Add modal

2023-04-19 15:11:56 +05:30
1495 changed files with 6476 additions and 30918 deletions
@@ -7,7 +7,7 @@ defaults: &defaults
  working_directory: ~/build
  docker:
    # specify the version you desire here
-    - image: cimg/ruby:3.2.2-browsers
+    - image: cimg/ruby:3.1.3-browsers

    # Specify service dependencies here if necessary
    # CircleCI maintains a library of pre-built images
@@ -157,7 +157,7 @@ jobs:
      - run:
          name: Code Climate Test Coverage
          command: |
-            ~/tmp/cc-test-reporter format-coverage -t lcov -o "coverage/codeclimate.frontend_$CIRCLE_NODE_INDEX.json"  
+            ~/tmp/cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.frontend_$CIRCLE_NODE_INDEX.json buildreports/lcov.info    
            
      - persist_to_workspace:
          root: coverage
@@ -30,7 +30,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
    npm

 # Install rbenv and ruby
-ARG RUBY_VERSION="3.2.2"
+ARG RUBY_VERSION="3.1.3"
 RUN git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
    &&  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc \
    &&  echo 'eval "$(rbenv init -)"' >> ~/.bashrc
@@ -173,9 +173,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## LogRocket
 # LOG_ROCKET_PROJECT_ID=xxxxx/some-project

-# MICROSOFT CLARITY
-# MS_CLARITY_TOKEN=xxxxxxxxx
-
 ## Scout
 ## https://scoutapm.com/docs/ruby/configuration
 # SCOUT_KEY=YOURKEY
@@ -0,0 +1,78 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'Bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See the error
+
+**Expected behavior**
+
+Share a clear and concise description of what you expected to happen.
+
+**Screenshots**
+
+If applicable, add screenshots to help explain your problem.
+
+**Browser logs**
+
+Share the browser logs to debug the issue further.
+
+**Server logs**
+
+Share the server logs to debug the issue further.
+
+**Environment**
+
+Describe whether you are using Chatwoot Cloud (app.chatwoot.com) or a self-hosted installation of Chatwoot. If you are using a self-hosted installation of Chatwoot, describe the type of deployment (Docker/Linux VM installation/Heroku/Kubernetes/Other).
+
+- [ ] app.chatwoot.com (Chatwoot Cloud)
+- [ ] Self-hosted
+- - [ ] Linux VM
+- - [ ] Docker
+- - [ ] Kubernetes
+- - [ ] Heroku
+- - [ ] Other (Please specify)
+
+
+**Desktop (please complete the following information)** (If applicable)
+ - OS: [e.g. Linux, Windows, MacOS]
+ - Browser [e.g. chrome, firefox, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information)** (If applicable)
+ - Device: [e.g. iPhone6, Pixel7]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, firefox, safari]
+ - Version [e.g. 22]
+
+**Docker** (If applicable)
+
+Please share the output of the following.
+- `docker version`
+- `docker info`
+- `docker-compose version`
+
+**Cloud Provider** (If applicable)
+- [ ] AWS
+- [ ] GCP
+- [ ] Azure
+- [ ] DigitalOcean
+- [ ] Others
+
+**Additional context**
+
+Add any other context about the problem here.
@@ -1,78 +0,0 @@
-name: 🐞 Bug report
-description: Create a report to help us improve
-labels: 'Bug'
-body:
-  - type: textarea
-    attributes:
-      label: Describe the bug
-      description: A concise description of what you expected to happen along with screenshots if applicable.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        1. In this environment...
-        2. With this config...
-        3. Run '...'
-        4. See error...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: A concise description of what you expected to happen.
-  - type: dropdown
-    id: environment
-    attributes:
-      label: Environment
-      description: Describe whether you are using Chatwoot Cloud (app.chatwoot.com) or a self-hosted installation of Chatwoot. If you are using a self-hosted installation of Chatwoot, describe the type of deployment (Docker/Linux VM installation/Heroku/Kubernetes/Other).
-      options:
-        - app.chatwoot.com
-        - Linux VM
-        - Docker
-        - Kubernetes
-        - Heroku
-        - Other [please specify in the description]
-    validations:
-      required: true
-  - type: dropdown
-    id: provider
-    attributes:
-      label: Cloud Provider
-      description:
-      options:
-        - AWS
-        - GCP
-        - Azure
-        - DigitalOcean
-        - Other [please specify in the description]
-  - type: dropdown
-    id: platform
-    attributes:
-      label: Platform
-      description: Describe the platform you are using
-      options:
-        - Browser
-        - Mobile
-  - type: input
-    attributes:
-      label: Operating system
-      description: The operating system and the version you are using.
-  - type: input
-    attributes:
-      label: Browser and version
-      description: The name of the browser and version you are using.
-  - type: textarea
-    attributes:
-      label: Docker (if applicable)
-      description: |
-        Please share the output of the following. 
-        - `docker version`
-        - `docker info`
-        - `docker-compose version`
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Report a security issue
-    url: https://www.chatwoot.com/docs/contributing-guide/security-reports/
-    about: Guidelines and steps to report a security vulnerability. Please report security vulnerabilities here.
-  - name: Product Documentation
-    url: https://www.chatwoot.com/help-center
-    about: If you have questions, are confused, or just want to understand our product better, please check out our documentation.
@@ -0,0 +1,20 @@
+---
+name: Enhancement request
+about: Suggest any enhancements for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your enhancement request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions you've considered.
+
+**Additional context**
+Add any other context or screenshots about the enhancement request here.
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -1,28 +0,0 @@
-name: 🧙 Feature request
-description: Suggest an idea for this project
-labels: 'feature-request'
-body:
-  - type: textarea
-    attributes:
-      label: Is your feature or enhancement related to a problem? Please describe.
-      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.
-    validations:
-      required: false
@@ -1,38 +0,0 @@
-name: Run Size Limit Check
-
-on:
-  pull_request:
-    branches:
-      - develop
-
-jobs:
-  test:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: yarn
-        run: yarn install
-
-      - name: Strip enterprise code
-        run: |
-          rm -rf enterprise
-          rm -rf spec/enterprise
-
-      - name: Run asset compile
-        run: bundle exec rake assets:precompile
-
-      - name: Size Check
-        run: yarn run size
@@ -67,10 +67,3 @@ test/cypress/videos/*
 # yalc for local testing
 .yalc
 yalc.lock
-
-/public/packs
-/public/packs-test
-/node_modules
-/yarn-error.log
-yarn-debug.log*
-.yarn-integrity
@@ -71,10 +71,6 @@ Rails/ApplicationController:
    - 'app/controllers/platform_controller.rb'
    - 'app/controllers/public_controller.rb'
    - 'app/controllers/survey/responses_controller.rb'
-Rails/FindEach:
-  Enabled: true
-  Include: 
-    - 'app/**/*.rb'
 Rails/CompactBlank:
  Enabled: false
 Rails/EnvironmentVariableAccess:
@@ -162,33 +158,8 @@ Rails/RenderInline:
 Performance/CollectionLiteralInLoop:
  Exclude:
    - 'db/migrate/20210315101919_enable_email_channel.rb'
-Rails/ThreeStateBooleanColumn:
-  Exclude:
-    - 'db/migrate/20200509044639_add_hide_input_flag_to_bot_config.rb'
-    - 'db/migrate/20200605130625_agent_away_message_to_auto_reply.rb'
-    - 'db/migrate/20200606132552_create_labels.rb'
-    - 'db/migrate/20201027135006_create_working_hours.rb'
-    - 'db/migrate/20210112174124_add_hmac_token_to_inbox.rb'
-    - 'db/migrate/20210114202310_create_teams.rb'
-    - 'db/migrate/20210212154240_add_request_for_email_on_channel_web_widget.rb'
-    - 'db/migrate/20210428135041_add_campaigns.rb'
-    - 'db/migrate/20210602182058_add_hmac_to_api_channel.rb'
-    - 'db/migrate/20210609133433_add_email_collect_to_inboxes.rb'
-    - 'db/migrate/20210618095823_add_csat_toggle_for_inbox.rb'
-    - 'db/migrate/20210927062350_add_trigger_only_during_business_hours_collect_to_campaigns.rb'
-    - 'db/migrate/20211027073553_add_imap_smtp_config_to_channel_email.rb'
-    - 'db/migrate/20211109143122_add_tweet_enabled_flag_to_twitter_channel.rb'
-    - 'db/migrate/20211216110209_add_allow_messages_after_resolved_to_inbox.rb'
-    - 'db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb'
-    - 'db/migrate/20220216151613_add_open_all_day_to_working_hour.rb'
-    - 'db/migrate/20220511072655_add_archive_column_to_portal.rb'
-    - 'db/migrate/20230503101201_create_sla_policies.rb'
-RSpec/IndexedLet:
-  Enabled: false
 RSpec/NamedSubject:
  Enabled: false
-
-
 # we should bring this down
 RSpec/MultipleMemoizedHelpers:
  Max: 14
@@ -1 +1 @@
-3.2.2
+3.1.3
@@ -1 +0,0 @@
-/spec
@@ -1,10 +1,10 @@
 source 'https://rubygems.org'

-ruby '3.2.2'
+ruby '3.1.3'

 ##-- base gems for rails --##
 gem 'rack-cors', require: 'rack/cors'
-gem 'rails', '~> 7'
+gem 'rails', '~> 6.1', '>= 6.1.7.3'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false

@@ -36,19 +36,19 @@ gem 'json_schemer'
 # Rack middleware for blocking & throttling abusive requests
 gem 'rack-attack'
 # a utility tool for streaming, flexible and safe downloading of remote files
-gem 'down'
+gem 'down', '~> 5.0'
 # authentication type to fetch and send mail over oauth2.0
 gem 'gmail_xoauth'
 # Prevent CSV injection
 gem 'csv-safe'
+# Support message translation
+gem 'google-cloud-translate'

 ##-- for active storage --##
 gem 'aws-sdk-s3', require: false
-# original gem isn't maintained actively
-# we wanted updated version of faraday which is a dependency for slack-ruby-client
-gem 'azure-storage-blob', git: 'https://github.com/chatwoot/azure-storage-ruby', branch: 'chatwoot', require: false
+gem 'azure-storage-blob', require: false
 gem 'google-cloud-storage', require: false
-gem 'image_processing'
+gem 'image_processing', '~> 1.12.2'

 ##-- gems for database --#
 gem 'groupdate'
@@ -62,26 +62,26 @@ gem 'activerecord-import'
 gem 'dotenv-rails'
 gem 'foreman'
 gem 'puma'
-gem 'webpacker'
+gem 'webpacker', '~> 5.4', '>= 5.4.3'
 # metrics on heroku
 gem 'barnes'

 ##--- gems for authentication & authorization ---##
 gem 'devise'
-gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
+gem 'devise-secure_password', '~> 2.0', git: 'https://github.com/chatwoot/devise-secure_password'
 gem 'devise_token_auth'
 # authorization
 gem 'jwt'
 gem 'pundit'
 # super admin
 gem 'administrate'
-gem 'administrate-field-active_storage'

 ##--- gems for pubsub service ---##
 # https://karolgalanciak.com/blog/2019/11/30/from-activerecord-callbacks-to-publish-slash-subscribe-pattern-and-event-driven-design/
 gem 'wisper', '2.0.0'

 ##--- gems for channels ---##
+# TODO: bump up gem to 2.0
 gem 'facebook-messenger'
 gem 'line-bot-api'
 gem 'twilio-ruby', '~> 5.66'
@@ -91,14 +91,9 @@ gem 'twitty', '~> 0.1.5'
 # facebook client
 gem 'koala'
 # slack client
-gem 'slack-ruby-client', '~> 2.0.0'
+gem 'slack-ruby-client'
 # for dialogflow integrations
-gem 'google-cloud-dialogflow-v2'
-gem 'grpc'
-# Translate integrations
-# 'google-cloud-translate' gem depends on faraday 2.0 version
-# this dependency breaks the slack-ruby-client gem
-gem 'google-cloud-translate-v3'
+gem 'google-cloud-dialogflow'

 ##-- apm and error monitoring ---#
 # loaded only when environment variables are set.
@@ -113,9 +108,9 @@ gem 'sentry-ruby', require: false
 gem 'sentry-sidekiq', require: false

 ##-- background job processing --##
-gem 'sidekiq'
+gem 'sidekiq', '~> 6.4.2'
 # We want cron jobs
-gem 'sidekiq-cron'
+gem 'sidekiq-cron', '~> 1.6', '>= 1.6.0'

 ##-- Push notification service --##
 gem 'fcm'
@@ -134,10 +129,7 @@ gem 'procore-sift'

 # parse email
 gem 'email_reply_trimmer'
-
-# TODO: we might have to fork this gem since 0.3.1 has hard depency on nokogir 1.10.
-# and this gem hasn't been updated for a while.
-gem 'html2text', git: 'https://github.com/chatwoot/html2text_ruby', branch: 'chatwoot'
+gem 'html2text'

 # to calculate working hours
 gem 'working_hours'
@@ -152,13 +144,18 @@ gem 'stripe'
 ## to populate db with sample data
 gem 'faker'

+# Can remove this in rails 7
+gem 'net-imap', require: false
+gem 'net-pop', require: false
+gem 'net-smtp', require: false
+
 # Include logrange conditionally in intializer using env variable
 gem 'lograge', '~> 0.12.0', require: false

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

-gem 'audited', '~> 5.3'
+gem 'audited', '~> 5.2'

 # need for google auth
 gem 'omniauth'
@@ -177,7 +174,6 @@ group :development do
  gem 'annotate'
  gem 'bullet'
  gem 'letter_opener'
-  gem 'scss_lint', require: false
  gem 'web-console'

  # used in swagger build
@@ -193,7 +189,7 @@ end

 group :test do
  # Cypress in rails.
-  gem 'cypress-on-rails'
+  gem 'cypress-on-rails', '~> 1.13', '>= 1.13.1'
  # fast cleaning of database
  gem 'database_cleaner'
  # mock http calls
@@ -215,7 +211,7 @@ group :development, :test do
  gem 'mock_redis'
  gem 'pry-rails'
  gem 'rspec_junit_formatter'
-  gem 'rspec-rails'
+  gem 'rspec-rails', '~> 5.0.3'
  gem 'rubocop', require: false
  gem 'rubocop-performance', require: false
  gem 'rubocop-rails', require: false
@@ -1,38 +0,0 @@
-# Variables
-APP_NAME := chatwoot
-RAILS_ENV ?= development
-
-# Targets
-setup:
-	gem install bundler
-	bundle install
-	yarn install
-
-db_create:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:create
-
-db_migrate:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:migrate
-
-db_seed:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:seed
-
-db:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:chatwoot_prepare
-
-console:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails console
-
-server:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails server -b 0.0.0.0 -p 3000
-
-burn:
-	bundle && yarn
-
-run:
-	overmind start -f Procfile.dev
-
-docker: 
-	docker build -t $(APP_NAME) -f ./docker/Dockerfile .
-
-.PHONY: setup db_create db_migrate db_seed db console server burn docker run
@@ -1 +1 @@
-2.17.0
+2.2.0
@@ -1 +1 @@
-2.3.0
+2.1.0
@@ -1,6 +1,5 @@
 //= link_tree ../images
 //= link administrate/application.css
 //= link administrate/application.js
-//= link administrate-field-active_storage/application.css
 //= link dashboardChart.js
 //= link secretField.js
@@ -63,43 +63,28 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
  end

  def conversation
-    @conversation ||= Conversation.where(conversation_params).find_by(
-      "additional_attributes ->> 'type' = 'instagram_direct_message'"
-    ) || build_conversation
+    @conversation ||= Conversation.find_by(conversation_params) || build_conversation
  end

  def message_content
    @messaging[:message][:text]
  end

-  def story_reply_attributes
-    message[:reply_to][:story] if message[:reply_to].present? && message[:reply_to][:story].present?
-  end
-
  def build_message
    return if @outgoing_echo && already_sent_from_chatwoot?
    return if message_content.blank? && all_unsupported_files?

    @message = conversation.messages.create!(message_params)
-    save_story_id

    attachments.each do |attachment|
      process_attachment(attachment)
    end
  end

-  def save_story_id
-    return if story_reply_attributes.blank?
-
-    @message.save_story_info(story_reply_attributes)
-  end
-
  def build_conversation
    @contact_inbox ||= contact.contact_inboxes.find_by!(source_id: message_source_id)
-
    Conversation.create!(conversation_params.merge(
-                           contact_inbox_id: @contact_inbox.id,
-                           additional_attributes: { type: 'instagram_direct_message' }
+                           contact_inbox_id: @contact_inbox.id
                         ))
  end

@@ -107,7 +92,10 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
    {
      account_id: @inbox.account_id,
      inbox_id: @inbox.id,
-      contact_id: contact.id
+      contact_id: contact.id,
+      additional_attributes: {
+        type: 'instagram_direct_message'
+      }
    }
  end

@@ -96,9 +96,10 @@ class V2::ReportBuilder

  def conversations
    @open_conversations = scope.conversations.where(account_id: @account.id).open
+    first_response_count = @account.reporting_events.where(name: 'first_response', conversation_id: @open_conversations.pluck('id')).count
    metric = {
      open: @open_conversations.count,
-      unattended: @open_conversations.unattended.count
+      unattended: @open_conversations.count - first_response_count
    }
    metric[:unassigned] = @open_conversations.unassigned.count if params[:type].equal?(:account)
    metric
@@ -16,9 +16,6 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
                end
  end

-  def show; end
-  def edit; end
-
  def create
    @article = @portal.articles.create!(article_params)
    @article.associate_root_article(article_params[:associated_article_id])
@@ -26,6 +23,10 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
    render json: { error: @article.errors.messages }, status: :unprocessable_entity and return unless @article.valid?
  end

+  def edit; end
+
+  def show; end
+
  def update
    @article.update!(article_params) if params[:article].present?
    render json: { error: @article.errors.messages }, status: :unprocessable_entity and return unless @article.valid?
@@ -6,8 +6,6 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
    @automation_rules = Current.account.automation_rules
  end

-  def show; end
-
  def create
    @automation_rule = Current.account.automation_rules.new(automation_rules_permit)
    @automation_rule.actions = params[:actions]
@@ -30,6 +28,8 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
    render json: { blob_key: file_blob.key, blob_id: file_blob.id }
  end

+  def show; end
+
  def update
    ActiveRecord::Base.transaction do
      automation_rule_update
@@ -6,21 +6,21 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
    @campaigns = Current.account.campaigns
  end

-  def show; end
-
  def create
    @campaign = Current.account.campaigns.create!(campaign_params)
  end

-  def update
-    @campaign.update!(campaign_params)
-  end
-
  def destroy
    @campaign.destroy!
    head :ok
  end

+  def show; end
+
+  def update
+    @campaign.update!(campaign_params)
+  end
+
  private

  def campaign
@@ -9,8 +9,6 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
    @categories = @portal.categories.search(params)
  end

-  def show; end
-
  def create
    @category = @portal.categories.create!(category_params)
    @category.related_categories << related_categories_records
@@ -19,6 +17,8 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
    @category.save!
  end

+  def show; end
+
  def update
    @category.update!(category_params)
    @category.related_categories = related_categories_records if related_categories_records.any?
@@ -1,13 +1,11 @@
 class Api::V1::Accounts::Contacts::ContactInboxesController < Api::V1::Accounts::Contacts::BaseController
-  include HmacConcern
  before_action :ensure_inbox, only: [:create]

  def create
    @contact_inbox = ContactInboxBuilder.new(
      contact: @contact,
      inbox: @inbox,
-      source_id: params[:source_id],
-      hmac_verified: hmac_verified?
+      source_id: params[:source_id]
    ).perform
  end

@@ -5,21 +5,21 @@ class Api::V1::Accounts::Contacts::NotesController < Api::V1::Accounts::Contacts
    @notes = @contact.notes.latest.includes(:user)
  end

-  def show; end
-
  def create
    @note = @contact.notes.create!(note_params)
  end

-  def update
-    @note.update(note_params)
-  end
-
  def destroy
    @note.destroy!
    head :ok
  end

+  def show; end
+
+  def update
+    @note.update(note_params)
+  end
+
  private

  def note
@@ -42,12 +42,6 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
    head :ok
  end

-  def export
-    column_names = params['column_names']
-    Account::ContactsExportJob.perform_later(Current.account.id, column_names)
-    head :ok, message: I18n.t('errors.contacts.export.success')
-  end
-
  # returns online contacts
  def active
    contacts = Current.account.contacts.where(id: ::OnlineStatusTracker
@@ -1,7 +1,6 @@
 class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseController
  include Events::Types
  include DateRangeHelper
-  include HmacConcern

  before_action :conversation, except: [:index, :meta, :search, :create, :filter]
  before_action :inbox, :contact, :contact_inbox, only: [:create]
@@ -23,12 +22,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    @conversations_count = result[:count]
  end

-  def attachments
-    @attachments = @conversation.attachments
-  end
-
-  def show; end
-
  def create
    ActiveRecord::Base.transaction do
      @conversation = ConversationBuilder.new(params: params, contact_inbox: @contact_inbox).perform
@@ -36,6 +29,8 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    end
  end

+  def show; end
+
  def filter
    result = ::Conversations::FilterService.new(params.permit!, current_user).perform
    @conversations = result[:conversations]
@@ -69,14 +64,13 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    assign_conversation if @conversation.status == 'open' && Current.user.is_a?(User) && Current.user&.agent?
  end

-  def toggle_priority
-    @conversation.toggle_priority(params[:priority])
-    head :ok
-  end
-
  def toggle_typing_status
-    typing_status_manager = ::Conversations::TypingStatusManager.new(@conversation, current_user, params)
-    typing_status_manager.toggle_typing_status
+    case params[:typing_status]
+    when 'on'
+      trigger_typing_event(CONVERSATION_TYPING_ON, params[:is_private])
+    when 'off'
+      trigger_typing_event(CONVERSATION_TYPING_OFF, params[:is_private])
+    end
    head :ok
  end

@@ -105,6 +99,9 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
  end

  def set_conversation_status
+    # TODO: temporary fallback for the old bot status in conversation, we will remove after couple of releases
+    # commenting this out to see if there are any errors, if not we can remove this in subsequent releases
+    # status = params[:status] == 'bot' ? 'pending' : params[:status]
    @conversation.status = params[:status]
    @conversation.snoozed_until = parse_date_time(params[:snoozed_until].to_s) if params[:snoozed_until]
  end
@@ -114,6 +111,11 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    @conversation.update_assignee(@agent)
  end

+  def trigger_typing_event(event, is_private)
+    user = current_user.presence || @resource
+    Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: user, is_private: is_private)
+  end
+
  def conversation
    @conversation ||= Current.account.conversations.find_by!(display_id: params[:id])
    authorize @conversation.inbox, :show?
@@ -150,8 +152,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    ContactInboxBuilder.new(
      contact: @contact,
      inbox: @inbox,
-      source_id: params[:source_id],
-      hmac_verified: hmac_verified?
+      source_id: params[:source_id]
    ).perform
  end

@@ -34,12 +34,9 @@ class Api::V1::Accounts::CsatSurveyResponsesController < Api::V1::Accounts::Base
  end

  def set_csat_survey_responses
-    base_query = Current.account.csat_survey_responses.includes([:conversation, :assigned_agent, :contact])
-    @csat_survey_responses = filtrate(base_query).filter_by_created_at(range)
-                                                 .filter_by_assigned_agent_id(params[:user_ids])
-                                                 .filter_by_inbox_id(params[:inbox_id])
-                                                 .filter_by_team_id(params[:team_id])
-                                                 .filter_by_rating(params[:rating])
+    @csat_survey_responses = filtrate(
+      Current.account.csat_survey_responses.includes([:conversation, :assigned_agent, :contact])
+    ).filter_by_created_at(range).filter_by_assigned_agent_id(params[:user_ids])
  end

  def set_current_page_surveys
@@ -11,7 +11,6 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
    @custom_filter = current_user.custom_filters.create!(
      permitted_payload.merge(account_id: Current.account.id)
    )
-    render json: { error: @custom_filter.errors.messages }, status: :unprocessable_entity and return unless @custom_filter.valid?
  end

  def update
@@ -2,11 +2,6 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
  before_action :fetch_inbox
  before_action :current_agents_ids, only: [:create, :update]

-  def show
-    authorize @inbox, :show?
-    fetch_updated_agents
-  end
-
  def create
    authorize @inbox, :create?
    ActiveRecord::Base.transaction do
@@ -15,6 +10,11 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
    fetch_updated_agents
  end

+  def show
+    authorize @inbox, :show?
+    fetch_updated_agents
+  end
+
  def update
    authorize @inbox, :update?
    update_agents_list
@@ -44,7 +44,26 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  def update
    @inbox.update!(permitted_params.except(:channel))
    update_inbox_working_hours
-    update_channel if channel_update_required?
+    channel_attributes = get_channel_attributes(@inbox.channel_type)
+
+    # Inbox update doesn't necessarily need channel attributes
+    return if permitted_params(channel_attributes)[:channel].blank?
+
+    if @inbox.inbox_type == 'Email'
+      begin
+        validate_email_channel(channel_attributes)
+      rescue StandardError => e
+        render json: { message: e }, status: :unprocessable_entity and return
+      end
+      @inbox.channel.reauthorized!
+    end
+
+    @inbox.channel.update!(permitted_params(channel_attributes)[:channel])
+    update_channel_feature_flags
+  end
+
+  def update_inbox_working_hours
+    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
  end

  def agent_bot
@@ -84,35 +103,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
    account_channels_method.create!(permitted_params(channel_type_from_params::EDITABLE_ATTRS)[:channel].except(:type))
  end

-  def update_inbox_working_hours
-    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
-  end
-
-  def update_channel
-    channel_attributes = get_channel_attributes(@inbox.channel_type)
-    return if permitted_params(channel_attributes)[:channel].blank?
-
-    validate_and_update_email_channel(channel_attributes) if @inbox.inbox_type == 'Email'
-
-    reauthorize_and_update_channel(channel_attributes)
-    update_channel_feature_flags
-  end
-
-  def channel_update_required?
-    permitted_params(get_channel_attributes(@inbox.channel_type))[:channel].present?
-  end
-
-  def validate_and_update_email_channel(channel_attributes)
-    validate_email_channel(channel_attributes)
-  rescue StandardError => e
-    render json: { message: e }, status: :unprocessable_entity and return
-  end
-
-  def reauthorize_and_update_channel(channel_attributes)
-    @inbox.channel.reauthorized! if @inbox.channel.respond_to?(:reauthorized!)
-    @inbox.channel.update!(permitted_params(channel_attributes)[:channel])
-  end
-
  def update_channel_feature_flags
    return unless @inbox.web_widget?
    return unless permitted_params(Channel::WebWidget::EDITABLE_ATTRS)[:channel].key? :selected_feature_flags
@@ -124,13 +114,10 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  def inbox_attributes
    [:name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled,
     :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone, :allow_messages_after_resolved,
-     :lock_to_single_conversation, :portal_id]
+     :lock_to_single_conversation]
  end

  def permitted_params(channel_attributes = [])
-    # We will remove this line after fixing https://linear.app/chatwoot/issue/CW-1567/null-value-passed-as-null-string-to-backend
-    params.each { |k, v| params[k] = params[k] == 'null' ? nil : v }
-
    params.permit(
      *inbox_attributes,
      channel: [:type, *channel_attributes]
@@ -1,5 +1,5 @@
 class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::BaseController
-  before_action :fetch_hook, except: [:create]
+  before_action :fetch_hook, only: [:update, :destroy]
  before_action :check_authorization

  def create
@@ -10,10 +10,6 @@ class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::Base
    @hook.update!(permitted_params.slice(:status, :settings))
  end

-  def process_event
-    render json: { message: @hook.process_event(params[:event]) }
-  end
-
  def destroy
    @hook.destroy!
    head :ok
@@ -6,10 +6,6 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
    @macros = Macro.with_visibility(current_user, params)
  end

-  def show
-    head :not_found if @macro.nil?
-  end
-
  def create
    @macro = Current.account.macros.new(macros_with_user.merge(created_by_id: current_user.id))
    @macro.set_visibility(current_user, permitted_params)
@@ -22,16 +18,8 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
    @macro
  end

-  def update
-    ActiveRecord::Base.transaction do
-      @macro.update!(macros_with_user)
-      @macro.set_visibility(current_user, permitted_params)
-      process_attachments
-      @macro.save!
-    rescue StandardError => e
-      Rails.logger.error e
-      render json: { error: @macro.errors.messages }.to_json, status: :unprocessable_entity
-    end
+  def show
+    head :not_found if @macro.nil?
  end

  def destroy
@@ -49,6 +37,18 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
    render json: { blob_key: file_blob.key, blob_id: file_blob.id }
  end

+  def update
+    ActiveRecord::Base.transaction do
+      @macro.update!(macros_with_user)
+      @macro.set_visibility(current_user, permitted_params)
+      process_attachments
+      @macro.save!
+    rescue StandardError => e
+      Rails.logger.error e
+      render json: { error: @macro.errors.messages }.to_json, status: :unprocessable_entity
+    end
+  end
+
  def execute
    ::MacrosExecutionJob.perform_later(@macro, conversation_ids: params[:conversation_ids], user: Current.user)

@@ -30,7 +30,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    ActiveRecord::Base.transaction do
      @portal.update!(portal_params) if params[:portal].present?
      # @portal.custom_domain = parsed_custom_domain
-      process_attached_logo if params[:blob_id].present?
+      process_attached_logo
    rescue StandardError => e
      Rails.logger.error e
      render json: { error: @portal.errors.messages }.to_json, status: :unprocessable_entity
@@ -14,11 +14,6 @@ class Api::V1::AccountsController < Api::BaseController
              CustomExceptions::Account::UserErrors,
              with: :render_error_response

-  def show
-    @latest_chatwoot_version = ::Redis::Alfred.get(::Redis::Alfred::LATEST_CHATWOOT_VERSION)
-    render 'api/v1/accounts/show', format: :json
-  end
-
  def create
    @user, @account = AccountBuilder.new(
      account_name: account_params[:account_name],
@@ -37,10 +32,14 @@ class Api::V1::AccountsController < Api::BaseController
  end

  def cache_keys
-    expires_in 10.seconds, public: false, stale_while_revalidate: 5.minutes
    render json: { cache_keys: get_cache_keys }, status: :ok
  end

+  def show
+    @latest_chatwoot_version = ::Redis::Alfred.get(::Redis::Alfred::LATEST_CHATWOOT_VERSION)
+    render 'api/v1/accounts/show', format: :json
+  end
+
  def update
    @account.update!(account_params.slice(:name, :locale, :domain, :support_email, :auto_resolve_duration))
  end
@@ -48,8 +48,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
  def message_finder_params
    {
      filter_internal_messages: true,
-      before: permitted_params[:before],
-      after: permitted_params[:after]
+      before: permitted_params[:before]
    }
  end

@@ -63,7 +62,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])
+    params.permit(:id, :before, :website_token, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id])
  end

  def set_message
@@ -72,16 +72,14 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
  def current_summary_params
    common_params.merge({
                          since: range[:current][:since],
-                          until: range[:current][:until],
-                          timezone_offset: params[:timezone_offset]
+                          until: range[:current][:until]
                        })
  end

  def previous_summary_params
    common_params.merge({
                          since: range[:previous][:since],
-                          until: range[:previous][:until],
-                          timezone_offset: params[:timezone_offset]
+                          until: range[:previous][:until]
                        })
  end

@@ -3,7 +3,7 @@ class ApiController < ApplicationController

  def index
    render json: { version: Chatwoot.config[:version],
-                   timestamp: Time.now.utc.to_fs(:db),
+                   timestamp: Time.now.utc.to_formatted_s(:db),
                   queue_services: redis_status,
                   data_services: postgres_status }
  end
@@ -1,5 +0,0 @@
-module HmacConcern
-  def hmac_verified?
-    ActiveModel::Type::Boolean.new.cast(params[:hmac_verified]).present?
-  end
-end
@@ -4,16 +4,6 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
  skip_before_action :require_no_authentication, raise: false
  skip_before_action :authenticate_user!, raise: false

-  def create
-    @user = User.find_by(email: params[:email])
-    if @user
-      @user.send_reset_password_instructions
-      build_response(I18n.t('messages.reset_password_success'), 200)
-    else
-      build_response(I18n.t('messages.reset_password_failure'), 404)
-    end
-  end
-
  def update
    # params: reset_password_token, password, password_confirmation
    original_token = params[:reset_password_token]
@@ -27,6 +17,16 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
    end
  end

+  def create
+    @user = User.find_by(email: params[:email])
+    if @user
+      @user.send_reset_password_instructions
+      build_response(I18n.t('messages.reset_password_success'), 200)
+    else
+      build_response(I18n.t('messages.reset_password_failure'), 404)
+    end
+  end
+
  private

  def reset_password_and_confirmation(recoverable)
@@ -1,4 +1,4 @@
-class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
+class DeviseOverrides::SessionsController < ::DeviseTokenAuth::SessionsController
  # Prevent session parameter from being passed
  # Unpermitted parameter: session
  wrap_parameters format: []
@@ -37,5 +37,3 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
    @resource = user if user&.valid_sso_auth_token?(params[:sso_auth_token])
  end
 end
-
-DeviseOverrides::SessionsController.prepend_mod_with('DeviseOverrides::SessionsController')
@@ -1,4 +1,4 @@
-class DeviseOverrides::TokenValidationsController < DeviseTokenAuth::TokenValidationsController
+class DeviseOverrides::TokenValidationsController < ::DeviseTokenAuth::TokenValidationsController
  def validate_token
    # @resource will have been set by set_user_by_token concern
    if @resource
@@ -1,12 +1,12 @@
 class Platform::Api::V1::AccountsController < PlatformController
-  def show; end
-
  def create
    @resource = Account.create!(account_params)
    update_resource_features
    @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
  end

+  def show; end
+
  def update
    @resource.assign_attributes(account_params)
    update_resource_features
@@ -6,14 +6,14 @@ class Platform::Api::V1::AgentBotsController < PlatformController
    @resources = @platform_app.platform_app_permissibles.where(permissible_type: 'AgentBot').all
  end

-  def show; end
-
  def create
    @resource = AgentBot.new(agent_bot_params)
    @resource.save!
    @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
  end

+  def show; end
+
  def update
    @resource.update!(agent_bot_params)
  end
@@ -5,8 +5,6 @@ class Platform::Api::V1::UsersController < PlatformController
  before_action(only: [:login]) { set_resource }
  before_action(only: [:login]) { validate_platform_app_permissible }

-  def show; end
-
  def create
    @resource = (User.find_by(email: user_params[:email]) || User.new(user_params))
    @resource.skip_confirmation!
@@ -18,6 +16,8 @@ class Platform::Api::V1::UsersController < PlatformController
    render json: { url: @resource.generate_sso_link }
  end

+  def show; end
+
  def update
    @resource.assign_attributes(user_update_params)

@@ -2,8 +2,6 @@ class Public::Api::V1::Inboxes::ContactsController < Public::Api::V1::InboxesCon
  before_action :contact_inbox, except: [:create]
  before_action :process_hmac

-  def show; end
-
  def create
    source_id = params[:source_id] || SecureRandom.uuid
    @contact_inbox = ::ContactInboxWithContactBuilder.new(
@@ -13,6 +11,8 @@ class Public::Api::V1::Inboxes::ContactsController < Public::Api::V1::InboxesCon
    ).perform
  end

+  def show; end
+
  def update
    contact_identify_action = ContactIdentifyAction.new(
      contact: @contact_inbox.contact,
@@ -1,7 +1,7 @@
 class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::BaseController
  before_action :ensure_custom_domain_request, only: [:show, :index]
  before_action :portal
-  before_action :set_category, except: [:index, :show]
+  before_action :set_category, except: [:index]
  before_action :set_article, only: [:show]
  layout 'portal'

@@ -16,7 +16,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  private

  def set_article
-    @article = @portal.articles.find_by(slug: permitted_params[:article_slug])
+    @article = @category.articles.find(permitted_params[:id])
    @article.increment_view_count
    @parsed_content = render_article_content(@article.content)
  end
@@ -39,10 +39,12 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  end

  def permitted_params
-    params.permit(:slug, :category_slug, :locale, :id, :article_slug)
+    params.permit(:slug, :category_slug, :locale, :id)
  end

  def render_article_content(content)
-    ChatwootMarkdownRenderer.new(content).render_article
+    # rubocop:disable Rails/OutputSafety
+    CommonMarker.render_html(content).html_safe
+    # rubocop:enable Rails/OutputSafety
  end
 end
@@ -5,9 +5,6 @@ class Public::Api::V1::Portals::BaseController < PublicController

  def set_locale(&)
    switch_locale_with_portal(&) if params[:locale].present?
-    switch_locale_with_article(&) if params[:article_slug].present?
-
-    yield
  end

  def switch_locale_with_portal(&)
@@ -22,16 +19,4 @@ class Public::Api::V1::Portals::BaseController < PublicController

    I18n.with_locale(@locale, &)
  end
-
-  def switch_locale_with_article(&)
-    article = Article.find_by(slug: params[:article_slug])
-
-    @locale = if article.category.present?
-                article.category.locale
-              else
-                'en'
-              end
-
-    I18n.with_locale(@locale, &)
-  end
 end
@@ -45,24 +45,13 @@ class SuperAdmin::AccountsController < SuperAdmin::ApplicationController

  def seed
    Internal::SeedAccountJob.perform_later(requested_resource)
-    # rubocop:disable Rails/I18nLocaleTexts
    redirect_back(fallback_location: [namespace, requested_resource], notice: 'Account seeding triggered')
-    # rubocop:enable Rails/I18nLocaleTexts
-  end
-
-  def reset_cache
-    requested_resource.reset_cache_keys
-    # rubocop:disable Rails/I18nLocaleTexts
-    redirect_back(fallback_location: [namespace, requested_resource], notice: 'Cache keys cleared')
-    # rubocop:enable Rails/I18nLocaleTexts
  end

  def destroy
    account = Account.find(params[:id])

    DeleteObjectJob.perform_later(account) if account.present?
-    # rubocop:disable Rails/I18nLocaleTexts
    redirect_back(fallback_location: [namespace, requested_resource], notice: 'Account deletion is in progress.')
-    # rubocop:enable Rails/I18nLocaleTexts
  end
 end
@@ -41,14 +41,4 @@ class SuperAdmin::AgentBotsController < SuperAdmin::ApplicationController

  # See https://administrate-prototype.herokuapp.com/customizing_controller_actions
  # for more information
-
-  def destroy_avatar
-    avatar = requested_resource.avatar
-    avatar.purge
-    redirect_back(fallback_location: super_admin_agent_bots_path)
-  end
-
-  def scoped_resource
-    resource_class.with_attached_avatar
-  end
 end
@@ -5,17 +5,6 @@ class SuperAdmin::InstanceStatusesController < SuperAdmin::ApplicationController
    sha
    postgres_status
    redis_metrics
-    chatwoot_edition
-  end
-
-  def chatwoot_edition
-    @metrics['Chatwoot edition'] = if ChatwootApp.enterprise?
-                                     'Enterprise'
-                                   elsif ChatwootApp.custom?
-                                     'Custom'
-                                   else
-                                     'Community'
-                                   end
  end

  def chatwoot_version
@@ -45,17 +45,6 @@ class SuperAdmin::UsersController < SuperAdmin::ApplicationController
  # empty values into nil values. It uses other APIs such as `resource_class`
  # and `dashboard`:
  #
-
-  def destroy_avatar
-    avatar = requested_resource.avatar
-    avatar.purge
-    redirect_back(fallback_location: super_admin_users_path)
-  end
-
-  def scoped_resource
-    resource_class.with_attached_avatar
-  end
-
  def resource_params
    permitted_params = super
    permitted_params.delete(:password) if permitted_params[:password].blank?
@@ -1,7 +1,7 @@
 class SwaggerController < ApplicationController
  def respond
    if Rails.env.development? || Rails.env.test?
-      render inline: Rails.root.join('swagger', derived_path).read
+      render inline: File.read(Rails.root.join('swagger', derived_path))
    else
      head :not_found
    end
@@ -41,7 +41,7 @@ class WidgetsController < ActionController::Base
      source_id: @auth_token_params[:source_id]
    )

-    @contact = @contact_inbox&.contact
+    @contact = @contact_inbox ? @contact_inbox.contact : nil
  end

  def build_contact
@@ -10,11 +10,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
  ATTRIBUTE_TYPES = {
    access_token: Field::HasOne,
    avatar_url: AvatarField,
-    avatar: Field::ActiveStorage.with_options(
-      destroy_url: proc do |_namespace, _resource, attachment|
-        [:avatar_super_admin_agent_bot, { attachment_id: attachment.id }]
-      end
-    ),
    id: Field::Number,
    name: Field::String,
    account: Field::BelongsTo.with_options(searchable: true, searchable_field: 'name', order: 'id DESC'),
@@ -41,7 +36,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
  # an array of attributes that will be displayed on the model's show page.
  SHOW_PAGE_ATTRIBUTES = %i[
    id
-    avatar_url
    account
    name
    description
@@ -53,7 +47,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
  # on the model's form (`new` and `edit`) pages.
  FORM_ATTRIBUTES = %i[
    name
-    avatar
    account
    description
    outgoing_url
@@ -11,11 +11,6 @@ class UserDashboard < Administrate::BaseDashboard
    account_users: Field::HasMany,
    id: Field::Number,
    avatar_url: AvatarField,
-    avatar: Field::ActiveStorage.with_options(
-      destroy_url: proc do |_namespace, _resource, attachment|
-        [:avatar_super_admin_user, { attachment_id: attachment.id }]
-      end
-    ),
    provider: Field::String,
    uid: Field::String,
    password: Field::Password,
@@ -74,7 +69,6 @@ class UserDashboard < Administrate::BaseDashboard
  # on the model's form (`new` and `edit`) pages.
  FORM_ATTRIBUTES = %i[
    name
-    avatar
    display_name
    email
    password
@@ -1,5 +1,2 @@
 class AccountDrop < BaseDrop
-  def name
-    @obj.try(:name)
-  end
 end
@@ -5,8 +5,7 @@ class ConversationFinder
  SORT_OPTIONS = {
    latest: 'latest',
    sort_on_created_at: 'sort_on_created_at',
-    last_user_message_at: 'last_user_message_at',
-    sort_on_priority: 'sort_on_priority'
+    last_user_message_at: 'last_user_message_at'
  }.with_indifferent_access

  # assumptions
@@ -54,10 +53,9 @@ class ConversationFinder

    find_all_conversations
    filter_by_status unless params[:q]
-    filter_by_team
-    filter_by_labels
-    filter_by_query
-    filter_by_source_id
+    filter_by_team if @team
+    filter_by_labels if params[:labels]
+    filter_by_query if params[:q]
  end

  def set_inboxes
@@ -102,14 +100,12 @@ class ConversationFinder
    when 'participating'
      @conversations = current_user.participating_conversations.where(account_id: current_account.id)
    when 'unattended'
-      @conversations = @conversations.unattended
+      @conversations = @conversations.where(first_reply_created_at: nil)
    end
    @conversations
  end

  def filter_by_query
-    return unless params[:q]
-
    allowed_message_types = [Message.message_types[:incoming], Message.message_types[:outgoing]]
    @conversations = conversations.joins(:messages).where('messages.content ILIKE :search', search: "%#{params[:q]}%")
                                  .where(messages: { message_type: allowed_message_types }).includes(:messages)
@@ -124,24 +120,13 @@ class ConversationFinder
  end

  def filter_by_team
-    return unless @team
-
    @conversations = @conversations.where(team: @team)
  end

  def filter_by_labels
-    return unless params[:labels]
-
    @conversations = @conversations.tagged_with(params[:labels], any: true)
  end

-  def filter_by_source_id
-    return unless params[:source_id]
-
-    @conversations = @conversations.joins(:contact_inbox)
-    @conversations = @conversations.where(contact_inboxes: { source_id: params[:source_id] })
-  end
-
  def set_count_for_all_conversations
    [
      @conversations.assigned_to(current_user).count,
@@ -155,9 +140,9 @@ class ConversationFinder
  end

  def conversations
-    @conversations = @conversations.includes(:taggings, :inbox,
-                                             { assignee: [{ account_users: [:account] }, { avatar_attachment: [:blob] }] },
-                                             { contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox, :messages)
+    @conversations = @conversations.includes(
+      :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox
+    )
    sort_by = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['latest']
    @conversations.send(sort_by).page(current_page)
  end
@@ -7,7 +7,7 @@ module DateRangeHelper
  def range
    return if params[:since].blank? || params[:until].blank?

-    parse_date_time(params[:since])...parse_date_time(params[:until])
+    parse_date_time(params[:since])..parse_date_time(params[:until])
  end

  def parse_date_time(datetime)
@@ -10,26 +10,4 @@ module EmailHelper
  def normalize_email_with_plus_addressing(email)
    "#{email.split('@').first.split('+').first}@#{email.split('@').last}".downcase
  end
-
-  def parse_email_variables(conversation, email)
-    case email
-    when modified_liquid_content(email)
-      template = Liquid::Template.parse(modified_liquid_content(email))
-      template.render(message_drops(conversation))
-    when URI::MailTo::EMAIL_REGEXP
-      email
-    end
-  end
-
-  def modified_liquid_content(email)
-    # This regex is used to match the code blocks in the content
-    # We don't want to process liquid in code blocks
-    email.gsub(/`(.*?)`/m, '{% raw %}`\\1`{% endraw %}')
-  end
-
-  def message_drops(conversation)
-    {
-      'contact' => ContactDrop.new(conversation.contact)
-    }
-  end
 end
@@ -7,6 +7,8 @@ module MessageFormatHelper
  end

  def render_message_content(message_content)
-    ChatwootMarkdownRenderer.new(message_content).render_message
+    # rubocop:disable Rails/OutputSafety
+    CommonMarker.render_html(message_content).html_safe
+    # rubocop:enable Rails/OutputSafety
  end
 end
@@ -29,9 +29,7 @@ module ReportHelper
  end

  def resolutions_count
-    object_scope = scope.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_resolved,
-                                                                                              conversations: { status: :resolved }).distinct
-    (get_grouped_values object_scope).count
+    (get_grouped_values scope.conversations.where(account_id: account.id).resolved).count
  end

  def avg_first_response_time
@@ -115,6 +115,11 @@ export default {

 <style lang="scss">
@import './assets/scss/app';
+.update-banner {
+  height: var(--space-larger);
+  align-items: center;
+  font-size: var(--font-size-small) !important;
+}
 </style>

 <style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
@@ -75,10 +75,6 @@ class ContactAPI extends ApiClient {
  destroyAvatar(contactId) {
    return axios.delete(`${this.url}/${contactId}/avatar`);
  }
-
-  exportContacts() {
-    return axios.get(`${this.url}/export`);
-  }
 }

 export default new ContactAPI();
@@ -6,7 +6,7 @@ class CSATReportsAPI extends ApiClient {
    super('csat_survey_responses', { accountScoped: true });
  }

-  get({ page, from, to, user_ids, inbox_id, team_id, rating } = {}) {
+  get({ page, from, to, user_ids } = {}) {
    return axios.get(this.url, {
      params: {
        page,
@@ -14,31 +14,24 @@ class CSATReportsAPI extends ApiClient {
        until: to,
        sort: '-created_at',
        user_ids,
-        inbox_id,
-        team_id,
-        rating,
      },
    });
  }

-  download({ from, to, user_ids, inbox_id, team_id, rating } = {}) {
+  download({ from, to, user_ids } = {}) {
    return axios.get(`${this.url}/download`, {
      params: {
        since: from,
        until: to,
        sort: '-created_at',
        user_ids,
-        inbox_id,
-        team_id,
-        rating,
      },
    });
  }

-  getMetrics({ from, to, user_ids, inbox_id, team_id, rating } = {}) {
-    // no ratings for metrics
+  getMetrics({ from, to, user_ids } = {}) {
    return axios.get(`${this.url}/metrics`, {
-      params: { since: from, until: to, user_ids, inbox_id, team_id, rating },
+      params: { since: from, until: to, user_ids },
    });
  }
 }
@@ -14,7 +14,6 @@ class ConversationApi extends ApiClient {
    labels,
    teamId,
    conversationType,
-    sortBy,
  }) {
    return axios.get(this.url, {
      params: {
@@ -25,7 +24,6 @@ class ConversationApi extends ApiClient {
        page,
        labels,
        conversation_type: conversationType,
-        sort_by: sortBy,
      },
    });
  }
@@ -54,12 +52,6 @@ class ConversationApi extends ApiClient {
    });
  }

-  togglePriority({ conversationId, priority }) {
-    return axios.post(`${this.url}/${conversationId}/toggle_priority`, {
-      priority,
-    });
-  }
-
  assignAgent({ conversationId, agentId }) {
    return axios.post(
      `${this.url}/${conversationId}/assignments?assignee_id=${agentId}`,
@@ -127,10 +119,6 @@ class ConversationApi extends ApiClient {
      user_ids: userIds,
    });
  }
-
-  getAllAttachments(conversationId) {
-    return axios.get(`${this.url}/${conversationId}/attachments`);
-  }
 }

 export default new ConversationApi();
@@ -1,31 +0,0 @@
-/* global axios */
-
-import ApiClient from '../ApiClient';
-
-class OpenAIAPI extends ApiClient {
-  constructor() {
-    super('integrations', { accountScoped: true });
-  }
-
-  processEvent({ type = 'rephrase', content, tone, conversationId, hookId }) {
-    let data = {
-      tone,
-      content,
-    };
-
-    if (type === 'reply_suggestion' || type === 'summarize') {
-      data = {
-        conversation_display_id: conversationId,
-      };
-    }
-
-    return axios.post(`${this.url}/hooks/${hookId}/process_event`, {
-      event: {
-        name: type,
-        data,
-      },
-    });
-  }
-}
-
-export default new OpenAIAPI();
@@ -40,7 +40,6 @@ class ReportsAPI extends ApiClient {
        id,
        group_by: groupBy,
        business_hours: businessHours,
-        timezone_offset: getTimeOffset(),
      },
    });
  }
@@ -13,30 +13,6 @@ class SearchAPI extends ApiClient {
      },
    });
  }
-
-  contacts({ q }) {
-    return axios.get(`${this.url}/contacts`, {
-      params: {
-        q,
-      },
-    });
-  }
-
-  conversations({ q }) {
-    return axios.get(`${this.url}/conversations`, {
-      params: {
-        q,
-      },
-    });
-  }
-
-  messages({ q }) {
-    return axios.get(`${this.url}/messages`, {
-      params: {
-        q,
-      },
-    });
-  }
 }

 export default new SearchAPI();
@@ -210,12 +210,5 @@ describe('#ConversationAPI', () => {
        { params: { page: payload.page } }
      );
    });
-
-    it('#getAllAttachments', () => {
-      conversationAPI.getAllAttachments(1);
-      expect(context.axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/conversations/1/attachments'
-      );
-    });
  });
 });
@@ -42,13 +42,9 @@ describe('#Reports API', () => {
        '/api/v2/reports/summary',
        {
          params: {
-            business_hours: undefined,
-            group_by: undefined,
-            id: undefined,
            since: 1621103400,
-            timezone_offset: -0,
-            type: 'account',
            until: 1621621800,
+            type: 'account',
          },
        }
      );
@@ -5,22 +5,14 @@
 }

 .date-picker {
-  &.no-margin {
-    .mx-input {
-      margin-bottom: 0;
-    }
-  }
-
-  &:not(.auto-width) {
-    .mx-datepicker-range {
-      width: 320px;
-    }
-  }
-
  .mx-datepicker {
    width: 100%;
  }

+  .mx-datepicker-range {
+    width: 320px;
+  }
+
  .mx-input {
    border: 1px solid var(--s-200);
    border-radius: var(--border-radius-normal);
@@ -254,7 +254,7 @@ $button-sizes: (tiny: var(--font-size-micro),
  default: var(--font-size-small),
  large: var(--font-size-medium));
 $button-palette: $foundation-palette;
-$button-opacity-disabled: 0.4;
+$button-opacity-disabled: 0.25;
 $button-background-hover-lightness: -20%;
 $button-hollow-hover-lightness: -50%;
 $button-transition: background-color 0.25s ease-out,
@@ -85,7 +85,7 @@
    }
  }

-  .header-section.back-button {
+  .settings.back-button {
    direction: initial;
    margin-left: var(--space-normal);
    margin-right: var(--space-smaller);
@@ -261,12 +261,6 @@
      }
    }

-    // Basic filter dropdown
-    .basic-filter {
-      left: 0;
-      right: unset;
-    }
-
    // Card label
    .label-container {
      .label {
@@ -13,9 +13,7 @@
 }

 .multiselect {
-  &:not(.no-margin) {
-    margin-bottom: var(--space-normal);
-  }
+  margin-bottom: var(--space-normal);

  &.multiselect--disabled {
    opacity: 0.8;
@@ -23,7 +21,7 @@

  .multiselect--active {
    >.multiselect__tags {
-      border-color: var(--w-500);
+      border-color: $color-woot;
    }
  }

@@ -77,13 +75,16 @@
      }

      &.multiselect__option--selected {
-        background: var(--w-75);
+        background: var(--w-400);
+        color: var(--white);

        &.multiselect__option--highlight:hover {
-          background: var(--w-75);
+          background: var(--w-600);
+          color: var(--white);

          &::after {
            background: transparent;
+            color: var(--white);
          }

          &::after:hover {
@@ -195,7 +196,6 @@
    display: flex;
    font-size: var(--font-size-small);
    margin: 0;
-    max-height: 3.8rem;
    padding: var(--space-smaller) var(--space-micro);
  }

@@ -29,13 +29,13 @@
    }

    .modal-image {
-      max-height: 80vh;
-      max-width: 80vw;
+      max-height: 90%;
+      max-width: 90%;
    }

    .modal-video {
-      max-height: 80vh;
-      max-width: 80vw;
+      max-height: 75vh;
+      max-width: 100%;
    }

    &::before {
@@ -53,6 +53,16 @@
      width: 100%;
    }
  }
+
+  .video {
+    .modal-container {
+      width: auto;
+
+      .modal--close {
+        z-index: var(--z-index-low);
+      }
+    }
+  }
 }

 .conversations-list-wrap {
@@ -85,6 +95,10 @@
    align-items: center;
    justify-content: space-between;
    padding: 0 var(--space-normal);
+
+    .page-title {
+      margin-bottom: 0;
+    }
  }

  .content-box {
@@ -390,3 +404,4 @@
    margin-bottom: 0;
  }
 }
+
@@ -11,23 +11,15 @@
      class="chat-list__top"
      :class="{ filter__applied: hasAppliedFiltersOrActiveFolders }"
    >
-      <div class="flex-center chat-list__title">
-        <h1
-          class="page-sub-title text-truncate margin-bottom-0"
-          :title="pageTitle"
-        >
-          {{ pageTitle }}
-        </h1>
-        <span
-          v-if="!hasAppliedFiltersOrActiveFolders"
-          class="conversation--status-pill"
-        >
-          {{
-            this.$t(`CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.${activeStatus}.TEXT`)
-          }}
-        </span>
-      </div>
+      <h1 class="page-title text-truncate" :title="pageTitle">
+        {{ pageTitle }}
+      </h1>
+
      <div class="filter--actions">
+        <chat-filter
+          v-if="!hasAppliedFiltersOrActiveFolders"
+          @statusFilterChange="updateStatusType"
+        />
        <div v-if="hasAppliedFilters && !hasActiveFolders">
          <woot-button
            v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.ADD.SAVE_BUTTON')"
@@ -47,14 +39,6 @@
          />
        </div>
        <div v-if="hasActiveFolders">
-          <woot-button
-            v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.EDIT.EDIT_BUTTON')"
-            size="tiny"
-            variant="smooth"
-            color-scheme="secondary"
-            icon="edit"
-            @click="onToggleAdvanceFiltersModal"
-          />
          <woot-button
            v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.DELETE.DELETE_BUTTON')"
            size="tiny"
@@ -64,6 +48,7 @@
            @click="onClickOpenDeleteFoldersModal"
          />
        </div>
+
        <woot-button
          v-else
          v-tooltip.right="$t('FILTER.TOOLTIP_LABEL')"
@@ -73,10 +58,6 @@
          size="tiny"
          @click="onToggleAdvanceFiltersModal"
        />
-        <conversation-basic-filter
-          v-if="!hasAppliedFiltersOrActiveFolders"
-          @changeFilter="onBasicFilterChange"
-        />
      </div>
    </div>

@@ -144,7 +125,6 @@
        @update-conversation-status="toggleConversationStatus"
        @context-menu-toggle="onContextMenuToggle"
        @mark-as-unread="markAsUnread"
-        @assign-priority="assignPriority"
      />

      <div v-if="chatListLoading" class="text-center">
@@ -176,11 +156,8 @@
        v-if="showAdvancedFilters"
        :initial-filter-types="advancedFilterTypes"
        :initial-applied-filters="appliedFilter"
-        :active-folder-name="activeFolderName"
        :on-close="closeAdvanceFiltersModal"
-        :is-folder-view="hasActiveFolders"
        @applyFilter="onApplyFilter"
-        @updateFolder="onUpdateSavedFilter"
      />
    </woot-modal>
  </div>
@@ -189,8 +166,8 @@
 <script>
 import { mapGetters } from 'vuex';

+import ChatFilter from './widgets/conversation/ChatFilter';
 import ConversationAdvancedFilter from './widgets/conversation/ConversationAdvancedFilter';
-import ConversationBasicFilter from './widgets/conversation/ConversationBasicFilter';
 import ChatTypeTabs from './widgets/ChatTypeTabs';
 import ConversationCard from './widgets/conversation/ConversationCard';
 import timeMixin from '../mixins/time';
@@ -204,9 +181,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 languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
-import countries from 'shared/constants/countries';
-import { generateValuesForEditCustomViews } from 'dashboard/helper/customViewsHelper';

 import {
  hasPressedAltAndJKey,
@@ -217,17 +191,16 @@ import {
  isOnMentionsView,
  isOnUnattendedView,
 } from '../store/modules/conversations/helpers/actionHelpers';
-import { CONVERSATION_EVENTS } from '../helper/AnalyticsHelper/events';

 export default {
  components: {
    AddCustomViews,
    ChatTypeTabs,
    ConversationCard,
+    ChatFilter,
    ConversationAdvancedFilter,
    DeleteCustomViews,
    ConversationBulkActions,
-    ConversationBasicFilter,
  },
  mixins: [
    timeMixin,
@@ -270,15 +243,11 @@ export default {
    return {
      activeAssigneeTab: wootConstants.ASSIGNEE_TYPE.ME,
      activeStatus: wootConstants.STATUS_TYPE.OPEN,
-      activeSortBy: wootConstants.SORT_BY_TYPE.LATEST,
      showAdvancedFilters: false,
      advancedFilterTypes: advancedFilterTypes.map(filter => ({
        ...filter,
        attributeName: this.$t(`FILTER.ATTRIBUTES.${filter.attributeI18nKey}`),
      })),
-      // chatsOnView is to store the chats that are currently visible on the screen,
-      // which mirrors the conversationList.
-      chatsOnView: [],
      foldersQuery: {},
      showAddFoldersModal: false,
      showDeleteFoldersModal: false,
@@ -303,11 +272,6 @@ export default {
      appliedFilters: 'getAppliedConversationFilters',
      folders: 'customViews/getCustomViews',
      inboxes: 'inboxes/getInboxes',
-      agentList: 'agents/getAgents',
-      teamsList: 'teams/getTeams',
-      inboxesList: 'inboxes/getInboxes',
-      campaigns: 'campaigns/getAllCampaigns',
-      labels: 'labels/getLabels',
    }),
    hasAppliedFilters() {
      return this.appliedFilters.length !== 0;
@@ -383,40 +347,18 @@ export default {
        this.currentPageFilterKey
      );
    },
-    activeAssigneeTabCount() {
-      const { activeAssigneeTab } = this;
-      const count = this.assigneeTabItems.find(
-        item => item.key === activeAssigneeTab
-      ).count;
-      return count;
-    },
    conversationFilters() {
      return {
        inboxId: this.conversationInbox ? this.conversationInbox : undefined,
        assigneeType: this.activeAssigneeTab,
        status: this.activeStatus,
-        sortBy: this.activeSortBy,
-        page: this.conversationListPagination,
+        page: this.currentPage + 1,
        labels: this.label ? [this.label] : undefined,
        teamId: this.teamId || undefined,
        conversationType: this.conversationType || undefined,
        folders: this.hasActiveFolders ? this.savedFoldersValue : undefined,
      };
    },
-    conversationListPagination() {
-      const conversationsPerPage = 25;
-      const isNoFiltersOrFoldersAndChatListNotEmpty =
-        !this.hasAppliedFiltersOrActiveFolders && this.chatsOnView !== [];
-      const isUnderPerPage =
-        this.chatsOnView.length < conversationsPerPage &&
-        this.activeAssigneeTabCount < conversationsPerPage &&
-        this.activeAssigneeTabCount > this.chatsOnView.length;
-
-      if (isNoFiltersOrFoldersAndChatListNotEmpty && isUnderPerPage) {
-        return 1;
-      }
-      return this.currentPage + 1;
-    },
    pageTitle() {
      if (this.hasAppliedFilters) {
        return this.$t('CHAT_LIST.TAB_HEADING');
@@ -458,6 +400,7 @@ export default {
      } else {
        conversationList = [...this.chatLists];
      }
+
      return conversationList;
    },
    activeFolder() {
@@ -470,9 +413,6 @@ export default {
      }
      return undefined;
    },
-    activeFolderName() {
-      return this.activeFolder?.name;
-    },
    activeTeam() {
      if (this.teamId) {
        return this.$store.getters['teams/getTeam'](this.teamId);
@@ -505,21 +445,15 @@ export default {
      this.resetAndFetchData();
    },
    activeFolder() {
-      this.resetAndFetchData();
-    },
-    chatLists() {
-      this.chatsOnView = this.conversationList;
+      if (!this.hasAppliedFilters) {
+        this.resetAndFetchData();
+      }
    },
  },
  mounted() {
-    this.$store.dispatch('setChatStatusFilter', this.activeStatus);
-    this.$store.dispatch('setChatSortFilter', this.activeSortBy);
+    this.$store.dispatch('setChatFilter', this.activeStatus);
    this.resetAndFetchData();

-    if (this.hasActiveFolders) {
-      this.$store.dispatch('campaigns/get');
-    }
-
    bus.$on('fetch_conversation_stats', () => {
      this.$store.dispatch('conversationStats/get', this.conversationFilters);
    });
@@ -532,15 +466,6 @@ export default {
      this.$store.dispatch('emptyAllConversations');
      this.fetchFilteredConversations(payload);
    },
-    onUpdateSavedFilter(payload, folderName) {
-      const payloadData = {
-        ...this.activeFolder,
-        name: folderName,
-        query: filterQueryGenerator(payload),
-      };
-      this.$store.dispatch('customViews/update', payloadData);
-      this.closeAdvanceFiltersModal();
-    },
    onClickOpenAddFoldersModal() {
      this.showAddFoldersModal = true;
    },
@@ -554,70 +479,15 @@ export default {
      this.showDeleteFoldersModal = false;
    },
    onToggleAdvanceFiltersModal() {
-      if (!this.hasAppliedFilters && !this.hasActiveFolders) {
+      if (!this.hasAppliedFilters) {
        this.initializeExistingFilterToModal();
      }
-      if (this.hasActiveFolders) {
-        this.initializeFolderToFilterModal(this.activeFolder);
-      }
      this.showAdvancedFilters = true;
    },
    closeAdvanceFiltersModal() {
      this.showAdvancedFilters = false;
      this.appliedFilter = [];
    },
-    setParamsForEditFolderModal() {
-      // Here we are setting the params for edit folder modal to show the existing values.
-
-      // For agent, team, inboxes,and campaigns we get only the id's from the query.
-      // So we are mapping the id's to the actual values.
-
-      // For labels we get the name of the label from the query.
-      // If we delete the label from the label list then we will not be able to show the label name.
-
-      // For custom attributes we get only attribute key.
-      // So we are mapping it to find the input type of the attribute to show in the edit folder modal.
-      const params = {
-        agents: this.agentList,
-        teams: this.teamsList,
-        inboxes: this.inboxesList,
-        labels: this.labels,
-        campaigns: this.campaigns,
-        languages: languages,
-        countries: countries,
-        filterTypes: advancedFilterTypes,
-        allCustomAttributes: this.$store.getters[
-          'attributes/getAttributesByModel'
-        ]('conversation_attribute'),
-      };
-      return params;
-    },
-    initializeFolderToFilterModal(activeFolder) {
-      // Here we are setting the params for edit folder modal.
-      //  To show the existing values. when we click on edit folder button.
-
-      // Here we get the query from the active folder.
-      // And we are mapping the query to the actual values.
-      // To show in the edit folder modal by the help of generateValuesForEditCustomViews helper.
-      const query = activeFolder?.query?.payload;
-      if (!Array.isArray(query)) return;
-
-      this.appliedFilter.push(
-        ...query.map(filter => ({
-          attribute_key: filter.attribute_key,
-          attribute_model: filter.attribute_model,
-          filter_operator: filter.filter_operator,
-          values: Array.isArray(filter.values)
-            ? generateValuesForEditCustomViews(
-                filter,
-                this.setParamsForEditFolderModal()
-              )
-            : [],
-          query_operator: filter.query_operator,
-          custom_attribute_type: filter.custom_attribute_type,
-        }))
-      );
-    },
    getKeyboardListenerParams() {
      const allConversations = this.$refs.activeConversation.querySelectorAll(
        'div.conversations-list div.conversation'
@@ -663,7 +533,6 @@ export default {
      }
    },
    resetAndFetchData() {
-      this.appliedFilter = [];
      this.resetBulkActions();
      this.$store.dispatch('conversationPage/reset');
      this.$store.dispatch('emptyAllConversations');
@@ -676,6 +545,7 @@ export default {
        return;
      }
      this.fetchConversations();
+      this.appliedFilter = [];
    },
    fetchConversations() {
      this.$store
@@ -727,13 +597,11 @@ export default {
      this.selectedConversations = [];
      this.selectedInboxes = [];
    },
-    onBasicFilterChange(value, type) {
-      if (type === 'status') {
-        this.activeStatus = value;
-      } else {
-        this.activeSortBy = value;
+    updateStatusType(index) {
+      if (this.activeStatus !== index) {
+        this.activeStatus = index;
+        this.resetAndFetchData();
      }
-      this.resetAndFetchData();
    },
    openLastSavedItemInFolder() {
      const lastItemOfFolder = this.folders[this.folders.length - 1];
@@ -802,26 +670,6 @@ export default {
        this.showAlert(this.$t('BULK_ACTION.ASSIGN_FAILED'));
      }
    },
-    async assignPriority(priority, conversationId = null) {
-      this.$store.dispatch('setCurrentChatPriority', {
-        priority,
-        conversationId,
-      });
-      this.$store
-        .dispatch('assignPriority', { conversationId, priority })
-        .then(() => {
-          this.$track(CONVERSATION_EVENTS.CHANGE_PRIORITY, {
-            newValue: priority,
-            from: 'Context menu',
-          });
-          this.showAlert(
-            this.$t('CONVERSATION.PRIORITY.CHANGE_PRIORITY.SUCCESSFUL', {
-              priority,
-              conversationId,
-            })
-          );
-        });
-    },
    async markAsUnread(conversationId) {
      try {
        await this.$store.dispatch('markMessagesUnread', {
@@ -982,15 +830,11 @@ export default {
  &.list--full-width {
    flex-basis: 100%;
  }
-
-  .page-sub-title {
-    font-size: var(--font-size-two);
-  }
 }
 .filter--actions {
  display: flex;
  align-items: center;
-  gap: var(--space-smaller);
+  gap: var(--space-micro);
 }

 .filter__applied {
@@ -1007,19 +851,4 @@ export default {
    }
  }
 }
-
-.conversation--status-pill {
-  background: var(--color-background);
-  border-radius: var(--border-radius-small);
-  color: var(--color-medium-gray);
-  font-size: var(--font-size-micro);
-  font-weight: var(--font-weight-medium);
-  margin: var(--space-micro) var(--space-small) 0;
-  padding: var(--space-smaller);
-  text-transform: capitalize;
-}
-
-.chat-list__title {
-  max-width: 85%;
-}
 </style>
@@ -115,7 +115,7 @@
 </template>

 <script>
-import { format, parseISO } from 'date-fns';
+import format from 'date-fns/format';
 import { required, url } from 'vuelidate/lib/validators';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import MultiselectDropdown from 'shared/components/ui/MultiselectDropdown.vue';
@@ -143,20 +143,15 @@ export default {
  },

  computed: {
-    displayValue() {
+    formattedValue() {
      if (this.isAttributeTypeDate) {
-        return new Date(this.value || new Date()).toLocaleDateString();
+        return format(new Date(this.value || new Date()), DATE_FORMAT);
      }
      if (this.isAttributeTypeCheckbox) {
        return this.value === 'false' ? false : this.value;
      }
      return this.value;
    },
-    formattedValue() {
-      return this.isAttributeTypeDate
-        ? format(this.value ? new Date(this.value) : new Date(), DATE_FORMAT)
-        : this.value;
-    },
    listOptions() {
      return this.values.map((value, index) => ({
        id: index + 1,
@@ -197,11 +192,17 @@ export default {
      }
      return this.$t('CUSTOM_ATTRIBUTES.VALIDATIONS.REQUIRED');
    },
+    displayValue() {
+      if (this.attributeType === 'date') {
+        return format(new Date(this.editedValue), 'dd-MM-yyyy');
+      }
+      return this.editedValue;
+    },
  },
  watch: {
    value() {
      this.isEditing = false;
-      this.editedValue = this.formattedValue;
+      this.editedValue = this.value;
    },
  },

@@ -248,8 +249,9 @@ export default {
    onUpdate() {
      const updatedValue =
        this.attributeType === 'date'
-          ? parseISO(this.editedValue)
+          ? format(new Date(this.editedValue), DATE_FORMAT)
          : this.editedValue;
+
      this.$v.$touch();
      if (this.$v.$invalid) {
        return;
@@ -8,7 +8,6 @@
    >
      <div :class="modalContainerClassName" @click.stop>
        <woot-button
-          v-if="showCloseButton"
          color-scheme="secondary"
          icon="dismiss"
          variant="clear"
@@ -29,10 +28,6 @@ export default {
      default: true,
    },
    show: Boolean,
-    showCloseButton: {
-      type: Boolean,
-      default: true,
-    },
    onClose: {
      type: Function,
      required: true,
@@ -5,9 +5,7 @@
        {{ title }}
      </p>
      <p class="sub-head">
-        <slot name="subTitle">
-          {{ subTitle }}
-        </slot>
+        {{ subTitle }}
      </p>
      <p v-if="note">
        <span class="note">{{ $t('INBOX_MGMT.NOTE') }}</span>
@@ -1,6 +1,7 @@
 <template>
  <banner
    v-if="shouldShowBanner"
+    class="update-banner"
    color-scheme="primary"
    :banner-message="bannerMessage"
    href-link="https://github.com/chatwoot/chatwoot/releases"
@@ -157,7 +157,6 @@ const settings = accountId => ({
      hasSubMenu: false,
      toState: frontendURL(`accounts/${accountId}/settings/audit-log/list`),
      toStateName: 'auditlogs_list',
-      featureFlag: FEATURE_FLAGS.AUDIT_LOGS,
      beta: true,
    },
  ],
@@ -11,29 +11,26 @@
        {{ hrefLinkText }}
      </a>
    </span>
-    <div class="actions">
-      <woot-button
-        v-if="hasActionButton"
-        size="tiny"
-        icon="arrow-right"
-        :variant="actionButtonVariant"
-        color-scheme="primary"
-        class-names="banner-action__button"
-        @click="onClick"
-      >
-        {{ actionButtonLabel }}
-      </woot-button>
-      <woot-button
-        v-if="hasCloseButton"
-        size="tiny"
-        :color-scheme="colorScheme"
-        icon="dismiss-circle"
-        class-names="banner-action__button"
-        @click="onClickClose"
-      >
-        {{ $t('GENERAL_SETTINGS.DISMISS') }}
-      </woot-button>
-    </div>
+    <woot-button
+      v-if="hasActionButton"
+      size="small"
+      variant="link"
+      icon="arrow-right"
+      color-scheme="primary"
+      class-names="banner-action__button"
+      @click="onClick"
+    >
+      {{ actionButtonLabel }}
+    </woot-button>
+    <woot-button
+      v-if="hasCloseButton"
+      size="small"
+      variant="link"
+      color-scheme="secondary"
+      icon="dismiss-circle"
+      class-names="banner-action__button"
+      @click="onClickClose"
+    />
  </div>
 </template>

@@ -56,10 +53,6 @@ export default {
      type: Boolean,
      default: false,
    },
-    actionButtonVariant: {
-      type: String,
-      default: '',
-    },
    actionButtonLabel: {
      type: String,
      default: '',
@@ -75,12 +68,7 @@ export default {
  },
  computed: {
    bannerClasses() {
-      const classList = [this.colorScheme, `banner-align-${this.align}`];
-
-      if (this.hasActionButton || this.hasCloseButton) {
-        classList.push('has-button');
-      }
-      return classList;
+      return [this.colorScheme];
    },
  },
  methods: {
@@ -96,26 +84,17 @@ export default {

 <style lang="scss" scoped>
 .banner {
-  --x-padding: var(--space-normal);
-  --y-padding: var(--space-slab);
-
  display: flex;
-  gap: var(--x-padding);
  color: var(--white);
  font-size: var(--font-size-mini);
-  padding: var(--y-padding) var(--x-padding);
+  padding: var(--space-slab) var(--space-normal);
  justify-content: center;
+  position: sticky;

  &.primary {
    background: var(--w-500);
    .banner-action__button {
-      background: var(--w-600);
-      border: none;
      color: var(--white);
-
-      &:hover {
-        background: var(--w-800);
-      }
    }
  }

@@ -128,16 +107,7 @@ export default {
  }

  &.alert {
-    background: var(--r-500);
-    .banner-action__button {
-      background: var(--r-700);
-      border: none;
-      color: var(--white);
-
-      &:hover {
-        background: var(--r-800);
-      }
-    }
+    background: var(--r-400);
  }

  &.warning {
@@ -163,6 +133,8 @@ export default {
  }

  .banner-action__button {
+    margin: 0 var(--space-smaller);
+
    ::v-deep .button__content {
      white-space: nowrap;
    }
@@ -172,11 +144,5 @@ export default {
    display: flex;
    align-items: center;
  }
-
-  .actions {
-    display: flex;
-    gap: var(--space-smaller);
-    right: var(--y-padding);
-  }
 }
 </style>
@@ -6,11 +6,7 @@
    :disabled="isDisabled || isLoading"
    @click="handleClick"
  >
-    <spinner
-      v-if="isLoading"
-      size="small"
-      :color-scheme="showDarkSpinner ? 'dark' : ''"
-    />
+    <spinner v-if="isLoading" size="small" />
    <emoji-or-icon
      v-else-if="icon || emoji"
      class="icon"
@@ -112,14 +108,6 @@ export default {
          return 16;
      }
    },
-    showDarkSpinner() {
-      return (
-        this.colorScheme === 'secondary' ||
-        this.variant === 'clear' ||
-        this.variant === 'link' ||
-        this.variant === 'hollow'
-      );
-    },
  },
  methods: {
    handleClick(evt) {
@@ -1,216 +0,0 @@
-<template>
-  <div v-if="isAIIntegrationEnabled" class="position-relative">
-    <div v-if="!message">
-      <woot-button
-        v-if="isPrivateNote"
-        v-tooltip.top-end="$t('INTEGRATION_SETTINGS.OPEN_AI.SUMMARY_TITLE')"
-        icon="book-pulse"
-        color-scheme="secondary"
-        variant="smooth"
-        size="small"
-        :is-loading="uiFlags.summarize"
-        @click="processEvent('summarize')"
-      />
-      <woot-button
-        v-else
-        v-tooltip.top-end="$t('INTEGRATION_SETTINGS.OPEN_AI.REPLY_TITLE')"
-        icon="wand"
-        color-scheme="secondary"
-        variant="smooth"
-        size="small"
-        :is-loading="uiFlags.reply_suggestion"
-        @click="processEvent('reply_suggestion')"
-      />
-    </div>
-
-    <div v-else>
-      <woot-button
-        v-tooltip.top-end="$t('INTEGRATION_SETTINGS.OPEN_AI.TITLE')"
-        icon="text-grammar-wand"
-        color-scheme="secondary"
-        variant="smooth"
-        size="small"
-        @click="toggleDropdown"
-      />
-      <div
-        v-if="showDropdown"
-        v-on-clickaway="closeDropdown"
-        class="dropdown-pane dropdown-pane--open ai-modal"
-      >
-        <h4 class="sub-block-title margin-top-1">
-          {{ $t('INTEGRATION_SETTINGS.OPEN_AI.TITLE') }}
-        </h4>
-        <p>
-          {{ $t('INTEGRATION_SETTINGS.OPEN_AI.SUBTITLE') }}
-        </p>
-        <label>
-          {{ $t('INTEGRATION_SETTINGS.OPEN_AI.TONE.TITLE') }}
-        </label>
-        <div class="tone__item">
-          <select v-model="activeTone" class="status--filter small">
-            <option v-for="tone in tones" :key="tone.key" :value="tone.key">
-              {{ tone.value }}
-            </option>
-          </select>
-        </div>
-        <div class="modal-footer flex-container align-right">
-          <woot-button variant="clear" size="small" @click="closeDropdown">
-            {{ $t('INTEGRATION_SETTINGS.OPEN_AI.BUTTONS.CANCEL') }}
-          </woot-button>
-          <woot-button
-            :is-loading="uiFlags.rephrase"
-            size="small"
-            @click="processEvent('rephrase')"
-          >
-            {{ buttonText }}
-          </woot-button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { mixin as clickaway } from 'vue-clickaway';
-import OpenAPI from 'dashboard/api/integrations/openapi';
-import alertMixin from 'shared/mixins/alertMixin';
-import { OPEN_AI_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
-
-export default {
-  mixins: [alertMixin, clickaway],
-  props: {
-    conversationId: {
-      type: Number,
-      default: 0,
-    },
-    message: {
-      type: String,
-      default: '',
-    },
-    isPrivateNote: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      uiFlags: {
-        rephrase: false,
-        reply_suggestion: false,
-        summarize: false,
-      },
-      showDropdown: false,
-      activeTone: 'professional',
-      tones: [
-        {
-          key: 'professional',
-          value: this.$t(
-            'INTEGRATION_SETTINGS.OPEN_AI.TONE.OPTIONS.PROFESSIONAL'
-          ),
-        },
-        {
-          key: 'friendly',
-          value: this.$t('INTEGRATION_SETTINGS.OPEN_AI.TONE.OPTIONS.FRIENDLY'),
-        },
-      ],
-    };
-  },
-  computed: {
-    ...mapGetters({ appIntegrations: 'integrations/getAppIntegrations' }),
-    isAIIntegrationEnabled() {
-      return this.appIntegrations.find(
-        integration => integration.id === 'openai' && !!integration.hooks.length
-      );
-    },
-    hookId() {
-      return this.appIntegrations.find(
-        integration => integration.id === 'openai' && !!integration.hooks.length
-      ).hooks[0].id;
-    },
-    buttonText() {
-      return this.uiFlags.isRephrasing
-        ? this.$t('INTEGRATION_SETTINGS.OPEN_AI.BUTTONS.GENERATING')
-        : this.$t('INTEGRATION_SETTINGS.OPEN_AI.BUTTONS.GENERATE');
-    },
-  },
-  mounted() {
-    if (!this.appIntegrations.length) {
-      this.$store.dispatch('integrations/get');
-    }
-  },
-  methods: {
-    toggleDropdown() {
-      this.showDropdown = !this.showDropdown;
-    },
-    closeDropdown() {
-      this.showDropdown = false;
-    },
-    async recordAnalytics({ type, tone }) {
-      const event = OPEN_AI_EVENTS[type.toUpperCase()];
-      if (event) {
-        this.$track(event, {
-          type,
-          tone,
-        });
-      }
-    },
-    async processEvent(type = 'rephrase') {
-      this.uiFlags[type] = true;
-      try {
-        const result = await OpenAPI.processEvent({
-          hookId: this.hookId,
-          type,
-          content: this.message,
-          tone: this.activeTone,
-          conversationId: this.conversationId,
-        });
-        const {
-          data: { message: generatedMessage },
-        } = result;
-        this.$emit('replace-text', generatedMessage || this.message);
-        this.closeDropdown();
-        this.recordAnalytics({ type, tone: this.activeTone });
-      } catch (error) {
-        this.showAlert(this.$t('INTEGRATION_SETTINGS.OPEN_AI.GENERATE_ERROR'));
-      } finally {
-        this.uiFlags[type] = false;
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.ai-modal {
-  width: 400px;
-  right: 0;
-  left: 0;
-  padding: var(--space-normal);
-  bottom: 34px;
-  position: absolute;
-  span {
-    font-size: var(--font-size-small);
-    font-weight: var(--font-weight-medium);
-  }
-
-  p {
-    color: var(--s-600);
-  }
-
-  label {
-    margin-bottom: var(--space-smaller);
-  }
-
-  .status--filter {
-    background-color: var(--color-background-light);
-    border: 1px solid var(--color-border);
-    font-size: var(--font-size-small);
-    height: var(--space-large);
-    padding: 0 var(--space-medium) 0 var(--space-small);
-  }
-
-  .modal-footer {
-    gap: var(--space-smaller);
-  }
-}
-</style>
@@ -1,5 +1,5 @@
 <template>
-  <button class="header-section back-button" @click.capture="goBack">
+  <button class="settings back-button" @click.capture="goBack">
    <fluent-icon icon="chevron-left" />
    {{ buttonLabel || $t('GENERAL_SETTINGS.BACK') }}
  </button>
@@ -1,37 +0,0 @@
-import InboxDropdownItem from './InboxDropdownItem';
-
-export default {
-  title: 'Components/DropDowns/InboxDropdownItem',
-  component: InboxDropdownItem,
-  argTypes: {
-    name: {
-      defaultValue: 'My new inbox',
-      control: {
-        type: 'text',
-      },
-    },
-
-    inboxIdentifier: {
-      defaultValue: 'nithin@mail.com',
-      control: {
-        type: 'text',
-      },
-    },
-
-    channelType: {
-      defaultValue: 'email',
-      control: {
-        type: 'text',
-      },
-    },
-  },
-};
-
-const Template = (args, { argTypes }) => ({
-  props: Object.keys(argTypes),
-  components: { InboxDropdownItem },
-  template: '<inbox-dropdown-item v-bind="$props" ></inbox-dropdown-item>',
-});
-
-export const Banner = Template.bind({});
-Banner.args = {};
@@ -1,102 +0,0 @@
-<template>
-  <div class="option-item--inbox">
-    <span class="badge--icon">
-      <fluent-icon :icon="computedInboxIcon" size="14" />
-    </span>
-    <div class="option__user-data">
-      <h5 class="option__title">
-        {{ name }}
-      </h5>
-      <p class="option__body text-truncate" :title="inboxIdentifier">
-        {{ inboxIdentifier || computedInboxType }}
-      </p>
-    </div>
-  </div>
-</template>
-
-<script>
-import {
-  getInboxClassByType,
-  getReadableInboxByType,
-} from 'dashboard/helper/inbox';
-
-export default {
-  components: {},
-  props: {
-    name: {
-      type: String,
-      default: '',
-    },
-    inboxIdentifier: {
-      type: String,
-      default: '',
-    },
-    channelType: {
-      type: String,
-      default: '',
-    },
-  },
-  computed: {
-    computedInboxIcon() {
-      if (!this.channelType) return 'chat';
-      const classByType = getInboxClassByType(
-        this.channelType,
-        this.inboxIdentifier
-      );
-      return classByType;
-    },
-    computedInboxType() {
-      if (!this.channelType) return 'chat';
-      const classByType = getReadableInboxByType(
-        this.channelType,
-        this.inboxIdentifier
-      );
-      return classByType;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.option-item--inbox {
-  display: flex;
-  align-items: center;
-  height: 3.8rem;
-  min-width: 0;
-  padding: 0 var(--space-smaller);
-}
-.badge--icon {
-  display: inline-flex;
-  border-radius: var(--border-radius-small);
-  margin-right: var(--space-smaller);
-  background: var(--s-25);
-  padding: var(--space-micro);
-  align-items: center;
-  flex-shrink: 0;
-  justify-content: center;
-  width: var(--space-medium);
-  height: var(--space-medium);
-}
-
-.option__user-data {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  min-width: 0;
-  margin-left: var(--space-smaller);
-  margin-right: var(--space-smaller);
-}
-.option__body {
-  display: inline-block;
-  color: var(--s-600);
-  font-size: var(--font-size-small);
-  line-height: 1.3;
-  min-width: 0;
-  margin: 0;
-}
-.option__title {
-  line-height: 1.1;
-  font-size: var(--font-size-mini);
-  margin: 0;
-}
-</style>
@@ -1,12 +1,12 @@
 <template>
-  <div class="position-relative">
+  <div style="position: relative;">
    <woot-button
-      v-tooltip.right="$t('CHAT_LIST.SORT_TOOLTIP_LABEL')"
-      variant="smooth"
-      size="tiny"
+      v-tooltip.top-end="'Compose With AI'"
+      icon="wand"
      color-scheme="secondary"
-      class="selector-button"
-      icon="sort-icon"
+      variant="smooth"
+      size="small"
+      :title="'AI'"
      @click="toggleDropdown"
    />
    <div
@@ -14,25 +14,34 @@
      v-on-clickaway="closeDropdown"
      class="dropdown-pane dropdown-pane--open basic-filter"
    >
+      <h3 class="page-sub-title">
+        Compose with AI
+      </h3>
+      <p>
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Ducimus odio
+        dolorem laborum mollitia nesciunt corrupti saepe recusandae esse nisi
+        earum, dignissimos fugiat nobis voluptatibus rerum quo illum. Atque, rem
+        voluptatem!
+      </p>
+      <h4 class="text-block-title">
+        Tone
+      </h4>
      <div class="filter__item">
-        <span>{{ this.$t('CHAT_LIST.CHAT_SORT.STATUS') }}</span>
-        <filter-item
-          type="status"
-          :selected-value="chatStatus"
-          :items="chatStatusItems"
-          path-prefix="CHAT_LIST.CHAT_STATUS_FILTER_ITEMS"
-          @onChangeFilter="onChangeFilter"
-        />
+        <select v-model="activeValue" class="status--filter">
+          <option v-for="item in items" :key="item.status" :value="item.status">
+            {{ item.value }}
+          </option>
+        </select>
      </div>
-      <div class="filter__item">
-        <span>{{ this.$t('CHAT_LIST.CHAT_SORT.ORDER_BY') }}</span>
-        <filter-item
-          type="sort"
-          :selected-value="chatSortFilter"
-          :items="chatSortItems"
-          path-prefix="CHAT_LIST.CHAT_SORT_FILTER_ITEMS"
-          @onChangeFilter="onChangeFilter"
-        />
+      <div class="medium-12 columns">
+        <div class="modal-footer justify-content-end w-full buttons">
+          <woot-button class="button clear" size="tiny">
+            Cancel
+          </woot-button>
+          <woot-button size="tiny">
+            Generate
+          </woot-button>
+        </div>
      </div>
    </div>
  </div>
@@ -42,18 +51,21 @@
 import wootConstants from 'dashboard/constants/globals';
 import { mapGetters } from 'vuex';
 import { mixin as clickaway } from 'vue-clickaway';
-import FilterItem from './FilterItem';

 export default {
-  components: {
-    FilterItem,
-  },
  mixins: [clickaway],
  data() {
    return {
      showActionsDropdown: false,
      chatStatusItems: this.$t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS'),
      chatSortItems: this.$t('CHAT_LIST.CHAT_SORT_FILTER_ITEMS'),
+      items: [
+        {
+          value: 'Professional',
+          status: 'Professional',
+        },
+      ],
+      activeValue: 'Professional',
    };
  },
  computed: {
@@ -87,20 +99,21 @@ export default {
 </script>
 <style lang="scss" scoped>
 .basic-filter {
+  width: 400px;
  margin-top: var(--space-smaller);
-  padding: var(--space-normal);
  right: 0;
-  width: 21rem;
-
+  left: 0;
+  padding: var(--space-normal) var(--space-small);
+  bottom: 34px;
+  position: absolute;
  span {
    font-size: var(--font-size-small);
    font-weight: var(--font-weight-medium);
  }
-
  .filter__item {
-    align-items: center;
-    display: flex;
    justify-content: space-between;
+    display: flex;
+    align-items: center;

    &:last-child {
      margin-top: var(--space-normal);
@@ -111,12 +124,25 @@ export default {
    }
  }
 }
-
 .icon {
  margin-right: var(--space-smaller);
 }
-
 .dropdown-icon {
  margin-left: var(--space-smaller);
 }
+
+.status--filter {
+  background-color: var(--color-background-light);
+  border: 1px solid var(--color-border);
+  font-size: var(--font-size-mini);
+  height: var(--space-medium);
+  margin: 0 var(--space-smaller);
+  padding: 0 var(--space-medium) 0 var(--space-small);
+}
+
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: var(--space-normal);
+}
 </style>
@@ -13,19 +13,15 @@ import videojs from 'video.js';
 import alertMixin from '../../../../shared/mixins/alertMixin';

 import Recorder from 'opus-recorder';
-
-// Workers to record Audio .ogg and .wav
 import encoderWorker from 'opus-recorder/dist/encoderWorker.min';
 import waveWorker from 'opus-recorder/dist/waveWorker.min';

 import WaveSurfer from 'wavesurfer.js';
 import MicrophonePlugin from 'wavesurfer.js/dist/plugin/wavesurfer.microphone.js';
-
 import 'videojs-wavesurfer/dist/videojs.wavesurfer.js';
+
 import 'videojs-record/dist/videojs.record.js';
-
-import OpusRecorderEngine from 'videojs-record/dist/plugins/videojs.record.opus-recorder.js';
-
+import 'videojs-record/dist/plugins/videojs.record.opus-recorder.js';
 import { format, addSeconds } from 'date-fns';
 import { AUDIO_FORMATS } from 'shared/constants/messages';

@@ -37,7 +33,7 @@ export default {
  props: {
    audioRecordFormat: {
      type: String,
-      default: AUDIO_FORMATS.WAV,
+      default: AUDIO_FORMATS.WEBM,
    },
  },
  data() {
@@ -83,18 +79,24 @@ export default {
            maxLength: 900,
            timeSlice: 1000,
            maxFileSize: 15 * 1024 * 1024,
-            displayMilliseconds: false,
-            audioChannels: 1,
-            audioSampleRate: 48000,
-            audioBitRate: 128,
-            audioEngine: 'opus-recorder',
-            ...(this.audioRecordFormat === AUDIO_FORMATS.WAV && {
-              audioMimeType: 'audio/wav',
-              audioWorkerURL: waveWorker,
+            ...(this.audioRecordFormat === AUDIO_FORMATS.WEBM && {
+              monitorGain: 0,
+              recordingGain: 1,
+              numberOfChannels: 1,
+              encoderSampleRate: 16000,
+              originalSampleRateOverride: 16000,
+              streamPages: true,
+              maxFramesPerPage: 1,
+              encoderFrameSize: 1,
+              encoderPath: waveWorker,
            }),
            ...(this.audioRecordFormat === AUDIO_FORMATS.OGG && {
-              audioMimeType: 'audio/ogg',
+              displayMilliseconds: false,
+              audioEngine: 'opus-recorder',
              audioWorkerURL: encoderWorker,
+              audioChannels: 1,
+              audioSampleRate: 48000,
+              audioBitRate: 128,
            }),
          },
        },
@@ -132,11 +134,6 @@ export default {
  },
  methods: {
    deviceReady() {
-      if (this.player.record().engine instanceof OpusRecorderEngine) {
-        if (this.audioRecordFormat === AUDIO_FORMATS.WAV) {
-          this.player.record().engine.audioType = 'audio/wav';
-        }
-      }
      this.player.record().start();
    },
    startRecord() {
@@ -49,7 +49,7 @@ import {
 import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import { isEditorHotKeyEnabled } from 'dashboard/mixins/uiSettings';
-import { replaceVariablesInMessage } from '@chatwoot/utils';
+import { replaceVariablesInMessage } from 'dashboard/helper/messageHelper';
 import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';

 const createState = (content, placeholder, plugins = []) => {
@@ -38,12 +38,12 @@
      </file-upload>
      <woot-button
        v-if="showAudioRecorderButton"
-        v-tooltip.top-end="$t('CONVERSATION.REPLYBOX.TIP_AUDIORECORDER_ICON')"
        :icon="!isRecordingAudio ? 'microphone' : 'microphone-off'"
        emoji="🎤"
        :color-scheme="!isRecordingAudio ? 'secondary' : 'alert'"
        variant="smooth"
        size="small"
+        :title="$t('CONVERSATION.REPLYBOX.TIP_AUDIORECORDER_ICON')"
        @click="toggleAudioRecorder"
      />
      <woot-button
@@ -91,12 +91,7 @@
        v-if="(isAWebWidgetInbox || isAPIInbox) && !isOnPrivateNote"
        :conversation-id="conversationId"
      />
-      <AIAssistanceButton
-        :conversation-id="conversationId"
-        :is-private-note="isOnPrivateNote"
-        :message="message"
-        @replace-text="replaceText"
-      />
+      <AIEditor />
      <transition name="modal-fade">
        <div
          v-show="$refs.upload && $refs.upload.dropActive"
@@ -130,18 +125,18 @@ import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import inboxMixin from 'shared/mixins/inboxMixin';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import AIEditor from './AIEditor.vue';
 import {
  ALLOWED_FILE_TYPES,
  ALLOWED_FILE_TYPES_FOR_TWILIO_WHATSAPP,
 } from 'shared/constants/messages';
 import VideoCallButton from '../VideoCallButton';
-import AIAssistanceButton from '../AIAssistanceButton.vue';
 import { REPLY_EDITOR_MODES } from './constants';
 import { mapGetters } from 'vuex';

 export default {
  name: 'ReplyBottomPanel',
-  components: { FileUpload, VideoCallButton, AIAssistanceButton },
+  components: { FileUpload, VideoCallButton, AIEditor },
  mixins: [eventListenerMixins, uiSettingsMixin, inboxMixin],
  props: {
    mode: {
@@ -224,10 +219,6 @@ export default {
      type: Number,
      required: true,
    },
-    message: {
-      type: String,
-      default: '',
-    },
  },
  computed: {
    ...mapGetters({
@@ -314,9 +305,6 @@ export default {
        send_with_signature: !this.sendWithSignature,
      });
    },
-    replaceText(text) {
-      this.$emit('replace-text', text);
-    },
  },
 };
 </script>
@@ -45,14 +45,6 @@ export default {
      default: () => {},
    },
  },
-  watch: {
-    collection() {
-      this.renderChart(this.collection, {
-        ...chartOptions,
-        ...this.chartOptions,
-      });
-    },
-  },
  mounted() {
    this.renderChart(this.collection, {
      ...chartOptions,
@@ -38,8 +38,8 @@ export default {
      this.onTabChange();
    },
    onTabChange() {
-      this.$store.dispatch('setChatStatusFilter', this.activeStatus);
-      this.$emit('onChangeFilter', this.activeStatus);
+      this.$store.dispatch('setChatFilter', this.activeStatus);
+      this.$emit('statusFilterChange', this.activeStatus);
    },
  },
 };
@@ -1,21 +1,9 @@
 <template>
  <div class="column">
-    <woot-modal-header :header-title="filterModalHeaderTitle">
-      <p>{{ filterModalSubTitle }}</p>
+    <woot-modal-header :header-title="$t('FILTER.TITLE')">
+      <p>{{ $t('FILTER.SUBTITLE') }}</p>
    </woot-modal-header>
-    <div class="column modal-content">
-      <div v-if="isFolderView" class="columns">
-        <label class="input-label" :class="{ error: !activeFolderNewName }">
-          {{ $t('FILTER.FOLDER_LABEL') }}
-          <input v-model="activeFolderNewName" type="text" class="name-input" />
-          <span v-if="!activeFolderNewName" class="message">
-            {{ $t('FILTER.EMPTY_VALUE_ERROR') }}
-          </span>
-        </label>
-        <label class="input-label">
-          {{ $t('FILTER.FOLDER_QUERY_LABEL') }}
-        </label>
-      </div>
+    <div class="row modal-content">
      <div class="medium-12 columns filters-wrap">
        <filter-input-box
          v-for="(filter, i) in appliedFilters"
@@ -54,14 +42,7 @@
          <woot-button class="button clear" @click.prevent="onClose">
            {{ $t('FILTER.CANCEL_BUTTON_LABEL') }}
          </woot-button>
-          <woot-button
-            v-if="isFolderView"
-            :disabled="!activeFolderNewName"
-            @click="updateSavedCustomViews"
-          >
-            {{ $t('FILTER.UPDATE_BUTTON_LABEL') }}
-          </woot-button>
-          <woot-button v-else @click="submitFilterQuery">
+          <woot-button @click="submitFilterQuery">
            {{ $t('FILTER.SUBMIT_BUTTON_LABEL') }}
          </woot-button>
        </div>
@@ -100,14 +81,6 @@ export default {
      type: Array,
      default: () => [],
    },
-    activeFolderName: {
-      type: String,
-      default: '',
-    },
-    isFolderView: {
-      type: Boolean,
-      default: false,
-    },
  },
  validations: {
    appliedFilters: {
@@ -134,7 +107,6 @@ export default {
    return {
      show: true,
      appliedFilters: this.initialAppliedFilters,
-      activeFolderNewName: this.activeFolderName,
      filterTypes: this.initialFilterTypes,
      filterAttributeGroups,
      filterGroups: [],
@@ -147,16 +119,6 @@ export default {
    ...mapGetters({
      getAppliedConversationFilters: 'getAppliedConversationFilters',
    }),
-    filterModalHeaderTitle() {
-      return !this.isFolderView
-        ? this.$t('FILTER.TITLE')
-        : this.$t('FILTER.EDIT_CUSTOM_FILTER');
-    },
-    filterModalSubTitle() {
-      return !this.isFolderView
-        ? this.$t('FILTER.SUBTITLE')
-        : this.$t('FILTER.CUSTOM_VIEWS_SUBTITLE');
-    },
  },
  mounted() {
    this.setFilterAttributes();
@@ -164,7 +126,7 @@ export default {
    if (this.getAppliedConversationFilters.length) {
      this.appliedFilters = [];
      this.appliedFilters = [...this.getAppliedConversationFilters];
-    } else if (!this.isFolderView) {
+    } else {
      this.appliedFilters.push({
        attribute_key: 'status',
        filter_operator: 'equal_to',
@@ -215,11 +177,11 @@ export default {
      if (key === 'created_at' || key === 'last_activity_at')
        if (operator === 'days_before') return 'plain_text';
      const type = this.filterTypes.find(filter => filter.attributeKey === key);
-      return type?.inputType;
+      return type.inputType;
    },
    getOperators(key) {
      const type = this.filterTypes.find(filter => filter.attributeKey === key);
-      return type?.filterOperators;
+      return type.filterOperators;
    },
    getDropdownValues(type) {
      const statusFilters = this.$t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS');
@@ -305,30 +267,11 @@ export default {
      }
    },
    appendNewFilter() {
-      if (this.isFolderView) {
-        this.setQueryOperatorOnLastQuery();
-      } else {
-        this.appliedFilters.push({
-          attribute_key: 'status',
-          filter_operator: 'equal_to',
-          values: '',
-          query_operator: 'and',
-        });
-      }
-    },
-    setQueryOperatorOnLastQuery() {
-      const lastItemIndex = this.appliedFilters.length - 1;
-      this.appliedFilters[lastItemIndex] = {
-        ...this.appliedFilters[lastItemIndex],
+      this.appliedFilters.push({
+        attribute_key: 'status',
+        filter_operator: 'equal_to',
+        values: '',
        query_operator: 'and',
-      };
-      this.$nextTick(() => {
-        this.appliedFilters.push({
-          attribute_key: 'status',
-          filter_operator: 'equal_to',
-          values: '',
-          query_operator: 'and',
-        });
      });
    },
    removeFilter(index) {
@@ -353,9 +296,6 @@ export default {
        })),
      });
    },
-    updateSavedCustomViews() {
-      this.$emit('updateFolder', this.appliedFilters, this.activeFolderNewName);
-    },
    resetFilter(index, currentFilter) {
      this.appliedFilters[index].filter_operator = this.filterTypes.find(
        filter => filter.attributeKey === currentFilter.attribute_key
@@ -382,12 +322,4 @@ export default {
 .filter-actions {
  margin-top: var(--space-normal);
 }
-
-.input-label {
-  margin-bottom: var(--space-smaller);
-
-  .name-input {
-    width: 50%;
-  }
-}
 </style>
@@ -9,7 +9,7 @@
    }"
    @mouseenter="onCardHover"
    @mouseleave="onCardLeave"
-    @click="onCardClick"
+    @click="cardClick(chat)"
    @contextmenu="openContextMenu($event)"
  >
    <label v-if="hovered || selected" class="checkbox-wrapper" @click.stop>
@@ -33,16 +33,13 @@
    <div class="conversation--details columns">
      <div class="conversation--metadata">
        <inbox-name v-if="showInboxName" :inbox="inbox" />
-        <div class="conversation-metadata-attributes">
-          <span
-            v-if="showAssignee && assignee.name"
-            class="label assignee-label text-truncate"
-          >
-            <fluent-icon icon="person" size="12" />
-            {{ assignee.name }}
-          </span>
-          <priority-mark :priority="chat.priority" />
-        </div>
+        <span
+          v-if="showAssignee && assignee.name"
+          class="label assignee-label text-truncate"
+        >
+          <fluent-icon icon="person" size="12" />
+          {{ assignee.name }}
+        </span>
      </div>
      <h4 class="conversation--user">
        {{ currentContact.name }}
@@ -109,14 +106,12 @@
      <conversation-context-menu
        :status="chat.status"
        :inbox-id="inbox.id"
-        :priority="chat.priority"
        :has-unread-messages="hasUnread"
        @update-conversation="onUpdateConversation"
        @assign-agent="onAssignAgent"
        @assign-label="onAssignLabel"
        @assign-team="onAssignTeam"
        @mark-as-unread="markAsUnread"
-        @assign-priority="assignPriority"
      />
    </woot-context-menu>
  </div>
@@ -136,7 +131,6 @@ import ConversationContextMenu from './contextMenu/Index.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import TimeAgo from 'dashboard/components/ui/TimeAgo';
 import CardLabels from './conversationCardComponents/CardLabels.vue';
-import PriorityMark from './PriorityMark.vue';
 const ATTACHMENT_ICONS = {
  image: 'image',
  audio: 'headphones-sound-wave',
@@ -153,7 +147,6 @@ export default {
    Thumbnail,
    ConversationContextMenu,
    TimeAgo,
-    PriorityMark,
  },

  mixins: [
@@ -313,33 +306,21 @@ export default {
    },
  },
  methods: {
-    onCardClick(e) {
-      const { activeInbox, chat } = this;
-      const path = frontendURL(
-        conversationUrl({
-          accountId: this.accountId,
-          activeInbox,
-          id: chat.id,
-          label: this.activeLabel,
-          teamId: this.teamId,
-          foldersId: this.foldersId,
-          conversationType: this.conversationType,
-        })
-      );
-
-      if (e.metaKey || e.ctrlKey) {
-        window.open(
-          window.chatwootConfig.hostURL + path,
-          '_blank',
-          'noopener noreferrer nofollow'
-        );
-        return;
-      }
+    cardClick(chat) {
+      const { activeInbox } = this;
+      const path = conversationUrl({
+        accountId: this.accountId,
+        activeInbox,
+        id: chat.id,
+        label: this.activeLabel,
+        teamId: this.teamId,
+        foldersId: this.foldersId,
+        conversationType: this.conversationType,
+      });
      if (this.isActiveChat) {
        return;
      }
-
-      router.push({ path });
+      router.push({ path: frontendURL(path) });
    },
    onCardHover() {
      this.hovered = !this.hideThumbnail;
@@ -389,10 +370,6 @@ export default {
      this.$emit('mark-as-unread', this.chat.id);
      this.closeContextMenu();
    },
-    async assignPriority(priority) {
-      this.$emit('assign-priority', priority, this.chat.id);
-      this.closeContextMenu();
-    },
  },
 };
 </script>
@@ -452,14 +429,9 @@ export default {
    padding: var(--space-micro) 0 var(--space-micro) 0;
  }

-  .conversation-metadata-attributes {
-    display: flex;
-    gap: var(--space-small);
-    margin-left: var(--space-small);
-  }
-
  .assignee-label {
    display: inline-flex;
+    margin-left: var(--space-small);
    max-width: 50%;
  }
 }
@@ -1,55 +0,0 @@
-<template>
-  <select v-model="activeValue" class="status--filter" @change="onTabChange()">
-    <option v-for="(value, status) in items" :key="status" :value="status">
-      {{ $t(`${pathPrefix}.${status}.TEXT`) }}
-    </option>
-  </select>
-</template>
-<script>
-export default {
-  props: {
-    selectedValue: {
-      type: String,
-      required: true,
-    },
-    items: {
-      type: Object,
-      required: true,
-    },
-    type: {
-      type: String,
-      required: true,
-    },
-    pathPrefix: {
-      type: String,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      activeValue: this.selectedValue,
-    };
-  },
-  methods: {
-    onTabChange() {
-      if (this.type === 'status') {
-        this.$store.dispatch('setChatStatusFilter', this.activeValue);
-      } else {
-        this.$store.dispatch('setChatSortFilter', this.activeValue);
-      }
-      this.$emit('onChangeFilter', this.activeValue, this.type);
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.status--filter {
-  background-color: var(--color-background-light);
-  border: 1px solid var(--color-border);
-  font-size: var(--font-size-mini);
-  height: var(--space-medium);
-  margin: 0 var(--space-smaller);
-  padding: 0 var(--space-medium) 0 var(--space-small);
-  width: 126px;
-}
-</style>
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .2.2
 .1.3
@@ -1 +1 @@
 .17.0
 .2.0
@@ -1 +1 @@
 .3.0
 .1.0