diff --git a/.env.example b/.env.example
index b7ba0920d..2ab2933dc 100644
--- a/.env.example
+++ b/.env.example
@@ -2,7 +2,7 @@
 # https://www.chatwoot.com/docs/self-hosted/configuration/environment-variables/#rails-production-variables
 
 # Used to verify the integrity of signed cookies. so ensure a secure value is set
-# SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols. 
+# SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols.
 # Use `rake secret` to generate this variable
 SECRET_KEY_BASE=replace_with_lengthy_secure_hex
 
@@ -216,6 +216,8 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 # ENABLE_RACK_ATTACK=true
 # RACK_ATTACK_LIMIT=300
 # ENABLE_RACK_ATTACK_WIDGET_API=true
+# Comma-separated list of trusted IPs that bypass Rack Attack throttling rules
+# RACK_ATTACK_ALLOWED_IPS=127.0.0.1,::1,192.168.0.10
 
 ## Running chatwoot as an API only server
 ## setting this value to true will disable the frontend dashboard endpoints
@@ -257,4 +259,3 @@ AZURE_APP_SECRET=
 # Set to true if you want to remove stale contact inboxes
 # contact_inboxes with no conversation older than 90 days will be removed
 # REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
-
diff --git a/Gemfile.lock b/Gemfile.lock
index d3ef47631..da19dbb72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -567,7 +567,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.13)
+    rack (2.2.14)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-contrib (2.5.0)
diff --git a/app/controllers/api/v1/accounts/custom_filters_controller.rb b/app/controllers/api/v1/accounts/custom_filters_controller.rb
index f458c018f..b4345bb8a 100644
--- a/app/controllers/api/v1/accounts/custom_filters_controller.rb
+++ b/app/controllers/api/v1/accounts/custom_filters_controller.rb
@@ -1,6 +1,6 @@
 class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseController
   before_action :check_authorization
-  before_action :fetch_custom_filters, except: [:create]
+  before_action :fetch_custom_filters, only: [:index]
   before_action :fetch_custom_filter, only: [:show, :update, :destroy]
   DEFAULT_FILTER_TYPE = 'conversation'.freeze
 
@@ -9,8 +9,8 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
   def show; end
 
   def create
-    @custom_filter = current_user.custom_filters.create!(
-      permitted_payload.merge(account_id: Current.account.id)
+    @custom_filter = Current.account.custom_filters.create!(
+      permitted_payload.merge(user: Current.user)
     )
     render json: { error: @custom_filter.errors.messages }, status: :unprocessable_entity and return unless @custom_filter.valid?
   end
@@ -27,14 +27,16 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
   private
 
   def fetch_custom_filters
-    @custom_filters = current_user.custom_filters.where(
-      account_id: Current.account.id,
+    @custom_filters = Current.account.custom_filters.where(
+      user: Current.user,
       filter_type: permitted_params[:filter_type] || DEFAULT_FILTER_TYPE
     )
   end
 
   def fetch_custom_filter
-    @custom_filter = @custom_filters.find(permitted_params[:id])
+    @custom_filter = Current.account.custom_filters.where(
+      user: Current.user
+    ).find(permitted_params[:id])
   end
 
   def permitted_payload
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index c0dac6d9e..c610dc846 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -44,8 +44,9 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def update
-    @account.assign_attributes(account_params.slice(:name, :locale, :domain, :support_email, :auto_resolve_duration))
+    @account.assign_attributes(account_params.slice(:name, :locale, :domain, :support_email))
     @account.custom_attributes.merge!(custom_attributes_params)
+    @account.settings.merge!(settings_params)
     @account.custom_attributes['onboarding_step'] = 'invite_team' if @account.custom_attributes['onboarding_step'] == 'account_update'
     @account.save!
   end
@@ -83,13 +84,17 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def account_params
-    params.permit(:account_name, :email, :name, :password, :locale, :domain, :support_email, :auto_resolve_duration, :user_full_name)
+    params.permit(:account_name, :email, :name, :password, :locale, :domain, :support_email, :user_full_name)
   end
 
   def custom_attributes_params
     params.permit(:industry, :company_size, :timezone)
   end
 
+  def settings_params
+    params.permit(:auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting)
+  end
+
   def check_signup_enabled
     raise ActionController::RoutingError, 'Not Found' if GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false') == 'false'
   end
diff --git a/app/controllers/api/v1/widget/campaigns_controller.rb b/app/controllers/api/v1/widget/campaigns_controller.rb
index 10a73aa62..9cf8dcb6e 100644
--- a/app/controllers/api/v1/widget/campaigns_controller.rb
+++ b/app/controllers/api/v1/widget/campaigns_controller.rb
@@ -2,10 +2,15 @@ class Api::V1::Widget::CampaignsController < Api::V1::Widget::BaseController
   skip_before_action :set_contact
 
   def index
-    @campaigns = @web_widget
-                 .inbox
-                 .campaigns
-                 .where(enabled: true, account_id: @web_widget.inbox.account_id)
-                 .includes(:sender)
+    account = @web_widget.inbox.account
+    @campaigns = if account.feature_enabled?('campaigns')
+                   @web_widget
+                     .inbox
+                     .campaigns
+                     .where(enabled: true, account_id: account.id)
+                     .includes(:sender)
+                 else
+                   []
+                 end
   end
 end
diff --git a/app/controllers/api/v2/accounts_controller.rb b/app/controllers/api/v2/accounts_controller.rb
index 45faca3d0..bed0a212a 100644
--- a/app/controllers/api/v2/accounts_controller.rb
+++ b/app/controllers/api/v2/accounts_controller.rb
@@ -54,7 +54,7 @@ class Api::V2::AccountsController < Api::BaseController
   end
 
   def account_params
-    params.permit(:account_name, :email, :name, :password, :locale, :domain, :support_email, :auto_resolve_duration, :user_full_name)
+    params.permit(:account_name, :email, :name, :password, :locale, :domain, :support_email, :user_full_name)
   end
 
   def check_signup_enabled
diff --git a/app/controllers/concerns/access_token_auth_helper.rb b/app/controllers/concerns/access_token_auth_helper.rb
index 2ee9f9854..9b0f9021f 100644
--- a/app/controllers/concerns/access_token_auth_helper.rb
+++ b/app/controllers/concerns/access_token_auth_helper.rb
@@ -1,6 +1,6 @@
 module AccessTokenAuthHelper
   BOT_ACCESSIBLE_ENDPOINTS = {
-    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create update],
+    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create update custom_attributes],
     'api/v1/accounts/conversations/messages' => ['create'],
     'api/v1/accounts/conversations/assignments' => ['create']
   }.freeze
diff --git a/app/javascript/dashboard/components-next/captain/assistant/MessageList.vue b/app/javascript/dashboard/components-next/captain/assistant/MessageList.vue
index 1d6529a45..3eca35744 100644
--- a/app/javascript/dashboard/components-next/captain/assistant/MessageList.vue
+++ b/app/javascript/dashboard/components-next/captain/assistant/MessageList.vue
@@ -65,7 +65,7 @@ watch(() => props.messages.length, scrollToBottom);
           class="max-w-[80%] rounded-lg p-3 text-sm"
           :class="getMessageStyle(message.sender)"
         >
-          <div v-html="formatMessage(message.content)" />
+          <div class="break-words" v-html="formatMessage(message.content)" />
         </div>
       </div>
     </div>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/EditAssistantForm.vue b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/EditAssistantForm.vue
index 3a668a757..249051878 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/EditAssistantForm.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/EditAssistantForm.vue
@@ -214,7 +214,7 @@ watch(
           v-model="state.instructions"
           :placeholder="t('CAPTAIN.ASSISTANTS.FORM.INSTRUCTIONS.PLACEHOLDER')"
           :message="formErrors.instructions"
-          :max-length="2000"
+          :max-length="20000"
           :message-type="formErrors.instructions ? 'error' : 'info'"
         />
 
diff --git a/app/javascript/dashboard/components-next/copilot/Copilot.vue b/app/javascript/dashboard/components-next/copilot/Copilot.vue
index e284bb983..5feb474a6 100644
--- a/app/javascript/dashboard/components-next/copilot/Copilot.vue
+++ b/app/javascript/dashboard/components-next/copilot/Copilot.vue
@@ -1,5 +1,6 @@
 <script setup>
 import { nextTick, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
 import { useTrack } from 'dashboard/composables';
 import { COPILOT_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 
@@ -39,6 +40,8 @@ const props = defineProps({
 
 const emit = defineEmits(['sendMessage', 'reset', 'setAssistant']);
 
+const { t } = useI18n();
+
 const COPILOT_USER_ROLES = ['assistant', 'system'];
 
 const sendMessage = message => {
@@ -47,7 +50,7 @@ const sendMessage = message => {
 };
 
 const useSuggestion = opt => {
-  emit('sendMessage', opt.prompt);
+  emit('sendMessage', t(opt.prompt));
   useTrack(COPILOT_EVENTS.SEND_SUGGESTED);
 };
 
@@ -66,16 +69,16 @@ const scrollToBottom = async () => {
 
 const promptOptions = [
   {
-    label: 'Summarize this conversation',
-    prompt: `Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent`,
+    label: 'CAPTAIN.COPILOT.PROMPTS.SUMMARIZE.LABEL',
+    prompt: 'CAPTAIN.COPILOT.PROMPTS.SUMMARIZE.CONTENT',
   },
   {
-    label: 'Suggest an answer',
-    prompt: `Analyze the customer’s inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information.`,
+    label: 'CAPTAIN.COPILOT.PROMPTS.SUGGEST.LABEL',
+    prompt: 'CAPTAIN.COPILOT.PROMPTS.SUGGEST.CONTENT',
   },
   {
-    label: 'Rate this conversation',
-    prompt: `Review the conversation to see how well it meets the customer’s needs. Share a rating out of 5 based on tone, clarity, and effectiveness.`,
+    label: 'CAPTAIN.COPILOT.PROMPTS.RATE.LABEL',
+    prompt: 'CAPTAIN.COPILOT.PROMPTS.RATE.CONTENT',
   },
 ];
 
@@ -89,7 +92,7 @@ watch(
 </script>
 
 <template>
-  <div class="flex flex-col h-full text-sm leading-6 tracking-tight">
+  <div class="flex flex-col h-full text-sm leading-6 tracking-tight w-full">
     <div ref="chatContainer" class="flex-1 px-4 py-4 space-y-6 overflow-y-auto">
       <template v-for="message in messages" :key="message.id">
         <CopilotAgentMessage
@@ -121,7 +124,7 @@ watch(
           class="px-2 py-1 rounded-md border border-n-weak bg-n-slate-2 text-n-slate-11 flex items-center gap-1"
           @click="() => useSuggestion(prompt)"
         >
-          <span>{{ prompt.label }}</span>
+          <span>{{ t(prompt.label) }}</span>
           <Icon icon="i-lucide-chevron-right" />
         </button>
       </div>
diff --git a/app/javascript/dashboard/components-next/input/DurationInput.vue b/app/javascript/dashboard/components-next/input/DurationInput.vue
new file mode 100644
index 000000000..15c6d102a
--- /dev/null
+++ b/app/javascript/dashboard/components-next/input/DurationInput.vue
@@ -0,0 +1,66 @@
+<script setup>
+import { computed, ref } from 'vue';
+import Input from './Input.vue';
+import { useI18n } from 'vue-i18n';
+
+const props = defineProps({
+  min: { type: Number, default: 0 },
+  max: { type: Number, default: Infinity },
+  disabled: { type: Boolean, default: false },
+});
+
+const { t } = useI18n();
+const duration = defineModel('modelValue', { type: Number, default: null });
+
+const UNIT_TYPES = {
+  MINUTES: 'minutes',
+  HOURS: 'hours',
+  DAYS: 'days',
+};
+const unit = ref(UNIT_TYPES.MINUTES);
+
+const transformedValue = computed({
+  get() {
+    if (unit.value === UNIT_TYPES.MINUTES) return duration.value;
+    if (unit.value === UNIT_TYPES.HOURS) return Math.floor(duration.value / 60);
+    if (unit.value === UNIT_TYPES.DAYS)
+      return Math.floor(duration.value / 24 / 60);
+
+    return 0;
+  },
+  set(newValue) {
+    let minuteValue;
+    if (unit.value === UNIT_TYPES.MINUTES) {
+      minuteValue = Math.floor(newValue);
+    } else if (unit.value === UNIT_TYPES.HOURS) {
+      minuteValue = Math.floor(newValue * 60);
+    } else if (unit.value === UNIT_TYPES.DAYS) {
+      minuteValue = Math.floor(newValue * 24 * 60);
+    }
+
+    duration.value = Math.min(Math.max(minuteValue, props.min), props.max);
+  },
+});
+</script>
+
+<template>
+  <Input
+    v-model="transformedValue"
+    type="number"
+    autocomplete="off"
+    :disabled="disabled"
+    :placeholder="t('DURATION_INPUT.PLACEHOLDER')"
+    class="flex-grow w-full disabled:"
+  />
+  <select
+    v-model="unit"
+    :disabled="disabled"
+    class="mb-0 text-sm disabled:outline-n-weak disabled:opacity-40"
+  >
+    <option :value="UNIT_TYPES.MINUTES">
+      {{ t('DURATION_INPUT.MINUTES') }}
+    </option>
+    <option :value="UNIT_TYPES.HOURS">{{ t('DURATION_INPUT.HOURS') }}</option>
+    <option :value="UNIT_TYPES.DAYS">{{ t('DURATION_INPUT.DAYS') }}</option>
+  </select>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/Message.vue b/app/javascript/dashboard/components-next/message/Message.vue
index ad607cf5b..c28b4730e 100644
--- a/app/javascript/dashboard/components-next/message/Message.vue
+++ b/app/javascript/dashboard/components-next/message/Message.vue
@@ -118,7 +118,7 @@ const props = defineProps({
   },
   conversationId: { type: Number, required: true },
   createdAt: { type: Number, required: true }, // eslint-disable-line vue/no-unused-properties
-  currentUserId: { type: Number, required: true },
+  currentUserId: { type: Number, required: true }, // eslint-disable-line vue/no-unused-properties
   groupWithNext: { type: Boolean, default: false },
   inboxId: { type: Number, default: null }, // eslint-disable-line vue/no-unused-properties
   inboxSupportsReplyTo: { type: Object, default: () => ({}) },
@@ -174,7 +174,10 @@ const variant = computed(() => {
   return variants[props.messageType] || MESSAGE_VARIANTS.USER;
 });
 
-const isMyMessage = computed(() => {
+const isBotOrAgentMessage = computed(() => {
+  if (props.messageType === MESSAGE_TYPES.ACTIVITY) {
+    return false;
+  }
   // if an outgoing message is still processing, then it's definitely a
   // message sent by the current user
   if (
@@ -187,13 +190,10 @@ const isMyMessage = computed(() => {
   const senderType = props.senderType ?? props.sender?.type;
 
   if (!senderType || !senderId) {
-    return false;
+    return true;
   }
 
-  return (
-    senderType.toLowerCase() === SENDER_TYPES.USER.toLowerCase() &&
-    props.currentUserId === senderId
-  );
+  return senderType.toLowerCase() === SENDER_TYPES.USER.toLowerCase();
 });
 
 /**
@@ -201,7 +201,7 @@ const isMyMessage = computed(() => {
  * @returns {import('vue').ComputedRef<'left'|'right'|'center'>} The computed orientation
  */
 const orientation = computed(() => {
-  if (isMyMessage.value) {
+  if (isBotOrAgentMessage.value) {
     return ORIENTATION.RIGHT;
   }
 
@@ -222,8 +222,8 @@ const flexOrientationClass = computed(() => {
 
 const gridClass = computed(() => {
   const map = {
-    [ORIENTATION.LEFT]: 'grid grid-cols-[24px_1fr]',
-    [ORIENTATION.RIGHT]: 'grid grid-cols-1fr',
+    [ORIENTATION.LEFT]: 'grid grid-cols-1fr',
+    [ORIENTATION.RIGHT]: 'grid grid-cols-[1fr_24px]',
   };
 
   return map[orientation.value];
@@ -232,13 +232,13 @@ const gridClass = computed(() => {
 const gridTemplate = computed(() => {
   const map = {
     [ORIENTATION.LEFT]: `
-      "avatar bubble"
-      "spacer meta"
-    `,
-    [ORIENTATION.RIGHT]: `
       "bubble"
       "meta"
     `,
+    [ORIENTATION.RIGHT]: `
+      "bubble avatar"
+      "meta spacer"
+    `,
   };
 
   return map[orientation.value];
@@ -252,7 +252,7 @@ const shouldGroupWithNext = computed(() => {
 
 const shouldShowAvatar = computed(() => {
   if (props.messageType === MESSAGE_TYPES.ACTIVITY) return false;
-  if (orientation.value === ORIENTATION.RIGHT) return false;
+  if (orientation.value === ORIENTATION.LEFT) return false;
 
   return true;
 });
@@ -404,23 +404,29 @@ function handleReplyTo() {
 }
 
 const avatarInfo = computed(() => {
-  if (!props.sender || props.sender.type === SENDER_TYPES.AGENT_BOT) {
+  // If no sender, return bot info
+  if (!props.sender) {
     return {
       name: t('CONVERSATION.BOT'),
       src: '',
     };
   }
 
-  if (props.sender) {
+  const { sender } = props;
+  const { name, type, avatarUrl, thumbnail } = sender || {};
+
+  // If sender type is agent bot, use avatarUrl
+  if (type === SENDER_TYPES.AGENT_BOT) {
     return {
-      name: props.sender.name,
-      src: props.sender?.thumbnail,
+      name: name ?? '',
+      src: avatarUrl ?? '',
     };
   }
 
+  // For all other senders, use thumbnail
   return {
-    name: '',
-    src: '',
+    name: name ?? '',
+    src: thumbnail ?? '',
   };
 });
 
@@ -448,7 +454,7 @@ provideMessageContext({
   isPrivate: computed(() => props.private),
   variant,
   orientation,
-  isMyMessage,
+  isBotOrAgentMessage,
   shouldGroupWithNext,
 });
 </script>
@@ -480,14 +486,14 @@ provideMessageContext({
           'w-full': variant === MESSAGE_VARIANTS.EMAIL,
         },
       ]"
-      class="gap-x-3"
+      class="gap-x-2"
       :style="{
         gridTemplateAreas: gridTemplate,
       }"
     >
       <div
         v-if="!shouldGroupWithNext && shouldShowAvatar"
-        v-tooltip.right-end="avatarTooltip"
+        v-tooltip.left-end="avatarTooltip"
         class="[grid-area:avatar] flex items-end"
       >
         <Avatar v-bind="avatarInfo" :size="24" />
@@ -495,7 +501,8 @@ provideMessageContext({
       <div
         class="[grid-area:bubble] flex"
         :class="{
-          'ltr:pl-9 rtl:pl-0 justify-end': orientation === ORIENTATION.RIGHT,
+          'ltr:pl-8 rtl:pr-8 justify-end': orientation === ORIENTATION.RIGHT,
+          'ltr:pr-8 rtl:pl-8': orientation === ORIENTATION.LEFT,
           'min-w-0': variant === MESSAGE_VARIANTS.EMAIL,
           'min-w-0 max-w-full': componentToRender === VoiceCallBubble,
         }"
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Activity.vue b/app/javascript/dashboard/components-next/message/bubbles/Activity.vue
index d52286543..057f1e7d7 100644
--- a/app/javascript/dashboard/components-next/message/bubbles/Activity.vue
+++ b/app/javascript/dashboard/components-next/message/bubbles/Activity.vue
@@ -14,7 +14,7 @@ const readableTime = computed(() =>
 <template>
   <BaseBubble
     v-tooltip.top="readableTime"
-    class="px-2 py-0.5 !rounded-full flex min-w-0 items-center gap-2"
+    class="px-3 py-1 !rounded-xl flex min-w-0 items-center gap-2"
     data-bubble-name="activity"
   >
     <span v-dompurify-html="content" :title="content" />
diff --git a/app/javascript/dashboard/components-next/message/provider.js b/app/javascript/dashboard/components-next/message/provider.js
index f4c501845..f40eaefa0 100644
--- a/app/javascript/dashboard/components-next/message/provider.js
+++ b/app/javascript/dashboard/components-next/message/provider.js
@@ -98,7 +98,7 @@ const MessageControl = Symbol('MessageControl');
  * @property {import('vue').Ref<Sender|null>} [sender=null] - The sender information
  * @property {import('vue').ComputedRef<MessageOrientation>} orientation - The visual variant of the message
  * @property {import('vue').ComputedRef<MessageVariant>} variant - The visual variant of the message
- * @property {import('vue').ComputedRef<boolean>} isMyMessage - Does the message belong to the current user
+ * @property {import('vue').ComputedRef<boolean>} isBotOrAgentMessage - Does the message belong to the current user
  * @property {import('vue').ComputedRef<boolean>} isPrivate - Proxy computed value for private
  * @property {import('vue').ComputedRef<boolean>} shouldGroupWithNext - Should group with the next message or not, it is differnt from groupWithNext, this has a bypass for a failed message
  */
diff --git a/app/javascript/dashboard/components-next/selectmenu/SelectMenu.vue b/app/javascript/dashboard/components-next/selectmenu/SelectMenu.vue
index cc584dcbb..922c0069e 100644
--- a/app/javascript/dashboard/components-next/selectmenu/SelectMenu.vue
+++ b/app/javascript/dashboard/components-next/selectmenu/SelectMenu.vue
@@ -15,6 +15,13 @@ const props = defineProps({
     type: String,
     required: true,
   },
+  subMenuPosition: {
+    type: String,
+    default: 'right',
+    validator: value => {
+      return ['right', 'left', 'bottom'].includes(value);
+    },
+  },
 });
 
 const emit = defineEmits(['update:modelValue']);
@@ -44,14 +51,21 @@ const handleSelect = value => {
       trailing-icon
       color="slate"
       variant="faded"
-      class="!w-fit"
+      class="!w-fit max-w-40"
       :class="{ 'dark:!bg-n-alpha-2 !bg-n-slate-9/20': isOpen }"
       :label="labelValue"
       @click="toggleMenu"
     />
     <div
       v-if="isOpen"
-      class="absolute ltr:left-full rtl:right-full select-none max-w-48 ltr:ml-1 rtl:mr-1 flex flex-col gap-1 bg-n-alpha-3 backdrop-blur-[100px] p-1 top-0 shadow-lg rounded-lg border border-n-weak"
+      class="absolute select-none max-w-64 flex flex-col gap-1 bg-n-alpha-3 backdrop-blur-[100px] p-1 top-0 shadow-lg z-40 rounded-lg border border-n-weak dark:border-n-strong/50"
+      :class="{
+        'ltr:left-full rtl:right-full ltr:ml-1 rtl:mr-1':
+          subMenuPosition === 'right',
+        'ltr:right-full rtl:left-full ltr:mr-1 rtl:ml-1':
+          subMenuPosition === 'left',
+        'top-full mt-1 ltr:right-0 rtl:left-0': subMenuPosition === 'bottom',
+      }"
     >
       <Button
         v-for="option in options"
diff --git a/app/javascript/dashboard/components-next/switch/Switch.vue b/app/javascript/dashboard/components-next/switch/Switch.vue
index 4428154a0..766442953 100644
--- a/app/javascript/dashboard/components-next/switch/Switch.vue
+++ b/app/javascript/dashboard/components-next/switch/Switch.vue
@@ -27,10 +27,10 @@ const updateValue = () => {
   >
     <span class="sr-only">{{ t('SWITCH.TOGGLE') }}</span>
     <span
-      class="absolute top-[0.07rem] left-0.5 h-3 w-3 transform rounded-full shadow-sm transition-transform duration-200 ease-in-out"
+      class="absolute top-0.5 left-0.5 h-3 w-3 transform rounded-full shadow-sm transition-transform duration-200 ease-in-out"
       :class="
         modelValue
-          ? 'translate-x-2.5 bg-white'
+          ? 'translate-x-3 bg-white'
           : 'translate-x-0 bg-white dark:bg-n-black'
       "
     />
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
index e328f86b4..dc434f6c7 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
@@ -1,93 +1,129 @@
-<script>
-import wootConstants from 'dashboard/constants/globals';
-import { mapGetters } from 'vuex';
-import FilterItem from './FilterItem.vue';
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useToggle } from '@vueuse/core';
+import { vOnClickOutside } from '@vueuse/components';
 import { useUISettings } from 'dashboard/composables/useUISettings';
+import { useMapGetter, useStore } from 'dashboard/composables/store.js';
+import wootConstants from 'dashboard/constants/globals';
+import SelectMenu from 'dashboard/components-next/selectmenu/SelectMenu.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
 
-const CHAT_STATUS_FILTER_ITEMS = Object.freeze([
-  'open',
-  'resolved',
-  'pending',
-  'snoozed',
-  'all',
-]);
+defineProps({
+  isOnExpandedLayout: {
+    type: Boolean,
+    required: true,
+  },
+});
 
-const SORT_ORDER_ITEMS = Object.freeze([
-  'last_activity_at_asc',
-  'last_activity_at_desc',
-  'created_at_desc',
-  'created_at_asc',
-  'priority_desc',
-  'priority_asc',
-  'waiting_since_asc',
-  'waiting_since_desc',
-]);
+const emit = defineEmits(['changeFilter']);
 
-export default {
-  components: {
-    FilterItem,
-    NextButton,
-  },
-  props: {
-    isOnExpandedLayout: {
-      type: Boolean,
-      required: true,
-    },
-  },
-  emits: ['changeFilter'],
-  setup() {
-    const { updateUISettings } = useUISettings();
+const store = useStore();
+const { t } = useI18n();
 
-    return {
-      updateUISettings,
-    };
+const { updateUISettings } = useUISettings();
+
+const chatStatusFilter = useMapGetter('getChatStatusFilter');
+const chatSortFilter = useMapGetter('getChatSortFilter');
+
+const [showActionsDropdown, toggleDropdown] = useToggle();
+
+const currentStatusFilter = computed(() => {
+  return chatStatusFilter.value || wootConstants.STATUS_TYPE.OPEN;
+});
+
+const currentSortBy = computed(() => {
+  return (
+    chatSortFilter.value || wootConstants.SORT_BY_TYPE.LAST_ACTIVITY_AT_DESC
+  );
+});
+
+const chatStatusOptions = [
+  {
+    label: t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.open.TEXT'),
+    value: 'open',
   },
-  data() {
-    return {
-      showActionsDropdown: false,
-      chatStatusItems: CHAT_STATUS_FILTER_ITEMS,
-      chatSortItems: SORT_ORDER_ITEMS,
-    };
+  {
+    label: t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.resolved.TEXT'),
+    value: 'resolved',
   },
-  computed: {
-    ...mapGetters({
-      chatStatusFilter: 'getChatStatusFilter',
-      chatSortFilter: 'getChatSortFilter',
-    }),
-    chatStatus() {
-      return this.chatStatusFilter || wootConstants.STATUS_TYPE.OPEN;
-    },
-    sortFilter() {
-      return (
-        this.chatSortFilter || wootConstants.SORT_BY_TYPE.LAST_ACTIVITY_AT_DESC
-      );
-    },
+  {
+    label: t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.pending.TEXT'),
+    value: 'pending',
   },
-  methods: {
-    onTabChange(value) {
-      this.$emit('changeFilter', value);
-      this.closeDropdown();
-    },
-    toggleDropdown() {
-      this.showActionsDropdown = !this.showActionsDropdown;
-    },
-    closeDropdown() {
-      this.showActionsDropdown = false;
-    },
-    onChangeFilter(value, type) {
-      this.$emit('changeFilter', value, type);
-      this.saveSelectedFilter(type, value);
-    },
-    saveSelectedFilter(type, value) {
-      this.updateUISettings({
-        conversations_filter_by: {
-          status: type === 'status' ? value : this.chatStatus,
-          order_by: type === 'sort' ? value : this.sortFilter,
-        },
-      });
-    },
+  {
+    label: t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.snoozed.TEXT'),
+    value: 'snoozed',
   },
+  {
+    label: t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.all.TEXT'),
+    value: 'all',
+  },
+];
+
+const chatSortOptions = [
+  {
+    label: t('CHAT_LIST.SORT_ORDER_ITEMS.last_activity_at_asc.TEXT'),
+    value: 'last_activity_at_asc',
+  },
+  {
+    label: t('CHAT_LIST.SORT_ORDER_ITEMS.last_activity_at_desc.TEXT'),
+    value: 'last_activity_at_desc',
+  },
+  {
+    label: t('CHAT_LIST.SORT_ORDER_ITEMS.created_at_desc.TEXT'),
+    value: 'created_at_desc',
+  },
+  {
+    label: t('CHAT_LIST.SORT_ORDER_ITEMS.created_at_asc.TEXT'),
+    value: 'created_at_asc',
+  },
+  {
+    label: t('CHAT_LIST.SORT_ORDER_ITEMS.priority_desc.TEXT'),
+    value: 'priority_desc',
+  },
+  {
+    label: t('CHAT_LIST.SORT_ORDER_ITEMS.priority_asc.TEXT'),
+    value: 'priority_asc',
+  },
+  {
+    label: t('CHAT_LIST.SORT_ORDER_ITEMS.waiting_since_asc.TEXT'),
+    value: 'waiting_since_asc',
+  },
+  {
+    label: t('CHAT_LIST.SORT_ORDER_ITEMS.waiting_since_desc.TEXT'),
+    value: 'waiting_since_desc',
+  },
+];
+
+const activeChatStatusLabel = computed(
+  () =>
+    chatStatusOptions.find(m => m.value === chatStatusFilter.value)?.label || ''
+);
+
+const activeChatSortLabel = computed(
+  () => chatSortOptions.find(m => m.value === chatSortFilter.value)?.label || ''
+);
+
+const saveSelectedFilter = (type, value) => {
+  updateUISettings({
+    conversations_filter_by: {
+      status: type === 'status' ? value : currentStatusFilter.value,
+      order_by: type === 'sort' ? value : currentSortBy.value,
+    },
+  });
+};
+
+const handleStatusChange = value => {
+  emit('changeFilter', value, 'status');
+  store.dispatch('setChatStatusFilter', value);
+  saveSelectedFilter('status', value);
+};
+
+const handleSortChange = value => {
+  emit('changeFilter', value, 'sort');
+  store.dispatch('setChatSortFilter', value);
+  saveSelectedFilter('sort', value);
 };
 </script>
 
@@ -99,39 +135,39 @@ export default {
       slate
       faded
       xs
-      @click="toggleDropdown"
+      @click="toggleDropdown()"
     />
     <div
       v-if="showActionsDropdown"
-      v-on-clickaway="closeDropdown"
-      class="mt-1 dropdown-pane dropdown-pane--open !w-52 !p-4 top-6 border !border-n-weak dark:!border-n-weak !bg-n-alpha-3 dark:!bg-n-alpha-3 backdrop-blur-[100px]"
+      v-on-click-outside="() => toggleDropdown()"
+      class="mt-1 bg-n-alpha-3 backdrop-blur-[100px] border border-n-weak w-72 rounded-xl p-4 absolute z-40 top-full"
       :class="{
         'ltr:left-0 rtl:right-0': !isOnExpandedLayout,
         'ltr:right-0 rtl:left-0': isOnExpandedLayout,
       }"
     >
-      <div class="flex items-center justify-between last:mt-4">
-        <span class="text-xs font-medium text-n-slate-12">{{
-          $t('CHAT_LIST.CHAT_SORT.STATUS')
-        }}</span>
-        <FilterItem
-          type="status"
-          :selected-value="chatStatus"
-          :items="chatStatusItems"
-          path-prefix="CHAT_LIST.CHAT_STATUS_FILTER_ITEMS"
-          @on-change-filter="onChangeFilter"
+      <div class="flex items-center justify-between last:mt-4 gap-2">
+        <span class="text-sm truncate text-n-slate-12">
+          {{ $t('CHAT_LIST.CHAT_SORT.STATUS') }}
+        </span>
+        <SelectMenu
+          :model-value="chatStatusFilter"
+          :options="chatStatusOptions"
+          :label="activeChatStatusLabel"
+          :sub-menu-position="isOnExpandedLayout ? 'left' : 'right'"
+          @update:model-value="handleStatusChange"
         />
       </div>
-      <div class="flex items-center justify-between last:mt-4">
-        <span class="text-xs font-medium text-n-slate-12">{{
-          $t('CHAT_LIST.CHAT_SORT.ORDER_BY')
-        }}</span>
-        <FilterItem
-          type="sort"
-          :selected-value="sortFilter"
-          :items="chatSortItems"
-          path-prefix="CHAT_LIST.SORT_ORDER_ITEMS"
-          @on-change-filter="onChangeFilter"
+      <div class="flex items-center justify-between last:mt-4 gap-2">
+        <span class="text-sm truncate text-n-slate-12">
+          {{ $t('CHAT_LIST.CHAT_SORT.ORDER_BY') }}
+        </span>
+        <SelectMenu
+          :model-value="chatSortFilter"
+          :options="chatSortOptions"
+          :label="activeChatSortLabel"
+          :sub-menu-position="isOnExpandedLayout ? 'left' : 'right'"
+          @update:model-value="handleSortChange"
         />
       </div>
     </div>
diff --git a/app/javascript/dashboard/composables/useAccount.js b/app/javascript/dashboard/composables/useAccount.js
index 8ace2a5e1..9a2ba012b 100644
--- a/app/javascript/dashboard/composables/useAccount.js
+++ b/app/javascript/dashboard/composables/useAccount.js
@@ -1,6 +1,6 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-import { useMapGetter } from './store';
+import { useMapGetter, useStore } from './store';
 
 /**
  * Composable for account-related operations.
@@ -12,6 +12,7 @@ export function useAccount() {
    * @type {import('vue').ComputedRef<number>}
    */
   const route = useRoute();
+  const store = useStore();
   const getAccountFn = useMapGetter('accounts/getAccount');
   const isOnChatwootCloud = useMapGetter('globalConfig/isOnChatwootCloud');
   const isFeatureEnabledonAccount = useMapGetter(
@@ -44,6 +45,12 @@ export function useAccount() {
     };
   };
 
+  const updateAccount = async data => {
+    await store.dispatch('accounts/update', {
+      ...data,
+    });
+  };
+
   return {
     accountId,
     route,
@@ -52,5 +59,6 @@ export function useAccount() {
     accountScopedRoute,
     isCloudFeatureEnabled,
     isOnChatwootCloud,
+    updateAccount,
   };
 }
diff --git a/app/javascript/dashboard/i18n/locale/am/components.json b/app/javascript/dashboard/i18n/locale/am/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/am/components.json
+++ b/app/javascript/dashboard/i18n/locale/am/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/am/generalSettings.json b/app/javascript/dashboard/i18n/locale/am/generalSettings.json
index cfda6c7da..e586fe761 100644
--- a/app/javascript/dashboard/i18n/locale/am/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/am/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/am/integrations.json b/app/javascript/dashboard/i18n/locale/am/integrations.json
index fa46b1900..f1a1d42c2 100644
--- a/app/javascript/dashboard/i18n/locale/am/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/am/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ar/components.json b/app/javascript/dashboard/i18n/locale/ar/components.json
index 6a4b2f4cb..e06f11d82 100644
--- a/app/javascript/dashboard/i18n/locale/ar/components.json
+++ b/app/javascript/dashboard/i18n/locale/ar/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "اعرف المزيد",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
index 694f4dc59..09463f134 100644
--- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "معرف الحساب",
         "NOTE": "هذا المعرف مطلوب إذا كنت بصدد بناء تكامل على API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "اسم الحساب",
         "PLACEHOLDER": "اسم الحساب الخاص بك",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "عدد الأيام للتذكرة التي يجب أن يتم حلها تلقائياً إذا لم يكن هناك أي نشاط",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "الرجاء إدخال مدة صالحة للحل تلقائي (حد أدنى 1 يوم والحد الأقصى 999 يوما)"
+        "ERROR": "الرجاء إدخال مدة صالحة للحل تلقائي (حد أدنى 1 يوم والحد الأقصى 999 يوما)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "الاستمرار في المحادثة عبر رسائل البريد الإلكتروني مفعّل لحسابك.",
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
index 1fc3f38d2..24e64a972 100644
--- a/app/javascript/dashboard/i18n/locale/ar/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "أنت",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "أنت",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "الاسم",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "الوصف",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/az/components.json b/app/javascript/dashboard/i18n/locale/az/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/az/components.json
+++ b/app/javascript/dashboard/i18n/locale/az/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/az/generalSettings.json b/app/javascript/dashboard/i18n/locale/az/generalSettings.json
index cfda6c7da..e586fe761 100644
--- a/app/javascript/dashboard/i18n/locale/az/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/az/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/az/integrations.json b/app/javascript/dashboard/i18n/locale/az/integrations.json
index fa46b1900..f1a1d42c2 100644
--- a/app/javascript/dashboard/i18n/locale/az/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/az/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/bg/components.json b/app/javascript/dashboard/i18n/locale/bg/components.json
index 2bba5bc01..cb087f380 100644
--- a/app/javascript/dashboard/i18n/locale/bg/components.json
+++ b/app/javascript/dashboard/i18n/locale/bg/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
index 3cdafe2fe..7c3af981f 100644
--- a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/bg/integrations.json b/app/javascript/dashboard/i18n/locale/bg/integrations.json
index 6432e684b..3bbc0bf71 100644
--- a/app/javascript/dashboard/i18n/locale/bg/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/bg/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Име",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Описание",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ca/components.json b/app/javascript/dashboard/i18n/locale/ca/components.json
index b45eb74fb..11623bd86 100644
--- a/app/javascript/dashboard/i18n/locale/ca/components.json
+++ b/app/javascript/dashboard/i18n/locale/ca/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Aprèn més",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index adca9cca9..9969494f5 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID del compte",
         "NOTE": "Aquest identificador és necessari si esteu creant una integració basada en API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nom del compte",
         "PLACEHOLDER": "El nom del vostre compte",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "El nombre de dies després que un ticket es resolgui automàticament si no hi ha activitat",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Introduïu una durada de resolució automàtica vàlida (mínim 1 dia i màxim 999 dies)"
+        "ERROR": "Introduïu una durada de resolució automàtica vàlida (mínim 1 dia i màxim 999 dies)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "La continuïtat de converses amb correus electrònics està habilitada per al vostre compte.",
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index dd75e22c0..76a028c64 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Tu",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Tu",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nom",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Descripció",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/cs/components.json b/app/javascript/dashboard/i18n/locale/cs/components.json
index 847cdee59..480c7e626 100644
--- a/app/javascript/dashboard/i18n/locale/cs/components.json
+++ b/app/javascript/dashboard/i18n/locale/cs/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
index 61765145c..9d750008f 100644
--- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Název účtu",
         "PLACEHOLDER": "Název vašeho účtu",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Počet dnů, po kterých by měl být ticket automaticky vyřešen při žádné aktivitě",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "E-mailová konverzace je u vašeho účtu povolena.",
diff --git a/app/javascript/dashboard/i18n/locale/cs/integrations.json b/app/javascript/dashboard/i18n/locale/cs/integrations.json
index ddca19146..2671155ae 100644
--- a/app/javascript/dashboard/i18n/locale/cs/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/cs/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Vy",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Vy",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Název",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/da/components.json b/app/javascript/dashboard/i18n/locale/da/components.json
index 1ce510edc..7905f51e6 100644
--- a/app/javascript/dashboard/i18n/locale/da/components.json
+++ b/app/javascript/dashboard/i18n/locale/da/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Lær mere",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
index 58c1a7a2e..ac6a67899 100644
--- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Konto SID",
         "NOTE": "Dette ID er påkrævet, hvis du bygger en API-baseret integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Kontonavn",
         "PLACEHOLDER": "Dit kontonavn",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Antal dage efter en ticket skal løses automatisk, hvis der ikke er nogen aktivitet",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 dag og maksimum 999 dage)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 dag og maksimum 999 dage)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Samtale kontinuitet med e-mails er aktiveret for din konto.",
diff --git a/app/javascript/dashboard/i18n/locale/da/integrations.json b/app/javascript/dashboard/i18n/locale/da/integrations.json
index f9a46c365..1a0de11ae 100644
--- a/app/javascript/dashboard/i18n/locale/da/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/da/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Dig",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Dig",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Navn",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Beskrivelse",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/de/components.json b/app/javascript/dashboard/i18n/locale/de/components.json
index 3ef5c8fe8..e9497cd02 100644
--- a/app/javascript/dashboard/i18n/locale/de/components.json
+++ b/app/javascript/dashboard/i18n/locale/de/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Mehr erfahren",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index bfc4a912a..cf5ea916e 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "Diese ID ist erforderlich, wenn Sie eine API-basierte Integration erstellen"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Kontobezeichnung",
         "PLACEHOLDER": "Ihr Kontoname",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Anzahl der Tage, nach denen ein Ticket automatisch geschlossen wird, wenn keine Aktivität erfolgt",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Bitte geben Sie eine gültige Dauer für die automatische Auflösung ein (mindestens 1Tag und maximal 999Tage)"
+        "ERROR": "Bitte geben Sie eine gültige Dauer für die automatische Auflösung ein (mindestens 1Tag und maximal 999Tage)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Konversationskontinuität mit E-Mails ist für Ihr Konto aktiviert.",
diff --git a/app/javascript/dashboard/i18n/locale/de/integrations.json b/app/javascript/dashboard/i18n/locale/de/integrations.json
index 3bab5dec5..d63dd7d5c 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Sie",
       "USE": "Verwenden",
       "RESET": "Zurücksetzen",
-      "SELECT_ASSISTANT": "Assistent auswählen"
+      "SELECT_ASSISTANT": "Assistent auswählen",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Sie",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Beschreibung",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/el/components.json b/app/javascript/dashboard/i18n/locale/el/components.json
index 2e0f6c686..0e08a569b 100644
--- a/app/javascript/dashboard/i18n/locale/el/components.json
+++ b/app/javascript/dashboard/i18n/locale/el/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Μάθετε περισσότερα",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index eef4753fe..df42da768 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID Λογαριασμού",
         "NOTE": "Αυτό το ID απαιτείται αν δημιουργείτε μια ενσωμάτωση βασισμένη στο API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Ονομασία Λογαριασμού",
         "PLACEHOLDER": "Η ονομασία του Λογαριασμού σας",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Αριθμός ημερών μετά τις οποίες η συνομιλία θα επιλύεται αυτόματα, αν δεν υπάρχει δραστηριότητα",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διάρκεια αυτόματης επίλυσης (ελάχιστο 1 ημέρα και μέγιστο 999 ημέρες)"
+        "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διάρκεια αυτόματης επίλυσης (ελάχιστο 1 ημέρα και μέγιστο 999 ημέρες)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Η συνέχεια της συνομιλίας με emails έχει ενεργοποιηθεί για τον λογαριασμό.",
diff --git a/app/javascript/dashboard/i18n/locale/el/integrations.json b/app/javascript/dashboard/i18n/locale/el/integrations.json
index f62a3dcbd..97094d3b4 100644
--- a/app/javascript/dashboard/i18n/locale/el/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/el/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Όνομα",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Περιγραφή",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/en/components.json b/app/javascript/dashboard/i18n/locale/en/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/en/components.json
+++ b/app/javascript/dashboard/i18n/locale/en/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/generalSettings.json b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/en/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index ed56b1669..9767df3ad 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
@@ -331,7 +333,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -389,15 +405,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/es/components.json b/app/javascript/dashboard/i18n/locale/es/components.json
index 67564e605..79764eadc 100644
--- a/app/javascript/dashboard/i18n/locale/es/components.json
+++ b/app/javascript/dashboard/i18n/locale/es/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Más información",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index 8e79d1912..b25cbfcc0 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID de Cuenta",
         "NOTE": "Este ID es necesario si estás construyendo una integración basada en API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nombre de cuenta",
         "PLACEHOLDER": "Tu nombre de cuenta",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Número de días después de que un ticket se resuelva automáticamente si no hay actividad",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Por favor introduzca una duración válida de resolución automática (mínimo 1 día y máximo 999 días)"
+        "ERROR": "Por favor introduzca una duración válida de resolución automática (mínimo 1 día y máximo 999 días)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Continuidad de la conversación con emails está habilitada para su cuenta.",
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index a086947e1..0d205336f 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Tú",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Tú",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nombre",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Descripción",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/fa/components.json b/app/javascript/dashboard/i18n/locale/fa/components.json
index c4b5cd813..13c553711 100644
--- a/app/javascript/dashboard/i18n/locale/fa/components.json
+++ b/app/javascript/dashboard/i18n/locale/fa/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "بیشتر بدانید",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index 67f66385a..94a51effc 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "شناسه حساب‌کاربری",
         "NOTE": "اگر شما در حال ساخت یک یکپارچه‌سازی مبتنی بر API هستید، این شناسه مورد نیاز است"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "نام حساب‌کاربری",
         "PLACEHOLDER": "نام حساب‌کاربری شما",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "تعداد روزهایی که اگر فعالیتی وجود نداشته باشد، گفتگو به صورت خودکار بسته شود",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "۳۰",
-        "ERROR": "لطفا یک مدت زمان حل خودکار معبر (بین حداقل 1 روز تا حداکثر 999 روز) وارد کنید"
+        "ERROR": "لطفا یک مدت زمان حل خودکار معبر (بین حداقل 1 روز تا حداکثر 999 روز) وارد کنید",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "تداوم مکالمه با ایمیل برای حساب شما فعال است.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index ba0bba48c..01e113aa6 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "شما",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "شما",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "نام",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "توضیحات",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/fi/components.json b/app/javascript/dashboard/i18n/locale/fi/components.json
index 916b21a31..4270da3d8 100644
--- a/app/javascript/dashboard/i18n/locale/fi/components.json
+++ b/app/javascript/dashboard/i18n/locale/fi/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
index e9d085363..49d91148e 100644
--- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Tilin nimi",
         "PLACEHOLDER": "Tilisi nimi",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Kuinka monen päivän jälkeen tukipyyntö suljetaan automaattisesti, mikäli sillä ei ole toimintaa",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Keskustelun jatkuvuus sähköpostin kautta on käytössä tililläsi.",
diff --git a/app/javascript/dashboard/i18n/locale/fi/integrations.json b/app/javascript/dashboard/i18n/locale/fi/integrations.json
index fa18e4a7b..6f749c74b 100644
--- a/app/javascript/dashboard/i18n/locale/fi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fi/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Sinä",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Sinä",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nimi",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Kuvaus",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/fr/components.json b/app/javascript/dashboard/i18n/locale/fr/components.json
index 6048fd367..eab6fa32a 100644
--- a/app/javascript/dashboard/i18n/locale/fr/components.json
+++ b/app/javascript/dashboard/i18n/locale/fr/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "En savoir plus",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index cbad750f0..f84a2094d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID de compte",
         "NOTE": "Cet identifiant est requis si vous construisez une intégration basée sur l'API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nom du compte",
         "PLACEHOLDER": "Votre nom de compte",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Nombre de jours après qu'un ticket soit automatiquement résolu s'il n'y a pas d'activité",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Veuillez entrer une durée de résolution automatique valide (minimum 1 jour et maximum 999 jours)"
+        "ERROR": "Veuillez entrer une durée de résolution automatique valide (minimum 1 jour et maximum 999 jours)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "La continuité des conversations avec les courriels est activée pour votre compte.",
diff --git a/app/javascript/dashboard/i18n/locale/fr/integrations.json b/app/javascript/dashboard/i18n/locale/fr/integrations.json
index 8e0558aaf..8a3341fc2 100644
--- a/app/javascript/dashboard/i18n/locale/fr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fr/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Vous",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Vous",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nom",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/he/components.json b/app/javascript/dashboard/i18n/locale/he/components.json
index b57658b6b..d2855b661 100644
--- a/app/javascript/dashboard/i18n/locale/he/components.json
+++ b/app/javascript/dashboard/i18n/locale/he/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "למד עוד",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index 875fcc9de..6e5538efc 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "מזהה חשבון",
         "NOTE": "מזהה זה נדרש אם אתה בונה אינטגרציה מבוססת API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "שם החשבון",
         "PLACEHOLDER": "שם החשבון שלך",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "מספר הימים לאחר כרטיס אמור להיפתר אוטומטית אם אין פעילות",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "אנא הזן משך פתרון אוטומטי חוקי (מינימום יום אחד ומקסימום 999 ימים)"
+        "ERROR": "אנא הזן משך פתרון אוטומטי חוקי (מינימום יום אחד ומקסימום 999 ימים)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "רציפות השיחה עם הודעות אימייל מופעלת עבור החשבון שלך.",
diff --git a/app/javascript/dashboard/i18n/locale/he/integrations.json b/app/javascript/dashboard/i18n/locale/he/integrations.json
index da2c9fed5..405e453c6 100644
--- a/app/javascript/dashboard/i18n/locale/he/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/he/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "שם",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "תיאור",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/hi/components.json b/app/javascript/dashboard/i18n/locale/hi/components.json
index 99d5bce1f..dea9e6b1a 100644
--- a/app/javascript/dashboard/i18n/locale/hi/components.json
+++ b/app/javascript/dashboard/i18n/locale/hi/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
index cfda6c7da..e586fe761 100644
--- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/hi/integrations.json b/app/javascript/dashboard/i18n/locale/hi/integrations.json
index b8519af8e..01dbf5ef2 100644
--- a/app/javascript/dashboard/i18n/locale/hi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hi/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/hr/components.json b/app/javascript/dashboard/i18n/locale/hr/components.json
index 26f1c8f51..cd32e5822 100644
--- a/app/javascript/dashboard/i18n/locale/hr/components.json
+++ b/app/javascript/dashboard/i18n/locale/hr/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
index f564e587f..1ea3f35b8 100644
--- a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/hr/integrations.json b/app/javascript/dashboard/i18n/locale/hr/integrations.json
index 8dde5e71c..71642872c 100644
--- a/app/javascript/dashboard/i18n/locale/hr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hr/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Vi",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Vi",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Ime",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/hu/components.json b/app/javascript/dashboard/i18n/locale/hu/components.json
index 2b57c01e9..f16dacaf8 100644
--- a/app/javascript/dashboard/i18n/locale/hu/components.json
+++ b/app/javascript/dashboard/i18n/locale/hu/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Tudj meg többet",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index 01215cee7..702605aa3 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Fiók Azonosító",
         "NOTE": "Ez a személyazonosság akkor használható, ha API-alapú integrációt építesz"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Fióknév",
         "PLACEHOLDER": "A fiókneved",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "A napok száma, mely után a ticketek automatikusan megoldódnak, ha nincs aktivitás",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Kérjük helyes auto feloldási időszakot adj meg (minimum 1 nap, maximum 999 nap)"
+        "ERROR": "Kérjük helyes auto feloldási időszakot adj meg (minimum 1 nap, maximum 999 nap)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "A beszélgetésfolytonosság e-maillel már elérhető a fiókodban.",
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
index ef921584d..26f2edcd9 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Ön",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Ön",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Név",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Leírás",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/hy/components.json b/app/javascript/dashboard/i18n/locale/hy/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/hy/components.json
+++ b/app/javascript/dashboard/i18n/locale/hy/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
index cfda6c7da..e586fe761 100644
--- a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/hy/integrations.json b/app/javascript/dashboard/i18n/locale/hy/integrations.json
index 90c27e381..5300c9239 100644
--- a/app/javascript/dashboard/i18n/locale/hy/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hy/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/id/components.json b/app/javascript/dashboard/i18n/locale/id/components.json
index 04b44190e..4275c1226 100644
--- a/app/javascript/dashboard/i18n/locale/id/components.json
+++ b/app/javascript/dashboard/i18n/locale/id/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Pelajari lebih lanjut",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
index 0b81a8ad6..8b6cb639f 100644
--- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID Akun",
         "NOTE": "ID ini diperlukan jika Anda membangun integrasi berbasis API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nama Akun",
         "PLACEHOLDER": "Nama akun Anda",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Jumlah hari setelah tiket harus diselesaikan secara otomatis jika tidak ada aktivitas",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Harap masukkan durasi penyelesaian otomatis yang valid (minimal 1 hari dan maksimal 999 hari)"
+        "ERROR": "Harap masukkan durasi penyelesaian otomatis yang valid (minimal 1 hari dan maksimal 999 hari)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Kelanjutan percakapan dengan email diaktifkan untuk akun Anda.",
diff --git a/app/javascript/dashboard/i18n/locale/id/integrations.json b/app/javascript/dashboard/i18n/locale/id/integrations.json
index 6aa9c3e39..a7b5acf20 100644
--- a/app/javascript/dashboard/i18n/locale/id/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/id/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Anda",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Anda",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nama",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Deskripsi",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/is/components.json b/app/javascript/dashboard/i18n/locale/is/components.json
index b79a1441c..d71ecd858 100644
--- a/app/javascript/dashboard/i18n/locale/is/components.json
+++ b/app/javascript/dashboard/i18n/locale/is/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Læra meira",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/is/generalSettings.json b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
index 993ccaa37..1db062d0a 100644
--- a/app/javascript/dashboard/i18n/locale/is/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Númer aðgangs",
         "NOTE": "Þetta auðkenni er nauðsynlegt ef þú ert að byggja upp API byggða samþættingu"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Aðgangsnafn",
         "PLACEHOLDER": "Þitt aðgangsnafn",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Fjöldi daga eftir miða ætti að leysast sjálfkrafa ef engin virkni er",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Vinsamlega sláðu inn gilda lengd sjálfvirkrar úrlausnar (lágmark 1 dagur og hámark 999 dagar)"
+        "ERROR": "Vinsamlega sláðu inn gilda lengd sjálfvirkrar úrlausnar (lágmark 1 dagur og hámark 999 dagar)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Samfellu samtals með tölvupósti er virkjuð fyrir reikninginn þinn.",
diff --git a/app/javascript/dashboard/i18n/locale/is/integrations.json b/app/javascript/dashboard/i18n/locale/is/integrations.json
index 66394b0b9..c8407059c 100644
--- a/app/javascript/dashboard/i18n/locale/is/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/is/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nafn",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/it/components.json b/app/javascript/dashboard/i18n/locale/it/components.json
index 5fdad88ac..c1d5dfd8b 100644
--- a/app/javascript/dashboard/i18n/locale/it/components.json
+++ b/app/javascript/dashboard/i18n/locale/it/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Scopri di più",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index cb9be746b..7768df6a0 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID Account",
         "NOTE": "Questo ID è richiesto se si sta costruendo un'integrazione basata su API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nome account",
         "PLACEHOLDER": "Nome del tuo account",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Numero di giorni dopo che un ticket dovrebbe risolvere automaticamente se non c'è attività",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Inserisci una durata di risoluzione automatica valida (minimo 1 giorno e massimo 999 giorni)"
+        "ERROR": "Inserisci una durata di risoluzione automatica valida (minimo 1 giorno e massimo 999 giorni)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "La continuità della conversazione con le email è abilitata per il tuo account.",
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index 96530c13b..d7e5fe340 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nome",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Descrizione",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ja/components.json b/app/javascript/dashboard/i18n/locale/ja/components.json
index 516a6090d..75ea91312 100644
--- a/app/javascript/dashboard/i18n/locale/ja/components.json
+++ b/app/javascript/dashboard/i18n/locale/ja/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "詳細を見る",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 638e89405..43f1f1338 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "アカウントID",
         "NOTE": "APIベースの統合を構築する場合に必要なIDです"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "アカウント名",
         "PLACEHOLDER": "あなたのアカウント名",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "アクティビティがない場合にチケットを自動解決するまでの日数",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "有効な自動解決期間を入力してください（最小1日、最大999日）"
+        "ERROR": "有効な自動解決期間を入力してください（最小1日、最大999日）",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "あなたのアカウントでは、メールでの会話が継続可能です。",
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrations.json b/app/javascript/dashboard/i18n/locale/ja/integrations.json
index a58570213..d346e6354 100644
--- a/app/javascript/dashboard/i18n/locale/ja/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ja/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "あなた",
       "USE": "これを使用",
       "RESET": "リセット",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "あなた",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "名前",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "説明",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "製品名",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "製品名が必要です"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ka/components.json b/app/javascript/dashboard/i18n/locale/ka/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/ka/components.json
+++ b/app/javascript/dashboard/i18n/locale/ka/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
index cfda6c7da..e586fe761 100644
--- a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ka/integrations.json b/app/javascript/dashboard/i18n/locale/ka/integrations.json
index 90c27e381..5300c9239 100644
--- a/app/javascript/dashboard/i18n/locale/ka/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ka/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ko/components.json b/app/javascript/dashboard/i18n/locale/ko/components.json
index b258479e5..fa25dece7 100644
--- a/app/javascript/dashboard/i18n/locale/ko/components.json
+++ b/app/javascript/dashboard/i18n/locale/ko/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
index 8355f3bc3..025203677 100644
--- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "계정 이름",
         "PLACEHOLDER": "당신의 계정 이름",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "활동이 없는 경우 티켓이 자동으로 해결되는 일 수",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "계정에 대해 이메일을 통한 대화 연속성이 활성화되었습니다.",
diff --git a/app/javascript/dashboard/i18n/locale/ko/integrations.json b/app/javascript/dashboard/i18n/locale/ko/integrations.json
index 258a150aa..57efa4fc8 100644
--- a/app/javascript/dashboard/i18n/locale/ko/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ko/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "나",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "나",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "이름",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "내용",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/lt/components.json b/app/javascript/dashboard/i18n/locale/lt/components.json
index afa22a1f7..47b7bc6f5 100644
--- a/app/javascript/dashboard/i18n/locale/lt/components.json
+++ b/app/javascript/dashboard/i18n/locale/lt/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Sužinoti daugiau",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
index 5a3187665..de1e474cb 100644
--- a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Paskyros ID",
         "NOTE": "Šis ID reikalingas, jei kuriate API pagrįstą integraciją"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Paskyros vardas",
         "PLACEHOLDER": "Tavo paskyros vardas",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Dienų skaičius, po kurio bilietas turi būti automatiškai uždarytas, jei nėra jokios veiklos",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Įveskite tinkamą automatinio išsprendimo trukmę (mažiausiai 1 diena ir daugiausia 999 dienos)"
+        "ERROR": "Įveskite tinkamą automatinio išsprendimo trukmę (mažiausiai 1 diena ir daugiausia 999 dienos)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Jūsų paskyroje leistas pokalbių tęstinumas su el. laiškais.",
diff --git a/app/javascript/dashboard/i18n/locale/lt/integrations.json b/app/javascript/dashboard/i18n/locale/lt/integrations.json
index 4caf532bb..60bd7755a 100644
--- a/app/javascript/dashboard/i18n/locale/lt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lt/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Jūs",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Jūs",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Vardas",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Aprašymas",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/lv/components.json b/app/javascript/dashboard/i18n/locale/lv/components.json
index 7a46b278c..33f36c584 100644
--- a/app/javascript/dashboard/i18n/locale/lv/components.json
+++ b/app/javascript/dashboard/i18n/locale/lv/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Uzzināt vairāk",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
index 0edaa876f..73080339e 100644
--- a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Konta ID",
         "NOTE": "Šis ID ir nepieciešams, ja veidojat uz API balstītu integrāciju"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Konta nosaukums",
         "PLACEHOLDER": "Jūsu konta nosaukums",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Dienu skaits pēc kā biļetei ir automātiski jāatrisinās, ja nenotiek nekādas darbības",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Lūdzu, ievadiet derīgu automātiskās atrisināšanas ilgumu (vismaz 1 diena un ne vairāk kā 999 dienas)"
+        "ERROR": "Lūdzu, ievadiet derīgu automātiskās atrisināšanas ilgumu (vismaz 1 diena un ne vairāk kā 999 dienas)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Jūsu kontam ir iespējota sarunu nepārtrauktība ar e-pastiem.",
diff --git a/app/javascript/dashboard/i18n/locale/lv/integrations.json b/app/javascript/dashboard/i18n/locale/lv/integrations.json
index f162f7ab9..a9ae45efe 100644
--- a/app/javascript/dashboard/i18n/locale/lv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lv/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Jūs",
       "USE": "Izmantot šo",
       "RESET": "Atiestatīt",
-      "SELECT_ASSISTANT": "Izvēlēties Asistentu"
+      "SELECT_ASSISTANT": "Izvēlēties Asistentu",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Jūs",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nosaukums",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Apraksts",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Produkta Nosaukums",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "Nepieciešams produkta nosaukums"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ml/components.json b/app/javascript/dashboard/i18n/locale/ml/components.json
index f810c1e56..c2d1dc756 100644
--- a/app/javascript/dashboard/i18n/locale/ml/components.json
+++ b/app/javascript/dashboard/i18n/locale/ml/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index 92ca11725..5762edb82 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "അക്കൗണ്ടിന്റെ പേര്",
         "PLACEHOLDER": "നിങ്ങളുടെ അക്കൗണ്ടിന്റെ പേര്",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "പ്രവർത്തനമൊന്നുമില്ലെങ്കിൽ ടിക്കറ്റിന് ശേഷമുള്ള ദിവസങ്ങളുടെ എണ്ണം യാന്ത്രികമായി പരിഹരിക്കേണ്ടതാണ്",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "നിങ്ങളുടെ അക്കൗണ്ടിനായി ഇമെയിലുകളുമായുള്ള സംഭാഷണ തുടർച്ച പ്രവർത്തനക്ഷമമാക്കി.",
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrations.json b/app/javascript/dashboard/i18n/locale/ml/integrations.json
index b08a033b2..239803cd5 100644
--- a/app/javascript/dashboard/i18n/locale/ml/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ml/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "പേര്",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "വിവരണം",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ms/components.json b/app/javascript/dashboard/i18n/locale/ms/components.json
index 6aa91cf7f..c0ad88921 100644
--- a/app/javascript/dashboard/i18n/locale/ms/components.json
+++ b/app/javascript/dashboard/i18n/locale/ms/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
index 993cc338b..02a2dc675 100644
--- a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ms/integrations.json b/app/javascript/dashboard/i18n/locale/ms/integrations.json
index 1691bad11..6d2b90acf 100644
--- a/app/javascript/dashboard/i18n/locale/ms/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ms/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nama",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ne/components.json b/app/javascript/dashboard/i18n/locale/ne/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/ne/components.json
+++ b/app/javascript/dashboard/i18n/locale/ne/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
index cfda6c7da..e586fe761 100644
--- a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ne/integrations.json b/app/javascript/dashboard/i18n/locale/ne/integrations.json
index 2504c6dde..dd959dc09 100644
--- a/app/javascript/dashboard/i18n/locale/ne/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ne/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/nl/components.json b/app/javascript/dashboard/i18n/locale/nl/components.json
index 15f2825a7..5f52637d7 100644
--- a/app/javascript/dashboard/i18n/locale/nl/components.json
+++ b/app/javascript/dashboard/i18n/locale/nl/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index 465fc8a8c..9f353955c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "accountnaam",
         "PLACEHOLDER": "Uw accountnaam",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/nl/integrations.json b/app/javascript/dashboard/i18n/locale/nl/integrations.json
index 31bb4efc8..b80ce0712 100644
--- a/app/javascript/dashboard/i18n/locale/nl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/nl/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Jij",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Jij",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Naam",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Beschrijving",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/no/components.json b/app/javascript/dashboard/i18n/locale/no/components.json
index 2ec8d7dae..2e9776e1f 100644
--- a/app/javascript/dashboard/i18n/locale/no/components.json
+++ b/app/javascript/dashboard/i18n/locale/no/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/generalSettings.json b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
index fa164f7c5..9aefa3d13 100644
--- a/app/javascript/dashboard/i18n/locale/no/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Kontonavn",
         "PLACEHOLDER": "Ditt kontonavn",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Antall dager en sak skal løses automatisk hvis det ikke har vært aktivitet",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Samtalekontinuitet med e-post er aktivert for din konto.",
diff --git a/app/javascript/dashboard/i18n/locale/no/integrations.json b/app/javascript/dashboard/i18n/locale/no/integrations.json
index 90f2c1b8a..0d0a80e97 100644
--- a/app/javascript/dashboard/i18n/locale/no/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/no/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Du",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Du",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Navn",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Beskrivelse",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/pl/components.json b/app/javascript/dashboard/i18n/locale/pl/components.json
index 2cf9539b1..dc56b980b 100644
--- a/app/javascript/dashboard/i18n/locale/pl/components.json
+++ b/app/javascript/dashboard/i18n/locale/pl/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Dowiedz się więcej",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index d1c9bb3c2..5acdeeab5 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID konta",
         "NOTE": "To ID jest wymagane, jeśli tworzysz integrację opartą na API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nazwa konta",
         "PLACEHOLDER": "Nazwa konta",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Liczba dni po upływie których rozmowa powinna zostać automatycznie zamknięta z powodu braku aktywności",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Wprowadź poprawną wartość dla czasu automatycznego zamykania rozmów (minimum 1 dzień, maksimum 999 dni)"
+        "ERROR": "Wprowadź poprawną wartość dla czasu automatycznego zamykania rozmów (minimum 1 dzień, maksimum 999 dni)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Kontynuacja rozmów za pomocą wiadomości e-mail jest włączona dla Twojego konta.",
diff --git a/app/javascript/dashboard/i18n/locale/pl/integrations.json b/app/javascript/dashboard/i18n/locale/pl/integrations.json
index b45fb8152..7edd5db6e 100644
--- a/app/javascript/dashboard/i18n/locale/pl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pl/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Imię",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Opis",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/pt/components.json b/app/javascript/dashboard/i18n/locale/pt/components.json
index cd5b970a3..df71ba7e8 100644
--- a/app/javascript/dashboard/i18n/locale/pt/components.json
+++ b/app/javascript/dashboard/i18n/locale/pt/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Saber mais",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index 61a09f0f9..caf2dd990 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID da conta",
         "NOTE": "Este ID é necessário para integrações via API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nome da conta",
         "PLACEHOLDER": "Nome da sua conta",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Número de dias sem nenhuma atividade, após os quais o ticket se auto-resolve",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Por favor, indique um período de resolução automática válido (mínimo de 1 dia e máximo de 999 dias)"
+        "ERROR": "Por favor, indique um período de resolução automática válido (mínimo de 1 dia e máximo de 999 dias)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "A sua conta tem a opção de continuar as conversas por e-mail ativa.",
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrations.json b/app/javascript/dashboard/i18n/locale/pt/integrations.json
index 794385023..eabf9e01d 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Você",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Você",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nome:",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Descrição",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/components.json b/app/javascript/dashboard/i18n/locale/pt_BR/components.json
index bf3330bac..e877c4f24 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/components.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Saiba mais",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutos",
+    "HOURS": "Horas",
+    "DAYS": "Dias",
+    "PLACEHOLDER": "Insira a duração"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index 785612ab3..a08336e6c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID da Conta",
         "NOTE": "Este ID é necessário se você está construindo uma integração baseada em API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Resolver conversas automaticamente",
+        "NOTE": "Essa configuração permitirá que você finalize automaticamente a conversa após um determinado período. Defina abaixo a duração e personalize a mensagem para o usuário."
+      },
       "NAME": {
         "LABEL": "Nome da Conta",
         "PLACEHOLDER": "Nome da sua conta",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Depois de quantos dias um ticket deve se resolver mesmo caso não haja nenhuma atividade",
+        "LABEL": "Tempo de inatividade para resolução",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Por favor, insira um período de resolução automática válido (mínimo de 1 dia e máximo de 999 dias)"
+        "ERROR": "Por favor, insira um período de resolução automática válido (mínimo de 1 dia e máximo de 999 dias)",
+        "API": {
+          "SUCCESS": "Configurações de resolução automática atualizadas com sucesso",
+          "ERROR": "Falha ao atualizar as configurações de resolução automática"
+        },
+        "UPDATE_BUTTON": "Atualizar resolução automática",
+        "MESSAGE_LABEL": "Mensagem de resolução personalizada",
+        "MESSAGE_PLACEHOLDER": "A conversa foi marcada como resolvida pelo sistema por ter 15 dias de inatividade",
+        "MESSAGE_HELP": "Esta mensagem é enviada ao cliente quando uma conversa é resolvida automaticamente pelo sistema devido à inatividade."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "A continuidade das conversas com e-mails está ativada para sua conta.",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 3b7526529..a49bc6b7e 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -242,8 +242,8 @@
           "ERROR": "Por favor, insira um valor válido."
         },
         "BUSINESS_ACCOUNT_ID": {
-          "LABEL": "ID da Conta de Negócios",
-          "PLACEHOLDER": "Por favor, insira o ID da Conta de Negócios obtido do painel do desenvolvedor do Facebook.",
+          "LABEL": "ID da conta do WhatsApp Business",
+          "PLACEHOLDER": "Por favor, insira o ID da conta do WhatsApp Business obtido do painel do desenvolvedor do Facebook.",
           "ERROR": "Por favor, insira um valor válido."
         },
         "WEBHOOK_VERIFY_TOKEN": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index 3dad66edd..a0f15b766 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Você",
       "USE": "Use isto",
       "RESET": "Reiniciar",
-      "SELECT_ASSISTANT": "Selecione o Assistente"
+      "SELECT_ASSISTANT": "Selecione o Assistente",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Resumir esta conversa",
+          "CONTENT": "Resuma os pontos-chave discutidos entre o cliente e o agente de suporte, incluindo as preocupações do cliente, as questões e as soluções ou respostas dadas pelo agente de suporte"
+        },
+        "SUGGEST": {
+          "LABEL": "Sugerir uma resposta",
+          "CONTENT": "Analise a pergunta do cliente e elabore uma resposta que responda efetivamente às suas preocupações ou perguntas. Certifique-se de que a resposta seja clara, concisa e forneça informações úteis."
+        },
+        "RATE": {
+          "LABEL": "Avaliar esta conversa",
+          "CONTENT": "Revise a conversa para ver o quanto ela atende às necessidades do cliente. Compartilhe uma classificação de 0 a 5 com base em tom, clareza e eficácia."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Você",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nome",
-          "PLACEHOLDER": "Digite o nome do assistente"
+          "PLACEHOLDER": "Digite o nome do assistente",
+          "ERROR": "O nome é obrigatório"
         },
         "DESCRIPTION": {
           "LABEL": "Descrição",
-          "PLACEHOLDER": "Digite a descrição do assistente"
+          "PLACEHOLDER": "Digite a descrição do assistente",
+          "ERROR": "A descrição é obrigatória"
         },
         "PRODUCT_NAME": {
           "LABEL": "Nome do Produto",
-          "PLACEHOLDER": "Digite o nome do produto"
+          "PLACEHOLDER": "Digite o nome do produto",
+          "ERROR": "O nome do produto é obrigatório"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Mensagem de boas-vindas",
diff --git a/app/javascript/dashboard/i18n/locale/ro/components.json b/app/javascript/dashboard/i18n/locale/ro/components.json
index 03d4a2391..5be9ed8ab 100644
--- a/app/javascript/dashboard/i18n/locale/ro/components.json
+++ b/app/javascript/dashboard/i18n/locale/ro/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Află mai mult",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index b9badadd9..51ead4b23 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID cont",
         "NOTE": "Acest ID este necesar dacă construiți o integrare bazată pe API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nume cont",
         "PLACEHOLDER": "Numele contului tău",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Numărul de zile de pe bilet ar trebui să se rezolve automat dacă nu există activitate",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Vă rugăm să introduceți o durată validă de rezolvare automată (minim 1 zi și maximum 999 de zile)"
+        "ERROR": "Vă rugăm să introduceți o durată validă de rezolvare automată (minim 1 zi și maximum 999 de zile)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Continuitatea conversației cu e-mailurile este activată pentru contul dvs.",
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrations.json b/app/javascript/dashboard/i18n/locale/ro/integrations.json
index a15b6d704..38340d476 100644
--- a/app/javascript/dashboard/i18n/locale/ro/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ro/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Nume",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Descriere",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ru/components.json b/app/javascript/dashboard/i18n/locale/ru/components.json
index 3e3cb1aad..92890e3e0 100644
--- a/app/javascript/dashboard/i18n/locale/ru/components.json
+++ b/app/javascript/dashboard/i18n/locale/ru/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Узнайте больше",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index d8f0610d8..00c056536 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID аккаунта",
         "NOTE": "Этот ID требуется для построения интеграции, основанной на API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Имя аккаунта",
         "PLACEHOLDER": "Имя вашего аккаунта",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Количество дней после того, как тикет будет автоматически решен, если нет активности",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Введите корректную длительность для автозавершения диалога (минимум 1 день, максимум 999)"
+        "ERROR": "Введите корректную длительность для автозавершения диалога (минимум 1 день, максимум 999)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Для вашего аккаунта включено продолжение диалогов по электронной почте.",
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index f1c08812a..cf4a3286a 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Вы",
       "USE": "Использовать это",
       "RESET": "Сброс",
-      "SELECT_ASSISTANT": "Выбрать ассистента"
+      "SELECT_ASSISTANT": "Выбрать ассистента",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Вы",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Имя",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Описание",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Название продукта",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "Требуется название продукта"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/sh/components.json b/app/javascript/dashboard/i18n/locale/sh/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/sh/components.json
+++ b/app/javascript/dashboard/i18n/locale/sh/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
index cfda6c7da..e586fe761 100644
--- a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/sh/integrations.json b/app/javascript/dashboard/i18n/locale/sh/integrations.json
index 90c27e381..5300c9239 100644
--- a/app/javascript/dashboard/i18n/locale/sh/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sh/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/sk/components.json b/app/javascript/dashboard/i18n/locale/sk/components.json
index c03937260..8c705e06d 100644
--- a/app/javascript/dashboard/i18n/locale/sk/components.json
+++ b/app/javascript/dashboard/i18n/locale/sk/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
index c598577c5..338c92cb5 100644
--- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID účtu",
         "NOTE": "Toto ID je potrebné, ak vytvárate integráciu založenú na rozhraní API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Názov účtu",
         "PLACEHOLDER": "Názov vášho účtu",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Počet dní po automatickom vyriešení tiketu, ak sa nevykonáva žiadna aktivita",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Pre vaše konto je povolená kontinuita konverzácie s e-mailami.",
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrations.json b/app/javascript/dashboard/i18n/locale/sk/integrations.json
index 608cf2337..d04a971ff 100644
--- a/app/javascript/dashboard/i18n/locale/sk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sk/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Vy",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Vy",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Meno",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/sl/components.json b/app/javascript/dashboard/i18n/locale/sl/components.json
index d4707b1eb..52d6109e1 100644
--- a/app/javascript/dashboard/i18n/locale/sl/components.json
+++ b/app/javascript/dashboard/i18n/locale/sl/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sl/generalSettings.json b/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
index cfda6c7da..e586fe761 100644
--- a/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/sl/integrations.json b/app/javascript/dashboard/i18n/locale/sl/integrations.json
index c15d92b1a..d225f442e 100644
--- a/app/javascript/dashboard/i18n/locale/sl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sl/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Vi",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Vi",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/sq/components.json b/app/javascript/dashboard/i18n/locale/sq/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/sq/components.json
+++ b/app/javascript/dashboard/i18n/locale/sq/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sq/generalSettings.json b/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
index cfda6c7da..e586fe761 100644
--- a/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/sq/integrations.json b/app/javascript/dashboard/i18n/locale/sq/integrations.json
index dc4d77681..36826d0db 100644
--- a/app/javascript/dashboard/i18n/locale/sq/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sq/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Ju",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Ju",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/sr/components.json b/app/javascript/dashboard/i18n/locale/sr/components.json
index 42a86f093..f78a78497 100644
--- a/app/javascript/dashboard/i18n/locale/sr/components.json
+++ b/app/javascript/dashboard/i18n/locale/sr/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Saznajte više",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
index 4ab3baaf8..6269f50f6 100644
--- a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID naloga",
         "NOTE": "Ovaj ID je neophodan ako izgrađujete integraciju zasnovanu na API-ju"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Naziv naloga",
         "PLACEHOLDER": "Naziv vašeg naloga",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Broj dana nakon čega će se tiket automatski rešiti ako nema aktivnosti",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Molim vas unesite ispravno trajanje za automatsko rešavanje (minimalno 1 dan i maksimalno 999 dana)"
+        "ERROR": "Molim vas unesite ispravno trajanje za automatsko rešavanje (minimalno 1 dan i maksimalno 999 dana)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Nastavljanje razgovora putem e-poruka je omogućeno za vaš nalog.",
diff --git a/app/javascript/dashboard/i18n/locale/sr/integrations.json b/app/javascript/dashboard/i18n/locale/sr/integrations.json
index 4eb10c036..8af9a3b60 100644
--- a/app/javascript/dashboard/i18n/locale/sr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sr/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Ime",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Opis",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/sv/components.json b/app/javascript/dashboard/i18n/locale/sv/components.json
index fe14f7b45..bd0548eed 100644
--- a/app/javascript/dashboard/i18n/locale/sv/components.json
+++ b/app/javascript/dashboard/i18n/locale/sv/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Läs mer",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
index f0bb3a031..d618a5977 100644
--- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Kontonamn",
         "PLACEHOLDER": "Ditt kontonamn",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Antal dagar till ett ärende ska automatlösas på grund av inaktivitet",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Konversationskontinuitet med e-post är aktiverat för ditt konto.",
diff --git a/app/javascript/dashboard/i18n/locale/sv/integrations.json b/app/javascript/dashboard/i18n/locale/sv/integrations.json
index 3947f53ff..8fd861823 100644
--- a/app/javascript/dashboard/i18n/locale/sv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sv/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Du",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Du",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Namn",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Beskrivning",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ta/components.json b/app/javascript/dashboard/i18n/locale/ta/components.json
index 59a7ddec1..4adf87ecf 100644
--- a/app/javascript/dashboard/i18n/locale/ta/components.json
+++ b/app/javascript/dashboard/i18n/locale/ta/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
index 806674316..c22bae67f 100644
--- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "கணக்கின் பெயர்",
         "PLACEHOLDER": "உங்கள் கணக்கின் பெயர்",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ta/integrations.json b/app/javascript/dashboard/i18n/locale/ta/integrations.json
index db8393bdf..10643fec2 100644
--- a/app/javascript/dashboard/i18n/locale/ta/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ta/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "பெயர்",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/th/components.json b/app/javascript/dashboard/i18n/locale/th/components.json
index f20c1e3fd..93cf557c3 100644
--- a/app/javascript/dashboard/i18n/locale/th/components.json
+++ b/app/javascript/dashboard/i18n/locale/th/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "เรียนรู้เพิ่มเติม",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
index 677d5633f..a792627de 100644
--- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "หมายเลขบัญชี",
         "NOTE": "โปรดระบุหมายเลขบัญชีหากคุณต้องการเชื่อมต่อกับ API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "ชื่อบัญชี",
         "PLACEHOLDER": "ชื่อบัญชีของคุณ",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "จำนวนวันที่จะเปลี่ยนสถานะเป็นสำเร็จถ้าไม่มีความเคลื่อนไหว",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "โปรดระบุช่วงเวลาในการปิดการสนทนาอัตโนมัติให้ถูกต้อง (ขั้นต่ำ 1 วัน มากสุด 999 วัน)"
+        "ERROR": "โปรดระบุช่วงเวลาในการปิดการสนทนาอัตโนมัติให้ถูกต้อง (ขั้นต่ำ 1 วัน มากสุด 999 วัน)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "การสนทนาด้วยอีเมล์ถูกเปิดสำหรับบัญชีของคุณ",
diff --git a/app/javascript/dashboard/i18n/locale/th/integrations.json b/app/javascript/dashboard/i18n/locale/th/integrations.json
index 7cb4345ac..a1d92a1a4 100644
--- a/app/javascript/dashboard/i18n/locale/th/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/th/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "ชื่อ",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "คำอธิบาย",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/tl/components.json b/app/javascript/dashboard/i18n/locale/tl/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/tl/components.json
+++ b/app/javascript/dashboard/i18n/locale/tl/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tl/generalSettings.json b/app/javascript/dashboard/i18n/locale/tl/generalSettings.json
index cfda6c7da..e586fe761 100644
--- a/app/javascript/dashboard/i18n/locale/tl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tl/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/tl/integrations.json b/app/javascript/dashboard/i18n/locale/tl/integrations.json
index fa46b1900..f1a1d42c2 100644
--- a/app/javascript/dashboard/i18n/locale/tl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tl/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/tr/components.json b/app/javascript/dashboard/i18n/locale/tr/components.json
index a6611ad40..c047c1c85 100644
--- a/app/javascript/dashboard/i18n/locale/tr/components.json
+++ b/app/javascript/dashboard/i18n/locale/tr/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Daha Fazla",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index 1a7be9302..5de8f51f2 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Hesap Kimliği",
         "NOTE": "API tabanlı bir entegrasyon oluşturuyorsanız bu kimlik gereklidir"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Hesap Adı",
         "PLACEHOLDER": "Hesap adınız",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Etkinlik yoksa, bir biletin otomatik olarak çözülmesi gereken gün sayısı",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Lütfen geçerli bir otomatik çözüm süresi girin (minimum 1 gün ve maksimum 999 gün)"
+        "ERROR": "Lütfen geçerli bir otomatik çözüm süresi girin (minimum 1 gün ve maksimum 999 gün)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Hesabınız için e-posta ile iletişim devre dışı bırakıldı.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrations.json b/app/javascript/dashboard/i18n/locale/tr/integrations.json
index 4b34583ba..9d18d873d 100644
--- a/app/javascript/dashboard/i18n/locale/tr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tr/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Sen",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Sen",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "İsim",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Açıklama",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/uk/components.json b/app/javascript/dashboard/i18n/locale/uk/components.json
index aab333184..22395ecc6 100644
--- a/app/javascript/dashboard/i18n/locale/uk/components.json
+++ b/app/javascript/dashboard/i18n/locale/uk/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Детальніше",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index ae8bc398d..313e2b1d6 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID акаунту",
         "NOTE": "Цей ID необхідний, якщо ви створюєте інтеграцію з API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Назва облікового запису",
         "PLACEHOLDER": "Ім'я вашого облікового запису",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Кількість днів після того, як заявка повинна автоматично буде закрита, якщо немає активності",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Будь ласка, введіть допустиму тривалість автозакртиття (мінімум 1 день і максимум 999 днів)"
+        "ERROR": "Будь ласка, введіть допустиму тривалість автозакртиття (мінімум 1 день і максимум 999 днів)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Продовження діалогу з е-поштою активоване для вашого облікового запису.",
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index b357294bd..0da64bbaa 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "Ви",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "Ви",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Ім'я",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Опис",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ur/components.json b/app/javascript/dashboard/i18n/locale/ur/components.json
index 081b19bb3..02df3a635 100644
--- a/app/javascript/dashboard/i18n/locale/ur/components.json
+++ b/app/javascript/dashboard/i18n/locale/ur/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
index 16864e8a1..47ad0b1ff 100644
--- a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ur/integrations.json b/app/javascript/dashboard/i18n/locale/ur/integrations.json
index ddaa0a2bf..914adced3 100644
--- a/app/javascript/dashboard/i18n/locale/ur/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "نام",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/components.json b/app/javascript/dashboard/i18n/locale/ur_IN/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/components.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
index cfda6c7da..e586fe761 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
index 90c27e381..5300c9239 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Name",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/vi/components.json b/app/javascript/dashboard/i18n/locale/vi/components.json
index cb1ea956b..d7fdcc472 100644
--- a/app/javascript/dashboard/i18n/locale/vi/components.json
+++ b/app/javascript/dashboard/i18n/locale/vi/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Tìm hiểu thêm",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index e7ec0d341..09745536f 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Tài khoản SID",
         "NOTE": "ID này là bắt buộc nếu bạn đang xây dựng tích hợp dựa trên API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Tên tài khoản",
         "PLACEHOLDER": "Tên tài khoản của bạn",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Số ngày sau đó mà vé sẽ tự động giải quyết nếu không có hoạt động nào",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Vui lòng điền thời lượng tự động giải quyết hợp lệ (tối thiểu 1 ngày và tối đa 999 ngày)"
+        "ERROR": "Vui lòng điền thời lượng tự động giải quyết hợp lệ (tối thiểu 1 ngày và tối đa 999 ngày)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Tính liên tục của cuộc trò chuyện với email được kích hoạt cho tài khoản của bạn.",
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
index b077b8da3..8cdd6c425 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "Tên",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "Mô tả",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/components.json b/app/javascript/dashboard/i18n/locale/zh_CN/components.json
index 72dc74dfa..8be474f93 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/components.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "了解更多",
     "WATCH_VIDEO": "观看视频"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index 2e3ecafaf..c3b954dda 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "账号 ID",
         "NOTE": "如果您正在构建基于 API 的集成，那么此 ID 是必需的"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "帐户名称",
         "PLACEHOLDER": "您的帐户名称",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "非活跃工单的自动结单的天数",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "请输入一个有效的自动解决时间 (至少 1 天，最多999 天)。"
+        "ERROR": "请输入一个有效的自动解决时间 (至少 1 天，最多999 天)。",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "您的帐户启用了与电子邮件的对话连续性。",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
index a41eb6cde..1c13783c8 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "您",
       "USE": "使用此",
       "RESET": "重置",
-      "SELECT_ASSISTANT": "选择助手"
+      "SELECT_ASSISTANT": "选择助手",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "您",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "姓名：",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "描述信息",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "产品名称",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "产品名称是必需的"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/components.json b/app/javascript/dashboard/i18n/locale/zh_TW/components.json
index 8631ab450..9d4176c48 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/components.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index fcb2fc026..14516002f 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "帳戶名稱",
         "PLACEHOLDER": "您的帳戶名稱",
@@ -65,9 +69,18 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update Auto-resolve",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "您的帳戶啟用了電子信箱與對話的持續性功能。",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
index 6e7331dbf..758fbe8ce 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
@@ -334,7 +334,21 @@
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
-      "SELECT_ASSISTANT": "Select Assistant"
+      "SELECT_ASSISTANT": "Select Assistant",
+      "PROMPTS": {
+        "SUMMARIZE": {
+          "LABEL": "Summarize this conversation",
+          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+        },
+        "SUGGEST": {
+          "LABEL": "Suggest an answer",
+          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+        },
+        "RATE": {
+          "LABEL": "Rate this conversation",
+          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+        }
+      }
     },
     "PLAYGROUND": {
       "USER": "You",
@@ -392,15 +406,18 @@
         },
         "NAME": {
           "LABEL": "姓名",
-          "PLACEHOLDER": "Enter assistant name"
+          "PLACEHOLDER": "Enter assistant name",
+          "ERROR": "The name is required"
         },
         "DESCRIPTION": {
           "LABEL": "描述資訊",
-          "PLACEHOLDER": "Enter assistant description"
+          "PLACEHOLDER": "Enter assistant description",
+          "ERROR": "The description is required"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name"
+          "PLACEHOLDER": "Enter product name",
+          "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Welcome Message",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
index 7afb3cf00..5681cb0f9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
@@ -1,25 +1,34 @@
 <script>
 import { useVuelidate } from '@vuelidate/core';
-import { required, minValue, maxValue } from '@vuelidate/validators';
+import { required } from '@vuelidate/validators';
 import { mapGetters } from 'vuex';
 import { useAlert } from 'dashboard/composables';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import { useConfig } from 'dashboard/composables/useConfig';
 import { useAccount } from 'dashboard/composables/useAccount';
 import { FEATURE_FLAGS } from '../../../../featureFlags';
-import semver from 'semver';
 import { getLanguageDirection } from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
+import WithLabel from 'v3/components/Form/WithLabel.vue';
+import NextInput from 'next/input/Input.vue';
 import BaseSettingsHeader from '../components/BaseSettingsHeader.vue';
-import V4Button from 'dashboard/components-next/button/Button.vue';
-import WootConfirmDeleteModal from 'dashboard/components/widgets/modal/ConfirmDeleteModal.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
+import AccountId from './components/AccountId.vue';
+import BuildInfo from './components/BuildInfo.vue';
+import AccountDelete from './components/AccountDelete.vue';
+import AutoResolve from './components/AutoResolve.vue';
+import SectionLayout from './components/SectionLayout.vue';
 
 export default {
   components: {
     BaseSettingsHeader,
-    V4Button,
-    WootConfirmDeleteModal,
     NextButton,
+    AccountId,
+    BuildInfo,
+    AccountDelete,
+    AutoResolve,
+    SectionLayout,
+    WithLabel,
+    NextInput,
   },
   setup() {
     const { updateUISettings } = useUISettings();
@@ -37,9 +46,6 @@ export default {
       domain: '',
       supportEmail: '',
       features: {},
-      autoResolveDuration: null,
-      latestChatwootVersion: null,
-      showDeletePopup: false,
     };
   },
   validations: {
@@ -49,14 +55,9 @@ export default {
     locale: {
       required,
     },
-    autoResolveDuration: {
-      minValue: minValue(1),
-      maxValue: maxValue(999),
-    },
   },
   computed: {
     ...mapGetters({
-      globalConfig: 'globalConfig/get',
       getAccount: 'accounts/getAccount',
       uiFlags: 'accounts/getUIFlags',
       isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
@@ -68,16 +69,6 @@ export default {
         FEATURE_FLAGS.AUTO_RESOLVE_CONVERSATIONS
       );
     },
-    hasAnUpdateAvailable() {
-      if (!semver.valid(this.latestChatwootVersion)) {
-        return false;
-      }
-
-      return semver.lt(
-        this.globalConfig.appVersion,
-        this.latestChatwootVersion
-      );
-    },
     languagesSortedByCode() {
       const enabledLanguages = [...this.enabledLanguages];
       return enabledLanguages.sort((l1, l2) =>
@@ -87,51 +78,19 @@ export default {
     isUpdating() {
       return this.uiFlags.isUpdating;
     },
-
     featureInboundEmailEnabled() {
       return !!this.features?.inbound_emails;
     },
-
     featureCustomReplyDomainEnabled() {
       return (
         this.featureInboundEmailEnabled && !!this.features.custom_reply_domain
       );
     },
-
     featureCustomReplyEmailEnabled() {
       return (
         this.featureInboundEmailEnabled && !!this.features.custom_reply_email
       );
     },
-
-    getAccountId() {
-      return this.id.toString();
-    },
-    confirmPlaceHolderText() {
-      return `${this.$t(
-        'GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.CONFIRM.PLACE_HOLDER',
-        {
-          accountName: this.name,
-        }
-      )}`;
-    },
-    isMarkedForDeletion() {
-      const { custom_attributes = {} } = this.currentAccount;
-      return !!custom_attributes.marked_for_deletion_at;
-    },
-    markedForDeletionDate() {
-      const { custom_attributes = {} } = this.currentAccount;
-      if (!custom_attributes.marked_for_deletion_at) return null;
-      return new Date(custom_attributes.marked_for_deletion_at);
-    },
-    markedForDeletionReason() {
-      const { custom_attributes = {} } = this.currentAccount;
-      return custom_attributes.marked_for_deletion_reason || 'manual_deletion';
-    },
-    formattedDeletionDate() {
-      if (!this.markedForDeletionDate) return '';
-      return this.markedForDeletionDate.toLocaleString();
-    },
     currentAccount() {
       return this.getAccount(this.accountId) || {};
     },
@@ -142,16 +101,8 @@ export default {
   methods: {
     async initializeAccount() {
       try {
-        const {
-          name,
-          locale,
-          id,
-          domain,
-          support_email,
-          features,
-          auto_resolve_duration,
-          latest_chatwoot_version: latestChatwootVersion,
-        } = this.getAccount(this.accountId);
+        const { name, locale, id, domain, support_email, features } =
+          this.getAccount(this.accountId);
 
         this.$root.$i18n.locale = locale;
         this.name = name;
@@ -160,8 +111,6 @@ export default {
         this.domain = domain;
         this.supportEmail = support_email;
         this.features = features;
-        this.autoResolveDuration = auto_resolve_duration;
-        this.latestChatwootVersion = latestChatwootVersion;
       } catch (error) {
         // Ignore error
       }
@@ -179,7 +128,6 @@ export default {
           name: this.name,
           domain: this.domain,
           support_email: this.supportEmail,
-          auto_resolve_duration: this.autoResolveDuration,
         });
         this.$root.$i18n.locale = this.locale;
         this.getAccount(this.id).locale = this.locale;
@@ -196,252 +144,101 @@ export default {
         rtl_view: isRTLSupported,
       });
     },
-    // Delete Function
-    openDeletePopup() {
-      this.showDeletePopup = true;
-    },
-    closeDeletePopup() {
-      this.showDeletePopup = false;
-    },
-    async markAccountForDeletion() {
-      this.closeDeletePopup();
-      try {
-        // Use the enterprise API to toggle deletion with delete action
-        await this.$store.dispatch('accounts/toggleDeletion', {
-          action_type: 'delete',
-        });
-        // Refresh account data
-        await this.$store.dispatch('accounts/get');
-        useAlert(this.$t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.SUCCESS'));
-      } catch (error) {
-        // Handle error message
-        this.handleDeletionError(error);
-      }
-    },
-    handleDeletionError(error) {
-      const errorKey = error.response?.data?.error_key;
-      if (errorKey) {
-        useAlert(
-          this.$t(`GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.${errorKey}`)
-        );
-        return;
-      }
-      const message = error.response?.data?.message;
-      if (message) {
-        useAlert(message);
-        return;
-      }
-      useAlert(this.$t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.FAILURE'));
-    },
-    async clearDeletionMark() {
-      try {
-        // Use the enterprise API to toggle deletion with undelete action
-        await this.$store.dispatch('accounts/toggleDeletion', {
-          action_type: 'undelete',
-        });
-        // Refresh account data
-        await this.$store.dispatch('accounts/get');
-        useAlert(this.$t('GENERAL_SETTINGS.UPDATE.SUCCESS'));
-      } catch (error) {
-        useAlert(this.$t('GENERAL_SETTINGS.UPDATE.ERROR'));
-      }
-    },
   },
 };
 </script>
 
 <template>
-  <div class="flex flex-col w-full">
-    <BaseSettingsHeader :title="$t('GENERAL_SETTINGS.TITLE')">
-      <template #actions>
-        <V4Button blue :loading="isUpdating" @click="updateAccount">
-          {{ $t('GENERAL_SETTINGS.SUBMIT') }}
-        </V4Button>
-      </template>
-    </BaseSettingsHeader>
-    <div class="flex-grow flex-shrink min-w-0 mt-3 overflow-auto">
-      <form v-if="!uiFlags.isFetchingItem" @submit.prevent="updateAccount">
-        <div
-          class="flex flex-row border-b border-slate-25 dark:border-slate-800"
+  <div class="flex flex-col max-w-2xl mx-auto w-full">
+    <BaseSettingsHeader :title="$t('GENERAL_SETTINGS.TITLE')" />
+    <div class="flex-grow flex-shrink min-w-0 mt-3">
+      <SectionLayout
+        :title="$t('GENERAL_SETTINGS.FORM.GENERAL_SECTION.TITLE')"
+        :description="$t('GENERAL_SETTINGS.FORM.GENERAL_SECTION.NOTE')"
+      >
+        <form
+          v-if="!uiFlags.isFetchingItem"
+          class="grid gap-4"
+          @submit.prevent="updateAccount"
         >
-          <div
-            class="flex-grow-0 flex-shrink-0 flex-[25%] min-w-0 py-4 pr-6 pl-0"
+          <WithLabel
+            :has-error="v$.name.$error"
+            :label="$t('GENERAL_SETTINGS.FORM.NAME.LABEL')"
+            :error-message="$t('GENERAL_SETTINGS.FORM.NAME.ERROR')"
           >
-            <h4 class="text-lg font-medium text-black-900 dark:text-slate-200">
-              {{ $t('GENERAL_SETTINGS.FORM.GENERAL_SECTION.TITLE') }}
-            </h4>
-            <p>{{ $t('GENERAL_SETTINGS.FORM.GENERAL_SECTION.NOTE') }}</p>
-          </div>
-          <div class="p-4 flex-grow-0 flex-shrink-0 flex-[50%]">
-            <label :class="{ error: v$.name.$error }">
-              {{ $t('GENERAL_SETTINGS.FORM.NAME.LABEL') }}
-              <input
-                v-model="name"
-                type="text"
-                :placeholder="$t('GENERAL_SETTINGS.FORM.NAME.PLACEHOLDER')"
-                @blur="v$.name.$touch"
-              />
-              <span v-if="v$.name.$error" class="message">
-                {{ $t('GENERAL_SETTINGS.FORM.NAME.ERROR') }}
-              </span>
-            </label>
-            <label :class="{ error: v$.locale.$error }">
-              {{ $t('GENERAL_SETTINGS.FORM.LANGUAGE.LABEL') }}
-              <select v-model="locale">
-                <option
-                  v-for="lang in languagesSortedByCode"
-                  :key="lang.iso_639_1_code"
-                  :value="lang.iso_639_1_code"
-                >
-                  {{ lang.name }}
-                </option>
-              </select>
-              <span v-if="v$.locale.$error" class="message">
-                {{ $t('GENERAL_SETTINGS.FORM.LANGUAGE.ERROR') }}
-              </span>
-            </label>
-            <label v-if="featureInboundEmailEnabled">
-              {{ $t('GENERAL_SETTINGS.FORM.FEATURES.INBOUND_EMAIL_ENABLED') }}
-            </label>
-            <label v-if="featureCustomReplyDomainEnabled">
+            <NextInput
+              v-model="name"
+              type="text"
+              class="w-full"
+              :placeholder="$t('GENERAL_SETTINGS.FORM.NAME.PLACEHOLDER')"
+              @blur="v$.name.$touch"
+            />
+          </WithLabel>
+          <WithLabel
+            :has-error="v$.locale.$error"
+            :label="$t('GENERAL_SETTINGS.FORM.LANGUAGE.LABEL')"
+            :error-message="$t('GENERAL_SETTINGS.FORM.LANGUAGE.ERROR')"
+          >
+            <select v-model="locale" class="!mb-0 text-sm">
+              <option
+                v-for="lang in languagesSortedByCode"
+                :key="lang.iso_639_1_code"
+                :value="lang.iso_639_1_code"
+              >
+                {{ lang.name }}
+              </option>
+            </select>
+          </WithLabel>
+          <WithLabel
+            v-if="featureCustomReplyDomainEnabled"
+            :label="$t('GENERAL_SETTINGS.FORM.DOMAIN.LABEL')"
+          >
+            <NextInput
+              v-model="domain"
+              type="text"
+              class="w-full"
+              :placeholder="$t('GENERAL_SETTINGS.FORM.DOMAIN.PLACEHOLDER')"
+            />
+            <template #help>
               {{
+                featureInboundEmailEnabled &&
+                $t('GENERAL_SETTINGS.FORM.FEATURES.INBOUND_EMAIL_ENABLED')
+              }}
+
+              {{
+                featureCustomReplyDomainEnabled &&
                 $t('GENERAL_SETTINGS.FORM.FEATURES.CUSTOM_EMAIL_DOMAIN_ENABLED')
               }}
-            </label>
-            <label v-if="featureCustomReplyDomainEnabled">
-              {{ $t('GENERAL_SETTINGS.FORM.DOMAIN.LABEL') }}
-              <input
-                v-model="domain"
-                type="text"
-                :placeholder="$t('GENERAL_SETTINGS.FORM.DOMAIN.PLACEHOLDER')"
-              />
-            </label>
-            <label v-if="featureCustomReplyEmailEnabled">
-              {{ $t('GENERAL_SETTINGS.FORM.SUPPORT_EMAIL.LABEL') }}
-              <input
-                v-model="supportEmail"
-                type="text"
-                :placeholder="
-                  $t('GENERAL_SETTINGS.FORM.SUPPORT_EMAIL.PLACEHOLDER')
-                "
-              />
-            </label>
-            <label
-              v-if="showAutoResolutionConfig"
-              :class="{ error: v$.autoResolveDuration.$error }"
-            >
-              {{ $t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.LABEL') }}
-              <input
-                v-model="autoResolveDuration"
-                type="number"
-                :placeholder="
-                  $t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.PLACEHOLDER')
-                "
-                @blur="v$.autoResolveDuration.$touch"
-              />
-              <span v-if="v$.autoResolveDuration.$error" class="message">
-                {{ $t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.ERROR') }}
-              </span>
-            </label>
+            </template>
+          </WithLabel>
+          <WithLabel
+            v-if="featureCustomReplyEmailEnabled"
+            :label="$t('GENERAL_SETTINGS.FORM.SUPPORT_EMAIL.LABEL')"
+          >
+            <NextInput
+              v-model="supportEmail"
+              type="text"
+              class="w-full"
+              :placeholder="
+                $t('GENERAL_SETTINGS.FORM.SUPPORT_EMAIL.PLACEHOLDER')
+              "
+            />
+          </WithLabel>
+          <div>
+            <NextButton blue :is-loading="isUpdating" type="submit">
+              {{ $t('GENERAL_SETTINGS.SUBMIT') }}
+            </NextButton>
           </div>
-        </div>
-      </form>
+        </form>
+      </SectionLayout>
 
       <woot-loading-state v-if="uiFlags.isFetchingItem" />
     </div>
-
-    <div class="flex flex-row">
-      <div class="flex-grow-0 flex-shrink-0 flex-[25%] min-w-0 py-4 pr-6 pl-0">
-        <h4 class="text-lg font-medium text-black-900 dark:text-slate-200">
-          {{ $t('GENERAL_SETTINGS.FORM.ACCOUNT_ID.TITLE') }}
-        </h4>
-        <p>
-          {{ $t('GENERAL_SETTINGS.FORM.ACCOUNT_ID.NOTE') }}
-        </p>
-      </div>
-      <div class="p-4 flex-grow-0 flex-shrink-0 flex-[50%]">
-        <woot-code :script="getAccountId" />
-      </div>
-    </div>
+    <AutoResolve v-if="showAutoResolutionConfig" />
+    <AccountId />
     <div v-if="!uiFlags.isFetchingItem && isOnChatwootCloud">
-      <div
-        class="flex flex-row pt-4 mt-2 border-t border-slate-25 dark:border-slate-800 text-black-900 dark:text-slate-300"
-      >
-        <div
-          class="flex-grow-0 flex-shrink-0 flex-[25%] min-w-0 py-4 pr-6 pl-0"
-        >
-          <h4 class="text-lg font-medium text-black-900 dark:text-slate-200">
-            {{ $t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.TITLE') }}
-          </h4>
-          <p>
-            {{ $t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.NOTE') }}
-          </p>
-        </div>
-        <div class="p-4 flex-grow-0 flex-shrink-0 flex-[50%]">
-          <div v-if="isMarkedForDeletion">
-            <div
-              class="p-4 flex-grow-0 flex-shrink-0 flex-[50%] bg-red-50 dark:bg-red-900 rounded"
-            >
-              <p class="mb-4">
-                {{
-                  $t(
-                    `GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.SCHEDULED_DELETION.MESSAGE_${markedForDeletionReason === 'manual_deletion' ? 'MANUAL' : 'INACTIVITY'}`,
-                    {
-                      deletionDate: formattedDeletionDate,
-                    }
-                  )
-                }}
-              </p>
-              <NextButton
-                :label="
-                  $t(
-                    'GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.SCHEDULED_DELETION.CLEAR_BUTTON'
-                  )
-                "
-                color="ruby"
-                :is-loading="uiFlags.isUpdating"
-                @click="clearDeletionMark"
-              />
-            </div>
-          </div>
-          <div v-if="!isMarkedForDeletion">
-            <NextButton
-              :label="$t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.BUTTON_TEXT')"
-              color="ruby"
-              @click="openDeletePopup()"
-            />
-          </div>
-        </div>
-      </div>
-      <WootConfirmDeleteModal
-        v-if="showDeletePopup"
-        v-model:show="showDeletePopup"
-        :title="$t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.CONFIRM.TITLE')"
-        :message="$t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.CONFIRM.MESSAGE')"
-        :confirm-text="
-          $t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.CONFIRM.BUTTON_TEXT')
-        "
-        :reject-text="
-          $t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.CONFIRM.DISMISS')
-        "
-        :confirm-value="name"
-        :confirm-place-holder-text="confirmPlaceHolderText"
-        @on-confirm="markAccountForDeletion"
-        @on-close="closeDeletePopup"
-      />
-    </div>
-    <div class="p-4 text-sm text-center">
-      <div>{{ `v${globalConfig.appVersion}` }}</div>
-      <div v-if="hasAnUpdateAvailable && globalConfig.displayManifest">
-        {{
-          $t('GENERAL_SETTINGS.UPDATE_CHATWOOT', {
-            latestChatwootVersion: latestChatwootVersion,
-          })
-        }}
-      </div>
-      <div class="build-id">
-        <div>{{ `Build ${globalConfig.gitSha}` }}</div>
-      </div>
+      <AccountDelete />
     </div>
+    <BuildInfo />
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/components/AccountDelete.vue b/app/javascript/dashboard/routes/dashboard/settings/account/components/AccountDelete.vue
new file mode 100644
index 000000000..66c969a0a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/components/AccountDelete.vue
@@ -0,0 +1,149 @@
+<script setup>
+import { computed } from 'vue';
+import { useStore, useMapGetter } from 'dashboard/composables/store';
+import { useAccount } from 'dashboard/composables/useAccount';
+import { useI18n } from 'vue-i18n';
+import { useToggle } from '@vueuse/core';
+import { useAlert } from 'dashboard/composables';
+import WootConfirmDeleteModal from 'dashboard/components/widgets/modal/ConfirmDeleteModal.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+import SectionLayout from './SectionLayout.vue';
+
+const { t } = useI18n();
+const store = useStore();
+const uiFlags = useMapGetter('accounts/getUIFlags');
+const { currentAccount } = useAccount();
+const [showDeletePopup, toggleDeletePopup] = useToggle();
+
+const confirmPlaceHolderText = computed(() => {
+  return `${t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.CONFIRM.PLACE_HOLDER', {
+    accountName: currentAccount.value.name,
+  })}`;
+});
+
+const isMarkedForDeletion = computed(() => {
+  const { custom_attributes = {} } = currentAccount.value;
+  return !!custom_attributes.marked_for_deletion_at;
+});
+
+const markedForDeletionDate = computed(() => {
+  const { custom_attributes = {} } = currentAccount.value;
+  if (!custom_attributes.marked_for_deletion_at) return null;
+  return new Date(custom_attributes.marked_for_deletion_at);
+});
+
+const markedForDeletionReason = computed(() => {
+  const { custom_attributes = {} } = currentAccount.value;
+  return custom_attributes.marked_for_deletion_reason || 'manual_deletion';
+});
+
+const formattedDeletionDate = computed(() => {
+  if (!markedForDeletionDate.value) return '';
+  return markedForDeletionDate.value.toLocaleString();
+});
+
+const markedForDeletionMessage = computed(() => {
+  const params = { deletionDate: formattedDeletionDate.value };
+
+  if (markedForDeletionReason.value === 'manual_deletion') {
+    return t(
+      `GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.SCHEDULED_DELETION.MESSAGE_MANUAL`,
+      params
+    );
+  }
+
+  return t(
+    `GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.SCHEDULED_DELETION.MESSAGE_INACTIVITY`,
+    params
+  );
+});
+
+function handleDeletionError(error) {
+  const message = error.response?.data?.message;
+  if (message) {
+    useAlert(message);
+    return;
+  }
+  useAlert(t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.FAILURE'));
+}
+
+async function markAccountForDeletion() {
+  toggleDeletePopup(false);
+  try {
+    // Use the enterprise API to toggle deletion with delete action
+    await store.dispatch('accounts/toggleDeletion', {
+      action_type: 'delete',
+    });
+    // Refresh account data
+    await store.dispatch('accounts/get');
+    useAlert(t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.SUCCESS'));
+  } catch (error) {
+    // Handle error message
+    handleDeletionError(error);
+  }
+}
+
+async function clearDeletionMark() {
+  try {
+    // Use the enterprise API to toggle deletion with undelete action
+    await store.dispatch('accounts/toggleDeletion', {
+      action_type: 'undelete',
+    });
+
+    // Refresh account data
+    await store.dispatch('accounts/get');
+    useAlert(t('GENERAL_SETTINGS.UPDATE.SUCCESS'));
+  } catch (error) {
+    useAlert(t('GENERAL_SETTINGS.UPDATE.ERROR'));
+  }
+}
+</script>
+
+<template>
+  <SectionLayout
+    :title="t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.TITLE')"
+    :description="t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.NOTE')"
+    with-border
+  >
+    <div v-if="isMarkedForDeletion">
+      <div
+        class="p-4 flex-grow-0 flex-shrink-0 flex-[50%] bg-red-50 dark:bg-red-900 rounded"
+      >
+        <p class="mb-4">
+          {{ markedForDeletionMessage }}
+        </p>
+        <NextButton
+          :label="
+            $t(
+              'GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.SCHEDULED_DELETION.CLEAR_BUTTON'
+            )
+          "
+          color="ruby"
+          :is-loading="uiFlags.isUpdating"
+          @click="clearDeletionMark"
+        />
+      </div>
+    </div>
+    <div v-if="!isMarkedForDeletion">
+      <NextButton
+        :label="$t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.BUTTON_TEXT')"
+        color="ruby"
+        @click="toggleDeletePopup(true)"
+      />
+    </div>
+  </SectionLayout>
+  <WootConfirmDeleteModal
+    v-if="showDeletePopup"
+    v-model:show="showDeletePopup"
+    :title="$t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.CONFIRM.TITLE')"
+    :message="$t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.CONFIRM.MESSAGE')"
+    :confirm-text="
+      $t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.CONFIRM.BUTTON_TEXT')
+    "
+    :reject-text="$t('GENERAL_SETTINGS.ACCOUNT_DELETE_SECTION.CONFIRM.DISMISS')"
+    :confirm-value="currentAccount.name"
+    :confirm-place-holder-text="confirmPlaceHolderText"
+    @on-confirm="markAccountForDeletion"
+    @on-close="toggleDeletePopup(false)"
+  />
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/components/AccountId.vue b/app/javascript/dashboard/routes/dashboard/settings/account/components/AccountId.vue
new file mode 100644
index 000000000..f02efcdc2
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/components/AccountId.vue
@@ -0,0 +1,22 @@
+<script setup>
+import { computed } from 'vue';
+import { useAccount } from 'dashboard/composables/useAccount';
+import { useI18n } from 'vue-i18n';
+
+import SectionLayout from './SectionLayout.vue';
+
+const { t } = useI18n();
+const { currentAccount } = useAccount();
+
+const getAccountId = computed(() => currentAccount.value.id.toString());
+</script>
+
+<template>
+  <SectionLayout
+    :title="t('GENERAL_SETTINGS.FORM.ACCOUNT_ID.TITLE')"
+    :description="t('GENERAL_SETTINGS.FORM.ACCOUNT_ID.NOTE')"
+    with-border
+  >
+    <woot-code :script="getAccountId" />
+  </SectionLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue b/app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue
new file mode 100644
index 000000000..9816fc7e0
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue
@@ -0,0 +1,141 @@
+<script setup>
+import { ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useAccount } from 'dashboard/composables/useAccount';
+import { useAlert } from 'dashboard/composables';
+import SectionLayout from './SectionLayout.vue';
+import WithLabel from 'v3/components/Form/WithLabel.vue';
+import DurationInput from 'next/input/DurationInput.vue';
+import TextArea from 'next/textarea/TextArea.vue';
+import Switch from 'next/switch/Switch.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+const { t } = useI18n();
+const duration = ref(0);
+const message = ref('');
+const ignoreWaiting = ref(false);
+const isEnabled = ref(false);
+
+const { currentAccount, updateAccount } = useAccount();
+
+watch(
+  currentAccount,
+  () => {
+    const {
+      auto_resolve_after,
+      auto_resolve_message,
+      auto_resolve_ignore_waiting,
+    } = currentAccount.value?.settings || {};
+
+    duration.value = auto_resolve_after;
+    message.value = auto_resolve_message;
+    ignoreWaiting.value = auto_resolve_ignore_waiting;
+
+    if (duration.value) {
+      isEnabled.value = true;
+    }
+  },
+  { deep: true, immediate: true }
+);
+
+const updateAccountSettings = async settings => {
+  try {
+    await updateAccount(settings);
+    useAlert(t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.API.SUCCESS'));
+  } catch (error) {
+    useAlert(t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.API.ERROR'));
+  }
+};
+
+const handleSubmit = async () => {
+  if (duration.value < 10) {
+    useAlert(t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.ERROR'));
+    return Promise.resolve();
+  }
+
+  return updateAccountSettings({
+    auto_resolve_after: duration.value,
+    auto_resolve_message: message.value,
+    auto_resolve_ignore_waiting: ignoreWaiting.value,
+  });
+};
+
+const handleDisable = async () => {
+  duration.value = null;
+  message.value = '';
+
+  return updateAccountSettings({
+    auto_resolve_after: null,
+    auto_resolve_message: '',
+    auto_resolve_ignore_waiting: false,
+  });
+};
+
+const toggleAutoResolve = async () => {
+  if (!isEnabled.value) handleDisable();
+};
+</script>
+
+<template>
+  <SectionLayout
+    :title="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.TITLE')"
+    :description="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.NOTE')"
+    with-border
+  >
+    <template #headerActions>
+      <div class="flex justify-end">
+        <Switch v-model="isEnabled" @change="toggleAutoResolve" />
+      </div>
+    </template>
+
+    <form class="grid gap-5" @submit.prevent="handleSubmit">
+      <WithLabel
+        :label="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.LABEL')"
+        :help-message="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.HELP')"
+      >
+        <div class="gap-2 w-full grid grid-cols-[3fr_1fr]">
+          <!-- allow 10 mins to 999 days -->
+          <DurationInput
+            v-model="duration"
+            min="0"
+            max="1439856"
+            class="w-full"
+          />
+        </div>
+      </WithLabel>
+      <WithLabel
+        :label="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.MESSAGE_LABEL')"
+        :help-message="
+          t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.MESSAGE_HELP')
+        "
+      >
+        <TextArea
+          v-model="message"
+          class="w-full"
+          :placeholder="
+            t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.MESSAGE_PLACEHOLDER')
+          "
+        />
+      </WithLabel>
+      <WithLabel
+        :label="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_IGNORE_WAITING.LABEL')"
+      >
+        <template #rightOfLabel>
+          <Switch v-model="ignoreWaiting" />
+        </template>
+        <p class="text-sm ml-px text-n-slate-10 max-w-lg">
+          {{ t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_IGNORE_WAITING.HELP') }}
+        </p>
+      </WithLabel>
+      <div class="flex gap-2">
+        <NextButton
+          blue
+          type="submit"
+          :label="
+            t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.UPDATE_BUTTON')
+          "
+        />
+      </div>
+    </form>
+  </SectionLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/components/BuildInfo.vue b/app/javascript/dashboard/routes/dashboard/settings/account/components/BuildInfo.vue
new file mode 100644
index 000000000..05f206136
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/components/BuildInfo.vue
@@ -0,0 +1,56 @@
+<script setup>
+import { computed } from 'vue';
+import { useAccount } from 'dashboard/composables/useAccount';
+import { useMapGetter } from 'dashboard/composables/store';
+import { copyTextToClipboard } from 'shared/helpers/clipboard';
+import { useI18n } from 'vue-i18n';
+
+import semver from 'semver';
+
+const { t } = useI18n();
+const { currentAccount } = useAccount();
+
+const latestChatwootVersion = computed(() => {
+  return currentAccount.value.latest_chatwoot_version;
+});
+
+const globalConfig = useMapGetter('globalConfig/get');
+
+const hasAnUpdateAvailable = computed(() => {
+  if (!semver.valid(latestChatwootVersion.value)) {
+    return false;
+  }
+
+  return semver.lt(globalConfig.value.appVersion, latestChatwootVersion.value);
+});
+
+const gitSha = computed(() => {
+  return globalConfig.value.gitSha.substring(0, 7);
+});
+
+const copyGitSha = () => {
+  copyTextToClipboard(globalConfig.value.gitSha);
+};
+</script>
+
+<template>
+  <div class="p-4 text-sm text-center">
+    <div v-if="hasAnUpdateAvailable && globalConfig.displayManifest">
+      {{
+        t('GENERAL_SETTINGS.UPDATE_CHATWOOT', {
+          latestChatwootVersion: latestChatwootVersion,
+        })
+      }}
+    </div>
+    <div class="divide-x divide-n-slate-9">
+      <span class="px-2">{{ `v${globalConfig.appVersion}` }}</span>
+      <span
+        v-tooltip="t('COMPONENTS.CODE.BUTTON_TEXT')"
+        class="px-2 build-id cursor-pointer"
+        @click="copyGitSha"
+      >
+        {{ `Build ${gitSha}` }}
+      </span>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/components/SectionLayout.vue b/app/javascript/dashboard/routes/dashboard/settings/account/components/SectionLayout.vue
new file mode 100644
index 000000000..5b203cd26
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/components/SectionLayout.vue
@@ -0,0 +1,40 @@
+<script setup>
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  description: {
+    type: String,
+    required: true,
+  },
+  withBorder: {
+    type: Boolean,
+    default: false,
+  },
+});
+</script>
+
+<template>
+  <section
+    class="grid grid-cols-1 py-8 gap-8"
+    :class="{ 'border-t border-n-weak': withBorder }"
+  >
+    <header class="grid grid-cols-4">
+      <div class="col-span-3">
+        <h4 class="text-lg font-medium text-n-slate-12">
+          <slot name="title">{{ title }}</slot>
+        </h4>
+        <p class="text-n-slate-11 text-sm mt-2">
+          <slot name="description">{{ description }}</slot>
+        </p>
+      </div>
+      <div class="col-span-1">
+        <slot name="headerActions" />
+      </div>
+    </header>
+    <div class="text-n-slate-12">
+      <slot />
+    </div>
+  </section>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
index f3c724bb2..430658329 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
@@ -16,6 +16,8 @@ const SUPPORTED_WEBHOOK_EVENTS = [
   'webwidget_triggered',
   'contact_created',
   'contact_updated',
+  'conversation_typing_on',
+  'conversation_typing_off',
 ];
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/accounts.js b/app/javascript/dashboard/store/modules/accounts.js
index 561695d28..662853720 100644
--- a/app/javascript/dashboard/store/modules/accounts.js
+++ b/app/javascript/dashboard/store/modules/accounts.js
@@ -66,7 +66,8 @@ export const actions = {
   update: async ({ commit }, updateObj) => {
     commit(types.default.SET_ACCOUNT_UI_FLAG, { isUpdating: true });
     try {
-      await AccountAPI.update('', updateObj);
+      const response = await AccountAPI.update('', updateObj);
+      commit(types.default.EDIT_ACCOUNT, response.data);
       commit(types.default.SET_ACCOUNT_UI_FLAG, { isUpdating: false });
     } catch (error) {
       commit(types.default.SET_ACCOUNT_UI_FLAG, { isUpdating: false });
diff --git a/app/javascript/dashboard/store/modules/specs/account/actions.spec.js b/app/javascript/dashboard/store/modules/specs/account/actions.spec.js
index 57b4a2f80..9ffdf0ad4 100644
--- a/app/javascript/dashboard/store/modules/specs/account/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/account/actions.spec.js
@@ -39,10 +39,13 @@ describe('#actions', () => {
 
   describe('#update', () => {
     it('sends correct actions if API is success', async () => {
-      axios.patch.mockResolvedValue();
+      axios.patch.mockResolvedValue({
+        data: { id: 1, name: 'John' },
+      });
       await actions.update({ commit, getters }, accountData);
       expect(commit.mock.calls).toEqual([
         [types.default.SET_ACCOUNT_UI_FLAG, { isUpdating: true }],
+        [types.default.EDIT_ACCOUNT, { id: 1, name: 'John' }],
         [types.default.SET_ACCOUNT_UI_FLAG, { isUpdating: false }],
       ]);
     });
diff --git a/app/javascript/entrypoints/sdk.js b/app/javascript/entrypoints/sdk.js
index 0aac9104e..a2cf297f1 100755
--- a/app/javascript/entrypoints/sdk.js
+++ b/app/javascript/entrypoints/sdk.js
@@ -23,12 +23,18 @@ const runSDK = ({ baseUrl, websiteToken }) => {
     return;
   }
 
-  if (window.Turbo) {
-    // if this is a Rails Turbo app
-    document.addEventListener('turbo:before-render', event =>
-      restoreWidgetInDOM(event.detail.newBody)
-    );
-  }
+  // if this is a Rails Turbo app
+  document.addEventListener('turbo:before-render', event => {
+    // when morphing the page, this typically happens on reload like events
+    // say you update a "Customer" on a form and it reloads the page
+    // We have already added data-turbo-permananent to true. This
+    // will ensure that the widget it preserved
+    // Read more about morphing here: https://turbo.hotwired.dev/handbook/page_refreshes#morphing
+    // and peristing elements here: https://turbo.hotwired.dev/handbook/building#persisting-elements-across-page-loads
+    if (event.detail.renderMethod === 'morph') return;
+
+    restoreWidgetInDOM(event.detail.newBody);
+  });
 
   if (window.Turbolinks) {
     document.addEventListener('turbolinks:before-render', event => {
diff --git a/app/javascript/portal/components/TableOfContents.vue b/app/javascript/portal/components/TableOfContents.vue
index 16da81f71..ec7ccd895 100644
--- a/app/javascript/portal/components/TableOfContents.vue
+++ b/app/javascript/portal/components/TableOfContents.vue
@@ -94,8 +94,8 @@ export default {
 </script>
 
 <template>
-  <div class="hidden lg:block flex-1 py-6 scroll-mt-24 pl-4">
-    <div v-if="rows.length > 0" class="sticky top-24 py-2 overflow-auto">
+  <div class="hidden lg:block flex-1 py-6 scroll-mt-24 pl-4 sticky top-24">
+    <div v-if="rows.length > 0" class="py-2 overflow-auto">
       <nav class="max-w-2xl">
         <ol
           role="list"
diff --git a/app/javascript/sdk/DOMHelpers.js b/app/javascript/sdk/DOMHelpers.js
index f8ba55337..ce12836d7 100644
--- a/app/javascript/sdk/DOMHelpers.js
+++ b/app/javascript/sdk/DOMHelpers.js
@@ -5,6 +5,7 @@ export const loadCSS = () => {
   const css = document.createElement('style');
   css.innerHTML = `${SDK_CSS}`;
   css.id = 'cw-widget-styles';
+  css.dataset.turboPermanent = true;
   document.body.appendChild(css);
 };
 
diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index 21b2fb8d4..469fbe8de 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -82,6 +82,7 @@ export const IFrameHelper = {
 
     addClasses(widgetHolder, holderClassName);
     widgetHolder.id = 'cw-widget-holder';
+    widgetHolder.dataset.turboPermanent = true;
     widgetHolder.appendChild(iframe);
     body.appendChild(widgetHolder);
     IFrameHelper.initPostMessageCommunication();
diff --git a/app/javascript/sdk/bubbleHelpers.js b/app/javascript/sdk/bubbleHelpers.js
index 05c67f478..c53323e27 100644
--- a/app/javascript/sdk/bubbleHelpers.js
+++ b/app/javascript/sdk/bubbleHelpers.js
@@ -67,6 +67,7 @@ export const createBubbleHolder = hideMessageBubble => {
   }
   addClasses(bubbleHolder, 'woot--bubble-holder');
   bubbleHolder.id = 'cw-bubble-holder';
+  bubbleHolder.dataset.turboPermanent = true;
   body.appendChild(bubbleHolder);
 };
 
diff --git a/app/javascript/v3/components/Form/WithLabel.vue b/app/javascript/v3/components/Form/WithLabel.vue
index 9008479d9..08e0b026b 100644
--- a/app/javascript/v3/components/Form/WithLabel.vue
+++ b/app/javascript/v3/components/Form/WithLabel.vue
@@ -1,28 +1,12 @@
-<script>
-export default {
-  props: {
-    label: {
-      type: String,
-      default: '',
-    },
-    name: {
-      type: String,
-      required: true,
-    },
-    icon: {
-      type: String,
-      default: '',
-    },
-    hasError: {
-      type: Boolean,
-      default: false,
-    },
-    errorMessage: {
-      type: String,
-      default: '',
-    },
-  },
-};
+<script setup>
+defineProps({
+  label: { type: String, default: '' },
+  name: { type: String, required: true },
+  icon: { type: String, default: '' },
+  hasError: { type: Boolean, default: false },
+  helpMessage: { type: String, default: '' },
+  errorMessage: { type: String, default: '' },
+});
 </script>
 
 <template>
@@ -30,8 +14,8 @@ export default {
     <label
       v-if="label"
       :for="name"
-      class="flex justify-between text-sm font-medium leading-6 text-slate-900 dark:text-white"
-      :class="{ 'text-red-500': hasError }"
+      class="flex justify-between text-sm font-medium leading-6 text-n-slate-12"
+      :class="{ 'text-n-ruby-12': hasError }"
     >
       <slot name="label">
         {{ label }}
@@ -44,16 +28,24 @@ export default {
           v-if="icon"
           size="16"
           :icon="icon"
-          class="absolute left-2 transform text-slate-400 dark:text-slate-600 w-5 h-5"
+          class="absolute left-2 transform text-n-slate-9 w-5 h-5"
         />
         <slot />
       </div>
-      <span
+      <div
         v-if="errorMessage && hasError"
-        class="text-xs text-n-ruby-9 dark:text-n-ruby-9 leading-2"
+        class="text-sm mt-1.5 ml-px text-n-ruby-9 leading-tight"
       >
         {{ errorMessage }}
-      </span>
+      </div>
+      <div
+        v-else-if="helpMessage || $slots.help"
+        class="text-sm mt-1.5 ml-px text-n-slate-10 leading-tight"
+      >
+        <slot name="help">
+          {{ helpMessage }}
+        </slot>
+      </div>
     </div>
   </div>
 </template>
diff --git a/app/jobs/account/conversations_resolution_scheduler_job.rb b/app/jobs/account/conversations_resolution_scheduler_job.rb
index ab9fc4029..6e1c9766f 100644
--- a/app/jobs/account/conversations_resolution_scheduler_job.rb
+++ b/app/jobs/account/conversations_resolution_scheduler_job.rb
@@ -2,7 +2,7 @@ class Account::ConversationsResolutionSchedulerJob < ApplicationJob
   queue_as :scheduled_jobs
 
   def perform
-    Account.where.not(auto_resolve_duration: nil).all.find_each(batch_size: 100) do |account|
+    Account.with_auto_resolve.find_each(batch_size: 100) do |account|
       Conversations::ResolutionJob.perform_later(account: account)
     end
   end
diff --git a/app/jobs/conversations/resolution_job.rb b/app/jobs/conversations/resolution_job.rb
index 164a82265..37a9d834c 100644
--- a/app/jobs/conversations/resolution_job.rb
+++ b/app/jobs/conversations/resolution_job.rb
@@ -3,7 +3,22 @@ class Conversations::ResolutionJob < ApplicationJob
 
   def perform(account:)
     # limiting the number of conversations to be resolved to avoid any performance issues
-    resolvable_conversations = account.conversations.resolvable(account.auto_resolve_duration).limit(Limits::BULK_ACTIONS_LIMIT)
-    resolvable_conversations.each(&:toggle_status)
+    resolvable_conversations = conversation_scope(account).limit(Limits::BULK_ACTIONS_LIMIT)
+    resolvable_conversations.each do |conversation|
+      # send message from bot that conversation has been resolved
+      # do this is account.auto_resolve_message is set
+      ::MessageTemplates::Template::AutoResolve.new(conversation: conversation).perform if account.auto_resolve_message.present?
+      conversation.toggle_status
+    end
+  end
+
+  private
+
+  def conversation_scope(account)
+    if account.auto_resolve_ignore_waiting
+      account.conversations.resolvable_not_waiting(account.auto_resolve_after)
+    else
+      account.conversations.resolvable_all(account.auto_resolve_after)
+    end
   end
 end
diff --git a/app/jobs/internal/process_stale_contacts_job.rb b/app/jobs/internal/process_stale_contacts_job.rb
index a40e73a01..28143cd6a 100644
--- a/app/jobs/internal/process_stale_contacts_job.rb
+++ b/app/jobs/internal/process_stale_contacts_job.rb
@@ -1,20 +1,39 @@
 # housekeeping
-# remove stale contacts for all accounts
+# remove stale contacts for subset of accounts each day
 # - have no identification (email, phone_number, and identifier are NULL)
 # - have no conversations
 # - are older than 30 days
 
 class Internal::ProcessStaleContactsJob < ApplicationJob
-  queue_as :scheduled_jobs
+  queue_as :housekeeping
 
+  # Number of day-based groups to split accounts into
+  DISTRIBUTION_GROUPS = 5
+  # Max accounts to process in one batch
+  MAX_ACCOUNTS_PER_BATCH = 20
+
+  # Process only a subset of accounts per day to avoid flooding the queue
   def perform
     return unless ChatwootApp.chatwoot_cloud?
 
-    Account.find_in_batches(batch_size: 100) do |accounts|
-      accounts.each do |account|
-        Rails.logger.info "Enqueuing RemoveStaleContactsJob for account #{account.id}"
-        Internal::RemoveStaleContactsJob.perform_later(account)
-      end
+    # Use the day of the month to determine which accounts to process
+    day_of_month = Date.current.day
+    remainder = day_of_month % DISTRIBUTION_GROUPS
+
+    # Count total accounts for logging
+    total_accounts = Account.count
+    log_message = "ProcessStaleContactsJob: Processing accounts with ID % #{DISTRIBUTION_GROUPS} = "
+    log_message += "#{remainder} (out of #{total_accounts} total accounts)"
+    Rails.logger.info log_message
+
+    # Process only accounts where ID % 5 = remainder for today
+    # This ensures each account is processed approximately once every 5 days
+    Account.where("id % #{DISTRIBUTION_GROUPS} = ?", remainder).find_each(batch_size: MAX_ACCOUNTS_PER_BATCH) do |account|
+      Rails.logger.info "Enqueuing RemoveStaleContactsJob for account #{account.id}"
+
+      # Add a small delay between jobs to further reduce queue pressure
+      delay = rand(1..10).minutes
+      Internal::RemoveStaleContactsJob.set(wait: delay).perform_later(account)
     end
   end
 end
diff --git a/app/jobs/internal/remove_stale_contacts_job.rb b/app/jobs/internal/remove_stale_contacts_job.rb
index 3c33fd245..4091af44a 100644
--- a/app/jobs/internal/remove_stale_contacts_job.rb
+++ b/app/jobs/internal/remove_stale_contacts_job.rb
@@ -5,7 +5,7 @@
 # - are older than 30 days
 
 class Internal::RemoveStaleContactsJob < ApplicationJob
-  queue_as :low
+  queue_as :housekeeping
 
   def perform(account, batch_size = 1000)
     Internal::RemoveStaleContactsService.new(account: account).perform(batch_size)
diff --git a/app/listeners/webhook_listener.rb b/app/listeners/webhook_listener.rb
index 3fdd823b8..82a9fc711 100644
--- a/app/listeners/webhook_listener.rb
+++ b/app/listeners/webhook_listener.rb
@@ -83,8 +83,30 @@ class WebhookListener < BaseListener
     deliver_account_webhooks(payload, account)
   end
 
+  def conversation_typing_on(event)
+    handle_typing_status(__method__.to_s, event)
+  end
+
+  def conversation_typing_off(event)
+    handle_typing_status(__method__.to_s, event)
+  end
+
   private
 
+  def handle_typing_status(event_name, event)
+    conversation = event.data[:conversation]
+    user = event.data[:user]
+    inbox = conversation.inbox
+
+    payload = {
+      event: event_name,
+      user: user.webhook_data,
+      conversation: conversation.webhook_data,
+      is_private: event.data[:is_private] || false
+    }
+    deliver_webhook_payloads(payload, inbox)
+  end
+
   def deliver_account_webhooks(payload, account)
     account.webhooks.account_type.each do |webhook|
       next unless webhook.subscriptions.include?(payload[:event])
diff --git a/app/models/account.rb b/app/models/account.rb
index afc8620c2..62201a6ee 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -11,6 +11,7 @@
 #  limits                :jsonb
 #  locale                :integer          default("en")
 #  name                  :string           not null
+#  settings              :jsonb
 #  status                :integer          default("active")
 #  support_email         :string(100)
 #  created_at            :datetime         not null
@@ -28,13 +29,29 @@ class Account < ApplicationRecord
   include Featurable
   include CacheKeys
 
+  SETTINGS_PARAMS_SCHEMA = {
+    'type': 'object',
+    'properties':
+      {
+        'auto_resolve_after': { 'type': %w[integer null], 'minimum': 10, 'maximum': 1_439_856 },
+        'auto_resolve_message': { 'type': %w[string null] },
+        'auto_resolve_ignore_waiting': { 'type': %w[boolean null] }
+      },
+    'required': [],
+    'additionalProperties': true
+  }.to_json.freeze
+
   DEFAULT_QUERY_SETTING = {
     flag_query_mode: :bit_operator,
     check_for_column: false
   }.freeze
 
-  validates :auto_resolve_duration, numericality: { greater_than_or_equal_to: 1, less_than_or_equal_to: 999, allow_nil: true }
   validates :domain, length: { maximum: 100 }
+  validates_with JsonSchemaValidator,
+                 schema: SETTINGS_PARAMS_SCHEMA,
+                 attribute_resolver: ->(record) { record.settings }
+
+  store_accessor :settings, :auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting
 
   has_many :account_users, dependent: :destroy_async
   has_many :agent_bot_inboxes, dependent: :destroy_async
@@ -84,6 +101,8 @@ class Account < ApplicationRecord
   enum locale: LANGUAGES_CONFIG.map { |key, val| [val[:iso_639_1_code], key] }.to_h
   enum status: { active: 0, suspended: 1 }
 
+  scope :with_auto_resolve, -> { where("(settings ->> 'auto_resolve_after')::int IS NOT NULL") }
+
   before_validation :validate_limit_keys
   after_create_commit :notify_creation
   after_destroy :remove_account_sequences
diff --git a/app/models/concerns/activity_message_handler.rb b/app/models/concerns/activity_message_handler.rb
index a20eef565..ffd3f1be6 100644
--- a/app/models/concerns/activity_message_handler.rb
+++ b/app/models/concerns/activity_message_handler.rb
@@ -56,13 +56,24 @@ module ActivityMessageHandler
     ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
   end
 
+  def auto_resolve_message_key(minutes)
+    if minutes >= 1440 && (minutes % 1440).zero?
+      { key: 'auto_resolved_days', count: minutes / 1440 }
+    elsif minutes >= 60 && (minutes % 60).zero?
+      { key: 'auto_resolved_hours', count: minutes / 60 }
+    else
+      { key: 'auto_resolved_minutes', count: minutes }
+    end
+  end
+
   def user_status_change_activity_content(user_name)
     if user_name
       I18n.t("conversations.activity.status.#{status}", user_name: user_name)
     elsif Current.contact.present? && resolved?
       I18n.t('conversations.activity.status.contact_resolved', contact_name: Current.contact.name.capitalize)
     elsif resolved?
-      I18n.t('conversations.activity.status.auto_resolved', duration: auto_resolve_duration)
+      message_data = auto_resolve_message_key(auto_resolve_after || 0)
+      I18n.t("conversations.activity.status.#{message_data[:key]}", count: message_data[:count])
     end
   end
 
diff --git a/app/models/concerns/json_schema_validator.rb b/app/models/concerns/json_schema_validator.rb
index 808564be9..a015da726 100644
--- a/app/models/concerns/json_schema_validator.rb
+++ b/app/models/concerns/json_schema_validator.rb
@@ -56,6 +56,8 @@ class JsonSchemaValidator < ActiveModel::Validator
 
   def format_and_append_error(error, record)
     return handle_required(error, record) if error['type'] == 'required'
+    return handle_minimum(error, record) if error['type'] == 'minimum'
+    return handle_maximum(error, record) if error['type'] == 'maximum'
 
     type = error['type'] == 'object' ? 'hash' : error['type']
 
@@ -74,6 +76,16 @@ class JsonSchemaValidator < ActiveModel::Validator
     record.errors.add(data, "must be of type #{expected_type}")
   end
 
+  def handle_minimum(error, record)
+    data = get_name_from_data_pointer(error)
+    record.errors.add(data, "must be greater than or equal to #{error['schema']['minimum']}")
+  end
+
+  def handle_maximum(error, record)
+    data = get_name_from_data_pointer(error)
+    record.errors.add(data, "must be less than or equal to #{error['schema']['maximum']}")
+  end
+
   def get_name_from_data_pointer(error)
     data = error['data_pointer']
 
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 5af4aea74..fd9277dbc 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -76,10 +76,15 @@ class Conversation < ApplicationRecord
   scope :assigned, -> { where.not(assignee_id: nil) }
   scope :assigned_to, ->(agent) { where(assignee_id: agent.id) }
   scope :unattended, -> { where(first_reply_created_at: nil).or(where.not(waiting_since: nil)) }
-  scope :resolvable, lambda { |auto_resolve_duration|
-    return none if auto_resolve_duration.to_i.zero?
+  scope :resolvable_not_waiting, lambda { |auto_resolve_after|
+    return none if auto_resolve_after.to_i.zero?
 
-    open.where('last_activity_at < ? ', Time.now.utc - auto_resolve_duration.days)
+    open.where('last_activity_at < ? AND waiting_since IS NULL', Time.now.utc - auto_resolve_after.minutes)
+  }
+  scope :resolvable_all, lambda { |auto_resolve_after|
+    return none if auto_resolve_after.to_i.zero?
+
+    open.where('last_activity_at < ?', Time.now.utc - auto_resolve_after.minutes)
   }
 
   scope :last_user_message_at, lambda {
@@ -112,7 +117,7 @@ class Conversation < ApplicationRecord
   after_create_commit :notify_conversation_creation
   after_create_commit :load_attributes_created_by_db_triggers
 
-  delegate :auto_resolve_duration, to: :account
+  delegate :auto_resolve_after, to: :account
 
   def can_reply?
     Conversations::MessageWindowService.new(self).can_reply?
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
index 540dbd9b7..105ffdc91 100644
--- a/app/models/webhook.rb
+++ b/app/models/webhook.rb
@@ -26,7 +26,8 @@ class Webhook < ApplicationRecord
   enum webhook_type: { account_type: 0, inbox_type: 1 }
 
   ALLOWED_WEBHOOK_EVENTS = %w[conversation_status_changed conversation_updated conversation_created contact_created contact_updated
-                              message_created message_updated webwidget_triggered inbox_created inbox_updated].freeze
+                              message_created message_updated webwidget_triggered inbox_created inbox_updated
+                              conversation_typing_on conversation_typing_off].freeze
 
   private
 
diff --git a/app/services/instagram/message_text.rb b/app/services/instagram/message_text.rb
index c3978f2ee..66445f5a5 100644
--- a/app/services/instagram/message_text.rb
+++ b/app/services/instagram/message_text.rb
@@ -44,7 +44,7 @@ class Instagram::MessageText < Instagram::BaseMessageText
     Rails.logger.warn("[InstagramUserFetchError]: account_id #{@inbox.account_id} inbox_id #{@inbox.id}")
     Rails.logger.warn("[InstagramUserFetchError]: #{error_message} #{error_code}")
 
-    ChatwootExceptionTracker.new(error, account: @inbox.account).capture_exception
+    ChatwootExceptionTracker.new(parsed_response, account: @inbox.account).capture_exception
   end
 
   def base_uri
diff --git a/app/services/message_templates/template/auto_resolve.rb b/app/services/message_templates/template/auto_resolve.rb
new file mode 100644
index 000000000..c70ab9ad2
--- /dev/null
+++ b/app/services/message_templates/template/auto_resolve.rb
@@ -0,0 +1,25 @@
+class MessageTemplates::Template::AutoResolve
+  pattr_initialize [:conversation!]
+
+  def perform
+    return if conversation.account.auto_resolve_message.blank?
+
+    ActiveRecord::Base.transaction do
+      conversation.messages.create!(auto_resolve_message_params)
+    end
+  end
+
+  private
+
+  delegate :contact, :account, to: :conversation
+  delegate :inbox, to: :message
+
+  def auto_resolve_message_params
+    {
+      account_id: @conversation.account_id,
+      inbox_id: @conversation.inbox_id,
+      message_type: :template,
+      content: account.auto_resolve_message
+    }
+  end
+end
diff --git a/app/views/api/v1/models/_account.json.jbuilder b/app/views/api/v1/models/_account.json.jbuilder
index 52a199167..efeff7db5 100644
--- a/app/views/api/v1/models/_account.json.jbuilder
+++ b/app/views/api/v1/models/_account.json.jbuilder
@@ -1,4 +1,4 @@
-json.auto_resolve_duration resource.auto_resolve_duration
+json.settings resource.settings
 json.created_at resource.created_at
 if resource.custom_attributes.present?
   json.custom_attributes do
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index b61cb8a8b..fdbd47008 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -21,8 +21,9 @@ class Rack::Attack
     end
 
     def allowed_ip?
-      allowed_ips = ['127.0.0.1', '::1']
-      allowed_ips.include?(remote_ip)
+      default_allowed_ips = ['127.0.0.1', '::1']
+      env_allowed_ips = ENV.fetch('RACK_ATTACK_ALLOWED_IPS', '').split(',').map(&:strip)
+      (default_allowed_ips + env_allowed_ips).include?(remote_ip)
     end
 
     # Rails would allow requests to paths with extentions, so lets compare against the path with extention stripped
@@ -32,6 +33,15 @@ class Rack::Attack
     end
   end
 
+  ### Safelist IPs from Environment Variable ###
+  #
+  # This block ensures requests from any IP present in RACK_ATTACK_ALLOWED_IPS
+  # will bypass Rack::Attack’s throttling rules.
+  #
+  # Example: RACK_ATTACK_ALLOWED_IPS="127.0.0.1,::1,192.168.0.10"
+
+  Rack::Attack.safelist('trusted IPs', &:allowed_ip?)
+
   ### Throttle Spammy Clients ###
 
   # If any single client IP is making tons of requests, then they're
diff --git a/config/locales/am.yml b/config/locales/am.yml
index 289179ac7..1e06aebde 100644
--- a/config/locales/am.yml
+++ b/config/locales/am.yml
@@ -145,7 +145,9 @@ am:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 9418da59e..1394d927c 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -145,7 +145,9 @@ ar:
         open: 'تم إعادة فتح المحادثة بواسطة %{user_name}'
         pending: 'تم تحديث حالة المحادثة لـ"معلقة" بواسطة %{user_name}'
         snoozed: 'تم تأجيل المحادثة بواسطة %{user_name}'
-        auto_resolved: 'تم وضع علامة على المحادثة كمحلولة من قبل النظام بسبب %{duration} أيام من عدم النشاط'
+        auto_resolved_days: 'تم وضع علامة على المحادثة كمحلولة من قبل النظام بسبب %{count} أيام من عدم النشاط'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: أعاد النظام فتح المحادثة بسبب رسالة واردة جديدة.
       priority:
         added: '%{user_name} حدد الأولوية إلى %{new_priority}'
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 2dbf3f936..2375edafb 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -145,7 +145,9 @@ az:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 02752863c..18fca0c3b 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -145,7 +145,9 @@ bg:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 67aa72fa9..25fdecfe1 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -145,7 +145,9 @@ ca:
         open: 'La conversa es va reobrir per %{user_name}'
         pending: 'La conversa va ser marcada com pendent per %{user_name}'
         snoozed: '%{user_name} ha posposat la conversa'
-        auto_resolved: 'El sistema ha marcat que la conversa s''ha resolt a causa de %{duration} dies d''inactivitat'
+        auto_resolved_days: 'El sistema ha marcat que la conversa s''ha resolt a causa de %{count} dies d''inactivitat'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: El sistema ha reobert la conversa a causa d'un nou missatge entrant.
       priority:
         added: '%{user_name} ha establert la prioritat a %{new_priority}'
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 3b563c9f8..890aefe25 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -145,7 +145,9 @@ cs:
         open: 'Konverzace byla znovu otevřena uživatelem %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/da.yml b/config/locales/da.yml
index ae82593cf..0b03be9f6 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -145,7 +145,9 @@ da:
         open: 'Samtalen blev genåbnet af %{user_name}'
         pending: 'Samtalen blev markeret som afventende af %{user_name}'
         snoozed: 'Samtalen blev udskudt af %{user_name}'
-        auto_resolved: 'Samtalen blev markeret som løst af systemet på grund af %{duration} dages inaktivitet'
+        auto_resolved_days: 'Samtalen blev markeret som løst af systemet på grund af %{count} dages inaktivitet'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9ed63cd17..584092e32 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -145,7 +145,9 @@ de:
         open: 'Das Gespräch wurde von %{user_name} wieder eröffnet'
         pending: 'Das Gespräch wurde von %{user_name} als ausstehend markiert'
         snoozed: 'Das Gespräch wurde von %{user_name} zur Erinnerung markiert'
-        auto_resolved: 'Das Gespräch wurde vom System aufgrund von %{duration} Tagen Inaktivität gelöst'
+        auto_resolved_days: 'Das Gespräch wurde vom System aufgrund von %{count} Tagen Inaktivität gelöst'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Das System hat die Unterhaltung aufgrund einer neuen eingehenden Nachricht wieder geöffnet.
       priority:
         added: '%{user_name} hat die Priorität auf %{new_priority} gesetzt'
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 7a1efc9b0..53e2828f5 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -145,7 +145,9 @@ el:
         open: 'Έγινε επαναφορά της συνομιλίας από τον %{user_name}'
         pending: 'Η συνομιλία επισημάνθηκε ως εκκρεμής από τον %{user_name}'
         snoozed: 'Η συνομιλία σημάνθηκε ως "καθυστερημένη" (snoozed) από τον %{user_name}'
-        auto_resolved: 'Η συνομιλία σημάνθηκε επιλυθείσα από το σύστημα με την παρέλευση %{duration} ημερών άνευ δραστηριότητας'
+        auto_resolved_days: 'Η συνομιλία σημάνθηκε επιλυθείσα από το σύστημα με την παρέλευση %{count} ημερών άνευ δραστηριότητας'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f8772112f..71b30272d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -204,7 +204,9 @@ en:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index ffbe568ea..74dbc5c6a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -145,7 +145,9 @@ es:
         open: 'La conversación fue reabierta por %{user_name}'
         pending: 'La conversación fue marcada como pendiente por %{user_name}'
         snoozed: 'La conversación fue pospuesta por %{user_name}'
-        auto_resolved: 'La conversación fue marcada por el sistema debido a %{duration} días de inactividad'
+        auto_resolved_days: 'La conversación fue marcada por el sistema debido a %{count} días de inactividad'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: El sistema reabrió la conversación debido a un nuevo mensaje entrante.
       priority:
         added: '%{user_name} estableció la prioridad a %{new_priority}'
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0dda83588..1f20e4e13 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -145,7 +145,9 @@ fa:
         open: 'گفتگو توسط ایجنت %{user_name} مجددا باز شده بود'
         pending: 'مکالمه توسط %{user_name} به عنوان معلق علامت گذاری شد'
         snoozed: 'مکالمه توسط %{user_name} به تعویق افتاد'
-        auto_resolved: 'به دلیل %{duration} روز عدم فعالیت ، مکالمه توسط سیستم بسته شد'
+        auto_resolved_days: 'به دلیل %{count} روز عدم فعالیت ، مکالمه توسط سیستم بسته شد'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: سیستم به دلیل یک پیام دریافتی جدید، مکالمه را دوباره باز کرد.
       priority:
         added: '%{user_name} اولویت را روی %{new_priority} تنظیم کرد'
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 4fd442da1..34afde79b 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -145,7 +145,9 @@ fi:
         open: '%{user_name} uudelleenavasi keskustelun'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Keskustelu merkittiin ratkaistuksi automaattisesti, sillä on kulunut %{duration} päivää viimeisestä viestistä'
+        auto_resolved_days: 'Keskustelu merkittiin ratkaistuksi automaattisesti, sillä on kulunut %{count} päivää viimeisestä viestistä'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6fa2443b9..5d249f49c 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -145,7 +145,9 @@ fr:
         open: 'La conversation a été ré-ouverte par %{user_name}'
         pending: 'La conversation a été marquée comme en attente par %{user_name}'
         snoozed: 'La conversation a été reportée par %{user_name}'
-        auto_resolved: 'La conversation a été marquée comme résolue par le système en raison de %{duration} jours d''inactivité'
+        auto_resolved_days: 'La conversation a été marquée comme résolue par le système en raison de %{count} jours d''inactivité'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Le système a rouvert la conversation en raison d'un nouveau message entrant.
       priority:
         added: '%{user_name} fixe la priorité à %{new_priority}'
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 6ef731fd1..fb0eba4e8 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -145,7 +145,9 @@ he:
         open: 'השיחה נפתחה מחדש על ידי %{user_name}'
         pending: 'השיחה סומנה כממתינה על ידי %{user_name}'
         snoozed: 'השיחה הושהה על ידי %{user_name}'
-        auto_resolved: 'השיחה סומנה כפתורה על ידי המערכת עקב חוסר פעילות של %{duration} ימים'
+        auto_resolved_days: 'השיחה סומנה כפתורה על ידי המערכת עקב חוסר פעילות של %{count} ימים'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index abe8dd3d8..5cd91f77f 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -145,7 +145,9 @@ hi:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 8afb9fe78..45bda80be 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -145,7 +145,9 @@ hr:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sustav je ponovno otvorio razgovor zbog pristigle nove poruke.
       priority:
         added: '%{user_name} je postavio prioritet na %{new_priority}'
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 444d80f00..7b9ce93a2 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -145,7 +145,9 @@ hu:
         open: 'A beszélgetést újranyitotta %{user_name}'
         pending: 'A beszélgetést %{user_name} folyamatban lévőnek jelölte'
         snoozed: 'A beszélgetést %{user_name} elnémította'
-        auto_resolved: 'A beszélgetést lezárta a rendszer mivel %{duration} napja inaktív volt'
+        auto_resolved_days: 'A beszélgetést lezárta a rendszer mivel %{count} napja inaktív volt'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: A rendszer újranyitotta a beszélgetést egy új bejövő üzenet miatt.
       priority:
         added: '%{user_name} beállította a prioritást erre: %{new_priority}'
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 6dfa38a67..cd4dcb783 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -145,7 +145,9 @@ hy:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 9bc01872c..89dce8175 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -145,7 +145,9 @@ id:
         open: 'Percakapan telah dibuka kembali oleh %{user_name}'
         pending: 'Percakapan telah ditandai sebagai tertunda oleh %{user_name}'
         snoozed: 'Percakapan telah ditunda oleh %{user_name}'
-        auto_resolved: 'Percakapan ditandai terselesaikan oleh sistem karena tidak ada aktifitas dalam %{duration} hari'
+        auto_resolved_days: 'Percakapan ditandai terselesaikan oleh sistem karena tidak ada aktifitas dalam %{count} hari'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistem membuka kembali percakapan karena pesan masuk baru.
       priority:
         added: '%{user_name} tetapkan prioritas untuk %{new_priority}'
diff --git a/config/locales/is.yml b/config/locales/is.yml
index d36eeca0d..a234cf915 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -145,7 +145,9 @@ is:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Samtal var merkt sem í bið af %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Samtal var merkt sem leyst af kerfinu vegna óvirkni í %{duration} daga'
+        auto_resolved_days: 'Samtal var merkt sem leyst af kerfinu vegna óvirkni í %{count} daga'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 998375e4a..c1cf9aa08 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -145,7 +145,9 @@ it:
         open: 'La conversazione è stata riaperta da %{user_name}'
         pending: 'La conversazione è stata contrassegnata come in attesa da %{user_name}'
         snoozed: 'La conversazione è stata posticipata da %{user_name}'
-        auto_resolved: 'La conversazione è stata contrassegnata come risolta dal sistema a causa di %{duration} giorni d''inattività'
+        auto_resolved_days: 'La conversazione è stata contrassegnata come risolta dal sistema a causa di %{count} giorni d''inattività'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d3fcc8706..82ff3adf1 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -145,7 +145,9 @@ ja:
         open: '%{user_name} によって会話が再開されました'
         pending: '%{user_name} によって会話が保留にされました'
         snoozed: '%{user_name} によって会話がスヌーズされました'
-        auto_resolved: '%{duration} 日間会話が非アクティブだったため、システムにより解決済みにされました'
+        auto_resolved_days: '%{count} 日間会話が非アクティブだったため、システムにより解決済みにされました'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: 新しい受信メッセージを受信したため、システムが会話が再開されました
       priority:
         added: '%{user_name} が優先度を "%{new_priority}" に設定しました'
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 27dce6767..ad0cd5159 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -145,7 +145,9 @@ ka:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 6e7b051e5..42417b179 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -145,7 +145,9 @@ ko:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 26c57124d..00de10987 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -145,7 +145,9 @@ lt:
         open: 'Pokalbį iš naujo pradėjo %{user_name}'
         pending: 'Pokalbį pažymėjo %{user_name} kaip laukiantį'
         snoozed: 'Pokalbį atidėjo %{user_name}'
-        auto_resolved: 'Sistema pokalbį pažymėjo kaip baigtą dėl %{duration} neaktyvumo dienų'
+        auto_resolved_days: 'Sistema pokalbį pažymėjo kaip baigtą dėl %{count} neaktyvumo dienų'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistema vėl atidarė pokalbį dėl naujo gaunamo pranešimo.
       priority:
         added: '%{user_name} nustatė prioritetą į %{new_priority}'
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 3579952a5..3588f491c 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -145,7 +145,9 @@ lv:
         open: '%{user_name} atkārtoti atvēra sarunu'
         pending: '%{user_name} sarunu atzīmēja kā neapstiprinātu'
         snoozed: '%{user_name} atlika sarunu'
-        auto_resolved: 'Sistēma sarunu atzīmēja kā atrisinātu %{duration} dienu neaktivitātes dēļ'
+        auto_resolved_days: 'Sistēma sarunu atzīmēja kā atrisinātu %{count} dienu neaktivitātes dēļ'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistēma atkārtoti atvēra sarunu jauna ienākoša ziņojuma dēļ.
       priority:
         added: '%{user_name} iestatīja prioritāti uz %{new_priority}'
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 6f992f50d..676cf8624 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -145,7 +145,9 @@ ml:
         open: 'സംഭാഷണം %{user_name} വീണ്ടും തുറന്നു'
         pending: '%{user_name} സംഭാഷണം തീർച്ചപ്പെടുത്താത്തതായി അടയാളപ്പെടുത്തി'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index e23420e5c..d471144b5 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -145,7 +145,9 @@ ms:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 76d5440b2..664cb7cb1 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -145,7 +145,9 @@ ne:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 6881c0939..c5c937fc3 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -145,7 +145,9 @@ nl:
         open: 'Gesprek werd heropend door %{user_name}'
         pending: 'Gesprek werd gemarkeerd als in afwachting door %{user_name}'
         snoozed: 'Gesprek werd gesluimerd door %{user_name}'
-        auto_resolved: 'Gesprek werd door systeem gemarkeerd als opgelost na %{duration} dagen inactiviteit'
+        auto_resolved_days: 'Gesprek werd door systeem gemarkeerd als opgelost na %{count} dagen inactiviteit'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 00b68f9c1..ef2327236 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -145,7 +145,9 @@
         open: 'Samtalen ble gjenåpnet av %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Samtale ble automatisk merket løst på grunn av %{duration} dager med inaktivitet'
+        auto_resolved_days: 'Samtale ble automatisk merket løst på grunn av %{count} dager med inaktivitet'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 87f2ad3b5..4d3878d45 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -145,7 +145,9 @@ pl:
         open: 'Rozmowa została ponownie otwarta przez %{user_name}'
         pending: 'Rozmowa została oznaczona jako oczekująca przez %{user_name}'
         snoozed: 'Rozmowa została uśpiona przez %{user_name}'
-        auto_resolved: 'Rozmowa została oznaczona przez system jako rozwiązana z powodu %{duration} dni bezczynności'
+        auto_resolved_days: 'Rozmowa została oznaczona przez system jako rozwiązana z powodu %{count} dni bezczynności'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System otworzył ponownie rozmowę z powodu nowej wiadomości przychodzącej.
       priority:
         added: '%{user_name} ustawił priorytet na %{new_priority}'
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 4b630e66a..fe2286502 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -145,7 +145,9 @@ pt:
         open: 'Conversa foi reaberta por %{user_name}'
         pending: 'Conversa marcada como pendente por %{user_name}'
         snoozed: 'Conversa adiada por %{user_name}'
-        auto_resolved: 'Conversa auto-resolvida pelo sistema por causa dos %{duration} dias sem inatividade'
+        auto_resolved_days: 'Conversa auto-resolvida pelo sistema por causa dos %{count} dias sem inatividade'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: O sistema reabriu a conversa por ter sido recebida uma nova mensagem.
       priority:
         added: '%{user_name} definiu a prioridade para %{new_priority}'
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index a8b0f1d02..601f689ac 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -145,7 +145,9 @@ pt_BR:
         open: 'Conversa foi reaberta por %{user_name}'
         pending: 'Conversa foi marcada como pendente por %{user_name}'
         snoozed: 'Conversa foi adiada por %{user_name}'
-        auto_resolved: 'Conversa foi marcada como resolvida pelo sistema por ter %{duration} dias de inatividade'
+        auto_resolved_days: 'A conversa foi marcada como resolvida pelo sistema por ter %{count} dias de inatividade'
+        auto_resolved_hours: 'A conversa foi marcada como resolvida pelo sistema por ter %{count} horas de inatividade'
+        auto_resolved_minutes: 'A conversa foi marcada como resolvida pelo sistema por ter %{count} minutos de inatividade'
         system_auto_open: O sistema reabriu a conversa devido a uma nova mensagem recebida.
       priority:
         added: '%{user_name} definiu a prioridade para %{new_priority}'
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index c54f67349..48e03ea29 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -145,7 +145,9 @@ ro:
         open: 'Conversația a fost redeschisă de %{user_name}'
         pending: 'Conversația a fost marcată ca fiind în așteptare de către %{user_name}'
         snoozed: 'Conversația a fost snoozed de %{user_name}'
-        auto_resolved: 'Conversația a fost marcată de sistem din cauza %{duration} zile de inactivitate'
+        auto_resolved_days: 'Conversația a fost marcată de sistem din cauza %{count} zile de inactivitate'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistemul a redeschis conversația din cauza unui nou mesaj de intrare.
       priority:
         added: '%{user_name} setați prioritatea pentru a %{new_priority}'
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b7117df94..f219e75c6 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -145,7 +145,9 @@ ru:
         open: '%{user_name} открыл заново диалог'
         pending: 'Разговор был помечен как ожидающий %{user_name}'
         snoozed: 'Разговор был помечен как отложенный %{user_name}'
-        auto_resolved: 'Разговор был помечен системой решённым из-за неактивности в течение %{duration} дней'
+        auto_resolved_days: 'Разговор был помечен системой решённым из-за неактивности в течение %{count} дней'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Система переоткрыла разговор из-за нового входящего сообщения.
       priority:
         added: '%{user_name} установил приоритет на %{new_priority}'
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 916685cdf..cdfb561c5 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -145,7 +145,9 @@ sh:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 9585c950a..ff7de2de9 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -145,7 +145,9 @@ sk:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index a6529051f..3d9d9746c 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -145,7 +145,9 @@ sl:
         open: '%{user_name} je znova odprl pogovor'
         pending: '%{user_name} je pogovor označil kot čakajočega'
         snoozed: '%{user_name} je preložil pogovor'
-        auto_resolved: 'Sistem je označil pogovor kot razrešen zaradi %{duration} dni nedejavnosti'
+        auto_resolved_days: 'Sistem je označil pogovor kot razrešen zaradi %{count} dni nedejavnosti'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistem je znova odprl pogovor zaradi novega dohodnega sporočila.
       priority:
         added: '%{user_name} je nastavil prednost na %{new_priority}'
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index fccbc17b2..d8e0cc689 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -145,7 +145,9 @@ sq:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index f927a0b6e..30c0a8f63 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -145,7 +145,9 @@ sr-Latn:
         open: 'Razgovor je ponovo otvoren od strane %{user_name}'
         pending: 'Razgovor je označen kao na čekanju od strane %{user_name}'
         snoozed: 'Razgovor je odložen od strane %{user_name}'
-        auto_resolved: 'Razgovor je označen kao rešen od strane sistema zbog %{duration} dana neaktivnosti'
+        auto_resolved_days: 'Razgovor je označen kao rešen od strane sistema zbog %{count} dana neaktivnosti'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 5a1931180..3cb09f24e 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -145,7 +145,9 @@ sv:
         open: 'Konversationen öppnades igen av %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Konversationen har markerats som löst av systemet på grund av %{duration} dagars inaktivitet'
+        auto_resolved_days: 'Konversationen har markerats som löst av systemet på grund av %{count} dagars inaktivitet'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 171952e23..0f2fb6b40 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -145,7 +145,9 @@ ta:
         open: 'உரையாடலை %{user_name} மீண்டும் திறந்துள்ளார்'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 031f4749b..d5b9d9ab3 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -145,7 +145,9 @@ th:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 89024bb52..11a71c04f 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -145,7 +145,9 @@ tl:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 42e1fff8e..27fc93e35 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -145,7 +145,9 @@ tr:
         open: 'Konuşma %{user_name} tarafından açık olarak işaretlendi'
         pending: 'Konuşma, %{user_name} tarafından bekleyen olarak işaretlendi'
         snoozed: 'Konuşma, %{user_name} tarafından erteledi olarak işaretlendi'
-        auto_resolved: ' %{duration} günlük hareketsizlik nedeniyle konuşma, sistem tarafından çözümlendi olarak işaretlendi'
+        auto_resolved_days: ' %{count} günlük hareketsizlik nedeniyle konuşma, sistem tarafından çözümlendi olarak işaretlendi'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistem, yeni gelen bir mesaj nedeniyle konuşmayı tekrar açtı.
       priority:
         added: '%{user_name} önceliği %{new_priority} olarak ayarladı'
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index bba730a83..999508e12 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -145,7 +145,9 @@ uk:
         open: 'Розмову знову відкрито %{user_name}'
         pending: 'Бесіда була позначена як очікується %{user_name}'
         snoozed: 'Розмова була відкладена %{user_name}'
-        auto_resolved: 'Діалог був закритий системою через %{duration} днів неактивності'
+        auto_resolved_days: 'Діалог був закритий системою через %{count} днів неактивності'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Система повторно відкрила розмову через нове вхідне повідомлення.
       priority:
         added: '%{user_name} встановив пріоритет %{new_priority}'
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 62df9f34f..6da50915c 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -145,7 +145,9 @@ ur:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 72c9ab3d8..75316ea8b 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -145,7 +145,9 @@ ur:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 848356911..56c36eb37 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -145,7 +145,9 @@ vi:
         open: 'Cuộc trò chuyện đã được mở lại bởi %{user_name}'
         pending: 'Hội thoại được đánh dấu là chưa giải quyết bởi %{user_name}'
         snoozed: 'Hội thoại đã được tạm dừng lại bởi %{user_name}'
-        auto_resolved: 'Hội thoại được đánh dấu là đã giải quyết bởi hệ thống vì %{duration} ngày không hoạt động'
+        auto_resolved_days: 'Hội thoại được đánh dấu là đã giải quyết bởi hệ thống vì %{count} ngày không hoạt động'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Hệ thống mở lại hội thoại do có tin nhắn mới.
       priority:
         added: '%{user_name} thiết lập độ ưu tiên thành %{new_priority}'
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 9788c1b26..7173af8c3 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -145,7 +145,9 @@ zh_CN:
         open: '对话被 %{user_name} 重新打开'
         pending: '对话被标记由 %{user_name} 待处理'
         snoozed: '对话被 %{user_name} 暂停'
-        auto_resolved: '对话被系统标记为已解决, 原因是 %{duration} 天不活跃'
+        auto_resolved_days: '对话被系统标记为已解决, 原因是 %{count} 天不活跃'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: 由于收到新的消息，系统重新打开了对话。
       priority:
         added: '%{user_name} 将优先级设置为 %{new_priority}'
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 3dd001948..b76f8926a 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -145,7 +145,9 @@ zh_TW:
         open: '被%{user_name}恢復對話。'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: '由於對話已經 %{duration} 天沒有新活動，已經被系統標記為完成'
+        auto_resolved_days: '由於對話已經 %{count} 天沒有新活動，已經被系統標記為完成'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/schedule.yml b/config/schedule.yml
index afb9d98c7..2747910ad 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -38,4 +38,4 @@ remove_stale_redis_keys_job.rb:
 process_stale_contacts_job:
   cron: '30 04 * * *'
   class: 'Internal::ProcessStaleContactsJob'
-  queue: scheduled_jobs
+  queue: housekeeping
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 4d2abed9c..af813d92a 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -23,6 +23,7 @@
   - action_mailbox_routing
   - low
   - scheduled_jobs
+  - housekeeping
   - async_database_migration
   - active_storage_analysis
   - active_storage_purge
diff --git a/db/migrate/20250421082927_add_settings_column_to_account.rb b/db/migrate/20250421082927_add_settings_column_to_account.rb
new file mode 100644
index 000000000..77391f0c9
--- /dev/null
+++ b/db/migrate/20250421082927_add_settings_column_to_account.rb
@@ -0,0 +1,5 @@
+class AddSettingsColumnToAccount < ActiveRecord::Migration[7.0]
+  def change
+    add_column :accounts, :settings, :jsonb, default: {}
+  end
+end
diff --git a/db/migrate/20250421085134_update_auto_resolve_to_mminutes.rb b/db/migrate/20250421085134_update_auto_resolve_to_mminutes.rb
new file mode 100644
index 000000000..47f1ca907
--- /dev/null
+++ b/db/migrate/20250421085134_update_auto_resolve_to_mminutes.rb
@@ -0,0 +1,8 @@
+class UpdateAutoResolveToMminutes < ActiveRecord::Migration[7.0]
+  def change
+    Account.where.not(auto_resolve_duration: nil).each do |account|
+      account.auto_resolve_after = account.auto_resolve_duration * 60 * 24
+      account.save!
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5f174ffed..1a9358085 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -58,6 +58,7 @@ ActiveRecord::Schema[7.0].define(version: 2025_04_26_140000) do
     t.jsonb "custom_attributes", default: {}
     t.integer "status", default: 0
     t.jsonb "internal_attributes", default: {}, null: false
+    t.jsonb "settings", default: {}
     t.index ["status"], name: "index_accounts_on_status"
   end
 
diff --git a/lib/tasks/generate_test_data.rake b/lib/tasks/generate_test_data.rake
new file mode 100644
index 000000000..898ed340d
--- /dev/null
+++ b/lib/tasks/generate_test_data.rake
@@ -0,0 +1,30 @@
+require_relative '../test_data'
+
+namespace :data do
+  desc 'Generate large, distributed test data'
+  task generate_distributed_data: :environment do
+    if Rails.env.production?
+      puts 'Generating large amounts of data in production can have serious performance implications.'
+      puts 'Exiting to avoid impacting a live environment.'
+      exit
+    end
+
+    # Configure logger
+    Rails.logger = ActiveSupport::Logger.new($stdout)
+    Rails.logger.formatter = proc do |severity, datetime, _progname, msg|
+      "#{datetime.strftime('%Y-%m-%d %H:%M:%S.%L')} #{severity}: #{msg}\n"
+    end
+
+    begin
+      TestData::DatabaseOptimizer.setup
+      TestData.generate
+    ensure
+      TestData::DatabaseOptimizer.restore
+    end
+  end
+
+  desc 'Clean up existing test data'
+  task cleanup_test_data: :environment do
+    TestData.cleanup
+  end
+end
diff --git a/lib/test_data.rb b/lib/test_data.rb
new file mode 100644
index 000000000..f797029dc
--- /dev/null
+++ b/lib/test_data.rb
@@ -0,0 +1,18 @@
+module TestData
+  def self.generate
+    Orchestrator.call
+  end
+
+  def self.cleanup
+    CleanupService.call
+  end
+end
+
+require_relative 'test_data/constants'
+require_relative 'test_data/database_optimizer'
+require_relative 'test_data/cleanup_service'
+require_relative 'test_data/account_creator'
+require_relative 'test_data/inbox_creator'
+require_relative 'test_data/display_id_tracker'
+require_relative 'test_data/contact_batch_service'
+require_relative 'test_data/orchestrator'
diff --git a/lib/test_data/account_creator.rb b/lib/test_data/account_creator.rb
new file mode 100644
index 000000000..13540ce91
--- /dev/null
+++ b/lib/test_data/account_creator.rb
@@ -0,0 +1,31 @@
+class TestData::AccountCreator
+  DATA_FILE = 'tmp/test_data_account_ids.txt'.freeze
+
+  def self.create!(id)
+    company_name = generate_company_name
+    domain       = generate_domain(company_name)
+    account      = Account.create!(
+      id: id,
+      name: company_name,
+      domain: domain,
+      created_at: Faker::Time.between(from: 2.years.ago, to: 6.months.ago)
+    )
+    persist_account_id(account.id)
+    account
+  end
+
+  def self.generate_company_name
+    "#{Faker::Company.name} #{TestData::Constants::COMPANY_TYPES.sample}"
+  end
+
+  def self.generate_domain(company_name)
+    "#{company_name.parameterize}.#{TestData::Constants::DOMAIN_EXTENSIONS.sample}"
+  end
+
+  def self.persist_account_id(account_id)
+    FileUtils.mkdir_p('tmp')
+    File.open(DATA_FILE, 'a') do |file|
+      file.write("#{account_id},")
+    end
+  end
+end
diff --git a/lib/test_data/cleanup_service.rb b/lib/test_data/cleanup_service.rb
new file mode 100644
index 000000000..6f952ec2c
--- /dev/null
+++ b/lib/test_data/cleanup_service.rb
@@ -0,0 +1,51 @@
+class TestData::CleanupService
+  DATA_FILE = 'tmp/test_data_account_ids.txt'.freeze
+
+  class << self
+    def call
+      Rails.logger.info 'Cleaning up any existing test data...'
+
+      return log_no_file_found unless file_exists?
+
+      account_ids = parse_account_ids_from_file
+
+      if account_ids.any?
+        delete_accounts(account_ids)
+      else
+        log_no_accounts_found
+      end
+
+      delete_data_file
+      Rails.logger.info '==> Cleanup complete!'
+    end
+
+    private
+
+    def file_exists?
+      File.exist?(DATA_FILE)
+    end
+
+    def log_no_file_found
+      Rails.logger.info 'No test data file found, skipping cleanup'
+    end
+
+    def parse_account_ids_from_file
+      File.read(DATA_FILE).split(',').map(&:strip).reject(&:empty?).map(&:to_i)
+    end
+
+    def delete_accounts(account_ids)
+      Rails.logger.info "Found #{account_ids.size} test accounts to clean up: #{account_ids.join(', ')}"
+      start_time = Time.zone.now
+      Account.where(id: account_ids).destroy_all
+      Rails.logger.info "Deleted #{account_ids.size} accounts in #{Time.zone.now - start_time}s"
+    end
+
+    def log_no_accounts_found
+      Rails.logger.info 'No test account IDs found in the data file'
+    end
+
+    def delete_data_file
+      File.delete(DATA_FILE)
+    end
+  end
+end
diff --git a/lib/test_data/constants.rb b/lib/test_data/constants.rb
new file mode 100644
index 000000000..0ef15dc2e
--- /dev/null
+++ b/lib/test_data/constants.rb
@@ -0,0 +1,18 @@
+module TestData::Constants
+  NUM_ACCOUNTS = 20
+  MIN_MESSAGES = 1_000_000  # 1M
+  MAX_MESSAGES = 10_000_000 # 10M
+  BATCH_SIZE   = 5_000
+
+  MAX_CONVERSATIONS_PER_CONTACT = 20
+  INBOXES_PER_ACCOUNT           = 5
+  STATUSES                      = %w[open resolved pending].freeze
+  MESSAGE_TYPES                 = %w[incoming outgoing].freeze
+
+  MIN_MESSAGES_PER_CONVO = 5
+  MAX_MESSAGES_PER_CONVO = 50
+
+  COMPANY_TYPES      = %w[Retail Healthcare Finance Education Manufacturing].freeze
+  DOMAIN_EXTENSIONS  = %w[com io tech ai].freeze
+  COUNTRY_CODES      = %w[1 44 91 61 81 86 49 33 34 39].freeze # US, UK, India, Australia, Japan, China, Germany, France, Spain, Italy
+end
diff --git a/lib/test_data/contact_batch_service.rb b/lib/test_data/contact_batch_service.rb
new file mode 100644
index 000000000..eaa41b5c4
--- /dev/null
+++ b/lib/test_data/contact_batch_service.rb
@@ -0,0 +1,196 @@
+class TestData::ContactBatchService
+  def initialize(account:, inboxes:, batch_size:, display_id_tracker:)
+    @account = account
+    @inboxes = inboxes
+    @batch_size = batch_size
+    @display_id_tracker = display_id_tracker
+    @total_messages = 0
+  end
+
+  # Generates contacts, contact_inboxes, conversations, and messages
+  # Returns the total number of messages created in this batch
+  def generate!
+    Rails.logger.info { "Starting batch generation for account ##{@account.id} with #{@batch_size} contacts" }
+
+    create_contacts
+    create_contact_inboxes
+    create_conversations
+    create_messages
+
+    Rails.logger.info { "Completed batch with #{@total_messages} messages for account ##{@account.id}" }
+    @total_messages
+  end
+
+  private
+
+  # rubocop:disable Rails/SkipsModelValidations
+  def create_contacts
+    Rails.logger.info { "Creating #{@batch_size} contacts for account ##{@account.id}" }
+    start_time = Time.current
+
+    @contacts_data = Array.new(@batch_size) { build_contact_data }
+    Contact.insert_all!(@contacts_data) if @contacts_data.any?
+    @contacts = Contact
+                .where(account_id: @account.id)
+                .order(created_at: :desc)
+                .limit(@batch_size)
+
+    Rails.logger.info { "Contacts created in #{Time.current - start_time}s" }
+  end
+  # rubocop:enable Rails/SkipsModelValidations
+
+  def build_contact_data
+    created_at = Faker::Time.between(from: 1.year.ago, to: Time.current)
+    {
+      account_id: @account.id,
+      name: Faker::Name.name,
+      email: "#{SecureRandom.uuid}@example.com",
+      phone_number: generate_e164_phone_number,
+      additional_attributes: maybe_add_additional_attributes,
+      created_at: created_at,
+      updated_at: created_at
+    }
+  end
+
+  def maybe_add_additional_attributes
+    return unless rand < 0.3
+
+    {
+      company: Faker::Company.name,
+      city: Faker::Address.city,
+      country: Faker::Address.country_code
+    }
+  end
+
+  def generate_e164_phone_number
+    return nil unless rand < 0.7
+
+    country_code = TestData::Constants::COUNTRY_CODES.sample
+    subscriber_number = rand(1_000_000..9_999_999_999).to_s
+    subscriber_number = subscriber_number[0...(15 - country_code.length)]
+    "+#{country_code}#{subscriber_number}"
+  end
+
+  # rubocop:disable Rails/SkipsModelValidations
+  def create_contact_inboxes
+    Rails.logger.info { "Creating contact inboxes for #{@contacts.size} contacts" }
+    start_time = Time.current
+
+    contact_inboxes_data = @contacts.flat_map do |contact|
+      @inboxes.map do |inbox|
+        {
+          inbox_id: inbox.id,
+          contact_id: contact.id,
+          source_id: SecureRandom.uuid,
+          created_at: contact.created_at,
+          updated_at: contact.created_at
+        }
+      end
+    end
+
+    count = contact_inboxes_data.size
+    ContactInbox.insert_all!(contact_inboxes_data) if contact_inboxes_data.any?
+    @contact_inboxes = ContactInbox.where(contact_id: @contacts.pluck(:id))
+
+    Rails.logger.info { "Created #{count} contact inboxes in #{Time.current - start_time}s" }
+  end
+  # rubocop:enable Rails/SkipsModelValidations
+
+  # rubocop:disable Rails/SkipsModelValidations
+  def create_conversations
+    Rails.logger.info { "Creating conversations for account ##{@account.id}" }
+    start_time = Time.current
+
+    conversations_data = []
+    @contact_inboxes.each do |ci|
+      num_convos = rand(1..TestData::Constants::MAX_CONVERSATIONS_PER_CONTACT)
+      num_convos.times { conversations_data << build_conversation(ci) }
+    end
+
+    count = conversations_data.size
+    Rails.logger.info { "Preparing to insert #{count} conversations" }
+
+    Conversation.insert_all!(conversations_data) if conversations_data.any?
+    @conversations = Conversation.where(
+      account_id: @account.id,
+      display_id: conversations_data.pluck(:display_id)
+    ).order(:created_at)
+
+    Rails.logger.info { "Created #{count} conversations in #{Time.current - start_time}s" }
+  end
+  # rubocop:enable Rails/SkipsModelValidations
+
+  def build_conversation(contact_inbox)
+    created_at = Faker::Time.between(from: contact_inbox.created_at, to: Time.current)
+    {
+      account_id: @account.id,
+      inbox_id: contact_inbox.inbox_id,
+      contact_id: contact_inbox.contact_id,
+      contact_inbox_id: contact_inbox.id,
+      status: TestData::Constants::STATUSES.sample,
+      created_at: created_at,
+      updated_at: created_at,
+      display_id: @display_id_tracker.next_id
+    }
+  end
+
+  # rubocop:disable Rails/SkipsModelValidations
+  def create_messages
+    Rails.logger.info { "Creating messages for #{@conversations.size} conversations" }
+    start_time = Time.current
+
+    batch_count = 0
+    @conversations.find_in_batches(batch_size: 1000) do |batch|
+      batch_count += 1
+      batch_start = Time.current
+
+      messages_data = batch.flat_map do |convo|
+        build_messages_for_conversation(convo)
+      end
+
+      batch_message_count = messages_data.size
+      Rails.logger.info { "Preparing to insert #{batch_message_count} messages (batch #{batch_count})" }
+
+      Message.insert_all!(messages_data) if messages_data.any?
+      @total_messages += batch_message_count
+
+      Rails.logger.info { "Created batch #{batch_count} with #{batch_message_count} messages in #{Time.current - batch_start}s" }
+    end
+
+    Rails.logger.info { "Created total of #{@total_messages} messages in #{Time.current - start_time}s" }
+  end
+  # rubocop:enable Rails/SkipsModelValidations
+
+  def build_messages_for_conversation(conversation)
+    num_messages = rand(TestData::Constants::MIN_MESSAGES_PER_CONVO..TestData::Constants::MAX_MESSAGES_PER_CONVO)
+    message_type = TestData::Constants::MESSAGE_TYPES.sample
+    time_range = [conversation.created_at, Time.current]
+    generate_messages(conversation, num_messages, message_type, time_range)
+  end
+
+  def generate_messages(conversation, num_messages, initial_message_type, time_range)
+    message_type = initial_message_type
+
+    Array.new(num_messages) do
+      message_type = (message_type == 'incoming' ? 'outgoing' : 'incoming')
+      created_at = Faker::Time.between(from: time_range.first, to: time_range.last)
+      build_message_data(conversation, message_type, created_at)
+    end
+  end
+
+  def build_message_data(conversation, message_type, created_at)
+    {
+      account_id: @account.id,
+      inbox_id: conversation.inbox_id,
+      conversation_id: conversation.id,
+      message_type: message_type,
+      content: Faker::Lorem.paragraph(sentence_count: 2),
+      created_at: created_at,
+      updated_at: created_at,
+      private: false,
+      status: 'sent',
+      content_type: 'text',
+      source_id: SecureRandom.uuid
+    }
+  end
+end
diff --git a/lib/test_data/database_optimizer.rb b/lib/test_data/database_optimizer.rb
new file mode 100644
index 000000000..f3fd42f7b
--- /dev/null
+++ b/lib/test_data/database_optimizer.rb
@@ -0,0 +1,80 @@
+class TestData::DatabaseOptimizer
+  class << self
+    # Tables that need trigger management
+    TABLES_WITH_TRIGGERS = %w[conversations messages].freeze
+
+    # Memory settings in MB
+    # Increased work_mem for better query performance with complex operations
+    WORK_MEM = 256
+
+    def setup
+      Rails.logger.info '==> Setting up database optimizations for improved performance'
+
+      # Remove statement timeout to allow long-running operations to complete
+      Rails.logger.info '    Removing statement timeout'
+      ActiveRecord::Base.connection.execute('SET statement_timeout = 0')
+
+      # Increase working memory for better query performance
+      Rails.logger.info "    Increasing work_mem to #{WORK_MEM}MB"
+      ActiveRecord::Base.connection.execute("SET work_mem = '#{WORK_MEM}MB'")
+
+      # Set tables to UNLOGGED mode for better write performance
+      # This disables WAL completely for these tables
+      Rails.logger.info '    Setting tables to UNLOGGED mode'
+      set_tables_unlogged
+
+      # Disable triggers on specified tables to avoid overhead
+      Rails.logger.info '    Disabling triggers on specified tables'
+      disable_triggers
+
+      Rails.logger.info '==> Database optimizations complete, data generation will run faster'
+    end
+
+    def restore
+      Rails.logger.info '==> Restoring database settings to normal'
+
+      Rails.logger.info '    Re-enabling triggers on specified tables'
+      enable_triggers
+
+      Rails.logger.info '    Setting tables back to LOGGED mode'
+      set_tables_logged
+
+      # Reset memory settings to defaults
+      Rails.logger.info '    Resetting memory settings to defaults'
+      ActiveRecord::Base.connection.execute('RESET work_mem')
+      ActiveRecord::Base.connection.execute('RESET maintenance_work_mem')
+
+      Rails.logger.info '==> Database settings restored to normal operation'
+    end
+
+    private
+
+    def disable_triggers
+      TABLES_WITH_TRIGGERS.each do |table|
+        Rails.logger.info "    Disabling triggers on #{table} table"
+        ActiveRecord::Base.connection.execute("ALTER TABLE #{table} DISABLE TRIGGER ALL")
+      end
+    end
+
+    def enable_triggers
+      TABLES_WITH_TRIGGERS.each do |table|
+        Rails.logger.info "    Enabling triggers on #{table} table"
+        ActiveRecord::Base.connection.execute("ALTER TABLE #{table} ENABLE TRIGGER ALL")
+      end
+    end
+
+    def set_tables_unlogged
+      TABLES_WITH_TRIGGERS.each do |table|
+        Rails.logger.info "    Setting #{table} table as UNLOGGED"
+        ActiveRecord::Base.connection.execute("ALTER TABLE #{table} SET UNLOGGED")
+      end
+    end
+
+    def set_tables_logged
+      TABLES_WITH_TRIGGERS.each do |table|
+        Rails.logger.info "    Setting #{table} table as LOGGED"
+        ActiveRecord::Base.connection.execute("ALTER TABLE #{table} SET LOGGED")
+      end
+    end
+  end
+end
diff --git a/lib/test_data/display_id_tracker.rb b/lib/test_data/display_id_tracker.rb
new file mode 100644
index 000000000..04ea406b0
--- /dev/null
+++ b/lib/test_data/display_id_tracker.rb
@@ -0,0 +1,12 @@
+class TestData::DisplayIdTracker
+  attr_reader :current
+
+  def initialize(account:)
+    max_display_id = Conversation.where(account_id: account.id).maximum(:display_id) || 0
+    @current = max_display_id
+  end
+
+  def next_id
+    @current += 1
+  end
+end
diff --git a/lib/test_data/inbox_creator.rb b/lib/test_data/inbox_creator.rb
new file mode 100644
index 000000000..4ece7624e
--- /dev/null
+++ b/lib/test_data/inbox_creator.rb
@@ -0,0 +1,12 @@
+class TestData::InboxCreator
+  def self.create_for(account)
+    Array.new(TestData::Constants::INBOXES_PER_ACCOUNT) do
+      channel = Channel::Api.create!(account: account)
+      Inbox.create!(
+        account_id: account.id,
+        name: "API Inbox #{SecureRandom.hex(4)}",
+        channel: channel
+      )
+    end
+  end
+end
diff --git a/lib/test_data/orchestrator.rb b/lib/test_data/orchestrator.rb
new file mode 100644
index 000000000..996713d5b
--- /dev/null
+++ b/lib/test_data/orchestrator.rb
@@ -0,0 +1,109 @@
+class TestData::Orchestrator
+  class << self
+    def call
+      Rails.logger.info { '========== STARTING TEST DATA GENERATION ==========' }
+
+      cleanup_existing_data
+      set_start_id
+
+      Rails.logger.info { "Starting to generate distributed test data across #{TestData::Constants::NUM_ACCOUNTS} accounts..." }
+      Rails.logger.info do
+        "Each account have between #{TestData::Constants::MIN_MESSAGES / 1_000_000}M and #{TestData::Constants::MAX_MESSAGES / 1_000_000}M messages"
+      end
+
+      TestData::Constants::NUM_ACCOUNTS.times do |account_index|
+        Rails.logger.info { "Processing account #{account_index + 1} of #{TestData::Constants::NUM_ACCOUNTS}" }
+        process_account(account_index)
+      end
+
+      Rails.logger.info { "========== ALL DONE! Created #{TestData::Constants::NUM_ACCOUNTS} accounts with distributed test data ==========" }
+    end
+
+    private
+
+    # Simple value object to group generation parameters
+    class DataGenerationParams
+      attr_reader :account, :inboxes, :total_contacts_needed, :target_message_count, :display_id_tracker
+
+      def initialize(account:, inboxes:, total_contacts_needed:, target_message_count:, display_id_tracker:)
+        @account = account
+        @inboxes = inboxes
+        @total_contacts_needed = total_contacts_needed
+        @target_message_count = target_message_count
+        @display_id_tracker = display_id_tracker
+      end
+    end
+
+    # 1. Remove existing data for old test accounts
+    def cleanup_existing_data
+      Rails.logger.info { 'Cleaning up existing test data...' }
+      TestData::CleanupService.call
+      Rails.logger.info { 'Cleanup complete' }
+    end
+
+    # 2. Find the max Account ID to avoid conflicts
+    def set_start_id
+      max_id = Account.maximum(:id) || 0
+      @start_id = max_id + 1
+      Rails.logger.info { "Setting start ID to #{@start_id}" }
+    end
+
+    # 3. Create an account, its inboxes, and some data
+    def process_account(account_index)
+      account_id = @start_id + account_index
+      Rails.logger.info { "Creating account with ID #{account_id}" }
+      account = TestData::AccountCreator.create!(account_id)
+
+      inboxes = TestData::InboxCreator.create_for(account)
+      target_messages = rand(TestData::Constants::MIN_MESSAGES..TestData::Constants::MAX_MESSAGES)
+      avg_per_convo = rand(15..50)
+      total_convos = (target_messages / avg_per_convo.to_f).ceil
+      total_contacts = (total_convos / TestData::Constants::MAX_CONVERSATIONS_PER_CONTACT.to_f).ceil
+
+      log_account_details(account, target_messages, total_contacts, total_convos)
+      display_id_tracker = TestData::DisplayIdTracker.new(account: account)
+
+      params = DataGenerationParams.new(
+        account: account,
+        inboxes: inboxes,
+        total_contacts_needed: total_contacts,
+        target_message_count: target_messages,
+        display_id_tracker: display_id_tracker
+      )
+
+      Rails.logger.info { "Starting data generation for account ##{account.id}" }
+      generate_data_for_account(params)
+    end
+
+    def generate_data_for_account(params)
+      contact_count = 0
+      message_count = 0
+      batch_number = 0
+
+      while contact_count < params.total_contacts_needed
+        batch_number += 1
+        batch_size = [TestData::Constants::BATCH_SIZE, params.total_contacts_needed - contact_count].min
+        Rails.logger.info { "Processing batch ##{batch_number} (#{batch_size} contacts) for account ##{params.account.id}" }
+
+        batch_service = TestData::ContactBatchService.new(
+          account: params.account,
+          inboxes: params.inboxes,
+          batch_size: batch_size,
+          display_id_tracker: params.display_id_tracker
+        )
+        batch_created_messages = batch_service.generate!
+
+        contact_count += batch_size
+        message_count += batch_created_messages
+
+      end
+
+      Rails.logger.info { "==> Completed Account ##{params.account.id} with #{message_count} messages" }
+    end
+
+    def log_account_details(account, target_messages, total_contacts, total_convos)
+      Rails.logger.info { "==> Account ##{account.id} plan: target of #{target_messages / 1_000_000.0}M messages" }
+      Rails.logger.info { "    Planning for #{total_contacts} contacts and #{total_convos} conversations" }
+    end
+  end
+end
diff --git a/package.json b/package.json
index 628a0b47d..94ea2b95a 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
     "prosemirror-model": "^1.22.3",
     "size-limit": "^8.2.4",
     "tailwindcss": "^3.4.13",
-    "vite": "^5.4.18",
+    "vite": "^5.4.19",
     "vite-plugin-ruby": "^5.0.0",
     "vitest": "3.0.5"
   },
@@ -155,7 +155,7 @@
   "pnpm": {
     "overrides": {
       "vite-node": "2.0.1",
-      "vite": "5.4.18",
+      "vite": "5.4.19",
       "vitest": "3.0.5"
     }
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fb72f6dfe..61151b4d2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,7 +6,7 @@ settings:
 
 overrides:
   vite-node: 2.0.1
-  vite: 5.4.18
+  vite: 5.4.19
   vitest: 3.0.5
 
 importers:
@@ -75,7 +75,7 @@ importers:
         version: 2.12.4
       '@vitejs/plugin-vue':
         specifier: ^5.1.4
-        version: 5.1.4(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
+        version: 5.1.4(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
       '@vue/compiler-sfc':
         specifier: ^3.5.8
         version: 3.5.8
@@ -241,7 +241,7 @@ importers:
         version: 1.8.1(tailwindcss@3.4.13)
       '@histoire/plugin-vue':
         specifier: 0.17.15
-        version: 0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
+        version: 0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
       '@iconify-json/logos':
         specifier: ^1.2.3
         version: 1.2.3
@@ -304,7 +304,7 @@ importers:
         version: 6.0.0
       histoire:
         specifier: 0.17.15
-        version: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+        version: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       husky:
         specifier: ^7.0.0
         version: 7.0.4
@@ -333,11 +333,11 @@ importers:
         specifier: ^3.4.13
         version: 3.4.13
       vite:
-        specifier: 5.4.18
-        version: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+        specifier: 5.4.19
+        version: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
       vite-plugin-ruby:
         specifier: ^5.0.0
-        version: 5.0.0(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+        version: 5.0.0(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       vitest:
         specifier: 3.0.5
         version: 3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0)
@@ -863,7 +863,7 @@ packages:
   '@histoire/shared@0.17.17':
     resolution: {integrity: sha512-ueGtURysonT0MujCObPCR57+mgZluMEXCrbc2FBgKAD/DoAt38tNwSGsmLldk2O6nTr7lr6ClbVSgWrLwgY6Xw==}
     peerDependencies:
-      vite: 5.4.18
+      vite: 5.4.19
 
   '@histoire/vendors@0.17.17':
     resolution: {integrity: sha512-QZvmffdoJlLuYftPIkOU5Q2FPAdG2JjMuQ5jF7NmEl0n1XnmbMqtRkdYTZ4eF6CO1KLZ0Zyf6gBQvoT1uWNcjA==}
@@ -1042,103 +1042,103 @@ packages:
   '@rails/ujs@7.1.400':
     resolution: {integrity: sha512-YwvXm3BR5tn+VCAKYGycLejMRVZE3Ionj5gFjEeGXCZnI0Rpi+7dKpmyu90kdUY7dRUFpHTdu9zZceEzFLl38w==}
 
-  '@rollup/rollup-android-arm-eabi@4.40.0':
-    resolution: {integrity: sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==}
+  '@rollup/rollup-android-arm-eabi@4.40.2':
+    resolution: {integrity: sha512-JkdNEq+DFxZfUwxvB58tHMHBHVgX23ew41g1OQinthJ+ryhdRk67O31S7sYw8u2lTjHUPFxwar07BBt1KHp/hg==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.40.0':
-    resolution: {integrity: sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==}
+  '@rollup/rollup-android-arm64@4.40.2':
+    resolution: {integrity: sha512-13unNoZ8NzUmnndhPTkWPWbX3vtHodYmy+I9kuLxN+F+l+x3LdVF7UCu8TWVMt1POHLh6oDHhnOA04n8oJZhBw==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.40.0':
-    resolution: {integrity: sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==}
+  '@rollup/rollup-darwin-arm64@4.40.2':
+    resolution: {integrity: sha512-Gzf1Hn2Aoe8VZzevHostPX23U7N5+4D36WJNHK88NZHCJr7aVMG4fadqkIf72eqVPGjGc0HJHNuUaUcxiR+N/w==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.40.0':
-    resolution: {integrity: sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==}
+  '@rollup/rollup-darwin-x64@4.40.2':
+    resolution: {integrity: sha512-47N4hxa01a4x6XnJoskMKTS8XZ0CZMd8YTbINbi+w03A2w4j1RTlnGHOz/P0+Bg1LaVL6ufZyNprSg+fW5nYQQ==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.40.0':
-    resolution: {integrity: sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==}
+  '@rollup/rollup-freebsd-arm64@4.40.2':
+    resolution: {integrity: sha512-8t6aL4MD+rXSHHZUR1z19+9OFJ2rl1wGKvckN47XFRVO+QL/dUSpKA2SLRo4vMg7ELA8pzGpC+W9OEd1Z/ZqoQ==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.40.0':
-    resolution: {integrity: sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==}
+  '@rollup/rollup-freebsd-x64@4.40.2':
+    resolution: {integrity: sha512-C+AyHBzfpsOEYRFjztcYUFsH4S7UsE9cDtHCtma5BK8+ydOZYgMmWg1d/4KBytQspJCld8ZIujFMAdKG1xyr4Q==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.40.0':
-    resolution: {integrity: sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.40.2':
+    resolution: {integrity: sha512-de6TFZYIvJwRNjmW3+gaXiZ2DaWL5D5yGmSYzkdzjBDS3W+B9JQ48oZEsmMvemqjtAFzE16DIBLqd6IQQRuG9Q==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.40.0':
-    resolution: {integrity: sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==}
+  '@rollup/rollup-linux-arm-musleabihf@4.40.2':
+    resolution: {integrity: sha512-urjaEZubdIkacKc930hUDOfQPysezKla/O9qV+O89enqsqUmQm8Xj8O/vh0gHg4LYfv7Y7UsE3QjzLQzDYN1qg==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.40.0':
-    resolution: {integrity: sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==}
+  '@rollup/rollup-linux-arm64-gnu@4.40.2':
+    resolution: {integrity: sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.40.0':
-    resolution: {integrity: sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==}
+  '@rollup/rollup-linux-arm64-musl@4.40.2':
+    resolution: {integrity: sha512-j8CgxvfM0kbnhu4XgjnCWJQyyBOeBI1Zq91Z850aUddUmPeQvuAy6OiMdPS46gNFgy8gN1xkYyLgwLYZG3rBOg==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.40.0':
-    resolution: {integrity: sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==}
+  '@rollup/rollup-linux-loongarch64-gnu@4.40.2':
+    resolution: {integrity: sha512-Ybc/1qUampKuRF4tQXc7G7QY9YRyeVSykfK36Y5Qc5dmrIxwFhrOzqaVTNoZygqZ1ZieSWTibfFhQ5qK8jpWxw==}
     cpu: [loong64]
     os: [linux]
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.40.0':
-    resolution: {integrity: sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==}
+  '@rollup/rollup-linux-powerpc64le-gnu@4.40.2':
+    resolution: {integrity: sha512-3FCIrnrt03CCsZqSYAOW/k9n625pjpuMzVfeI+ZBUSDT3MVIFDSPfSUgIl9FqUftxcUXInvFah79hE1c9abD+Q==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.40.0':
-    resolution: {integrity: sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==}
+  '@rollup/rollup-linux-riscv64-gnu@4.40.2':
+    resolution: {integrity: sha512-QNU7BFHEvHMp2ESSY3SozIkBPaPBDTsfVNGx3Xhv+TdvWXFGOSH2NJvhD1zKAT6AyuuErJgbdvaJhYVhVqrWTg==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-musl@4.40.0':
-    resolution: {integrity: sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==}
+  '@rollup/rollup-linux-riscv64-musl@4.40.2':
+    resolution: {integrity: sha512-5W6vNYkhgfh7URiXTO1E9a0cy4fSgfE4+Hl5agb/U1sa0kjOLMLC1wObxwKxecE17j0URxuTrYZZME4/VH57Hg==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.40.0':
-    resolution: {integrity: sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==}
+  '@rollup/rollup-linux-s390x-gnu@4.40.2':
+    resolution: {integrity: sha512-B7LKIz+0+p348JoAL4X/YxGx9zOx3sR+o6Hj15Y3aaApNfAshK8+mWZEf759DXfRLeL2vg5LYJBB7DdcleYCoQ==}
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.40.0':
-    resolution: {integrity: sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==}
+  '@rollup/rollup-linux-x64-gnu@4.40.2':
+    resolution: {integrity: sha512-lG7Xa+BmBNwpjmVUbmyKxdQJ3Q6whHjMjzQplOs5Z+Gj7mxPtWakGHqzMqNER68G67kmCX9qX57aRsW5V0VOng==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.40.0':
-    resolution: {integrity: sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==}
+  '@rollup/rollup-linux-x64-musl@4.40.2':
+    resolution: {integrity: sha512-tD46wKHd+KJvsmije4bUskNuvWKFcTOIM9tZ/RrmIvcXnbi0YK/cKS9FzFtAm7Oxi2EhV5N2OpfFB348vSQRXA==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-win32-arm64-msvc@4.40.0':
-    resolution: {integrity: sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==}
+  '@rollup/rollup-win32-arm64-msvc@4.40.2':
+    resolution: {integrity: sha512-Bjv/HG8RRWLNkXwQQemdsWw4Mg+IJ29LK+bJPW2SCzPKOUaMmPEppQlu/Fqk1d7+DX3V7JbFdbkh/NMmurT6Pg==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.40.0':
-    resolution: {integrity: sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==}
+  '@rollup/rollup-win32-ia32-msvc@4.40.2':
+    resolution: {integrity: sha512-dt1llVSGEsGKvzeIO76HToiYPNPYPkmjhMHhP00T9S4rDern8P2ZWvWAQUEJ+R1UdMWJ/42i/QqJ2WV765GZcA==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.40.0':
-    resolution: {integrity: sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==}
+  '@rollup/rollup-win32-x64-msvc@4.40.2':
+    resolution: {integrity: sha512-bwspbWB04XJpeElvsp+DCylKfF4trJDa2Y9Go8O6A7YLX2LIKGcNK/CYImJN6ZP4DcuOHB4Utl3iCbnR62DudA==}
     cpu: [x64]
     os: [win32]
 
@@ -1813,7 +1813,7 @@ packages:
     resolution: {integrity: sha512-N2XSI2n3sQqp5w7Y/AN/L2XDjBIRGqXko+eDp42sydYSBeJuSm5a1sLf8zakmo8u7tA8NmBgoDLA1HeOESjp9A==}
     engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
-      vite: 5.4.18
+      vite: 5.4.19
       vue: ^3.2.25
 
   '@vitest/coverage-v8@3.0.5':
@@ -1832,7 +1832,7 @@ packages:
     resolution: {integrity: sha512-CLPNBFBIE7x6aEGbIjaQAX03ZZlBMaWwAjBdMkIf/cAn6xzLTiM3zYqO/WAbieEjsAZir6tO71mzeHZoodThvw==}
     peerDependencies:
       msw: ^2.4.9
-      vite: 5.4.18
+      vite: 5.4.19
     peerDependenciesMeta:
       msw:
         optional: true
@@ -3117,7 +3117,7 @@ packages:
     resolution: {integrity: sha512-DiRMSIgj340z+zikqf0f3Pj0CTv2/xtdBMBIAO1EARat+QXxMwumbfK41Gi7f9IIBr+UVmomNcwFxVY2EM/vrw==}
     hasBin: true
     peerDependencies:
-      vite: 5.4.18
+      vite: 5.4.19
 
   hotkeys-js@3.8.7:
     resolution: {integrity: sha512-ckAx3EkUr5XjDwjEHDorHxRO2Kb7z6Z2Sxul4MbBkN8Nho7XDslQsgMJT+CiJ5Z4TgRxxvKHEpuLE3imzqy4Lg==}
@@ -4365,8 +4365,8 @@ packages:
     deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
-  rollup@4.40.0:
-    resolution: {integrity: sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==}
+  rollup@4.40.2:
+    resolution: {integrity: sha512-tfUOg6DTP4rhQ3VjOO6B4wyrJnGOX85requAXvqYTHsOgb2TFJdZ3aWpT8W2kPoypSGP7dZUyzxJ9ee4buM5Fg==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -4891,10 +4891,10 @@ packages:
   vite-plugin-ruby@5.0.0:
     resolution: {integrity: sha512-c8PjTp21Ah/ttgnNUyu0qvCXZI08Jr9I24oUKg3TRIRhF5GcOZ++6wtlTCrNFd9COEQbpXHxlRIXd/MEg0iZJw==}
     peerDependencies:
-      vite: 5.4.18
+      vite: 5.4.19
 
-  vite@5.4.18:
-    resolution: {integrity: sha512-1oDcnEp3lVyHCuQ2YFelM4Alm2o91xNoMncRm1U7S+JdYfYOvbiGZ3/CxGttrOu2M/KcGz7cRC2DoNUA6urmMA==}
+  vite@5.4.19:
+    resolution: {integrity: sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -5700,10 +5700,10 @@ snapshots:
       highlight.js: 11.10.0
       vue: 3.5.12(typescript@5.6.2)
 
-  '@histoire/app@0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+  '@histoire/app@0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
     dependencies:
-      '@histoire/controls': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
-      '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/controls': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/shared': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       '@histoire/vendors': 0.17.17
       '@types/flexsearch': 0.7.6
       flexsearch: 0.7.21
@@ -5711,7 +5711,7 @@ snapshots:
     transitivePeerDependencies:
       - vite
 
-  '@histoire/controls@0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+  '@histoire/controls@0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
     dependencies:
       '@codemirror/commands': 6.7.0
       '@codemirror/lang-json': 6.0.1
@@ -5720,26 +5720,26 @@ snapshots:
       '@codemirror/state': 6.4.1
       '@codemirror/theme-one-dark': 6.1.2
       '@codemirror/view': 6.34.1
-      '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/shared': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       '@histoire/vendors': 0.17.17
     transitivePeerDependencies:
       - vite
 
-  '@histoire/plugin-vue@0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
+  '@histoire/plugin-vue@0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
     dependencies:
-      '@histoire/controls': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
-      '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/controls': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/shared': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       '@histoire/vendors': 0.17.17
       change-case: 4.1.2
       globby: 13.2.2
-      histoire: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      histoire: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       launch-editor: 2.9.1
       pathe: 1.1.2
       vue: 3.5.12(typescript@5.6.2)
     transitivePeerDependencies:
       - vite
 
-  '@histoire/shared@0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+  '@histoire/shared@0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
     dependencies:
       '@histoire/vendors': 0.17.17
       '@types/fs-extra': 9.0.13
@@ -5747,7 +5747,7 @@ snapshots:
       chokidar: 3.6.0
       pathe: 1.1.2
       picocolors: 1.1.0
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
 
   '@histoire/vendors@0.17.17': {}
 
@@ -5972,64 +5972,64 @@ snapshots:
 
   '@rails/ujs@7.1.400': {}
 
-  '@rollup/rollup-android-arm-eabi@4.40.0':
+  '@rollup/rollup-android-arm-eabi@4.40.2':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.40.0':
+  '@rollup/rollup-android-arm64@4.40.2':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.40.0':
+  '@rollup/rollup-darwin-arm64@4.40.2':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.40.0':
+  '@rollup/rollup-darwin-x64@4.40.2':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.40.0':
+  '@rollup/rollup-freebsd-arm64@4.40.2':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.40.0':
+  '@rollup/rollup-freebsd-x64@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.40.0':
+  '@rollup/rollup-linux-arm-gnueabihf@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.40.0':
+  '@rollup/rollup-linux-arm-musleabihf@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.40.0':
+  '@rollup/rollup-linux-arm64-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.40.0':
+  '@rollup/rollup-linux-arm64-musl@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.40.0':
+  '@rollup/rollup-linux-loongarch64-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.40.0':
+  '@rollup/rollup-linux-powerpc64le-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.40.0':
+  '@rollup/rollup-linux-riscv64-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.40.0':
+  '@rollup/rollup-linux-riscv64-musl@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.40.0':
+  '@rollup/rollup-linux-s390x-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.40.0':
+  '@rollup/rollup-linux-x64-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.40.0':
+  '@rollup/rollup-linux-x64-musl@4.40.2':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.40.0':
+  '@rollup/rollup-win32-arm64-msvc@4.40.2':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.40.0':
+  '@rollup/rollup-win32-ia32-msvc@4.40.2':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.40.0':
+  '@rollup/rollup-win32-x64-msvc@4.40.2':
     optional: true
 
   '@rtsao/scc@1.1.0': {}
@@ -6843,9 +6843,9 @@ snapshots:
       global: 4.4.0
       is-function: 1.0.2
 
-  '@vitejs/plugin-vue@5.1.4(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
+  '@vitejs/plugin-vue@5.1.4(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
     dependencies:
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
       vue: 3.5.12(typescript@5.6.2)
 
   '@vitest/coverage-v8@3.0.5(vitest@3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0))':
@@ -6873,13 +6873,13 @@ snapshots:
       chai: 5.1.2
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.0.5(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+  '@vitest/mocker@3.0.5(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
     dependencies:
       '@vitest/spy': 3.0.5
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
 
   '@vitest/pretty-format@3.0.5':
     dependencies:
@@ -8436,12 +8436,12 @@ snapshots:
 
   highlight.js@11.10.0: {}
 
-  histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
+  histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
     dependencies:
       '@akryum/tinypool': 0.3.1
-      '@histoire/app': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
-      '@histoire/controls': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
-      '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/app': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/controls': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/shared': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       '@histoire/vendors': 0.17.17
       '@types/flexsearch': 0.7.6
       '@types/markdown-it': 12.2.3
@@ -8468,7 +8468,7 @@ snapshots:
       sade: 1.8.1
       shiki-es: 0.2.0
       sirv: 2.0.4
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
       vite-node: 2.0.1(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
     transitivePeerDependencies:
       - '@types/node'
@@ -9811,30 +9811,30 @@ snapshots:
     dependencies:
       glob: 7.2.3
 
-  rollup@4.40.0:
+  rollup@4.40.2:
     dependencies:
       '@types/estree': 1.0.7
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.40.0
-      '@rollup/rollup-android-arm64': 4.40.0
-      '@rollup/rollup-darwin-arm64': 4.40.0
-      '@rollup/rollup-darwin-x64': 4.40.0
-      '@rollup/rollup-freebsd-arm64': 4.40.0
-      '@rollup/rollup-freebsd-x64': 4.40.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.40.0
-      '@rollup/rollup-linux-arm-musleabihf': 4.40.0
-      '@rollup/rollup-linux-arm64-gnu': 4.40.0
-      '@rollup/rollup-linux-arm64-musl': 4.40.0
-      '@rollup/rollup-linux-loongarch64-gnu': 4.40.0
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.40.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.40.0
-      '@rollup/rollup-linux-riscv64-musl': 4.40.0
-      '@rollup/rollup-linux-s390x-gnu': 4.40.0
-      '@rollup/rollup-linux-x64-gnu': 4.40.0
-      '@rollup/rollup-linux-x64-musl': 4.40.0
-      '@rollup/rollup-win32-arm64-msvc': 4.40.0
-      '@rollup/rollup-win32-ia32-msvc': 4.40.0
-      '@rollup/rollup-win32-x64-msvc': 4.40.0
+      '@rollup/rollup-android-arm-eabi': 4.40.2
+      '@rollup/rollup-android-arm64': 4.40.2
+      '@rollup/rollup-darwin-arm64': 4.40.2
+      '@rollup/rollup-darwin-x64': 4.40.2
+      '@rollup/rollup-freebsd-arm64': 4.40.2
+      '@rollup/rollup-freebsd-x64': 4.40.2
+      '@rollup/rollup-linux-arm-gnueabihf': 4.40.2
+      '@rollup/rollup-linux-arm-musleabihf': 4.40.2
+      '@rollup/rollup-linux-arm64-gnu': 4.40.2
+      '@rollup/rollup-linux-arm64-musl': 4.40.2
+      '@rollup/rollup-linux-loongarch64-gnu': 4.40.2
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.40.2
+      '@rollup/rollup-linux-riscv64-gnu': 4.40.2
+      '@rollup/rollup-linux-riscv64-musl': 4.40.2
+      '@rollup/rollup-linux-s390x-gnu': 4.40.2
+      '@rollup/rollup-linux-x64-gnu': 4.40.2
+      '@rollup/rollup-linux-x64-musl': 4.40.2
+      '@rollup/rollup-win32-arm64-msvc': 4.40.2
+      '@rollup/rollup-win32-ia32-msvc': 4.40.2
+      '@rollup/rollup-win32-x64-msvc': 4.40.2
       fsevents: 2.3.3
 
   rope-sequence@1.3.2: {}
@@ -10429,7 +10429,7 @@ snapshots:
       debug: 4.4.0
       pathe: 1.1.2
       picocolors: 1.1.1
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -10441,19 +10441,19 @@ snapshots:
       - supports-color
       - terser
 
-  vite-plugin-ruby@5.0.0(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
+  vite-plugin-ruby@5.0.0(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
     dependencies:
       debug: 4.3.5
       fast-glob: 3.3.2
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
     transitivePeerDependencies:
       - supports-color
 
-  vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0):
+  vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.5.3
-      rollup: 4.40.0
+      rollup: 4.40.2
     optionalDependencies:
       '@types/node': 22.7.0
       fsevents: 2.3.3
@@ -10463,7 +10463,7 @@ snapshots:
   vitest@3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0):
     dependencies:
       '@vitest/expect': 3.0.5
-      '@vitest/mocker': 3.0.5(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@vitest/mocker': 3.0.5(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       '@vitest/pretty-format': 3.0.5
       '@vitest/runner': 3.0.5
       '@vitest/snapshot': 3.0.5
@@ -10479,7 +10479,7 @@ snapshots:
       tinyexec: 0.3.2
       tinypool: 1.0.2
       tinyrainbow: 2.0.0
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
       vite-node: 2.0.1(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index d93886fc3..a3697be84 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -843,7 +843,7 @@ RSpec.describe 'Conversations API', type: :request do
         create(:inbox_member, user: agent, inbox: conversation.inbox)
       end
 
-      it 'updates last seen' do
+      it 'updates custom attributes' do
         post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/custom_attributes",
              headers: agent.create_new_auth_token,
              params: valid_params,
@@ -854,6 +854,27 @@ RSpec.describe 'Conversations API', type: :request do
         expect(conversation.reload.custom_attributes.count).to eq 3
       end
     end
+
+    context 'when it is a bot' do
+      let(:agent_bot) { create(:agent_bot, account: account) }
+      let(:custom_attributes) { { bot_id: 1001, flow_name: 'support_flow', step: 'greeting' } }
+      let(:valid_params) { { custom_attributes: custom_attributes } }
+
+      before do
+        create(:agent_bot_inbox, agent_bot: agent_bot, inbox: conversation.inbox)
+      end
+
+      it 'updates custom attributes' do
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/custom_attributes",
+             headers: { api_access_token: agent_bot.access_token.token },
+             params: valid_params,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(conversation.reload.custom_attributes).not_to be_nil
+        expect(conversation.reload.custom_attributes.count).to eq 3
+      end
+    end
   end
 
   describe 'GET /api/v1/accounts/{account.id}/conversations/:id/attachments' do
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index bd604f650..ec49ecd39 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -119,7 +119,7 @@ RSpec.describe 'Accounts API', type: :request do
 
     context 'when it is an authenticated user' do
       it 'shows an account' do
-        account.update(auto_resolve_duration: 30)
+        account.update(name: 'new name')
 
         get "/api/v1/accounts/#{account.id}",
             headers: admin.create_new_auth_token,
@@ -130,7 +130,6 @@ RSpec.describe 'Accounts API', type: :request do
         expect(response.body).to include(account.locale)
         expect(response.body).to include(account.domain)
         expect(response.body).to include(account.support_email)
-        expect(response.body).to include(account.auto_resolve_duration.to_s)
         expect(response.body).to include(account.locale)
       end
     end
@@ -189,7 +188,9 @@ RSpec.describe 'Accounts API', type: :request do
         locale: 'en',
         domain: 'example.com',
         support_email: 'care@example.com',
-        auto_resolve_duration: 40,
+        auto_resolve_after: 40,
+        auto_resolve_message: 'Auto resolved',
+        auto_resolve_ignore_waiting: false,
         timezone: 'Asia/Kolkata',
         industry: 'Technology',
         company_size: '1-10'
@@ -206,7 +207,10 @@ RSpec.describe 'Accounts API', type: :request do
         expect(account.reload.locale).to eq(params[:locale])
         expect(account.reload.domain).to eq(params[:domain])
         expect(account.reload.support_email).to eq(params[:support_email])
-        expect(account.reload.auto_resolve_duration).to eq(params[:auto_resolve_duration])
+
+        %w[auto_resolve_after auto_resolve_message auto_resolve_ignore_waiting].each do |attribute|
+          expect(account.reload.settings[attribute]).to eq(params[attribute.to_sym])
+        end
 
         %w[timezone industry company_size].each do |attribute|
           expect(account.reload.custom_attributes[attribute]).to eq(params[attribute.to_sym])
diff --git a/spec/controllers/api/v1/widget/campaigns_controller_spec.rb b/spec/controllers/api/v1/widget/campaigns_controller_spec.rb
index 602fa96b7..91e5e40ba 100644
--- a/spec/controllers/api/v1/widget/campaigns_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/campaigns_controller_spec.rb
@@ -9,7 +9,11 @@ RSpec.describe '/api/v1/widget/campaigns', type: :request do
   describe 'GET /api/v1/widget/campaigns' do
     let(:params) { { website_token: web_widget.website_token } }
 
-    context 'with correct website token' do
+    context 'when campaigns feature is enabled' do
+      before do
+        account.enable_features!('campaigns')
+      end
+
       it 'returns the list of enabled campaigns' do
         get '/api/v1/widget/campaigns', params: params
 
@@ -21,8 +25,22 @@ RSpec.describe '/api/v1/widget/campaigns', type: :request do
       end
     end
 
+    context 'when campaigns feature is disabled' do
+      before do
+        account.disable_features!('campaigns')
+      end
+
+      it 'returns empty array' do
+        get '/api/v1/widget/campaigns', params: params
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+        expect(json_response).to eq []
+      end
+    end
+
     context 'with invalid website token' do
-      it 'returns the list of agents' do
+      it 'returns not found status' do
         get '/api/v1/widget/campaigns', params: { website_token: '' }
         expect(response).to have_http_status(:not_found)
       end
diff --git a/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb b/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb
index 0e4ef3d45..0a1a1484d 100644
--- a/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb
+++ b/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Account::ConversationsResolutionSchedulerJob do
   end
 
   it 'enqueues Conversations::ResolutionJob' do
-    account.update(auto_resolve_duration: 10)
+    account.update(auto_resolve_after: 10 * 60 * 24)
     expect(Conversations::ResolutionJob).to receive(:perform_later).with(account: account).once
     described_class.perform_now
   end
diff --git a/spec/jobs/conversations/resolution_job_spec.rb b/spec/jobs/conversations/resolution_job_spec.rb
index 1a812ac86..0103bd72b 100644
--- a/spec/jobs/conversations/resolution_job_spec.rb
+++ b/spec/jobs/conversations/resolution_job_spec.rb
@@ -17,16 +17,39 @@ RSpec.describe Conversations::ResolutionJob do
     expect(conversation.reload.status).to eq('open')
   end
 
-  it 'resolves the issue if time of inactivity is more than the auto resolve duration' do
-    account.update(auto_resolve_duration: 10)
-    conversation.update(last_activity_at: 13.days.ago)
-    described_class.perform_now(account: account)
-    expect(conversation.reload.status).to eq('resolved')
+  context 'when auto_resolve_ignore_waiting is true' do
+    it 'resolves non-waiting conversations if time of inactivity is more than auto resolve duration' do
+      account.update(auto_resolve_after: 14_400, auto_resolve_ignore_waiting: true) # 10 days in minutes
+      conversation.update(last_activity_at: 13.days.ago, waiting_since: nil)
+      described_class.perform_now(account: account)
+      expect(conversation.reload.status).to eq('resolved')
+    end
+
+    it 'does not resolve waiting conversations even if time of inactivity is more than auto resolve duration' do
+      account.update(auto_resolve_after: 14_400, auto_resolve_ignore_waiting: true) # 10 days in minutes
+      conversation.update(last_activity_at: 13.days.ago, waiting_since: 13.days.ago)
+      described_class.perform_now(account: account)
+      expect(conversation.reload.status).to eq('open')
+    end
   end
 
-  it 'resolved only a limited number of conversations in a single execution' do
+  context 'when auto_resolve_ignore_waiting is false' do
+    it 'resolves all conversations if time of inactivity is more than auto resolve duration' do
+      account.update(auto_resolve_after: 14_400, auto_resolve_ignore_waiting: false) # 10 days in minutes
+      # Create one waiting conversation and one non-waiting conversation
+      waiting_conversation = create(:conversation, account: account, last_activity_at: 13.days.ago, waiting_since: 13.days.ago)
+      non_waiting_conversation = create(:conversation, account: account, last_activity_at: 13.days.ago, waiting_since: nil)
+
+      described_class.perform_now(account: account)
+
+      expect(waiting_conversation.reload.status).to eq('resolved')
+      expect(non_waiting_conversation.reload.status).to eq('resolved')
+    end
+  end
+
+  it 'resolves only a limited number of conversations in a single execution' do
     stub_const('Limits::BULK_ACTIONS_LIMIT', 2)
-    account.update(auto_resolve_duration: 10)
+    account.update(auto_resolve_after: 14_400, auto_resolve_ignore_waiting: false) # 10 days in minutes
     create_list(:conversation, 3, account: account, last_activity_at: 13.days.ago)
     described_class.perform_now(account: account)
     expect(account.conversations.resolved.count).to eq(Limits::BULK_ACTIONS_LIMIT)
diff --git a/spec/jobs/internal/process_stale_contacts_job_spec.rb b/spec/jobs/internal/process_stale_contacts_job_spec.rb
index 412ee06cc..ca873756c 100644
--- a/spec/jobs/internal/process_stale_contacts_job_spec.rb
+++ b/spec/jobs/internal/process_stale_contacts_job_spec.rb
@@ -3,44 +3,62 @@ require 'rails_helper'
 RSpec.describe Internal::ProcessStaleContactsJob do
   subject(:job) { described_class.perform_later }
 
-  it 'enqueues the job' do
-    allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
-    expect { job }.to have_enqueued_job(described_class)
-      .on_queue('scheduled_jobs')
+  context 'when in cloud environment' do
+    before do
+      allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
+    end
+
+    it 'processes accounts based on the day of month' do
+      # Set a fixed day for testing
+      day_of_month = 16
+      remainder = day_of_month % described_class::DISTRIBUTION_GROUPS
+      allow(Date).to receive(:current).and_return(Date.new(2025, 5, day_of_month))
+
+      # Create an account and set its ID to match today's pattern
+      account = create(:account)
+      allow(account).to receive(:id).and_return(remainder)
+
+      # Mock the Account.where to return our filtered accounts
+      account_relation = double
+      allow(Account).to receive(:where).with("id % #{described_class::DISTRIBUTION_GROUPS} = ?", remainder).and_return(account_relation)
+      allow(account_relation).to receive(:find_each).and_yield(account)
+
+      # Mock the delay setting
+      allow(Internal::RemoveStaleContactsJob).to receive(:set).and_return(Internal::RemoveStaleContactsJob)
+      expect(Internal::RemoveStaleContactsJob).to receive(:perform_later).with(account)
+
+      described_class.perform_now
+    end
+
+    it 'adds a delay between jobs' do
+      day_of_month = 15
+      remainder = day_of_month % described_class::DISTRIBUTION_GROUPS
+      allow(Date).to receive(:current).and_return(Date.new(2025, 5, day_of_month))
+
+      account = create(:account)
+
+      account_relation = double
+      allow(Account).to receive(:where).with("id % #{described_class::DISTRIBUTION_GROUPS} = ?", remainder).and_return(account_relation)
+      allow(account_relation).to receive(:find_each).and_yield(account)
+
+      expect(Internal::RemoveStaleContactsJob).to receive(:set) do |args|
+        expect(args[:wait]).to be_between(1.minute, 10.minutes)
+        Internal::RemoveStaleContactsJob
+      end
+      expect(Internal::RemoveStaleContactsJob).to receive(:perform_later).with(account)
+
+      described_class.perform_now
+    end
   end
 
-  it 'enqueues RemoveStaleContactsJob for each account' do
-    allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
-    account1 = create(:account)
-    account2 = create(:account)
-    account3 = create(:account)
+  context 'when not in cloud environment' do
+    it 'does not process any accounts' do
+      allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(false)
 
-    expect { described_class.perform_now }.to have_enqueued_job(Internal::RemoveStaleContactsJob)
-      .with(account1)
-      .on_queue('low')
-    expect { described_class.perform_now }.to have_enqueued_job(Internal::RemoveStaleContactsJob)
-      .with(account2)
-      .on_queue('low')
-    expect { described_class.perform_now }.to have_enqueued_job(Internal::RemoveStaleContactsJob)
-      .with(account3)
-      .on_queue('low')
-  end
+      expect(Account).not_to receive(:where)
+      expect(Internal::RemoveStaleContactsJob).not_to receive(:perform_later)
 
-  it 'processes accounts in batches' do
-    allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
-    account = create(:account)
-    allow(Account).to receive(:find_in_batches).with(batch_size: 100).and_yield([account])
-
-    expect(Internal::RemoveStaleContactsJob).to receive(:perform_later).with(account)
-    described_class.perform_now
-  end
-
-  it 'does not process accounts when not in cloud environment' do
-    allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(false)
-    create(:account)
-
-    expect(Account).not_to receive(:find_in_batches)
-    expect(Internal::RemoveStaleContactsJob).not_to receive(:perform_later)
-    described_class.perform_now
+      described_class.perform_now
+    end
   end
 end
diff --git a/spec/jobs/internal/remove_stale_contacts_job_spec.rb b/spec/jobs/internal/remove_stale_contacts_job_spec.rb
index ea2636114..373fc5867 100644
--- a/spec/jobs/internal/remove_stale_contacts_job_spec.rb
+++ b/spec/jobs/internal/remove_stale_contacts_job_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Internal::RemoveStaleContactsJob do
   it 'enqueues the job' do
     expect { job }.to have_enqueued_job(described_class)
       .with(account)
-      .on_queue('low')
+      .on_queue('housekeeping')
   end
 
   it 'calls the RemoveStaleContactsService' do
diff --git a/spec/listeners/webhook_listener_spec.rb b/spec/listeners/webhook_listener_spec.rb
index 736db07d0..5062b11bc 100644
--- a/spec/listeners/webhook_listener_spec.rb
+++ b/spec/listeners/webhook_listener_spec.rb
@@ -279,4 +279,79 @@ describe WebhookListener do
       end
     end
   end
+
+  describe '#conversation_typing_on' do
+    let(:event_name) { :'conversation.typing_on' }
+    let!(:typing_event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation, user: user) }
+
+    context 'when webhook is not configured' do
+      it 'does not trigger webhook' do
+        expect(WebhookJob).not_to receive(:perform_later)
+        listener.conversation_typing_on(typing_event)
+      end
+    end
+
+    context 'when webhook is configured' do
+      it 'triggers webhook' do
+        webhook = create(:webhook, inbox: inbox, account: account, subscriptions: ['conversation_typing_on'])
+
+        payload = {
+          event: 'conversation_typing_on',
+          user: user.webhook_data,
+          conversation: conversation.webhook_data,
+          is_private: false
+        }
+
+        expect(WebhookJob).to receive(:perform_later).with(webhook.url, payload).once
+        listener.conversation_typing_on(typing_event)
+      end
+    end
+
+    context 'when inbox is an API Channel' do
+      it 'triggers webhook if webhook_url is present' do
+        channel_api = create(:channel_api, account: account)
+        api_inbox = channel_api.inbox
+        api_conversation = create(:conversation, account: account, inbox: api_inbox, assignee: user)
+        api_event = Events::Base.new(event_name, Time.zone.now, conversation: api_conversation, user: user, is_private: false)
+
+        payload = {
+          event: 'conversation_typing_on',
+          user: user.webhook_data,
+          conversation: api_conversation.webhook_data,
+          is_private: false
+        }
+
+        expect(WebhookJob).to receive(:perform_later).with(channel_api.webhook_url, payload, :api_inbox_webhook).once
+        listener.conversation_typing_on(api_event)
+      end
+    end
+  end
+
+  describe '#conversation_typing_off' do
+    let(:event_name) { :'conversation.typing_off' }
+    let!(:typing_event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation, user: user, is_private: false) }
+
+    context 'when webhook is not configured' do
+      it 'does not trigger webhook' do
+        expect(WebhookJob).not_to receive(:perform_later)
+        listener.conversation_typing_off(typing_event)
+      end
+    end
+
+    context 'when webhook is configured' do
+      it 'triggers webhook' do
+        webhook = create(:webhook, inbox: inbox, account: account, subscriptions: ['conversation_typing_off'])
+
+        payload = {
+          event: 'conversation_typing_off',
+          user: user.webhook_data,
+          conversation: conversation.webhook_data,
+          is_private: false
+        }
+
+        expect(WebhookJob).to receive(:perform_later).with(webhook.url, payload).once
+        listener.conversation_typing_off(typing_event)
+      end
+    end
+  end
 end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index e545f8e4a..51ab792cf 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -3,9 +3,6 @@
 require 'rails_helper'
 
 RSpec.describe Account do
-  it { is_expected.to validate_numericality_of(:auto_resolve_duration).is_greater_than_or_equal_to(1) }
-  it { is_expected.to validate_numericality_of(:auto_resolve_duration).is_less_than_or_equal_to(999) }
-
   it { is_expected.to have_many(:users).through(:account_users) }
   it { is_expected.to have_many(:account_users) }
   it { is_expected.to have_many(:inboxes).dependent(:destroy_async) }
@@ -134,4 +131,86 @@ RSpec.describe Account do
       expect(account.locale_english_name).to eq('portuguese')
     end
   end
+
+  describe 'settings' do
+    let(:account) { create(:account) }
+
+    context 'when auto_resolve_after' do
+      it 'validates minimum value' do
+        account.settings = { auto_resolve_after: 4 }
+        expect(account).to be_invalid
+        expect(account.errors.messages).to eq({ auto_resolve_after: ['must be greater than or equal to 10'] })
+      end
+
+      it 'validates maximum value' do
+        account.settings = { auto_resolve_after: 1_439_857 }
+        expect(account).to be_invalid
+        expect(account.errors.messages).to eq({ auto_resolve_after: ['must be less than or equal to 1439856'] })
+      end
+
+      it 'allows valid values' do
+        account.settings = { auto_resolve_after: 15 }
+        expect(account).to be_valid
+
+        account.settings = { auto_resolve_after: 1_439_856 }
+        expect(account).to be_valid
+      end
+
+      it 'allows null values' do
+        account.settings = { auto_resolve_after: nil }
+        expect(account).to be_valid
+      end
+    end
+
+    context 'when auto_resolve_message' do
+      it 'allows string values' do
+        account.settings = { auto_resolve_message: 'This conversation has been resolved automatically.' }
+        expect(account).to be_valid
+      end
+
+      it 'allows empty string' do
+        account.settings = { auto_resolve_message: '' }
+        expect(account).to be_valid
+      end
+
+      it 'allows nil values' do
+        account.settings = { auto_resolve_message: nil }
+        expect(account).to be_valid
+      end
+    end
+
+    context 'when using store_accessor' do
+      it 'correctly gets and sets auto_resolve_after' do
+        account.auto_resolve_after = 30
+        expect(account.auto_resolve_after).to eq(30)
+        expect(account.settings['auto_resolve_after']).to eq(30)
+      end
+
+      it 'correctly gets and sets auto_resolve_message' do
+        message = 'This conversation was automatically resolved'
+        account.auto_resolve_message = message
+        expect(account.auto_resolve_message).to eq(message)
+        expect(account.settings['auto_resolve_message']).to eq(message)
+      end
+
+      it 'handles nil values correctly' do
+        account.auto_resolve_after = nil
+        account.auto_resolve_message = nil
+        expect(account.auto_resolve_after).to be_nil
+        expect(account.auto_resolve_message).to be_nil
+      end
+    end
+
+    context 'when using with_auto_resolve scope' do
+      it 'finds accounts with auto_resolve_after set' do
+        account.update(auto_resolve_after: 40 * 24 * 60)
+        expect(described_class.with_auto_resolve).to include(account)
+      end
+
+      it 'does not find accounts without auto_resolve_after' do
+        account.update(auto_resolve_after: nil)
+        expect(described_class.with_auto_resolve).not_to include(account)
+      end
+    end
+  end
 end
diff --git a/spec/models/concerns/json_schema_validator_spec.rb b/spec/models/concerns/json_schema_validator_spec.rb
index 77e08f53f..1c89abe7a 100644
--- a/spec/models/concerns/json_schema_validator_spec.rb
+++ b/spec/models/concerns/json_schema_validator_spec.rb
@@ -5,9 +5,10 @@ RSpec.describe JsonSchemaValidator, type: :validator do
     'type' => 'object',
     'properties' => {
       'name' => { 'type' => 'string' },
-      'age' => { 'type' => 'integer' },
+      'age' => { 'type' => 'integer', 'minimum' => 18, 'maximum' => 100 },
       'is_active' => { 'type' => 'boolean' },
       'tags' => { 'type' => 'array' },
+      'score' => { 'type' => 'number', 'minimum' => 0, 'maximum' => 10 },
       'address' => {
         'type' => 'object',
         'properties' => {
@@ -109,4 +110,44 @@ RSpec.describe JsonSchemaValidator, type: :validator do
                                             :is_active => ['must be of type boolean'], :tags => ['must be of type array'] })
     end
   end
+
+  context 'with value below minimum' do
+    let(:invalid_data) do
+      {
+        'name' => 'John Doe',
+        'age' => 15,
+        'score' => -1,
+        'is_active' => true
+      }
+    end
+
+    it 'fails validation' do
+      model = TestModelForJSONValidation.new(invalid_data)
+      expect(model.valid?).to be false
+      expect(model.errors.messages).to eq({
+                                            :age => ['must be greater than or equal to 18'],
+                                            :score => ['must be greater than or equal to 0']
+                                          })
+    end
+  end
+
+  context 'with value above maximum' do
+    let(:invalid_data) do
+      {
+        'name' => 'John Doe',
+        'age' => 120,
+        'score' => 11,
+        'is_active' => true
+      }
+    end
+
+    it 'fails validation' do
+      model = TestModelForJSONValidation.new(invalid_data)
+      expect(model.valid?).to be false
+      expect(model.errors.messages).to eq({
+                                            :age => ['must be less than or equal to 100'],
+                                            :score => ['must be less than or equal to 10']
+                                          })
+    end
+  end
 end
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index e437f5d89..9395f3e55 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -213,11 +213,18 @@ RSpec.describe Conversation do
     end
 
     it 'adds a message for system auto resolution if marked resolved by system' do
-      account.update(auto_resolve_duration: 40)
+      account.update(auto_resolve_after: 40 * 24 * 60)
       conversation2 = create(:conversation, status: 'open', account: account, assignee: old_assignee)
       Current.user = nil
 
-      system_resolved_message = "Conversation was marked resolved by system due to #{account.auto_resolve_duration} days of inactivity"
+      message_data = if account.auto_resolve_after >= 1440 && account.auto_resolve_after % 1440 == 0
+                       { key: 'auto_resolved_days', count: account.auto_resolve_after / 1440 }
+                     elsif account.auto_resolve_after >= 60 && account.auto_resolve_after % 60 == 0
+                       { key: 'auto_resolved_hours', count: account.auto_resolve_after / 60 }
+                     else
+                       { key: 'auto_resolved_minutes', count: account.auto_resolve_after }
+                     end
+      system_resolved_message = "Conversation was marked resolved by system due to #{message_data[:count]} days of inactivity"
       expect { conversation2.update(status: :resolved) }
         .to have_enqueued_job(Conversations::ActivityMessageJob)
         .with(conversation2, { account_id: conversation2.account_id, inbox_id: conversation2.inbox_id, message_type: :activity,