diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index e6270c807..86e21d9fd 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -24,9 +24,8 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   def search
     render json: { error: 'Specify search string with parameter q' }, status: :unprocessable_entity if params[:q].blank? && return
 
-    contacts = resolved_contacts.where(
-      'name ILIKE :search OR email ILIKE :search OR phone_number ILIKE :search OR contacts.identifier LIKE :search
-        OR contacts.additional_attributes->>\'company_name\' ILIKE :search',
+    contacts = Current.account.contacts.where(
+      'name ILIKE :search OR email ILIKE :search OR phone_number ILIKE :search OR contacts.identifier LIKE :search',
       search: "%#{params[:q].strip}%"
     )
     @contacts = fetch_contacts(contacts)
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index 4301eaa4a..e2b930ac9 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -110,6 +110,15 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
   end
 
   def update_last_seen
+    # High-traffic accounts generate excessive DB writes when agents frequently switch between conversations.
+    # Throttle last_seen updates to once per hour when there are no unread messages to reduce DB load.
+    # Always update immediately if there are unread messages to maintain accurate read/unread state.
+    return update_last_seen_on_conversation(DateTime.now.utc, true) if assignee? && @conversation.assignee_unread_messages.any?
+    return update_last_seen_on_conversation(DateTime.now.utc, false) if !assignee? && @conversation.unread_messages.any?
+
+    # No unread messages - apply throttling to limit DB writes
+    return unless should_update_last_seen?
+
     update_last_seen_on_conversation(DateTime.now.utc, assignee?)
   end
 
@@ -142,12 +151,25 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
   end
 
   def update_last_seen_on_conversation(last_seen_at, update_assignee)
+    updates = { agent_last_seen_at: last_seen_at }
+    updates[:assignee_last_seen_at] = last_seen_at if update_assignee.present?
+
     # rubocop:disable Rails/SkipsModelValidations
-    @conversation.update_column(:agent_last_seen_at, last_seen_at)
-    @conversation.update_column(:assignee_last_seen_at, last_seen_at) if update_assignee.present?
+    @conversation.update_columns(updates)
     # rubocop:enable Rails/SkipsModelValidations
   end
 
+  def should_update_last_seen?
+    # Update if at least one relevant timestamp is older than 1 hour or not set
+    # This prevents redundant DB writes when agents repeatedly view the same conversation
+    agent_needs_update = @conversation.agent_last_seen_at.blank? || @conversation.agent_last_seen_at < 1.hour.ago
+    return agent_needs_update unless assignee?
+
+    # For assignees, check both timestamps - update if either is old
+    assignee_needs_update = @conversation.assignee_last_seen_at.blank? || @conversation.assignee_last_seen_at < 1.hour.ago
+    agent_needs_update || assignee_needs_update
+  end
+
   def set_conversation_status
     @conversation.status = params[:status]
     @conversation.snoozed_until = parse_date_time(params[:snoozed_until].to_s) if params[:snoozed_until]
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 57062a5b2..bcbf80355 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -92,8 +92,11 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def settings_params
-    params.permit(:auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting, :audio_transcriptions, :auto_resolve_label,
-                  conversation_required_attributes: [])
+    params.permit(*permitted_settings_attributes)
+  end
+
+  def permitted_settings_attributes
+    [:auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting, :audio_transcriptions, :auto_resolve_label]
   end
 
   def check_signup_enabled
@@ -112,3 +115,5 @@ class Api::V1::AccountsController < Api::BaseController
     }
   end
 end
+
+Api::V1::AccountsController.prepend_mod_with('Api::V1::AccountsSettings')
diff --git a/app/javascript/dashboard/assets/images/auth/signup-bg.jpg b/app/javascript/dashboard/assets/images/auth/signup-bg.jpg
new file mode 100644
index 000000000..884a57922
Binary files /dev/null and b/app/javascript/dashboard/assets/images/auth/signup-bg.jpg differ
diff --git a/app/javascript/dashboard/components-next/Conversation/ConversationRequiredEmpty.vue b/app/javascript/dashboard/components-next/Conversation/ConversationRequiredEmpty.vue
new file mode 100644
index 000000000..36687245e
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Conversation/ConversationRequiredEmpty.vue
@@ -0,0 +1,17 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+const { t } = useI18n();
+</script>
+
+<template>
+  <div class="flex justify-between items-center px-4 py-4 w-full">
+    <div
+      class="flex justify-center items-center py-6 w-full custom-dashed-border"
+    >
+      <span class="text-sm text-n-slate-11">
+        {{ t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.NO_ATTRIBUTES') }}
+      </span>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/ConversationWorkflow/ConversationRequiredAttributeItem.vue b/app/javascript/dashboard/components-next/ConversationWorkflow/ConversationRequiredAttributeItem.vue
new file mode 100644
index 000000000..70b4a7af5
--- /dev/null
+++ b/app/javascript/dashboard/components-next/ConversationWorkflow/ConversationRequiredAttributeItem.vue
@@ -0,0 +1,56 @@
+<script setup>
+import { computed } from 'vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+import { ATTRIBUTE_TYPES } from './constants';
+
+const props = defineProps({
+  attribute: {
+    type: Object,
+    required: true,
+  },
+});
+
+const emit = defineEmits(['delete']);
+
+const iconByType = {
+  [ATTRIBUTE_TYPES.TEXT]: 'i-lucide-align-justify',
+  [ATTRIBUTE_TYPES.CHECKBOX]: 'i-lucide-circle-check-big',
+  [ATTRIBUTE_TYPES.LIST]: 'i-lucide-list',
+  [ATTRIBUTE_TYPES.DATE]: 'i-lucide-calendar',
+  [ATTRIBUTE_TYPES.LINK]: 'i-lucide-link',
+  [ATTRIBUTE_TYPES.NUMBER]: 'i-lucide-hash',
+};
+
+const attributeIcon = computed(() => {
+  const typeKey = props.attribute.type?.toLowerCase();
+  return iconByType[typeKey] || 'i-lucide-align-justify';
+});
+
+const handleDelete = () => {
+  emit('delete', props.attribute);
+};
+</script>
+
+<template>
+  <div class="flex justify-between items-center px-4 py-3 w-full">
+    <div class="flex gap-3 items-center">
+      <h5 class="text-sm font-medium text-n-slate-12 line-clamp-1">
+        {{ attribute.label }}
+      </h5>
+      <div class="w-px h-2.5 bg-n-slate-5" />
+      <div class="flex gap-1.5 items-center">
+        <Icon :icon="attributeIcon" class="size-4 text-n-slate-11" />
+        <span class="text-sm text-n-slate-11">{{ attribute.type }}</span>
+      </div>
+      <div class="w-px h-2.5 bg-n-slate-5" />
+      <div class="flex gap-1.5 items-center">
+        <Icon icon="i-lucide-key-round" class="size-4 text-n-slate-11" />
+        <span class="text-sm text-n-slate-11">{{ attribute.value }}</span>
+      </div>
+    </div>
+    <div class="flex gap-2 items-center">
+      <Button icon="i-lucide-trash" sm slate ghost @click.stop="handleDelete" />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/ConversationWorkflow/ConversationRequiredAttributes.vue b/app/javascript/dashboard/components-next/ConversationWorkflow/ConversationRequiredAttributes.vue
new file mode 100644
index 000000000..e611dd637
--- /dev/null
+++ b/app/javascript/dashboard/components-next/ConversationWorkflow/ConversationRequiredAttributes.vue
@@ -0,0 +1,186 @@
+<script setup>
+import { computed } from 'vue';
+import { useToggle } from '@vueuse/core';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { useMapGetter } from 'dashboard/composables/store';
+import { useAccount } from 'dashboard/composables/useAccount';
+import { useAlert } from 'dashboard/composables';
+import Button from 'dashboard/components-next/button/Button.vue';
+import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
+import ConversationRequiredAttributeItem from 'dashboard/components-next/ConversationWorkflow/ConversationRequiredAttributeItem.vue';
+import ConversationRequiredEmpty from 'dashboard/components-next/Conversation/ConversationRequiredEmpty.vue';
+import BasePaywallModal from 'dashboard/routes/dashboard/settings/components/BasePaywallModal.vue';
+
+const props = defineProps({
+  isEnabled: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(['click']);
+const router = useRouter();
+const { t } = useI18n();
+const { currentAccount, accountId, isOnChatwootCloud, updateAccount } =
+  useAccount();
+const [showDropdown, toggleDropdown] = useToggle(false);
+const [isSaving, toggleSaving] = useToggle(false);
+const conversationAttributes = useMapGetter(
+  'attributes/getConversationAttributes'
+);
+const currentUser = useMapGetter('getCurrentUser');
+
+const isSuperAdmin = computed(() => currentUser.value.type === 'SuperAdmin');
+const showPaywall = computed(() => !props.isEnabled && isOnChatwootCloud.value);
+const i18nKey = computed(() =>
+  isOnChatwootCloud.value ? 'PAYWALL' : 'ENTERPRISE_PAYWALL'
+);
+
+const goToBillingSettings = () => {
+  router.push({
+    name: 'billing_settings_index',
+    params: { accountId: accountId.value },
+  });
+};
+
+const handleClick = () => {
+  emit('click');
+};
+
+const selectedAttributeKeys = computed(
+  () => currentAccount.value?.settings?.conversation_required_attributes || []
+);
+
+const allAttributeOptions = computed(() =>
+  (conversationAttributes.value || []).map(attribute => ({
+    ...attribute,
+    action: 'add',
+    value: attribute.attributeKey,
+    label: attribute.attributeDisplayName,
+    type: attribute.attributeDisplayType,
+  }))
+);
+
+const attributeOptions = computed(() => {
+  const selectedKeysSet = new Set(selectedAttributeKeys.value);
+  return allAttributeOptions.value.filter(
+    attribute => !selectedKeysSet.has(attribute.value)
+  );
+});
+
+const conversationRequiredAttributes = computed(() => {
+  const attributeMap = new Map(
+    allAttributeOptions.value.map(attr => [attr.value, attr])
+  );
+  return selectedAttributeKeys.value
+    .map(key => attributeMap.get(key))
+    .filter(Boolean);
+});
+
+const handleAddAttributesClick = event => {
+  event.stopPropagation();
+  toggleDropdown();
+};
+
+const saveRequiredAttributes = async keys => {
+  try {
+    toggleSaving(true);
+    await updateAccount(
+      { conversation_required_attributes: keys },
+      { silent: true }
+    );
+    useAlert(t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.SAVE.SUCCESS'));
+  } catch (error) {
+    useAlert(t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.SAVE.ERROR'));
+  } finally {
+    toggleSaving(false);
+    toggleDropdown(false);
+  }
+};
+
+const handleAttributeAction = ({ value }) => {
+  if (!value || isSaving.value) return;
+  const updatedKeys = Array.from(
+    new Set([...selectedAttributeKeys.value, value])
+  );
+  saveRequiredAttributes(updatedKeys);
+};
+
+const closeDropdown = () => {
+  toggleDropdown(false);
+};
+
+const handleDelete = attribute => {
+  if (isSaving.value) return;
+  const updatedKeys = selectedAttributeKeys.value.filter(
+    key => key !== attribute.value
+  );
+  saveRequiredAttributes(updatedKeys);
+};
+</script>
+
+<template>
+  <div
+    v-if="isEnabled || showPaywall"
+    class="flex flex-col w-full outline-1 outline outline-n-container rounded-xl bg-n-solid-2 divide-y divide-n-weak"
+    @click="handleClick"
+  >
+    <div class="flex flex-col gap-2 items-start px-5 py-4">
+      <div class="flex justify-between items-center w-full">
+        <div class="flex flex-col gap-2">
+          <h3 class="text-base font-medium text-n-slate-12">
+            {{ $t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.TITLE') }}
+          </h3>
+          <p class="mb-0 text-sm text-n-slate-11">
+            {{ $t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.DESCRIPTION') }}
+          </p>
+        </div>
+        <div v-if="isEnabled" v-on-clickaway="closeDropdown" class="relative">
+          <Button
+            icon="i-lucide-circle-plus"
+            :label="$t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.ADD.TITLE')"
+            :is-loading="isSaving"
+            :disabled="isSaving || attributeOptions.length === 0"
+            @click="handleAddAttributesClick"
+          />
+          <DropdownMenu
+            v-if="showDropdown"
+            :menu-items="attributeOptions"
+            show-search
+            :search-placeholder="
+              $t(
+                'CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.ADD.SEARCH_PLACEHOLDER'
+              )
+            "
+            class="top-full mt-1 w-52 ltr:right-0 rtl:left-0"
+            @action="handleAttributeAction"
+          />
+        </div>
+      </div>
+    </div>
+
+    <template v-if="isEnabled">
+      <ConversationRequiredEmpty
+        v-if="conversationRequiredAttributes.length === 0"
+      />
+
+      <ConversationRequiredAttributeItem
+        v-for="attribute in conversationRequiredAttributes"
+        :key="attribute.value"
+        :attribute="attribute"
+        @delete="handleDelete"
+      />
+    </template>
+
+    <BasePaywallModal
+      v-else
+      class="mx-auto my-8"
+      feature-prefix="CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES"
+      :i18n-key="i18nKey"
+      :is-on-chatwoot-cloud="isOnChatwootCloud"
+      :is-super-admin="isSuperAdmin"
+      @upgrade="goToBillingSettings"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/ConversationWorkflow/ConversationResolveAttributesModal.vue b/app/javascript/dashboard/components-next/ConversationWorkflow/ConversationResolveAttributesModal.vue
new file mode 100644
index 000000000..12e13f11e
--- /dev/null
+++ b/app/javascript/dashboard/components-next/ConversationWorkflow/ConversationResolveAttributesModal.vue
@@ -0,0 +1,248 @@
+<script setup>
+import { ref, computed, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useVuelidate } from '@vuelidate/core';
+import { required, url, helpers } from '@vuelidate/validators';
+import { getRegexp } from 'shared/helpers/Validators';
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+import TextArea from 'next/textarea/TextArea.vue';
+import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
+import Input from 'dashboard/components-next/input/Input.vue';
+import ChoiceToggle from 'dashboard/components-next/input/ChoiceToggle.vue';
+import { ATTRIBUTE_TYPES } from './constants';
+
+const emit = defineEmits(['submit']);
+
+const { t } = useI18n();
+
+const dialogRef = ref(null);
+const visibleAttributes = ref([]);
+const formValues = reactive({});
+const conversationContext = ref(null);
+
+const placeholders = computed(() => ({
+  text: t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.MODAL.PLACEHOLDERS.TEXT'),
+  number: t(
+    'CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.MODAL.PLACEHOLDERS.NUMBER'
+  ),
+  link: t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.MODAL.PLACEHOLDERS.LINK'),
+  date: t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.MODAL.PLACEHOLDERS.DATE'),
+  list: t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.MODAL.PLACEHOLDERS.LIST'),
+}));
+
+const getPlaceholder = type => placeholders.value[type] || '';
+
+const validationRules = computed(() => {
+  const rules = {};
+  visibleAttributes.value.forEach(attribute => {
+    if (attribute.type === ATTRIBUTE_TYPES.LINK) {
+      rules[attribute.value] = { required, url };
+    } else if (attribute.type === ATTRIBUTE_TYPES.CHECKBOX) {
+      // Checkbox doesn't need validation - any selection is valid
+      rules[attribute.value] = {};
+    } else {
+      rules[attribute.value] = { required };
+      if (attribute.regexPattern) {
+        rules[attribute.value].regexValidation = helpers.withParams(
+          { regexCue: attribute.regexCue },
+          value => !value || getRegexp(attribute.regexPattern).test(value)
+        );
+      }
+    }
+  });
+  return rules;
+});
+
+const v$ = useVuelidate(validationRules, formValues);
+
+const getErrorMessage = attributeKey => {
+  const field = v$.value[attributeKey];
+  if (!field || !field.$error) return '';
+
+  if (field.url && field.url.$invalid) {
+    return t('CUSTOM_ATTRIBUTES.VALIDATIONS.INVALID_URL');
+  }
+  if (field.regexValidation && field.regexValidation.$invalid) {
+    return (
+      field.regexValidation.$params?.regexCue ||
+      t('CUSTOM_ATTRIBUTES.VALIDATIONS.INVALID_INPUT')
+    );
+  }
+  if (field.required && field.required.$invalid) {
+    return t('CUSTOM_ATTRIBUTES.VALIDATIONS.REQUIRED');
+  }
+  return '';
+};
+
+const isFormComplete = computed(() =>
+  visibleAttributes.value.every(attribute => {
+    const value = formValues[attribute.value];
+
+    // For checkbox attributes, ensure the agent has explicitly selected a value
+    if (attribute.type === ATTRIBUTE_TYPES.CHECKBOX) {
+      return formValues[attribute.value] !== null;
+    }
+
+    // For other attribute types, check for valid non-empty values
+    return value !== undefined && value !== null && String(value).trim() !== '';
+  })
+);
+
+const comboBoxOptions = computed(() => {
+  const options = {};
+  visibleAttributes.value.forEach(attribute => {
+    if (attribute.type === ATTRIBUTE_TYPES.LIST) {
+      options[attribute.value] = (attribute.attributeValues || []).map(
+        option => ({
+          value: option,
+          label: option,
+        })
+      );
+    }
+  });
+  return options;
+});
+
+const close = () => {
+  dialogRef.value?.close();
+  conversationContext.value = null;
+  v$.value.$reset();
+};
+
+const open = (attributes = [], initialValues = {}, context = null) => {
+  visibleAttributes.value = attributes;
+  conversationContext.value = context;
+
+  // Clear existing formValues
+  Object.keys(formValues).forEach(key => {
+    delete formValues[key];
+  });
+
+  // Initialize form values
+  attributes.forEach(attribute => {
+    const presetValue = initialValues[attribute.value];
+    if (presetValue !== undefined && presetValue !== null) {
+      formValues[attribute.value] = presetValue;
+    } else {
+      // For checkbox attributes, initialize to null to avoid pre-selection
+      // For other attributes, initialize to empty string
+      formValues[attribute.value] =
+        attribute.type === ATTRIBUTE_TYPES.CHECKBOX ? null : '';
+    }
+  });
+
+  v$.value.$reset();
+  dialogRef.value?.open();
+};
+
+const handleConfirm = async () => {
+  v$.value.$touch();
+  if (v$.value.$invalid) {
+    return;
+  }
+
+  emit('submit', {
+    attributes: { ...formValues },
+    context: conversationContext.value,
+  });
+  close();
+};
+
+defineExpose({ open, close });
+</script>
+
+<template>
+  <Dialog
+    ref="dialogRef"
+    width="lg"
+    :title="t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.MODAL.TITLE')"
+    :description="
+      t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.MODAL.DESCRIPTION')
+    "
+    :confirm-button-label="
+      t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.MODAL.ACTIONS.RESOLVE')
+    "
+    :cancel-button-label="
+      t('CONVERSATION_WORKFLOW.REQUIRED_ATTRIBUTES.MODAL.ACTIONS.CANCEL')
+    "
+    :disable-confirm-button="!isFormComplete"
+    @confirm="handleConfirm"
+  >
+    <div class="flex flex-col gap-4">
+      <div
+        v-for="attribute in visibleAttributes"
+        :key="attribute.value"
+        class="flex flex-col gap-2"
+      >
+        <div class="flex justify-between items-center">
+          <label class="mb-0.5 text-sm font-medium text-n-slate-12">
+            {{ attribute.label }}
+          </label>
+        </div>
+
+        <template v-if="attribute.type === ATTRIBUTE_TYPES.TEXT">
+          <TextArea
+            v-model="formValues[attribute.value]"
+            class="w-full"
+            :placeholder="getPlaceholder(ATTRIBUTE_TYPES.TEXT)"
+            :message="getErrorMessage(attribute.value)"
+            :message-type="v$[attribute.value].$error ? 'error' : 'info'"
+            @blur="v$[attribute.value].$touch"
+          />
+        </template>
+
+        <template v-else-if="attribute.type === ATTRIBUTE_TYPES.NUMBER">
+          <Input
+            v-model="formValues[attribute.value]"
+            type="number"
+            size="md"
+            :placeholder="getPlaceholder(ATTRIBUTE_TYPES.NUMBER)"
+            :message="getErrorMessage(attribute.value)"
+            :message-type="v$[attribute.value].$error ? 'error' : 'info'"
+            @blur="v$[attribute.value].$touch"
+          />
+        </template>
+
+        <template v-else-if="attribute.type === ATTRIBUTE_TYPES.LINK">
+          <Input
+            v-model="formValues[attribute.value]"
+            type="url"
+            size="md"
+            :placeholder="getPlaceholder(ATTRIBUTE_TYPES.LINK)"
+            :message="getErrorMessage(attribute.value)"
+            :message-type="v$[attribute.value].$error ? 'error' : 'info'"
+            @blur="v$[attribute.value].$touch"
+          />
+        </template>
+
+        <template v-else-if="attribute.type === ATTRIBUTE_TYPES.DATE">
+          <Input
+            v-model="formValues[attribute.value]"
+            type="date"
+            size="md"
+            :placeholder="getPlaceholder(ATTRIBUTE_TYPES.DATE)"
+            :message="getErrorMessage(attribute.value)"
+            :message-type="v$[attribute.value].$error ? 'error' : 'info'"
+            @blur="v$[attribute.value].$touch"
+          />
+        </template>
+
+        <template v-else-if="attribute.type === ATTRIBUTE_TYPES.LIST">
+          <ComboBox
+            v-model="formValues[attribute.value]"
+            :options="comboBoxOptions[attribute.value]"
+            :placeholder="getPlaceholder(ATTRIBUTE_TYPES.LIST)"
+            :message="getErrorMessage(attribute.value)"
+            :message-type="v$[attribute.value].$error ? 'error' : 'info'"
+            :has-error="v$[attribute.value].$error"
+            class="w-full"
+          />
+        </template>
+
+        <template v-else-if="attribute.type === ATTRIBUTE_TYPES.CHECKBOX">
+          <ChoiceToggle v-model="formValues[attribute.value]" />
+        </template>
+      </div>
+    </div>
+  </Dialog>
+</template>
diff --git a/app/javascript/dashboard/components-next/ConversationWorkflow/constants.js b/app/javascript/dashboard/components-next/ConversationWorkflow/constants.js
new file mode 100644
index 000000000..03f3dac66
--- /dev/null
+++ b/app/javascript/dashboard/components-next/ConversationWorkflow/constants.js
@@ -0,0 +1,8 @@
+export const ATTRIBUTE_TYPES = {
+  TEXT: 'text',
+  NUMBER: 'number',
+  LINK: 'link',
+  DATE: 'date',
+  LIST: 'list',
+  CHECKBOX: 'checkbox',
+};
diff --git a/app/javascript/dashboard/components-next/input/ChoiceToggle.vue b/app/javascript/dashboard/components-next/input/ChoiceToggle.vue
new file mode 100644
index 000000000..5c5e718e2
--- /dev/null
+++ b/app/javascript/dashboard/components-next/input/ChoiceToggle.vue
@@ -0,0 +1,45 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+defineProps({
+  modelValue: {
+    type: Boolean,
+  },
+});
+
+const emit = defineEmits(['update:modelValue']);
+const { t } = useI18n();
+
+const options = computed(() => [
+  { label: t('CHOICE_TOGGLE.YES'), value: true },
+  { label: t('CHOICE_TOGGLE.NO'), value: false },
+]);
+
+const handleSelect = value => {
+  emit('update:modelValue', value);
+};
+</script>
+
+<template>
+  <div
+    class="flex gap-4 items-center px-4 py-2.5 w-full rounded-lg divide-x transition-colors bg-n-solid-1 outline outline-1 outline-n-weak hover:outline-n-slate-6 focus-within:outline-n-brand divide-n-weak"
+  >
+    <div
+      v-for="option in options"
+      :key="option.value"
+      class="flex flex-1 gap-2 justify-center items-center"
+    >
+      <label class="inline-flex gap-2 items-center text-base cursor-pointer">
+        <input
+          type="radio"
+          :value="option.value"
+          :checked="modelValue === option.value"
+          class="size-4 accent-n-blue-9 text-n-blue-9"
+          @change="handleSelect(option.value)"
+        />
+        <span class="text-sm text-n-slate-12">{{ option.label }}</span>
+      </label>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
index fb5e3ddcf..b2ed4e580 100644
--- a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
@@ -529,7 +529,7 @@ const menuItems = computed(() => {
         {
           name: 'Settings Automation',
           label: t('SIDEBAR.AUTOMATION'),
-          icon: 'i-lucide-workflow',
+          icon: 'i-lucide-repeat',
           to: accountScopedRoute('automation_list'),
         },
         {
@@ -574,6 +574,12 @@ const menuItems = computed(() => {
           icon: 'i-lucide-clock-alert',
           to: accountScopedRoute('sla_list'),
         },
+        {
+          name: 'Conversation Workflow',
+          label: t('SIDEBAR.CONVERSATION_WORKFLOW'),
+          icon: 'i-lucide-workflow',
+          to: accountScopedRoute('conversation_workflow_index'),
+        },
         {
           name: 'Settings Security',
           label: t('SIDEBAR.SECURITY'),
@@ -655,7 +661,7 @@ const menuItems = computed(() => {
       </ul>
     </nav>
     <section
-      class="flex flex-col flex-shrink-0 relative gap-1 justify-between items-center"
+      class="flex relative flex-col flex-shrink-0 gap-1 justify-between items-center"
     >
       <div
         class="pointer-events-none absolute inset-x-0 -top-[31px] h-8 bg-gradient-to-t from-n-solid-2 to-transparent"
diff --git a/app/javascript/dashboard/components-next/textarea/TextArea.vue b/app/javascript/dashboard/components-next/textarea/TextArea.vue
index 7568341c4..e0fc0b264 100644
--- a/app/javascript/dashboard/components-next/textarea/TextArea.vue
+++ b/app/javascript/dashboard/components-next/textarea/TextArea.vue
@@ -32,7 +32,7 @@ const props = defineProps({
   allowSignature: { type: Boolean, default: false }, // allowSignature is a kill switch, ensuring no signature methods are triggered except when this flag is true
 });
 
-const emit = defineEmits(['update:modelValue']);
+const emit = defineEmits(['update:modelValue', 'blur', 'focus']);
 
 const textareaRef = ref(null);
 const isFocused = ref(false);
@@ -96,15 +96,17 @@ const handleInput = event => {
   }
 };
 
-const handleFocus = () => {
+const handleFocus = event => {
   if (!props.disabled) {
     isFocused.value = true;
+    emit('focus', event);
   }
 };
 
-const handleBlur = () => {
+const handleBlur = event => {
   if (!props.disabled) {
     isFocused.value = false;
+    emit('blur', event);
   }
 };
 
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 3727a16c3..88c053087 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -32,6 +32,7 @@ import ConversationBulkActions from './widgets/conversation/conversationBulkActi
 import IntersectionObserver from './IntersectionObserver.vue';
 import TeleportWithDirection from 'dashboard/components-next/TeleportWithDirection.vue';
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
+import ConversationResolveAttributesModal from 'dashboard/components-next/ConversationWorkflow/ConversationResolveAttributesModal.vue';
 
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import { useAlert } from 'dashboard/composables';
@@ -46,6 +47,7 @@ import {
 } from 'dashboard/composables/useTransformKeys';
 import { useEmitter } from 'dashboard/composables/emitter';
 import { useEventListener } from '@vueuse/core';
+import { useConversationRequiredAttributes } from 'dashboard/composables/useConversationRequiredAttributes';
 
 import { emitter } from 'shared/helpers/mitt';
 
@@ -87,6 +89,7 @@ const router = useRouter();
 const route = useRoute();
 const store = useStore();
 
+const resolveAttributesModalRef = ref(null);
 const conversationListRef = ref(null);
 const conversationDynamicScroller = ref(null);
 
@@ -129,6 +132,7 @@ const labels = useMapGetter('labels/getLabels');
 const currentAccountId = useMapGetter('getCurrentAccountId');
 // We can't useFunctionGetter here since it needs to be called on setup?
 const getTeamFn = useMapGetter('teams/getTeam');
+const getConversationById = useMapGetter('getConversationById');
 
 useChatListKeyboardEvents(conversationListRef);
 const {
@@ -153,6 +157,8 @@ const {
   attributeModel: 'conversation_attribute',
 });
 
+const { checkMissingAttributes } = useConversationRequiredAttributes();
+
 // computed
 const intersectionObserverOptions = computed(() => {
   return {
@@ -729,22 +735,76 @@ async function onAssignTeam(team, conversationId = null) {
   }
 }
 
-function toggleConversationStatus(conversationId, status, snoozedUntil) {
-  store
-    .dispatch('toggleStatus', {
-      conversationId,
-      status,
+function toggleConversationStatus(
+  conversationId,
+  status,
+  snoozedUntil,
+  customAttributes = null
+) {
+  const payload = {
+    conversationId,
+    status,
+    snoozedUntil,
+  };
+
+  if (customAttributes) {
+    payload.customAttributes = customAttributes;
+  }
+
+  store.dispatch('toggleStatus', payload).then(() => {
+    useAlert(t('CONVERSATION.CHANGE_STATUS'));
+  });
+}
+
+function handleResolveConversation(conversationId, status, snoozedUntil) {
+  if (status !== wootConstants.STATUS_TYPE.RESOLVED) {
+    toggleConversationStatus(conversationId, status, snoozedUntil);
+    return;
+  }
+
+  // Check for required attributes before resolving
+  const conversation = getConversationById.value(conversationId);
+  const currentCustomAttributes = conversation?.custom_attributes || {};
+  const { hasMissing, missing } = checkMissingAttributes(
+    currentCustomAttributes
+  );
+
+  if (hasMissing) {
+    // Pass conversation context through the modal's API
+    const conversationContext = {
+      id: conversationId,
       snoozedUntil,
-    })
-    .then(() => {
-      useAlert(t('CONVERSATION.CHANGE_STATUS'));
-    });
+    };
+    resolveAttributesModalRef.value?.open(
+      missing,
+      currentCustomAttributes,
+      conversationContext
+    );
+  } else {
+    toggleConversationStatus(conversationId, status, snoozedUntil);
+  }
+}
+
+function handleResolveWithAttributes({ attributes, context }) {
+  if (context) {
+    const existingConversation = getConversationById.value(context.id);
+    const currentCustomAttributes =
+      existingConversation?.custom_attributes || {};
+    const mergedAttributes = { ...currentCustomAttributes, ...attributes };
+
+    toggleConversationStatus(
+      context.id,
+      wootConstants.STATUS_TYPE.RESOLVED,
+      context.snoozedUntil,
+      mergedAttributes
+    );
+  }
 }
 
 function allSelectedConversationsStatus(status) {
   if (!selectedConversations.value.length) return false;
   return selectedConversations.value.every(item => {
-    return store.getters.getConversationById(item)?.status === status;
+    return getConversationById.value(item)?.status === status;
   });
 }
 
@@ -799,7 +859,7 @@ provide('deSelectConversation', deSelectConversation);
 provide('assignAgent', onAssignAgent);
 provide('assignTeam', onAssignTeam);
 provide('assignLabels', onAssignLabels);
-provide('updateConversationStatus', toggleConversationStatus);
+provide('updateConversationStatus', handleResolveConversation);
 provide('toggleContextMenu', onContextMenuToggle);
 provide('markAsUnread', markAsUnread);
 provide('markAsRead', markAsRead);
@@ -895,7 +955,7 @@ watch(conversationFilters, (newVal, oldVal) => {
 
     <p
       v-if="!chatListLoading && !conversationList.length"
-      class="flex items-center justify-center p-4 overflow-auto"
+      class="flex overflow-auto justify-center items-center p-4"
     >
       {{ $t('CHAT_LIST.LIST.404') }}
     </p>
@@ -915,14 +975,14 @@ watch(conversationFilters, (newVal, oldVal) => {
     />
     <div
       ref="conversationListRef"
-      class="flex-1 overflow-hidden conversations-list hover:overflow-y-auto"
+      class="overflow-hidden flex-1 conversations-list hover:overflow-y-auto"
       :class="{ 'overflow-hidden': isContextMenuOpen }"
     >
       <DynamicScroller
         ref="conversationDynamicScroller"
         :items="conversationList"
         :min-item-size="24"
-        class="w-full h-full overflow-auto"
+        class="overflow-auto w-full h-full"
       >
         <template #default="{ item, index, active }">
           <!--
@@ -997,5 +1057,9 @@ watch(conversationFilters, (newVal, oldVal) => {
         @close="closeAdvanceFiltersModal"
       />
     </TeleportWithDirection>
+    <ConversationResolveAttributesModal
+      ref="resolveAttributesModalRef"
+      @submit="handleResolveWithAttributes"
+    />
   </div>
 </template>
diff --git a/app/javascript/dashboard/components/buttons/ResolveAction.vue b/app/javascript/dashboard/components/buttons/ResolveAction.vue
index c1700321a..a57bc1825 100644
--- a/app/javascript/dashboard/components/buttons/ResolveAction.vue
+++ b/app/javascript/dashboard/components/buttons/ResolveAction.vue
@@ -6,6 +6,7 @@ import { useI18n } from 'vue-i18n';
 import { useStore, useStoreGetters } from 'dashboard/composables/store';
 import { useEmitter } from 'dashboard/composables/emitter';
 import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
+import { useConversationRequiredAttributes } from 'dashboard/composables/useConversationRequiredAttributes';
 
 import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
 import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
@@ -17,13 +18,16 @@ import {
 
 import ButtonGroup from 'dashboard/components-next/buttonGroup/ButtonGroup.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
+import ConversationResolveAttributesModal from 'dashboard/components-next/ConversationWorkflow/ConversationResolveAttributesModal.vue';
 
 const store = useStore();
 const getters = useStoreGetters();
 const { t } = useI18n();
+const { checkMissingAttributes } = useConversationRequiredAttributes();
 
 const arrowDownButtonRef = ref(null);
 const isLoading = ref(false);
+const resolveAttributesModalRef = ref(null);
 
 const [showActionsDropdown, toggleDropdown] = useToggle();
 const closeDropdown = () => toggleDropdown(false);
@@ -77,19 +81,36 @@ const openSnoozeModal = () => {
   ninja.open({ parent: 'snooze_conversation' });
 };
 
-const toggleStatus = (status, snoozedUntil) => {
+const toggleStatus = (status, snoozedUntil, customAttributes = null) => {
   closeDropdown();
   isLoading.value = true;
-  store
-    .dispatch('toggleStatus', {
-      conversationId: currentChat.value.id,
-      status,
-      snoozedUntil,
-    })
-    .then(() => {
-      useAlert(t('CONVERSATION.CHANGE_STATUS'));
-      isLoading.value = false;
-    });
+
+  const payload = {
+    conversationId: currentChat.value.id,
+    status,
+    snoozedUntil,
+  };
+
+  if (customAttributes) {
+    payload.customAttributes = customAttributes;
+  }
+
+  store.dispatch('toggleStatus', payload).then(() => {
+    useAlert(t('CONVERSATION.CHANGE_STATUS'));
+    isLoading.value = false;
+  });
+};
+
+const handleResolveWithAttributes = ({ attributes, context }) => {
+  if (context) {
+    const currentCustomAttributes = currentChat.value.custom_attributes || {};
+    const mergedAttributes = { ...currentCustomAttributes, ...attributes };
+    toggleStatus(
+      wootConstants.STATUS_TYPE.RESOLVED,
+      context.snoozedUntil,
+      mergedAttributes
+    );
+  }
 };
 
 const onCmdOpenConversation = () => {
@@ -97,7 +118,24 @@ const onCmdOpenConversation = () => {
 };
 
 const onCmdResolveConversation = () => {
-  toggleStatus(wootConstants.STATUS_TYPE.RESOLVED);
+  const currentCustomAttributes = currentChat.value.custom_attributes || {};
+  const { hasMissing, missing } = checkMissingAttributes(
+    currentCustomAttributes
+  );
+
+  if (hasMissing) {
+    const conversationContext = {
+      id: currentChat.value.id,
+      snoozedUntil: null,
+    };
+    resolveAttributesModalRef.value?.open(
+      missing,
+      currentCustomAttributes,
+      conversationContext
+    );
+  } else {
+    toggleStatus(wootConstants.STATUS_TYPE.RESOLVED);
+  }
 };
 
 const keyboardEvents = {
@@ -107,13 +145,13 @@ const keyboardEvents = {
   },
   'Alt+KeyE': {
     action: async () => {
-      await toggleStatus(wootConstants.STATUS_TYPE.RESOLVED);
+      onCmdResolveConversation();
     },
   },
   '$mod+Alt+KeyE': {
     action: async event => {
       const { all, activeIndex, lastIndex } = getConversationParams();
-      await toggleStatus(wootConstants.STATUS_TYPE.RESOLVED);
+      onCmdResolveConversation();
 
       if (activeIndex < lastIndex) {
         all[activeIndex + 1].click();
@@ -133,9 +171,9 @@ useEmitter(CMD_RESOLVE_CONVERSATION, onCmdResolveConversation);
 </script>
 
 <template>
-  <div class="relative flex items-center justify-end resolve-actions">
+  <div class="flex relative justify-end items-center resolve-actions">
     <ButtonGroup
-      class="rounded-lg shadow outline-1 outline flex-shrink-0"
+      class="flex-shrink-0 rounded-lg shadow outline-1 outline"
       :class="!showOpenButton ? 'outline-n-container' : 'outline-transparent'"
     >
       <Button
@@ -212,5 +250,9 @@ useEmitter(CMD_RESOLVE_CONVERSATION, onCmdResolveConversation);
         </WootDropdownItem>
       </WootDropdownMenu>
     </div>
+    <ConversationResolveAttributesModal
+      ref="resolveAttributesModalRef"
+      @submit="handleResolveWithAttributes"
+    />
   </div>
 </template>
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 0ec1139a6..710ab2888 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -2,7 +2,7 @@
 import { ref, provide } from 'vue';
 // composable
 import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
-import { useCaptain } from 'dashboard/composables/useCaptain';
+import { useLabelSuggestions } from 'dashboard/composables/useLabelSuggestions';
 import { useSnakeCase } from 'dashboard/composables/useTransformKeys';
 
 // components
@@ -59,7 +59,11 @@ export default {
 
     useKeyboardEvents(keyboardEvents);
 
-    const { captainTasksEnabled, getLabelSuggestions } = useCaptain();
+    const {
+      captainTasksEnabled,
+      isLabelSuggestionFeatureEnabled,
+      getLabelSuggestions,
+    } = useLabelSuggestions();
 
     provide('contextMenuElementTarget', conversationPanelRef);
 
@@ -67,6 +71,7 @@ export default {
       isPopOutReplyBox,
       captainTasksEnabled,
       getLabelSuggestions,
+      isLabelSuggestionFeatureEnabled,
       conversationPanelRef,
     };
   },
@@ -94,7 +99,10 @@ export default {
     },
     shouldShowLabelSuggestions() {
       return (
-        this.isOpen && this.captainTasksEnabled && !this.messageSentSinceOpened
+        this.isOpen &&
+        this.captainTasksEnabled &&
+        this.isLabelSuggestionFeatureEnabled &&
+        !this.messageSentSinceOpened
       );
     },
     inboxId() {
@@ -282,7 +290,7 @@ export default {
       const existingLabels = this.currentChat?.labels || [];
       if (existingLabels.length > 0) return;
 
-      if (!this.captainTasksEnabled) {
+      if (!this.captainTasksEnabled || !this.isLabelSuggestionFeatureEnabled) {
         return;
       }
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 7467c2fa8..e9d2f6d08 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -1271,7 +1271,7 @@ export default {
         key="copilot-bottom-panel"
         :is-generating-content="copilot.isButtonDisabled.value"
         @submit="onSubmitCopilotReply"
-        @cancel="copilot.toggleEditor"
+        @cancel="copilot.reset"
       />
       <ReplyBottomPanel
         v-else
diff --git a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js
index c1dcfa790..ffe61edd1 100644
--- a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js
+++ b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js
@@ -515,6 +515,10 @@ const languages = [
     name: 'Portuguese',
     id: 'pt',
   },
+  {
+    name: 'Portuguese (Brazil)',
+    id: 'pt_BR',
+  },
   {
     name: 'Punjabi',
     id: 'pa',
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversation/LabelSuggestion.vue b/app/javascript/dashboard/components/widgets/conversation/conversation/LabelSuggestion.vue
index a4716da1e..9075eb4ed 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversation/LabelSuggestion.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversation/LabelSuggestion.vue
@@ -13,7 +13,7 @@ import { mapGetters } from 'vuex';
 // utils & constants
 import { LocalStorage } from 'shared/helpers/localStorage';
 import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
-import { OPEN_AI_EVENTS } from '../../../../helper/AnalyticsHelper/events';
+import { CAPTAIN_EVENTS } from '../../../../helper/AnalyticsHelper/events';
 
 export default {
   name: 'LabelSuggestion',
@@ -114,7 +114,7 @@ export default {
 
       // dismiss this once the values are set
       this.isDismissed = true;
-      this.trackLabelEvent(OPEN_AI_EVENTS.DISMISS_LABEL_SUGGESTION);
+      this.trackLabelEvent(CAPTAIN_EVENTS.LABEL_SUGGESTION_DISMISSED);
     },
     isConversationDismissed() {
       return LocalStorage.getFlag(
@@ -132,7 +132,7 @@ export default {
         conversationId: this.conversationId,
         labels: labelsToAdd,
       });
-      this.trackLabelEvent(OPEN_AI_EVENTS.APPLY_LABEL_SUGGESTION);
+      this.trackLabelEvent(CAPTAIN_EVENTS.LABEL_SUGGESTION_APPLIED);
     },
     trackLabelEvent(event) {
       const payload = {
diff --git a/app/javascript/dashboard/composables/chatlist/useBulkActions.js b/app/javascript/dashboard/composables/chatlist/useBulkActions.js
index 32301990a..a32c4c512 100644
--- a/app/javascript/dashboard/composables/chatlist/useBulkActions.js
+++ b/app/javascript/dashboard/composables/chatlist/useBulkActions.js
@@ -3,10 +3,13 @@ import { useStore } from 'vuex';
 import { useAlert } from 'dashboard/composables';
 import { useI18n } from 'vue-i18n';
 import { useMapGetter } from 'dashboard/composables/store.js';
+import { useConversationRequiredAttributes } from 'dashboard/composables/useConversationRequiredAttributes';
+import wootConstants from 'dashboard/constants/globals';
 
 export function useBulkActions() {
   const store = useStore();
   const { t } = useI18n();
+  const { checkMissingAttributes } = useConversationRequiredAttributes();
 
   const selectedConversations = useMapGetter(
     'bulkActions/getSelectedConversationIds'
@@ -116,17 +119,61 @@ export function useBulkActions() {
   }
 
   async function onUpdateConversations(status, snoozedUntil) {
-    try {
-      await store.dispatch('bulkActions/process', {
-        type: 'Conversation',
-        ids: selectedConversations.value,
-        fields: {
-          status,
+    let conversationIds = selectedConversations.value;
+    let skippedCount = 0;
+
+    // If resolving, check for required attributes
+    if (status === wootConstants.STATUS_TYPE.RESOLVED) {
+      const { validIds, skippedIds } = selectedConversations.value.reduce(
+        (acc, id) => {
+          const conversation = store.getters.getConversationById(id);
+          const currentCustomAttributes = conversation?.custom_attributes || {};
+          const { hasMissing } = checkMissingAttributes(
+            currentCustomAttributes
+          );
+
+          if (!hasMissing) {
+            acc.validIds.push(id);
+          } else {
+            acc.skippedIds.push(id);
+          }
+          return acc;
         },
-        snoozed_until: snoozedUntil,
-      });
+        { validIds: [], skippedIds: [] }
+      );
+
+      conversationIds = validIds;
+      skippedCount = skippedIds.length;
+
+      if (skippedCount > 0 && validIds.length === 0) {
+        // All conversations have missing attributes
+        useAlert(
+          t('BULK_ACTION.RESOLVE.ALL_MISSING_ATTRIBUTES') ||
+            'Cannot resolve conversations due to missing required attributes'
+        );
+        return;
+      }
+    }
+
+    try {
+      if (conversationIds.length > 0) {
+        await store.dispatch('bulkActions/process', {
+          type: 'Conversation',
+          ids: conversationIds,
+          fields: {
+            status,
+          },
+          snoozed_until: snoozedUntil,
+        });
+      }
+
       store.dispatch('bulkActions/clearSelectedConversationIds');
-      useAlert(t('BULK_ACTION.UPDATE.UPDATE_SUCCESFUL'));
+
+      if (skippedCount > 0) {
+        useAlert(t('BULK_ACTION.RESOLVE.PARTIAL_SUCCESS'));
+      } else {
+        useAlert(t('BULK_ACTION.UPDATE.UPDATE_SUCCESFUL'));
+      }
     } catch (err) {
       useAlert(t('BULK_ACTION.UPDATE.UPDATE_FAILED'));
     }
diff --git a/app/javascript/dashboard/composables/spec/useCaptain.spec.js b/app/javascript/dashboard/composables/spec/useCaptain.spec.js
index c5fad7a00..3932813fe 100644
--- a/app/javascript/dashboard/composables/spec/useCaptain.spec.js
+++ b/app/javascript/dashboard/composables/spec/useCaptain.spec.js
@@ -8,7 +8,6 @@ import { useAccount } from 'dashboard/composables/useAccount';
 import { useConfig } from 'dashboard/composables/useConfig';
 import { useI18n } from 'vue-i18n';
 import TasksAPI from 'dashboard/api/captain/tasks';
-import analyticsHelper from 'dashboard/helper/AnalyticsHelper/index';
 
 vi.mock('dashboard/composables/store');
 vi.mock('dashboard/composables/useAccount');
@@ -23,8 +22,8 @@ vi.mock('dashboard/helper/AnalyticsHelper/index', async importOriginal => {
   return actual;
 });
 vi.mock('dashboard/helper/AnalyticsHelper/events', () => ({
-  OPEN_AI_EVENTS: {
-    TEST_EVENT: 'open_ai_test_event',
+  CAPTAIN_EVENTS: {
+    TEST_EVENT: 'captain_test_event',
   },
 }));
 
@@ -65,29 +64,6 @@ describe('useCaptain', () => {
     expect(draftMessage.value).toBe('Draft message');
   });
 
-  it('records analytics correctly', async () => {
-    const { recordAnalytics } = useCaptain();
-
-    await recordAnalytics('TEST_EVENT', { data: 'test' });
-
-    expect(analyticsHelper.track).toHaveBeenCalledWith('open_ai_test_event', {
-      type: 'TEST_EVENT',
-      data: 'test',
-    });
-  });
-
-  it('gets label suggestions', async () => {
-    TasksAPI.labelSuggestion.mockResolvedValue({
-      data: { message: 'label1, label2' },
-    });
-
-    const { getLabelSuggestions } = useCaptain();
-    const result = await getLabelSuggestions();
-
-    expect(TasksAPI.labelSuggestion).toHaveBeenCalledWith('123');
-    expect(result).toEqual(['label1', 'label2']);
-  });
-
   it('rewrites content', async () => {
     TasksAPI.rewrite.mockResolvedValue({
       data: { message: 'Rewritten content', follow_up_context: { id: 'ctx1' } },
@@ -193,21 +169,4 @@ describe('useCaptain', () => {
     await processEvent('improve', 'content', {});
     expect(TasksAPI.rewrite).toHaveBeenCalled();
   });
-
-  it('returns empty array when no conversation ID for label suggestions', async () => {
-    useMapGetter.mockImplementation(getter => {
-      const mockValues = {
-        'accounts/getUIFlags': { isFetchingLimits: false },
-        getSelectedChat: { id: null },
-        'draftMessages/getReplyEditorMode': 'reply',
-      };
-      return { value: mockValues[getter] };
-    });
-
-    const { getLabelSuggestions } = useCaptain();
-    const result = await getLabelSuggestions();
-
-    expect(result).toEqual([]);
-    expect(TasksAPI.labelSuggestion).not.toHaveBeenCalled();
-  });
 });
diff --git a/app/javascript/dashboard/composables/spec/useConversationRequiredAttributes.spec.js b/app/javascript/dashboard/composables/spec/useConversationRequiredAttributes.spec.js
new file mode 100644
index 000000000..a269f3d66
--- /dev/null
+++ b/app/javascript/dashboard/composables/spec/useConversationRequiredAttributes.spec.js
@@ -0,0 +1,348 @@
+import { useConversationRequiredAttributes } from '../useConversationRequiredAttributes';
+import { useMapGetter } from 'dashboard/composables/store';
+import { useAccount } from 'dashboard/composables/useAccount';
+
+vi.mock('dashboard/composables/store');
+vi.mock('dashboard/composables/useAccount');
+
+const defaultAttributes = [
+  {
+    attributeKey: 'priority',
+    attributeDisplayName: 'Priority',
+    attributeDisplayType: 'list',
+    attributeValues: ['High', 'Medium', 'Low'],
+  },
+  {
+    attributeKey: 'category',
+    attributeDisplayName: 'Category',
+    attributeDisplayType: 'text',
+    attributeValues: [],
+  },
+  {
+    attributeKey: 'is_urgent',
+    attributeDisplayName: 'Is Urgent',
+    attributeDisplayType: 'checkbox',
+    attributeValues: [],
+  },
+];
+
+describe('useConversationRequiredAttributes', () => {
+  beforeEach(() => {
+    useMapGetter.mockImplementation(getter => {
+      if (getter === 'accounts/isFeatureEnabledonAccount') {
+        return { value: () => true };
+      }
+      if (getter === 'attributes/getConversationAttributes') {
+        return { value: defaultAttributes };
+      }
+      return { value: null };
+    });
+
+    useAccount.mockReturnValue({
+      currentAccount: {
+        value: {
+          settings: {
+            conversation_required_attributes: [
+              'priority',
+              'category',
+              'is_urgent',
+            ],
+          },
+        },
+      },
+      accountId: { value: 1 },
+    });
+  });
+
+  const setupMocks = (
+    requiredAttributes = ['priority', 'category', 'is_urgent'],
+    { attributes = defaultAttributes, featureEnabled = true } = {}
+  ) => {
+    useMapGetter.mockImplementation(getter => {
+      if (getter === 'accounts/isFeatureEnabledonAccount') {
+        return { value: () => featureEnabled };
+      }
+      if (getter === 'attributes/getConversationAttributes') {
+        return { value: attributes };
+      }
+      return { value: null };
+    });
+
+    useAccount.mockReturnValue({
+      currentAccount: {
+        value: {
+          settings: {
+            conversation_required_attributes: requiredAttributes,
+          },
+        },
+      },
+      accountId: { value: 1 },
+    });
+  };
+
+  describe('requiredAttributeKeys', () => {
+    it('should return required attribute keys from account settings', () => {
+      setupMocks();
+      const { requiredAttributeKeys } = useConversationRequiredAttributes();
+
+      expect(requiredAttributeKeys.value).toEqual([
+        'priority',
+        'category',
+        'is_urgent',
+      ]);
+    });
+
+    it('should return empty array when no required attributes configured', () => {
+      setupMocks([]);
+      const { requiredAttributeKeys } = useConversationRequiredAttributes();
+
+      expect(requiredAttributeKeys.value).toEqual([]);
+    });
+
+    it('should return empty array when account settings is null', () => {
+      setupMocks([], { attributes: [] });
+      useAccount.mockReturnValue({
+        currentAccount: { value: { settings: null } },
+        accountId: { value: 1 },
+      });
+
+      const { requiredAttributeKeys } = useConversationRequiredAttributes();
+
+      expect(requiredAttributeKeys.value).toEqual([]);
+    });
+  });
+
+  describe('requiredAttributes', () => {
+    it('should return full attribute definitions for required attributes only', () => {
+      setupMocks();
+      const { requiredAttributes } = useConversationRequiredAttributes();
+
+      expect(requiredAttributes.value).toHaveLength(3);
+      expect(requiredAttributes.value[0]).toEqual({
+        attributeKey: 'priority',
+        attributeDisplayName: 'Priority',
+        attributeDisplayType: 'list',
+        attributeValues: ['High', 'Medium', 'Low'],
+        value: 'priority',
+        label: 'Priority',
+        type: 'list',
+      });
+    });
+
+    it('should filter out deleted attributes that no longer exist', () => {
+      // Mock with only 2 attributes available but 3 required
+      setupMocks(['priority', 'category', 'is_urgent'], {
+        attributes: [
+          {
+            attributeKey: 'priority',
+            attributeDisplayName: 'Priority',
+            attributeDisplayType: 'list',
+            attributeValues: ['High', 'Medium', 'Low'],
+          },
+          {
+            attributeKey: 'is_urgent',
+            attributeDisplayName: 'Is Urgent',
+            attributeDisplayType: 'checkbox',
+            attributeValues: [],
+          },
+        ],
+      });
+
+      const { requiredAttributes } = useConversationRequiredAttributes();
+
+      expect(requiredAttributes.value).toHaveLength(2);
+      expect(requiredAttributes.value.map(attr => attr.value)).toEqual([
+        'priority',
+        'is_urgent',
+      ]);
+    });
+  });
+
+  describe('checkMissingAttributes', () => {
+    beforeEach(() => {
+      setupMocks();
+    });
+
+    it('should return no missing when all attributes are filled', () => {
+      const { checkMissingAttributes } = useConversationRequiredAttributes();
+
+      const customAttributes = {
+        priority: 'High',
+        category: 'Bug Report',
+        is_urgent: true,
+      };
+
+      const result = checkMissingAttributes(customAttributes);
+
+      expect(result.hasMissing).toBe(false);
+      expect(result.missing).toEqual([]);
+      expect(result.all).toHaveLength(3);
+    });
+
+    it('should detect missing text attributes', () => {
+      const { checkMissingAttributes } = useConversationRequiredAttributes();
+
+      const customAttributes = {
+        priority: 'High',
+        is_urgent: true,
+        // category is missing
+      };
+
+      const result = checkMissingAttributes(customAttributes);
+
+      expect(result.hasMissing).toBe(true);
+      expect(result.missing).toHaveLength(1);
+      expect(result.missing[0].value).toBe('category');
+    });
+
+    it('should detect empty string values as missing', () => {
+      const { checkMissingAttributes } = useConversationRequiredAttributes();
+
+      const customAttributes = {
+        priority: 'High',
+        category: '', // empty string
+        is_urgent: true,
+      };
+
+      const result = checkMissingAttributes(customAttributes);
+
+      expect(result.hasMissing).toBe(true);
+      expect(result.missing[0].value).toBe('category');
+    });
+
+    it('should consider checkbox attribute present when value is true', () => {
+      const { checkMissingAttributes } = useConversationRequiredAttributes();
+
+      const customAttributes = {
+        priority: 'High',
+        category: 'Bug Report',
+        is_urgent: true,
+      };
+
+      const result = checkMissingAttributes(customAttributes);
+
+      expect(result.hasMissing).toBe(false);
+      expect(result.missing).toEqual([]);
+    });
+
+    it('should consider checkbox attribute present when value is false', () => {
+      const { checkMissingAttributes } = useConversationRequiredAttributes();
+
+      const customAttributes = {
+        priority: 'High',
+        category: 'Bug Report',
+        is_urgent: false, // false is still considered "filled"
+      };
+
+      const result = checkMissingAttributes(customAttributes);
+
+      expect(result.hasMissing).toBe(false);
+      expect(result.missing).toEqual([]);
+    });
+
+    it('should detect missing checkbox when key does not exist', () => {
+      const { checkMissingAttributes } = useConversationRequiredAttributes();
+
+      const customAttributes = {
+        priority: 'High',
+        category: 'Bug Report',
+        // is_urgent key is completely missing
+      };
+
+      const result = checkMissingAttributes(customAttributes);
+
+      expect(result.hasMissing).toBe(true);
+      expect(result.missing).toHaveLength(1);
+      expect(result.missing[0].value).toBe('is_urgent');
+      expect(result.missing[0].type).toBe('checkbox');
+    });
+
+    it('should handle falsy values correctly for non-checkbox attributes', () => {
+      setupMocks(['score', 'status_flag'], {
+        attributes: [
+          {
+            attributeKey: 'score',
+            attributeDisplayName: 'Score',
+            attributeDisplayType: 'number',
+            attributeValues: [],
+          },
+          {
+            attributeKey: 'status_flag',
+            attributeDisplayName: 'Status Flag',
+            attributeDisplayType: 'text',
+            attributeValues: [],
+          },
+        ],
+      });
+
+      const { checkMissingAttributes } = useConversationRequiredAttributes();
+
+      const customAttributes = {
+        score: 0, // zero should be considered valid, not missing
+        status_flag: false, // false should be considered valid, not missing
+      };
+
+      const result = checkMissingAttributes(customAttributes);
+
+      expect(result.hasMissing).toBe(false);
+      expect(result.missing).toEqual([]);
+    });
+
+    it('should handle null values as missing for text attributes', () => {
+      const { checkMissingAttributes } = useConversationRequiredAttributes();
+
+      const customAttributes = {
+        priority: 'High',
+        category: null, // null should be missing for text attribute
+        is_urgent: true, // checkbox is present
+      };
+
+      const result = checkMissingAttributes(customAttributes);
+
+      expect(result.hasMissing).toBe(true);
+      expect(result.missing).toHaveLength(1);
+      expect(result.missing[0].value).toBe('category');
+    });
+
+    it('should consider undefined checkbox values as present when key exists', () => {
+      const { checkMissingAttributes } = useConversationRequiredAttributes();
+
+      const customAttributes = {
+        priority: 'High',
+        category: 'Bug Report',
+        is_urgent: undefined, // key exists but value is undefined - still considered "filled" for checkbox
+      };
+
+      const result = checkMissingAttributes(customAttributes);
+
+      expect(result.hasMissing).toBe(false);
+      expect(result.missing).toEqual([]);
+    });
+
+    it('should return no missing when no attributes are required', () => {
+      setupMocks([]); // No required attributes
+
+      const { checkMissingAttributes } = useConversationRequiredAttributes();
+
+      const result = checkMissingAttributes({});
+
+      expect(result.hasMissing).toBe(false);
+      expect(result.missing).toEqual([]);
+    });
+
+    it('should handle whitespace-only values as missing', () => {
+      const { checkMissingAttributes } = useConversationRequiredAttributes();
+
+      const customAttributes = {
+        priority: 'High',
+        category: '   ', // whitespace only
+        is_urgent: true,
+      };
+
+      const result = checkMissingAttributes(customAttributes);
+
+      expect(result.hasMissing).toBe(true);
+      expect(result.missing[0].value).toBe('category');
+    });
+  });
+});
diff --git a/app/javascript/dashboard/composables/useCaptain.js b/app/javascript/dashboard/composables/useCaptain.js
index a109cb5c1..f7c72e04f 100644
--- a/app/javascript/dashboard/composables/useCaptain.js
+++ b/app/javascript/dashboard/composables/useCaptain.js
@@ -7,26 +7,11 @@ import {
 import { useAccount } from 'dashboard/composables/useAccount';
 import { useConfig } from 'dashboard/composables/useConfig';
 import { useCamelCase } from 'dashboard/composables/useTransformKeys';
-import { useAlert, useTrack } from 'dashboard/composables';
+import { useAlert } from 'dashboard/composables';
 import { useI18n } from 'vue-i18n';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
-import { OPEN_AI_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 import TasksAPI from 'dashboard/api/captain/tasks';
 
-/**
- * Cleans and normalizes a list of labels.
- * @param {string} labels - A comma-separated string of labels.
- * @returns {string[]} An array of cleaned and unique labels.
- */
-const cleanLabels = labels => {
-  return labels
-    .toLowerCase()
-    .split(',')
-    .filter(label => label.trim())
-    .map(label => label.trim())
-    .filter((label, index, self) => self.indexOf(label) === index);
-};
-
 export function useCaptain() {
   const store = useStore();
   const { t } = useI18n();
@@ -93,23 +78,6 @@ export function useCaptain() {
     useAlert(errorMessage);
   };
 
-  // === Analytics ===
-  /**
-   * Records analytics for AI-related events.
-   * @param {string} type - The type of event.
-   * @param {Object} payload - Additional data for the event.
-   * @returns {Promise<void>}
-   */
-  const recordAnalytics = async (type, payload) => {
-    const event = OPEN_AI_EVENTS[type.toUpperCase()];
-    if (event) {
-      useTrack(event, {
-        type,
-        ...payload,
-      });
-    }
-  };
-
   // === Task Methods ===
   /**
    * Rewrites content with a specific operation.
@@ -183,24 +151,6 @@ export function useCaptain() {
     }
   };
 
-  /**
-   * Gets label suggestions for the current conversation.
-   * @returns {Promise<string[]>} An array of suggested labels.
-   */
-  const getLabelSuggestions = async () => {
-    if (!conversationId.value) return [];
-
-    try {
-      const result = await TasksAPI.labelSuggestion(conversationId.value);
-      const {
-        data: { message: labels },
-      } = result;
-      return cleanLabels(labels);
-    } catch {
-      return [];
-    }
-  };
-
   /**
    * Sends a follow-up message to refine a previous AI task result.
    * @param {Object} options - The follow-up options.
@@ -264,11 +214,7 @@ export function useCaptain() {
     rewriteContent,
     summarizeConversation,
     getReplySuggestion,
-    getLabelSuggestions,
     followUp,
     processEvent,
-
-    // Analytics
-    recordAnalytics,
   };
 }
diff --git a/app/javascript/dashboard/composables/useConversationRequiredAttributes.js b/app/javascript/dashboard/composables/useConversationRequiredAttributes.js
new file mode 100644
index 000000000..7b6ab29b1
--- /dev/null
+++ b/app/javascript/dashboard/composables/useConversationRequiredAttributes.js
@@ -0,0 +1,97 @@
+import { computed } from 'vue';
+import { useMapGetter } from 'dashboard/composables/store';
+import { useAccount } from 'dashboard/composables/useAccount';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { ATTRIBUTE_TYPES } from 'dashboard/components-next/ConversationWorkflow/constants';
+
+/**
+ * Composable for managing conversation required attributes workflow
+ *
+ * This handles the logic for checking if conversations have all required
+ * custom attributes filled before they can be resolved.
+ */
+export function useConversationRequiredAttributes() {
+  const { currentAccount, accountId } = useAccount();
+  const isFeatureEnabledonAccount = useMapGetter(
+    'accounts/isFeatureEnabledonAccount'
+  );
+  const conversationAttributes = useMapGetter(
+    'attributes/getConversationAttributes'
+  );
+
+  const isFeatureEnabled = computed(() =>
+    isFeatureEnabledonAccount.value(
+      accountId.value,
+      FEATURE_FLAGS.CONVERSATION_REQUIRED_ATTRIBUTES
+    )
+  );
+
+  const requiredAttributeKeys = computed(() => {
+    if (!isFeatureEnabled.value) return [];
+    return (
+      currentAccount.value?.settings?.conversation_required_attributes || []
+    );
+  });
+
+  const allAttributeOptions = computed(() =>
+    (conversationAttributes.value || []).map(attribute => ({
+      ...attribute,
+      value: attribute.attributeKey,
+      label: attribute.attributeDisplayName,
+      type: attribute.attributeDisplayType,
+      attributeValues: attribute.attributeValues,
+    }))
+  );
+
+  /**
+   * Get the full attribute definitions for only the required attributes
+   * Filters allAttributeOptions to only include attributes marked as required
+   */
+  const requiredAttributes = computed(
+    () =>
+      requiredAttributeKeys.value
+        .map(key =>
+          allAttributeOptions.value.find(attribute => attribute.value === key)
+        )
+        .filter(Boolean) // Remove any undefined attributes (deleted attributes)
+  );
+
+  /**
+   * Check if a conversation is missing any required attributes
+   *
+   * @param {Object} conversationCustomAttributes - Current conversation's custom attributes
+   * @returns {Object} - Analysis result with missing attributes info
+   */
+  const checkMissingAttributes = (conversationCustomAttributes = {}) => {
+    // If no attributes are required, conversation can be resolved
+    if (!requiredAttributes.value.length) {
+      return { hasMissing: false, missing: [] };
+    }
+
+    // Find attributes that are missing or empty
+    const missing = requiredAttributes.value.filter(attribute => {
+      const value = conversationCustomAttributes[attribute.value];
+
+      // For checkbox/boolean attributes, only check if the key exists
+      if (attribute.type === ATTRIBUTE_TYPES.CHECKBOX) {
+        return !(attribute.value in conversationCustomAttributes);
+      }
+
+      // For other attribute types, only consider null, undefined, empty string, or whitespace-only as missing
+      // Allow falsy values like 0, false as they are valid filled values
+      return value == null || String(value).trim() === '';
+    });
+
+    return {
+      hasMissing: missing.length > 0,
+      missing,
+      all: requiredAttributes.value,
+    };
+  };
+
+  return {
+    requiredAttributeKeys,
+    requiredAttributes,
+    checkMissingAttributes,
+  };
+}
diff --git a/app/javascript/dashboard/composables/useCopilotReply.js b/app/javascript/dashboard/composables/useCopilotReply.js
index 83b541700..492bcb43e 100644
--- a/app/javascript/dashboard/composables/useCopilotReply.js
+++ b/app/javascript/dashboard/composables/useCopilotReply.js
@@ -1,6 +1,56 @@
 import { ref, computed } from 'vue';
 import { useCaptain } from 'dashboard/composables/useCaptain';
 import { useUISettings } from 'dashboard/composables/useUISettings';
+import { useTrack } from 'dashboard/composables';
+import { CAPTAIN_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+
+// Actions that map to REWRITE events (with operation attribute)
+const REWRITE_ACTIONS = [
+  'improve',
+  'fix_spelling_grammar',
+  'casual',
+  'professional',
+  'expand',
+  'shorten',
+  'rephrase',
+  'make_friendly',
+  'make_formal',
+  'simplify',
+];
+
+/**
+ * Gets the event key suffix based on action type.
+ * @param {string} action - The action type
+ * @returns {string} The event key prefix (REWRITE, SUMMARIZE, or REPLY_SUGGESTION)
+ */
+function getEventPrefix(action) {
+  if (action === 'summarize') return 'SUMMARIZE';
+  if (action === 'reply_suggestion') return 'REPLY_SUGGESTION';
+  return 'REWRITE';
+}
+
+/**
+ * Builds the analytics payload based on action type.
+ * @param {string} action - The action type
+ * @param {number} conversationId - The conversation ID
+ * @param {number} [followUpCount] - Optional follow-up count
+ * @returns {Object} The payload object
+ */
+function buildPayload(action, conversationId, followUpCount = undefined) {
+  const payload = { conversationId };
+
+  // Add operation for rewrite actions
+  if (REWRITE_ACTIONS.includes(action)) {
+    payload.operation = action;
+  }
+
+  // Add followUpCount if provided
+  if (followUpCount !== undefined) {
+    payload.followUpCount = followUpCount;
+  }
+
+  return payload;
+}
 
 /**
  * Composable for managing Copilot reply generation state and actions.
@@ -9,7 +59,7 @@ import { useUISettings } from 'dashboard/composables/useUISettings';
  * @returns {Object} Copilot reply state and methods
  */
 export function useCopilotReply() {
-  const { processEvent, followUp } = useCaptain();
+  const { processEvent, followUp, currentChat } = useCaptain();
   const { updateUISettings } = useUISettings();
 
   const showEditor = ref(false);
@@ -19,6 +69,13 @@ export function useCopilotReply() {
   const followUpContext = ref(null);
   const abortController = ref(null);
 
+  // Tracking state
+  const currentAction = ref(null);
+  const followUpCount = ref(0);
+  const trackedConversationId = ref(null);
+
+  const conversationId = computed(() => currentChat.value?.id);
+
   const isActive = computed(() => showEditor.value || isGenerating.value);
   const isButtonDisabled = computed(
     () => isGenerating.value || !isContentReady.value
@@ -29,8 +86,22 @@ export function useCopilotReply() {
 
   /**
    * Resets all copilot editor state and cancels any ongoing generation.
+   * @param {boolean} [trackDismiss=true] - Whether to track dismiss event
    */
-  function reset() {
+  function reset(trackDismiss = true) {
+    // Track dismiss event if there was content and we're not accepting
+    if (trackDismiss && generatedContent.value && currentAction.value) {
+      const eventKey = `${getEventPrefix(currentAction.value)}_DISMISSED`;
+      useTrack(
+        CAPTAIN_EVENTS[eventKey],
+        buildPayload(
+          currentAction.value,
+          trackedConversationId.value,
+          followUpCount.value
+        )
+      );
+    }
+
     if (abortController.value) {
       abortController.value.abort();
       abortController.value = null;
@@ -40,6 +111,9 @@ export function useCopilotReply() {
     isContentReady.value = false;
     generatedContent.value = '';
     followUpContext.value = null;
+    currentAction.value = null;
+    followUpCount.value = 0;
+    trackedConversationId.value = null;
   }
 
   /**
@@ -70,11 +144,14 @@ export function useCopilotReply() {
       return;
     }
 
-    // Reset and start new generation
-    reset();
+    // Reset without tracking dismiss (starting new action)
+    reset(false);
     abortController.value = new AbortController();
     isGenerating.value = true;
     isContentReady.value = false;
+    currentAction.value = action;
+    followUpCount.value = 0;
+    trackedConversationId.value = conversationId.value;
 
     try {
       const { message: content, followUpContext: newContext } =
@@ -85,7 +162,15 @@ export function useCopilotReply() {
       if (!abortController.value?.signal.aborted) {
         generatedContent.value = content;
         followUpContext.value = newContext;
-        if (content) showEditor.value = true;
+        if (content) {
+          showEditor.value = true;
+          // Track "Used" event on successful generation
+          const eventKey = `${getEventPrefix(action)}_USED`;
+          useTrack(
+            CAPTAIN_EVENTS[eventKey],
+            buildPayload(action, trackedConversationId.value)
+          );
+        }
         isGenerating.value = false;
       }
     } catch {
@@ -106,6 +191,12 @@ export function useCopilotReply() {
     isGenerating.value = true;
     isContentReady.value = false;
 
+    // Track follow-up sent event
+    useTrack(CAPTAIN_EVENTS.FOLLOW_UP_SENT, {
+      conversationId: trackedConversationId.value,
+    });
+    followUpCount.value += 1;
+
     try {
       const { message: content, followUpContext: updatedContext } =
         await followUp({
@@ -137,7 +228,28 @@ export function useCopilotReply() {
    */
   function accept() {
     const content = generatedContent.value;
+
+    // Track "Applied" event
+    if (currentAction.value) {
+      const eventKey = `${getEventPrefix(currentAction.value)}_APPLIED`;
+      useTrack(
+        CAPTAIN_EVENTS[eventKey],
+        buildPayload(
+          currentAction.value,
+          trackedConversationId.value,
+          followUpCount.value
+        )
+      );
+    }
+
+    // Reset state without tracking dismiss
     showEditor.value = false;
+    generatedContent.value = '';
+    followUpContext.value = null;
+    currentAction.value = null;
+    followUpCount.value = 0;
+    trackedConversationId.value = null;
+
     return content;
   }
 
diff --git a/app/javascript/dashboard/composables/useLabelSuggestions.js b/app/javascript/dashboard/composables/useLabelSuggestions.js
new file mode 100644
index 000000000..479d1f2fb
--- /dev/null
+++ b/app/javascript/dashboard/composables/useLabelSuggestions.js
@@ -0,0 +1,80 @@
+import { computed, onMounted } from 'vue';
+import { useMapGetter, useStore } from 'dashboard/composables/store';
+import { useAccount } from 'dashboard/composables/useAccount';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import TasksAPI from 'dashboard/api/captain/tasks';
+
+/**
+ * Cleans and normalizes a list of labels.
+ * @param {string} labels - A comma-separated string of labels.
+ * @returns {string[]} An array of cleaned and unique labels.
+ */
+const cleanLabels = labels => {
+  return labels
+    .toLowerCase()
+    .split(',')
+    .filter(label => label.trim())
+    .map(label => label.trim())
+    .filter((label, index, self) => self.indexOf(label) === index);
+};
+
+export function useLabelSuggestions() {
+  const store = useStore();
+  const { isCloudFeatureEnabled } = useAccount();
+  const appIntegrations = useMapGetter('integrations/getAppIntegrations');
+  const currentChat = useMapGetter('getSelectedChat');
+  const conversationId = computed(() => currentChat.value?.id);
+
+  const captainTasksEnabled = computed(() => {
+    return isCloudFeatureEnabled(FEATURE_FLAGS.CAPTAIN_TASKS);
+  });
+
+  const aiIntegration = computed(
+    () =>
+      appIntegrations.value.find(
+        integration => integration.id === 'openai' && !!integration.hooks.length
+      )?.hooks[0]
+  );
+
+  const isLabelSuggestionFeatureEnabled = computed(() => {
+    if (aiIntegration.value) {
+      const { settings = {} } = aiIntegration.value || {};
+      return !!settings.label_suggestion;
+    }
+    return false;
+  });
+
+  const fetchIntegrationsIfRequired = async () => {
+    if (!appIntegrations.value.length) {
+      await store.dispatch('integrations/get');
+    }
+  };
+
+  /**
+   * Gets label suggestions for the current conversation.
+   * @returns {Promise<string[]>} An array of suggested labels.
+   */
+  const getLabelSuggestions = async () => {
+    if (!conversationId.value) return [];
+
+    try {
+      const result = await TasksAPI.labelSuggestion(conversationId.value);
+      const {
+        data: { message: labels },
+      } = result;
+      return cleanLabels(labels);
+    } catch {
+      return [];
+    }
+  };
+
+  onMounted(() => {
+    fetchIntegrationsIfRequired();
+  });
+
+  return {
+    captainTasksEnabled,
+    isLabelSuggestionFeatureEnabled,
+    getLabelSuggestions,
+  };
+}
diff --git a/app/javascript/dashboard/constants/globals.js b/app/javascript/dashboard/constants/globals.js
index 85dab459c..eb42a270f 100644
--- a/app/javascript/dashboard/constants/globals.js
+++ b/app/javascript/dashboard/constants/globals.js
@@ -34,7 +34,8 @@ export default {
   DOCS_URL: 'https://www.chatwoot.com/docs/product/',
   HELP_CENTER_DOCS_URL:
     'https://www.chatwoot.com/docs/product/others/help-center',
-  TESTIMONIAL_URL: 'https://testimonials.cdn.chatwoot.com/content.json',
+  TESTIMONIAL_URL:
+    'https://testimonials.cdn.chatwoot.com/testimonial-content.json',
   WHATSAPP_EMBEDDED_SIGNUP_DOCS_URL:
     'https://developers.facebook.com/docs/whatsapp/embedded-signup/custom-flows/onboarding-business-app-users#limitations',
   SMALL_SCREEN_BREAKPOINT: 768,
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 2c3d4c74b..279bc1cf6 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -45,6 +45,7 @@ export const FEATURE_FLAGS = {
   QUOTED_EMAIL_REPLY: 'quoted_email_reply',
   COMPANIES: 'companies',
   ADVANCED_SEARCH: 'advanced_search',
+  CONVERSATION_REQUIRED_ATTRIBUTES: 'conversation_required_attributes',
 };
 
 export const PREMIUM_FEATURES = [
@@ -54,4 +55,5 @@ export const PREMIUM_FEATURES = [
   FEATURE_FLAGS.AUDIT_LOGS,
   FEATURE_FLAGS.HELP_CENTER,
   FEATURE_FLAGS.SAML,
+  FEATURE_FLAGS.CONVERSATION_REQUIRED_ATTRIBUTES,
 ];
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index 8e28473d9..0b6e85d77 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -84,22 +84,28 @@ export const PORTALS_EVENTS = Object.freeze({
   PREVIEW_ARTICLE: 'Previewed article',
 });
 
-export const OPEN_AI_EVENTS = Object.freeze({
-  SUMMARIZE: 'OpenAI: Used summarize',
-  REPLY_SUGGESTION: 'OpenAI: Used reply suggestion',
-  REPHRASE: 'OpenAI: Used rephrase',
-  IMPROVE: 'OpenAI: Used improve',
-  FIX_SPELLING_AND_GRAMMAR: 'OpenAI: Used fix spelling and grammar',
-  SHORTEN: 'OpenAI: Used shorten',
-  EXPAND: 'OpenAI: Used expand',
-  MAKE_FRIENDLY: 'OpenAI: Used make friendly',
-  MAKE_FORMAL: 'OpenAI: Used make formal',
-  SIMPLIFY: 'OpenAI: Used simplify',
-  APPLY_LABEL_SUGGESTION: 'OpenAI: Apply label from suggestion',
-  DISMISS_LABEL_SUGGESTION: 'OpenAI: Dismiss label suggestions',
-  ADDED_AI_INTEGRATION_VIA_CTA_BUTTON:
-    'OpenAI: Added AI integration via CTA button',
-  DISMISS_AI_SUGGESTION: 'OpenAI: Dismiss AI suggestions',
+export const CAPTAIN_EVENTS = Object.freeze({
+  // Rewrite events (with operation attribute in payload)
+  REWRITE_USED: 'Captain: Rewrite used',
+  REWRITE_APPLIED: 'Captain: Rewrite applied',
+  REWRITE_DISMISSED: 'Captain: Rewrite dismissed',
+
+  // Summarize events
+  SUMMARIZE_USED: 'Captain: Summarize used',
+  SUMMARIZE_APPLIED: 'Captain: Summarize applied',
+  SUMMARIZE_DISMISSED: 'Captain: Summarize dismissed',
+
+  // Reply suggestion events
+  REPLY_SUGGESTION_USED: 'Captain: Reply suggestion used',
+  REPLY_SUGGESTION_APPLIED: 'Captain: Reply suggestion applied',
+  REPLY_SUGGESTION_DISMISSED: 'Captain: Reply suggestion dismissed',
+
+  // Follow-up events
+  FOLLOW_UP_SENT: 'Captain: Follow-up sent',
+
+  // Label suggestions
+  LABEL_SUGGESTION_APPLIED: 'Captain: Label suggestion applied',
+  LABEL_SUGGESTION_DISMISSED: 'Captain: Label suggestion dismissed',
 });
 
 export const COPILOT_EVENTS = Object.freeze({
diff --git a/app/javascript/dashboard/i18n/locale/en/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/en/attributesMgmt.json
index 78886f451..4c2d5fbe0 100644
--- a/app/javascript/dashboard/i18n/locale/en/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/attributesMgmt.json
@@ -63,6 +63,10 @@
         },
         "ENABLE_REGEX": {
           "LABEL": "Enable regex validation"
+        },
+        "BADGES": {
+          "PRE_CHAT": "Pre-chat",
+          "RESOLUTION": "Resolution"
         }
       },
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/en/bulkActions.json b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
index 0c8d6602c..d736201de 100644
--- a/app/javascript/dashboard/i18n/locale/en/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
@@ -22,6 +22,10 @@
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
+    "RESOLVE": {
+      "ALL_MISSING_ATTRIBUTES": "Cannot resolve conversations due to missing required attributes",
+      "PARTIAL_SUCCESS": "Some conversations need required attributes before resolving and were skipped"
+    },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
       "NO_LABELS_FOUND": "No labels found",
diff --git a/app/javascript/dashboard/i18n/locale/en/general.json b/app/javascript/dashboard/i18n/locale/en/general.json
index 737bb2b33..bdc7cb8a4 100644
--- a/app/javascript/dashboard/i18n/locale/en/general.json
+++ b/app/javascript/dashboard/i18n/locale/en/general.json
@@ -11,5 +11,9 @@
     "ACCEPT": "Accept",
     "DISCARD": "Discard",
     "PREFERRED": "Preferred"
+  },
+  "CHOICE_TOGGLE": {
+    "YES": "Yes",
+    "NO": "No"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 0c4647474..3dbb67467 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -379,7 +379,8 @@
     },
     "DOCS": "Read docs",
     "SECURITY": "Security",
-    "CAPTAIN_AI": "Captain"
+    "CAPTAIN_AI": "Captain",
+    "CONVERSATION_WORKFLOW": "Conversation Workflow"
   },
   "CAPTAIN_SETTINGS": {
     "TITLE": "Captain Settings",
@@ -555,6 +556,58 @@
       }
     }
   },
+  "CONVERSATION_WORKFLOW": {
+    "INDEX": {
+      "HEADER": {
+        "TITLE": "Conversation Workflows",
+        "DESCRIPTION": "Configure rules and required fields for conversation resolution."
+      }
+    },
+    "REQUIRED_ATTRIBUTES": {
+      "TITLE": "Attributes required on resolution",
+      "DESCRIPTION": "When resolving a conversation, agents will be prompted to fill these attributes if they haven't yet.",
+      "NO_ATTRIBUTES": "No attributes added yet",
+      "ADD": {
+        "TITLE": "Add Attributes",
+        "SEARCH_PLACEHOLDER": "Search attributes"
+      },
+      "SAVE": {
+        "SUCCESS": "Required attributes updated",
+        "ERROR": "Could not update required attributes, please try again"
+      },
+      "MODAL": {
+        "TITLE": "Resolve conversation",
+        "DESCRIPTION": "Please fill in the following custom attributes before resolving this conversation",
+        "ACTIONS": {
+          "RESOLVE": "Resolve conversation",
+          "CANCEL": "Cancel"
+        },
+        "PLACEHOLDERS": {
+          "TEXT": "Write a note...",
+          "NUMBER": "Enter a number",
+          "LINK": "Add a link",
+          "DATE": "Pick a date",
+          "LIST": "Select an option"
+        },
+        "CHECKBOX": {
+          "YES": "Yes",
+          "NO": "No"
+        }
+      },
+      "PAYWALL": {
+        "TITLE": "Upgrade to use required attributes",
+        "AVAILABLE_ON": "The required conversation attributes feature is available on the Business and Enterprise plans.",
+        "UPGRADE_PROMPT": "Upgrade your plan to prompt agents to fill required attributes before conversation resolution.",
+        "UPGRADE_NOW": "Upgrade now",
+        "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+      },
+      "ENTERPRISE_PAYWALL": {
+        "AVAILABLE_ON": "The required conversation attributes feature is available on the paid plans.",
+        "UPGRADE_PROMPT": "Upgrade to a paid plan to enforce required attributes before conversation resolution.",
+        "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+      }
+    }
+  },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
     "NEW_ACCOUNT": "New Account",
diff --git a/app/javascript/dashboard/i18n/locale/en/signup.json b/app/javascript/dashboard/i18n/locale/en/signup.json
index b0e5f5d27..4a90fd322 100644
--- a/app/javascript/dashboard/i18n/locale/en/signup.json
+++ b/app/javascript/dashboard/i18n/locale/en/signup.json
@@ -1,6 +1,7 @@
 {
   "REGISTER": {
     "TRY_WOOT": "Create an account",
+    "GET_STARTED": "Get started with Chatwoot",
     "TITLE": "Register",
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue b/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
index 8fca4bded..915191da9 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
@@ -76,10 +76,7 @@ const toggleButtonText = computed(() =>
 const filteredCustomAttributes = computed(() =>
   attributes.value.map(attribute => {
     // Check if the attribute key exists in customAttributes
-    const hasValue = Object.hasOwnProperty.call(
-      customAttributes.value,
-      attribute.attribute_key
-    );
+    const hasValue = attribute.attribute_key in customAttributes.value;
 
     return {
       ...attribute,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
index c6e9a1ebb..f796635c4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
@@ -14,7 +14,6 @@ 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 AudioTranscription from './components/AudioTranscription.vue';
 import SectionLayout from './components/SectionLayout.vue';
 
@@ -25,7 +24,6 @@ export default {
     AccountId,
     BuildInfo,
     AccountDelete,
-    AutoResolve,
     AudioTranscription,
     SectionLayout,
     WithLabel,
@@ -64,12 +62,6 @@ export default {
       isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
       isOnChatwootCloud: 'globalConfig/isOnChatwootCloud',
     }),
-    showAutoResolutionConfig() {
-      return this.isFeatureEnabledonAccount(
-        this.accountId,
-        FEATURE_FLAGS.AUTO_RESOLVE_CONVERSATIONS
-      );
-    },
     showAudioTranscriptionConfig() {
       return this.isFeatureEnabledonAccount(
         this.accountId,
@@ -239,7 +231,6 @@ export default {
 
       <woot-loading-state v-if="uiFlags.isFetchingItem" />
     </div>
-    <AutoResolve v-if="showAutoResolutionConfig" />
     <AudioTranscription v-if="showAudioTranscriptionConfig" />
     <AccountId />
     <div v-if="!uiFlags.isFetchingItem && isOnChatwootCloud">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue b/app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue
index 881ccb0e8..5e9f14f1f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue
@@ -4,7 +4,6 @@ import { useMapGetter } from 'dashboard/composables/store';
 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 TextArea from 'next/textarea/TextArea.vue';
 import Switch from 'next/switch/Switch.vue';
@@ -125,81 +124,90 @@ const toggleAutoResolve = async () => {
 </script>
 
 <template>
-  <SectionLayout
-    :title="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.TITLE')"
-    :description="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.NOTE')"
-    :hide-content="!isEnabled"
-    with-border
+  <div
+    class="flex flex-col w-full outline-1 outline outline-n-container rounded-xl bg-n-solid-2 divide-y divide-n-weak"
   >
-    <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"
-            v-model:unit="unit"
-            min="0"
-            max="1438560"
-            class="w-full"
-          />
+    <div class="flex flex-col gap-2 items-start px-5 py-4">
+      <div class="flex justify-between items-center w-full">
+        <h3 class="text-base font-medium text-n-slate-12">
+          {{ t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.TITLE') }}
+        </h3>
+        <div class="flex justify-end">
+          <Switch v-model="isEnabled" @change="toggleAutoResolve" />
         </div>
-      </WithLabel>
-      <WithLabel
-        :label="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.MESSAGE.LABEL')"
-        :help-message="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.MESSAGE.HELP')"
-      >
-        <TextArea
-          v-model="message"
-          class="w-full"
-          :placeholder="
-            t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.MESSAGE.PLACEHOLDER')
-          "
-        />
-      </WithLabel>
-      <WithLabel :label="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.PREFERENCES')">
-        <div
-          class="rounded-xl border border-n-weak bg-n-solid-1 w-full text-sm text-n-slate-12 divide-y divide-n-weak"
+      </div>
+      <p class="mb-0 text-sm text-n-slate-11">
+        {{ t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.NOTE') }}
+      </p>
+    </div>
+
+    <div v-if="isEnabled" class="px-5 py-4">
+      <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="p-3 h-12 flex items-center justify-between">
-            <span>
-              {{ t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.IGNORE_WAITING.LABEL') }}
-            </span>
-            <Switch v-model="ignoreWaiting" />
-          </div>
-          <div class="p-3 h-12 flex items-center justify-between">
-            <span>
-              {{ t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.LABEL.LABEL') }}
-            </span>
-            <SingleSelect
-              v-model="labelToApply"
-              :options="labelOptions"
-              :placeholder="
-                $t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.LABEL.PLACEHOLDER')
-              "
-              placeholder-icon="i-lucide-chevron-down"
-              placeholder-trailing-icon
-              variant="faded"
+          <div class="gap-2 w-full grid grid-cols-[3fr_1fr]">
+            <!-- allow 10 mins to 999 days -->
+            <DurationInput
+              v-model="duration"
+              v-model:unit="unit"
+              min="0"
+              max="1438560"
+              class="w-full"
             />
           </div>
+        </WithLabel>
+        <WithLabel
+          :label="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.MESSAGE.LABEL')"
+          :help-message="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.MESSAGE.HELP')"
+        >
+          <TextArea
+            v-model="message"
+            class="w-full"
+            :placeholder="
+              t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.MESSAGE.PLACEHOLDER')
+            "
+          />
+        </WithLabel>
+        <WithLabel :label="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.PREFERENCES')">
+          <div
+            class="rounded-xl border border-n-weak bg-n-solid-1 w-full text-sm text-n-slate-12 divide-y divide-n-weak"
+          >
+            <div class="p-3 h-12 flex items-center justify-between">
+              <span>
+                {{
+                  t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.IGNORE_WAITING.LABEL')
+                }}
+              </span>
+              <Switch v-model="ignoreWaiting" />
+            </div>
+            <div class="p-3 h-12 flex items-center justify-between">
+              <span>
+                {{ t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.LABEL.LABEL') }}
+              </span>
+              <SingleSelect
+                v-model="labelToApply"
+                :options="labelOptions"
+                :placeholder="
+                  $t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.LABEL.PLACEHOLDER')
+                "
+                placeholder-icon="i-lucide-chevron-down"
+                placeholder-trailing-icon
+                variant="faded"
+              />
+            </div>
+          </div>
+        </WithLabel>
+        <div class="flex gap-2">
+          <NextButton
+            blue
+            type="submit"
+            :is-loading="isSubmitting"
+            :label="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.UPDATE_BUTTON')"
+          />
         </div>
-      </WithLabel>
-      <div class="flex gap-2">
-        <NextButton
-          blue
-          type="submit"
-          :is-loading="isSubmitting"
-          :label="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.UPDATE_BUTTON')"
-        />
-      </div>
-    </form>
-  </SectionLayout>
+      </form>
+    </div>
+  </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue b/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
deleted file mode 100644
index db9c2dacf..000000000
--- a/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<script setup>
-import { useAlert } from 'dashboard/composables';
-import EditAttribute from './EditAttribute.vue';
-import { useStoreGetters, useStore } from 'dashboard/composables/store';
-import { computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import Button from 'dashboard/components-next/button/Button.vue';
-
-const props = defineProps({
-  attributeModel: {
-    type: String,
-    default: 'conversation_attribute',
-  },
-});
-
-const { t } = useI18n();
-
-const showEditPopup = ref(false);
-const showDeletePopup = ref(false);
-const selectedAttribute = ref({});
-
-const getters = useStoreGetters();
-const store = useStore();
-
-const attributes = computed(() =>
-  getters['attributes/getAttributesByModel'].value(props.attributeModel)
-);
-const uiFlags = computed(() => getters['attributes/getUIFlags'].value);
-
-const attributeDisplayName = computed(
-  () => selectedAttribute.value.attribute_display_name
-);
-const deleteConfirmText = computed(
-  () =>
-    `${t('ATTRIBUTES_MGMT.DELETE.CONFIRM.YES')} ${attributeDisplayName.value}`
-);
-const deleteRejectText = computed(() => t('ATTRIBUTES_MGMT.DELETE.CONFIRM.NO'));
-const confirmDeleteTitle = computed(() =>
-  t('ATTRIBUTES_MGMT.DELETE.CONFIRM.TITLE', {
-    attributeName: attributeDisplayName.value,
-  })
-);
-const confirmPlaceHolderText = computed(
-  () =>
-    `${t('ATTRIBUTES_MGMT.DELETE.CONFIRM.PLACE_HOLDER', {
-      attributeName: attributeDisplayName.value,
-    })}`
-);
-
-const deleteAttributes = async ({ id }) => {
-  try {
-    await store.dispatch('attributes/delete', id);
-    useAlert(t('ATTRIBUTES_MGMT.DELETE.API.SUCCESS_MESSAGE'));
-  } catch (error) {
-    const errorMessage =
-      error?.response?.message || t('ATTRIBUTES_MGMT.DELETE.API.ERROR_MESSAGE');
-    useAlert(errorMessage);
-  }
-};
-const openEditPopup = response => {
-  showEditPopup.value = true;
-  selectedAttribute.value = response;
-};
-const hideEditPopup = () => {
-  showEditPopup.value = false;
-};
-
-const closeDelete = () => {
-  showDeletePopup.value = false;
-  selectedAttribute.value = {};
-};
-const confirmDeletion = () => {
-  deleteAttributes(selectedAttribute.value);
-  closeDelete();
-};
-const openDelete = value => {
-  showDeletePopup.value = true;
-  selectedAttribute.value = value;
-};
-
-const tableHeaders = computed(() => {
-  return [
-    t('ATTRIBUTES_MGMT.LIST.TABLE_HEADER.NAME'),
-    t('ATTRIBUTES_MGMT.LIST.TABLE_HEADER.DESCRIPTION'),
-    t('ATTRIBUTES_MGMT.LIST.TABLE_HEADER.TYPE'),
-    t('ATTRIBUTES_MGMT.LIST.TABLE_HEADER.KEY'),
-  ];
-});
-</script>
-
-<template>
-  <div class="flex flex-col">
-    <table class="min-w-full overflow-x-auto">
-      <thead>
-        <th
-          v-for="tableHeader in tableHeaders"
-          :key="tableHeader"
-          class="py-4 ltr:pr-4 rtl:pl-4 text-left font-semibold text-n-slate-11"
-        >
-          {{ tableHeader }}
-        </th>
-      </thead>
-      <tbody class="divide-y divide-n-weak flex-1 text-n-slate-12">
-        <tr v-for="attribute in attributes" :key="attribute.attribute_key">
-          <td
-            class="py-4 ltr:pr-4 rtl:pl-4 overflow-hidden whitespace-nowrap text-ellipsis"
-          >
-            {{ attribute.attribute_display_name }}
-          </td>
-          <td class="py-4 ltr:pr-4 rtl:pl-4">
-            {{ attribute.attribute_description }}
-          </td>
-          <td
-            class="py-4 ltr:pr-4 rtl:pl-4 overflow-hidden whitespace-nowrap text-ellipsis"
-          >
-            {{
-              $t(
-                `ATTRIBUTES_MGMT.ATTRIBUTE_TYPES.${attribute.attribute_display_type?.toUpperCase()}`
-              )
-            }}
-          </td>
-          <td
-            class="py-4 ltr:pr-4 rtl:pl-4 attribute-key overflow-hidden whitespace-nowrap text-ellipsis"
-          >
-            {{ attribute.attribute_key }}
-          </td>
-          <td class="py-4 min-w-xs">
-            <div class="flex gap-1 justify-end">
-              <Button
-                v-tooltip.top="$t('ATTRIBUTES_MGMT.LIST.BUTTONS.EDIT')"
-                icon="i-lucide-pen"
-                slate
-                xs
-                faded
-                @click="openEditPopup(attribute)"
-              />
-              <Button
-                v-tooltip.top="$t('ATTRIBUTES_MGMT.LIST.BUTTONS.DELETE')"
-                icon="i-lucide-trash-2"
-                xs
-                ruby
-                faded
-                @click="openDelete(attribute)"
-              />
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <woot-modal v-model:show="showEditPopup" :on-close="hideEditPopup">
-      <EditAttribute
-        :selected-attribute="selectedAttribute"
-        :is-updating="uiFlags.isUpdating"
-        @on-close="hideEditPopup"
-      />
-    </woot-modal>
-    <woot-confirm-delete-modal
-      v-if="showDeletePopup"
-      v-model:show="showDeletePopup"
-      :title="confirmDeleteTitle"
-      :message="$t('ATTRIBUTES_MGMT.DELETE.CONFIRM.MESSAGE')"
-      :confirm-text="deleteConfirmText"
-      :reject-text="deleteRejectText"
-      :confirm-value="selectedAttribute.attribute_display_name"
-      :confirm-place-holder-text="confirmPlaceHolderText"
-      @on-confirm="confirmDeletion"
-      @on-close="closeDelete"
-    />
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.attribute-key {
-  font-family: monospace;
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/conversationWorkflow/conversationWorkflow.routes.js b/app/javascript/dashboard/routes/dashboard/settings/conversationWorkflow/conversationWorkflow.routes.js
new file mode 100644
index 000000000..494e6a7f1
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/conversationWorkflow/conversationWorkflow.routes.js
@@ -0,0 +1,22 @@
+import { frontendURL } from '../../../../helper/URLHelper';
+import SettingsWrapper from '../SettingsWrapper.vue';
+import ConversationWorkflowIndex from './index.vue';
+
+export default {
+  routes: [
+    {
+      path: frontendURL('accounts/:accountId/settings/conversation-workflow'),
+      component: SettingsWrapper,
+      children: [
+        {
+          path: '',
+          name: 'conversation_workflow_index',
+          component: ConversationWorkflowIndex,
+          meta: {
+            permissions: ['administrator'],
+          },
+        },
+      ],
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/conversationWorkflow/index.vue b/app/javascript/dashboard/routes/dashboard/settings/conversationWorkflow/index.vue
new file mode 100644
index 000000000..30df5bbd6
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/conversationWorkflow/index.vue
@@ -0,0 +1,48 @@
+<script setup>
+import { computed } from 'vue';
+import { useMapGetter } from 'dashboard/composables/store';
+import { useAccount } from 'dashboard/composables/useAccount';
+import { FEATURE_FLAGS } from '../../../../featureFlags';
+import BaseSettingsHeader from '../components/BaseSettingsHeader.vue';
+import SettingsLayout from '../SettingsLayout.vue';
+import ConversationRequiredAttributes from 'dashboard/components-next/ConversationWorkflow/ConversationRequiredAttributes.vue';
+import AutoResolve from 'dashboard/routes/dashboard/settings/account/components/AutoResolve.vue';
+
+const { accountId } = useAccount();
+const isFeatureEnabledonAccount = useMapGetter(
+  'accounts/isFeatureEnabledonAccount'
+);
+
+const showAutoResolutionConfig = computed(() => {
+  return isFeatureEnabledonAccount.value(
+    accountId.value,
+    FEATURE_FLAGS.AUTO_RESOLVE_CONVERSATIONS
+  );
+});
+
+const showRequiredAttributes = computed(() => {
+  return isFeatureEnabledonAccount.value(
+    accountId.value,
+    FEATURE_FLAGS.CONVERSATION_REQUIRED_ATTRIBUTES
+  );
+});
+</script>
+
+<template>
+  <SettingsLayout :no-records-found="false" class="gap-10">
+    <template #header>
+      <BaseSettingsHeader
+        :title="$t('CONVERSATION_WORKFLOW.INDEX.HEADER.TITLE')"
+        :description="$t('CONVERSATION_WORKFLOW.INDEX.HEADER.DESCRIPTION')"
+        feature-name="conversation-workflow"
+      />
+    </template>
+
+    <template #body>
+      <div class="flex flex-col gap-6">
+        <AutoResolve v-if="showAutoResolutionConfig" />
+        <ConversationRequiredAttributes :is-enabled="showRequiredAttributes" />
+      </div>
+    </template>
+  </SettingsLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
index 41c3498e1..e277a0ef4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
@@ -24,6 +24,7 @@ import teams from './teams/teams.routes';
 import customRoles from './customRoles/customRole.routes';
 import profile from './profile/profile.routes';
 import security from './security/security.routes';
+import conversationWorkflow from './conversationWorkflow/conversationWorkflow.routes';
 import captain from './captain/captain.routes';
 
 export default {
@@ -64,6 +65,7 @@ export default {
     ...customRoles.routes,
     ...profile.routes,
     ...security.routes,
+    ...conversationWorkflow.routes,
     ...captain.routes,
   ],
 };
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index dcaf5f9c9..559eaaad9 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -240,9 +240,21 @@ const actions = {
 
   toggleStatus: async (
     { commit },
-    { conversationId, status, snoozedUntil = null }
+    { conversationId, status, snoozedUntil = null, customAttributes = null }
   ) => {
     try {
+      // Update custom attributes first if provided
+      if (customAttributes) {
+        await ConversationApi.updateCustomAttributes({
+          conversationId,
+          customAttributes,
+        });
+        commit(types.UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES, {
+          conversationId,
+          customAttributes,
+        });
+      }
+
       const {
         data: {
           payload: {
@@ -459,7 +471,10 @@ const actions = {
         customAttributes,
       });
       const { custom_attributes } = response.data;
-      commit(types.UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES, custom_attributes);
+      commit(types.UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES, {
+        conversationId,
+        customAttributes: custom_attributes,
+      });
     } catch (error) {
       // Handle error
     }
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 72b7bc566..8d3ef9a9a 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -121,9 +121,19 @@ export const mutations = {
     chat.priority = priority;
   },
 
-  [types.UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES](_state, custom_attributes) {
-    const [chat] = getSelectedChatConversation(_state);
-    chat.custom_attributes = custom_attributes;
+  [types.UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES](
+    _state,
+    { conversationId, customAttributes }
+  ) {
+    const conversation = _state.allConversations.find(
+      c => c.id === conversationId
+    );
+    if (conversation) {
+      conversation.custom_attributes = {
+        ...conversation.custom_attributes,
+        ...customAttributes,
+      };
+    }
   },
 
   [types.CHANGE_CONVERSATION_STATUS](
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
index 161ae914b..502c072f6 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
@@ -548,7 +548,13 @@ describe('#deleteMessage', () => {
         }
       );
       expect(commit.mock.calls).toEqual([
-        [types.UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES, { order_d: '1001' }],
+        [
+          types.UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES,
+          {
+            conversationId: 1,
+            customAttributes: { order_d: '1001' },
+          },
+        ],
       ]);
     });
   });
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
index 48e676215..e9e78a25c 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
@@ -239,14 +239,14 @@ describe('#mutations', () => {
     describe('#UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES', () => {
       it('update conversation custom attributes', () => {
         const custom_attributes = { order_id: 1001 };
-        const state = { allConversations: [{ id: 1 }], selectedChatId: 1 };
+        const state = { allConversations: [{ id: 1, custom_attributes: {} }] };
         mutations[types.UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES](state, {
           conversationId: 1,
-          custom_attributes,
+          customAttributes: custom_attributes,
         });
-        expect(
-          state.allConversations[0].custom_attributes.custom_attributes
-        ).toEqual(custom_attributes);
+        expect(state.allConversations[0].custom_attributes).toEqual(
+          custom_attributes
+        );
       });
     });
   });
diff --git a/app/javascript/v3/api/auth.js b/app/javascript/v3/api/auth.js
index 146db4e07..cccd9468e 100644
--- a/app/javascript/v3/api/auth.js
+++ b/app/javascript/v3/api/auth.js
@@ -4,7 +4,10 @@ import {
   clearLocalStorageOnLogout,
 } from 'dashboard/store/utils/api';
 import wootAPI from './apiClient';
-import { getLoginRedirectURL } from '../helpers/AuthHelper';
+import {
+  getLoginRedirectURL,
+  getCredentialsFromEmail,
+} from '../helpers/AuthHelper';
 
 export const login = async ({
   ssoAccountId,
@@ -46,9 +49,10 @@ export const login = async ({
 
 export const register = async creds => {
   try {
+    const { fullName, accountName } = getCredentialsFromEmail(creds.email);
     const response = await wootAPI.post('api/v1/accounts.json', {
-      account_name: creds.accountName.trim(),
-      user_full_name: creds.fullName.trim(),
+      account_name: accountName,
+      user_full_name: fullName,
       email: creds.email,
       password: creds.password,
       h_captcha_client_response: creds.hCaptchaClientResponse,
diff --git a/app/javascript/v3/helpers/AuthHelper.js b/app/javascript/v3/helpers/AuthHelper.js
index 70df55331..c2afec985 100644
--- a/app/javascript/v3/helpers/AuthHelper.js
+++ b/app/javascript/v3/helpers/AuthHelper.js
@@ -22,6 +22,21 @@ const getSSOAccountPath = ({ ssoAccountId, user }) => {
   return accountPath;
 };
 
+const capitalize = str =>
+  str
+    .split(/[._-]+/)
+    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(' ');
+
+export const getCredentialsFromEmail = email => {
+  const [localPart, domain] = email.split('@');
+  const namePart = localPart.split('+')[0];
+  return {
+    fullName: capitalize(namePart),
+    accountName: capitalize(domain.split('.')[0]),
+  };
+};
+
 export const getLoginRedirectURL = ({
   ssoAccountId,
   ssoConversationId,
diff --git a/app/javascript/v3/helpers/specs/AuthHelper.spec.js b/app/javascript/v3/helpers/specs/AuthHelper.spec.js
index 2bf3ba450..b422d8530 100644
--- a/app/javascript/v3/helpers/specs/AuthHelper.spec.js
+++ b/app/javascript/v3/helpers/specs/AuthHelper.spec.js
@@ -1,4 +1,4 @@
-import { getLoginRedirectURL } from '../AuthHelper';
+import { getLoginRedirectURL, getCredentialsFromEmail } from '../AuthHelper';
 
 describe('#URL Helpers', () => {
   describe('getLoginRedirectURL', () => {
@@ -40,4 +40,41 @@ describe('#URL Helpers', () => {
       expect(getLoginRedirectURL('7500', null)).toBe('/app/');
     });
   });
+
+  describe('getCredentialsFromEmail', () => {
+    it('should capitalize fullName and accountName from a standard email', () => {
+      expect(getCredentialsFromEmail('john@company.com')).toEqual({
+        fullName: 'John',
+        accountName: 'Company',
+      });
+    });
+
+    it('should handle subdomains by using the first part of the domain', () => {
+      expect(getCredentialsFromEmail('jane@mail.example.org')).toEqual({
+        fullName: 'Jane',
+        accountName: 'Mail',
+      });
+    });
+
+    it('should split by dots and capitalize each word', () => {
+      expect(getCredentialsFromEmail('john.doe@acme.co')).toEqual({
+        fullName: 'John Doe',
+        accountName: 'Acme',
+      });
+    });
+
+    it('should omit everything after + in the local part', () => {
+      expect(getCredentialsFromEmail('user+tag@startup.io')).toEqual({
+        fullName: 'User',
+        accountName: 'Startup',
+      });
+    });
+
+    it('should split by underscores and hyphens', () => {
+      expect(getCredentialsFromEmail('first_last@my-company.com')).toEqual({
+        fullName: 'First Last',
+        accountName: 'My Company',
+      });
+    });
+  });
 });
diff --git a/app/javascript/v3/views/auth/signup/Index.vue b/app/javascript/v3/views/auth/signup/Index.vue
index 86baff55c..57ec0b20c 100644
--- a/app/javascript/v3/views/auth/signup/Index.vue
+++ b/app/javascript/v3/views/auth/signup/Index.vue
@@ -1,83 +1,84 @@
-<script>
-import { mapGetters } from 'vuex';
-import { useBranding } from 'shared/composables/useBranding';
+<script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import { useStore } from 'vuex';
 import SignupForm from './components/Signup/Form.vue';
 import Testimonials from './components/Testimonials/Index.vue';
 import Spinner from 'shared/components/Spinner.vue';
+import signupBg from 'assets/images/auth/signup-bg.jpg';
 
-export default {
-  components: {
-    SignupForm,
-    Spinner,
-    Testimonials,
-  },
-  setup() {
-    const { replaceInstallationName } = useBranding();
-    return { replaceInstallationName };
-  },
-  data() {
-    return { isLoading: false };
-  },
-  computed: {
-    ...mapGetters({ globalConfig: 'globalConfig/get' }),
-    isAChatwootInstance() {
-      return this.globalConfig.installationName === 'Chatwoot';
-    },
-  },
-  beforeMount() {
-    this.isLoading = this.isAChatwootInstance;
-  },
-  methods: {
-    resizeContainers() {
-      this.isLoading = false;
-    },
-  },
+const store = useStore();
+
+const isLoading = ref(false);
+const globalConfig = computed(() => store.getters['globalConfig/get']);
+const isAChatwootInstance = computed(
+  () => globalConfig.value.installationName === 'Chatwoot'
+);
+
+onBeforeMount(() => {
+  isLoading.value = isAChatwootInstance.value;
+});
+
+const resizeContainers = () => {
+  isLoading.value = false;
 };
 </script>
 
 <template>
-  <div class="w-full h-full bg-n-background">
-    <div v-show="!isLoading" class="flex h-full min-h-screen items-center">
-      <div
-        class="flex-1 min-h-[640px] inline-flex items-center h-full justify-center overflow-auto py-6"
-      >
-        <div class="px-8 max-w-[560px] w-full overflow-auto">
-          <div class="mb-4">
+  <div
+    class="relative w-full h-full min-h-screen flex items-center justify-center bg-cover bg-center bg-no-repeat p-4"
+    :style="{ backgroundImage: `url(${signupBg})` }"
+  >
+    <div
+      class="absolute inset-0 bg-n-gray-12/60 dark:bg-n-gray-1/80 backdrop-blur-sm"
+    />
+    <div
+      v-show="!isLoading"
+      class="relative flex max-w-[960px] bg-white dark:bg-n-solid-2 rounded-lg outline outline-1 outline-n-container shadow-sm"
+      :class="{ 'w-auto xl:w-full': isAChatwootInstance }"
+    >
+      <div class="flex-1 flex items-center justify-center py-10 px-10">
+        <div class="max-w-[420px] w-full">
+          <div class="mb-6">
             <img
               :src="globalConfig.logo"
               :alt="globalConfig.installationName"
-              class="block w-auto h-8 dark:hidden"
+              class="block w-auto h-7 dark:hidden"
             />
             <img
               v-if="globalConfig.logoDark"
               :src="globalConfig.logoDark"
               :alt="globalConfig.installationName"
-              class="hidden w-auto h-8 dark:block"
+              class="hidden w-auto h-7 dark:block"
             />
-            <h2
-              class="mt-6 text-3xl font-medium text-left mb-7 text-n-slate-12"
-            >
-              {{ $t('REGISTER.TRY_WOOT') }}
+            <h2 class="mt-6 text-2xl font-semibold text-n-slate-12">
+              {{
+                isAChatwootInstance
+                  ? $t('REGISTER.GET_STARTED')
+                  : $t('REGISTER.TRY_WOOT')
+              }}
             </h2>
+            <p class="mt-2 text-sm text-n-slate-11">
+              {{ $t('REGISTER.HAVE_AN_ACCOUNT') }}{{ ' '
+              }}<router-link
+                class="text-n-blue-10 font-medium hover:text-n-blue-11"
+                to="/app/login"
+              >
+                {{ $t('LOGIN.SUBMIT') }}
+              </router-link>
+            </p>
           </div>
           <SignupForm />
-          <div class="px-1 text-sm text-n-slate-12">
-            <span>{{ $t('REGISTER.HAVE_AN_ACCOUNT') }} </span>
-            <router-link class="text-link text-n-brand" to="/app/login">
-              {{ replaceInstallationName($t('LOGIN.TITLE')) }}
-            </router-link>
-          </div>
         </div>
       </div>
       <Testimonials
         v-if="isAChatwootInstance"
-        class="flex-1"
+        class="flex-1 hidden xl:flex"
         @resize-containers="resizeContainers"
       />
     </div>
     <div
       v-show="isLoading"
-      class="flex items-center min-h-screen justify-center w-full h-full"
+      class="relative flex items-center justify-center w-full h-full"
     >
       <Spinner color-scheme="primary" size="" />
     </div>
diff --git a/app/javascript/v3/views/auth/signup/components/Signup/Form.vue b/app/javascript/v3/views/auth/signup/components/Signup/Form.vue
index cb7345ef1..cc6606dad 100644
--- a/app/javascript/v3/views/auth/signup/components/Signup/Form.vue
+++ b/app/javascript/v3/views/auth/signup/components/Signup/Form.vue
@@ -1,224 +1,121 @@
-<script>
+<script setup>
+import { ref, computed, reactive } from 'vue';
 import { useVuelidate } from '@vuelidate/core';
-import { required, minLength, email, sameAs } from '@vuelidate/validators';
-import { mapGetters } from 'vuex';
+import { required, minLength, email } from '@vuelidate/validators';
+import { useStore } from 'vuex';
+import { useI18n } from 'vue-i18n';
 import { useAlert } from 'dashboard/composables';
 import { DEFAULT_REDIRECT_URL } from 'dashboard/constants/globals';
 import VueHcaptcha from '@hcaptcha/vue3-hcaptcha';
-import SimpleDivider from '../../../../../components/Divider/SimpleDivider.vue';
 import FormInput from '../../../../../components/Form/Input.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
+import PasswordRequirements from './PasswordRequirements.vue';
 import { isValidPassword } from 'shared/helpers/Validators';
 import GoogleOAuthButton from '../../../../../components/GoogleOauth/Button.vue';
 import { register } from '../../../../../api/auth';
 import * as CompanyEmailValidator from 'company-email-validator';
 
 const MIN_PASSWORD_LENGTH = 6;
-const SPECIAL_CHAR_REGEX = /[!@#$%^&*()_+\-=[\]{}|'"/\\.,`<>:;?~]/;
 
-export default {
-  components: {
-    FormInput,
-    GoogleOAuthButton,
-    NextButton,
-    SimpleDivider,
-    Icon,
-    VueHcaptcha,
-  },
-  setup() {
-    return { v$: useVuelidate() };
-  },
-  data() {
-    return {
-      credentials: {
-        accountName: '',
-        fullName: '',
-        email: '',
-        password: '',
-        confirmPassword: '',
-        hCaptchaClientResponse: '',
+const store = useStore();
+const { t } = useI18n();
+
+const hCaptcha = ref(null);
+const isPasswordFocused = ref(false);
+const isSignupInProgress = ref(false);
+
+const credentials = reactive({
+  email: '',
+  password: '',
+  hCaptchaClientResponse: '',
+});
+
+const rules = {
+  credentials: {
+    email: {
+      required,
+      email,
+      businessEmailValidator(value) {
+        return CompanyEmailValidator.isCompanyEmail(value);
       },
-      didCaptchaReset: false,
-      isSignupInProgress: false,
-      error: '',
-    };
-  },
-  validations() {
-    return {
-      credentials: {
-        accountName: {
-          required,
-          minLength: minLength(2),
-        },
-        fullName: {
-          required,
-          minLength: minLength(2),
-        },
-        email: {
-          required,
-          email,
-          businessEmailValidator(value) {
-            return CompanyEmailValidator.isCompanyEmail(value);
-          },
-        },
-        password: {
-          required,
-          isValidPassword,
-          minLength: minLength(MIN_PASSWORD_LENGTH),
-        },
-        confirmPassword: {
-          required,
-          minLength: minLength(MIN_PASSWORD_LENGTH),
-          sameAsPassword: sameAs(this.credentials.password),
-        },
-      },
-    };
-  },
-  computed: {
-    ...mapGetters({ globalConfig: 'globalConfig/get' }),
-    termsLink() {
-      return this.$t('REGISTER.TERMS_ACCEPT')
-        .replace('https://www.chatwoot.com/terms', this.globalConfig.termsURL)
-        .replace(
-          'https://www.chatwoot.com/privacy-policy',
-          this.globalConfig.privacyURL
-        );
     },
-    hasAValidCaptcha() {
-      if (this.globalConfig.hCaptchaSiteKey) {
-        return !!this.credentials.hCaptchaClientResponse;
-      }
-      return true;
-    },
-    confirmPasswordErrorText() {
-      const { confirmPassword } = this.v$.credentials;
-      if (!confirmPassword.$error) return '';
-      if (confirmPassword.sameAsPassword.$invalid) {
-        return this.$t('REGISTER.CONFIRM_PASSWORD.ERROR');
-      }
-      return '';
-    },
-    allowedLoginMethods() {
-      return window.chatwootConfig.allowedLoginMethods || ['email'];
-    },
-    showGoogleOAuth() {
-      return (
-        this.allowedLoginMethods.includes('google_oauth') &&
-        Boolean(window.chatwootConfig.googleOAuthClientId)
-      );
-    },
-    isFormValid() {
-      return !this.v$.$invalid && this.hasAValidCaptcha;
-    },
-    passwordRequirements() {
-      const password = this.credentials.password || '';
-      return {
-        length: password.length >= MIN_PASSWORD_LENGTH,
-        uppercase: /[A-Z]/.test(password),
-        lowercase: /[a-z]/.test(password),
-        number: /[0-9]/.test(password),
-        special: SPECIAL_CHAR_REGEX.test(password),
-      };
-    },
-    passwordRequirementItems() {
-      const reqs = this.passwordRequirements;
-      return [
-        {
-          id: 'length',
-          met: reqs.length,
-          label: this.$t('REGISTER.PASSWORD.REQUIREMENTS_LENGTH', {
-            min: MIN_PASSWORD_LENGTH,
-          }),
-        },
-        {
-          id: 'uppercase',
-          met: reqs.uppercase,
-          label: this.$t('REGISTER.PASSWORD.REQUIREMENTS_UPPERCASE'),
-        },
-        {
-          id: 'lowercase',
-          met: reqs.lowercase,
-          label: this.$t('REGISTER.PASSWORD.REQUIREMENTS_LOWERCASE'),
-        },
-        {
-          id: 'number',
-          met: reqs.number,
-          label: this.$t('REGISTER.PASSWORD.REQUIREMENTS_NUMBER'),
-        },
-        {
-          id: 'special',
-          met: reqs.special,
-          label: this.$t('REGISTER.PASSWORD.REQUIREMENTS_SPECIAL'),
-        },
-      ];
-    },
-    passwordRequirementsMet() {
-      return Object.values(this.passwordRequirements).every(Boolean);
-    },
-  },
-  methods: {
-    async submit() {
-      this.v$.$touch();
-      if (this.v$.$invalid) {
-        this.resetCaptcha();
-        return;
-      }
-      this.isSignupInProgress = true;
-      try {
-        await register(this.credentials);
-        window.location = DEFAULT_REDIRECT_URL;
-      } catch (error) {
-        let errorMessage =
-          error?.message || this.$t('REGISTER.API.ERROR_MESSAGE');
-        this.resetCaptcha();
-        useAlert(errorMessage);
-      } finally {
-        this.isSignupInProgress = false;
-      }
-    },
-    onRecaptchaVerified(token) {
-      this.credentials.hCaptchaClientResponse = token;
-      this.didCaptchaReset = false;
-      this.v$.$touch();
-    },
-    resetCaptcha() {
-      if (!this.globalConfig.hCaptchaSiteKey) return;
-      this.$refs.hCaptcha.reset();
-      this.credentials.hCaptchaClientResponse = '';
-      this.didCaptchaReset = true;
+    password: {
+      required,
+      isValidPassword,
+      minLength: minLength(MIN_PASSWORD_LENGTH),
     },
   },
 };
+
+const v$ = useVuelidate(rules, { credentials });
+
+const globalConfig = computed(() => store.getters['globalConfig/get']);
+
+const termsLink = computed(() =>
+  t('REGISTER.TERMS_ACCEPT')
+    .replace('https://www.chatwoot.com/terms', globalConfig.value.termsURL)
+    .replace(
+      'https://www.chatwoot.com/privacy-policy',
+      globalConfig.value.privacyURL
+    )
+);
+
+const allowedLoginMethods = computed(
+  () => window.chatwootConfig.allowedLoginMethods || ['email']
+);
+
+const showGoogleOAuth = computed(
+  () =>
+    allowedLoginMethods.value.includes('google_oauth') &&
+    Boolean(window.chatwootConfig.googleOAuthClientId)
+);
+
+const isFormValid = computed(() => !v$.value.$invalid);
+
+const performRegistration = async () => {
+  isSignupInProgress.value = true;
+  try {
+    await register(credentials);
+    window.location = DEFAULT_REDIRECT_URL;
+  } catch (error) {
+    const errorMessage = error?.message || t('REGISTER.API.ERROR_MESSAGE');
+    if (globalConfig.value.hCaptchaSiteKey) {
+      hCaptcha.value.reset();
+      credentials.hCaptchaClientResponse = '';
+    }
+    useAlert(errorMessage);
+  } finally {
+    isSignupInProgress.value = false;
+  }
+};
+
+const submit = () => {
+  if (isSignupInProgress.value) return;
+  v$.value.$touch();
+  if (v$.value.$invalid) return;
+  isSignupInProgress.value = true;
+  if (globalConfig.value.hCaptchaSiteKey) {
+    hCaptcha.value.execute();
+  } else {
+    performRegistration();
+  }
+};
+
+const onRecaptchaVerified = token => {
+  credentials.hCaptchaClientResponse = token;
+  performRegistration();
+};
+
+const onCaptchaError = () => {
+  isSignupInProgress.value = false;
+  credentials.hCaptchaClientResponse = '';
+  hCaptcha.value.reset();
+};
 </script>
 
 <template>
-  <div class="flex-1 px-1 overflow-auto">
+  <div class="flex-1">
     <form class="space-y-3" @submit.prevent="submit">
-      <div class="grid grid-cols-2 gap-2">
-        <FormInput
-          v-model="credentials.fullName"
-          name="full_name"
-          class="flex-1"
-          :class="{ error: v$.credentials.fullName.$error }"
-          :label="$t('REGISTER.FULL_NAME.LABEL')"
-          :placeholder="$t('REGISTER.FULL_NAME.PLACEHOLDER')"
-          :has-error="v$.credentials.fullName.$error"
-          :error-message="$t('REGISTER.FULL_NAME.ERROR')"
-          @blur="v$.credentials.fullName.$touch"
-        />
-        <FormInput
-          v-model="credentials.accountName"
-          name="account_name"
-          class="flex-1"
-          :class="{ error: v$.credentials.accountName.$error }"
-          :label="$t('REGISTER.COMPANY_NAME.LABEL')"
-          :placeholder="$t('REGISTER.COMPANY_NAME.PLACEHOLDER')"
-          :has-error="v$.credentials.accountName.$error"
-          :error-message="$t('REGISTER.COMPANY_NAME.ERROR')"
-          @blur="v$.credentials.accountName.$touch"
-        />
-      </div>
       <FormInput
         v-model="credentials.email"
         type="email"
@@ -230,100 +127,62 @@ export default {
         :error-message="$t('REGISTER.EMAIL.ERROR')"
         @blur="v$.credentials.email.$touch"
       />
-      <FormInput
-        v-model="credentials.password"
-        type="password"
-        name="password"
-        :class="{ error: v$.credentials.password.$error }"
-        :label="$t('LOGIN.PASSWORD.LABEL')"
-        :placeholder="$t('SET_NEW_PASSWORD.PASSWORD.PLACEHOLDER')"
-        :has-error="v$.credentials.password.$error"
-        aria-describedby="password-requirements"
-        @blur="v$.credentials.password.$touch"
-      />
-      <div
-        id="password-requirements"
-        class="text-xs rounded-md px-4 py-3 outline outline-1 outline-n-weak bg-n-alpha-black2"
-      >
-        <ul role="list" class="grid grid-cols-2 gap-1">
-          <li
-            v-for="item in passwordRequirementItems"
-            :key="item.id"
-            class="inline-flex gap-1 items-start"
-          >
-            <Icon
-              class="flex-none flex-shrink-0 w-3 mt-0.5"
-              :icon="item.met ? 'i-lucide-circle-check-big' : 'i-lucide-circle'"
-              :class="item.met ? 'text-n-teal-10' : 'text-n-slate-10'"
-            />
-
-            <span :class="item.met ? 'text-n-slate-11' : 'text-n-slate-10'">
-              {{ item.label }}
-            </span>
-          </li>
-        </ul>
-      </div>
-      <FormInput
-        v-model="credentials.confirmPassword"
-        type="password"
-        name="confirm_password"
-        :class="{ error: v$.credentials.confirmPassword.$error }"
-        :label="$t('REGISTER.CONFIRM_PASSWORD.LABEL')"
-        :placeholder="$t('REGISTER.CONFIRM_PASSWORD.PLACEHOLDER')"
-        :has-error="v$.credentials.confirmPassword.$error"
-        :error-message="confirmPasswordErrorText"
-        @blur="v$.credentials.confirmPassword.$touch"
-      />
-      <div v-if="globalConfig.hCaptchaSiteKey" class="mb-3">
-        <VueHcaptcha
-          ref="hCaptcha"
-          :class="{ error: !hasAValidCaptcha && didCaptchaReset }"
-          :sitekey="globalConfig.hCaptchaSiteKey"
-          @verify="onRecaptchaVerified"
+      <div class="relative">
+        <FormInput
+          v-model="credentials.password"
+          type="password"
+          name="password"
+          :class="{ error: v$.credentials.password.$error }"
+          :label="$t('LOGIN.PASSWORD.LABEL')"
+          :placeholder="$t('SET_NEW_PASSWORD.PASSWORD.PLACEHOLDER')"
+          :has-error="v$.credentials.password.$error"
+          @focus="isPasswordFocused = true"
+          @blur="
+            isPasswordFocused = false;
+            v$.credentials.password.$touch();
+          "
         />
-        <span
-          v-if="!hasAValidCaptcha && didCaptchaReset"
-          class="text-xs text-n-ruby-9"
+        <Transition
+          enter-active-class="transition duration-200 ease-out origin-left"
+          enter-from-class="opacity-0 scale-90 translate-x-1"
+          enter-to-class="opacity-100 scale-100 translate-x-0"
+          leave-active-class="transition duration-150 ease-in origin-left"
+          leave-from-class="opacity-100 scale-100 translate-x-0"
+          leave-to-class="opacity-0 scale-90 translate-x-1"
         >
-          {{ $t('SET_NEW_PASSWORD.CAPTCHA.ERROR') }}
-        </span>
+          <PasswordRequirements
+            v-if="isPasswordFocused"
+            :password="credentials.password"
+          />
+        </Transition>
       </div>
+      <VueHcaptcha
+        v-if="globalConfig.hCaptchaSiteKey"
+        ref="hCaptcha"
+        size="invisible"
+        :sitekey="globalConfig.hCaptchaSiteKey"
+        @verify="onRecaptchaVerified"
+        @error="onCaptchaError"
+        @expired="onCaptchaError"
+        @challenge-expired="onCaptchaError"
+        @closed="onCaptchaError"
+      />
       <NextButton
         lg
         type="submit"
         data-testid="submit_button"
-        class="w-full"
-        icon="i-lucide-chevron-right"
-        trailing-icon
+        class="w-full font-medium"
         :label="$t('REGISTER.SUBMIT')"
         :disabled="isSignupInProgress || !isFormValid"
         :is-loading="isSignupInProgress"
       />
     </form>
-    <div class="flex flex-col">
-      <SimpleDivider
-        v-if="showGoogleOAuth"
-        :label="$t('COMMON.OR')"
-        bg="bg-n-background"
-        class="uppercase"
-      />
-      <GoogleOAuthButton v-if="showGoogleOAuth">
-        {{ $t('REGISTER.OAUTH.GOOGLE_SIGNUP') }}
-      </GoogleOAuthButton>
-    </div>
+    <GoogleOAuthButton v-if="showGoogleOAuth" class="mt-3">
+      {{ $t('REGISTER.OAUTH.GOOGLE_SIGNUP') }}
+    </GoogleOAuthButton>
     <p
-      class="text-sm mb-1 mt-5 text-n-slate-12 [&>a]:text-n-brand [&>a]:font-medium [&>a]:hover:brightness-110"
+      class="text-sm mt-5 mb-0 text-n-slate-11 [&>a]:text-n-blue-10 [&>a]:font-medium [&>a]:hover:text-n-blue-11"
       v-html="termsLink"
     />
   </div>
 </template>
-
-<style scoped lang="scss">
-.h-captcha--box {
-  &::v-deep .error {
-    iframe {
-      @apply rounded-md border border-n-ruby-8 dark:border-n-ruby-8;
-    }
-  }
-}
-</style>
diff --git a/app/javascript/v3/views/auth/signup/components/Signup/PasswordRequirements.vue b/app/javascript/v3/views/auth/signup/components/Signup/PasswordRequirements.vue
new file mode 100644
index 000000000..babd7c223
--- /dev/null
+++ b/app/javascript/v3/views/auth/signup/components/Signup/PasswordRequirements.vue
@@ -0,0 +1,69 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+
+const props = defineProps({
+  password: { type: String, default: '' },
+});
+const MIN_PASSWORD_LENGTH = 6;
+const SPECIAL_CHAR_REGEX = /[!@#$%^&*()_+\-=[\]{}|'"/\\.,`<>:;?~]/;
+
+const { t } = useI18n();
+
+const requirements = computed(() => {
+  const password = props.password || '';
+  return [
+    {
+      id: 'length',
+      met: password.length >= MIN_PASSWORD_LENGTH,
+      label: t('REGISTER.PASSWORD.REQUIREMENTS_LENGTH', {
+        min: MIN_PASSWORD_LENGTH,
+      }),
+    },
+    {
+      id: 'uppercase',
+      met: /[A-Z]/.test(password),
+      label: t('REGISTER.PASSWORD.REQUIREMENTS_UPPERCASE'),
+    },
+    {
+      id: 'lowercase',
+      met: /[a-z]/.test(password),
+      label: t('REGISTER.PASSWORD.REQUIREMENTS_LOWERCASE'),
+    },
+    {
+      id: 'number',
+      met: /[0-9]/.test(password),
+      label: t('REGISTER.PASSWORD.REQUIREMENTS_NUMBER'),
+    },
+    {
+      id: 'special',
+      met: SPECIAL_CHAR_REGEX.test(password),
+      label: t('REGISTER.PASSWORD.REQUIREMENTS_SPECIAL'),
+    },
+  ];
+});
+</script>
+
+<template>
+  <div
+    class="absolute top-0 z-50 w-64 text-xs rounded-lg px-4 py-3 bg-white dark:bg-n-solid-3 shadow-lg outline outline-1 outline-n-weak start-full ms-4"
+  >
+    <ul role="list" class="space-y-1.5">
+      <li
+        v-for="item in requirements"
+        :key="item.id"
+        class="inline-flex gap-1.5 items-start"
+      >
+        <Icon
+          class="flex-none flex-shrink-0 w-3 mt-0.5"
+          :icon="item.met ? 'i-lucide-circle-check-big' : 'i-lucide-circle'"
+          :class="item.met ? 'text-n-teal-10' : 'text-n-slate-10'"
+        />
+        <span :class="item.met ? 'text-n-slate-11' : 'text-n-slate-10'">
+          {{ item.label }}
+        </span>
+      </li>
+    </ul>
+  </div>
+</template>
diff --git a/app/javascript/v3/views/auth/signup/components/Testimonials/Index.vue b/app/javascript/v3/views/auth/signup/components/Testimonials/Index.vue
index e49cf7505..970b7cc9d 100644
--- a/app/javascript/v3/views/auth/signup/components/Testimonials/Index.vue
+++ b/app/javascript/v3/views/auth/signup/components/Testimonials/Index.vue
@@ -1,66 +1,48 @@
-<script>
+<script setup>
+import { ref, onBeforeMount } from 'vue';
 import TestimonialCard from './TestimonialCard.vue';
 import { getTestimonialContent } from '../../../../../api/testimonials';
-export default {
-  components: { TestimonialCard },
-  emits: ['resizeContainers'],
-  data() {
-    return { testimonials: [] };
-  },
-  beforeMount() {
-    this.fetchTestimonials();
-  },
-  methods: {
-    async fetchTestimonials() {
-      try {
-        const { data } = await getTestimonialContent();
-        this.testimonials = data;
-      } catch (error) {
-        // Ignoring the error as the UI wouldn't break
-      } finally {
-        this.$emit('resizeContainers', !!this.testimonials.length);
-      }
-    },
-  },
+
+const emit = defineEmits(['resizeContainers']);
+
+const testimonial = ref(null);
+
+const fetchTestimonials = async () => {
+  try {
+    const { data } = await getTestimonialContent();
+    if (data.length) {
+      testimonial.value = data[Math.floor(Math.random() * data.length)];
+    }
+  } catch {
+    // Ignoring the error as the UI wouldn't break
+  } finally {
+    emit('resizeContainers', !!testimonial.value);
+  }
 };
+
+onBeforeMount(() => {
+  fetchTestimonials();
+});
 </script>
 
 <template>
   <div
-    v-show="testimonials.length"
-    class="relative flex-1 min-h-screen hidden overflow-hidden bg-n-blue-8 dark:bg-n-blue-5 xl:flex"
+    class="relative flex-1 flex flex-col items-start justify-center bg-n-alpha-black2 dark:bg-n-solid-3 px-12 py-14 rounded-e-lg"
   >
-    <img
-      src="assets/images/auth/top-left.svg"
-      class="absolute top-0 left-0 w-40 h-40"
+    <TestimonialCard
+      v-if="testimonial"
+      :review-content="testimonial.authorReview"
+      :author-image="testimonial.authorImage"
+      :author-name="testimonial.authorName"
+      :author-designation="testimonial.authorCompany"
     />
-    <img
-      src="assets/images/auth/bottom-right.svg"
-      class="absolute bottom-0 right-0 w-40 h-40"
-    />
-    <img
-      src="assets/images/auth/auth--bg.svg"
-      class="h-[96%] left-[6%] top-[8%] w-[96%] absolute"
-    />
-    <div
-      class="z-50 flex flex-col items-center justify-center w-full h-full min-h-screen"
-    >
-      <div class="flex items-start justify-center p-6">
-        <TestimonialCard
-          v-for="(testimonial, index) in testimonials"
-          :key="testimonial.id"
-          :review-content="testimonial.authorReview"
-          :author-image="testimonial.authorImage"
-          :author-name="testimonial.authorName"
-          :author-designation="testimonial.authorCompany"
-          :class="!index ? 'mt-[20%] -mr-4 z-50' : ''"
-        />
-      </div>
+    <div class="absolute bottom-8 right-8 grid grid-cols-3 gap-1.5">
+      <span class="w-2 h-2 rounded-full bg-n-gray-5" />
+      <span class="w-2 h-2 rounded-full bg-n-gray-5" />
+      <span class="w-2 h-2 rounded-full bg-n-gray-5" />
+      <span class="w-2 h-2 rounded-full bg-n-gray-5" />
+      <span class="w-2 h-2 rounded-full bg-n-gray-5" />
+      <span class="w-2 h-2 rounded-full bg-n-gray-5" />
     </div>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.center--img {
-}
-</style>
diff --git a/app/javascript/v3/views/auth/signup/components/Testimonials/TestimonialCard.vue b/app/javascript/v3/views/auth/signup/components/Testimonials/TestimonialCard.vue
index 6ebd8e92c..a8df8dfde 100644
--- a/app/javascript/v3/views/auth/signup/components/Testimonials/TestimonialCard.vue
+++ b/app/javascript/v3/views/auth/signup/components/Testimonials/TestimonialCard.vue
@@ -1,40 +1,39 @@
-<script>
-export default {
-  props: {
-    reviewContent: {
-      type: String,
-      default: '',
-    },
-    authorImage: {
-      type: String,
-      default: '',
-    },
-    authorName: {
-      type: String,
-      default: '',
-    },
-    authorDesignation: {
-      type: String,
-      default: '',
-    },
-  },
-};
+<script setup>
+defineProps({
+  reviewContent: { type: String, default: '' },
+  authorImage: { type: String, default: '' },
+  authorName: { type: String, default: '' },
+  authorDesignation: { type: String, default: '' },
+});
 </script>
 
 <template>
-  <div
-    class="flex flex-col items-start justify-center p-6 w-80 bg-n-background rounded-lg drop-shadow-md"
-  >
-    <p class="text-sm text-n-slate-12 tracking-normal">
+  <div class="flex flex-col items-start">
+    <svg
+      class="w-10 h-10 text-n-slate-7 mb-6"
+      viewBox="0 0 40 40"
+      fill="currentColor"
+    >
+      <path
+        d="M10.7 28.3c-1.4-1.2-2.1-3-2.1-5.4 0-2.3.8-4.6 2.4-6.8 1.6-2.2 3.8-3.9 6.6-5.1l1.2 2.1c-2.2 1.2-3.7 2.4-4.6 3.6-.9 1.2-1.3 2.5-1.2 3.8.3-.1.7-.2 1.2-.2 1.3 0 2.4.4 3.3 1.3.9.9 1.3 2 1.3 3.3 0 1.4-.5 2.5-1.4 3.4-.9.9-2.1 1.4-3.5 1.4-1.5 0-2.7-.5-3.2-1.4zm15 0c-1.4-1.2-2.1-3-2.1-5.4 0-2.3.8-4.6 2.4-6.8 1.6-2.2 3.8-3.9 6.6-5.1l1.2 2.1c-2.2 1.2-3.7 2.4-4.6 3.6-.9 1.2-1.3 2.5-1.2 3.8.3-.1.7-.2 1.2-.2 1.3 0 2.4.4 3.3 1.3.9.9 1.3 2 1.3 3.3 0 1.4-.5 2.5-1.4 3.4-.9.9-2.1 1.4-3.5 1.4-1.5 0-2.7-.5-3.2-1.4z"
+      />
+    </svg>
+    <p
+      class="text-lg text-n-slate-12 leading-relaxed whitespace-pre-line tracking-tight"
+    >
       {{ reviewContent }}
     </p>
-    <div class="flex items-center mt-4 text-n-slate-12">
-      <div class="bg-white rounded-full p-1">
-        <img :src="authorImage" class="h-8 w-8 rounded-full" />
-      </div>
-      <div class="ml-2">
-        <div class="text-sm font-medium">{{ authorName }}</div>
-        <div class="text-xs">{{ authorDesignation }}</div>
+    <div class="flex items-center mt-8">
+      <img
+        :src="authorImage"
+        :alt="authorName"
+        class="w-11 h-11 rounded-full object-cover"
+      />
+      <div class="ml-3">
+        <div class="text-base font-medium text-n-slate-12">
+          {{ authorName }}
+        </div>
+        <div class="text-sm text-n-slate-10">{{ authorDesignation }}</div>
       </div>
     </div>
   </div>
diff --git a/app/models/account.rb b/app/models/account.rb
index dad5bc18d..df79ee6c1 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -85,7 +85,7 @@ class Account < ApplicationRecord
 
   store_accessor :settings, :auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting
 
-  store_accessor :settings, :audio_transcriptions, :auto_resolve_label, :conversation_required_attributes
+  store_accessor :settings, :audio_transcriptions, :auto_resolve_label
   store_accessor :settings, :captain_models, :captain_features
 
   has_many :account_users, dependent: :destroy_async
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index ac0985416..ca53238e8 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -167,6 +167,10 @@ class Conversation < ApplicationRecord
     agent_last_seen_at.present? ? messages.created_since(agent_last_seen_at) : messages
   end
 
+  def assignee_unread_messages
+    assignee_last_seen_at.present? ? messages.created_since(assignee_last_seen_at) : messages
+  end
+
   def unread_incoming_messages
     unread_messages.where(account_id: account_id).incoming.last(10)
   end
diff --git a/app/models/custom_attribute_definition.rb b/app/models/custom_attribute_definition.rb
index 4154da3b8..70956c108 100644
--- a/app/models/custom_attribute_definition.rb
+++ b/app/models/custom_attribute_definition.rb
@@ -45,7 +45,6 @@ class CustomAttributeDefinition < ApplicationRecord
   belongs_to :account
   after_update :update_widget_pre_chat_custom_fields
   after_destroy :sync_widget_pre_chat_custom_fields
-  after_destroy :cleanup_conversation_required_attributes
 
   private
 
@@ -57,13 +56,6 @@ class CustomAttributeDefinition < ApplicationRecord
     ::Inboxes::UpdateWidgetPreChatCustomFieldsJob.perform_later(account, self)
   end
 
-  def cleanup_conversation_required_attributes
-    return unless conversation_attribute? && account.conversation_required_attributes&.include?(attribute_key)
-
-    account.conversation_required_attributes = account.conversation_required_attributes - [attribute_key]
-    account.save!
-  end
-
   def attribute_must_not_conflict
     model_keys = attribute_model.to_sym == :conversation_attribute ? :conversation : :contact
     return unless attribute_key.in?(STANDARD_ATTRIBUTES[model_keys])
@@ -71,3 +63,5 @@ class CustomAttributeDefinition < ApplicationRecord
     errors.add(:attribute_key, I18n.t('errors.custom_attribute_definition.key_conflict'))
   end
 end
+
+CustomAttributeDefinition.include_mod_with('Concerns::CustomAttributeDefinition')
diff --git a/app/presenters/messages/search_data_presenter.rb b/app/presenters/messages/search_data_presenter.rb
index 7d0638add..7a6260686 100644
--- a/app/presenters/messages/search_data_presenter.rb
+++ b/app/presenters/messages/search_data_presenter.rb
@@ -51,7 +51,6 @@ class Messages::SearchDataPresenter < SimpleDelegator
 
   def additional_attributes_data
     {
-      campaign_id: additional_attributes&.dig('campaign_id'),
       automation_rule_id: content_attributes&.dig('automation_rule_id')
     }
   end
diff --git a/app/services/messages/markdown_renderers/whats_app_renderer.rb b/app/services/messages/markdown_renderers/whats_app_renderer.rb
index 8f98218cf..3b4517b4b 100644
--- a/app/services/messages/markdown_renderers/whats_app_renderer.rb
+++ b/app/services/messages/markdown_renderers/whats_app_renderer.rb
@@ -1,4 +1,9 @@
 class Messages::MarkdownRenderers::WhatsAppRenderer < Messages::MarkdownRenderers::BaseMarkdownRenderer
+  def initialize
+    super
+    @list_item_number = 0
+  end
+
   def strong(_node)
     out('*', :children, '*')
   end
@@ -15,13 +20,20 @@ class Messages::MarkdownRenderers::WhatsAppRenderer < Messages::MarkdownRenderer
     out(node.url)
   end
 
-  def list(_node)
+  def list(node)
+    @list_type = node.list_type
+    @list_item_number = @list_type == :ordered_list ? node.list_start : 0
     out(:children)
     cr
   end
 
   def list_item(_node)
-    out('- ', :children)
+    if @list_type == :ordered_list
+      out("#{@list_item_number}. ", :children)
+      @list_item_number += 1
+    else
+      out('- ', :children)
+    end
     cr
   end
 
diff --git a/app/views/public/api/v1/portals/sitemap.xml.erb b/app/views/public/api/v1/portals/sitemap.xml.erb
index d3e2b8301..1ea828165 100644
--- a/app/views/public/api/v1/portals/sitemap.xml.erb
+++ b/app/views/public/api/v1/portals/sitemap.xml.erb
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sitemapindex>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <% @portal.articles.where(status: :published).each do |article| %>
-    <sitemap>
+    <url>
       <loc><%= @help_center_url %><%= generate_article_link(@portal.slug, article.slug, false, false) %></loc>
-      <lastmod><%= article.updated_at.strftime("%Y-%m-%d") %></lastmod>
-    </sitemap>
+      <lastmod><%= article.updated_at.to_date.iso8601 %></lastmod>
+    </url>
   <% end %>
-</sitemapindex>
\ No newline at end of file
+</urlset>
diff --git a/config/features.yml b/config/features.yml
index 703d3cb8c..e03690d74 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -237,3 +237,7 @@
 - name: captain_tasks
   display_name: Captain Tasks
   enabled: true
+- name: conversation_required_attributes
+  display_name: Required Conversation Attributes
+  enabled: false
+  premium: true
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts_settings.rb b/enterprise/app/controllers/enterprise/api/v1/accounts_settings.rb
new file mode 100644
index 000000000..bdcbfc1d3
--- /dev/null
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts_settings.rb
@@ -0,0 +1,7 @@
+module Enterprise::Api::V1::AccountsSettings
+  private
+
+  def permitted_settings_attributes
+    super + [{ conversation_required_attributes: [] }]
+  end
+end
diff --git a/enterprise/app/models/enterprise/concerns/account.rb b/enterprise/app/models/enterprise/concerns/account.rb
index cae32e86c..01693ac79 100644
--- a/enterprise/app/models/enterprise/concerns/account.rb
+++ b/enterprise/app/models/enterprise/concerns/account.rb
@@ -2,6 +2,8 @@ module Enterprise::Concerns::Account
   extend ActiveSupport::Concern
 
   included do
+    store_accessor :settings, :conversation_required_attributes
+
     has_many :sla_policies, dependent: :destroy_async
     has_many :applied_slas, dependent: :destroy_async
     has_many :custom_roles, dependent: :destroy_async
diff --git a/enterprise/app/models/enterprise/concerns/custom_attribute_definition.rb b/enterprise/app/models/enterprise/concerns/custom_attribute_definition.rb
new file mode 100644
index 000000000..ad359f8a0
--- /dev/null
+++ b/enterprise/app/models/enterprise/concerns/custom_attribute_definition.rb
@@ -0,0 +1,16 @@
+module Enterprise::Concerns::CustomAttributeDefinition
+  extend ActiveSupport::Concern
+
+  included do
+    after_destroy :cleanup_conversation_required_attributes
+  end
+
+  private
+
+  def cleanup_conversation_required_attributes
+    return unless conversation_attribute? && account.conversation_required_attributes&.include?(attribute_key)
+
+    account.conversation_required_attributes = account.conversation_required_attributes - [attribute_key]
+    account.save!
+  end
+end
diff --git a/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb b/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
index 10887a1d7..a5f03cddf 100644
--- a/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
+++ b/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
@@ -22,7 +22,7 @@ class Enterprise::Billing::HandleStripeEventService
   ].freeze
 
   # Additional features available starting with the Business plan
-  BUSINESS_PLAN_FEATURES = %w[sla custom_roles csat_review_notes].freeze
+  BUSINESS_PLAN_FEATURES = %w[sla custom_roles csat_review_notes conversation_required_attributes].freeze
 
   # Additional features available only in the Enterprise plan
   ENTERPRISE_PLAN_FEATURES = %w[audit_logs disable_branding saml].freeze
diff --git a/enterprise/config/premium_features.yml b/enterprise/config/premium_features.yml
index 9465a6e11..64275503d 100644
--- a/enterprise/config/premium_features.yml
+++ b/enterprise/config/premium_features.yml
@@ -6,3 +6,4 @@
 - custom_roles
 - captain_integration
 - csat_review_notes
+- conversation_required_attributes
diff --git a/lib/integrations/openai/openai_prompts/fix_spelling_grammar.liquid b/lib/integrations/openai/openai_prompts/fix_spelling_grammar.liquid
index 520487357..2a0e8c6d2 100644
--- a/lib/integrations/openai/openai_prompts/fix_spelling_grammar.liquid
+++ b/lib/integrations/openai/openai_prompts/fix_spelling_grammar.liquid
@@ -10,8 +10,9 @@ Important guidelines:
 - Ensure the output remains appropriate for customer support
 
 Super Important:
-- If the message has some markdown formatting, keep the formatting as it is. 
+- If the message has some markdown formatting, keep the formatting as it is.
 - Block quotes (lines starting with >) contain quoted text from the customer's previous message. Preserve this quoted text exactly as written (do not modify the customer's words inside the block quote), but DO improve the agent's reply that follows the block quote.
 - Ensure the output is in the user's original language
+- If the message contains a signature block (text after a `--` line), preserve the signature exactly as written without any modification. Do not add a signature if one is not already present.
 
 Output only the corrected message, with no preamble, tags, or explanation.
diff --git a/lib/integrations/openai/openai_prompts/improve.liquid b/lib/integrations/openai/openai_prompts/improve.liquid
index 7e3d35e82..8730d1b0f 100644
--- a/lib/integrations/openai/openai_prompts/improve.liquid
+++ b/lib/integrations/openai/openai_prompts/improve.liquid
@@ -38,6 +38,7 @@ Do NOT use the context to fill in gaps or add information the agent didn't inclu
 - Keep the improved message at a similar length to the draft (brief stays brief)
 - Preserve any markdown formatting
 - Block quotes (lines starting with `>`) contain quoted customer text—keep this unchanged, only improve the agent's reply
+- If the message contains a signature block (text after a `--` line), preserve the signature exactly as written without any modification. Do not add a signature if one is not already present.
 - Output in the same language as the draft
 - Output only the improved message, no commentary
 
diff --git a/lib/integrations/openai/openai_prompts/tone_rewrite.liquid b/lib/integrations/openai/openai_prompts/tone_rewrite.liquid
index c140a93df..6b62617f0 100644
--- a/lib/integrations/openai/openai_prompts/tone_rewrite.liquid
+++ b/lib/integrations/openai/openai_prompts/tone_rewrite.liquid
@@ -28,8 +28,9 @@ Important guidelines:
 - Do not remove critical details or instructions
 
 Super Important:
-- If the message has some markdown formatting, keep the formatting as it is. 
+- If the message has some markdown formatting, keep the formatting as it is.
 - Block quotes (lines starting with >) contain quoted text from the customer's previous message. Preserve this quoted text exactly as written (do not modify the customer's words inside the block quote), but DO improve the agent's reply that follows the block quote.
 - Ensure the output is in the user's original language
+- If the message contains a signature block (text after a `--` line), preserve the signature exactly as written without any modification. Do not add a signature if one is not already present.
 
 Output only the rewritten message without any preamble, tags or explanation.
diff --git a/public/brand-assets/logo.svg b/public/brand-assets/logo.svg
index 438f2b4b0..63adcde76 100644
--- a/public/brand-assets/logo.svg
+++ b/public/brand-assets/logo.svg
@@ -1,15 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="2458px" height="512px" viewBox="0 0 2458 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 60.1 (88133) - https://sketch.com -->
-    <title>on_white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Logo" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="on_white" fill-rule="nonzero">
-            <g id="woot-log">
-                <circle id="Oval" fill="#47A7F6" cx="256" cy="256" r="256"></circle>
-                <path d="M362.807947,368.807947 L244.122956,368.807947 C178.699407,368.807947 125.456954,315.561812 125.456954,250.12177 C125.456954,184.703089 178.699407,131.456954 244.124143,131.456954 C309.565494,131.456954 362.807947,184.703089 362.807947,250.12177 L362.807947,368.807947 Z" id="Fill-1" stroke="#FFFFFF" stroke-width="6" fill="#FFFFFF"></path>
-            </g>
-            <path d="M772.982159,256.84801 C768.65756,250.216959 762.170758,244.66714 753.52156,240.198388 C744.872362,235.729635 735.64669,233.495293 725.844265,233.495293 C715.176921,233.495293 705.735022,235.513409 697.518283,239.549701 C689.301545,243.585993 682.310215,248.991661 676.544083,255.766866 C670.777951,262.542071 666.381342,270.398308 663.354122,279.335813 C660.326903,288.273317 658.813316,297.643141 658.813316,307.445566 C658.813316,317.24799 660.326903,326.617814 663.354122,335.555319 C666.381342,344.492823 670.777951,352.34906 676.544083,359.124265 C682.310215,365.89947 689.373621,371.305138 697.734512,375.34143 C706.095404,379.377723 715.609379,381.395839 726.276723,381.395839 C736.655761,381.395839 746.09766,379.377723 754.602705,375.34143 C763.10775,371.305138 770.09908,365.827395 775.576905,358.908036 L802.821743,383.558127 C794.172545,393.648858 783.361209,401.505095 770.387412,407.127074 C757.413615,412.749053 742.710199,415.56 726.276723,415.56 C710.41986,415.56 695.78852,412.96528 682.382263,407.775761 C668.976006,402.586242 657.371839,395.306609 647.569415,385.936645 C637.76699,376.566681 630.054905,365.250816 624.432926,351.988713 C618.810947,338.726609 616,323.879042 616,307.445566 C616,291.300396 618.738872,276.59698 624.216697,263.334876 C629.694522,250.072773 637.334533,238.684833 647.136957,229.170715 C656.939381,219.656597 668.543548,212.304889 681.949805,207.115371 C695.356062,201.925852 709.843251,199.331131 725.411808,199.331131 C739.827138,199.331131 754.170176,202.214154 768.441352,207.980286 C782.712529,213.746418 794.028393,222.107184 802.389285,233.062835 L772.982159,256.84801 Z M885.42117,236.090039 C890.322383,225.999308 898.683149,217.35024 910.503719,210.142575 C922.32429,202.93491 935.586194,199.331131 950.289831,199.331131 C963.551935,199.331131 974.939874,201.565474 984.453992,206.034226 C993.96811,210.502979 1001.89642,216.485251 1008.23917,223.981222 C1014.58191,231.477194 1019.26682,240.270413 1022.29404,250.361144 C1025.32126,260.451875 1026.83485,271.263211 1026.83485,282.795475 L1026.83485,409.938049 L986.183823,409.938049 L986.183823,296.634122 C986.183823,288.273231 985.535143,280.344918 984.237763,272.848947 C982.940384,265.352975 980.56189,258.722023 977.102211,252.955891 C973.642549,247.189759 968.957619,242.576922 963.047334,239.117243 C957.137049,235.657564 949.424963,233.92775 939.910845,233.92775 C923.765676,233.92775 910.503771,240.054174 900.124733,252.307204 C889.745696,264.560235 884.556255,280.921389 884.556255,301.391157 L884.556255,409.938049 L843.905228,409.938049 L843.905228,83 L884.556255,83 L884.556255,236.090039 L885.42117,236.090039 Z M1223.17066,277.173524 C1223.17066,261.893274 1218.55783,250.57741 1209.33202,243.225592 C1200.1062,235.873773 1187.85336,232.197919 1172.57311,232.197919 C1161.04084,232.197919 1150.15743,234.432262 1139.92255,238.901014 C1129.68766,243.369767 1121.11067,249.063737 1114.19131,255.983095 L1092.56843,230.035631 C1102.65916,220.521513 1114.98408,213.025654 1129.54356,207.547828 C1144.10305,202.070003 1159.74344,199.331131 1176.46523,199.331131 C1191.16886,199.331131 1203.92624,201.421323 1214.73774,205.601769 C1225.54923,209.782214 1234.41453,215.476184 1241.33389,222.683849 C1248.25325,229.891514 1253.4427,238.396431 1256.90237,248.198856 C1260.36205,258.00128 1262.09186,268.524313 1262.09186,279.76827 L1262.09186,369.287022 C1262.09186,376.206381 1262.30809,383.486013 1262.74055,391.126138 C1263.17301,398.766263 1263.96584,405.036837 1265.11906,409.938049 L1228.36016,409.938049 C1226.0537,400.135625 1224.90049,390.333348 1224.90049,380.530923 L1223.60312,380.530923 C1216.10715,391.486574 1206.66525,399.991491 1195.27714,406.04593 C1183.88903,412.100368 1170.4109,415.127542 1154.84234,415.127542 C1146.76976,415.127542 1138.33691,414.046409 1129.54356,411.884109 C1120.75021,409.72181 1112.74982,406.190107 1105.54216,401.288895 C1098.33449,396.387682 1092.35222,389.900881 1087.59516,381.828296 C1082.8381,373.755712 1080.45961,363.809283 1080.45961,351.988713 C1080.45961,336.420156 1084.63999,324.095234 1093.00088,315.013576 C1101.36178,305.931918 1112.31726,299.012664 1125.86767,294.255605 C1139.41808,289.498546 1154.6981,286.399296 1171.70819,284.957763 C1188.71828,283.51623 1205.87227,282.795475 1223.17066,282.795475 L1223.17066,277.173524 Z M1213.22414,312.202601 C1203.1334,312.202601 1192.68245,312.635054 1181.87095,313.499974 C1171.05945,314.364894 1161.25717,316.094707 1152.46382,318.689467 C1143.67047,321.284226 1136.39084,325.176307 1130.62471,330.365826 C1124.85858,335.555345 1121.97555,342.474599 1121.97555,351.123797 C1121.97555,357.178236 1123.20084,362.223526 1125.65144,366.259818 C1128.10205,370.29611 1131.34545,373.611587 1135.38174,376.206346 C1139.41803,378.801105 1143.88672,380.602995 1148.78793,381.612068 C1153.68914,382.621141 1158.73443,383.12567 1163.92395,383.12567 C1182.95219,383.12567 1197.58353,377.4317 1207.81841,366.043589 C1218.0533,354.655478 1223.17066,340.31244 1223.17066,323.014044 L1223.17066,312.202601 L1213.22414,312.202601 Z M1425.99334,238.252328 L1371.50367,238.252328 L1371.50367,345.069389 C1371.50367,357.466573 1373.81009,366.331868 1378.42299,371.66554 C1383.0359,376.999212 1390.3876,379.666008 1400.47834,379.666008 C1404.22632,379.666008 1408.26255,379.233554 1412.58715,378.368635 C1416.91175,377.503715 1420.80383,376.206355 1424.26351,374.476515 L1425.56088,407.775761 C1420.65967,409.5056 1415.254,410.875036 1409.34372,411.884109 C1403.43343,412.893182 1397.30701,413.397711 1390.96427,413.397711 C1371.64772,413.397711 1356.87223,408.064119 1346.63735,397.396775 C1336.40246,386.729431 1331.2851,370.728655 1331.2851,349.393966 L1331.2851,238.252328 L1291.93144,238.252328 L1291.93144,204.953082 L1331.2851,204.953082 L1331.2851,146.13883 L1371.50367,146.13883 L1371.50367,204.953082 L1425.99334,204.953082 L1425.99334,238.252328 Z M1506.07776,204.953082 L1552.35074,361.502783 L1553.21566,361.502783 L1602.08338,204.953082 L1644.8967,204.953082 L1694.62934,361.502783 L1695.49425,361.502783 L1741.76723,204.953082 L1784.58055,204.953082 L1716.68468,409.938049 L1674.30382,409.938049 L1623.70627,255.983095 L1622.84135,255.983095 L1572.67625,409.938049 L1530.2954,409.938049 L1461.96707,204.953082 L1506.07776,204.953082 Z M2032.81129,307.013108 C2032.81129,322.869971 2030.00034,337.429236 2024.37836,350.691339 C2018.75638,363.953443 2010.97222,375.413458 2001.02564,385.07173 C1991.07907,394.730001 1979.33075,402.22586 1965.78034,407.559532 C1952.22993,412.893204 1937.67066,415.56 1922.10211,415.56 C1906.53355,415.56 1891.97429,412.893204 1878.42388,407.559532 C1864.87346,402.22586 1853.19722,394.730001 1843.3948,385.07173 C1833.59237,375.413458 1825.88029,363.953443 1820.25831,350.691339 C1814.63633,337.429236 1811.82538,322.869971 1811.82538,307.013108 C1811.82538,291.156245 1814.63633,276.669056 1820.25831,263.551105 C1825.88029,250.433155 1833.59237,239.117291 1843.3948,229.603173 C1853.19722,220.089055 1864.87346,212.665272 1878.42388,207.331599 C1891.97429,201.997927 1906.53355,199.331131 1922.10211,199.331131 C1937.67066,199.331131 1952.22993,201.997927 1965.78034,207.331599 C1979.33075,212.665272 1991.07907,220.089055 2001.02564,229.603173 C2010.97222,239.117291 2018.75638,250.433155 2024.37836,263.551105 C2030.00034,276.669056 2032.81129,291.156245 2032.81129,307.013108 Z M1990.43043,307.013108 C1990.43043,297.210684 1988.91683,287.84086 1985.88962,278.903355 C1982.8624,269.96585 1978.46579,262.109613 1972.69966,255.334408 C1966.93353,248.559203 1959.79805,243.153536 1951.293,239.117243 C1942.78796,235.080951 1933.05776,233.062835 1922.10211,233.062835 C1911.14646,233.062835 1901.41625,235.080951 1892.91121,239.117243 C1884.40616,243.153536 1877.27068,248.559203 1871.50455,255.334408 C1865.73842,262.109613 1861.34181,269.96585 1858.31459,278.903355 C1855.28737,287.84086 1853.77378,297.210684 1853.77378,307.013108 C1853.77378,316.815532 1855.28737,326.185356 1858.31459,335.122861 C1861.34181,344.060365 1865.73842,351.988678 1871.50455,358.908036 C1877.27068,365.827395 1884.40616,371.305138 1892.91121,375.34143 C1901.41625,379.377723 1911.14646,381.395839 1922.10211,381.395839 C1933.05776,381.395839 1942.78796,379.377723 1951.293,375.34143 C1959.79805,371.305138 1966.93353,365.827395 1972.69966,358.908036 C1978.46579,351.988678 1982.8624,344.060365 1985.88962,335.122861 C1988.91683,326.185356 1990.43043,316.815532 1990.43043,307.013108 Z M2296.61051,307.013108 C2296.61051,322.869971 2293.79956,337.429236 2288.17758,350.691339 C2282.5556,363.953443 2274.77144,375.413458 2264.82486,385.07173 C2254.87829,394.730001 2243.12997,402.22586 2229.57956,407.559532 C2216.02915,412.893204 2201.46988,415.56 2185.90133,415.56 C2170.33277,415.56 2155.77351,412.893204 2142.22309,407.559532 C2128.67268,402.22586 2116.99644,394.730001 2107.19402,385.07173 C2097.39159,375.413458 2089.67951,363.953443 2084.05753,350.691339 C2078.43555,337.429236 2075.6246,322.869971 2075.6246,307.013108 C2075.6246,291.156245 2078.43555,276.669056 2084.05753,263.551105 C2089.67951,250.433155 2097.39159,239.117291 2107.19402,229.603173 C2116.99644,220.089055 2128.67268,212.665272 2142.22309,207.331599 C2155.77351,201.997927 2170.33277,199.331131 2185.90133,199.331131 C2201.46988,199.331131 2216.02915,201.997927 2229.57956,207.331599 C2243.12997,212.665272 2254.87829,220.089055 2264.82486,229.603173 C2274.77144,239.117291 2282.5556,250.433155 2288.17758,263.551105 C2293.79956,276.669056 2296.61051,291.156245 2296.61051,307.013108 Z M2254.22965,307.013108 C2254.22965,297.210684 2252.71605,287.84086 2249.68884,278.903355 C2246.66162,269.96585 2242.26501,262.109613 2236.49888,255.334408 C2230.73275,248.559203 2223.59727,243.153536 2215.09222,239.117243 C2206.58718,235.080951 2196.85698,233.062835 2185.90133,233.062835 C2174.94568,233.062835 2165.21547,235.080951 2156.71043,239.117243 C2148.20538,243.153536 2141.0699,248.559203 2135.30377,255.334408 C2129.53764,262.109613 2125.14103,269.96585 2122.11381,278.903355 C2119.08659,287.84086 2117.573,297.210684 2117.573,307.013108 C2117.573,316.815532 2119.08659,326.185356 2122.11381,335.122861 C2125.14103,344.060365 2129.53764,351.988678 2135.30377,358.908036 C2141.0699,365.827395 2148.20538,371.305138 2156.71043,375.34143 C2165.21547,379.377723 2174.94568,381.395839 2185.90133,381.395839 C2196.85698,381.395839 2206.58718,379.377723 2215.09222,375.34143 C2223.59727,371.305138 2230.73275,365.827395 2236.49888,358.908036 C2242.26501,351.988678 2246.66162,344.060365 2249.68884,335.122861 C2252.71605,326.185356 2254.22965,316.815532 2254.22965,307.013108 Z M2453.16021,238.252328 L2398.67053,238.252328 L2398.67053,345.069389 C2398.67053,357.466573 2400.97695,366.331868 2405.58986,371.66554 C2410.20276,376.999212 2417.55447,379.666008 2427.6452,379.666008 C2431.39319,379.666008 2435.42942,379.233554 2439.75402,378.368635 C2444.07862,377.503715 2447.9707,376.206355 2451.43038,374.476515 L2452.72775,407.775761 C2447.82654,409.5056 2442.42087,410.875036 2436.51059,411.884109 C2430.6003,412.893182 2424.47388,413.397711 2418.13113,413.397711 C2398.81459,413.397711 2384.0391,408.064119 2373.80421,397.396775 C2363.56933,386.729431 2358.45196,370.728655 2358.45196,349.393966 L2358.45196,238.252328 L2319.09831,238.252328 L2319.09831,204.953082 L2358.45196,204.953082 L2358.45196,146.13883 L2398.67053,146.13883 L2398.67053,204.953082 L2453.16021,204.953082 L2453.16021,238.252328 Z" id="chatwoot" stroke="#273445" stroke-width="8" fill="#273444"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="2559" height="581" viewBox="0 0 2559 581" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M256 546C397.385 546 512 431.385 512 290C512 148.615 397.385 34 256 34C114.615 34 0 148.615 0 290C0 431.385 114.615 546 256 546Z" fill="#2781F6"/>
+<path d="M367 410H247.99C182.388 410 129 356.608 129 290.989C129 225.392 182.388 172 247.992 172C313.612 172 367 225.392 367 290.989V410Z" fill="white" stroke="white" stroke-width="6"/>
+<path d="M707.875 470.625C683.5 470.625 662.016 465.156 643.422 454.219C624.984 443.281 610.609 428.125 600.297 408.75C590.141 389.375 585.062 366.953 585.062 341.484C585.062 316.016 590.141 293.516 600.297 273.984C610.609 254.453 624.984 239.219 643.422 228.281C662.016 217.344 683.5 211.875 707.875 211.875C723.812 211.875 738.5 214.297 751.938 219.141C765.531 223.828 777.328 230.469 787.328 239.062C797.484 247.656 805.609 257.812 811.703 269.531C817.797 281.25 821.469 294.219 822.719 308.438H759.438C758.5 301.875 756.625 296.016 753.812 290.859C751.156 285.547 747.641 281.016 743.266 277.266C739.047 273.359 734.047 270.391 728.266 268.359C722.641 266.172 716.156 265.078 708.812 265.078C696.781 265.078 686.391 268.203 677.641 274.453C668.891 280.703 662.172 289.531 657.484 300.938C652.953 312.344 650.688 325.859 650.688 341.484C650.688 356.953 652.953 370.391 657.484 381.797C662.172 393.203 668.812 402.031 677.406 408.281C686.156 414.375 696.625 417.422 708.812 417.422C716.156 417.422 722.641 416.406 728.266 414.375C733.891 412.344 738.734 409.453 742.797 405.703C747.016 401.797 750.453 397.188 753.109 391.875C755.766 386.406 757.719 380.312 758.969 373.594H822.719C821.781 387.656 818.266 400.625 812.172 412.5C806.234 424.219 798.188 434.453 788.031 443.203C777.875 451.797 766 458.516 752.406 463.359C738.812 468.203 723.969 470.625 707.875 470.625ZM911.209 326.484V465H846.053V115.781H911.209V281.25H898.319C906.288 259.375 917.459 242.422 931.834 230.391C946.366 218.359 964.725 212.344 986.913 212.344C1004.41 212.344 1019.65 216.172 1032.62 223.828C1045.74 231.328 1055.98 242.344 1063.32 256.875C1070.66 271.406 1074.33 289.141 1074.33 310.078V465H1009.18V321.562C1009.18 304.219 1005.04 291.094 996.756 282.188C988.631 273.281 977.069 268.828 962.069 268.828C952.069 268.828 943.241 270.859 935.584 274.922C927.928 278.984 921.913 285.234 917.538 293.672C913.319 302.109 911.209 313.047 911.209 326.484ZM1185.79 468.984C1169.39 468.984 1154.78 466.25 1141.97 460.781C1129.15 455.312 1119 447.109 1111.5 436.172C1104.15 425.234 1100.48 411.562 1100.48 395.156C1100.48 381.094 1103.06 369.453 1108.22 360.234C1113.53 350.859 1120.64 343.438 1129.54 337.969C1138.61 332.344 1149 328.125 1160.72 325.312C1172.43 322.344 1184.62 320.156 1197.28 318.75C1212.59 317.188 1224.7 315.781 1233.61 314.531C1242.51 313.125 1248.92 311.094 1252.83 308.438C1256.73 305.781 1258.68 301.719 1258.68 296.25V294.609C1258.68 288.047 1256.97 282.344 1253.53 277.5C1250.09 272.5 1245.25 268.594 1239 265.781C1232.75 262.969 1225.17 261.562 1216.26 261.562C1207.36 261.562 1199.47 262.969 1192.59 265.781C1185.87 268.594 1180.48 272.578 1176.42 277.734C1172.51 282.734 1170.25 288.594 1169.62 295.312H1107.98C1109.08 278.438 1114.08 263.828 1122.98 251.484C1132.04 239.141 1144.54 229.531 1160.48 222.656C1176.58 215.781 1195.72 212.344 1217.9 212.344C1234.47 212.344 1249.23 214.297 1262.2 218.203C1275.33 222.109 1286.34 227.734 1295.25 235.078C1304.31 242.422 1311.18 251.328 1315.87 261.797C1320.56 272.109 1322.9 283.75 1322.9 296.719V465H1259.39V430.078H1258.45C1254.23 437.891 1248.92 444.766 1242.51 450.703C1236.26 456.484 1228.45 461.016 1219.08 464.297C1209.86 467.422 1198.76 468.984 1185.79 468.984ZM1203.14 422.812C1214.86 422.812 1224.86 420.703 1233.14 416.484C1241.58 412.109 1247.98 406.25 1252.36 398.906C1256.89 391.562 1259.15 383.281 1259.15 374.062V348.281C1257.12 349.531 1254.39 350.703 1250.95 351.797C1247.67 352.734 1243.68 353.672 1239 354.609C1234.47 355.547 1229.47 356.484 1224 357.422C1218.68 358.359 1213.14 359.219 1207.36 360C1199.23 361.25 1191.81 363.203 1185.09 365.859C1178.37 368.516 1172.98 372.109 1168.92 376.641C1165.01 381.016 1163.06 386.719 1163.06 393.75C1163.06 399.688 1164.7 404.922 1167.98 409.453C1171.42 413.828 1176.11 417.188 1182.04 419.531C1187.98 421.719 1195.01 422.812 1203.14 422.812ZM1496.24 217.5V269.062H1337.57V217.5H1496.24ZM1380.69 150H1445.61V390.703C1445.61 399.297 1447.33 405.234 1450.77 408.516C1454.21 411.797 1460.69 413.438 1470.22 413.438C1474.13 413.438 1478.66 413.438 1483.82 413.438C1489.13 413.438 1493.27 413.438 1496.24 413.438V465C1492.02 465 1486.32 465 1479.13 465C1472.1 465 1464.99 465 1457.8 465C1431.39 465 1411.94 459.766 1399.44 449.297C1386.94 438.828 1380.69 422.656 1380.69 400.781V150ZM1584.03 465L1507.62 217.5H1575.82L1599.73 307.031C1604.26 324.688 1608.63 342.891 1612.85 361.641C1617.07 380.391 1621.29 398.828 1625.51 416.953H1616.6C1621.13 398.828 1625.67 380.391 1630.2 361.641C1634.88 342.891 1639.57 324.688 1644.26 307.031L1669.1 217.5H1728.17L1752.54 307.031C1757.38 324.688 1762.07 342.891 1766.6 361.641C1771.13 380.391 1775.67 398.828 1780.2 416.953H1771.06C1775.43 398.828 1779.65 380.391 1783.71 361.641C1787.93 342.891 1792.23 324.688 1796.6 307.031L1820.51 217.5H1889.42L1813.01 465H1745.74L1716.45 364.688C1713.63 354.844 1710.9 344.844 1708.24 334.688C1705.59 324.375 1702.93 314.062 1700.28 303.75C1697.78 293.281 1695.12 282.969 1692.31 272.812H1704.96C1702.31 282.969 1699.57 293.281 1696.76 303.75C1694.1 314.062 1691.45 324.375 1688.79 334.688C1686.29 344.844 1683.56 354.844 1680.59 364.688L1650.82 465H1584.03ZM2009.78 470.625C1985.09 470.625 1963.38 465.234 1944.62 454.453C1926.03 443.672 1911.5 428.594 1901.03 409.219C1890.72 389.844 1885.56 367.266 1885.56 341.484C1885.56 315.703 1890.72 293.125 1901.03 273.75C1911.5 254.219 1926.03 239.062 1944.62 228.281C1963.38 217.344 1985.09 211.875 2009.78 211.875C2034.62 211.875 2056.34 217.344 2074.94 228.281C2093.53 239.062 2107.98 254.219 2118.3 273.75C2128.77 293.125 2134 315.703 2134 341.484C2134 367.266 2128.77 389.844 2118.3 409.219C2107.98 428.594 2093.53 443.672 2074.94 454.453C2056.34 465.234 2034.62 470.625 2009.78 470.625ZM2009.78 417.188C2021.66 417.188 2031.97 414.219 2040.72 408.281C2049.47 402.188 2056.27 393.438 2061.11 382.031C2065.95 370.625 2068.38 357.109 2068.38 341.484C2068.38 325.547 2065.95 311.953 2061.11 300.703C2056.27 289.297 2049.47 280.547 2040.72 274.453C2031.97 268.359 2021.66 265.312 2009.78 265.312C1998.06 265.312 1987.75 268.359 1978.84 274.453C1970.09 280.547 1963.3 289.297 1958.45 300.703C1953.61 311.953 1951.19 325.547 1951.19 341.484C1951.19 357.266 1953.61 370.859 1958.45 382.266C1963.3 393.516 1970.09 402.188 1978.84 408.281C1987.75 414.219 1998.06 417.188 2009.78 417.188ZM2271.94 470.625C2247.26 470.625 2225.54 465.234 2206.79 454.453C2188.19 443.672 2173.66 428.594 2163.19 409.219C2152.88 389.844 2147.72 367.266 2147.72 341.484C2147.72 315.703 2152.88 293.125 2163.19 273.75C2173.66 254.219 2188.19 239.062 2206.79 228.281C2225.54 217.344 2247.26 211.875 2271.94 211.875C2296.79 211.875 2318.51 217.344 2337.1 228.281C2355.69 239.062 2370.15 254.219 2380.46 273.75C2390.93 293.125 2396.16 315.703 2396.16 341.484C2396.16 367.266 2390.93 389.844 2380.46 409.219C2370.15 428.594 2355.69 443.672 2337.1 454.453C2318.51 465.234 2296.79 470.625 2271.94 470.625ZM2271.94 417.188C2283.82 417.188 2294.13 414.219 2302.88 408.281C2311.63 402.188 2318.43 393.438 2323.27 382.031C2328.12 370.625 2330.54 357.109 2330.54 341.484C2330.54 325.547 2328.12 311.953 2323.27 300.703C2318.43 289.297 2311.63 280.547 2302.88 274.453C2294.13 268.359 2283.82 265.312 2271.94 265.312C2260.22 265.312 2249.91 268.359 2241.01 274.453C2232.26 280.547 2225.46 289.297 2220.62 300.703C2215.77 311.953 2213.35 325.547 2213.35 341.484C2213.35 357.266 2215.77 370.859 2220.62 382.266C2225.46 393.516 2232.26 402.188 2241.01 408.281C2249.91 414.219 2260.22 417.188 2271.94 417.188ZM2558.48 217.5V269.062H2399.81V217.5H2558.48ZM2442.93 150H2507.86V390.703C2507.86 399.297 2509.57 405.234 2513.01 408.516C2516.45 411.797 2522.93 413.438 2532.47 413.438C2536.37 413.438 2540.9 413.438 2546.06 413.438C2551.37 413.438 2555.51 413.438 2558.48 413.438V465C2554.26 465 2548.56 465 2541.37 465C2534.34 465 2527.23 465 2520.04 465C2493.64 465 2474.18 459.766 2461.68 449.297C2449.18 438.828 2442.93 422.656 2442.93 400.781V150Z" fill="#040101"/>
+</svg>
diff --git a/public/brand-assets/logo_dark.svg b/public/brand-assets/logo_dark.svg
index a0f7ac881..679ae4687 100644
--- a/public/brand-assets/logo_dark.svg
+++ b/public/brand-assets/logo_dark.svg
@@ -1,13 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="2458px" height="512px" viewBox="0 0 2458 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>logo-dark</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="logo" fill-rule="nonzero">
-            <g id="woot-log">
-                <circle id="Oval" fill="#47A7F6" cx="256" cy="256" r="256"></circle>
-                <path d="M362.807947,368.807947 L244.122956,368.807947 C178.699407,368.807947 125.456954,315.561812 125.456954,250.12177 C125.456954,184.703089 178.699407,131.456954 244.124143,131.456954 C309.565494,131.456954 362.807947,184.703089 362.807947,250.12177 L362.807947,368.807947 Z" id="Fill-1" stroke="#FFFFFF" stroke-width="6" fill="#FFFFFF"></path>
-            </g>
-            <path d="M772.982159,256.84801 C768.65756,250.216959 762.170758,244.66714 753.52156,240.198388 C744.872362,235.729635 735.64669,233.495293 725.844265,233.495293 C715.176921,233.495293 705.735022,235.513409 697.518283,239.549701 C689.301545,243.585993 682.310215,248.991661 676.544083,255.766866 C670.777951,262.542071 666.381342,270.398308 663.354122,279.335813 C660.326903,288.273317 658.813316,297.643141 658.813316,307.445566 C658.813316,317.24799 660.326903,326.617814 663.354122,335.555319 C666.381342,344.492823 670.777951,352.34906 676.544083,359.124265 C682.310215,365.89947 689.373621,371.305138 697.734512,375.34143 C706.095404,379.377723 715.609379,381.395839 726.276723,381.395839 C736.655761,381.395839 746.09766,379.377723 754.602705,375.34143 C763.10775,371.305138 770.09908,365.827395 775.576905,358.908036 L802.821743,383.558127 C794.172545,393.648858 783.361209,401.505095 770.387412,407.127074 C757.413615,412.749053 742.710199,415.56 726.276723,415.56 C710.41986,415.56 695.78852,412.96528 682.382263,407.775761 C668.976006,402.586242 657.371839,395.306609 647.569415,385.936645 C637.76699,376.566681 630.054905,365.250816 624.432926,351.988713 C618.810947,338.726609 616,323.879042 616,307.445566 C616,291.300396 618.738872,276.59698 624.216697,263.334876 C629.694522,250.072773 637.334533,238.684833 647.136957,229.170715 C656.939381,219.656597 668.543548,212.304889 681.949805,207.115371 C695.356062,201.925852 709.843251,199.331131 725.411808,199.331131 C739.827138,199.331131 754.170176,202.214154 768.441352,207.980286 C782.712529,213.746418 794.028393,222.107184 802.389285,233.062835 L772.982159,256.84801 Z M885.42117,236.090039 C890.322383,225.999308 898.683149,217.35024 910.503719,210.142575 C922.32429,202.93491 935.586194,199.331131 950.289831,199.331131 C963.551935,199.331131 974.939874,201.565474 984.453992,206.034226 C993.96811,210.502979 1001.89642,216.485251 1008.23917,223.981222 C1014.58191,231.477194 1019.26682,240.270413 1022.29404,250.361144 C1025.32126,260.451875 1026.83485,271.263211 1026.83485,282.795475 L1026.83485,409.938049 L986.183823,409.938049 L986.183823,296.634122 C986.183823,288.273231 985.535143,280.344918 984.237763,272.848947 C982.940384,265.352975 980.56189,258.722023 977.102211,252.955891 C973.642549,247.189759 968.957619,242.576922 963.047334,239.117243 C957.137049,235.657564 949.424963,233.92775 939.910845,233.92775 C923.765676,233.92775 910.503771,240.054174 900.124733,252.307204 C889.745696,264.560235 884.556255,280.921389 884.556255,301.391157 L884.556255,409.938049 L843.905228,409.938049 L843.905228,83 L884.556255,83 L884.556255,236.090039 L885.42117,236.090039 Z M1223.17066,277.173524 C1223.17066,261.893274 1218.55783,250.57741 1209.33202,243.225592 C1200.1062,235.873773 1187.85336,232.197919 1172.57311,232.197919 C1161.04084,232.197919 1150.15743,234.432262 1139.92255,238.901014 C1129.68766,243.369767 1121.11067,249.063737 1114.19131,255.983095 L1092.56843,230.035631 C1102.65916,220.521513 1114.98408,213.025654 1129.54356,207.547828 C1144.10305,202.070003 1159.74344,199.331131 1176.46523,199.331131 C1191.16886,199.331131 1203.92624,201.421323 1214.73774,205.601769 C1225.54923,209.782214 1234.41453,215.476184 1241.33389,222.683849 C1248.25325,229.891514 1253.4427,238.396431 1256.90237,248.198856 C1260.36205,258.00128 1262.09186,268.524313 1262.09186,279.76827 L1262.09186,369.287022 C1262.09186,376.206381 1262.30809,383.486013 1262.74055,391.126138 C1263.17301,398.766263 1263.96584,405.036837 1265.11906,409.938049 L1228.36016,409.938049 C1226.0537,400.135625 1224.90049,390.333348 1224.90049,380.530923 L1223.60312,380.530923 C1216.10715,391.486574 1206.66525,399.991491 1195.27714,406.04593 C1183.88903,412.100368 1170.4109,415.127542 1154.84234,415.127542 C1146.76976,415.127542 1138.33691,414.046409 1129.54356,411.884109 C1120.75021,409.72181 1112.74982,406.190107 1105.54216,401.288895 C1098.33449,396.387682 1092.35222,389.900881 1087.59516,381.828296 C1082.8381,373.755712 1080.45961,363.809283 1080.45961,351.988713 C1080.45961,336.420156 1084.63999,324.095234 1093.00088,315.013576 C1101.36178,305.931918 1112.31726,299.012664 1125.86767,294.255605 C1139.41808,289.498546 1154.6981,286.399296 1171.70819,284.957763 C1188.71828,283.51623 1205.87227,282.795475 1223.17066,282.795475 L1223.17066,277.173524 Z M1213.22414,312.202601 C1203.1334,312.202601 1192.68245,312.635054 1181.87095,313.499974 C1171.05945,314.364894 1161.25717,316.094707 1152.46382,318.689467 C1143.67047,321.284226 1136.39084,325.176307 1130.62471,330.365826 C1124.85858,335.555345 1121.97555,342.474599 1121.97555,351.123797 C1121.97555,357.178236 1123.20084,362.223526 1125.65144,366.259818 C1128.10205,370.29611 1131.34545,373.611587 1135.38174,376.206346 C1139.41803,378.801105 1143.88672,380.602995 1148.78793,381.612068 C1153.68914,382.621141 1158.73443,383.12567 1163.92395,383.12567 C1182.95219,383.12567 1197.58353,377.4317 1207.81841,366.043589 C1218.0533,354.655478 1223.17066,340.31244 1223.17066,323.014044 L1223.17066,312.202601 L1213.22414,312.202601 Z M1425.99334,238.252328 L1371.50367,238.252328 L1371.50367,345.069389 C1371.50367,357.466573 1373.81009,366.331868 1378.42299,371.66554 C1383.0359,376.999212 1390.3876,379.666008 1400.47834,379.666008 C1404.22632,379.666008 1408.26255,379.233554 1412.58715,378.368635 C1416.91175,377.503715 1420.80383,376.206355 1424.26351,374.476515 L1425.56088,407.775761 C1420.65967,409.5056 1415.254,410.875036 1409.34372,411.884109 C1403.43343,412.893182 1397.30701,413.397711 1390.96427,413.397711 C1371.64772,413.397711 1356.87223,408.064119 1346.63735,397.396775 C1336.40246,386.729431 1331.2851,370.728655 1331.2851,349.393966 L1331.2851,238.252328 L1291.93144,238.252328 L1291.93144,204.953082 L1331.2851,204.953082 L1331.2851,146.13883 L1371.50367,146.13883 L1371.50367,204.953082 L1425.99334,204.953082 L1425.99334,238.252328 Z M1506.07776,204.953082 L1552.35074,361.502783 L1553.21566,361.502783 L1602.08338,204.953082 L1644.8967,204.953082 L1694.62934,361.502783 L1695.49425,361.502783 L1741.76723,204.953082 L1784.58055,204.953082 L1716.68468,409.938049 L1674.30382,409.938049 L1623.70627,255.983095 L1622.84135,255.983095 L1572.67625,409.938049 L1530.2954,409.938049 L1461.96707,204.953082 L1506.07776,204.953082 Z M2032.81129,307.013108 C2032.81129,322.869971 2030.00034,337.429236 2024.37836,350.691339 C2018.75638,363.953443 2010.97222,375.413458 2001.02564,385.07173 C1991.07907,394.730001 1979.33075,402.22586 1965.78034,407.559532 C1952.22993,412.893204 1937.67066,415.56 1922.10211,415.56 C1906.53355,415.56 1891.97429,412.893204 1878.42388,407.559532 C1864.87346,402.22586 1853.19722,394.730001 1843.3948,385.07173 C1833.59237,375.413458 1825.88029,363.953443 1820.25831,350.691339 C1814.63633,337.429236 1811.82538,322.869971 1811.82538,307.013108 C1811.82538,291.156245 1814.63633,276.669056 1820.25831,263.551105 C1825.88029,250.433155 1833.59237,239.117291 1843.3948,229.603173 C1853.19722,220.089055 1864.87346,212.665272 1878.42388,207.331599 C1891.97429,201.997927 1906.53355,199.331131 1922.10211,199.331131 C1937.67066,199.331131 1952.22993,201.997927 1965.78034,207.331599 C1979.33075,212.665272 1991.07907,220.089055 2001.02564,229.603173 C2010.97222,239.117291 2018.75638,250.433155 2024.37836,263.551105 C2030.00034,276.669056 2032.81129,291.156245 2032.81129,307.013108 Z M1990.43043,307.013108 C1990.43043,297.210684 1988.91683,287.84086 1985.88962,278.903355 C1982.8624,269.96585 1978.46579,262.109613 1972.69966,255.334408 C1966.93353,248.559203 1959.79805,243.153536 1951.293,239.117243 C1942.78796,235.080951 1933.05776,233.062835 1922.10211,233.062835 C1911.14646,233.062835 1901.41625,235.080951 1892.91121,239.117243 C1884.40616,243.153536 1877.27068,248.559203 1871.50455,255.334408 C1865.73842,262.109613 1861.34181,269.96585 1858.31459,278.903355 C1855.28737,287.84086 1853.77378,297.210684 1853.77378,307.013108 C1853.77378,316.815532 1855.28737,326.185356 1858.31459,335.122861 C1861.34181,344.060365 1865.73842,351.988678 1871.50455,358.908036 C1877.27068,365.827395 1884.40616,371.305138 1892.91121,375.34143 C1901.41625,379.377723 1911.14646,381.395839 1922.10211,381.395839 C1933.05776,381.395839 1942.78796,379.377723 1951.293,375.34143 C1959.79805,371.305138 1966.93353,365.827395 1972.69966,358.908036 C1978.46579,351.988678 1982.8624,344.060365 1985.88962,335.122861 C1988.91683,326.185356 1990.43043,316.815532 1990.43043,307.013108 Z M2296.61051,307.013108 C2296.61051,322.869971 2293.79956,337.429236 2288.17758,350.691339 C2282.5556,363.953443 2274.77144,375.413458 2264.82486,385.07173 C2254.87829,394.730001 2243.12997,402.22586 2229.57956,407.559532 C2216.02915,412.893204 2201.46988,415.56 2185.90133,415.56 C2170.33277,415.56 2155.77351,412.893204 2142.22309,407.559532 C2128.67268,402.22586 2116.99644,394.730001 2107.19402,385.07173 C2097.39159,375.413458 2089.67951,363.953443 2084.05753,350.691339 C2078.43555,337.429236 2075.6246,322.869971 2075.6246,307.013108 C2075.6246,291.156245 2078.43555,276.669056 2084.05753,263.551105 C2089.67951,250.433155 2097.39159,239.117291 2107.19402,229.603173 C2116.99644,220.089055 2128.67268,212.665272 2142.22309,207.331599 C2155.77351,201.997927 2170.33277,199.331131 2185.90133,199.331131 C2201.46988,199.331131 2216.02915,201.997927 2229.57956,207.331599 C2243.12997,212.665272 2254.87829,220.089055 2264.82486,229.603173 C2274.77144,239.117291 2282.5556,250.433155 2288.17758,263.551105 C2293.79956,276.669056 2296.61051,291.156245 2296.61051,307.013108 Z M2254.22965,307.013108 C2254.22965,297.210684 2252.71605,287.84086 2249.68884,278.903355 C2246.66162,269.96585 2242.26501,262.109613 2236.49888,255.334408 C2230.73275,248.559203 2223.59727,243.153536 2215.09222,239.117243 C2206.58718,235.080951 2196.85698,233.062835 2185.90133,233.062835 C2174.94568,233.062835 2165.21547,235.080951 2156.71043,239.117243 C2148.20538,243.153536 2141.0699,248.559203 2135.30377,255.334408 C2129.53764,262.109613 2125.14103,269.96585 2122.11381,278.903355 C2119.08659,287.84086 2117.573,297.210684 2117.573,307.013108 C2117.573,316.815532 2119.08659,326.185356 2122.11381,335.122861 C2125.14103,344.060365 2129.53764,351.988678 2135.30377,358.908036 C2141.0699,365.827395 2148.20538,371.305138 2156.71043,375.34143 C2165.21547,379.377723 2174.94568,381.395839 2185.90133,381.395839 C2196.85698,381.395839 2206.58718,379.377723 2215.09222,375.34143 C2223.59727,371.305138 2230.73275,365.827395 2236.49888,358.908036 C2242.26501,351.988678 2246.66162,344.060365 2249.68884,335.122861 C2252.71605,326.185356 2254.22965,316.815532 2254.22965,307.013108 Z M2453.16021,238.252328 L2398.67053,238.252328 L2398.67053,345.069389 C2398.67053,357.466573 2400.97695,366.331868 2405.58986,371.66554 C2410.20276,376.999212 2417.55447,379.666008 2427.6452,379.666008 C2431.39319,379.666008 2435.42942,379.233554 2439.75402,378.368635 C2444.07862,377.503715 2447.9707,376.206355 2451.43038,374.476515 L2452.72775,407.775761 C2447.82654,409.5056 2442.42087,410.875036 2436.51059,411.884109 C2430.6003,412.893182 2424.47388,413.397711 2418.13113,413.397711 C2398.81459,413.397711 2384.0391,408.064119 2373.80421,397.396775 C2363.56933,386.729431 2358.45196,370.728655 2358.45196,349.393966 L2358.45196,238.252328 L2319.09831,238.252328 L2319.09831,204.953082 L2358.45196,204.953082 L2358.45196,146.13883 L2398.67053,146.13883 L2398.67053,204.953082 L2453.16021,204.953082 L2453.16021,238.252328 Z" id="chatwoot" stroke="#EEEEEE" stroke-width="8" fill="#EDEDED"></path>
-        </g>
-    </g>
+<svg width="2559" height="581" viewBox="0 0 2559 581" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M256 546C397.385 546 512 431.385 512 290C512 148.615 397.385 34 256 34C114.615 34 0 148.615 0 290C0 431.385 114.615 546 256 546Z" fill="#2781F6"/>
+<path d="M367 410H247.99C182.388 410 129 356.608 129 290.989C129 225.392 182.388 172 247.992 172C313.612 172 367 225.392 367 290.989V410Z" fill="white" stroke="white" stroke-width="6"/>
+<path d="M707.875 470.625C683.5 470.625 662.016 465.156 643.422 454.219C624.984 443.281 610.609 428.125 600.297 408.75C590.141 389.375 585.062 366.953 585.062 341.484C585.062 316.016 590.141 293.516 600.297 273.984C610.609 254.453 624.984 239.219 643.422 228.281C662.016 217.344 683.5 211.875 707.875 211.875C723.812 211.875 738.5 214.297 751.938 219.141C765.531 223.828 777.328 230.469 787.328 239.062C797.484 247.656 805.609 257.812 811.703 269.531C817.797 281.25 821.469 294.219 822.719 308.438H759.438C758.5 301.875 756.625 296.016 753.812 290.859C751.156 285.547 747.641 281.016 743.266 277.266C739.047 273.359 734.047 270.391 728.266 268.359C722.641 266.172 716.156 265.078 708.812 265.078C696.781 265.078 686.391 268.203 677.641 274.453C668.891 280.703 662.172 289.531 657.484 300.938C652.953 312.344 650.688 325.859 650.688 341.484C650.688 356.953 652.953 370.391 657.484 381.797C662.172 393.203 668.812 402.031 677.406 408.281C686.156 414.375 696.625 417.422 708.812 417.422C716.156 417.422 722.641 416.406 728.266 414.375C733.891 412.344 738.734 409.453 742.797 405.703C747.016 401.797 750.453 397.188 753.109 391.875C755.766 386.406 757.719 380.312 758.969 373.594H822.719C821.781 387.656 818.266 400.625 812.172 412.5C806.234 424.219 798.188 434.453 788.031 443.203C777.875 451.797 766 458.516 752.406 463.359C738.812 468.203 723.969 470.625 707.875 470.625ZM911.209 326.484V465H846.053V115.781H911.209V281.25H898.319C906.288 259.375 917.459 242.422 931.834 230.391C946.366 218.359 964.725 212.344 986.913 212.344C1004.41 212.344 1019.65 216.172 1032.62 223.828C1045.74 231.328 1055.98 242.344 1063.32 256.875C1070.66 271.406 1074.33 289.141 1074.33 310.078V465H1009.18V321.562C1009.18 304.219 1005.04 291.094 996.756 282.188C988.631 273.281 977.069 268.828 962.069 268.828C952.069 268.828 943.241 270.859 935.584 274.922C927.928 278.984 921.913 285.234 917.538 293.672C913.319 302.109 911.209 313.047 911.209 326.484ZM1185.79 468.984C1169.39 468.984 1154.78 466.25 1141.97 460.781C1129.15 455.312 1119 447.109 1111.5 436.172C1104.15 425.234 1100.48 411.562 1100.48 395.156C1100.48 381.094 1103.06 369.453 1108.22 360.234C1113.53 350.859 1120.64 343.438 1129.54 337.969C1138.61 332.344 1149 328.125 1160.72 325.312C1172.43 322.344 1184.62 320.156 1197.28 318.75C1212.59 317.188 1224.7 315.781 1233.61 314.531C1242.51 313.125 1248.92 311.094 1252.83 308.438C1256.73 305.781 1258.68 301.719 1258.68 296.25V294.609C1258.68 288.047 1256.97 282.344 1253.53 277.5C1250.09 272.5 1245.25 268.594 1239 265.781C1232.75 262.969 1225.17 261.562 1216.26 261.562C1207.36 261.562 1199.47 262.969 1192.59 265.781C1185.87 268.594 1180.48 272.578 1176.42 277.734C1172.51 282.734 1170.25 288.594 1169.62 295.312H1107.98C1109.08 278.438 1114.08 263.828 1122.98 251.484C1132.04 239.141 1144.54 229.531 1160.48 222.656C1176.58 215.781 1195.72 212.344 1217.9 212.344C1234.47 212.344 1249.23 214.297 1262.2 218.203C1275.33 222.109 1286.34 227.734 1295.25 235.078C1304.31 242.422 1311.18 251.328 1315.87 261.797C1320.56 272.109 1322.9 283.75 1322.9 296.719V465H1259.39V430.078H1258.45C1254.23 437.891 1248.92 444.766 1242.51 450.703C1236.26 456.484 1228.45 461.016 1219.08 464.297C1209.86 467.422 1198.76 468.984 1185.79 468.984ZM1203.14 422.812C1214.86 422.812 1224.86 420.703 1233.14 416.484C1241.58 412.109 1247.98 406.25 1252.36 398.906C1256.89 391.562 1259.15 383.281 1259.15 374.062V348.281C1257.12 349.531 1254.39 350.703 1250.95 351.797C1247.67 352.734 1243.68 353.672 1239 354.609C1234.47 355.547 1229.47 356.484 1224 357.422C1218.68 358.359 1213.14 359.219 1207.36 360C1199.23 361.25 1191.81 363.203 1185.09 365.859C1178.37 368.516 1172.98 372.109 1168.92 376.641C1165.01 381.016 1163.06 386.719 1163.06 393.75C1163.06 399.688 1164.7 404.922 1167.98 409.453C1171.42 413.828 1176.11 417.188 1182.04 419.531C1187.98 421.719 1195.01 422.812 1203.14 422.812ZM1496.24 217.5V269.062H1337.57V217.5H1496.24ZM1380.69 150H1445.61V390.703C1445.61 399.297 1447.33 405.234 1450.77 408.516C1454.21 411.797 1460.69 413.438 1470.22 413.438C1474.13 413.438 1478.66 413.438 1483.82 413.438C1489.13 413.438 1493.27 413.438 1496.24 413.438V465C1492.02 465 1486.32 465 1479.13 465C1472.1 465 1464.99 465 1457.8 465C1431.39 465 1411.94 459.766 1399.44 449.297C1386.94 438.828 1380.69 422.656 1380.69 400.781V150ZM1584.03 465L1507.62 217.5H1575.82L1599.73 307.031C1604.26 324.688 1608.63 342.891 1612.85 361.641C1617.07 380.391 1621.29 398.828 1625.51 416.953H1616.6C1621.13 398.828 1625.67 380.391 1630.2 361.641C1634.88 342.891 1639.57 324.688 1644.26 307.031L1669.1 217.5H1728.17L1752.54 307.031C1757.38 324.688 1762.07 342.891 1766.6 361.641C1771.13 380.391 1775.67 398.828 1780.2 416.953H1771.06C1775.43 398.828 1779.65 380.391 1783.71 361.641C1787.93 342.891 1792.23 324.688 1796.6 307.031L1820.51 217.5H1889.42L1813.01 465H1745.74L1716.45 364.688C1713.63 354.844 1710.9 344.844 1708.24 334.688C1705.59 324.375 1702.93 314.062 1700.28 303.75C1697.78 293.281 1695.12 282.969 1692.31 272.812H1704.96C1702.31 282.969 1699.57 293.281 1696.76 303.75C1694.1 314.062 1691.45 324.375 1688.79 334.688C1686.29 344.844 1683.56 354.844 1680.59 364.688L1650.82 465H1584.03ZM2009.78 470.625C1985.09 470.625 1963.38 465.234 1944.62 454.453C1926.03 443.672 1911.5 428.594 1901.03 409.219C1890.72 389.844 1885.56 367.266 1885.56 341.484C1885.56 315.703 1890.72 293.125 1901.03 273.75C1911.5 254.219 1926.03 239.062 1944.62 228.281C1963.38 217.344 1985.09 211.875 2009.78 211.875C2034.62 211.875 2056.34 217.344 2074.94 228.281C2093.53 239.062 2107.98 254.219 2118.3 273.75C2128.77 293.125 2134 315.703 2134 341.484C2134 367.266 2128.77 389.844 2118.3 409.219C2107.98 428.594 2093.53 443.672 2074.94 454.453C2056.34 465.234 2034.62 470.625 2009.78 470.625ZM2009.78 417.188C2021.66 417.188 2031.97 414.219 2040.72 408.281C2049.47 402.188 2056.27 393.438 2061.11 382.031C2065.95 370.625 2068.38 357.109 2068.38 341.484C2068.38 325.547 2065.95 311.953 2061.11 300.703C2056.27 289.297 2049.47 280.547 2040.72 274.453C2031.97 268.359 2021.66 265.312 2009.78 265.312C1998.06 265.312 1987.75 268.359 1978.84 274.453C1970.09 280.547 1963.3 289.297 1958.45 300.703C1953.61 311.953 1951.19 325.547 1951.19 341.484C1951.19 357.266 1953.61 370.859 1958.45 382.266C1963.3 393.516 1970.09 402.188 1978.84 408.281C1987.75 414.219 1998.06 417.188 2009.78 417.188ZM2271.94 470.625C2247.26 470.625 2225.54 465.234 2206.79 454.453C2188.19 443.672 2173.66 428.594 2163.19 409.219C2152.88 389.844 2147.72 367.266 2147.72 341.484C2147.72 315.703 2152.88 293.125 2163.19 273.75C2173.66 254.219 2188.19 239.062 2206.79 228.281C2225.54 217.344 2247.26 211.875 2271.94 211.875C2296.79 211.875 2318.51 217.344 2337.1 228.281C2355.69 239.062 2370.15 254.219 2380.46 273.75C2390.93 293.125 2396.16 315.703 2396.16 341.484C2396.16 367.266 2390.93 389.844 2380.46 409.219C2370.15 428.594 2355.69 443.672 2337.1 454.453C2318.51 465.234 2296.79 470.625 2271.94 470.625ZM2271.94 417.188C2283.82 417.188 2294.13 414.219 2302.88 408.281C2311.63 402.188 2318.43 393.438 2323.27 382.031C2328.12 370.625 2330.54 357.109 2330.54 341.484C2330.54 325.547 2328.12 311.953 2323.27 300.703C2318.43 289.297 2311.63 280.547 2302.88 274.453C2294.13 268.359 2283.82 265.312 2271.94 265.312C2260.22 265.312 2249.91 268.359 2241.01 274.453C2232.26 280.547 2225.46 289.297 2220.62 300.703C2215.77 311.953 2213.35 325.547 2213.35 341.484C2213.35 357.266 2215.77 370.859 2220.62 382.266C2225.46 393.516 2232.26 402.188 2241.01 408.281C2249.91 414.219 2260.22 417.188 2271.94 417.188ZM2558.48 217.5V269.062H2399.81V217.5H2558.48ZM2442.93 150H2507.86V390.703C2507.86 399.297 2509.57 405.234 2513.01 408.516C2516.45 411.797 2522.93 413.438 2532.47 413.438C2536.37 413.438 2540.9 413.438 2546.06 413.438C2551.37 413.438 2555.51 413.438 2558.48 413.438V465C2554.26 465 2548.56 465 2541.37 465C2534.34 465 2527.23 465 2520.04 465C2493.64 465 2474.18 459.766 2461.68 449.297C2449.18 438.828 2442.93 422.656 2442.93 400.781V150Z" fill="white"/>
 </svg>
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index 5beae6850..8bdc86bb4 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -357,18 +357,6 @@ RSpec.describe 'Contacts API', type: :request do
         expect(response.body).not_to include(contact1.email)
       end
 
-      it 'searches contacts using company name' do
-        contact2.update(additional_attributes: { company_name: 'acme.inc' })
-        get "/api/v1/accounts/#{account.id}/contacts/search",
-            params: { q: 'acme.inc' },
-            headers: admin.create_new_auth_token,
-            as: :json
-
-        expect(response).to have_http_status(:success)
-        expect(response.body).to include(contact2.email)
-        expect(response.body).not_to include(contact1.email)
-      end
-
       it 'matches the resolved contact respecting the identifier character casing' do
         contact_normal = create(:contact, name: 'testcontact', account: account, identifier: 'testidentifer')
         contact_special = create(:contact, name: 'testcontact', account: account, identifier: 'TestIdentifier')
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 38bd649fe..3c380c155 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -667,6 +667,8 @@ RSpec.describe 'Conversations API', type: :request do
       end
 
       it 'updates last seen' do
+        conversation.update!(agent_last_seen_at: nil)
+
         post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/update_last_seen",
              headers: agent.create_new_auth_token,
              as: :json
@@ -676,7 +678,7 @@ RSpec.describe 'Conversations API', type: :request do
       end
 
       it 'updates assignee last seen' do
-        conversation.update!(assignee_id: agent.id)
+        conversation.update!(assignee_id: agent.id, agent_last_seen_at: nil)
 
         expect(conversation.reload.assignee_last_seen_at).to be_nil
 
@@ -687,6 +689,76 @@ RSpec.describe 'Conversations API', type: :request do
         expect(response).to have_http_status(:success)
         expect(conversation.reload.assignee_last_seen_at).not_to be_nil
       end
+
+      it 'throttles updates within an hour when there are no unread messages' do
+        conversation.update!(agent_last_seen_at: 30.minutes.ago)
+        # Ensure all messages are older than agent_last_seen_at (no unread messages)
+        # rubocop:disable Rails/SkipsModelValidations
+        conversation.messages.update_all(created_at: 1.hour.ago)
+        # rubocop:enable Rails/SkipsModelValidations
+        initial_last_seen = conversation.agent_last_seen_at
+
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/update_last_seen",
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(conversation.reload.agent_last_seen_at).to be_within(1.second).of(initial_last_seen)
+      end
+
+      it 'updates even within an hour when there are unread messages' do
+        conversation.update!(agent_last_seen_at: 30.minutes.ago)
+        # Create a new message after agent_last_seen_at (unread message)
+        create(:message, conversation: conversation, created_at: 5.minutes.ago)
+        initial_last_seen = conversation.agent_last_seen_at
+
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/update_last_seen",
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(conversation.reload.agent_last_seen_at).not_to be_within(1.second).of(initial_last_seen)
+        expect(conversation.reload.agent_last_seen_at).to be > initial_last_seen
+      end
+
+      it 'updates both if one timestamp is old even when the other is recent' do
+        conversation.update!(assignee_id: agent.id, agent_last_seen_at: 2.hours.ago, assignee_last_seen_at: 30.minutes.ago)
+        # Ensure all messages are older than assignee_last_seen_at (no unread messages)
+        # rubocop:disable Rails/SkipsModelValidations
+        conversation.messages.update_all(created_at: 1.hour.ago)
+        # rubocop:enable Rails/SkipsModelValidations
+
+        initial_agent_last_seen = conversation.agent_last_seen_at
+
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/update_last_seen",
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        # Both should be updated because agent_last_seen_at is old
+        expect(conversation.reload.agent_last_seen_at).to be > initial_agent_last_seen
+        expect(conversation.reload.assignee_last_seen_at).to be > initial_agent_last_seen
+      end
+
+      it 'throttles only when both timestamps are recent and no unread messages' do
+        conversation.update!(assignee_id: agent.id, agent_last_seen_at: 30.minutes.ago, assignee_last_seen_at: 30.minutes.ago)
+        # Ensure all messages are older (no unread messages)
+        # rubocop:disable Rails/SkipsModelValidations
+        conversation.messages.update_all(created_at: 1.hour.ago)
+        # rubocop:enable Rails/SkipsModelValidations
+
+        initial_agent_last_seen = conversation.agent_last_seen_at
+        initial_assignee_last_seen = conversation.assignee_last_seen_at
+
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/update_last_seen",
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        # Both should remain unchanged (throttled)
+        expect(conversation.reload.agent_last_seen_at).to be_within(1.second).of(initial_agent_last_seen)
+        expect(conversation.reload.assignee_last_seen_at).to be_within(1.second).of(initial_assignee_last_seen)
+      end
     end
   end
 
diff --git a/spec/controllers/public/api/v1/portals_controller_spec.rb b/spec/controllers/public/api/v1/portals_controller_spec.rb
index 92ab56e5b..9cc77a19c 100644
--- a/spec/controllers/public/api/v1/portals_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals_controller_spec.rb
@@ -60,24 +60,35 @@ RSpec.describe Public::Api::V1::PortalsController, type: :request do
 
   describe 'GET /public/api/v1/portals/{portal_slug}/sitemap' do
     context 'when custom_domain is present' do
-      it 'gets a valid sitemap' do
+      it 'returns a valid urlset sitemap with the correct namespace' do
         get "/hc/#{portal.slug}/sitemap.xml"
+
         expect(response).to have_http_status(:success)
-        expect(response.body).to match(/<sitemap/)
-        expect(Nokogiri::XML(response.body).errors).to be_empty
+
+        doc = Nokogiri::XML(response.body)
+        expect(doc.errors).to be_empty
+
+        expect(doc.root.name).to eq('urlset')
+        expect(doc.root.namespace&.href).to eq('http://www.sitemaps.org/schemas/sitemap/0.9')
       end
 
-      it 'has valid sitemap links' do
+      it 'contains valid article URLs for the portal' do
         get "/hc/#{portal.slug}/sitemap.xml"
+
         expect(response).to have_http_status(:success)
-        parsed_xml = Nokogiri::XML(response.body)
-        links = parsed_xml.css('loc')
 
-        links.each do |link|
-          expect(link.text).to match(%r{https://www\.example\.com/hc/test-portal/articles/\d+})
-        end
+        doc = Nokogiri::XML(response.body)
+        doc.remove_namespaces!
 
-        expect(links.length).to eq 3
+        # ensure we are NOT returning a sitemapindex
+        expect(doc.xpath('//sitemapindex')).to be_empty
+
+        links = doc.xpath('//url/loc').map(&:text)
+        expect(links.length).to eq(3)
+
+        expect(links).to all(
+          match(%r{\Ahttps://www\.example\.com/hc/#{Regexp.escape(portal.slug)}/articles/\d+})
+        )
       end
     end
   end
diff --git a/spec/models/custom_attribute_definition_spec.rb b/spec/enterprise/models/custom_attribute_definition_spec.rb
similarity index 100%
rename from spec/models/custom_attribute_definition_spec.rb
rename to spec/enterprise/models/custom_attribute_definition_spec.rb
diff --git a/spec/presenters/messages/search_data_presenter_spec.rb b/spec/presenters/messages/search_data_presenter_spec.rb
index 0bbe1a812..7b3d4acb9 100644
--- a/spec/presenters/messages/search_data_presenter_spec.rb
+++ b/spec/presenters/messages/search_data_presenter_spec.rb
@@ -61,15 +61,10 @@ RSpec.describe Messages::SearchDataPresenter do
     context 'with campaign and automation data' do
       before do
         message.update(
-          additional_attributes: { 'campaign_id' => '123' },
           content_attributes: { 'automation_rule_id' => '456' }
         )
       end
 
-      it 'includes campaign_id' do
-        expect(presenter.search_data[:additional_attributes][:campaign_id]).to eq('123')
-      end
-
       it 'includes automation_rule_id' do
         expect(presenter.search_data[:additional_attributes][:automation_rule_id]).to eq('456')
       end
diff --git a/spec/services/messages/markdown_renderer_service_spec.rb b/spec/services/messages/markdown_renderer_service_spec.rb
index e43b0d6d0..8bad763b4 100644
--- a/spec/services/messages/markdown_renderer_service_spec.rb
+++ b/spec/services/messages/markdown_renderer_service_spec.rb
@@ -53,12 +53,28 @@ RSpec.describe Messages::MarkdownRendererService, type: :service do
         expect(result.strip).to eq('*bold _italic_*')
       end
 
-      it 'converts bullet lists' do
-        content = "- item 1\n- item 2"
+      it 'preserves unordered list with dash markers' do
+        content = "- item 1\n- item 2\n- item 3"
         result = described_class.new(content, channel_type).render
-        expect(result.strip).to include('- item 1')
-        expect(result.strip).to include('- item 2')
-        expect(result).to include("- item 1\n- item 2")
+        expect(result).to include('- item 1')
+        expect(result).to include('- item 2')
+        expect(result).to include('- item 3')
+      end
+
+      it 'converts asterisk unordered lists to dash markers' do
+        content = "* item 1\n* item 2\n* item 3"
+        result = described_class.new(content, channel_type).render
+        expect(result).to include('- item 1')
+        expect(result).to include('- item 2')
+        expect(result).to include('- item 3')
+      end
+
+      it 'preserves ordered list markers with numbering' do
+        content = "1. first step\n2. second step\n3. third step"
+        result = described_class.new(content, channel_type).render
+        expect(result).to include('1. first step')
+        expect(result).to include('2. second step')
+        expect(result).to include('3. third step')
       end
 
       it 'preserves newlines in plain text without list markers' do
@@ -432,6 +448,24 @@ RSpec.describe Messages::MarkdownRendererService, type: :service do
         expect(result).to include("Line 1\nLine 2\nLine 3")
       end
 
+      it 'preserves ordered list markers with numbering in Twilio WhatsApp' do
+        content = "1. first step\n2. second step\n3. third step"
+        channel = instance_double(Channel::TwilioSms, whatsapp?: true)
+        result = described_class.new(content, channel_type, channel).render
+        expect(result).to include('1. first step')
+        expect(result).to include('2. second step')
+        expect(result).to include('3. third step')
+      end
+
+      it 'preserves unordered list markers in Twilio WhatsApp' do
+        content = "- item 1\n- item 2\n- item 3"
+        channel = instance_double(Channel::TwilioSms, whatsapp?: true)
+        result = described_class.new(content, channel_type, channel).render
+        expect(result).to include('- item 1')
+        expect(result).to include('- item 2')
+        expect(result).to include('- item 3')
+      end
+
       it 'backwards compatible when channel is not provided' do
         content = '**bold** _italic_'
         result = described_class.new(content, channel_type).render
@@ -483,12 +517,12 @@ RSpec.describe Messages::MarkdownRendererService, type: :service do
     context 'when testing all formatting types' do
       let(:channel_type) { 'Channel::Whatsapp' }
 
-      it 'handles ordered lists' do
+      it 'handles ordered lists with proper numbering' do
         content = "1. first\n2. second\n3. third"
         result = described_class.new(content, channel_type).render
-        expect(result).to include('first')
-        expect(result).to include('second')
-        expect(result).to include('third')
+        expect(result).to include('1. first')
+        expect(result).to include('2. second')
+        expect(result).to include('3. third')
       end
     end