Merge branch 'develop' into feat/email-forwarding

.env.example

@@ -256,8 +256,6 @@ AZURE_APP_SECRET=
 ## Change these values to fine tune performance
 # control the concurrency setting of sidekiq
 # SIDEKIQ_CONCURRENCY=10
-# Enable verbose logging each time a job is dequeued in Sidekiq
-# ENABLE_SIDEKIQ_DEQUEUE_LOGGER=false
 
 
 # AI powered features

.github/workflows/run_mfa_spec.yml

@@ -70,7 +70,6 @@ jobs:
             spec/services/mfa/authentication_service_spec.rb \
             spec/requests/api/v1/profile/mfa_controller_spec.rb \
             spec/controllers/devise_overrides/sessions_controller_spec.rb \
-            spec/models/application_record_external_credentials_encryption_spec.rb \
             --profile=10 \
             --format documentation
         env:

.rubocop.yml

@@ -23,7 +23,7 @@ Metrics/MethodLength:
     - 'enterprise/lib/captain/agent.rb'
 
 RSpec/ExampleLength:
-  Max: 50
+  Max: 25
 
 Style/Documentation:
   Enabled: false
@@ -336,4 +336,4 @@ FactoryBot/RedundantFactoryOption:
   Enabled: false
 
 FactoryBot/FactoryAssociationWithStrategy:
-  Enabled: false
+  Enabled: false

Gemfile

@@ -21,7 +21,6 @@ gem 'telephone_number'
 gem 'time_diff'
 gem 'tzinfo-data'
 gem 'valid_email2'
-gem 'email-provider-info'
 # compress javascript config.assets.js_compressor
 gem 'uglifier'
 ##-- used for single column multiple binary flags in notification settings/feature flagging --##
@@ -104,7 +103,7 @@ gem 'twitty', '~> 0.1.5'
 # facebook client
 gem 'koala'
 # slack client
-gem 'slack-ruby-client', '~> 2.7.0'
+gem 'slack-ruby-client', '~> 2.5.2'
 # for dialogflow integrations
 gem 'google-cloud-dialogflow-v2', '>= 0.24.0'
 gem 'grpc'

Gemfile.lock

@@ -270,7 +270,6 @@ GEM
       concurrent-ruby (~> 1.0)
       http (>= 3.0)
       ruby2_keywords
-    email-provider-info (0.0.1)
     email_reply_trimmer (0.1.13)
     erubi (1.13.0)
     et-orbi (1.2.11)
@@ -293,7 +292,7 @@ GEM
       logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-mashify (1.0.0)
+    faraday-mashify (0.1.1)
       faraday (~> 2.0)
       hashie
     faraday-multipart (1.0.4)
@@ -595,7 +594,7 @@ GEM
     oj (3.16.10)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    omniauth (2.1.4)
+    omniauth (2.1.3)
       hashie (>= 3.4.6)
       logger
       rack (>= 2.2.3)
@@ -645,7 +644,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.2.3)
+    rack (3.2.0)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-contrib (2.5.0)
@@ -654,7 +653,7 @@ GEM
       rack (>= 2.0.0)
     rack-mini-profiler (3.2.0)
       rack (>= 1.2.0)
-    rack-protection (4.2.1)
+    rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
@@ -877,8 +876,8 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    slack-ruby-client (2.7.0)
-      faraday (>= 2.0.1)
+    slack-ruby-client (2.5.2)
+      faraday (>= 2.0)
       faraday-mashify
       faraday-multipart
       gli
@@ -936,7 +935,7 @@ GEM
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uniform_notifier (1.17.0)
-    uri (1.0.4)
+    uri (1.0.3)
     uri_template (0.7.0)
     valid_email2 (5.2.6)
       activemodel (>= 3.2)
@@ -1017,7 +1016,6 @@ DEPENDENCIES
   dotenv-rails (>= 3.0.0)
   down
   elastic-apm
-  email-provider-info
   email_reply_trimmer
   facebook-messenger
   factory_bot_rails (>= 6.4.3)
@@ -1105,7 +1103,7 @@ DEPENDENCIES
   sidekiq_alive
   simplecov (>= 0.21)
   simplecov_json_formatter
-  slack-ruby-client (~> 2.7.0)
+  slack-ruby-client (~> 2.5.2)
   spring
   spring-watcher-listen
   squasher

app.json

@@ -36,10 +36,6 @@
     "REDIS_OPENSSL_VERIFY_MODE":{
       "description": "OpenSSL verification mode for Redis connections. ref https://help.heroku.com/HC0F8CUS/redis-connection-issues",
       "value": "none"
-    },
-    "NODE_OPTIONS": {
-      "description": "Increase V8 heap for Vite build to avoid OOM",
-      "value": "--max-old-space-size=4096"
     }
   },
   "formation": {

app/builders/email/base_builder.rb

@@ -1,54 +0,0 @@
-class Email::BaseBuilder
-  pattr_initialize [:inbox!]
-
-  private
-
-  def channel
-    @channel ||= inbox.channel
-  end
-
-  def account
-    @account ||= inbox.account
-  end
-
-  def conversation
-    @conversation ||= message.conversation
-  end
-
-  def custom_sender_name
-    message&.sender&.available_name || I18n.t('conversations.reply.email.header.notifications')
-  end
-
-  def sender_name(sender_email)
-    # Friendly: <agent_name> from <business_name>
-    # Professional: <business_name>
-    if inbox.friendly?
-      I18n.t(
-        'conversations.reply.email.header.friendly_name',
-        sender_name: custom_sender_name,
-        business_name: business_name,
-        from_email: sender_email
-      )
-    else
-      I18n.t(
-        'conversations.reply.email.header.professional_name',
-        business_name: business_name,
-        from_email: sender_email
-      )
-    end
-  end
-
-  def business_name
-    inbox.business_name || inbox.sanitized_name
-  end
-
-  def account_support_email
-    # Parse the email to ensure it's in the correct format, the user
-    # 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/email/from_builder.rb

@@ -1,51 +0,0 @@
-class Email::FromBuilder < Email::BaseBuilder
-  pattr_initialize [:inbox!, :message!]
-
-  def build
-    return sender_name(account_support_email) unless inbox.email?
-
-    from_email = case email_channel_type
-                 when :standard_imap_smtp,
-                      :google_oauth,
-                      :microsoft_oauth,
-                      :forwarding_own_smtp
-                   channel.email
-                 when :imap_chatwoot_smtp,
-                      :forwarding_chatwoot_smtp
-                   channel.verified_for_sending ? channel.email : account_support_email
-                 else
-                   account_support_email
-                 end
-
-    sender_name(from_email)
-  end
-
-  private
-
-  def email_channel_type
-    return :google_oauth if channel.google?
-    return :microsoft_oauth if channel.microsoft?
-    return :standard_imap_smtp if imap_and_smtp_enabled?
-    return :imap_chatwoot_smtp if imap_enabled_without_smtp?
-    return :forwarding_own_smtp if forwarding_with_own_smtp?
-    return :forwarding_chatwoot_smtp if forwarding_without_smtp?
-
-    :unknown
-  end
-
-  def imap_and_smtp_enabled?
-    channel.imap_enabled && channel.smtp_enabled
-  end
-
-  def imap_enabled_without_smtp?
-    channel.imap_enabled && !channel.smtp_enabled
-  end
-
-  def forwarding_with_own_smtp?
-    !channel.imap_enabled && channel.smtp_enabled
-  end
-
-  def forwarding_without_smtp?
-    !channel.imap_enabled && !channel.smtp_enabled
-  end
-end

app/builders/email/reply_to_builder.rb

@@ -1,21 +0,0 @@
-class Email::ReplyToBuilder < Email::BaseBuilder
-  pattr_initialize [:inbox!, :message!]
-
-  def build
-    reply_to = if inbox.email?
-                 channel.email
-               elsif inbound_email_enabled?
-                 "reply+#{conversation.uuid}@#{account.inbound_email_domain}"
-               else
-                 account_support_email
-               end
-
-    sender_name(reply_to)
-  end
-
-  private
-
-  def inbound_email_enabled?
-    account.feature_enabled?('inbound_emails') && account.inbound_email_domain.present?
-  end
-end

app/builders/messages/message_builder.rb

@@ -7,29 +7,61 @@ class Messages::MessageBuilder
     @private = params[:private] || false
     @conversation = conversation
     @user = user
-    @account = conversation.account
     @message_type = params[:message_type] || 'outgoing'
     @attachments = params[:attachments]
-    @automation_rule = content_attributes&.dig(:automation_rule_id)
-    return unless params.instance_of?(ActionController::Parameters)
-
-    @in_reply_to = content_attributes&.dig(:in_reply_to)
-    @items = content_attributes&.dig(:items)
+    process_content_attributes
   end
 
   def perform
+    process_forwarded_message if @forwarded_message_id.present?
     @message = @conversation.messages.build(message_params)
     process_attachments
+    process_forwarded_attachments if @forwarded_message_id.present?
     process_emails
-    # When the message has no quoted content, it will just be rendered as a regular message
-    # The frontend is equipped to handle this case
-    process_email_content
     @message.save!
     @message
   end
 
   private
 
+  def process_forwarded_message
+    builder = Messages::ForwardedMessageBuilderService.new(@forwarded_message_id, { to_emails: @params[:to_emails] })
+    @forwarded_attributes = builder.perform
+    @forwarded_message_attachments = builder.forwarded_attachments
+
+    # Update content to include forwarded message
+    original_content = @params[:content_original] || @params[:content]
+    @params[:content] = builder.formatted_content(@params[:content])
+
+    # Update email data
+    return unless @forwarded_attributes[:content_attributes] && @conversation.inbox&.inbox_type == 'Email'
+
+    # Ensure we have valid email data structure to avoid breaking the rendering
+    @forwarded_attributes[:content_attributes][:email] = builder.forwarded_email_data(original_content)
+  end
+
+  # Process attachments from the forwarded message
+  def process_forwarded_attachments
+    return if @forwarded_message_attachments.blank?
+
+    @forwarded_message_attachments.each do |source_attachment|
+      # Create a new attachment for the current message
+      attachment = @message.attachments.build(
+        account_id: @message.account_id,
+        file_type: source_attachment.file_type
+      )
+
+      # Attach the file by directly copying it from the source attachment
+      next unless source_attachment.file.attached?
+
+      attachment.file.attach(
+        io: StringIO.new(source_attachment.file.download),
+        filename: source_attachment.file.filename.to_s,
+        content_type: source_attachment.file.content_type
+      )
+    end
+  end
+
   # Extracts content attributes from the given params.
   # - Converts ActionController::Parameters to a regular hash if needed.
   # - Attempts to parse a JSON string if content is a string.
@@ -62,6 +94,18 @@ class Messages::MessageBuilder
     {}
   end
 
+  def process_content_attributes
+    @automation_rule = content_attributes&.dig(:automation_rule_id)
+    return unless @params.instance_of?(ActionController::Parameters)
+
+    @forwarded_message_id = content_attributes&.dig(:forwarded_message_id)
+    @in_reply_to = content_attributes&.dig(:in_reply_to)
+    @items = content_attributes&.dig(:items)
+
+    # Store original content before any modifications
+    @params[:content_original] = @params[:content].dup if @params[:content].present?
+  end
+
   def process_attachments
     return if @attachments.blank?
 
@@ -96,14 +140,6 @@ class Messages::MessageBuilder
     @message.content_attributes[:to_emails] = to_emails
   end
 
-  def process_email_content
-    return unless should_process_email_content?
-
-    @message.content_attributes ||= {}
-    email_attributes = build_email_attributes
-    @message.content_attributes[:email] = email_attributes
-  end
-
   def process_email_string(email_string)
     return [] if email_string.blank?
 
@@ -163,73 +199,11 @@ class Messages::MessageBuilder
       in_reply_to: @in_reply_to,
       echo_id: @params[:echo_id],
       source_id: @params[:source_id]
-    }.merge(external_created_at).merge(automation_rule_id).merge(campaign_id).merge(template_params)
-  end
-
-  def email_inbox?
-    @conversation.inbox&.inbox_type == 'Email'
-  end
-
-  def should_process_email_content?
-    email_inbox? && !@private && @message.content.present?
-  end
-
-  def build_email_attributes
-    email_attributes = ensure_indifferent_access(@message.content_attributes[:email] || {})
-    normalized_content = normalize_email_body(@message.content)
-
-    # Use custom HTML content if provided, otherwise generate from message content
-    email_attributes[:html_content] = if custom_email_content_provided?
-                                        build_custom_html_content
-                                      else
-                                        build_html_content(normalized_content)
-                                      end
-
-    email_attributes[:text_content] = build_text_content(normalized_content)
-    email_attributes
-  end
-
-  def build_html_content(normalized_content)
-    html_content = ensure_indifferent_access(@message.content_attributes.dig(:email, :html_content) || {})
-    rendered_html = render_email_html(normalized_content)
-    html_content[:full] = rendered_html
-    html_content[:reply] = rendered_html
-    html_content
-  end
-
-  def build_text_content(normalized_content)
-    text_content = ensure_indifferent_access(@message.content_attributes.dig(:email, :text_content) || {})
-    text_content[:full] = normalized_content
-    text_content[:reply] = normalized_content
-    text_content
-  end
-
-  def ensure_indifferent_access(hash)
-    return {} if hash.blank?
-
-    hash.respond_to?(:with_indifferent_access) ? hash.with_indifferent_access : hash
-  end
-
-  def normalize_email_body(content)
-    content.to_s.gsub("\r\n", "\n")
-  end
-
-  def render_email_html(content)
-    return '' if content.blank?
-
-    ChatwootMarkdownRenderer.new(content).render_message.to_s
-  end
-
-  def custom_email_content_provided?
-    @params[:email_html_content].present?
-  end
-
-  def build_custom_html_content
-    html_content = ensure_indifferent_access(@message.content_attributes.dig(:email, :html_content) || {})
-
-    html_content[:full] = @params[:email_html_content]
-    html_content[:reply] = @params[:email_html_content]
-
-    html_content
+    }
+      .merge(external_created_at)
+      .merge(automation_rule_id)
+      .merge(campaign_id)
+      .merge(template_params)
+      .merge(@forwarded_attributes || {})
   end
 end

app/builders/v2/reports/base_summary_builder.rb

@@ -10,28 +10,10 @@ class V2::Reports::BaseSummaryBuilder
 
   def load_data
     @conversations_count = fetch_conversations_count
-    load_reporting_events_data
-  end
-
-  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)
+    @resolved_count = fetch_resolved_count
+    @avg_resolution_time = fetch_average_time('conversation_resolved')
+    @avg_first_response_time = fetch_average_time('first_response')
+    @avg_reply_time = fetch_average_time('reply_time')
   end
 
   def reporting_events
@@ -42,6 +24,14 @@ class V2::Reports::BaseSummaryBuilder
     # Override this method
   end
 
+  def fetch_average_time(event_name)
+    get_grouped_average(reporting_events.where(name: event_name))
+  end
+
+  def fetch_resolved_count
+    reporting_events.where(name: 'conversation_resolved').group(group_by_key).count
+  end
+
   def group_by_key
     # Override this method
   end
@@ -50,6 +40,10 @@ class V2::Reports::BaseSummaryBuilder
     # Override this method
   end
 
+  def get_grouped_average(events)
+    events.group(group_by_key).average(average_value_key)
+  end
+
   def average_value_key
     ActiveModel::Type::Boolean.new.cast(params[:business_hours]).present? ? :value_in_business_hours : :value
   end

app/builders/v2/reports/inbox_summary_builder.rb

@@ -13,7 +13,10 @@ class V2::Reports::InboxSummaryBuilder < V2::Reports::BaseSummaryBuilder
 
   def load_data
     @conversations_count = fetch_conversations_count
-    load_reporting_events_data
+    @resolved_count = fetch_resolved_count
+    @avg_resolution_time = fetch_average_time('conversation_resolved')
+    @avg_first_response_time = fetch_average_time('first_response')
+    @avg_reply_time = fetch_average_time('reply_time')
   end
 
   def fetch_conversations_count

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

@@ -1,12 +1,13 @@
 class Api::V1::Accounts::BulkActionsController < Api::V1::Accounts::BaseController
+  before_action :type_matches?
+
   def create
-    case normalized_type
-    when 'Conversation'
-      enqueue_conversation_job
-      head :ok
-    when 'Contact'
-      check_authorization_for_contact_action
-      enqueue_contact_job
+    if type_matches?
+      ::BulkActionsJob.perform_later(
+        account: @current_account,
+        user: current_user,
+        params: permitted_params
+      )
       head :ok
     else
       render json: { success: false }, status: :unprocessable_entity
@@ -15,54 +16,11 @@ class Api::V1::Accounts::BulkActionsController < Api::V1::Accounts::BaseControll
 
   private
 
-  def normalized_type
-    params[:type].to_s.camelize
+  def type_matches?
+    ['Conversation'].include?(params[:type])
   end
 
-  def enqueue_conversation_job
-    ::BulkActionsJob.perform_later(
-      account: @current_account,
-      user: current_user,
-      params: conversation_params
-    )
-  end
-
-  def enqueue_contact_job
-    Contacts::BulkActionJob.perform_later(
-      @current_account.id,
-      current_user.id,
-      contact_params
-    )
-  end
-
-  def delete_contact_action?
-    params[:action_name] == 'delete'
-  end
-
-  def check_authorization_for_contact_action
-    authorize(Contact, :destroy?) if delete_contact_action?
-  end
-
-  def conversation_params
-    # TODO: Align conversation payloads with the `{ action_name, action_attributes }`
-    # and then remove this method in favor of a common params method.
-    base = params.permit(
-      :snoozed_until,
-      fields: [:status, :assignee_id, :team_id]
-    )
-    append_common_bulk_attributes(base)
-  end
-
-  def contact_params
-    # TODO: remove this method in favor of a common params method.
-    # once legacy conversation payloads are migrated.
-    append_common_bulk_attributes({})
-  end
-
-  def append_common_bulk_attributes(base_params)
-    # NOTE: Conversation payloads historically diverged per action. Going forward we
-    # want all objects to share a common contract: `{ action_name, action_attributes }`
-    common = params.permit(:type, :action_name, ids: [], labels: [add: [], remove: []])
-    base_params.merge(common)
+  def permitted_params
+    params.permit(:type, :snoozed_until, ids: [], fields: [:status, :assignee_id, :team_id], labels: [add: [], remove: []])
   end
 end

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

@@ -17,8 +17,8 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   before_action :set_include_contact_inboxes, only: [:index, :active, :search, :filter, :show, :update]
 
   def index
+    @contacts_count = resolved_contacts.count
     @contacts = fetch_contacts(resolved_contacts)
-    @contacts_count = @contacts.total_count
   end
 
   def search
@@ -29,8 +29,8 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
         OR contacts.additional_attributes->>\'company_name\' ILIKE :search',
       search: "%#{params[:q].strip}%"
     )
+    @contacts_count = contacts.count
     @contacts = fetch_contacts(contacts)
-    @contacts_count = @contacts.total_count
   end
 
   def import
@@ -55,8 +55,8 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   def active
     contacts = Current.account.contacts.where(id: ::OnlineStatusTracker
                   .get_available_contact_ids(Current.account.id))
+    @contacts_count = contacts.count
     @contacts = fetch_contacts(contacts)
-    @contacts_count = @contacts.total_count
   end
 
   def show; end
@@ -133,14 +133,13 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   end
 
   def fetch_contacts(contacts)
-    # Build includes hash to avoid separate query when contact_inboxes are needed
-    includes_hash = { avatar_attachment: [:blob] }
-    includes_hash[:contact_inboxes] = { inbox: :channel } if @include_contact_inboxes
+    contacts_with_avatar = filtrate(contacts)
+                           .includes([{ avatar_attachment: [:blob] }])
+                           .page(@current_page).per(RESULTS_PER_PAGE)
 
-    filtrate(contacts)
-      .includes(includes_hash)
-      .page(@current_page)
-      .per(RESULTS_PER_PAGE)
+    return contacts_with_avatar.includes([{ contact_inboxes: [:inbox] }]) if @include_contact_inboxes
+
+    contacts_with_avatar
   end
 
   def build_contact_inbox

app/controllers/api/v1/accounts/conversations/base_controller.rb

@@ -5,6 +5,6 @@ class Api::V1::Accounts::Conversations::BaseController < Api::V1::Accounts::Base
 
   def conversation
     @conversation ||= Current.account.conversations.find_by!(display_id: params[:conversation_id])
-    authorize @conversation, :show?
+    authorize @conversation.inbox, :show?
   end
 end

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

@@ -160,7 +160,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
 
   def conversation
     @conversation ||= Current.account.conversations.find_by!(display_id: params[:id])
-    authorize @conversation, :show?
+    authorize @conversation.inbox, :show?
   end
 
   def inbox

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

@@ -4,8 +4,7 @@ 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, :health]
-  before_action :validate_whatsapp_cloud_channel, only: [:health]
+  before_action :check_authorization, except: [:show]
 
   def index
     @inboxes = policy_scope(Current.account.inboxes.order_by_name.includes(:channel, { avatar_attachment: [:blob] }))
@@ -79,14 +78,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     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
@@ -98,12 +89,6 @@ 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])
 

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

@@ -22,7 +22,7 @@ class Api::V1::Accounts::Integrations::DyteController < Api::V1::Accounts::BaseC
   private
 
   def authorize_request
-    authorize @conversation, :show?
+    authorize @conversation.inbox, :show?
   end
 
   def render_response(response)

app/controllers/concerns/access_token_auth_helper.rb

@@ -14,7 +14,6 @@ module AccessTokenAuthHelper
     ensure_access_token
     render_unauthorized('Invalid Access Token') && return if @access_token.blank?
 
-    # NOTE: This ensures that current_user is set and available for the rest of the controller actions
     @resource = @access_token.owner
     Current.user = @resource if allowed_current_user_type?(@resource)
   end

app/controllers/devise_overrides/omniauth_callbacks_controller.rb

@@ -19,19 +19,6 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
     redirect_to login_page_url(email: encoded_email, sso_auth_token: @resource.generate_sso_auth_token)
   end
 
-  def sign_in_user_on_mobile
-    @resource.skip_confirmation! if confirmable_enabled?
-
-    # once the resource is found and verified
-    # we can just send them to the login page again with the SSO params
-    # that will log them in
-    encoded_email = ERB::Util.url_encode(@resource.email)
-    params = { email: encoded_email, sso_auth_token: @resource.generate_sso_auth_token }.to_query
-
-    mobile_deep_link_base = GlobalConfigService.load('MOBILE_DEEP_LINK_BASE', 'chatwootapp')
-    redirect_to "#{mobile_deep_link_base}://auth/saml?#{params}", allow_other_host: true
-  end
-
   def sign_up_user
     return redirect_to login_page_url(error: 'no-account-found') unless account_signup_allowed?
     return redirect_to login_page_url(error: 'business-account-only') unless validate_signup_email_is_business_domain?

app/controllers/devise_overrides/sessions_controller.rb

@@ -12,11 +12,9 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
     return handle_mfa_verification if mfa_verification_request?
     return handle_sso_authentication if sso_authentication_request?
 
-    user = find_user_for_authentication
-    return handle_mfa_required(user) if user&.mfa_enabled?
-
-    # Only proceed with standard authentication if no MFA is required
-    super
+    super do |resource|
+      return handle_mfa_required(resource) if resource&.mfa_enabled?
+    end
   end
 
   def render_create_success
@@ -25,17 +23,6 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
 
   private
 
-  def find_user_for_authentication
-    return nil unless params[:email].present? && params[:password].present?
-
-    normalized_email = params[:email].strip.downcase
-    user = User.from_email(normalized_email)
-    return nil unless user&.valid_password?(params[:password])
-    return nil unless user.active_for_authentication?
-
-    user
-  end
-
   def mfa_verification_request?
     params[:mfa_token].present?
   end
@@ -72,10 +59,10 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
     @resource = user if user&.valid_sso_auth_token?(params[:sso_auth_token])
   end
 
-  def handle_mfa_required(user)
+  def handle_mfa_required(resource)
     render json: {
       mfa_required: true,
-      mfa_token: Mfa::TokenService.new(user: user).generate_token
+      mfa_token: Mfa::TokenService.new(user: resource).generate_token
     }, status: :partial_content
   end
 

app/controllers/public/api/v1/inboxes/conversations_controller.rb

@@ -3,7 +3,7 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
   before_action :set_conversation, only: [:toggle_typing, :update_last_seen, :show, :toggle_status]
 
   def index
-    @conversations = @contact_inbox.hmac_verified? ? @contact_inbox.contact.conversations : @contact_inbox.conversations
+    @conversations = @contact_inbox.hmac_verified? ? @contact.conversations : @contact_inbox.conversations
   end
 
   def show; end

app/controllers/super_admin/users_controller.rb

@@ -13,11 +13,11 @@ class SuperAdmin::UsersController < SuperAdmin::ApplicationController
       redirect_to new_super_admin_user_path, notice: notice
     end
   end
-
-  def update
-    requested_resource.skip_reconfirmation! if resource_params[:confirmed_at].present?
-    super
-  end
+  #
+  # def update
+  #   super
+  #   send_foo_updated_email(requested_resource)
+  # end
 
   # Override this method to specify custom lookup behavior.
   # This will be used to set the resource for the `show`, `edit`, and `update`

app/dashboards/user_dashboard.rb

@@ -59,11 +59,11 @@ class UserDashboard < Administrate::BaseDashboard
   SHOW_PAGE_ATTRIBUTES = %i[
     id
     avatar_url
+    unconfirmed_email
     name
     type
     display_name
     email
-    unconfirmed_email
     created_at
     updated_at
     confirmed_at

app/finders/email_channel_finder.rb

@@ -6,54 +6,19 @@ class EmailChannelFinder
   end
 
   def perform
-    channel_from_primary_recipients || channel_from_bcc_recipients
-  end
+    channel = nil
 
-  private
+    recipient_mails.each do |email|
+      normalized_email = normalize_email_with_plus_addressing(email)
+      channel = Channel::Email.find_by('lower(email) = ? OR lower(forward_to_email) = ?', normalized_email, normalized_email)
 
-  def channel_from_primary_recipients
-    primary_recipient_emails.each do |email|
-      channel = channel_from_email(email)
-      return channel if channel.present?
+      break if channel.present?
     end
-
-    nil
+    channel
   end
 
-  def channel_from_bcc_recipients
-    bcc_recipient_emails.each do |email|
-      channel = channel_from_email(email)
-
-      # Skip if BCC processing is disabled for this account
-      next if channel && !allow_bcc_processing?(channel.account_id)
-
-      return channel if channel.present?
-    end
-
-    nil
-  end
-
-  def primary_recipient_emails
-    (@email_object.to.to_a + @email_object.cc.to_a + [@email_object['X-Original-To'].try(:value)]).flatten.compact
-  end
-
-  def bcc_recipient_emails
-    @email_object.bcc.to_a.flatten.compact
-  end
-
-  def channel_from_email(email)
-    normalized_email = normalize_email_with_plus_addressing(email)
-    Channel::Email.find_by('lower(email) = ? OR lower(forward_to_email) = ?', normalized_email, normalized_email)
-  end
-
-  def bcc_processing_skipped_accounts
-    config_value = GlobalConfigService.load('SKIP_INCOMING_BCC_PROCESSING', '')
-    return [] if config_value.blank?
-
-    config_value.split(',').map(&:to_i)
-  end
-
-  def allow_bcc_processing?(account_id)
-    bcc_processing_skipped_accounts.exclude?(account_id)
+  def recipient_mails
+    recipient_addresses = @email_object.to.to_a + @email_object.cc.to_a + @email_object.bcc.to_a + [@email_object['X-Original-To'].try(:value)]
+    recipient_addresses.flatten.compact
   end
 end

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

@@ -1,36 +0,0 @@
-/* global axios */
-import ApiClient from '../ApiClient';
-
-class CaptainCustomTools extends ApiClient {
-  constructor() {
-    super('captain/custom_tools', { accountScoped: true });
-  }
-
-  get({ page = 1, searchKey } = {}) {
-    return axios.get(this.url, {
-      params: { page, searchKey },
-    });
-  }
-
-  show(id) {
-    return axios.get(`${this.url}/${id}`);
-  }
-
-  create(data = {}) {
-    return axios.post(this.url, {
-      custom_tool: data,
-    });
-  }
-
-  update(id, data = {}) {
-    return axios.put(`${this.url}/${id}`, {
-      custom_tool: data,
-    });
-  }
-
-  delete(id) {
-    return axios.delete(`${this.url}/${id}`);
-  }
-}
-
-export default new CaptainCustomTools();

app/javascript/dashboard/api/changelog.js

@@ -1,16 +0,0 @@
-import axios from 'axios';
-import ApiClient from './ApiClient';
-import { CHANGELOG_API_URL } from 'shared/constants/links';
-
-class ChangelogApi extends ApiClient {
-  constructor() {
-    super('changelog', { apiVersion: 'v1' });
-  }
-
-  // eslint-disable-next-line class-methods-use-this
-  fetchFromHub() {
-    return axios.get(CHANGELOG_API_URL);
-  }
-}
-
-export default new ChangelogApi();

app/javascript/dashboard/api/inboxHealth.js

@@ -1,14 +0,0 @@
-/* global axios */
-import ApiClient from './ApiClient';
-
-class InboxHealthAPI extends ApiClient {
-  constructor() {
-    super('inboxes', { accountScoped: true });
-  }
-
-  getHealthStatus(inboxId) {
-    return axios.get(`${this.url}/${inboxId}/health`);
-  }
-}
-
-export default new InboxHealthAPI();

app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactDeleteSection.vue

@@ -5,7 +5,6 @@ import { useToggle } from '@vueuse/core';
 
 import Button from 'dashboard/components-next/button/Button.vue';
 import ConfirmContactDeleteDialog from 'dashboard/components-next/Contacts/ContactsForm/ConfirmContactDeleteDialog.vue';
-import Policy from 'dashboard/components/policy.vue';
 
 defineProps({
   selectedContact: {
@@ -25,44 +24,42 @@ const openConfirmDeleteContactDialog = () => {
 </script>
 
 <template>
-  <Policy :permissions="['administrator']">
-    <div class="flex flex-col items-start border-t border-n-strong px-6 py-5">
-      <Button
-        :label="t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT')"
-        sm
-        link
-        slate
-        class="hover:!no-underline text-n-slate-12"
-        icon="i-lucide-chevron-down"
-        trailing-icon
-        @click="toggleDeleteSection()"
-      />
+  <div class="flex flex-col items-start border-t border-n-strong px-6 py-5">
+    <Button
+      :label="t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT')"
+      sm
+      link
+      slate
+      class="hover:!no-underline text-n-slate-12"
+      icon="i-lucide-chevron-down"
+      trailing-icon
+      @click="toggleDeleteSection()"
+    />
 
-      <div
-        class="transition-all duration-300 ease-in-out grid w-full overflow-hidden"
-        :class="
-          showDeleteSection
-            ? 'grid-rows-[1fr] opacity-100 mt-2'
-            : 'grid-rows-[0fr] opacity-0 mt-0'
-        "
-      >
-        <div class="overflow-hidden min-h-0">
-          <span class="inline-flex text-n-slate-11 text-sm items-center gap-1">
-            {{ t('CONTACTS_LAYOUT.CARD.DELETE_CONTACT.MESSAGE') }}
-            <Button
-              :label="t('CONTACTS_LAYOUT.CARD.DELETE_CONTACT.BUTTON')"
-              sm
-              ruby
-              link
-              @click="openConfirmDeleteContactDialog()"
-            />
-          </span>
-        </div>
+    <div
+      class="transition-all duration-300 ease-in-out grid w-full overflow-hidden"
+      :class="
+        showDeleteSection
+          ? 'grid-rows-[1fr] opacity-100 mt-2'
+          : 'grid-rows-[0fr] opacity-0 mt-0'
+      "
+    >
+      <div class="overflow-hidden min-h-0">
+        <span class="inline-flex text-n-slate-11 text-sm items-center gap-1">
+          {{ t('CONTACTS_LAYOUT.CARD.DELETE_CONTACT.MESSAGE') }}
+          <Button
+            :label="t('CONTACTS_LAYOUT.CARD.DELETE_CONTACT.BUTTON')"
+            sm
+            ruby
+            link
+            @click="openConfirmDeleteContactDialog()"
+          />
+        </span>
       </div>
     </div>
-    <ConfirmContactDeleteDialog
-      ref="confirmDeleteContactDialogRef"
-      :selected-contact="selectedContact"
-    />
-  </Policy>
+  </div>
+  <ConfirmContactDeleteDialog
+    ref="confirmDeleteContactDialogRef"
+    :selected-contact="selectedContact"
+  />
 </template>

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

@@ -8,7 +8,6 @@ import Button from 'dashboard/components-next/button/Button.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
 import Flag from 'dashboard/components-next/flag/Flag.vue';
 import ContactDeleteSection from 'dashboard/components-next/Contacts/ContactsCard/ContactDeleteSection.vue';
-import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
 import countries from 'shared/constants/countries';
 
 const props = defineProps({
@@ -21,17 +20,9 @@ const props = defineProps({
   availabilityStatus: { type: String, default: null },
   isExpanded: { type: Boolean, default: false },
   isUpdating: { type: Boolean, default: false },
-  selectable: { type: Boolean, default: false },
-  isSelected: { type: Boolean, default: false },
 });
 
-const emit = defineEmits([
-  'toggle',
-  'updateContact',
-  'showContact',
-  'select',
-  'avatarHover',
-]);
+const emit = defineEmits(['toggle', 'updateContact', 'showContact']);
 
 const { t } = useI18n();
 
@@ -97,148 +88,111 @@ const onClickExpand = () => {
 };
 
 const onClickViewDetails = () => emit('showContact', props.id);
-
-const toggleSelect = checked => {
-  emit('select', checked);
-};
-
-const handleAvatarHover = isHovered => {
-  emit('avatarHover', isHovered);
-};
 </script>
 
 <template>
-  <div class="relative">
-    <CardLayout
-      :key="id"
-      layout="row"
-      :class="{
-        'outline-n-weak !bg-n-slate-3 dark:!bg-n-solid-3': isSelected,
-      }"
-    >
-      <div class="flex items-center justify-start flex-1 gap-4">
-        <div
-          class="relative"
-          @mouseenter="handleAvatarHover(true)"
-          @mouseleave="handleAvatarHover(false)"
-        >
-          <Avatar
-            :name="name"
-            :src="thumbnail"
-            :size="48"
-            :status="availabilityStatus"
-            hide-offline-status
-            rounded-full
-          >
-            <template v-if="selectable" #overlay="{ size }">
-              <label
-                class="flex items-center justify-center rounded-full cursor-pointer absolute inset-0 z-10 backdrop-blur-[2px] border border-n-weak"
-                :style="{ width: `${size}px`, height: `${size}px` }"
-                @click.stop
-              >
-                <Checkbox
-                  :model-value="isSelected"
-                  @change="event => toggleSelect(event.target.checked)"
-                />
-              </label>
-            </template>
-          </Avatar>
-        </div>
-        <div class="flex flex-col gap-0.5 flex-1">
-          <div class="flex flex-wrap items-center gap-x-4 gap-y-1">
-            <span class="text-base font-medium truncate text-n-slate-12">
-              {{ name }}
-            </span>
-            <span class="inline-flex items-center gap-1">
-              <span
-                v-if="additionalAttributes?.companyName"
-                class="i-ph-building-light size-4 text-n-slate-10 mb-0.5"
-              />
-              <span
-                v-if="additionalAttributes?.companyName"
-                class="text-sm truncate text-n-slate-11"
-              >
-                {{ additionalAttributes.companyName }}
-              </span>
-            </span>
-          </div>
-          <div
-            class="flex flex-wrap items-center justify-start gap-x-3 gap-y-1"
-          >
-            <div v-if="email" class="truncate max-w-72" :title="email">
-              <span class="text-sm text-n-slate-11">
-                {{ email }}
-              </span>
-            </div>
-            <div v-if="email" class="w-px h-3 truncate bg-n-slate-6" />
-            <span v-if="phoneNumber" class="text-sm truncate text-n-slate-11">
-              {{ phoneNumber }}
-            </span>
-            <div v-if="phoneNumber" class="w-px h-3 truncate bg-n-slate-6" />
+  <CardLayout :key="id" layout="row">
+    <div class="flex items-center justify-start flex-1 gap-4">
+      <Avatar
+        :name="name"
+        :src="thumbnail"
+        :size="48"
+        :status="availabilityStatus"
+        hide-offline-status
+        rounded-full
+      />
+      <div class="flex flex-col gap-0.5 flex-1">
+        <div class="flex flex-wrap items-center gap-x-4 gap-y-1">
+          <span class="text-base font-medium truncate text-n-slate-12">
+            {{ name }}
+          </span>
+          <span class="inline-flex items-center gap-1">
             <span
-              v-if="countryDetails"
-              class="inline-flex items-center gap-2 text-sm truncate text-n-slate-11"
-            >
-              <Flag :country="countryDetails.countryCode" class="size-3.5" />
-              {{ formattedLocation }}
-            </span>
-            <div v-if="countryDetails" class="w-px h-3 truncate bg-n-slate-6" />
-            <Button
-              :label="t('CONTACTS_LAYOUT.CARD.VIEW_DETAILS')"
-              variant="link"
-              size="xs"
-              @click="onClickViewDetails"
+              v-if="additionalAttributes?.companyName"
+              class="i-ph-building-light size-4 text-n-slate-10 mb-0.5"
             />
+            <span
+              v-if="additionalAttributes?.companyName"
+              class="text-sm truncate text-n-slate-11"
+            >
+              {{ additionalAttributes.companyName }}
+            </span>
+          </span>
+        </div>
+        <div class="flex flex-wrap items-center justify-start gap-x-3 gap-y-1">
+          <div v-if="email" class="truncate max-w-72" :title="email">
+            <span class="text-sm text-n-slate-11">
+              {{ email }}
+            </span>
           </div>
+          <div v-if="email" class="w-px h-3 truncate bg-n-slate-6" />
+          <span v-if="phoneNumber" class="text-sm truncate text-n-slate-11">
+            {{ phoneNumber }}
+          </span>
+          <div v-if="phoneNumber" class="w-px h-3 truncate bg-n-slate-6" />
+          <span
+            v-if="countryDetails"
+            class="inline-flex items-center gap-2 text-sm truncate text-n-slate-11"
+          >
+            <Flag :country="countryDetails.countryCode" class="size-3.5" />
+            {{ formattedLocation }}
+          </span>
+          <div v-if="countryDetails" class="w-px h-3 truncate bg-n-slate-6" />
+          <Button
+            :label="t('CONTACTS_LAYOUT.CARD.VIEW_DETAILS')"
+            variant="link"
+            size="xs"
+            @click="onClickViewDetails"
+          />
         </div>
       </div>
+    </div>
 
-      <Button
-        icon="i-lucide-chevron-down"
-        variant="ghost"
-        color="slate"
-        size="xs"
-        :class="{ 'rotate-180': isExpanded }"
-        @click="onClickExpand"
-      />
+    <Button
+      icon="i-lucide-chevron-down"
+      variant="ghost"
+      color="slate"
+      size="xs"
+      :class="{ 'rotate-180': isExpanded }"
+      @click="onClickExpand"
+    />
 
-      <template #after>
-        <div
-          class="transition-all duration-500 ease-in-out grid overflow-hidden"
-          :class="
-            isExpanded
-              ? 'grid-rows-[1fr] opacity-100'
-              : 'grid-rows-[0fr] opacity-0'
-          "
-        >
-          <div class="overflow-hidden">
-            <div class="flex flex-col gap-6 p-6 border-t border-n-strong">
-              <ContactsForm
-                ref="contactsFormRef"
-                :contact-data="contactData"
-                @update="handleFormUpdate"
-              />
-              <div>
-                <Button
-                  :label="
-                    t('CONTACTS_LAYOUT.CARD.EDIT_DETAILS_FORM.UPDATE_BUTTON')
-                  "
-                  size="sm"
-                  :is-loading="isUpdating"
-                  :disabled="isUpdating || isFormInvalid"
-                  @click="handleUpdateContact"
-                />
-              </div>
-            </div>
-            <ContactDeleteSection
-              :selected-contact="{
-                id: props.id,
-                name: props.name,
-              }"
+    <template #after>
+      <div
+        class="transition-all duration-500 ease-in-out grid overflow-hidden"
+        :class="
+          isExpanded
+            ? 'grid-rows-[1fr] opacity-100'
+            : 'grid-rows-[0fr] opacity-0'
+        "
+      >
+        <div class="overflow-hidden">
+          <div class="flex flex-col gap-6 p-6 border-t border-n-strong">
+            <ContactsForm
+              ref="contactsFormRef"
+              :contact-data="contactData"
+              @update="handleFormUpdate"
             />
+            <div>
+              <Button
+                :label="
+                  t('CONTACTS_LAYOUT.CARD.EDIT_DETAILS_FORM.UPDATE_BUTTON')
+                "
+                size="sm"
+                :is-loading="isUpdating"
+                :disabled="isUpdating || isFormInvalid"
+                @click="handleUpdateContact"
+              />
+            </div>
           </div>
+          <ContactDeleteSection
+            :selected-contact="{
+              id: props.id,
+              name: props.name,
+            }"
+          />
         </div>
-      </template>
-    </CardLayout>
-  </div>
+      </div>
+    </template>
+  </CardLayout>
 </template>

app/javascript/dashboard/components-next/Contacts/Pages/ContactDetails.vue

@@ -10,7 +10,6 @@ import Button from 'dashboard/components-next/button/Button.vue';
 import ContactLabels from 'dashboard/components-next/Contacts/ContactLabels/ContactLabels.vue';
 import ContactsForm from 'dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue';
 import ConfirmContactDeleteDialog from 'dashboard/components-next/Contacts/ContactsForm/ConfirmContactDeleteDialog.vue';
-import Policy from 'dashboard/components/policy.vue';
 
 const props = defineProps({
   selectedContact: {
@@ -175,29 +174,27 @@ const handleAvatarDelete = async () => {
         @click="updateContact"
       />
     </div>
-    <Policy :permissions="['administrator']">
-      <div
-        class="flex flex-col items-start w-full gap-4 pt-6 border-t border-n-strong"
-      >
-        <div class="flex flex-col gap-2">
-          <h6 class="text-base font-medium text-n-slate-12">
-            {{ t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT') }}
-          </h6>
-          <span class="text-sm text-n-slate-11">
-            {{ t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT_DESCRIPTION') }}
-          </span>
-        </div>
-        <Button
-          :label="t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT')"
-          color="ruby"
-          @click="openConfirmDeleteContactDialog"
-        />
+    <div
+      class="flex flex-col items-start w-full gap-4 pt-6 border-t border-n-strong"
+    >
+      <div class="flex flex-col gap-2">
+        <h6 class="text-base font-medium text-n-slate-12">
+          {{ t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT') }}
+        </h6>
+        <span class="text-sm text-n-slate-11">
+          {{ t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT_DESCRIPTION') }}
+        </span>
       </div>
-      <ConfirmContactDeleteDialog
-        ref="confirmDeleteContactDialogRef"
-        :selected-contact="selectedContact"
-        @go-to-contacts-list="emit('goToContactsList')"
+      <Button
+        :label="t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT')"
+        color="ruby"
+        @click="openConfirmDeleteContactDialog"
       />
-    </Policy>
+    </div>
+    <ConfirmContactDeleteDialog
+      ref="confirmDeleteContactDialogRef"
+      :selected-contact="selectedContact"
+      @go-to-contacts-list="emit('goToContactsList')"
+    />
   </div>
 </template>

app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue

@@ -10,15 +10,7 @@ import {
 } from 'shared/helpers/CustomErrors';
 import ContactsCard from 'dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue';
 
-const props = defineProps({
-  contacts: { type: Array, required: true },
-  selectedContactIds: {
-    type: Array,
-    default: () => [],
-  },
-});
-
-const emit = defineEmits(['toggleContact']);
+defineProps({ contacts: { type: Array, required: true } });
 
 const { t } = useI18n();
 const store = useStore();
@@ -28,9 +20,6 @@ const route = useRoute();
 const uiFlags = useMapGetter('contacts/getUIFlags');
 const isUpdating = computed(() => uiFlags.value.isUpdating);
 const expandedCardId = ref(null);
-const hoveredAvatarId = ref(null);
-
-const selectedIdsSet = computed(() => new Set(props.selectedContactIds || []));
 
 const updateContact = async updatedData => {
   try {
@@ -69,43 +58,25 @@ const onClickViewDetails = async id => {
 const toggleExpanded = id => {
   expandedCardId.value = expandedCardId.value === id ? null : id;
 };
-
-const isSelected = id => selectedIdsSet.value.has(id);
-
-const shouldShowSelection = id => {
-  return hoveredAvatarId.value === id || isSelected(id);
-};
-
-const handleSelect = (id, value) => {
-  emit('toggleContact', { id, value });
-};
-
-const handleAvatarHover = (id, isHovered) => {
-  hoveredAvatarId.value = isHovered ? id : null;
-};
 </script>
 
 <template>
-  <div class="flex flex-col gap-4">
-    <div v-for="contact in contacts" :key="contact.id" class="relative">
-      <ContactsCard
-        :id="contact.id"
-        :name="contact.name"
-        :email="contact.email"
-        :thumbnail="contact.thumbnail"
-        :phone-number="contact.phoneNumber"
-        :additional-attributes="contact.additionalAttributes"
-        :availability-status="contact.availabilityStatus"
-        :is-expanded="expandedCardId === contact.id"
-        :is-updating="isUpdating"
-        :selectable="shouldShowSelection(contact.id)"
-        :is-selected="isSelected(contact.id)"
-        @toggle="toggleExpanded(contact.id)"
-        @update-contact="updateContact"
-        @show-contact="onClickViewDetails"
-        @select="value => handleSelect(contact.id, value)"
-        @avatar-hover="value => handleAvatarHover(contact.id, value)"
-      />
-    </div>
+  <div class="flex flex-col gap-4 px-6 pt-4 pb-6">
+    <ContactsCard
+      v-for="contact in contacts"
+      :id="contact.id"
+      :key="contact.id"
+      :name="contact.name"
+      :email="contact.email"
+      :thumbnail="contact.thumbnail"
+      :phone-number="contact.phoneNumber"
+      :additional-attributes="contact.additionalAttributes"
+      :availability-status="contact.availabilityStatus"
+      :is-expanded="expandedCardId === contact.id"
+      :is-updating="isUpdating"
+      @toggle="toggleExpanded(contact.id)"
+      @update-contact="updateContact"
+      @show-contact="onClickViewDetails"
+    />
   </div>
 </template>

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

@@ -14,10 +14,6 @@ defineProps({
     type: Array,
     default: () => [],
   },
-  showBackdrop: {
-    type: Boolean,
-    default: true,
-  },
 });
 </script>
 
@@ -29,24 +25,14 @@ defineProps({
       class="relative w-full max-w-[60rem] mx-auto overflow-hidden h-full max-h-[28rem]"
     >
       <div
-        v-if="showBackdrop"
         class="w-full h-full space-y-4 overflow-y-hidden opacity-50 pointer-events-none"
       >
         <slot name="empty-state-item" />
       </div>
       <div
-        class="flex flex-col items-center justify-end w-full h-full pb-20"
-        :class="{
-          'absolute inset-x-0 bottom-0 bg-gradient-to-t from-n-background from-25% dark:from-n-background to-transparent':
-            showBackdrop,
-        }"
+        class="absolute inset-x-0 bottom-0 flex flex-col items-center justify-end w-full h-full pb-20 bg-gradient-to-t from-n-background from-25% dark:from-n-background to-transparent"
       >
-        <div
-          class="flex flex-col items-center justify-center gap-6"
-          :class="{
-            'mt-48': !showBackdrop,
-          }"
-        >
+        <div class="flex flex-col items-center justify-center gap-6">
           <div class="flex flex-col items-center justify-center gap-3">
             <h2
               class="text-3xl font-medium text-center text-n-slate-12 font-interDisplay"
@@ -54,7 +40,6 @@ defineProps({
               {{ title }}
             </h2>
             <p
-              v-if="subtitle"
               class="max-w-xl text-base text-center text-n-slate-11 font-interDisplay tracking-[0.3px]"
             >
               {{ subtitle }}

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

@@ -148,6 +148,7 @@ const keyboardEvents = {
         emit('sendMessage');
       }
     },
+    allowOnFocusedInput: true,
   },
   '$mod+Enter': {
     action: () => {
@@ -159,6 +160,7 @@ const keyboardEvents = {
         emit('sendMessage');
       }
     },
+    allowOnFocusedInput: true,
   },
 };
 useKeyboardEvents(keyboardEvents);

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

@@ -148,21 +148,10 @@ const isAnyDropdownActive = computed(() => {
 
 const handleContactSearch = value => {
   showContactsDropdown.value = true;
-  const query = typeof value === 'string' ? value.trim() : '';
-  const hasAlphabet = Array.from(query).some(char => {
-    const lower = char.toLowerCase();
-    const upper = char.toUpperCase();
-    return lower !== upper;
+  emit('searchContacts', {
+    keys: ['email', 'phone_number', 'name'],
+    query: value,
   });
-  const isEmailLike = /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(query);
-
-  const keys = ['email', 'phone_number', 'name'].filter(key => {
-    if (key === 'phone_number' && hasAlphabet) return false;
-    if (key === 'name' && isEmailLike) return false;
-    return true;
-  });
-
-  emit('searchContacts', { keys, query: value });
 };
 
 const handleDropdownUpdate = (type, value) => {

app/javascript/dashboard/components-next/captain/PageLayout.vue

@@ -114,7 +114,6 @@ const handlePageChange = event => {
             <slot name="action" />
           </div>
         </div>
-        <slot name="subHeader" />
       </div>
     </header>
     <main class="flex-1 px-6 overflow-y-auto">

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

@@ -64,23 +64,20 @@ const bulkCheckboxState = computed({
       class="flex items-center gap-3 py-1 ltr:pl-3 rtl:pr-3 ltr:pr-4 rtl:pl-4 rounded-lg bg-n-solid-2 outline outline-1 outline-n-container shadow"
     >
       <div class="flex items-center gap-3">
-        <div class="flex items-center gap-1.5 min-w-0">
+        <div class="flex items-center gap-1.5">
           <Checkbox
             v-model="bulkCheckboxState"
             :indeterminate="isIndeterminate"
           />
-          <span
-            class="text-sm font-medium truncate text-n-slate-12 tabular-nums"
-          >
+          <span class="text-sm font-medium text-n-slate-12 tabular-nums">
             {{ selectAllLabel }}
           </span>
         </div>
-        <span class="text-sm text-n-slate-10 truncate tabular-nums">
+        <span class="text-sm text-n-slate-10 tabular-nums">
           {{ selectedCountLabel }}
         </span>
-        <div class="h-4 w-px bg-n-strong" />
-        <slot name="secondary-actions" />
       </div>
+      <div class="h-4 w-px bg-n-strong" />
       <div class="flex items-center gap-3">
         <slot name="actions" :selected-count="selectedCount">
           <Button

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

@@ -9,7 +9,6 @@ import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.v
 import Button from 'dashboard/components-next/button/Button.vue';
 import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
 import Policy from 'dashboard/components/policy.vue';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
 
 const props = defineProps({
   id: {
@@ -60,10 +59,6 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
-  showActions: {
-    type: Boolean,
-    default: false,
-  },
 });
 
 const emit = defineEmits(['action', 'navigate', 'select', 'hover']);
@@ -164,116 +159,73 @@ const handleDocumentableClick = () => {
     <span class="text-n-slate-11 text-sm line-clamp-5">
       {{ answer }}
     </span>
-    <div
-      v-if="!compact"
-      class="flex items-start justify-between flex-col-reverse md:flex-row gap-3"
-    >
-      <Policy v-if="showActions" :permissions="['administrator']">
-        <div class="flex items-center gap-2 sm:gap-5 w-full">
-          <Button
-            v-if="status === 'pending'"
-            :label="$t('CAPTAIN.RESPONSES.OPTIONS.APPROVE')"
-            icon="i-lucide-circle-check-big"
-            sm
-            link
-            class="hover:!no-underline"
-            @click="
-              handleAssistantAction({ action: 'approve', value: 'approve' })
-            "
-          />
-          <Button
-            :label="$t('CAPTAIN.RESPONSES.OPTIONS.EDIT_RESPONSE')"
-            icon="i-lucide-pencil-line"
-            sm
-            slate
-            link
-            class="hover:!no-underline"
-            @click="
-              handleAssistantAction({
-                action: 'edit',
-                value: 'edit',
-              })
-            "
-          />
-          <Button
-            :label="$t('CAPTAIN.RESPONSES.OPTIONS.DELETE_RESPONSE')"
-            icon="i-lucide-trash"
-            sm
-            ruby
-            link
-            class="hover:!no-underline"
-            @click="
-              handleAssistantAction({ action: 'delete', value: 'delete' })
-            "
-          />
-        </div>
-      </Policy>
-      <div
-        class="flex items-center gap-3"
-        :class="{ 'justify-between w-full': !showActions }"
-      >
-        <div class="inline-flex items-center gap-3 min-w-0">
+    <div v-if="!compact" class="items-center justify-between hidden lg:flex">
+      <div class="inline-flex items-center">
+        <span
+          class="text-sm shrink-0 truncate text-n-slate-11 inline-flex items-center gap-1"
+        >
+          <i class="i-woot-captain" />
+          {{ assistant?.name || '' }}
+        </span>
+        <div
+          v-if="documentable"
+          class="shrink-0 text-sm text-n-slate-11 inline-flex line-clamp-1 gap-1 ml-3"
+        >
           <span
-            v-if="status === 'approved'"
-            class="text-sm shrink-0 truncate text-n-slate-11 inline-flex items-center gap-1"
+            v-if="documentable.type === 'Captain::Document'"
+            class="inline-flex items-center gap-1 truncate over"
           >
-            <Icon icon="i-woot-captain" class="size-3.5" />
-            {{ assistant?.name || '' }}
-          </span>
-          <div
-            v-if="documentable"
-            class="text-sm text-n-slate-11 grid grid-cols-[auto_1fr] items-center gap-1 min-w-0"
-          >
-            <Icon
-              v-if="documentable.type === 'Captain::Document'"
-              icon="i-ph-files-light"
-              class="size-3.5"
-            />
-            <Icon
-              v-else-if="documentable.type === 'User'"
-              icon="i-ph-user-circle-plus"
-              class="size-3.5"
-            />
-            <Icon
-              v-else-if="documentable.type === 'Conversation'"
-              icon="i-ph-chat-circle-dots"
-              class="size-3.5"
-            />
-            <span
-              v-if="documentable.type === 'Captain::Document'"
-              class="truncate"
-              :title="documentable.name"
-            >
+            <i class="i-ph-files-light text-base" />
+            <span class="max-w-96 truncate" :title="documentable.name">
               {{ documentable.name }}
             </span>
+          </span>
+          <span
+            v-if="documentable.type === 'User'"
+            class="inline-flex items-center gap-1"
+          >
+            <i class="i-ph-user-circle-plus text-base" />
             <span
-              v-else-if="documentable.type === 'User'"
-              class="truncate"
+              class="max-w-96 truncate"
               :title="documentable.available_name"
             >
               {{ documentable.available_name }}
             </span>
-            <span
-              v-else-if="documentable.type === 'Conversation'"
-              class="hover:underline truncate cursor-pointer"
-              role="button"
-              @click="handleDocumentableClick"
-            >
+          </span>
+          <span
+            v-else-if="documentable.type === 'Conversation'"
+            class="inline-flex items-center gap-1 group cursor-pointer"
+            role="button"
+            @click="handleDocumentableClick"
+          >
+            <i class="i-ph-chat-circle-dots text-base" />
+            <span class="group-hover:underline">
               {{
                 t(`CAPTAIN.RESPONSES.DOCUMENTABLE.CONVERSATION`, {
                   id: documentable.display_id,
                 })
               }}
             </span>
-          </div>
+          </span>
+          <span v-else />
         </div>
         <div
-          class="shrink-0 text-sm text-n-slate-11 line-clamp-1 inline-flex items-center gap-1"
+          v-if="status !== 'approved'"
+          class="shrink-0 text-sm text-n-slate-11 line-clamp-1 inline-flex items-center gap-1 ml-3"
         >
-          <Icon icon="i-ph-calendar-dot" class="size-3.5" />
-          {{ timestamp }}
+          <i
+            class="i-ph-stack text-base"
+            :title="t('CAPTAIN.RESPONSES.STATUS.TITLE')"
+          />
+          {{ t(`CAPTAIN.RESPONSES.STATUS.${status.toUpperCase()}`) }}
         </div>
       </div>
+      <div
+        class="shrink-0 text-sm text-n-slate-11 line-clamp-1 inline-flex items-center gap-1 ml-3"
+      >
+        <i class="i-ph-calendar-dot" />
+        {{ timestamp }}
+      </div>
     </div>
   </CardLayout>
 </template>

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

@@ -10,10 +10,6 @@ const props = defineProps({
     type: String,
     required: true,
   },
-  translationKey: {
-    type: String,
-    required: true,
-  },
   entity: {
     type: Object,
     required: true,
@@ -29,9 +25,7 @@ const emit = defineEmits(['deleteSuccess']);
 const { t } = useI18n();
 const store = useStore();
 const deleteDialogRef = ref(null);
-const i18nKey = computed(() => {
-  return props.translationKey || props.type.toUpperCase();
-});
+const i18nKey = computed(() => props.type.toUpperCase());
 
 const deleteEntity = async payload => {
   if (!payload) return;

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

@@ -1,73 +0,0 @@
-<script setup>
-import { defineModel, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-import Input from 'dashboard/components-next/input/Input.vue';
-
-const props = defineProps({
-  authType: {
-    type: String,
-    required: true,
-    validator: value => ['none', 'bearer', 'basic', 'api_key'].includes(value),
-  },
-});
-
-const { t } = useI18n();
-
-const authConfig = defineModel('authConfig', {
-  type: Object,
-  default: () => ({}),
-});
-
-watch(
-  () => props.authType,
-  () => {
-    authConfig.value = {};
-  }
-);
-</script>
-
-<template>
-  <div class="flex flex-col gap-2">
-    <Input
-      v-if="authType === 'bearer'"
-      v-model="authConfig.token"
-      :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.BEARER_TOKEN')"
-      :placeholder="
-        t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.BEARER_TOKEN_PLACEHOLDER')
-      "
-    />
-    <template v-else-if="authType === 'basic'">
-      <Input
-        v-model="authConfig.username"
-        :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.USERNAME')"
-        :placeholder="
-          t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.USERNAME_PLACEHOLDER')
-        "
-      />
-      <Input
-        v-model="authConfig.password"
-        type="password"
-        :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.PASSWORD')"
-        :placeholder="
-          t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.PASSWORD_PLACEHOLDER')
-        "
-      />
-    </template>
-    <template v-else-if="authType === 'api_key'">
-      <Input
-        v-model="authConfig.name"
-        :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.API_KEY')"
-        :placeholder="
-          t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.API_KEY_PLACEHOLDER')
-        "
-      />
-      <Input
-        v-model="authConfig.key"
-        :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.API_VALUE')"
-        :placeholder="
-          t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.API_VALUE_PLACEHOLDER')
-        "
-      />
-    </template>
-  </div>
-</template>

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

@@ -1,87 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { useStore } from 'dashboard/composables/store';
-import { useAlert } from 'dashboard/composables';
-import { useI18n } from 'vue-i18n';
-import { parseAPIErrorResponse } from 'dashboard/store/utils/api';
-
-import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
-import CustomToolForm from './CustomToolForm.vue';
-
-const props = defineProps({
-  selectedTool: {
-    type: Object,
-    default: () => ({}),
-  },
-  type: {
-    type: String,
-    default: 'create',
-    validator: value => ['create', 'edit'].includes(value),
-  },
-});
-
-const emit = defineEmits(['close']);
-const { t } = useI18n();
-const store = useStore();
-
-const dialogRef = ref(null);
-
-const updateTool = toolDetails =>
-  store.dispatch('captainCustomTools/update', {
-    id: props.selectedTool.id,
-    ...toolDetails,
-  });
-
-const i18nKey = computed(
-  () => `CAPTAIN.CUSTOM_TOOLS.${props.type.toUpperCase()}`
-);
-
-const createTool = toolDetails =>
-  store.dispatch('captainCustomTools/create', toolDetails);
-
-const handleSubmit = async updatedTool => {
-  try {
-    if (props.type === 'edit') {
-      await updateTool(updatedTool);
-    } else {
-      await createTool(updatedTool);
-    }
-    useAlert(t(`${i18nKey.value}.SUCCESS_MESSAGE`));
-    dialogRef.value.close();
-  } catch (error) {
-    const errorMessage =
-      parseAPIErrorResponse(error) || t(`${i18nKey.value}.ERROR_MESSAGE`);
-    useAlert(errorMessage);
-  }
-};
-
-const handleClose = () => {
-  emit('close');
-};
-
-const handleCancel = () => {
-  dialogRef.value.close();
-};
-
-defineExpose({ dialogRef });
-</script>
-
-<template>
-  <Dialog
-    ref="dialogRef"
-    width="2xl"
-    :title="$t(`${i18nKey}.TITLE`)"
-    :description="$t('CAPTAIN.CUSTOM_TOOLS.FORM_DESCRIPTION')"
-    :show-cancel-button="false"
-    :show-confirm-button="false"
-    @close="handleClose"
-  >
-    <CustomToolForm
-      :mode="type"
-      :tool="selectedTool"
-      @submit="handleSubmit"
-      @cancel="handleCancel"
-    />
-    <template #footer />
-  </Dialog>
-</template>

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

@@ -1,125 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useToggle } from '@vueuse/core';
-import { useI18n } from 'vue-i18n';
-import { dynamicTime } from 'shared/helpers/timeHelper';
-
-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 Policy from 'dashboard/components/policy.vue';
-
-const props = defineProps({
-  id: {
-    type: Number,
-    required: true,
-  },
-  title: {
-    type: String,
-    required: true,
-  },
-  description: {
-    type: String,
-    default: '',
-  },
-  authType: {
-    type: String,
-    default: 'none',
-  },
-  updatedAt: {
-    type: Number,
-    required: true,
-  },
-  createdAt: {
-    type: Number,
-    required: true,
-  },
-});
-
-const emit = defineEmits(['action']);
-
-const { t } = useI18n();
-
-const [showActionsDropdown, toggleDropdown] = useToggle();
-
-const menuItems = computed(() => [
-  {
-    label: t('CAPTAIN.CUSTOM_TOOLS.OPTIONS.EDIT_TOOL'),
-    value: 'edit',
-    action: 'edit',
-    icon: 'i-lucide-pencil-line',
-  },
-  {
-    label: t('CAPTAIN.CUSTOM_TOOLS.OPTIONS.DELETE_TOOL'),
-    value: 'delete',
-    action: 'delete',
-    icon: 'i-lucide-trash',
-  },
-]);
-
-const timestamp = computed(() =>
-  dynamicTime(props.updatedAt || props.createdAt)
-);
-
-const handleAction = ({ action, value }) => {
-  toggleDropdown(false);
-  emit('action', { action, value, id: props.id });
-};
-
-const authTypeLabel = computed(() => {
-  return t(
-    `CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_TYPES.${props.authType.toUpperCase()}`
-  );
-});
-</script>
-
-<template>
-  <CardLayout class="relative">
-    <div class="flex relative justify-between w-full gap-1">
-      <span class="text-base text-n-slate-12 line-clamp-1 font-medium">
-        {{ title }}
-      </span>
-      <div class="flex items-center gap-2">
-        <Policy
-          v-on-clickaway="() => toggleDropdown(false)"
-          :permissions="['administrator']"
-          class="relative flex items-center group"
-        >
-          <Button
-            icon="i-lucide-ellipsis-vertical"
-            color="slate"
-            size="xs"
-            class="rounded-md group-hover:bg-n-alpha-2"
-            @click="toggleDropdown()"
-          />
-          <DropdownMenu
-            v-if="showActionsDropdown"
-            :menu-items="menuItems"
-            class="mt-1 ltr:right-0 rtl:right-0 top-full"
-            @action="handleAction($event)"
-          />
-        </Policy>
-      </div>
-    </div>
-    <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
-          v-if="authType !== 'none'"
-          class="text-sm shrink-0 text-n-slate-11 inline-flex items-center gap-1"
-        >
-          <i class="i-lucide-lock text-base" />
-          {{ authTypeLabel }}
-        </span>
-      </div>
-      <span class="text-sm text-n-slate-11 line-clamp-1 shrink-0">
-        {{ timestamp }}
-      </span>
-    </div>
-  </CardLayout>
-</template>

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

@@ -1,271 +0,0 @@
-<script setup>
-import { reactive, computed, useTemplateRef, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useVuelidate } from '@vuelidate/core';
-import { required } from '@vuelidate/validators';
-import { useMapGetter } from 'dashboard/composables/store';
-
-import Input from 'dashboard/components-next/input/Input.vue';
-import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
-import Button from 'dashboard/components-next/button/Button.vue';
-import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
-import ParamRow from './ParamRow.vue';
-import AuthConfig from './AuthConfig.vue';
-
-const props = defineProps({
-  mode: {
-    type: String,
-    default: 'create',
-    validator: value => ['create', 'edit'].includes(value),
-  },
-  tool: {
-    type: Object,
-    default: () => ({}),
-  },
-});
-
-const emit = defineEmits(['submit', 'cancel']);
-
-const { t } = useI18n();
-
-const formState = {
-  uiFlags: useMapGetter('captainCustomTools/getUIFlags'),
-};
-
-const initialState = {
-  title: '',
-  description: '',
-  endpoint_url: '',
-  http_method: 'GET',
-  request_template: '',
-  response_template: '',
-  auth_type: 'none',
-  auth_config: {},
-  param_schema: [],
-};
-
-const state = reactive({ ...initialState });
-
-// Populate form when in edit mode
-watch(
-  () => props.tool,
-  newTool => {
-    if (props.mode === 'edit' && newTool && newTool.id) {
-      state.title = newTool.title || '';
-      state.description = newTool.description || '';
-      state.endpoint_url = newTool.endpoint_url || '';
-      state.http_method = newTool.http_method || 'GET';
-      state.request_template = newTool.request_template || '';
-      state.response_template = newTool.response_template || '';
-      state.auth_type = newTool.auth_type || 'none';
-      state.auth_config = newTool.auth_config || {};
-      state.param_schema = newTool.param_schema || [];
-    }
-  },
-  { immediate: true }
-);
-
-const DEFAULT_PARAM = {
-  name: '',
-  type: 'string',
-  description: '',
-  required: false,
-};
-
-const validationRules = {
-  title: { required },
-  endpoint_url: { required },
-  http_method: { required },
-  auth_type: { required },
-};
-
-const httpMethodOptions = computed(() => [
-  { value: 'GET', label: 'GET' },
-  { value: 'POST', label: 'POST' },
-]);
-
-const authTypeOptions = computed(() => [
-  { value: 'none', label: t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_TYPES.NONE') },
-  { value: 'bearer', label: t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_TYPES.BEARER') },
-  { value: 'basic', label: t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_TYPES.BASIC') },
-  {
-    value: 'api_key',
-    label: t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_TYPES.API_KEY'),
-  },
-]);
-
-const v$ = useVuelidate(validationRules, state);
-
-const isLoading = computed(() =>
-  props.mode === 'edit'
-    ? formState.uiFlags.value.updatingItem
-    : formState.uiFlags.value.creatingItem
-);
-
-const getErrorMessage = (field, errorKey) => {
-  return v$.value[field].$error
-    ? t(`CAPTAIN.CUSTOM_TOOLS.FORM.${errorKey}.ERROR`)
-    : '';
-};
-
-const formErrors = computed(() => ({
-  title: getErrorMessage('title', 'TITLE'),
-  endpoint_url: getErrorMessage('endpoint_url', 'ENDPOINT_URL'),
-}));
-
-const paramsRef = useTemplateRef('paramsRef');
-
-const isParamsValid = () => {
-  if (!paramsRef.value || paramsRef.value.length === 0) {
-    return true;
-  }
-  return paramsRef.value.every(param => param.validate());
-};
-
-const removeParam = index => {
-  state.param_schema.splice(index, 1);
-};
-
-const addParam = () => {
-  state.param_schema.push({ ...DEFAULT_PARAM });
-};
-
-const handleCancel = () => emit('cancel');
-
-const handleSubmit = async () => {
-  const isFormValid = await v$.value.$validate();
-  if (!isFormValid || !isParamsValid()) {
-    return;
-  }
-
-  emit('submit', state);
-};
-</script>
-
-<template>
-  <form
-    class="flex flex-col px-4 -mx-4 gap-4 max-h-[calc(100vh-200px)] overflow-y-scroll"
-    @submit.prevent="handleSubmit"
-  >
-    <Input
-      v-model="state.title"
-      :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.TITLE.LABEL')"
-      :placeholder="t('CAPTAIN.CUSTOM_TOOLS.FORM.TITLE.PLACEHOLDER')"
-      :message="formErrors.title"
-      :message-type="formErrors.title ? 'error' : 'info'"
-    />
-
-    <TextArea
-      v-model="state.description"
-      :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.DESCRIPTION.LABEL')"
-      :placeholder="t('CAPTAIN.CUSTOM_TOOLS.FORM.DESCRIPTION.PLACEHOLDER')"
-      :rows="2"
-    />
-
-    <div class="flex gap-2">
-      <div class="flex flex-col gap-1 w-28">
-        <label class="mb-0.5 text-sm font-medium text-n-slate-12">
-          {{ t('CAPTAIN.CUSTOM_TOOLS.FORM.HTTP_METHOD.LABEL') }}
-        </label>
-        <ComboBox
-          v-model="state.http_method"
-          :options="httpMethodOptions"
-          class="[&>div>button]:bg-n-alpha-black2 [&_li]:font-mono [&_button]:font-mono [&>div>button]:outline-offset-[-1px]"
-        />
-      </div>
-      <Input
-        v-model="state.endpoint_url"
-        :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.ENDPOINT_URL.LABEL')"
-        :placeholder="t('CAPTAIN.CUSTOM_TOOLS.FORM.ENDPOINT_URL.PLACEHOLDER')"
-        :message="formErrors.endpoint_url"
-        :message-type="formErrors.endpoint_url ? 'error' : 'info'"
-        class="flex-1"
-      />
-    </div>
-
-    <div class="flex flex-col gap-1">
-      <label class="mb-0.5 text-sm font-medium text-n-slate-12">
-        {{ t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_TYPE.LABEL') }}
-      </label>
-      <ComboBox
-        v-model="state.auth_type"
-        :options="authTypeOptions"
-        class="[&>div>button]:bg-n-alpha-black2"
-      />
-    </div>
-
-    <AuthConfig
-      v-model:auth-config="state.auth_config"
-      :auth-type="state.auth_type"
-    />
-
-    <div class="flex flex-col gap-2">
-      <label class="text-sm font-medium text-n-slate-12">
-        {{ t('CAPTAIN.CUSTOM_TOOLS.FORM.PARAMETERS.LABEL') }}
-      </label>
-      <p class="text-xs text-n-slate-11 -mt-1">
-        {{ t('CAPTAIN.CUSTOM_TOOLS.FORM.PARAMETERS.HELP_TEXT') }}
-      </p>
-      <ul v-if="state.param_schema.length > 0" class="grid gap-2 list-none">
-        <ParamRow
-          v-for="(param, index) in state.param_schema"
-          :key="index"
-          ref="paramsRef"
-          v-model:name="param.name"
-          v-model:type="param.type"
-          v-model:description="param.description"
-          v-model:required="param.required"
-          @remove="removeParam(index)"
-        />
-      </ul>
-      <Button
-        type="button"
-        sm
-        ghost
-        blue
-        icon="i-lucide-plus"
-        :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.ADD_PARAMETER')"
-        @click="addParam"
-      />
-    </div>
-
-    <TextArea
-      v-if="state.http_method === 'POST'"
-      v-model="state.request_template"
-      :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.REQUEST_TEMPLATE.LABEL')"
-      :placeholder="t('CAPTAIN.CUSTOM_TOOLS.FORM.REQUEST_TEMPLATE.PLACEHOLDER')"
-      :rows="4"
-      class="[&_textarea]:font-mono"
-    />
-
-    <TextArea
-      v-model="state.response_template"
-      :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.RESPONSE_TEMPLATE.LABEL')"
-      :placeholder="
-        t('CAPTAIN.CUSTOM_TOOLS.FORM.RESPONSE_TEMPLATE.PLACEHOLDER')
-      "
-      :rows="4"
-      class="[&_textarea]:font-mono"
-    />
-
-    <div class="flex gap-3 justify-between items-center w-full">
-      <Button
-        type="button"
-        variant="faded"
-        color="slate"
-        :label="t('CAPTAIN.FORM.CANCEL')"
-        class="w-full bg-n-alpha-2 text-n-blue-text hover:bg-n-alpha-3"
-        @click="handleCancel"
-      />
-      <Button
-        type="submit"
-        :label="
-          t(mode === 'edit' ? 'CAPTAIN.FORM.EDIT' : 'CAPTAIN.FORM.CREATE')
-        "
-        class="w-full"
-        :is-loading="isLoading"
-        :disabled="isLoading"
-      />
-    </div>
-  </form>
-</template>

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

@@ -1,113 +0,0 @@
-<script setup>
-import { computed, defineModel, ref, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-import Button from 'dashboard/components-next/button/Button.vue';
-import Input from 'dashboard/components-next/input/Input.vue';
-import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
-import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
-
-const emit = defineEmits(['remove']);
-const { t } = useI18n();
-const showErrors = ref(false);
-
-const name = defineModel('name', {
-  type: String,
-  required: true,
-});
-
-const type = defineModel('type', {
-  type: String,
-  required: true,
-});
-
-const description = defineModel('description', {
-  type: String,
-  default: '',
-});
-
-const required = defineModel('required', {
-  type: Boolean,
-  default: false,
-});
-
-const paramTypeOptions = computed(() => [
-  { value: 'string', label: t('CAPTAIN.CUSTOM_TOOLS.FORM.PARAM_TYPES.STRING') },
-  { value: 'number', label: t('CAPTAIN.CUSTOM_TOOLS.FORM.PARAM_TYPES.NUMBER') },
-  {
-    value: 'boolean',
-    label: t('CAPTAIN.CUSTOM_TOOLS.FORM.PARAM_TYPES.BOOLEAN'),
-  },
-  { value: 'array', label: t('CAPTAIN.CUSTOM_TOOLS.FORM.PARAM_TYPES.ARRAY') },
-  { value: 'object', label: t('CAPTAIN.CUSTOM_TOOLS.FORM.PARAM_TYPES.OBJECT') },
-]);
-
-const validationError = computed(() => {
-  if (!name.value || name.value.trim() === '') {
-    return 'PARAM_NAME_REQUIRED';
-  }
-  return null;
-});
-
-watch([name, type, description, required], () => {
-  showErrors.value = false;
-});
-
-const validate = () => {
-  showErrors.value = true;
-  return !validationError.value;
-};
-
-defineExpose({ validate });
-</script>
-
-<template>
-  <li class="list-none">
-    <div
-      class="flex items-start gap-2 p-3 rounded-lg border border-n-weak bg-n-alpha-2"
-      :class="{
-        'animate-wiggle border-n-ruby-9': showErrors && validationError,
-      }"
-    >
-      <div class="flex flex-col flex-1 gap-3">
-        <div class="grid grid-cols-3 gap-2">
-          <Input
-            v-model="name"
-            :placeholder="t('CAPTAIN.CUSTOM_TOOLS.FORM.PARAM_NAME.PLACEHOLDER')"
-            class="col-span-2"
-          />
-          <ComboBox
-            v-model="type"
-            :options="paramTypeOptions"
-            :placeholder="t('CAPTAIN.CUSTOM_TOOLS.FORM.PARAM_TYPE.PLACEHOLDER')"
-            class="[&>div>button]:bg-n-alpha-black2"
-          />
-        </div>
-        <Input
-          v-model="description"
-          :placeholder="
-            t('CAPTAIN.CUSTOM_TOOLS.FORM.PARAM_DESCRIPTION.PLACEHOLDER')
-          "
-        />
-        <label class="flex items-center gap-2 cursor-pointer">
-          <Checkbox v-model="required" />
-          <span class="text-sm text-n-slate-11">
-            {{ t('CAPTAIN.CUSTOM_TOOLS.FORM.PARAM_REQUIRED.LABEL') }}
-          </span>
-        </label>
-      </div>
-      <Button
-        solid
-        slate
-        icon="i-lucide-trash"
-        class="flex-shrink-0"
-        @click.stop="emit('remove')"
-      />
-    </div>
-    <span
-      v-if="showErrors && validationError"
-      class="block mt-1 text-sm text-n-ruby-11"
-    >
-      {{ t(`CAPTAIN.CUSTOM_TOOLS.FORM.ERRORS.${validationError}`) }}
-    </span>
-  </li>
-</template>

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

@@ -1,5 +1,4 @@
 <script setup>
-import { useAccount } from 'dashboard/composables/useAccount';
 import EmptyStateLayout from 'dashboard/components-next/EmptyStateLayout.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import AssistantCard from 'dashboard/components-next/captain/assistant/AssistantCard.vue';
@@ -7,7 +6,6 @@ import FeatureSpotlight from 'dashboard/components-next/feature-spotlight/Featur
 import { assistantsList } from 'dashboard/components-next/captain/pageComponents/emptyStates/captainEmptyStateContent.js';
 
 const emit = defineEmits(['click']);
-const { isOnChatwootCloud } = useAccount();
 
 const onClick = () => {
   emit('click');
@@ -22,7 +20,6 @@ const onClick = () => {
     fallback-thumbnail-dark="/assets/images/dashboard/captain/assistant-dark.svg"
     learn-more-url="https://chwt.app/captain-assistant"
     class="mb-8"
-    :hide-actions="!isOnChatwootCloud"
   />
   <EmptyStateLayout
     :title="$t('CAPTAIN.ASSISTANTS.EMPTY_STATE.TITLE')"

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

@@ -1,29 +0,0 @@
-<script setup>
-import EmptyStateLayout from 'dashboard/components-next/EmptyStateLayout.vue';
-import Button from 'dashboard/components-next/button/Button.vue';
-
-const emit = defineEmits(['click']);
-
-const onClick = () => {
-  emit('click');
-};
-</script>
-
-<template>
-  <EmptyStateLayout
-    :title="$t('CAPTAIN.CUSTOM_TOOLS.EMPTY_STATE.TITLE')"
-    :subtitle="$t('CAPTAIN.CUSTOM_TOOLS.EMPTY_STATE.SUBTITLE')"
-    :action-perms="['administrator']"
-  >
-    <template #empty-state-item>
-      <div class="min-h-[600px]" />
-    </template>
-    <template #actions>
-      <Button
-        :label="$t('CAPTAIN.CUSTOM_TOOLS.ADD_NEW')"
-        icon="i-lucide-plus"
-        @click="onClick"
-      />
-    </template>
-  </EmptyStateLayout>
-</template>

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

@@ -1,5 +1,4 @@
 <script setup>
-import { useAccount } from 'dashboard/composables/useAccount';
 import EmptyStateLayout from 'dashboard/components-next/EmptyStateLayout.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import DocumentCard from 'dashboard/components-next/captain/assistant/DocumentCard.vue';
@@ -7,7 +6,6 @@ import FeatureSpotlight from 'dashboard/components-next/feature-spotlight/Featur
 import { documentsList } from 'dashboard/components-next/captain/pageComponents/emptyStates/captainEmptyStateContent.js';
 
 const emit = defineEmits(['click']);
-const { isOnChatwootCloud } = useAccount();
 
 const onClick = () => {
   emit('click');
@@ -21,7 +19,6 @@ const onClick = () => {
     fallback-thumbnail="/assets/images/dashboard/captain/document-light.svg"
     fallback-thumbnail-dark="/assets/images/dashboard/captain/document-dark.svg"
     learn-more-url="https://chwt.app/captain-document"
-    :hide-actions="!isOnChatwootCloud"
     class="mb-8"
   />
   <EmptyStateLayout

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

@@ -1,63 +1,32 @@
 <script setup>
-import { useAccount } from 'dashboard/composables/useAccount';
 import EmptyStateLayout from 'dashboard/components-next/EmptyStateLayout.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import ResponseCard from 'dashboard/components-next/captain/assistant/ResponseCard.vue';
 import FeatureSpotlight from 'dashboard/components-next/feature-spotlight/FeatureSpotlight.vue';
 import { responsesList } from 'dashboard/components-next/captain/pageComponents/emptyStates/captainEmptyStateContent.js';
 
-import { computed } from 'vue';
-
-const props = defineProps({
-  variant: {
-    type: String,
-    default: 'approved',
-    validator: value => ['approved', 'pending'].includes(value),
-  },
-  hasActiveFilters: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const emit = defineEmits(['click', 'clearFilters']);
-
-const isApproved = computed(() => props.variant === 'approved');
-const isPending = computed(() => props.variant === 'pending');
-
-const { isOnChatwootCloud } = useAccount();
+const emit = defineEmits(['click']);
 
 const onClick = () => {
   emit('click');
 };
-
-const onClearFilters = () => {
-  emit('clearFilters');
-};
 </script>
 
 <template>
   <FeatureSpotlight
-    v-if="isApproved"
     :title="$t('CAPTAIN.RESPONSES.EMPTY_STATE.FEATURE_SPOTLIGHT.TITLE')"
     :note="$t('CAPTAIN.RESPONSES.EMPTY_STATE.FEATURE_SPOTLIGHT.NOTE')"
     fallback-thumbnail="/assets/images/dashboard/captain/faqs-light.svg"
     fallback-thumbnail-dark="/assets/images/dashboard/captain/faqs-dark.svg"
     learn-more-url="https://chwt.app/captain-faq"
-    :hide-actions="!isOnChatwootCloud"
     class="mb-8"
   />
   <EmptyStateLayout
-    :title="
-      isPending
-        ? $t('CAPTAIN.RESPONSES.EMPTY_STATE.NO_PENDING_TITLE')
-        : $t('CAPTAIN.RESPONSES.EMPTY_STATE.TITLE')
-    "
-    :subtitle="isApproved ? $t('CAPTAIN.RESPONSES.EMPTY_STATE.SUBTITLE') : ''"
+    :title="$t('CAPTAIN.RESPONSES.EMPTY_STATE.TITLE')"
+    :subtitle="$t('CAPTAIN.RESPONSES.EMPTY_STATE.SUBTITLE')"
     :action-perms="['administrator']"
-    :show-backdrop="isApproved"
   >
-    <template v-if="isApproved" #empty-state-item>
+    <template #empty-state-item>
       <div class="grid grid-cols-1 gap-4 p-px overflow-hidden">
         <ResponseCard
           v-for="(response, index) in responsesList.slice(0, 5)"
@@ -73,21 +42,11 @@ const onClearFilters = () => {
       </div>
     </template>
     <template #actions>
-      <div class="flex flex-col items-center gap-3">
-        <Button
-          v-if="isApproved"
-          :label="$t('CAPTAIN.RESPONSES.ADD_NEW')"
-          icon="i-lucide-plus"
-          @click="onClick"
-        />
-        <Button
-          v-else-if="isPending && hasActiveFilters"
-          :label="$t('CAPTAIN.RESPONSES.EMPTY_STATE.CLEAR_SEARCH')"
-          variant="link"
-          size="sm"
-          @click="onClearFilters"
-        />
-      </div>
+      <Button
+        :label="$t('CAPTAIN.RESPONSES.ADD_NEW')"
+        icon="i-lucide-plus"
+        @click="onClick"
+      />
     </template>
   </EmptyStateLayout>
 </template>

app/javascript/dashboard/components-next/changelog-card/GroupedStackedChangelogCard.story.vue

@@ -1,114 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import GroupedStackedChangelogCard from './GroupedStackedChangelogCard.vue';
-
-const sampleCards = [
-  {
-    id: 'chatwoot-captain',
-    title: 'Chatwoot Captain',
-    meta_title: 'Chatwoot Captain',
-    meta_description:
-      'Watch how our latest feature can transform your workflow with powerful automation tools.',
-    slug: 'chatwoot-captain',
-    feature_image:
-      'https://www.chatwoot.com/images/captain/captain_thumbnail.jpg',
-  },
-  {
-    id: 'smart-routing',
-    title: 'Smart Routing Forms',
-    meta_title: 'Smart Routing Forms',
-    meta_description:
-      'Screen bookers with intelligent forms and route them to the right team member.',
-    slug: 'smart-routing',
-    feature_image: 'https://www.chatwoot.com/images/dashboard-dark.webp',
-  },
-  {
-    id: 'instant-meetings',
-    title: 'Instant Meetings',
-    meta_title: 'Instant Meetings',
-    meta_description: 'Start instant meetings directly from shared links.',
-    slug: 'instant-meetings',
-    feature_image:
-      'https://images.unsplash.com/photo-1587614382346-4ec70e388b28?w=600',
-  },
-  {
-    id: 'analytics',
-    title: 'Advanced Analytics',
-    meta_title: 'Advanced Analytics',
-    meta_description:
-      'Track meeting performance, conversion, and response rates in one place.',
-    slug: 'analytics',
-    feature_image:
-      'https://images.unsplash.com/photo-1522202176988-66273c2fd55f?w=500',
-  },
-  {
-    id: 'team-collaboration',
-    title: 'Team Collaboration',
-    meta_title: 'Team Collaboration',
-    meta_description:
-      'Coordinate with your team seamlessly using shared availability.',
-    slug: 'team-collaboration',
-    feature_image:
-      'https://images.unsplash.com/photo-1522202176988-66273c2fd55f?w=400',
-  },
-];
-
-const visibleCards = ref([...sampleCards]);
-const currentIndex = ref(0);
-const dismissingCards = ref([]);
-
-const handleReadMore = slug => {
-  console.log(`Read more: ${slug}`);
-};
-
-const handleDismiss = slug => {
-  dismissingCards.value.push(slug);
-  setTimeout(() => {
-    const idx = visibleCards.value.findIndex(c => c.slug === slug);
-    if (idx !== -1) visibleCards.value.splice(idx, 1);
-    dismissingCards.value = dismissingCards.value.filter(s => s !== slug);
-    if (currentIndex.value >= visibleCards.value.length) currentIndex.value = 0;
-  }, 200);
-};
-
-const handleImgClick = data => {
-  currentIndex.value = data.index;
-  console.log(`Card clicked: ${visibleCards.value[data.index].title}`);
-};
-
-const resetDemo = () => {
-  visibleCards.value = [...sampleCards];
-  currentIndex.value = 0;
-  dismissingCards.value = [];
-};
-</script>
-
-<template>
-  <Story
-    title="Components/ChangelogCard/GroupedStackedChangelogCard"
-    :layout="{ type: 'grid', width: '320px' }"
-  >
-    <Variant title="Interactive Demo">
-      <div class="p-4 bg-n-solid-2 rounded-md mx-auto w-64 h-[400px]">
-        <GroupedStackedChangelogCard
-          :posts="visibleCards"
-          :current-index="currentIndex"
-          :is-active="currentIndex === 0"
-          :dismissing-slugs="dismissingCards"
-          class="min-h-[270px]"
-          @read-more="handleReadMore"
-          @dismiss="handleDismiss"
-          @img-click="handleImgClick"
-        />
-
-        <button
-          class="mt-3 px-3 py-1 text-xs font-medium bg-n-brand text-white rounded hover:bg-n-brand/80 transition"
-          @click="resetDemo"
-        >
-          <!-- eslint-disable-next-line @intlify/vue-i18n/no-raw-text -->
-          {{ 'Reset Cards' }}
-        </button>
-      </div>
-    </Variant>
-  </Story>
-</template>

app/javascript/dashboard/components-next/changelog-card/GroupedStackedChangelogCard.vue

@@ -1,74 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import StackedChangelogCard from './StackedChangelogCard.vue';
-
-const props = defineProps({
-  posts: {
-    type: Array,
-    required: true,
-  },
-  currentIndex: {
-    type: Number,
-    default: 0,
-  },
-  dismissingSlugs: {
-    type: Array,
-    default: () => [],
-  },
-});
-
-const emit = defineEmits(['readMore', 'dismiss', 'imgClick']);
-
-const stackedPosts = computed(() => props.posts?.slice(0, 5));
-
-const isPostDismissing = post => props.dismissingSlugs.includes(post.slug);
-
-const handleReadMore = post => emit('readMore', post.slug);
-const handleDismiss = post => emit('dismiss', post.slug);
-const handlePostClick = (post, index) => {
-  if (index === props.currentIndex && !isPostDismissing(post)) {
-    emit('imgClick', { slug: post.slug, index });
-  }
-};
-
-const getCardClasses = index => {
-  const pos =
-    (index - props.currentIndex + stackedPosts.value.length) %
-    stackedPosts.value.length;
-  const base =
-    'relative transition-all duration-500 ease-out col-start-1 row-start-1';
-
-  const layers = [
-    'z-50 scale-100 translate-y-0 opacity-100',
-    'z-40 scale-[0.95] -translate-y-3 opacity-90',
-    'z-30 scale-[0.9] -translate-y-6 opacity-70',
-    'z-20 scale-[0.85] -translate-y-9 opacity-50',
-    'z-10 scale-[0.8] -translate-y-12 opacity-30',
-  ];
-
-  return pos < layers.length
-    ? `${base} ${layers[pos]}`
-    : `${base} opacity-0 scale-75 -translate-y-16`;
-};
-</script>
-
-<template>
-  <div class="overflow-hidden">
-    <div class="relative grid grid-cols-1 pt-8 pb-1 px-2">
-      <div
-        v-for="(post, index) in stackedPosts"
-        :key="post.slug || index"
-        :class="getCardClasses(index)"
-      >
-        <StackedChangelogCard
-          :card="post"
-          :is-active="index === currentIndex"
-          :is-dismissing="isPostDismissing(post)"
-          @read-more="handleReadMore(post)"
-          @dismiss="handleDismiss(post)"
-          @img-click="handlePostClick(post, index)"
-        />
-      </div>
-    </div>
-  </div>
-</template>

app/javascript/dashboard/components-next/changelog-card/StackedChangelogCard.story.vue

@@ -1,46 +0,0 @@
-<script setup>
-import StackedChangelogCard from './StackedChangelogCard.vue';
-
-const imageCards = {
-  id: 'chatwoot-captain',
-  title: 'Chatwoot Captain',
-  meta_title: 'Chatwoot Captain',
-  meta_description:
-    'Watch how our latest feature can transform your workflow with powerful automation tools.',
-  slug: 'chatwoot-captain',
-  feature_image:
-    'https://www.chatwoot.com/images/captain/captain_thumbnail.jpg',
-};
-
-const handleReadMore = () => {
-  console.log(`Read more: ${imageCards.title}`);
-};
-
-const handleDismiss = () => {
-  console.log(`Dismissed: ${imageCards.title}`);
-};
-
-const handleImgClick = () => {
-  console.log(`Card clicked: ${imageCards.title}`);
-};
-</script>
-
-<template>
-  <Story
-    title="Components/ChangelogCard/StackedChangelogCard"
-    :layout="{ type: 'grid', width: '260px' }"
-  >
-    <Variant title="Single Card - With Image">
-      <div class="p-3 bg-n-solid-2 w-56">
-        <StackedChangelogCard
-          :card="imageCards"
-          is-active
-          :is-dismissing="false"
-          @read-more="handleReadMore(imageCards)"
-          @dismiss="handleDismiss(imageCards)"
-          @img-click="handleImgClick(imageCards)"
-        />
-      </div>
-    </Variant>
-  </Story>
-</template>

app/javascript/dashboard/components-next/changelog-card/StackedChangelogCard.vue

@@ -1,119 +0,0 @@
-<script setup>
-import Button from 'dashboard/components-next/button/Button.vue';
-
-defineProps({
-  card: {
-    type: Object,
-    required: true,
-  },
-  isActive: {
-    type: Boolean,
-    default: false,
-  },
-  isDismissing: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const emit = defineEmits(['readMore', 'dismiss', 'imgClick']);
-
-const handleReadMore = () => {
-  emit('readMore');
-};
-
-const handleDismiss = () => {
-  emit('dismiss');
-};
-
-const handleImgClick = () => {
-  emit('imgClick');
-};
-</script>
-
-<template>
-  <div
-    data-testid="changelog-card"
-    class="flex flex-col justify-between p-3 w-full rounded-lg border shadow-sm transition-all duration-200 border-n-weak bg-n-background text-n-slate-12"
-    :class="{
-      'animate-fade-out pointer-events-none': isDismissing,
-      'hover:shadow': isActive,
-    }"
-  >
-    <div>
-      <h5
-        :title="card.meta_title"
-        class="mb-1 text-sm font-semibold line-clamp-1 text-n-slate-12"
-      >
-        {{ card.meta_title }}
-      </h5>
-      <p
-        :title="card.meta_description"
-        class="mb-0 text-xs leading-relaxed text-n-slate-11 line-clamp-2"
-      >
-        {{ card.meta_description }}
-      </p>
-    </div>
-
-    <div
-      v-if="card.feature_image"
-      class="block overflow-hidden my-3 rounded-md border border-n-weak/40"
-    >
-      <img
-        :src="card.feature_image"
-        :alt="`${card.title} preview image`"
-        class="object-cover w-full h-24 rounded-md cursor-pointer"
-        loading="lazy"
-        @click.stop="handleImgClick"
-      />
-    </div>
-    <div
-      v-else
-      class="block overflow-hidden my-3 rounded-md border border-n-weak/40"
-    >
-      <img
-        :src="card.feature_image"
-        :alt="`${card.title} preview image`"
-        class="object-cover w-full h-24 rounded-md cursor-pointer"
-        loading="lazy"
-        @click.stop="handleImgClick"
-      />
-    </div>
-
-    <div class="flex justify-between items-center mt-1">
-      <Button
-        label="Read more"
-        color="slate"
-        link
-        sm
-        class="text-xs font-normal hover:!no-underline"
-        @click.stop="handleReadMore"
-      />
-      <Button
-        label="Dismiss"
-        color="slate"
-        link
-        sm
-        class="text-xs font-normal hover:!no-underline"
-        @click.stop="handleDismiss"
-      />
-    </div>
-  </div>
-</template>
-
-<style scoped>
-@keyframes fade-out {
-  from {
-    opacity: 1;
-    transform: scale(1);
-  }
-  to {
-    opacity: 0;
-    transform: scale(0.95);
-  }
-}
-
-.animate-fade-out {
-  animation: fade-out 0.2s ease-out forwards;
-}
-</style>

app/javascript/dashboard/components-next/copilot/ToggleCopilotAssistant.vue

@@ -45,7 +45,7 @@ const activeAssistantLabel = computed(() => {
         />
       </template>
       <DropdownBody class="bottom-9 min-w-64 z-50" strong>
-        <DropdownSection class="[&>ul]:max-h-80">
+        <DropdownSection class="max-h-80 overflow-scroll">
           <DropdownItem
             v-for="assistant in assistants"
             :key="assistant.id"

app/javascript/dashboard/components-next/feature-spotlight/FeatureSpotlight.vue

@@ -10,7 +10,6 @@ defineProps({
   fallbackThumbnail: { type: String, default: '' },
   fallbackThumbnailDark: { type: String, default: '' },
   learnMoreUrl: { type: String, default: '' },
-  hideActions: { type: Boolean, default: false },
 });
 
 const imageError = ref(false);
@@ -66,7 +65,7 @@ const openLink = link => {
       <div class="flex flex-col flex-1 gap-3 ltr:pr-8 rtl:pl-8">
         <p v-if="note" class="text-n-slate-12 text-sm mb-0">{{ note }}</p>
 
-        <div v-if="!hideActions" class="flex gap-3">
+        <div class="flex gap-3">
           <slot name="actions">
             <Button
               v-if="videoUrl"

app/javascript/dashboard/components-next/feature-spotlight/FeatureSpotlightPopover.vue

@@ -13,7 +13,6 @@ defineProps({
   fallbackThumbnail: { type: String, default: '' },
   fallbackThumbnailDark: { type: String, default: '' },
   learnMoreUrl: { type: String, default: '' },
-  hideActions: { type: Boolean, default: false },
 });
 
 const imageError = ref(false);
@@ -93,7 +92,7 @@ const openLink = link => {
             {{ note }}
           </p>
 
-          <div v-if="!hideActions" class="flex gap-3 justify-between w-full">
+          <div class="flex gap-3 justify-between w-full">
             <slot name="actions">
               <Button
                 v-if="videoUrl"

app/javascript/dashboard/components-next/filter/inputs/FilterSelect.vue

@@ -91,7 +91,7 @@ const updateSelected = newValue => {
       :class="dropdownPosition"
       strong
     >
-      <DropdownSection class="[&>ul]:max-h-80">
+      <DropdownSection class="max-h-80 overflow-scroll">
         <DropdownItem
           v-for="option in options"
           :key="option.value"

app/javascript/dashboard/components-next/filter/inputs/MultiSelect.vue

@@ -123,7 +123,7 @@ const toggleOption = option => {
       </Button>
     </template>
     <DropdownBody class="top-0 min-w-48 z-50" strong>
-      <DropdownSection class="[&>ul]:max-h-80">
+      <DropdownSection class="max-h-80 overflow-scroll">
         <DropdownItem
           v-for="option in options"
           :key="option.id"

app/javascript/dashboard/components-next/filter/inputs/SingleSelect.vue

@@ -124,7 +124,7 @@ const toggleSelected = option => {
           :placeholder="searchPlaceholder || t('COMBOBOX.SEARCH_PLACEHOLDER')"
         />
       </div>
-      <DropdownSection class="[&>ul]:max-h-80">
+      <DropdownSection class="max-h-80 overflow-scroll">
         <template v-if="searchResults.length">
           <DropdownItem
             v-for="option in searchResults"

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

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, computed, ref, toRefs } from 'vue';
+import { onMounted, computed, ref, toRefs, useTemplateRef } from 'vue';
 import { useTimeoutFn } from '@vueuse/core';
 import { provideMessageContext } from './provider.js';
 import { useTrack } from 'dashboard/composables';
@@ -136,6 +136,7 @@ const emit = defineEmits(['retry']);
 const contextMenuPosition = ref({});
 const showBackgroundHighlight = ref(false);
 const showContextMenu = ref(false);
+const emailBubbleRef = useTemplateRef('emailBubbleRef');
 const { t } = useI18n();
 const route = useRoute();
 
@@ -364,6 +365,16 @@ const contextMenuEnabledOptions = computed(() => {
       !props.private &&
       props.inboxSupportsReplyTo.outgoing &&
       !isFailedOrProcessing,
+    // Forward email is enabled only when the message is not in progress and is not private and is an email inbox
+    forwardEmail:
+      props.isEmailInbox &&
+      !props.private &&
+      props.status !== MESSAGE_STATUS.PROGRESS &&
+      ![
+        CONTENT_TYPES.FORM,
+        CONTENT_TYPES.INPUT_CSAT,
+        CONTENT_TYPES.CARDS,
+      ].includes(props.contentType),
   };
 });
 
@@ -384,6 +395,9 @@ const shouldRenderMessage = computed(() => {
 });
 
 function openContextMenu(e) {
+  // Close forward modal, when opening context menu
+  emailBubbleRef.value?.closeForwardModal();
+
   const shouldSkipContextMenu =
     e.target?.classList.contains('skip-context-menu') ||
     ['a', 'img'].includes(e.target?.tagName.toLowerCase());
@@ -459,6 +473,11 @@ const setupHighlightTimer = () => {
   }, HIGHLIGHT_TIMER);
 };
 
+const openForwardModal = ({ x, y }) => {
+  // Open forward modal, with the event from context menu
+  emailBubbleRef.value.openForwardModal({ x, y });
+};
+
 onMounted(setupHighlightTimer);
 
 provideMessageContext({
@@ -519,7 +538,12 @@ provideMessageContext({
         }"
         @contextmenu="openContextMenu($event)"
       >
-        <Component :is="componentToRender" />
+        <component
+          :is="componentToRender"
+          :ref="
+            componentToRender === EmailBubble ? 'emailBubbleRef' : undefined
+          "
+        />
       </div>
       <MessageError
         v-if="contentAttributes.externalError"
@@ -540,6 +564,7 @@ provideMessageContext({
         @open="openContextMenu"
         @close="closeContextMenu"
         @reply-to="handleReplyTo"
+        @forward-email="openForwardModal"
       />
     </div>
   </div>

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

@@ -1,10 +1,8 @@
 <script setup>
-import { defineProps, computed, reactive } from 'vue';
+import { defineProps, computed } from 'vue';
 import Message from './Message.vue';
 import { MESSAGE_TYPES } from './constants.js';
 import { useCamelCase } from 'dashboard/composables/useTransformKeys';
-import { useMapGetter } from 'dashboard/composables/store.js';
-import MessageApi from 'dashboard/api/inbox/message.js';
 
 /**
  * Props definition for the component
@@ -45,48 +43,6 @@ const allMessages = computed(() => {
   return useCamelCase(props.messages, { deep: true });
 });
 
-const currentChat = useMapGetter('getSelectedChat');
-
-// Cache for fetched reply messages to avoid duplicate API calls
-const fetchedReplyMessages = reactive(new Map());
-
-/**
- * Fetches a specific message from the API by trying to get messages around it
- * @param {number} messageId - The ID of the message to fetch
- * @param {number} conversationId - The ID of the conversation
- * @returns {Promise<Object|null>} - The fetched message or null if not found/error
- */
-const fetchReplyMessage = async (messageId, conversationId) => {
-  // Return cached result if already fetched
-  if (fetchedReplyMessages.has(messageId)) {
-    return fetchedReplyMessages.get(messageId);
-  }
-
-  try {
-    const response = await MessageApi.getPreviousMessages({
-      conversationId,
-      before: messageId + 100,
-      after: messageId - 100,
-    });
-
-    const messages = response.data?.payload || [];
-    const targetMessage = messages.find(msg => msg.id === messageId);
-
-    if (targetMessage) {
-      const camelCaseMessage = useCamelCase(targetMessage);
-      fetchedReplyMessages.set(messageId, camelCaseMessage);
-      return camelCaseMessage;
-    }
-
-    // Cache null result to avoid repeated API calls
-    fetchedReplyMessages.set(messageId, null);
-    return null;
-  } catch (error) {
-    fetchedReplyMessages.set(messageId, null);
-    return null;
-  }
-};
-
 /**
  * Determines if a message should be grouped with the next message
  * @param {Number} index - Index of the current message
@@ -134,29 +90,23 @@ const getInReplyToMessage = parentMessage => {
 
   if (!inReplyToMessageId) return null;
 
-  // Try to find in current messages first
-  let replyMessage = props.messages?.find(msg => msg.id === inReplyToMessageId);
-
-  // Then try store messages
-  if (!replyMessage && currentChat.value?.messages) {
-    replyMessage = currentChat.value.messages.find(
-      msg => msg.id === inReplyToMessageId
-    );
-  }
-
-  // Then check fetch cache
-  if (!replyMessage && fetchedReplyMessages.has(inReplyToMessageId)) {
-    replyMessage = fetchedReplyMessages.get(inReplyToMessageId);
-  }
-
-  // If still not found and we have conversation context, fetch it
-  if (!replyMessage && currentChat.value?.id) {
-    fetchReplyMessage(inReplyToMessageId, currentChat.value.id);
-    return null; // Let UI handle loading state
-  }
+  // Find in-reply-to message in the messages prop
+  const replyMessage = props.messages?.find(
+    message => message.id === inReplyToMessageId
+  );
 
   return replyMessage ? useCamelCase(replyMessage) : null;
 };
+
+/**
+ * Gets the address of the forwarded message
+ * @param {Object} message - The message containing the forwarded message reference
+ * @returns {Array|null} - The email addresses of the forwarded message, or null if not forwarded
+ */
+const getForwardedMessageAddress = message => {
+  const { forwardedMessageId, toEmails } = message.contentAttributes || {};
+  return forwardedMessageId ? toEmails : null;
+};
 </script>
 
 <template>
@@ -167,6 +117,11 @@ const getInReplyToMessage = parentMessage => {
         v-if="firstUnreadId && message.id === firstUnreadId"
         name="unreadBadge"
       />
+      <slot
+        v-if="getForwardedMessageAddress(message)"
+        :address="getForwardedMessageAddress(message)"
+        name="forwardedMessageAddress"
+      />
       <Message
         v-bind="message"
         :is-email-inbox="isAnEmailChannel"

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

@@ -14,8 +14,8 @@ const fromEmail = computed(() => {
 });
 
 const toEmail = computed(() => {
-  const { toEmails, email } = contentAttributes.value;
-  return email?.to ?? toEmails ?? [];
+  const { forwardedMessageId, toEmails, email } = contentAttributes.value;
+  return forwardedMessageId ? (toEmails ?? []) : (email?.to ?? []);
 });
 
 const ccEmail = computed(() => {
@@ -82,7 +82,7 @@ const showMeta = computed(() => {
           <{{ fromEmail[0] }}>
         </template>
         <template v-else>
-          {{ fromEmail[0] }}
+          {{ $t('EMAIL_HEADER.FROM') }}: {{ fromEmail[0] }}
         </template>
       </div>
       <div v-if="toEmail.length">

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

@@ -1,30 +1,40 @@
 <script setup>
-import { computed, useTemplateRef, ref, onMounted } from 'vue';
+import { computed, useTemplateRef, ref, onMounted, reactive } from 'vue';
 import { Letter } from 'vue-letter';
 import { sanitizeTextForRender } from '@chatwoot/utils';
 import { allowedCssProperties } from 'lettersanitizer';
+import { useToggle } from '@vueuse/core';
 
 import Icon from 'next/icon/Icon.vue';
-import { EmailQuoteExtractor } from 'dashboard/helper/emailQuoteExtractor.js';
-import FormattedContent from 'next/message/bubbles/Text/FormattedContent.vue';
+import { EmailQuoteExtractor } from './removeReply.js';
 import BaseBubble from 'next/message/bubbles/Base.vue';
+import FormattedContent from 'next/message/bubbles/Text/FormattedContent.vue';
 import AttachmentChips from 'next/message/chips/AttachmentChips.vue';
 import EmailMeta from './EmailMeta.vue';
 import TranslationToggle from 'dashboard/components-next/message/TranslationToggle.vue';
+import ForwardMessageForm from 'dashboard/components-next/message/forwardMessage/ForwardMessage.vue';
+import ContextMenu from 'dashboard/components/ui/ContextMenu.vue';
 
 import { useMessageContext } from '../../provider.js';
+import { useInbox } from 'dashboard/composables/useInbox';
 import { MESSAGE_TYPES } from 'next/message/constants.js';
 import { useTranslations } from 'dashboard/composables/useTranslations';
 
-const { content, contentAttributes, attachments, messageType } =
+const { id, content, contentAttributes, attachments, messageType } =
   useMessageContext();
 
+const { inbox } = useInbox();
+
 const isExpandable = ref(false);
 const isExpanded = ref(false);
 const showQuotedMessage = ref(false);
 const renderOriginal = ref(false);
 const contentContainer = useTemplateRef('contentContainer');
 
+// Forward form - managed locally but can be triggered by parent
+const [showForwardMessageModal, toggleForwardModal] = useToggle();
+const forwardFormPosition = reactive({ top: 0, right: 0 });
+
 onMounted(() => {
   isExpandable.value = contentContainer.value?.scrollHeight > 400;
 });
@@ -32,6 +42,8 @@ onMounted(() => {
 const isOutgoing = computed(() => messageType.value === MESSAGE_TYPES.OUTGOING);
 const isIncoming = computed(() => !isOutgoing.value);
 
+const isForwarded = computed(() => contentAttributes.value?.forwardedMessageId);
+
 const { hasTranslations, translationContent } =
   useTranslations(contentAttributes);
 
@@ -47,13 +59,6 @@ const originalEmailHtml = computed(
     originalEmailText.value
 );
 
-const hasEmailContent = computed(() => {
-  return (
-    contentAttributes?.value?.email?.textContent?.full ||
-    contentAttributes?.value?.email?.htmlContent?.full
-  );
-});
-
 const messageContent = computed(() => {
   // If translations exist and we're showing translations (not original)
   if (hasTranslations.value && !renderOriginal.value) {
@@ -100,6 +105,23 @@ const translationKeySuffix = computed(() => {
 const handleSeeOriginal = () => {
   renderOriginal.value = !renderOriginal.value;
 };
+
+const closeForwardModal = () => {
+  toggleForwardModal(false);
+  forwardFormPosition.x = 0;
+  forwardFormPosition.y = 0;
+};
+
+const openForwardModal = ({ x, y }) => {
+  forwardFormPosition.x = x;
+  forwardFormPosition.y = y;
+  toggleForwardModal(true);
+};
+
+defineExpose({
+  openForwardModal,
+  closeForwardModal,
+});
 </script>
 
 <template>
@@ -118,6 +140,7 @@ const handleSeeOriginal = () => {
         'border-b border-n-slate-8/20': isOutgoing,
       }"
     />
+
     <section ref="contentContainer" class="p-3">
       <div
         :class="{
@@ -144,7 +167,7 @@ const handleSeeOriginal = () => {
           </button>
         </div>
         <FormattedContent
-          v-if="isOutgoing && content && !hasEmailContent"
+          v-if="isOutgoing && content && !isForwarded"
           class="text-n-slate-12"
           :content="messageContent"
         />
@@ -207,6 +230,22 @@ const handleSeeOriginal = () => {
     >
       <AttachmentChips :attachments="attachments" class="gap-1" />
     </section>
+
+    <ContextMenu
+      v-if="showForwardMessageModal"
+      :x="forwardFormPosition.x"
+      :y="forwardFormPosition.y"
+      @close="closeForwardModal"
+    >
+      <ForwardMessageForm
+        :message="contentAttributes?.email"
+        :content="content"
+        :inbox="inbox"
+        :attachments="attachments"
+        :message-id="id"
+        @close="closeForwardModal"
+      />
+    </ContextMenu>
   </BaseBubble>
 </template>
 

app/javascript/dashboard/components-next/message/bubbles/Email/removeReply.js

@@ -10,8 +10,6 @@ const QUOTE_INDICATORS = [
   '[class*="Quote"]',
 ];
 
-const BLOCKQUOTE_FALLBACK_SELECTOR = 'blockquote';
-
 // Regex patterns for quote identification
 const QUOTE_PATTERNS = [
   /On .* wrote:/i,
@@ -38,8 +36,6 @@ export class EmailQuoteExtractor {
       });
     });
 
-    this.removeTrailingBlockquote(tempDiv);
-
     // Remove text-based quotes
     const textNodeQuotes = this.findTextNodeQuotes(tempDiv);
     textNodeQuotes.forEach(el => {
@@ -66,10 +62,6 @@ export class EmailQuoteExtractor {
       }
     }
 
-    if (this.findTrailingBlockquote(tempDiv)) {
-      return true;
-    }
-
     // Check for text-based quotes
     const textNodeQuotes = this.findTextNodeQuotes(tempDiv);
     return textNodeQuotes.length > 0;
@@ -131,26 +123,4 @@ export class EmailQuoteExtractor {
 
     return null;
   }
-
-  /**
-   * Remove fallback blockquote if it is the last top-level element.
-   * @param {Element} rootElement - Root element containing the HTML
-   */
-  static removeTrailingBlockquote(rootElement) {
-    const trailingBlockquote = this.findTrailingBlockquote(rootElement);
-    trailingBlockquote?.remove();
-  }
-
-  /**
-   * Locate a fallback blockquote that is the last top-level element.
-   * @param {Element} rootElement - Root element containing the HTML
-   * @returns {Element|null} The trailing blockquote element if present
-   */
-  static findTrailingBlockquote(rootElement) {
-    const lastElement = rootElement.lastElementChild;
-    if (lastElement?.matches?.(BLOCKQUOTE_FALLBACK_SELECTOR)) {
-      return lastElement;
-    }
-    return null;
-  }
 }

app/javascript/dashboard/components-next/message/bubbles/Template/CallToAction.vue

@@ -1,29 +0,0 @@
-<script setup>
-import Button from 'dashboard/components-next/button/Button.vue';
-
-defineProps({
-  message: {
-    type: Object,
-    required: true,
-  },
-});
-</script>
-
-<template>
-  <div class="text-n-slate-12 max-w-80 flex flex-col gap-2.5">
-    <div class="p-3 bg-n-alpha-2 rounded-xl">
-      <span
-        v-dompurify-html="message.content"
-        class="prose prose-bubble font-medium text-sm"
-      />
-    </div>
-    <div class="flex gap-2">
-      <Button label="Call us" slate class="!text-n-blue-text w-full" />
-      <Button
-        label="Visit our website"
-        slate
-        class="!text-n-blue-text w-full"
-      />
-    </div>
-  </div>
-</template>

app/javascript/dashboard/components-next/message/bubbles/Template/Card.vue

@@ -1,32 +0,0 @@
-<script setup>
-import Button from 'dashboard/components-next/button/Button.vue';
-defineProps({
-  message: {
-    type: Object,
-    required: true,
-  },
-});
-</script>
-
-<template>
-  <div
-    class="bg-n-alpha-2 divide-y divide-n-strong text-n-slate-12 rounded-xl max-w-80"
-  >
-    <div class="px-3 py-2.5">
-      <img :src="message.image_url" class="max-h-44 rounded-lg w-full" />
-      <div class="pt-2.5 flex flex-col gap-2">
-        <h6 class="font-semibold">{{ message.title }}</h6>
-        <span
-          v-dompurify-html="message.content"
-          class="prose prose-bubble text-sm"
-        />
-      </div>
-    </div>
-    <div class="p-3 flex items-center justify-center">
-      <Button label="Call us to order" link class="hover:!no-underline" />
-    </div>
-    <div class="p-3 flex items-center justify-center">
-      <Button label="Visit our store" link class="hover:!no-underline" />
-    </div>
-  </div>
-</template>

app/javascript/dashboard/components-next/message/bubbles/Template/ListPicker.vue

@@ -1,25 +0,0 @@
-<script setup>
-import Button from 'dashboard/components-next/button/Button.vue';
-defineProps({
-  message: {
-    type: Object,
-    required: true,
-  },
-});
-</script>
-
-<template>
-  <div
-    class="bg-n-alpha-2 divide-y divide-n-strong text-n-slate-12 rounded-xl max-w-80"
-  >
-    <div class="p-3">
-      <span
-        v-dompurify-html="message.content"
-        class="prose prose-bubble font-medium text-sm"
-      />
-    </div>
-    <div class="p-3 flex items-center justify-center">
-      <Button label="See options" link class="hover:!no-underline" />
-    </div>
-  </div>
-</template>

app/javascript/dashboard/components-next/message/bubbles/Template/Media.vue

@@ -1,20 +0,0 @@
-<script setup>
-defineProps({
-  message: {
-    type: Object,
-    required: true,
-  },
-});
-</script>
-
-<template>
-  <div
-    class="bg-n-alpha-2 text-n-slate-12 rounded-xl flex flex-col gap-2.5 p-3 max-w-80"
-  >
-    <img :src="message.image_url" class="max-h-44 rounded-lg w-full" />
-    <span
-      v-dompurify-html="message.content"
-      class="prose prose-bubble font-medium text-sm"
-    />
-  </div>
-</template>

app/javascript/dashboard/components-next/message/bubbles/Template/QuickReply.vue

@@ -1,68 +0,0 @@
-<script setup>
-import Button from 'dashboard/components-next/button/Button.vue';
-defineProps({
-  message: {
-    type: Object,
-    required: true,
-  },
-});
-</script>
-
-<template>
-  <div
-    class="bg-n-alpha-2 divide-y divide-n-strong text-n-slate-12 rounded-xl max-w-80"
-  >
-    <div class="p-3">
-      <span
-        v-dompurify-html="message.content"
-        class="prose prose-bubble font-medium text-sm"
-      />
-    </div>
-    <div class="p-3 flex items-center justify-center">
-      <Button label="No, that will be all" link class="hover:!no-underline">
-        <template #icon>
-          <svg
-            width="15"
-            height="15"
-            viewBox="0 0 15 15"
-            fill="none"
-            class="stroke-n-blue-text"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M.667 6.654 5.315.667v3.326c7.968 0 8.878 6.46 8.656 10.007l-.005-.027c-.334-1.79-.474-4.658-8.65-4.658v3.327z"
-              stroke-width="1.333"
-              stroke-linecap="round"
-              stroke-linejoin="round"
-            />
-          </svg>
-        </template>
-      </Button>
-    </div>
-    <div class="p-3 flex items-center justify-center">
-      <Button
-        label="I want to talk to an agents"
-        link
-        class="hover:!no-underline"
-      >
-        <template #icon>
-          <svg
-            width="15"
-            height="15"
-            viewBox="0 0 15 15"
-            fill="none"
-            class="stroke-n-blue-text"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M.667 6.654 5.315.667v3.326c7.968 0 8.878 6.46 8.656 10.007l-.005-.027c-.334-1.79-.474-4.658-8.65-4.658v3.327z"
-              stroke-width="1.333"
-              stroke-linecap="round"
-              stroke-linejoin="round"
-            />
-          </svg>
-        </template>
-      </Button>
-    </div>
-  </div>
-</template>

app/javascript/dashboard/components-next/message/bubbles/Template/Text.vue

@@ -1,14 +0,0 @@
-<script setup>
-defineProps({
-  message: {
-    type: Object,
-    required: true,
-  },
-});
-</script>
-
-<template>
-  <div class="bg-n-alpha-2 text-n-slate-12 rounded-xl p-3 max-w-80">
-    <span v-dompurify-html="message.content" class="prose prose-bubble" />
-  </div>
-</template>

app/javascript/dashboard/components-next/message/bubbles/Video.vue

@@ -47,7 +47,6 @@ const isReel = computed(() => {
           'max-w-48': isReel,
           'max-w-full': !isReel,
         }"
-        @click.stop
         @error="handleError"
       />
     </div>

app/javascript/dashboard/components-next/message/forwardMessage/ForwardMessage.vue

@@ -0,0 +1,185 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import { useStore, useMapGetter } from 'dashboard/composables/store';
+import { vOnClickOutside } from '@vueuse/components';
+import { EmailQuoteExtractor } from 'dashboard/components-next/message/bubbles/Email/removeReply.js';
+import { debounce } from '@chatwoot/utils';
+import { emitter } from 'shared/helpers/mitt';
+import { BUS_EVENTS } from 'shared/constants/busEvents';
+import {
+  searchContacts,
+  createNewContact,
+} from 'dashboard/components-next/NewConversation/helpers/composeConversationHelper';
+
+import ForwardMessageForm from './components/ForwardMessageForm.vue';
+
+const props = defineProps({
+  forwardType: {
+    type: String,
+    default: 'email',
+  },
+  message: {
+    type: Object,
+    default: () => ({}),
+  },
+  content: {
+    type: String,
+    default: '',
+  },
+  inbox: {
+    type: Object,
+    default: () => ({}),
+  },
+  messageId: {
+    type: Number,
+    default: null,
+  },
+  attachments: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const emit = defineEmits(['close']);
+
+const { t } = useI18n();
+const store = useStore();
+
+const contacts = ref([]);
+const selectedContact = ref(null);
+const isCreatingContact = ref(false);
+const isSearching = ref(false);
+
+const messageSignature = useMapGetter('getMessageSignature');
+const currentChat = useMapGetter('getSelectedChat');
+const currentUser = useMapGetter('getCurrentUser');
+const globalConfig = useMapGetter('globalConfig/get');
+
+const fromEmail = computed(() => props.inbox?.email);
+
+const fullHTML = computed(() => {
+  return (
+    props.message?.htmlContent?.full ??
+    props.message?.textContent?.full?.replace(/\n/g, '<br>')
+  );
+});
+
+const unquotedHTML = computed(() =>
+  EmailQuoteExtractor.extractQuotes(fullHTML.value)
+);
+
+const hasQuotedMessage = computed(() =>
+  EmailQuoteExtractor.hasQuotes(fullHTML.value)
+);
+
+const textToShow = computed(() => {
+  const text = props.message?.textContent?.full;
+  return text?.replace(/\n/g, '<br>');
+});
+
+const onContactSearch = debounce(
+  async query => {
+    isSearching.value = true;
+    contacts.value = [];
+    try {
+      contacts.value = await searchContacts(query);
+      isSearching.value = false;
+    } catch (error) {
+      useAlert(t('FORWARD_MESSAGE_FORM.CONTACT_SEARCH.ERROR_MESSAGE'));
+    } finally {
+      isSearching.value = false;
+    }
+  },
+  300,
+  false
+);
+
+const handleClickOutside = () => {
+  selectedContact.value = null;
+  emit('close');
+};
+
+const handleForwardMessage = async ({ state }) => {
+  try {
+    const messagePayload = {
+      conversationId: currentChat.value?.id,
+      message: state.message,
+      toEmails: selectedContact.value?.email,
+      private: false,
+      contentAttributes: {
+        forwarded_message_id: props.messageId,
+      },
+      sender: {
+        name: currentUser.value?.name,
+        thumbnail: currentUser.value?.avatar_url,
+      },
+      files: globalConfig.value?.directUploadsEnabled
+        ? state.attachedFiles.map(file => file.blobSignedId)
+        : state.attachedFiles.map(file => file.resource.file),
+    };
+    await store.dispatch('createPendingMessageAndSend', messagePayload);
+    emitter.emit(BUS_EVENTS.SCROLL_TO_MESSAGE);
+    emitter.emit(BUS_EVENTS.MESSAGE_SENT);
+    // Close the forward message modal after sending
+    emit('close');
+  } catch (error) {
+    const errorMessage =
+      error?.response?.data?.error ||
+      t('FORWARD_MESSAGE_FORM.FORWARD_MESSAGE.ERROR_MESSAGE');
+    useAlert(errorMessage);
+  }
+};
+
+const handleSelectedContact = async ({ value, action, ...rest }) => {
+  let contact;
+  if (action === 'create') {
+    isCreatingContact.value = true;
+    try {
+      contact = await createNewContact(value);
+      isCreatingContact.value = false;
+    } catch (error) {
+      isCreatingContact.value = false;
+      return;
+    }
+  } else {
+    contact = rest;
+  }
+  selectedContact.value = contact;
+};
+</script>
+
+<template>
+  <div
+    v-on-click-outside="[
+      handleClickOutside,
+      // Fixed and edge case https://github.com/chatwoot/chatwoot/issues/10785
+      // This will prevent closing the compose conversation modal when the editor Create link popup is open
+      { ignore: ['div.ProseMirror-prompt'] },
+    ]"
+  >
+    <ForwardMessageForm
+      :forward-type="forwardType"
+      :contacts="contacts"
+      :selected-contact="selectedContact"
+      :is-loading="isSearching"
+      :is-creating-contact="isCreatingContact"
+      :from-email="fromEmail"
+      :message="message"
+      :attachments="attachments"
+      :message-signature="messageSignature"
+      :content="content"
+      :is-plain-email="!message || !Object.keys(message).length"
+      :full-html="fullHTML"
+      :unquoted-html="unquotedHTML"
+      :text-to-show="textToShow"
+      :has-quoted-message="hasQuotedMessage"
+      @search-contacts="onContactSearch"
+      @update-selected-contact="handleSelectedContact"
+      @clear-selected-contact="selectedContact = null"
+      @discard="emit('close')"
+      @forward-message="handleForwardMessage"
+    />
+  </div>
+</template>

app/javascript/dashboard/components-next/message/forwardMessage/components/EmailMessageEditor.vue

@@ -0,0 +1,97 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { Letter } from 'vue-letter';
+import { allowedCssProperties } from 'lettersanitizer';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+import EmailMeta from 'dashboard/components-next/message/bubbles/Email/EmailMeta.vue';
+
+import FormattedContent from 'next/message/bubbles/Text/FormattedContent.vue';
+import Editor from 'dashboard/components-next/Editor/Editor.vue';
+
+defineProps({
+  content: { type: String, default: '' },
+  isPlainEmail: { type: Boolean, default: false },
+  hasQuotedMessage: { type: Boolean, default: false },
+  fullHtml: { type: String, default: '' },
+  unquotedHtml: { type: String, default: '' },
+  textToShow: { type: String, default: '' },
+});
+
+const { t } = useI18n();
+
+const modelValue = defineModel({
+  type: String,
+  default: '',
+});
+
+const showQuotedMessage = ref(false);
+</script>
+
+<template>
+  <div class="flex-1 h-full">
+    <Editor
+      v-model="modelValue"
+      :placeholder="t('FORWARD_MESSAGE_FORM.EMAIL_EDITOR_PLACEHOLDER')"
+      class="[&>div]:!border-transparent [&>div]:px-4 [&>div]:py-4 [&>div]:!bg-transparent h-full [&_.ProseMirror-woot-style]:!max-h-[200px] [&_.ProseMirror-woot-style]:!min-h-fit"
+      enable-variables
+      :show-character-count="false"
+    />
+    <div class="px-4 pb-4 flex flex-col gap-2">
+      <div class="flex items-center gap-1.5">
+        <span class="text-sm text-n-slate-12">
+          {{ t('FORWARD_MESSAGE_FORM.FORWARDED_MESSAGE') }}
+        </span>
+      </div>
+      <EmailMeta />
+    </div>
+    <div class="px-4 pb-4">
+      <FormattedContent
+        v-if="isPlainEmail"
+        class="text-n-slate-12"
+        :content="content"
+      />
+      <template v-else>
+        <Letter
+          v-if="showQuotedMessage"
+          class-name="prose prose-bubble !max-w-none letter-render"
+          :allowed-css-properties="[
+            ...allowedCssProperties,
+            'transform',
+            'transform-origin',
+          ]"
+          :html="fullHtml"
+          :text="textToShow"
+        />
+        <Letter
+          v-else
+          class-name="prose prose-bubble !max-w-none letter-render"
+          :html="unquotedHtml"
+          :allowed-css-properties="[
+            ...allowedCssProperties,
+            'transform',
+            'transform-origin',
+          ]"
+          :text="textToShow"
+        />
+      </template>
+      <button
+        v-if="hasQuotedMessage"
+        class="text-n-slate-11 px-1 leading-none text-sm bg-n-alpha-black2 text-center flex items-center gap-1 mt-2"
+        @click="showQuotedMessage = !showQuotedMessage"
+      >
+        <template v-if="showQuotedMessage">
+          {{ t('FORWARD_MESSAGE_FORM.HIDE_QUOTED_TEXT') }}
+        </template>
+        <template v-else>
+          {{ t('FORWARD_MESSAGE_FORM.SHOW_QUOTED_TEXT') }}
+        </template>
+        <Icon
+          :icon="
+            showQuotedMessage ? 'i-lucide-chevron-up' : 'i-lucide-chevron-down'
+          "
+        />
+      </button>
+    </div>
+  </div>
+</template>

app/javascript/dashboard/components-next/message/forwardMessage/components/ForwardMessageForm.vue

@@ -0,0 +1,213 @@
+<script setup>
+import { ref, computed, reactive } from 'vue';
+import { useVuelidate } from '@vuelidate/core';
+import { useI18n } from 'vue-i18n';
+import { required } from '@vuelidate/validators';
+import { buildContactableInboxesList } from 'dashboard/components-next/NewConversation/helpers/composeConversationHelper.js';
+import {
+  appendSignature,
+  removeSignature,
+} from 'dashboard/helper/editorHelper';
+
+import ContactSelector from 'dashboard/components-next/NewConversation/components/ContactSelector.vue';
+import ActionButtons from 'dashboard/components-next/NewConversation/components/ActionButtons.vue';
+import AttachmentPreviews from 'dashboard/components-next/NewConversation/components/AttachmentPreviews.vue';
+import EmailMessageEditor from './EmailMessageEditor.vue';
+import AttachmentChips from 'next/message/chips/AttachmentChips.vue';
+
+const props = defineProps({
+  forwardType: { type: String, default: 'email' }, // eslint-disable-line vue/no-unused-properties
+  contacts: { type: Array, default: () => [] },
+  selectedContact: { type: Object, default: null },
+  isLoading: { type: Boolean, default: false },
+  isCreatingContact: { type: Boolean, default: false },
+  fromEmail: { type: String, default: null },
+  messageSignature: { type: String, default: '' },
+  content: { type: String, default: '' },
+  isPlainEmail: { type: Boolean, default: false },
+  fullHtml: { type: String, default: '' },
+  unquotedHtml: { type: String, default: '' },
+  textToShow: { type: String, default: '' },
+  hasQuotedMessage: { type: Boolean, default: false },
+  attachments: { type: Array, default: () => [] },
+});
+
+const emit = defineEmits([
+  'searchContacts',
+  'updateSelectedContact',
+  'clearSelectedContact',
+  'discard',
+  'forwardMessage',
+]);
+
+const { t } = useI18n();
+
+const state = reactive({
+  message: '',
+  attachedFiles: [],
+});
+
+const showContactsDropdown = ref(false);
+
+const contactableInboxesList = computed(() => {
+  return buildContactableInboxesList(props.selectedContact?.contactInboxes);
+});
+
+const validationRules = computed(() => ({
+  selectedContact: { required },
+}));
+
+const v$ = useVuelidate(validationRules, {
+  selectedContact: computed(() => props.selectedContact),
+});
+
+const validationStates = computed(() => ({
+  isContactInvalid:
+    v$.value.selectedContact.$dirty && v$.value.selectedContact.$invalid,
+}));
+
+const handleContactSearch = value => {
+  showContactsDropdown.value = true;
+  emit('searchContacts', {
+    keys: ['email'],
+    query: value,
+  });
+};
+
+const setSelectedContact = async ({ value, action, ...rest }) => {
+  v$.value.$reset();
+  emit('updateSelectedContact', { value, action, ...rest });
+  showContactsDropdown.value = false;
+};
+
+const clearSelectedContact = () => {
+  emit('clearSelectedContact');
+  state.attachedFiles = [];
+};
+
+const handleDropdownUpdate = (type, value) => {
+  showContactsDropdown.value = value;
+};
+
+const onClickInsertEmoji = emoji => {
+  state.message += emoji;
+};
+
+const handleAddSignature = signature => {
+  state.message = appendSignature(state.message, signature);
+};
+
+const handleRemoveSignature = signature => {
+  state.message = removeSignature(state.message, signature);
+};
+
+const handleAttachFile = files => {
+  state.attachedFiles = files;
+};
+
+const clearForm = () => {
+  Object.assign(state, {
+    message: '',
+    attachedFiles: [],
+  });
+  v$.value.$reset();
+};
+
+const handleSendMessage = async () => {
+  const isValid = await v$.value.$validate();
+  if (!isValid) return;
+
+  try {
+    const success = await emit('forwardMessage', { state });
+    if (success) {
+      clearForm();
+    }
+  } catch (error) {
+    // Form will not be cleared if conversation creation fails
+  }
+};
+</script>
+
+<template>
+  <div
+    class="w-[42rem] max-h-[31.25rem] divide-y divide-n-strong transition-all duration-300 ease-in-out top-full justify-between flex flex-col border border-n-strong shadow-sm backdrop-blur-[100px] rounded-xl overflow-hidden"
+  >
+    <div
+      class="relative flex-1 rounded-t-xl px-4 py-3 overflow-y-visible bg-n-alpha-3"
+    >
+      <div class="flex items-baseline w-full gap-3 min-h-7">
+        <label class="text-sm font-medium text-n-slate-11 whitespace-nowrap">
+          {{ t('FORWARD_MESSAGE_FORM.FROM') }}
+        </label>
+
+        <div
+          class="flex items-center gap-1.5 rounded-md bg-n-alpha-2 px-3 min-h-7 min-w-0"
+        >
+          <span class="text-sm truncate text-n-slate-12">
+            {{ fromEmail }}
+          </span>
+        </div>
+      </div>
+    </div>
+    <ContactSelector
+      class="bg-n-alpha-3"
+      :contacts="contacts"
+      :selected-contact="selectedContact"
+      :show-contacts-dropdown="showContactsDropdown"
+      :is-loading="isLoading"
+      :is-creating-contact="isCreatingContact"
+      :contactable-inboxes-list="contactableInboxesList"
+      :show-inboxes-dropdown="false"
+      :has-errors="validationStates.isContactInvalid"
+      @search-contacts="handleContactSearch"
+      @set-selected-contact="setSelectedContact"
+      @clear-selected-contact="clearSelectedContact"
+      @update-dropdown="handleDropdownUpdate"
+    />
+    <div class="overflow-y-scroll">
+      <EmailMessageEditor
+        v-model="state.message"
+        class="bg-n-alpha-3"
+        :content="content"
+        :is-plain-email="isPlainEmail"
+        :has-quoted-message="hasQuotedMessage"
+        :full-html="fullHtml"
+        :unquoted-html="unquotedHtml"
+        :text-to-show="textToShow"
+      />
+      <section
+        v-if="Array.isArray(attachments) && attachments.length"
+        class="px-4 pb-4 pt-2 !border-t-0 space-y-2 bg-n-alpha-3"
+      >
+        <AttachmentChips
+          :attachments="attachments"
+          class="gap-1 !justify-start"
+        />
+      </section>
+    </div>
+    <AttachmentPreviews
+      v-if="state.attachedFiles.length > 0"
+      :attachments="state.attachedFiles"
+      class="bg-n-alpha-3"
+      @update:attachments="state.attachedFiles = $event"
+    />
+    <ActionButtons
+      class="bg-n-alpha-3 sticky bottom-0 backdrop-blur-[100px]"
+      :attached-files="state.attachedFiles"
+      is-email-or-web-widget-inbox
+      channel-type="Channel::Email"
+      :is-loading="false"
+      :disable-send-button="false"
+      has-selected-inbox
+      :has-no-inbox="false"
+      :is-dropdown-active="showContactsDropdown"
+      :message-signature="messageSignature"
+      @insert-emoji="onClickInsertEmoji"
+      @add-signature="handleAddSignature"
+      @remove-signature="handleRemoveSignature"
+      @attach-file="handleAttachFile"
+      @discard="$emit('discard')"
+      @send-message="handleSendMessage"
+    />
+  </div>
+</template>

app/javascript/dashboard/components-next/message/provider.js

@@ -100,7 +100,7 @@ const MessageControl = Symbol('MessageControl');
  * @property {import('vue').ComputedRef<MessageVariant>} variant - The visual variant of the message
  * @property {import('vue').ComputedRef<boolean>} isBotOrAgentMessage - Does the message belong to the current user
  * @property {import('vue').ComputedRef<boolean>} isPrivate - Proxy computed value for private
- * @property {import('vue').ComputedRef<boolean>} shouldGroupWithNext - Should group with the next message or not, it is differnt from groupWithNext, this has a bypass for a failed message
+ * @property {import('vue').ComputedRef<boolean>} shouldGroupWithNext - Should group with the next message or not, it is different from groupWithNext, this has a bypass for a failed message
  */
 
 /**

app/javascript/dashboard/components-next/message/stories/Template/CallToAction.story.vue

@@ -1,21 +0,0 @@
-<script setup>
-import CallToAction from '../../bubbles/Template/CallToAction.vue';
-
-const message = {
-  content:
-    'We have super cool products going live! Pre-order and customize products. Contact us for more details',
-};
-</script>
-
-<template>
-  <Story
-    title="Components/Message Bubbles/Template/CallToAction"
-    :layout="{ type: 'grid', width: '600px' }"
-  >
-    <Variant title="Call To Action">
-      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
-        <CallToAction :message="message" />
-      </div>
-    </Variant>
-  </Story>
-</template>

app/javascript/dashboard/components-next/message/stories/Template/Card.story.vue

@@ -1,23 +0,0 @@
-<script setup>
-import Card from '../../bubbles/Template/Card.vue';
-
-const message = {
-  title: 'Two in one cake (1 pound)',
-  content: 'Customize your order for special occasions',
-  image_url:
-    'https://images.unsplash.com/photo-1506905925346-21bda4d32df4?w=500&h=300&fit=crop',
-};
-</script>
-
-<template>
-  <Story
-    title="Components/Message Bubbles/Template/Card"
-    :layout="{ type: 'grid', width: '600px' }"
-  >
-    <Variant title="Card">
-      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
-        <Card :message="message" />
-      </div>
-    </Variant>
-  </Story>
-</template>

app/javascript/dashboard/components-next/message/stories/Template/ListPicker.story.vue

@@ -1,21 +0,0 @@
-<script setup>
-import ListPicker from '../../bubbles/Template/ListPicker.vue';
-
-const message = {
-  content: `Hey there! Thanks for reaching out to us. Could you let us know
-what you need to help us better assist you? `,
-};
-</script>
-
-<template>
-  <Story
-    title="Components/Message Bubbles/Template/ListPicker"
-    :layout="{ type: 'grid', width: '600px' }"
-  >
-    <Variant title="ListPicker">
-      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
-        <ListPicker :message="message" />
-      </div>
-    </Variant>
-  </Story>
-</template>

app/javascript/dashboard/components-next/message/stories/Template/Media.story.vue

@@ -1,23 +0,0 @@
-<script setup>
-import Media from '../../bubbles/Template/Media.vue';
-
-const message = {
-  content:
-    'Welcome to our Diwali sale! Get flat 50% off on select items. Hurry now!',
-  image_url:
-    'https://images.unsplash.com/photo-1506905925346-21bda4d32df4?w=500&h=300&fit=crop',
-};
-</script>
-
-<template>
-  <Story
-    title="Components/Message Bubbles/Template/Media"
-    :layout="{ type: 'grid', width: '600px' }"
-  >
-    <Variant title="Image Media">
-      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
-        <Media :message="message" />
-      </div>
-    </Variant>
-  </Story>
-</template>

app/javascript/dashboard/components-next/message/stories/Template/QuickReply.story.vue

@@ -1,21 +0,0 @@
-<script setup>
-import QuickReply from '../../bubbles/Template/QuickReply.vue';
-
-const message = {
-  content: `Hey there! Thanks for reaching out to us. Could you let us know
-what you need to help us better assist you?`,
-};
-</script>
-
-<template>
-  <Story
-    title="Components/Message Bubbles/Template/QuickReply"
-    :layout="{ type: 'grid', width: '600px' }"
-  >
-    <Variant title="Quick Replies">
-      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
-        <QuickReply :message="message" />
-      </div>
-    </Variant>
-  </Story>
-</template>

app/javascript/dashboard/components-next/message/stories/Template/Text.story.vue

@@ -1,20 +0,0 @@
-<script setup>
-import Text from '../../bubbles/Template/Text.vue';
-
-const message = {
-  content: 'Hello John, how may we assist you?',
-};
-</script>
-
-<template>
-  <Story
-    title="Components/Message Bubbles/Template/Text"
-    :layout="{ type: 'grid', width: '600px' }"
-  >
-    <Variant title="Default Text">
-      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
-        <Text :message="message" />
-      </div>
-    </Variant>
-  </Story>
-</template>

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

@@ -13,7 +13,6 @@ import { vOnClickOutside } from '@vueuse/components';
 import Button from 'dashboard/components-next/button/Button.vue';
 import SidebarGroup from './SidebarGroup.vue';
 import SidebarProfileMenu from './SidebarProfileMenu.vue';
-import SidebarChangelogCard from './SidebarChangelogCard.vue';
 import ChannelLeaf from './ChannelLeaf.vue';
 import SidebarAccountSwitcher from './SidebarAccountSwitcher.vue';
 import Logo from 'next/icon/Logo.vue';
@@ -33,15 +32,11 @@ const emit = defineEmits([
   'closeMobileSidebar',
 ]);
 
-const { accountScopedRoute, isOnChatwootCloud } = useAccount();
+const { accountScopedRoute } = useAccount();
 const store = useStore();
 const searchShortcut = useKbd([`$mod`, 'k']);
 const { t } = useI18n();
 
-const isACustomBrandedInstance = useMapGetter(
-  'globalConfig/isACustomBrandedInstance'
-);
-
 const toggleShortcutModalFn = show => {
   if (show) {
     emit('openKeyShortcutModal');
@@ -237,11 +232,6 @@ const menuItems = computed(() => {
           label: t('SIDEBAR.CAPTAIN_RESPONSES'),
           to: accountScopedRoute('captain_responses_index'),
         },
-        {
-          name: 'Tools',
-          label: t('SIDEBAR.CAPTAIN_TOOLS'),
-          to: accountScopedRoute('captain_tools_index'),
-        },
       ],
     },
     {
@@ -537,20 +527,20 @@ const menuItems = computed(() => {
     ]"
   >
     <section class="grid gap-2 mt-2 mb-4">
-      <div class="flex gap-2 items-center px-2 min-w-0">
-        <div class="grid flex-shrink-0 place-content-center size-6">
+      <div class="flex items-center min-w-0 gap-2 px-2">
+        <div class="grid flex-shrink-0 size-6 place-content-center">
           <Logo class="size-4" />
         </div>
         <div class="flex-shrink-0 w-px h-3 bg-n-strong" />
         <SidebarAccountSwitcher
-          class="flex-grow -mx-1 min-w-0"
+          class="flex-grow min-w-0 -mx-1"
           @show-create-account-modal="emit('showCreateAccountModal')"
         />
       </div>
       <div class="flex gap-2 px-2">
         <RouterLink
           :to="{ name: 'search' }"
-          class="flex gap-2 items-center px-2 py-1 w-full h-7 rounded-lg outline outline-1 outline-n-weak bg-n-solid-3 dark:bg-n-black/30"
+          class="flex items-center w-full gap-2 px-2 py-1 rounded-lg h-7 outline outline-1 outline-n-weak bg-n-solid-3 dark:bg-n-black/30"
         >
           <span class="flex-shrink-0 i-lucide-search size-4 text-n-slate-11" />
           <span class="flex-grow text-left">
@@ -575,7 +565,7 @@ const menuItems = computed(() => {
         </ComposeConversation>
       </div>
     </section>
-    <nav class="grid overflow-y-scroll flex-grow gap-2 px-2 pb-5 no-scrollbar">
+    <nav class="grid flex-grow gap-2 px-2 pb-5 overflow-y-scroll no-scrollbar">
       <ul class="flex flex-col gap-1.5 m-0 list-none">
         <SidebarGroup
           v-for="item in menuItems"
@@ -585,21 +575,11 @@ const menuItems = computed(() => {
       </ul>
     </nav>
     <section
-      class="flex flex-col flex-shrink-0 relative gap-1 justify-between items-center"
+      class="p-1 border-t border-n-weak shadow-[0px_-2px_4px_0px_rgba(27,28,29,0.02)] flex-shrink-0 flex justify-between gap-2 items-center"
     >
-      <div
-        class="pointer-events-none absolute inset-x-0 -top-[31px] h-8 bg-gradient-to-t from-n-solid-2 to-transparent"
+      <SidebarProfileMenu
+        @open-key-shortcut-modal="emit('openKeyShortcutModal')"
       />
-      <SidebarChangelogCard
-        v-if="isOnChatwootCloud && !isACustomBrandedInstance"
-      />
-      <div
-        class="p-1 flex-shrink-0 flex w-full justify-between z-10 gap-2 items-center border-t border-n-weak shadow-[0px_-2px_4px_0px_rgba(27,28,29,0.02)]"
-      >
-        <SidebarProfileMenu
-          @open-key-shortcut-modal="emit('openKeyShortcutModal')"
-        />
-      </div>
     </section>
   </aside>
 </template>

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

@@ -1,110 +0,0 @@
-<script setup>
-import { ref, computed, onMounted } from 'vue';
-import GroupedStackedChangelogCard from 'dashboard/components-next/changelog-card/GroupedStackedChangelogCard.vue';
-import { useUISettings } from 'dashboard/composables/useUISettings';
-import changelogAPI from 'dashboard/api/changelog';
-
-const MAX_DISMISSED_SLUGS = 5;
-
-const { uiSettings, updateUISettings } = useUISettings();
-const posts = ref([]);
-const currentIndex = ref(0);
-const dismissingCards = ref([]);
-const isLoading = ref(false);
-
-// Get current dismissed slugs from ui_settings
-const dismissedSlugs = computed(() => {
-  return uiSettings.value.changelog_dismissed_slugs || [];
-});
-
-// Get un dismissed posts - these are the changelog posts that should be shown
-const unDismissedPosts = computed(() => {
-  return posts.value.filter(post => !dismissedSlugs.value.includes(post.slug));
-});
-
-// Fetch changelog posts from API
-const fetchChangelog = async () => {
-  isLoading.value = true;
-
-  try {
-    const response = await changelogAPI.fetchFromHub();
-    posts.value = response.data.posts || [];
-
-    // Clean up dismissed slugs - remove any that are no longer in the current feed
-    const currentSlugs = posts.value.map(post => post.slug);
-    const cleanedDismissedSlugs = dismissedSlugs.value.filter(slug =>
-      currentSlugs.includes(slug)
-    );
-
-    // Update ui_settings if cleanup occurred
-    if (cleanedDismissedSlugs.length !== dismissedSlugs.value.length) {
-      updateUISettings({
-        changelog_dismissed_slugs: cleanedDismissedSlugs,
-      });
-    }
-    // eslint-disable-next-line no-empty
-  } catch (err) {
-  } finally {
-    isLoading.value = false;
-  }
-};
-
-// Dismiss a changelog post
-const dismissPost = slug => {
-  const currentDismissed = [...dismissedSlugs.value];
-
-  // Add new slug if not already present
-  if (!currentDismissed.includes(slug)) {
-    currentDismissed.push(slug);
-
-    // Keep only the most recent MAX_DISMISSED_SLUGS entries
-    if (currentDismissed.length > MAX_DISMISSED_SLUGS) {
-      currentDismissed.shift(); // Remove oldest entry
-    }
-
-    updateUISettings({
-      changelog_dismissed_slugs: currentDismissed,
-    });
-  }
-};
-
-const handleDismiss = slug => {
-  dismissingCards.value.push(slug);
-  setTimeout(() => {
-    dismissPost(slug);
-    dismissingCards.value = dismissingCards.value.filter(s => s !== slug);
-    if (currentIndex.value >= unDismissedPosts.value.length)
-      currentIndex.value = 0;
-  }, 200);
-};
-
-const handleReadMore = () => {
-  const currentPost = unDismissedPosts.value[currentIndex.value];
-  if (currentPost?.slug) {
-    window.open(`https://www.chatwoot.com/blog/${currentPost.slug}`, '_blank');
-  }
-};
-
-const handleImgClick = ({ index }) => {
-  currentIndex.value = index;
-  handleReadMore();
-};
-
-onMounted(() => {
-  fetchChangelog();
-});
-</script>
-
-<template>
-  <GroupedStackedChangelogCard
-    v-if="unDismissedPosts.length > 0"
-    :posts="unDismissedPosts"
-    :current-index="currentIndex"
-    :dismissing-slugs="dismissingCards"
-    class="min-h-[240px] z-10"
-    @read-more="handleReadMore"
-    @dismiss="handleDismiss"
-    @img-click="handleImgClick"
-  />
-  <template v-else />
-</template>

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

@@ -76,7 +76,7 @@ function changeAvailabilityStatus(availability) {
 </script>
 
 <template>
-  <DropdownSection class="[&>ul]:overflow-visible">
+  <DropdownSection>
     <div class="grid gap-0">
       <DropdownItem preserve-open>
         <div class="flex-grow flex items-center gap-1">

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

@@ -24,7 +24,7 @@ const menuRef = useTemplateRef('menuRef');
 
 const scrollLockElement = computed(() => {
   if (!elementToLock?.value) return null;
-  return elementToLock.value?.$el;
+  return elementToLock.value.$el;
 });
 
 const isLocked = useScrollLock(scrollLockElement);

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

@@ -118,14 +118,6 @@ export default {
       type: String,
       default: '',
     },
-    showQuotedReplyToggle: {
-      type: Boolean,
-      default: false,
-    },
-    quotedReplyEnabled: {
-      type: Boolean,
-      default: false,
-    },
   },
   emits: [
     'replaceText',
@@ -133,7 +125,6 @@ export default {
     'toggleEditor',
     'selectWhatsappTemplate',
     'selectContentTemplate',
-    'toggleQuotedReply',
   ],
   setup() {
     const { setSignatureFlagForInbox, fetchSignatureFlagFromUISettings } =
@@ -258,11 +249,6 @@ export default {
     isFetchingAppIntegrations() {
       return this.uiFlags.isFetching;
     },
-    quotedReplyToggleTooltip() {
-      return this.quotedReplyEnabled
-        ? this.$t('CONVERSATION.REPLYBOX.QUOTED_REPLY.DISABLE_TOOLTIP')
-        : this.$t('CONVERSATION.REPLYBOX.QUOTED_REPLY.ENABLE_TOOLTIP');
-    },
   },
   mounted() {
     ActiveStorage.start();
@@ -353,16 +339,6 @@ export default {
         sm
         @click="toggleMessageSignature"
       />
-      <NextButton
-        v-if="showQuotedReplyToggle"
-        v-tooltip.top-end="quotedReplyToggleTooltip"
-        icon="i-ph-quotes"
-        :variant="quotedReplyEnabled ? 'solid' : 'faded'"
-        color="slate"
-        sm
-        :aria-pressed="quotedReplyEnabled"
-        @click="$emit('toggleQuotedReply')"
-      />
       <NextButton
         v-if="enableWhatsAppTemplates"
         v-tooltip.top-end="$t('CONVERSATION.FOOTER.WHATSAPP_TEMPLATES')"

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

@@ -11,6 +11,7 @@ import ReplyBox from './ReplyBox.vue';
 import MessageList from 'next/message/MessageList.vue';
 import ConversationLabelSuggestion from './conversation/LabelSuggestion.vue';
 import Banner from 'dashboard/components/ui/Banner.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 
 // stores and apis
@@ -44,6 +45,7 @@ export default {
     Banner,
     ConversationLabelSuggestion,
     Spinner,
+    Icon,
   },
   mixins: [inboxMixin],
   setup() {
@@ -495,6 +497,16 @@ export default {
           </span>
         </li>
       </template>
+      <template #forwardedMessageAddress="{ address }">
+        <li class="flex items-center gap-1 !mt-4 !mb-2.5 ltr:pl-9 rtl:pr-9 h-5">
+          <Icon icon="i-lucide-forward" class="text-n-amber-10 size-4" />
+          <span class="text-n-amber-10 text-xs font-medium leading-[20px]">
+            {{
+              $t('CONVERSATION.FORWARDED_TO', { address: address?.join(', ') })
+            }}
+          </span>
+        </li>
+      </template>
       <template #after>
         <ConversationLabelSuggestion
           v-if="shouldShowLabelSuggestions"

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

@@ -1,76 +0,0 @@
-<script setup>
-import { computed, ref } from 'vue';
-import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
-import { useI18n } from 'vue-i18n';
-import NextButton from 'dashboard/components-next/button/Button.vue';
-
-const props = defineProps({
-  quotedEmailText: {
-    type: String,
-    required: true,
-  },
-  previewText: {
-    type: String,
-    required: true,
-  },
-});
-
-const emit = defineEmits(['toggle']);
-
-const { t } = useI18n();
-const { formatMessage } = useMessageFormatter();
-
-const isExpanded = ref(false);
-
-const formattedQuotedEmailText = computed(() => {
-  if (!props.quotedEmailText) {
-    return '';
-  }
-  return formatMessage(props.quotedEmailText, false, false, true);
-});
-
-const toggleExpand = () => {
-  isExpanded.value = !isExpanded.value;
-};
-</script>
-
-<template>
-  <div class="mt-2">
-    <div
-      class="relative rounded-md px-3 py-2 text-xs text-n-slate-12 bg-n-slate-3 dark:bg-n-solid-3"
-    >
-      <div class="absolute top-2 right-2 z-10 flex items-center gap-1">
-        <NextButton
-          v-tooltip="
-            isExpanded
-              ? t('CONVERSATION.REPLYBOX.QUOTED_REPLY.COLLAPSE')
-              : t('CONVERSATION.REPLYBOX.QUOTED_REPLY.EXPAND')
-          "
-          ghost
-          slate
-          xs
-          :icon="isExpanded ? 'i-lucide-minimize' : 'i-lucide-maximize'"
-          @click="toggleExpand"
-        />
-        <NextButton
-          v-tooltip="t('CONVERSATION.REPLYBOX.QUOTED_REPLY.REMOVE_PREVIEW')"
-          ghost
-          slate
-          xs
-          icon="i-lucide-x"
-          @click="emit('toggle')"
-        />
-      </div>
-      <div
-        v-dompurify-html="formattedQuotedEmailText"
-        class="w-full max-w-none break-words prose prose-sm dark:prose-invert cursor-pointer ltr:pr-8 rtl:pl-8"
-        :class="{
-          'line-clamp-1': !isExpanded,
-          'max-h-60 overflow-y-auto': isExpanded,
-        }"
-        :title="previewText"
-        @click="toggleExpand"
-      />
-    </div>
-  </div>
-</template>

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

@@ -5,7 +5,6 @@ import { useAlert } from 'dashboard/composables';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import { useTrack } from 'dashboard/composables';
 import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 import CannedResponse from './CannedResponse.vue';
 import ReplyToMessage from './ReplyToMessage.vue';
@@ -17,7 +16,6 @@ import ReplyBottomPanel from 'dashboard/components/widgets/WootWriter/ReplyBotto
 import ArticleSearchPopover from 'dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue';
 import MessageSignatureMissingAlert from './MessageSignatureMissingAlert.vue';
 import ReplyBoxBanner from './ReplyBoxBanner.vue';
-import QuotedEmailPreview from './QuotedEmailPreview.vue';
 import { REPLY_EDITOR_MODES } from 'dashboard/components/widgets/WootWriter/constants';
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor.vue';
 import AudioRecorder from 'dashboard/components/widgets/WootWriter/AudioRecorder.vue';
@@ -34,12 +32,6 @@ import { MESSAGE_MAX_LENGTH } from 'shared/helpers/MessageTypeHelper';
 import inboxMixin, { INBOX_FEATURES } from 'shared/mixins/inboxMixin';
 import { trimContent, debounce, getRecipients } from '@chatwoot/utils';
 import wootConstants from 'dashboard/constants/globals';
-import {
-  extractQuotedEmailText,
-  buildQuotedEmailHeader,
-  truncatePreviewText,
-  appendQuotedTextToMessage,
-} from 'dashboard/helper/quotedEmailHelper';
 import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
 import fileUploadMixin from 'dashboard/mixins/fileUploadMixin';
 import {
@@ -73,7 +65,6 @@ export default {
     ContentTemplates,
     WhatsappTemplates,
     WootMessageEditor,
-    QuotedEmailPreview,
   },
   mixins: [inboxMixin, fileUploadMixin, keyboardEventListenerMixins],
   props: {
@@ -89,8 +80,6 @@ export default {
       updateUISettings,
       isEditorHotKeyEnabled,
       fetchSignatureFlagFromUISettings,
-      setQuotedReplyFlagForInbox,
-      fetchQuotedReplyFlagFromUISettings,
     } = useUISettings();
 
     const replyEditor = useTemplateRef('replyEditor');
@@ -100,8 +89,6 @@ export default {
       updateUISettings,
       isEditorHotKeyEnabled,
       fetchSignatureFlagFromUISettings,
-      setQuotedReplyFlagForInbox,
-      fetchQuotedReplyFlagFromUISettings,
       replyEditor,
     };
   },
@@ -143,8 +130,6 @@ export default {
       currentUser: 'getCurrentUser',
       lastEmail: 'getLastEmailInSelectedChat',
       globalConfig: 'globalConfig/get',
-      accountId: 'getCurrentAccountId',
-      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
     }),
     currentContact() {
       return this.$store.getters['contacts/getContact'](
@@ -382,51 +367,6 @@ export default {
       const { slug = '' } = portal;
       return slug;
     },
-    isQuotedEmailReplyEnabled() {
-      return this.isFeatureEnabledonAccount(
-        this.accountId,
-        FEATURE_FLAGS.QUOTED_EMAIL_REPLY
-      );
-    },
-    quotedReplyPreference() {
-      if (!this.isAnEmailChannel || !this.isQuotedEmailReplyEnabled) {
-        return false;
-      }
-
-      return !!this.fetchQuotedReplyFlagFromUISettings(this.channelType);
-    },
-    lastEmailWithQuotedContent() {
-      if (!this.isAnEmailChannel) {
-        return null;
-      }
-
-      const lastEmail = this.lastEmail;
-      if (!lastEmail || lastEmail.private) {
-        return null;
-      }
-
-      return lastEmail;
-    },
-    quotedEmailText() {
-      return extractQuotedEmailText(this.lastEmailWithQuotedContent);
-    },
-    quotedEmailPreviewText() {
-      return truncatePreviewText(this.quotedEmailText, 80);
-    },
-    shouldShowQuotedReplyToggle() {
-      return (
-        this.isAnEmailChannel &&
-        !this.isOnPrivateNote &&
-        this.isQuotedEmailReplyEnabled
-      );
-    },
-    shouldShowQuotedPreview() {
-      return (
-        this.shouldShowQuotedReplyToggle &&
-        this.quotedReplyPreference &&
-        !!this.quotedEmailText
-      );
-    },
   },
   watch: {
     currentChat(conversation, oldConversation) {
@@ -576,36 +516,6 @@ export default {
         );
       }
     },
-    toggleQuotedReply() {
-      if (!this.isAnEmailChannel) {
-        return;
-      }
-
-      const nextValue = !this.quotedReplyPreference;
-      this.setQuotedReplyFlagForInbox(this.channelType, nextValue);
-    },
-    shouldIncludeQuotedEmail() {
-      return (
-        this.isQuotedEmailReplyEnabled &&
-        this.quotedReplyPreference &&
-        this.shouldShowQuotedReplyToggle &&
-        !!this.quotedEmailText
-      );
-    },
-    getMessageWithQuotedEmailText(message) {
-      if (!this.shouldIncludeQuotedEmail()) {
-        return message;
-      }
-
-      const quotedText = this.quotedEmailText || '';
-      const header = buildQuotedEmailHeader(
-        this.lastEmailWithQuotedContent,
-        this.currentContact,
-        this.inbox
-      );
-
-      return appendQuotedTextToMessage(message, quotedText, header);
-    },
     resetRecorderAndClearAttachments() {
       // Reset audio recorder UI state
       this.resetAudioRecorderInput();
@@ -1055,11 +965,9 @@ export default {
       return multipleMessagePayload;
     },
     getMessagePayload(message) {
-      const messageWithQuote = this.getMessageWithQuotedEmailText(message);
-
       let messagePayload = {
         conversationId: this.currentChat.id,
-        message: messageWithQuote,
+        message,
         private: this.isPrivate,
         sender: this.sender,
       };
@@ -1087,6 +995,7 @@ export default {
       if (this.toEmails && !this.isOnPrivateNote) {
         messagePayload.toEmails = this.toEmails;
       }
+
       return messagePayload;
     },
     setCcEmails(value) {
@@ -1251,12 +1160,6 @@ export default {
         @toggle-variables-menu="toggleVariablesMenu"
         @clear-selection="clearEditorSelection"
       />
-      <QuotedEmailPreview
-        v-if="shouldShowQuotedPreview"
-        :quoted-email-text="quotedEmailText"
-        :preview-text="quotedEmailPreviewText"
-        @toggle="toggleQuotedReply"
-      />
     </div>
     <div
       v-if="hasAttachments && !showAudioRecorderEditor"
@@ -1292,8 +1195,6 @@ export default {
       :show-editor-toggle="isAPIInbox && !isOnPrivateNote"
       :show-emoji-picker="showEmojiPicker"
       :show-file-upload="showFileUpload"
-      :show-quoted-reply-toggle="shouldShowQuotedReplyToggle"
-      :quoted-reply-enabled="quotedReplyPreference"
       :toggle-audio-recorder-play-pause="toggleAudioRecorderPlayPause"
       :toggle-audio-recorder="toggleAudioRecorder"
       :toggle-emoji-picker="toggleEmojiPicker"
@@ -1305,7 +1206,6 @@ export default {
       @toggle-editor="toggleRichContentEditor"
       @replace-text="replaceText"
       @toggle-insert-article="toggleInsertArticle"
-      @toggle-quoted-reply="toggleQuotedReply"
     />
     <WhatsappTemplates
       :inbox-id="inbox.id"

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

@@ -1,129 +1,100 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useMapGetter } from 'dashboard/composables/store';
-import { vOnClickOutside } from '@vueuse/components';
-
+<script>
+import { mapGetters } from 'vuex';
 import NextButton from 'dashboard/components-next/button/Button.vue';
-import Input from 'dashboard/components-next/input/Input.vue';
 
-const emit = defineEmits(['close', 'assign']);
-
-const { t } = useI18n();
-
-const labels = useMapGetter('labels/getLabels');
-
-const query = ref('');
-const selectedLabels = ref([]);
-
-const filteredLabels = computed(() => {
-  if (!query.value) return labels.value;
-  return labels.value.filter(label =>
-    label.title.toLowerCase().includes(query.value.toLowerCase())
-  );
-});
-
-const hasLabels = computed(() => labels.value.length > 0);
-const hasFilteredLabels = computed(() => filteredLabels.value.length > 0);
-
-const isLabelSelected = label => {
-  return selectedLabels.value.includes(label);
-};
-
-const onClose = () => {
-  emit('close');
-};
-
-const handleAssign = () => {
-  if (selectedLabels.value.length > 0) {
-    emit('assign', selectedLabels.value);
-  }
+export default {
+  components: {
+    NextButton,
+  },
+  emits: ['update', 'close', 'assign'],
+  data() {
+    return {
+      query: '',
+      selectedLabels: [],
+    };
+  },
+  computed: {
+    ...mapGetters({ labels: 'labels/getLabels' }),
+    filteredLabels() {
+      return this.labels.filter(label =>
+        label.title.toLowerCase().includes(this.query.toLowerCase())
+      );
+    },
+  },
+  methods: {
+    isLabelSelected(label) {
+      return this.selectedLabels.includes(label);
+    },
+    assignLabels(key) {
+      this.$emit('update', key);
+    },
+    onClose() {
+      this.$emit('close');
+    },
+  },
 };
 </script>
 
 <template>
-  <div
-    v-on-click-outside="onClose"
-    class="absolute ltr:right-2 rtl:left-2 top-12 origin-top-right z-20 w-60 bg-n-alpha-3 backdrop-blur-[100px] border-n-weak rounded-lg border border-solid shadow-md"
-    role="dialog"
-    aria-labelledby="label-dialog-title"
-  >
+  <div v-on-clickaway="onClose" class="labels-container">
     <div class="triangle">
       <svg height="12" viewBox="0 0 24 12" width="24">
         <path d="M20 12l-8-8-12 12" fill-rule="evenodd" stroke-width="1px" />
       </svg>
     </div>
-    <div class="flex items-center justify-between p-2.5">
-      <span class="text-sm font-medium">{{
-        t('BULK_ACTION.LABELS.ASSIGN_LABELS')
-      }}</span>
+    <div class="flex items-center justify-between header">
+      <span>{{ $t('BULK_ACTION.LABELS.ASSIGN_LABELS') }}</span>
       <NextButton ghost xs slate icon="i-lucide-x" @click="onClose" />
     </div>
-    <div class="flex flex-col max-h-60 min-h-0">
-      <header class="py-2 px-2.5">
-        <Input
-          v-model="query"
-          type="search"
-          :placeholder="t('BULK_ACTION.SEARCH_INPUT_PLACEHOLDER')"
-          icon-left="i-lucide-search"
-          size="sm"
-          class="w-full"
-          :aria-label="t('BULK_ACTION.SEARCH_INPUT_PLACEHOLDER')"
-        />
+    <div class="labels-list">
+      <header class="labels-list__header">
+        <div
+          class="flex items-center justify-between h-8 gap-2 label-list-search"
+        >
+          <fluent-icon icon="search" class="search-icon" size="16" />
+          <input
+            v-model="query"
+            type="search"
+            :placeholder="$t('BULK_ACTION.SEARCH_INPUT_PLACEHOLDER')"
+            class="reset-base !outline-0 !text-sm label--search_input"
+          />
+        </div>
       </header>
-      <ul
-        v-if="hasLabels"
-        class="flex-1 overflow-y-auto m-0 list-none"
-        role="listbox"
-        :aria-label="t('BULK_ACTION.LABELS.ASSIGN_LABELS')"
-      >
-        <li v-if="!hasFilteredLabels" class="p-2 text-center">
-          <span class="text-sm text-n-slate-11">{{
-            t('BULK_ACTION.LABELS.NO_LABELS_FOUND')
-          }}</span>
-        </li>
+      <ul class="labels-list__body">
         <li
           v-for="label in filteredLabels"
           :key="label.id"
-          class="my-1 mx-0 py-0 px-2.5"
-          role="option"
-          :aria-selected="isLabelSelected(label.title)"
+          class="label__list-item"
         >
           <label
-            class="items-center rounded-md cursor-pointer flex py-1 px-2.5 hover:bg-n-slate-3 dark:hover:bg-n-solid-3 has-[:checked]:bg-n-slate-2"
+            class="item"
+            :class="{ 'label-selected': isLabelSelected(label.title) }"
           >
             <input
               v-model="selectedLabels"
               type="checkbox"
               :value="label.title"
-              class="my-0 ltr:mr-2.5 rtl:ml-2.5"
-              :aria-label="label.title"
+              class="label-checkbox"
             />
             <span
-              class="overflow-hidden flex-grow w-full text-sm whitespace-nowrap text-ellipsis"
+              class="overflow-hidden label-title whitespace-nowrap text-ellipsis"
             >
               {{ label.title }}
             </span>
             <span
-              class="rounded-md h-3 w-3 flex-shrink-0 border border-solid border-n-weak"
+              class="label-pill"
               :style="{ backgroundColor: label.color }"
             />
           </label>
         </li>
       </ul>
-      <div v-else class="p-2 text-center">
-        <span class="text-sm text-n-slate-11">{{
-          t('CONTACTS_BULK_ACTIONS.NO_LABELS_FOUND')
-        }}</span>
-      </div>
-      <footer class="p-2">
+      <footer class="labels-list__footer">
         <NextButton
           sm
           type="submit"
-          class="w-full"
-          :label="t('BULK_ACTION.LABELS.ASSIGN_SELECTED_LABELS')"
+          :label="$t('BULK_ACTION.LABELS.ASSIGN_SELECTED_LABELS')"
           :disabled="!selectedLabels.length"
-          @click="handleAssign"
+          @click="$emit('assign', selectedLabels)"
         />
       </footer>
     </div>
@@ -131,11 +102,107 @@ const handleAssign = () => {
 </template>
 
 <style scoped lang="scss">
-.triangle {
-  @apply block z-10 absolute text-left -top-3 ltr:right-[--triangle-position] rtl:left-[--triangle-position];
+.labels-list {
+  @apply flex flex-col max-h-[15rem] min-h-[auto];
 
-  svg path {
-    @apply fill-n-alpha-3 backdrop-blur-[100px]  stroke-n-weak;
+  .labels-list__header {
+    @apply bg-n-alpha-3 backdrop-blur-[100px] py-0 px-2.5;
+  }
+
+  .labels-list__body {
+    @apply flex-1 overflow-y-auto py-2.5 mx-0;
+  }
+
+  .labels-list__footer {
+    @apply p-2;
+
+    button {
+      @apply w-full;
+
+      .button__content {
+        @apply text-center;
+      }
+    }
   }
 }
+
+.label-list-search {
+  @apply bg-n-alpha-black2 py-0 px-2.5 border border-solid border-n-strong rounded-md;
+
+  .search-icon {
+    @apply text-n-slate-10;
+  }
+
+  .label--search_input {
+    @apply border-0 text-xs m-0 dark:bg-transparent bg-transparent h-[unset] w-full;
+  }
+}
+
+.labels-container {
+  @apply absolute ltr:right-2 rtl:left-2 top-12 origin-top-right w-auto z-20 max-w-[15rem] min-w-[15rem] bg-n-alpha-3 backdrop-blur-[100px] border-n-weak rounded-lg border border-solid shadow-md;
+
+  .header {
+    @apply p-2.5;
+
+    span {
+      @apply text-sm font-medium;
+    }
+  }
+
+  .container {
+    @apply max-h-[15rem] overflow-y-auto;
+
+    .label__list-container {
+      @apply h-full;
+    }
+  }
+
+  .triangle {
+    @apply block z-10 absolute text-left -top-3 ltr:right-[--triangle-position] rtl:left-[--triangle-position];
+
+    svg path {
+      @apply fill-n-alpha-3 backdrop-blur-[100px]  stroke-n-weak;
+    }
+  }
+}
+
+ul {
+  @apply m-0 list-none;
+}
+
+.labels-placeholder {
+  @apply p-2;
+}
+
+.label__list-item {
+  @apply my-1 mx-0 py-0 px-2.5;
+
+  .item {
+    @apply items-center rounded-md cursor-pointer flex py-1 px-2.5 hover:bg-n-slate-3 dark:hover:bg-n-solid-3;
+
+    &.label-selected {
+      @apply bg-n-slate-2;
+    }
+
+    span {
+      @apply text-sm;
+    }
+
+    .label-checkbox {
+      @apply my-0 ltr:mr-2.5 rtl:ml-2.5;
+    }
+
+    .label-title {
+      @apply flex-grow w-full;
+    }
+
+    .label-pill {
+      @apply rounded-md h-3 w-3 flex-shrink-0 border border-solid border-n-weak;
+    }
+  }
+}
+
+.search-container {
+  @apply bg-n-alpha-3 backdrop-blur-[100px] py-0 px-2.5 sticky top-0 z-20;
+}
 </style>

app/javascript/dashboard/components/widgets/modal/ConfirmDeleteModal.vue

@@ -32,10 +32,7 @@ export default {
     value: {
       required,
       isEqual(value) {
-        // Trim whitespace from both input and target values
-        const normalizedInput = (value || '').trim();
-        const normalizedTarget = (this.confirmValue || '').trim();
-        return normalizedInput === normalizedTarget;
+        return value === this.confirmValue;
       },
     },
   },

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

@@ -13,7 +13,6 @@ const getUISettingsMock = ref({
   conversation_sidebar_items_order: DEFAULT_CONVERSATION_SIDEBAR_ITEMS_ORDER,
   contact_sidebar_items_order: DEFAULT_CONTACT_SIDEBAR_ITEMS_ORDER,
   editor_message_key: 'enter',
-  channel_email_quoted_reply_enabled: true,
 });
 
 vi.mock('dashboard/composables/store', () => ({
@@ -38,7 +37,6 @@ describe('useUISettings', () => {
         DEFAULT_CONVERSATION_SIDEBAR_ITEMS_ORDER,
       contact_sidebar_items_order: DEFAULT_CONTACT_SIDEBAR_ITEMS_ORDER,
       editor_message_key: 'enter',
-      channel_email_quoted_reply_enabled: true,
     });
   });
 
@@ -53,7 +51,6 @@ describe('useUISettings', () => {
           DEFAULT_CONVERSATION_SIDEBAR_ITEMS_ORDER,
         contact_sidebar_items_order: DEFAULT_CONTACT_SIDEBAR_ITEMS_ORDER,
         editor_message_key: 'enter',
-        channel_email_quoted_reply_enabled: true,
       },
     });
   });
@@ -68,7 +65,6 @@ describe('useUISettings', () => {
           DEFAULT_CONVERSATION_SIDEBAR_ITEMS_ORDER,
         contact_sidebar_items_order: DEFAULT_CONTACT_SIDEBAR_ITEMS_ORDER,
         editor_message_key: 'enter',
-        channel_email_quoted_reply_enabled: true,
       },
     });
   });
@@ -104,7 +100,6 @@ describe('useUISettings', () => {
         contact_sidebar_items_order: DEFAULT_CONTACT_SIDEBAR_ITEMS_ORDER,
         email_signature_enabled: true,
         editor_message_key: 'enter',
-        channel_email_quoted_reply_enabled: true,
       },
     });
   });
@@ -114,26 +109,6 @@ describe('useUISettings', () => {
     expect(fetchSignatureFlagFromUISettings('email')).toBe(undefined);
   });
 
-  it('sets quoted reply flag for inbox correctly', () => {
-    const { setQuotedReplyFlagForInbox } = useUISettings();
-    setQuotedReplyFlagForInbox('Channel::Email', false);
-    expect(mockDispatch).toHaveBeenCalledWith('updateUISettings', {
-      uiSettings: {
-        is_ct_labels_open: true,
-        conversation_sidebar_items_order:
-          DEFAULT_CONVERSATION_SIDEBAR_ITEMS_ORDER,
-        contact_sidebar_items_order: DEFAULT_CONTACT_SIDEBAR_ITEMS_ORDER,
-        editor_message_key: 'enter',
-        channel_email_quoted_reply_enabled: false,
-      },
-    });
-  });
-
-  it('fetches quoted reply flag from UI settings correctly', () => {
-    const { fetchQuotedReplyFlagFromUISettings } = useUISettings();
-    expect(fetchQuotedReplyFlagFromUISettings('Channel::Email')).toBe(true);
-  });
-
   it('returns correct value for isEditorHotKeyEnabled when editor_message_key is configured', () => {
     getUISettingsMock.value.enter_to_send_enabled = false;
     const { isEditorHotKeyEnabled } = useUISettings();

app/javascript/dashboard/composables/useUISettings.js

@@ -87,13 +87,6 @@ const setSignatureFlagForInbox = (channelType, value, updateUISettings) => {
   updateUISettings({ [`${slugifiedChannel}_signature_enabled`]: value });
 };
 
-const setQuotedReplyFlagForInbox = (channelType, value, updateUISettings) => {
-  if (!channelType) return;
-
-  const slugifiedChannel = slugifyChannel(channelType);
-  updateUISettings({ [`${slugifiedChannel}_quoted_reply_enabled`]: value });
-};
-
 /**
  * Fetches the signature flag for a specific channel type from UI settings.
  * @param {string} channelType - The type of the channel.
@@ -107,13 +100,6 @@ const fetchSignatureFlagFromUISettings = (channelType, uiSettings) => {
   return uiSettings.value[`${slugifiedChannel}_signature_enabled`];
 };
 
-const fetchQuotedReplyFlagFromUISettings = (channelType, uiSettings) => {
-  if (!channelType) return false;
-
-  const slugifiedChannel = slugifyChannel(channelType);
-  return uiSettings.value[`${slugifiedChannel}_quoted_reply_enabled`];
-};
-
 /**
  * Checks if a specific editor hotkey is enabled.
  * @param {string} key - The key to check.
@@ -161,10 +147,6 @@ export function useUISettings() {
       setSignatureFlagForInbox(channelType, value, updateUISettings),
     fetchSignatureFlagFromUISettings: channelType =>
       fetchSignatureFlagFromUISettings(channelType, uiSettings),
-    setQuotedReplyFlagForInbox: (channelType, value) =>
-      setQuotedReplyFlagForInbox(channelType, value, updateUISettings),
-    fetchQuotedReplyFlagFromUISettings: channelType =>
-      fetchQuotedReplyFlagFromUISettings(channelType, uiSettings),
     isEditorHotKeyEnabled: key => isEditorHotKeyEnabled(key, uiSettings),
   };
 }

app/javascript/dashboard/featureFlags.js

@@ -40,7 +40,6 @@ export const FEATURE_FLAGS = {
   CONTACT_CHATWOOT_SUPPORT_TEAM: 'contact_chatwoot_support_team',
   CAPTAIN_V2: 'captain_integration_v2',
   SAML: 'saml',
-  QUOTED_EMAIL_REPLY: 'quoted_email_reply',
 };
 
 export const PREMIUM_FEATURES = [
@@ -49,5 +48,5 @@ export const PREMIUM_FEATURES = [
   FEATURE_FLAGS.CUSTOM_ROLES,
   FEATURE_FLAGS.AUDIT_LOGS,
   FEATURE_FLAGS.HELP_CENTER,
-  FEATURE_FLAGS.SAML,
+  FEATURE_FLAGS.CAPTAIN_V2,
 ];

app/javascript/dashboard/helper/URLHelper.js

@@ -145,34 +145,3 @@ export const extractFilenameFromUrl = url => {
     return match ? match[1] : url;
   }
 };
-
-/**
- * Normalizes a comma/newline separated list of domains
- * @param {string} domains - The comma/newline separated list of domains
- * @returns {string} - The normalized list of domains
- * - Converts newlines to commas
- * - Trims whitespace
- * - Lowercases entries
- * - Removes empty values
- * - De-duplicates while preserving original order
- */
-export const sanitizeAllowedDomains = domains => {
-  if (!domains) return '';
-
-  const tokens = domains
-    .replace(/\r\n/g, '\n')
-    .replace(/\s*\n\s*/g, ',')
-    .split(',')
-    .map(d => d.trim().toLowerCase())
-    .filter(d => d.length > 0);
-
-  // De-duplicate while preserving order using Set and filter index
-  const seen = new Set();
-  const unique = tokens.filter(d => {
-    if (seen.has(d)) return false;
-    seen.add(d);
-    return true;
-  });
-
-  return unique.join(',');
-};

app/javascript/dashboard/helper/pushHelper.js

@@ -68,17 +68,13 @@ export const registerSubscription = (onSuccess = () => {}) => {
     .then(() => {
       onSuccess();
     })
-    .catch(error => {
-      // eslint-disable-next-line no-console
-      console.error('Push subscription registration failed:', error);
+    .catch(() => {
       useAlert('This browser does not support desktop notification');
     });
 };
 
 export const requestPushPermissions = ({ onSuccess }) => {
   if (!('Notification' in window)) {
-    // eslint-disable-next-line no-console
-    console.warn('Notification is not supported');
     useAlert('This browser does not support desktop notification');
   } else if (Notification.permission === 'granted') {
     registerSubscription(onSuccess);

app/javascript/dashboard/helper/quotedEmailHelper.js

@@ -1,332 +0,0 @@
-import { format, parseISO, isValid as isValidDate } from 'date-fns';
-
-/**
- * Extracts plain text from HTML content
- * @param {string} html - HTML content to convert
- * @returns {string} Plain text content
- */
-export const extractPlainTextFromHtml = html => {
-  if (!html) {
-    return '';
-  }
-  if (typeof document === 'undefined') {
-    return html.replace(/<[^>]*>/g, ' ');
-  }
-  const tempDiv = document.createElement('div');
-  tempDiv.innerHTML = html;
-  return tempDiv.textContent || tempDiv.innerText || '';
-};
-
-/**
- * Extracts sender name from email message
- * @param {Object} lastEmail - Last email message object
- * @param {Object} contact - Contact object
- * @returns {string} Sender name
- */
-export const getEmailSenderName = (lastEmail, contact) => {
-  const senderName = lastEmail?.sender?.name;
-  if (senderName && senderName.trim()) {
-    return senderName.trim();
-  }
-
-  const contactName = contact?.name;
-  return contactName && contactName.trim() ? contactName.trim() : '';
-};
-
-/**
- * Extracts sender email from email message
- * @param {Object} lastEmail - Last email message object
- * @param {Object} contact - Contact object
- * @returns {string} Sender email address
- */
-export const getEmailSenderEmail = (lastEmail, contact) => {
-  const senderEmail = lastEmail?.sender?.email;
-  if (senderEmail && senderEmail.trim()) {
-    return senderEmail.trim();
-  }
-
-  const contentAttributes =
-    lastEmail?.contentAttributes || lastEmail?.content_attributes || {};
-  const emailMeta = contentAttributes.email || {};
-
-  if (Array.isArray(emailMeta.from) && emailMeta.from.length > 0) {
-    const fromAddress = emailMeta.from[0];
-    if (fromAddress && fromAddress.trim()) {
-      return fromAddress.trim();
-    }
-  }
-
-  const contactEmail = contact?.email;
-  return contactEmail && contactEmail.trim() ? contactEmail.trim() : '';
-};
-
-/**
- * Extracts date from email message
- * @param {Object} lastEmail - Last email message object
- * @returns {Date|null} Email date
- */
-export const getEmailDate = lastEmail => {
-  const contentAttributes =
-    lastEmail?.contentAttributes || lastEmail?.content_attributes || {};
-  const emailMeta = contentAttributes.email || {};
-
-  if (emailMeta.date) {
-    const parsedDate = parseISO(emailMeta.date);
-    if (isValidDate(parsedDate)) {
-      return parsedDate;
-    }
-  }
-
-  const createdAt = lastEmail?.created_at;
-  if (createdAt) {
-    const timestamp = Number(createdAt);
-    if (!Number.isNaN(timestamp)) {
-      const milliseconds = timestamp > 1e12 ? timestamp : timestamp * 1000;
-      const derivedDate = new Date(milliseconds);
-      if (!Number.isNaN(derivedDate.getTime())) {
-        return derivedDate;
-      }
-    }
-  }
-
-  return null;
-};
-
-/**
- * Formats date for quoted email header
- * @param {Date} date - Date to format
- * @returns {string} Formatted date string
- */
-export const formatQuotedEmailDate = date => {
-  try {
-    return format(date, "EEE, MMM d, yyyy 'at' p");
-  } catch (error) {
-    const fallbackDate = new Date(date);
-    if (!Number.isNaN(fallbackDate.getTime())) {
-      return format(fallbackDate, "EEE, MMM d, yyyy 'at' p");
-    }
-  }
-
-  return '';
-};
-
-/**
- * Extracts inbox email address from last email message
- * @param {Object} lastEmail - Last email message object
- * @param {Object} inbox - Inbox object
- * @returns {string} Inbox email address
- */
-export const getInboxEmail = (lastEmail, inbox) => {
-  const contentAttributes =
-    lastEmail?.contentAttributes || lastEmail?.content_attributes || {};
-  const emailMeta = contentAttributes.email || {};
-
-  if (Array.isArray(emailMeta.to) && emailMeta.to.length > 0) {
-    const toAddress = emailMeta.to[0];
-    if (toAddress && toAddress.trim()) {
-      return toAddress.trim();
-    }
-  }
-
-  const inboxEmail = inbox?.email;
-  return inboxEmail && inboxEmail.trim() ? inboxEmail.trim() : '';
-};
-
-/**
- * Builds quoted email header from contact (for incoming messages)
- * @param {Object} lastEmail - Last email message object
- * @param {Object} contact - Contact object
- * @returns {string} Formatted header string
- */
-export const buildQuotedEmailHeaderFromContact = (lastEmail, contact) => {
-  if (!lastEmail) {
-    return '';
-  }
-
-  const quotedDate = getEmailDate(lastEmail);
-  const senderEmail = getEmailSenderEmail(lastEmail, contact);
-
-  if (!quotedDate || !senderEmail) {
-    return '';
-  }
-
-  const formattedDate = formatQuotedEmailDate(quotedDate);
-  if (!formattedDate) {
-    return '';
-  }
-
-  const senderName = getEmailSenderName(lastEmail, contact);
-  const hasName = !!senderName;
-  const contactLabel = hasName
-    ? `${senderName} <${senderEmail}>`
-    : `<${senderEmail}>`;
-
-  return `On ${formattedDate} ${contactLabel} wrote:`;
-};
-
-/**
- * Builds quoted email header from inbox (for outgoing messages)
- * @param {Object} lastEmail - Last email message object
- * @param {Object} inbox - Inbox object
- * @returns {string} Formatted header string
- */
-export const buildQuotedEmailHeaderFromInbox = (lastEmail, inbox) => {
-  if (!lastEmail) {
-    return '';
-  }
-
-  const quotedDate = getEmailDate(lastEmail);
-  const inboxEmail = getInboxEmail(lastEmail, inbox);
-
-  if (!quotedDate || !inboxEmail) {
-    return '';
-  }
-
-  const formattedDate = formatQuotedEmailDate(quotedDate);
-  if (!formattedDate) {
-    return '';
-  }
-
-  const inboxName = inbox?.name;
-  const hasName = !!inboxName;
-  const inboxLabel = hasName
-    ? `${inboxName} <${inboxEmail}>`
-    : `<${inboxEmail}>`;
-
-  return `On ${formattedDate} ${inboxLabel} wrote:`;
-};
-
-/**
- * Builds quoted email header based on message type
- * @param {Object} lastEmail - Last email message object
- * @param {Object} contact - Contact object
- * @param {Object} inbox - Inbox object
- * @returns {string} Formatted header string
- */
-export const buildQuotedEmailHeader = (lastEmail, contact, inbox) => {
-  if (!lastEmail) {
-    return '';
-  }
-
-  // MESSAGE_TYPE.OUTGOING = 1, MESSAGE_TYPE.INCOMING = 0
-  const isOutgoing = lastEmail.message_type === 1;
-
-  if (isOutgoing) {
-    return buildQuotedEmailHeaderFromInbox(lastEmail, inbox);
-  }
-
-  return buildQuotedEmailHeaderFromContact(lastEmail, contact);
-};
-
-/**
- * Formats text as markdown blockquote
- * @param {string} text - Text to format
- * @param {string} header - Optional header to prepend
- * @returns {string} Formatted blockquote
- */
-export const formatQuotedTextAsBlockquote = (text, header = '') => {
-  const normalizedLines = text
-    ? String(text).replace(/\r\n/g, '\n').split('\n')
-    : [];
-
-  if (!header && !normalizedLines.length) {
-    return '';
-  }
-
-  const quotedLines = [];
-
-  if (header) {
-    quotedLines.push(`> ${header}`);
-    quotedLines.push('>');
-  }
-
-  normalizedLines.forEach(line => {
-    const trimmedLine = line.trimEnd();
-    quotedLines.push(trimmedLine ? `> ${trimmedLine}` : '>');
-  });
-
-  return quotedLines.join('\n');
-};
-
-/**
- * Extracts quoted email text from last email message
- * @param {Object} lastEmail - Last email message object
- * @returns {string} Quoted email text
- */
-export const extractQuotedEmailText = lastEmail => {
-  if (!lastEmail) {
-    return '';
-  }
-
-  const contentAttributes =
-    lastEmail.contentAttributes || lastEmail.content_attributes || {};
-  const emailContent = contentAttributes.email || {};
-  const textContent = emailContent.textContent || emailContent.text_content;
-
-  if (textContent?.reply) {
-    return textContent.reply;
-  }
-  if (textContent?.full) {
-    return textContent.full;
-  }
-
-  const htmlContent = emailContent.htmlContent || emailContent.html_content;
-  if (htmlContent?.reply) {
-    return extractPlainTextFromHtml(htmlContent.reply);
-  }
-  if (htmlContent?.full) {
-    return extractPlainTextFromHtml(htmlContent.full);
-  }
-
-  const fallbackContent =
-    lastEmail.content || lastEmail.processed_message_content || '';
-
-  return fallbackContent;
-};
-
-/**
- * Truncates text for preview display
- * @param {string} text - Text to truncate
- * @param {number} maxLength - Maximum length (default: 80)
- * @returns {string} Truncated text
- */
-export const truncatePreviewText = (text, maxLength = 80) => {
-  const preview = text.trim().replace(/\s+/g, ' ');
-  if (!preview) {
-    return '';
-  }
-
-  if (preview.length <= maxLength) {
-    return preview;
-  }
-  return `${preview.slice(0, maxLength - 3)}...`;
-};
-
-/**
- * Appends quoted text to message
- * @param {string} message - Original message
- * @param {string} quotedText - Text to quote
- * @param {string} header - Quote header
- * @returns {string} Message with quoted text appended
- */
-export const appendQuotedTextToMessage = (message, quotedText, header) => {
-  const baseMessage = message ? String(message) : '';
-  const quotedBlock = formatQuotedTextAsBlockquote(quotedText, header);
-
-  if (!quotedBlock) {
-    return baseMessage;
-  }
-
-  if (!baseMessage) {
-    return quotedBlock;
-  }
-
-  let separator = '\n\n';
-  if (baseMessage.endsWith('\n\n')) {
-    separator = '';
-  } else if (baseMessage.endsWith('\n')) {
-    separator = '\n';
-  }
-
-  return `${baseMessage}${separator}${quotedBlock}`;
-};

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

@@ -8,7 +8,6 @@ import {
   timeStampAppendedURL,
   getHostNameFromURL,
   extractFilenameFromUrl,
-  sanitizeAllowedDomains,
 } from '../URLHelper';
 
 describe('#URL Helpers', () => {
@@ -319,32 +318,4 @@ describe('#URL Helpers', () => {
       ).toBe('file.doc');
     });
   });
-
-  describe('sanitizeAllowedDomains', () => {
-    it('returns empty string for falsy input', () => {
-      expect(sanitizeAllowedDomains('')).toBe('');
-      expect(sanitizeAllowedDomains(null)).toBe('');
-      expect(sanitizeAllowedDomains(undefined)).toBe('');
-    });
-
-    it('trims whitespace and converts newlines to commas', () => {
-      const input = '  example.com  \n  foo.bar\nbar.baz  ';
-      expect(sanitizeAllowedDomains(input)).toBe('example.com,foo.bar,bar.baz');
-    });
-
-    it('handles Windows newlines and mixed spacing', () => {
-      const input = ' example.com\r\n\tfoo.bar  ,  bar.baz ';
-      expect(sanitizeAllowedDomains(input)).toBe('example.com,foo.bar,bar.baz');
-    });
-
-    it('removes empty values from repeated commas', () => {
-      const input = ',,example.com,,foo.bar,,';
-      expect(sanitizeAllowedDomains(input)).toBe('example.com,foo.bar');
-    });
-
-    it('lowercases entries and de-duplicates preserving order', () => {
-      const input = 'Example.com,FOO.bar,example.com,Bar.Baz,foo.BAR';
-      expect(sanitizeAllowedDomains(input)).toBe('example.com,foo.bar,bar.baz');
-    });
-  });
 });

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

@@ -1,99 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { EmailQuoteExtractor } from '../emailQuoteExtractor.js';
-
-const SAMPLE_EMAIL_HTML = `
-<p>method</p>
-<blockquote>
-<p>On Mon, Sep 29, 2025 at 5:18 PM John <a href="mailto:shivam@chatwoot.com">shivam@chatwoot.com</a> wrote:</p>
-<p>Hi</p>
-<blockquote>
-<p>On Mon, Sep 29, 2025 at 5:17 PM Shivam Mishra <a href="mailto:shivam@chatwoot.com">shivam@chatwoot.com</a> wrote:</p>
-<p>Yes, it is.</p>
-<p>On Mon, Sep 29, 2025 at 5:16 PM John from Shaneforwoot &lt; shaneforwoot@gmail.com&gt; wrote:</p>
-<blockquote>
-<p>Hey</p>
-<p>On Mon, Sep 29, 2025 at 4:59 PM John shivam@chatwoot.com wrote:</p>
-<p>This is another quoted quoted text reply</p>
-<p>This is nice</p>
-<p>On Mon, Sep 29, 2025 at 4:21 PM John from Shaneforwoot &lt; &gt; shaneforwoot@gmail.com&gt; wrote:</p>
-<p>Hey there, this is a reply from Chatwoot, notice the quoted text</p>
-<p>Hey there</p>
-<p>This is an email text, enjoy reading this</p>
-<p>-- Shivam Mishra, Chatwoot</p>
-</blockquote>
-</blockquote>
-</blockquote>
-`;
-
-const EMAIL_WITH_SIGNATURE = `
-<p>Latest reply here.</p>
-<p>Thanks,</p>
-<p>Jane Doe</p>
-<blockquote>
-  <p>On Mon, Sep 22, Someone wrote:</p>
-  <p>Previous reply content</p>
-</blockquote>
-`;
-
-const EMAIL_WITH_FOLLOW_UP_CONTENT = `
-<blockquote>
-  <p>Inline quote that should stay</p>
-</blockquote>
-<p>Internal note follows</p>
-<p>Regards,</p>
-`;
-
-describe('EmailQuoteExtractor', () => {
-  it('removes blockquote-based quotes from the email body', () => {
-    const cleanedHtml = EmailQuoteExtractor.extractQuotes(SAMPLE_EMAIL_HTML);
-
-    const container = document.createElement('div');
-    container.innerHTML = cleanedHtml;
-
-    expect(container.querySelectorAll('blockquote').length).toBe(0);
-    expect(container.textContent?.trim()).toBe('method');
-    expect(container.textContent).not.toContain(
-      'On Mon, Sep 29, 2025 at 5:18 PM'
-    );
-  });
-
-  it('keeps blockquote fallback when it is not the last top-level element', () => {
-    const cleanedHtml = EmailQuoteExtractor.extractQuotes(
-      EMAIL_WITH_FOLLOW_UP_CONTENT
-    );
-
-    const container = document.createElement('div');
-    container.innerHTML = cleanedHtml;
-
-    expect(container.querySelector('blockquote')).not.toBeNull();
-    expect(container.lastElementChild?.tagName).toBe('P');
-  });
-
-  it('detects quote indicators in nested blockquotes', () => {
-    const result = EmailQuoteExtractor.hasQuotes(SAMPLE_EMAIL_HTML);
-    expect(result).toBe(true);
-  });
-
-  it('does not flag blockquotes that are followed by other elements', () => {
-    expect(EmailQuoteExtractor.hasQuotes(EMAIL_WITH_FOLLOW_UP_CONTENT)).toBe(
-      false
-    );
-  });
-
-  it('returns false when no quote indicators are present', () => {
-    const html = '<p>Plain content</p>';
-    expect(EmailQuoteExtractor.hasQuotes(html)).toBe(false);
-  });
-
-  it('removes trailing blockquotes while preserving trailing signatures', () => {
-    const cleanedHtml = EmailQuoteExtractor.extractQuotes(EMAIL_WITH_SIGNATURE);
-
-    expect(cleanedHtml).toContain('<p>Thanks,</p>');
-    expect(cleanedHtml).toContain('<p>Jane Doe</p>');
-    expect(cleanedHtml).not.toContain('<blockquote');
-  });
-
-  it('detects quotes for trailing blockquotes even when signatures follow text', () => {
-    expect(EmailQuoteExtractor.hasQuotes(EMAIL_WITH_SIGNATURE)).toBe(true);
-  });
-});

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

@@ -1,441 +0,0 @@
-import {
-  extractPlainTextFromHtml,
-  getEmailSenderName,
-  getEmailSenderEmail,
-  getEmailDate,
-  formatQuotedEmailDate,
-  getInboxEmail,
-  buildQuotedEmailHeader,
-  buildQuotedEmailHeaderFromContact,
-  buildQuotedEmailHeaderFromInbox,
-  formatQuotedTextAsBlockquote,
-  extractQuotedEmailText,
-  truncatePreviewText,
-  appendQuotedTextToMessage,
-} from '../quotedEmailHelper';
-
-describe('quotedEmailHelper', () => {
-  describe('extractPlainTextFromHtml', () => {
-    it('returns empty string for null or undefined', () => {
-      expect(extractPlainTextFromHtml(null)).toBe('');
-      expect(extractPlainTextFromHtml(undefined)).toBe('');
-    });
-
-    it('strips HTML tags and returns plain text', () => {
-      const html = '<p>Hello <strong>world</strong></p>';
-      const result = extractPlainTextFromHtml(html);
-      expect(result).toBe('Hello world');
-    });
-
-    it('handles complex HTML structure', () => {
-      const html = '<div><p>Line 1</p><p>Line 2</p></div>';
-      const result = extractPlainTextFromHtml(html);
-      expect(result).toContain('Line 1');
-      expect(result).toContain('Line 2');
-    });
-  });
-
-  describe('getEmailSenderName', () => {
-    it('returns sender name from lastEmail', () => {
-      const lastEmail = { sender: { name: 'John Doe' } };
-      const result = getEmailSenderName(lastEmail, {});
-      expect(result).toBe('John Doe');
-    });
-
-    it('returns contact name if sender name not available', () => {
-      const lastEmail = { sender: {} };
-      const contact = { name: 'Jane Smith' };
-      const result = getEmailSenderName(lastEmail, contact);
-      expect(result).toBe('Jane Smith');
-    });
-
-    it('returns empty string if neither available', () => {
-      const result = getEmailSenderName({}, {});
-      expect(result).toBe('');
-    });
-
-    it('trims whitespace from names', () => {
-      const lastEmail = { sender: { name: '  John Doe  ' } };
-      const result = getEmailSenderName(lastEmail, {});
-      expect(result).toBe('John Doe');
-    });
-  });
-
-  describe('getEmailSenderEmail', () => {
-    it('returns sender email from lastEmail', () => {
-      const lastEmail = { sender: { email: 'john@example.com' } };
-      const result = getEmailSenderEmail(lastEmail, {});
-      expect(result).toBe('john@example.com');
-    });
-
-    it('returns email from contentAttributes if sender email not available', () => {
-      const lastEmail = {
-        contentAttributes: {
-          email: { from: ['jane@example.com'] },
-        },
-      };
-      const result = getEmailSenderEmail(lastEmail, {});
-      expect(result).toBe('jane@example.com');
-    });
-
-    it('returns contact email as fallback', () => {
-      const lastEmail = {};
-      const contact = { email: 'contact@example.com' };
-      const result = getEmailSenderEmail(lastEmail, contact);
-      expect(result).toBe('contact@example.com');
-    });
-
-    it('trims whitespace from emails', () => {
-      const lastEmail = { sender: { email: '  john@example.com  ' } };
-      const result = getEmailSenderEmail(lastEmail, {});
-      expect(result).toBe('john@example.com');
-    });
-  });
-
-  describe('getEmailDate', () => {
-    it('returns parsed date from email metadata', () => {
-      const lastEmail = {
-        contentAttributes: {
-          email: { date: '2024-01-15T10:30:00Z' },
-        },
-      };
-      const result = getEmailDate(lastEmail);
-      expect(result).toBeInstanceOf(Date);
-    });
-
-    it('returns date from created_at timestamp', () => {
-      const lastEmail = { created_at: 1705318200 };
-      const result = getEmailDate(lastEmail);
-      expect(result).toBeInstanceOf(Date);
-    });
-
-    it('handles millisecond timestamps', () => {
-      const lastEmail = { created_at: 1705318200000 };
-      const result = getEmailDate(lastEmail);
-      expect(result).toBeInstanceOf(Date);
-    });
-
-    it('returns null if no valid date found', () => {
-      const result = getEmailDate({});
-      expect(result).toBeNull();
-    });
-  });
-
-  describe('formatQuotedEmailDate', () => {
-    it('formats date correctly', () => {
-      const date = new Date('2024-01-15T10:30:00Z');
-      const result = formatQuotedEmailDate(date);
-      expect(result).toMatch(/Mon, Jan 15, 2024 at/);
-    });
-
-    it('returns empty string for invalid date', () => {
-      const result = formatQuotedEmailDate('invalid');
-      expect(result).toBe('');
-    });
-  });
-
-  describe('getInboxEmail', () => {
-    it('returns email from contentAttributes.email.to', () => {
-      const lastEmail = {
-        contentAttributes: {
-          email: { to: ['inbox@example.com'] },
-        },
-      };
-      const result = getInboxEmail(lastEmail, {});
-      expect(result).toBe('inbox@example.com');
-    });
-
-    it('returns inbox email as fallback', () => {
-      const lastEmail = {};
-      const inbox = { email: 'support@example.com' };
-      const result = getInboxEmail(lastEmail, inbox);
-      expect(result).toBe('support@example.com');
-    });
-
-    it('returns empty string if no email found', () => {
-      expect(getInboxEmail({}, {})).toBe('');
-    });
-
-    it('trims whitespace from emails', () => {
-      const lastEmail = {
-        contentAttributes: {
-          email: { to: ['  inbox@example.com  '] },
-        },
-      };
-      const result = getInboxEmail(lastEmail, {});
-      expect(result).toBe('inbox@example.com');
-    });
-  });
-
-  describe('buildQuotedEmailHeaderFromContact', () => {
-    it('builds complete header with name and email', () => {
-      const lastEmail = {
-        sender: { name: 'John Doe', email: 'john@example.com' },
-        contentAttributes: {
-          email: { date: '2024-01-15T10:30:00Z' },
-        },
-      };
-      const result = buildQuotedEmailHeaderFromContact(lastEmail, {});
-      expect(result).toContain('John Doe');
-      expect(result).toContain('john@example.com');
-      expect(result).toContain('wrote:');
-    });
-
-    it('builds header without name if not available', () => {
-      const lastEmail = {
-        sender: { email: 'john@example.com' },
-        contentAttributes: {
-          email: { date: '2024-01-15T10:30:00Z' },
-        },
-      };
-      const result = buildQuotedEmailHeaderFromContact(lastEmail, {});
-      expect(result).toContain('<john@example.com>');
-      expect(result).not.toContain('undefined');
-    });
-
-    it('returns empty string if missing required data', () => {
-      expect(buildQuotedEmailHeaderFromContact(null, {})).toBe('');
-      expect(buildQuotedEmailHeaderFromContact({}, {})).toBe('');
-    });
-  });
-
-  describe('buildQuotedEmailHeaderFromInbox', () => {
-    it('builds complete header with inbox name and email', () => {
-      const lastEmail = {
-        contentAttributes: {
-          email: {
-            date: '2024-01-15T10:30:00Z',
-            to: ['support@example.com'],
-          },
-        },
-      };
-      const inbox = { name: 'Support Team', email: 'support@example.com' };
-      const result = buildQuotedEmailHeaderFromInbox(lastEmail, inbox);
-      expect(result).toContain('Support Team');
-      expect(result).toContain('support@example.com');
-      expect(result).toContain('wrote:');
-    });
-
-    it('builds header without name if not available', () => {
-      const lastEmail = {
-        contentAttributes: {
-          email: {
-            date: '2024-01-15T10:30:00Z',
-            to: ['inbox@example.com'],
-          },
-        },
-      };
-      const inbox = { email: 'inbox@example.com' };
-      const result = buildQuotedEmailHeaderFromInbox(lastEmail, inbox);
-      expect(result).toContain('<inbox@example.com>');
-      expect(result).not.toContain('undefined');
-    });
-
-    it('returns empty string if missing required data', () => {
-      expect(buildQuotedEmailHeaderFromInbox(null, {})).toBe('');
-      expect(buildQuotedEmailHeaderFromInbox({}, {})).toBe('');
-    });
-  });
-
-  describe('buildQuotedEmailHeader', () => {
-    it('uses inbox email for outgoing messages (message_type: 1)', () => {
-      const lastEmail = {
-        message_type: 1,
-        contentAttributes: {
-          email: {
-            date: '2024-01-15T10:30:00Z',
-            to: ['support@example.com'],
-          },
-        },
-      };
-      const inbox = { name: 'Support', email: 'support@example.com' };
-      const contact = { name: 'John Doe', email: 'john@example.com' };
-      const result = buildQuotedEmailHeader(lastEmail, contact, inbox);
-      expect(result).toContain('Support');
-      expect(result).toContain('support@example.com');
-      expect(result).not.toContain('John Doe');
-    });
-
-    it('uses contact email for incoming messages (message_type: 0)', () => {
-      const lastEmail = {
-        message_type: 0,
-        sender: { name: 'Jane Smith', email: 'jane@example.com' },
-        contentAttributes: {
-          email: { date: '2024-01-15T10:30:00Z' },
-        },
-      };
-      const inbox = { name: 'Support', email: 'support@example.com' };
-      const contact = { name: 'Jane Smith', email: 'jane@example.com' };
-      const result = buildQuotedEmailHeader(lastEmail, contact, inbox);
-      expect(result).toContain('Jane Smith');
-      expect(result).toContain('jane@example.com');
-      expect(result).not.toContain('Support');
-    });
-
-    it('returns empty string if missing required data', () => {
-      expect(buildQuotedEmailHeader(null, {}, {})).toBe('');
-      expect(buildQuotedEmailHeader({}, {}, {})).toBe('');
-    });
-  });
-
-  describe('formatQuotedTextAsBlockquote', () => {
-    it('formats single line text', () => {
-      const result = formatQuotedTextAsBlockquote('Hello world');
-      expect(result).toBe('> Hello world');
-    });
-
-    it('formats multi-line text', () => {
-      const text = 'Line 1\nLine 2\nLine 3';
-      const result = formatQuotedTextAsBlockquote(text);
-      expect(result).toBe('> Line 1\n> Line 2\n> Line 3');
-    });
-
-    it('includes header if provided', () => {
-      const result = formatQuotedTextAsBlockquote('Hello', 'Header text');
-      expect(result).toContain('> Header text');
-      expect(result).toContain('>\n> Hello');
-    });
-
-    it('handles empty lines correctly', () => {
-      const text = 'Line 1\n\nLine 3';
-      const result = formatQuotedTextAsBlockquote(text);
-      expect(result).toBe('> Line 1\n>\n> Line 3');
-    });
-
-    it('returns empty string for empty input', () => {
-      expect(formatQuotedTextAsBlockquote('')).toBe('');
-      expect(formatQuotedTextAsBlockquote('', '')).toBe('');
-    });
-
-    it('handles Windows line endings', () => {
-      const text = 'Line 1\r\nLine 2';
-      const result = formatQuotedTextAsBlockquote(text);
-      expect(result).toBe('> Line 1\n> Line 2');
-    });
-  });
-
-  describe('extractQuotedEmailText', () => {
-    it('extracts text from textContent.reply', () => {
-      const lastEmail = {
-        contentAttributes: {
-          email: { textContent: { reply: 'Reply text' } },
-        },
-      };
-      const result = extractQuotedEmailText(lastEmail);
-      expect(result).toBe('Reply text');
-    });
-
-    it('falls back to textContent.full', () => {
-      const lastEmail = {
-        contentAttributes: {
-          email: { textContent: { full: 'Full text' } },
-        },
-      };
-      const result = extractQuotedEmailText(lastEmail);
-      expect(result).toBe('Full text');
-    });
-
-    it('extracts from htmlContent and converts to plain text', () => {
-      const lastEmail = {
-        contentAttributes: {
-          email: { htmlContent: { reply: '<p>HTML reply</p>' } },
-        },
-      };
-      const result = extractQuotedEmailText(lastEmail);
-      expect(result).toBe('HTML reply');
-    });
-
-    it('uses fallback content if structured content not available', () => {
-      const lastEmail = { content: 'Fallback content' };
-      const result = extractQuotedEmailText(lastEmail);
-      expect(result).toBe('Fallback content');
-    });
-
-    it('returns empty string for null or missing email', () => {
-      expect(extractQuotedEmailText(null)).toBe('');
-      expect(extractQuotedEmailText({})).toBe('');
-    });
-  });
-
-  describe('truncatePreviewText', () => {
-    it('returns full text if under max length', () => {
-      const text = 'Short text';
-      const result = truncatePreviewText(text, 80);
-      expect(result).toBe('Short text');
-    });
-
-    it('truncates text exceeding max length', () => {
-      const text = 'A'.repeat(100);
-      const result = truncatePreviewText(text, 80);
-      expect(result).toHaveLength(80);
-      expect(result).toContain('...');
-    });
-
-    it('collapses multiple spaces', () => {
-      const text = 'Text   with    spaces';
-      const result = truncatePreviewText(text);
-      expect(result).toBe('Text with spaces');
-    });
-
-    it('trims whitespace', () => {
-      const text = '  Text with spaces  ';
-      const result = truncatePreviewText(text);
-      expect(result).toBe('Text with spaces');
-    });
-
-    it('returns empty string for empty input', () => {
-      expect(truncatePreviewText('')).toBe('');
-      expect(truncatePreviewText('   ')).toBe('');
-    });
-
-    it('uses default max length of 80', () => {
-      const text = 'A'.repeat(100);
-      const result = truncatePreviewText(text);
-      expect(result).toHaveLength(80);
-    });
-  });
-
-  describe('appendQuotedTextToMessage', () => {
-    it('appends quoted text to message', () => {
-      const message = 'My reply';
-      const quotedText = 'Original message';
-      const header = 'On date sender wrote:';
-      const result = appendQuotedTextToMessage(message, quotedText, header);
-
-      expect(result).toContain('My reply');
-      expect(result).toContain('> On date sender wrote:');
-      expect(result).toContain('> Original message');
-    });
-
-    it('returns only quoted text if message is empty', () => {
-      const result = appendQuotedTextToMessage('', 'Quoted', 'Header');
-      expect(result).toContain('> Header');
-      expect(result).toContain('> Quoted');
-      expect(result).not.toContain('\n\n\n');
-    });
-
-    it('returns message if no quoted text', () => {
-      const result = appendQuotedTextToMessage('Message', '', '');
-      expect(result).toBe('Message');
-    });
-
-    it('handles proper spacing with double newline', () => {
-      const result = appendQuotedTextToMessage('Message', 'Quoted', 'Header');
-      expect(result).toContain('Message\n\n>');
-    });
-
-    it('does not add extra newlines if message already ends with newlines', () => {
-      const result = appendQuotedTextToMessage(
-        'Message\n\n',
-        'Quoted',
-        'Header'
-      );
-      expect(result).not.toContain('\n\n\n');
-    });
-
-    it('adds single newline if message ends with one newline', () => {
-      const result = appendQuotedTextToMessage('Message\n', 'Quoted', 'Header');
-      expect(result).toContain('Message\n\n>');
-    });
-  });
-});

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

@@ -177,8 +177,7 @@
       "REFERER_LINK": "Referrer Link",
       "ASSIGNEE_NAME": "Assignee",
       "TEAM_NAME": "Team",
-      "PRIORITY": "Priority",
-      "LABELS": "Labels"
+      "PRIORITY": "Priority"
     }
   }
 }