Merge branch 'release/4.12.1'

.annotaterb.yml

@@ -1,65 +0,0 @@
----
-:position: before
-:position_in_additional_file_patterns: before
-:position_in_class: before
-:position_in_factory: before
-:position_in_fixture: before
-:position_in_routes: before
-:position_in_serializer: before
-:position_in_test: before
-:classified_sort: true
-:exclude_controllers: true
-:exclude_factories: true
-:exclude_fixtures: true
-:exclude_helpers: true
-:exclude_scaffolds: true
-:exclude_serializers: true
-:exclude_sti_subclasses: false
-:exclude_tests: true
-:force: false
-:format_markdown: false
-:format_rdoc: false
-:format_yard: false
-:frozen: false
-:grouped_polymorphic: false
-:ignore_model_sub_dir: false
-:ignore_unknown_models: false
-:include_version: false
-:show_check_constraints: false
-:show_complete_foreign_keys: false
-:show_foreign_keys: true
-:show_indexes: true
-:show_indexes_include: false
-:simple_indexes: false
-:sort: false
-:timestamp: false
-:trace: false
-:with_comment: true
-:with_column_comments: true
-:with_table_comments: true
-:position_of_column_comment: :with_name
-:active_admin: false
-:command:
-:debug: false
-:hide_default_column_types: json,jsonb,hstore
-:hide_limit_column_types: integer,bigint,boolean
-:timestamp_columns:
-- created_at
-- updated_at
-:ignore_columns:
-:ignore_routes:
-:models: true
-:routes: false
-:skip_on_db_migrate: false
-:target_action: :do_annotations
-:wrapper:
-:wrapper_close:
-:wrapper_open:
-:classes_default_to_s: []
-:additional_file_patterns: []
-:model_dir:
-- app/models
-- enterprise/app/models
-:require: []
-:root_dir:
-- ''

.bundler-audit.yml

@@ -2,8 +2,3 @@
 ignore:
   - CVE-2021-41098 # https://github.com/chatwoot/chatwoot/issues/3097 (update once azure blob storage is updated)
   - GHSA-57hq-95w6-v4fc # Devise confirmable race condition — patched locally in User model (remove once on Devise 5+)
-  # Chatwoot defaults to Active Storage redirect-style URLs, and its recommended
-  # storage setup uses local/cloud storage with optional direct uploads to the
-  # storage provider rather than Rails proxy mode. Revisit if we enable
-  # rails_storage_proxy or other app-served Active Storage proxy routes.
-  - CVE-2026-33658

Gemfile

@@ -40,8 +40,6 @@ gem 'json_refs'
 gem 'rack-attack', '>= 6.7.0'
 # a utility tool for streaming, flexible and safe downloading of remote files
 gem 'down'
-# SSRF-safe URL fetching
-gem 'ssrf_filter', '~> 1.5'
 # authentication type to fetch and send mail over oauth2.0
 gem 'gmail_xoauth'
 # Lock net-smtp to 0.3.4 to avoid issues with gmail_xoauth2

Gemfile.lock

@@ -942,7 +942,6 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     squasher (0.7.2)
-    ssrf_filter (1.5.0)
     stackprof (0.2.25)
     statsd-ruby (1.5.0)
     stripe (18.0.1)
@@ -1159,7 +1158,6 @@ DEPENDENCIES
   spring
   spring-watcher-listen
   squasher
-  ssrf_filter (~> 1.5)
   stackprof
   stripe (~> 18.0)
   telephone_number

VERSION_CW

@@ -1 +1 @@
-4.13.0
+4.12.1

app/builders/email/base_builder.rb

@@ -1,6 +1,4 @@
 class Email::BaseBuilder
-  include EmailAddressParseable
-
   pattr_initialize [:inbox!]
 
   private
@@ -49,4 +47,8 @@ class Email::BaseBuilder
     # can save it in the format "Name <email@domain.com>"
     parse_email(account.support_email)
   end
+
+  def parse_email(email_string)
+    Mail::Address.new(email_string).address
+  end
 end

app/builders/v2/report_builder.rb

@@ -1,7 +1,6 @@
 class V2::ReportBuilder
   include DateRangeHelper
   include ReportHelper
-
   attr_reader :account, :params
 
   DEFAULT_GROUP_BY = 'day'.freeze

app/builders/v2/reports/agent_summary_builder.rb

@@ -11,6 +11,10 @@ class V2::Reports::AgentSummaryBuilder < V2::Reports::BaseSummaryBuilder
   attr_reader :conversations_count, :resolved_count,
               :avg_resolution_time, :avg_first_response_time, :avg_reply_time
 
+  def fetch_conversations_count
+    account.conversations.where(created_at: range).group('assignee_id').count
+  end
+
   def prepare_report
     account.account_users.map do |account_user|
       build_agent_stats(account_user)

app/builders/v2/reports/base_summary_builder.rb

@@ -9,13 +9,37 @@ class V2::Reports::BaseSummaryBuilder
   private
 
   def load_data
-    results = data_source.summary
+    @conversations_count = fetch_conversations_count
+    load_reporting_events_data
+  end
 
-    @conversations_count = results.transform_values { |data| data[:conversations_count] }
-    @resolved_count = results.transform_values { |data| data[:resolved_conversations_count] }
-    @avg_resolution_time = results.transform_values { |data| data[:avg_resolution_time] }
-    @avg_first_response_time = results.transform_values { |data| data[:avg_first_response_time] }
-    @avg_reply_time = results.transform_values { |data| data[:avg_reply_time] }
+  def load_reporting_events_data
+    # Extract the column name for indexing (e.g., 'conversations.team_id' -> 'team_id')
+    index_key = group_by_key.to_s.split('.').last
+
+    results = reporting_events
+              .select(
+                "#{group_by_key} as #{index_key}",
+                "COUNT(CASE WHEN name = 'conversation_resolved' THEN 1 END) as resolved_count",
+                "AVG(CASE WHEN name = 'conversation_resolved' THEN #{average_value_key} END) as avg_resolution_time",
+                "AVG(CASE WHEN name = 'first_response' THEN #{average_value_key} END) as avg_first_response_time",
+                "AVG(CASE WHEN name = 'reply_time' THEN #{average_value_key} END) as avg_reply_time"
+              )
+              .group(group_by_key)
+              .index_by { |record| record.public_send(index_key) }
+
+    @resolved_count = results.transform_values(&:resolved_count)
+    @avg_resolution_time = results.transform_values(&:avg_resolution_time)
+    @avg_first_response_time = results.transform_values(&:avg_first_response_time)
+    @avg_reply_time = results.transform_values(&:avg_reply_time)
+  end
+
+  def reporting_events
+    @reporting_events ||= account.reporting_events.where(created_at: range)
+  end
+
+  def fetch_conversations_count
+    # Override this method
   end
 
   def group_by_key
@@ -26,26 +50,7 @@ class V2::Reports::BaseSummaryBuilder
     # Override this method
   end
 
-  def data_source
-    @data_source ||= Reports::DataSource.for(
-      account: account,
-      metric: nil,
-      dimension_type: summary_dimension_type,
-      dimension_id: nil,
-      scope: nil,
-      range: range,
-      group_by: 'day',
-      timezone_offset: params[:timezone_offset],
-      business_hours: params[:business_hours]
-    )
-  end
-
-  def summary_dimension_type
-    {
-      'account_id' => 'account',
-      'user_id' => 'agent',
-      'inbox_id' => 'inbox',
-      'conversations.team_id' => 'team'
-    }.fetch(group_by_key.to_s)
+  def average_value_key
+    ActiveModel::Type::Boolean.new.cast(params[:business_hours]).present? ? :value_in_business_hours : :value
   end
 end

app/builders/v2/reports/conversations/base_report_builder.rb

@@ -3,10 +3,23 @@ class V2::Reports::Conversations::BaseReportBuilder
 
   private
 
-  def builder_class(metric)
-    return unless Reports::ReportMetricRegistry.supported?(metric)
+  AVG_METRICS = %w[avg_first_response_time avg_resolution_time reply_time].freeze
+  COUNT_METRICS = %w[
+    conversations_count
+    incoming_messages_count
+    outgoing_messages_count
+    resolutions_count
+    bot_resolutions_count
+    bot_handoffs_count
+  ].freeze
 
-    V2::Reports::Timeseries::ReportBuilder
+  def builder_class(metric)
+    case metric
+    when *AVG_METRICS
+      V2::Reports::Timeseries::AverageReportBuilder
+    when *COUNT_METRICS
+      V2::Reports::Timeseries::CountReportBuilder
+    end
   end
 
   def log_invalid_metric

app/builders/v2/reports/inbox_summary_builder.rb

@@ -11,6 +11,15 @@ class V2::Reports::InboxSummaryBuilder < V2::Reports::BaseSummaryBuilder
   attr_reader :conversations_count, :resolved_count,
               :avg_resolution_time, :avg_first_response_time, :avg_reply_time
 
+  def load_data
+    @conversations_count = fetch_conversations_count
+    load_reporting_events_data
+  end
+
+  def fetch_conversations_count
+    account.conversations.where(created_at: range).group(group_by_key).count
+  end
+
   def prepare_report
     account.inboxes.map do |inbox|
       build_inbox_stats(inbox)
@@ -31,4 +40,8 @@ class V2::Reports::InboxSummaryBuilder < V2::Reports::BaseSummaryBuilder
   def group_by_key
     :inbox_id
   end
+
+  def average_value_key
+    ActiveModel::Type::Boolean.new.cast(params[:business_hours]) ? :value_in_business_hours : :value
+  end
 end

app/builders/v2/reports/team_summary_builder.rb

@@ -6,6 +6,14 @@ class V2::Reports::TeamSummaryBuilder < V2::Reports::BaseSummaryBuilder
   attr_reader :conversations_count, :resolved_count,
               :avg_resolution_time, :avg_first_response_time, :avg_reply_time
 
+  def fetch_conversations_count
+    account.conversations.where(created_at: range).group(:team_id).count
+  end
+
+  def reporting_events
+    @reporting_events ||= account.reporting_events.where(created_at: range).joins(:conversation)
+  end
+
   def prepare_report
     account.teams.map do |team|
       build_team_stats(team)

app/builders/v2/reports/timeseries/average_report_builder.rb

@@ -0,0 +1,48 @@
+class V2::Reports::Timeseries::AverageReportBuilder < V2::Reports::Timeseries::BaseTimeseriesBuilder
+  def timeseries
+    grouped_average_time = reporting_events.average(average_value_key)
+    grouped_event_count = reporting_events.count
+    grouped_average_time.each_with_object([]) do |element, arr|
+      event_date, average_time = element
+      arr << {
+        value: average_time,
+        timestamp: event_date.in_time_zone(timezone).to_i,
+        count: grouped_event_count[event_date]
+      }
+    end
+  end
+
+  def aggregate_value
+    object_scope.average(average_value_key)
+  end
+
+  private
+
+  def event_name
+    metric_to_event_name = {
+      avg_first_response_time: :first_response,
+      avg_resolution_time: :conversation_resolved,
+      reply_time: :reply_time
+    }
+    metric_to_event_name[params[:metric].to_sym]
+  end
+
+  def object_scope
+    scope.reporting_events.where(name: event_name, created_at: range, account_id: account.id)
+  end
+
+  def reporting_events
+    @grouped_values = object_scope.group_by_period(
+      group_by,
+      :created_at,
+      default_value: 0,
+      range: range,
+      permit: %w[day week month year hour],
+      time_zone: timezone
+    )
+  end
+
+  def average_value_key
+    @average_value_key ||= params[:business_hours].present? ? :value_in_business_hours : :value
+  end
+end

app/builders/v2/reports/timeseries/base_timeseries_builder.rb

@@ -1,13 +1,12 @@
 class V2::Reports::Timeseries::BaseTimeseriesBuilder
   include TimezoneHelper
   include DateRangeHelper
-
   DEFAULT_GROUP_BY = 'day'.freeze
 
   pattr_initialize :account, :params
 
   def scope
-    case dimension_type.to_sym
+    case params[:type].to_sym
     when :account
       account
     when :inbox
@@ -21,20 +20,6 @@ class V2::Reports::Timeseries::BaseTimeseriesBuilder
     end
   end
 
-  def data_source
-    @data_source ||= Reports::DataSource.for(
-      account: account,
-      metric: params[:metric],
-      dimension_type: dimension_type,
-      dimension_id: params[:id],
-      scope: scope,
-      range: range,
-      group_by: group_by,
-      timezone_offset: params[:timezone_offset],
-      business_hours: params[:business_hours]
-    )
-  end
-
   def inbox
     @inbox ||= account.inboxes.find(params[:id])
   end
@@ -58,10 +43,4 @@ class V2::Reports::Timeseries::BaseTimeseriesBuilder
   def timezone
     @timezone ||= timezone_name_from_offset(params[:timezone_offset])
   end
-
-  private
-
-  def dimension_type
-    (params[:type].presence || 'account').to_s
-  end
 end

app/builders/v2/reports/timeseries/count_report_builder.rb

@@ -0,0 +1,78 @@
+class V2::Reports::Timeseries::CountReportBuilder < V2::Reports::Timeseries::BaseTimeseriesBuilder
+  def timeseries
+    grouped_count.each_with_object([]) do |element, arr|
+      event_date, event_count = element
+
+      # The `event_date` is in Date format (without time), such as "Wed, 15 May 2024".
+      # We need a timestamp for the start of the day. However, we can't use `event_date.to_time.to_i`
+      # because it converts the date to 12:00 AM server timezone.
+      # The desired output should be 12:00 AM in the specified timezone.
+      arr << { value: event_count, timestamp: event_date.in_time_zone(timezone).to_i }
+    end
+  end
+
+  def aggregate_value
+    object_scope.count
+  end
+
+  private
+
+  def metric
+    @metric ||= params[:metric]
+  end
+
+  def object_scope
+    send("scope_for_#{metric}")
+  end
+
+  def scope_for_conversations_count
+    scope.conversations.where(account_id: account.id, created_at: range)
+  end
+
+  def scope_for_incoming_messages_count
+    scope.messages.where(account_id: account.id, created_at: range).incoming.unscope(:order)
+  end
+
+  def scope_for_outgoing_messages_count
+    scope.messages.where(account_id: account.id, created_at: range).outgoing.unscope(:order)
+  end
+
+  def scope_for_resolutions_count
+    scope.reporting_events.where(
+      name: :conversation_resolved,
+      account_id: account.id,
+      created_at: range
+    )
+  end
+
+  def scope_for_bot_resolutions_count
+    scope.reporting_events.where(
+      name: :conversation_bot_resolved,
+      account_id: account.id,
+      created_at: range
+    )
+  end
+
+  def scope_for_bot_handoffs_count
+    scope.reporting_events.joins(:conversation).select(:conversation_id).where(
+      name: :conversation_bot_handoff,
+      account_id: account.id,
+      created_at: range
+    ).distinct
+  end
+
+  def grouped_count
+    # IMPORTANT: time_zone parameter affects both data grouping AND output timestamps
+    # It converts timestamps to the target timezone before grouping, which means
+    # the same event can fall into different day buckets depending on timezone
+    # Example: 2024-01-15 00:00 UTC becomes 2024-01-14 16:00 PST (falls on different day)
+    @grouped_values = object_scope.group_by_period(
+      group_by,
+      :created_at,
+      default_value: 0,
+      range: range,
+      permit: %w[day week month year hour],
+      time_zone: timezone
+    ).count
+  end
+end

app/builders/v2/reports/timeseries/report_builder.rb

@@ -1,9 +0,0 @@
-class V2::Reports::Timeseries::ReportBuilder < V2::Reports::Timeseries::BaseTimeseriesBuilder
-  def timeseries
-    data_source.timeseries
-  end
-
-  def aggregate_value
-    data_source.aggregate
-  end
-end

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

@@ -34,10 +34,6 @@ class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
     @agent_bot.reload
   end
 
-  def reset_secret
-    @agent_bot.reset_secret!
-  end
-
   private
 
   def agent_bot

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

@@ -116,8 +116,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     # High-traffic accounts generate excessive DB writes when agents frequently switch between conversations.
     # Throttle last_seen updates to once per hour when there are no unread messages to reduce DB load.
     # Always update immediately if there are unread messages to maintain accurate read/unread state.
-    # Visiting a conversation should clear any unread inbox notifications for this conversation.
-    Notification::MarkConversationReadService.new(user: Current.user, account: Current.account, conversation: @conversation).perform
     return update_last_seen_on_conversation(DateTime.now.utc, true) if assignee? && @conversation.assignee_unread_messages.any?
     return update_last_seen_on_conversation(DateTime.now.utc, false) if !assignee? && @conversation.unread_messages.any?
 

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

@@ -66,12 +66,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     head :ok
   end
 
-  def reset_secret
-    return head :not_found unless @inbox.api?
-
-    @inbox.channel.reset_secret!
-  end
-
   def destroy
     ::DeleteObjectJob.perform_later(@inbox, Current.user, request.ip) if @inbox.present?
     render status: :ok, json: { message: I18n.t('messages.inbox_deletetion_response') }

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

@@ -5,7 +5,7 @@ class Api::V1::Accounts::UploadController < Api::V1::Accounts::BaseController
              elsif params[:external_url].present?
                create_from_url
              else
-               render_error(I18n.t('errors.upload.missing_input'), :unprocessable_entity)
+               render_error('No file or URL provided', :unprocessable_entity)
              end
 
     render_success(result) if result.is_a?(ActiveStorage::Blob)
@@ -19,21 +19,35 @@ class Api::V1::Accounts::UploadController < Api::V1::Accounts::BaseController
   end
 
   def create_from_url
-    SafeFetch.fetch(params[:external_url].to_s) do |result|
-      create_and_save_blob(result.tempfile, result.filename, result.content_type)
+    uri = parse_uri(params[:external_url])
+    return if performed?
+
+    fetch_and_process_file_from_uri(uri)
+  end
+
+  def parse_uri(url)
+    uri = URI.parse(url)
+    validate_uri(uri)
+    uri
+  rescue URI::InvalidURIError, SocketError
+    render_error('Invalid URL provided', :unprocessable_entity)
+    nil
+  end
+
+  def validate_uri(uri)
+    raise URI::InvalidURIError unless uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
+  end
+
+  def fetch_and_process_file_from_uri(uri)
+    uri.open do |file|
+      create_and_save_blob(file, File.basename(uri.path), file.content_type)
     end
-  rescue SafeFetch::HttpError => e
-    render_error(I18n.t('errors.upload.fetch_failed_with_message', message: e.message), :unprocessable_entity)
-  rescue SafeFetch::FetchError
-    render_error(I18n.t('errors.upload.fetch_failed'), :unprocessable_entity)
-  rescue SafeFetch::FileTooLargeError
-    render_error(I18n.t('errors.upload.file_too_large'), :unprocessable_entity)
-  rescue SafeFetch::UnsupportedContentTypeError
-    render_error(I18n.t('errors.upload.unsupported_content_type'), :unprocessable_entity)
-  rescue SafeFetch::Error
-    render_error(I18n.t('errors.upload.invalid_url'), :unprocessable_entity)
+  rescue OpenURI::HTTPError => e
+    render_error("Failed to fetch file from URL: #{e.message}", :unprocessable_entity)
+  rescue SocketError
+    render_error('Invalid URL provided', :unprocessable_entity)
   rescue StandardError
-    render_error(I18n.t('errors.upload.unexpected'), :internal_server_error)
+    render_error('An unexpected error occurred', :internal_server_error)
   end
 
   def create_and_save_blob(io, filename, content_type)

app/controllers/api/v1/accounts_controller.rb

@@ -30,20 +30,9 @@ class Api::V1::AccountsController < Api::BaseController
       locale: account_params[:locale],
       user: current_user
     ).perform
-    enqueue_branding_enrichment
     if @user
-      # Authenticated users (dashboard "add account") and api_only signups
-      # need the full response with account_id. API-only deployments have no
-      # frontend to handle the email confirmation flow, so they need auth
-      # tokens to proceed.
-      # Unauthenticated web signup returns only the email — no session is
-      # created until the user confirms via the email link.
-      if current_user || api_only_signup?
-        send_auth_headers(@user)
-        render 'api/v1/accounts/create', format: :json, locals: { resource: @user }
-      else
-        render json: { email: @user.email }
-      end
+      send_auth_headers(@user)
+      render 'api/v1/accounts/create', format: :json, locals: { resource: @user }
     else
       render_error_response(CustomExceptions::Account::SignupFailed.new({}))
     end
@@ -70,16 +59,6 @@ class Api::V1::AccountsController < Api::BaseController
 
   private
 
-  def enqueue_branding_enrichment
-    return if account_params[:email].blank?
-
-    Account::BrandingEnrichmentJob.perform_later(@account.id, account_params[:email])
-    Redis::Alfred.set(format(Redis::Alfred::ACCOUNT_ONBOARDING_ENRICHMENT, account_id: @account.id), '1', ex: 30)
-  rescue StandardError => e
-    # Enrichment is optional — never let queue/Redis failures abort signup
-    ChatwootExceptionTracker.new(e).capture_exception
-  end
-
   def ensure_account_name
     # ensure that account_name and user_full_name is present
     # this is becuase the account builder and the models validations are not triggered
@@ -124,15 +103,6 @@ class Api::V1::AccountsController < Api::BaseController
     raise ActionController::RoutingError, 'Not Found' unless GlobalConfigService.account_signup_enabled?
   end
 
-  def api_only_signup?
-    # CW_API_ONLY_SERVER is the canonical flag for API-only deployments.
-    # ENABLE_ACCOUNT_SIGNUP='api_only' is a legacy sentinel for the same purpose.
-    # Read ENABLE_ACCOUNT_SIGNUP raw from InstallationConfig because GlobalConfig.get
-    # typecasts it to boolean, coercing 'api_only' to true.
-    ActiveModel::Type::Boolean.new.cast(ENV.fetch('CW_API_ONLY_SERVER', false)) ||
-      InstallationConfig.find_by(name: 'ENABLE_ACCOUNT_SIGNUP')&.value.to_s == 'api_only'
-  end
-
   def validate_captcha
     raise ActionController::InvalidAuthenticityToken, 'Invalid Captcha' unless ChatwootCaptcha.new(params[:h_captcha_client_response]).valid?
   end

app/controllers/api/v1/profile/mfa_controller.rb

@@ -2,8 +2,8 @@ class Api::V1::Profile::MfaController < Api::BaseController
   before_action :check_mfa_feature_available
   before_action :check_mfa_enabled, only: [:destroy, :backup_codes]
   before_action :check_mfa_disabled, only: [:create, :verify]
-  before_action :validate_password, only: [:destroy]
   before_action :validate_otp, only: [:verify, :backup_codes, :destroy]
+  before_action :validate_password, only: [:destroy]
 
   def show; end
 
@@ -48,8 +48,7 @@ class Api::V1::Profile::MfaController < Api::BaseController
   def validate_otp
     authenticated = Mfa::AuthenticationService.new(
       user: current_user,
-      otp_code: mfa_params[:otp_code],
-      backup_code: mfa_params[:backup_code]
+      otp_code: mfa_params[:otp_code]
     ).authenticate
 
     return if authenticated
@@ -64,6 +63,6 @@ class Api::V1::Profile::MfaController < Api::BaseController
   end
 
   def mfa_params
-    params.permit(:otp_code, :backup_code, :password)
+    params.permit(:otp_code, :password)
   end
 end

app/controllers/api/v1/widget/messages_controller.rb

@@ -43,15 +43,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
   end
 
   def set_conversation
-    return unless conversation.nil?
-
-    @conversation = create_conversation
-    apply_labels if permitted_params[:labels].present?
-  end
-
-  def apply_labels
-    valid_labels = inbox.account.labels.where(title: permitted_params[:labels]).pluck(:title)
-    @conversation.update_labels(valid_labels) if valid_labels.present?
+    @conversation = create_conversation if conversation.nil?
   end
 
   def message_finder_params
@@ -72,14 +64,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
 
   def permitted_params
     # timestamp parameter is used in create conversation method
-    # custom_attributes and labels are applied when a new conversation is created alongside the first message
-    params.permit(
-      :id, :before, :after, :website_token,
-      contact: [:name, :email],
-      message: [:content, :referer_url, :timestamp, :echo_id, :reply_to],
-      custom_attributes: {},
-      labels: []
-    )
+    params.permit(:id, :before, :after, :website_token, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id, :reply_to])
   end
 
   def set_message

app/controllers/api/v2/accounts/summary_reports_controller.rb

@@ -3,15 +3,15 @@ class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseContr
   before_action :prepare_builder_params, only: [:agent, :team, :inbox, :label, :channel]
 
   def agent
-    render_report_with(V2::Reports::AgentSummaryBuilder, type: :agent)
+    render_report_with(V2::Reports::AgentSummaryBuilder)
   end
 
   def team
-    render_report_with(V2::Reports::TeamSummaryBuilder, type: :team)
+    render_report_with(V2::Reports::TeamSummaryBuilder)
   end
 
   def inbox
-    render_report_with(V2::Reports::InboxSummaryBuilder, type: :inbox)
+    render_report_with(V2::Reports::InboxSummaryBuilder)
   end
 
   def label
@@ -38,9 +38,8 @@ class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseContr
     }
   end
 
-  def render_report_with(builder_class, type: nil)
-    builder_params = type.present? ? @builder_params.merge(type: type) : @builder_params
-    builder = builder_class.new(account: Current.account, params: builder_params)
+  def render_report_with(builder_class)
+    builder = builder_class.new(account: Current.account, params: @builder_params)
     render json: builder.build
   end
 

app/controllers/auth/resend_confirmations_controller.rb

@@ -1,18 +0,0 @@
-# Unauthenticated endpoint for resending confirmation emails during signup.
-# This is a standalone controller (not on DeviseOverrides::ConfirmationsController)
-# because OmniAuth middleware intercepts all POST /auth/* routes as provider
-# callbacks, and Devise controller filters cause 307 redirects for custom actions.
-# Inherits from ActionController::API to avoid both issues entirely.
-# Rate-limited by Rack::Attack (IP + email) and gated by hCaptcha.
-class Auth::ResendConfirmationsController < ActionController::API
-  def create
-    return head(:ok) unless ChatwootCaptcha.new(params[:h_captcha_client_response]).valid?
-
-    email = params[:email]
-    return head(:ok) unless email.is_a?(String)
-
-    user = User.from_email(email.strip.downcase)
-    user&.send_confirmation_instructions unless user&.confirmed?
-    head :ok
-  end
-end

app/controllers/devise_overrides/omniauth_callbacks_controller.rb

@@ -10,12 +10,7 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
   private
 
   def sign_in_user
-    # Capture before skip_confirmation! sets confirmed_at, which would
-    # make oauth_user_needs_password_reset? return false and skip the
-    # password reset for persisted unconfirmed users.
-    needs_password_reset = oauth_user_needs_password_reset?
     @resource.skip_confirmation! if confirmable_enabled?
-    set_random_password_if_oauth_user if needs_password_reset
 
     # once the resource is found and verified
     # we can just send them to the login page again with the SSO params
@@ -25,10 +20,7 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
   end
 
   def sign_in_user_on_mobile
-    # See comment in sign_in_user for why this is captured before skip_confirmation!
-    needs_password_reset = oauth_user_needs_password_reset?
     @resource.skip_confirmation! if confirmable_enabled?
-    set_random_password_if_oauth_user if needs_password_reset
 
     # once the resource is found and verified
     # we can just send them to the login page again with the SSO params
@@ -45,7 +37,6 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
     return redirect_to login_page_url(error: 'business-account-only') unless validate_signup_email_is_business_domain?
 
     create_account_for_user
-    set_random_password_if_oauth_user
     token = @resource.send(:set_reset_password_token)
     frontend_url = ENV.fetch('FRONTEND_URL', nil)
     redirect_to "#{frontend_url}/app/auth/password/edit?config=default&reset_password_token=#{token}"
@@ -90,15 +81,6 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
     Avatar::AvatarFromUrlJob.perform_later(@resource, auth_hash['info']['image'])
   end
 
-  def oauth_user_needs_password_reset?
-    @resource.present? && (@resource.new_record? || !@resource.confirmed?)
-  end
-
-  def set_random_password_if_oauth_user
-    # Password must satisfy secure_password requirements (uppercase, lowercase, number, special char)
-    @resource.update(password: "#{SecureRandom.hex(16)}aA1!") if @resource.persisted?
-  end
-
   def default_devise_mapping
     'user'
   end

app/controllers/public/api/v1/portals/articles_controller.rb

@@ -1,7 +1,6 @@
 class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::BaseController
   before_action :ensure_custom_domain_request, only: [:show, :index]
   before_action :portal
-  before_action :ensure_portal_feature_enabled
   before_action :set_category, except: [:index, :show, :tracking_pixel]
   before_action :set_article, only: [:show]
   layout 'portal'
@@ -62,7 +61,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
 
   def set_article
     @article = @portal.articles.find_by(slug: permitted_params[:article_slug])
-    @parsed_content = render_article_content(@article.content.to_s)
+    @parsed_content = render_article_content(@article.content)
   end
 
   def set_category

app/controllers/public/api/v1/portals/categories_controller.rb

@@ -1,7 +1,6 @@
 class Public::Api::V1::Portals::CategoriesController < Public::Api::V1::Portals::BaseController
   before_action :ensure_custom_domain_request, only: [:show, :index]
   before_action :portal
-  before_action :ensure_portal_feature_enabled
   before_action :set_category, only: [:show]
   layout 'portal'
 

app/controllers/public/api/v1/portals_controller.rb

@@ -1,8 +1,7 @@
 class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseController
   before_action :ensure_custom_domain_request, only: [:show]
-  before_action :redirect_to_portal_with_locale, only: [:show]
   before_action :portal
-  before_action :ensure_portal_feature_enabled
+  before_action :redirect_to_portal_with_locale, only: [:show]
   layout 'portal'
 
   def show
@@ -25,7 +24,6 @@ class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseControl
   def redirect_to_portal_with_locale
     return if params[:locale].present?
 
-    portal
     redirect_to "/hc/#{@portal.slug}/#{@portal.default_locale}"
   end
 end

app/controllers/public_controller.rb

@@ -18,11 +18,4 @@ class PublicController < ActionController::Base
       Please send us an email at support@chatwoot.com with the custom domain name and account API key"
     }, status: :unauthorized and return
   end
-
-  def ensure_portal_feature_enabled
-    return unless ChatwootApp.chatwoot_cloud?
-    return if @portal.account.feature_enabled?('help_center')
-
-    render 'public/api/v1/portals/not_active', status: :payment_required
-  end
 end

app/javascript/dashboard/App.vue

@@ -5,7 +5,6 @@ import NetworkNotification from './components/NetworkNotification.vue';
 import UpdateBanner from './components/app/UpdateBanner.vue';
 import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
 import PendingEmailVerificationBanner from './components/app/PendingEmailVerificationBanner.vue';
-import LowBackupCodesBanner from './components/app/LowBackupCodesBanner.vue';
 import vueActionCable from './helper/actionCable';
 import { useRouter } from 'vue-router';
 import { useStore } from 'dashboard/composables/store';
@@ -31,7 +30,6 @@ export default {
     PaymentPendingBanner,
     WootSnackbarBox,
     PendingEmailVerificationBanner,
-    LowBackupCodesBanner,
   },
   setup() {
     const router = useRouter();
@@ -100,9 +98,7 @@ export default {
       mql.onchange = e => setColorTheme(e.matches);
     },
     setLocale(locale) {
-      if (locale) {
-        this.$root.$i18n.locale = locale;
-      }
+      this.$root.$i18n.locale = locale;
     },
     async initializeAccount() {
       await this.$store.dispatch('accounts/get');
@@ -142,7 +138,6 @@ export default {
     <template v-if="currentAccountId">
       <PendingEmailVerificationBanner v-if="hideOnOnboardingView" />
       <PaymentPendingBanner v-if="hideOnOnboardingView" />
-      <LowBackupCodesBanner v-if="hideOnOnboardingView" />
     </template>
     <router-view v-slot="{ Component }">
       <transition name="fade" mode="out-in">

app/javascript/dashboard/api/agentBots.js

@@ -25,10 +25,6 @@ class AgentBotsAPI extends ApiClient {
   resetAccessToken(botId) {
     return axios.post(`${this.url}/${botId}/reset_access_token`);
   }
-
-  resetSecret(botId) {
-    return axios.post(`${this.url}/${botId}/reset_secret`);
-  }
 }
 
 export default new AgentBotsAPI();

app/javascript/dashboard/api/captain/customTools.js

@@ -31,12 +31,6 @@ class CaptainCustomTools extends ApiClient {
   delete(id) {
     return axios.delete(`${this.url}/${id}`);
   }
-
-  test(data = {}) {
-    return axios.post(`${this.url}/test`, {
-      custom_tool: data,
-    });
-  }
 }
 
 export default new CaptainCustomTools();

app/javascript/dashboard/api/inboxes.js

@@ -48,10 +48,6 @@ class Inboxes extends CacheEnabledApiClient {
       template,
     });
   }
-
-  resetSecret(inboxId) {
-    return axios.post(`${this.url}/${inboxId}/reset_secret`);
-  }
 }
 
 export default new Inboxes();

app/javascript/dashboard/api/mfa.js

@@ -14,9 +14,9 @@ class MfaAPI extends ApiClient {
     return axios.post(`${this.url}/verify`, { otp_code: otpCode });
   }
 
-  disable(password, { otpCode, backupCode } = {}) {
+  disable(password, otpCode) {
     return axios.delete(this.url, {
-      data: { password, otp_code: otpCode, backup_code: backupCode },
+      data: { password, otp_code: otpCode },
     });
   }
 

app/javascript/dashboard/assets/scss/_base.scss

@@ -106,10 +106,6 @@ select {
   &[disabled] {
     @apply field-disabled;
   }
-
-  option:not(:disabled) {
-    @apply bg-n-solid-2 text-n-slate-12;
-  }
 }
 
 // Textarea

app/javascript/dashboard/components-next/AssignmentPolicy/components/ExclusionRules.vue

@@ -20,11 +20,11 @@ const excludedLabels = defineModel('excludedLabels', {
 
 const excludeOlderThanMinutes = defineModel('excludeOlderThanMinutes', {
   type: Number,
-  default: null,
+  default: 10,
 });
 
-// Duration limits: 1 minute to 999 days (in minutes)
-const MIN_DURATION_MINUTES = 1;
+// Duration limits: 10 minutes to 999 days (in minutes)
+const MIN_DURATION_MINUTES = 10;
 const MAX_DURATION_MINUTES = 1438560; // 999 days * 24 hours * 60 minutes
 
 const { t } = useI18n();

app/javascript/dashboard/components-next/AssignmentPolicy/components/InboxCapacityLimits.vue

@@ -27,7 +27,7 @@ const { t } = useI18n();
 
 const BASE_KEY = 'ASSIGNMENT_POLICY.AGENT_CAPACITY_POLICY';
 const DEFAULT_CONVERSATION_LIMIT = 10;
-const MIN_CONVERSATION_LIMIT = 0;
+const MIN_CONVERSATION_LIMIT = 1;
 const MAX_CONVERSATION_LIMIT = 100000;
 
 const selectedInboxIds = computed(
@@ -42,7 +42,6 @@ const availableInboxes = computed(() =>
 
 const isLimitValid = limit => {
   return (
-    Number.isInteger(limit.conversationLimit) &&
     limit.conversationLimit >= MIN_CONVERSATION_LIMIT &&
     limit.conversationLimit <= MAX_CONVERSATION_LIMIT
   );

app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue

@@ -107,10 +107,11 @@ const closeMobileSidebar = () => {
                 size="sm"
               />
               <ComposeConversation :contact-id="contactId">
-                <template #trigger>
+                <template #trigger="{ toggle }">
                   <Button
                     :label="$t('CONTACTS_LAYOUT.HEADER.SEND_MESSAGE')"
                     size="sm"
+                    @click="toggle"
                   />
                 </template>
               </ComposeConversation>

app/javascript/dashboard/components-next/Contacts/ContactsHeader/ContactHeader.vue

@@ -114,8 +114,8 @@ const emit = defineEmits([
           </div>
           <div class="w-px h-4 bg-n-strong" />
           <ComposeConversation>
-            <template #trigger>
-              <Button :label="buttonLabel" size="sm" />
+            <template #trigger="{ toggle }">
+              <Button :label="buttonLabel" size="sm" @click="toggle" />
             </template>
           </ComposeConversation>
         </div>

app/javascript/dashboard/components-next/Contacts/ContactsListLayout.vue

@@ -103,7 +103,6 @@ const showPagination = computed(() => {
           <ContactsActiveFiltersPreview
             v-if="showActiveFiltersPreview"
             :active-segment="activeSegment"
-            class="mb-1"
             @clear-filters="emit('clearFilters')"
             @open-filter="openFilter"
           />

app/javascript/dashboard/components-next/Conversation/ConversationCard/CardPriorityIcon.vue

@@ -1,63 +1,207 @@
 <script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { CONVERSATION_PRIORITY } from 'shared/constants/messages';
 
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-
-const props = defineProps({
+defineProps({
   priority: {
     type: String,
     default: '',
   },
-  showEmpty: {
-    type: Boolean,
-    default: false,
-  },
-});
-const { t } = useI18n();
-
-const icons = {
-  [CONVERSATION_PRIORITY.URGENT]: 'i-woot-priority-urgent',
-  [CONVERSATION_PRIORITY.HIGH]: 'i-woot-priority-high',
-  [CONVERSATION_PRIORITY.MEDIUM]: 'i-woot-priority-medium',
-  [CONVERSATION_PRIORITY.LOW]: 'i-woot-priority-low',
-};
-
-const priorityLabels = {
-  [CONVERSATION_PRIORITY.URGENT]: 'CONVERSATION.PRIORITY.OPTIONS.URGENT',
-  [CONVERSATION_PRIORITY.HIGH]: 'CONVERSATION.PRIORITY.OPTIONS.HIGH',
-  [CONVERSATION_PRIORITY.MEDIUM]: 'CONVERSATION.PRIORITY.OPTIONS.MEDIUM',
-  [CONVERSATION_PRIORITY.LOW]: 'CONVERSATION.PRIORITY.OPTIONS.LOW',
-};
-
-const iconName = computed(() => {
-  if (props.priority && icons[props.priority]) {
-    return icons[props.priority];
-  }
-  return props.showEmpty ? 'i-woot-priority-empty' : '';
-});
-
-const tooltipContent = computed(() => {
-  if (props.priority && priorityLabels[props.priority]) {
-    return t(priorityLabels[props.priority]);
-  }
-
-  if (props.showEmpty) {
-    return t('CONVERSATION.PRIORITY.OPTIONS.NONE');
-  }
-
-  return '';
 });
 </script>
 
+<!-- eslint-disable vue/no-static-inline-styles -->
 <template>
-  <Icon
-    v-tooltip.top="{
-      content: tooltipContent,
-      delay: { show: 500, hide: 0 },
-    }"
-    :icon="iconName"
-    class="size-4 text-n-slate-5"
-  />
+  <div class="inline-flex items-center justify-center rounded-md">
+    <!-- Low Priority -->
+    <svg
+      v-if="priority === CONVERSATION_PRIORITY.LOW"
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <mask
+        id="mask0_2030_12879"
+        style="mask-type: alpha"
+        maskUnits="userSpaceOnUse"
+        x="0"
+        y="0"
+        width="20"
+        height="20"
+      >
+        <rect width="20" height="20" fill="#D9D9D9" />
+      </mask>
+      <g mask="url(#mask0_2030_12879)">
+        <rect
+          x="3.33301"
+          y="10"
+          width="3.33333"
+          height="6.66667"
+          rx="1.66667"
+          class="fill-n-amber-9"
+        />
+        <rect
+          x="8.33301"
+          y="6.6665"
+          width="3.33333"
+          height="10"
+          rx="1.66667"
+          class="fill-n-slate-6"
+        />
+        <rect
+          x="13.333"
+          y="3.3335"
+          width="3.33333"
+          height="13.3333"
+          rx="1.66667"
+          class="fill-n-slate-6"
+        />
+      </g>
+    </svg>
+
+    <!-- Medium Priority  -->
+    <svg
+      v-if="priority === CONVERSATION_PRIORITY.MEDIUM"
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <mask
+        id="mask0_2030_12879"
+        style="mask-type: alpha"
+        maskUnits="userSpaceOnUse"
+        x="0"
+        y="0"
+        width="20"
+        height="20"
+      >
+        <rect width="20" height="20" fill="#D9D9D9" />
+      </mask>
+      <g mask="url(#mask0_2030_12879)">
+        <rect
+          x="3.33301"
+          y="10"
+          width="3.33333"
+          height="6.66667"
+          rx="1.66667"
+          class="fill-n-amber-9"
+        />
+        <rect
+          x="8.33301"
+          y="6.6665"
+          width="3.33333"
+          height="10"
+          rx="1.66667"
+          class="fill-n-amber-9"
+        />
+        <rect
+          x="13.333"
+          y="3.3335"
+          width="3.33333"
+          height="13.3333"
+          rx="1.66667"
+          class="fill-n-slate-6"
+        />
+      </g>
+    </svg>
+
+    <!-- High Priority -->
+    <svg
+      v-if="priority === CONVERSATION_PRIORITY.HIGH"
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <mask
+        id="mask0_2030_12879"
+        style="mask-type: alpha"
+        maskUnits="userSpaceOnUse"
+        x="0"
+        y="0"
+        width="20"
+        height="20"
+      >
+        <rect width="20" height="20" fill="#D9D9D9" />
+      </mask>
+      <g mask="url(#mask0_2030_12879)">
+        <rect
+          x="3.33301"
+          y="10"
+          width="3.33333"
+          height="6.66667"
+          rx="1.66667"
+          class="fill-n-amber-9"
+        />
+        <rect
+          x="8.33301"
+          y="6.6665"
+          width="3.33333"
+          height="10"
+          rx="1.66667"
+          class="fill-n-amber-9"
+        />
+        <rect
+          x="13.333"
+          y="3.3335"
+          width="3.33333"
+          height="13.3333"
+          rx="1.66667"
+          class="fill-n-amber-9"
+        />
+      </g>
+    </svg>
+
+    <!-- Urgent Priority -->
+    <svg
+      v-if="priority === CONVERSATION_PRIORITY.URGENT"
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <mask
+        id="mask0_2030_12879"
+        style="mask-type: alpha"
+        maskUnits="userSpaceOnUse"
+        x="0"
+        y="0"
+        width="20"
+        height="20"
+      >
+        <rect width="20" height="20" fill="#D9D9D9" />
+      </mask>
+      <g mask="url(#mask0_2030_12879)">
+        <rect
+          x="3.33301"
+          y="10"
+          width="3.33333"
+          height="6.66667"
+          rx="1.66667"
+          class="fill-n-ruby-9"
+        />
+        <rect
+          x="8.33301"
+          y="6.6665"
+          width="3.33333"
+          height="10"
+          rx="1.66667"
+          class="fill-n-ruby-9"
+        />
+        <rect
+          x="13.333"
+          y="3.3335"
+          width="3.33333"
+          height="13.3333"
+          rx="1.66667"
+          class="fill-n-ruby-9"
+        />
+      </g>
+    </svg>
+  </div>
 </template>

app/javascript/dashboard/components-next/Conversation/SidepanelSwitch.vue

@@ -57,7 +57,7 @@ useKeyboardEvents(keyboardEvents);
 
 <template>
   <ButtonGroup
-    class="flex flex-col justify-center items-center absolute top-36 xl:top-24 ltr:right-2 rtl:left-2 bg-n-solid-2/90 backdrop-blur-lg border border-n-weak/50 rounded-full gap-1.5 p-1.5 shadow-sm transition-shadow duration-200 hover:shadow !z-20"
+    class="flex flex-col justify-center items-center absolute top-36 xl:top-24 ltr:right-2 rtl:left-2 bg-n-solid-2/90 backdrop-blur-lg border border-n-weak/50 rounded-full gap-1.5 p-1.5 shadow-sm transition-shadow duration-200 hover:shadow"
   >
     <Button
       v-tooltip.top="$t('CONVERSATION.SIDEBAR.CONTACT')"

app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditor.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, watch } from 'vue';
+import { computed } from 'vue';
 import { debounce } from '@chatwoot/utils';
 import { useI18n } from 'vue-i18n';
 import { ARTICLE_EDITOR_MENU_OPTIONS } from 'dashboard/constants/editor';
@@ -27,50 +27,58 @@ const props = defineProps({
 
 const emit = defineEmits([
   'saveArticle',
+  'saveArticleAsync',
   'goBack',
   'setAuthor',
   'setCategory',
   'previewArticle',
-  'createArticle',
 ]);
 
 const { t } = useI18n();
 
 const isNewArticle = computed(() => !props.article?.id);
 
-const localTitle = ref(props.article?.title ?? '');
-const localContent = ref(props.article?.content ?? '');
+const saveAndSync = value => {
+  emit('saveArticle', value);
+};
 
-// Sync local state when navigating to a different article or on initial fetch
-watch(
-  () => props.article?.id,
-  newId => {
-    if (newId) {
-      localTitle.value = props.article?.title ?? '';
-      localContent.value = props.article?.content ?? '';
-    }
-  }
+// this will only send the data to the backend
+// but will not update the local state preventing unnecessary re-renders
+// since the data is already saved and we keep the editor text as the source of truth
+const quickSave = debounce(
+  value => emit('saveArticleAsync', value),
+  400,
+  false
 );
 
-const debouncedSave = debounce(value => emit('saveArticle', value), 500, false);
+// 2.5 seconds is enough to know that the user has stopped typing and is taking a pause
+// so we can save the data to the backend and retrieve the updated data
+// this will update the local state with response data
+// Only use to save for existing articles
+const saveAndSyncDebounced = debounce(saveAndSync, 2500, false);
+
+// Debounced save for new articles
+const quickSaveNewArticle = debounce(saveAndSync, 400, false);
 
 const handleSave = value => {
-  if (isNewArticle.value) return;
-  debouncedSave(value);
+  if (isNewArticle.value) {
+    quickSaveNewArticle(value);
+  } else {
+    quickSave(value);
+    saveAndSyncDebounced(value);
+  }
 };
 
 const articleTitle = computed({
-  get: () => localTitle.value,
+  get: () => props.article.title,
   set: value => {
-    localTitle.value = value;
     handleSave({ title: value });
   },
 });
 
 const articleContent = computed({
-  get: () => localContent.value,
+  get: () => props.article.content,
   set: content => {
-    localContent.value = content;
     handleSave({ content });
   },
 });
@@ -90,14 +98,6 @@ const setCategoryId = categoryId => {
 const previewArticle = () => {
   emit('previewArticle');
 };
-
-const handleCreateArticle = event => {
-  if (!isNewArticle.value) return;
-  const title = event?.target?.value || '';
-  if (title.trim()) {
-    emit('createArticle', { title, content: localContent.value });
-  }
-};
 </script>
 
 <template>
@@ -122,11 +122,10 @@ const handleCreateArticle = event => {
           custom-text-area-wrapper-class="border-0 !bg-transparent dark:!bg-transparent !py-0 !px-0"
           placeholder="Title"
           autofocus
-          @blur="handleCreateArticle"
         />
         <ArticleEditorControls
           :article="article"
-          @save-article="values => emit('saveArticle', values)"
+          @save-article="saveAndSync"
           @set-author="setAuthorId"
           @set-category="setCategoryId"
         />
@@ -161,12 +160,8 @@ const handleCreateArticle = event => {
   }
 
   .editor-root .has-selection {
-    .ProseMirror-menubar:not(:has(*)) {
-      display: none !important;
-    }
-
     .ProseMirror-menubar {
-      @apply rounded-lg !px-3 !py-1.5 z-50 bg-n-background items-center gap-4 ml-0 mb-0 shadow-md outline outline-1 outline-n-weak;
+      @apply h-8 rounded-lg !px-2 z-50 bg-n-solid-3 items-center gap-4 ml-0 mb-0 shadow-md outline outline-1 outline-n-weak;
       display: flex;
       top: var(--selection-top, auto) !important;
       left: var(--selection-left, 0) !important;
@@ -174,10 +169,15 @@ const handleCreateArticle = event => {
       position: absolute !important;
 
       .ProseMirror-menuitem {
-        @apply ltr:mr-0 rtl:ml-0 size-4 flex items-center;
+        @apply mr-0;
 
         .ProseMirror-icon {
-          @apply p-0.5 flex-shrink-0 ltr:mr-2 rtl:ml-2;
+          @apply p-0 mt-0 !mr-0;
+
+          svg {
+            width: 20px !important;
+            height: 20px !important;
+          }
         }
       }
 

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

@@ -2,10 +2,13 @@
 import { reactive, ref, computed, onMounted, watch } from 'vue';
 import { useStore, useMapGetter } from 'dashboard/composables/store';
 import { useI18n } from 'vue-i18n';
+import { useWindowSize } from '@vueuse/core';
 import { useUISettings } from 'dashboard/composables/useUISettings';
+import { vOnClickOutside } from '@vueuse/components';
 import { useAlert } from 'dashboard/composables';
 import { ExceptionWithMessage } from 'shared/helpers/CustomErrors';
 import { debounce } from '@chatwoot/utils';
+import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
 import { emitter } from 'shared/helpers/mitt';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import {
@@ -15,18 +18,22 @@ import {
   processContactableInboxes,
   mergeInboxDetails,
 } from 'dashboard/components-next/NewConversation/helpers/composeConversationHelper';
+import wootConstants from 'dashboard/constants/globals';
 
-import Popover from 'dashboard/components-next/popover/Popover.vue';
 import ComposeNewConversationForm from 'dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue';
 
 const props = defineProps({
+  alignPosition: {
+    type: String,
+    default: 'left',
+  },
   contactId: {
     type: String,
     default: null,
   },
-  align: {
-    type: String,
-    default: 'end',
+  isModal: {
+    type: Boolean,
+    default: false,
   },
 });
 
@@ -35,16 +42,23 @@ const emit = defineEmits(['close']);
 const searchContacts = createContactSearcher();
 const store = useStore();
 const { t } = useI18n();
+const { width: windowWidth } = useWindowSize();
 
 const { fetchSignatureFlagFromUISettings } = useUISettings();
 
-const popoverRef = ref(null);
+const isSmallScreen = computed(
+  () => windowWidth.value < wootConstants.SMALL_SCREEN_BREAKPOINT
+);
+
+const viewInModal = computed(() => props.isModal || isSmallScreen.value);
+
 const contacts = ref([]);
 const selectedContact = ref(null);
 const targetInbox = ref(null);
 const isCreatingContact = ref(false);
 const isFetchingInboxes = ref(false);
 const isSearching = ref(false);
+const showComposeNewConversation = ref(false);
 
 const formState = reactive({
   message: '',
@@ -81,6 +95,14 @@ const directUploadsEnabled = computed(
 
 const activeContact = computed(() => contactById.value(props.contactId));
 
+const composePopoverClass = computed(() => {
+  if (viewInModal.value) return '';
+
+  return props.alignPosition === 'right'
+    ? 'absolute ltr:left-0 ltr:right-[unset] rtl:right-0 rtl:left-[unset]'
+    : 'absolute rtl:left-0 rtl:right-[unset] ltr:right-0 ltr:left-[unset]';
+});
+
 const onContactSearch = debounce(
   async query => {
     isSearching.value = true;
@@ -150,7 +172,7 @@ const clearSelectedContact = () => {
 };
 
 const closeCompose = () => {
-  popoverRef.value?.hide();
+  showComposeNewConversation.value = false;
   if (!props.contactId) {
     // If contactId is passed as prop
     // Then don't allow to remove the selected contact
@@ -158,6 +180,7 @@ const closeCompose = () => {
   }
   targetInbox.value = null;
   resetContacts();
+  emit('close');
 };
 
 const discardCompose = () => {
@@ -190,15 +213,8 @@ const createConversation = async ({ payload, isFromWhatsApp }) => {
   }
 };
 
-const onPopoverShow = () => {
-  // Flag to prevent triggering drag n drop,
-  // When compose modal is active
-  emitter.emit(BUS_EVENTS.NEW_CONVERSATION_MODAL, true);
-};
-
-const onPopoverHide = () => {
-  emitter.emit(BUS_EVENTS.NEW_CONVERSATION_MODAL, false);
-  emit('close');
+const toggle = () => {
+  showComposeNewConversation.value = !showComposeNewConversation.value;
 };
 
 watch(
@@ -226,22 +242,64 @@ watch(
   { immediate: true, deep: true }
 );
 
+const handleClickOutside = () => {
+  if (!showComposeNewConversation.value) return;
+
+  showComposeNewConversation.value = false;
+  emit('close');
+};
+
+const onModalBackdropClick = () => {
+  if (!viewInModal.value) return;
+  handleClickOutside();
+};
+
 onMounted(() => resetContacts());
+
+const keyboardEvents = {
+  Escape: {
+    action: () => {
+      if (showComposeNewConversation.value) {
+        showComposeNewConversation.value = false;
+        emit('close');
+        emitter.emit(BUS_EVENTS.NEW_CONVERSATION_MODAL, false);
+      }
+    },
+  },
+};
+
+useKeyboardEvents(keyboardEvents);
 </script>
 
 <template>
-  <Popover
-    ref="popoverRef"
-    :align="align"
-    @show="onPopoverShow"
-    @hide="onPopoverHide"
+  <div
+    v-on-click-outside="[
+      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'] },
+    ]"
+    class="relative"
+    :class="{
+      'z-50': showComposeNewConversation && !viewInModal,
+    }"
   >
-    <template #default="{ isOpen }">
-      <slot name="trigger" :is-open="isOpen" />
-    </template>
-    <template #content>
+    <slot
+      name="trigger"
+      :is-open="showComposeNewConversation"
+      :toggle="toggle"
+    />
+    <div
+      v-if="showComposeNewConversation"
+      :class="{
+        'fixed z-50 bg-n-alpha-black1 backdrop-blur-[4px] flex items-start pt-[clamp(3rem,15vh,12rem)] justify-center inset-0':
+          viewInModal,
+      }"
+      @click.self="onModalBackdropClick"
+    >
       <ComposeNewConversationForm
         :form-state="formState"
+        :class="[{ 'mt-2': !viewInModal }, composePopoverClass]"
         :contacts="contacts"
         :contact-id="contactId"
         :is-loading="isSearching"
@@ -263,6 +321,6 @@ onMounted(() => resetContacts());
         @create-conversation="createConversation"
         @discard="discardCompose"
       />
-    </template>
-  </Popover>
+    </div>
+  </div>
 </template>

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

@@ -361,7 +361,7 @@ useKeyboardEvents({
 
 <template>
   <div
-    class="w-full md:w-[42rem] divide-y divide-n-strong overflow-visible transition-all duration-300 ease-in-out top-full flex flex-col bg-n-alpha-3 border border-n-strong shadow-sm backdrop-blur-[100px] rounded-xl min-w-0 max-h-[calc(100vh-8rem)]"
+    class="w-[42rem] divide-y divide-n-strong overflow-visible transition-all duration-300 ease-in-out top-full flex flex-col bg-n-alpha-3 border border-n-strong shadow-sm backdrop-blur-[100px] rounded-xl min-w-0 max-h-[calc(100vh-8rem)]"
   >
     <div class="flex-1 overflow-y-auto divide-y divide-n-strong">
       <ContactSelector

app/javascript/dashboard/components-next/captain/assistant/BulkSelectBar.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, useSlots } from 'vue';
+import { computed } from 'vue';
 import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 
@@ -30,40 +30,23 @@ const modelValue = defineModel({
 });
 
 const selectedCount = computed(() => modelValue.value.size);
-const visibleItemIds = computed(() => props.allItems.map(item => item.id));
-const visibleItemCount = computed(() => visibleItemIds.value.length);
-const selectedVisibleCount = computed(
-  () => visibleItemIds.value.filter(id => modelValue.value.has(id)).length
-);
+const totalCount = computed(() => props.allItems.length);
+
 const hasSelected = computed(() => selectedCount.value > 0);
 const isIndeterminate = computed(
-  () =>
-    selectedVisibleCount.value > 0 &&
-    selectedVisibleCount.value < visibleItemCount.value
+  () => hasSelected.value && selectedCount.value < totalCount.value
 );
 const allSelected = computed(
-  () =>
-    visibleItemCount.value > 0 &&
-    selectedVisibleCount.value === visibleItemCount.value
+  () => totalCount.value > 0 && selectedCount.value === totalCount.value
 );
 
-const slots = useSlots();
-const hasSecondaryActions = computed(() => Boolean(slots['secondary-actions']));
-
 const bulkCheckboxState = computed({
   get: () => allSelected.value,
   set: shouldSelectAll => {
-    if (!visibleItemCount.value) {
-      return;
-    }
-
-    const updatedSelection = new Set(modelValue.value);
-    if (shouldSelectAll) {
-      visibleItemIds.value.forEach(id => updatedSelection.add(id));
-    } else {
-      visibleItemIds.value.forEach(id => updatedSelection.delete(id));
-    }
-    modelValue.value = updatedSelection;
+    const newSelectedIds = shouldSelectAll
+      ? new Set(props.allItems.map(item => item.id))
+      : new Set();
+    modelValue.value = newSelectedIds;
   },
 });
 </script>
@@ -80,7 +63,7 @@ const bulkCheckboxState = computed({
       v-if="hasSelected"
       class="flex items-center gap-3 py-1 ltr:pl-3 rtl:pr-3 ltr:pr-4 rtl:pl-4 rounded-lg bg-n-solid-2 outline outline-1 outline-n-container shadow"
     >
-      <div class="flex items-center gap-3 min-w-0">
+      <div class="flex items-center gap-3">
         <div class="flex items-center gap-1.5 min-w-0">
           <Checkbox
             v-model="bulkCheckboxState"
@@ -95,23 +78,21 @@ const bulkCheckboxState = computed({
         <span class="text-sm text-n-slate-10 truncate tabular-nums">
           {{ selectedCountLabel }}
         </span>
+        <div class="h-4 w-px bg-n-strong" />
+        <slot name="secondary-actions" />
       </div>
       <div class="flex items-center gap-3">
-        <slot v-if="hasSecondaryActions" name="secondary-actions" />
-        <div v-if="hasSecondaryActions" class="h-4 w-px bg-n-strong" />
-        <div class="flex items-center gap-3">
-          <slot name="actions" :selected-count="selectedCount">
-            <Button
-              :label="deleteLabel"
-              sm
-              ruby
-              ghost
-              class="!px-1.5"
-              icon="i-lucide-trash"
-              @click="emit('bulkDelete')"
-            />
-          </slot>
-        </div>
+        <slot name="actions" :selected-count="selectedCount">
+          <Button
+            :label="deleteLabel"
+            sm
+            ruby
+            ghost
+            class="!px-1.5"
+            icon="i-lucide-trash"
+            @click="emit('bulkDelete')"
+          />
+        </slot>
       </div>
     </div>
     <div v-else class="flex items-center gap-3">

app/javascript/dashboard/components-next/captain/assistant/DocumentCard.vue

@@ -12,7 +12,6 @@ import {
 import CardLayout from 'dashboard/components-next/CardLayout.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
-import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
 
 const props = defineProps({
   id: {
@@ -35,34 +34,14 @@ const props = defineProps({
     type: Number,
     required: true,
   },
-  isSelected: {
-    type: Boolean,
-    default: false,
-  },
-  selectable: {
-    type: Boolean,
-    default: false,
-  },
-  showSelectionControl: {
-    type: Boolean,
-    default: false,
-  },
-  showMenu: {
-    type: Boolean,
-    default: true,
-  },
 });
 
-const emit = defineEmits(['action', 'select', 'hover']);
+const emit = defineEmits(['action']);
 const { checkPermissions } = usePolicy();
 
 const { t } = useI18n();
 
 const [showActionsDropdown, toggleDropdown] = useToggle();
-const modelValue = computed({
-  get: () => props.isSelected,
-  set: () => emit('select', props.id),
-});
 
 const menuItems = computed(() => {
   const allOptions = [
@@ -100,23 +79,12 @@ const handleAction = ({ action, value }) => {
 </script>
 
 <template>
-  <CardLayout
-    :selectable="selectable"
-    class="relative"
-    @mouseenter="emit('hover', true)"
-    @mouseleave="emit('hover', false)"
-  >
-    <div
-      v-show="showSelectionControl"
-      class="absolute top-7 ltr:left-3 rtl:right-3"
-    >
-      <Checkbox v-model="modelValue" />
-    </div>
+  <CardLayout>
     <div class="flex gap-1 justify-between w-full">
       <span class="text-base text-n-slate-12 line-clamp-1">
         {{ name }}
       </span>
-      <div v-if="showMenu" class="flex gap-2 items-center">
+      <div class="flex gap-2 items-center">
         <div
           v-on-clickaway="() => toggleDropdown(false)"
           class="flex relative items-center group"

app/javascript/dashboard/components-next/captain/pageComponents/BulkDeleteDialog.vue

@@ -21,22 +21,16 @@ const emit = defineEmits(['deleteSuccess']);
 const { t } = useI18n();
 const store = useStore();
 const bulkDeleteDialogRef = ref(null);
-const i18nKey = computed(() => {
-  const i18nTypeMap = {
-    AssistantResponse: 'RESPONSES',
-    AssistantDocument: 'DOCUMENTS',
-  };
-  return i18nTypeMap[props.type];
-});
+const i18nKey = computed(() => props.type.toUpperCase());
 
 const handleBulkDelete = async ids => {
   if (!ids) return;
 
   try {
-    await store.dispatch('captainBulkActions/handleBulkDelete', {
-      ids: Array.from(props.bulkIds),
-      type: props.type,
-    });
+    await store.dispatch(
+      'captainBulkActions/handleBulkDelete',
+      Array.from(props.bulkIds)
+    );
 
     emit('deleteSuccess');
     useAlert(t(`CAPTAIN.${i18nKey.value}.BULK_DELETE.SUCCESS_MESSAGE`));

app/javascript/dashboard/components-next/captain/pageComponents/Paywall.vue

@@ -6,13 +6,6 @@ import { useAccount } from 'dashboard/composables/useAccount';
 
 import BasePaywallModal from 'dashboard/routes/dashboard/settings/components/BasePaywallModal.vue';
 
-defineProps({
-  featurePrefix: {
-    type: String,
-    default: 'CAPTAIN',
-  },
-});
-
 const router = useRouter();
 const currentUser = useMapGetter('getCurrentUser');
 
@@ -38,7 +31,7 @@ const openBilling = () => {
   >
     <BasePaywallModal
       class="mx-auto"
-      :feature-prefix="featurePrefix"
+      feature-prefix="CAPTAIN"
       :i18n-key="i18nKey"
       :is-super-admin="isSuperAdmin"
       :is-on-chatwoot-cloud="isOnChatwootCloud"

app/javascript/dashboard/components-next/captain/pageComponents/customTool/CustomToolCard.vue

@@ -101,9 +101,12 @@ const authTypeLabel = computed(() => {
         </Policy>
       </div>
     </div>
-    <div class="flex items-center justify-between w-full gap-4 min-w-0">
-      <div class="flex items-center gap-3 flex-1 min-w-0">
-        <span v-if="description" class="text-sm truncate text-n-slate-11">
+    <div class="flex items-center justify-between w-full gap-4">
+      <div class="flex items-center gap-3 flex-1">
+        <span
+          v-if="description"
+          class="text-sm truncate text-n-slate-11 flex-1"
+        >
           {{ description }}
         </span>
         <span

app/javascript/dashboard/components-next/captain/pageComponents/customTool/CustomToolForm.vue

@@ -1,10 +1,9 @@
 <script setup>
-import { reactive, computed, ref, useTemplateRef, watch } from 'vue';
+import { reactive, computed, useTemplateRef, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVuelidate } from '@vuelidate/core';
-import { required, maxLength } from '@vuelidate/validators';
+import { required } from '@vuelidate/validators';
 import { useMapGetter } from 'dashboard/composables/store';
-import CustomToolsAPI from 'dashboard/api/captain/customTools';
 
 import Input from 'dashboard/components-next/input/Input.vue';
 import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
@@ -73,12 +72,8 @@ const DEFAULT_PARAM = {
   required: false,
 };
 
-// OpenAI enforces a 64-char limit on function names. The backend slug is
-// "custom_" (7 chars) + parameterized title, so cap the title conservatively.
-const MAX_TOOL_NAME_LENGTH = 55;
-
 const validationRules = {
-  title: { required, maxLength: maxLength(MAX_TOOL_NAME_LENGTH) },
+  title: { required },
   endpoint_url: { required },
   http_method: { required },
   auth_type: { required },
@@ -108,15 +103,9 @@ const isLoading = computed(() =>
 );
 
 const getErrorMessage = (field, errorKey) => {
-  if (!v$.value[field].$error) return '';
-
-  const failedRule = v$.value[field].$errors[0]?.$validator;
-  if (failedRule === 'maxLength') {
-    return t(`CAPTAIN.CUSTOM_TOOLS.FORM.${errorKey}.MAX_LENGTH_ERROR`, {
-      max: MAX_TOOL_NAME_LENGTH,
-    });
-  }
-  return t(`CAPTAIN.CUSTOM_TOOLS.FORM.${errorKey}.ERROR`);
+  return v$.value[field].$error
+    ? t(`CAPTAIN.CUSTOM_TOOLS.FORM.${errorKey}.ERROR`)
+    : '';
 };
 
 const formErrors = computed(() => ({
@@ -151,30 +140,6 @@ const handleSubmit = async () => {
 
   emit('submit', state);
 };
-
-const isTesting = ref(false);
-const testResult = ref(null);
-const isTestDisabled = computed(
-  () => state.endpoint_url.includes('{{') || !!state.request_template
-);
-
-const handleTest = async () => {
-  if (!state.endpoint_url) return;
-
-  isTesting.value = true;
-  testResult.value = null;
-  try {
-    const { data } = await CustomToolsAPI.test(state);
-    const isOk = data.status >= 200 && data.status < 300;
-    testResult.value = { success: isOk, status: data.status };
-  } catch (e) {
-    const message =
-      e.response?.data?.error || t('CAPTAIN.CUSTOM_TOOLS.TEST.ERROR');
-    testResult.value = { success: false, message };
-  } finally {
-    isTesting.value = false;
-  }
-};
 </script>
 
 <template>
@@ -283,45 +248,6 @@ const handleTest = async () => {
       class="[&_textarea]:font-mono"
     />
 
-    <div class="flex flex-col gap-2">
-      <Button
-        type="button"
-        variant="faded"
-        color="slate"
-        icon="i-lucide-play"
-        :label="t('CAPTAIN.CUSTOM_TOOLS.TEST.BUTTON')"
-        :is-loading="isTesting"
-        :disabled="isTesting || !state.endpoint_url || isTestDisabled"
-        @click="handleTest"
-      />
-      <p v-if="isTestDisabled" class="text-xs text-n-slate-11">
-        {{ t('CAPTAIN.CUSTOM_TOOLS.TEST.DISABLED_HINT') }}
-      </p>
-      <div
-        v-if="testResult"
-        class="flex items-center gap-2 px-3 py-2 text-xs rounded-lg"
-        :class="
-          testResult.success
-            ? 'bg-n-teal-2 text-n-teal-11'
-            : 'bg-n-ruby-2 text-n-ruby-11'
-        "
-      >
-        <span
-          :class="
-            testResult.success ? 'i-lucide-check-circle' : 'i-lucide-x-circle'
-          "
-          class="size-3.5 shrink-0"
-        />
-        {{
-          testResult.status
-            ? t('CAPTAIN.CUSTOM_TOOLS.TEST.SUCCESS', {
-                status: testResult.status,
-              })
-            : testResult.message
-        }}
-      </div>
-    </div>
-
     <div class="flex gap-3 justify-between items-center w-full">
       <Button
         type="button"

app/javascript/dashboard/components-next/captain/pageComponents/emptyStates/CustomToolsPageEmptyState.vue

@@ -1,11 +1,8 @@
 <script setup>
-import { useAccount } from 'dashboard/composables/useAccount';
 import EmptyStateLayout from 'dashboard/components-next/EmptyStateLayout.vue';
-import FeatureSpotlight from 'dashboard/components-next/feature-spotlight/FeatureSpotlight.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 
 const emit = defineEmits(['click']);
-const { isOnChatwootCloud } = useAccount();
 
 const onClick = () => {
   emit('click');
@@ -13,15 +10,6 @@ const onClick = () => {
 </script>
 
 <template>
-  <FeatureSpotlight
-    :title="$t('CAPTAIN.CUSTOM_TOOLS.EMPTY_STATE.FEATURE_SPOTLIGHT.TITLE')"
-    :note="$t('CAPTAIN.CUSTOM_TOOLS.EMPTY_STATE.FEATURE_SPOTLIGHT.NOTE')"
-    fallback-thumbnail="/assets/images/dashboard/captain/assistant-light.svg"
-    fallback-thumbnail-dark="/assets/images/dashboard/captain/assistant-dark.svg"
-    learn-more-url="https://chwt.app/hc/captain-tools"
-    class="mb-8"
-    :hide-actions="!isOnChatwootCloud"
-  />
   <EmptyStateLayout
     :title="$t('CAPTAIN.CUSTOM_TOOLS.EMPTY_STATE.TITLE')"
     :subtitle="$t('CAPTAIN.CUSTOM_TOOLS.EMPTY_STATE.SUBTITLE')"

app/javascript/dashboard/components-next/inline-input/InlineInput.vue

@@ -36,13 +36,7 @@ const props = defineProps({
   },
 });
 
-const emit = defineEmits([
-  'enterPress',
-  'escapePress',
-  'input',
-  'blur',
-  'focus',
-]);
+const emit = defineEmits(['enterPress', 'input', 'blur', 'focus']);
 
 const modelValue = defineModel({
   type: [String, Number],
@@ -55,10 +49,6 @@ const onEnterPress = () => {
   emit('enterPress');
 };
 
-const onEscapePress = () => {
-  emit('escapePress');
-};
-
 const handleInput = event => {
   emit('input', event.target.value);
   modelValue.value = event.target.value;
@@ -112,7 +102,6 @@ defineExpose({
       @focus="handleFocus"
       @blur="handleBlur"
       @keydown.enter.prevent="onEnterPress"
-      @keydown.escape.prevent="onEscapePress"
     />
   </div>
 </template>

app/javascript/dashboard/components-next/input/DurationInput.vue

@@ -32,7 +32,6 @@ const convertToMinutes = newValue => {
 
 const transformedValue = computed({
   get() {
-    if (duration.value == null) return null;
     if (unit.value === DURATION_UNITS.MINUTES) return duration.value;
     if (unit.value === DURATION_UNITS.HOURS)
       return Math.floor(duration.value / 60);
@@ -42,10 +41,6 @@ const transformedValue = computed({
     return 0;
   },
   set(newValue) {
-    if (newValue == null || newValue === '') {
-      duration.value = null;
-      return;
-    }
     let minuteValue = convertToMinutes(newValue);
 
     duration.value = Math.min(Math.max(minuteValue, props.min), props.max);
@@ -58,7 +53,6 @@ const transformedValue = computed({
 // this might create some confusion, especially when saving
 // this watcher fixes it by rounding the duration basically, to the nearest unit value
 watch(unit, () => {
-  if (duration.value == null) return;
   let adjustedValue = convertToMinutes(transformedValue.value);
   duration.value = Math.min(Math.max(adjustedValue, props.min), props.max);
 });

app/javascript/dashboard/components-next/message/bubbles/Email/Index.vue

@@ -226,10 +226,4 @@ const handleSeeOriginal = () => {
     }
   }
 }
-
-// Email clients (Gmail, Outlook) hardcode dir="ltr" on wrapper elements.
-// In RTL apps this forces email content LTR regardless of actual text.
-[dir='rtl'] .letter-render [dir='ltr'] {
-  direction: inherit;
-}
 </style>

app/javascript/dashboard/components-next/popover/Popover.vue

@@ -1,121 +0,0 @@
-<script setup>
-import { ref, computed, watch, nextTick } from 'vue';
-import { vOnClickOutside } from '@vueuse/components';
-import { useBreakpoints, breakpointsTailwind } from '@vueuse/core';
-import { useDropdownPosition } from 'dashboard/composables/useDropdownPosition';
-import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
-import TeleportWithDirection from 'dashboard/components-next/TeleportWithDirection.vue';
-
-const props = defineProps({
-  align: {
-    type: String,
-    default: 'end',
-    validator: v => ['start', 'end'].includes(v),
-  },
-});
-
-const emit = defineEmits(['show', 'hide']);
-
-const isActive = ref(false);
-const triggerRef = ref(null);
-const popoverRef = ref(null);
-const mobileContentRef = ref(null);
-
-const breakpoints = useBreakpoints(breakpointsTailwind);
-const isMobile = breakpoints.smaller('md');
-const showPopover = computed(() => isActive.value && !isMobile.value);
-
-const { fixedPosition, updatePosition } = useDropdownPosition(
-  triggerRef,
-  popoverRef,
-  showPopover,
-  { align: props.align }
-);
-
-const show = async () => {
-  isActive.value = true;
-  if (!isMobile.value) {
-    await nextTick();
-    updatePosition();
-  }
-  emit('show');
-};
-
-const hide = () => {
-  if (!isActive.value) return;
-  isActive.value = false;
-  emit('hide');
-};
-
-const toggle = async () => {
-  if (isActive.value) hide();
-  else await show();
-};
-
-// Recalculate position when switching from mobile to desktop while open
-watch(isMobile, async mobile => {
-  if (!isActive.value || mobile) return;
-  await nextTick();
-  updatePosition();
-});
-
-const handleClickOutside = event => {
-  if (triggerRef.value?.contains(event.target)) return;
-  hide();
-};
-
-// Selectors for teleported elements that should not trigger close
-const clickOutsideIgnore = [
-  'dialog.ProseMirror-prompt-backdrop',
-  '[data-popover-content]',
-];
-
-useKeyboardEvents({
-  Escape: {
-    action: () => isActive.value && hide(),
-    allowOnFocusedInput: true,
-  },
-});
-
-defineExpose({ show, hide, toggle });
-</script>
-
-<template>
-  <span ref="triggerRef" class="inline-flex" @click="toggle">
-    <slot :is-open="isActive" />
-  </span>
-
-  <TeleportWithDirection to="body">
-    <!-- Mobile: centered modal with backdrop -->
-    <div
-      v-if="isActive && isMobile"
-      data-popover-backdrop
-      class="fixed inset-0 z-[9999] flex items-start pt-[clamp(3rem,15vh,12rem)] justify-center bg-n-alpha-black1"
-    >
-      <div
-        ref="mobileContentRef"
-        v-on-click-outside="[
-          handleClickOutside,
-          { ignore: clickOutsideIgnore },
-        ]"
-        data-popover-content
-        class="relative w-full max-w-lg max-h-[calc(100vh-4rem)] mx-4 overflow-y-auto bg-n-alpha-3 backdrop-blur-[100px] shadow-xl rounded-xl"
-      >
-        <slot name="content" :hide="hide" />
-      </div>
-    </div>
-
-    <!-- Desktop: fixed popover -->
-    <div
-      v-else-if="showPopover"
-      ref="popoverRef"
-      v-on-click-outside="[handleClickOutside, { ignore: clickOutsideIgnore }]"
-      data-popover-content
-      :class="fixedPosition.class"
-      :style="fixedPosition.style"
-      class="bg-n-alpha-3 backdrop-blur-[100px] shadow-xl rounded-xl overflow-y-auto max-h-[calc(100vh-2rem)]"
-    >
-      <slot name="content" :hide="hide" />
-    </div>
-  </TeleportWithDirection>
-</template>

app/javascript/dashboard/components-next/sidebar/Sidebar.vue

@@ -10,6 +10,8 @@ import { useSidebarKeyboardShortcuts } from './useSidebarKeyboardShortcuts';
 import { vOnClickOutside } from '@vueuse/components';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { useWindowSize, useEventListener } from '@vueuse/core';
+import { emitter } from 'shared/helpers/mitt';
+import { BUS_EVENTS } from 'shared/constants/busEvents';
 
 import Button from 'dashboard/components-next/button/Button.vue';
 import SidebarGroup from './SidebarGroup.vue';
@@ -182,6 +184,15 @@ const closeMobileSidebar = () => {
   emit('closeMobileSidebar');
 };
 
+const onComposeOpen = toggleFn => {
+  toggleFn();
+  emitter.emit(BUS_EVENTS.NEW_CONVERSATION_MODAL, true);
+};
+
+const onComposeClose = () => {
+  emitter.emit(BUS_EVENTS.NEW_CONVERSATION_MODAL, false);
+};
+
 const newReportRoutes = () => [
   {
     name: 'Reports Agent',
@@ -239,12 +250,6 @@ const menuItems = computed(() => {
           activeOn: ['conversation_through_mentions'],
           to: accountScopedRoute('conversation_mentions'),
         },
-        {
-          name: 'Participating',
-          label: t('SIDEBAR.PARTICIPATING_CONVERSATIONS'),
-          activeOn: ['conversation_through_participating'],
-          to: accountScopedRoute('conversation_participating'),
-        },
         {
           name: 'Unattended',
           activeOn: ['conversation_through_unattended'],
@@ -723,13 +728,7 @@ const menuItems = computed(() => {
   <aside
     v-on-click-outside="[
       closeMobileSidebar,
-      {
-        ignore: [
-          '#mobile-sidebar-launcher',
-          '[data-popover-content]',
-          '[data-popover-backdrop]',
-        ],
-      },
+      { ignore: ['#mobile-sidebar-launcher'] },
     ]"
     class="bg-n-background flex flex-col text-sm pb-px fixed top-0 ltr:left-0 rtl:right-0 h-full z-40 w-[200px] md:w-auto md:relative md:flex-shrink-0 md:ltr:translate-x-0 md:rtl:translate-x-0 ltr:border-r rtl:border-l border-n-weak"
     :class="[
@@ -797,8 +796,8 @@ const menuItems = computed(() => {
         >
           <span class="i-lucide-search size-4 text-n-slate-11" />
         </RouterLink>
-        <ComposeConversation align="start">
-          <template #trigger="{ isOpen }">
+        <ComposeConversation align-position="right" @close="onComposeClose">
+          <template #trigger="{ toggle, isOpen }">
             <Button
               icon="i-lucide-pen-line"
               color="slate"
@@ -810,6 +809,7 @@ const menuItems = computed(() => {
                   : '!h-7 !outline-n-weak !text-n-slate-11',
                 { '!bg-n-alpha-2 dark:!bg-n-slate-9/30': isOpen },
               ]"
+              @click="onComposeOpen(toggle)"
             />
           </template>
         </ComposeConversation>

app/javascript/dashboard/components-next/sidebar/SidebarGroup.vue

@@ -158,11 +158,9 @@ const activeChild = computed(() => {
     return rankedPage ?? activeOnPages[0];
   }
 
-  return navigableChildren.value.find(child => {
-    if (!child.to) return false;
-    const childPath = resolvePath(child.to);
-    return route.path === childPath || route.path.startsWith(`${childPath}/`);
-  });
+  return navigableChildren.value.find(
+    child => child.to && route.path.startsWith(resolvePath(child.to))
+  );
 });
 
 const hasActiveChild = computed(() => {

app/javascript/dashboard/components/ChatList.vue

@@ -56,7 +56,6 @@ import { generateValuesForEditCustomViews } from 'dashboard/helper/customViewsHe
 import { conversationListPageURL } from '../helper/URLHelper';
 import {
   isOnMentionsView,
-  isOnParticipatingView,
   isOnUnattendedView,
 } from '../store/modules/conversations/helpers/actionHelpers';
 import {
@@ -114,7 +113,6 @@ const chatLists = useMapGetter('getFilteredConversations');
 const mineChatsList = useMapGetter('getMineChats');
 const allChatList = useMapGetter('getAllStatusChats');
 const unAssignedChatsList = useMapGetter('getUnAssignedChats');
-const participatingChatsList = useMapGetter('getParticipatingChats');
 const chatListLoading = useMapGetter('getChatListLoadingStatus');
 const activeInbox = useMapGetter('getSelectedInbox');
 const conversationStats = useMapGetter('conversationStats/getStats');
@@ -298,15 +296,13 @@ const pageTitle = computed(() => {
   if (props.label) {
     return `#${props.label}`;
   }
-  if (props.conversationType === wootConstants.CONVERSATION_TYPE.MENTION) {
+  if (props.conversationType === 'mention') {
     return t('CHAT_LIST.MENTION_HEADING');
   }
-  if (
-    props.conversationType === wootConstants.CONVERSATION_TYPE.PARTICIPATING
-  ) {
+  if (props.conversationType === 'participating') {
     return t('CONVERSATION_PARTICIPANTS.SIDEBAR_MENU_TITLE');
   }
-  if (props.conversationType === wootConstants.CONVERSATION_TYPE.UNATTENDED) {
+  if (props.conversationType === 'unattended') {
     return t('CHAT_LIST.UNATTENDED_HEADING');
   }
   if (hasActiveFolders.value) {
@@ -315,30 +311,12 @@ const pageTitle = computed(() => {
   return t('CHAT_LIST.TAB_HEADING');
 });
 
-function filterByAssigneeTab(conversations) {
-  if (activeAssigneeTab.value === wootConstants.ASSIGNEE_TYPE.ME) {
-    return conversations.filter(
-      c => c.meta?.assignee?.id === currentUser.value?.id
-    );
-  }
-  if (activeAssigneeTab.value === wootConstants.ASSIGNEE_TYPE.UNASSIGNED) {
-    return conversations.filter(c => !c.meta?.assignee);
-  }
-  return [...conversations];
-}
-
 const conversationList = computed(() => {
   let localConversationList = [];
 
   if (!hasAppliedFiltersOrActiveFolders.value) {
     const filters = conversationFilters.value;
-    if (
-      props.conversationType === wootConstants.CONVERSATION_TYPE.PARTICIPATING
-    ) {
-      localConversationList = filterByAssigneeTab(
-        participatingChatsList.value(filters)
-      );
-    } else if (activeAssigneeTab.value === 'me') {
+    if (activeAssigneeTab.value === 'me') {
       localConversationList = [...mineChatsList.value(filters)];
     } else if (activeAssigneeTab.value === 'unassigned') {
       localConversationList = [...unAssignedChatsList.value(filters)];
@@ -659,11 +637,9 @@ function redirectToConversationList() {
 
   let conversationType = '';
   if (isOnMentionsView({ route: { name } })) {
-    conversationType = wootConstants.CONVERSATION_TYPE.MENTION;
-  } else if (isOnParticipatingView({ route: { name } })) {
-    conversationType = wootConstants.CONVERSATION_TYPE.PARTICIPATING;
+    conversationType = 'mention';
   } else if (isOnUnattendedView({ route: { name } })) {
-    conversationType = wootConstants.CONVERSATION_TYPE.UNATTENDED;
+    conversationType = 'unattended';
   }
   router.push(
     conversationListPageURL({

app/javascript/dashboard/components/app/LowBackupCodesBanner.vue

@@ -1,79 +0,0 @@
-<script setup>
-import { computed, onUnmounted, onMounted, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { parseBoolean } from '@chatwoot/utils';
-import { useMapGetter } from 'dashboard/composables/store';
-import { emitter } from 'shared/helpers/mitt';
-import { BUS_EVENTS } from 'shared/constants/busEvents';
-import mfaAPI from 'dashboard/api/mfa';
-import Banner from 'dashboard/components/ui/Banner.vue';
-
-const LOW_BACKUP_CODES_THRESHOLD = 3;
-
-const { t } = useI18n();
-const router = useRouter();
-
-const mfaEnabled = ref(false);
-const remainingBackupCodes = ref(null);
-
-const currentAccountId = useMapGetter('getCurrentAccountId');
-
-const shouldShowBanner = computed(() => {
-  if (!mfaEnabled.value) return false;
-  if (remainingBackupCodes.value === null) return false;
-  return remainingBackupCodes.value <= LOW_BACKUP_CODES_THRESHOLD;
-});
-
-const bannerColorScheme = computed(() =>
-  remainingBackupCodes.value === 0 ? 'alert' : 'warning'
-);
-
-const bannerMessage = computed(() => {
-  if (remainingBackupCodes.value === 0) {
-    return t('MFA_SETTINGS.LOW_BACKUP_CODES.NONE_LEFT');
-  }
-  return t('MFA_SETTINGS.LOW_BACKUP_CODES.MESSAGE', remainingBackupCodes.value);
-});
-
-const fetchMfaStatus = async () => {
-  if (!parseBoolean(window.chatwootConfig?.isMfaEnabled)) return;
-
-  try {
-    const { data } = await mfaAPI.get();
-    mfaEnabled.value = data.enabled;
-    remainingBackupCodes.value = data.remaining_backup_codes ?? null;
-  } catch {
-    // ignore; banner stays hidden
-  }
-};
-
-const goToMfaSettings = () => {
-  router.push({
-    name: 'profile_settings_mfa',
-    params: { accountId: currentAccountId.value },
-  });
-};
-
-onMounted(() => {
-  fetchMfaStatus();
-  emitter.on(BUS_EVENTS.MFA_STATE_CHANGED, fetchMfaStatus);
-});
-
-onUnmounted(() => {
-  emitter.off(BUS_EVENTS.MFA_STATE_CHANGED, fetchMfaStatus);
-});
-</script>
-
-<!-- eslint-disable-next-line vue/no-root-v-if -->
-<template>
-  <Banner
-    v-if="shouldShowBanner"
-    :color-scheme="bannerColorScheme"
-    :banner-message="bannerMessage"
-    :action-button-label="$t('MFA_SETTINGS.LOW_BACKUP_CODES.ACTION')"
-    action-button-icon="i-lucide-key"
-    has-action-button
-    @primary-action="goToMfaSettings"
-  />
-</template>

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

@@ -27,6 +27,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  isPopout: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits([
@@ -204,7 +208,10 @@ onMounted(() => {
 
 <template>
   <div class="space-y-2 mb-4">
-    <div class="overflow-y-auto max-h-56">
+    <div
+      class="overflow-y-auto"
+      :class="{ 'max-h-96': isPopout, 'max-h-56': !isPopout }"
+    >
       <p
         v-dompurify-html="formatMessage(generatedContent, false)"
         class="text-n-iris-12 text-sm prose-sm font-normal !mb-4"

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

@@ -313,12 +313,7 @@ const plugins = computed(() => {
 const sendWithSignature = computed(() => {
   // this is considered the source of truth, we watch this property
   // on change, we toggle the signature in the editor
-  if (
-    props.allowSignature &&
-    !props.isPrivate &&
-    props.channelType &&
-    !props.disabled
-  ) {
+  if (props.allowSignature && !props.isPrivate && props.channelType) {
     return fetchSignatureFlagFromUISettings(props.channelType);
   }
 
@@ -441,7 +436,6 @@ function reloadState(content = props.modelValue) {
 }
 
 function addSignature() {
-  if (props.disabled) return;
   let content = props.modelValue;
   // see if the content is empty, if it is before appending the signature
   // we need to add a paragraph node and move the cursor at the start of the editor
@@ -460,7 +454,6 @@ function addSignature() {
 }
 
 function removeSignature() {
-  if (props.disabled) return;
   if (!props.signature) return;
   let content = props.modelValue;
   content = removeSignatureHelper(
@@ -813,7 +806,7 @@ watch(
 
 watch(sendWithSignature, newValue => {
   // see if the allowSignature flag is true
-  if (props.allowSignature && !props.disabled) {
+  if (props.allowSignature) {
     toggleSignatureInEditor(newValue);
   }
 });
@@ -984,32 +977,7 @@ useEmitter(BUS_EVENTS.INSERT_INTO_RICH_EDITOR, insertContentIntoEditor);
 }
 
 .ProseMirror-woot-style {
-  @apply overflow-auto;
-}
-
-.ProseMirror-woot-style:not(
-    :where(.resizable-editor-wrapper .ProseMirror-woot-style)
-  ) {
-  @apply min-h-[5rem] max-h-[7.5rem];
-}
-
-// Resizable editor wrapper styles
-.resizable-editor-wrapper {
-  .ProseMirror-woot-style {
-    min-height: clamp(
-      var(--editor-min-allowed, var(--editor-min-height, 5rem)),
-      var(--editor-height, var(--editor-min-height, 5rem)),
-      var(--editor-max-allowed, var(--editor-max-height, 7.5rem))
-    );
-    max-height: clamp(
-      var(--editor-min-allowed, var(--editor-min-height, 5rem)),
-      var(--editor-height, var(--editor-min-height, 5rem)),
-      var(--editor-max-allowed, var(--editor-max-height, 7.5rem))
-    );
-    transition:
-      min-height var(--editor-height-transition, 180ms ease),
-      max-height var(--editor-height-transition, 180ms ease);
-  }
+  @apply overflow-auto min-h-[5rem] max-h-[7.5rem];
 }
 
 .ProseMirror-prompt-backdrop::backdrop {

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

@@ -8,22 +8,13 @@ import {
   EditorState,
   Selection,
 } from '@chatwoot/prosemirror-schema';
-import {
-  suggestionsPlugin,
-  triggerCharacters,
-} from '@chatwoot/prosemirror-schema/src/mentions/plugin';
 import imagePastePlugin from '@chatwoot/prosemirror-schema/src/plugins/image';
-import { toggleMark } from 'prosemirror-commands';
-import { wrapInList } from 'prosemirror-schema-list';
-import { toggleBlockType } from '@chatwoot/prosemirror-schema/src/menu/common';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import { useAlert } from 'dashboard/composables';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
-import SlashCommandMenu from './SlashCommandMenu.vue';
 
 const MAXIMUM_FILE_UPLOAD_SIZE = 4; // in MB
-const SLASH_MENU_OFFSET = 4;
 const createState = (
   content,
   placeholder,
@@ -49,7 +40,6 @@ let editorView = null;
 let state;
 
 export default {
-  components: { SlashCommandMenu },
   mixins: [keyboardEventListenerMixins],
   props: {
     modelValue: { type: String, default: '' },
@@ -72,15 +62,8 @@ export default {
   },
   data() {
     return {
-      plugins: [
-        imagePastePlugin(this.handleImageUpload),
-        this.createSlashPlugin(),
-      ],
+      plugins: [imagePastePlugin(this.handleImageUpload)],
       isTextSelected: false, // Tracks text selection and prevents unnecessary re-renders on mouse selection
-      showSlashMenu: false,
-      slashSearchTerm: '',
-      slashRange: null,
-      slashMenuPosition: null,
     };
   },
   watch: {
@@ -96,7 +79,7 @@ export default {
 
   created() {
     state = createState(
-      this.modelValue || '',
+      this.modelValue,
       this.placeholder,
       this.plugins,
       { onImageUpload: this.openFileBrowser },
@@ -112,126 +95,6 @@ export default {
     }
   },
   methods: {
-    createSlashPlugin() {
-      return suggestionsPlugin({
-        matcher: triggerCharacters('/', 0),
-        suggestionClass: '',
-        onEnter: args => {
-          this.showSlashMenu = true;
-          this.slashRange = args.range;
-          this.slashSearchTerm = args.text || '';
-          this.updateSlashMenuPosition(args.range.from);
-          return false;
-        },
-        onChange: args => {
-          this.slashRange = args.range;
-          this.slashSearchTerm = args.text;
-          return false;
-        },
-        onExit: () => {
-          this.slashSearchTerm = '';
-          this.showSlashMenu = false;
-          this.slashMenuPosition = null;
-          return false;
-        },
-        onKeyDown: ({ event }) => {
-          return (
-            event.keyCode === 13 &&
-            this.showSlashMenu &&
-            this.$refs.slashMenu?.hasItems
-          );
-        },
-      });
-    },
-    updateSlashMenuPosition(pos) {
-      if (!editorView) return;
-      const coords = editorView.coordsAtPos(pos);
-      const editorRect = this.$refs.editor.getBoundingClientRect();
-      const isRtl = getComputedStyle(this.$refs.editor).direction === 'rtl';
-      this.slashMenuPosition = {
-        top: coords.bottom - editorRect.top + SLASH_MENU_OFFSET,
-        ...(isRtl
-          ? { right: editorRect.right - coords.right }
-          : { left: coords.left - editorRect.left }),
-      };
-    },
-    removeSlashTriggerText() {
-      if (!editorView || !this.slashRange) return;
-      const { from, to } = this.slashRange;
-      editorView.dispatch(editorView.state.tr.delete(from, to));
-      state = editorView.state;
-    },
-    executeSlashCommand(actionKey) {
-      if (!editorView) return;
-
-      this.removeSlashTriggerText();
-
-      const { schema } = editorView.state;
-      const commandMap = {
-        strong: () =>
-          toggleMark(schema.marks.strong)(
-            editorView.state,
-            editorView.dispatch
-          ),
-        em: () =>
-          toggleMark(schema.marks.em)(editorView.state, editorView.dispatch),
-        strike: () =>
-          toggleMark(schema.marks.strike)(
-            editorView.state,
-            editorView.dispatch
-          ),
-        code: () =>
-          toggleMark(schema.marks.code)(editorView.state, editorView.dispatch),
-        h1: () =>
-          toggleBlockType(schema.nodes.heading, { level: 1 })(
-            editorView.state,
-            editorView.dispatch
-          ),
-        h2: () =>
-          toggleBlockType(schema.nodes.heading, { level: 2 })(
-            editorView.state,
-            editorView.dispatch
-          ),
-        h3: () =>
-          toggleBlockType(schema.nodes.heading, { level: 3 })(
-            editorView.state,
-            editorView.dispatch
-          ),
-        bulletList: () =>
-          wrapInList(schema.nodes.bullet_list)(
-            editorView.state,
-            editorView.dispatch
-          ),
-        orderedList: () =>
-          wrapInList(schema.nodes.ordered_list)(
-            editorView.state,
-            editorView.dispatch
-          ),
-        insertTable: () => {
-          const { table, table_row, table_header, table_cell, paragraph } =
-            schema.nodes;
-          const headerCells = [0, 1, 2].map(() =>
-            table_header.createAndFill(null, paragraph.create())
-          );
-          const dataCells = [0, 1, 2].map(() =>
-            table_cell.createAndFill(null, paragraph.create())
-          );
-          const headerRow = table_row.create(null, headerCells);
-          const dataRow = table_row.create(null, dataCells);
-          const tableNode = table.create(null, [headerRow, dataRow]);
-          const tr = editorView.state.tr.replaceSelectionWith(tableNode);
-          editorView.dispatch(tr.scrollIntoView());
-        },
-      };
-
-      const command = commandMap[actionKey];
-      if (command) {
-        command();
-        state = editorView.state;
-        this.emitOnChange();
-        editorView.focus();
-      }
-    },
     contentFromEditor() {
       if (editorView) {
         return ArticleMarkdownSerializer.serialize(editorView.state.doc);
@@ -307,7 +170,7 @@ export default {
     },
     reloadState() {
       state = createState(
-        this.modelValue || '',
+        this.modelValue,
         this.placeholder,
         this.plugins,
         { onImageUpload: this.openFileBrowser },
@@ -399,8 +262,7 @@ export default {
 
       // Get the editor's width
       const editorWidth = editor.offsetWidth;
-      const menubar = editor.querySelector('.ProseMirror-menubar');
-      const menubarWidth = menubar ? menubar.scrollWidth : 480;
+      const menubarWidth = 480; // Menubar width (adjust as needed (px))
 
       // Get the end position of the selection
       const { bottom: endBottom, right: endRight } = editorView.coordsAtPos(to);
@@ -428,15 +290,7 @@ export default {
 
 <template>
   <div>
-    <div class="editor-root editor--article relative">
-      <SlashCommandMenu
-        v-if="showSlashMenu"
-        ref="slashMenu"
-        :search-key="slashSearchTerm"
-        :enabled-menu-options="enabledMenuOptions"
-        :position="slashMenuPosition"
-        @select-action="executeSlashCommand"
-      />
+    <div class="editor-root editor--article">
       <input
         ref="imageUploadInput"
         type="file"

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

@@ -128,6 +128,7 @@ export default {
     },
   },
   emits: [
+    'replaceText',
     'toggleInsertArticle',
     'selectWhatsappTemplate',
     'selectContentTemplate',
@@ -276,6 +277,9 @@ export default {
     toggleMessageSignature() {
       this.setSignatureFlagForInbox(this.channelType, !this.sendWithSignature);
     },
+    replaceText(text) {
+      this.$emit('replaceText', text);
+    },
     toggleInsertArticle() {
       this.$emit('toggleInsertArticle');
     },

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

@@ -54,7 +54,7 @@ export default {
       default: undefined,
     },
   },
-  emits: ['setReplyMode', 'toggleEditorSize', 'executeCopilotAction'],
+  emits: ['setReplyMode', 'togglePopout', 'executeCopilotAction'],
   setup(props, { emit }) {
     const setReplyMode = mode => {
       emit('setReplyMode', mode);
@@ -189,7 +189,7 @@ export default {
         class="text-n-slate-11"
         sm
         icon="i-lucide-maximize-2"
-        @click="$emit('toggleEditorSize')"
+        @click="$emit('togglePopout')"
       />
     </div>
   </div>

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

@@ -1,180 +0,0 @@
-<script setup>
-import { ref, computed, watch, nextTick } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useKeyboardNavigableList } from 'dashboard/composables/useKeyboardNavigableList';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-
-const props = defineProps({
-  searchKey: {
-    type: String,
-    default: '',
-  },
-  enabledMenuOptions: {
-    type: Array,
-    default: () => [],
-  },
-  position: {
-    type: Object,
-    default: null,
-  },
-});
-
-const emit = defineEmits(['selectAction']);
-
-const { t } = useI18n();
-
-const EDITOR_ACTIONS = [
-  {
-    value: 'h1',
-    labelKey: 'SLASH_COMMANDS.HEADING_1',
-    icon: 'i-lucide-heading-1',
-    menuKey: 'h1',
-  },
-  {
-    value: 'h2',
-    labelKey: 'SLASH_COMMANDS.HEADING_2',
-    icon: 'i-lucide-heading-2',
-    menuKey: 'h2',
-  },
-  {
-    value: 'h3',
-    labelKey: 'SLASH_COMMANDS.HEADING_3',
-    icon: 'i-lucide-heading-3',
-    menuKey: 'h3',
-  },
-  {
-    value: 'strong',
-    labelKey: 'SLASH_COMMANDS.BOLD',
-    icon: 'i-lucide-bold',
-    menuKey: 'strong',
-  },
-  {
-    value: 'em',
-    labelKey: 'SLASH_COMMANDS.ITALIC',
-    icon: 'i-lucide-italic',
-    menuKey: 'em',
-  },
-  {
-    value: 'insertTable',
-    labelKey: 'SLASH_COMMANDS.TABLE',
-    icon: 'i-lucide-table',
-    menuKey: 'insertTable',
-  },
-  {
-    value: 'strike',
-    labelKey: 'SLASH_COMMANDS.STRIKETHROUGH',
-    icon: 'i-lucide-strikethrough',
-    menuKey: 'strike',
-  },
-  {
-    value: 'code',
-    labelKey: 'SLASH_COMMANDS.CODE',
-    icon: 'i-lucide-code',
-    menuKey: 'code',
-  },
-  {
-    value: 'bulletList',
-    labelKey: 'SLASH_COMMANDS.BULLET_LIST',
-    icon: 'i-lucide-list',
-    menuKey: 'bulletList',
-  },
-  {
-    value: 'orderedList',
-    labelKey: 'SLASH_COMMANDS.ORDERED_LIST',
-    icon: 'i-lucide-list-ordered',
-    menuKey: 'orderedList',
-  },
-];
-
-const listContainerRef = ref(null);
-const selectedIndex = ref(0);
-
-const items = computed(() => {
-  const search = props.searchKey.toLowerCase();
-  return EDITOR_ACTIONS.filter(action => {
-    if (!props.enabledMenuOptions.includes(action.menuKey)) return false;
-    if (!search) return true;
-    return t(action.labelKey).toLowerCase().includes(search);
-  });
-});
-
-const hasItems = computed(() => items.value.length > 0);
-
-const menuStyle = computed(() => {
-  if (!props.position) return {};
-  const style = { top: `${props.position.top}px` };
-  if (props.position.right != null) {
-    style.right = `${props.position.right}px`;
-  } else {
-    style.left = `${props.position.left}px`;
-  }
-  return style;
-});
-
-const adjustScroll = () => {
-  nextTick(() => {
-    const container = listContainerRef.value;
-    if (!container) return;
-    const el = container.querySelector(`#slash-item-${selectedIndex.value}`);
-    if (el) {
-      el.scrollIntoView({ block: 'nearest', behavior: 'auto' });
-    }
-  });
-};
-
-const onSelect = () => {
-  const item = items.value[selectedIndex.value];
-  if (item) emit('selectAction', item.value);
-};
-
-useKeyboardNavigableList({
-  items,
-  onSelect,
-  adjustScroll,
-  selectedIndex,
-});
-
-// Reset selection when filtered items change
-watch(items, () => {
-  selectedIndex.value = 0;
-});
-
-const onHover = index => {
-  selectedIndex.value = index;
-};
-
-const onItemClick = index => {
-  selectedIndex.value = index;
-  onSelect();
-};
-
-defineExpose({ hasItems });
-</script>
-
-<!-- eslint-disable-next-line vue/no-root-v-if -->
-<template>
-  <div
-    v-if="hasItems"
-    ref="listContainerRef"
-    class="bg-n-alpha-3 backdrop-blur-[100px] outline outline-1 outline-n-container absolute rounded-xl z-50 flex flex-col min-w-[10rem] shadow-lg p-2 overflow-auto max-h-[15rem]"
-    :style="menuStyle"
-  >
-    <button
-      v-for="(item, index) in items"
-      :id="`slash-item-${index}`"
-      :key="item.value"
-      type="button"
-      class="inline-flex items-center justify-start w-full h-8 min-w-0 gap-2 px-2 py-1.5 border-0 rounded-lg text-n-slate-12 hover:bg-n-alpha-1 dark:hover:bg-n-alpha-2"
-      :class="{
-        'bg-n-alpha-1 dark:bg-n-alpha-2': index === selectedIndex,
-      }"
-      @mouseover="onHover(index)"
-      @click="onItemClick(index)"
-    >
-      <Icon :icon="item.icon" class="flex-shrink-0 size-3.5" />
-      <span class="min-w-0 text-sm truncate">
-        {{ t(item.labelKey) }}
-      </span>
-    </button>
-  </div>
-</template>

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

@@ -10,7 +10,7 @@ import InboxName from '../InboxName.vue';
 import ConversationContextMenu from './contextMenu/Index.vue';
 import TimeAgo from 'dashboard/components/ui/TimeAgo.vue';
 import CardLabels from './conversationCardComponents/CardLabels.vue';
-import CardPriorityIcon from 'dashboard/components-next/Conversation/ConversationCard/CardPriorityIcon.vue';
+import PriorityMark from './PriorityMark.vue';
 import SLACardLabel from './components/SLACardLabel.vue';
 import ContextMenu from 'dashboard/components/ui/ContextMenu.vue';
 import VoiceCallStatus from './VoiceCallStatus.vue';
@@ -305,7 +305,7 @@ const deleteConversation = () => {
       >
         <InboxName v-if="showInboxName" :inbox="inbox" class="flex-1 min-w-0" />
         <div
-          class="flex items-baseline gap-2 flex-shrink-0"
+          class="flex items-center gap-2 flex-shrink-0"
           :class="{
             'flex-1 justify-between': !showInboxName,
           }"
@@ -317,10 +317,7 @@ const deleteConversation = () => {
             <fluent-icon icon="person" size="12" class="text-n-slate-11" />
             {{ assignee.name }}
           </span>
-          <CardPriorityIcon
-            :priority="chat.priority"
-            class="flex-shrink-0 !size-3.5"
-          />
+          <PriorityMark :priority="chat.priority" class="flex-shrink-0" />
         </div>
       </div>
       <h4

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

@@ -45,7 +45,6 @@ const backButtonUrl = computed(() => {
 
   const conversationTypeMap = {
     conversation_through_mentions: 'mention',
-    conversation_through_participating: 'participating',
     conversation_through_unattended: 'unattended',
   };
   return conversationListPageURL({

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

@@ -41,16 +41,7 @@ const closeContactPanel = () => {
 
 <template>
   <div
-    v-on-click-outside="[
-      () => closeContactPanel(),
-      {
-        ignore: [
-          'dialog.ProseMirror-prompt-backdrop',
-          '[data-popover-content]',
-          '[data-popover-backdrop]',
-        ],
-      },
-    ]"
+    v-on-click-outside="() => closeContactPanel()"
     class="bg-n-surface-2 h-full overflow-hidden flex flex-col fixed top-0 z-40 w-full max-w-sm transition-transform duration-300 ease-in-out ltr:right-0 rtl:left-0 md:static md:w-[320px] md:min-w-[320px] ltr:border-l rtl:border-r border-n-weak 2xl:min-w-[360px] 2xl:w-[360px] shadow-lg md:shadow-none"
     :class="[
       {

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

@@ -16,6 +16,10 @@ defineProps({
     type: String,
     default: '',
   },
+  isPopout: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits([
@@ -65,6 +69,7 @@ const onSend = () => {
       :generated-content="generatedContent"
       :min-height="4"
       :enabled-menu-options="[]"
+      :is-popout="isPopout"
       @focus="onFocus"
       @blur="onBlur"
       @clear-selection="clearEditorSelection"

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

@@ -1,7 +1,7 @@
 <script>
-import { ref, provide, useTemplateRef } from 'vue';
-import { useElementSize } from '@vueuse/core';
+import { ref, provide } from 'vue';
 // composable
+import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
 import { useLabelSuggestions } from 'dashboard/composables/useLabelSuggestions';
 import { useSnakeCase } from 'dashboard/composables/useTransformKeys';
 
@@ -11,7 +11,6 @@ import MessageList from 'next/message/MessageList.vue';
 import ConversationLabelSuggestion from './conversation/LabelSuggestion.vue';
 import Banner from 'dashboard/components/ui/Banner.vue';
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
-import ResizableEditorWrapper from './ResizableEditorWrapper.vue';
 
 // stores and apis
 import { mapGetters } from 'vuex';
@@ -44,16 +43,21 @@ export default {
     Banner,
     ConversationLabelSuggestion,
     Spinner,
-    ResizableEditorWrapper,
   },
   mixins: [inboxMixin],
   setup() {
+    const isPopOutReplyBox = ref(false);
     const conversationPanelRef = ref(null);
-    const resizableEditorWrapperRef = ref(null);
-    const messagesViewRef = useTemplateRef('messagesViewRef');
-    const topBannerRef = useTemplateRef('topBannerRef');
-    const { height: containerHeight } = useElementSize(messagesViewRef);
-    const { height: topBannerHeight } = useElementSize(topBannerRef);
+
+    const keyboardEvents = {
+      Escape: {
+        action: () => {
+          isPopOutReplyBox.value = false;
+        },
+      },
+    };
+
+    useKeyboardEvents(keyboardEvents);
 
     const {
       captainTasksEnabled,
@@ -64,15 +68,11 @@ export default {
     provide('contextMenuElementTarget', conversationPanelRef);
 
     return {
+      isPopOutReplyBox,
       captainTasksEnabled,
       getLabelSuggestions,
       isLabelSuggestionFeatureEnabled,
       conversationPanelRef,
-      resizableEditorWrapperRef,
-      messagesViewRef,
-      topBannerRef,
-      containerHeight,
-      topBannerHeight,
     };
   },
   data() {
@@ -254,7 +254,6 @@ export default {
       this.fetchAllAttachmentsFromCurrentChat();
       this.fetchSuggestions();
       this.messageSentSinceOpened = false;
-      this.resetReplyEditorHeight();
     },
   },
 
@@ -438,37 +437,26 @@ export default {
       const payload = useSnakeCase(message);
       await this.$store.dispatch('sendMessageWithData', payload);
     },
-    toggleReplyEditorSize() {
-      this.resizableEditorWrapperRef?.toggleEditorExpand?.();
-    },
-    resetReplyEditorHeight() {
-      this.resizableEditorWrapperRef?.resetEditorHeight?.();
-    },
   },
 };
 </script>
 
 <template>
-  <div
-    ref="messagesViewRef"
-    class="flex flex-col justify-between flex-grow h-full min-w-0 m-0"
-  >
-    <div ref="topBannerRef">
-      <Banner
-        v-if="!currentChat.can_reply"
-        color-scheme="alert"
-        class="mx-2 mt-2 overflow-hidden rounded-lg"
-        :banner-message="replyWindowBannerMessage"
-        :href-link="replyWindowLink"
-        :href-link-text="replyWindowLinkText"
-      />
-      <Banner
-        v-else-if="hasDuplicateInstagramInbox"
-        color-scheme="alert"
-        class="mx-2 mt-2 overflow-hidden rounded-lg"
-        :banner-message="$t('CONVERSATION.OLD_INSTAGRAM_INBOX_REPLY_BANNER')"
-      />
-    </div>
+  <div class="flex flex-col justify-between flex-grow h-full min-w-0 m-0">
+    <Banner
+      v-if="!currentChat.can_reply"
+      color-scheme="alert"
+      class="mx-2 mt-2 overflow-hidden rounded-lg"
+      :banner-message="replyWindowBannerMessage"
+      :href-link="replyWindowLink"
+      :href-link-text="replyWindowLinkText"
+    />
+    <Banner
+      v-else-if="hasDuplicateInstagramInbox"
+      color-scheme="alert"
+      class="mx-2 mt-2 overflow-hidden rounded-lg"
+      :banner-message="$t('CONVERSATION.OLD_INSTAGRAM_INBOX_REPLY_BANNER')"
+    />
     <MessageList
       ref="conversationPanelRef"
       class="conversation-panel flex-shrink flex-grow basis-px flex flex-col overflow-y-auto relative h-full m-0 pb-4"
@@ -510,7 +498,13 @@ export default {
         />
       </template>
     </MessageList>
-    <div class="flex relative flex-col bg-n-surface-1">
+    <div
+      class="flex relative flex-col"
+      :class="{
+        'modal-mask': isPopOutReplyBox,
+        'bg-n-surface-1': !isPopOutReplyBox,
+      }"
+    >
       <div
         v-if="isAnyoneTyping"
         class="absolute flex items-center w-full h-0 -top-7"
@@ -526,12 +520,42 @@ export default {
           />
         </div>
       </div>
-      <ResizableEditorWrapper
-        ref="resizableEditorWrapperRef"
-        :container-height="Math.max(0, containerHeight - topBannerHeight)"
-      >
-        <ReplyBox @toggle-editor-size="toggleReplyEditorSize" />
-      </ResizableEditorWrapper>
+      <ReplyBox
+        :pop-out-reply-box="isPopOutReplyBox"
+        @update:pop-out-reply-box="isPopOutReplyBox = $event"
+      />
     </div>
   </div>
 </template>
+
+<style scoped lang="scss">
+.modal-mask {
+  @apply fixed;
+
+  &::v-deep {
+    .ProseMirror-woot-style {
+      @apply max-h-[25rem];
+    }
+
+    .reply-box {
+      @apply border border-n-weak max-w-[75rem] w-[70%];
+
+      &.is-private {
+        @apply dark:border-n-amber-3/30 border-n-amber-12/5;
+      }
+    }
+
+    .reply-box .reply-box__top {
+      @apply relative min-h-[27.5rem];
+    }
+
+    .reply-box__top .input {
+      @apply min-h-[27.5rem];
+    }
+
+    .emoji-dialog {
+      @apply absolute ltr:left-auto rtl:right-auto bottom-1;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,53 @@
+<script>
+import { CONVERSATION_PRIORITY } from '../../../../shared/constants/messages';
+
+export default {
+  name: 'PriorityMark',
+  props: {
+    priority: {
+      type: String,
+      default: '',
+      validate: value =>
+        [...Object.values(CONVERSATION_PRIORITY), ''].includes(value),
+    },
+  },
+  data() {
+    return {
+      CONVERSATION_PRIORITY,
+    };
+  },
+  computed: {
+    tooltipText() {
+      return this.$t(
+        `CONVERSATION.PRIORITY.OPTIONS.${this.priority.toUpperCase()}`
+      );
+    },
+    isUrgent() {
+      return this.priority === CONVERSATION_PRIORITY.URGENT;
+    },
+  },
+};
+</script>
+
+<!-- eslint-disable-next-line vue/no-root-v-if -->
+<template>
+  <span
+    v-if="priority"
+    v-tooltip="{
+      content: tooltipText,
+      delay: { show: 1500, hide: 0 },
+    }"
+    class="shrink-0 rounded-sm inline-flex items-center justify-center w-3.5 h-3.5"
+    :class="{
+      'bg-n-ruby-4 text-n-ruby-10': isUrgent,
+      'bg-n-slate-4 text-n-slate-11': !isUrgent,
+    }"
+  >
+    <fluent-icon
+      :icon="`priority-${priority.toLowerCase()}`"
+      :size="isUrgent ? 12 : 14"
+      class="flex-shrink-0"
+      view-box="0 0 14 14"
+    />
+  </span>
+</template>

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

@@ -27,6 +27,7 @@ import { CMD_AI_ASSIST } from 'dashboard/helper/commandbar/events';
 import {
   getMessageVariables,
   getUndefinedVariablesInMessage,
+  replaceVariablesInMessage,
 } from '@chatwoot/utils';
 import WhatsappTemplates from './WhatsappTemplates/Modal.vue';
 import ContentTemplates from './ContentTemplates/ContentTemplatesModal.vue';
@@ -81,7 +82,13 @@ export default {
     CopilotReplyBottomPanel,
   },
   mixins: [inboxMixin, fileUploadMixin, keyboardEventListenerMixins],
-  emits: ['toggleEditorSize'],
+  props: {
+    popOutReplyBox: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ['update:popOutReplyBox'],
   setup() {
     const {
       uiSettings,
@@ -246,9 +253,6 @@ export default {
       if (this.isAnInstagramChannel) {
         return MESSAGE_MAX_LENGTH.INSTAGRAM;
       }
-      if (this.isATelegramChannel) {
-        return MESSAGE_MAX_LENGTH.TELEGRAM;
-      }
       if (this.isATiktokChannel) {
         return MESSAGE_MAX_LENGTH.TIKTOK;
       }
@@ -541,10 +545,7 @@ export default {
     },
     setCopilotAcceptedMessage(message, replyType = this.replyType) {
       const key = this.getDraftKey(this.conversationIdByRoute, replyType);
-      this.copilotAcceptedMessages[key] = trimContent(
-        message || '',
-        this.maxLength
-      );
+      this.copilotAcceptedMessages[key] = trimContent(message || '');
     },
     clearCopilotAcceptedMessage(replyType = this.replyType) {
       const key = this.getDraftKey(this.conversationIdByRoute, replyType);
@@ -602,7 +603,7 @@ export default {
     saveDraft(conversationId, replyType) {
       if (this.message || this.message === '') {
         const key = this.getDraftKey(conversationId, replyType);
-        const draftToSave = trimContent(this.message || '', this.maxLength);
+        const draftToSave = trimContent(this.message || '');
 
         this.$store.dispatch('draftMessages/set', {
           key,
@@ -629,17 +630,10 @@ export default {
         return message;
       }
 
-      // Even when editor is disabled (e.g. WhatsApp/API can't reply), we must
-      // still normalize stale signatures out of drafts when signature is off.
-      if (this.isEditorDisabled && this.sendWithSignature) {
-        return message;
-      }
-
       const effectiveChannelType = getEffectiveChannelType(
         this.channelType,
         this.inbox?.medium || ''
       );
-
       return this.sendWithSignature
         ? appendSignature(message, this.messageSignature, effectiveChannelType)
         : removeSignature(message, this.messageSignature, effectiveChannelType);
@@ -791,6 +785,7 @@ export default {
 
         this.clearMessage();
         this.hideEmojiPicker();
+        this.$emit('update:popOutReplyBox', false);
       }
     },
     sendMessageAsMultipleMessages(message, copilotAcceptedMessage = '') {
@@ -910,6 +905,32 @@ export default {
       });
       this.hideContentTemplatesModal();
     },
+    replaceText(message) {
+      if (this.sendWithSignature && !this.private) {
+        // if signature is enabled, append it to the message
+        // appendSignature ensures that the signature is not duplicated
+        // so we don't need to check if the signature is already present
+        const effectiveChannelType = getEffectiveChannelType(
+          this.channelType,
+          this.inbox?.medium || ''
+        );
+        message = appendSignature(
+          message,
+          this.messageSignature,
+          effectiveChannelType
+        );
+      }
+
+      const updatedMessage = replaceVariablesInMessage({
+        message,
+        variables: this.messageVariables,
+      });
+
+      setTimeout(() => {
+        useTrack(CONVERSATION_EVENTS.INSERTED_A_CANNED_RESPONSE);
+        this.message = updatedMessage;
+      }, 100);
+    },
     setReplyMode(mode = REPLY_EDITOR_MODES.REPLY) {
       // Clear attachments when switching between private note and reply modes
       // This is to prevent from breaking the upload rules
@@ -1210,9 +1231,8 @@ export default {
         file => !file?.isRecordedAudio
       );
     },
-    toggleEditorSize() {
-      this.$emit('toggleEditorSize');
-      this.$nextTick(() => this.messageEditor?.focusEditorInputField());
+    togglePopout() {
+      this.$emit('update:popOutReplyBox', !this.popOutReplyBox);
     },
     onSubmitCopilotReply() {
       const acceptedMessage = this.copilot.accept();
@@ -1238,8 +1258,9 @@ export default {
       :is-message-length-reaching-threshold="isMessageLengthReachingThreshold"
       :characters-remaining="charactersRemaining"
       :editor-content="message"
+      :popout-reply-box="popOutReplyBox"
       @set-reply-mode="setReplyMode"
-      @toggle-editor-size="toggleEditorSize"
+      @toggle-popout="togglePopout"
       @toggle-copilot="copilot.toggleEditor"
       @execute-copilot-action="executeCopilotAction"
     />
@@ -1268,7 +1289,7 @@ export default {
           v-if="showEmojiPicker"
           v-on-clickaway="hideEmojiPicker"
           :class="{
-            'emoji-dialog--expanded': isOnExpandedLayout,
+            'emoji-dialog--expanded': isOnExpandedLayout || popOutReplyBox,
           }"
           :on-click="addIntoEditor"
         />
@@ -1292,6 +1313,7 @@ export default {
           :show-copilot-editor="copilot.showEditor.value"
           :is-generating-content="copilot.isGenerating.value"
           :generated-content="copilot.generatedContent.value"
+          :is-popout="popOutReplyBox"
           :placeholder="$t('CONVERSATION.FOOTER.COPILOT_MSG_INPUT')"
           @focus="onFocus"
           @blur="onBlur"
@@ -1407,6 +1429,7 @@ export default {
         :new-conversation-modal-active="newConversationModalActive"
         @select-whatsapp-template="openWhatsappTemplateModal"
         @select-content-template="openContentTemplateModal"
+        @replace-text="replaceText"
         @toggle-insert-article="toggleInsertArticle"
         @toggle-quoted-reply="toggleQuotedReply"
       />

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

@@ -1,154 +0,0 @@
-<script setup>
-import { ref, computed, onMounted, onBeforeUnmount, useTemplateRef } from 'vue';
-import { useEventListener } from '@vueuse/core';
-import { emitter } from 'shared/helpers/mitt';
-import { BUS_EVENTS } from 'shared/constants/busEvents';
-
-const props = defineProps({
-  containerHeight: { type: Number, default: 0 },
-});
-
-const DEFAULT_HEIGHT = 120;
-const MIN_HEIGHT = 80;
-const MIN_MESSAGES_HEIGHT = 200;
-const EXPAND_RATIO = 0.5;
-const RESET_DELAY_MS = 120;
-
-const wrapperRef = useTemplateRef('wrapperRef');
-const surroundingHeight = ref(0);
-const editorHeight = ref(DEFAULT_HEIGHT);
-const isResizing = ref(false);
-const startY = ref(0);
-const startHeight = ref(0);
-let resetTimeoutId = null;
-
-const clamp = (val, min, max) => Math.min(Math.max(val, min), max);
-
-// Measure height of elements surrounding the editor (top panel, email fields, bottom panel)
-const measureSurroundingHeight = () => {
-  if (wrapperRef.value) {
-    surroundingHeight.value = Math.max(
-      0,
-      wrapperRef.value.offsetHeight - editorHeight.value
-    );
-  }
-};
-
-const isContainerReady = computed(() => props.containerHeight > 0);
-
-const sizeBounds = computed(() => {
-  const h = props.containerHeight;
-  const s = surroundingHeight.value;
-  const max = Math.max(MIN_HEIGHT, h - MIN_MESSAGES_HEIGHT - s);
-  const expanded = clamp(Math.floor(h * EXPAND_RATIO - s / 2), MIN_HEIGHT, max);
-  return {
-    min: MIN_HEIGHT,
-    max: isContainerReady.value ? max : DEFAULT_HEIGHT,
-    expanded,
-    default: clamp(DEFAULT_HEIGHT, MIN_HEIGHT, max),
-  };
-});
-
-const clampToBounds = val =>
-  clamp(val, sizeBounds.value.min, sizeBounds.value.max);
-
-const clearDragStyles = () => {
-  Object.assign(document.body.style, { cursor: '', userSelect: '' });
-};
-
-const getClientY = e => (e.touches ? e.touches[0].clientY : e.clientY);
-
-const onResizeStart = event => {
-  editorHeight.value = clampToBounds(editorHeight.value);
-  measureSurroundingHeight();
-  isResizing.value = true;
-  startY.value = getClientY(event);
-  startHeight.value = clampToBounds(editorHeight.value);
-  editorHeight.value = startHeight.value;
-  Object.assign(document.body.style, {
-    cursor: 'row-resize',
-    userSelect: 'none',
-  });
-};
-
-const onResizeMove = event => {
-  if (!isResizing.value) return;
-  if (event.touches) event.preventDefault();
-  editorHeight.value = clampToBounds(
-    startHeight.value + startY.value - getClientY(event)
-  );
-};
-
-const onResizeEnd = () => {
-  if (!isResizing.value) return;
-  isResizing.value = false;
-  clearDragStyles();
-};
-
-const resetEditorHeight = () => {
-  editorHeight.value = sizeBounds.value.default;
-};
-
-const toggleEditorExpand = () => {
-  editorHeight.value = clampToBounds(editorHeight.value);
-  measureSurroundingHeight();
-  const { expanded, max, default: defaultHeight } = sizeBounds.value;
-  const isExpanded = editorHeight.value > defaultHeight;
-  // If expanded is too close to default, use max so the toggle is always noticeable
-  const target = expanded - defaultHeight < 100 ? max : expanded;
-  editorHeight.value = isExpanded ? defaultHeight : target;
-};
-
-const handleMessageSent = () => {
-  clearTimeout(resetTimeoutId);
-  resetTimeoutId = setTimeout(resetEditorHeight, RESET_DELAY_MS);
-};
-
-onMounted(() => {
-  emitter.on(BUS_EVENTS.MESSAGE_SENT, handleMessageSent);
-});
-
-onBeforeUnmount(() => {
-  emitter.off(BUS_EVENTS.MESSAGE_SENT, handleMessageSent);
-  clearTimeout(resetTimeoutId);
-  if (isResizing.value) {
-    isResizing.value = false;
-    clearDragStyles();
-  }
-});
-
-useEventListener(document, 'mousemove', onResizeMove);
-useEventListener(document, 'mouseup', onResizeEnd);
-useEventListener(document, 'touchmove', onResizeMove, { passive: false });
-useEventListener(document, 'touchend', onResizeEnd);
-useEventListener(document, 'touchcancel', onResizeEnd);
-useEventListener(window, 'blur', onResizeEnd);
-
-defineExpose({ toggleEditorExpand, resetEditorHeight });
-</script>
-
-<template>
-  <div
-    ref="wrapperRef"
-    class="relative resizable-editor-wrapper"
-    :style="{
-      '--editor-height': editorHeight + 'px',
-      '--editor-min-allowed': sizeBounds.min + 'px',
-      '--editor-max-allowed': sizeBounds.max + 'px',
-      '--editor-height-transition': isResizing ? 'none' : '180ms ease',
-    }"
-  >
-    <div
-      class="group absolute inset-x-0 -top-4 z-10 flex h-4 cursor-row-resize select-none items-center justify-center bg-gradient-to-b from-transparent from-10% dark:to-n-surface-1/80 to-n-surface-1/90 backdrop-blur-[0.01875rem]"
-      @mousedown="onResizeStart"
-      @touchstart.prevent="onResizeStart"
-      @dblclick="resetEditorHeight"
-    >
-      <div
-        class="w-8 h-0.5 mt-1 rounded-full bg-n-slate-6 group-hover:bg-n-slate-8 transition-all duration-200 motion-safe:group-hover:animate-bounce"
-        :class="{ 'bg-n-slate-8 animate-bounce': isResizing }"
-      />
-    </div>
-    <slot />
-  </div>
-</template>

app/javascript/dashboard/composables/spec/useAutomation.spec.js

@@ -8,7 +8,6 @@ import {
   agents,
   teams,
   labels,
-  booleanFilterOptions,
   statusFilterOptions,
   messageTypeOptions,
   priorityOptions,
@@ -74,8 +73,6 @@ describe('useAutomation', () => {
           return countries;
         case 'message_type':
           return messageTypeOptions;
-        case 'private_note':
-          return booleanFilterOptions;
         case 'priority':
           return priorityOptions;
         default:
@@ -92,9 +89,7 @@ describe('useAutomation', () => {
         case 'assign_team':
           return teams;
         case 'assign_agent':
-          return options.addNoneToListFn
-            ? options.addNoneToListFn(options.agents)
-            : options.agents;
+          return agents;
         case 'send_email_to_team':
           return teams;
         case 'send_message':
@@ -231,9 +226,6 @@ describe('useAutomation', () => {
     expect(getConditionDropdownValues('message_type')).toEqual(
       messageTypeOptions
     );
-    expect(getConditionDropdownValues('private_note')).toEqual(
-      booleanFilterOptions
-    );
     expect(getConditionDropdownValues('priority')).toEqual(priorityOptions);
   });
 
@@ -242,11 +234,7 @@ describe('useAutomation', () => {
 
     expect(getActionDropdownValues('add_label')).toEqual(labels);
     expect(getActionDropdownValues('assign_team')).toEqual(teams);
-    expect(getActionDropdownValues('assign_agent')).toEqual([
-      { id: 'nil', name: 'AUTOMATION.NONE_OPTION' },
-      { id: 'last_responding_agent', name: 'AUTOMATION.LAST_RESPONDING_AGENT' },
-      ...agents,
-    ]);
+    expect(getActionDropdownValues('assign_agent')).toEqual(agents);
     expect(getActionDropdownValues('send_email_to_team')).toEqual(teams);
     expect(getActionDropdownValues('send_message')).toEqual([]);
     expect(getActionDropdownValues('add_sla')).toEqual(slaPolicies);

app/javascript/dashboard/composables/spec/useDropdownPosition.spec.js

@@ -1,239 +0,0 @@
-import { ref } from 'vue';
-import { useDropdownPosition } from 'dashboard/composables/useDropdownPosition';
-
-// Mock @vueuse/core — return reactive refs we can control per test
-const mockBounding = () => ({
-  top: ref(0),
-  bottom: ref(0),
-  left: ref(0),
-  right: ref(0),
-  width: ref(0),
-  height: ref(0),
-  update: vi.fn(),
-});
-
-const triggerBounds = mockBounding();
-const dropdownBounds = mockBounding();
-const winWidth = ref(1024);
-const winHeight = ref(768);
-
-vi.mock('@vueuse/core', () => {
-  let callCount = 0;
-  return {
-    // First call = trigger, second = dropdown, third = container (if any)
-    useElementBounding: () => {
-      callCount += 1;
-      return callCount % 3 === 1 ? triggerBounds : dropdownBounds;
-    },
-    useWindowSize: () => ({ width: winWidth, height: winHeight }),
-  };
-});
-
-const setTrigger = ({ top, bottom, left, right }) => {
-  triggerBounds.top.value = top;
-  triggerBounds.bottom.value = bottom;
-  triggerBounds.left.value = left ?? 100;
-  triggerBounds.right.value = right ?? 200;
-};
-
-const setDropdown = ({ width, height }) => {
-  dropdownBounds.width.value = width ?? 200;
-  dropdownBounds.height.value = height;
-};
-
-describe('useDropdownPosition', () => {
-  beforeEach(() => {
-    winWidth.value = 1024;
-    winHeight.value = 768;
-    document.body.innerHTML = '<div id="app" dir="ltr"></div>';
-  });
-
-  describe('verticalClass (relative mode)', () => {
-    it('places below when enough space', () => {
-      // Trigger at y=100, dropdown 200px tall
-      // Space below = 768 - 140 = 628 → fits (628 > 216)
-      setTrigger({ top: 100, bottom: 140 });
-      setDropdown({ height: 200 });
-
-      const { position } = useDropdownPosition(ref(null), ref(null), ref(true));
-      expect(position.value.class).toBe('top-full mt-2');
-    });
-
-    it('places above when not enough space below but enough above', () => {
-      // Trigger near bottom at y=600
-      // Space below = 128 → doesn't fit. Space above = 600 → fits
-      setTrigger({ top: 600, bottom: 640 });
-      setDropdown({ height: 200 });
-
-      const { position } = useDropdownPosition(ref(null), ref(null), ref(true));
-      expect(position.value.class).toBe('bottom-full mb-2');
-    });
-
-    it('picks the side with more space when dropdown fits neither', () => {
-      // Dropdown 500px tall, won't fit above (300) or below (428)
-      // Below has more room → stays below
-      setTrigger({ top: 300, bottom: 340 });
-      setDropdown({ height: 500 });
-
-      const { position } = useDropdownPosition(ref(null), ref(null), ref(true));
-      expect(position.value.class).toBe('top-full mt-2');
-    });
-
-    it('picks above when above has more space and neither fits', () => {
-      // Dropdown 600px tall, won't fit above (500) or below (228)
-      // Above has more room → flips above
-      setTrigger({ top: 500, bottom: 540 });
-      setDropdown({ height: 600 });
-
-      const { position } = useDropdownPosition(ref(null), ref(null), ref(true));
-      expect(position.value.class).toBe('bottom-full mb-2');
-    });
-
-    it('returns default when disabled', () => {
-      setTrigger({ top: 700, bottom: 740 });
-      setDropdown({ height: 200 });
-
-      const { position } = useDropdownPosition(
-        ref(null),
-        ref(null),
-        ref(false)
-      );
-      expect(position.value.class).toBe('top-full mt-2');
-      expect(position.value.style).toEqual({});
-    });
-  });
-
-  describe('fixedPosition', () => {
-    it('places below with correct top and maxHeight', () => {
-      // Trigger at y=140, space below = 628
-      // top = 140 + 8(gap) = 148
-      // maxHeight = 628 - 8(gap) - 16(margin) = 604
-      setTrigger({ top: 100, bottom: 140 });
-      setDropdown({ height: 200, width: 200 });
-
-      const { fixedPosition } = useDropdownPosition(
-        ref(null),
-        ref(null),
-        ref(true)
-      );
-
-      expect(fixedPosition.value.style.top).toBe('148px');
-      expect(fixedPosition.value.style.bottom).toBeUndefined();
-      expect(fixedPosition.value.style.maxHeight).toBe('604px');
-    });
-
-    it('flips above with correct bottom and maxHeight', () => {
-      // Trigger near bottom at y=650, space below = 78 → doesn't fit
-      // Flips above: bottom = 768 - 650 + 8 = 126
-      // maxHeight = 650 - 8 - 16 = 626
-      setTrigger({ top: 650, bottom: 690 });
-      setDropdown({ height: 200, width: 200 });
-
-      const { fixedPosition } = useDropdownPosition(
-        ref(null),
-        ref(null),
-        ref(true)
-      );
-
-      expect(fixedPosition.value.style.bottom).toBe('126px');
-      expect(fixedPosition.value.style.top).toBeUndefined();
-      expect(fixedPosition.value.style.maxHeight).toBe('626px');
-    });
-
-    it('constrains maxHeight to available space on short viewports', () => {
-      // Short viewport (400px), trigger in the middle, dropdown 500px tall
-      // Neither side fits → above (200) > below (160) → places above
-      // maxHeight capped to 200 - 8 - 16 = 176
-      winHeight.value = 400;
-      setTrigger({ top: 200, bottom: 240 });
-      setDropdown({ height: 500, width: 200 });
-
-      const { fixedPosition } = useDropdownPosition(
-        ref(null),
-        ref(null),
-        ref(true)
-      );
-
-      expect(fixedPosition.value.style.bottom).toBeDefined();
-      expect(fixedPosition.value.style.maxHeight).toBe('176px');
-    });
-
-    it('returns defaults when disabled', () => {
-      const { fixedPosition } = useDropdownPosition(
-        ref(null),
-        ref(null),
-        ref(false)
-      );
-      expect(fixedPosition.value.class).toBe('fixed z-[9999]');
-      expect(fixedPosition.value.style).toEqual({});
-    });
-  });
-
-  describe('horizontal positioning (fixedPosition)', () => {
-    it('anchors to the right edge by default (align=end, LTR)', () => {
-      // align=end + LTR → anchorLeft=false → uses style.right
-      // right = 1024 - 900 = 124
-      setTrigger({ top: 100, bottom: 140, left: 800, right: 900 });
-      setDropdown({ height: 100, width: 200 });
-
-      const { fixedPosition } = useDropdownPosition(
-        ref(null),
-        ref(null),
-        ref(true)
-      );
-
-      expect(fixedPosition.value.style.right).toBe('124px');
-    });
-
-    it('anchors to the left edge when align=start (LTR)', () => {
-      // align=start + LTR → anchorLeft=true → uses style.left
-      setTrigger({ top: 100, bottom: 140, left: 100, right: 200 });
-      setDropdown({ height: 100, width: 200 });
-
-      const { fixedPosition } = useDropdownPosition(
-        ref(null),
-        ref(null),
-        ref(true),
-        { align: 'start' }
-      );
-
-      expect(fixedPosition.value.style.left).toBe('100px');
-    });
-
-    it('shifts left when dropdown overflows right edge', () => {
-      // Trigger at x=900, dropdown 300px wide → 900+300=1200 > 1024
-      // Falls back to right: 16px (margin)
-      setTrigger({ top: 100, bottom: 140, left: 900, right: 1000 });
-      setDropdown({ height: 100, width: 300 });
-
-      const { fixedPosition } = useDropdownPosition(
-        ref(null),
-        ref(null),
-        ref(true),
-        { align: 'start' }
-      );
-
-      expect(fixedPosition.value.style.right).toBe('16px');
-    });
-  });
-
-  describe('RTL', () => {
-    beforeEach(() => {
-      document.body.innerHTML = '<div id="app" dir="rtl"></div>';
-    });
-
-    it('flips anchor direction in RTL (align=end anchors left)', () => {
-      // align=end + RTL → anchorLeft=true → uses style.left
-      setTrigger({ top: 100, bottom: 140, left: 100, right: 200 });
-      setDropdown({ height: 100, width: 200 });
-
-      const { fixedPosition } = useDropdownPosition(
-        ref(null),
-        ref(null),
-        ref(true)
-      );
-
-      expect(fixedPosition.value.style.left).toBe('100px');
-    });
-  });
-});

app/javascript/dashboard/composables/spec/useEditableAutomation.spec.js

@@ -1,98 +0,0 @@
-import { useEditableAutomation } from '../useEditableAutomation';
-import useAutomationValues from '../useAutomationValues';
-
-vi.mock('../useAutomationValues');
-
-describe('useEditableAutomation', () => {
-  beforeEach(() => {
-    useAutomationValues.mockReturnValue({
-      getConditionDropdownValues: vi.fn(attributeKey => {
-        if (attributeKey === 'private_note') {
-          return [
-            { id: true, name: 'True' },
-            { id: false, name: 'False' },
-          ];
-        }
-
-        return [];
-      }),
-      getActionDropdownValues: vi.fn(actionName => {
-        if (actionName === 'assign_agent') {
-          return [
-            { id: 'nil', name: 'None' },
-            {
-              id: 'last_responding_agent',
-              name: 'Last Responding Agent',
-            },
-            { id: 1, name: 'Agent 1' },
-          ];
-        }
-
-        return [];
-      }),
-    });
-  });
-
-  it('rehydrates boolean conditions as a single selected option', () => {
-    const automation = {
-      event_name: 'message_created',
-      conditions: [
-        {
-          attribute_key: 'private_note',
-          filter_operator: 'equal_to',
-          values: [false],
-          query_operator: null,
-        },
-      ],
-      actions: [],
-    };
-    const automationTypes = {
-      message_created: {
-        conditions: [{ key: 'private_note', inputType: 'search_select' }],
-      },
-    };
-
-    const { formatAutomation } = useEditableAutomation();
-    const result = formatAutomation(automation, [], automationTypes, []);
-
-    expect(result.conditions).toEqual([
-      {
-        attribute_key: 'private_note',
-        filter_operator: 'equal_to',
-        values: { id: false, name: 'False' },
-        query_operator: 'and',
-      },
-    ]);
-  });
-
-  it('rehydrates last responding agent as a selected action option', () => {
-    const automation = {
-      event_name: 'conversation_created',
-      conditions: [],
-      actions: [
-        {
-          action_name: 'assign_agent',
-          action_params: ['last_responding_agent'],
-        },
-      ],
-    };
-    const automationActionTypes = [
-      { key: 'assign_agent', inputType: 'search_select' },
-    ];
-
-    const { formatAutomation } = useEditableAutomation();
-    const result = formatAutomation(automation, [], {}, automationActionTypes);
-
-    expect(result.actions).toEqual([
-      {
-        action_name: 'assign_agent',
-        action_params: [
-          {
-            id: 'last_responding_agent',
-            name: 'Last Responding Agent',
-          },
-        ],
-      },
-    ]);
-  });
-});

app/javascript/dashboard/composables/spec/useMacros.spec.js

@@ -119,30 +119,24 @@ describe('useMacros', () => {
     const { getMacroDropdownValues } = useMacros();
     expect(getMacroDropdownValues('add_label')).toHaveLength(mockLabels.length);
     expect(getMacroDropdownValues('assign_team')).toHaveLength(
-      mockTeams.length + 1
-    ); // +1 for "None"
+      mockTeams.length
+    );
     expect(getMacroDropdownValues('assign_agent')).toHaveLength(
-      mockAgents.length + 2
-    ); // +2 for "None" and "Self"
+      mockAgents.length + 1
+    ); // +1 for "Self"
   });
 
-  it('returns teams with "None" option for assign_team and teams only for send_email_to_team', () => {
+  it('returns teams for assign_team and send_email_to_team types', () => {
     const { getMacroDropdownValues } = useMacros();
-    const assignTeamResult = getMacroDropdownValues('assign_team');
-    expect(assignTeamResult[0]).toEqual({
-      id: 'nil',
-      name: 'AUTOMATION.NONE_OPTION',
-    });
-    expect(assignTeamResult.slice(1)).toEqual(mockTeams);
+    expect(getMacroDropdownValues('assign_team')).toEqual(mockTeams);
     expect(getMacroDropdownValues('send_email_to_team')).toEqual(mockTeams);
   });
 
-  it('returns agents with "None" and "Self" options for assign_agent type', () => {
+  it('returns agents with "Self" option for assign_agent type', () => {
     const { getMacroDropdownValues } = useMacros();
     const result = getMacroDropdownValues('assign_agent');
-    expect(result[0]).toEqual({ id: 'nil', name: 'AUTOMATION.NONE_OPTION' });
-    expect(result[1]).toEqual({ id: 'self', name: 'Self' });
-    expect(result.slice(2)).toEqual(mockAgents);
+    expect(result[0]).toEqual({ id: 'self', name: 'Self' });
+    expect(result.slice(1)).toEqual(mockAgents);
   });
 
   it('returns formatted labels for add_label and remove_label types', () => {
@@ -178,11 +172,8 @@ describe('useMacros', () => {
 
     const { getMacroDropdownValues } = useMacros();
     expect(getMacroDropdownValues('add_label')).toEqual([]);
-    expect(getMacroDropdownValues('assign_team')).toEqual([
-      { id: 'nil', name: 'AUTOMATION.NONE_OPTION' },
-    ]);
+    expect(getMacroDropdownValues('assign_team')).toEqual([]);
     expect(getMacroDropdownValues('assign_agent')).toEqual([
-      { id: 'nil', name: 'AUTOMATION.NONE_OPTION' },
       { id: 'self', name: 'Self' },
     ]);
   });

app/javascript/dashboard/composables/useAutomationValues.js

@@ -121,19 +121,8 @@ export default function useAutomationValues() {
    * @returns {Array} An array of action dropdown values.
    */
   const getActionDropdownValues = type => {
-    let agentsList = agents.value;
-    if (type === 'assign_agent') {
-      agentsList = [
-        {
-          id: 'last_responding_agent',
-          name: t('AUTOMATION.LAST_RESPONDING_AGENT'),
-        },
-        ...agentsList,
-      ];
-    }
-
     return getActionOptions({
-      agents: agentsList,
+      agents: agents.value,
       labels: labels.value,
       teams: teams.value,
       slaPolicies: slaPolicies.value,

app/javascript/dashboard/composables/useDropdownPosition.js

@@ -1,128 +0,0 @@
-import { computed, unref, watch } from 'vue';
-import { useElementBounding, useWindowSize } from '@vueuse/core';
-
-const FALLBACK_SIZE = 200;
-const SAFE_MARGIN = 16;
-const GAP = 8;
-
-/**
- * Auto-position a floating element based on available viewport space.
- *
- * @param {Ref} triggerRef - Trigger element ref
- * @param {Ref} dropdownRef - Dropdown/popover element ref
- * @param {Ref} enabled - Whether to calculate position
- * @param {Object} options
- * @param {Ref}    [options.container] - Constraining container ref
- * @param {number} [options.margin=16] - Min distance from viewport/container edges
- * @param {string} [options.align='end'] - 'start' or 'end' (flips automatically for RTL)
- */
-export function useDropdownPosition(
-  triggerRef,
-  dropdownRef,
-  enabled,
-  { container = null, margin = SAFE_MARGIN, align = 'end' } = {}
-) {
-  const trigger = useElementBounding(triggerRef);
-  const dropdown = useElementBounding(dropdownRef);
-  const bounds = useElementBounding(container);
-  const { width: winWidth, height: winHeight } = useWindowSize();
-
-  const isRTL = computed(
-    () => document.querySelector('#app[dir]')?.getAttribute('dir') === 'rtl'
-  );
-
-  // Whether to anchor to the left edge of the trigger
-  const anchorLeft = computed(() => (align === 'start') !== isRTL.value);
-
-  const verticalClass = computed(() => {
-    if (!unref(enabled)) return 'top-full mt-2';
-    const dh = dropdown.height.value || FALLBACK_SIZE;
-    const spaceBelow = winHeight.value - trigger.bottom.value;
-    const spaceAbove = trigger.top.value;
-    // Only flip above if it fits there; otherwise stay below (more room or equal)
-    if (spaceBelow >= dh + margin) return 'top-full mt-2';
-    if (spaceAbove >= dh + margin) return 'bottom-full mb-2';
-    return spaceBelow >= spaceAbove ? 'top-full mt-2' : 'bottom-full mb-2';
-  });
-
-  // Relative mode: Tailwind class + style for absolute-in-parent dropdowns
-  const position = computed(() => {
-    if (!unref(enabled)) return { class: 'top-full mt-2', style: {} };
-
-    const dw = dropdown.width.value || FALLBACK_SIZE;
-    const leftBound = container ? bounds.left.value : 0;
-    const rightBound = container ? bounds.right.value : winWidth.value;
-    const style = {};
-
-    if (anchorLeft.value) {
-      const available = rightBound - trigger.left.value;
-      const overflow = dw - available;
-      style.left = overflow > 0 ? `-${overflow}px` : '0px';
-    } else {
-      const available = trigger.right.value - leftBound;
-      const overflow = dw - available;
-      style.right = overflow > 0 ? `-${overflow}px` : '0px';
-    }
-
-    return { class: verticalClass.value, style };
-  });
-
-  // Fixed mode: styles for teleported popovers
-  const fixedPosition = computed(() => {
-    if (!unref(enabled)) return { class: 'fixed z-[9999]', style: {} };
-
-    const dh = dropdown.height.value || FALLBACK_SIZE;
-    const dw = dropdown.width.value || FALLBACK_SIZE;
-    const spaceBelow = winHeight.value - trigger.bottom.value;
-    const style = {};
-
-    // Vertical: prefer below, flip above only if it fits, else pick the larger side
-    const spaceAbove = trigger.top.value;
-    const placeAbove =
-      spaceBelow < dh + margin &&
-      (spaceAbove >= dh + margin || spaceAbove > spaceBelow);
-
-    if (placeAbove) {
-      style.bottom = `${winHeight.value - trigger.top.value + GAP}px`;
-      style.maxHeight = `${spaceAbove - GAP - margin}px`;
-    } else {
-      style.top = `${trigger.bottom.value + GAP}px`;
-      style.maxHeight = `${spaceBelow - GAP - margin}px`;
-    }
-
-    // Horizontal
-    if (anchorLeft.value) {
-      const left = trigger.left.value;
-      if (left + dw > winWidth.value - margin) {
-        style.right = `${margin}px`;
-      } else {
-        style.left = `${Math.max(margin, left)}px`;
-      }
-    } else {
-      const right = winWidth.value - trigger.right.value;
-      if (trigger.right.value - dw < margin) {
-        style.left = `${margin}px`;
-      } else {
-        style.right = `${right}px`;
-      }
-    }
-
-    return { class: 'fixed z-[9999]', style };
-  });
-
-  const updatePosition = () => {
-    trigger.update();
-    dropdown.update();
-    if (container) bounds.update();
-  };
-
-  // Update position when dropdown opens to ensure RTL state is current
-  watch(
-    () => unref(enabled),
-    isEnabled => {
-      if (isEnabled) updatePosition();
-    }
-  );
-
-  return { position, fixedPosition, updatePosition };
-}

app/javascript/dashboard/composables/useEditableAutomation.js

@@ -46,26 +46,11 @@ export function useEditableAutomation() {
       if (inputType === 'comma_separated_plain_text') {
         return { ...condition, values: condition.values.join(',') };
       }
-      const dropdownValues = getConditionDropdownValues(
-        condition.attribute_key
-      );
-      const hasBooleanOptions =
-        inputType === 'search_select' &&
-        dropdownValues.length &&
-        dropdownValues.every(item => typeof item.id === 'boolean');
-
-      if (hasBooleanOptions) {
-        return {
-          ...condition,
-          query_operator: condition.query_operator || 'and',
-          values: dropdownValues.find(item => item.id === condition.values[0]),
-        };
-      }
       return {
         ...condition,
         query_operator: condition.query_operator || 'and',
-        values: [...dropdownValues].filter(item =>
-          [...condition.values].includes(item.id)
+        values: [...getConditionDropdownValues(condition.attribute_key)].filter(
+          item => [...condition.values].includes(item.id)
         ),
       };
     });

app/javascript/dashboard/composables/useKeyboardNavigableList.js

@@ -12,14 +12,11 @@ import { useKeyboardEvents } from './useKeyboardEvents';
 
 /**
  * Wrap the action in a function that calls the action and prevents the default event behavior.
- * Only prevents default when items are available to navigate.
  * @param {Function} action - The action to be called.
- * @param {import('vue').Ref<Array>} items - A ref to the array of selectable items.
  * @returns {{action: Function, allowOnFocusedInput: boolean}} An object containing the action and a flag to allow the event on focused input.
  */
-const createAction = (action, items) => ({
+const createAction = action => ({
   action: e => {
-    if (!items.value?.length) return;
     action();
     e.preventDefault();
   },
@@ -41,14 +38,15 @@ const createKeyboardEvents = (
   items
 ) => {
   const events = {
-    ArrowUp: createAction(moveSelectionUp, items),
-    'Control+KeyP': createAction(moveSelectionUp, items),
-    ArrowDown: createAction(moveSelectionDown, items),
-    'Control+KeyN': createAction(moveSelectionDown, items),
+    ArrowUp: createAction(moveSelectionUp),
+    'Control+KeyP': createAction(moveSelectionUp),
+    ArrowDown: createAction(moveSelectionDown),
+    'Control+KeyN': createAction(moveSelectionDown),
   };
 
+  // Adds an event handler for the Enter key if the onSelect function is provided.
   if (typeof onSelect === 'function') {
-    events.Enter = createAction(onSelect, items);
+    events.Enter = createAction(() => items.value?.length > 0 && onSelect());
   }
 
   return events;

app/javascript/dashboard/composables/useMacros.js

@@ -15,11 +15,6 @@ export const useMacros = () => {
   const teams = computed(() => getters['teams/getTeams'].value);
   const agents = computed(() => getters['agents/getVerifiedAgents'].value);
 
-  const withNoneOption = options => [
-    { id: 'nil', name: t('AUTOMATION.NONE_OPTION') },
-    ...(options || []),
-  ];
-
   /**
    * Get dropdown values based on the specified type
    * @param {string} type - The type of dropdown values to retrieve
@@ -28,15 +23,10 @@ export const useMacros = () => {
   const getMacroDropdownValues = type => {
     switch (type) {
       case 'assign_team':
-        return withNoneOption(teams.value);
       case 'send_email_to_team':
         return teams.value;
       case 'assign_agent':
-        return [
-          ...withNoneOption(),
-          { id: 'self', name: 'Self' },
-          ...agents.value,
-        ];
+        return [{ id: 'self', name: 'Self' }, ...agents.value];
       case 'add_label':
       case 'remove_label':
         return labels.value.map(i => ({

app/javascript/dashboard/constants/editor.js

@@ -172,7 +172,6 @@ export const FORMATTING = {
 export const ARTICLE_EDITOR_MENU_OPTIONS = [
   'strong',
   'em',
-  'strike',
   'link',
   'undo',
   'redo',
@@ -183,7 +182,6 @@ export const ARTICLE_EDITOR_MENU_OPTIONS = [
   'h3',
   'imageUpload',
   'code',
-  'insertTable',
 ];
 
 /**

app/javascript/dashboard/constants/globals.js

@@ -12,11 +12,6 @@ export default {
     SNOOZED: 'snoozed',
     ALL: 'all',
   },
-  CONVERSATION_TYPE: {
-    MENTION: 'mention',
-    PARTICIPATING: 'participating',
-    UNATTENDED: 'unattended',
-  },
   SORT_BY_TYPE: {
     LAST_ACTIVITY_AT_ASC: 'last_activity_at_asc',
     LAST_ACTIVITY_AT_DESC: 'last_activity_at_desc',

app/javascript/dashboard/featureFlags.js

@@ -37,7 +37,6 @@ export const FEATURE_FLAGS = {
   CHANNEL_INSTAGRAM: 'channel_instagram',
   CHANNEL_TIKTOK: 'channel_tiktok',
   CONTACT_CHATWOOT_SUPPORT_TEAM: 'contact_chatwoot_support_team',
-  CAPTAIN_CUSTOM_TOOLS: 'custom_tools',
   CAPTAIN_V2: 'captain_integration_v2',
   CAPTAIN_TASKS: 'captain_tasks',
   SAML: 'saml',
@@ -50,7 +49,6 @@ export const FEATURE_FLAGS = {
 export const PREMIUM_FEATURES = [
   FEATURE_FLAGS.SLA,
   FEATURE_FLAGS.CAPTAIN,
-  FEATURE_FLAGS.CAPTAIN_CUSTOM_TOOLS,
   FEATURE_FLAGS.CUSTOM_ROLES,
   FEATURE_FLAGS.AUDIT_LOGS,
   FEATURE_FLAGS.HELP_CENTER,

app/javascript/dashboard/helper/URLHelper.js

@@ -51,7 +51,6 @@ export const conversationListPageURL = ({
   } else if (conversationType) {
     const urlMap = {
       mention: 'mentions/conversations',
-      participating: 'participating/conversations',
       unattended: 'unattended/conversations',
     };
     url = `accounts/${accountId}/${urlMap[conversationType]}`;

app/javascript/dashboard/helper/automationHelper.js

@@ -150,7 +150,6 @@ export const getConditionOptions = ({
     conversation_language: languages,
     country_code: countries,
     message_type: messageTypeOptions,
-    private_note: booleanFilterOptions,
     priority: priorityOptions,
     labels: generateConditionOptions(labels, 'title'),
   };

app/javascript/dashboard/helper/editorHelper.js

@@ -32,25 +32,6 @@ export function extractTextFromMarkdown(markdown) {
     .trim(); // Trim any extra space
 }
 
-/**
- * Removes inline base64 markdown images from signature content.
- *
- * @param {string} content
- * @returns {{ sanitizedContent: string, hasInlineImages: boolean }}
- */
-export function stripInlineBase64Images(content) {
-  if (!content || typeof content !== 'string') {
-    return { sanitizedContent: content || '', hasInlineImages: false };
-  }
-
-  const markdownInlineBase64ImageRegex =
-    /!\[[^\]]*]\(\s*data:image\/[a-zA-Z0-9.+-]+;base64,[^)]+\s*\)/gi;
-  const sanitizedContent = content.replace(markdownInlineBase64ImageRegex, '');
-  const hasInlineImages = sanitizedContent !== content;
-
-  return { sanitizedContent, hasInlineImages };
-}
-
 /**
  * Strip unsupported markdown formatting based on channel capabilities.
  * Uses MARKDOWN_PATTERNS from editor constants.

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

@@ -40,15 +40,6 @@ describe('#URL Helpers', () => {
         '/app/accounts/1/custom_view/1'
       );
     });
-
-    it('should return url to participating conversations', () => {
-      expect(
-        conversationListPageURL({
-          accountId: 1,
-          conversationType: 'participating',
-        })
-      ).toBe('/app/accounts/1/participating/conversations');
-    });
   });
   describe('conversationUrl', () => {
     it('should return direct conversation URL if activeInbox is nil', () => {

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

@@ -178,21 +178,6 @@ describe('getConditionOptions', () => {
       })
     ).toEqual(testOptions);
   });
-
-  it('returns boolean options for private_note', () => {
-    const booleanOptions = [
-      { id: true, name: 'True' },
-      { id: false, name: 'False' },
-    ];
-
-    expect(
-      helpers.getConditionOptions({
-        booleanFilterOptions: booleanOptions,
-        customAttributes,
-        type: 'private_note',
-      })
-    ).toEqual(booleanOptions);
-  });
 });
 
 describe('getFileName', () => {

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

@@ -15,7 +15,6 @@ import {
   getMenuAnchor,
   calculateMenuPosition,
   stripUnsupportedFormatting,
-  stripInlineBase64Images,
 } from '../editorHelper';
 import { FORMATTING } from 'dashboard/constants/editor';
 import { EditorState } from '@chatwoot/prosemirror-schema';
@@ -424,36 +423,6 @@ describe('extractTextFromMarkdown', () => {
   });
 });
 
-describe('stripInlineBase64Images', () => {
-  it('removes markdown data:image base64 images and sets hasInlineImages', () => {
-    const content =
-      'Hello\n![x](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAE)\nWorld';
-    const { sanitizedContent, hasInlineImages } =
-      stripInlineBase64Images(content);
-
-    expect(hasInlineImages).toBe(true);
-    expect(sanitizedContent).not.toContain('data:image/png;base64');
-    expect(sanitizedContent).toContain('Hello');
-    expect(sanitizedContent).toContain('World');
-  });
-
-  it('leaves hosted image markdown unchanged', () => {
-    const content = '![](https://example.com/logo.png)';
-    const { sanitizedContent, hasInlineImages } =
-      stripInlineBase64Images(content);
-
-    expect(hasInlineImages).toBe(false);
-    expect(sanitizedContent).toBe(content);
-  });
-
-  it('returns empty hasInlineImages for empty input', () => {
-    expect(stripInlineBase64Images('')).toEqual({
-      sanitizedContent: '',
-      hasInlineImages: false,
-    });
-  });
-});
-
 describe('insertAtCursor', () => {
   it('should return undefined if editorView is not provided', () => {
     const result = insertAtCursor(undefined, schema.text('Hello'), 0);

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

@@ -45,10 +45,6 @@ describe('#resolveTeamIds', () => {
     const resolvedTeams = '⚙️ sales team, 🤷‍♂️ fayaz';
     expect(resolveTeamIds(teams, [1, 2])).toEqual(resolvedTeams);
   });
-
-  it('resolves nil as None', () => {
-    expect(resolveTeamIds(teams, ['nil'])).toEqual('None');
-  });
 });
 
 describe('#resolveLabels', () => {
@@ -63,10 +59,6 @@ describe('#resolveAgents', () => {
     const resolvedAgents = 'John Doe';
     expect(resolveAgents(agents, [1])).toEqual(resolvedAgents);
   });
-
-  it('resolves nil and self values', () => {
-    expect(resolveAgents(agents, ['nil', 'self'])).toEqual('None, Self');
-  });
 });
 
 describe('#getFileName', () => {

app/javascript/dashboard/helper/validations.js

@@ -125,7 +125,6 @@ const validateSingleAction = action => {
     'mute_conversation',
     'snooze_conversation',
     'resolve_conversation',
-    'remove_assigned_agent',
     'remove_assigned_team',
     'open_conversation',
     'pending_conversation',

app/javascript/dashboard/i18n/locale/am/agentBots.json

@@ -63,16 +63,6 @@
         "ERROR_MESSAGE": "Could not update bot. Please try again."
       }
     },
-    "SECRET": {
-      "LABEL": "Webhook Secret",
-      "COPY": "ምስጢሩን ወደ ክሊፕቦርድ ቅዳ",
-      "COPY_SUCCESS": "ምስጢሩ ወደ ክሊፕቦርድ ተቀድሷል",
-      "TOGGLE": "የምስጢሩን ማየት አሳይ/ደብቅ",
-      "CREATED_DESC": "Use the secret below to verify webhook signatures. Please copy it now, you can also find it later in the bot settings.",
-      "DONE": "ተጠናቀቀ",
-      "RESET_SUCCESS": "Webhook secret regenerated successfully",
-      "RESET_ERROR": "Unable to regenerate webhook secret. Please try again"
-    },
     "ACCESS_TOKEN": {
       "TITLE": "Access Token",
       "DESCRIPTION": "Copy the access token and save it securely",

app/javascript/dashboard/i18n/locale/am/automation.json

@@ -140,8 +140,6 @@
     "ACTIONS": {
       "ASSIGN_AGENT": "Assign to Agent",
       "ASSIGN_TEAM": "Assign a Team",
-      "REMOVE_ASSIGNED_AGENT": "Remove Assigned Agent",
-      "REMOVE_ASSIGNED_TEAM": "Remove Assigned Team",
       "ADD_LABEL": "Add a Label",
       "REMOVE_LABEL": "Remove a Label",
       "SEND_EMAIL_TO_TEAM": "Send an Email to Team",
@@ -171,7 +169,6 @@
     },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
-      "PRIVATE_NOTE": "የግል ማስታወሻ",
       "MESSAGE_CONTAINS": "Message Contains",
       "EMAIL": "Email",
       "INBOX": "Inbox",

app/javascript/dashboard/i18n/locale/am/components.json

@@ -52,17 +52,5 @@
   },
   "CHANNEL_SELECTOR": {
     "COMING_SOON": "Coming Soon!"
-  },
-  "SLASH_COMMANDS": {
-    "HEADING_1": "Heading 1",
-    "HEADING_2": "Heading 2",
-    "HEADING_3": "Heading 3",
-    "BOLD": "Bold",
-    "ITALIC": "Italic",
-    "STRIKETHROUGH": "Strikethrough",
-    "CODE": "Code",
-    "BULLET_LIST": "Bullet List",
-    "ORDERED_LIST": "Ordered List",
-    "TABLE": "Table"
   }
 }

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

@@ -20,7 +20,6 @@
     "CALL": "ደውል",
     "CALL_INITIATED": "ለእውነተኛው እውቀት መደወል እየተከናወነ ነው…",
     "CALL_FAILED": "ጥሪውን መጀመር አልቻልንም። እባክዎ ደግመው ይሞክሩ።.",
-    "CLICK_TO_EDIT": "Click to edit",
     "VOICE_INBOX_PICKER": {
       "TITLE": "የድምፅ ኢንቦክስ ይምረጡ"
     },

app/javascript/dashboard/i18n/locale/am/conversation.json

@@ -6,12 +6,12 @@
     "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
-    "NO_MESSAGE_1": "የደንበኞች መልእክቶች በኢንቦክስዎ አልተገኙም።",
-    "NO_MESSAGE_2": " ወደ ገፅዎ መልእክት ለመላክ!",
-    "NO_INBOX_1": "እሺ! አሁን ምንም ኢንቦክስ አልጨመሩም።",
-    "NO_INBOX_2": " ለመጀመር",
-    "NO_INBOX_AGENT": "ወይ! ምንም ኢንቦክስ አባል አይደለህም። እባክዎ አስተዳዳሪዎን ያነጋግሩ",
-    "SEARCH_MESSAGES": "መልእክቶችን በውይይቶች ውስጥ ይፈልጉ",
+    "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
+    "NO_MESSAGE_2": " to send a message to your page!",
+    "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
+    "NO_INBOX_2": " to get started",
+    "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
     "VIEW_ORIGINAL": "View original",
     "VIEW_TRANSLATED": "View translated",
     "EMPTY_STATE": {
@@ -19,19 +19,19 @@
       "KEYBOARD_SHORTCUTS": "to view keyboard shortcuts"
     },
     "SEARCH": {
-      "TITLE": "መልእክቶችን ይፈልጉ",
+      "TITLE": "Search messages",
       "RESULT_TITLE": "Search Results",
-      "LOADING_MESSAGE": "መረጃ በማስተናገድ ላይ...",
+      "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
       "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
-    "CLICK_HERE": "እዚህ ጠቅ ያድርጉ",
-    "LOADING_INBOXES": "ኢንቦክሶች በመጫን ላይ",
-    "LOADING_CONVERSATIONS": "ውይይቶች በመጫን ላይ",
-    "CANNOT_REPLY": "ምክንያቱን በመነሳት መልስ ማድረግ አይችሉም",
-    "24_HOURS_WINDOW": "የ24 ሰዓት መልእክት ጊዜ ገደብ",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "CANNOT_REPLY": "You cannot reply due to",
+    "24_HOURS_WINDOW": "24 hour message window restriction",
     "48_HOURS_WINDOW": "48 hour message window restriction",
     "API_HOURS_WINDOW": "ለዚህ ውይይት መመለስ በ{hours} ሰአታት ውስጥ ብቻ ይቻላል",
     "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
@@ -44,9 +44,9 @@
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
     "OLD_INSTAGRAM_INBOX_REPLY_BANNER": "ይህ የInstagram መለያ ወደ አዲሱ የInstagram ቻናል ገቢ ሳጥን ተዛውሯል። ሁሉም አዲስ መልዕክቶች በዚያ ይታያሉ። ከአሁን ጀምሮ ከዚህ ውይይት መልዕክቶች መላክ አትችሉም።",
-    "REPLYING_TO": "ለዚህ ትመልሳለህ፦",
-    "REMOVE_SELECTION": "ምርጫ አስወግድ",
-    "DOWNLOAD": "አውርድ",
+    "REPLYING_TO": "You are replying to:",
+    "REMOVE_SELECTION": "Remove Selection",
+    "DOWNLOAD": "Download",
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save Contact",
     "NO_CONTENT": "No content to display",
@@ -85,13 +85,13 @@
       "YOU_ANSWERED": "You answered"
     },
     "HEADER": {
-      "RESOLVE_ACTION": "ተፈትኗል",
-      "REOPEN_ACTION": "እንደገና ክፈት",
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
       "OPEN_ACTION": "Open",
       "MORE_ACTIONS": "ተጨማሪ እርምጃዎች",
-      "OPEN": "ተጨማሪ",
-      "CLOSE": "ዝጋ",
-      "DETAILS": "ዝርዝሮች",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details",
       "SNOOZED_UNTIL": "Snoozed until",
       "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
       "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
@@ -188,21 +188,21 @@
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
       "DISABLE_SIGN_TOOLTIP": "Disable signature",
-      "MSG_INPUT": "አዲስ መስመር ለማስገባት Shift + enter ይጠቀሙ። '/' በመጀመር የተዘጋጀ ምላሽ ይምረጡ።",
-      "PRIVATE_MSG_INPUT": "አዲስ መስመር ለማስገባት Shift + enter ይጠቀሙ። ይህ ለወኪሎች ብቻ ይታያል",
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents",
       "MESSAGING_RESTRICTED": "You cannot reply to this conversation",
       "MESSAGING_RESTRICTED_WHATSAPP": "You can only reply using a template message due to 24-hour message window restriction",
       "MESSAGING_RESTRICTED_API": "You can only reply using a template message due to message window restriction",
       "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
-      "COPILOT_MSG_INPUT": "ኮፒሎት ተጨማሪ እባብነቶች ስጡው, ወይም ሌላ ማንኛውንም ጥያቄ ያቀርቡ... ተከትሎ ለማስተላለፊያ ኤንተር ይጫኑ።",
+      "COPILOT_MSG_INPUT": "Give copilot additional prompts, or ask anything else... Press enter to send follow-up",
       "CLICK_HERE": "Click here to update",
       "WHATSAPP_TEMPLATES": "Whatsapp Templates"
     },
     "REPLYBOX": {
-      "REPLY": "መልስ",
-      "PRIVATE_NOTE": "የግል ማስታወሻ",
-      "SEND": "ላክ",
-      "CREATE": "ማስታወሻ አክል",
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
       "INSERT_READ_MORE": "Read more",
       "DISMISS_REPLY": "Dismiss reply",
       "REPLYING_TO": "Replying to:",
@@ -214,7 +214,7 @@
       "DRAG_DROP": "Drag and drop here to attach",
       "START_AUDIO_RECORDING": "Start audio recording",
       "STOP_AUDIO_RECORDING": "Stop audio recording",
-      "COPILOT_THINKING": "ኮፒሎት እየሰማራ ነው",
+      "COPILOT_THINKING": "Copilot is thinking",
       "EMAIL_HEAD": {
         "TO": "TO",
         "ADD_BCC": "Add bcc",
@@ -245,10 +245,10 @@
         "EXPAND": "Expand preview"
       }
     },
-    "VISIBLE_TO_AGENTS": "የግል ማስታወሻ፡ ለአንተና ቡድንህ ብቻ ይታያል",
-    "CHANGE_STATUS": "የውይይቱ ሁኔታ ተቀይሯል",
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
     "CHANGE_STATUS_FAILED": "Conversation status change failed",
-    "CHANGE_AGENT": "የውይይቱ ተመድብ ተቀይሯል",
+    "CHANGE_AGENT": "Conversation Assignee changed",
     "CHANGE_AGENT_FAILED": "Assignee change failed",
     "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
     "ASSIGN_LABEL_FAILED": "Label assignment failed",
@@ -300,20 +300,20 @@
     }
   },
   "EMAIL_TRANSCRIPT": {
-    "TITLE": "የውይይት ጽሑፍ ላክ",
-    "DESC": "የውይይቱን ጽሑፍ ቅጂ ወደ ተጠቃሚው ኢሜይል ላክ",
-    "SUBMIT": "አስገባ",
-    "CANCEL": "ይቅር",
-    "SEND_EMAIL_SUCCESS": "የቻት አጭር መግለጫው በተሳካ ሁኔታ ተልኳል",
-    "SEND_EMAIL_ERROR": "ስህተት ተፈጥሯል፣ እባክዎ ደግመው ይሞክሩ",
+    "TITLE": "Send conversation transcript",
+    "DESC": "Send a copy of the conversation transcript to the specified email address",
+    "SUBMIT": "Submit",
+    "CANCEL": "Cancel",
+    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_ERROR": "There was an error, please try again",
     "SEND_EMAIL_PAYMENT_REQUIRED": "Email transcript is not available on your current plan. Please upgrade to use this feature.",
     "FORM": {
-      "SEND_TO_CONTACT": "መግለጫውን ለደንበኛው ይላኩ",
+      "SEND_TO_CONTACT": "Send the transcript to the customer",
       "SEND_TO_AGENT": "Send the transcript to the assigned agent",
-      "SEND_TO_OTHER_EMAIL_ADDRESS": "መግለጫውን ወደ ሌላ ኢሜይል አድራሻ ይላኩ",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
       "EMAIL": {
-        "PLACEHOLDER": "ኢሜይል አድራሻ ያስገቡ",
-        "ERROR": "ትክክለኛ ኢሜይል አድራሻ ያስገቡ"
+        "PLACEHOLDER": "Enter an email address",
+        "ERROR": "Please enter a valid email address"
       }
     }
   },