Merge branch 'chore/improve-conversation-snooze' into chore/improve-custom-snooze

AGENTS.md

@@ -68,15 +68,6 @@
 - Example: `feat(auth): add user authentication`
 - Don't reference Claude in commit messages
 
-## PR Description Format
-
-- Start with a short, user-facing paragraph describing the product change.
-- Add a `Closes` section with relevant issue links (GitHub, Linear, etc.).
-- For feature PRs, add `How to test` from a product/UX standpoint.
-- For bugfix PRs, use `How to reproduce` when helpful.
-- Optionally add a `What changed` section for implementation highlights.
-- Do not add a `How this was tested` section listing specs/commands.
-
 ## Project-Specific
 
 - **Translations**:

Gemfile.lock

@@ -191,7 +191,7 @@ GEM
     coderay (1.1.3)
     commonmarker (0.23.10)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.5)
+    connection_pool (2.5.3)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -736,7 +736,7 @@ GEM
       ffi (~> 1.0)
     redis (5.0.6)
       redis-client (>= 0.9.0)
-    redis-client (0.26.4)
+    redis-client (0.22.2)
       connection_pool
     redis-namespace (1.10.0)
       redis (>= 4)

Makefile

@@ -40,12 +40,8 @@ run:
 	fi
 
 force_run:
-	@echo "Cleaning up Overmind processes..."
-	@lsof -ti:3036 2>/dev/null | xargs kill -9 2>/dev/null || true
-	@lsof -ti:3000 2>/dev/null | xargs kill -9 2>/dev/null || true
-	@rm -f ./.overmind.sock
-	@rm -f tmp/pids/*.pid
-	@echo "Cleanup complete"
+	rm -f ./.overmind.sock
+	rm -f tmp/pids/*.pid
 	overmind start -f Procfile.dev
 
 force_run_tunnel:

VERSION_CW

@@ -1 +1 @@
-4.11.2
+4.11.1

app/builders/messages/messenger/message_builder.rb

@@ -2,17 +2,12 @@ class Messages::Messenger::MessageBuilder
   include ::FileTypeHelper
 
   def process_attachment(attachment)
-    # This check handles very rare case if there are multiple files to attach with only one unsupported file
+    # This check handles very rare case if there are multiple files to attach with only one usupported file
     return if unsupported_file_type?(attachment['type'])
 
-    params = attachment_params(attachment)
-    attachment_obj = @message.attachments.new(params.except(:remote_file_url))
+    attachment_obj = @message.attachments.new(attachment_params(attachment).except(:remote_file_url))
     attachment_obj.save!
-    if facebook_reel?(attachment)
-      update_facebook_reel_content(attachment)
-    elsif params[:remote_file_url]
-      attach_file(attachment_obj, params[:remote_file_url])
-    end
+    attach_file(attachment_obj, attachment_params(attachment)[:remote_file_url]) if attachment_params(attachment)[:remote_file_url]
     fetch_story_link(attachment_obj) if attachment_obj.file_type == 'story_mention'
     fetch_ig_story_link(attachment_obj) if attachment_obj.file_type == 'ig_story'
     fetch_ig_post_link(attachment_obj) if attachment_obj.file_type == 'ig_post'
@@ -31,7 +26,7 @@ class Messages::Messenger::MessageBuilder
   end
 
   def attachment_params(attachment)
-    file_type = normalize_file_type(attachment['type'])
+    file_type = attachment['type'].to_sym
     params = { file_type: file_type, account_id: @message.account_id }
 
     if [:image, :file, :audio, :video, :share, :story_mention, :ig_reel, :ig_post, :ig_story].include? file_type
@@ -105,28 +100,6 @@ class Messages::Messenger::MessageBuilder
 
   private
 
-  # Facebook may send attachment types that don't directly match our file_type enum.
-  # Map known aliases to their canonical enum values.
-  FACEBOOK_FILE_TYPE_MAP = { reel: :ig_reel }.freeze
-
-  def normalize_file_type(type)
-    sym = type.to_sym
-    FACEBOOK_FILE_TYPE_MAP.fetch(sym, sym)
-  end
-
-  # Facebook sends reel URLs as webpage links (facebook.com/reel/...) rather than
-  # direct video URLs. Downloading these yields HTML, not video content.
-  def facebook_reel?(attachment)
-    attachment['type'].to_sym == :reel
-  end
-
-  def update_facebook_reel_content(attachment)
-    url = attachment.dig('payload', 'url')
-    return if url.blank?
-
-    @message.update!(content: url) if @message.content.blank?
-  end
-
   def unsupported_file_type?(attachment_type)
     [:template, :unsupported_type, :ephemeral].include? attachment_type.to_sym
   end

app/controllers/api/v1/accounts/articles_controller.rb

@@ -40,7 +40,7 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
   end
 
   def reorder
-    Article.update_positions(portal: @portal, positions_hash: params[:positions_hash])
+    Article.update_positions(params[:positions_hash])
     head :ok
   end
 

app/controllers/api/v1/accounts/categories_controller.rb

@@ -1,7 +1,7 @@
 class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseController
   before_action :portal
   before_action :check_authorization
-  before_action :fetch_category, except: [:index, :create, :reorder]
+  before_action :fetch_category, except: [:index, :create]
   before_action :set_current_page, only: [:index]
 
   def index
@@ -32,11 +32,6 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
     head :ok
   end
 
-  def reorder
-    Category.update_positions(portal: @portal, positions_hash: params[:positions_hash])
-    head :ok
-  end
-
   private
 
   def fetch_category
@@ -44,7 +39,7 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
   end
 
   def portal
-    @portal ||= Current.account.portals.find_by!(slug: params[:portal_id])
+    @portal ||= Current.account.portals.find_by(slug: params[:portal_id])
   end
 
   def related_categories_records

app/controllers/api/v1/accounts/conversations_controller.rb

@@ -107,7 +107,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
   end
 
   def toggle_typing_status
-    typing_status_manager = ::Conversations::TypingStatusManager.new(@conversation, Current.user, params)
+    typing_status_manager = ::Conversations::TypingStatusManager.new(@conversation, current_user, params)
     typing_status_manager.toggle_typing_status
     head :ok
   end

app/controllers/concerns/access_token_auth_helper.rb

@@ -1,6 +1,6 @@
 module AccessTokenAuthHelper
   BOT_ACCESSIBLE_ENDPOINTS = {
-    'api/v1/accounts/conversations' => %w[toggle_status toggle_typing_status toggle_priority create update custom_attributes],
+    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create update custom_attributes],
     'api/v1/accounts/conversations/messages' => ['create'],
     'api/v1/accounts/conversations/assignments' => ['create']
   }.freeze
@@ -28,7 +28,7 @@ module AccessTokenAuthHelper
 
   def validate_bot_access_token!
     return if Current.user.is_a?(User)
-    return if @resource.is_a?(AgentBot) && agent_bot_accessible?
+    return if agent_bot_accessible?
 
     render_unauthorized('Access to this endpoint is not authorized for bots')
   end

app/helpers/filters/filter_helper.rb

@@ -47,15 +47,11 @@ module Filters::FilterHelper
 
   def handle_additional_attributes(query_hash, filter_operator_value, data_type)
     if data_type == 'text_case_insensitive'
-      ActiveRecord::Base.sanitize_sql_array(
-        ["LOWER(#{filter_config[:table_name]}.additional_attributes ->> ?) #{filter_operator_value} #{query_hash[:query_operator]}",
-         query_hash[:attribute_key]]
-      )
+      "LOWER(#{filter_config[:table_name]}.additional_attributes ->> '#{query_hash[:attribute_key]}') " \
+        "#{filter_operator_value} #{query_hash[:query_operator]}"
     else
-      ActiveRecord::Base.sanitize_sql_array(
-        ["#{filter_config[:table_name]}.additional_attributes ->> ? #{filter_operator_value} #{query_hash[:query_operator]} ",
-         query_hash[:attribute_key]]
-      )
+      "#{filter_config[:table_name]}.additional_attributes ->> '#{query_hash[:attribute_key]}' " \
+        "#{filter_operator_value} #{query_hash[:query_operator]} "
     end
   end
 
@@ -74,7 +70,7 @@ module Filters::FilterHelper
 
   def date_filter(current_filter, query_hash, filter_operator_value)
     "(#{filter_config[:table_name]}.#{query_hash[:attribute_key]})::#{current_filter['data_type']} " \
-      "#{filter_operator_value} #{query_hash[:query_operator]}"
+      "#{filter_operator_value}#{current_filter['data_type']} #{query_hash[:query_operator]}"
   end
 
   def text_case_insensitive_filter(query_hash, filter_operator_value)

app/javascript/dashboard/api/contacts.js

@@ -57,14 +57,14 @@ class ContactAPI extends ApiClient {
     return axios.post(`${this.url}/${contactId}/labels`, { labels });
   }
 
-  search(search = '', page = 1, sortAttr = 'name', label = '', options = {}) {
+  search(search = '', page = 1, sortAttr = 'name', label = '') {
     let requestURL = `${this.url}/search?${buildContactParams(
       page,
       sortAttr,
       label,
       search
     )}`;
-    return axios.get(requestURL, { signal: options.signal });
+    return axios.get(requestURL);
   }
 
   active(page = 1, sortAttr = 'name') {

app/javascript/dashboard/api/helpCenter/categories.js

@@ -25,12 +25,6 @@ class CategoriesAPI extends PortalsAPI {
   delete({ portalSlug, categoryId }) {
     return axios.delete(`${this.url}/${portalSlug}/categories/${categoryId}`);
   }
-
-  reorder({ portalSlug, reorderedGroup }) {
-    return axios.post(`${this.url}/${portalSlug}/categories/reorder`, {
-      positions_hash: reorderedGroup,
-    });
-  }
 }
 
 export default new CategoriesAPI();

app/javascript/dashboard/api/specs/contacts.spec.js

@@ -68,19 +68,7 @@ describe('#ContactsAPI', () => {
     it('#search', () => {
       contactAPI.search('leads', 1, 'date', 'customer-support');
       expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/contacts/search?include_contact_inboxes=false&page=1&sort=date&q=leads&labels[]=customer-support',
-        { signal: undefined }
-      );
-    });
-
-    it('#search with signal', () => {
-      const controller = new AbortController();
-      contactAPI.search('leads', 1, 'date', 'customer-support', {
-        signal: controller.signal,
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/contacts/search?include_contact_inboxes=false&page=1&sort=date&q=leads&labels[]=customer-support',
-        { signal: controller.signal }
+        '/api/v1/contacts/search?include_contact_inboxes=false&page=1&sort=date&q=leads&labels[]=customer-support'
       );
     });
 

app/javascript/dashboard/api/specs/helpCenter/categories.spec.js

@@ -8,6 +8,5 @@ describe('#BulkActionsAPI', () => {
     expect(categoriesAPI).toHaveProperty('create');
     expect(categoriesAPI).toHaveProperty('update');
     expect(categoriesAPI).toHaveProperty('delete');
-    expect(categoriesAPI).toHaveProperty('reorder');
   });
 });

app/javascript/dashboard/assets/scss/_woot.scss

@@ -12,9 +12,6 @@
 // Base styles for elements
 @import 'base';
 
-// Plugins
-@import 'plugins/date-picker';
-
 html,
 body {
   font-family:

app/javascript/dashboard/components-next/Campaigns/CampaignLayout.vue

@@ -1,5 +1,4 @@
 <script setup>
-import { vOnClickOutside } from '@vueuse/components';
 import Button from 'dashboard/components-next/button/Button.vue';
 
 defineProps({
@@ -29,11 +28,7 @@ const handleButtonClick = () => {
             {{ headerTitle }}
           </span>
           <div
-            v-on-click-outside="[
-              () => emit('close'),
-              // This will prevent closing the modal when the editor Create link popup is open
-              { ignore: ['dialog.ProseMirror-prompt-backdrop'] },
-            ]"
+            v-on-clickaway="() => emit('close')"
             class="relative group/campaign-button"
           >
             <Button

app/javascript/dashboard/components-next/DatePicker/DatePicker.vue

@@ -0,0 +1,181 @@
+<script setup>
+import { ref, computed } from 'vue';
+import {
+  startOfMonth,
+  addMonths,
+  subMonths,
+  startOfDay,
+  isSameDay,
+  addHours,
+  addYears,
+  subYears,
+  setMonth,
+  setYear,
+} from 'date-fns';
+import { CALENDAR_PERIODS } from './helpers/DatePickerHelper';
+import CalendarYear from './components/CalendarYear.vue';
+import CalendarMonth from './components/CalendarMonth.vue';
+import CalendarWeek from './components/CalendarWeek.vue';
+import CalendarFooter from './components/CalendarFooter.vue';
+import TimePicker from './components/TimePicker.vue';
+
+const props = defineProps({
+  minDate: {
+    type: Date,
+    default: null,
+  },
+});
+
+const emit = defineEmits(['apply', 'clear']);
+
+const { WEEK, MONTH, YEAR } = CALENDAR_PERIODS;
+
+const currentDate = ref(new Date());
+const selectedDate = ref(null);
+
+const getCurrentTime = () => {
+  const now = new Date();
+  return {
+    hour: now.getHours(),
+    minute: now.getMinutes(),
+    second: now.getSeconds(),
+  };
+};
+
+const selectedTime = ref(getCurrentTime());
+const calendarView = ref(WEEK);
+const calendarDate = ref(startOfMonth(currentDate.value));
+
+const getMinTimeForToday = () => addHours(new Date(), 1);
+
+const effectiveMinDate = computed(() => {
+  const thresholdDay = startOfDay(getMinTimeForToday());
+  if (!props.minDate) return thresholdDay;
+  const propDay = startOfDay(props.minDate);
+  return propDay > thresholdDay ? propDay : thresholdDay;
+});
+
+const minTime = computed(() => {
+  if (!selectedDate.value) return null;
+  if (!isSameDay(selectedDate.value, effectiveMinDate.value)) return null;
+  return getMinTimeForToday();
+});
+
+const selectedDateTime = computed(() => {
+  if (!selectedDate.value) return null;
+  const date = new Date(selectedDate.value);
+  date.setHours(
+    selectedTime.value.hour,
+    selectedTime.value.minute,
+    selectedTime.value.second,
+    0
+  );
+  return date;
+});
+
+const selectDate = day => {
+  selectedDate.value = startOfDay(day);
+  if (isSameDay(day, effectiveMinDate.value)) {
+    const threshold = getMinTimeForToday();
+    selectedTime.value = {
+      hour: threshold.getHours(),
+      minute: threshold.getMinutes(),
+      second: 0,
+    };
+  } else {
+    selectedTime.value = { hour: 0, minute: 0, second: 0 };
+  }
+};
+
+const moveCalendar = (direction, period = MONTH) => {
+  const adjust =
+    period === YEAR
+      ? { prev: subYears, next: addYears }
+      : { prev: subMonths, next: addMonths };
+  calendarDate.value = adjust[direction](calendarDate.value, 1);
+};
+
+const setViewMode = (_type, mode) => {
+  calendarView.value = mode;
+};
+
+const openCalendar = (index, _type, period = MONTH) => {
+  calendarDate.value =
+    period === MONTH
+      ? setMonth(startOfMonth(calendarDate.value), index)
+      : setYear(calendarDate.value, index);
+  calendarView.value = period === MONTH ? WEEK : MONTH;
+};
+
+const onApply = () => {
+  if (selectedDateTime.value) {
+    emit('apply', selectedDateTime.value);
+  }
+};
+
+const isDefaultState = computed(
+  () => !selectedDate.value && calendarView.value === WEEK
+);
+
+const resetState = () => {
+  selectedDate.value = null;
+  selectedTime.value = getCurrentTime();
+  calendarDate.value = startOfMonth(currentDate.value);
+  calendarView.value = WEEK;
+};
+
+const onClear = () => {
+  if (isDefaultState.value) {
+    emit('clear');
+    return;
+  }
+  resetState();
+};
+
+defineExpose({ resetState });
+</script>
+
+<template>
+  <div class="flex flex-col select-none font-inter">
+    <div class="flex w-full gap-3 justify-between">
+      <div class="flex justify-center py-5">
+        <div class="flex flex-col items-center gap-2 min-w-[300px]">
+          <CalendarYear
+            v-if="calendarView === YEAR"
+            :start-current-date="calendarDate"
+            @select-year="openCalendar($event, null, YEAR)"
+          />
+          <CalendarMonth
+            v-else-if="calendarView === MONTH"
+            :start-current-date="calendarDate"
+            @select-month="openCalendar($event)"
+            @set-view="setViewMode"
+            @prev="moveCalendar('prev', YEAR)"
+            @next="moveCalendar('next', YEAR)"
+          />
+          <CalendarWeek
+            v-else
+            :current-date="currentDate"
+            :start-current-date="calendarDate"
+            :selected-start-date="selectedDate"
+            :selected-end-date="selectedDate"
+            :min-date="effectiveMinDate"
+            @select-date="selectDate"
+            @set-view="setViewMode"
+            @prev="moveCalendar('prev')"
+            @next="moveCalendar('next')"
+          />
+        </div>
+      </div>
+      <div
+        class="flex justify-center py-2 w-full transition-opacity ltr:border-l rtl:border-r border-n-strong"
+        :class="selectedDate ? 'opacity-100' : 'opacity-40 pointer-events-none'"
+      >
+        <TimePicker v-model="selectedTime" :min-time="minTime" />
+      </div>
+    </div>
+    <div class="border-t border-n-strong">
+      <CalendarFooter @change="onApply" @clear="onClear" />
+    </div>
+  </div>
+</template>

app/javascript/dashboard/components-next/DatePicker/components/CalendarWeek.vue

@@ -1,4 +1,5 @@
 <script setup>
+import { startOfDay } from 'date-fns';
 import {
   monthName,
   yearName,
@@ -28,6 +29,10 @@ const props = defineProps({
   selectingEndDate: Boolean,
   selectedEndDate: Date,
   hoveredEndDate: Date,
+  minDate: {
+    type: Date,
+    default: null,
+  },
 });
 
 const emit = defineEmits([
@@ -41,11 +46,18 @@ const emit = defineEmits([
 const { START_CALENDAR } = CALENDAR_TYPES;
 const { MONTH } = CALENDAR_PERIODS;
 
+const isDayDisabled = day => {
+  if (!props.minDate) return false;
+  return startOfDay(day) < startOfDay(props.minDate);
+};
+
 const emitHoveredEndDate = day => {
+  if (isDayDisabled(day)) return;
   emit('updateHoveredEndDate', day);
 };
 
 const emitSelectDate = day => {
+  if (isDayDisabled(day)) return;
   emit('selectDate', day);
 };
 const onClickPrev = () => {
@@ -108,8 +120,10 @@ const isNextDayInRange = day => {
 
 const dayClasses = day => ({
   'text-n-slate-10 pointer-events-none': !isInCurrentMonth(day),
+  'text-n-slate-10 pointer-events-none opacity-40':
+    isInCurrentMonth(day) && isDayDisabled(day),
   'text-n-slate-12 hover:text-n-slate-12 hover:bg-n-blue-6 dark:hover:bg-n-blue-7':
-    isInCurrentMonth(day),
+    isInCurrentMonth(day) && !isDayDisabled(day),
   'bg-n-brand text-white':
     isSelectedStartOrEndDate(day) && isInCurrentMonth(day),
   'bg-n-blue-4 dark:bg-n-blue-5':

app/javascript/dashboard/components-next/DatePicker/components/TimePicker.vue

@@ -0,0 +1,430 @@
+<script setup>
+import { ref, reactive, computed, watch, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import TabBar from 'dashboard/components-next/tabbar/TabBar.vue';
+import {
+  TIME_COLUMNS,
+  TIME_PERIODS,
+  TIME_FORMATS,
+} from '../helpers/DatePickerHelper';
+
+const props = defineProps({
+  minTime: { type: Date, default: null },
+});
+
+const model = defineModel({
+  type: Object,
+  default: () => ({ hour: 9, minute: 0, second: 0 }),
+});
+
+const { t } = useI18n();
+
+const { HOUR, HOUR_12, MINUTE, SECOND, PERIOD } = TIME_COLUMNS;
+const { AM, PM } = TIME_PERIODS;
+const { H24, H12 } = TIME_FORMATS;
+
+const ITEM_HEIGHT = 40;
+const CENTER_ROW = 2;
+const VISIBLE_ROWS = 5;
+const SNAP_DELAY = 120;
+const SEPARATOR = ':';
+
+const is24HourFormat = ref(false);
+const selectedTime = reactive({
+  hour: model.value.hour,
+  minute: model.value.minute,
+  second: model.value.second ?? 0,
+});
+const activeIndex = reactive({});
+const dragOffset = reactive({});
+const interactionMode = reactive({});
+const touchStartY = {};
+const snapTimers = {};
+const columnRefs = reactive({});
+const focusedColumn = ref(null);
+
+const period = computed(() => (selectedTime.hour >= 12 ? PM : AM));
+const showPeriod = computed(() => !is24HourFormat.value);
+
+const minBound = computed(() => {
+  if (!props.minTime) return null;
+  const d = props.minTime;
+  return { h: d.getHours(), m: d.getMinutes(), s: d.getSeconds() };
+});
+
+const toTimeNumber = (h, m, s) => h * 3600 + m * 60 + s;
+
+const convertTo12Hour = hour => {
+  if (hour === 0) return 12;
+  return hour > 12 ? hour - 12 : hour;
+};
+
+const convertTo24Hour = (hour12, timePeriod) => {
+  if (timePeriod === AM) return hour12 === 12 ? 0 : hour12;
+  return hour12 === 12 ? 12 : hour12 + 12;
+};
+
+const isItemDisabled = (key, val) => {
+  const mb = minBound.value;
+  if (!mb) return false;
+  const minVal = toTimeNumber(mb.h, mb.m, mb.s);
+  const { hour, minute } = selectedTime;
+  if (key === HOUR) return toTimeNumber(val, 0, 0) < toTimeNumber(mb.h, 0, 0);
+  if (key === MINUTE) return toTimeNumber(hour, val, 0) < minVal;
+  if (key === SECOND) return toTimeNumber(hour, minute, val) < minVal;
+  return false;
+};
+
+const formatLabel = value => String(value).padStart(2, '0');
+
+const buildItems = (count, key) =>
+  Array.from({ length: count }, (_, i) => ({
+    value: i,
+    label: formatLabel(i),
+    disabled: isItemDisabled(key, i),
+  }));
+
+const buildHour12Items = () =>
+  Array.from({ length: 12 }, (_, i) => {
+    const display = i === 0 ? 12 : i;
+    return {
+      value: display,
+      label: formatLabel(display),
+      disabled: isItemDisabled(HOUR, convertTo24Hour(display, period.value)),
+    };
+  });
+
+const periodItems = computed(() => [
+  { value: AM, label: AM, disabled: minBound.value?.h >= 12 },
+  { value: PM, label: PM, disabled: false },
+]);
+
+const columns = computed(() => [
+  {
+    key: is24HourFormat.value ? HOUR : HOUR_12,
+    label: t('DATE_PICKER.HOUR'),
+    items: is24HourFormat.value ? buildItems(24, HOUR) : buildHour12Items(),
+  },
+  {
+    key: MINUTE,
+    label: t('DATE_PICKER.MINUTE'),
+    items: buildItems(60, MINUTE),
+  },
+  {
+    key: SECOND,
+    label: t('DATE_PICKER.SECOND'),
+    items: buildItems(60, SECOND),
+  },
+  { key: PERIOD, label: '', items: periodItems.value },
+]);
+
+const findColumn = key => columns.value.find(c => c.key === key);
+
+const findNearestEnabled = (items, index) => {
+  for (let d = 0; d < items.length; d += 1) {
+    if (index + d < items.length && !items[index + d].disabled)
+      return index + d;
+    if (index - d >= 0 && !items[index - d].disabled) return index - d;
+  }
+  return index;
+};
+
+const getActiveIndex = key => {
+  if (key === HOUR) return selectedTime.hour;
+  if (key === HOUR_12) {
+    const h = convertTo12Hour(selectedTime.hour);
+    return h === 12 ? 0 : h;
+  }
+  if (key === PERIOD) return period.value === AM ? 0 : 1;
+  return selectedTime[key];
+};
+
+const getColumnTranslateY = key => {
+  const idx = -(activeIndex[key] ?? 0) * ITEM_HEIGHT;
+  return CENTER_ROW * ITEM_HEIGHT + idx + (dragOffset[key] ?? 0);
+};
+
+const getMaxDragOffset = key => {
+  const column = findColumn(key);
+  if (!column) return { maxDown: 0, maxUp: 0 };
+  const currentIdx = activeIndex[key] ?? 0;
+  const firstEnabled = column.items.findIndex(i => !i.disabled);
+  const lastEnabled = column.items.findLastIndex(i => !i.disabled);
+  if (firstEnabled === -1) return { maxDown: 0, maxUp: 0 };
+  return {
+    maxDown: (currentIdx - firstEnabled) * ITEM_HEIGHT,
+    maxUp: (lastEnabled - currentIdx) * ITEM_HEIGHT,
+  };
+};
+
+const clampDragOffset = (key, rawOffset) => {
+  const { maxDown, maxUp } = getMaxDragOffset(key);
+  return Math.max(-maxUp, Math.min(maxDown, rawOffset));
+};
+
+let lastEmittedSignature = '';
+const emitTimeValue = () => {
+  const sig = `${selectedTime.hour}:${selectedTime.minute}:${selectedTime.second}`;
+  if (sig === lastEmittedSignature) return;
+  lastEmittedSignature = sig;
+  model.value = { ...selectedTime };
+};
+
+const applySelection = (key, item) => {
+  if (key === HOUR_12) {
+    selectedTime.hour = convertTo24Hour(item.value, period.value);
+  } else if (key === PERIOD) {
+    selectedTime.hour = convertTo24Hour(
+      convertTo12Hour(selectedTime.hour),
+      item.value
+    );
+  } else {
+    selectedTime[key] = item.value;
+  }
+  emitTimeValue();
+};
+
+const selectIndex = (key, targetIndex) => {
+  const column = findColumn(key);
+  if (!column) return;
+  const clamped = Math.max(0, Math.min(targetIndex, column.items.length - 1));
+  const resolved = column.items[clamped]?.disabled
+    ? findNearestEnabled(column.items, clamped)
+    : clamped;
+  activeIndex[key] = resolved;
+  const item = column.items[resolved];
+  if (item) applySelection(key, item);
+};
+
+const selectByValue = (key, value) => {
+  const column = findColumn(key);
+  if (!column) return;
+  const idx = column.items.findIndex(i => i.value === value && !i.disabled);
+  if (idx !== -1) selectIndex(key, idx);
+};
+
+const snapToNearest = key => {
+  const offset = dragOffset[key] ?? 0;
+  const steps = Math.round(-offset / ITEM_HEIGHT);
+  dragOffset[key] = 0;
+  interactionMode[key] = null;
+  if (steps !== 0) selectIndex(key, (activeIndex[key] ?? 0) + steps);
+};
+
+const isItemSelected = (key, val) => {
+  if (key === HOUR_12) return convertTo12Hour(selectedTime.hour) === val;
+  if (key === PERIOD) return period.value === val;
+  return selectedTime[key] === val;
+};
+
+const isColumnHidden = key => key === PERIOD && !showPeriod.value;
+
+const onWheelScroll = (key, event) => {
+  event.preventDefault();
+  interactionMode[key] = 'wheel';
+  dragOffset[key] = clampDragOffset(key, (dragOffset[key] ?? 0) - event.deltaY);
+  clearTimeout(snapTimers[key]);
+  snapTimers[key] = setTimeout(() => snapToNearest(key), SNAP_DELAY);
+};
+
+const onTouchStart = (key, event) => {
+  interactionMode[key] = 'touch';
+  touchStartY[key] = event.touches[0].clientY;
+  dragOffset[key] = 0;
+};
+
+const onTouchMove = (key, event) => {
+  event.preventDefault();
+  dragOffset[key] = clampDragOffset(
+    key,
+    event.touches[0].clientY - touchStartY[key]
+  );
+};
+
+const onTouchEnd = key => snapToNearest(key);
+
+const visibleColumnKeys = computed(() =>
+  columns.value.filter(col => !isColumnHidden(col.key)).map(col => col.key)
+);
+
+const onKeyDown = (key, event) => {
+  const { key: pressed, shiftKey } = event;
+  if (pressed === 'ArrowUp' || pressed === 'ArrowDown') {
+    event.preventDefault();
+    selectIndex(
+      key,
+      (activeIndex[key] ?? 0) + (pressed === 'ArrowDown' ? 1 : -1)
+    );
+    return;
+  }
+  if (pressed === 'Tab') {
+    const keys = visibleColumnKeys.value;
+    const next = keys.indexOf(key) + (shiftKey ? -1 : 1);
+    if (next >= 0 && next < keys.length) {
+      event.preventDefault();
+      columnRefs[keys[next]]?.focus();
+    }
+  }
+};
+
+const syncAllColumns = () => {
+  columns.value.forEach(col => {
+    activeIndex[col.key] = getActiveIndex(col.key);
+  });
+};
+
+const formatTabs = [
+  { label: t('DATE_PICKER.FORMAT_24H'), value: H24 },
+  { label: t('DATE_PICKER.FORMAT_12H'), value: H12 },
+];
+const activeFormatTab = computed(() => (is24HourFormat.value ? 0 : 1));
+
+const onFormatChange = tab => {
+  is24HourFormat.value = tab.value === H24;
+  syncAllColumns();
+};
+
+watch(model, v => {
+  selectedTime.hour = v.hour;
+  selectedTime.minute = v.minute;
+  selectedTime.second = v.second ?? 0;
+  syncAllColumns();
+});
+
+onMounted(syncAllColumns);
+</script>
+
+<template>
+  <div class="relative flex flex-col items-center py-2 w-full">
+    <div class="mb-4">
+      <TabBar
+        :tabs="formatTabs"
+        :initial-active-tab="activeFormatTab"
+        @tab-changed="onFormatChange"
+      />
+    </div>
+    <div class="flex items-center z-[1] mb-1">
+      <template v-for="(col, colIdx) in columns" :key="`label-${col.key}`">
+        <span
+          class="text-center text-xs font-medium text-n-slate-11 transition-all duration-300 ease-in-out overflow-hidden"
+          :class="
+            isColumnHidden(col.key) ? 'w-0 opacity-0' : 'w-14 opacity-100'
+          "
+        >
+          {{ col.label }}
+        </span>
+        <span
+          v-if="colIdx < columns.length - 1"
+          class="text-lg font-520 text-transparent transition-all duration-300 ease-in-out overflow-hidden"
+          :class="
+            isColumnHidden(columns[colIdx + 1]?.key)
+              ? 'w-0 opacity-0'
+              : 'opacity-100'
+          "
+        >
+          {{ SEPARATOR }}
+        </span>
+      </template>
+    </div>
+    <div class="relative w-full">
+      <div
+        class="absolute inset-x-6 h-10 rounded-2xl bg-n-solid-active outline outline-1 -outline-offset-1 outline-n-weak pointer-events-none shadow-inner"
+        :style="{ top: `${CENTER_ROW * ITEM_HEIGHT}px` }"
+      />
+      <div class="flex items-center justify-center z-[1] relative">
+        <template v-for="(col, colIdx) in columns" :key="col.key">
+          <div
+            :ref="
+              el => {
+                if (el) columnRefs[col.key] = el;
+              }
+            "
+            :tabindex="isColumnHidden(col.key) ? -1 : 0"
+            class="time-wheel relative overflow-hidden transition-all duration-300 ease-in-out outline-none"
+            :class="
+              isColumnHidden(col.key) ? 'w-0 opacity-0' : 'w-14 opacity-100'
+            "
+            :style="{ height: `${VISIBLE_ROWS * ITEM_HEIGHT}px` }"
+            @wheel.prevent="onWheelScroll(col.key, $event)"
+            @touchstart="onTouchStart(col.key, $event)"
+            @touchmove.prevent="onTouchMove(col.key, $event)"
+            @touchend="onTouchEnd(col.key)"
+            @keydown="onKeyDown(col.key, $event)"
+            @focus="focusedColumn = col.key"
+            @blur="focusedColumn = null"
+          >
+            <div
+              class="flex flex-col items-center"
+              :class="{
+                'transition-transform duration-200 ease-out':
+                  !interactionMode[col.key],
+                'transition-transform duration-100 ease-out':
+                  interactionMode[col.key] === 'wheel',
+              }"
+              :style="{
+                transform: `translateY(${getColumnTranslateY(col.key)}px)`,
+              }"
+            >
+              <button
+                v-for="item in col.items"
+                :key="item.value"
+                :disabled="item.disabled"
+                tabindex="-1"
+                class="flex items-center justify-center w-14 shrink-0 text-base font-semibold transition-colors outline-none"
+                :style="{ height: `${ITEM_HEIGHT}px` }"
+                :class="[
+                  isItemSelected(col.key, item.value)
+                    ? 'text-n-slate-12'
+                    : 'text-n-slate-9',
+                  item.disabled
+                    ? 'opacity-20 cursor-not-allowed'
+                    : 'cursor-pointer',
+                  isItemSelected(col.key, item.value) &&
+                  focusedColumn === col.key
+                    ? 'outline outline-1 outline-n-brand -outline-offset-4 rounded-xl'
+                    : '',
+                ]"
+                @click="selectByValue(col.key, item.value)"
+              >
+                {{ item.label }}
+              </button>
+            </div>
+          </div>
+          <span
+            v-if="colIdx < columns.length - 1 && col.key !== SECOND"
+            class="text-lg font-520 text-n-slate-11"
+          >
+            {{ SEPARATOR }}
+          </span>
+        </template>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.time-wheel {
+  mask-image: linear-gradient(
+    to bottom,
+    transparent 0%,
+    rgba(0, 0, 0, 0.3) 15%,
+    rgba(0, 0, 0, 0.7) 30%,
+    black 40%,
+    black 60%,
+    rgba(0, 0, 0, 0.7) 70%,
+    rgba(0, 0, 0, 0.3) 85%,
+    transparent 100%
+  );
+  -webkit-mask-image: linear-gradient(
+    to bottom,
+    transparent 0%,
+    rgba(0, 0, 0, 0.3) 15%,
+    rgba(0, 0, 0, 0.7) 30%,
+    black 40%,
+    black 60%,
+    rgba(0, 0, 0, 0.7) 70%,
+    rgba(0, 0, 0, 0.3) 85%,
+    transparent 100%
+  );
+}
+</style>

app/javascript/dashboard/components-next/DatePicker/helpers/DatePickerHelper.js

@@ -81,6 +81,24 @@ export const CALENDAR_PERIODS = {
   YEAR: 'year',
 };
 
+export const TIME_COLUMNS = {
+  HOUR: 'hour',
+  HOUR_12: 'hour12',
+  MINUTE: 'minute',
+  SECOND: 'second',
+  PERIOD: 'period',
+};
+
+export const TIME_PERIODS = {
+  AM: 'AM',
+  PM: 'PM',
+};
+
+export const TIME_FORMATS = {
+  H24: '24h',
+  H12: '12h',
+};
+
 // Utility functions for date operations
 export const monthName = currentDate => format(currentDate, 'MMMM');
 export const yearName = currentDate => format(currentDate, 'yyyy');

app/javascript/dashboard/components-next/Editor/Editor.vue

@@ -28,7 +28,7 @@ const props = defineProps({
   medium: { type: String, default: '' },
 });
 
-const emit = defineEmits(['update:modelValue', 'executeCopilotAction']);
+const emit = defineEmits(['update:modelValue']);
 
 const slots = useSlots();
 
@@ -113,9 +113,6 @@ watch(
         @input="handleInput"
         @focus="handleFocus"
         @blur="handleBlur"
-        @execute-copilot-action="
-          (...args) => emit('executeCopilotAction', ...args)
-        "
       />
       <div
         v-if="showCharacterCount || slots.actions"

app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleList.vue

@@ -58,22 +58,18 @@ const openArticle = id => {
   }
 };
 
-const onReorder = async reorderedGroup => {
-  try {
-    await store.dispatch('articles/reorder', {
-      reorderedGroup,
-      portalSlug: route.params.portalSlug,
-    });
-  } catch {
-    useAlert(t('HELP_CENTER.REORDER_ARTICLE.API.ERROR_MESSAGE'));
-  }
+const onReorder = reorderedGroup => {
+  store.dispatch('articles/reorder', {
+    reorderedGroup,
+    portalSlug: route.params.portalSlug,
+  });
 };
 
 const onDragEnd = () => {
-  // Collect and sort existing positions, falling back to index+1 for null/0 values
+  // Reuse existing positions to maintain order within the current group
   const sortedArticlePositions = localArticles.value
-    .map((article, index) => article.position || index + 1)
-    .sort((a, b) => a - b);
+    .map(article => article.position)
+    .sort((a, b) => a - b); // Use custom sort to handle numeric values correctly
 
   const orderedArticles = localArticles.value.map(article => article.id);
 

app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoriesPage.vue

@@ -98,17 +98,6 @@ const handleAction = ({ action, id, category: categoryData }) => {
     deleteCategory(categoryData);
   }
 };
-
-const reorderCategories = async reorderedGroup => {
-  try {
-    await store.dispatch('categories/reorder', {
-      portalSlug: route.params.portalSlug,
-      reorderedGroup,
-    });
-  } catch {
-    useAlert(t('HELP_CENTER.REORDER_CATEGORY.API.ERROR_MESSAGE'));
-  }
-};
 </script>
 
 <template>
@@ -133,7 +122,6 @@ const reorderCategories = async reorderedGroup => {
         :categories="categories"
         @click="openCategoryArticles"
         @action="handleAction"
-        @reorder="reorderCategories"
       />
       <CategoryEmptyState
         v-else

app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue

@@ -1,22 +1,14 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
-import Draggable from 'vuedraggable';
 import CategoryCard from 'dashboard/components-next/HelpCenter/CategoryCard/CategoryCard.vue';
 
-const props = defineProps({
+defineProps({
   categories: {
     type: Array,
     required: true,
   },
 });
 
-const emit = defineEmits(['click', 'action', 'reorder']);
-
-const localCategories = ref(props.categories);
-
-const dragEnabled = computed(() => {
-  return localCategories.value?.length > 1;
-});
+const emit = defineEmits(['click', 'action']);
 
 const handleClick = slug => {
   emit('click', slug);
@@ -25,57 +17,21 @@ const handleClick = slug => {
 const handleAction = ({ action, value, id }, category) => {
   emit('action', { action, value, id, category });
 };
-
-const onDragEnd = () => {
-  // Collect and sort existing positions, falling back to index+1 for null/0 values
-  const sortedPositions = localCategories.value
-    .map((category, index) => category.position || index + 1)
-    .sort((a, b) => a - b);
-
-  const reorderedGroup = localCategories.value.reduce(
-    (obj, category, index) => {
-      obj[category.id] = sortedPositions[index];
-      return obj;
-    },
-    {}
-  );
-
-  emit('reorder', reorderedGroup);
-};
-
-watch(
-  () => props.categories,
-  newCategories => {
-    localCategories.value = newCategories;
-  },
-  { deep: true }
-);
 </script>
 
 <template>
-  <Draggable
-    v-model="localCategories"
-    :disabled="!dragEnabled"
-    item-key="id"
-    tag="ul"
-    role="list"
-    class="grid w-full h-full grid-cols-1 gap-4 md:grid-cols-2"
-    @end="onDragEnd"
-  >
-    <template #item="{ element }">
-      <li class="list-none">
-        <CategoryCard
-          :id="element.id"
-          :title="element.name"
-          :icon="element.icon"
-          :description="element.description"
-          :articles-count="element.meta?.articles_count || 0"
-          :slug="element.slug"
-          :class="{ 'cursor-grab': dragEnabled }"
-          @click="handleClick(element.slug)"
-          @action="handleAction($event, element)"
-        />
-      </li>
-    </template>
-  </Draggable>
+  <ul role="list" class="grid w-full h-full grid-cols-1 gap-4 md:grid-cols-2">
+    <CategoryCard
+      v-for="category in categories"
+      :id="category.id"
+      :key="category.id"
+      :title="category.name"
+      :icon="category.icon"
+      :description="category.description"
+      :articles-count="category.meta.articles_count || 0"
+      :slug="category.slug"
+      @click="handleClick(category.slug)"
+      @action="handleAction($event, category)"
+    />
+  </ul>
 </template>

app/javascript/dashboard/components-next/NewConversation/ComposeConversation.vue

@@ -12,7 +12,7 @@ import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
 import { emitter } from 'shared/helpers/mitt';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import {
-  createContactSearcher,
+  searchContacts,
   createNewContact,
   fetchContactableInboxes,
   processContactableInboxes,
@@ -39,7 +39,6 @@ const props = defineProps({
 
 const emit = defineEmits(['close']);
 
-const searchContacts = createContactSearcher();
 const store = useStore();
 const { t } = useI18n();
 const { width: windowWidth } = useWindowSize();
@@ -108,17 +107,15 @@ const onContactSearch = debounce(
     isSearching.value = true;
     contacts.value = [];
     try {
-      const results = await searchContacts(query);
-      // null means the request was aborted (a newer search is in-flight),
-      if (results === null) return;
-      contacts.value = results;
+      contacts.value = await searchContacts(query);
       isSearching.value = false;
     } catch (error) {
-      isSearching.value = false;
       useAlert(t('COMPOSE_NEW_CONVERSATION.CONTACT_SEARCH.ERROR_MESSAGE'));
+    } finally {
+      isSearching.value = false;
     }
   },
-  400,
+  300,
   false
 );
 
@@ -141,7 +138,6 @@ const handleSelectedContact = async ({ value, action, ...rest }) => {
     contact = rest;
   }
   selectedContact.value = contact;
-  contacts.value = [];
   if (contact?.id) {
     isFetchingInboxes.value = true;
     try {
@@ -277,7 +273,7 @@ useKeyboardEvents(keyboardEvents);
       handleClickOutside,
       // Fixed and edge case https://github.com/chatwoot/chatwoot/issues/10785
       // This will prevent closing the compose conversation modal when the editor Create link popup is open
-      { ignore: ['dialog.ProseMirror-prompt-backdrop'] },
+      { ignore: ['div.ProseMirror-prompt'] },
     ]"
     class="relative"
     :class="{

app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue

@@ -15,9 +15,6 @@ import {
   prepareWhatsAppMessagePayload,
 } from 'dashboard/components-next/NewConversation/helpers/composeConversationHelper.js';
 
-import { useCopilotReply } from 'dashboard/composables/useCopilotReply';
-import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
-
 import ContactSelector from './ContactSelector.vue';
 import InboxSelector from './InboxSelector.vue';
 import EmailOptions from './EmailOptions.vue';
@@ -25,7 +22,6 @@ import MessageEditor from './MessageEditor.vue';
 import ActionButtons from './ActionButtons.vue';
 import InboxEmptyState from './InboxEmptyState.vue';
 import AttachmentPreviews from './AttachmentPreviews.vue';
-import CopilotReplyBottomPanel from 'dashboard/components/widgets/WootWriter/CopilotReplyBottomPanel.vue';
 
 const props = defineProps({
   contacts: { type: Array, default: () => [] },
@@ -46,7 +42,6 @@ const props = defineProps({
 
 const emit = defineEmits([
   'searchContacts',
-  'resetContactSearch',
   'discard',
   'updateSelectedContact',
   'updateTargetInbox',
@@ -56,8 +51,6 @@ const emit = defineEmits([
 
 const DEFAULT_FORMATTING = 'Context::Default';
 
-const copilot = useCopilotReply();
-
 const showContactsDropdown = ref(false);
 const showInboxesDropdown = ref(false);
 const showCcEmailsDropdown = ref(false);
@@ -164,7 +157,7 @@ const isAnyDropdownActive = computed(() => {
 });
 
 const handleContactSearch = value => {
-  showContactsDropdown.value = value.trim().length > 1;
+  showContactsDropdown.value = true;
   emit('searchContacts', value);
 };
 
@@ -179,16 +172,12 @@ const handleDropdownUpdate = (type, value) => {
 };
 
 const searchCcEmails = value => {
-  showBccEmailsDropdown.value = false;
-  emit('resetContactSearch');
-  showCcEmailsDropdown.value = value.trim().length >= 2;
+  showCcEmailsDropdown.value = true;
   emit('searchContacts', value);
 };
 
 const searchBccEmails = value => {
-  showCcEmailsDropdown.value = false;
-  emit('resetContactSearch');
-  showBccEmailsDropdown.value = value.trim().length >= 2;
+  showBccEmailsDropdown.value = true;
   emit('searchContacts', value);
 };
 
@@ -207,7 +196,6 @@ const stripMessageFormatting = channelType => {
 
 const handleInboxAction = ({ value, action, channelType, medium, ...rest }) => {
   v$.value.$reset();
-  copilot.reset(false);
 
   // Strip unsupported formatting when changing the target inbox
   if (channelType) {
@@ -234,7 +222,6 @@ const removeSignatureFromMessage = () => {
 
 const removeTargetInbox = value => {
   v$.value.$reset();
-  copilot.reset(false);
   removeSignatureFromMessage();
 
   stripMessageFormatting(DEFAULT_FORMATTING);
@@ -244,7 +231,6 @@ const removeTargetInbox = value => {
 };
 
 const clearSelectedContact = () => {
-  copilot.reset(false);
   removeSignatureFromMessage();
   emit('clearSelectedContact');
   state.message = '';
@@ -276,7 +262,6 @@ const handleAttachFile = files => {
 };
 
 const clearForm = () => {
-  copilot.reset(false);
   Object.assign(state, {
     message: '',
     subject: '',
@@ -339,24 +324,6 @@ const shouldShowMessageEditor = computed(() => {
     !inboxTypes.value.isTwilioWhatsapp
   );
 });
-
-const isCopilotActive = computed(() => copilot.isActive?.value ?? false);
-
-const onSubmitCopilotReply = () => {
-  const acceptedMessage = copilot.accept();
-  state.message = acceptedMessage;
-};
-
-useKeyboardEvents({
-  '$mod+Enter': {
-    action: () => {
-      if (isCopilotActive.value && !copilot.isButtonDisabled.value) {
-        onSubmitCopilotReply();
-      }
-    },
-    allowOnFocusedInput: true,
-  },
-});
 </script>
 
 <template>
@@ -387,7 +354,6 @@ useKeyboardEvents({
         :show-inboxes-dropdown="showInboxesDropdown"
         :contactable-inboxes-list="contactableInboxesList"
         :has-errors="validationStates.isInboxInvalid"
-        :is-fetching-inboxes="isFetchingInboxes"
         @update-inbox="removeTargetInbox"
         @toggle-dropdown="showInboxesDropdown = $event"
         @handle-inbox-action="handleInboxAction"
@@ -416,7 +382,6 @@ useKeyboardEvents({
         :has-errors="validationStates.isMessageInvalid"
         :channel-type="inboxChannelType"
         :medium="targetInbox?.medium || ''"
-        :copilot="copilot"
       />
 
       <AttachmentPreviews
@@ -426,15 +391,7 @@ useKeyboardEvents({
       />
     </div>
 
-    <CopilotReplyBottomPanel
-      v-if="isCopilotActive"
-      :is-generating-content="copilot.isButtonDisabled.value"
-      class="h-[3.25rem] !px-4 !py-2"
-      @submit="onSubmitCopilotReply"
-      @cancel="copilot.reset"
-    />
     <ActionButtons
-      v-else
       :attached-files="state.attachedFiles"
       :is-whatsapp-inbox="inboxTypes.isWhatsapp"
       :is-email-or-web-widget-inbox="inboxTypes.isEmailOrWebWidget"

app/javascript/dashboard/components-next/NewConversation/components/EmailOptions.vue

@@ -99,6 +99,7 @@ const inputClass = computed(() => {
           type="email"
           allow-create
           class="flex-1 min-h-7"
+          @focus="emit('updateDropdown', 'cc', true)"
           @input="emit('searchCcEmails', $event)"
           @on-click-outside="emit('updateDropdown', 'cc', false)"
           @update:model-value="handleCcUpdate"
@@ -132,6 +133,7 @@ const inputClass = computed(() => {
         allow-create
         class="flex-1 min-h-7"
         focus-on-mount
+        @focus="emit('updateDropdown', 'bcc', true)"
         @input="emit('searchBccEmails', $event)"
         @on-click-outside="emit('updateDropdown', 'bcc', false)"
         @update:model-value="handleBccUpdate"

app/javascript/dashboard/components-next/NewConversation/components/InboxEmptyState.vue

@@ -1,15 +1,9 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-
-const { t } = useI18n();
-</script>
-
 <template>
   <div
     class="flex items-center w-full px-4 py-3 dark:bg-n-amber-11/15 bg-n-amber-3"
   >
     <span class="text-sm dark:text-n-amber-11 text-n-amber-11">
-      {{ t('COMPOSE_NEW_CONVERSATION.FORM.NO_INBOX_ALERT') }}
+      {{ $t('COMPOSE_NEW_CONVERSATION.FORM.NO_INBOX_ALERT') }}
     </span>
   </div>
 </template>

app/javascript/dashboard/components-next/NewConversation/components/InboxSelector.vue

@@ -6,7 +6,6 @@ import { generateLabelForContactableInboxesList } from 'dashboard/components-nex
 
 import Button from 'dashboard/components-next/button/Button.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
-import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 
 const props = defineProps({
   targetInbox: {
@@ -29,10 +28,6 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  isFetchingInboxes: {
-    type: Boolean,
-    default: false,
-  },
 });
 
 const emit = defineEmits([
@@ -76,9 +71,7 @@ const targetInboxLabel = computed(() => {
       v-on-click-outside="() => emit('toggleDropdown', false)"
       class="relative flex items-center h-7"
     >
-      <Spinner v-if="isFetchingInboxes" :size="16" />
       <Button
-        v-else
         :label="t('COMPOSE_NEW_CONVERSATION.FORM.INBOX_SELECTOR.BUTTON')"
         variant="link"
         size="sm"

app/javascript/dashboard/components-next/NewConversation/components/MessageEditor.vue

@@ -3,7 +3,6 @@ import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import Editor from 'dashboard/components-next/Editor/Editor.vue';
-import CopilotEditorSection from 'dashboard/components/widgets/conversation/CopilotEditorSection.vue';
 
 const props = defineProps({
   hasErrors: { type: Boolean, default: false },
@@ -11,7 +10,6 @@ const props = defineProps({
   messageSignature: { type: String, default: '' },
   channelType: { type: String, default: '' },
   medium: { type: String, default: '' },
-  copilot: { type: Object, default: null },
 });
 
 const editorKey = computed(() => `editor-${props.channelType}-${props.medium}`);
@@ -22,67 +20,29 @@ const modelValue = defineModel({
   type: String,
   default: '',
 });
-
-const isCopilotActive = computed(() => props.copilot?.isActive?.value ?? false);
-
-const executeCopilotAction = (action, data) => {
-  if (props.copilot) {
-    props.copilot.execute(action, data);
-  }
-};
 </script>
 
 <template>
-  <div class="flex-1 h-full px-4 py-4">
-    <Transition
-      mode="out-in"
-      enter-active-class="transition-all duration-300 ease-out"
-      enter-from-class="opacity-0 translate-y-2 scale-[0.98]"
-      enter-to-class="opacity-100 translate-y-0 scale-100"
-      leave-active-class="transition-all duration-200 ease-in"
-      leave-from-class="opacity-100 translate-y-0 scale-100"
-      leave-to-class="opacity-0 translate-y-2 scale-[0.98]"
-    >
-      <div
-        :key="copilot ? copilot.editorTransitionKey.value : 'rich'"
-        class="h-full"
-      >
-        <CopilotEditorSection
-          v-if="isCopilotActive"
-          :show-copilot-editor="copilot.showEditor.value"
-          :is-generating-content="copilot.isGenerating.value"
-          :generated-content="copilot.generatedContent.value"
-          class="!mb-0"
-          @focus="() => {}"
-          @blur="() => {}"
-          @clear-selection="() => {}"
-          @content-ready="copilot.setContentReady"
-          @send="copilot.sendFollowUp"
-        />
-        <Editor
-          v-else
-          v-model="modelValue"
-          :editor-key="editorKey"
-          :placeholder="
-            t('COMPOSE_NEW_CONVERSATION.FORM.MESSAGE_EDITOR.PLACEHOLDER')
-          "
-          class="[&>div]:!border-transparent [&>div]:px-0 [&>div]:py-0 [&>div]:!bg-transparent h-full [&_.ProseMirror-woot-style]:!max-h-[12.5rem] [&_.ProseMirror-woot-style]:!min-h-[12rem] [&_.ProseMirror-menubar]:!pt-0 [&_.mention--box]:-top-[7.5rem] [&_.mention--box]:bottom-[unset]"
-          :class="
-            hasErrors
-              ? '[&_.empty-node]:before:!text-n-ruby-9 [&_.empty-node]:dark:before:!text-n-ruby-9'
-              : ''
-          "
-          enable-variables
-          enable-captain-tools
-          :show-character-count="false"
-          :signature="messageSignature"
-          allow-signature
-          :send-with-signature="sendWithSignature"
-          :channel-type="channelType"
-          :medium="medium"
-          @execute-copilot-action="executeCopilotAction"
-        />
-      </div>
-    </Transition>
+  <div class="flex-1 h-full">
+    <Editor
+      v-model="modelValue"
+      :editor-key="editorKey"
+      :placeholder="
+        t('COMPOSE_NEW_CONVERSATION.FORM.MESSAGE_EDITOR.PLACEHOLDER')
+      "
+      class="[&>div]:!border-transparent [&>div]:px-4 [&>div]:py-4 [&>div]:!bg-transparent h-full [&_.ProseMirror-woot-style]:!max-h-[12.5rem] [&_.ProseMirror-woot-style]:!min-h-[10rem] [&_.ProseMirror-menubar]:!pt-0 [&_.mention--box]:-top-[7.5rem] [&_.mention--box]:bottom-[unset]"
+      :class="
+        hasErrors
+          ? '[&_.empty-node]:before:!text-n-ruby-9 [&_.empty-node]:dark:before:!text-n-ruby-9'
+          : ''
+      "
+      enable-variables
+      :show-character-count="false"
+      :signature="messageSignature"
+      allow-signature
+      :send-with-signature="sendWithSignature"
+      :channel-type="channelType"
+      :medium="medium"
+    />
   </div>
 </template>

app/javascript/dashboard/components-next/NewConversation/helpers/composeConversationHelper.js

@@ -177,42 +177,19 @@ export const prepareWhatsAppMessagePayload = ({
 };
 
 // API Calls
-const MIN_SEARCH_LENGTH = 2;
+export const searchContacts = async query => {
+  const trimmed = typeof query === 'string' ? query.trim() : '';
+  if (!trimmed) return [];
 
-export const createContactSearcher = () => {
-  let controller = null;
-
-  return async (query, { skipMinLength = false } = {}) => {
-    const trimmed = typeof query === 'string' ? query.trim() : '';
-
-    controller?.abort();
-
-    if (!trimmed || (!skipMinLength && trimmed.length < MIN_SEARCH_LENGTH))
-      return [];
-
-    controller = new AbortController();
-    const { signal } = controller;
-
-    try {
-      const {
-        data: { payload },
-      } = await ContactAPI.search(trimmed, 1, 'name', '', { signal });
-
-      const camelCasedPayload = camelcaseKeys(payload, { deep: true });
-      // Filter contacts that have either phone_number or email
-      const filteredPayload = camelCasedPayload?.filter(
-        contact => contact.phoneNumber || contact.email
-      );
-      return filteredPayload || [];
-    } catch (error) {
-      // Return null for aborted requests so callers can distinguish
-      // "request was cancelled" from "no results found"
-      if (error?.name === 'AbortError' || error?.name === 'CanceledError') {
-        return null;
-      }
-      throw error;
-    }
-  };
+  const {
+    data: { payload },
+  } = await ContactAPI.search(trimmed);
+  const camelCasedPayload = camelcaseKeys(payload, { deep: true });
+  // Filter contacts that have either phone_number or email
+  const filteredPayload = camelCasedPayload?.filter(
+    contact => contact.phoneNumber || contact.email
+  );
+  return filteredPayload || [];
 };
 
 export const createNewContact = async input => {

app/javascript/dashboard/components-next/NewConversation/helpers/specs/composeConversationHelper.spec.js

@@ -337,12 +337,7 @@ describe('composeConversationHelper', () => {
   });
 
   describe('API calls', () => {
-    describe('createContactSearcher', () => {
-      let searchContacts;
-      beforeEach(() => {
-        searchContacts = helpers.createContactSearcher();
-      });
-
+    describe('searchContacts', () => {
       it('searches contacts and returns camelCase results', async () => {
         const mockPayload = [
           {
@@ -358,7 +353,7 @@ describe('composeConversationHelper', () => {
           data: { payload: mockPayload },
         });
 
-        const result = await searchContacts('john');
+        const result = await helpers.searchContacts('john');
 
         expect(result).toEqual([
           {
@@ -370,56 +365,7 @@ describe('composeConversationHelper', () => {
           },
         ]);
 
-        expect(ContactAPI.search).toHaveBeenCalledWith(
-          'john',
-          1,
-          'name',
-          '',
-          expect.objectContaining({ signal: expect.any(AbortSignal) })
-        );
-      });
-
-      it('returns empty array for queries shorter than 2 characters', async () => {
-        const result = await searchContacts('j');
-        expect(result).toEqual([]);
-        expect(ContactAPI.search).not.toHaveBeenCalled();
-      });
-
-      it('returns empty array for empty or whitespace-only queries', async () => {
-        expect(await searchContacts('')).toEqual([]);
-        expect(await searchContacts('  ')).toEqual([]);
-        expect(await searchContacts(null)).toEqual([]);
-        expect(ContactAPI.search).not.toHaveBeenCalled();
-      });
-
-      it('aborts previous in-flight request when a new search starts', async () => {
-        const mockPayload = [
-          { id: 1, name: 'Result', email: 'r@test.com', phone_number: null },
-        ];
-
-        let resolveFirst;
-        const firstCall = new Promise(resolve => {
-          resolveFirst = resolve;
-        });
-        ContactAPI.search
-          .mockReturnValueOnce(firstCall)
-          .mockResolvedValueOnce({ data: { payload: mockPayload } });
-
-        // Start first search (will hang)
-        const first = searchContacts('alpha');
-        // Start second search (aborts first)
-        const second = searchContacts('beta');
-
-        // Resolve the first call with CanceledError (simulating axios abort)
-        const canceledError = new Error('canceled');
-        canceledError.name = 'CanceledError';
-        resolveFirst(Promise.reject(canceledError));
-
-        const [firstResult, secondResult] = await Promise.all([first, second]);
-        expect(firstResult).toBeNull();
-        expect(secondResult).toEqual([
-          { id: 1, name: 'Result', email: 'r@test.com', phoneNumber: null },
-        ]);
+        expect(ContactAPI.search).toHaveBeenCalledWith('john');
       });
 
       it('searches contacts and returns only contacts with email or phone number', async () => {
@@ -451,7 +397,7 @@ describe('composeConversationHelper', () => {
           data: { payload: mockPayload },
         });
 
-        const result = await searchContacts('john');
+        const result = await helpers.searchContacts('john');
 
         // Should only return contacts with either email or phone number
         expect(result).toEqual([
@@ -471,13 +417,7 @@ describe('composeConversationHelper', () => {
           },
         ]);
 
-        expect(ContactAPI.search).toHaveBeenCalledWith(
-          'john',
-          1,
-          'name',
-          '',
-          expect.objectContaining({ signal: expect.any(AbortSignal) })
-        );
+        expect(ContactAPI.search).toHaveBeenCalledWith('john');
       });
 
       it('handles empty search results', async () => {
@@ -485,7 +425,7 @@ describe('composeConversationHelper', () => {
           data: { payload: [] },
         });
 
-        const result = await searchContacts('nonexistent');
+        const result = await helpers.searchContacts('nonexistent');
         expect(result).toEqual([]);
       });
 
@@ -512,7 +452,7 @@ describe('composeConversationHelper', () => {
           data: { payload: mockPayload },
         });
 
-        const result = await searchContacts('test');
+        const result = await helpers.searchContacts('test');
 
         expect(result).toEqual([
           {
@@ -534,36 +474,6 @@ describe('composeConversationHelper', () => {
       });
     });
 
-    describe('createContactSearcher isolation', () => {
-      it('creates isolated searcher instances that do not cancel each other', async () => {
-        const searcherA = helpers.createContactSearcher();
-        const searcherB = helpers.createContactSearcher();
-
-        const payloadA = [
-          { id: 1, name: 'Alice', email: 'a@test.com', phone_number: null },
-        ];
-        const payloadB = [
-          { id: 2, name: 'Bob', email: 'b@test.com', phone_number: null },
-        ];
-
-        ContactAPI.search
-          .mockResolvedValueOnce({ data: { payload: payloadA } })
-          .mockResolvedValueOnce({ data: { payload: payloadB } });
-
-        const [resultA, resultB] = await Promise.all([
-          searcherA('alice'),
-          searcherB('bob'),
-        ]);
-
-        expect(resultA).toEqual([
-          { id: 1, name: 'Alice', email: 'a@test.com', phoneNumber: null },
-        ]);
-        expect(resultB).toEqual([
-          { id: 2, name: 'Bob', email: 'b@test.com', phoneNumber: null },
-        ]);
-      });
-    });
-
     describe('createNewContact', () => {
       it('creates new contact with capitalized name', async () => {
         const mockContact = { id: 1, name: 'John', email: 'john@example.com' };

app/javascript/dashboard/components-next/dialog/Dialog.vue

@@ -96,17 +96,6 @@ const close = () => {
   isOpen.value = false;
 };
 
-// Only close if the close event originated from this dialog,
-// not from a child dialog (e.g. ProseMirror prompt) bubbling up.
-const handleDialogClose = e => e.target === dialogRef.value && close();
-
-// Only close on click-outside if this dialog is the topmost one.
-// If another dialog (e.g. ProseMirror prompt) is open on top, ignore.
-const handleClickOutside = () => {
-  const dialogs = document.querySelectorAll('dialog[open]');
-  if (dialogs[dialogs.length - 1] === dialogRef.value) close();
-};
-
 const confirm = () => {
   emit('confirm');
 };
@@ -118,15 +107,15 @@ defineExpose({ open, close });
   <TeleportWithDirection to="body">
     <dialog
       ref="dialogRef"
-      class="w-full transition-all duration-300 ease-in-out shadow-xl rounded-xl"
+      class="w-full transition-all duration-300 ease-in-out shadow-xl rounded-xl focus-within:outline-none focus-within:outline-0"
       :class="[
         maxWidthClass,
         positionClass,
         overflowYAuto ? 'overflow-y-auto' : 'overflow-visible',
       ]"
-      @close.prevent="handleDialogClose"
+      @close="close"
     >
-      <OnClickOutside @trigger="handleClickOutside">
+      <OnClickOutside @trigger="close">
         <form
           ref="dialogContentRef"
           class="flex flex-col w-full h-auto gap-6 p-6 overflow-visible text-start align-middle transition-all duration-300 ease-in-out transform bg-n-alpha-3 backdrop-blur-[100px] shadow-xl rounded-xl"

app/javascript/dashboard/components-next/message/MessageMeta.vue

@@ -81,7 +81,6 @@ const isDelivered = computed(() => {
     isATwilioChannel.value ||
     isASmsInbox.value ||
     isAFacebookInbox.value ||
-    isAnInstagramChannel.value ||
     isATiktokChannel.value
   ) {
     return sourceId.value && status.value === MESSAGE_STATUS.DELIVERED;

app/javascript/dashboard/components-next/taginput/TagInput.vue

@@ -72,7 +72,7 @@ const isNewTagInValidType = computed(() =>
 
 const showInput = computed(() =>
   props.mode === MODE.SINGLE
-    ? !tags.value.length
+    ? isFocused.value && !tags.value.length
     : isFocused.value || !tags.value.length
 );
 

app/javascript/dashboard/components/CustomSnoozeModal.vue

@@ -1,77 +1,53 @@
-<script>
-import DatePicker from 'vue-datepicker-next';
-import NextButton from 'dashboard/components-next/button/Button.vue';
+<script setup>
+import { ref } from 'vue';
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+import DatePicker from 'dashboard/components-next/DatePicker/DatePicker.vue';
 
-export default {
-  components: {
-    DatePicker,
-    NextButton,
-  },
-  emits: ['close', 'chooseTime'],
+const emit = defineEmits(['chooseTime', 'close']);
 
-  data() {
-    return {
-      snoozeTime: null,
-      lang: {
-        days: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-        yearFormat: 'YYYY',
-        monthFormat: 'MMMM',
-      },
-    };
-  },
+const dialogRef = ref(null);
+const datePickerRef = ref(null);
+const today = new Date();
 
-  methods: {
-    onClose() {
-      this.$emit('close');
-    },
-    chooseTime() {
-      this.$emit('chooseTime', this.snoozeTime);
-    },
-    disabledDate(date) {
-      // Disable all the previous dates
-      const yesterday = new Date();
-      yesterday.setDate(yesterday.getDate() - 1);
-      return date < yesterday;
-    },
-    disabledTime(date) {
-      // Allow only time after 1 hour
-      const now = new Date();
-      now.setHours(now.getHours() + 1);
-      return date < now;
-    },
-  },
+const onApply = dateTime => {
+  dialogRef.value?.close();
+  emit('chooseTime', dateTime);
 };
+
+const onClear = () => {
+  dialogRef.value?.close();
+};
+
+const onDialogClose = () => {
+  datePickerRef.value?.resetState();
+  emit('close');
+};
+
+const open = () => {
+  dialogRef.value?.open();
+};
+
+const close = () => {
+  dialogRef.value?.close();
+};
+
+defineExpose({ open, close });
 </script>
 
 <template>
-  <div class="flex flex-col">
-    <woot-modal-header :header-title="$t('CONVERSATION.CUSTOM_SNOOZE.TITLE')" />
-    <form
-      class="modal-content w-full pt-2 px-5 pb-6"
-      @submit.prevent="chooseTime"
-    >
-      <DatePicker
-        v-model:value="snoozeTime"
-        type="datetime"
-        inline
-        input-class="mx-input "
-        :lang="lang"
-        :disabled-date="disabledDate"
-        :disabled-time="disabledTime"
-      />
-      <div class="flex flex-row justify-end w-full gap-2 px-0 py-2">
-        <NextButton
-          faded
-          slate
-          type="reset"
-          :label="$t('CONVERSATION.CUSTOM_SNOOZE.CANCEL')"
-          @click.prevent="onClose"
-        />
-        <NextButton
-          type="submit"
-          :label="$t('CONVERSATION.CUSTOM_SNOOZE.APPLY')"
-        />
-      </div>
-    </form>
-  </div>
+  <Dialog
+    ref="dialogRef"
+    :title="$t('CONVERSATION.CUSTOM_SNOOZE.TITLE')"
+    :show-confirm-button="false"
+    :show-cancel-button="false"
+    width="2xl"
+    @close="onDialogClose"
+  >
+    <DatePicker
+      ref="datePickerRef"
+      :min-date="today"
+      @apply="onApply"
+      @clear="onClear"
+    />
+  </Dialog>
 </template>

app/javascript/dashboard/components/index.js

@@ -17,7 +17,6 @@ import Modal from './Modal.vue';
 import Spinner from 'shared/components/Spinner.vue';
 import Tabs from './ui/Tabs/Tabs.vue';
 import TabsItem from './ui/Tabs/TabsItem.vue';
-import DatePicker from './ui/DatePicker/DatePicker.vue';
 
 const WootUIKit = {
   Code,
@@ -37,7 +36,6 @@ const WootUIKit = {
   Spinner,
   Tabs,
   TabsItem,
-  DatePicker,
   install(Vue) {
     const keys = Object.keys(this);
     keys.pop(); // remove 'install' from keys

app/javascript/dashboard/components/ui/DateRangePicker.vue

@@ -1,41 +0,0 @@
-<script>
-import DatePicker from 'vue-datepicker-next';
-export default {
-  components: { DatePicker },
-  props: {
-    confirmText: {
-      type: String,
-      default: '',
-    },
-    placeholder: {
-      type: String,
-      default: '',
-    },
-    value: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  emits: ['change'],
-  methods: {
-    handleChange(value) {
-      this.$emit('change', value);
-    },
-  },
-};
-</script>
-
-<template>
-  <div class="date-picker">
-    <DatePicker
-      range
-      confirm
-      :clearable="false"
-      :editable="false"
-      :confirm-text="confirmText"
-      :placeholder="placeholder"
-      :value="value"
-      @change="handleChange"
-    />
-  </div>
-</template>

app/javascript/dashboard/components/ui/DateTimePicker.vue

@@ -1,48 +0,0 @@
-<script>
-import addDays from 'date-fns/addDays';
-import DatePicker from 'vue-datepicker-next';
-export default {
-  components: { DatePicker },
-  props: {
-    confirmText: {
-      type: String,
-      default: '',
-    },
-    placeholder: {
-      type: String,
-      default: '',
-    },
-    value: {
-      type: Date,
-      default: [],
-    },
-  },
-  emits: ['change'],
-
-  methods: {
-    handleChange(value) {
-      this.$emit('change', value);
-    },
-    disableBeforeToday(date) {
-      const yesterdayDate = addDays(new Date(), -1);
-      return date < yesterdayDate;
-    },
-  },
-};
-</script>
-
-<template>
-  <div class="date-picker">
-    <DatePicker
-      type="datetime"
-      confirm
-      :clearable="false"
-      :editable="false"
-      :confirm-text="confirmText"
-      :placeholder="placeholder"
-      :value="value"
-      :disabled-date="disableBeforeToday"
-      @change="handleChange"
-    />
-  </div>
-</template>

app/javascript/dashboard/components/widgets/WootWriter/CopilotMenuBar.vue

@@ -10,23 +10,11 @@ import DropdownBody from 'next/dropdown-menu/base/DropdownBody.vue';
 
 import Icon from 'next/icon/Icon.vue';
 
-const props = defineProps({
+defineProps({
   hasSelection: {
     type: Boolean,
     default: false,
   },
-  isEditorMenuPopover: {
-    type: Boolean,
-    default: false,
-  },
-  editorContent: {
-    type: String,
-    default: undefined,
-  },
-  conversationId: {
-    type: Number,
-    default: null,
-  },
 });
 
 const emit = defineEmits(['executeCopilotAction']);
@@ -37,13 +25,6 @@ const { draftMessage } = useCaptain();
 
 const replyMode = useMapGetter('draftMessages/getReplyEditorMode');
 
-// When editorContent prop is passed, use it exclusively (even if empty)
-// This ensures each editor instance shows menu items based on its own content
-// Falls back to global draftMessage only when editorContent is not provided
-const effectiveContent = computed(() =>
-  props.editorContent !== undefined ? props.editorContent : draftMessage.value
-);
-
 // Selection-based menu items (when text is selected)
 const menuItems = computed(() => {
   const items = [];
@@ -61,9 +42,8 @@ const menuItems = computed(() => {
       icon: 'i-fluent-pen-sparkle-24-regular',
     });
   } else if (
-    props.conversationId &&
     replyMode.value === REPLY_EDITOR_MODES.REPLY &&
-    effectiveContent.value
+    draftMessage.value
   ) {
     items.push({
       label: t('INTEGRATION_SETTINGS.OPEN_AI.REPLY_OPTIONS.IMPROVE_REPLY'),
@@ -72,7 +52,7 @@ const menuItems = computed(() => {
     });
   }
 
-  if (effectiveContent.value) {
+  if (draftMessage.value) {
     items.push(
       {
         label: t(
@@ -125,7 +105,7 @@ const menuItems = computed(() => {
 
 const generalMenuItems = computed(() => {
   const items = [];
-  if (props.conversationId && replyMode.value === REPLY_EDITOR_MODES.REPLY) {
+  if (replyMode.value === REPLY_EDITOR_MODES.REPLY) {
     items.push({
       label: t('INTEGRATION_SETTINGS.OPEN_AI.REPLY_OPTIONS.SUGGESTION'),
       key: 'reply_suggestion',
@@ -133,10 +113,7 @@ const generalMenuItems = computed(() => {
     });
   }
 
-  if (
-    props.conversationId &&
-    (replyMode.value === REPLY_EDITOR_MODES.NOTE || true)
-  ) {
+  if (replyMode.value === REPLY_EDITOR_MODES.NOTE || true) {
     items.push({
       label: t('INTEGRATION_SETTINGS.OPEN_AI.REPLY_OPTIONS.SUMMARIZE'),
       key: 'summarize',
@@ -199,8 +176,8 @@ const handleSubMenuItemClick = (parentItem, subItem) => {
   <DropdownBody
     ref="menuRef"
     class="min-w-56 [&>ul]:gap-3 z-50 [&>ul]:px-4 [&>ul]:py-3.5"
-    :class="{ 'selection-menu': hasSelection && isEditorMenuPopover }"
-    :style="hasSelection && isEditorMenuPopover ? selectionMenuStyle : {}"
+    :class="{ 'selection-menu': hasSelection }"
+    :style="hasSelection ? selectionMenuStyle : {}"
   >
     <div v-if="menuItems.length > 0" class="flex flex-col items-start gap-2.5">
       <div

app/javascript/dashboard/components/widgets/WootWriter/Editor.vue

@@ -202,11 +202,6 @@ const editorRoot = useTemplateRef('editorRoot');
 const imageUpload = useTemplateRef('imageUpload');
 const editor = useTemplateRef('editor');
 
-const isEditorMenuPopover = computed(
-  () =>
-    editorRoot.value?.classList.contains('popover-prosemirror-menu') ?? false
-);
-
 const handleCopilotAction = actionKey => {
   if (actionKey === 'improve_selection' && editorView?.state) {
     const { from, to } = editorView.state.selection;
@@ -216,7 +211,7 @@ const handleCopilotAction = actionKey => {
       emit('executeCopilotAction', 'improve', selectedText);
     }
   } else {
-    emit('executeCopilotAction', actionKey, props.modelValue);
+    emit('executeCopilotAction', actionKey);
   }
 
   showSelectionMenu.value = false;
@@ -489,7 +484,6 @@ function setToolbarPosition() {
 function setMenubarPosition({ selection } = {}) {
   const wrapper = editorRoot.value;
   if (!selection || !wrapper) return;
-  if (!isEditorMenuPopover.value) return;
 
   const rect = wrapper.getBoundingClientRect();
   const isRtl = getComputedStyle(wrapper).direction === 'rtl';
@@ -872,12 +866,8 @@ useEmitter(BUS_EVENTS.INSERT_INTO_RICH_EDITOR, insertContentIntoEditor);
       v-if="showSelectionMenu"
       v-on-click-outside="handleClickOutside"
       :has-selection="isTextSelected"
-      :is-editor-menu-popover="isEditorMenuPopover"
-      :editor-content="modelValue"
-      :conversation-id="conversationId"
       :show-selection-menu="showSelectionMenu"
       :show-general-menu="false"
-      class="copilot-editor-menu"
       @execute-copilot-action="handleCopilotAction"
     />
     <input
@@ -978,15 +968,11 @@ useEmitter(BUS_EVENTS.INSERT_INTO_RICH_EDITOR, insertContentIntoEditor);
   @apply overflow-auto min-h-[5rem] max-h-[7.5rem];
 }
 
-.ProseMirror-prompt-backdrop::backdrop {
-  @apply bg-n-alpha-black1 backdrop-blur-[4px];
-}
-
 .ProseMirror-prompt {
-  @apply bg-n-alpha-3 border border-n-strong p-6 shadow-xl rounded-xl w-96 !important;
+  @apply z-[9999] bg-n-alpha-3 backdrop-blur-[100px] border border-n-strong p-6 shadow-xl rounded-xl;
 
   h5 {
-    @apply text-n-slate-12 mb-3;
+    @apply text-n-slate-12 mb-1.5;
   }
 
   .ProseMirror-prompt-buttons {
@@ -1040,17 +1026,6 @@ useEmitter(BUS_EVENTS.INSERT_INTO_RICH_EDITOR, insertContentIntoEditor);
   @apply text-n-ruby-9 dark:text-n-ruby-9 font-normal text-sm pt-1 pb-0 px-0;
 }
 
-// Default copilot menu position (non-popover editors like components-next/Editor)
-// When popover-prosemirror-menu is NOT on the wrapper, anchor below the menubar
-:not(.popover-prosemirror-menu) > .copilot-editor-menu {
-  top: 1.5rem !important;
-
-  [dir='rtl'] & {
-    left: auto !important;
-    right: 0 !important;
-  }
-}
-
 // Float editor menu
 .popover-prosemirror-menu {
   position: relative;

app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue

@@ -326,4 +326,26 @@ export default {
   max-height: 7.5rem;
   overflow: auto;
 }
+
+.ProseMirror-prompt {
+  @apply z-[9999] bg-n-alpha-3 min-w-80 backdrop-blur-[100px] border border-n-strong p-6 shadow-xl rounded-xl;
+
+  h5 {
+    @apply text-n-slate-12 mb-1.5;
+  }
+
+  .ProseMirror-prompt-buttons {
+    button {
+      @apply h-8 px-3;
+
+      &[type='submit'] {
+        @apply bg-n-brand text-white hover:bg-n-brand/90;
+      }
+
+      &[type='button'] {
+        @apply bg-n-slate-9/10 text-n-slate-12 hover:bg-n-slate-9/20;
+      }
+    }
+  }
+}
 </style>

app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue

@@ -49,10 +49,6 @@ export default {
       type: Number,
       default: () => 0,
     },
-    editorContent: {
-      type: String,
-      default: undefined,
-    },
   },
   emits: ['setReplyMode', 'togglePopout', 'executeCopilotAction'],
   setup(props, { emit }) {
@@ -77,8 +73,8 @@ export default {
     const { captainTasksEnabled } = useCaptain();
     const showCopilotMenu = ref(false);
 
-    const handleCopilotAction = (actionKey, data) => {
-      emit('executeCopilotAction', actionKey, data || props.editorContent);
+    const handleCopilotAction = actionKey => {
+      emit('executeCopilotAction', actionKey);
       showCopilotMenu.value = false;
     };
 
@@ -178,8 +174,6 @@ export default {
           v-if="showCopilotMenu"
           v-on-click-outside="handleClickOutside"
           :has-selection="false"
-          :editor-content="editorContent"
-          :conversation-id="conversationId"
           class="ltr:right-0 rtl:left-0 bottom-full mb-2"
           @execute-copilot-action="handleCopilotAction"
         />

app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue

@@ -1245,7 +1245,6 @@ export default {
       :is-editor-disabled="isEditorDisabled"
       :is-message-length-reaching-threshold="isMessageLengthReachingThreshold"
       :characters-remaining="charactersRemaining"
-      :editor-content="message"
       :popout-reply-box="popOutReplyBox"
       @set-reply-mode="setReplyMode"
       @toggle-popout="togglePopout"

app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue

@@ -65,7 +65,6 @@ export default {
       showLabelActions: false,
       showTeamsList: false,
       popoverPositions: {},
-      showCustomTimeSnoozeModal: false,
     };
   },
   mounted() {
@@ -99,7 +98,7 @@ export default {
   methods: {
     onCmdSnoozeConversation(snoozeType) {
       if (snoozeType === wootConstants.SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME) {
-        this.showCustomTimeSnoozeModal = true;
+        this.$refs.snoozeModalRef?.open();
       } else if (typeof snoozeType === 'number') {
         this.updateConversations('snoozed', snoozeType);
       } else {
@@ -113,14 +112,10 @@ export default {
       this.updateConversations('resolved', null);
     },
     customSnoozeTime(customSnoozedTime) {
-      this.showCustomTimeSnoozeModal = false;
       if (customSnoozedTime) {
         this.updateConversations('snoozed', getUnixTime(customSnoozedTime));
       }
     },
-    hideCustomSnoozeModal() {
-      this.showCustomTimeSnoozeModal = false;
-    },
     selectAll(e) {
       this.$emit('selectAllConversations', e.target.checked);
     },
@@ -251,15 +246,7 @@ export default {
     <div v-if="allConversationsSelected" class="bulk-action__alert">
       {{ $t('BULK_ACTION.ALL_CONVERSATIONS_SELECTED_ALERT') }}
     </div>
-    <woot-modal
-      v-model:show="showCustomTimeSnoozeModal"
-      :on-close="hideCustomSnoozeModal"
-    >
-      <CustomSnoozeModal
-        @close="hideCustomSnoozeModal"
-        @choose-time="customSnoozeTime"
-      />
-    </woot-modal>
+    <CustomSnoozeModal ref="snoozeModalRef" @choose-time="customSnoozeTime" />
   </div>
 </template>
 

app/javascript/dashboard/helper/AnalyticsHelper/events.js

@@ -119,10 +119,6 @@ export const COPILOT_EVENTS = Object.freeze({
   USE_CAPTAIN_RESPONSE: 'Copilot: Used captain response',
 });
 
-export const SNOOZE_EVENTS = Object.freeze({
-  NLP_SNOOZE_APPLIED: 'Applied snooze via text-to-date input',
-});
-
 export const GENERAL_EVENTS = Object.freeze({
   COMMAND_BAR: 'Used commandbar',
 });

app/javascript/dashboard/helper/snoozeDateParser/localization.js

@@ -93,23 +93,12 @@ const EN_DEFAULTS = {
     TWENTY: 'twenty',
     THIRTY: 'thirty',
   },
-  ORDINALS: {
-    FIRST: 'first',
-    SECOND: 'second',
-    THIRD: 'third',
-    FOURTH: 'fourth',
-    FIFTH: 'fifth',
-  },
   MERIDIEM: { AM: 'am', PM: 'pm' },
   HALF: 'half',
   NEXT: 'next',
   THIS: 'this',
   AT: 'at',
   IN: 'in',
-  OF: 'of',
-  AFTER: 'after',
-  WEEK: 'week',
-  DAY: 'day',
   FROM_NOW: 'from now',
   NEXT_YEAR: 'next year',
 };
@@ -132,13 +121,6 @@ const STRUCTURAL_WORDS = [
   'eod',
   'am',
   'pm',
-  'week',
-  'day',
-  'first',
-  'second',
-  'third',
-  'fourth',
-  'fifth',
 ];
 
 const ENGLISH_VOCAB = new Set([
@@ -152,6 +134,8 @@ const ENGLISH_VOCAB = new Set([
   ...EN_MONTHS_LIST,
   ...STRUCTURAL_WORDS,
 ]);
+const ENGLISH_VOCAB_LIST = [...ENGLISH_VOCAB];
+const hasVocabPrefix = w => ENGLISH_VOCAB_LIST.some(v => v.startsWith(w));
 
 // ─── Regex for token replacement ────────────────────────────────────────────
 
@@ -177,7 +161,6 @@ const CACHE_SECTIONS = [
   'RELATIVE',
   'TIME_OF_DAY',
   'WORD_NUMBERS',
-  'ORDINALS',
   'MERIDIEM',
 ];
 const SINGLE_KEYS = [
@@ -186,10 +169,6 @@ const SINGLE_KEYS = [
   'THIS',
   'AT',
   'IN',
-  'OF',
-  'AFTER',
-  'WEEK',
-  'DAY',
   'FROM_NOW',
   'NEXT_YEAR',
 ];
@@ -362,32 +341,25 @@ export const generateDateSuggestions = (
       ? buildReplacementPairs(translations, locale)
       : [];
 
-  // Try English parse first, then translated parse if we have locale pairs.
-  // This avoids the problem where a single overlapping word (e.g. "in" in German)
-  // would skip token translation entirely.
+  // Try English first — if user types English in a non-English locale, skip translation
   const directParse = parseDateFromText(stripped, referenceDate);
+  const looksEnglish =
+    directParse ||
+    stripped
+      .split(/\s+/)
+      .filter(w => !/^\d/.test(w))
+      .some(w => ENGLISH_VOCAB.has(w) || (w.length >= 2 && hasVocabPrefix(w)));
+  const useEnglish = !pairs.length || looksEnglish;
 
-  const translated = pairs.length ? replaceTokens(normalized, pairs) : null;
-  const translatedParse =
-    translated && translated !== stripped
-      ? parseDateFromText(translated, referenceDate)
-      : null;
-
-  // Prefer direct English parse; fall back to translated parse
-  const useTranslated = !directParse && !!translatedParse;
-  const englishInput = useTranslated ? translated : stripped;
+  const englishInput = useEnglish ? stripped : replaceTokens(normalized, pairs);
 
   const seen = new Set();
   const results = [];
 
-  const exact = directParse || translatedParse;
+  const exact = directParse || parseDateFromText(englishInput, referenceDate);
   if (exact) {
     seen.add(exact.unix);
-    const exactLabel =
-      useTranslated && pairs.length
-        ? reverseTokens(englishInput, pairs)
-        : englishInput;
-    results.push({ label: exactLabel, query: englishInput, ...exact });
+    results.push({ label: normalized, query: englishInput, ...exact });
   }
 
   buildSuggestionCandidates(englishInput).some(candidate => {
@@ -396,7 +368,7 @@ export const generateDateSuggestions = (
     if (result && !seen.has(result.unix)) {
       seen.add(result.unix);
       const label =
-        useTranslated && pairs.length
+        !useEnglish && pairs.length
           ? reverseTokens(candidate, pairs)
           : candidate;
       results.push({ label, query: candidate, ...result });

app/javascript/dashboard/helper/snoozeDateParser/parser.js

@@ -59,25 +59,6 @@ const UNIT_RE = `(${UNIT_NAMES})`;
 const TIME_SUFFIX_RE =
   '(?:\\s+(?:at\\s+)?(\\d{1,2}(?::\\d{2})?\\s*(?:am|pm|a\\.m\\.?|p\\.m\\.?)?|\\d{1,2}:\\d{2}))?';
 
-const ORDINAL_MAP = {
-  first: 1,
-  second: 2,
-  third: 3,
-  fourth: 4,
-  fifth: 5,
-  sixth: 6,
-  seventh: 7,
-  eighth: 8,
-  ninth: 9,
-  tenth: 10,
-};
-const parseOrdinal = str => {
-  if (ORDINAL_MAP[str]) return ORDINAL_MAP[str];
-  return parseInt(str.replace(/(?:st|nd|rd|th)$/, ''), 10) || null;
-};
-const ORDINAL_WORDS = Object.keys(ORDINAL_MAP).join('|');
-const ORDINAL_RE = `(\\d{1,2}(?:st|nd|rd|th)?|${ORDINAL_WORDS})`;
-
 // ─── Pre-compiled Regexes ───────────────────────────────────────────────────
 
 const HALF_UNIT_RE = /^(?:in\s+)?half\s+(?:an?\s+)?(hour|day|week|month|year)$/;
@@ -98,7 +79,7 @@ const RELATIVE_DAY_AT_TIME_RE = new RegExp(
     '(?:am|pm|a\\.m\\.?|p\\.m\\.?)?|\\d{1,2}:\\d{2})$'
 );
 const RELATIVE_DAY_SAME_TIME_RE = new RegExp(
-  `^(?:(${RELATIVE_DAYS})\\s+(?:same\\s+time|this\\s+time)|(?:same\\s+time|this\\s+time)\\s+(${RELATIVE_DAYS}))$`
+  `^(${RELATIVE_DAYS})\\s+(?:same\\s+time|this\\s+time)$`
 );
 const NEXT_UNIT_RE = new RegExp(
   `^next\\s+(hour|minute|week|month|year)${TIME_SUFFIX_RE}$`
@@ -147,10 +128,6 @@ const ABSOLUTE_DATE_REVERSED_RE = new RegExp(
     `(?:[,\\s]+(\\d{4}|next\\s+year))?${TIME_SUFFIX_RE}$`
 );
 const MONTH_YEAR_RE = new RegExp(`^(${MONTH_NAMES})\\s+(\\d{4})$`);
-// "april first week", "first week of april", "march 2nd day", "5th day of jan"
-const MONTH_ORDINAL_RE = new RegExp(
-  `^(?:(${MONTH_NAMES})\\s+${ORDINAL_RE}\\s+(week|day)|${ORDINAL_RE}\\s+(week|day)\\s+of\\s+(${MONTH_NAMES}))${TIME_SUFFIX_RE}$`
-);
 const DAY_AFTER_TOMORROW_RE = new RegExp(
   `^day\\s+after\\s+tomorrow${TIME_SUFFIX_RE}$`
 );
@@ -163,17 +140,7 @@ const DURATION_AT_TIME_RE = new RegExp(
     '(\\d{1,2}(?::\\d{2})?\\s*(?:am|pm|a\\.m\\.?|p\\.m\\.?)?)$'
 );
 const END_OF_RE = /^end\s+of\s+(?:the\s+)?(week|month|day)$/;
-const END_OF_NEXT_RE = /^end\s+of\s+(?:the\s+)?next\s+(week|month)$/;
-const START_OF_NEXT_RE =
-  /^(?:beginning|start)\s+of\s+(?:the\s+)?next\s+(week|month)$/;
 const LATER_TODAY_RE = /^later\s+(?:today|this\s+(?:afternoon|evening))$/;
-const EARLY_LATE_TOD_RE = new RegExp(
-  `^(early|late)\\s+(${TIME_OF_DAY_NAMES})$`
-);
-const ONE_AND_HALF_RE = new RegExp(
-  `^(?:in\\s+)?(?:one\\s+and\\s+(?:a\\s+)?half|an?\\s+hour\\s+and\\s+(?:a\\s+)?half)(?:\\s+${UNIT_RE})?$`
-);
-const NEXT_BUSINESS_DAY_RE = /^next\s+(?:business|working)\s+day$/;
 
 const TIME_SUFFIX_COMPILED = new RegExp(`${TIME_SUFFIX_RE}$`);
 const ISO_DATE_RE = new RegExp(
@@ -188,6 +155,7 @@ const DASH_DATE_RE = new RegExp(
 const DOT_DATE_RE = new RegExp(
   `^(\\d{1,2})\\.(\\d{1,2})\\.(\\d{4})${TIME_SUFFIX_COMPILED.source}`
 );
+const AMBIGUOUS_DATE_RES = [SLASH_DATE_RE, DASH_DATE_RE, DOT_DATE_RE];
 
 // ─── Pattern Matchers ───────────────────────────────────────────────────────
 
@@ -209,13 +177,6 @@ const matchDuration = (text, now) => {
       : null;
   }
 
-  // "one and a half hours", "an hour and a half"
-  const oneHalf = text.match(ONE_AND_HALF_RE);
-  if (oneHalf) {
-    const unit = UNIT_MAP[oneHalf[1]] || 'hours';
-    return addFractionalSafe(now, unit, 1.5);
-  }
-
   const compound = text.match(COMPOUND_DURATION_RE);
   if (compound) {
     const a1 = parseNumber(compound[1]);
@@ -321,7 +282,7 @@ const matchRelativeDay = (text, now) => {
 
   const sameTimeMatch = text.match(RELATIVE_DAY_SAME_TIME_RE);
   if (sameTimeMatch) {
-    const offset = RELATIVE_DAY_MAP[sameTimeMatch[1] || sameTimeMatch[2]];
+    const offset = RELATIVE_DAY_MAP[sameTimeMatch[1]];
     if (offset <= 0) return null;
     return applyTimeToDate(
       add(startOfDay(now), { days: offset }),
@@ -494,18 +455,6 @@ const matchTimeOfDay = (text, now) => {
     );
   }
 
-  // "early morning" → 7am, "late evening" → 21:00, "late night" → 23:00
-  const earlyLate = text.match(EARLY_LATE_TOD_RE);
-  if (earlyLate) {
-    const tod = TIME_OF_DAY_MAP[earlyLate[2]];
-    if (!tod) return null;
-    const shift = earlyLate[1] === 'early' ? -1 : 2;
-    return ensureFutureOrNextDay(
-      applyTimeToDate(now, tod.hours + shift, 0),
-      now
-    );
-  }
-
   const match = text.match(TOD_PLAIN_RE);
   if (!match) return null;
 
@@ -570,41 +519,6 @@ const matchNamedDate = (text, now) => {
     return isAfter(result, now) ? result : null;
   }
 
-  // "april first week", "first week of april", "march 2nd day", etc.
-  const mo = text.match(MONTH_ORDINAL_RE);
-  if (mo) {
-    // Groups: (1)month-A (2)ordinal-A (3)unit-A | (4)ordinal-B (5)unit-B (6)month-B (7)time
-    const monthIdx = MONTH_MAP[mo[1] || mo[6]];
-    const num = parseOrdinal(mo[2] || mo[4]);
-    const unit = mo[3] || mo[5];
-    const timeStr = mo[7];
-
-    if (!num || num < 1) return null;
-
-    if (unit === 'day') {
-      if (num > 31) return null;
-      return resolveAbsoluteDate(monthIdx, num, null, timeStr, now);
-    }
-
-    // unit === 'week'
-    if (num > 5) return null;
-    const weekStartDay = (num - 1) * 7 + 1;
-    let year = now.getFullYear();
-    if (
-      monthIdx < now.getMonth() ||
-      (monthIdx === now.getMonth() && now.getDate() > weekStartDay)
-    ) {
-      year += 1;
-    }
-    // Reject if weekStartDay overflows the month (e.g. feb fifth week = day 29 in non-leap)
-    const daysInMonth = new Date(year, monthIdx + 1, 0).getDate();
-    if (weekStartDay > daysInMonth) return null;
-    const d = new Date(year, monthIdx, weekStartDay);
-    if (!isValid(d)) return null;
-    const result = applyTimeOrDefault(d, timeStr);
-    return result && isAfter(result, now) ? result : null;
-  }
-
   return null;
 };
 
@@ -615,13 +529,11 @@ const buildDateWithOptionalTime = (year, month, day, timeStr) => {
   return applyTimeOrDefault(date, timeStr);
 };
 
-// When both values are ≤ 12 (ambiguous), dayFirst controls the fallback:
-//   dayFirst=false (slash M/D/Y) → month first
-//   dayFirst=true  (dash/dot D-M-Y, D.M.Y) → day first
-const disambiguateDayMonth = (a, b, dayFirst = false) => {
+// When both values are ≤ 12 (ambiguous), defaults to M/D (US format).
+const disambiguateDayMonth = (a, b) => {
   if (a > 12) return { day: a, month: b - 1 };
   if (b > 12) return { month: a - 1, day: b };
-  return dayFirst ? { day: a, month: b - 1 } : { month: a - 1, day: b };
+  return { month: a - 1, day: b };
 };
 
 /** Handle formal dates: "2025-01-15", "1/15/2025", "15.01.2025". */
@@ -640,20 +552,13 @@ const matchFormalDate = (text, now) => {
     );
   }
 
-  // Slash = M/D/Y (US), Dash/Dot = D-M-Y / D.M.Y (European)
-  const formats = [
-    { re: SLASH_DATE_RE, dayFirst: false },
-    { re: DASH_DATE_RE, dayFirst: true },
-    { re: DOT_DATE_RE, dayFirst: true },
-  ];
   let result = null;
-  formats.some(({ re, dayFirst }) => {
+  AMBIGUOUS_DATE_RES.some(re => {
     const m = text.match(re);
     if (!m) return false;
     const { month, day } = disambiguateDayMonth(
       parseInt(m[1], 10),
-      parseInt(m[2], 10),
-      dayFirst
+      parseInt(m[2], 10)
     );
     result = ensureFuture(
       buildDateWithOptionalTime(parseInt(m[3], 10), month, day, m[4])
@@ -683,41 +588,6 @@ const matchSpecial = (text, now) => {
     }
   }
 
-  // "end of next week", "end of next month"
-  const eofNext = text.match(END_OF_NEXT_RE);
-  if (eofNext) {
-    if (eofNext[1] === 'week') {
-      const nextWeekStart = startOfWeek(addWeeks(now, 1), { weekStartsOn: 1 });
-      return applyTimeToDate(add(nextWeekStart, { days: 4 }), 17, 0);
-    }
-    if (eofNext[1] === 'month') {
-      return applyTimeToDate(endOfMonth(add(now, { months: 1 })), 17, 0);
-    }
-  }
-
-  // "beginning of next week", "start of next month"
-  const sofNext = text.match(START_OF_NEXT_RE);
-  if (sofNext) {
-    if (sofNext[1] === 'week') {
-      return applyTimeToDate(
-        startOfWeek(addWeeks(now, 1), { weekStartsOn: 1 }),
-        9,
-        0
-      );
-    }
-    if (sofNext[1] === 'month') {
-      const nextMonth = new Date(now.getFullYear(), now.getMonth() + 1, 1);
-      return applyTimeToDate(nextMonth, 9, 0);
-    }
-  }
-
-  // "next business day", "next working day"
-  if (NEXT_BUSINESS_DAY_RE.test(text)) {
-    let d = add(startOfDay(now), { days: 1 });
-    while (isSaturday(d) || isSunday(d)) d = add(d, { days: 1 });
-    return applyTimeToDate(d, 9, 0);
-  }
-
   if (LATER_TODAY_RE.test(text)) return add(now, { hours: 3 });
 
   const weekendMatch = text.match(

app/javascript/dashboard/helper/snoozeDateParser/suggestions.js

@@ -34,7 +34,8 @@ const ALL_SUGGESTION_PHRASES = [
   'end of day',
   'end of week',
   'end of month',
-  ...['morning', 'afternoon', 'evening'].map(tod => `tomorrow ${tod}`),
+  ...TOD_NAMES.map(tod => `tomorrow ${tod}`),
+  ...TOD_NAMES.map(tod => `tomorrow at ${tod}`),
   ...FULL_WEEKDAYS.map(wd => `next ${wd}`),
   ...FULL_WEEKDAYS.map(wd => `this ${wd}`),
   ...FULL_WEEKDAYS.flatMap(wd => TOD_NAMES.map(tod => `${wd} ${tod}`)),
@@ -69,9 +70,8 @@ export const buildSuggestionCandidates = text => {
     const num = text.match(/^\d+(?:\.5)?/)[0];
     const candidates = SUGGESTION_UNITS.map(u => `${num} ${u}`);
     const trimmed = text.replace(/\s+/g, ' ').trim();
-    const spaced = trimmed.replace(/(\d)([a-z])/i, '$1 $2');
-    return spaced.length > num.length
-      ? candidates.filter(c => c.startsWith(spaced))
+    return trimmed.length > num.length
+      ? candidates.filter(c => c.startsWith(trimmed))
       : candidates;
   }
 

app/javascript/dashboard/helper/snoozeDateParser/tokenMaps.js

@@ -114,8 +114,6 @@ export const WORD_NUMBER_MAP = {
   a: 1,
   an: 1,
   one: 1,
-  couple: 2,
-  few: 3,
   two: 2,
   three: 3,
   four: 4,
@@ -141,6 +139,8 @@ export const WORD_NUMBER_MAP = {
   sixty: 60,
   ninety: 90,
   half: 0.5,
+  couple: 2,
+  few: 3,
 };
 
 /** Day index → the date-fns function that finds the next occurrence. */
@@ -235,7 +235,7 @@ const ARABIC_PUNCT_MAP = {
 };
 
 const NOISE_RE =
-  /^(?:(?:can|could|will|would)\s+you\s+)?(?:(?:please|pls|plz|kindly)\s+)?(?:(?:snooze|remind(?:\s+me)?|set(?:\s+(?:a|the))?(?:\s+(?:reminder|deadline|snooze|timer))?|add(?:\s+(?:a|the))?(?:\s+(?:reminder|deadline|snooze))?|schedule|postpone|defer|delay|push)(?:\s+(?:it|this))?\s+)?(?:(?:on|to|for|at|until|till|by|from|after|within)\s+)?/;
+  /^(?:(?:can|could|will|would)\s+you\s+)?(?:(?:please|pls|plz|kindly)\s+)?(?:(?:snooze|remind(?:\s+me)?|set(?:\s+(?:a|the))?(?:\s+(?:reminder|deadline|snooze|timer))?|add(?:\s+(?:a|the))?(?:\s+(?:reminder|deadline|snooze))?|schedule|postpone|defer|delay|push)(?:\s+(?:it|this))?\s+)?(?:(?:on|to|for|at|until|till|by|from)\s+)?/;
 
 const APPROX_RE = /^(?:approx(?:imately)?|around|about|roughly|~)\s+/;
 
@@ -256,35 +256,15 @@ export const sanitize = text =>
     .trim();
 
 /** Strip filler words like "please snooze for" and fix typos like "tommorow". */
-export const stripNoise = text => {
-  let r = text
-    .replace(/\ba\s+fortnight\b/g, '2 weeks')
-    .replace(/\bfortnight\b/g, '2 weeks')
+export const stripNoise = text =>
+  text
     .replace(NOISE_RE, '')
     .replace(APPROX_RE, '')
-    .replace(/^the\s+/, '')
     .replace(/\bnxt\b/g, 'next')
-    .replace(/\ba\s+couple\s+of\b/g, 'couple')
     .replace(/\bcouple\s+of\b/g, 'couple')
-    .replace(/\ba\s+couple\b/g, 'couple')
-    .replace(/\ba\s+few\b/g, 'few')
-    .replace(
-      /\b(\d+)\s*(?:h|hr|hours?)[\s]*(\d+)\s*(?:m|min|minutes?)\b/g,
-      (_, h, m) =>
-        `${h} ${h === '1' ? 'hour' : 'hours'} ${m} ${m === '1' ? 'minute' : 'minutes'}`
-    )
-    .replace(/\b(\d+)h\b/g, (_, h) => `${h} ${h === '1' ? 'hour' : 'hours'}`)
-    .replace(
-      /\b(\d+)m\b/g,
-      (_, m) => `${m} ${m === '1' ? 'minute' : 'minutes'}`
-    )
+    .replace(/\b(\d+)h(\d+)m?\b/g, '$1 hours $2 minutes')
     .replace(/\btomm?orow\b/g, 'tomorrow')
-    .replace(/\s+later$/, '')
     .trim();
-  // bare unit without number: "month later" → "1 month", "week" stays
-  r = r.replace(/^(minutes?|hours?|days?|weeks?|months?|years?)$/, '1 $1');
-  return r;
-};
 
 // ─── Utility Functions ──────────────────────────────────────────────────────
 

app/javascript/dashboard/helper/snoozeHelpers.js

@@ -17,7 +17,6 @@ import {
   generateDateSuggestions,
   parseDateFromText,
 } from 'dashboard/helper/snoozeDateParser';
-import { UNIT_MAP } from 'dashboard/helper/snoozeDateParser/tokenMaps';
 
 const SNOOZE_OPTIONS = wootConstants.SNOOZE_OPTIONS;
 
@@ -88,25 +87,7 @@ const formatSnoozeDate = (snoozeDate, currentDate, locale = 'en') => {
   }
 };
 
-const expandUnit = (num, abbr) => {
-  const full = UNIT_MAP[abbr];
-  if (!full) return `${num} ${abbr}`;
-  return parseFloat(num) === 1
-    ? `${num} ${full.replace(/s$/, '')}`
-    : `${num} ${full}`;
-};
-
-const capitalizeLabel = text => {
-  const expanded = text
-    .replace(
-      /^(\d+)h(\d+)m(?:in)?$/i,
-      (_, h, m) => `${expandUnit(h, 'h')} ${expandUnit(m, 'm')}`
-    )
-    .replace(/^(\d+(?:\.5)?)\s*([a-z]+)$/i, (_, n, u) =>
-      UNIT_MAP[u.toLowerCase()] ? expandUnit(n, u.toLowerCase()) : `${n} ${u}`
-    );
-  return expanded.replace(/^\w/, c => c.toUpperCase());
-};
+const capitalizeLabel = text => text.replace(/^\w/, c => c.toUpperCase());
 
 export const generateSnoozeSuggestions = (
   searchText,

app/javascript/dashboard/helper/specs/snoozeDateParser.spec.js

@@ -642,27 +642,6 @@ describe('parseDateFromText: formal date formats', () => {
     expect(result.date.getDate()).toEqual(15);
     expect(result.date.getMonth()).toEqual(0);
   });
-
-  it('"05-04-2027" ambiguous dash → day-first (April 5)', () => {
-    const result = parseDateFromText('05-04-2027', now);
-    expect(result).not.toBeNull();
-    expect(result.date.getDate()).toEqual(5);
-    expect(result.date.getMonth()).toEqual(3);
-  });
-
-  it('"05.04.2027" ambiguous dot → day-first (April 5)', () => {
-    const result = parseDateFromText('05.04.2027', now);
-    expect(result).not.toBeNull();
-    expect(result.date.getDate()).toEqual(5);
-    expect(result.date.getMonth()).toEqual(3);
-  });
-
-  it('"05/04/2027" ambiguous slash → month-first (May 4)', () => {
-    const result = parseDateFromText('05/04/2027', now);
-    expect(result).not.toBeNull();
-    expect(result.date.getMonth()).toEqual(4);
-    expect(result.date.getDate()).toEqual(4);
-  });
 });
 
 describe('parseDateFromText: returns null for garbage', () => {
@@ -1028,32 +1007,6 @@ describe('golden tests: pinned phrase → exact date/time', () => {
     ['march 5 at 2pm', 2024, 2, 5, 14, 0],
     ['dec 25 2025', 2025, 11, 25, 9, 0],
 
-    // ── Month ordinal week ──
-    ['july 1st week', 2023, 6, 1, 9, 0], // July 1st week = July 1
-    ['july 2nd week', 2023, 6, 8, 9, 0], // July 2nd week = July 8
-    ['july 3rd week', 2023, 6, 15, 9, 0], // July 3rd week = July 15
-    ['aug 1st week', 2023, 7, 1, 9, 0], // August 1st week = Aug 1
-    ['feb 2nd week at 3pm', 2024, 1, 8, 15, 0], // Feb 2nd week with time
-    ['march first week', 2024, 2, 1, 9, 0], // Ordinal: first
-    ['march second week', 2024, 2, 8, 9, 0], // Ordinal: second
-    ['april third week', 2024, 3, 15, 9, 0], // Ordinal: third
-    ['may fourth week', 2024, 4, 22, 9, 0], // Ordinal: fourth
-    ['june fifth week', 2023, 5, 29, 9, 0], // Ordinal: fifth (same year since we're before week 5)
-
-    // ── Month ordinal day ──
-    ['april first day', 2024, 3, 1, 9, 0],
-    ['april second day', 2024, 3, 2, 9, 0],
-    ['july third day', 2023, 6, 3, 9, 0],
-    ['march 5th day', 2024, 2, 5, 9, 0],
-    ['jan tenth day at 2pm', 2024, 0, 10, 14, 0],
-
-    // ── Reversed order: ordinal unit of month ──
-    ['first week of april', 2024, 3, 1, 9, 0],
-    ['2nd week of july', 2023, 6, 8, 9, 0],
-    ['third day of march', 2024, 2, 3, 9, 0],
-    ['5th day of jan at 2pm', 2024, 0, 5, 14, 0],
-    ['second week of feb at 3pm', 2024, 1, 8, 15, 0],
-
     // ── Formal dates ──
     ['2025-01-15', 2025, 0, 15, 9, 0],
     ['01/15/2025', 2025, 0, 15, 9, 0],
@@ -1064,57 +1017,6 @@ describe('golden tests: pinned phrase → exact date/time', () => {
     ['tonight 11', 2023, 5, 16, 23, 0],
     ['today 8', 2023, 5, 17, 8, 0], // 8am is past → rolls to next day
 
-    // ── Shorthand durations ──
-    ['2h', 2023, 5, 16, 12, 0],
-    ['30m', 2023, 5, 16, 10, 30],
-    ['1h30minutes', 2023, 5, 16, 11, 30],
-    ['2hr15min', 2023, 5, 16, 12, 15],
-
-    // ── Couple / few ──
-    ['couple hours', 2023, 5, 16, 12, 0],
-    ['a couple of days', 2023, 5, 18, 10, 0],
-    ['a few minutes', 2023, 5, 16, 10, 3],
-    ['in a few hours', 2023, 5, 16, 13, 0],
-
-    // ── Fortnight ──
-    ['fortnight', 2023, 5, 30, 10, 0],
-    ['in a fortnight', 2023, 5, 30, 10, 0],
-
-    // ── X later ──
-    ['2 days later', 2023, 5, 18, 10, 0],
-    ['a week later', 2023, 5, 23, 10, 0],
-    ['month later', 2023, 6, 16, 10, 0],
-
-    // ── Same time reversed ──
-    ['same time tomorrow', 2023, 5, 17, 10, 0],
-
-    // ── Early / late time of day ──
-    ['early morning', 2023, 5, 17, 8, 0],
-    ['late evening', 2023, 5, 16, 20, 0],
-    ['late night', 2023, 5, 16, 22, 0],
-
-    // ── Beginning / end of next ──
-    ['beginning of next week', 2023, 5, 19, 9, 0],
-    ['start of next week', 2023, 5, 19, 9, 0],
-    ['end of next week', 2023, 5, 23, 17, 0],
-    ['end of next month', 2023, 6, 31, 17, 0],
-    ['beginning of next month', 2023, 6, 1, 9, 0],
-
-    // ── Next business day ──
-    ['next business day', 2023, 5, 19, 9, 0],
-    ['next working day', 2023, 5, 19, 9, 0],
-
-    // ── One and a half ──
-    ['one and a half hours', 2023, 5, 16, 11, 30],
-    ['an hour and a half', 2023, 5, 16, 11, 30],
-
-    // ── Noise prefix: after / within ──
-    ['after 2 hours', 2023, 5, 16, 12, 0],
-    ['within a week', 2023, 5, 23, 10, 0],
-
-    // ── The day after tomorrow ──
-    ['the day after tomorrow', 2023, 5, 18, 9, 0],
-
     // ── Special ──
     ['this weekend', 2023, 5, 17, 9, 0],
     ['end of month', 2023, 5, 30, 17, 0],
@@ -1133,20 +1035,6 @@ describe('golden tests: pinned phrase → exact date/time', () => {
   });
 });
 
-describe('regression: month-ordinal week overflow (P1)', () => {
-  it('"feb fifth week" returns null in non-leap year (would overflow into March)', () => {
-    const ref = new Date(2023, 0, 10, 10, 0, 0);
-    expect(parseDateFromText('feb fifth week', ref)).toBeNull();
-  });
-
-  it('"feb fourth week" is still valid', () => {
-    const ref = new Date(2023, 0, 10, 10, 0, 0);
-    const result = parseDateFromText('feb fourth week', ref);
-    expect(result).not.toBeNull();
-    expect(result.date.getMonth()).toBe(1);
-  });
-});
-
 describe('localized suggestions with Malayalam translations', () => {
   const mlTranslations = {
     UNITS: {
@@ -1423,23 +1311,6 @@ describe('noise word stripping', () => {
     expect(result).not.toBeNull();
   });
 
-  it('"after ten year" strips "after" and parses as duration', () => {
-    const result = parseDateFromText('after ten year', now);
-    expect(result).not.toBeNull();
-  });
-
-  it('"after 2 hours" strips "after" and parses as duration', () => {
-    const result = parseDateFromText('after 2 hours', now);
-    expect(result).not.toBeNull();
-    expect(result.date.getHours()).toEqual(12);
-  });
-
-  it('"after 3 days" strips "after" and parses as duration', () => {
-    const result = parseDateFromText('after 3 days', now);
-    expect(result).not.toBeNull();
-    expect(result.date.getDate()).toEqual(19);
-  });
-
   it('"schedule this for 2025-01-15" parses', () => {
     const result = parseDateFromText('schedule this for 2025-01-15', now);
     expect(result).not.toBeNull();
@@ -1722,40 +1593,3 @@ describe('generateDateSuggestions — localized input regressions', () => {
     });
   });
 });
-
-describe('no-space duration suggestions', () => {
-  it('"1d" generates day suggestions', () => {
-    const results = generateDateSuggestions('1d', now);
-    expect(results.length).toBeGreaterThan(0);
-    expect(results[0].label).toBe('1 days');
-  });
-
-  it('"2min" generates minute suggestions', () => {
-    const results = generateDateSuggestions('2min', now);
-    expect(results.length).toBeGreaterThan(0);
-    expect(results[0].label).toBe('2 minutes');
-  });
-
-  it('"1h" generates hour suggestions', () => {
-    const results = generateDateSuggestions('1h', now);
-    expect(results.length).toBeGreaterThan(0);
-    expect(results[0].label).toBe('1 hour');
-  });
-
-  it('"2ho" generates hour suggestions (partial match)', () => {
-    const results = generateDateSuggestions('2ho', now);
-    expect(results.length).toBeGreaterThan(0);
-    expect(results[0].label).toBe('2 hours');
-  });
-
-  it('"3w" generates week suggestions', () => {
-    const results = generateDateSuggestions('3w', now);
-    expect(results.length).toBeGreaterThan(0);
-    expect(results[0].label).toBe('3 weeks');
-  });
-
-  it('"1h30m" generates compound suggestion', () => {
-    const results = generateDateSuggestions('1h30m', now);
-    expect(results.length).toBeGreaterThan(0);
-  });
-});

app/javascript/dashboard/helper/specs/snoozeHelpers.spec.js

@@ -7,7 +7,6 @@ import {
   setHoursToNine,
   snoozedReopenTimeToTimestamp,
   shortenSnoozeTime,
-  generateSnoozeSuggestions,
 } from '../snoozeHelpers';
 
 describe('#Snooze Helpers', () => {
@@ -165,56 +164,4 @@ describe('#Snooze Helpers', () => {
       expect(shortenSnoozeTime(null)).toEqual(null);
     });
   });
-
-  describe('generateSnoozeSuggestions label expansion', () => {
-    const now = new Date('2023-06-16T10:00:00');
-
-    it('expands abbreviated units: "1d" → "1 Day"', () => {
-      const results = generateSnoozeSuggestions('1d', now);
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].label).toBe('1 day');
-    });
-
-    it('expands abbreviated units: "2 d" → "2 Days"', () => {
-      const results = generateSnoozeSuggestions('2 d', now);
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].label).toBe('2 days');
-    });
-
-    it('expands abbreviated units: "1h" → "1 Hour"', () => {
-      const results = generateSnoozeSuggestions('1h', now);
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].label).toBe('1 hour');
-    });
-
-    it('expands abbreviated units: "2min" → "2 Minutes"', () => {
-      const results = generateSnoozeSuggestions('2min', now);
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].label).toBe('2 minutes');
-    });
-
-    it('handles singular: "1 hours" → "1 Hour"', () => {
-      const results = generateSnoozeSuggestions('1 hours', now);
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].label).toBe('1 hour');
-    });
-
-    it('handles singular: "1 minutes" → "1 Minute"', () => {
-      const results = generateSnoozeSuggestions('1 minutes', now);
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].label).toBe('1 minute');
-    });
-
-    it('keeps plural for non-1: "2 days" → "2 Days"', () => {
-      const results = generateSnoozeSuggestions('2 days', now);
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].label).toBe('2 days');
-    });
-
-    it('expands compound: "1h30m" → "1 Hour 30 Minutes"', () => {
-      const results = generateSnoozeSuggestions('1h30m', now);
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].label).toBe('1 hour 30 minutes');
-    });
-  });
 });

app/javascript/dashboard/i18n/locale/ar/index.js

@@ -33,6 +33,7 @@ import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
 import sla from './sla.json';
+import snooze from './snooze.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -72,6 +73,7 @@ export default {
   ...settings,
   ...signup,
   ...sla,
+  ...snooze,
   ...teamsSettings,
   ...whatsappTemplates,
 };

app/javascript/dashboard/i18n/locale/ar/snooze.json

@@ -0,0 +1,61 @@
+{
+  "SNOOZE_PARSER": {
+    "UNITS": {
+      "MINUTE": "دقيقة",
+      "MINUTES": "دقائق",
+      "HOUR": "ساعة",
+      "HOURS": "ساعات",
+      "DAY": "يوم",
+      "DAYS": "أيام",
+      "WEEK": "أسبوع",
+      "WEEKS": "أسابيع",
+      "MONTH": "شهر",
+      "MONTHS": "أشهر",
+      "YEAR": "سنة",
+      "YEARS": "سنوات"
+    },
+    "HALF": "نصف",
+    "NEXT": "القادم",
+    "THIS": "هذا",
+    "AT": "الساعة",
+    "IN": "في",
+    "FROM_NOW": "من الآن",
+    "NEXT_YEAR": "العام المقبل",
+    "MERIDIEM": {
+      "AM": "صباحاً",
+      "PM": "مساءً"
+    },
+    "RELATIVE": {
+      "TOMORROW": "غداً",
+      "DAY_AFTER_TOMORROW": "بعد غد",
+      "NEXT_WEEK": "الأسبوع القادم",
+      "NEXT_MONTH": "الشهر القادم",
+      "THIS_WEEKEND": "نهاية هذا الأسبوع",
+      "NEXT_WEEKEND": "نهاية الأسبوع القادم"
+    },
+    "TIME_OF_DAY": {
+      "MORNING": "صباحاً",
+      "AFTERNOON": "بعد الظهر",
+      "EVENING": "مساءً",
+      "NIGHT": "ليلاً",
+      "NOON": "ظهراً",
+      "MIDNIGHT": "منتصف الليل"
+    },
+    "WORD_NUMBERS": {
+      "ONE": "واحد",
+      "TWO": "اثنان",
+      "THREE": "ثلاثة",
+      "FOUR": "أربعة",
+      "FIVE": "خمسة",
+      "SIX": "ستة",
+      "SEVEN": "سبعة",
+      "EIGHT": "ثمانية",
+      "NINE": "تسعة",
+      "TEN": "عشرة",
+      "TWELVE": "اثنا عشر",
+      "FIFTEEN": "خمسة عشر",
+      "TWENTY": "عشرون",
+      "THIRTY": "ثلاثون"
+    }
+  }
+}

app/javascript/dashboard/i18n/locale/en/contact.json

@@ -613,7 +613,7 @@
       "NO_INBOX_ALERT": "There are no available inboxes to start a conversation with this contact.",
       "CONTACT_SELECTOR": {
         "LABEL": "To:",
-        "TAG_INPUT_PLACEHOLDER": "Enter at least 2 characters to search by name, email, or phone number",
+        "TAG_INPUT_PLACEHOLDER": "Search for a contact with name, email or phone number",
         "CONTACT_CREATING": "Creating contact..."
       },
       "INBOX_SELECTOR": {
@@ -624,9 +624,9 @@
         "SUBJECT_LABEL": "Subject :",
         "SUBJECT_PLACEHOLDER": "Enter your email subject here",
         "CC_LABEL": "Cc:",
-        "CC_PLACEHOLDER": "Enter at least 2 characters to search by email",
+        "CC_PLACEHOLDER": "Search for a contact with their email address",
         "BCC_LABEL": "Bcc:",
-        "BCC_PLACEHOLDER": "Enter at least 2 characters to search by email",
+        "BCC_PLACEHOLDER": "Search for a contact with their email address",
         "BCC_BUTTON": "Bcc"
       },
       "MESSAGE_EDITOR": {

app/javascript/dashboard/i18n/locale/en/datePicker.json

@@ -5,6 +5,11 @@
     "WEEK_NUMBER": "Week #{weekNumber}",
     "APPLY_BUTTON": "Apply",
     "CLEAR_BUTTON": "Clear",
+    "HOUR": "Hour",
+    "MINUTE": "Min",
+    "SECOND": "Sec",
+    "FORMAT_12H": "12h",
+    "FORMAT_24H": "24h",
     "DATE_RANGE_INPUT": {
       "START": "Start Date",
       "END": "End Date"

app/javascript/dashboard/i18n/locale/en/helpCenter.json

@@ -374,16 +374,6 @@
         "ERROR_MESSAGE": "Error while deleting article"
       }
     },
-    "REORDER_ARTICLE": {
-      "API": {
-        "ERROR_MESSAGE": "Unable to reorder articles. Please try again."
-      }
-    },
-    "REORDER_CATEGORY": {
-      "API": {
-        "ERROR_MESSAGE": "Unable to reorder categories. Please try again."
-      }
-    },
     "CREATE_ARTICLE": {
       "ERROR_MESSAGE": "Please add the article heading and content then only you can update the settings"
     },
@@ -849,7 +839,7 @@
       "STATUS": {
         "UPLOADED": "Ready",
         "PROCESSING": "Processing",
-        "PROCESSED": "Completed",
+        "PROCESSED": "Completed", 
         "FAILED": "Failed"
       }
     },

app/javascript/dashboard/i18n/locale/en/snooze.json

@@ -56,17 +56,6 @@
       "FIFTEEN": "fifteen",
       "TWENTY": "twenty",
       "THIRTY": "thirty"
-    },
-    "ORDINALS": {
-      "FIRST": "first",
-      "SECOND": "second",
-      "THIRD": "third",
-      "FOURTH": "fourth",
-      "FIFTH": "fifth"
-    },
-    "OF": "of",
-    "AFTER": "after",
-    "WEEK": "week",
-    "DAY": "day"
+    }
   }
 }

app/javascript/dashboard/i18n/locale/es/index.js

@@ -33,6 +33,7 @@ import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
 import sla from './sla.json';
+import snooze from './snooze.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -72,6 +73,7 @@ export default {
   ...settings,
   ...signup,
   ...sla,
+  ...snooze,
   ...teamsSettings,
   ...whatsappTemplates,
 };

app/javascript/dashboard/i18n/locale/es/snooze.json

@@ -0,0 +1,61 @@
+{
+  "SNOOZE_PARSER": {
+    "UNITS": {
+      "MINUTE": "minuto",
+      "MINUTES": "minutos",
+      "HOUR": "hora",
+      "HOURS": "horas",
+      "DAY": "día",
+      "DAYS": "días",
+      "WEEK": "semana",
+      "WEEKS": "semanas",
+      "MONTH": "mes",
+      "MONTHS": "meses",
+      "YEAR": "año",
+      "YEARS": "años"
+    },
+    "HALF": "media",
+    "NEXT": "próximo",
+    "THIS": "este",
+    "AT": "a las",
+    "IN": "en",
+    "FROM_NOW": "a partir de ahora",
+    "NEXT_YEAR": "el próximo año",
+    "MERIDIEM": {
+      "AM": "am",
+      "PM": "pm"
+    },
+    "RELATIVE": {
+      "TOMORROW": "mañana",
+      "DAY_AFTER_TOMORROW": "pasado mañana",
+      "NEXT_WEEK": "la próxima semana",
+      "NEXT_MONTH": "el próximo mes",
+      "THIS_WEEKEND": "este fin de semana",
+      "NEXT_WEEKEND": "el próximo fin de semana"
+    },
+    "TIME_OF_DAY": {
+      "MORNING": "mañana",
+      "AFTERNOON": "tarde",
+      "EVENING": "noche",
+      "NIGHT": "noche",
+      "NOON": "mediodía",
+      "MIDNIGHT": "medianoche"
+    },
+    "WORD_NUMBERS": {
+      "ONE": "uno",
+      "TWO": "dos",
+      "THREE": "tres",
+      "FOUR": "cuatro",
+      "FIVE": "cinco",
+      "SIX": "seis",
+      "SEVEN": "siete",
+      "EIGHT": "ocho",
+      "NINE": "nueve",
+      "TEN": "diez",
+      "TWELVE": "doce",
+      "FIFTEEN": "quince",
+      "TWENTY": "veinte",
+      "THIRTY": "treinta"
+    }
+  }
+}

app/javascript/dashboard/i18n/locale/ml/index.js

@@ -33,6 +33,7 @@ import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
 import sla from './sla.json';
+import snooze from './snooze.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -72,6 +73,7 @@ export default {
   ...settings,
   ...signup,
   ...sla,
+  ...snooze,
   ...teamsSettings,
   ...whatsappTemplates,
 };

app/javascript/dashboard/i18n/locale/ml/snooze.json

@@ -0,0 +1,58 @@
+{
+  "SNOOZE_PARSER": {
+    "UNITS": {
+      "MINUTE": "മിനിറ്റ്",
+      "MINUTES": "മിനിറ്റ്",
+      "HOUR": "മണിക്കൂർ",
+      "HOURS": "മണിക്കൂർ",
+      "DAY": "ദിവസം",
+      "DAYS": "ദിവസം",
+      "WEEK": "ആഴ്ച",
+      "WEEKS": "ആഴ്ച",
+      "MONTH": "മാസം",
+      "MONTHS": "മാസം",
+      "YEAR": "വർഷം",
+      "YEARS": "വർഷം"
+    },
+    "HALF": "അര",
+    "NEXT": "അടുത്ത",
+    "THIS": "ഈ",
+    "AT": "സമയം",
+    "IN": "കഴിഞ്ഞ്",
+    "FROM_NOW": "ഇപ്പോൾ മുതൽ",
+    "NEXT_YEAR": "അടുത്ത വർഷം",
+    "MERIDIEM": { "AM": "രാവിലെ", "PM": "വൈകുന്നേരം" },
+    "RELATIVE": {
+      "TOMORROW": "നാളെ",
+      "DAY_AFTER_TOMORROW": "മറ്റന്നാൾ",
+      "NEXT_WEEK": "അടുത്ത ആഴ്ച",
+      "NEXT_MONTH": "അടുത്ത മാസം",
+      "THIS_WEEKEND": "ഈ വാരാന്ത്യം",
+      "NEXT_WEEKEND": "അടുത്ത വാരാന്ത്യം"
+    },
+    "TIME_OF_DAY": {
+      "MORNING": "രാവിലെ",
+      "AFTERNOON": "ഉച്ചയ്ക്ക്",
+      "EVENING": "വൈകുന്നേരം",
+      "NIGHT": "രാത്രി",
+      "NOON": "ഉച്ച",
+      "MIDNIGHT": "അർദ്ധരാത്രി"
+    },
+    "WORD_NUMBERS": {
+      "ONE": "ഒന്ന്",
+      "TWO": "രണ്ട്",
+      "THREE": "മൂന്ന്",
+      "FOUR": "നാല്",
+      "FIVE": "അഞ്ച്",
+      "SIX": "ആറ്",
+      "SEVEN": "ഏഴ്",
+      "EIGHT": "എട്ട്",
+      "NINE": "ഒൻപത്",
+      "TEN": "പത്ത്",
+      "TWELVE": "പന്ത്രണ്ട്",
+      "FIFTEEN": "പതിനഞ്ച്",
+      "TWENTY": "ഇരുപത്",
+      "THIRTY": "മുപ്പത്"
+    }
+  }
+}

app/javascript/dashboard/i18n/locale/pt/index.js

@@ -33,6 +33,7 @@ import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
 import sla from './sla.json';
+import snooze from './snooze.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -72,6 +73,7 @@ export default {
   ...settings,
   ...signup,
   ...sla,
+  ...snooze,
   ...teamsSettings,
   ...whatsappTemplates,
 };

app/javascript/dashboard/i18n/locale/pt/snooze.json

@@ -0,0 +1,61 @@
+{
+  "SNOOZE_PARSER": {
+    "UNITS": {
+      "MINUTE": "minuto",
+      "MINUTES": "minutos",
+      "HOUR": "hora",
+      "HOURS": "horas",
+      "DAY": "dia",
+      "DAYS": "dias",
+      "WEEK": "semana",
+      "WEEKS": "semanas",
+      "MONTH": "mês",
+      "MONTHS": "meses",
+      "YEAR": "ano",
+      "YEARS": "anos"
+    },
+    "HALF": "meia",
+    "NEXT": "próximo",
+    "THIS": "este",
+    "AT": "às",
+    "IN": "em",
+    "FROM_NOW": "a partir de agora",
+    "NEXT_YEAR": "próximo ano",
+    "MERIDIEM": {
+      "AM": "am",
+      "PM": "pm"
+    },
+    "RELATIVE": {
+      "TOMORROW": "amanhã",
+      "DAY_AFTER_TOMORROW": "depois de amanhã",
+      "NEXT_WEEK": "próxima semana",
+      "NEXT_MONTH": "próximo mês",
+      "THIS_WEEKEND": "este fim de semana",
+      "NEXT_WEEKEND": "próximo fim de semana"
+    },
+    "TIME_OF_DAY": {
+      "MORNING": "manhã",
+      "AFTERNOON": "tarde",
+      "EVENING": "noite",
+      "NIGHT": "noite",
+      "NOON": "meio-dia",
+      "MIDNIGHT": "meia-noite"
+    },
+    "WORD_NUMBERS": {
+      "ONE": "um",
+      "TWO": "dois",
+      "THREE": "três",
+      "FOUR": "quatro",
+      "FIVE": "cinco",
+      "SIX": "seis",
+      "SEVEN": "sete",
+      "EIGHT": "oito",
+      "NINE": "nove",
+      "TEN": "dez",
+      "TWELVE": "doze",
+      "FIFTEEN": "quinze",
+      "TWENTY": "vinte",
+      "THIRTY": "trinta"
+    }
+  }
+}

app/javascript/dashboard/modules/search/components/SearchContactAgentSelector.vue

@@ -5,7 +5,7 @@ import { useToggle } from '@vueuse/core';
 import { vOnClickOutside } from '@vueuse/components';
 import { debounce } from '@chatwoot/utils';
 import { useMapGetter } from 'dashboard/composables/store.js';
-import { createContactSearcher } from 'dashboard/components-next/NewConversation/helpers/composeConversationHelper';
+import { searchContacts } from 'dashboard/components-next/NewConversation/helpers/composeConversationHelper';
 import { useCamelCase } from 'dashboard/composables/useTransformKeys';
 import { fetchContactDetails } from '../helpers/searchHelper';
 
@@ -18,8 +18,6 @@ const props = defineProps({
 
 const emit = defineEmits(['change']);
 
-const searchContacts = createContactSearcher();
-
 const FROM_TYPE = {
   CONTACT: 'contact',
   AGENT: 'agent',
@@ -121,10 +119,7 @@ const debouncedSearch = debounce(async query => {
   }
 
   try {
-    const contacts = await searchContacts(query, { skipMinLength: true });
-
-    // null means the request was aborted (a newer search is in-flight),
-    if (contacts === null) return;
+    const contacts = await searchContacts(query);
 
     // Add selected contact to top if not already in results
     const allContacts = selectedContact.value
@@ -135,8 +130,9 @@ const debouncedSearch = debounce(async query => {
       : contacts;
 
     searchedContacts.value = allContacts;
-    isSearching.value = false;
   } catch {
+    // Ignore error
+  } finally {
     isSearching.value = false;
   }
 }, 300);

app/javascript/dashboard/routes/dashboard/commands/CmdBarConversationSnooze.vue

@@ -13,7 +13,7 @@ import CustomSnoozeModal from 'dashboard/components/CustomSnoozeModal.vue';
 const store = useStore();
 const getters = useStoreGetters();
 const { t } = useI18n();
-const showCustomSnoozeModal = ref(false);
+const snoozeModalRef = ref(null);
 
 const selectedChat = computed(() => getters.getSelectedChat.value);
 const contextMenuChatId = computed(() => getters.getContextMenuChatId.value);
@@ -30,7 +30,7 @@ const toggleStatus = async (status, snoozedUntil) => {
 
 const onCmdSnoozeConversation = snoozeType => {
   if (snoozeType === wootConstants.SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME) {
-    showCustomSnoozeModal.value = true;
+    snoozeModalRef.value?.open();
   } else if (typeof snoozeType === 'number') {
     toggleStatus(wootConstants.STATUS_TYPE.SNOOZED, snoozeType);
   } else {
@@ -42,7 +42,6 @@ const onCmdSnoozeConversation = snoozeType => {
 };
 
 const chooseSnoozeTime = customSnoozeTime => {
-  showCustomSnoozeModal.value = false;
   if (customSnoozeTime) {
     toggleStatus(
       wootConstants.STATUS_TYPE.SNOOZED,
@@ -51,24 +50,17 @@ const chooseSnoozeTime = customSnoozeTime => {
   }
 };
 
-const hideCustomSnoozeModal = () => {
-  // if we select custom snooze and the custom snooze modal is open
-  // Then if the custom snooze modal is closed then set the context menu chat id to null
+const clearContextMenu = () => {
   store.dispatch('setContextMenuChatId', null);
-  showCustomSnoozeModal.value = false;
 };
 
 useEmitter(CMD_SNOOZE_CONVERSATION, onCmdSnoozeConversation);
 </script>
 
 <template>
-  <woot-modal
-    v-model:show="showCustomSnoozeModal"
-    :on-close="hideCustomSnoozeModal"
-  >
-    <CustomSnoozeModal
-      @close="hideCustomSnoozeModal"
-      @choose-time="chooseSnoozeTime"
-    />
-  </woot-modal>
+  <CustomSnoozeModal
+    ref="snoozeModalRef"
+    @choose-time="chooseSnoozeTime"
+    @close="clearContextMenu"
+  />
 </template>

app/javascript/dashboard/routes/dashboard/commands/commandbar.vue

@@ -11,10 +11,7 @@ import { useGoToCommandHotKeys } from 'dashboard/composables/commands/useGoToCom
 import { useBulkActionsHotKeys } from 'dashboard/composables/commands/useBulkActionsHotKeys';
 import { useConversationHotKeys } from 'dashboard/composables/commands/useConversationHotKeys';
 import wootConstants from 'dashboard/constants/globals';
-import {
-  GENERAL_EVENTS,
-  SNOOZE_EVENTS,
-} from 'dashboard/helper/AnalyticsHelper/events';
+import { GENERAL_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 import { generateSnoozeSuggestions } from 'dashboard/helper/snoozeHelpers';
 import { ICON_SNOOZE_CONVERSATION } from 'dashboard/helper/commandbar/icons';
 import {
@@ -59,23 +56,14 @@ const placeholder = computed(() =>
     : t('COMMAND_BAR.SEARCH_PLACEHOLDER')
 );
 
-const SNOOZE_PRESET_IDS = new Set(Object.values(wootConstants.SNOOZE_OPTIONS));
-
-const hotKeys = computed(() => {
-  const allActions = [
-    ...dynamicSnoozeActions.value,
-    ...inboxHotKeys.value,
-    ...goToCommandHotKeys.value,
-    ...goToAppearanceHotKeys.value,
-    ...bulkActionsHotKeys.value,
-    ...conversationHotKeys.value,
-  ];
-  // When dynamic NLP snooze suggestions exist, hide all preset snooze actions to avoid duplication
-  if (!dynamicSnoozeActions.value.length) return allActions;
-  return allActions.filter(
-    a => !SNOOZE_PRESET_IDS.has(a.id) || !SNOOZE_PARENT_IDS.includes(a.parent)
-  );
-});
+const hotKeys = computed(() => [
+  ...dynamicSnoozeActions.value,
+  ...inboxHotKeys.value,
+  ...goToCommandHotKeys.value,
+  ...goToAppearanceHotKeys.value,
+  ...bulkActionsHotKeys.value,
+  ...conversationHotKeys.value,
+]);
 
 const setCommandBarData = () => {
   ninjakeys.value.data = hotKeys.value;
@@ -113,16 +101,13 @@ const buildDynamicSnoozeActions = (search, parentId) => {
     id: `${DYNAMIC_SNOOZE_PREFIX}${index}`,
     title:
       parsed.label !== parsed.formattedDate
-        ? `${parsed.label} - ${parsed.formattedDate}`
+        ? `${parsed.label} — ${parsed.formattedDate}`
         : parsed.formattedDate,
     parent: parentId,
     section,
     icon: ICON_SNOOZE_CONVERSATION,
     keywords: search,
-    handler: () => {
-      emitter.emit(busEvent, parsed.resolve());
-      useTrack(SNOOZE_EVENTS.NLP_SNOOZE_APPLIED, { label: parsed.label });
-    },
+    handler: () => emitter.emit(busEvent, parsed.resolve()),
   }));
 };
 

app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesIndexPage.vue

@@ -11,10 +11,7 @@ const store = useStore();
 
 const pageNumber = ref(1);
 
-const allArticles = useMapGetter('articles/allArticles');
-const articlesSortedByPosition = useMapGetter(
-  'articles/allArticlesSortedByPosition'
-);
+const articles = useMapGetter('articles/allArticles');
 const categories = useMapGetter('categories/allCategories');
 const meta = useMapGetter('articles/getMeta');
 const portalMeta = useMapGetter('portals/getMeta');
@@ -61,11 +58,6 @@ const isCategoryArticles = computed(() => {
   );
 });
 
-// Use position-sorted articles for category views and categories filter view (where drag reorder is enabled)
-const articles = computed(() =>
-  isCategoryArticles.value ? articlesSortedByPosition.value : allArticles.value
-);
-
 const fetchArticles = ({ pageNumber: pageNumberParam } = {}) => {
   store.dispatch('articles/index', {
     pageNumber: pageNumberParam || pageNumber.value,

app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsCategoriesIndexPage.vue

@@ -9,7 +9,7 @@ import CategoriesPage from 'dashboard/components-next/HelpCenter/Pages/CategoryP
 const store = useStore();
 const route = useRoute();
 
-const categories = useMapGetter('categories/allCategoriesSortedByPosition');
+const categories = useMapGetter('categories/allCategories');
 
 const selectedPortalSlug = computed(() => route.params.portalSlug);
 const getPortalBySlug = useMapGetter('portals/portalBySlug');

app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue

@@ -34,9 +34,6 @@ export default {
     },
   },
   emits: ['next', 'prev'],
-  data() {
-    return { showCustomSnoozeModal: false };
-  },
   computed: {
     ...mapGetters({ meta: 'notifications/getMeta' }),
   },
@@ -51,9 +48,6 @@ export default {
       const ninja = document.querySelector('ninja-keys');
       ninja.open({ parent: 'snooze_notification' });
     },
-    hideCustomSnoozeModal() {
-      this.showCustomSnoozeModal = false;
-    },
     async snoozeNotification(snoozedUntil) {
       try {
         await this.$store.dispatch('notifications/snooze', {
@@ -68,7 +62,7 @@ export default {
     },
     onCmdSnoozeNotification(snoozeType) {
       if (snoozeType === wootConstants.SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME) {
-        this.showCustomSnoozeModal = true;
+        this.$refs.snoozeModalRef?.open();
       } else if (typeof snoozeType === 'number') {
         this.snoozeNotification(snoozeType);
       } else {
@@ -77,7 +71,6 @@ export default {
       }
     },
     scheduleCustomSnooze(customSnoozeTime) {
-      this.showCustomSnoozeModal = false;
       if (customSnoozeTime) {
         const snoozedUntil = getUnixTime(customSnoozeTime) || null;
         this.snoozeNotification(snoozedUntil);
@@ -147,14 +140,9 @@ export default {
         @click="deleteNotification"
       />
     </div>
-    <woot-modal
-      v-model:show="showCustomSnoozeModal"
-      :on-close="hideCustomSnoozeModal"
-    >
-      <CustomSnoozeModal
-        @close="hideCustomSnoozeModal"
-        @choose-time="scheduleCustomSnooze"
-      />
-    </woot-modal>
+    <CustomSnoozeModal
+      ref="snoozeModalRef"
+      @choose-time="scheduleCustomSnooze"
+    />
   </div>
 </template>

app/javascript/dashboard/routes/dashboard/settings/account/Index.vue

@@ -160,7 +160,6 @@ export default {
           @submit.prevent="updateAccount"
         >
           <WithLabel
-            name="account-name"
             :has-error="v$.name.$error"
             :label="$t('GENERAL_SETTINGS.FORM.NAME.LABEL')"
             :error-message="$t('GENERAL_SETTINGS.FORM.NAME.ERROR')"
@@ -174,7 +173,6 @@ export default {
             />
           </WithLabel>
           <WithLabel
-            name="site-language"
             :has-error="v$.locale.$error"
             :label="$t('GENERAL_SETTINGS.FORM.LANGUAGE.LABEL')"
             :error-message="$t('GENERAL_SETTINGS.FORM.LANGUAGE.ERROR')"
@@ -191,7 +189,6 @@ export default {
           </WithLabel>
           <WithLabel
             v-if="featureCustomReplyDomainEnabled"
-            name="custom-domain"
             :label="$t('GENERAL_SETTINGS.FORM.DOMAIN.LABEL')"
           >
             <NextInput
@@ -214,7 +211,6 @@ export default {
           </WithLabel>
           <WithLabel
             v-if="featureCustomReplyEmailEnabled"
-            name="support-email"
             :label="$t('GENERAL_SETTINGS.FORM.SUPPORT_EMAIL.LABEL')"
           >
             <NextInput

app/javascript/dashboard/routes/dashboard/settings/reports/components/Csat/CsatFilters.vue

@@ -14,13 +14,13 @@ import {
 import FilterButton from 'dashboard/components/ui/Dropdown/DropdownButton.vue';
 import ActiveFilterChip from '../Filters/v3/ActiveFilterChip.vue';
 import AddFilterChip from '../Filters/v3/AddFilterChip.vue';
-import WootDatePicker from 'dashboard/components/ui/DatePicker/DatePicker.vue';
+import DateRangePicker from 'dashboard/components-next/DatePicker/DateRangePicker.vue';
 import {
   parseReportURLParams,
   parseFilterURLParams,
   generateCompleteURLParams,
 } from '../../helpers/reportFilterHelper';
-import { DATE_RANGE_TYPES } from 'dashboard/components/ui/DatePicker/helpers/DatePickerHelper';
+import { DATE_RANGE_TYPES } from 'dashboard/components-next/DatePicker/helpers/DatePickerHelper.js';
 
 const props = defineProps({
   showTeamFilter: {
@@ -254,7 +254,7 @@ onMounted(() => {
 
 <template>
   <div class="flex flex-col flex-wrap w-full gap-3 md:flex-row">
-    <WootDatePicker
+    <DateRangePicker
       v-model:date-range="customDateRange"
       v-model:range-type="selectedDateRange"
       @date-range-changed="onDateRangeChange"

app/javascript/dashboard/routes/dashboard/settings/reports/components/OverviewReportFilters.vue

@@ -3,13 +3,13 @@ import { ref, onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { getUnixStartOfDay, getUnixEndOfDay } from 'helpers/DateHelper';
 import subDays from 'date-fns/subDays';
-import WootDatePicker from 'dashboard/components/ui/DatePicker/DatePicker.vue';
+import DateRangePicker from 'dashboard/components-next/DatePicker/DateRangePicker.vue';
 import ToggleSwitch from 'dashboard/components-next/switch/Switch.vue';
 import {
   generateReportURLParams,
   parseReportURLParams,
 } from '../helpers/reportFilterHelper';
-import { DATE_RANGE_TYPES } from 'dashboard/components/ui/DatePicker/helpers/DatePickerHelper';
+import { DATE_RANGE_TYPES } from 'dashboard/components-next/DatePicker/helpers/DatePickerHelper.js';
 
 defineProps({
   disabled: {
@@ -91,7 +91,7 @@ onMounted(() => {
     :class="{ 'pointer-events-none opacity-50': disabled }"
   >
     <div class="flex flex-col flex-wrap items-start gap-2 md:flex-row">
-      <WootDatePicker
+      <DateRangePicker
         v-model:date-range="customDateRange"
         v-model:range-type="selectedDateRange"
         @date-range-changed="onDateRangeChange"

app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue

@@ -7,10 +7,10 @@ import { getUnixStartOfDay, getUnixEndOfDay } from 'helpers/DateHelper';
 import subDays from 'date-fns/subDays';
 import differenceInDays from 'date-fns/differenceInDays';
 import ActiveFilterChip from './Filters/v3/ActiveFilterChip.vue';
-import WootDatePicker from 'dashboard/components/ui/DatePicker/DatePicker.vue';
+import DateRangePicker from 'dashboard/components-next/DatePicker/DateRangePicker.vue';
 import ToggleSwitch from 'dashboard/components-next/switch/Switch.vue';
 import { GROUP_BY_FILTER } from '../constants';
-import { DATE_RANGE_TYPES } from 'dashboard/components/ui/DatePicker/helpers/DatePickerHelper';
+import { DATE_RANGE_TYPES } from 'dashboard/components-next/DatePicker/helpers/DatePickerHelper.js';
 import {
   generateReportURLParams,
   parseReportURLParams,
@@ -320,7 +320,7 @@ onMounted(() => {
 
 <template>
   <div class="flex flex-col w-full gap-3 lg:flex-row">
-    <WootDatePicker
+    <DateRangePicker
       v-model:date-range="customDateRange"
       v-model:range-type="selectedDateRange"
       @date-range-changed="onDateRangeChange"

app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAReportFilters.vue

@@ -2,7 +2,7 @@
 import { ref, computed, onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import SLAFilter from '../SLA/SLAFilter.vue';
-import WootDatePicker from 'dashboard/components/ui/DatePicker/DatePicker.vue';
+import DateRangePicker from 'dashboard/components-next/DatePicker/DateRangePicker.vue';
 import { subDays, fromUnixTime } from 'date-fns';
 import { getUnixStartOfDay, getUnixEndOfDay } from 'helpers/DateHelper';
 import {
@@ -88,7 +88,7 @@ onMounted(() => {
 
 <template>
   <div class="flex flex-col flex-wrap w-full gap-3 md:flex-row">
-    <WootDatePicker
+    <DateRangePicker
       v-model:date-range="customDateRange"
       v-model:range-type="selectedDateRange"
       @date-range-changed="onDateRangeChange"

app/javascript/dashboard/store/modules/conversations/index.js

@@ -228,10 +228,7 @@ export const mutations = {
   },
 
   [types.ADD_CONVERSATION](_state, conversation) {
-    const exists = _state.allConversations.some(c => c.id === conversation.id);
-    if (!exists) {
-      _state.allConversations.push(conversation);
-    }
+    _state.allConversations.push(conversation);
   },
 
   [types.DELETE_CONVERSATION](_state, conversationId) {

app/javascript/dashboard/store/modules/helpCenterArticles/actions.js

@@ -167,17 +167,7 @@ export const actions = {
     return fileUrl;
   },
 
-  reorder: async (
-    { commit, state },
-    { portalSlug, categorySlug, reorderedGroup }
-  ) => {
-    // Save old positions so we can rollback on failure
-    const oldPositions = Object.keys(reorderedGroup).reduce((map, id) => {
-      map[id] = state.articles.byId[id]?.position;
-      return map;
-    }, {});
-    // Update positions in the store immediately so subsequent mutations preserve correct positions
-    commit(types.SET_ARTICLE_POSITIONS, reorderedGroup);
+  reorder: async (_, { portalSlug, categorySlug, reorderedGroup }) => {
     try {
       await articlesAPI.reorderArticles({
         portalSlug,
@@ -185,8 +175,9 @@ export const actions = {
         categorySlug,
       });
     } catch (error) {
-      commit(types.SET_ARTICLE_POSITIONS, oldPositions);
-      throw error;
+      throwErrorMessage(error);
     }
+
+    return '';
   },
 };

app/javascript/dashboard/store/modules/helpCenterArticles/getters.js

@@ -22,16 +22,6 @@ export const getters = {
       .filter(article => article !== undefined);
     return articles;
   },
-  allArticlesSortedByPosition: (...getterArguments) => {
-    const [state, _getters] = getterArguments;
-    const articles = state.articles.allIds
-      .map(id => _getters.articleById(id))
-      .filter(article => article !== undefined);
-    // Sort by position so reordered articles stay in correct order after store updates
-    return articles.sort(
-      (a, b) => (a.position ?? Infinity) - (b.position ?? Infinity)
-    );
-  },
   articleStatus:
     (...getterArguments) =>
     articleId => {

app/javascript/dashboard/store/modules/helpCenterArticles/mutations.js

@@ -64,18 +64,6 @@ export const mutations = {
       ...uiFlags,
     };
   },
-  [types.SET_ARTICLE_POSITIONS]: ($state, positionsHash) => {
-    const { byId, allIds } = $state.articles;
-    // Update position on each article record
-    Object.entries(positionsHash).forEach(([id, position]) => {
-      if (byId[id]) byId[id] = { ...byId[id], position };
-    });
-    // Re-sort allIds so every consumer sees the new order
-    allIds.sort(
-      (a, b) =>
-        (byId[a]?.position ?? Infinity) - (byId[b]?.position ?? Infinity)
-    );
-  },
   [types.UPDATE_ARTICLE]: ($state, updatedArticle) => {
     const articleId = updatedArticle.id;
     if ($state.articles.byId[articleId]) {

app/javascript/dashboard/store/modules/helpCenterArticles/specs/action.spec.js

@@ -279,63 +279,4 @@ describe('#actions', () => {
       ).rejects.toThrow('Upload failed');
     });
   });
-
-  describe('#reorder', () => {
-    const state = {
-      articles: {
-        byId: {
-          1: { id: 1, title: 'Article 1', position: 10 },
-          2: { id: 2, title: 'Article 2', position: 20 },
-          3: { id: 3, title: 'Article 3', position: 30 },
-        },
-      },
-    };
-
-    it('commits SET_ARTICLE_POSITIONS and calls API when reorder is successful', async () => {
-      axios.post.mockResolvedValue({ data: {} });
-      const reorderedGroup = { 1: 1, 2: 2, 3: 3 };
-
-      await actions.reorder(
-        { commit, state },
-        {
-          portalSlug: 'test-portal',
-          categorySlug: 'test-category',
-          reorderedGroup,
-        }
-      );
-
-      expect(commit).toHaveBeenCalledWith(
-        types.default.SET_ARTICLE_POSITIONS,
-        reorderedGroup
-      );
-      expect(axios.post).toHaveBeenCalledWith(
-        expect.stringContaining('/portals/test-portal/articles/reorder'),
-        { positions_hash: reorderedGroup, category_slug: 'test-category' }
-      );
-    });
-
-    it('rolls back positions and throws when API call fails', async () => {
-      axios.post.mockRejectedValue({ message: 'Network error' });
-      const reorderedGroup = { 1: 1, 2: 2 };
-
-      await expect(
-        actions.reorder(
-          { commit, state },
-          {
-            portalSlug: 'test-portal',
-            reorderedGroup,
-          }
-        )
-      ).rejects.toEqual({ message: 'Network error' });
-
-      expect(commit).toHaveBeenCalledWith(
-        types.default.SET_ARTICLE_POSITIONS,
-        reorderedGroup
-      );
-      expect(commit).toHaveBeenCalledWith(types.default.SET_ARTICLE_POSITIONS, {
-        1: 10,
-        2: 20,
-      });
-    });
-  });
 });

app/javascript/dashboard/store/modules/helpCenterArticles/specs/getters.spec.js

@@ -41,82 +41,4 @@ describe('#getters', () => {
   it('isFetchingArticles', () => {
     expect(getters.isFetching(state)).toEqual(true);
   });
-
-  describe('allArticlesSortedByPosition', () => {
-    it('returns articles sorted by position in ascending order', () => {
-      const stateWithPositions = {
-        ...state,
-        articles: {
-          ...state.articles,
-          byId: {
-            1: { id: 1, title: 'Article 1', position: 3 },
-            2: { id: 2, title: 'Article 2', position: 1 },
-            3: { id: 3, title: 'Article 3', position: 2 },
-          },
-          allIds: [1, 2, 3],
-        },
-      };
-      const boundGetters = {
-        articleById: getters.articleById(stateWithPositions),
-      };
-
-      const result = getters.allArticlesSortedByPosition(
-        stateWithPositions,
-        boundGetters
-      );
-
-      expect(result.map(a => a.id)).toEqual([2, 3, 1]);
-      expect(result.map(a => a.position)).toEqual([1, 2, 3]);
-    });
-
-    it('places articles with null position at the end', () => {
-      const stateWithNullPositions = {
-        ...state,
-        articles: {
-          ...state.articles,
-          byId: {
-            1: { id: 1, title: 'Article 1', position: 1 },
-            2: { id: 2, title: 'Article 2', position: null },
-            3: { id: 3, title: 'Article 3', position: 2 },
-          },
-          allIds: [1, 2, 3],
-        },
-      };
-      const boundGetters = {
-        articleById: getters.articleById(stateWithNullPositions),
-      };
-
-      const result = getters.allArticlesSortedByPosition(
-        stateWithNullPositions,
-        boundGetters
-      );
-
-      expect(result.map(a => a.id)).toEqual([1, 3, 2]);
-    });
-
-    it('handles articles with undefined position', () => {
-      const stateWithUndefinedPositions = {
-        ...state,
-        articles: {
-          ...state.articles,
-          byId: {
-            1: { id: 1, title: 'Article 1', position: 1 },
-            2: { id: 2, title: 'Article 2' },
-            3: { id: 3, title: 'Article 3', position: 2 },
-          },
-          allIds: [1, 2, 3],
-        },
-      };
-      const boundGetters = {
-        articleById: getters.articleById(stateWithUndefinedPositions),
-      };
-
-      const result = getters.allArticlesSortedByPosition(
-        stateWithUndefinedPositions,
-        boundGetters
-      );
-
-      expect(result.map(a => a.id)).toEqual([1, 3, 2]);
-    });
-  });
 });

app/javascript/dashboard/store/modules/helpCenterArticles/specs/mutation.spec.js

@@ -5,7 +5,7 @@ import types from '../../../mutation-types';
 describe('#mutations', () => {
   let state = {};
   beforeEach(() => {
-    state = JSON.parse(JSON.stringify(article));
+    state = article;
   });
 
   describe('#SET_UI_FLAG', () => {
@@ -93,9 +93,9 @@ describe('#mutations', () => {
       mutations[types.ADD_ARTICLE_ID](state, 3);
       expect(state.articles.allIds).toEqual([1, 2, 3]);
     });
-    it('does not add duplicate article id to state', () => {
-      mutations[types.ADD_ARTICLE_ID](state, 1);
-      expect(state.articles.allIds).toEqual([1, 2]);
+    it('Does not invalid article with empty data passed', () => {
+      mutations[types.ADD_ARTICLE_ID](state, {});
+      expect(state).toEqual(article);
     });
   });
 
@@ -154,53 +154,4 @@ describe('#mutations', () => {
       });
     });
   });
-
-  describe('#SET_ARTICLE_POSITIONS', () => {
-    it('updates positions for articles in the store', () => {
-      const positionsHash = { 1: 1, 2: 2 };
-      mutations[types.SET_ARTICLE_POSITIONS](state, positionsHash);
-
-      expect(state.articles.byId[1].position).toEqual(1);
-      expect(state.articles.byId[2].position).toEqual(2);
-    });
-
-    it('does not update articles that are not in the store', () => {
-      const positionsHash = { 999: 5 };
-      mutations[types.SET_ARTICLE_POSITIONS](state, positionsHash);
-
-      expect(state.articles.byId[999]).toBeUndefined();
-    });
-
-    it('preserves other article properties when updating position', () => {
-      const originalTitle = state.articles.byId[1].title;
-      const positionsHash = { 1: 3 };
-      mutations[types.SET_ARTICLE_POSITIONS](state, positionsHash);
-
-      expect(state.articles.byId[1].position).toEqual(3);
-      expect(state.articles.byId[1].title).toEqual(originalTitle);
-    });
-
-    it('re-sorts allIds by position after update', () => {
-      state.articles.byId[1].position = 1;
-      state.articles.byId[2].position = 2;
-      state.articles.allIds = [1, 2];
-
-      mutations[types.SET_ARTICLE_POSITIONS](state, { 1: 3, 2: 1 });
-
-      expect(state.articles.allIds).toEqual([2, 1]);
-    });
-
-    it('UPDATE_ARTICLE preserves reordered position after SET_ARTICLE_POSITIONS', () => {
-      mutations[types.SET_ARTICLE_POSITIONS](state, { 2: 1 });
-      expect(state.articles.byId[2].position).toEqual(1);
-
-      mutations[types.UPDATE_ARTICLE](state, {
-        id: 2,
-        title: 'Updated Title',
-        status: 'published',
-      });
-      expect(state.articles.byId[2].position).toEqual(1);
-      expect(state.articles.byId[2].title).toEqual('Updated Title');
-    });
-  });
 });

app/javascript/dashboard/store/modules/helpCenterCategories/actions.js

@@ -92,23 +92,4 @@ export const actions = {
       });
     }
   },
-
-  reorder: async ({ commit, state }, { portalSlug, reorderedGroup }) => {
-    // Save old positions so we can rollback on failure
-    const oldPositions = Object.keys(reorderedGroup).reduce((map, id) => {
-      map[id] = state.categories.byId[id]?.position;
-      return map;
-    }, {});
-    // Update positions in the store immediately so subsequent mutations preserve correct positions
-    commit(types.SET_CATEGORY_POSITIONS, reorderedGroup);
-    try {
-      await categoriesAPI.reorder({
-        portalSlug,
-        reorderedGroup,
-      });
-    } catch (error) {
-      commit(types.SET_CATEGORY_POSITIONS, oldPositions);
-      throw error;
-    }
-  },
 };

app/javascript/dashboard/store/modules/helpCenterCategories/getters.js

@@ -21,16 +21,6 @@ export const getters = {
     });
     return categories;
   },
-  allCategoriesSortedByPosition: (...getterArguments) => {
-    const [state, _getters] = getterArguments;
-    const categories = state.categories.allIds
-      .map(id => _getters.categoryById(id))
-      .filter(category => category !== undefined);
-    // Sort by position so reordered categories stay in correct order after store updates
-    return categories.sort(
-      (a, b) => (a.position ?? Infinity) - (b.position ?? Infinity)
-    );
-  },
   categoriesByLocaleCode:
     (...getterArguments) =>
     localeCode => {

app/javascript/dashboard/store/modules/helpCenterCategories/mutations.js

@@ -49,18 +49,6 @@ export const mutations = {
       ...uiFlags,
     };
   },
-  [types.SET_CATEGORY_POSITIONS]: ($state, positionsHash) => {
-    const { byId, allIds } = $state.categories;
-    // Update position on each category record
-    Object.entries(positionsHash).forEach(([id, position]) => {
-      if (byId[id]) byId[id] = { ...byId[id], position };
-    });
-    // Re-sort allIds so every consumer sees the new order
-    allIds.sort(
-      (a, b) =>
-        (byId[a]?.position ?? Infinity) - (byId[b]?.position ?? Infinity)
-    );
-  },
   [types.UPDATE_CATEGORY]($state, category) {
     const categoryId = category.id;
 

app/javascript/dashboard/store/modules/helpCenterCategories/specs/actions.spec.js

@@ -161,63 +161,4 @@ describe('#actions', () => {
       ]);
     });
   });
-
-  describe('#reorder', () => {
-    const state = {
-      categories: {
-        byId: {
-          1: { id: 1, name: 'Category 1', position: 10 },
-          2: { id: 2, name: 'Category 2', position: 20 },
-        },
-      },
-    };
-
-    it('commits SET_CATEGORY_POSITIONS and calls API when reorder is successful', async () => {
-      axios.post.mockResolvedValue({ data: {} });
-      const reorderedGroup = { 2: 1, 1: 2 };
-
-      await actions.reorder(
-        { commit, state },
-        {
-          portalSlug: 'room-rental',
-          reorderedGroup,
-        }
-      );
-
-      expect(commit).toHaveBeenCalledWith(
-        types.default.SET_CATEGORY_POSITIONS,
-        reorderedGroup
-      );
-      expect(axios.post).toHaveBeenCalledWith(
-        expect.stringContaining('/portals/room-rental/categories/reorder'),
-        {
-          positions_hash: { 2: 1, 1: 2 },
-        }
-      );
-    });
-
-    it('rolls back positions and throws when API call fails', async () => {
-      axios.post.mockRejectedValue({ message: 'Incorrect header' });
-      const reorderedGroup = { 2: 1, 1: 2 };
-
-      await expect(
-        actions.reorder(
-          { commit, state },
-          {
-            portalSlug: 'room-rental',
-            reorderedGroup,
-          }
-        )
-      ).rejects.toEqual({ message: 'Incorrect header' });
-
-      expect(commit).toHaveBeenCalledWith(
-        types.default.SET_CATEGORY_POSITIONS,
-        reorderedGroup
-      );
-      expect(commit).toHaveBeenCalledWith(
-        types.default.SET_CATEGORY_POSITIONS,
-        { 1: 10, 2: 20 }
-      );
-    });
-  });
 });

app/javascript/dashboard/store/modules/helpCenterCategories/specs/getters.spec.js

@@ -25,82 +25,4 @@ describe('#getters', () => {
   it('isFetchingCategories', () => {
     expect(getters.isFetching(state)).toEqual(true);
   });
-
-  describe('allCategoriesSortedByPosition', () => {
-    it('returns categories sorted by position in ascending order', () => {
-      const stateWithPositions = {
-        ...state,
-        categories: {
-          ...state.categories,
-          byId: {
-            1: { id: 1, name: 'Category 1', position: 3 },
-            2: { id: 2, name: 'Category 2', position: 1 },
-            3: { id: 3, name: 'Category 3', position: 2 },
-          },
-          allIds: [1, 2, 3],
-        },
-      };
-      const boundGetters = {
-        categoryById: getters.categoryById(stateWithPositions),
-      };
-
-      const result = getters.allCategoriesSortedByPosition(
-        stateWithPositions,
-        boundGetters
-      );
-
-      expect(result.map(c => c.id)).toEqual([2, 3, 1]);
-      expect(result.map(c => c.position)).toEqual([1, 2, 3]);
-    });
-
-    it('places categories with null position at the end', () => {
-      const stateWithNullPositions = {
-        ...state,
-        categories: {
-          ...state.categories,
-          byId: {
-            1: { id: 1, name: 'Category 1', position: 1 },
-            2: { id: 2, name: 'Category 2', position: null },
-            3: { id: 3, name: 'Category 3', position: 2 },
-          },
-          allIds: [1, 2, 3],
-        },
-      };
-      const boundGetters = {
-        categoryById: getters.categoryById(stateWithNullPositions),
-      };
-
-      const result = getters.allCategoriesSortedByPosition(
-        stateWithNullPositions,
-        boundGetters
-      );
-
-      expect(result.map(c => c.id)).toEqual([1, 3, 2]);
-    });
-
-    it('handles categories with undefined position', () => {
-      const stateWithUndefinedPositions = {
-        ...state,
-        categories: {
-          ...state.categories,
-          byId: {
-            1: { id: 1, name: 'Category 1', position: 1 },
-            2: { id: 2, name: 'Category 2' },
-            3: { id: 3, name: 'Category 3', position: 2 },
-          },
-          allIds: [1, 2, 3],
-        },
-      };
-      const boundGetters = {
-        categoryById: getters.categoryById(stateWithUndefinedPositions),
-      };
-
-      const result = getters.allCategoriesSortedByPosition(
-        stateWithUndefinedPositions,
-        boundGetters
-      );
-
-      expect(result.map(c => c.id)).toEqual([1, 3, 2]);
-    });
-  });
 });

app/javascript/dashboard/store/modules/helpCenterCategories/specs/mutations.spec.js

@@ -4,7 +4,7 @@ import { categoriesState, categoriesPayload } from './fixtures';
 describe('#mutations', () => {
   let state = {};
   beforeEach(() => {
-    state = JSON.parse(JSON.stringify(categoriesState));
+    state = categoriesState;
   });
 
   describe('#SET_UI_FLAG', () => {
@@ -53,9 +53,9 @@ describe('#mutations', () => {
       mutations[types.ADD_CATEGORY_ID](state, 3);
       expect(state.categories.allIds).toEqual([1, 2, 3]);
     });
-    it('pushes the given id to allIds', () => {
+    it('Does not invalid category with empty data passed', () => {
       mutations[types.ADD_CATEGORY_ID](state, {});
-      expect(state.categories.allIds).toEqual([1, 2, {}]);
+      expect(state).toEqual(categoriesState);
     });
   });
 
@@ -98,40 +98,4 @@ describe('#mutations', () => {
   //     expect(state.categories.uiFlags).toEqual({});
   //   });
   // });
-
-  describe('#SET_CATEGORY_POSITIONS', () => {
-    it('updates positions for categories in the store', () => {
-      const positionsHash = { 1: 1, 2: 2 };
-      mutations[types.SET_CATEGORY_POSITIONS](state, positionsHash);
-
-      expect(state.categories.byId[1].position).toEqual(1);
-      expect(state.categories.byId[2].position).toEqual(2);
-    });
-
-    it('does not update categories that are not in the store', () => {
-      const positionsHash = { 999: 5 };
-      mutations[types.SET_CATEGORY_POSITIONS](state, positionsHash);
-
-      expect(state.categories.byId[999]).toBeUndefined();
-    });
-
-    it('preserves other category properties when updating position', () => {
-      const originalName = state.categories.byId[1].name;
-      const positionsHash = { 1: 3 };
-      mutations[types.SET_CATEGORY_POSITIONS](state, positionsHash);
-
-      expect(state.categories.byId[1].position).toEqual(3);
-      expect(state.categories.byId[1].name).toEqual(originalName);
-    });
-
-    it('re-sorts allIds by position after update', () => {
-      state.categories.byId[1].position = 1;
-      state.categories.byId[2].position = 2;
-      state.categories.allIds = [1, 2];
-
-      mutations[types.SET_CATEGORY_POSITIONS](state, { 1: 3, 2: 1 });
-
-      expect(state.categories.allIds).toEqual([2, 1]);
-    });
-  });
 });

app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js

@@ -975,16 +975,6 @@ describe('#mutations', () => {
       mutations[types.ADD_CONVERSATION](state, conversation);
       expect(state.allConversations).toEqual([conversation]);
     });
-
-    it('should not add a duplicate conversation', () => {
-      const conversation = { id: 1, messages: [] };
-      const state = {
-        allConversations: [conversation],
-      };
-
-      mutations[types.ADD_CONVERSATION](state, { id: 1, messages: [] });
-      expect(state.allConversations).toHaveLength(1);
-    });
   });
 
   describe('#DELETE_CONVERSATION', () => {