Merge branch 'develop' of github.com:chatwoot/chatwoot into feat/rollup-refactor

Reduces block length by moving logic from the rake task block
into a dedicated ReportingEventsRollupBackfill class with
focused methods.

.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

@@ -1,9 +1,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

@@ -166,7 +166,7 @@ GEM
       multi_json (~> 1)
       statsd-ruby (~> 1.1)
     base64 (0.3.0)
-    bcrypt (3.1.22)
+    bcrypt (3.1.20)
     benchmark (0.4.1)
     bigdecimal (3.2.2)
     bindex (0.8.1)
@@ -465,7 +465,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.19.2)
+    json (2.18.1)
     json_refs (0.1.8)
       hana
     json_schemer (0.2.24)
@@ -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.12.1
+4.11.2

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,6 +1,7 @@
 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,10 +11,6 @@ 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

@@ -1,5 +1,6 @@
 class V2::Reports::BaseSummaryBuilder
   include DateRangeHelper
+  include TimezoneHelper
 
   def build
     load_data
@@ -9,37 +10,13 @@ class V2::Reports::BaseSummaryBuilder
   private
 
   def load_data
-    @conversations_count = fetch_conversations_count
-    load_reporting_events_data
-  end
+    results = data_source.summary
 
-  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
+    @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] }
   end
 
   def group_by_key
@@ -50,7 +27,27 @@ class V2::Reports::BaseSummaryBuilder
     # Override this method
   end
 
-  def average_value_key
-    ActiveModel::Type::Boolean.new.cast(params[:business_hours]).present? ? :value_in_business_hours : :value
+  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: timezone_name_from_params(params[:timezone], params[:timezone_offset]),
+      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)
   end
 end

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

@@ -3,23 +3,10 @@ class V2::Reports::Conversations::BaseReportBuilder
 
   private
 
-  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
-
   def builder_class(metric)
-    case metric
-    when *AVG_METRICS
-      V2::Reports::Timeseries::AverageReportBuilder
-    when *COUNT_METRICS
-      V2::Reports::Timeseries::CountReportBuilder
-    end
+    return unless ReportingEvents::MetricRegistry.supported_metric?(metric)
+
+    V2::Reports::Timeseries::ReportBuilder
   end
 
   def log_invalid_metric

app/builders/v2/reports/inbox_summary_builder.rb

@@ -11,15 +11,6 @@ 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)
@@ -40,8 +31,4 @@ 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/label_summary_builder.rb

@@ -7,8 +7,7 @@ class V2::Reports::LabelSummaryBuilder < V2::Reports::BaseSummaryBuilder
     @account = account
     @params = params
 
-    timezone_offset = (params[:timezone_offset] || 0).to_f
-    @timezone = ActiveSupport::TimeZone[timezone_offset]&.name
+    @timezone = timezone_name_from_params(params[:timezone], params[:timezone_offset])
   end
   # rubocop:enable Lint/MissingSuper
 

app/builders/v2/reports/team_summary_builder.rb

@@ -6,14 +6,6 @@ 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

@@ -1,48 +0,0 @@
-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,12 +1,13 @@
 class V2::Reports::Timeseries::BaseTimeseriesBuilder
   include TimezoneHelper
   include DateRangeHelper
+
   DEFAULT_GROUP_BY = 'day'.freeze
 
   pattr_initialize :account, :params
 
   def scope
-    case params[:type].to_sym
+    case dimension_type.to_sym
     when :account
       account
     when :inbox
@@ -20,6 +21,21 @@ 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: timezone,
+      timezone_offset: params[:timezone_offset],
+      business_hours: params[:business_hours]
+    )
+  end
+
   def inbox
     @inbox ||= account.inboxes.find(params[:id])
   end
@@ -41,6 +57,12 @@ class V2::Reports::Timeseries::BaseTimeseriesBuilder
   end
 
   def timezone
-    @timezone ||= timezone_name_from_offset(params[:timezone_offset])
+    @timezone ||= timezone_name_from_params(params[:timezone], 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

@@ -1,78 +0,0 @@
-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

@@ -0,0 +1,9 @@
+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/concerns/whatsapp_health_management.rb

@@ -1,55 +0,0 @@
-module Api::V1::Accounts::Concerns::WhatsappHealthManagement
-  extend ActiveSupport::Concern
-
-  included do
-    skip_before_action :check_authorization, only: [:health, :register_webhook]
-    before_action :check_admin_authorization?, only: [:register_webhook]
-    before_action :validate_whatsapp_cloud_channel, only: [:health, :register_webhook]
-  end
-
-  def sync_templates
-    return render status: :unprocessable_entity, json: { error: 'Template sync is only available for WhatsApp channels' } unless whatsapp_channel?
-
-    trigger_template_sync
-    render status: :ok, json: { message: 'Template sync initiated successfully' }
-  rescue StandardError => e
-    render status: :internal_server_error, json: { error: e.message }
-  end
-
-  def health
-    health_data = Whatsapp::HealthService.new(@inbox.channel).fetch_health_status
-    render json: health_data
-  rescue StandardError => e
-    Rails.logger.error "[INBOX HEALTH] Error fetching health data: #{e.message}"
-    render json: { error: e.message }, status: :unprocessable_entity
-  end
-
-  def register_webhook
-    Whatsapp::WebhookSetupService.new(@inbox.channel).register_callback
-
-    render json: { message: 'Webhook registered successfully' }, status: :ok
-  rescue StandardError => e
-    Rails.logger.error "[INBOX WEBHOOK] Webhook registration failed: #{e.message}"
-    render json: { error: e.message }, status: :unprocessable_entity
-  end
-
-  private
-
-  def validate_whatsapp_cloud_channel
-    return if @inbox.channel.is_a?(Channel::Whatsapp) && @inbox.channel.provider == 'whatsapp_cloud'
-
-    render json: { error: 'Health data only available for WhatsApp Cloud API channels' }, status: :bad_request
-  end
-
-  def whatsapp_channel?
-    @inbox.whatsapp? || (@inbox.twilio? && @inbox.channel.whatsapp?)
-  end
-
-  def trigger_template_sync
-    if @inbox.whatsapp?
-      Channels::Whatsapp::TemplatesSyncJob.perform_later(@inbox.channel)
-    elsif @inbox.twilio? && @inbox.channel.whatsapp?
-      Channels::Twilio::TemplatesSyncJob.perform_later(@inbox.channel)
-    end
-  end
-end

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

@@ -4,9 +4,8 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   before_action :fetch_agent_bot, only: [:set_agent_bot]
   before_action :validate_limit, only: [:create]
   # we are already handling the authorization in fetch inbox
-  before_action :check_authorization, except: [:show]
-
-  include Api::V1::Accounts::Concerns::WhatsappHealthManagement
+  before_action :check_authorization, except: [:show, :health]
+  before_action :validate_whatsapp_cloud_channel, only: [:health]
 
   def index
     @inboxes = policy_scope(Current.account.inboxes.order_by_name.includes(:channel, { avatar_attachment: [:blob] }))
@@ -66,17 +65,28 @@ 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') }
   end
 
+  def sync_templates
+    return render status: :unprocessable_entity, json: { error: 'Template sync is only available for WhatsApp channels' } unless whatsapp_channel?
+
+    trigger_template_sync
+    render status: :ok, json: { message: 'Template sync initiated successfully' }
+  rescue StandardError => e
+    render status: :internal_server_error, json: { error: e.message }
+  end
+
+  def health
+    health_data = Whatsapp::HealthService.new(@inbox.channel).fetch_health_status
+    render json: health_data
+  rescue StandardError => e
+    Rails.logger.error "[INBOX HEALTH] Error fetching health data: #{e.message}"
+    render json: { error: e.message }, status: :unprocessable_entity
+  end
+
   private
 
   def fetch_inbox
@@ -88,6 +98,12 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     @agent_bot = AgentBot.find(params[:agent_bot]) if params[:agent_bot]
   end
 
+  def validate_whatsapp_cloud_channel
+    return if @inbox.channel.is_a?(Channel::Whatsapp) && @inbox.channel.provider == 'whatsapp_cloud'
+
+    render json: { error: 'Health data only available for WhatsApp Cloud API channels' }, status: :bad_request
+  end
+
   def create_channel
     return unless allowed_channel_types.include?(permitted_params[:channel][:type])
 
@@ -184,6 +200,18 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   def get_channel_attributes(channel_type)
     channel_type.constantize.const_defined?(:EDITABLE_ATTRS) ? channel_type.constantize::EDITABLE_ATTRS.presence : []
   end
+
+  def whatsapp_channel?
+    @inbox.whatsapp? || (@inbox.twilio? && @inbox.channel.whatsapp?)
+  end
+
+  def trigger_template_sync
+    if @inbox.whatsapp?
+      Channels::Whatsapp::TemplatesSyncJob.perform_later(@inbox.channel)
+    elsif @inbox.twilio? && @inbox.channel.whatsapp?
+      Channels::Twilio::TemplatesSyncJob.perform_later(@inbox.channel)
+    end
+  end
 end
 
 Api::V1::Accounts::InboxesController.prepend_mod_with('Api::V1::Accounts::InboxesController')

app/controllers/api/v1/accounts/integrations/linear_controller.rb

@@ -126,7 +126,7 @@ class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Bas
     return unless @hook&.access_token
 
     begin
-      linear_client = Linear.new(@hook.access_token, refresh_token: @hook.settings&.[]('refresh_token'))
+      linear_client = Linear.new(@hook.access_token)
       linear_client.revoke_token
     rescue StandardError => e
       Rails.logger.error "Failed to revoke Linear token: #{e.message}"

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

@@ -79,7 +79,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
   def portal_params
     params.require(:portal).permit(
       :id, :color, :custom_domain, :header_text, :homepage_link,
-      :name, :page_title, :slug, :archived, { config: [:default_locale, { allowed_locales: [] }, { draft_locales: [] }] }
+      :name, :page_title, :slug, :archived, { config: [:default_locale, { allowed_locales: [] }] }
     )
   end
 

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/widget/contacts_controller.rb

@@ -19,7 +19,7 @@ class Api::V1::Widget::ContactsController < Api::V1::Widget::BaseController
       contact = @contact
     end
 
-    @contact_inbox.update(hmac_verified: true) if should_verify_hmac?
+    @contact_inbox.update(hmac_verified: true) if should_verify_hmac? && valid_hmac?
 
     identify_contact(contact)
   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/reports_controller.rb

@@ -112,6 +112,7 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
     common_params.merge({
                           since: range[:current][:since],
                           until: range[:current][:until],
+                          timezone: params[:timezone],
                           timezone_offset: params[:timezone_offset]
                         })
   end
@@ -120,6 +121,7 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
     common_params.merge({
                           since: range[:previous][:since],
                           until: range[:previous][:until],
+                          timezone: params[:timezone],
                           timezone_offset: params[:timezone_offset]
                         })
   end
@@ -129,6 +131,7 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
                           metric: params[:metric],
                           since: params[:since],
                           until: params[:until],
+                          timezone: params[:timezone],
                           timezone_offset: params[:timezone_offset]
                         })
   end

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)
+    render_report_with(V2::Reports::AgentSummaryBuilder, type: :agent)
   end
 
   def team
-    render_report_with(V2::Reports::TeamSummaryBuilder)
+    render_report_with(V2::Reports::TeamSummaryBuilder, type: :team)
   end
 
   def inbox
-    render_report_with(V2::Reports::InboxSummaryBuilder)
+    render_report_with(V2::Reports::InboxSummaryBuilder, type: :inbox)
   end
 
   def label
@@ -36,15 +36,18 @@ class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseContr
       until: permitted_params[:until],
       business_hours: ActiveModel::Type::Boolean.new.cast(permitted_params[:business_hours])
     }
+    @builder_params[:timezone] = permitted_params[:timezone] if permitted_params[:timezone].present?
+    @builder_params[:timezone_offset] = permitted_params[:timezone_offset] if permitted_params[:timezone_offset].present?
   end
 
-  def render_report_with(builder_class)
-    builder = builder_class.new(account: Current.account, params: @builder_params)
+  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)
     render json: builder.build
   end
 
   def permitted_params
-    params.permit(:since, :until, :business_hours)
+    params.permit(:since, :until, :business_hours, :timezone, :timezone_offset)
   end
 
   def date_range_too_long?

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/linear/callbacks_controller.rb

@@ -2,8 +2,6 @@ class Linear::CallbacksController < ApplicationController
   include Linear::IntegrationHelper
 
   def show
-    return redirect_to(safe_linear_redirect_uri) if params[:code].blank? || account_id.blank?
-
     @response = oauth_client.auth_code.get_token(
       params[:code],
       redirect_uri: "#{base_url}/linear/callback"
@@ -12,7 +10,7 @@ class Linear::CallbacksController < ApplicationController
     handle_response
   rescue StandardError => e
     Rails.logger.error("Linear callback error: #{e.message}")
-    redirect_to safe_linear_redirect_uri
+    redirect_to linear_redirect_uri
   end
 
   private
@@ -33,19 +31,22 @@ class Linear::CallbacksController < ApplicationController
   end
 
   def handle_response
-    raise ArgumentError, 'Missing access token in Linear OAuth response' if parsed_body['access_token'].blank?
-
-    hook = account.hooks.find_or_initialize_by(app_id: 'linear')
-    hook.assign_attributes(
+    hook = account.hooks.new(
       access_token: parsed_body['access_token'],
       status: 'enabled',
-      settings: merged_integration_settings(hook.settings)
+      app_id: 'linear',
+      settings: {
+        token_type: parsed_body['token_type'],
+        expires_in: parsed_body['expires_in'],
+        scope: parsed_body['scope']
+      }
     )
+    # You may wonder why we're not handling the refresh token update, since the token will expire only after 10 years, https://github.com/linear/linear/issues/251
     hook.save!
     redirect_to linear_redirect_uri
   rescue StandardError => e
     Rails.logger.error("Linear callback error: #{e.message}")
-    redirect_to safe_linear_redirect_uri
+    redirect_to linear_redirect_uri
   end
 
   def account
@@ -53,47 +54,19 @@ class Linear::CallbacksController < ApplicationController
   end
 
   def account_id
-    return @account_id if instance_variable_defined?(:@account_id)
+    return unless params[:state]
 
-    @account_id = params[:state].present? ? verify_linear_token(params[:state]) : nil
+    verify_linear_token(params[:state])
   end
 
   def linear_redirect_uri
     "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{account.id}/settings/integrations/linear"
   end
 
-  def safe_linear_redirect_uri
-    return base_url if account_id.blank?
-
-    linear_redirect_uri
-  rescue StandardError
-    base_url
-  end
-
   def parsed_body
     @parsed_body ||= @response.response.parsed
   end
 
-  def integration_settings
-    {
-      token_type: parsed_body['token_type'],
-      expires_in: parsed_body['expires_in'],
-      expires_on: expires_on,
-      scope: parsed_body['scope'],
-      refresh_token: parsed_body['refresh_token']
-    }.compact
-  end
-
-  def merged_integration_settings(existing_settings)
-    existing_settings.to_h.with_indifferent_access.merge(integration_settings)
-  end
-
-  def expires_on
-    return if parsed_body['expires_in'].blank?
-
-    (Time.current.utc + parsed_body['expires_in'].to_i.seconds).to_s
-  end
-
   def base_url
     ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
   end

app/controllers/platform/api/v1/email_channel_migrations_controller.rb

@@ -1,101 +0,0 @@
-class Platform::Api::V1::EmailChannelMigrationsController < PlatformController
-  before_action :set_account
-  before_action :validate_account_permissible
-  before_action :validate_feature_flag
-  before_action :validate_params
-
-  def create
-    results = migrate_email_channels
-    render json: { results: results }, status: :ok
-  end
-
-  private
-
-  def set_account
-    @account = Account.find(params[:account_id])
-  end
-
-  def validate_account_permissible
-    return if @platform_app.platform_app_permissibles.find_by(permissible: @account)
-
-    render json: { error: 'Non permissible resource' }, status: :unauthorized
-  end
-
-  def validate_feature_flag
-    return if ActiveModel::Type::Boolean.new.cast(ENV.fetch('EMAIL_CHANNEL_MIGRATION', false))
-
-    render json: { error: 'Email channel migration is not enabled' }, status: :forbidden
-  end
-
-  def validate_params
-    return render json: { error: 'Missing migrations parameter' }, status: :unprocessable_entity if migration_params.blank?
-
-    return unless migration_params.size > MAX_MIGRATIONS
-
-    return render json: { error: "Too many migrations (max #{MAX_MIGRATIONS})" },
-                  status: :unprocessable_entity
-  end
-
-  def migrate_email_channels
-    migration_params.map { |entry| migrate_single(entry) }
-  end
-
-  MAX_MIGRATIONS = 25
-  SUPPORTED_PROVIDERS = %w[google microsoft].freeze
-
-  def migrate_single(entry)
-    validate_provider!(entry[:provider])
-
-    ActiveRecord::Base.transaction do
-      channel = create_channel(entry)
-      inbox = create_inbox(channel, entry)
-
-      { email: entry[:email], inbox_id: inbox.id, channel_id: channel.id, status: 'success' }
-    end
-  rescue StandardError => e
-    { email: entry[:email], status: 'error', message: e.message }
-  end
-
-  def create_channel(entry)
-    Channel::Email.create!(
-      account_id: @account.id,
-      email: entry[:email],
-      provider: entry[:provider],
-      provider_config: entry[:provider_config]&.to_h,
-      imap_enabled: entry.fetch(:imap_enabled, true),
-      imap_address: entry[:imap_address] || default_imap_address(entry[:provider]),
-      imap_port: entry[:imap_port] || 993,
-      imap_login: entry[:imap_login] || entry[:email],
-      imap_enable_ssl: entry.fetch(:imap_enable_ssl, true)
-    )
-  end
-
-  def create_inbox(channel, entry)
-    @account.inboxes.create!(
-      name: entry[:inbox_name] || "Migrated #{entry[:provider]&.capitalize}: #{entry[:email]}",
-      channel: channel
-    )
-  end
-
-  def validate_provider!(provider)
-    return if SUPPORTED_PROVIDERS.include?(provider)
-
-    raise ArgumentError, "Unsupported provider '#{provider}'. Must be one of: #{SUPPORTED_PROVIDERS.join(', ')}"
-  end
-
-  def default_imap_address(provider)
-    case provider
-    when 'google' then 'imap.gmail.com'
-    when 'microsoft' then 'outlook.office365.com'
-    else ''
-    end
-  end
-
-  def migration_params
-    params.permit(migrations: [
-                    :email, :provider, :inbox_name,
-                    :imap_enabled, :imap_address, :imap_port, :imap_login, :imap_enable_ssl,
-                    { provider_config: {} }
-                  ])[:migrations]
-  end
-end

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

@@ -1,13 +1,11 @@
 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'
 
   def index
-    @search_query = list_params[:query]
     @articles = @portal.articles.published.includes(:category, :author)
 
     @articles = @articles.where(locale: permitted_params[:locale]) if permitted_params[:locale].present?
@@ -62,7 +60,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
@@ -75,9 +73,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
   end
 
   def list_params
-    @list_params ||= params.permit(:query, :locale, :sort, :status, :page, :per_page).tap do |permitted|
-      permitted[:query] = permitted[:query].to_s.strip.presence
-    end
+    params.permit(:query, :locale, :sort, :status, :page, :per_page)
   end
 
   def permitted_params

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/controllers/widgets_controller.rb

@@ -77,23 +77,13 @@ class WidgetsController < ActionController::Base
   end
 
   def allow_iframe_requests
-    if @web_widget.allowed_domains.blank? || embedded_from_non_web_origin?
+    if @web_widget.allowed_domains.blank?
       response.headers.delete('X-Frame-Options')
     else
       domains = @web_widget.allowed_domains.split(',').map(&:strip).join(' ')
       response.headers['Content-Security-Policy'] = "frame-ancestors #{domains}"
     end
   end
-
-  # Mobile WebViews (iOS/Android) load content from file:// or null origins,
-  # which cannot match any domain in frame-ancestors. When the per-inbox flag
-  # is enabled, skip frame-ancestors for these requests.
-  def embedded_from_non_web_origin?
-    return false unless @web_widget.allow_mobile_webview?
-
-    origin = request.headers['Origin']
-    origin.blank? || origin == 'null' || origin&.start_with?('file://')
-  end
 end
 
 WidgetsController.prepend_mod_with('WidgetsController')

app/javascript/dashboard/App.vue

@@ -98,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');

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/inboxHealth.js

@@ -9,10 +9,6 @@ class InboxHealthAPI extends ApiClient {
   getHealthStatus(inboxId) {
     return axios.get(`${this.url}/${inboxId}/health`);
   }
-
-  registerWebhook(inboxId) {
-    return axios.post(`${this.url}/${inboxId}/register_webhook`);
-  }
 }
 
 export default new InboxHealthAPI();

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/reports.js

@@ -2,6 +2,7 @@
 import ApiClient from './ApiClient';
 
 const getTimeOffset = () => -new Date().getTimezoneOffset() / 60;
+const getTimeZone = () => Intl.DateTimeFormat().resolvedOptions().timeZone;
 
 class ReportsAPI extends ApiClient {
   constructor() {
@@ -26,6 +27,7 @@ class ReportsAPI extends ApiClient {
         id,
         group_by: groupBy,
         business_hours: businessHours,
+        timezone: getTimeZone(),
         timezone_offset: getTimeOffset(),
       },
     });
@@ -41,6 +43,7 @@ class ReportsAPI extends ApiClient {
         id,
         group_by: groupBy,
         business_hours: businessHours,
+        timezone: getTimeZone(),
         timezone_offset: getTimeOffset(),
       },
     });
@@ -105,6 +108,8 @@ class ReportsAPI extends ApiClient {
         type: 'account',
         group_by: groupBy,
         business_hours: businessHours,
+        timezone: getTimeZone(),
+        timezone_offset: getTimeOffset(),
       },
     });
   }

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

@@ -2,6 +2,8 @@ import reportsAPI from '../reports';
 import ApiClient from '../ApiClient';
 
 describe('#Reports API', () => {
+  const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
   it('creates correct instance', () => {
     expect(reportsAPI).toBeInstanceOf(ApiClient);
     expect(reportsAPI.apiVersion).toBe('/api/v2');
@@ -46,6 +48,7 @@ describe('#Reports API', () => {
           since: 1621103400,
           until: 1621621800,
           type: 'account',
+          timezone,
           timezone_offset: -0,
         },
       });
@@ -59,6 +62,7 @@ describe('#Reports API', () => {
           group_by: undefined,
           id: undefined,
           since: 1621103400,
+          timezone,
           timezone_offset: -0,
           type: 'account',
           until: 1621621800,
@@ -140,6 +144,8 @@ describe('#Reports API', () => {
             type: 'account',
             group_by: 'date',
             business_hours: true,
+            timezone,
+            timezone_offset: -0,
           },
         }
       );

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

@@ -0,0 +1,47 @@
+import summaryReportsAPI from '../summaryReports';
+import ApiClient from '../ApiClient';
+
+describe('#Summary Reports API', () => {
+  const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+  it('creates correct instance', () => {
+    expect(summaryReportsAPI).toBeInstanceOf(ApiClient);
+    expect(summaryReportsAPI.apiVersion).toBe('/api/v2');
+  });
+
+  describe('API calls', () => {
+    const originalAxios = window.axios;
+    const axiosMock = {
+      get: vi.fn(() => Promise.resolve()),
+    };
+
+    beforeEach(() => {
+      window.axios = axiosMock;
+    });
+
+    afterEach(() => {
+      window.axios = originalAxios;
+    });
+
+    it('includes timezone data in summary report requests', () => {
+      summaryReportsAPI.getAgentReports({
+        since: 1621103400,
+        until: 1621621800,
+        businessHours: true,
+      });
+
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v2/summary_reports/agent',
+        {
+          params: {
+            since: 1621103400,
+            until: 1621621800,
+            business_hours: true,
+            timezone,
+            timezone_offset: -0,
+          },
+        }
+      );
+    });
+  });
+});

app/javascript/dashboard/api/summaryReports.js

@@ -1,6 +1,9 @@
 /* global axios */
 import ApiClient from './ApiClient';
 
+const getTimeOffset = () => -new Date().getTimezoneOffset() / 60;
+const getTimeZone = () => Intl.DateTimeFormat().resolvedOptions().timeZone;
+
 class SummaryReportsAPI extends ApiClient {
   constructor() {
     super('summary_reports', { accountScoped: true, apiVersion: 'v2' });
@@ -12,6 +15,8 @@ class SummaryReportsAPI extends ApiClient {
         since,
         until,
         business_hours: businessHours,
+        timezone: getTimeZone(),
+        timezone_offset: getTimeOffset(),
       },
     });
   }
@@ -22,6 +27,8 @@ class SummaryReportsAPI extends ApiClient {
         since,
         until,
         business_hours: businessHours,
+        timezone: getTimeZone(),
+        timezone_offset: getTimeOffset(),
       },
     });
   }
@@ -32,6 +39,8 @@ class SummaryReportsAPI extends ApiClient {
         since,
         until,
         business_hours: businessHours,
+        timezone: getTimeZone(),
+        timezone_offset: getTimeOffset(),
       },
     });
   }
@@ -42,6 +51,8 @@ class SummaryReportsAPI extends ApiClient {
         since,
         until,
         business_hours: businessHours,
+        timezone: getTimeZone(),
+        timezone_offset: getTimeOffset(),
       },
     });
   }

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/VoiceCallButton.vue

@@ -3,7 +3,7 @@ import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useMapGetter, useStore } from 'dashboard/composables/store';
-import { isVoiceCallEnabled } from 'dashboard/helper/inbox';
+import { INBOX_TYPES } from 'dashboard/helper/inbox';
 import { useAlert } from 'dashboard/composables';
 import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
 import { useCallsStore } from 'dashboard/stores/calls';
@@ -34,7 +34,9 @@ const inboxesList = useMapGetter('inboxes/getInboxes');
 const contactsUiFlags = useMapGetter('contacts/getUIFlags');
 
 const voiceInboxes = computed(() =>
-  (inboxesList.value || []).filter(isVoiceCallEnabled)
+  (inboxesList.value || []).filter(
+    inbox => inbox.channel_type === INBOX_TYPES.VOICE
+  )
 );
 const hasVoiceInboxes = computed(() => voiceInboxes.value.length > 0);
 

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/HelpCenter/EmptyState/Portal/PortalEmptyState.vue

@@ -26,7 +26,6 @@ const onPortalCreate = ({ slug: portalSlug, locale }) => {
   <EmptyStateLayout
     :title="$t('HELP_CENTER.TITLE')"
     :subtitle="$t('HELP_CENTER.NEW_PAGE.DESCRIPTION')"
-    class="bg-n-surface-1"
   >
     <template #empty-state-item>
       <div class="grid grid-cols-2 gap-4 p-px">

app/javascript/dashboard/components-next/HelpCenter/LocaleCard/LocaleCard.story.vue

@@ -1,22 +1,8 @@
 <script setup>
 import LocaleCard from './LocaleCard.vue';
 const locales = [
-  {
-    name: 'English',
-    code: 'en',
-    isDefault: true,
-    isDraft: false,
-    articleCount: 29,
-    categoryCount: 5,
-  },
-  {
-    name: 'Spanish',
-    code: 'es',
-    isDefault: false,
-    isDraft: true,
-    articleCount: 29,
-    categoryCount: 5,
-  },
+  { name: 'English', isDefault: true, articleCount: 29, categoryCount: 5 },
+  { name: 'Spanish', isDefault: false, articleCount: 29, categoryCount: 5 },
 ];
 </script>
 
@@ -33,8 +19,6 @@ const locales = [
           <LocaleCard
             :locale="locale.name"
             :is-default="locale.isDefault"
-            :is-draft="locale.isDraft"
-            :locale-code="locale.code"
             :article-count="locale.articleCount"
             :category-count="locale.categoryCount"
           />

app/javascript/dashboard/components-next/HelpCenter/LocaleCard/LocaleCard.vue

@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useToggle } from '@vueuse/core';
-import { buildLocaleMenuItems } from 'dashboard/helper/portalHelper';
+import { LOCALE_MENU_ITEMS } from 'dashboard/helper/portalHelper';
 
 import CardLayout from 'dashboard/components-next/CardLayout.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
@@ -17,10 +17,6 @@ const props = defineProps({
     type: Boolean,
     required: true,
   },
-  isDraft: {
-    type: Boolean,
-    required: true,
-  },
   localeCode: {
     type: String,
     required: true,
@@ -41,28 +37,11 @@ const { t } = useI18n();
 
 const [showDropdownMenu, toggleDropdown] = useToggle();
 
-const localeLabel = computed(() => `${props.locale} (${props.localeCode})`);
-
-const localeMenuLabels = computed(() => ({
-  'change-default': t(
-    'HELP_CENTER.LOCALES_PAGE.LOCALE_CARD.DROPDOWN_MENU.MAKE_DEFAULT'
-  ),
-  'move-to-draft': t(
-    'HELP_CENTER.LOCALES_PAGE.LOCALE_CARD.DROPDOWN_MENU.MOVE_TO_DRAFT'
-  ),
-  'publish-locale': t(
-    'HELP_CENTER.LOCALES_PAGE.LOCALE_CARD.DROPDOWN_MENU.PUBLISH_LOCALE'
-  ),
-  delete: t('HELP_CENTER.LOCALES_PAGE.LOCALE_CARD.DROPDOWN_MENU.DELETE'),
-}));
-
 const localeMenuItems = computed(() =>
-  buildLocaleMenuItems({
-    isDefault: props.isDefault,
-    isDraft: props.isDraft,
-  }).map(item => ({
+  LOCALE_MENU_ITEMS.map(item => ({
     ...item,
-    label: localeMenuLabels.value[item.action],
+    label: t(item.label),
+    disabled: props.isDefault,
   }))
 );
 
@@ -77,7 +56,7 @@ const handleAction = ({ action, value }) => {
     <div class="flex justify-between gap-2">
       <div class="flex items-center justify-start gap-2">
         <span class="text-sm font-medium text-n-slate-12 line-clamp-1">
-          {{ localeLabel }}
+          {{ locale }} ({{ localeCode }})
         </span>
         <span
           v-if="isDefault"
@@ -85,12 +64,6 @@ const handleAction = ({ action, value }) => {
         >
           {{ $t('HELP_CENTER.LOCALES_PAGE.LOCALE_CARD.DEFAULT') }}
         </span>
-        <span
-          v-else-if="isDraft"
-          class="bg-n-alpha-2 h-6 inline-flex items-center justify-center rounded-md text-xs border-px border-transparent text-n-slate-11 px-2 py-0.5"
-        >
-          {{ $t('HELP_CENTER.LOCALES_PAGE.LOCALE_CARD.DRAFT') }}
-        </span>
       </div>
       <div class="flex items-center justify-end gap-4">
         <div class="flex items-center gap-4">
@@ -113,7 +86,6 @@ const handleAction = ({ action, value }) => {
           </span>
         </div>
         <div
-          v-if="localeMenuItems.length"
           v-on-clickaway="() => toggleDropdown(false)"
           class="relative group"
         >

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

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } 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';
@@ -32,7 +32,6 @@ const emit = defineEmits([
   'setAuthor',
   'setCategory',
   'previewArticle',
-  'createArticle',
 ]);
 
 const { t } = useI18n();
@@ -58,10 +57,16 @@ const quickSave = debounce(
 // 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;
-  quickSave(value);
-  saveAndSyncDebounced(value);
+  if (isNewArticle.value) {
+    quickSaveNewArticle(value);
+  } else {
+    quickSave(value);
+    saveAndSyncDebounced(value);
+  }
 };
 
 const articleTitle = computed({
@@ -71,12 +76,9 @@ const articleTitle = computed({
   },
 });
 
-const localContent = ref(props.article.content || '');
-
 const articleContent = computed({
   get: () => props.article.content,
   set: content => {
-    localContent.value = content;
     handleSave({ content });
   },
 });
@@ -96,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>
@@ -128,7 +122,6 @@ 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"

app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/AddLocaleDialog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, watch } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStore } from 'dashboard/composables/store';
 import { useAlert, useTrack } from 'dashboard/composables';
@@ -24,20 +24,12 @@ const dialogRef = ref(null);
 const isUpdating = ref(false);
 
 const selectedLocale = ref('');
-const localeStatus = ref('published');
 
 const addedLocales = computed(() => {
   const { allowed_locales: allowedLocales = [] } = props.portal?.config || {};
   return allowedLocales.map(locale => locale.code);
 });
 
-const draftedLocales = computed(() => {
-  const { allowed_locales: allowedLocales = [] } = props.portal?.config || {};
-  return allowedLocales
-    .filter(locale => locale.draft)
-    .map(locale => locale.code);
-});
-
 const locales = computed(() => {
   return Object.keys(allLocales)
     .map(key => {
@@ -49,44 +41,17 @@ const locales = computed(() => {
     .filter(locale => !addedLocales.value.includes(locale.value));
 });
 
-const statusOptions = computed(() => [
-  {
-    value: 'published',
-    label: t('HELP_CENTER.LOCALES_PAGE.ADD_LOCALE_DIALOG.STATUS.OPTIONS.LIVE'),
-  },
-  {
-    value: 'draft',
-    label: t('HELP_CENTER.LOCALES_PAGE.ADD_LOCALE_DIALOG.STATUS.OPTIONS.DRAFT'),
-  },
-]);
-
-const resetForm = () => {
-  selectedLocale.value = '';
-  localeStatus.value = 'published';
-};
-
-watch(localeStatus, value => {
-  if (!value) {
-    localeStatus.value = 'published';
-  }
-});
-
 const onCreate = async () => {
   if (!selectedLocale.value) return;
 
   isUpdating.value = true;
   const updatedLocales = [...addedLocales.value, selectedLocale.value];
-  const updatedDraftLocales =
-    localeStatus.value === 'draft'
-      ? [...new Set([...draftedLocales.value, selectedLocale.value])]
-      : draftedLocales.value;
 
   try {
     await store.dispatch('portals/update', {
       portalSlug: props.portal?.slug,
       config: {
         allowed_locales: updatedLocales,
-        draft_locales: updatedDraftLocales,
         default_locale: props.portal?.meta?.default_locale,
       },
     });
@@ -97,7 +62,7 @@ const onCreate = async () => {
       from: route.name,
     });
 
-    resetForm();
+    selectedLocale.value = '';
     dialogRef.value?.close();
     useAlert(
       t('HELP_CENTER.LOCALES_PAGE.ADD_LOCALE_DIALOG.API.SUCCESS_MESSAGE')
@@ -122,7 +87,6 @@ defineExpose({ dialogRef });
     type="edit"
     :title="t('HELP_CENTER.LOCALES_PAGE.ADD_LOCALE_DIALOG.TITLE')"
     :description="t('HELP_CENTER.LOCALES_PAGE.ADD_LOCALE_DIALOG.DESCRIPTION')"
-    @close="resetForm"
     @confirm="onCreate"
   >
     <div class="flex flex-col gap-6">
@@ -134,16 +98,6 @@ defineExpose({ dialogRef });
         "
         class="[&>div>button:not(.focused)]:!outline-n-slate-5 [&>div>button:not(.focused)]:dark:!outline-n-slate-5"
       />
-      <div class="flex flex-col gap-2">
-        <span class="text-sm font-medium text-n-slate-12">
-          {{ t('HELP_CENTER.LOCALES_PAGE.ADD_LOCALE_DIALOG.STATUS.LABEL') }}
-        </span>
-        <ComboBox
-          v-model="localeStatus"
-          :options="statusOptions"
-          class="[&>div>button:not(.focused)]:!outline-n-slate-5 [&>div>button:not(.focused)]:dark:!outline-n-slate-5"
-        />
-      </div>
     </div>
   </Dialog>
 </template>

app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocaleList.vue

@@ -29,7 +29,6 @@ const isLocaleDefault = code => {
 
 const updatePortalLocales = async ({
   newAllowedLocales,
-  newDraftLocales,
   defaultLocale,
   messageKey,
 }) => {
@@ -40,7 +39,6 @@ const updatePortalLocales = async ({
       config: {
         default_locale: defaultLocale,
         allowed_locales: newAllowedLocales,
-        draft_locales: newDraftLocales,
       },
     });
 
@@ -55,12 +53,8 @@ const updatePortalLocales = async ({
 
 const changeDefaultLocale = ({ localeCode }) => {
   const newAllowedLocales = props.locales.map(locale => locale.code);
-  const newDraftLocales = props.locales
-    .filter(locale => locale.isDraft)
-    .map(locale => locale.code);
   updatePortalLocales({
     newAllowedLocales,
-    newDraftLocales,
     defaultLocale: localeCode,
     messageKey: 'CHANGE_DEFAULT_LOCALE',
   });
@@ -87,15 +81,11 @@ const deletePortalLocale = async ({ localeCode }) => {
   const updatedLocales = props.locales
     .filter(locale => locale.code !== localeCode)
     .map(locale => locale.code);
-  const updatedDraftLocales = props.locales
-    .filter(locale => locale.code !== localeCode && locale.isDraft)
-    .map(locale => locale.code);
 
   const defaultLocale = props.portal.meta.default_locale;
 
   await updatePortalLocales({
     newAllowedLocales: updatedLocales,
-    newDraftLocales: updatedDraftLocales,
     defaultLocale,
     messageKey: 'DELETE_LOCALE',
   });
@@ -108,46 +98,9 @@ const deletePortalLocale = async ({ localeCode }) => {
   });
 };
 
-const updateDraftLocales = async ({ localeCode, shouldDraft, messageKey }) => {
-  const newAllowedLocales = props.locales.map(locale => locale.code);
-  const currentDraftLocales = props.locales
-    .filter(locale => locale.isDraft)
-    .map(locale => locale.code);
-  const newDraftLocales = shouldDraft
-    ? [...new Set([...currentDraftLocales, localeCode])]
-    : currentDraftLocales.filter(locale => locale !== localeCode);
-
-  await updatePortalLocales({
-    newAllowedLocales,
-    newDraftLocales,
-    defaultLocale: props.portal.meta.default_locale,
-    messageKey,
-  });
-};
-
-const moveLocaleToDraft = async ({ localeCode }) => {
-  await updateDraftLocales({
-    localeCode,
-    shouldDraft: true,
-    messageKey: 'DRAFT_LOCALE',
-  });
-};
-
-const publishLocale = async ({ localeCode }) => {
-  await updateDraftLocales({
-    localeCode,
-    shouldDraft: false,
-    messageKey: 'PUBLISH_LOCALE',
-  });
-};
-
 const handleAction = ({ action }, localeCode) => {
   if (action === 'change-default') {
     changeDefaultLocale({ localeCode: localeCode });
-  } else if (action === 'move-to-draft') {
-    moveLocaleToDraft({ localeCode: localeCode });
-  } else if (action === 'publish-locale') {
-    publishLocale({ localeCode: localeCode });
   } else if (action === 'delete') {
     deletePortalLocale({ localeCode: localeCode });
   }
@@ -161,7 +114,6 @@ const handleAction = ({ action }, localeCode) => {
       :key="index"
       :locale="locale.name"
       :is-default="isLocaleDefault(locale.code)"
-      :is-draft="locale.isDraft"
       :locale-code="locale.code"
       :article-count="locale.articlesCount || 0"
       :category-count="locale.categoriesCount || 0"

app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocalesPage.story.vue

@@ -4,49 +4,37 @@ import LocalesPage from './LocalesPage.vue';
 const locales = [
   {
     name: 'English (en-US)',
-    code: 'en',
     isDefault: true,
-    isDraft: false,
     articleCount: 5,
     categoryCount: 5,
   },
   {
     name: 'Spanish (es-ES)',
-    code: 'es',
     isDefault: false,
-    isDraft: true,
     articleCount: 20,
     categoryCount: 10,
   },
   {
     name: 'English (en-UK)',
-    code: 'en_GB',
     isDefault: false,
-    isDraft: false,
     articleCount: 15,
     categoryCount: 7,
   },
   {
     name: 'Malay (ms-MY)',
-    code: 'ms',
     isDefault: false,
-    isDraft: false,
     articleCount: 15,
     categoryCount: 7,
   },
   {
     name: 'Malayalam (ml-IN)',
-    code: 'ml',
     isDefault: false,
-    isDraft: false,
     articleCount: 10,
     categoryCount: 5,
   },
   {
     name: 'Hindi (hi-IN)',
-    code: 'hi',
     isDefault: false,
-    isDraft: false,
     articleCount: 15,
     categoryCount: 7,
   },

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

@@ -8,6 +8,8 @@ import { useEventListener } from '@vueuse/core';
 import { ALLOWED_FILE_TYPES } from 'shared/constants/messages';
 import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
 import FileUpload from 'vue-upload-component';
+import { INBOX_TYPES } from 'dashboard/helper/inbox';
+
 import Button from 'dashboard/components-next/button/Button.vue';
 import WhatsAppOptions from './WhatsAppOptions.vue';
 import ContentTemplateSelector from './ContentTemplateSelector.vue';
@@ -27,7 +29,6 @@ const props = defineProps({
   isDropdownActive: { type: Boolean, default: false },
   messageSignature: { type: String, default: '' },
   inboxId: { type: Number, default: null },
-  voiceEnabled: { type: Boolean, default: false },
 });
 
 const emit = defineEmits([
@@ -80,13 +81,11 @@ const isRegularMessageMode = computed(() => {
   return !props.isWhatsappInbox && !props.isTwilioWhatsAppInbox;
 });
 
-const voiceCallEnabled = computed(() => props.voiceEnabled);
+const isVoiceInbox = computed(() => props.channelType === INBOX_TYPES.VOICE);
 
 const shouldShowSignatureButton = computed(() => {
   return (
-    props.hasSelectedInbox &&
-    isRegularMessageMode.value &&
-    !voiceCallEnabled.value
+    props.hasSelectedInbox && isRegularMessageMode.value && !isVoiceInbox.value
   );
 });
 
@@ -111,7 +110,7 @@ watch(
   () => props.hasSelectedInbox,
   newValue => {
     nextTick(() => {
-      if (newValue && !voiceCallEnabled.value) setSignature();
+      if (newValue && !isVoiceInbox.value) setSignature();
     });
   },
   { immediate: true }

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

@@ -2,7 +2,7 @@
 import { ref, computed } from 'vue';
 import { useVuelidate } from '@vuelidate/core';
 import { required, requiredIf } from '@vuelidate/validators';
-import { INBOX_TYPES, isVoiceCallEnabled } from 'dashboard/helper/inbox';
+import { INBOX_TYPES } from 'dashboard/helper/inbox';
 import {
   appendSignature,
   removeSignature,
@@ -100,8 +100,6 @@ const inboxChannelType = computed(() => props.targetInbox?.channelType || '');
 
 const inboxMedium = computed(() => props.targetInbox?.medium || '');
 
-const voiceCallEnabled = computed(() => isVoiceCallEnabled(props.targetInbox));
-
 const effectiveChannelType = computed(() =>
   getEffectiveChannelType(inboxChannelType.value, inboxMedium.value)
 );
@@ -444,7 +442,6 @@ useKeyboardEvents({
       :is-twilio-whats-app-inbox="inboxTypes.isTwilioWhatsapp"
       :message-templates="whatsappMessageTemplates"
       :channel-type="inboxChannelType"
-      :voice-enabled="voiceCallEnabled"
       :is-loading="isCreating"
       :disable-send-button="isCreating"
       :has-selected-inbox="!!targetInbox"

app/javascript/dashboard/components-next/Settings/SettingsToggleSection.vue

@@ -14,10 +14,6 @@ defineProps({
     type: Boolean,
     default: false,
   },
-  hideToggle: {
-    type: Boolean,
-    default: false,
-  },
 });
 
 const modelValue = defineModel({ type: Boolean, default: false });
@@ -32,8 +28,7 @@ const modelValue = defineModel({ type: Boolean, default: false });
         <span class="text-heading-3 text-n-slate-12">
           {{ header }}
         </span>
-        <div v-if="hideToggle" class="size-2" />
-        <ToggleSwitch v-else v-model="modelValue" />
+        <ToggleSwitch v-model="modelValue" />
       </div>
       <span v-if="description" class="text-body-main text-n-slate-11">
         {{ description }}

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/assistant/settings/AssistantBasicSettingsForm.vue

@@ -27,7 +27,6 @@ const initialState = {
     conversationFaqs: false,
     memories: false,
     citations: false,
-    contactAttributes: false,
   },
 };
 
@@ -60,7 +59,6 @@ const updateStateFromAssistant = assistant => {
     conversationFaqs: config.feature_faq || false,
     memories: config.feature_memory || false,
     citations: config.feature_citation || false,
-    contactAttributes: config.feature_contact_attributes || false,
   };
 };
 
@@ -81,7 +79,6 @@ const handleBasicInfoUpdate = async () => {
       feature_faq: state.features.conversationFaqs,
       feature_memory: state.features.memories,
       feature_citation: state.features.citations,
-      feature_contact_attributes: state.features.contactAttributes,
     },
   };
 
@@ -141,10 +138,6 @@ watch(
           <input v-model="state.features.citations" type="checkbox" />
           {{ t('CAPTAIN.ASSISTANTS.FORM.FEATURES.ALLOW_CITATIONS') }}
         </label>
-        <label class="flex items-center gap-2">
-          <input v-model="state.features.contactAttributes" type="checkbox" />
-          {{ t('CAPTAIN.ASSISTANTS.FORM.FEATURES.ALLOW_CONTACT_ATTRIBUTES') }}
-        </label>
       </div>
     </div>
 

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/icon/provider.js

@@ -1,5 +1,4 @@
 import { computed } from 'vue';
-import { isVoiceCallEnabled } from 'dashboard/helper/inbox';
 
 export function useChannelIcon(inbox) {
   const channelTypeIconMap = {
@@ -15,6 +14,7 @@ export function useChannelIcon(inbox) {
     'Channel::Whatsapp': 'i-woot-whatsapp',
     'Channel::Instagram': 'i-woot-instagram',
     'Channel::Tiktok': 'i-woot-tiktok',
+    'Channel::Voice': 'i-woot-voice',
   };
 
   const providerIconMap = {
@@ -38,11 +38,6 @@ export function useChannelIcon(inbox) {
       icon = 'i-woot-whatsapp';
     }
 
-    // Special case for voice-enabled inboxes (Twilio, WhatsApp, etc.)
-    if (isVoiceCallEnabled(inboxDetails)) {
-      icon = 'i-woot-voice';
-    }
-
     return icon ?? 'i-ri-global-fill';
   });
 

app/javascript/dashboard/components-next/icon/specs/provider.spec.js

@@ -19,11 +19,8 @@ describe('useChannelIcon', () => {
     expect(icon).toBe('i-woot-whatsapp');
   });
 
-  it('returns correct icon for voice-enabled Twilio channel', () => {
-    const inbox = {
-      channel_type: 'Channel::TwilioSms',
-      voice_enabled: true,
-    };
+  it('returns correct icon for Voice channel', () => {
+    const inbox = { channel_type: 'Channel::Voice' };
     const { value: icon } = useChannelIcon(inbox);
     expect(icon).toBe('i-woot-voice');
   });

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/MessageMeta.vue

@@ -67,9 +67,6 @@ const isSent = computed(() => {
     return sourceId.value && status.value === MESSAGE_STATUS.SENT;
   }
 
-  // API inbox messages use real sent/delivered/read status values from the external system.
-  if (isAPIInbox.value) return status.value === MESSAGE_STATUS.SENT;
-
   // All messages will be mark as sent for the Line channel, as there is no source ID.
   if (isALineChannel.value) return true;
 
@@ -89,10 +86,8 @@ const isDelivered = computed(() => {
   ) {
     return sourceId.value && status.value === MESSAGE_STATUS.DELIVERED;
   }
-  // API inbox messages use real delivered status from the external system.
-  if (isAPIInbox.value) return status.value === MESSAGE_STATUS.DELIVERED;
-  // All messages marked as delivered for the web widget inbox once they are sent.
-  if (isAWebWidgetInbox.value) {
+  // All messages marked as delivered for the web widget inbox and API inbox once they are sent.
+  if (isAWebWidgetInbox.value || isAPIInbox.value) {
     return status.value === MESSAGE_STATUS.SENT;
   }
   if (isALineChannel.value) {

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/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);
   }
 });
@@ -835,8 +828,6 @@ onMounted(() => {
   }
 });
 
-defineExpose({ focusEditorInputField });
-
 // BUS Event to insert text or markdown into the editor at the
 // current cursor position.
 // Components using this

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

@@ -79,7 +79,7 @@ export default {
 
   created() {
     state = createState(
-      this.modelValue || '',
+      this.modelValue,
       this.placeholder,
       this.plugins,
       { onImageUpload: this.openFileBrowser },
@@ -170,7 +170,7 @@ export default {
     },
     reloadState() {
       state = createState(
-        this.modelValue || '',
+        this.modelValue,
         this.placeholder,
         this.plugins,
         { onImageUpload: this.openFileBrowser },

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/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/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';
@@ -98,7 +99,6 @@ export default {
     } = useUISettings();
 
     const replyEditor = useTemplateRef('replyEditor');
-    const messageEditor = useTemplateRef('messageEditor');
     const copilot = useCopilotReply();
     const shortcutKey = useKbd(['$mod', '+', 'enter']);
 
@@ -109,7 +109,6 @@ export default {
       setQuotedReplyFlagForInbox,
       fetchQuotedReplyFlagFromUISettings,
       replyEditor,
-      messageEditor,
       copilot,
       shortcutKey,
     };
@@ -252,9 +251,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;
       }
@@ -511,7 +507,7 @@ export default {
     );
 
     this.fetchAndSetReplyTo();
-    emitter.on(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE, this.onReplyToMessage);
+    emitter.on(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE, this.fetchAndSetReplyTo);
 
     // A hacky fix to solve the drag and drop
     // Is showing on top of new conversation modal drag and drop
@@ -526,7 +522,7 @@ export default {
   unmounted() {
     document.removeEventListener('paste', this.onPaste);
     document.removeEventListener('keydown', this.handleKeyEvents);
-    emitter.off(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE, this.onReplyToMessage);
+    emitter.off(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE, this.fetchAndSetReplyTo);
     emitter.off(BUS_EVENTS.INSERT_INTO_NORMAL_EDITOR, this.addIntoEditor);
     emitter.off(
       BUS_EVENTS.NEW_CONVERSATION_MODAL,
@@ -547,10 +543,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);
@@ -608,7 +601,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,
@@ -635,17 +628,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);
@@ -917,6 +903,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
@@ -1179,15 +1191,6 @@ export default {
         return false;
       });
     },
-    onReplyToMessage() {
-      this.fetchAndSetReplyTo();
-      if (this.inReplyTo) {
-        this.$nextTick(() => {
-          const pos = this.isSignatureEnabledForInbox ? 'start' : 'end';
-          this.messageEditor?.focusEditorInputField(pos);
-        });
-      }
-    },
     resetReplyToMessage() {
       const replyStorageKey = LOCAL_STORAGE_KEYS.MESSAGE_REPLY_TO;
       LocalStorage.deleteFromJsonStore(replyStorageKey, this.conversationId);
@@ -1310,7 +1313,6 @@ export default {
         />
         <WootMessageEditor
           v-else-if="!showAudioRecorderEditor"
-          ref="messageEditor"
           v-model="message"
           :conversation-id="conversationId"
           :editor-id="editorStateId"
@@ -1415,6 +1417,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/ReplyToMessage.vue

@@ -32,7 +32,6 @@ const emit = defineEmits(['dismiss']);
       xs
       slate
       icon="i-lucide-x"
-      class="flex-shrink-0"
       @click.stop="emit('dismiss')"
     />
   </div>

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:
@@ -229,9 +226,6 @@ describe('useAutomation', () => {
     expect(getConditionDropdownValues('message_type')).toEqual(
       messageTypeOptions
     );
-    expect(getConditionDropdownValues('private_note')).toEqual(
-      booleanFilterOptions
-    );
     expect(getConditionDropdownValues('priority')).toEqual(priorityOptions);
   });
 

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

@@ -1,54 +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(),
-    });
-  });
-
-  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',
-      },
-    ]);
-  });
-});

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

@@ -47,11 +47,7 @@ const mockStore = createStore({
             11: { id: 11, channel_type: INBOX_TYPES.API },
             12: { id: 12, channel_type: INBOX_TYPES.SMS },
             13: { id: 13, channel_type: INBOX_TYPES.INSTAGRAM },
-            14: {
-              id: 14,
-              channel_type: INBOX_TYPES.TWILIO,
-              voice_enabled: true,
-            },
+            14: { id: 14, channel_type: INBOX_TYPES.VOICE },
             15: { id: 15, channel_type: INBOX_TYPES.TIKTOK },
           };
           return inboxes[id] || null;
@@ -215,11 +211,11 @@ describe('useInbox', () => {
       });
       expect(wrapper.vm.isAnInstagramChannel).toBe(true);
 
-      // Test Voice (Twilio with voice_enabled)
+      // Test Voice
       wrapper = mount(createTestComponent(14), {
         global: { plugins: [mockStore] },
       });
-      expect(wrapper.vm.voiceCallEnabled).toBe(true);
+      expect(wrapper.vm.isAVoiceChannel).toBe(true);
 
       // Test Tiktok
       wrapper = mount(createTestComponent(15), {
@@ -278,8 +274,7 @@ describe('useInbox', () => {
         'isAnEmailChannel',
         'isAnInstagramChannel',
         'isATiktokChannel',
-        'voiceCallEnabled',
-        'voiceCallProvider',
+        'isAVoiceChannel',
       ];
 
       expectedProperties.forEach(prop => {

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/useInbox.js

@@ -1,11 +1,7 @@
 import { computed } from 'vue';
 import { useMapGetter } from 'dashboard/composables/store';
 import { useCamelCase } from 'dashboard/composables/useTransformKeys';
-import {
-  INBOX_TYPES,
-  isVoiceCallEnabled,
-  getVoiceCallProvider,
-} from 'dashboard/helper/inbox';
+import { INBOX_TYPES } from 'dashboard/helper/inbox';
 
 export const INBOX_FEATURES = {
   REPLY_TO: 'replyTo',
@@ -138,9 +134,9 @@ export const useInbox = (inboxId = null) => {
     return channelType.value === INBOX_TYPES.TIKTOK;
   });
 
-  const voiceCallEnabled = computed(() => isVoiceCallEnabled(inbox.value));
-
-  const voiceCallProvider = computed(() => getVoiceCallProvider(inbox.value));
+  const isAVoiceChannel = computed(() => {
+    return channelType.value === INBOX_TYPES.VOICE;
+  });
 
   return {
     inbox,
@@ -160,7 +156,6 @@ export const useInbox = (inboxId = null) => {
     isAnEmailChannel,
     isAnInstagramChannel,
     isATiktokChannel,
-    voiceCallEnabled,
-    voiceCallProvider,
+    isAVoiceChannel,
   };
 };

app/javascript/dashboard/constants/editor.js

@@ -109,6 +109,11 @@ export const FORMATTING = {
       'redo',
     ],
   },
+  'Channel::Voice': {
+    marks: [],
+    nodes: [],
+    menu: [],
+  },
   'Channel::Tiktok': {
     marks: [],
     nodes: [],

app/javascript/dashboard/featureFlags.js

@@ -36,9 +36,7 @@ export const FEATURE_FLAGS = {
   CHATWOOT_V4: 'chatwoot_v4',
   CHANNEL_INSTAGRAM: 'channel_instagram',
   CHANNEL_TIKTOK: 'channel_tiktok',
-  CHANNEL_VOICE: 'channel_voice',
   CONTACT_CHATWOOT_SUPPORT_TEAM: 'contact_chatwoot_support_team',
-  CAPTAIN_CUSTOM_TOOLS: 'custom_tools',
   CAPTAIN_V2: 'captain_integration_v2',
   CAPTAIN_TASKS: 'captain_tasks',
   SAML: 'saml',
@@ -51,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/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/inbox.js

@@ -11,28 +11,9 @@ export const INBOX_TYPES = {
   SMS: 'Channel::Sms',
   INSTAGRAM: 'Channel::Instagram',
   TIKTOK: 'Channel::Tiktok',
+  VOICE: 'Channel::Voice',
 };
 
-// Add providers here as they gain voice capability (e.g., WhatsApp Cloud, Twilio WhatsApp)
-export const VOICE_CALL_PROVIDERS = {
-  TWILIO: 'twilio',
-};
-
-export const getVoiceCallProvider = inbox => {
-  if (!inbox) return null;
-
-  const channelType = inbox.channel_type || inbox.channelType;
-  const voiceEnabled = inbox.voice_enabled || inbox.voiceEnabled;
-
-  if (channelType === INBOX_TYPES.TWILIO && voiceEnabled) {
-    return VOICE_CALL_PROVIDERS.TWILIO;
-  }
-
-  return null;
-};
-
-export const isVoiceCallEnabled = inbox => getVoiceCallProvider(inbox) !== null;
-
 export const TWILIO_CHANNEL_MEDIUM = {
   WHATSAPP: 'whatsapp',
   SMS: 'sms',
@@ -49,6 +30,7 @@ const INBOX_ICON_MAP_FILL = {
   [INBOX_TYPES.LINE]: 'i-ri-line-fill',
   [INBOX_TYPES.INSTAGRAM]: 'i-ri-instagram-fill',
   [INBOX_TYPES.TIKTOK]: 'i-ri-tiktok-fill',
+  [INBOX_TYPES.VOICE]: 'i-ri-phone-fill',
 };
 
 const DEFAULT_ICON_FILL = 'i-ri-chat-1-fill';
@@ -63,6 +45,7 @@ const INBOX_ICON_MAP_LINE = {
   [INBOX_TYPES.TELEGRAM]: 'i-woot-telegram',
   [INBOX_TYPES.LINE]: 'i-woot-line',
   [INBOX_TYPES.INSTAGRAM]: 'i-woot-instagram',
+  [INBOX_TYPES.VOICE]: 'i-woot-voice',
   [INBOX_TYPES.TIKTOK]: 'i-woot-tiktok',
 };
 
@@ -75,6 +58,7 @@ export const getInboxSource = (type, phoneNumber, inbox) => {
 
     case INBOX_TYPES.TWILIO:
     case INBOX_TYPES.WHATSAPP:
+    case INBOX_TYPES.VOICE:
       return phoneNumber || '';
 
     case INBOX_TYPES.EMAIL:
@@ -113,6 +97,9 @@ export const getReadableInboxByType = (type, phoneNumber) => {
     case INBOX_TYPES.LINE:
       return 'line';
 
+    case INBOX_TYPES.VOICE:
+      return 'voice';
+
     default:
       return 'chat';
   }
@@ -155,6 +142,9 @@ export const getInboxClassByType = (type, phoneNumber) => {
     case INBOX_TYPES.TIKTOK:
       return 'brand-tiktok';
 
+    case INBOX_TYPES.VOICE:
+      return 'phone';
+
     default:
       return 'chat';
   }

app/javascript/dashboard/helper/portalHelper.js

@@ -133,55 +133,20 @@ export const ARTICLE_TABS_OPTIONS = [
   },
 ];
 
-export const LOCALE_MENU_ITEMS = {
-  makeDefault: {
+export const LOCALE_MENU_ITEMS = [
+  {
     label: 'HELP_CENTER.LOCALES_PAGE.LOCALE_CARD.DROPDOWN_MENU.MAKE_DEFAULT',
     action: 'change-default',
     value: 'default',
     icon: 'i-lucide-star',
   },
-  moveToDraft: {
-    label: 'HELP_CENTER.LOCALES_PAGE.LOCALE_CARD.DROPDOWN_MENU.MOVE_TO_DRAFT',
-    action: 'move-to-draft',
-    value: 'draft',
-    icon: 'i-lucide-eye-off',
-  },
-  publishLocale: {
-    label: 'HELP_CENTER.LOCALES_PAGE.LOCALE_CARD.DROPDOWN_MENU.PUBLISH_LOCALE',
-    action: 'publish-locale',
-    value: 'publish',
-    icon: 'i-lucide-eye',
-  },
-  delete: {
+  {
     label: 'HELP_CENTER.LOCALES_PAGE.LOCALE_CARD.DROPDOWN_MENU.DELETE',
     action: 'delete',
     value: 'delete',
     icon: 'i-lucide-trash',
   },
-};
-
-const disableLocaleMenuItems = menuItems =>
-  menuItems.map(item => ({ ...item, disabled: true }));
-
-export const buildLocaleMenuItems = ({ isDefault, isDraft }) => {
-  if (isDefault) {
-    return disableLocaleMenuItems([
-      LOCALE_MENU_ITEMS.makeDefault,
-      LOCALE_MENU_ITEMS.moveToDraft,
-      LOCALE_MENU_ITEMS.delete,
-    ]);
-  }
-
-  if (isDraft) {
-    return [LOCALE_MENU_ITEMS.publishLocale, LOCALE_MENU_ITEMS.delete];
-  }
-
-  return [
-    LOCALE_MENU_ITEMS.makeDefault,
-    LOCALE_MENU_ITEMS.moveToDraft,
-    LOCALE_MENU_ITEMS.delete,
-  ];
-};
+];
 
 export const ARTICLE_EDITOR_STATUS_OPTIONS = {
   published: ['archive', 'draft'],

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

@@ -166,8 +166,6 @@ const TOD_TO_MERIDIEM = {
   evening: 'pm',
   night: 'pm',
 };
-const CJK_CHAR_RE =
-  /[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]/u;
 
 // ─── Translation Cache ──────────────────────────────────────────────────────
 
@@ -280,13 +278,8 @@ const escapeRegex = s => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 const substituteLocalTokens = (text, pairs) => {
   let r = text;
   pairs.forEach(([local, en]) => {
-    if (CJK_CHAR_RE.test(local)) {
-      const re = new RegExp(escapeRegex(local), 'g');
-      r = r.replace(re, ` ${en} `);
-    } else {
-      const re = new RegExp(`(?<=^|\\s)${escapeRegex(local)}(?=\\s|$)`, 'g');
-      r = r.replace(re, en);
-    }
+    const re = new RegExp(`(?<=^|\\s)${escapeRegex(local)}(?=\\s|$)`, 'g');
+    r = r.replace(re, en);
   });
   return r;
 };

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

@@ -82,9 +82,6 @@ const ORDINAL_RE = `(\\d{1,2}(?:st|nd|rd|th)?|${ORDINAL_WORDS})`;
 
 const HALF_UNIT_RE = /^(?:in\s+)?half\s+(?:an?\s+)?(hour|day|week|month|year)$/;
 const RELATIVE_DURATION_RE = new RegExp(`^(?:in\\s+)?${NUM_RE}\\s+${UNIT_RE}$`);
-const RELATIVE_DURATION_AFTER_RE = new RegExp(
-  `^(?:in\\s+)?${NUM_RE}\\s+${UNIT_RE}\\s+after$`
-);
 const DURATION_FROM_NOW_RE = new RegExp(
   `^${NUM_RE}\\s+${UNIT_RE}\\s+from\\s+now$`
 );
@@ -92,9 +89,6 @@ const RELATIVE_DAY_ONLY_RE = new RegExp(`^(${RELATIVE_DAYS})$`);
 const RELATIVE_DAY_TOD_RE = new RegExp(
   `^(${RELATIVE_DAYS})\\s+(?:at\\s+)?(${TIME_OF_DAY_NAMES})$`
 );
-const RELATIVE_DAY_MERIDIEM_RE = new RegExp(
-  `^(${RELATIVE_DAYS})\\s+(?:at\\s+)?(am|pm)$`
-);
 const RELATIVE_DAY_TOD_TIME_RE = new RegExp(
   `^(${RELATIVE_DAYS})\\s+(?:at\\s+)?(${TIME_OF_DAY_NAMES})\\s+(\\d{1,2}(?::\\d{2})?)$`
 );
@@ -251,7 +245,6 @@ const matchDuration = (text, now) => {
 
   return (
     parseDuration(text.match(DURATION_FROM_NOW_RE), now) ||
-    parseDuration(text.match(RELATIVE_DURATION_AFTER_RE), now) ||
     parseDuration(text.match(RELATIVE_DURATION_RE), now)
   );
 };
@@ -310,13 +303,6 @@ const matchRelativeDay = (text, now) => {
     );
   }
 
-  const dayMeridiemMatch = text.match(RELATIVE_DAY_MERIDIEM_RE);
-  if (dayMeridiemMatch) {
-    const [, dayKey, meridiem] = dayMeridiemMatch;
-    const hours = meridiem === 'am' ? 9 : 14;
-    return applyTimeWithRollover(RELATIVE_DAY_MAP[dayKey], hours, 0, now);
-  }
-
   const dayAtTimeMatch = text.match(RELATIVE_DAY_AT_TIME_RE);
   if (dayAtTimeMatch) {
     const [, dayKey, timeRaw] = dayAtTimeMatch;

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/portalHelper.spec.js

@@ -1,8 +1,4 @@
-import {
-  buildLocaleMenuItems,
-  buildPortalArticleURL,
-  buildPortalURL,
-} from '../portalHelper';
+import { buildPortalArticleURL, buildPortalURL } from '../portalHelper';
 
 describe('PortalHelper', () => {
   describe('buildPortalURL', () => {
@@ -72,39 +68,4 @@ describe('PortalHelper', () => {
       ).toEqual('https://app.chatwoot.com/hc/handbook/articles/article-slug');
     });
   });
-
-  describe('buildLocaleMenuItems', () => {
-    it('returns disabled actions for the default locale', () => {
-      expect(
-        buildLocaleMenuItems({
-          isDefault: true,
-          isDraft: false,
-        })
-      ).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ action: 'change-default', disabled: true }),
-          expect.objectContaining({ action: 'move-to-draft', disabled: true }),
-          expect.objectContaining({ action: 'delete', disabled: true }),
-        ])
-      );
-    });
-
-    it('returns publish and delete actions for draft locales', () => {
-      expect(
-        buildLocaleMenuItems({
-          isDefault: false,
-          isDraft: true,
-        }).map(({ action }) => action)
-      ).toEqual(['publish-locale', 'delete']);
-    });
-
-    it('returns default, draft, and delete actions for live locales', () => {
-      expect(
-        buildLocaleMenuItems({
-          isDefault: false,
-          isDraft: false,
-        }).map(({ action }) => action)
-      ).toEqual(['change-default', 'move-to-draft', 'delete']);
-    });
-  });
 });

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

@@ -1626,24 +1626,6 @@ describe('generateDateSuggestions — localized input regressions', () => {
     },
   };
 
-  const zhTWSnoozeTranslations = {
-    UNITS: {
-      HOUR: '小時',
-      HOURS: '小時',
-      DAY: '天',
-      DAYS: '天',
-    },
-    HALF: '半',
-    RELATIVE: {
-      TOMORROW: '明天',
-    },
-    MERIDIEM: {
-      AM: '上午',
-      PM: '下午',
-    },
-    AFTER: '後',
-  };
-
   describe('P1: short non-English tokens must NOT produce spurious half-duration suggestions', () => {
     it('Arabic "غد" does not produce half-duration suggestions', () => {
       const results = generateDateSuggestions('غد', now, {
@@ -1739,37 +1721,6 @@ describe('generateDateSuggestions — localized input regressions', () => {
       expect(results[0].date.getHours()).toBe(6);
     });
   });
-
-  describe('zh_TW compact CJK inputs', () => {
-    const options = {
-      translations: zhTWSnoozeTranslations,
-      locale: 'zh-TW',
-    };
-
-    it('parses "2小時後" (2 hours from now) without spaces', () => {
-      const results = generateDateSuggestions('2小時後', now, options);
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].date.getDate()).toBe(16);
-      expect(results[0].date.getHours()).toBe(12);
-      expect(results[0].date.getMinutes()).toBe(0);
-    });
-
-    it('parses "半天" (half day) without spaces', () => {
-      const results = generateDateSuggestions('半天', now, options);
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].date.getDate()).toBe(16);
-      expect(results[0].date.getHours()).toBe(22);
-      expect(results[0].date.getMinutes()).toBe(0);
-    });
-
-    it('parses "明天 上午" (tomorrow AM) into tomorrow 9am', () => {
-      const results = generateDateSuggestions('明天 上午', now, options);
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].date.getDate()).toBe(17);
-      expect(results[0].date.getHours()).toBe(9);
-      expect(results[0].date.getMinutes()).toBe(0);
-    });
-  });
 });
 
 describe('no-space duration suggestions', () => {

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

@@ -4,9 +4,6 @@
     "LOADING_EDITOR": "Loading editor...",
     "DESCRIPTION": "Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try. You can manage your bots from this page or create new ones using the 'Add Bot' button.",
     "LEARN_MORE": "Learn about agent bots",
-    "COUNT": "{n} bot | {n} bots",
-    "SEARCH_PLACEHOLDER": "Search bots...",
-    "NO_RESULTS": "No bots found matching your search",
     "GLOBAL_BOT": "System bot",
     "GLOBAL_BOT_BADGE": "System",
     "AVATAR": {
@@ -37,8 +34,7 @@
       "LOADING": "Fetching bots...",
       "TABLE_HEADER": {
         "DETAILS": "Bot Details",
-        "URL": "Webhook URL",
-        "ACTIONS": "Actions"
+        "URL": "Webhook URL"
       }
     },
     "DELETE": {

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

@@ -9,7 +9,6 @@
       "ADMINISTRATOR": "Administrator",
       "AGENT": "Agent"
     },
-    "COUNT": "{n} agent | {n} agents",
     "LIST": {
       "404": "There are no agents associated to this account",
       "TITLE": "Manage agents in your team",
@@ -97,8 +96,6 @@
         "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       }
     },
-    "SEARCH_PLACEHOLDER": "Search agents...",
-    "NO_RESULTS": "No agents found matching your search",
     "SEARCH": {
       "NO_RESULTS": "No results found."
     },