refactor: move attachment methods to a mixin

refactor: move methods out to mixin
style: sort and group imports
2023-10-04 19:33:28 +05:30 · 2023-10-04 19:26:18 +05:30 · 2023-10-04 19:26:13 +05:30 · 2023-10-04 19:26:07 +05:30
830 changed files with 4622 additions and 14316 deletions
@@ -81,7 +81,7 @@ SMTP_OPENSSL_VERIFY_MODE=peer
 # Mail Incoming
 # This is the domain set for the reply emails when conversation continuity is enabled
 MAILER_INBOUND_EMAIL_DOMAIN=
-# Set this to the appropriate ingress channel with regards to incoming emails
+# Set this to appropriate ingress channel with regards to incoming emails
 # Possible values are :
 # relay for Exim, Postfix, Qmail
 # mailgun for Mailgun
@@ -91,20 +91,10 @@ MAILER_INBOUND_EMAIL_DOMAIN=
 RAILS_INBOUND_EMAIL_SERVICE=
 # Use one of the following based on the email ingress service
 # Ref: https://edgeguides.rubyonrails.org/action_mailbox_basics.html
-# Set this to a password of your choice and use it in the Inbound webhook
 RAILS_INBOUND_EMAIL_PASSWORD=
-
 MAILGUN_INGRESS_SIGNING_KEY=
 MANDRILL_INGRESS_API_KEY=

-# Creating Your Inbound Webhook Instructions for Postmark and Sendgrid:
-# Inbound webhook URL format:
-#    https://actionmailbox:[YOUR_RAILS_INBOUND_EMAIL_PASSWORD]@[YOUR_CHATWOOT_DOMAIN.COM]/rails/action_mailbox/[RAILS_INBOUND_EMAIL_SERVICE]/inbound_emails
-# Note: Replace the values inside the brackets; do not include the brackets themselves.
-# Example: https://actionmailbox:mYRandomPassword3@chatwoot.example.com/rails/action_mailbox/postmark/inbound_emails
-# For Postmark
-# Ensure the 'Include raw email content in JSON payload' checkbox is selected in the inbound webhook section.
-
 # Storage
 ACTIVE_STORAGE_SERVICE=local

@@ -186,9 +176,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 # MICROSOFT CLARITY
 # MS_CLARITY_TOKEN=xxxxxxxxx

-# GOOGLE_TAG_MANAGER
-# GOOGLE_TAG = GTM-XXXXXXX
-
 ## Scout
 ## https://scoutapm.com/docs/ruby/configuration
 # SCOUT_KEY=YOURKEY
@@ -253,9 +240,3 @@ AZURE_APP_SECRET=

 # Sentiment analysis model file path
 SENTIMENT_FILE_PATH=
-
-
-# Housekeeping/Performance related configurations
-# Set to true if you want to remove stale contact inboxes
-# contact_inboxes with no conversation older than 90 days will be removed
-# REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
@@ -4,7 +4,6 @@ module.exports = {
    'prettier',
    'plugin:vue/recommended',
    'plugin:storybook/recommended',
-    'plugin:cypress/recommended',
  ],
  parserOptions: {
    parser: '@babel/eslint-parser',
@@ -15,7 +15,7 @@ gem 'browser'
 gem 'hashie'
 gem 'jbuilder'
 gem 'kaminari'
-gem 'responders', '>= 3.1.1'
+gem 'responders'
 gem 'rest-client'
 gem 'telephone_number'
 gem 'time_diff'
@@ -67,7 +67,7 @@ gem 'webpacker'
 gem 'barnes'

 ##--- gems for authentication & authorization ---##
-gem 'devise', '>= 4.9.3'
+gem 'devise'
 gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
 gem 'devise_token_auth'
 # authorization
@@ -75,7 +75,7 @@ gem 'jwt'
 gem 'pundit'
 # super admin
 gem 'administrate', '>= 0.19.0'
-gem 'administrate-field-active_storage', '>= 1.0.0'
+gem 'administrate-field-active_storage'
 gem 'administrate-field-belongs_to_search'

 ##--- gems for pubsub service ---##
@@ -92,7 +92,7 @@ gem 'twitty', '~> 0.1.5'
 # facebook client
 gem 'koala'
 # slack client
-gem 'slack-ruby-client', '~> 2.2.0'
+gem 'slack-ruby-client', '~> 2.0.0'
 # for dialogflow integrations
 gem 'google-cloud-dialogflow-v2'
 gem 'grpc'
@@ -107,16 +107,16 @@ gem 'google-cloud-translate-v3'
 gem 'ddtrace', require: false
 gem 'elastic-apm', require: false
 gem 'newrelic_rpm', require: false
-gem 'newrelic-sidekiq-metrics', '>= 1.6.2', require: false
+gem 'newrelic-sidekiq-metrics', require: false
 gem 'scout_apm', require: false
-gem 'sentry-rails', '>= 5.13.0', require: false
+gem 'sentry-rails', '>= 5.11.0', require: false
 gem 'sentry-ruby', require: false
-gem 'sentry-sidekiq', '>= 5.13.0', require: false
+gem 'sentry-sidekiq', '>= 5.11.0', require: false

 ##-- background job processing --##
 gem 'sidekiq', '>= 7.1.3'
 # We want cron jobs
-gem 'sidekiq-cron', '>= 1.11.0'
+gem 'sidekiq-cron', '>= 1.10.1'

 ##-- Push notification service --##
 gem 'fcm'
@@ -154,12 +154,12 @@ gem 'stripe'
 gem 'faker'

 # Include logrange conditionally in intializer using env variable
-gem 'lograge', '~> 0.14.0', require: false
+gem 'lograge', '~> 0.13.0', require: false

 # worked with microsoft refresh token
 gem 'omniauth-oauth2'

-gem 'audited', '~> 5.4', '>= 5.4.1'
+gem 'audited', '~> 5.4', '>= 5.4.0'

 # need for google auth
 gem 'omniauth'
@@ -200,8 +200,6 @@ group :development do
  # profiling
  gem 'rack-mini-profiler', '>= 3.1.1', require: false
  gem 'stackprof'
-  # Should install the associated chrome extension to view query logs
-  gem 'meta_request'
 end

 group :test do
@@ -113,7 +113,7 @@ GEM
      kaminari (>= 1.0)
      sassc-rails (~> 2.1)
      selectize-rails (~> 0.6)
-    administrate-field-active_storage (1.0.0)
+    administrate-field-active_storage (0.4.2)
      administrate (>= 0.2.2)
      rails (>= 7.0)
    administrate-field-belongs_to_search (0.8.0)
@@ -126,9 +126,9 @@ GEM
      rake (>= 10.4, < 14.0)
    ast (2.4.2)
    attr_extras (7.1.0)
-    audited (5.4.1)
-      activerecord (>= 5.0, < 7.7)
-      activesupport (>= 5.0, < 7.7)
+    audited (5.4.0)
+      activerecord (>= 5.0, < 7.2)
+      request_store (~> 1.2)
    aws-eventstream (1.2.0)
    aws-partitions (1.760.0)
    aws-sdk-core (3.171.1)
@@ -148,8 +148,7 @@ GEM
    barnes (0.0.9)
      multi_json (~> 1)
      statsd-ruby (~> 1.1)
-    base64 (0.1.1)
-    bcrypt (3.1.19)
+    bcrypt (3.1.18)
    bindex (0.8.1)
    blingfire (0.1.8)
    bootsnap (1.16.0)
@@ -175,7 +174,7 @@ GEM
      rexml
    crass (1.0.6)
    csv-safe (3.2.1)
-    cypress-on-rails (1.16.0)
+    cypress-on-rails (1.13.1)
      rack
    database_cleaner (2.0.2)
      database_cleaner-active_record (>= 2, < 3)
@@ -183,7 +182,7 @@ GEM
      activerecord (>= 5.a)
      database_cleaner-core (~> 2.0.0)
    database_cleaner-core (2.0.1)
-    date (3.3.4)
+    date (3.3.3)
    ddtrace (1.11.1)
      debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
      libdatadog (~> 2.0.0.1.0)
@@ -194,7 +193,7 @@ GEM
      irb (>= 1.5.0)
      reline (>= 0.3.1)
    declarative (0.0.20)
-    devise (4.9.3)
+    devise (4.9.2)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0)
@@ -256,13 +255,13 @@ GEM
    fcm (1.0.8)
      faraday (>= 1.0.0, < 3.0)
      googleauth (~> 1)
-    ffi (1.16.3)
+    ffi (1.15.5)
    ffi-compiler (1.0.1)
      ffi (>= 1.0.0)
      rake
    flag_shih_tzu (0.3.23)
    foreman (0.87.2)
-    fugit (1.9.0)
+    fugit (1.8.1)
      et-orbi (~> 1, >= 1.2.7)
      raabro (~> 1.4)
    gapic-common (0.18.0)
@@ -274,7 +273,7 @@ GEM
      googleauth (~> 1.0)
      grpc (~> 1.36)
    geocoder (1.8.1)
-    gli (2.21.1)
+    gli (2.21.0)
    globalid (1.2.1)
      activesupport (>= 6.1)
    gmail_xoauth (0.4.2)
@@ -435,12 +434,12 @@ GEM
    llhttp-ffi (0.4.0)
      ffi-compiler (~> 1.0)
      rake (~> 13.0)
-    lograge (0.14.0)
+    lograge (0.13.0)
      actionpack (>= 4)
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.22.0)
+    loofah (2.21.3)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    mail (2.8.1)
@@ -451,16 +450,13 @@ GEM
    marcel (1.0.2)
    maxminddb (0.1.22)
    memoist (0.16.2)
-    meta_request (0.7.4)
-      rack-contrib (>= 1.1, < 3)
-      railties (>= 3.0.0, < 7.1)
    method_source (1.0.0)
    mime-types (3.4.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2023.0218.1)
    mini_magick (4.12.0)
    mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.4)
    minitest (5.20.0)
    mock_redis (0.36.0)
      ruby2_keywords
@@ -472,30 +468,29 @@ GEM
      activerecord (>= 5.2)
    net-http-persistent (4.0.2)
      connection_pool (~> 2.2)
-    net-imap (0.4.5)
+    net-imap (0.3.7)
      date
      net-protocol
    net-pop (0.1.2)
      net-protocol
-    net-protocol (0.2.2)
+    net-protocol (0.2.1)
      timeout
-    net-smtp (0.4.0)
+    net-smtp (0.3.3)
      net-protocol
    netrc (0.11.0)
-    newrelic-sidekiq-metrics (1.6.2)
-      newrelic_rpm (>= 8.0.0)
+    newrelic-sidekiq-metrics (1.6.1)
+      newrelic_rpm (~> 8)
      sidekiq
-    newrelic_rpm (9.6.0)
-      base64
-    nio4r (2.6.0)
-    nokogiri (1.15.5)
+    newrelic_rpm (8.16.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.4)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.15.5-arm64-darwin)
+    nokogiri (1.15.4-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-darwin)
+    nokogiri (1.15.4-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
      racc (~> 1.4)
    numo-narray (0.9.2.1)
    oauth (1.1.0)
@@ -558,12 +553,10 @@ GEM
    pundit (2.3.0)
      activesupport (>= 3.0.0)
    raabro (1.4.0)
-    racc (1.7.3)
+    racc (1.7.1)
    rack (2.2.8)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
-    rack-contrib (2.4.0)
-      rack (< 4)
    rack-cors (2.0.1)
      rack (>= 2.0.0)
    rack-mini-profiler (3.1.1)
@@ -604,13 +597,13 @@ GEM
      thor (~> 1.0)
      zeitwerk (~> 2.5)
    rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.0.6)
    rb-fsevent (0.11.2)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    redis (5.0.6)
      redis-client (>= 0.9.0)
-    redis-client (0.18.0)
+    redis-client (0.17.0)
      connection_pool
    redis-namespace (1.10.0)
      redis (>= 4)
@@ -623,7 +616,7 @@ GEM
      uber (< 0.2.0)
    request_store (1.5.1)
      rack (>= 1.4)
-    responders (3.1.1)
+    responders (3.1.0)
      actionpack (>= 5.2)
      railties (>= 5.2)
    rest-client (2.1.0)
@@ -709,23 +702,23 @@ GEM
      activesupport (>= 4)
    selectize-rails (0.12.6)
    semantic_range (3.0.0)
-    sentry-rails (5.13.0)
+    sentry-rails (5.11.0)
      railties (>= 5.0)
-      sentry-ruby (~> 5.13.0)
-    sentry-ruby (5.13.0)
+      sentry-ruby (~> 5.11.0)
+    sentry-ruby (5.11.0)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.13.0)
-      sentry-ruby (~> 5.13.0)
+    sentry-sidekiq (5.11.0)
+      sentry-ruby (~> 5.11.0)
      sidekiq (>= 3.0)
    sexp_processor (4.17.0)
    shoulda-matchers (5.3.0)
      activesupport (>= 5.2.0)
-    sidekiq (7.2.0)
+    sidekiq (7.1.3)
      concurrent-ruby (< 2)
      connection_pool (>= 2.3.0)
      rack (>= 2.2.4)
      redis-client (>= 0.14.0)
-    sidekiq-cron (1.11.0)
+    sidekiq-cron (1.10.1)
      fugit (~> 1.8)
      globalid (>= 1.0.1)
      sidekiq (>= 6)
@@ -739,12 +732,13 @@ GEM
      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
    simplecov-html (0.10.2)
-    slack-ruby-client (2.2.0)
+    slack-ruby-client (2.0.0)
      faraday (>= 2.0)
      faraday-mashify
      faraday-multipart
      gli
      hashie
+      websocket-driver
    snaky_hash (2.0.1)
      hashie
      version_gem (~> 1.1, >= 1.1.1)
@@ -752,7 +746,7 @@ GEM
    spring-watcher-listen (2.1.0)
      listen (>= 2.7, < 4.0)
      spring (>= 4)
-    sprockets (4.2.1)
+    sprockets (4.2.0)
      concurrent-ruby (~> 1.0)
      rack (>= 2.2.4, < 4)
    sprockets-rails (3.4.2)
@@ -765,12 +759,12 @@ GEM
    stripe (8.5.0)
    telephone_number (1.4.20)
    test-prof (1.2.1)
-    thor (1.3.0)
-    tilt (2.3.0)
+    thor (1.2.2)
+    tilt (2.2.0)
    time_diff (0.3.0)
      activesupport
      i18n
-    timeout (0.4.1)
+    timeout (0.4.0)
    trailblazer-option (0.1.2)
    twilio-ruby (5.77.0)
      faraday (>= 0.9, < 3.0)
@@ -823,7 +817,7 @@ GEM
    working_hours (1.4.1)
      activesupport (>= 3.2)
      tzinfo
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.11)

 PLATFORMS
  arm64-darwin-20
@@ -841,11 +835,11 @@ DEPENDENCIES
  activerecord-import
  acts-as-taggable-on
  administrate (>= 0.19.0)
-  administrate-field-active_storage (>= 1.0.0)
+  administrate-field-active_storage
  administrate-field-belongs_to_search
  annotate
  attr_extras
-  audited (~> 5.4, >= 5.4.1)
+  audited (~> 5.4, >= 5.4.0)
  aws-sdk-s3
  azure-storage-blob!
  barnes
@@ -862,7 +856,7 @@ DEPENDENCIES
  database_cleaner
  ddtrace
  debug (~> 1.8)
-  devise (>= 4.9.3)
+  devise
  devise-secure_password!
  devise_token_auth
  dotenv-rails
@@ -898,12 +892,11 @@ DEPENDENCIES
  line-bot-api
  liquid
  listen
-  lograge (~> 0.14.0)
+  lograge (~> 0.13.0)
  maxminddb
-  meta_request
  mock_redis
  neighbor
-  newrelic-sidekiq-metrics (>= 1.6.2)
+  newrelic-sidekiq-metrics
  newrelic_rpm
  omniauth
  omniauth-google-oauth2
@@ -923,7 +916,7 @@ DEPENDENCIES
  rails (~> 7.0.8.0)
  redis
  redis-namespace
-  responders (>= 3.1.1)
+  responders
  rest-client
  reverse_markdown
  rspec-rails
@@ -935,14 +928,14 @@ DEPENDENCIES
  scout_apm
  scss_lint
  seed_dump
-  sentry-rails (>= 5.13.0)
+  sentry-rails (>= 5.11.0)
  sentry-ruby
-  sentry-sidekiq (>= 5.13.0)
+  sentry-sidekiq (>= 5.11.0)
  shoulda-matchers
  sidekiq (>= 7.1.3)
-  sidekiq-cron (>= 1.11.0)
+  sidekiq-cron (>= 1.10.1)
  simplecov (= 0.17.1)
-  slack-ruby-client (~> 2.2.0)
+  slack-ruby-client (~> 2.0.0)
  spring
  spring-watcher-listen
  squasher
@@ -1,3 +1,3 @@
 backend: RAILS_ENV=test bin/rails s -p 5050
-frontend: export NODE_OPTIONS=--openssl-legacy-provider && bin/webpack-dev-server
-worker: RAILS_ENV=test dotenv bundle exec sidekiq -C config/sidekiq.yml
+frontend: bin/webpack-dev-server
+worker: dotenv RAILS_ENV=test bundle exec sidekiq -C config/sidekiq.yml
@@ -1,12 +1,10 @@
-<img src="https://user-images.githubusercontent.com/2246121/282256557-1570674b-d142-4198-9740-69404cc6a339.png#gh-light-mode-only" width="100%" alt="Chat dashboard dark mode"/>
-<img src="https://user-images.githubusercontent.com/2246121/282256632-87f6a01b-6467-4e0e-8a93-7bbf66d03a17.png#gh-dark-mode-only" width="100%" alt="Chat dashboard"/>
+<p align="center">
+  <img src="https://s3.us-west-2.amazonaws.com/gh-assets.chatwoot.com/brand.svg" alt="Woot-logo" width="240" />

-___
+  <p align="center">Customer engagement suite, an open-source alternative to Intercom, Zendesk, Salesforce Service Cloud etc.</p>
+</p>

-# Chatwoot 
-
-Customer engagement suite, an open-source alternative to Intercom, Zendesk, Salesforce Service Cloud etc.
-<p>
+<p align="center">
  <a href="https://heroku.com/deploy?template=https://github.com/chatwoot/chatwoot/tree/master" alt="Deploy to Heroku">
     <img width="150" alt="Deploy" src="https://www.herokucdn.com/deploy/button.svg"/>
  </a>
@@ -15,7 +13,9 @@ Customer engagement suite, an open-source alternative to Intercom, Zendesk, Sale
  </a>
 </p>

-<p>
+___
+
+<p align="center">
  <a href="https://codeclimate.com/github/chatwoot/chatwoot/maintainability"><img src="https://api.codeclimate.com/v1/badges/e6e3f66332c91e5a4c0c/maintainability" alt="Maintainability"></a>
  <img src="https://img.shields.io/circleci/build/github/chatwoot/chatwoot" alt="CircleCI Badge">
    <a href="https://hub.docker.com/r/chatwoot/chatwoot/"><img src="https://img.shields.io/docker/pulls/chatwoot/chatwoot" alt="Docker Pull Badge"></a>
@@ -29,8 +29,9 @@ Customer engagement suite, an open-source alternative to Intercom, Zendesk, Sale
  <a href="https://artifacthub.io/packages/helm/chatwoot/chatwoot"><img src="https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/artifact-hub" alt="Artifact HUB"></a>
 </p>

-<img src="https://user-images.githubusercontent.com/2246121/282255783-ee8a50c9-f42d-4752-8201-2d59965a663d.png#gh-light-mode-only" width="100%" alt="Chat dashboard dark mode"/>
-<img src="https://user-images.githubusercontent.com/2246121/282255784-3d1994ec-d895-4ff5-ac68-d819987e1869.png#gh-dark-mode-only" width="100%" alt="Chat dashboard"/>
+<img src="https://chatwoot-public-assets.s3.amazonaws.com/github/screenshot.png" width="100%" alt="Chat dashboard"/>
+
+

 Chatwoot is an open-source, self-hosted customer engagement suite. Chatwoot lets you view and manage your customer data, communicate with them irrespective of which medium they use, and re-engage them based on their profile.

@@ -1 +1 @@
-2.6.0
+2.4.0
@@ -93,9 +93,6 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
      message_type: @message_type,
      content: response.content,
      source_id: response.identifier,
-      content_attributes: {
-        in_reply_to_external_id: response.in_reply_to_external_id
-      },
      sender: @outgoing_echo ? nil : @contact_inbox.contact
    }
  end
@@ -76,10 +76,6 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
    message[:reply_to][:story] if message[:reply_to].present? && message[:reply_to][:story].present?
  end

-  def message_reply_attributes
-    message[:reply_to][:mid] if message[:reply_to].present? && message[:reply_to][:mid].present?
-  end
-
  def build_message
    return if @outgoing_echo && already_sent_from_chatwoot?
    return if message_content.blank? && all_unsupported_files?
@@ -122,10 +118,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
      message_type: message_type,
      source_id: message_identifier,
      content: message_content,
-      sender: @outgoing_echo ? nil : contact,
-      content_attributes: {
-        in_reply_to_external_id: message_reply_attributes
-      }
+      sender: @outgoing_echo ? nil : contact
    }
  end

@@ -9,11 +9,11 @@ class Messages::MessageBuilder
    @user = user
    @message_type = params[:message_type] || 'outgoing'
    @attachments = params[:attachments]
-    @automation_rule = content_attributes&.dig(:automation_rule_id)
+    @automation_rule = @params&.dig(:content_attributes, :automation_rule_id)
    return unless params.instance_of?(ActionController::Parameters)

-    @in_reply_to = content_attributes&.dig(:in_reply_to)
-    @items = content_attributes&.dig(:items)
+    @in_reply_to = params.to_unsafe_h&.dig(:content_attributes, :in_reply_to)
+    @items = params.to_unsafe_h&.dig(:content_attributes, :items)
  end

  def perform
@@ -26,38 +26,6 @@ class Messages::MessageBuilder

  private

-  # 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.
-  # - Returns an empty hash if content is not present, if there's a parsing error, or if it's an unexpected type.
-  def content_attributes
-    params = convert_to_hash(@params)
-    content_attributes = params.fetch(:content_attributes, {})
-
-    return parse_json(content_attributes) if content_attributes.is_a?(String)
-    return content_attributes if content_attributes.is_a?(Hash)
-
-    {}
-  end
-
-  # Converts the given object to a hash.
-  # If it's an instance of ActionController::Parameters, converts it to an unsafe hash.
-  # Otherwise, returns the object as-is.
-  def convert_to_hash(obj)
-    return obj.to_unsafe_h if obj.instance_of?(ActionController::Parameters)
-
-    obj
-  end
-
-  # Attempts to parse a string as JSON.
-  # If successful, returns the parsed hash with symbolized names.
-  # If unsuccessful, returns nil.
-  def parse_json(content)
-    JSON.parse(content, symbolize_names: true)
-  rescue JSON::ParserError
-    {}
-  end
-
  def process_attachments
    return if @attachments.blank?

@@ -15,10 +15,7 @@ class V2::ReportBuilder
  end

  def timeseries
-    return send(params[:metric]) if metric_valid?
-
-    Rails.logger.error "ReportBuilder: Invalid metric - #{params[:metric]}"
-    {}
+    send(params[:metric])
  end

  # For backward compatible with old report
@@ -56,16 +53,6 @@ class V2::ReportBuilder

  private

-  def metric_valid?
-    %w[conversations_count
-       incoming_messages_count
-       outgoing_messages_count
-       avg_first_response_time
-       avg_resolution_time reply_time
-       resolutions_count
-       reply_time].include?(params[:metric])
-  end
-
  def inbox
    @inbox ||= account.inboxes.find(params[:id])
  end
@@ -9,6 +9,7 @@ class Api::V1::Accounts::Actions::ContactMergesController < Api::V1::Accounts::B
      mergee_contact: @mergee_contact
    )
    contact_merge_action.perform
+    render json: @base_contact
  end

  private
@@ -10,7 +10,7 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
    @articles_count = @all_articles.count

    @articles = if list_params[:category_slug].present?
-                  @all_articles.order_by_position.page(@current_page)
+                  @all_articles.order_by_position.page(@current_page).per(50)
                else
                  @all_articles.order_by_updated_at.page(@current_page)
                end
@@ -48,7 +48,7 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle

  def category_params
    params.require(:category).permit(
-      :name, :description, :position, :slug, :locale, :icon, :parent_category_id, :associated_category_id
+      :name, :description, :position, :slug, :locale, :parent_category_id, :associated_category_id
    )
  end

@@ -60,7 +60,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
  end

  def toggle_status
-    if params[:status].present?
+    if params[:status]
      set_conversation_status
      @status = @conversation.save!
    else
@@ -1,8 +1,7 @@
 class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseController
  RESULTS_PER_PAGE = 15
-  include DateRangeHelper

-  before_action :fetch_notification, only: [:update, :destroy, :snooze]
+  before_action :fetch_notification, only: [:update]
  before_action :set_primary_actor, only: [:read_all]
  before_action :set_current_page, only: [:index]

@@ -29,21 +28,11 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
    render json: @notification
  end

-  def destroy
-    @notification.destroy
-    head :ok
-  end
-
  def unread_count
    @unread_count = current_user.notifications.where(account_id: current_account.id, read_at: nil).count
    render json: @unread_count
  end

-  def snooze
-    @notification.update(snoozed_until: parse_date_time(params[:snoozed_until].to_s)) if params[:snoozed_until]
-    render json: @notification
-  end
-
  private

  def set_primary_actor
@@ -47,11 +47,6 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    head :ok
  end

-  def logo
-    @portal.logo.purge if @portal.logo.attached?
-    head :ok
-  end
-
  def process_attached_logo
    blob_id = params[:blob_id]
    blob = ActiveStorage::Blob.find_by(id: blob_id)
@@ -79,9 +79,6 @@ class Api::V1::Widget::BaseController < ApplicationController
      sender: @contact,
      content: permitted_params[:message][:content],
      inbox_id: conversation.inbox_id,
-      content_attributes: {
-        in_reply_to: permitted_params[:message][:reply_to]
-      },
      echo_id: permitted_params[:message][:echo_id],
      message_type: :incoming
    }
@@ -1,6 +1,5 @@
 class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
  include Events::Types
-  before_action :render_not_found_if_empty, only: [:toggle_typing, :toggle_status, :set_custom_attributes, :destroy_custom_attributes]

  def index
    @conversation = conversation
@@ -28,7 +27,6 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController

    conversation.contact_last_seen_at = DateTime.now.utc
    conversation.save!
-    ::Conversations::UpdateMessageStatusJob.perform_later(conversation.id, conversation.contact_last_seen_at)
    head :ok
  end

@@ -43,6 +41,8 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
  end

  def toggle_typing
+    head :ok && return if conversation.nil?
+
    case permitted_params[:typing_status]
    when 'on'
      trigger_typing_event(CONVERSATION_TYPING_ON)
@@ -54,6 +54,8 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
  end

  def toggle_status
+    return head :not_found if conversation.nil?
+
    return head :forbidden unless @web_widget.end_conversation?

    unless conversation.resolved?
@@ -79,10 +81,6 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
    Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: conversation, user: @contact)
  end

-  def render_not_found_if_empty
-    return head :not_found if conversation.nil?
-  end
-
  def permitted_params
    params.permit(:id, :typing_status, :website_token, :email, contact: [:name, :email, :phone_number],
                                                               message: [:content, :referer_url, :timestamp, :echo_id],
@@ -64,7 +64,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController

  def permitted_params
    # timestamp parameter is used in create conversation method
-    params.permit(:id, :before, :after, :website_token, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id, :reply_to])
+    params.permit(:id, :before, :after, :website_token, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id])
  end

  def set_message
@@ -23,7 +23,6 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
  def update_last_seen
    @conversation.contact_last_seen_at = DateTime.now.utc
    @conversation.save!
-    ::Conversations::UpdateMessageStatusJob.perform_later(@conversation.id, @conversation.contact_last_seen_at)
    head :ok
  end

@@ -39,6 +39,10 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
    )
  end

+  def portal
+    @portal ||= Portal.find_by!(slug: permitted_params[:slug], archived: false)
+  end
+
  def list_params
    params.permit(:query, :locale, :sort, :status)
  end
@@ -11,11 +11,11 @@ class Public::Api::V1::Portals::BaseController < PublicController
  end

  def set_color_scheme
-    @theme_from_params = params[:theme] if %w[dark light].include?(params[:theme])
-  end
-
-  def portal
-    @portal ||= Portal.find_by!(slug: params[:slug], archived: false)
+    @theme = if %w[dark light].include?(params[:theme])
+               params[:theme]
+             else
+               ''
+             end
  end

  def set_locale(&)
@@ -40,8 +40,6 @@ class Public::Api::V1::Portals::BaseController < PublicController

  def switch_locale_with_article(&)
    article = Article.find_by(slug: params[:article_slug])
-    Rails.logger.info "Article: not found for slug: #{params[:article_slug]}"
-    render_404 && return if article.blank?

    @locale = if article.category.present?
                article.category.locale
@@ -55,9 +53,4 @@ class Public::Api::V1::Portals::BaseController < PublicController
  def allow_iframe_requests
    response.headers.delete('X-Frame-Options') if @is_plain_layout_enabled
  end
-
-  def render_404
-    portal
-    render 'public/api/v1/portals/error/404', status: :not_found
-  end
 end
@@ -13,9 +13,10 @@ class Public::Api::V1::Portals::CategoriesController < Public::Api::V1::Portals:
  private

  def set_category
-    @category = @portal.categories.find_by(locale: params[:locale], slug: params[:category_slug])
+    @category = @portal.categories.find_by!(locale: params[:locale], slug: params[:category_slug])
+  end

-    Rails.logger.info "Category: not found for slug: #{params[:category_slug]}"
-    render_404 && return if @category.blank?
+  def portal
+    @portal ||= Portal.find_by!(slug: params[:slug], archived: false)
  end
 end
@@ -27,8 +27,7 @@ class SuperAdmin::Devise::SessionsController < Devise::SessionsController

    true
  rescue StandardError => e
-    Rails.logger.error e.message
-    @error_message = 'Invalid credentials. Please try again.'
+    @error_message = e.message
    false
  end
 end
@@ -1,21 +0,0 @@
-class Twilio::DeliveryStatusController < ApplicationController
-  def create
-    ::Twilio::DeliveryStatusService.new(params: permitted_params).perform
-
-    head :no_content
-  end
-
-  private
-
-  def permitted_params
-    params.permit(
-      :AccountSid,
-      :From,
-      :MessageSid,
-      :MessagingServiceSid,
-      :MessageStatus,
-      :ErrorCode,
-      :ErrorMessage
-    )
-  end
-end
@@ -1,69 +1,11 @@
 module PortalHelper
  def generate_portal_bg_color(portal_color, theme)
    base_color = theme == 'dark' ? 'black' : 'white'
-    "color-mix(in srgb, #{portal_color} 20%, #{base_color})"
+    "color-mix(in srgb, #{portal_color} 10%, #{base_color})"
  end

  def generate_portal_bg(portal_color, theme)
-    bg_image = theme == 'dark' ? 'hexagon-dark.svg' : 'hexagon-light.svg'
-    "url(/assets/images/hc/#{bg_image}) #{generate_portal_bg_color(portal_color, theme)}"
-  end
-
-  def generate_gradient_to_bottom(theme)
-    base_color = theme == 'dark' ? '#151718' : 'white'
-    "linear-gradient(to bottom, transparent, #{base_color})"
-  end
-
-  def generate_portal_hover_color(portal_color, theme)
-    base_color = theme == 'dark' ? '#1B1B1B' : '#F9F9F9'
-    "color-mix(in srgb, #{portal_color} 5%, #{base_color})"
-  end
-
-  def language_name(locale)
-    language_map = YAML.load_file(Rails.root.join('config/languages/language_map.yml'))
-    language_map[locale] || locale
-  end
-
-  def theme_query_string(theme)
-    theme.present? && theme != 'system' ? "?theme=#{theme}" : ''
-  end
-
-  def generate_home_link(portal_slug, portal_locale, theme, is_plain_layout_enabled)
-    if is_plain_layout_enabled
-      "/hc/#{portal_slug}/#{portal_locale}#{theme_query_string(theme)}"
-    else
-      "/hc/#{portal_slug}/#{portal_locale}"
-    end
-  end
-
-  def generate_category_link(params)
-    portal_slug = params[:portal_slug]
-    category_locale = params[:category_locale]
-    category_slug = params[:category_slug]
-    theme = params[:theme]
-    is_plain_layout_enabled = params[:is_plain_layout_enabled]
-
-    if is_plain_layout_enabled
-      "/hc/#{portal_slug}/#{category_locale}/categories/#{category_slug}#{theme_query_string(theme)}"
-    else
-      "/hc/#{portal_slug}/#{category_locale}/categories/#{category_slug}"
-    end
-  end
-
-  def generate_article_link(portal_slug, article_slug, theme, is_plain_layout_enabled)
-    if is_plain_layout_enabled
-      "/hc/#{portal_slug}/articles/#{article_slug}#{theme_query_string(theme)}"
-    else
-      "/hc/#{portal_slug}/articles/#{article_slug}"
-    end
-  end
-
-  def render_category_content(content)
-    ChatwootMarkdownRenderer.new(content).render_markdown_to_plain_text
-  end
-
-  def thumbnail_bg_color(username)
-    colors = ['#6D95BA', '#A4C3C3', '#E19191']
-    colors[username.length % colors.size]
+    bg_image = theme == 'dark' ? 'grid_dark.svg' : 'grid.svg'
+    "background: url(/assets/images/hc/#{bg_image}) #{generate_portal_bg_color(portal_color, theme)}"
  end
 end
@@ -1,13 +1,13 @@
 <template>
  <div
-    v-if="!authUIFlags.isFetching && !accountUIFlags.isFetchingItem"
+    v-if="!authUIFlags.isFetching"
    id="app"
    class="app-wrapper h-full flex-grow-0 min-h-0 w-full"
    :class="{ 'app-rtl--wrapper': isRTLView }"
    :dir="isRTLView ? 'rtl' : 'ltr'"
  >
    <update-banner :latest-chatwoot-version="latestChatwootVersion" />
-    <template v-if="currentAccountId">
+    <template v-if="!accountUIFlags.isFetchingItem && currentAccountId">
      <payment-pending-banner />
      <upgrade-banner />
    </template>
@@ -84,11 +84,6 @@ export default {
    return axios.delete(endPoints('deleteAvatar').url);
  },

-  resetPassword({ email }) {
-    const urlData = endPoints('resetPassword');
-    return axios.post(urlData.url, { email });
-  },
-
  setActiveAccount({ accountId }) {
    const urlData = endPoints('setActiveAccount');
    return axios.put(urlData.url, {
@@ -1,7 +1,6 @@
 /* global axios */

 import PortalsAPI from './portals';
-import { getArticleSearchURL } from 'dashboard/helper/URLHelper.js';

 class ArticlesAPI extends PortalsAPI {
  constructor() {
@@ -13,31 +12,14 @@ class ArticlesAPI extends PortalsAPI {
    portalSlug,
    locale,
    status,
-    authorId,
-    categorySlug,
-    sort,
+    author_id,
+    category_slug,
  }) {
-    const url = getArticleSearchURL({
-      pageNumber,
-      portalSlug,
-      locale,
-      status,
-      authorId,
-      categorySlug,
-      sort,
-      host: this.url,
-    });
-
-    return axios.get(url);
-  }
-
-  searchArticles({ portalSlug, query }) {
-    const url = getArticleSearchURL({
-      portalSlug,
-      query,
-      host: this.url,
-    });
-    return axios.get(url);
+    let baseUrl = `${this.url}/${portalSlug}/articles?page=${pageNumber}&locale=${locale}`;
+    if (status !== undefined) baseUrl += `&status=${status}`;
+    if (author_id) baseUrl += `&author_id=${author_id}`;
+    if (category_slug) baseUrl += `&category_slug=${category_slug}`;
+    return axios.get(baseUrl);
  }

  getArticle({ id, portalSlug }) {
@@ -17,10 +17,6 @@ class PortalsAPI extends ApiClient {
  deletePortal(portalSlug) {
    return axios.delete(`${this.url}/${portalSlug}`);
  }
-
-  deleteLogo(portalSlug) {
-    return axios.delete(`${this.url}/${portalSlug}/logo`);
-  }
 }

 export default PortalsAPI;
@@ -26,13 +26,9 @@ export const buildCreatePayload = ({
    payload.append('echo_id', echoId);
    payload.append('cc_emails', ccEmails);
    payload.append('bcc_emails', bccEmails);
-
    if (toEmails) {
      payload.append('to_emails', toEmails);
    }
-    if (contentAttributes) {
-      payload.append('content_attributes', JSON.stringify(contentAttributes));
-    }
  } else {
    payload = {
      content: message,
@@ -34,7 +34,7 @@ describe('#PortalAPI', () => {
        portalSlug: 'room-rental',
        locale: 'en-US',
        status: 'published',
-        authorId: '1',
+        author_id: '1',
      });
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/portals/room-rental/articles?page=1&locale=en-US&status=published&author_id=1'
@@ -85,33 +85,6 @@ describe('#PortalAPI', () => {
      window.axios = originalAxios;
    });

-    it('#searchArticles', () => {
-      articlesAPI.searchArticles({
-        query: 'test',
-        portalSlug: 'room-rental',
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/portals/room-rental/articles?query=test'
-      );
-    });
-  });
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
    it('#updateArticle', () => {
      articlesAPI.updateArticle({
        articleId: 1,
@@ -50,7 +50,6 @@ describe('#ConversationAPI', () => {
        message: 'test content',
        echoId: 12,
        isPrivate: true,
-        contentAttributes: { in_reply_to: 12 },
        files: [new Blob(['test-content'], { type: 'application/pdf' })],
      });
      expect(formPayload).toBeInstanceOf(FormData);
@@ -58,10 +57,6 @@ describe('#ConversationAPI', () => {
      expect(formPayload.get('echo_id')).toEqual('12');
      expect(formPayload.get('private')).toEqual('true');
      expect(formPayload.get('cc_emails')).toEqual('');
-      expect(formPayload.get('bcc_emails')).toEqual('');
-      expect(formPayload.get('content_attributes')).toEqual(
-        '{"in_reply_to":12}'
-      );
    });

    it('builds object payload if file is not available', () => {
@@ -1,5 +1,9 @@
@import '~vue2-datepicker/scss/index';

+.mx-datepicker-popup {
+  @apply z-[99999];
+}
+
 .date-picker {
  &.no-margin {
    .mx-input {
@@ -25,52 +29,10 @@
  .mx-input[readonly] {
    @apply bg-white dark:bg-slate-900 cursor-pointer;
  }
-
-  .mx-icon-calendar {
-    @apply dark:text-slate-500;
-  }
 }

-.mx-datepicker-main {
-  @apply border-0 bg-white dark:bg-slate-800;
-
-  .cell {
-    &.disabled {
-      @apply bg-slate-25 dark:bg-slate-900 text-slate-200 dark:text-slate-300;
-    }
-
-    &:hover,
-    &.hover-in-range,
-    &.in-range {
-      @apply bg-slate-75 dark:bg-slate-700 text-slate-900 dark:text-slate-100;
-    }
-  }
-
-  .mx-time {
-    @apply border-0 bg-white dark:bg-slate-800;
-
-    .mx-time-header {
-      @apply border-0;
-    }
-
-    .mx-time-item {
-      &.disabled {
-        @apply bg-slate-25 dark:bg-slate-900;
-      }
-
-      &:hover {
-        @apply bg-slate-75 dark:bg-slate-700;
-      }
-    }
-  }
-
-  .today {
-    @apply font-semibold;
-  }
-}
-
-.mx-datepicker-popup {
-  @apply z-[99999];
+.mx-calendar-content .cell:hover {
+  @apply bg-slate-75 dark:bg-slate-700 text-slate-900 dark:text-slate-100;
 }

 .mx-datepicker-inline {
@@ -79,4 +41,24 @@
  .mx-calendar {
    @apply w-full;
  }
+
+  .cell.disabled {
+    @apply bg-slate-25 dark:bg-slate-900 text-slate-200 dark:text-slate-300;
+  }
+
+  .mx-time-item.disabled {
+    @apply bg-slate-25 dark:bg-slate-900;
+  }
+
+  .today {
+    @apply font-semibold;
+  }
+
+  .mx-datepicker-main {
+    @apply border-0 bg-white dark:bg-slate-800;
+  }
+
+  .mx-time-header {
+    @apply border-0;
+  }
 }
@@ -16,23 +16,3 @@
    width: 100%;
  }
 }
-
-.integration-hooks {
-  .formulate-input[data-type='checkbox'] {
-    .formulate-input-wrapper {
-      @apply flex;
-
-      .formulate-input-element {
-        @apply pr-2;
-
-        input {
-          @apply mb-0;
-        }
-      }
-    }
-
-    .formulate-input-element-decorator {
-      @apply hidden;
-    }
-  }
-}
@@ -34,26 +34,26 @@
  }

  &.hollow {
-    @apply border border-woot-500 dark:border-woot-500 text-woot-500 dark:text-woot-500 hover:bg-woot-50 dark:hover:bg-woot-900;
+    @apply border border-slate-200 dark:border-slate-600 text-woot-700 dark:text-woot-100 hover:bg-woot-50 dark:hover:bg-woot-900;

    &.secondary {
      @apply text-slate-700 border-slate-200 dark:border-slate-600 dark:text-slate-100 hover:bg-slate-50 dark:hover:bg-slate-700;
    }

    &.success {
-      @apply text-green-700 dark:text-green-400 border-green-100 dark:border-green-600 hover:bg-green-50 dark:hover:bg-green-800;
+      @apply text-green-700 dark:text-green-100 hover:bg-green-50 dark:hover:bg-green-800;
    }

    &.alert {
-      @apply text-red-700 dark:text-red-400 border-red-100 dark:border-red-600 hover:bg-red-50 dark:hover:bg-red-800;
+      @apply text-red-700 dark:text-red-100 hover:bg-red-50 dark:hover:bg-red-800;
    }

    &.warning {
-      @apply text-yellow-600 dark:text-yellow-600 border-yellow-600 dark:border-yellow-700 hover:bg-yellow-50 dark:hover:bg-yellow-800;
+      @apply text-yellow-700 dark:text-yellow-100 hover:bg-yellow-50 dark:hover:bg-yellow-800;
    }

    &:hover {
-      @apply bg-woot-75 dark:bg-woot-800 border-slate-100 dark:border-woot-600 dark:text-woot-400;
+      @apply bg-slate-75 dark:bg-slate-900 border-slate-100 dark:border-slate-700;

      &.secondary {
        @apply border-slate-100 dark:border-slate-700 text-slate-800 dark:text-slate-100;
@@ -68,7 +68,7 @@
      }

      &.warning {
-        @apply border-slate-100 dark:border-slate-700 text-yellow-700 dark:text-yellow-500;
+        @apply border-slate-100 dark:border-slate-700 text-yellow-700 dark:text-yellow-700;
      }
    }
  }
@@ -152,10 +152,6 @@

      &.is-image {
        @apply rounded-lg;
-
-        .message__mail-head {
-          @apply px-4 py-2;
-        }
      }
    }

@@ -4,6 +4,10 @@
  @apply flex items-center justify-center bg-modal dark:bg-modal z-[9990] h-full left-0 fixed top-0 w-full;
 }

+.modal--close {
+  @apply absolute right-2 rtl:right-[unset] rtl:left-2 top-2;
+}
+
 .page-top-bar {
  @apply px-8 pt-9 pb-0;

@@ -2,10 +2,6 @@
  transition: box-shadow 0.35s $swift-ease-out-function,
    height 2s $swift-ease-out-function;

-  &.is-focused {
-    box-shadow: var(--shadow);
-  }
-
  .reply-box__top {
    .icon {
      color: $medium-gray;
@@ -47,8 +43,6 @@
  }

  &.is-private {
-    @apply bg-yellow-100 dark:bg-yellow-800;
-
    .reply-box__top {
      @apply bg-yellow-100 dark:bg-yellow-800;

@@ -207,7 +207,6 @@ import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCust
 import ConversationBulkActions from './widgets/conversation/conversationBulkActions/Index.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import filterMixin from 'shared/mixins/filterMixin';
-import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
 import countries from 'shared/constants/countries';
 import { generateValuesForEditCustomViews } from 'dashboard/helper/customViewsHelper';
@@ -239,7 +238,6 @@ export default {
    eventListenerMixins,
    alertMixin,
    filterMixin,
-    uiSettingsMixin,
  ],
  props: {
    conversationInbox: {
@@ -410,12 +408,8 @@ export default {
    },
    conversationListPagination() {
      const conversationsPerPage = 25;
-      const hasChatsOnView =
-        this.chatsOnView &&
-        Array.isArray(this.chatsOnView) &&
-        !this.chatsOnView.length;
      const isNoFiltersOrFoldersAndChatListNotEmpty =
-        !this.hasAppliedFiltersOrActiveFolders && hasChatsOnView;
+        !this.hasAppliedFiltersOrActiveFolders && this.chatsOnView !== [];
      const isUnderPerPage =
        this.chatsOnView.length < conversationsPerPage &&
        this.activeAssigneeTabCount < conversationsPerPage &&
@@ -521,7 +515,6 @@ export default {
    },
  },
  mounted() {
-    this.setFiltersFromUISettings();
    this.$store.dispatch('setChatStatusFilter', this.activeStatus);
    this.$store.dispatch('setChatSortFilter', this.activeSortBy);
    this.resetAndFetchData();
@@ -551,12 +544,6 @@ export default {
      this.$store.dispatch('customViews/update', payloadData);
      this.closeAdvanceFiltersModal();
    },
-    setFiltersFromUISettings() {
-      const { conversations_filter_by: filterBy = {} } = this.uiSettings;
-      const { status, order_by: orderBy } = filterBy;
-      this.activeStatus = status || wootConstants.STATUS_TYPE.OPEN;
-      this.activeSortBy = orderBy || wootConstants.SORT_BY_TYPE.LATEST;
-    },
    onClickOpenAddFoldersModal() {
      this.showAddFoldersModal = true;
    },
@@ -4,19 +4,15 @@
      v-if="show"
      :class="modalClassName"
      transition="modal"
-      @mousedown="handleMouseDown"
+      @click="onBackDropClick"
    >
-      <div
-        :class="modalContainerClassName"
-        @mouse.stop
-        @mousedown="event => event.stopPropagation()"
-      >
+      <div :class="modalContainerClassName" @click.stop>
        <woot-button
          v-if="showCloseButton"
          color-scheme="secondary"
          icon="dismiss"
          variant="clear"
-          class="absolute ltr:right-2 rtl:left-2 top-2 z-10"
+          class="modal--close"
          @click="close"
        />
        <slot />
@@ -54,11 +50,6 @@ export default {
      default: '',
    },
  },
-  data() {
-    return {
-      mousedDownOnBackdrop: false,
-    };
-  },
  computed: {
    modalContainerClassName() {
      let className =
@@ -86,22 +77,13 @@ export default {
        this.onClose();
      }
    });
-
-    document.body.addEventListener('mouseup', this.onMouseUp);
-  },
-  beforeDestroy() {
-    document.body.removeEventListener('mouseup', this.onMouseUp);
  },
  methods: {
-    handleMouseDown() {
-      this.mousedDownOnBackdrop = true;
-    },
    close() {
      this.onClose();
    },
-    onMouseUp() {
-      if (this.mousedDownOnBackdrop) {
-        this.mousedDownOnBackdrop = false;
+    onBackDropClick() {
+      if (this.closeOnBackdropClick) {
        this.onClose();
      }
    },
@@ -11,6 +11,7 @@
      @key-shortcut-modal="toggleKeyShortcutModal"
      @open-notification-panel="openNotificationPanel"
    />
+
    <secondary-sidebar
      v-if="showSecondarySidebar"
      :class="sidebarClassName"
@@ -113,12 +114,7 @@ export default {
        if (!isAvailableForTheUser) {
          return false;
        }
-        if (
-          menuItem.alwaysVisibleOnChatwootInstances &&
-          !this.isACustomBrandedInstance
-        ) {
-          return true;
-        }
+
        if (menuItem.featureFlag) {
          return this.isFeatureEnabledonAccount(
            this.accountId,
@@ -42,7 +42,6 @@ const primaryMenuItems = accountId => [
    key: 'helpcenter',
    label: 'HELP_CENTER.TITLE',
    featureFlag: FEATURE_FLAGS.HELP_CENTER,
-    alwaysVisibleOnChatwootInstances: true,
    toState: frontendURL(`accounts/${accountId}/portals`),
    toStateName: 'default_portal_articles',
    roles: ['administrator'],
@@ -136,7 +136,6 @@ export default {
        toStateName: 'labels_list',
        showModalForNewItem: true,
        modalName: 'AddLabel',
-        dataTestid: 'sidebar-new-label-button',
        children: this.labels.map(label => ({
          id: label.id,
          label: label.title,
@@ -78,7 +78,6 @@
              variant="clear"
              color-scheme="secondary"
              icon="add"
-              :data-testid="menuItem.dataTestid"
              @click="e => newLinkClick(e, navigate)"
            >
              {{ $t(`SIDEBAR.${menuItem.newLinkTag}`) }}
@@ -61,7 +61,6 @@ export default {
  computed: {
    ...mapGetters({
      currentChat: 'getSelectedChat',
-      isAChatwootInstance: 'globalConfig/isAChatwootInstance',
    }),
    isAICTAModalDismissed() {
      return this.uiSettings.is_open_ai_cta_modal_dismissed;
@@ -71,8 +70,7 @@ export default {
      return (
        this.isAdmin &&
        !this.isAIIntegrationEnabled &&
-        !this.isAICTAModalDismissed &&
-        this.isAChatwootInstance
+        !this.isAICTAModalDismissed
      );
    },
    // Display a AI CTA button for agents and other admins who have not yet opened the AI assistance modal.
@@ -1,9 +1,11 @@
 <template>
-  <div class="preview-item__wrap flex overflow-auto max-h-[12.5rem]">
+  <div
+    class="preview-item__wrap flex flex-col overflow-auto mt-4 max-h-[12.5rem]"
+  >
    <div
      v-for="(attachment, index) in attachments"
      :key="attachment.id"
-      class="preview-item flex items-center p-1 bg-slate-50 dark:bg-slate-800 gap-1 rounded-md w-[15rem] mb-1"
+      class="preview-item flex p-1 bg-slate-50 dark:bg-slate-800 rounded-md w-[15rem] mb-1"
    >
      <div class="max-w-[4rem] flex-shrink-0 w-6 flex items-center">
        <img
@@ -15,7 +17,7 @@
          📄
        </span>
      </div>
-      <div class="max-w-[60%] min-w-[50%] overflow-hidden text-ellipsis">
+      <div class="max-w-[60%] min-w-[50%] overflow-hidden text-ellipsis ml-2">
        <span
          class="h-4 overflow-hidden text-sm font-medium text-ellipsis whitespace-nowrap"
        >
@@ -12,7 +12,7 @@
      />
      <iframe
        v-if="configItem.type === 'frame' && configItem.url"
-        :id="getFrameId(index)"
+        :id="`dashboard-app--frame-${index}`"
        :src="configItem.url"
        @load="() => onIframeLoad(index)"
      />
@@ -39,10 +39,6 @@ export default {
      type: Boolean,
      default: false,
    },
-    position: {
-      type: Number,
-      required: true,
-    },
  },
  data() {
    return {
@@ -86,14 +82,10 @@ export default {
    };
  },
  methods: {
-    getFrameId(index) {
-      return `dashboard-app--frame-${this.position}-${index}`;
-    },
    onIframeLoad(index) {
-      // A possible alternative is to use ref instead of document.getElementById
-      // However, when ref is used together with v-for, the ref you get will be
-      // an array containing the child components mirroring the data source.
-      const frameElement = document.getElementById(this.getFrameId(index));
+      const frameElement = document.getElementById(
+        `dashboard-app--frame-${index}`
+      );
      const eventData = { event: 'appContext', data: this.dashboardAppContext };
      frameElement.contentWindow.postMessage(JSON.stringify(eventData), '*');
      this.iframeLoading = false;
@@ -1,5 +1,5 @@
 <template>
-  <div ref="editorRoot" class="relative editor-root">
+  <div class="editor-root">
    <tag-agents
      v-if="showUserMentions && isPrivate"
      :search-key="mentionSearchKey"
@@ -23,23 +23,6 @@
      @change="onFileChange"
    />
    <div ref="editor" />
-    <div
-      v-show="isImageNodeSelected && showImageResizeToolbar"
-      class="absolute shadow-md rounded-[4px] flex gap-1 py-1 px-1 bg-slate-50 dark:bg-slate-700 text-slate-800 dark:text-slate-50"
-      :style="{
-        top: toolbarPosition.top,
-        left: toolbarPosition.left,
-      }"
-    >
-      <button
-        v-for="size in sizes"
-        :key="size.name"
-        class="text-xs font-medium rounded-[4px] border border-solid border-slate-200 dark:border-slate-600 px-1.5 py-0.5 hover:bg-slate-100 dark:hover:bg-slate-800"
-        @click="setURLWithQueryAndImageSize(size)"
-      >
-        {{ size.name }}
-      </button>
-    </div>
    <slot name="footer" />
  </div>
 </template>
@@ -58,7 +41,6 @@ import {
  suggestionsPlugin,
  triggerCharacters,
 } from '@chatwoot/prosemirror-schema/src/mentions/plugin';
-import { BUS_EVENTS } from 'shared/constants/busEvents';

 import TagAgents from '../conversation/TagAgents.vue';
 import CannedResponse from '../conversation/CannedResponse.vue';
@@ -66,10 +48,6 @@ import VariableList from '../conversation/VariableList.vue';
 import {
  appendSignature,
  removeSignature,
-  insertAtCursor,
-  scrollCursorIntoView,
-  findNodeToInsertImage,
-  setURLWithQueryAndSize,
 } from 'dashboard/helper/editorHelper';

 const TYPING_INDICATOR_IDLE_TIME = 4000;
@@ -89,10 +67,8 @@ import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import { uploadFile } from 'dashboard/helper/uploadHelper';
 import alertMixin from 'shared/mixins/alertMixin';
-import {
-  MESSAGE_EDITOR_MENU_OPTIONS,
-  MESSAGE_EDITOR_IMAGE_RESIZES,
-} from 'dashboard/constants/editor';
+import { findNodeToInsertImage } from 'dashboard/helper/messageEditorHelper';
+import { MESSAGE_EDITOR_MENU_OPTIONS } from 'dashboard/constants/editor';

 const createState = (
  content,
@@ -135,8 +111,6 @@ export default {
    // allowSignature is a kill switch, ensuring no signature methods
    // are triggered except when this flag is true
    allowSignature: { type: Boolean, default: false },
-    channelType: { type: String, default: '' },
-    showImageResizeToolbar: { type: Boolean, default: false }, // A kill switch to show or hide the image toolbar
  },
  data() {
    return {
@@ -149,16 +123,9 @@ export default {
      editorView: null,
      range: null,
      state: undefined,
-      isImageNodeSelected: false,
-      toolbarPosition: { top: 0, left: 0 },
-      sizes: MESSAGE_EDITOR_IMAGE_RESIZES,
-      selectedImageNode: null,
    };
  },
  computed: {
-    editorRoot() {
-      return this.$refs.editorRoot;
-    },
    contentFromEditor() {
      return MessageMarkdownSerializer.serialize(this.editorView.state.doc);
    },
@@ -267,11 +234,8 @@ export default {
    sendWithSignature() {
      // this is considered the source of truth, we watch this property
      // on change, we toggle the signature in the editor
-      if (this.allowSignature && !this.isPrivate && this.channelType) {
-        return this.fetchSignatureFlagFromUiSettings(this.channelType);
-      }
-
-      return false;
+      const { send_with_signature: isEnabled } = this.uiSettings;
+      return isEnabled && this.allowSignature && !this.isPrivate;
    },
  },
  watch: {
@@ -309,7 +273,6 @@ export default {
          const tr = this.editorView.state.tr.replaceSelectionWith(node);
          this.editorView.focus();
          this.state = this.editorView.state.apply(tr);
-          this.editorView.updateState(this.state);
          this.emitOnChange();
          this.$emit('clear-selection');
        }
@@ -335,17 +298,7 @@ export default {
  mounted() {
    this.createEditorView();
    this.editorView.updateState(this.state);
-    this.focusEditorInputField();
-
-    // BUS Event to insert text or markdown into the editor at the
-    // current cursor position.
-    // Components using this
-    // 1. SearchPopover.vue
-
-    bus.$on(BUS_EVENTS.INSERT_INTO_RICH_EDITOR, this.insertContentIntoEditor);
-  },
-  beforeDestroy() {
-    bus.$off(BUS_EVENTS.INSERT_INTO_RICH_EDITOR, this.insertContentIntoEditor);
+    this.focusEditor(this.value);
  },
  methods: {
    reloadState(content = this.value) {
@@ -432,7 +385,6 @@ export default {
        state: this.state,
        dispatchTransaction: tx => {
          this.state = this.state.apply(tx);
-          this.editorView.updateState(this.state);
          this.emitOnChange();
        },
        handleDOMEvents: {
@@ -445,9 +397,6 @@ export default {
          focus: () => {
            this.onFocus();
          },
-          click: () => {
-            this.isEditorMouseFocusedOnAnImage();
-          },
          blur: () => {
            this.onBlur();
          },
@@ -460,50 +409,6 @@ export default {
        },
      });
    },
-    isEditorMouseFocusedOnAnImage() {
-      if (!this.showImageResizeToolbar) {
-        return;
-      }
-      this.selectedImageNode = document.querySelector(
-        'img.ProseMirror-selectednode'
-      );
-      if (this.selectedImageNode) {
-        this.isImageNodeSelected = !!this.selectedImageNode;
-        // Get the position of the selected node
-        this.setToolbarPosition();
-      } else {
-        this.isImageNodeSelected = false;
-      }
-    },
-    setToolbarPosition() {
-      const editorRect = this.editorRoot.getBoundingClientRect();
-      const rect = this.selectedImageNode.getBoundingClientRect();
-      this.toolbarPosition = {
-        top: `${rect.top - editorRect.top - 30}px`,
-        left: `${rect.left - editorRect.left - 4}px`,
-      };
-    },
-    setURLWithQueryAndImageSize(size) {
-      if (!this.showImageResizeToolbar) {
-        return;
-      }
-      setURLWithQueryAndSize(this.selectedImageNode, size, this.editorView);
-      this.isImageNodeSelected = false;
-    },
-    updateImgToolbarOnDelete() {
-      // check if the selected node is present or not on keyup
-      // this is needed because the user can select an image and then delete it
-      // in that case, the selected node will be null and we need to hide the toolbar
-      // otherwise, the toolbar will be visible even when the image is deleted and cause some errors
-      if (this.selectedImageNode) {
-        const hasImgSelectedNode = document.querySelector(
-          'img.ProseMirror-selectednode'
-        );
-        if (!hasImgSelectedNode) {
-          this.isImageNodeSelected = false;
-        }
-      }
-    },
    isEnterToSendEnabled() {
      return isEditorHotKeyEnabled(this.uiSettings, 'enter');
    },
@@ -536,7 +441,11 @@ export default {
        userFullName: mentionItem.name,
      });

-      this.insertNodeIntoEditor(node, this.range.from, this.range.to);
+      const tr = this.editorView.state.tr
+        .replaceWith(this.range.from, this.range.to, node)
+        .insertText(` `);
+      this.state = this.editorView.state.apply(tr);
+      this.emitOnChange();
      this.$track(CONVERSATION_EVENTS.USED_MENTIONS);

      return false;
@@ -546,22 +455,30 @@ export default {
        message: cannedItem,
        variables: this.variables,
      });
-
      if (!this.editorView) {
        return null;
      }

+      let from = this.range.from - 1;
      let node = new MessageMarkdownTransformer(messageSchema).parse(
        updatedMessage
      );

-      const from =
-        node.textContent === updatedMessage
-          ? this.range.from
-          : this.range.from - 1;
+      if (node.textContent === updatedMessage) {
+        node = this.editorView.state.schema.text(updatedMessage);
+        from = this.range.from;
+      }

-      this.insertNodeIntoEditor(node, from, this.range.to);
+      const tr = this.editorView.state.tr.replaceWith(
+        from,
+        this.range.to,
+        node
+      );

+      this.state = this.editorView.state.apply(tr);
+      this.emitOnChange();
+
+      tr.scrollIntoView();
      this.$track(CONVERSATION_EVENTS.INSERTED_A_CANNED_RESPONSE);
      return false;
    },
@@ -569,14 +486,23 @@ export default {
      if (!this.editorView) {
        return null;
      }
+      let node = this.editorView.state.schema.text(`{{${variable}}}`);
+      const from = this.range.from;

-      const content = `{{${variable}}}`;
-      let node = this.editorView.state.schema.text(content);
-      const { from, to } = this.range;
+      const tr = this.editorView.state.tr.replaceWith(
+        from,
+        this.range.to,
+        node
+      );

-      this.insertNodeIntoEditor(node, from, to);
+      this.state = this.editorView.state.apply(tr);
+      this.emitOnChange();
+
+      // The `{{ }}` are added to the message, but the cursor is placed
+      // and onExit of suggestionsPlugin is not called. So we need to manually hide
      this.showVariables = false;
      this.$track(CONVERSATION_EVENTS.INSERTED_A_VARIABLE);
+      tr.scrollIntoView();
      return false;
    },
    openFileBrowser() {
@@ -632,6 +558,8 @@ export default {
    },

    emitOnChange() {
+      this.editorView.updateState(this.state);
+
      this.$emit('input', this.contentFromEditor);
    },

@@ -674,7 +602,6 @@ export default {
        () => this.resetTyping(),
        TYPING_INDICATOR_IDLE_TIME
      );
-      this.updateImgToolbarOnDelete();
    },
    onKeydown(event) {
      if (this.isEnterToSendEnabled()) {
@@ -692,19 +619,6 @@ export default {
    onFocus() {
      this.$emit('focus');
    },
-    insertContentIntoEditor(content, defaultFrom = 0) {
-      const from = defaultFrom || this.editorView.state.selection.from || 0;
-      let node = new MessageMarkdownTransformer(messageSchema).parse(content);
-
-      this.insertNodeIntoEditor(node, from, undefined);
-    },
-    insertNodeIntoEditor(node, from = 0, to = 0) {
-      this.state = insertAtCursor(this.editorView, node, from, to);
-      this.emitOnChange();
-      this.$nextTick(() => {
-        scrollCursorIntoView(this.editorView);
-      });
-    },
  },
 };
 </script>
@@ -798,6 +712,6 @@ export default {
 }

 .editor-warning__message {
-  @apply text-red-400 dark:text-red-400 font-normal text-sm pt-1 pb-0 px-0;
+  @apply text-red-400 dark:text-red-400 text-sm font-normal pt-1 pb-0 px-0;
 }
 </style>
@@ -14,11 +14,10 @@
      <file-upload
        ref="upload"
        v-tooltip.top-end="$t('CONVERSATION.REPLYBOX.TIP_ATTACH_ICON')"
-        input-id="conversationAttachment"
        :size="4096 * 4096"
        :accept="allowedFileTypes"
        :multiple="enableMultipleFileUpload"
-        :drop="enableDragAndDrop"
+        :drop="true"
        :drop-directory="false"
        :data="{
          direct_upload_url: '/rails/active_storage/direct_uploads',
@@ -101,24 +100,14 @@
      <transition name="modal-fade">
        <div
          v-show="$refs.upload && $refs.upload.dropActive"
-          class="fixed top-0 bottom-0 left-0 right-0 z-20 flex flex-col items-center justify-center w-full h-full gap-2 text-slate-600 dark:text-slate-200 bg-white_transparent dark:bg-black_transparent"
+          class="modal-mask"
        >
-          <fluent-icon icon="cloud-backup" size="40" />
+          <fluent-icon icon="cloud-backup" />
          <h4 class="page-sub-title text-slate-600 dark:text-slate-200">
            {{ $t('CONVERSATION.REPLYBOX.DRAG_DROP') }}
          </h4>
        </div>
      </transition>
-      <woot-button
-        v-if="enableInsertArticleInReply"
-        v-tooltip.top-end="$t('HELP_CENTER.ARTICLE_SEARCH.OPEN_ARTICLE_SEARCH')"
-        icon="document-text-link"
-        color-scheme="secondary"
-        variant="smooth"
-        size="small"
-        :title="$t('HELP_CENTER.ARTICLE_SEARCH.OPEN_ARTICLE_SEARCH')"
-        @click="toggleInsertArticle"
-      />
    </div>
    <div class="right-wrap">
      <woot-button
@@ -144,7 +133,6 @@ import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import {
  ALLOWED_FILE_TYPES,
  ALLOWED_FILE_TYPES_FOR_TWILIO_WHATSAPP,
-  ALLOWED_FILE_TYPES_FOR_LINE,
 } from 'shared/constants/messages';
 import VideoCallButton from '../VideoCallButton.vue';
 import AIAssistanceButton from '../AIAssistanceButton.vue';
@@ -240,14 +228,6 @@ export default {
      type: String,
      default: '',
    },
-    newConversationModalActive: {
-      type: Boolean,
-      default: false,
-    },
-    portalSlug: {
-      type: String,
-      required: true,
-    },
  },
  computed: {
    ...mapGetters({
@@ -271,9 +251,6 @@ export default {
      return this.showFileUpload || this.isNote;
    },
    showAudioRecorderButton() {
-      if (this.isALineChannel) {
-        return false;
-      }
      // Disable audio recorder for safari browser as recording is not supported
      const isSafari = /^((?!chrome|android|crios|fxios).)*safari/i.test(
        navigator.userAgent
@@ -295,14 +272,8 @@ export default {
      if (this.isATwilioWhatsAppChannel) {
        return ALLOWED_FILE_TYPES_FOR_TWILIO_WHATSAPP;
      }
-      if (this.isALineChannel) {
-        return ALLOWED_FILE_TYPES_FOR_LINE;
-      }
      return ALLOWED_FILE_TYPES;
    },
-    enableDragAndDrop() {
-      return !this.newConversationModalActive;
-    },
    audioRecorderPlayStopIcon() {
      switch (this.recordingAudioState) {
        // playing paused recording stopped inactive destroyed
@@ -320,21 +291,14 @@ export default {
      return !this.isOnPrivateNote;
    },
    sendWithSignature() {
-      // channelType is sourced from inboxMixin
-      return this.fetchSignatureFlagFromUiSettings(this.channelType);
+      const { send_with_signature: isEnabled } = this.uiSettings;
+      return isEnabled;
    },
    signatureToggleTooltip() {
      return this.sendWithSignature
        ? this.$t('CONVERSATION.FOOTER.DISABLE_SIGN_TOOLTIP')
        : this.$t('CONVERSATION.FOOTER.ENABLE_SIGN_TOOLTIP');
    },
-    enableInsertArticleInReply() {
-      const isFeatEnabled = this.isFeatureEnabledonAccount(
-        this.accountId,
-        FEATURE_FLAGS.INSERT_ARTICLE_IN_REPLY
-      );
-      return isFeatEnabled && this.portalSlug;
-    },
  },
  mounted() {
    ActiveStorage.start();
@@ -346,14 +310,13 @@ export default {
      }
    },
    toggleMessageSignature() {
-      this.setSignatureFlagForInbox(this.channelType, !this.sendWithSignature);
+      this.updateUISettings({
+        send_with_signature: !this.sendWithSignature,
+      });
    },
    replaceText(text) {
      this.$emit('replace-text', text);
    },
-    toggleInsertArticle() {
-      this.$emit('toggle-insert-article');
-    },
  },
 };
 </script>
@@ -383,4 +346,12 @@ export default {
    @apply dark:bg-slate-800 bg-slate-100;
  }
 }
+
+.modal-mask {
+  @apply text-slate-600 dark:text-slate-200 bg-white_transparent dark:bg-black_transparent flex-col;
+}
+
+.icon {
+  @apply text-[5rem];
+}
 </style>
@@ -32,7 +32,7 @@
        }}</span>
        <filter-item
          type="sort"
-          :selected-value="sortFilter"
+          :selected-value="chatSortFilter"
          :items="chatSortItems"
          path-prefix="CHAT_LIST.CHAT_SORT_FILTER_ITEMS"
          @onChangeFilter="onChangeFilter"
@@ -47,13 +47,12 @@ import wootConstants from 'dashboard/constants/globals';
 import { mapGetters } from 'vuex';
 import { mixin as clickaway } from 'vue-clickaway';
 import FilterItem from './FilterItem.vue';
-import uiSettingsMixin from 'dashboard/mixins/uiSettings';

 export default {
  components: {
    FilterItem,
  },
-  mixins: [clickaway, uiSettingsMixin],
+  mixins: [clickaway],
  data() {
    return {
      showActionsDropdown: false,
@@ -84,17 +83,8 @@ export default {
    closeDropdown() {
      this.showActionsDropdown = false;
    },
-    onChangeFilter(value, type) {
-      this.$emit('changeFilter', value, type);
-      this.saveSelectedFilter(type, value);
-    },
-    saveSelectedFilter(type, value) {
-      this.updateUISettings({
-        conversations_filter_by: {
-          status: type === 'status' ? value : this.chatStatus,
-          order_by: type === 'sort' ? value : this.sortFilter,
-        },
-      });
+    onChangeFilter(type, value) {
+      this.$emit('changeFilter', type, value);
    },
  },
 };
@@ -52,7 +52,6 @@
      :key="currentChat.id + '-' + dashboardApp.id"
      :is-visible="activeIndex - 1 === index"
      :config="dashboardApps[index].content"
-      :position="index"
      :current-chat="currentChat"
    />
  </div>
@@ -1,6 +1,6 @@
 <template>
  <div
-    class="relative flex items-start flex-grow-0 flex-shrink-0 w-auto max-w-full px-4 py-0 border-t-0 border-b-0 border-l-2 border-r-0 border-transparent border-solid cursor-pointer conversation hover:bg-slate-25 dark:hover:bg-slate-800 group"
+    class="conversation flex flex-shrink-0 flex-grow-0 w-auto max-w-full cursor-pointer relative py-0 px-4 border-transparent border-l-2 border-t-0 border-b-0 border-r-0 border-solid items-start hover:bg-slate-25 dark:hover:bg-slate-800 group"
    :class="{
      'active bg-slate-25 dark:bg-slate-800 border-woot-500': isActiveChat,
      'unread-chat': hasUnread,
@@ -31,7 +31,7 @@
      size="40px"
    />
    <div
-      class="px-0 py-3 border-b group-last:border-transparent group-hover:border-transparent border-slate-50 dark:border-slate-800/75 columns"
+      class="py-3 px-0 border-b group-last:border-transparent group-hover:border-transparent border-slate-50 dark:border-slate-800/75 columns"
    >
      <div class="flex justify-between">
        <inbox-name v-if="showInboxName" :inbox="inbox" />
@@ -55,11 +55,44 @@
      >
        {{ currentContact.name }}
      </h4>
-      <message-preview
+      <p
        v-if="lastMessageInChat"
-        :message="lastMessageInChat"
-        class="conversation--message my-0 mx-2 leading-6 h-6 max-w-[96%] w-[16.875rem] text-sm text-slate-700 dark:text-slate-200"
-      />
+        class="conversation--message text-slate-700 dark:text-slate-200 text-sm my-0 mx-2 leading-6 h-6 max-w-[96%] w-[16.875rem] overflow-hidden text-ellipsis whitespace-nowrap"
+      >
+        <fluent-icon
+          v-if="isMessagePrivate"
+          size="16"
+          class="-mt-0.5 align-middle text-slate-600 dark:text-slate-300 inline-block"
+          icon="lock-closed"
+        />
+        <fluent-icon
+          v-else-if="messageByAgent"
+          size="16"
+          class="-mt-0.5 align-middle text-slate-600 dark:text-slate-300 inline-block"
+          icon="arrow-reply"
+        />
+        <fluent-icon
+          v-else-if="isMessageAnActivity"
+          size="16"
+          class="-mt-0.5 align-middle text-slate-600 dark:text-slate-300 inline-block"
+          icon="info"
+        />
+        <span v-if="lastMessageInChat.content">
+          {{ parsedLastMessage }}
+        </span>
+        <span v-else-if="lastMessageInChat.attachments">
+          <fluent-icon
+            v-if="attachmentIcon"
+            size="16"
+            class="-mt-0.5 align-middle inline-block text-slate-600 dark:text-slate-300"
+            :icon="attachmentIcon"
+          />
+          {{ $t(`${attachmentMessageContent}`) }}
+        </span>
+        <span v-else>
+          {{ $t('CHAT_LIST.NO_CONTENT') }}
+        </span>
+      </p>
      <p
        v-else
        class="conversation--message text-slate-700 dark:text-slate-200 text-sm my-0 mx-2 leading-6 h-6 max-w-[96%] w-[16.875rem] overflow-hidden text-ellipsis whitespace-nowrap"
@@ -73,8 +106,8 @@
          {{ $t(`CHAT_LIST.NO_MESSAGES`) }}
        </span>
      </p>
-      <div class="absolute flex flex-col conversation--meta right-4 top-4">
-        <span class="ml-auto font-normal leading-4 text-black-600 text-xxs">
+      <div class="conversation--meta flex flex-col absolute right-4 top-4">
+        <span class="text-black-600 text-xxs font-normal leading-4 ml-auto">
          <time-ago
            :last-activity-timestamp="chat.timestamp"
            :created-at-timestamp="chat.created_at"
@@ -112,8 +145,9 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
+import { MESSAGE_TYPE } from 'widget/helpers/constants';
+import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import Thumbnail from '../Thumbnail.vue';
-import MessagePreview from './MessagePreview.vue';
 import conversationMixin from '../../../mixins/conversations';
 import timeMixin from '../../../mixins/time';
 import router from '../../../routes';
@@ -125,6 +159,14 @@ import alertMixin from 'shared/mixins/alertMixin';
 import TimeAgo from 'dashboard/components/ui/TimeAgo.vue';
 import CardLabels from './conversationCardComponents/CardLabels.vue';
 import PriorityMark from './PriorityMark.vue';
+const ATTACHMENT_ICONS = {
+  image: 'image',
+  audio: 'headphones-sound-wave',
+  video: 'video',
+  file: 'document',
+  location: 'location',
+  fallback: 'link',
+};

 export default {
  components: {
@@ -133,11 +175,16 @@ export default {
    Thumbnail,
    ConversationContextMenu,
    TimeAgo,
-    MessagePreview,
    PriorityMark,
  },

-  mixins: [inboxMixin, timeMixin, conversationMixin, alertMixin],
+  mixins: [
+    inboxMixin,
+    timeMixin,
+    conversationMixin,
+    messageFormatterMixin,
+    alertMixin,
+  ],
  props: {
    activeLabel: {
      type: String,
@@ -211,6 +258,20 @@ export default {
      );
    },

+    lastMessageFileType() {
+      const lastMessage = this.lastMessageInChat;
+      const [{ file_type: fileType } = {}] = lastMessage.attachments;
+      return fileType;
+    },
+
+    attachmentIcon() {
+      return ATTACHMENT_ICONS[this.lastMessageFileType];
+    },
+
+    attachmentMessageContent() {
+      return `CHAT_LIST.ATTACHMENTS.${this.lastMessageFileType}.CONTENT`;
+    },
+
    isActiveChat() {
      return this.currentChat.id === this.chat.id;
    },
@@ -231,6 +292,30 @@ export default {
      return this.lastMessage(this.chat);
    },

+    messageByAgent() {
+      const lastMessage = this.lastMessageInChat;
+      const { message_type: messageType } = lastMessage;
+      return messageType === MESSAGE_TYPE.OUTGOING;
+    },
+
+    isMessageAnActivity() {
+      const lastMessage = this.lastMessageInChat;
+      const { message_type: messageType } = lastMessage;
+      return messageType === MESSAGE_TYPE.ACTIVITY;
+    },
+
+    isMessagePrivate() {
+      const lastMessage = this.lastMessageInChat;
+      const { private: isPrivate } = lastMessage;
+      return isPrivate;
+    },
+
+    parsedLastMessage() {
+      const { content_attributes: contentAttributes } = this.lastMessageInChat;
+      const { email: { subject } = {} } = contentAttributes || {};
+      return this.getPlainText(subject || this.lastMessageInChat.content);
+    },
+
    inbox() {
      const { inbox_id: inboxId } = this.chat;
      const stateInbox = this.$store.getters['inboxes/getInbox'](inboxId);
@@ -3,10 +3,10 @@
    class="bg-white dark:bg-slate-900 flex justify-between items-center py-2 px-4 border-b border-slate-50 dark:border-slate-800/50 flex-col md:flex-row"
  >
    <div
-      class="flex-1 w-full min-w-0 flex flex-col md:flex-row items-center justify-center"
+      class="flex-1 w-100 flex flex-col md:flex-row items-center justify-center"
    >
      <div
-        class="flex justify-start items-center mr-4 rtl:mr-0 rtl:ml-4 min-w-0 w-[inherit]"
+        class="flex justify-center items-center mr-4 rtl:mr-0 rtl:ml-4 min-w-0"
      >
        <back-button
          v-if="showBackButton"
@@ -19,31 +19,26 @@
          :username="currentContact.name"
          :status="currentContact.availability_status"
        />
-        <div
-          class="items-start flex flex-col ml-2 rtl:ml-0 rtl:mr-2 min-w-0 w-[inherit] overflow-hidden"
-        >
-          <div class="flex items-center flex-row gap-1 m-0 p-0 w-[inherit]">
-            <woot-button
-              variant="link"
-              color-scheme="secondary"
-              class="[&>span]:overflow-hidden [&>span]:whitespace-nowrap [&>span]:text-ellipsis min-w-0"
-              @click.prevent="$emit('contact-panel-toggle')"
+        <div class="items-start flex flex-col ml-2 rtl:ml-0 rtl:mr-2 min-w-0">
+          <woot-button
+            variant="link"
+            color-scheme="secondary"
+            class="overflow-hidden whitespace-nowrap text-ellipsis"
+            @click.prevent="$emit('contact-panel-toggle')"
+          >
+            <h3
+              class="text-base inline-block leading-tight capitalize m-0 p-0 text-ellipsis overflow-hidden whitespace-nowrap text-slate-900 dark:text-slate-100"
            >
-              <span
-                class="text-base leading-tight text-slate-900 dark:text-slate-100"
-              >
-                {{ currentContact.name }}
-              </span>
-            </woot-button>
-            <fluent-icon
-              v-if="!isHMACVerified"
-              v-tooltip="$t('CONVERSATION.UNVERIFIED_SESSION')"
-              size="14"
-              class="text-yellow-600 dark:text-yellow-500 my-0 mx-0 min-w-[14px]"
-              icon="warning"
-            />
-          </div>
-
+              <span>{{ currentContact.name }}</span>
+              <fluent-icon
+                v-if="!isHMACVerified"
+                v-tooltip="$t('CONVERSATION.UNVERIFIED_SESSION')"
+                size="14"
+                class="text-yellow-600 dark:text-yellow-500 my-0 mx-0.5"
+                icon="warning"
+              />
+            </h3>
+          </woot-button>
          <div
            class="conversation--header--actions items-center flex text-xs gap-2 text-ellipsis overflow-hidden whitespace-nowrap"
          >
@@ -22,14 +22,18 @@
          :bcc="emailHeadAttributes.bcc"
          :is-incoming="isIncoming"
        />
-        <instagram-story-reply v-if="storyUrl" :story-url="storyUrl" />
-        <bubble-reply-to
-          v-if="inReplyToMessageId && inboxSupportsReplyTo.incoming"
-          :message="inReplyTo"
-          :message-type="data.message_type"
-          :parent-has-attachments="hasAttachments"
-          @click="navigateToMessage"
-        />
+        <blockquote v-if="storyReply" class="story-reply-quote">
+          <span>{{ $t('CONVERSATION.REPLIED_TO_STORY') }}</span>
+          <bubble-image
+            v-if="!hasImgStoryError && storyUrl"
+            :url="storyUrl"
+            @error="onStoryLoadError"
+          />
+          <bubble-video
+            v-else-if="hasImgStoryError && storyUrl"
+            :url="storyUrl"
+          />
+        </blockquote>
        <bubble-text
          v-if="data.content"
          :message="message"
@@ -49,15 +53,10 @@
        </span>
        <div v-if="!isPending && hasAttachments">
          <div v-for="attachment in attachments" :key="attachment.id">
-            <instagram-story
-              v-if="isAnInstagramStory"
-              :story-url="attachment.data_url"
-              @error="onMediaLoadError"
-            />
            <bubble-image-audio-video
-              v-else-if="isAttachmentImageVideoAudio(attachment.file_type)"
+              v-if="isAttachmentImageVideoAudio(attachment.file_type)"
              :attachment="attachment"
-              @error="onMediaLoadError"
+              @error="onImageLoadError"
            />
            <bubble-location
              v-else-if="attachment.file_type === 'location'"
@@ -70,6 +69,9 @@
              :name="data.content"
              :phone-number="attachment.fallback_title"
            />
+            <instagram-image-error-placeholder
+              v-else-if="hasImageError && hasInstagramStory"
+            />
            <bubble-file v-else :url="attachment.data_url" />
          </div>
        </div>
@@ -81,6 +83,7 @@
          :story-id="`${storyId}`"
          :is-a-tweet="isATweet"
          :is-a-whatsapp-channel="isAWhatsAppChannel"
+          :has-instagram-story="hasInstagramStory"
          :is-email="isEmailContentType"
          :is-private="data.private"
          :message-type="data.message_type"
@@ -121,7 +124,6 @@
        :message="data"
        @open="openContextMenu"
        @close="closeContextMenu"
-        @replyTo="handleReplyTo"
      />
    </div>
  </li>
@@ -129,42 +131,40 @@
 <script>
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import BubbleActions from './bubble/Actions.vue';
-import BubbleContact from './bubble/Contact.vue';
 import BubbleFile from './bubble/File.vue';
+import BubbleImage from './bubble/Image.vue';
+import BubbleVideo from './bubble/Video.vue';
 import BubbleImageAudioVideo from './bubble/ImageAudioVideo.vue';
 import BubbleIntegration from './bubble/Integration.vue';
 import BubbleLocation from './bubble/Location.vue';
 import BubbleMailHead from './bubble/MailHead.vue';
-import BubbleReplyTo from './bubble/ReplyTo.vue';
 import BubbleText from './bubble/Text.vue';
-import ContextMenu from 'dashboard/modules/conversations/components/MessageContextMenu.vue';
-import InstagramStory from './bubble/InstagramStory.vue';
-import InstagramStoryReply from './bubble/InstagramStoryReply.vue';
+import BubbleContact from './bubble/Contact.vue';
 import Spinner from 'shared/components/Spinner.vue';
+import ContextMenu from 'dashboard/modules/conversations/components/MessageContextMenu.vue';
+import instagramImageErrorPlaceholder from './instagramImageErrorPlaceholder.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import contentTypeMixin from 'shared/mixins/contentTypeMixin';
 import { MESSAGE_TYPE, MESSAGE_STATUS } from 'shared/constants/messages';
 import { generateBotMessageContent } from './helpers/botMessageContentHelper';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import { ACCOUNT_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
-import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
-import { LocalStorage } from 'shared/helpers/localStorage';

 export default {
  components: {
    BubbleActions,
-    BubbleContact,
    BubbleFile,
+    BubbleImage,
+    BubbleVideo,
    BubbleImageAudioVideo,
    BubbleIntegration,
    BubbleLocation,
    BubbleMailHead,
-    BubbleReplyTo,
    BubbleText,
+    BubbleContact,
    ContextMenu,
-    InstagramStory,
-    InstagramStoryReply,
    Spinner,
+    instagramImageErrorPlaceholder,
  },
  mixins: [alertMixin, messageFormatterMixin, contentTypeMixin],
  props: {
@@ -180,25 +180,22 @@ export default {
      type: Boolean,
      default: false,
    },
-    isWebWidgetInbox: {
+    hasInstagramStory: {
      type: Boolean,
      default: false,
    },
-    inboxSupportsReplyTo: {
-      type: Object,
-      default: () => ({}),
-    },
-    inReplyTo: {
-      type: Object,
-      default: () => ({}),
+    isWebWidgetInbox: {
+      type: Boolean,
+      default: false,
    },
  },
  data() {
    return {
      showContextMenu: false,
-      hasMediaLoadError: false,
+      hasImageError: false,
      contextMenuPosition: {},
      showBackgroundHighlight: false,
+      hasImgStoryError: false,
    };
  },
  computed: {
@@ -267,29 +264,18 @@ export default {
        ) + botMessageContent
      );
    },
-    inReplyToMessageId() {
-      // Why not use the inReplyTo object directly?
-      // Glad you asked! The inReplyTo object may or may not be available
-      // depending on the current scroll position of the message list
-      // since old messages are only loaded when the user scrolls up
-      return this.data.content_attributes?.in_reply_to;
-    },
-    isAnInstagramStory() {
-      return this.contentAttributes.image_type === 'story_mention';
-    },
    contextMenuEnabledOptions() {
      return {
        copy: this.hasText,
        delete: this.hasText || this.hasAttachments,
        cannedResponse: this.isOutgoing && this.hasText,
-        replyTo: !this.data.private && this.inboxSupportsReplyTo.outgoing,
      };
    },
    contentAttributes() {
      return this.data.content_attributes || {};
    },
    externalError() {
-      return this.contentAttributes.external_error || '';
+      return this.contentAttributes.external_error || null;
    },
    sender() {
      return this.data.sender || {};
@@ -306,6 +292,9 @@ export default {
    storyUrl() {
      return this.contentAttributes.story_url || null;
    },
+    storyReply() {
+      return this.storyUrl && this.hasInstagramStory;
+    },
    contentType() {
      const {
        data: { content_type: contentType },
@@ -329,8 +318,6 @@ export default {
        left: isLeftAligned,
        right: isRightAligned,
        'has-context-menu': this.showContextMenu,
-        // this handles the offset required to align the context menu button
-        // extra alignment is required since a tweet message has a the user name and avatar below it
        'has-tweet-menu': this.isATweet,
        'has-bg': this.showBackgroundHighlight,
      };
@@ -386,7 +373,7 @@ export default {
        return false;
      }
      if (this.isFailed) {
-        return this.externalError || this.$t(`CONVERSATION.SEND_FAILED`);
+        return this.externalError ? '' : this.$t(`CONVERSATION.SEND_FAILED`);
      }
      return false;
    },
@@ -444,11 +431,13 @@ export default {
  },
  watch: {
    data() {
-      this.hasMediaLoadError = false;
+      this.hasImageError = false;
+      this.hasImgStoryError = false;
    },
  },
  mounted() {
-    this.hasMediaLoadError = false;
+    this.hasImageError = false;
+    this.hasImgStoryError = false;
    bus.$on(BUS_EVENTS.ON_MESSAGE_LIST_SCROLL, this.closeContextMenu);
    this.setupHighlightTimer();
  },
@@ -458,13 +447,13 @@ export default {
  },
  methods: {
    isAttachmentImageVideoAudio(fileType) {
-      return ['image', 'audio', 'video', 'story_mention'].includes(fileType);
+      return ['image', 'audio', 'video'].includes(fileType);
    },
    hasMediaAttachment(type) {
      if (this.hasAttachments && this.data.attachments.length > 0) {
        const { attachments = [{}] } = this.data;
        const { file_type: fileType } = attachments[0];
-        return fileType === type && !this.hasMediaLoadError;
+        return fileType === type && !this.hasImageError;
      }
      if (this.storyReply) {
        return true;
@@ -477,8 +466,11 @@ export default {
    async retrySendMessage() {
      await this.$store.dispatch('sendMessageWithData', this.data);
    },
-    onMediaLoadError() {
-      this.hasMediaLoadError = true;
+    onImageLoadError() {
+      this.hasImageError = true;
+    },
+    onStoryLoadError() {
+      this.hasImgStoryError = true;
    },
    openContextMenu(e) {
      const shouldSkipContextMenu =
@@ -502,13 +494,6 @@ export default {
      this.showContextMenu = false;
      this.contextMenuPosition = { x: null, y: null };
    },
-    handleReplyTo() {
-      const replyStorageKey = LOCAL_STORAGE_KEYS.MESSAGE_REPLY_TO;
-      const { conversation_id: conversationId, id: replyTo } = this.data;
-
-      LocalStorage.updateJsonStore(replyStorageKey, conversationId, replyTo);
-      bus.$emit(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE, this.data);
-    },
    setupHighlightTimer() {
      if (Number(this.$route.query.messageId) !== Number(this.data.id)) {
        return;
@@ -520,13 +505,6 @@ export default {
        this.showBackgroundHighlight = false;
      }, HIGHLIGHT_TIMER);
    },
-    async navigateToMessage() {
-      this.$nextTick(() => {
-        bus.$emit(BUS_EVENTS.SCROLL_TO_MESSAGE, {
-          messageId: this.inReplyToMessageId,
-        });
-      });
-    },
  },
 };
 </script>
@@ -635,8 +613,6 @@ li.right {
 }

 li.left.has-tweet-menu .context-menu {
-  // this handles the offset required to align the context menu button
-  // extra alignment is required since a tweet message has a the user name and avatar below it
  @apply mb-6;
 }

@@ -717,4 +693,8 @@ li.right {
    }
  }
 }
+
+.story-reply-quote {
+  @apply mt-2 mx-4 mb-0 px-2 pb-0 pt-2 border-l-4 border-solid border-slate-75 dark:border-slate-600 text-slate-600 dark:text-slate-200;
+}
 </style>
@@ -1,93 +0,0 @@
-<template>
-  <div class="overflow-hidden text-ellipsis whitespace-nowrap">
-    <template v-if="showMessageType">
-      <fluent-icon
-        v-if="isMessagePrivate"
-        size="16"
-        class="-mt-0.5 align-middle text-slate-600 dark:text-slate-300 inline-block"
-        icon="lock-closed"
-      />
-      <fluent-icon
-        v-else-if="messageByAgent"
-        size="16"
-        class="-mt-0.5 align-middle text-slate-600 dark:text-slate-300 inline-block"
-        icon="arrow-reply"
-      />
-      <fluent-icon
-        v-else-if="isMessageAnActivity"
-        size="16"
-        class="-mt-0.5 align-middle text-slate-600 dark:text-slate-300 inline-block"
-        icon="info"
-      />
-    </template>
-    <span v-if="message.content">
-      {{ parsedLastMessage }}
-    </span>
-    <span v-else-if="message.attachments">
-      <fluent-icon
-        v-if="attachmentIcon && showMessageType"
-        size="16"
-        class="-mt-0.5 align-middle inline-block text-slate-600 dark:text-slate-300"
-        :icon="attachmentIcon"
-      />
-      {{ $t(`${attachmentMessageContent}`) }}
-    </span>
-    <span v-else>
-      {{ defaultEmptyMessage || $t('CHAT_LIST.NO_CONTENT') }}
-    </span>
-  </div>
-</template>
-
-<script>
-import { MESSAGE_TYPE } from 'widget/helpers/constants';
-import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
-import { ATTACHMENT_ICONS } from 'shared/constants/messages';
-
-export default {
-  name: 'MessagePreview',
-  mixins: [messageFormatterMixin],
-  props: {
-    message: {
-      type: Object,
-      required: true,
-    },
-    showMessageType: {
-      type: Boolean,
-      default: true,
-    },
-    defaultEmptyMessage: {
-      type: String,
-      default: '',
-    },
-  },
-  computed: {
-    messageByAgent() {
-      const { message_type: messageType } = this.message;
-      return messageType === MESSAGE_TYPE.OUTGOING;
-    },
-    isMessageAnActivity() {
-      const { message_type: messageType } = this.message;
-      return messageType === MESSAGE_TYPE.ACTIVITY;
-    },
-    isMessagePrivate() {
-      const { private: isPrivate } = this.message;
-      return isPrivate;
-    },
-    parsedLastMessage() {
-      const { content_attributes: contentAttributes } = this.message;
-      const { email: { subject } = {} } = contentAttributes || {};
-      return this.getPlainText(subject || this.message.content);
-    },
-    lastMessageFileType() {
-      const [{ file_type: fileType } = {}] = this.message.attachments;
-      return fileType;
-    },
-    attachmentIcon() {
-      return ATTACHMENT_ICONS[this.lastMessageFileType];
-    },
-    attachmentMessageContent() {
-      return `CHAT_LIST.ATTACHMENTS.${this.lastMessageFileType}.CONTENT`;
-    },
-  },
-};
-</script>
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col justify-between flex-grow h-full min-w-0 m-0">
+  <div class="m-0 flex flex-col justify-between h-full flex-grow min-w-0">
    <banner
      v-if="!currentChat.can_reply"
      color-scheme="alert"
@@ -7,12 +7,21 @@
      :href-link="replyWindowLink"
      :href-link-text="replyWindowLinkText"
    />
+
+    <banner
+      v-if="isATweet"
+      color-scheme="gray"
+      :banner-message="tweetBannerText"
+      :has-close-button="hasSelectedTweetId"
+      @close="removeTweetSelection"
+    />
+
    <div class="flex justify-end">
      <woot-button
        variant="smooth"
        size="tiny"
        color-scheme="secondary"
-        class="rounded-bl-calc rtl:rotate-180 rounded-tl-calc fixed top-[9.5rem] md:top-[6.25rem] z-10 bg-white dark:bg-slate-700 border-slate-50 dark:border-slate-600 border-solid border border-r-0 box-border"
+        class="rounded-bl-calc rtl:rotate-180 rounded-tl-calc fixed top-[6.25rem] z-10 bg-white dark:bg-slate-700 border-slate-50 dark:border-slate-600 border-solid border border-r-0 box-border"
        :icon="isRightOrLeftIcon"
        @click="onToggleContactPanel"
      />
@@ -31,9 +40,8 @@
        :data="message"
        :is-a-tweet="isATweet"
        :is-a-whatsapp-channel="isAWhatsAppChannel"
+        :has-instagram-story="hasInstagramStory"
        :is-web-widget-inbox="isAWebWidgetInbox"
-        :inbox-supports-reply-to="inboxSupportsReplyTo"
-        :in-reply-to="getInReplyToMessage(message)"
      />
      <li v-show="unreadMessageCount != 0" class="unread--toast">
        <span>
@@ -53,9 +61,8 @@
        :data="message"
        :is-a-tweet="isATweet"
        :is-a-whatsapp-channel="isAWhatsAppChannel"
+        :has-instagram-story="hasInstagramStory"
        :is-web-widget-inbox="isAWebWidgetInbox"
-        :inbox-supports-reply-to="inboxSupportsReplyTo"
-        :in-reply-to="getInReplyToMessage(message)"
      />
      <conversation-label-suggestion
        v-if="shouldShowLabelSuggestions"
@@ -80,6 +87,8 @@
      </div>
      <reply-box
        :conversation-id="currentChat.id"
+        :is-a-tweet="isATweet"
+        :selected-tweet="selectedTweet"
        :popout-reply-box.sync="isPopoutReplyBox"
        @click="showPopoutReplyBox"
      />
@@ -101,7 +110,7 @@ import { mapGetters } from 'vuex';
 import conversationMixin, {
  filterDuplicateSourceMessages,
 } from '../../../mixins/conversations';
-import inboxMixin, { INBOX_FEATURES } from 'shared/mixins/inboxMixin';
+import inboxMixin from 'shared/mixins/inboxMixin';
 import configMixin from 'shared/mixins/configMixin';
 import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import aiMixin from 'dashboard/mixins/aiMixin';
@@ -144,6 +153,7 @@ export default {
      isLoadingPrevious: true,
      heightBeforeLoad: null,
      conversationPanel: null,
+      selectedTweetId: null,
      hasUserScrolled: false,
      isProgrammaticScroll: false,
      isPopoutReplyBox: false,
@@ -154,14 +164,12 @@ export default {

  computed: {
    ...mapGetters({
-      accountId: 'getCurrentAccountId',
      currentChat: 'getSelectedChat',
      allConversations: 'getAllConversations',
      inboxesList: 'inboxes/getInboxes',
      listLoadingStatus: 'getAllMessagesLoaded',
      loadingChatList: 'getChatListLoadingStatus',
      appIntegrations: 'integrations/getAppIntegrations',
-      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
      currentAccountId: 'getCurrentAccountId',
    }),
    isOpen() {
@@ -181,6 +189,16 @@ export default {
    inbox() {
      return this.$store.getters['inboxes/getInbox'](this.inboxId);
    },
+    hasSelectedTweetId() {
+      return !!this.selectedTweetId;
+    },
+    tweetBannerText() {
+      return !this.selectedTweetId
+        ? this.$t('CONVERSATION.SELECT_A_TWEET_TO_REPLY')
+        : `
+          ${this.$t('CONVERSATION.REPLYING_TO')}
+          ${this.selectedTweet.content}` || '';
+    },
    typingUsersList() {
      const userList = this.$store.getters[
        'conversationTypingStatus/getUserList'
@@ -235,6 +253,21 @@ export default {
    isATweet() {
      return this.conversationType === 'tweet';
    },
+
+    hasInstagramStory() {
+      return this.conversationType === 'instagram_direct_message';
+    },
+
+    selectedTweet() {
+      if (this.selectedTweetId) {
+        const { messages = [] } = this.currentChat;
+        const [selectedMessage] = messages.filter(
+          message => message.id === this.selectedTweetId
+        );
+        return selectedMessage || {};
+      }
+      return '';
+    },
    isRightOrLeftIcon() {
      if (this.isContactPanelOpen) {
        return 'arrow-chevron-right';
@@ -283,12 +316,6 @@ export default {
    unreadMessageCount() {
      return this.currentChat.unread_count || 0;
    },
-    inboxSupportsReplyTo() {
-      return {
-        incoming: this.inboxHasFeature(INBOX_FEATURES.REPLY_TO),
-        outgoing: this.inboxHasFeature(INBOX_FEATURES.REPLY_TO_OUTGOING),
-      };
-    },
  },

  watch: {
@@ -299,6 +326,7 @@ export default {
      this.fetchAllAttachmentsFromCurrentChat();
      this.fetchSuggestions();
      this.messageSentSinceOpened = false;
+      this.selectedTweetId = null;
    },
  },

@@ -306,6 +334,7 @@ export default {
    bus.$on(BUS_EVENTS.SCROLL_TO_MESSAGE, this.onScrollToMessage);
    // when a new message comes in, we refetch the label suggestions
    bus.$on(BUS_EVENTS.FETCH_LABEL_SUGGESTIONS, this.fetchSuggestions);
+    bus.$on(BUS_EVENTS.SET_TWEET_REPLY, this.setSelectedTweet);
    // when a message is sent we set the flag to true this hides the label suggestions,
    // until the chat is changed and the flag is reset in the watch for currentChat
    bus.$on(BUS_EVENTS.MESSAGE_SENT, () => {
@@ -340,7 +369,7 @@ export default {
      // method available in mixin, need to ensure that integrations are present
      await this.fetchIntegrationsIfRequired();

-      if (!this.isLabelSuggestionFeatureEnabled) {
+      if (!this.isAIIntegrationEnabled) {
        return;
      }

@@ -376,21 +405,17 @@ export default {
    },
    removeBusListeners() {
      bus.$off(BUS_EVENTS.SCROLL_TO_MESSAGE, this.onScrollToMessage);
+      bus.$off(BUS_EVENTS.SET_TWEET_REPLY, this.setSelectedTweet);
    },
-    async onScrollToMessage({ messageId = '' } = {}) {
-      if (messageId) {
-        await this.$store.dispatch('setActiveChat', {
-          data: this.currentChat,
-          after: messageId,
-          force: true,
-        });
-      }
-
+    setSelectedTweet(tweetId) {
+      this.selectedTweetId = tweetId;
+    },
+    onScrollToMessage({ messageId = '' } = {}) {
      this.$nextTick(() => {
        const messageElement = document.getElementById('message' + messageId);
        if (messageElement) {
          this.isProgrammaticScroll = true;
-          messageElement.scrollIntoView();
+          messageElement.scrollIntoView({ behavior: 'smooth' });
          this.fetchPreviousMessages();
        } else {
          this.scrollToBottom();
@@ -506,18 +531,8 @@ export default {
    makeMessagesRead() {
      this.$store.dispatch('markMessagesRead', { id: this.currentChat.id });
    },
-
-    getInReplyToMessage(parentMessage) {
-      if (!parentMessage) return {};
-      const inReplyToMessageId = parentMessage.content_attributes?.in_reply_to;
-      if (!inReplyToMessageId) return {};
-
-      return this.currentChat?.messages.find(message => {
-        if (message.id === inReplyToMessageId) {
-          return true;
-        }
-        return false;
-      });
+    removeTweetSelection() {
+      this.selectedTweetId = null;
    },
  },
 };
@@ -1,5 +1,11 @@
 <template>
-  <div class="reply-box" :class="replyBoxClass">
+  <div
+    class="border-t border-slate-50 dark:border-slate-700 bg-white dark:bg-slate-900 reply-box"
+    :class="{
+      'bg-yellow-100 dark:bg-yellow-800 is-private': isPrivate,
+      'shadow-sm': isFocused || hasAttachments,
+    }"
+  >
    <banner
      v-if="showSelfAssignBanner"
      action-button-variant="clear"
@@ -18,19 +24,7 @@
      :popout-reply-box="popoutReplyBox"
      @click="$emit('click')"
    />
-    <article-search-popover
-      v-if="showArticleSearchPopover && connectedPortalSlug"
-      :selected-portal-slug="connectedPortalSlug"
-      @insert="handleInsert"
-      @close="onSearchPopoverClose"
-    />
    <div class="reply-box__top">
-      <reply-to-message
-        v-if="shouldShowReplyToMessage"
-        :message="inReplyTo"
-        @dismiss="resetReplyToMessage"
-        @navigate-to-message="navigateToMessage"
-      />
      <canned-response
        v-if="showMentions && hasSlashCommand"
        v-on-clickaway="hideMentions"
@@ -42,7 +36,7 @@
        v-if="showEmojiPicker"
        v-on-clickaway="hideEmojiPicker"
        :class="emojiDialogClassOnExpandedLayoutAndRTLView"
-        :on-click="addIntoEditor"
+        :on-click="emojiOnClick"
      />
      <reply-email-head
        v-if="showReplyHead"
@@ -86,7 +80,6 @@
        :variables="messageVariables"
        :signature="signatureToApply"
        :allow-signature="true"
-        :channel-type="channelType"
        @typing-off="onTypingOff"
        @typing-on="onTypingOn"
        @focus="onFocus"
@@ -99,7 +92,6 @@
    </div>
    <div v-if="hasAttachments" class="attachment-preview-box" @paste="onPaste">
      <attachment-preview
-        class="flex-col mt-4"
        :attachments="attachedFiles"
        :remove-attachment="removeAttachment"
      />
@@ -129,12 +121,9 @@
      :toggle-audio-recorder="toggleAudioRecorder"
      :toggle-emoji-picker="toggleEmojiPicker"
      :message="message"
-      :portal-slug="connectedPortalSlug"
-      :new-conversation-modal-active="newConversationModalActive"
      @selectWhatsappTemplate="openWhatsappTemplateModal"
      @toggle-editor="toggleRichContentEditor"
      @replace-text="replaceText"
-      @toggle-insert-article="toggleInsertArticle"
    />
    <whatsapp-templates
      :inbox-id="inbox.id"
@@ -153,59 +142,63 @@
 </template>

 <script>
+// Vuex
 import { mapGetters } from 'vuex';
+
+// Mixins
 import { mixin as clickaway } from 'vue-clickaway';
 import alertMixin from 'shared/mixins/alertMixin';
-
-import CannedResponse from './CannedResponse.vue';
-import ReplyToMessage from './ReplyToMessage.vue';
-import ResizableTextArea from 'shared/components/ResizableTextArea.vue';
-import AttachmentPreview from 'dashboard/components/widgets/AttachmentsPreview.vue';
-import ReplyTopPanel from 'dashboard/components/widgets/WootWriter/ReplyTopPanel.vue';
-import ReplyEmailHead from './ReplyEmailHead.vue';
-import ReplyBottomPanel from 'dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue';
-import ArticleSearchPopover from 'dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue';
-import MessageSignatureMissingAlert from './MessageSignatureMissingAlert';
-import Banner from 'dashboard/components/ui/Banner.vue';
-import { REPLY_EDITOR_MODES } from 'dashboard/components/widgets/WootWriter/constants';
-import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor.vue';
-import WootAudioRecorder from 'dashboard/components/widgets/WootWriter/AudioRecorder.vue';
+import inboxMixin from 'shared/mixins/inboxMixin';
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
-import { AUDIO_FORMATS } from 'shared/constants/messages';
-import { BUS_EVENTS } from 'shared/constants/busEvents';
-import {
-  getMessageVariables,
-  getUndefinedVariablesInMessage,
-  replaceVariablesInMessage,
-} from '@chatwoot/utils';
-import WhatsappTemplates from './WhatsappTemplates/Modal.vue';
-import { buildHotKeys } from 'shared/helpers/KeyboardHelpers';
-import { MESSAGE_MAX_LENGTH } from 'shared/helpers/MessageTypeHelper';
-import inboxMixin, { INBOX_FEATURES } from 'shared/mixins/inboxMixin';
-import uiSettingsMixin from 'dashboard/mixins/uiSettings';
-import { trimContent, debounce } from '@chatwoot/utils';
-import wootConstants from 'dashboard/constants/globals';
-import { isEditorHotKeyEnabled } from 'dashboard/mixins/uiSettings';
-import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
 import rtlMixin from 'shared/mixins/rtlMixin';
 import fileUploadMixin from 'dashboard/mixins/fileUploadMixin';
+import replyDraftMixin from 'dashboard/mixins/replyDraftMixin';
+import audioRecordingMixin from 'dashboard/mixins/audioRecordingMixin';
+import emailEditorMixin from 'dashboard/mixins/emailEditorMixin';
+import attachmentHandlerMixin from 'dashboard/mixins/attachmentHandlerMixin';
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+
+// constants
+import { REPLY_EDITOR_MODES } from 'dashboard/components/widgets/WootWriter/constants';
+import { BUS_EVENTS } from 'shared/constants/busEvents';
+import { MESSAGE_MAX_LENGTH } from 'shared/helpers/MessageTypeHelper';
+import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
+import wootConstants from 'dashboard/constants/globals';
+
+// components
+import AttachmentPreview from 'dashboard/components/widgets/AttachmentsPreview.vue';
+import Banner from 'dashboard/components/ui/Banner.vue';
+import CannedResponse from './CannedResponse.vue';
+import EmojiInput from 'shared/components/emoji/EmojiInput.vue';
+import MessageSignatureMissingAlert from './MessageSignatureMissingAlert.vue';
+import ReplyBottomPanel from 'dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue';
+import ReplyEmailHead from './ReplyEmailHead.vue';
+import ReplyTopPanel from 'dashboard/components/widgets/WootWriter/ReplyTopPanel.vue';
+import ResizableTextArea from 'shared/components/ResizableTextArea.vue';
+import WhatsappTemplates from './WhatsappTemplates/Modal.vue';
+import WootAudioRecorder from 'dashboard/components/widgets/WootWriter/AudioRecorder.vue';
+import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor.vue';
+
+// Helpers
+import { buildHotKeys } from 'shared/helpers/KeyboardHelpers';
+import { isEditorHotKeyEnabled } from 'dashboard/mixins/uiSettings';
 import {
  appendSignature,
  removeSignature,
  replaceSignature,
  extractTextFromMarkdown,
 } from 'dashboard/helper/editorHelper';
-
-import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
-import { LocalStorage } from 'shared/helpers/localStorage';
-
-const EmojiInput = () => import('shared/components/emoji/EmojiInput');
+import {
+  getMessageVariables,
+  getUndefinedVariablesInMessage,
+  replaceVariablesInMessage,
+  debounce,
+} from '@chatwoot/utils';

 export default {
  components: {
    EmojiInput,
    CannedResponse,
-    ReplyToMessage,
    ResizableTextArea,
    AttachmentPreview,
    ReplyTopPanel,
@@ -216,7 +209,6 @@ export default {
    Banner,
    WhatsappTemplates,
    MessageSignatureMissingAlert,
-    ArticleSearchPopover,
  },
  mixins: [
    clickaway,
@@ -226,8 +218,20 @@ export default {
    messageFormatterMixin,
    rtlMixin,
    fileUploadMixin,
+    replyDraftMixin,
+    audioRecordingMixin,
+    emailEditorMixin,
+    attachmentHandlerMixin,
  ],
  props: {
+    selectedTweet: {
+      type: [Object, String],
+      default: () => ({}),
+    },
+    isATweet: {
+      type: Boolean,
+      default: false,
+    },
    popoutReplyBox: {
      type: Boolean,
      default: false,
@@ -236,20 +240,12 @@ export default {
  data() {
    return {
      message: '',
-      inReplyTo: {},
      isFocused: false,
      showEmojiPicker: false,
-      attachedFiles: [],
-      isRecordingAudio: false,
-      recordingAudioState: '',
-      recordingAudioDurationText: '',
      isUploading: false,
      replyType: REPLY_EDITOR_MODES.REPLY,
      mentionSearchKey: '',
      hasSlashCommand: false,
-      bccEmails: '',
-      ccEmails: '',
-      toEmails: '',
      doAutoSaveDraft: () => {},
      showWhatsAppTemplatesModal: false,
      updateEditorSelectionWith: '',
@@ -258,8 +254,6 @@ export default {
      showUserMentions: false,
      showCannedMenu: false,
      showVariablesMenu: false,
-      newConversationModalActive: false,
-      showArticleSearchPopover: false,
    };
  },
  computed: {
@@ -270,15 +264,7 @@ export default {
      lastEmail: 'getLastEmailInSelectedChat',
      globalConfig: 'globalConfig/get',
      accountId: 'getCurrentAccountId',
-      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
    }),
-    shouldShowReplyToMessage() {
-      return (
-        this.inReplyTo?.id &&
-        !this.isPrivate &&
-        this.inboxHasFeature(INBOX_FEATURES.REPLY_TO)
-      );
-    },
    showRichContentEditor() {
      if (this.isOnPrivateNote || this.isRichEditorEnabled) {
        return true;
@@ -350,7 +336,10 @@ export default {
      return this.maxLength - this.message.length;
    },
    isReplyButtonDisabled() {
-      if (this.isATwitterInbox) return true;
+      if (this.isATweet && !this.inReplyTo && !this.isOnPrivateNote) {
+        return true;
+      }
+
      if (this.hasAttachments || this.hasRecordedAudio) return false;

      return (
@@ -383,6 +372,11 @@ export default {
      if (this.isASmsInbox) {
        return MESSAGE_MAX_LENGTH.TWILIO_SMS;
      }
+      if (this.isATwitterInbox) {
+        if (this.conversationType === 'tweet') {
+          return MESSAGE_MAX_LENGTH.TWEET - this.replyToUserLength - 2;
+        }
+      }
      return MESSAGE_MAX_LENGTH.GENERAL;
    },
    showFileUpload() {
@@ -393,29 +387,21 @@ export default {
        this.isAPIInbox ||
        this.isAnEmailChannel ||
        this.isASmsInbox ||
-        this.isATelegramChannel ||
-        this.isALineChannel
+        this.isATelegramChannel
      );
    },
    replyButtonLabel() {
      let sendMessageText = this.$t('CONVERSATION.REPLYBOX.SEND');
      if (this.isPrivate) {
        sendMessageText = this.$t('CONVERSATION.REPLYBOX.CREATE');
+      } else if (this.conversationType === 'tweet') {
+        sendMessageText = this.$t('CONVERSATION.REPLYBOX.TWEET');
      }
      const keyLabel = isEditorHotKeyEnabled(this.uiSettings, 'cmd_enter')
        ? '(⌘ + ↵)'
        : '(↵)';
      return `${sendMessageText} ${keyLabel}`;
    },
-    replyBoxClass() {
-      return {
-        'is-private': this.isPrivate,
-        'is-focused': this.isFocused || this.hasAttachments,
-      };
-    },
-    hasAttachments() {
-      return this.attachedFiles.length;
-    },
    hasRecordedAudio() {
      return (
        this.$refs.audioRecorderInput &&
@@ -425,15 +411,13 @@ export default {
    isRichEditorEnabled() {
      return this.isAWebWidgetInbox || this.isAnEmailChannel;
    },
-    showAudioRecorder() {
-      return !this.isOnPrivateNote && this.showFileUpload;
-    },
-    showAudioRecorderEditor() {
-      return this.showAudioRecorder && this.isRecordingAudio;
-    },
    isOnPrivateNote() {
      return this.replyType === REPLY_EDITOR_MODES.NOTE;
    },
+    inReplyTo() {
+      const selectedTweet = this.selectedTweet || {};
+      return selectedTweet.id;
+    },
    isOnExpandedLayout() {
      const {
        LAYOUT_TYPES: { CONDENSED },
@@ -451,6 +435,15 @@ export default {
      }
      return '';
    },
+    replyToUserLength() {
+      const selectedTweet = this.selectedTweet || {};
+      const {
+        sender: {
+          additional_attributes: { screen_name: screenName = '' } = {},
+        } = {},
+      } = selectedTweet;
+      return screenName ? screenName.length : 0;
+    },
    isMessageEmpty() {
      if (!this.message) {
        return true;
@@ -475,7 +468,8 @@ export default {
      return !!this.signatureToApply;
    },
    sendWithSignature() {
-      return this.fetchSignatureFlagFromUiSettings(this.channelType);
+      const { send_with_signature: isEnabled } = this.uiSettings;
+      return isEnabled;
    },
    editorMessageKey() {
      const { editor_message_key: isEnabled } = this.uiSettings;
@@ -496,12 +490,6 @@ export default {
    editorStateId() {
      return `draft-${this.conversationIdByRoute}-${this.replyType}`;
    },
-    audioRecordFormat() {
-      if (this.isAWhatsAppChannel || this.isAPIInbox) {
-        return AUDIO_FORMATS.OGG;
-      }
-      return AUDIO_FORMATS.WAV;
-    },
    messageVariables() {
      const variables = getMessageVariables({
        conversation: this.currentChat,
@@ -514,18 +502,11 @@ export default {
        ? this.messageSignature
        : extractTextFromMarkdown(this.messageSignature);
    },
-    connectedPortalSlug() {
-      const { help_center: portal = {} } = this.inbox;
-      const { slug = '' } = portal;
-      return slug;
-    },
  },
  watch: {
    currentChat(conversation) {
      const { can_reply: canReply } = conversation;

-      this.setCCAndToEmailsFromLastChat();
-
      if (this.isOnPrivateNote) {
        return;
      }
@@ -536,7 +517,7 @@ export default {
        this.replyType = REPLY_EDITOR_MODES.NOTE;
      }

-      this.fetchAndSetReplyTo();
+      this.setCCAndToEmailsFromLastChat();
    },
    conversationIdByRoute(conversationId, oldConversationId) {
      if (conversationId !== oldConversationId) {
@@ -545,25 +526,17 @@ export default {
      }
    },
    message(updatedMessage) {
-      // Check if the message starts with a slash.
-      const bodyWithoutSignature = removeSignature(
-        updatedMessage,
-        this.signatureToApply
-      );
-      const startsWithSlash = bodyWithoutSignature.startsWith('/');
-
-      // Determine if the user is potentially typing a slash command.
-      // This is true if the message starts with a slash and the rich content editor is not active.
-      this.hasSlashCommand = startsWithSlash && !this.showRichContentEditor;
-      this.showMentions = this.hasSlashCommand;
-
-      // If a slash command is active, extract the command text after the slash.
-      // If not, reset the mentionSearchKey.
-      this.mentionSearchKey = this.hasSlashCommand
-        ? bodyWithoutSignature.substring(1)
-        : '';
-
-      // Autosave the current message draft.
+      this.hasSlashCommand =
+        updatedMessage[0] === '/' && !this.showRichContentEditor;
+      const hasNextWord = updatedMessage.includes(' ');
+      const isShortCodeActive = this.hasSlashCommand && !hasNextWord;
+      if (isShortCodeActive) {
+        this.mentionSearchKey = updatedMessage.substring(1);
+        this.showMentions = true;
+      } else {
+        this.mentionSearchKey = '';
+        this.showMentions = false;
+      }
      this.doAutoSaveDraft();
    },
    replyType(updatedReplyType, oldReplyType) {
@@ -586,49 +559,12 @@ export default {
      500,
      true
    );
-
-    this.fetchAndSetReplyTo();
-    bus.$on(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE, this.fetchAndSetReplyTo);
-
-    // A hacky fix to solve the drag and drop
-    // Is showing on top of new conversation modal drag and drop
-    // TODO need to find a better solution
-    bus.$on(
-      BUS_EVENTS.NEW_CONVERSATION_MODAL,
-      this.onNewConversationModalActive
-    );
  },
  destroyed() {
    document.removeEventListener('paste', this.onPaste);
    document.removeEventListener('keydown', this.handleKeyEvents);
-    bus.$off(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE, this.fetchAndSetReplyTo);
-  },
-  beforeDestroy() {
-    bus.$off(
-      BUS_EVENTS.NEW_CONVERSATION_MODAL,
-      this.onNewConversationModalActive
-    );
  },
  methods: {
-    handleInsert(article) {
-      const { url, title } = article;
-      if (this.isRichEditorEnabled) {
-        // Removing empty lines from the title
-        const lines = title.split('\n');
-        const nonEmptyLines = lines.filter(line => line.trim() !== '');
-        const filteredMarkdown = nonEmptyLines.join(' ');
-        bus.$emit(
-          BUS_EVENTS.INSERT_INTO_RICH_EDITOR,
-          `[${filteredMarkdown}](${url})`
-        );
-      } else {
-        this.addIntoEditor(
-          `${this.$t('CONVERSATION.REPLYBOX.INSERT_READ_MORE')} ${url}`
-        );
-      }
-
-      this.$track(CONVERSATION_EVENTS.INSERT_ARTICLE_LINK);
-    },
    toggleRichContentEditor() {
      this.updateUISettings({
        display_rich_content_editor: !this.showRichContentEditor,
@@ -651,31 +587,6 @@ export default {
        );
      }
    },
-    saveDraft(conversationId, replyType) {
-      if (this.message || this.message === '') {
-        const key = `draft-${conversationId}-${replyType}`;
-        const draftToSave = trimContent(this.message || '');
-
-        this.$store.dispatch('draftMessages/set', {
-          key,
-          message: draftToSave,
-        });
-      }
-    },
-    setToDraft(conversationId, replyType) {
-      this.saveDraft(conversationId, replyType);
-      this.message = '';
-    },
-    getFromDraft() {
-      if (this.conversationIdByRoute) {
-        const key = `draft-${this.conversationIdByRoute}-${this.replyType}`;
-        const messageFromStore =
-          this.$store.getters['draftMessages/get'](key) || '';
-
-        // ensure that the message has signature set based on the ui setting
-        this.message = this.toggleSignatureForDraft(messageFromStore);
-      }
-    },
    toggleSignatureForDraft(message) {
      if (this.isPrivate) {
        return message;
@@ -685,12 +596,6 @@ export default {
        ? appendSignature(message, this.signatureToApply)
        : removeSignature(message, this.signatureToApply);
    },
-    removeFromDraft() {
-      if (this.conversationIdByRoute) {
-        const key = `draft-${this.conversationIdByRoute}-${this.replyType}`;
-        this.$store.dispatch('draftMessages/delete', { key });
-      }
-    },
    handleKeyEvents(e) {
      const keyCode = buildHotKeys(e);
      if (keyCode === 'escape') {
@@ -809,7 +714,6 @@ export default {
        : this.$track(CONVERSATION_EVENTS.SENT_MESSAGE, {
            channelType: this.channelType,
            signatureEnabled: this.sendWithSignature,
-            hasReplyTo: !!this.inReplyTo?.id,
          });
    },
    async onSendReply() {
@@ -860,18 +764,10 @@ export default {
      this.hideWhatsappTemplatesModal();
    },
    replaceText(message) {
-      if (this.sendWithSignature && !this.private) {
-        // if signature is enabled, append it to the message
-        // appendSignature ensures that the signature is not duplicated
-        // so we don't need to check if the signature is already present
-        message = appendSignature(message, this.signatureToApply);
-      }
-
      const updatedMessage = replaceVariablesInMessage({
        message,
        variables: this.messageVariables,
      });
-
      setTimeout(() => {
        this.$track(CONVERSATION_EVENTS.INSERTED_A_CANNED_RESPONSE);
        this.message = updatedMessage;
@@ -894,22 +790,22 @@ export default {
    clearEditorSelection() {
      this.updateEditorSelectionWith = '';
    },
-    insertIntoTextEditor(text, selectionStart, selectionEnd) {
+    insertEmoji(emoji, selectionStart, selectionEnd) {
      const { message } = this;
      const newMessage =
        message.slice(0, selectionStart) +
-        text +
+        emoji +
        message.slice(selectionEnd, message.length);
      this.message = newMessage;
    },
-    addIntoEditor(content) {
+    emojiOnClick(emoji) {
      if (this.showRichContentEditor) {
-        this.updateEditorSelectionWith = content;
+        this.updateEditorSelectionWith = emoji;
        this.onFocus();
      }
      if (!this.showRichContentEditor) {
        const { selectionStart, selectionEnd } = this.$refs.messageInput.$el;
-        this.insertIntoTextEditor(content, selectionStart, selectionEnd);
+        this.insertEmoji(emoji, selectionStart, selectionEnd);
      }
    },
    clearMessage() {
@@ -920,34 +816,10 @@ export default {
      }
      this.attachedFiles = [];
      this.isRecordingAudio = false;
-      this.resetReplyToMessage();
-    },
-    clearEmailField() {
-      this.ccEmails = '';
-      this.bccEmails = '';
-      this.toEmails = '';
    },
    toggleEmojiPicker() {
      this.showEmojiPicker = !this.showEmojiPicker;
    },
-    toggleAudioRecorder() {
-      this.isRecordingAudio = !this.isRecordingAudio;
-      this.isRecorderAudioStopped = !this.isRecordingAudio;
-      if (!this.isRecordingAudio) {
-        this.clearMessage();
-        this.clearEmailField();
-      }
-    },
-    toggleAudioRecorderPlayPause() {
-      if (this.isRecordingAudio) {
-        if (!this.isRecorderAudioStopped) {
-          this.isRecorderAudioStopped = true;
-          this.$refs.audioRecorderInput.stopAudioRecording();
-        } else if (this.isRecorderAudioStopped) {
-          this.$refs.audioRecorderInput.playPause();
-        }
-      }
-    },
    hideEmojiPicker() {
      if (this.showEmojiPicker) {
        this.toggleEmojiPicker();
@@ -969,18 +841,6 @@ export default {
    onFocus() {
      this.isFocused = true;
    },
-    onStateProgressRecorderChanged(duration) {
-      this.recordingAudioDurationText = duration;
-    },
-    onStateRecorderChanged(state) {
-      this.recordingAudioState = state;
-      if (state && 'notallowederror'.includes(state)) {
-        this.toggleAudioRecorder();
-      }
-    },
-    onFinishRecorder(file) {
-      return file && this.onFileUpload(file);
-    },
    toggleTyping(status) {
      const conversationId = this.currentChat.id;
      const isPrivate = this.isPrivate;
@@ -995,37 +855,6 @@ export default {
        isPrivate,
      });
    },
-    attachFile({ blob, file }) {
-      const reader = new FileReader();
-      reader.readAsDataURL(file.file);
-      reader.onloadend = () => {
-        this.attachedFiles.push({
-          currentChatId: this.currentChat.id,
-          resource: blob || file,
-          isPrivate: this.isPrivate,
-          thumb: reader.result,
-          blobSignedId: blob ? blob.signed_id : undefined,
-        });
-      };
-    },
-    removeAttachment(itemIndex) {
-      this.attachedFiles = this.attachedFiles.filter(
-        (item, index) => itemIndex !== index
-      );
-    },
-    setReplyToInPayload(payload) {
-      if (this.inReplyTo?.id) {
-        return {
-          ...payload,
-          contentAttributes: {
-            ...payload.contentAttributes,
-            in_reply_to: this.inReplyTo.id,
-          },
-        };
-      }
-
-      return payload;
-    },
    getMessagePayloadForWhatsapp(message) {
      const multipleMessagePayload = [];

@@ -1035,41 +864,39 @@ export default {
          const attachedFile = this.globalConfig.directUploadsEnabled
            ? attachment.blobSignedId
            : attachment.resource.file;
-          let attachmentPayload = {
+          const attachmentPayload = {
            conversationId: this.currentChat.id,
            files: [attachedFile],
            private: false,
            message: caption,
            sender: this.sender,
          };
-
-          attachmentPayload = this.setReplyToInPayload(attachmentPayload);
          multipleMessagePayload.push(attachmentPayload);
          caption = '';
        });
      } else {
-        let messagePayload = {
+        const messagePayload = {
          conversationId: this.currentChat.id,
          message,
          private: false,
          sender: this.sender,
        };
-
-        messagePayload = this.setReplyToInPayload(messagePayload);
-
        multipleMessagePayload.push(messagePayload);
      }

      return multipleMessagePayload;
    },
    getMessagePayload(message) {
-      let messagePayload = {
+      const messagePayload = {
        conversationId: this.currentChat.id,
        message,
        private: this.isPrivate,
        sender: this.sender,
      };
-      messagePayload = this.setReplyToInPayload(messagePayload);
+
+      if (this.inReplyTo) {
+        messagePayload.contentAttributes = { in_reply_to: this.inReplyTo };
+      }

      if (this.attachedFiles && this.attachedFiles.length) {
        messagePayload.files = [];
@@ -1096,89 +923,6 @@ export default {

      return messagePayload;
    },
-    setCcEmails(value) {
-      this.bccEmails = value.bccEmails;
-      this.ccEmails = value.ccEmails;
-    },
-    setCCAndToEmailsFromLastChat() {
-      if (!this.lastEmail) return;
-
-      const {
-        content_attributes: { email: emailAttributes = {} },
-      } = this.lastEmail;
-
-      // Retrieve the email of the current conversation's sender
-      const conversationContact = this.currentChat?.meta?.sender?.email || '';
-      let cc = emailAttributes.cc ? [...emailAttributes.cc] : [];
-      let to = [];
-
-      // there might be a situation where the current conversation will include a message from a third person,
-      // and the current conversation contact is in CC.
-      // This is an edge-case, reported here: CW-1511 [ONLY FOR INTERNAL REFERENCE]
-      // So we remove the current conversation contact's email from the CC list if present
-      if (cc.includes(conversationContact)) {
-        cc = cc.filter(email => email !== conversationContact);
-      }
-
-      // If the last incoming message sender is different from the conversation contact, add them to the "to"
-      // and add the conversation contact to the CC
-      if (!emailAttributes.from.includes(conversationContact)) {
-        to.push(...emailAttributes.from);
-        cc.push(conversationContact);
-      }
-
-      // Remove the conversation contact's email from the BCC list if present
-      let bcc = (emailAttributes.bcc || []).filter(
-        email => email !== conversationContact
-      );
-
-      // Ensure only unique email addresses are in the CC list
-      bcc = [...new Set(bcc)];
-      cc = [...new Set(cc)];
-      to = [...new Set(to)];
-
-      this.ccEmails = cc.join(', ');
-      this.bccEmails = bcc.join(', ');
-      this.toEmails = to.join(', ');
-    },
-    fetchAndSetReplyTo() {
-      const replyStorageKey = LOCAL_STORAGE_KEYS.MESSAGE_REPLY_TO;
-      const replyToMessageId = LocalStorage.getFromJsonStore(
-        replyStorageKey,
-        this.conversationId
-      );
-
-      this.inReplyTo = this.currentChat?.messages?.find(message => {
-        if (message.id === replyToMessageId) {
-          return true;
-        }
-        return false;
-      });
-    },
-    resetReplyToMessage() {
-      const replyStorageKey = LOCAL_STORAGE_KEYS.MESSAGE_REPLY_TO;
-      LocalStorage.deleteFromJsonStore(replyStorageKey, this.conversationId);
-      bus.$emit(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE);
-    },
-    navigateToMessage(messageId) {
-      bus.$emit(BUS_EVENTS.SCROLL_TO_MESSAGE, {
-        messageId,
-      });
-    },
-    onNewConversationModalActive(isActive) {
-      // Issue is if the new conversation modal is open and we drag and drop the file
-      // then the file is not getting attached to the new conversation modal
-      // and it is getting attached to the current conversation reply box
-      // so to fix this we are removing the drag and drop event listener from the current conversation reply box
-      // When new conversation modal is open
-      this.newConversationModalActive = isActive;
-    },
-    onSearchPopoverClose() {
-      this.showArticleSearchPopover = false;
-    },
-    toggleInsertArticle() {
-      this.showArticleSearchPopover = !this.showArticleSearchPopover;
-    },
  },
 };
 </script>
@@ -1196,13 +940,6 @@ export default {
  @apply bg-transparent py-0 px-4;
 }

-.reply-box {
-  @apply relative border-t border-slate-50 dark:border-slate-700 bg-white dark:bg-slate-900;
-
-  &.is-private {
-    @apply bg-yellow-50 dark:bg-yellow-200;
-  }
-}
 .send-button {
  @apply mb-0;
 }
@@ -1,50 +0,0 @@
-<template>
-  <div
-    class="reply-editor bg-slate-50 dark:bg-slate-800 rounded-md py-1 pl-2 pr-1 text-xs tracking-wide mt-2 flex items-center gap-1.5 -mx-2 cursor-pointer"
-    @click="$emit('navigate-to-message', message.id)"
-  >
-    <fluent-icon class="flex-shrink-0 icon" icon="arrow-reply" size="14" />
-    <div class="flex-grow gap-1 mt-px text-xs truncate">
-      {{ $t('CONVERSATION.REPLYBOX.REPLYING_TO') }}
-      <message-preview
-        :message="message"
-        :show-message-type="false"
-        :default-empty-message="$t('CONVERSATION.REPLY_MESSAGE_NOT_FOUND')"
-        class="inline"
-      />
-    </div>
-    <woot-button
-      v-tooltip="$t('CONVERSATION.REPLYBOX.DISMISS_REPLY')"
-      color-scheme="secondary"
-      icon="dismiss"
-      variant="clear"
-      size="tiny"
-      class="flex-shrink-0"
-      @click.stop="$emit('dismiss')"
-    />
-  </div>
-</template>
-
-<script>
-import MessagePreview from 'dashboard/components/widgets/conversation/MessagePreview.vue';
-
-export default {
-  components: { MessagePreview },
-  props: {
-    message: {
-      type: Object,
-      required: true,
-    },
-  },
-};
-</script>
-
-<style lang="scss">
-// TODO: Remove this
-// override for dashboard/assets/scss/widgets/_reply-box.scss
-.reply-editor {
-  .icon {
-    margin-right: 0px !important;
-  }
-}
-</style>
@@ -33,7 +33,7 @@
      <woot-button variant="smooth" @click="$emit('resetTemplate')">
        {{ $t('WHATSAPP_TEMPLATES.PARSER.GO_BACK_LABEL') }}
      </woot-button>
-      <woot-button type="button" @click="sendMessage">
+      <woot-button @click="sendMessage">
        {{ $t('WHATSAPP_TEMPLATES.PARSER.SEND_MESSAGE_LABEL') }}
      </woot-button>
    </footer>
@@ -57,6 +57,17 @@
      @mouseenter="isHovered = true"
      @mouseleave="isHovered = false"
    />
+    <button
+      v-if="isATweet && (isIncoming || isOutgoing) && sourceId"
+      @click="onTweetReply"
+    >
+      <fluent-icon
+        v-tooltip.top-start="$t('CHAT_LIST.REPLY_TO_TWEET')"
+        icon="arrow-reply"
+        class="action--icon cursor-pointer"
+        size="16"
+      />
+    </button>
    <a
      v-if="isATweet && (isOutgoing || isIncoming) && linkToTweet"
      :href="linkToTweet"
@@ -66,7 +77,7 @@
      <fluent-icon
        v-tooltip.top-start="$t('CHAT_LIST.VIEW_TWEET_IN_TWITTER')"
        icon="open"
-        class="cursor-pointer action--icon"
+        class="action--icon cursor-pointer"
        size="16"
      />
    </a>
@@ -75,6 +86,7 @@

 <script>
 import { MESSAGE_TYPE, MESSAGE_STATUS } from 'shared/constants/messages';
+import { BUS_EVENTS } from 'shared/constants/busEvents';
 import inboxMixin from 'shared/mixins/inboxMixin';
 import { mapGetters } from 'vuex';
 import timeMixin from '../../../../mixins/time';
@@ -114,6 +126,10 @@ export default {
      type: Boolean,
      default: true,
    },
+    hasInstagramStory: {
+      type: Boolean,
+      default: true,
+    },
    messageType: {
      type: Number,
      default: 1,
@@ -192,46 +208,24 @@ export default {
      if (!this.showStatusIndicators) {
        return false;
      }
-      // Messages will be marked as sent for the Email channel if they have a source ID.
+
      if (this.isAnEmailChannel) {
        return !!this.sourceId;
      }

-      if (
-        this.isAWhatsAppChannel ||
-        this.isATwilioChannel ||
-        this.isAFacebookInbox ||
-        this.isASmsInbox ||
-        this.isATelegramChannel
-      ) {
+      if (this.isAWhatsAppChannel) {
        return this.sourceId && this.isSent;
      }
-      // All messages will be mark as sent for the Line channel, as there is no source ID.
-      if (this.isALineChannel) {
-        return true;
-      }
-
      return false;
    },
    showDeliveredIndicator() {
      if (!this.showStatusIndicators) {
        return false;
      }
-      if (
-        this.isAWhatsAppChannel ||
-        this.isATwilioChannel ||
-        this.isASmsInbox ||
-        this.isAFacebookInbox
-      ) {
+
+      if (this.isAWhatsAppChannel) {
        return this.sourceId && this.isDelivered;
      }
-      // All messages marked as delivered for the web widget inbox and API inbox once they are sent.
-      if (this.isAWebWidgetInbox || this.isAPIInbox) {
-        return this.isSent;
-      }
-      if (this.isALineChannel) {
-        return this.isDelivered;
-      }

      return false;
    },
@@ -239,21 +233,24 @@ export default {
      if (!this.showStatusIndicators) {
        return false;
      }
-      if (
-        this.isAWhatsAppChannel ||
-        this.isATwilioChannel ||
-        this.isAFacebookInbox
-      ) {
+
+      if (this.isAWebWidgetInbox || this.isAPIInbox) {
+        const { contact_last_seen_at: contactLastSeenAt } = this.currentChat;
+        return contactLastSeenAt >= this.createdAt;
+      }
+
+      if (this.isAWhatsAppChannel) {
        return this.sourceId && this.isRead;
      }

-      if (this.isAWebWidgetInbox || this.isAPIInbox) {
-        return this.isRead;
-      }
-
      return false;
    },
  },
+  methods: {
+    onTweetReply() {
+      bus.$emit(BUS_EVENTS.SET_TWEET_REPLY, this.id);
+    },
+  },
 };
 </script>

@@ -1,6 +1,6 @@
 <template>
  <div class="image message-text__wrap">
-    <img :src="url" @click="onClick" @error="$emit('error')" />
+    <img :src="url" @click="onClick" @error="onImgError()" />
    <woot-modal :full-width="true" :show.sync="show" :on-close="onClose">
      <img :src="url" class="modal-image skip-context-menu" />
    </woot-modal>
@@ -28,6 +28,9 @@ export default {
    onClick() {
      this.show = true;
    },
+    onImgError() {
+      this.$emit('error');
+    },
  },
 };
 </script>
@@ -4,14 +4,13 @@
      v-if="isImage && !isImageError"
      :src="attachment.data_url"
      @click="onClick"
-      @error="onImgError"
+      @error="onImgError()"
    />
    <video
      v-if="isVideo"
      :src="attachment.data_url"
      muted
      playsInline
-      @error="onImgError"
      @click="onClick"
    />
    <audio v-else-if="isAudio" controls class="skip-context-menu">
@@ -22,7 +21,7 @@
      :show.sync="show"
      :attachment="attachment"
      :all-attachments="filteredCurrentChatAttachments"
-      @error="onImgError"
+      @error="onImgError()"
      @close="onClose"
    />
  </div>
@@ -1,51 +0,0 @@
-<template>
-  <bubble-image
-    v-if="!hasImgStoryError"
-    :url="storyUrl"
-    @error="onImageLoadError"
-  />
-  <bubble-video
-    v-else-if="!hasVideoStoryError"
-    :url="storyUrl"
-    @error="onVideoLoadError"
-  />
-  <instagram-story-error-place-holder v-else />
-</template>
-<script>
-import BubbleImage from './Image.vue';
-import BubbleVideo from './Video.vue';
-import InstagramStoryErrorPlaceHolder from './InstagramStoryErrorPlaceHolder.vue';
-
-export default {
-  components: {
-    BubbleImage,
-    BubbleVideo,
-    InstagramStoryErrorPlaceHolder,
-  },
-  props: {
-    storyUrl: {
-      type: String,
-      default: '',
-    },
-  },
-  data() {
-    return {
-      hasImgStoryError: false,
-      hasVideoStoryError: false,
-    };
-  },
-  methods: {
-    onImageLoadError() {
-      this.hasImgStoryError = true;
-      this.emitError();
-    },
-    onVideoLoadError() {
-      this.hasVideoStoryError = true;
-      this.emitError();
-    },
-    emitError() {
-      this.$emit('error');
-    },
-  },
-};
-</script>
@@ -1,14 +0,0 @@
-<template>
-  <div
-    class="flex items-center justify-center px-8 h-28 w-full bg-slate-100 text-slate-700 dark:bg-slate-500 dark:text-slate-75"
-  >
-    <fluent-icon icon="document-error" size="32" />
-    <p class="mb-0 text-slate-700 dark:text-slate-75">
-      {{ $t('COMPONENTS.FILE_BUBBLE.INSTAGRAM_STORY_UNAVAILABLE') }}
-    </p>
-  </div>
-</template>
-
-<script>
-export default {};
-</script>
@@ -1,35 +0,0 @@
-<template>
-  <blockquote
-    class="my-0 px-2 pb-0 pt-0 border-l-4 border-solid border-slate-75 dark:border-slate-600 text-slate-600 dark:text-slate-200"
-  >
-    <span>{{ $t('CONVERSATION.REPLIED_TO_STORY') }}</span>
-    <instagram-story :story-url="storyUrl" class="mt-3 rounded-md" />
-  </blockquote>
-</template>
-<script>
-import InstagramStory from './InstagramStory.vue';
-
-export default {
-  components: { InstagramStory },
-  props: {
-    storyUrl: {
-      type: String,
-      default: '',
-    },
-  },
-  data() {
-    return {
-      hasImgStoryError: false,
-      hasVideoStoryError: false,
-    };
-  },
-  methods: {
-    onImageLoadError() {
-      this.hasImgStoryError = true;
-    },
-    onVideoLoadError() {
-      this.hasVideoStoryError = true;
-    },
-  },
-};
-</script>
@@ -1,47 +0,0 @@
-<template>
-  <div
-    class="px-2 py-1.5 -mx-2 rounded-sm min-w-[15rem] mb-2 cursor-pointer"
-    :class="{
-      'bg-slate-50 dark:bg-slate-600 dark:text-slate-50':
-        messageType === MESSAGE_TYPE.INCOMING,
-      'bg-woot-600 text-woot-50': messageType === MESSAGE_TYPE.OUTGOING,
-      '-mx-2': !parentHasAttachments,
-    }"
-    @click="$emit('click')"
-  >
-    <message-preview
-      :message="message"
-      :show-message-type="false"
-      :default-empty-message="$t('CONVERSATION.REPLY_MESSAGE_NOT_FOUND')"
-    />
-  </div>
-</template>
-
-<script>
-import MessagePreview from 'dashboard/components/widgets/conversation/MessagePreview.vue';
-import { MESSAGE_TYPE } from 'shared/constants/messages';
-
-export default {
-  name: 'ReplyTo',
-  components: {
-    MessagePreview,
-  },
-  props: {
-    message: {
-      type: Object,
-      required: true,
-    },
-    messageType: {
-      type: Number,
-      required: true,
-    },
-    parentHasAttachments: {
-      type: Boolean,
-      required: true,
-    },
-  },
-  data() {
-    return { MESSAGE_TYPE };
-  },
-};
-</script>
@@ -7,11 +7,7 @@
    }"
  >
    <div v-if="!isEmail" v-dompurify-html="message" class="text-content" />
-    <letter
-      v-else
-      class="text-content bg-white dark:bg-white text-slate-900 dark:text-slate-900 p-2 rounded-[4px]"
-      :html="message"
-    />
+    <letter v-else class="text-content" :html="message" />
    <button
      v-if="showQuoteToggle"
      class="text-slate-300 dark:text-slate-300 cursor-pointer text-xs py-1"
@@ -1,12 +1,12 @@
 <template>
  <div class="video message-text__wrap">
-    <video ref="videoElement" :src="url" muted playsInline @click="onClick" />
+    <video :src="url" muted playsInline @click="onClick" />
    <woot-modal :show.sync="show" :on-close="onClose">
      <video
        :src="url"
        controls
        playsInline
-        class="modal-video skip-context-menu mx-auto"
+        class="modal-video skip-context-menu"
      />
    </woot-modal>
  </div>
@@ -25,11 +25,6 @@ export default {
      show: false,
    };
  },
-  mounted() {
-    this.$refs.videoElement.onerror = () => {
-      this.$emit('error');
-    };
-  },
  methods: {
    onClose() {
      this.show = false;
@@ -0,0 +1,26 @@
+<template>
+  <div class="image-placeholder">
+    <fluent-icon icon="document-error" size="32" />
+    <p>{{ $t('COMPONENTS.FILE_BUBBLE.INSTAGRAM_STORY_UNAVAILABLE') }}</p>
+  </div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style scoped>
+.image-placeholder {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  padding: var(--space-slab);
+  height: calc(var(--space-large) * 10);
+  margin-top: var(--space-one);
+  width: 100%;
+  background-color: var(--s-75);
+  color: var(--s-800);
+  border-radius: var(--border-radius-normal);
+}
+</style>
@@ -25,7 +25,7 @@
        id="file"
        ref="file"
        type="file"
-        accept="image/png, image/jpeg, image/jpg, image/gif, image/webp"
+        accept="image/png, image/jpeg, image/gif"
        @change="handleImageUpload"
      />
      <slot />
@@ -32,22 +32,3 @@ export const ARTICLE_EDITOR_MENU_OPTIONS = [
  'imageUpload',
  'code',
 ];
-
-export const MESSAGE_EDITOR_IMAGE_RESIZES = [
-  {
-    name: 'Small',
-    height: '24px',
-  },
-  {
-    name: 'Medium',
-    height: '48px',
-  },
-  {
-    name: 'Large',
-    height: '72px',
-  },
-  {
-    name: 'Original Size',
-    height: 'auto',
-  },
-];
@@ -28,7 +28,6 @@ export default {
    EXPANDED: 'expanded',
  },
  DOCS_URL: '//www.chatwoot.com/docs/product/',
-  HELP_CENTER_DOCS_URL: '//www.chatwoot.com/docs/product/others/help-center',
  TESTIMONIAL_URL: 'https://testimonials.cdn.chatwoot.com/content.json',
  SMALL_SCREEN_BREAKPOINT: 1024,
  AVAILABILITY_STATUS_KEYS: ['online', 'busy', 'offline'],
@@ -4,5 +4,4 @@ export const LOCAL_STORAGE_KEYS = {
  DRAFT_MESSAGES: 'draftMessages',
  COLOR_SCHEME: 'color_scheme',
  DISMISSED_LABEL_SUGGESTIONS: 'labelSuggestionsDismissed',
-  MESSAGE_REPLY_TO: 'messageReplyTo',
 };
@@ -16,5 +16,4 @@ export const FEATURE_FLAGS = {
  TEAM_MANAGEMENT: 'team_management',
  VOICE_RECORDER: 'voice_recorder',
  AUDIT_LOGS: 'audit_logs',
-  INSERT_ARTICLE_IN_REPLY: 'insert_article_in_reply',
 };
@@ -3,13 +3,11 @@ export const CONVERSATION_EVENTS = Object.freeze({
  SENT_MESSAGE: 'Sent a message',
  SENT_PRIVATE_NOTE: 'Sent a private note',
  INSERTED_A_CANNED_RESPONSE: 'Inserted a canned response',
-  TRANSLATE_A_MESSAGE: 'Translated a message',
  INSERTED_A_VARIABLE: 'Inserted a variable',
  USED_MENTIONS: 'Used mentions',
  SEARCH_CONVERSATION: 'Searched conversations',
  APPLY_FILTER: 'Applied filters in the conversation list',
  CHANGE_PRIORITY: 'Assigned priority to a conversation',
-  INSERT_ARTICLE_LINK: 'Inserted article into reply via article search',
 });

 export const ACCOUNT_EVENTS = Object.freeze({
@@ -64,47 +64,3 @@ export const isValidURL = value => {
    /^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)$/gm;
  return URL_REGEX.test(value);
 };
-
-export const getArticleSearchURL = ({
-  host,
-  portalSlug,
-  pageNumber,
-  locale,
-  status,
-  authorId,
-  categorySlug,
-  sort,
-  query,
-}) => {
-  const queryParams = new URLSearchParams({});
-
-  const params = {
-    page: pageNumber,
-    locale,
-    status,
-    author_id: authorId,
-    category_slug: categorySlug,
-    sort,
-    query,
-  };
-
-  Object.entries(params).forEach(([key, value]) => {
-    if (value !== null && value !== undefined) {
-      queryParams.set(key, value);
-    }
-  });
-
-  return `${host}/${portalSlug}/articles?${queryParams.toString()}`;
-};
-
-export const hasValidAvatarUrl = avatarUrl => {
-  try {
-    const { host: avatarUrlHost } = new URL(avatarUrl);
-    const isFromGravatar = ['www.gravatar.com', 'gravatar'].includes(
-      avatarUrlHost
-    );
-    return avatarUrl && !isFromGravatar;
-  } catch (error) {
-    return false;
-  }
-};
@@ -135,7 +135,6 @@ export const getActionOptions = ({ agents, teams, labels, type }) => {
    assign_team: teams,
    send_email_to_team: teams,
    add_label: generateConditionOptions(labels, 'title'),
-    remove_label: generateConditionOptions(labels, 'title'),
    change_priority: PRIORITY_CONDITION_VALUES,
  };
  return actionsMap[type];
@@ -156,128 +156,3 @@ export function extractTextFromMarkdown(markdown) {
    .replace(/\n{2,}/g, '\n') // Remove multiple consecutive newlines (blank lines)
    .trim(); // Trim any extra space
 }
-
-/**
- * Scrolls the editor view into current cursor position
- *
- * @param {EditorView} view - The Prosemirror EditorView
- *
- */
-export const scrollCursorIntoView = view => {
-  // Get the current selection's head position (where the cursor is).
-  const pos = view.state.selection.head;
-
-  // Get the corresponding DOM node for that position.
-  const domAtPos = view.domAtPos(pos);
-  const node = domAtPos.node;
-
-  // Scroll the node into view.
-  if (node && node.scrollIntoView) {
-    node.scrollIntoView({ behavior: 'smooth', block: 'center' });
-  }
-};
-
-/**
- * Returns a transaction that inserts a node into editor at the given position
- * Has an optional param 'content' to check if the
- *
- * @param {Node} node - The prosemirror node that needs to be inserted into the editor
- * @param {number} from - Position in the editor where the node needs to be inserted
- * @param {number} to - Position in the editor where the node needs to be replaced
- *
- */
-export function insertAtCursor(editorView, node, from, to) {
-  if (!editorView) {
-    return undefined;
-  }
-
-  // This is a workaround to prevent inserting content into new line rather than on the exiting line
-  // If the node is of type 'doc' and has only one child which is a paragraph,
-  // then extract its inline content to be inserted as inline.
-  const isWrappedInParagraph =
-    node.type.name === 'doc' &&
-    node.childCount === 1 &&
-    node.firstChild.type.name === 'paragraph';
-
-  if (isWrappedInParagraph) {
-    node = node.firstChild.content;
-  }
-
-  let tr;
-  if (to) {
-    tr = editorView.state.tr.replaceWith(from, to, node).insertText(` `);
-  } else {
-    tr = editorView.state.tr.insert(from, node);
-  }
-  const state = editorView.state.apply(tr);
-  editorView.updateState(state);
-  editorView.focus();
-
-  return state;
-}
-
-/**
- * Determines the appropriate node and position to insert an image in the editor.
- *
- * Based on the current editor state and the provided image URL, this function finds out the correct node (either
- * a standalone image node or an image wrapped in a paragraph) and its respective position in the editor.
- *
- * 1. If the current node is a paragraph and doesn't contain an image or text, the image is inserted directly into it.
- * 2. If the current node isn't a paragraph or it's a paragraph containing text, the image will be wrapped
- *    in a new paragraph and then inserted.
- * 3. If the current node is a paragraph containing an image, the new image will be inserted directly into it.
- *
- * @param {Object} editorState - The current state of the editor. It provides necessary details like selection, schema, etc.
- * @param {string} fileUrl - The URL of the image to be inserted into the editor.
- * @returns {Object|null} An object containing details about the node to be inserted and its position. It returns null if no image node can be created.
- * @property {Node} node - The ProseMirror node to be inserted (either an image node or a paragraph containing the image).
- * @property {number} pos - The position where the new node should be inserted in the editor.
- */
-
-export const findNodeToInsertImage = (editorState, fileUrl) => {
-  const { selection, schema } = editorState;
-  const { nodes } = schema;
-  const currentNode = selection.$from.node();
-  const {
-    type: { name: typeName },
-    content: { size, content },
-  } = currentNode;
-
-  const imageNode = nodes.image.create({ src: fileUrl });
-
-  if (!imageNode) return null;
-
-  const isInParagraph = typeName === 'paragraph';
-  const needsNewLine =
-    !content.some(n => n.type.name === 'image') && size !== 0 ? 1 : 0;
-
-  return {
-    node: isInParagraph ? imageNode : nodes.paragraph.create({}, imageNode),
-    pos: selection.from + needsNewLine,
-  };
-};
-
-/**
- * Set URL with query and size.
- *
- * @param {Object} selectedImageNode - The current selected node.
- * @param {Object} size - The size to set.
- * @param {Object} editorView - The editor view.
- */
-export function setURLWithQueryAndSize(selectedImageNode, size, editorView) {
-  if (selectedImageNode) {
-    // Create and apply the transaction
-    const tr = editorView.state.tr.setNodeMarkup(
-      editorView.state.selection.from,
-      null,
-      {
-        src: selectedImageNode.src,
-        height: size.height,
-      }
-    );
-
-    if (tr.docChanged) {
-      editorView.dispatch(tr);
-    }
-  }
-}
@@ -0,0 +1,40 @@
+/**
+ * Determines the appropriate node and position to insert an image in the editor.
+ *
+ * Based on the current editor state and the provided image URL, this function finds out the correct node (either
+ * a standalone image node or an image wrapped in a paragraph) and its respective position in the editor.
+ *
+ * 1. If the current node is a paragraph and doesn't contain an image or text, the image is inserted directly into it.
+ * 2. If the current node isn't a paragraph or it's a paragraph containing text, the image will be wrapped
+ *    in a new paragraph and then inserted.
+ * 3. If the current node is a paragraph containing an image, the new image will be inserted directly into it.
+ *
+ * @param {Object} editorState - The current state of the editor. It provides necessary details like selection, schema, etc.
+ * @param {string} fileUrl - The URL of the image to be inserted into the editor.
+ * @returns {Object|null} An object containing details about the node to be inserted and its position. It returns null if no image node can be created.
+ * @property {Node} node - The ProseMirror node to be inserted (either an image node or a paragraph containing the image).
+ * @property {number} pos - The position where the new node should be inserted in the editor.
+ */
+
+export const findNodeToInsertImage = (editorState, fileUrl) => {
+  const { selection, schema } = editorState;
+  const { nodes } = schema;
+  const currentNode = selection.$from.node();
+  const {
+    type: { name: typeName },
+    content: { size, content },
+  } = currentNode;
+
+  const imageNode = nodes.image.create({ src: fileUrl });
+
+  if (!imageNode) return null;
+
+  const isInParagraph = typeName === 'paragraph';
+  const needsNewLine =
+    !content.some(n => n.type.name === 'image') && size !== 0 ? 1 : 0;
+
+  return {
+    node: isInParagraph ? imageNode : nodes.paragraph.create({}, imageNode),
+    pos: selection.from + needsNewLine,
+  };
+};
@@ -3,8 +3,6 @@ import {
  conversationUrl,
  isValidURL,
  conversationListPageURL,
-  getArticleSearchURL,
-  hasValidAvatarUrl,
 } from '../URLHelper';

 describe('#URL Helpers', () => {
@@ -77,117 +75,4 @@ describe('#URL Helpers', () => {
      expect(isValidURL('alert.window')).toBe(false);
    });
  });
-
-  describe('getArticleSearchURL', () => {
-    it('should generate a basic URL without optional parameters', () => {
-      const url = getArticleSearchURL({
-        portalSlug: 'news',
-        pageNumber: 1,
-        locale: 'en',
-        host: 'myurl.com',
-      });
-      expect(url).toBe('myurl.com/news/articles?page=1&locale=en');
-    });
-
-    it('should include status parameter if provided', () => {
-      const url = getArticleSearchURL({
-        portalSlug: 'news',
-        pageNumber: 1,
-        locale: 'en',
-        status: 'published',
-        host: 'myurl.com',
-      });
-      expect(url).toBe(
-        'myurl.com/news/articles?page=1&locale=en&status=published'
-      );
-    });
-
-    it('should include author_id parameter if provided', () => {
-      const url = getArticleSearchURL({
-        portalSlug: 'news',
-        pageNumber: 1,
-        locale: 'en',
-        authorId: 123,
-        host: 'myurl.com',
-      });
-      expect(url).toBe(
-        'myurl.com/news/articles?page=1&locale=en&author_id=123'
-      );
-    });
-
-    it('should include category_slug parameter if provided', () => {
-      const url = getArticleSearchURL({
-        portalSlug: 'news',
-        pageNumber: 1,
-        locale: 'en',
-        categorySlug: 'technology',
-        host: 'myurl.com',
-      });
-      expect(url).toBe(
-        'myurl.com/news/articles?page=1&locale=en&category_slug=technology'
-      );
-    });
-
-    it('should include sort parameter if provided', () => {
-      const url = getArticleSearchURL({
-        portalSlug: 'news',
-        pageNumber: 1,
-        locale: 'en',
-        sort: 'views',
-        host: 'myurl.com',
-      });
-      expect(url).toBe('myurl.com/news/articles?page=1&locale=en&sort=views');
-    });
-
-    it('should handle multiple optional parameters', () => {
-      const url = getArticleSearchURL({
-        portalSlug: 'news',
-        pageNumber: 1,
-        locale: 'en',
-        status: 'draft',
-        authorId: 456,
-        categorySlug: 'science',
-        sort: 'views',
-        host: 'myurl.com',
-      });
-      expect(url).toBe(
-        'myurl.com/news/articles?page=1&locale=en&status=draft&author_id=456&category_slug=science&sort=views'
-      );
-    });
-
-    it('should handle missing optional parameters gracefully', () => {
-      const url = getArticleSearchURL({
-        portalSlug: 'news',
-        pageNumber: 1,
-        locale: 'en',
-        host: 'myurl.com',
-      });
-      expect(url).toBe('myurl.com/news/articles?page=1&locale=en');
-    });
-  });
-
-  describe('hasValidAvatarUrl', () => {
-    test('should return true for valid non-Gravatar URL', () => {
-      expect(hasValidAvatarUrl('https://chatwoot.com/avatar.jpg')).toBe(true);
-    });
-
-    test('should return false for a Gravatar URL (www.gravatar.com)', () => {
-      expect(hasValidAvatarUrl('https://www.gravatar.com/avatar.jpg')).toBe(
-        false
-      );
-    });
-
-    test('should return false for a Gravatar URL (gravatar)', () => {
-      expect(hasValidAvatarUrl('https://gravatar/avatar.jpg')).toBe(false);
-    });
-
-    test('should handle invalid URL', () => {
-      expect(hasValidAvatarUrl('invalid-url')).toBe(false); // or expect an error, depending on function design
-    });
-
-    test('should return false for empty or undefined URL', () => {
-      expect(hasValidAvatarUrl('')).toBe(false);
-      expect(hasValidAvatarUrl()).toBe(false);
-    });
-  });
 });
@@ -5,43 +5,7 @@ import {
  replaceSignature,
  cleanSignature,
  extractTextFromMarkdown,
-  insertAtCursor,
-  findNodeToInsertImage,
-  setURLWithQueryAndSize,
 } from '../editorHelper';
-import { EditorState } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-import { Schema } from 'prosemirror-model';
-
-// Define a basic ProseMirror schema
-const schema = new Schema({
-  nodes: {
-    doc: { content: 'paragraph+' },
-    paragraph: {
-      content: 'text*',
-      toDOM: () => ['p', 0], // Represents a paragraph as a <p> tag in the DOM.
-    },
-    text: {
-      toDOM: node => node.text, // Represents text as its actual string value.
-    },
-  },
-});
-
-// Initialize a basic EditorState for testing
-const createEditorState = (content = '') => {
-  if (!content) {
-    return EditorState.create({
-      schema,
-      doc: schema.node('doc', null, [schema.node('paragraph')]),
-    });
-  }
-  return EditorState.create({
-    schema,
-    doc: schema.node('doc', null, [
-      schema.node('paragraph', null, [schema.text(content)]),
-    ]),
-  });
-};

 const NEW_SIGNATURE = 'This is a new signature';

@@ -234,208 +198,3 @@ describe('extractTextFromMarkdown', () => {
    expect(extractTextFromMarkdown(markdown)).toEqual(expected);
  });
 });
-
-describe('insertAtCursor', () => {
-  it('should return undefined if editorView is not provided', () => {
-    const result = insertAtCursor(undefined, schema.text('Hello'), 0);
-    expect(result).toBeUndefined();
-  });
-
-  it('should unwrap doc nodes that are wrapped in a paragraph', () => {
-    const docNode = schema.node('doc', null, [
-      schema.node('paragraph', null, [schema.text('Hello')]),
-    ]);
-
-    const editorState = createEditorState();
-    const editorView = new EditorView(document.body, { state: editorState });
-
-    insertAtCursor(editorView, docNode, 0);
-
-    // Check if node was unwrapped and inserted correctly
-    expect(editorView.state.doc.firstChild.firstChild.text).toBe('Hello');
-  });
-
-  it('should insert node without replacing any content if "to" is not provided', () => {
-    const editorState = createEditorState();
-    const editorView = new EditorView(document.body, { state: editorState });
-
-    insertAtCursor(editorView, schema.text('Hello'), 0);
-
-    // Check if node was inserted correctly
-    expect(editorView.state.doc.firstChild.firstChild.text).toBe('Hello');
-  });
-
-  it('should replace content between "from" and "to" with the provided node', () => {
-    const editorState = createEditorState('ReplaceMe');
-    const editorView = new EditorView(document.body, { state: editorState });
-
-    insertAtCursor(editorView, schema.text('Hello'), 0, 8);
-
-    // Check if content was replaced correctly
-    expect(editorView.state.doc.firstChild.firstChild.text).toBe('Hello Me');
-  });
-});
-
-describe('findNodeToInsertImage', () => {
-  let mockEditorState;
-
-  beforeEach(() => {
-    mockEditorState = {
-      selection: {
-        $from: {
-          node: jest.fn(() => ({})),
-        },
-        from: 0,
-      },
-      schema: {
-        nodes: {
-          image: {
-            create: jest.fn(attrs => ({ type: { name: 'image' }, attrs })),
-          },
-          paragraph: {
-            create: jest.fn((_, node) => ({
-              type: { name: 'paragraph' },
-              content: [node],
-            })),
-          },
-        },
-      },
-    };
-  });
-
-  it('should insert image directly into an empty paragraph', () => {
-    const mockNode = {
-      type: { name: 'paragraph' },
-      content: { size: 0, content: [] },
-    };
-    mockEditorState.selection.$from.node.mockReturnValueOnce(mockNode);
-
-    const result = findNodeToInsertImage(mockEditorState, 'image-url');
-    expect(result).toEqual({
-      node: { type: { name: 'image' }, attrs: { src: 'image-url' } },
-      pos: 0,
-    });
-  });
-
-  it('should insert image directly into a paragraph without an image but with other content', () => {
-    const mockNode = {
-      type: { name: 'paragraph' },
-      content: {
-        size: 1,
-        content: [
-          {
-            type: { name: 'text' },
-          },
-        ],
-      },
-    };
-    mockEditorState.selection.$from.node.mockReturnValueOnce(mockNode);
-    mockEditorState.selection.from = 1;
-
-    const result = findNodeToInsertImage(mockEditorState, 'image-url');
-    expect(result).toEqual({
-      node: { type: { name: 'image' }, attrs: { src: 'image-url' } },
-      pos: 2, // Because it should insert after the text, on a new line.
-    });
-  });
-
-  it("should wrap image in a new paragraph when the current node isn't a paragraph", () => {
-    const mockNode = {
-      type: { name: 'not-a-paragraph' },
-      content: { size: 0, content: [] },
-    };
-    mockEditorState.selection.$from.node.mockReturnValueOnce(mockNode);
-
-    const result = findNodeToInsertImage(mockEditorState, 'image-url');
-    expect(result.node.type.name).toBe('paragraph');
-    expect(result.node.content[0].type.name).toBe('image');
-    expect(result.node.content[0].attrs.src).toBe('image-url');
-    expect(result.pos).toBe(0);
-  });
-
-  it('should insert a new image directly into the paragraph that already contains an image', () => {
-    const mockNode = {
-      type: { name: 'paragraph' },
-      content: {
-        size: 1,
-        content: [
-          {
-            type: { name: 'image', attrs: { src: 'existing-image-url' } },
-          },
-        ],
-      },
-    };
-    mockEditorState.selection.$from.node.mockReturnValueOnce(mockNode);
-    mockEditorState.selection.from = 1;
-
-    const result = findNodeToInsertImage(mockEditorState, 'image-url');
-    expect(result.node.type.name).toBe('image');
-    expect(result.node.attrs.src).toBe('image-url');
-    expect(result.pos).toBe(1);
-  });
-});
-
-describe('setURLWithQueryAndSize', () => {
-  let selectedNode;
-  let editorView;
-
-  beforeEach(() => {
-    selectedNode = {
-      setAttribute: jest.fn(),
-    };
-
-    const tr = {
-      setNodeMarkup: jest.fn().mockReturnValue({
-        docChanged: true,
-      }),
-    };
-
-    const state = {
-      selection: { from: 0 },
-      tr,
-    };
-
-    editorView = {
-      state,
-      dispatch: jest.fn(),
-    };
-  });
-
-  it('updates the URL with the given size and updates the editor view', () => {
-    const size = { height: '20px' };
-
-    setURLWithQueryAndSize(selectedNode, size, editorView);
-
-    // Check if the editor view is updated
-    expect(editorView.dispatch).toHaveBeenCalledTimes(1);
-  });
-
-  it('updates the URL with the given size and updates the editor view with original size', () => {
-    const size = { height: 'auto' };
-
-    setURLWithQueryAndSize(selectedNode, size, editorView);
-
-    // Check if the editor view is updated
-    expect(editorView.dispatch).toHaveBeenCalledTimes(1);
-  });
-
-  it('does not update the editor view if the document has not changed', () => {
-    editorView.state.tr.setNodeMarkup = jest.fn().mockReturnValue({
-      docChanged: false,
-    });
-
-    const size = { height: '20px' };
-
-    setURLWithQueryAndSize(selectedNode, size, editorView);
-
-    // Check if the editor view dispatch was not called
-    expect(editorView.dispatch).not.toHaveBeenCalled();
-  });
-
-  it('does not perform any operations if selectedNode is not provided', () => {
-    setURLWithQueryAndSize(null, { height: '20px' }, editorView);
-
-    // Ensure the dispatch method wasn't called
-    expect(editorView.dispatch).not.toHaveBeenCalled();
-  });
-});
@@ -0,0 +1,100 @@
+import { findNodeToInsertImage } from '../messageEditorHelper';
+
+describe('findNodeToInsertImage', () => {
+  let mockEditorState;
+
+  beforeEach(() => {
+    mockEditorState = {
+      selection: {
+        $from: {
+          node: jest.fn(() => ({})),
+        },
+        from: 0,
+      },
+      schema: {
+        nodes: {
+          image: {
+            create: jest.fn(attrs => ({ type: { name: 'image' }, attrs })),
+          },
+          paragraph: {
+            create: jest.fn((_, node) => ({
+              type: { name: 'paragraph' },
+              content: [node],
+            })),
+          },
+        },
+      },
+    };
+  });
+
+  it('should insert image directly into an empty paragraph', () => {
+    const mockNode = {
+      type: { name: 'paragraph' },
+      content: { size: 0, content: [] },
+    };
+    mockEditorState.selection.$from.node.mockReturnValueOnce(mockNode);
+
+    const result = findNodeToInsertImage(mockEditorState, 'image-url');
+    expect(result).toEqual({
+      node: { type: { name: 'image' }, attrs: { src: 'image-url' } },
+      pos: 0,
+    });
+  });
+
+  it('should insert image directly into a paragraph without an image but with other content', () => {
+    const mockNode = {
+      type: { name: 'paragraph' },
+      content: {
+        size: 1,
+        content: [
+          {
+            type: { name: 'text' },
+          },
+        ],
+      },
+    };
+    mockEditorState.selection.$from.node.mockReturnValueOnce(mockNode);
+    mockEditorState.selection.from = 1;
+
+    const result = findNodeToInsertImage(mockEditorState, 'image-url');
+    expect(result).toEqual({
+      node: { type: { name: 'image' }, attrs: { src: 'image-url' } },
+      pos: 2, // Because it should insert after the text, on a new line.
+    });
+  });
+
+  it("should wrap image in a new paragraph when the current node isn't a paragraph", () => {
+    const mockNode = {
+      type: { name: 'not-a-paragraph' },
+      content: { size: 0, content: [] },
+    };
+    mockEditorState.selection.$from.node.mockReturnValueOnce(mockNode);
+
+    const result = findNodeToInsertImage(mockEditorState, 'image-url');
+    expect(result.node.type.name).toBe('paragraph');
+    expect(result.node.content[0].type.name).toBe('image');
+    expect(result.node.content[0].attrs.src).toBe('image-url');
+    expect(result.pos).toBe(0);
+  });
+
+  it('should insert a new image directly into the paragraph that already contains an image', () => {
+    const mockNode = {
+      type: { name: 'paragraph' },
+      content: {
+        size: 1,
+        content: [
+          {
+            type: { name: 'image', attrs: { src: 'existing-image-url' } },
+          },
+        ],
+      },
+    };
+    mockEditorState.selection.$from.node.mockReturnValueOnce(mockNode);
+    mockEditorState.selection.from = 1;
+
+    const result = findNodeToInsertImage(mockEditorState, 'image-url');
+    expect(result.node.type.name).toBe('image');
+    expect(result.node.attrs.src).toBe('image-url');
+    expect(result.pos).toBe(1);
+  });
+});
@@ -41,16 +41,6 @@
      "STATUS": "Status",
      "ORDER_BY": "Order by"
    },
-    "CHAT_TIME_STAMP": {
-      "CREATED": {
-        "LATEST": "Created",
-        "OLDEST": "Created at:"
-      },
-      "LAST_ACTIVITY": {
-        "NOT_ACTIVE": "Last activity:",
-        "ACTIVE": "Last activity"
-      }
-    },
    "CHAT_SORT_FILTER_ITEMS": {
      "latest": {
        "TEXT": "Last activity"
@@ -204,10 +204,6 @@
        "PLACEHOLDER": "Write your message here",
        "ERROR": "Message can't be empty"
      },
-      "ATTACHMENTS": {
-        "SELECT": "Choose files",
-        "HELP_TEXT": "Drag and drop files here or choose files to attach"
-      },
      "SUBMIT": "Send message",
      "CANCEL": "Cancel",
      "SUCCESS_MESSAGE": "Message sent!",
@@ -347,17 +343,17 @@
    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’s attributes will take precedence.",
    "PRIMARY": {
      "TITLE": "Primary contact",
-      "HELP_LABEL": "To be deleted"
+      "HELP_LABEL": "To be kept"
    },
-    "PARENT": {
+    "CHILD": {
      "TITLE": "Contact to merge",
      "PLACEHOLDER": "Search for a contact",
-      "HELP_LABEL": "To be kept"
+      "HELP_LABEL": "To be deleted"
    },
    "SUMMARY": {
      "TITLE": "Summary",
-      "DELETE_WARNING": "Contact of <strong>%{primaryContactName}</strong> will be deleted.",
-      "ATTRIBUTE_WARNING": "Contact details of <strong>%{primaryContactName}</strong> will be copied to <strong>%{parentContactName}</strong>."
+      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
+      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
    },
    "SEARCH": {
      "ERROR": "ERROR_MESSAGE"
@@ -34,6 +34,7 @@
    "ASSIGN_TO_ME": "Assign to me",
    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
+    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
    "REPLYING_TO": "You are replying to:",
    "REMOVE_SELECTION": "Remove Selection",
    "DOWNLOAD": "Download",
@@ -46,7 +47,6 @@
    "NO_RESPONSE": "No response",
    "RATING_TITLE": "Rating",
    "FEEDBACK_TITLE": "Feedback",
-    "REPLY_MESSAGE_NOT_FOUND": "Message not available",
    "CARD": {
      "SHOW_LABELS": "Show labels",
      "HIDE_LABELS": "Hide labels"
@@ -139,8 +139,7 @@
      "PRIVATE_NOTE": "Private Note",
      "SEND": "Send",
      "CREATE": "Add Note",
-      "DISMISS_REPLY": "Dismiss reply",
-      "REPLYING_TO": "Replying to:",
+      "TWEET": "Tweet",
      "TIP_FORMAT_ICON": "Show rich text editor",
      "TIP_EMOJI_ICON": "Show emoji selector",
      "TIP_ATTACH_ICON": "Attach files",
@@ -195,7 +194,6 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "REPLY_TO": "Reply to this message",
      "DELETE": "Delete",
      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
      "TRANSLATE": "Translate",
@@ -1,7 +1,6 @@
 {
  "EMOJI": {
    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search",
-    "REMOVE": "Remove"
+    "NOT_FOUND": "No emoji match your search"
  }
 }
@@ -365,7 +365,7 @@
        "NAME": {
          "LABEL": "Name",
          "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
          "ERROR": "Name is required"
        },
        "SLUG": {
@@ -396,7 +396,7 @@
        "NAME": {
          "LABEL": "Name",
          "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
          "ERROR": "Name is required"
        },
        "SLUG": {
@@ -425,33 +425,6 @@
          "ERROR_MESSAGE": "Unable to delete category"
        }
      }
-    },
-    "UPGRADE_PAGE": {
-      "TITLE": "Help Center",
-      "DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Upgrade your subscription to enable this feature.",
-      "SELF_HOSTED_DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Please contact your administrator to enable this feature.",
-      "BUTTON": {
-        "LEARN_MORE": "Learn more",
-        "UPGRADE": "Upgrade"
-      },
-      "FEATURES": {
-        "PORTALS": {
-          "TITLE": "Multiple portals",
-          "DESCRIPTION": "Create multiple help center portals for different products using the same account."
-        },
-        "LOCALES": {
-          "TITLE": "Full support for locales",
-          "DESCRIPTION": "Localize the portal in your language. We support all locales and allow translations for every article."
-        },
-        "SEO": {
-          "TITLE": "SEO-friendly design",
-          "DESCRIPTION": "Customize your meta tags to improve your visibility on search engines with our SEO-friendly pages."
-        },
-        "API": {
-          "TITLE": "Full API support",
-          "DESCRIPTION": "Use the portal as a headless CMS with third party front-end frameworks using our APIs."
-        }
-      }
    }
  }
 }
@@ -242,7 +242,7 @@
    "REPORTS_OVERVIEW": "Overview",
    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
    "HELP_CENTER": {
-      "TITLE": "Help Center",
+      "TITLE": "Help Center (Beta)",
      "ALL_ARTICLES": "All Articles",
      "MY_ARTICLES": "My Articles",
      "DRAFT": "Draft",
@@ -41,16 +41,6 @@
      "STATUS": "الحالة",
      "ORDER_BY": "الترتيب بواسطة"
    },
-    "CHAT_TIME_STAMP": {
-      "CREATED": {
-        "LATEST": "Created",
-        "OLDEST": "تم إنشاؤها في:"
-      },
-      "LAST_ACTIVITY": {
-        "NOT_ACTIVE": "النشاط الأخير:",
-        "ACTIVE": "النشاط الأخير"
-      }
-    },
    "CHAT_SORT_FILTER_ITEMS": {
      "latest": {
        "TEXT": "النشاط الأخير"
@@ -204,10 +204,6 @@
        "PLACEHOLDER": "اكتب رسالتك هنا",
        "ERROR": "لا يمكن أن تكون الرسالة فارغة"
      },
-      "ATTACHMENTS": {
-        "SELECT": "Choose files",
-        "HELP_TEXT": "Drag and drop files here or choose files to attach"
-      },
      "SUBMIT": "إرسال الرسالة",
      "CANCEL": "إلغاء",
      "SUCCESS_MESSAGE": "تم إرسال الرسالة!",
@@ -347,17 +343,17 @@
    "DESCRIPTION": "دمج جهات الاتصال للجمع بين ملفّين شخصيين في واحد، بما في ذلك جميع السمات والمحادثات. في حالة التعارض، تكون لخصائص جهة الاتصال الرئيسية الأسبقية.",
    "PRIMARY": {
      "TITLE": "جهة الاتصال الرئيسية",
-      "HELP_LABEL": "ليتم حذفها"
+      "HELP_LABEL": "سيتم الاحتفاظ بها"
    },
-    "PARENT": {
+    "CHILD": {
      "TITLE": "دمج جهة الإتصال",
      "PLACEHOLDER": "بحث عن جهات الاتصال",
-      "HELP_LABEL": "سيتم الاحتفاظ بها"
+      "HELP_LABEL": "ليتم حذفها"
    },
    "SUMMARY": {
      "TITLE": "ملخص",
-      "DELETE_WARNING": "سيتم حذف جهة الاتصال بـ <strong>%{primaryContactName}</strong>.",
-      "ATTRIBUTE_WARNING": "سيتم نسخ تفاصيل الاتصال بـ <strong>%{primaryContactName}</strong> إلى <strong>%{parentContactName}</strong>."
+      "DELETE_WARNING": "سيتم حذف جهة الاتصال بـ <strong>%{childContactName}</strong>.",
+      "ATTRIBUTE_WARNING": "سيتم نسخ تفاصيل الاتصال بـ <strong>%{childContactName}</strong> إلى <strong>%{primaryContactName}</strong>."
    },
    "SEARCH": {
      "ERROR": "رسالة_خطأ"
@@ -34,6 +34,7 @@
    "ASSIGN_TO_ME": "إسناد لي",
    "TWILIO_WHATSAPP_CAN_REPLY": "يمكنك فقط الرد على هذه المحادثة باستخدام رسالة قالب بسبب",
    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "قيد نافذة الـ 24 ساعة",
+    "SELECT_A_TWEET_TO_REPLY": "الرجاء تحديد تغريدة للرد عليها.",
    "REPLYING_TO": "أنت ترد على:",
    "REMOVE_SELECTION": "إزالة التحديد",
    "DOWNLOAD": "تنزيل",
@@ -46,7 +47,6 @@
    "NO_RESPONSE": "لا توجد استجابة",
    "RATING_TITLE": "التقييم",
    "FEEDBACK_TITLE": "الملاحظات",
-    "REPLY_MESSAGE_NOT_FOUND": "Message not available",
    "CARD": {
      "SHOW_LABELS": "إظهار السمات",
      "HIDE_LABELS": "إخفاء السمات"
@@ -139,8 +139,7 @@
      "PRIVATE_NOTE": "إضافة ملاحظة خاصة",
      "SEND": "إرسال",
      "CREATE": "إضافة ملاحظة",
-      "DISMISS_REPLY": "Dismiss reply",
-      "REPLYING_TO": "Replying to:",
+      "TWEET": "تغريد",
      "TIP_FORMAT_ICON": "عرض محرر النصوص",
      "TIP_EMOJI_ICON": "إظهار قائمة الرموز التعبيرية",
      "TIP_ATTACH_ICON": "إرفاق الملفات",
@@ -195,7 +194,6 @@
    },
    "CONTEXT_MENU": {
      "COPY": "نسخ",
-      "REPLY_TO": "Reply to this message",
      "DELETE": "حذف",
      "CREATE_A_CANNED_RESPONSE": "إضافة إلى الردود السريعة",
      "TRANSLATE": "ترجم",
@@ -1,7 +1,6 @@
 {
  "EMOJI": {
    "PLACEHOLDER": "ابحث في الايموجي",
-    "NOT_FOUND": "لا يوجد إيموجي يطابق بحثك",
-    "REMOVE": "حذف"
+    "NOT_FOUND": "لا يوجد إيموجي يطابق بحثك"
  }
 }
@@ -365,7 +365,7 @@
        "NAME": {
          "LABEL": "الاسم",
          "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
          "ERROR": "الاسم مطلوب"
        },
        "SLUG": {
@@ -396,7 +396,7 @@
        "NAME": {
          "LABEL": "الاسم",
          "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
          "ERROR": "الاسم مطلوب"
        },
        "SLUG": {
@@ -425,33 +425,6 @@
          "ERROR_MESSAGE": "Unable to delete category"
        }
      }
-    },
-    "UPGRADE_PAGE": {
-      "TITLE": "Help Center",
-      "DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Upgrade your subscription to enable this feature.",
-      "SELF_HOSTED_DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Please contact your administrator to enable this feature.",
-      "BUTTON": {
-        "LEARN_MORE": "اعرف المزيد",
-        "UPGRADE": "Upgrade"
-      },
-      "FEATURES": {
-        "PORTALS": {
-          "TITLE": "Multiple portals",
-          "DESCRIPTION": "Create multiple help center portals for different products using the same account."
-        },
-        "LOCALES": {
-          "TITLE": "Full support for locales",
-          "DESCRIPTION": "Localize the portal in your language. We support all locales and allow translations for every article."
-        },
-        "SEO": {
-          "TITLE": "SEO-friendly design",
-          "DESCRIPTION": "Customize your meta tags to improve your visibility on search engines with our SEO-friendly pages."
-        },
-        "API": {
-          "TITLE": "Full API support",
-          "DESCRIPTION": "Use the portal as a headless CMS with third party front-end frameworks using our APIs."
-        }
-      }
    }
  }
 }
@@ -242,7 +242,7 @@
    "REPORTS_OVERVIEW": "نظرة عامة",
    "FACEBOOK_REAUTHORIZE": "انتهت صلاحية اتصال الفيسبوك الخاص بك، يرجى إعادة الاتصال بصفحة الفيسبوك الخاصة بك لمواصلة الخدمات",
    "HELP_CENTER": {
-      "TITLE": "Help Center",
+      "TITLE": "مركز المساعدة (نسخة تجريبية)",
      "ALL_ARTICLES": "جميع المقالات",
      "MY_ARTICLES": "مقالاتي",
      "DRAFT": "مسودة",
@@ -41,16 +41,6 @@
      "STATUS": "Статус",
      "ORDER_BY": "Order by"
    },
-    "CHAT_TIME_STAMP": {
-      "CREATED": {
-        "LATEST": "Created",
-        "OLDEST": "Създаден в:"
-      },
-      "LAST_ACTIVITY": {
-        "NOT_ACTIVE": "Last activity:",
-        "ACTIVE": "Last activity"
-      }
-    },
    "CHAT_SORT_FILTER_ITEMS": {
      "latest": {
        "TEXT": "Last activity"
@@ -204,10 +204,6 @@
        "PLACEHOLDER": "Напишете съобщението си тук",
        "ERROR": "Съобщението не може да е празно"
      },
-      "ATTACHMENTS": {
-        "SELECT": "Choose files",
-        "HELP_TEXT": "Drag and drop files here or choose files to attach"
-      },
      "SUBMIT": "Изпрати съобщение",
      "CANCEL": "Отмени",
      "SUCCESS_MESSAGE": "Съобщението е изпратено!",
@@ -347,17 +343,17 @@
    "DESCRIPTION": "Обединете контактите, за да комбинирате два профила в един, включително всички атрибути и разговори. В случай на конфликт атрибутите на основния контакт ще имат предимство.",
    "PRIMARY": {
      "TITLE": "Основен контакт",
-      "HELP_LABEL": "Да бъде изтрит"
+      "HELP_LABEL": "Да бъде запазено"
    },
-    "PARENT": {
+    "CHILD": {
      "TITLE": "Контакт за обединяване",
      "PLACEHOLDER": "Търсене на контакт",
-      "HELP_LABEL": "Да бъде запазено"
+      "HELP_LABEL": "Да бъде изтрит"
    },
    "SUMMARY": {
      "TITLE": "Резюме",
-      "DELETE_WARNING": "Контакт от <strong>%{primaryContactName}</strong> ще бъде изтрит.",
-      "ATTRIBUTE_WARNING": "Детайлите на контакт <strong>%{primaryContactName}</strong> ще бъдат копирани в <strong>%{parentContactName}</strong>."
+      "DELETE_WARNING": "Контакт от <strong>%{childContactName}</strong> ще бъде изтрит.",
+      "ATTRIBUTE_WARNING": "Детайлите на контакт <strong>%{childContactName}</strong> ще бъдат копирани в <strong>%{primaryContactName}</strong>."
    },
    "SEARCH": {
      "ERROR": "ГРЕШКА"
@@ -34,6 +34,7 @@
    "ASSIGN_TO_ME": "Assign to me",
    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
+    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
    "REPLYING_TO": "You are replying to:",
    "REMOVE_SELECTION": "Remove Selection",
    "DOWNLOAD": "Download",
@@ -46,7 +47,6 @@
    "NO_RESPONSE": "No response",
    "RATING_TITLE": "Rating",
    "FEEDBACK_TITLE": "Feedback",
-    "REPLY_MESSAGE_NOT_FOUND": "Message not available",
    "CARD": {
      "SHOW_LABELS": "Show labels",
      "HIDE_LABELS": "Hide labels"
@@ -139,8 +139,7 @@
      "PRIVATE_NOTE": "Private Note",
      "SEND": "Send",
      "CREATE": "Add Note",
-      "DISMISS_REPLY": "Dismiss reply",
-      "REPLYING_TO": "Replying to:",
+      "TWEET": "Tweet",
      "TIP_FORMAT_ICON": "Show rich text editor",
      "TIP_EMOJI_ICON": "Show emoji selector",
      "TIP_ATTACH_ICON": "Attach files",
@@ -195,7 +194,6 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "REPLY_TO": "Reply to this message",
      "DELETE": "Изтрий",
      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
      "TRANSLATE": "Translate",
@@ -1,7 +1,6 @@
 {
  "EMOJI": {
    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search",
-    "REMOVE": "Remove"
+    "NOT_FOUND": "No emoji match your search"
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shivam Mishra	6e3375fb84	refactor: move attachment methods to a mixin	2023-10-04 19:33:28 +05:30
Shivam Mishra	58ce9bfc19	refactor: move methods out to mixin	2023-10-04 19:26:18 +05:30
Shivam Mishra	63a071f0d3	style: sort and group imports	2023-10-04 19:26:13 +05:30
Shivam Mishra	f0d3ae09d9	refactor: move top level styles to tailwind	2023-10-04 19:26:07 +05:30
@@ -1 +1 @@
 .6.0
 .4.0