refactor: find_or_build_for_multiple_conversations

fix: resolved condition for message_builder
feat: handle conversation query order
2024-04-03 18:09:41 +05:30 · 2024-04-03 18:07:40 +05:30 · 2024-04-03 18:02:46 +05:30 · 2024-04-03 18:01:50 +05:30 · 2024-04-03 15:32:11 +05:30 · 2024-04-02 17:59:47 +05:30
1274 changed files with 9533 additions and 30519 deletions
@@ -1,9 +1,4 @@
-# Learn about the various environment variables at
-# https://www.chatwoot.com/docs/self-hosted/configuration/environment-variables/#rails-production-variables
-
 # Used to verify the integrity of signed cookies. so ensure a secure value is set
-# SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols. 
-# Use `rake secret` to generate this variable
 SECRET_KEY_BASE=replace_with_lengthy_secure_hex

 # Replace with the URL you are planning to use for your app
@@ -28,9 +23,6 @@ FORCE_SSL=false
 ENABLE_ACCOUNT_SIGNUP=false

 # Redis config
-# specify the configs via single URL or individual variables
-# ref: https://www.iana.org/assignments/uri-schemes/prov/redis
-# You can also use the following format for the URL: redis://:password@host:port/db_number
 REDIS_URL=redis://redis:6379
 # If you are using docker-compose, set this variable's value to be any string,
 # which will be the password for the redis service running inside the docker-compose
@@ -188,6 +180,14 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## Sentry
 # SENTRY_DSN=

+## LogRocket
+# LOG_ROCKET_PROJECT_ID=xxxxx/some-project
+
+# MICROSOFT CLARITY
+# MS_CLARITY_TOKEN=xxxxxxxxx
+
+# GOOGLE_TAG_MANAGER
+# GOOGLE_TAG = GTM-XXXXXXX

 ## Scout
 ## https://scoutapm.com/docs/ruby/configuration
@@ -251,6 +251,9 @@ AZURE_APP_SECRET=
 ## OpenAI key
 # OPENAI_API_KEY=

+# Sentiment analysis model file path
+SENTIMENT_FILE_PATH=
+
 # Housekeeping/Performance related configurations
 # Set to true if you want to remove stale contact inboxes
 # contact_inboxes with no conversation older than 90 days will be removed
@@ -1,2 +1,7 @@
+## All javascript files should be reviewed by pranav before merging
+*.js @pranavrajs
+*.vue @pranavrajs
+
+
 ## All enterprise related files should be reviewed by sojan before merging
 /enterprise/* @sojan-official
@@ -69,15 +69,15 @@ gem 'webpacker'
 gem 'barnes'

 ##--- gems for authentication & authorization ---##
-gem 'devise', '>= 4.9.4'
+gem 'devise', '>= 4.9.3'
 gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
-gem 'devise_token_auth', '>= 1.2.3'
+gem 'devise_token_auth'
 # authorization
 gem 'jwt'
 gem 'pundit'
 # super admin
 gem 'administrate', '>= 0.20.1'
-gem 'administrate-field-active_storage', '>= 1.0.3'
+gem 'administrate-field-active_storage', '>= 1.0.1'
 gem 'administrate-field-belongs_to_search', '>= 0.9.0'

 ##--- gems for pubsub service ---##
@@ -113,10 +113,10 @@ gem 'newrelic-sidekiq-metrics', '>= 1.6.2', require: false
 gem 'scout_apm', require: false
 gem 'sentry-rails', '>= 5.14.0', require: false
 gem 'sentry-ruby', require: false
-gem 'sentry-sidekiq', '>= 5.15.0', require: false
+gem 'sentry-sidekiq', '>= 5.14.0', require: false

 ##-- background job processing --##
-gem 'sidekiq', '>= 7.2.4'
+gem 'sidekiq', '>= 7.2.1'
 # We want cron jobs
 gem 'sidekiq-cron', '>= 1.12.0'

@@ -165,8 +165,8 @@ gem 'audited', '~> 5.4', '>= 5.4.1'

 # need for google auth
 gem 'omniauth', '>= 2.1.2'
-gem 'omniauth-google-oauth2', '>= 1.1.2'
-gem 'omniauth-rails_csrf_protection', '~> 1.0', '>= 1.0.2'
+gem 'omniauth-google-oauth2'
+gem 'omniauth-rails_csrf_protection', '~> 1.0'

 ## Gems for reponse bot
 # adds cosine similarity to postgres using vector extension
@@ -175,6 +175,9 @@ gem 'pgvector'
 # Convert Website HTML to Markdown
 gem 'reverse_markdown'

+# Sentiment analysis
+gem 'informers'
+
 ### Gems required only in specific deployment environments ###
 ##############################################################

@@ -200,7 +203,7 @@ group :development do
  gem 'rack-mini-profiler', '>= 3.2.0', require: false
  gem 'stackprof'
  # Should install the associated chrome extension to view query logs
-  gem 'meta_request', '>= 0.8.0'
+  gem 'meta_request'
 end

 group :test do
@@ -33,70 +33,70 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.0.8.3)
-      actionpack (= 7.0.8.3)
-      activesupport (= 7.0.8.3)
+    actioncable (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8.3)
-      actionpack (= 7.0.8.3)
-      activejob (= 7.0.8.3)
-      activerecord (= 7.0.8.3)
-      activestorage (= 7.0.8.3)
-      activesupport (= 7.0.8.3)
+    actionmailbox (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activestorage (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.0.8.3)
-      actionpack (= 7.0.8.3)
-      actionview (= 7.0.8.3)
-      activejob (= 7.0.8.3)
-      activesupport (= 7.0.8.3)
+    actionmailer (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      actionview (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
      rails-dom-testing (~> 2.0)
-    actionpack (7.0.8.3)
-      actionview (= 7.0.8.3)
-      activesupport (= 7.0.8.3)
+    actionpack (7.0.8.1)
+      actionview (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
      rack (~> 2.0, >= 2.2.4)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8.3)
-      actionpack (= 7.0.8.3)
-      activerecord (= 7.0.8.3)
-      activestorage (= 7.0.8.3)
-      activesupport (= 7.0.8.3)
+    actiontext (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activestorage (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.0.8.3)
-      activesupport (= 7.0.8.3)
+    actionview (7.0.8.1)
+      activesupport (= 7.0.8.1)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
    active_record_query_trace (1.8)
-    activejob (7.0.8.3)
-      activesupport (= 7.0.8.3)
+    activejob (7.0.8.1)
+      activesupport (= 7.0.8.1)
      globalid (>= 0.3.6)
-    activemodel (7.0.8.3)
-      activesupport (= 7.0.8.3)
-    activerecord (7.0.8.3)
-      activemodel (= 7.0.8.3)
-      activesupport (= 7.0.8.3)
+    activemodel (7.0.8.1)
+      activesupport (= 7.0.8.1)
+    activerecord (7.0.8.1)
+      activemodel (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
    activerecord-import (1.4.1)
      activerecord (>= 4.2)
-    activestorage (7.0.8.3)
-      actionpack (= 7.0.8.3)
-      activejob (= 7.0.8.3)
-      activerecord (= 7.0.8.3)
-      activesupport (= 7.0.8.3)
+    activestorage (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
      marcel (~> 1.0)
      mini_mime (>= 1.1.0)
-    activesupport (7.0.8.3)
+    activesupport (7.0.8.1)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@@ -113,7 +113,7 @@ GEM
      kaminari (~> 1.2.2)
      sassc-rails (~> 2.1)
      selectize-rails (~> 0.6)
-    administrate-field-active_storage (1.0.3)
+    administrate-field-active_storage (1.0.1)
      administrate (>= 0.2.2)
      rails (>= 7.0)
    administrate-field-belongs_to_search (0.9.0)
@@ -148,10 +148,10 @@ GEM
    barnes (0.0.9)
      multi_json (~> 1)
      statsd-ruby (~> 1.1)
-    base64 (0.2.0)
-    bcrypt (3.1.20)
-    bigdecimal (3.1.7)
+    base64 (0.1.1)
+    bcrypt (3.1.19)
    bindex (0.8.1)
+    blingfire (0.1.8)
    bootsnap (1.16.0)
      msgpack (~> 1.2)
    brakeman (5.4.1)
@@ -194,16 +194,16 @@ GEM
      irb (>= 1.5.0)
      reline (>= 0.3.1)
    declarative (0.0.20)
-    devise (4.9.4)
+    devise (4.9.3)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0)
      responders
      warden (~> 1.2.3)
-    devise_token_auth (1.2.3)
+    devise_token_auth (1.2.1)
      bcrypt (~> 3.0)
      devise (> 3.5.2, < 5)
-      rails (>= 4.2.0, < 7.2)
+      rails (>= 4.2.0, < 7.1)
    diff-lcs (1.5.0)
    digest-crc (0.6.4)
      rake (>= 12.0.0, < 14.0.0)
@@ -237,8 +237,9 @@ GEM
      railties (>= 5.0.0)
    faker (3.2.0)
      i18n (>= 1.8.11, < 2)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
    faraday-follow_redirects (0.3.0)
      faraday (>= 1, < 3)
    faraday-mashify (0.1.1)
@@ -246,8 +247,7 @@ GEM
      hashie
    faraday-multipart (1.0.4)
      multipart-post (~> 2)
-    faraday-net_http (3.1.0)
-      net-http
+    faraday-net_http (3.0.2)
    faraday-net_http_persistent (2.1.0)
      faraday (~> 2.5)
      net-http-persistent (~> 4.0)
@@ -316,15 +316,15 @@ GEM
    google-cloud-translate-v3 (0.6.0)
      gapic-common (>= 0.17.1, < 2.a)
      google-cloud-errors (~> 1.0)
-    google-protobuf (3.25.3)
-    google-protobuf (3.25.3-arm64-darwin)
-    google-protobuf (3.25.3-x86_64-darwin)
-    google-protobuf (3.25.3-x86_64-linux)
+    google-protobuf (3.25.2)
+    google-protobuf (3.25.2-arm64-darwin)
+    google-protobuf (3.25.2-x86_64-darwin)
+    google-protobuf (3.25.2-x86_64-linux)
    googleapis-common-protos (1.4.0)
      google-protobuf (~> 3.14)
      googleapis-common-protos-types (~> 1.2)
      grpc (~> 1.27)
-    googleapis-common-protos-types (1.14.0)
+    googleapis-common-protos-types (1.11.0)
      google-protobuf (~> 3.18)
    googleauth (1.5.2)
      faraday (>= 0.17.3, < 3.a)
@@ -335,17 +335,14 @@ GEM
      signet (>= 0.16, < 2.a)
    groupdate (6.2.1)
      activesupport (>= 5.2)
-    grpc (1.62.0)
-      google-protobuf (~> 3.25)
+    grpc (1.54.3)
+      google-protobuf (~> 3.21)
      googleapis-common-protos-types (~> 1.0)
-    grpc (1.62.0-arm64-darwin)
-      google-protobuf (~> 3.25)
+    grpc (1.54.3-x86_64-darwin)
+      google-protobuf (~> 3.21)
      googleapis-common-protos-types (~> 1.0)
-    grpc (1.62.0-x86_64-darwin)
-      google-protobuf (~> 3.25)
-      googleapis-common-protos-types (~> 1.0)
-    grpc (1.62.0-x86_64-linux)
-      google-protobuf (~> 3.25)
+    grpc (1.54.3-x86_64-linux)
+      google-protobuf (~> 3.21)
      googleapis-common-protos-types (~> 1.0)
    haikunator (1.1.1)
    hairtrigger (1.0.0)
@@ -369,11 +366,15 @@ GEM
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
-    i18n (1.14.5)
+    i18n (1.14.1)
      concurrent-ruby (~> 1.0)
    image_processing (1.12.2)
      mini_magick (>= 4.9.5, < 5)
      ruby-vips (>= 2.0.17, < 3)
+    informers (0.2.0)
+      blingfire (>= 0.1.7)
+      numo-narray
+      onnxruntime (>= 0.5.1)
    io-console (0.6.0)
    irb (1.7.2)
      reline (>= 0.3.6)
@@ -393,8 +394,7 @@ GEM
      hana (~> 1.3)
      regexp_parser (~> 2.0)
      uri_template (~> 0.7)
-    jwt (2.8.1)
-      base64
+    jwt (2.7.0)
    kaminari (1.2.2)
      activesupport (>= 4.1.0)
      kaminari-actionview (= 1.2.2)
@@ -448,20 +448,20 @@ GEM
      net-imap
      net-pop
      net-smtp
-    marcel (1.0.4)
+    marcel (1.0.2)
    maxminddb (0.1.22)
    memoist (0.16.2)
-    meta_request (0.8.2)
+    meta_request (0.7.4)
      rack-contrib (>= 1.1, < 3)
-      railties (>= 3.0.0, < 8)
-    method_source (1.1.0)
+      railties (>= 3.0.0, < 7.1)
+    method_source (1.0.0)
    mime-types (3.4.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2023.0218.1)
    mini_magick (4.12.0)
    mini_mime (1.1.5)
-    mini_portile2 (2.8.6)
-    minitest (5.23.0)
+    mini_portile2 (2.8.5)
+    minitest (5.21.2)
    mock_redis (0.36.0)
      ruby2_keywords
    msgpack (1.7.0)
@@ -470,11 +470,9 @@ GEM
    multipart-post (2.3.0)
    neighbor (0.2.3)
      activerecord (>= 5.2)
-    net-http (0.4.1)
-      uri
    net-http-persistent (4.0.2)
      connection_pool (~> 2.2)
-    net-imap (0.4.11)
+    net-imap (0.4.9)
      date
      net-protocol
    net-pop (0.1.2)
@@ -489,16 +487,17 @@ GEM
      sidekiq
    newrelic_rpm (9.6.0)
      base64
-    nio4r (2.7.3)
-    nokogiri (1.16.5)
+    nio4r (2.7.0)
+    nokogiri (1.16.2)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.2-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.2-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.2-x86_64-linux)
      racc (~> 1.4)
+    numo-narray (0.9.2.1)
    oauth (1.1.0)
      oauth-tty (~> 1.0, >= 1.0.1)
      snaky_hash (~> 2.0)
@@ -516,17 +515,25 @@ GEM
      hashie (>= 3.4.6)
      rack (>= 2.2.3)
      rack-protection
-    omniauth-google-oauth2 (1.1.2)
+    omniauth-google-oauth2 (1.1.1)
      jwt (>= 2.0)
-      oauth2 (~> 2.0)
+      oauth2 (~> 2.0.6)
      omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.8)
+      omniauth-oauth2 (~> 1.8.0)
    omniauth-oauth2 (1.8.0)
      oauth2 (>= 1.4, < 3)
      omniauth (~> 2.0)
-    omniauth-rails_csrf_protection (1.0.2)
+    omniauth-rails_csrf_protection (1.0.1)
      actionpack (>= 4.2)
      omniauth (~> 2.0)
+    onnxruntime (0.7.6)
+      ffi
+    onnxruntime (0.7.6-arm64-darwin)
+      ffi
+    onnxruntime (0.7.6-x86_64-darwin)
+      ffi
+    onnxruntime (0.7.6-x86_64-linux)
+      ffi
    openssl (3.1.0)
    orm_adapter (0.5.0)
    os (1.1.4)
@@ -552,37 +559,36 @@ GEM
      activesupport (>= 3.0.0)
    raabro (1.4.0)
    racc (1.7.3)
-    rack (2.2.9)
+    rack (2.2.8.1)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
-    rack-contrib (2.5.0)
+    rack-contrib (2.4.0)
      rack (< 4)
    rack-cors (2.0.0)
      rack (>= 2.0.0)
    rack-mini-profiler (3.2.0)
      rack (>= 1.2.0)
-    rack-protection (3.2.0)
-      base64 (>= 0.1.0)
+    rack-protection (3.1.0)
      rack (~> 2.2, >= 2.2.4)
    rack-proxy (0.7.6)
      rack
    rack-test (2.1.0)
      rack (>= 1.3)
    rack-timeout (0.6.3)
-    rails (7.0.8.3)
-      actioncable (= 7.0.8.3)
-      actionmailbox (= 7.0.8.3)
-      actionmailer (= 7.0.8.3)
-      actionpack (= 7.0.8.3)
-      actiontext (= 7.0.8.3)
-      actionview (= 7.0.8.3)
-      activejob (= 7.0.8.3)
-      activemodel (= 7.0.8.3)
-      activerecord (= 7.0.8.3)
-      activestorage (= 7.0.8.3)
-      activesupport (= 7.0.8.3)
+    rails (7.0.8.1)
+      actioncable (= 7.0.8.1)
+      actionmailbox (= 7.0.8.1)
+      actionmailer (= 7.0.8.1)
+      actionpack (= 7.0.8.1)
+      actiontext (= 7.0.8.1)
+      actionview (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activemodel (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activestorage (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
      bundler (>= 1.15.0)
-      railties (= 7.0.8.3)
+      railties (= 7.0.8.1)
    rails-dom-testing (2.2.0)
      activesupport (>= 5.0.0)
      minitest
@@ -590,21 +596,21 @@ GEM
    rails-html-sanitizer (1.6.0)
      loofah (~> 2.21)
      nokogiri (~> 1.14)
-    railties (7.0.8.3)
-      actionpack (= 7.0.8.3)
-      activesupport (= 7.0.8.3)
+    railties (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
      zeitwerk (~> 2.5)
    rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.1.0)
    rb-fsevent (0.11.2)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    redis (5.0.6)
      redis-client (>= 0.9.0)
-    redis-client (0.22.1)
+    redis-client (0.19.1)
      connection_pool
    redis-namespace (1.10.0)
      redis (>= 4)
@@ -628,8 +634,7 @@ GEM
    retriable (3.1.2)
    reverse_markdown (2.1.1)
      nokogiri
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.2.5)
    rspec-core (3.12.2)
      rspec-support (~> 3.12.0)
    rspec-expectations (3.12.3)
@@ -704,19 +709,18 @@ GEM
      activesupport (>= 4)
    selectize-rails (0.12.6)
    semantic_range (3.0.0)
-    sentry-rails (5.17.3)
+    sentry-rails (5.14.0)
      railties (>= 5.0)
-      sentry-ruby (~> 5.17.3)
-    sentry-ruby (5.17.3)
-      bigdecimal
+      sentry-ruby (~> 5.14.0)
+    sentry-ruby (5.14.0)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.17.3)
-      sentry-ruby (~> 5.17.3)
+    sentry-sidekiq (5.14.0)
+      sentry-ruby (~> 5.14.0)
      sidekiq (>= 3.0)
    sexp_processor (4.17.0)
    shoulda-matchers (5.3.0)
      activesupport (>= 5.2.0)
-    sidekiq (7.2.4)
+    sidekiq (7.2.1)
      concurrent-ruby (< 2)
      connection_pool (>= 2.3.0)
      rack (>= 2.2.4)
@@ -759,10 +763,9 @@ GEM
    stackprof (0.2.25)
    statsd-ruby (1.5.0)
    stripe (8.5.0)
-    strscan (3.1.0)
    telephone_number (1.4.20)
    test-prof (1.2.1)
-    thor (1.3.1)
+    thor (1.3.0)
    tilt (2.3.0)
    time_diff (0.3.0)
      activesupport
@@ -787,12 +790,11 @@ GEM
    unf_ext (0.0.8.2)
    unicode-display_width (2.4.2)
    uniform_notifier (1.16.0)
-    uri (0.13.0)
    uri_template (0.7.0)
    valid_email2 (4.0.6)
      activemodel (>= 3.2)
      mail (~> 2.5)
-    version_gem (1.1.4)
+    version_gem (1.1.3)
    warden (1.2.9)
      rack (>= 2.0.9)
    web-console (4.2.1)
@@ -821,7 +823,7 @@ GEM
    working_hours (1.4.1)
      activesupport (>= 3.2)
      tzinfo
-    zeitwerk (2.6.14)
+    zeitwerk (2.6.12)

 PLATFORMS
  arm64-darwin-20
@@ -839,7 +841,7 @@ DEPENDENCIES
  activerecord-import
  acts-as-taggable-on
  administrate (>= 0.20.1)
-  administrate-field-active_storage (>= 1.0.3)
+  administrate-field-active_storage (>= 1.0.1)
  administrate-field-belongs_to_search (>= 0.9.0)
  annotate
  attr_extras
@@ -860,9 +862,9 @@ DEPENDENCIES
  database_cleaner
  ddtrace
  debug (~> 1.8)
-  devise (>= 4.9.4)
+  devise (>= 4.9.3)
  devise-secure_password!
-  devise_token_auth (>= 1.2.3)
+  devise_token_auth
  dotenv-rails
  down
  elastic-apm
@@ -885,6 +887,7 @@ DEPENDENCIES
  hashie
  html2text!
  image_processing
+  informers
  jbuilder
  json_refs
  json_schemer
@@ -897,16 +900,16 @@ DEPENDENCIES
  listen
  lograge (~> 0.14.0)
  maxminddb
-  meta_request (>= 0.8.0)
+  meta_request
  mock_redis
  neighbor
  net-smtp (~> 0.3.4)
  newrelic-sidekiq-metrics (>= 1.6.2)
  newrelic_rpm
  omniauth (>= 2.1.2)
-  omniauth-google-oauth2 (>= 1.1.2)
+  omniauth-google-oauth2
  omniauth-oauth2
-  omniauth-rails_csrf_protection (~> 1.0, >= 1.0.2)
+  omniauth-rails_csrf_protection (~> 1.0)
  pg
  pg_search
  pgvector
@@ -935,9 +938,9 @@ DEPENDENCIES
  seed_dump
  sentry-rails (>= 5.14.0)
  sentry-ruby
-  sentry-sidekiq (>= 5.15.0)
+  sentry-sidekiq (>= 5.14.0)
  shoulda-matchers
-  sidekiq (>= 7.2.4)
+  sidekiq (>= 7.2.1)
  sidekiq-cron (>= 1.12.0)
  simplecov (= 0.17.1)
  slack-ruby-client (~> 2.2.0)
@@ -17,9 +17,6 @@ db_migrate:
 db_seed:
 	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:seed

-db_reset:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:reset
-
 db:
 	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:chatwoot_prepare

@@ -52,4 +49,4 @@ debug_worker:
 docker: 
 	docker build -t $(APP_NAME) -f ./docker/Dockerfile .

-.PHONY: setup db_create db_migrate db_seed db_reset db console server burn docker run force_run debug debug_worker
+.PHONY: setup db_create db_migrate db_seed db console server burn docker run force_run debug debug_worker
@@ -55,7 +55,7 @@
      "plan": "heroku-redis:mini"
    },
    {
-      "plan": "heroku-postgresql:essential-0"
+      "plan": "heroku-postgresql:mini"
    }
  ],
  "stack": "heroku-20",
@@ -19,9 +19,9 @@ class ContactInboxWithContactBuilder

    ActiveRecord::Base.transaction(requires_new: true) do
      build_contact_with_contact_inbox
+      update_contact_avatar(@contact) unless @contact.avatar.attached?
+      @contact_inbox
    end
-    update_contact_avatar(@contact) unless @contact.avatar.attached?
-    @contact_inbox
  end

  private
@@ -86,7 +86,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
  end

  def find_or_build_for_multiple_conversations
-    last_conversation = instagram_direct_message_conversation.where.not(status: :resolved).order(created_at: :desc).first
+    last_conversation = instagram_direct_message_conversation..where.not(status: :resolved).order(created_at: :desc).first

    return build_conversation if last_conversation.nil?

@@ -1,30 +0,0 @@
-class V2::Reports::Conversations::BaseReportBuilder
-  pattr_initialize :account, :params
-
-  private
-
-  AVG_METRICS = %w[avg_first_response_time avg_resolution_time reply_time].freeze
-  COUNT_METRICS = %w[
-    conversations_count
-    incoming_messages_count
-    outgoing_messages_count
-    resolutions_count
-    bot_resolutions_count
-    bot_handoffs_count
-  ].freeze
-
-  def builder_class(metric)
-    case metric
-    when *AVG_METRICS
-      V2::Reports::Timeseries::AverageReportBuilder
-    when *COUNT_METRICS
-      V2::Reports::Timeseries::CountReportBuilder
-    end
-  end
-
-  def log_invalid_metric
-    Rails.logger.error "ReportBuilder: Invalid metric - #{params[:metric]}"
-
-    {}
-  end
-end
@@ -1,30 +0,0 @@
-class V2::Reports::Conversations::MetricBuilder < V2::Reports::Conversations::BaseReportBuilder
-  def summary
-    {
-      conversations_count: count('conversations_count'),
-      incoming_messages_count: count('incoming_messages_count'),
-      outgoing_messages_count: count('outgoing_messages_count'),
-      avg_first_response_time: count('avg_first_response_time'),
-      avg_resolution_time: count('avg_resolution_time'),
-      resolutions_count: count('resolutions_count'),
-      reply_time: count('reply_time')
-    }
-  end
-
-  def bot_summary
-    {
-      bot_resolutions_count: count('bot_resolutions_count'),
-      bot_handoffs_count: count('bot_handoffs_count')
-    }
-  end
-
-  private
-
-  def count(metric)
-    builder_class(metric).new(account, builder_params(metric)).aggregate_value
-  end
-
-  def builder_params(metric)
-    params.merge({ metric: metric })
-  end
-end
@@ -1,21 +0,0 @@
-class V2::Reports::Conversations::ReportBuilder < V2::Reports::Conversations::BaseReportBuilder
-  def timeseries
-    perform_action(:timeseries)
-  end
-
-  def aggregate_value
-    perform_action(:aggregate_value)
-  end
-
-  private
-
-  def perform_action(method_name)
-    return builder.new(account, params).public_send(method_name) if builder.present?
-
-    log_invalid_metric
-  end
-
-  def builder
-    builder_class(params[:metric])
-  end
-end
@@ -1,48 +0,0 @@
-class V2::Reports::Timeseries::AverageReportBuilder < V2::Reports::Timeseries::BaseTimeseriesBuilder
-  def timeseries
-    grouped_average_time = reporting_events.average(average_value_key)
-    grouped_event_count = reporting_events.count
-    grouped_average_time.each_with_object([]) do |element, arr|
-      event_date, average_time = element
-      arr << {
-        value: average_time,
-        timestamp: event_date.in_time_zone(timezone).to_i,
-        count: grouped_event_count[event_date]
-      }
-    end
-  end
-
-  def aggregate_value
-    object_scope.average(average_value_key)
-  end
-
-  private
-
-  def event_name
-    metric_to_event_name = {
-      avg_first_response_time: :first_response,
-      avg_resolution_time: :conversation_resolved,
-      reply_time: :reply_time
-    }
-    metric_to_event_name[params[:metric].to_sym]
-  end
-
-  def object_scope
-    scope.reporting_events.where(name: event_name, created_at: range)
-  end
-
-  def reporting_events
-    @grouped_values = object_scope.group_by_period(
-      group_by,
-      :created_at,
-      default_value: 0,
-      range: range,
-      permit: %w[day week month year hour],
-      time_zone: timezone
-    )
-  end
-
-  def average_value_key
-    @average_value_key ||= params[:business_hours].present? ? :value_in_business_hours : :value
-  end
-end
@@ -1,46 +0,0 @@
-class V2::Reports::Timeseries::BaseTimeseriesBuilder
-  include TimezoneHelper
-  include DateRangeHelper
-  DEFAULT_GROUP_BY = 'day'.freeze
-
-  pattr_initialize :account, :params
-
-  def scope
-    case params[:type].to_sym
-    when :account
-      account
-    when :inbox
-      inbox
-    when :agent
-      user
-    when :label
-      label
-    when :team
-      team
-    end
-  end
-
-  def inbox
-    @inbox ||= account.inboxes.find(params[:id])
-  end
-
-  def user
-    @user ||= account.users.find(params[:id])
-  end
-
-  def label
-    @label ||= account.labels.find(params[:id])
-  end
-
-  def team
-    @team ||= account.teams.find(params[:id])
-  end
-
-  def group_by
-    @group_by ||= %w[day week month year hour].include?(params[:group_by]) ? params[:group_by] : DEFAULT_GROUP_BY
-  end
-
-  def timezone
-    @timezone ||= timezone_name_from_offset(params[:timezone_offset])
-  end
-end
@@ -1,71 +0,0 @@
-class V2::Reports::Timeseries::CountReportBuilder < V2::Reports::Timeseries::BaseTimeseriesBuilder
-  def timeseries
-    grouped_count.each_with_object([]) do |element, arr|
-      event_date, event_count = element
-
-      # The `event_date` is in Date format (without time), such as "Wed, 15 May 2024".
-      # We need a timestamp for the start of the day. However, we can't use `event_date.to_time.to_i`
-      # because it converts the date to 12:00 AM server timezone.
-      # The desired output should be 12:00 AM in the specified timezone.
-      arr << { value: event_count, timestamp: event_date.in_time_zone(timezone).to_i }
-    end
-  end
-
-  def aggregate_value
-    object_scope.count
-  end
-
-  private
-
-  def metric
-    @metric ||= params[:metric]
-  end
-
-  def object_scope
-    send("scope_for_#{metric}")
-  end
-
-  def scope_for_conversations_count
-    scope.conversations.where(account_id: account.id, created_at: range)
-  end
-
-  def scope_for_incoming_messages_count
-    scope.messages.where(account_id: account.id, created_at: range).incoming.unscope(:order)
-  end
-
-  def scope_for_outgoing_messages_count
-    scope.messages.where(account_id: account.id, created_at: range).outgoing.unscope(:order)
-  end
-
-  def scope_for_resolutions_count
-    scope.reporting_events.joins(:conversation).select(:conversation_id).where(
-      name: :conversation_resolved,
-      conversations: { status: :resolved }, created_at: range
-    ).distinct
-  end
-
-  def scope_for_bot_resolutions_count
-    scope.reporting_events.joins(:conversation).select(:conversation_id).where(
-      name: :conversation_bot_resolved,
-      conversations: { status: :resolved }, created_at: range
-    ).distinct
-  end
-
-  def scope_for_bot_handoffs_count
-    scope.reporting_events.joins(:conversation).select(:conversation_id).where(
-      name: :conversation_bot_handoff,
-      created_at: range
-    ).distinct
-  end
-
-  def grouped_count
-    @grouped_values = object_scope.group_by_period(
-      group_by,
-      :created_at,
-      default_value: 0,
-      range: range,
-      permit: %w[day week month year hour],
-      time_zone: timezone
-    ).count
-  end
-end
@@ -19,7 +19,7 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
      account: Current.account
    )

-    @agent = builder.perform
+    builder.perform
  end

  def update
@@ -21,6 +21,6 @@ class Api::V1::Accounts::BulkActionsController < Api::V1::Accounts::BaseControll
  end

  def permitted_params
-    params.permit(:type, :snoozed_until, ids: [], fields: [:status, :assignee_id, :team_id], labels: [add: [], remove: []])
+    params.permit(:type, ids: [], fields: [:status, :assignee_id, :team_id], labels: [add: [], remove: []])
  end
 end
@@ -46,8 +46,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController

  def export
    column_names = params['column_names']
-    filter_params = { :payload => params.permit!['payload'], :label => params.permit!['label'] }
-    Account::ContactsExportJob.perform_later(Current.account.id, Current.user.id, column_names, filter_params)
+    Account::ContactsExportJob.perform_later(Current.account.id, column_names, Current.user.email)
    head :ok, message: I18n.t('errors.contacts.export.success')
  end

@@ -62,7 +61,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
  def show; end

  def filter
-    result = ::Contacts::FilterService.new(Current.account, Current.user, params.permit!).perform
+    result = ::Contacts::FilterService.new(params.permit!, current_user).perform
    contacts = result[:contacts]
    @contacts_count = result[:count]
    @contacts = fetch_contacts(contacts)
@@ -1,28 +0,0 @@
-class Api::V1::Accounts::Conversations::DraftMessagesController < Api::V1::Accounts::Conversations::BaseController
-  def show
-    render json: { has_draft: false } and return unless Redis::Alfred.exists?(draft_redis_key)
-
-    draft_message = Redis::Alfred.get(draft_redis_key)
-    render json: { has_draft: true, message: draft_message }
-  end
-
-  def update
-    Redis::Alfred.set(draft_redis_key, draft_message_params)
-    head :ok
-  end
-
-  def destroy
-    Redis::Alfred.delete(draft_redis_key)
-    head :ok
-  end
-
-  private
-
-  def draft_redis_key
-    format(Redis::Alfred::CONVERSATION_DRAFT_MESSAGE, id: @conversation.id)
-  end
-
-  def draft_message_params
-    params.dig(:draft_message, :message) || ''
-  end
-end
@@ -1,93 +0,0 @@
-class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::BaseController
-  before_action :fetch_conversation, only: [:link_issue, :linked_issues]
-
-  def teams
-    teams = linear_processor_service.teams
-    if teams[:error]
-      render json: { error: teams[:error] }, status: :unprocessable_entity
-    else
-      render json: teams[:data], status: :ok
-    end
-  end
-
-  def team_entities
-    team_id = permitted_params[:team_id]
-    team_entities = linear_processor_service.team_entities(team_id)
-    if team_entities[:error]
-      render json: { error: team_entities[:error] }, status: :unprocessable_entity
-    else
-      render json: team_entities[:data], status: :ok
-    end
-  end
-
-  def create_issue
-    issue = linear_processor_service.create_issue(permitted_params)
-    if issue[:error]
-      render json: { error: issue[:error] }, status: :unprocessable_entity
-    else
-      render json: issue[:data], status: :ok
-    end
-  end
-
-  def link_issue
-    issue_id = permitted_params[:issue_id]
-    title = permitted_params[:title]
-    issue = linear_processor_service.link_issue(conversation_link, issue_id, title)
-    if issue[:error]
-      render json: { error: issue[:error] }, status: :unprocessable_entity
-    else
-      render json: issue[:data], status: :ok
-    end
-  end
-
-  def unlink_issue
-    link_id = permitted_params[:link_id]
-    issue = linear_processor_service.unlink_issue(link_id)
-
-    if issue[:error]
-      render json: { error: issue[:error] }, status: :unprocessable_entity
-    else
-      render json: issue[:data], status: :ok
-    end
-  end
-
-  def linked_issues
-    issues = linear_processor_service.linked_issues(conversation_link)
-
-    if issues[:error]
-      render json: { error: issues[:error] }, status: :unprocessable_entity
-    else
-      render json: issues[:data], status: :ok
-    end
-  end
-
-  def search_issue
-    render json: { error: 'Specify search string with parameter q' }, status: :unprocessable_entity if params[:q].blank? && return
-
-    term = params[:q]
-    issues = linear_processor_service.search_issue(term)
-    if issues[:error]
-      render json: { error: issues[:error] }, status: :unprocessable_entity
-    else
-      render json: issues[:data], status: :ok
-    end
-  end
-
-  private
-
-  def conversation_link
-    "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{Current.account.id}/conversations/#{@conversation.display_id}"
-  end
-
-  def fetch_conversation
-    @conversation = Current.account.conversations.find_by!(display_id: permitted_params[:conversation_id])
-  end
-
-  def linear_processor_service
-    Integrations::Linear::ProcessorService.new(account: Current.account)
-  end
-
-  def permitted_params
-    params.permit(:team_id, :project_id, :conversation_id, :issue_id, :link_id, :title, :description, :assignee_id, :priority, label_ids: [])
-  end
-end
@@ -33,10 +33,10 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
  end

  def transcript
-    if conversation.present? && conversation.contact.present? && conversation.contact.email.present?
+    if permitted_params[:email].present? && conversation.present?
      ConversationReplyMailer.with(account: conversation.account).conversation_transcript(
        conversation,
-        conversation.contact.email
+        permitted_params[:email]
      )&.deliver_later
    end
    head :ok
@@ -5,17 +5,19 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
  before_action :check_authorization

  def index
-    builder = V2::Reports::Conversations::ReportBuilder.new(Current.account, report_params)
-    data = builder.timeseries
+    builder = V2::ReportBuilder.new(Current.account, report_params)
+    data = builder.build
    render json: data
  end

  def summary
-    render json: build_summary(:summary)
+    render json: summary_metrics
  end

  def bot_summary
-    render json: build_summary(:bot_summary)
+    summary = V2::ReportBuilder.new(Current.account, current_summary_params).bot_summary
+    summary[:previous] = V2::ReportBuilder.new(Current.account, previous_summary_params).bot_summary
+    render json: summary
  end

  def agents
@@ -124,11 +126,10 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
    }
  end

-  def build_summary(method)
-    builder = V2::Reports::Conversations::MetricBuilder
-    current_summary = builder.new(Current.account, current_summary_params).send(method)
-    previous_summary = builder.new(Current.account, previous_summary_params).send(method)
-    current_summary.merge(previous: previous_summary)
+  def summary_metrics
+    summary = V2::ReportBuilder.new(Current.account, current_summary_params).summary
+    summary[:previous] = V2::ReportBuilder.new(Current.account, previous_summary_params).summary
+    summary
  end

  def conversation_metrics
@@ -2,10 +2,7 @@ module MicrosoftConcern
  extend ActiveSupport::Concern

  def microsoft_client
-    app_id = GlobalConfigService.load('AZURE_APP_ID', nil)
-    app_secret = GlobalConfigService.load('AZURE_APP_SECRET', nil)
-
-    ::OAuth2::Client.new(app_id, app_secret,
+    ::OAuth2::Client.new(ENV.fetch('AZURE_APP_ID', nil), ENV.fetch('AZURE_APP_SECRET', nil),
                         {
                           site: 'https://login.microsoftonline.com',
                           authorize_url: 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize',
@@ -3,7 +3,6 @@ class DashboardController < ActionController::Base

  before_action :set_application_pack
  before_action :set_global_config
-  before_action :set_dashboard_scripts
  around_action :switch_locale
  before_action :ensure_installation_onboarding, only: [:index]
  before_action :render_hc_if_custom_domain, only: [:index]
@@ -36,10 +35,6 @@ class DashboardController < ActionController::Base
    ).merge(app_config)
  end

-  def set_dashboard_scripts
-    @dashboard_scripts = GlobalConfig.get_value('DASHBOARD_SCRIPTS')
-  end
-
  def ensure_installation_onboarding
    redirect_to '/installation/onboarding' if ::Redis::Alfred.get(::Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)
  end
@@ -63,7 +58,7 @@ class DashboardController < ActionController::Base
      FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
      FACEBOOK_API_VERSION: GlobalConfigService.load('FACEBOOK_API_VERSION', 'v17.0'),
      IS_ENTERPRISE: ChatwootApp.enterprise?,
-      AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),
+      AZURE_APP_ID: ENV.fetch('AZURE_APP_ID', ''),
      GIT_SHA: GIT_HASH
    }
  end
@@ -4,10 +4,6 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
  wrap_parameters format: []
  before_action :process_sso_auth_token, only: [:create]

-  def new
-    redirect_to login_page_url(error: 'access-denied')
-  end
-
  def create
    # Authenticate user via the temporary sso auth token
    if params[:sso_auth_token].present? && @resource.present?
@@ -25,12 +21,6 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController

  private

-  def login_page_url(error: nil)
-    frontend_url = ENV.fetch('FRONTEND_URL', nil)
-
-    "#{frontend_url}/app/login?error=#{error}"
-  end
-
  def authenticate_resource_with_sso_token
    @token = @resource.create_token
    @resource.save!
@@ -7,14 +7,9 @@ class Microsoft::CallbacksController < ApplicationController
      redirect_uri: "#{base_url}/microsoft/callback"
    )

-    inbox, already_exists = find_or_create_inbox
+    inbox = find_or_create_inbox
    ::Redis::Alfred.delete(users_data['email'].downcase)
-
-    if already_exists
-      redirect_to app_microsoft_inbox_settings_url(account_id: account.id, inbox_id: inbox.id)
-    else
-      redirect_to app_microsoft_inbox_agents_url(account_id: account.id, inbox_id: inbox.id)
-    end
+    redirect_to app_microsoft_inbox_agents_url(account_id: account.id, inbox_id: inbox.id)
  rescue StandardError => e
    ChatwootExceptionTracker.new(e).capture_exception
    redirect_to '/'
@@ -45,17 +40,9 @@ class Microsoft::CallbacksController < ApplicationController

  def find_or_create_inbox
    channel_email = Channel::Email.find_by(email: users_data['email'], account: account)
-    # we need this value to know where to redirect on sucessful processing of the callback
-    channel_exists = channel_email.present?
-
    channel_email ||= create_microsoft_channel_with_inbox
    update_microsoft_channel(channel_email)
-
-    # reauthorize channel, this code path only triggers when microsoft auth is successful
-    # reauthorized will also update cache keys for the associated inbox
-    channel_email.reauthorized!
-
-    [channel_email.inbox, channel_exists]
+    channel_email.inbox
  end

  # Fallback name, for when name field is missing from users_data
@@ -12,6 +12,6 @@ class MicrosoftController < ApplicationController
  end

  def microsoft_indentity
-    @identity_json = GlobalConfigService.load('AZURE_APP_ID', nil)
+    @identity_json = ENV.fetch('AZURE_APP_ID', nil)
  end
 end
@@ -7,7 +7,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B

  def index
    @articles = @portal.articles
-    search_articles
+    @articles = @articles.search(list_params) if list_params.present?
    order_by_sort_param
    @articles.page(list_params[:page]) if list_params[:page].present?
  end
@@ -16,10 +16,6 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B

  private

-  def search_articles
-    @articles = @articles.search(list_params) if list_params.present?
-  end
-
  def order_by_sort_param
    @articles = if list_params[:sort].present? && list_params[:sort] == 'views'
                  @articles.order_by_views
@@ -55,5 +51,3 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
    ChatwootMarkdownRenderer.new(content).render_article
  end
 end
-
-Public::Api::V1::Portals::ArticlesController.prepend_mod_with('Public::Api::V1::Portals::ArticlesController')
@@ -6,12 +6,6 @@ class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseControl

  def show; end

-  def sitemap
-    @help_center_url = @portal.custom_domain || ChatwootApp.help_center_root
-    # if help_center_url does not contain a protocol, prepend it with https
-    @help_center_url = "https://#{@help_center_url}" unless @help_center_url.include?('://')
-  end
-
  private

  def portal
@@ -35,8 +35,6 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
    @allowed_configs = case @config
                       when 'facebook'
                         %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET IG_VERIFY_TOKEN FACEBOOK_API_VERSION ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT]
-                       when 'microsoft'
-                         %w[AZURE_APP_ID AZURE_APP_SECRET]
                       when 'email'
                         ['MAILER_INBOUND_EMAIL_DOMAIN']
                       else
@@ -10,15 +10,14 @@ class AsyncDispatcher < BaseDispatcher

  def listeners
    [
-      AutomationRuleListener.instance,
      CampaignListener.instance,
      CsatSurveyListener.instance,
      HookListener.instance,
      InstallationWebhookListener.instance,
      NotificationListener.instance,
-      ParticipationListener.instance,
      ReportingEventListener.instance,
-      WebhookListener.instance
+      WebhookListener.instance,
+      AutomationRuleListener.instance
    ]
  end
 end
@@ -1,7 +1,7 @@
 module Api::V2::Accounts::ReportsHelper
  def generate_agents_report
    Current.account.users.map do |agent|
-      agent_report = report_builder({ type: :agent, id: agent.id }).summary
+      agent_report = generate_report({ type: :agent, id: agent.id })
      [agent.name] + generate_readable_report_metrics(agent_report)
    end
  end
@@ -15,7 +15,7 @@ module Api::V2::Accounts::ReportsHelper

  def generate_teams_report
    Current.account.teams.map do |team|
-      team_report = report_builder({ type: :team, id: team.id }).summary
+      team_report = generate_report({ type: :team, id: team.id })
      [team.name] + generate_readable_report_metrics(team_report)
    end
  end
@@ -27,7 +27,7 @@ module Api::V2::Accounts::ReportsHelper
    end
  end

-  def report_builder(report_params)
+  def generate_report(report_params)
    V2::ReportBuilder.new(
      Current.account,
      report_params.merge(
@@ -37,11 +37,7 @@ module Api::V2::Accounts::ReportsHelper
          business_hours: ActiveModel::Type::Boolean.new.cast(params[:business_hours])
        }
      )
-    )
-  end
-
-  def generate_report(report_params)
-    report_builder(report_params).short_summary
+    ).short_summary
  end

  private
@@ -50,9 +46,7 @@ module Api::V2::Accounts::ReportsHelper
    [
      report_metric[:conversations_count],
      Reports::TimeFormatPresenter.new(report_metric[:avg_first_response_time]).format,
-      Reports::TimeFormatPresenter.new(report_metric[:avg_resolution_time]).format,
-      Reports::TimeFormatPresenter.new(report_metric[:reply_time]).format,
-      report_metric[:resolutions_count]
+      Reports::TimeFormatPresenter.new(report_metric[:avg_resolution_time]).format
    ]
  end
 end
@@ -1,19 +0,0 @@
-module TimezoneHelper
-  # ActiveSupport TimeZone is not aware of the current time, so ActiveSupport::Timezone[offset]
-  # would return the timezone without considering day light savings. To get the correct timezone,
-  # this method uses zone.now.utc_offset for comparison as referenced in the issues below
-  #
-  # https://github.com/rails/rails/pull/22243
-  # https://github.com/rails/rails/issues/21501
-  # https://github.com/rails/rails/issues/7297
-  def timezone_name_from_offset(offset)
-    return 'UTC' if offset.blank?
-
-    offset_in_seconds = offset.to_f * 3600
-    matching_zone = ActiveSupport::TimeZone.all.find do |zone|
-      zone.now.utc_offset == offset_in_seconds
-    end
-
-    return matching_zone.name if matching_zone
-  end
-end
@@ -77,8 +77,8 @@ class ContactAPI extends ApiClient {
    return axios.delete(`${this.url}/${contactId}/avatar`);
  }

-  exportContacts(queryPayload) {
-    return axios.post(`${this.url}/export`, queryPayload);
+  exportContacts() {
+    return axios.get(`${this.url}/export`);
  }
 }

@@ -15,7 +15,6 @@ class ConversationApi extends ApiClient {
    teamId,
    conversationType,
    sortBy,
-    updatedWithin,
  }) {
    return axios.get(this.url, {
      params: {
@@ -27,7 +26,6 @@ class ConversationApi extends ApiClient {
        labels,
        conversation_type: conversationType,
        sort_by: sortBy,
-        updated_within: updatedWithin,
      },
    });
  }
@@ -1,47 +0,0 @@
-/* global axios */
-
-import ApiClient from '../ApiClient';
-
-class LinearAPI extends ApiClient {
-  constructor() {
-    super('integrations/linear', { accountScoped: true });
-  }
-
-  getTeams() {
-    return axios.get(`${this.url}/teams`);
-  }
-
-  getTeamEntities(teamId) {
-    return axios.get(`${this.url}/team_entities?team_id=${teamId}`);
-  }
-
-  createIssue(data) {
-    return axios.post(`${this.url}/create_issue`, data);
-  }
-
-  link_issue(conversationId, issueId, title) {
-    return axios.post(`${this.url}/link_issue`, {
-      issue_id: issueId,
-      conversation_id: conversationId,
-      title: title,
-    });
-  }
-
-  getLinkedIssue(conversationId) {
-    return axios.get(
-      `${this.url}/linked_issues?conversation_id=${conversationId}`
-    );
-  }
-
-  unlinkIssue(linkId) {
-    return axios.post(`${this.url}/unlink_issue`, {
-      link_id: linkId,
-    });
-  }
-
-  searchIssues(query) {
-    return axios.get(`${this.url}/search_issue?q=${query}`);
-  }
-}
-
-export default new LinearAPI();
@@ -1,78 +0,0 @@
-/* global axios */
-import ApiClient from './ApiClient';
-
-class SLAReportsAPI extends ApiClient {
-  constructor() {
-    super('applied_slas', { accountScoped: true });
-  }
-
-  get({
-    from,
-    to,
-    assigned_agent_id,
-    inbox_id,
-    team_id,
-    sla_policy_id,
-    label_list,
-    page,
-  } = {}) {
-    return axios.get(this.url, {
-      params: {
-        since: from,
-        until: to,
-        assigned_agent_id,
-        inbox_id,
-        team_id,
-        sla_policy_id,
-        label_list,
-        page,
-      },
-    });
-  }
-
-  download({
-    from,
-    to,
-    assigned_agent_id,
-    inbox_id,
-    team_id,
-    sla_policy_id,
-    label_list,
-  } = {}) {
-    return axios.get(`${this.url}/download`, {
-      params: {
-        since: from,
-        until: to,
-        assigned_agent_id,
-        inbox_id,
-        team_id,
-        label_list,
-        sla_policy_id,
-      },
-    });
-  }
-
-  getMetrics({
-    from,
-    to,
-    assigned_agent_id,
-    inbox_id,
-    team_id,
-    label_list,
-    sla_policy_id,
-  } = {}) {
-    return axios.get(`${this.url}/metrics`, {
-      params: {
-        since: from,
-        until: to,
-        assigned_agent_id,
-        inbox_id,
-        label_list,
-        team_id,
-        sla_policy_id,
-      },
-    });
-  }
-}
-
-export default new SLAReportsAPI();
@@ -46,7 +46,6 @@ describe('#ConversationAPI', () => {
        page: 1,
        labels: [],
        teamId: 1,
-        updatedWithin: 20,
      });
      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/conversations', {
        params: {
@@ -56,7 +55,6 @@ describe('#ConversationAPI', () => {
          assignee_type: 'me',
          page: 1,
          labels: [],
-          updated_within: 20,
        },
      });
    });
@@ -1,202 +0,0 @@
-import LinearAPIClient from '../../integrations/linear';
-import ApiClient from '../../ApiClient';
-
-describe('#linearAPI', () => {
-  it('creates correct instance', () => {
-    expect(LinearAPIClient).toBeInstanceOf(ApiClient);
-    expect(LinearAPIClient).toHaveProperty('getTeams');
-    expect(LinearAPIClient).toHaveProperty('getTeamEntities');
-    expect(LinearAPIClient).toHaveProperty('createIssue');
-    expect(LinearAPIClient).toHaveProperty('link_issue');
-    expect(LinearAPIClient).toHaveProperty('getLinkedIssue');
-    expect(LinearAPIClient).toHaveProperty('unlinkIssue');
-    expect(LinearAPIClient).toHaveProperty('searchIssues');
-  });
-
-  describe('getTeams', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('creates a valid request', () => {
-      LinearAPIClient.getTeams();
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/integrations/linear/teams'
-      );
-    });
-  });
-
-  describe('getTeamEntities', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('creates a valid request', () => {
-      LinearAPIClient.getTeamEntities(1);
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/integrations/linear/team_entities?team_id=1'
-      );
-    });
-  });
-
-  describe('createIssue', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('creates a valid request', () => {
-      const issueData = {
-        title: 'New Issue',
-        description: 'Issue description',
-      };
-      LinearAPIClient.createIssue(issueData);
-      expect(axiosMock.post).toHaveBeenCalledWith(
-        '/api/v1/integrations/linear/create_issue',
-        issueData
-      );
-    });
-  });
-
-  describe('link_issue', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('creates a valid request', () => {
-      LinearAPIClient.link_issue(1, 2);
-      expect(axiosMock.post).toHaveBeenCalledWith(
-        '/api/v1/integrations/linear/link_issue',
-        {
-          issue_id: 2,
-          conversation_id: 1,
-        }
-      );
-    });
-  });
-
-  describe('getLinkedIssue', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('creates a valid request', () => {
-      LinearAPIClient.getLinkedIssue(1);
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/integrations/linear/linked_issues?conversation_id=1'
-      );
-    });
-  });
-
-  describe('unlinkIssue', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('creates a valid request', () => {
-      LinearAPIClient.unlinkIssue(1);
-      expect(axiosMock.post).toHaveBeenCalledWith(
-        '/api/v1/integrations/linear/unlink_issue',
-        {
-          link_id: 1,
-        }
-      );
-    });
-  });
-
-  describe('searchIssues', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('creates a valid request', () => {
-      LinearAPIClient.searchIssues('query');
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/integrations/linear/search_issue?q=query'
-      );
-    });
-  });
-});
@@ -1,104 +0,0 @@
-import SLAReportsAPI from '../slaReports';
-import ApiClient from '../ApiClient';
-
-describe('#SLAReports API', () => {
-  it('creates correct instance', () => {
-    expect(SLAReportsAPI).toBeInstanceOf(ApiClient);
-    expect(SLAReportsAPI.apiVersion).toBe('/api/v1');
-    expect(SLAReportsAPI).toHaveProperty('get');
-    expect(SLAReportsAPI).toHaveProperty('getMetrics');
-  });
-
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('#get', () => {
-      SLAReportsAPI.get({
-        page: 1,
-        from: 1622485800,
-        to: 1623695400,
-        assigned_agent_id: 1,
-        inbox_id: 1,
-        team_id: 1,
-        sla_policy_id: 1,
-        label_list: ['label1'],
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/applied_slas', {
-        params: {
-          page: 1,
-          since: 1622485800,
-          until: 1623695400,
-          assigned_agent_id: 1,
-          inbox_id: 1,
-          team_id: 1,
-          sla_policy_id: 1,
-          label_list: ['label1'],
-        },
-      });
-    });
-    it('#getMetrics', () => {
-      SLAReportsAPI.getMetrics({
-        from: 1622485800,
-        to: 1623695400,
-        assigned_agent_id: 1,
-        inbox_id: 1,
-        team_id: 1,
-        sla_policy_id: 1,
-        label_list: ['label1'],
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/applied_slas/metrics',
-        {
-          params: {
-            since: 1622485800,
-            until: 1623695400,
-            assigned_agent_id: 1,
-            inbox_id: 1,
-            team_id: 1,
-            sla_policy_id: 1,
-            label_list: ['label1'],
-          },
-        }
-      );
-    });
-    it('#download', () => {
-      SLAReportsAPI.download({
-        from: 1622485800,
-        to: 1623695400,
-        assigned_agent_id: 1,
-        inbox_id: 1,
-        team_id: 1,
-        sla_policy_id: 1,
-        label_list: ['label1'],
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/applied_slas/download',
-        {
-          params: {
-            since: 1622485800,
-            until: 1623695400,
-            assigned_agent_id: 1,
-            inbox_id: 1,
-            team_id: 1,
-            sla_policy_id: 1,
-            label_list: ['label1'],
-          },
-        }
-      );
-    });
-  });
-});
@@ -1,13 +1,6 @@
@import '~vue2-datepicker/scss/index';

 .date-picker {
-  // To be removed one SLA reports date picker is created
-  &.small {
-    .mx-input {
-      @apply h-8 text-sm;
-    }
-  }
-
  &.no-margin {
    .mx-input {
      @apply mb-0;
@@ -11,7 +11,6 @@ body {
    'Segoe UI',
    Roboto,
    'Helvetica Neue',
-    Tahoma,
    Arial,
    sans-serif !important;
  -moz-osx-font-smoothing: grayscale;
@@ -40,347 +40,3 @@
 .hide {
  @apply hidden;
 }
-
-@layer base {
-  // scss-lint:disable PropertySortOrder
-  :root {
-    --color-amber-25: 254 253 251;
-    --color-amber-50: 255 249 237;
-    --color-amber-75: 255 243 208;
-    --color-amber-100: 255 236 183;
-    --color-amber-200: 255 224 161;
-    --color-amber-300: 245 208 140;
-    --color-amber-400: 228 187 120;
-    --color-amber-500: 214 163 92;
-    --color-amber-600: 214 163 92;
-    --color-amber-700: 255 186 26;
-    --color-amber-800: 145 89 48;
-    --color-amber-900: 79 52 34;
-
-    --color-ash-100: 235 235 239;
-    --color-ash-200: 228 228 233;
-    --color-ash-25: 252 252 253;
-    --color-ash-300: 221 221 227;
-    --color-ash-400: 211 212 219;
-    --color-ash-50: 249 249 251;
-    --color-ash-500: 185 187 198;
-    --color-ash-600: 139 141 152;
-    --color-ash-700: 126 128 138;
-    --color-ash-75: 242 242 245;
-    --color-ash-800: 96 100 108;
-    --color-ash-900: 28 32 36;
-
-    --color-primary-25: 251 253 255;
-    --color-primary-50: 245 249 255;
-    --color-primary-75: 233 243 255;
-    --color-primary-100: 218 236 255;
-    --color-primary-200: 201 226 255;
-    --color-primary-300: 181 213 255;
-    --color-primary-400: 155 195 252;
-    --color-primary-500: 117 171 247;
-    --color-primary-600: 39 129 246;
-    --color-primary-700: 16 115 233;
-    --color-primary-800: 8 109 224;
-    --color-primary-900: 11 50 101;
-
-    --color-ruby-100: 255 220 225;
-    --color-ruby-200: 255 206 214;
-    --color-ruby-25: 255 252 253;
-    --color-ruby-300: 248 191 200;
-    --color-ruby-400: 239 172 184;
-    --color-ruby-50: 255 247 248;
-    --color-ruby-500: 229 146 163;
-    --color-ruby-600: 229 70 102;
-    --color-ruby-700: 220 59 93;
-    --color-ruby-75: 254 234 237;
-    --color-ruby-800: 202 36 77;
-    --color-ruby-900: 100 23 43;
-
-    --color-teal-100: 224 248 243;
-    --color-teal-200: 204 243 234;
-    --color-teal-25: 250 254 253;
-    --color-teal-300: 184 234 224;
-    --color-teal-400: 161 222 210;
-    --color-teal-50: 243 251 249;
-    --color-teal-500: 83 185 171;
-    --color-teal-600: 18 165 148;
-    --color-teal-700: 13 155 138;
-    --color-teal-75: 236 249 255;
-    --color-teal-800: 0 133 115;
-    --color-teal-900: 13 61 56;
-
-    --color-green-25: 251 254 252;
-    --color-green-50: 244 251 246;
-    --color-green-75: 230 246 235;
-    --color-green-100: 214 241 223;
-    --color-green-200: 196 232 209;
-    --color-green-300: 173 221 192;
-    --color-green-400: 142 206 170;
-    --color-green-500: 91 185 139;
-    --color-green-600: 48 164 108;
-    --color-green-700: 43 154 102;
-    --color-green-800: 33 131 88;
-    --color-green-900: 25 59 45;
-
-    --color-mint-25: 249 254 253;
-    --color-mint-50: 242 251 249;
-    --color-mint-75: 221 249 242;
-    --color-mint-100: 200 244 233;
-    --color-mint-200: 179 236 222;
-    --color-mint-300: 156 224 208;
-    --color-mint-400: 126 207 189;
-    --color-mint-500: 76 187 165;
-    --color-mint-600: 134 234 212;
-    --color-mint-700: 125 224 203;
-    --color-mint-800: 2 120 100;
-    --color-mint-900: 22 67 60;
-
-    --color-sky-25: 249 254 255;
-    --color-sky-50: 241 250 253;
-    --color-sky-75: 225 246 253;
-    --color-sky-100: 209 240 250;
-    --color-sky-200: 190 231 245;
-    --color-sky-300: 169 218 237;
-    --color-sky-400: 141 202 227;
-    --color-sky-500: 96 179 215;
-    --color-sky-600: 124 226 254;
-    --color-sky-700: 116 218 248;
-    --color-sky-800: 0 116 158;
-    --color-sky-900: 29 62 86;
-
-    --color-indigo-25: 253 253 254;
-    --color-indigo-50: 247 249 255;
-    --color-indigo-75: 237 242 254;
-    --color-indigo-100: 225 233 255;
-    --color-indigo-200: 210 222 255;
-    --color-indigo-300: 193 208 255;
-    --color-indigo-400: 171 189 249;
-    --color-indigo-500: 141 164 239;
-    --color-indigo-600: 62 99 221;
-    --color-indigo-700: 51 88 212;
-    --color-indigo-800: 58 91 199;
-    --color-indigo-900: 31 45 92;
-
-    --color-iris-25: 253 253 255;
-    --color-iris-50: 248 248 255;
-    --color-iris-75: 240 241 254;
-    --color-iris-100: 230 231 255;
-    --color-iris-200: 218 220 255;
-    --color-iris-300: 203 205 255;
-    --color-iris-400: 184 186 248;
-    --color-iris-500: 155 158 240;
-    --color-iris-600: 91 91 214;
-    --color-iris-700: 81 81 205;
-    --color-iris-800: 87 83 198;
-    --color-iris-900: 39 41 98;
-
-    --color-violet-25: 253 252 254;
-    --color-violet-50: 250 248 255;
-    --color-violet-75: 244 240 254;
-    --color-violet-100: 235 228 255;
-    --color-violet-200: 225 217 255;
-    --color-violet-300: 212 202 254;
-    --color-violet-400: 194 181 245;
-    --color-violet-500: 170 153 236;
-    --color-violet-600: 110 86 207;
-    --color-violet-700: 101 77 196;
-    --color-violet-800: 101 80 185;
-    --color-violet-900: 47 38 95;
-
-    --color-pink-25: 255 252 254;
-    --color-pink-50: 254 247 251;
-    --color-pink-75: 254 233 245;
-    --color-pink-100: 251 220 239;
-    --color-pink-200: 246 206 231;
-    --color-pink-300: 239 191 221;
-    --color-pink-400: 231 172 208;
-    --color-pink-500: 221 147 194;
-    --color-pink-600: 214 64 159;
-    --color-pink-700: 207 56 151;
-    --color-pink-800: 194 41 138;
-    --color-pink-900: 101 18 73;
-
-    --color-orange-25: 254 252 251;
-    --color-orange-50: 255 247 237;
-    --color-orange-75: 255 239 214;
-    --color-orange-100: 255 223 181;
-    --color-orange-200: 255 209 154;
-    --color-orange-300: 255 193 130;
-    --color-orange-400: 245 174 115;
-    --color-orange-500: 236 148 85;
-    --color-orange-600: 247 107 21;
-    --color-orange-700: 239 95 0;
-    --color-orange-800: 204 78 0;
-    --color-orange-900: 88 45 29;
-  }
-  // scss-lint:disable QualifyingElement
-  body.dark {
-    --color-amber-25: 31 19 0;
-    --color-amber-50: 37 24 4;
-    --color-amber-75: 48 32 11;
-    --color-amber-100: 57 39 15;
-    --color-amber-200: 67 46 18;
-    --color-amber-300: 83 57 22;
-    --color-amber-400: 111 77 29;
-    --color-amber-500: 169 118 42;
-    --color-amber-600: 169 118 42;
-    --color-amber-700: 255 203 71;
-    --color-amber-800: 255 204 77;
-    --color-amber-900: 255 231 179;
-
-    --color-ash-100: 46 48 53;
-    --color-ash-200: 53 55 60;
-    --color-ash-25: 24 24 26;
-    --color-ash-300: 60 63 68;
-    --color-ash-400: 70 75 80;
-    --color-ash-50: 27 27 31;
-    --color-ash-500: 90 97 101;
-    --color-ash-600: 105 110 119;
-    --color-ash-700: 120 127 133;
-    --color-ash-75: 39 40 45;
-    --color-ash-800: 173 177 184;
-    --color-ash-900: 237 238 240;
-
-    --color-primary-25: 10 17 28;
-    --color-primary-50: 15 24 38;
-    --color-primary-75: 15 39 72;
-    --color-primary-100: 10 49 99;
-    --color-primary-200: 18 61 117;
-    --color-primary-300: 29 74 134;
-    --color-primary-400: 40 89 156;
-    --color-primary-500: 48 106 186;
-    --color-primary-600: 39 129 246;
-    --color-primary-700: 21 116 231;
-    --color-primary-800: 126 182 255;
-    --color-primary-900: 205 227 255;
-
-    --color-ruby-100: 78 19 37;
-    --color-ruby-200: 94 26 46;
-    --color-ruby-25: 25 17 19;
-    --color-ruby-300: 111 37 57;
-    --color-ruby-400: 136 52 71;
-    --color-ruby-50: 30 21 23;
-    --color-ruby-500: 179 68 90;
-    --color-ruby-600: 229 70 102;
-    --color-ruby-700: 236 90 114;
-    --color-ruby-75: 58 20 30;
-    --color-ruby-800: 255 148 157;
-    --color-ruby-900: 254 210 225;
-
-    --color-teal-100: 2 59 55;
-    --color-teal-200: 8 72 67;
-    --color-teal-25: 13 21 20;
-    --color-teal-300: 28 105 97;
-    --color-teal-400: 28 105 97;
-    --color-teal-50: 17 28 27;
-    --color-teal-500: 32 126 115;
-    --color-teal-600: 41 163 131;
-    --color-teal-700: 14 179 158;
-    --color-teal-75: 13 45 42;
-    --color-teal-800: 11 216 182;
-    --color-teal-900: 173 240 221;
-
-    --color-green-25: 14 21 18;
-    --color-green-50: 18 27 23;
-    --color-green-75: 19 45 33;
-    --color-green-100: 17 59 41;
-    --color-green-200: 23 73 51;
-    --color-green-300: 32 87 62;
-    --color-green-400: 40 104 74;
-    --color-green-500: 47 124 87;
-    --color-green-600: 48 164 108;
-    --color-green-700: 51 176 116;
-    --color-green-800: 61 214 140;
-    --color-green-900: 177 241 203;
-
-    --color-mint-25: 14 21 21;
-    --color-mint-50: 15 27 27;
-    --color-mint-75: 9 44 43;
-    --color-mint-100: 0 58 56;
-    --color-mint-200: 0 71 68;
-    --color-mint-300: 16 86 80;
-    --color-mint-400: 30 104 95;
-    --color-mint-500: 39 127 112;
-    --color-mint-600: 134 234 212;
-    --color-mint-700: 168 245 229;
-    --color-mint-800: 88 213 186;
-    --color-mint-900: 196 245 225;
-
-    --color-sky-25: 14 21 21;
-    --color-sky-50: 15 27 27;
-    --color-sky-75: 9 44 43;
-    --color-sky-100: 0 58 56;
-    --color-sky-200: 0 71 68;
-    --color-sky-300: 16 86 80;
-    --color-sky-400: 30 104 95;
-    --color-sky-500: 39 127 112;
-    --color-sky-600: 134 234 212;
-    --color-sky-700: 168 245 229;
-    --color-sky-800: 88 213 186;
-    --color-sky-900: 196 245 225;
-
-    --color-indigo-25: 17 19 31;
-    --color-indigo-50: 20 23 38;
-    --color-indigo-75: 24 36 73;
-    --color-indigo-100: 29 46 98;
-    --color-indigo-200: 37 57 116;
-    --color-indigo-300: 48 67 132;
-    --color-indigo-400: 58 79 151;
-    --color-indigo-500: 67 93 177;
-    --color-indigo-600: 62 99 221;
-    --color-indigo-700: 84 114 228;
-    --color-indigo-800: 158 177 255;
-    --color-indigo-900: 214 225 255;
-
-    --color-iris-25: 19 19 30;
-    --color-iris-50: 23 22 37;
-    --color-iris-75: 32 34 72;
-    --color-iris-100: 38 42 101;
-    --color-iris-200: 48 51 116;
-    --color-iris-300: 61 62 130;
-    --color-iris-400: 74 74 149;
-    --color-iris-500: 89 88 177;
-    --color-iris-600: 91 91 214;
-    --color-iris-700: 110 106 222;
-    --color-iris-800: 177 169 255;
-    --color-iris-900: 224 223 254;
-
-    --color-violet-25: 20 18 31;
-    --color-violet-50: 27 21 37;
-    --color-violet-75: 41 31 67;
-    --color-violet-100: 51 37 91;
-    --color-violet-200: 60 46 105;
-    --color-violet-300: 71 56 118;
-    --color-violet-400: 86 70 139;
-    --color-violet-500: 105 88 173;
-    --color-violet-600: 110 86 207;
-    --color-violet-700: 125 102 217;
-    --color-violet-800: 186 167 255;
-    --color-violet-900: 226 221 254;
-
-    --color-pink-25: 25 17 23;
-    --color-pink-50: 33 18 29;
-    --color-pink-75: 55 23 47;
-    --color-pink-100: 75 20 61;
-    --color-pink-200: 89 28 71;
-    --color-pink-300: 105 41 85;
-    --color-pink-400: 131 56 105;
-    --color-pink-500: 168 72 133;
-    --color-pink-600: 214 64 159;
-    --color-pink-700: 222 81 168;
-    --color-pink-800: 255 141 204;
-    --color-pink-900: 253 209 234;
-    --color-orange-25: 23 18 14;
-    --color-orange-50: 30 22 15;
-    --color-orange-75: 51 30 11;
-    --color-orange-100: 70 33 0;
-    --color-orange-200: 86 40 0;
-    --color-orange-300: 102 53 12;
-    --color-orange-400: 126 69 29;
-    --color-orange-500: 163 88 41;
-    --color-orange-600: 247 107 21;
-    --color-orange-700: 255 128 31;
-    --color-orange-800: 255 160 87;
-    --color-orange-900: 255 224 194;
-  }
-}
@@ -153,29 +153,6 @@
 }

 .multiselect-wrap--small {
-  // To be removed one SLA reports date picker is created
-  &.tiny {
-    .multiselect.no-margin {
-      @apply min-h-[32px];
-    }
-
-    .multiselect__select {
-      @apply min-h-[32px] h-8;
-
-      &::before {
-        @apply top-[60%];
-      }
-    }
-
-    .multiselect__tags {
-      @apply min-h-[32px] max-h-[32px];
-
-      .multiselect__single {
-        @apply pt-1 pb-1;
-      }
-    }
-  }
-
  .multiselect__tags,
  .multiselect__input,
  .multiselect {
@@ -12,6 +12,7 @@ h6 {

 p {
  text-rendering: optimizeLegibility;
+  word-spacing: 0.12em;

  @apply mb-2 leading-[1.65] text-sm;

@@ -62,12 +63,12 @@ input:focus {
 }

 // Inputs
-input[type='text']:not(.reset-base),
-input[type='number']:not(.reset-base),
-input[type='password']:not(.reset-base),
-input[type='date']:not(.reset-base),
-input[type='email']:not(.reset-base),
-input[type='url']:not(.reset-base) {
+input[type='text'],
+input[type='number'],
+input[type='password'],
+input[type='date'],
+input[type='email'],
+input[type='url'] {
  @apply block box-border w-full transition-colors focus:border-woot-500 dark:focus:border-woot-600 duration-[0.25s] ease-[ease-in-out] h-10 appearance-none mx-0 mt-0 mb-4 p-2 rounded-md text-base font-normal bg-white dark:bg-slate-900 focus:bg-white focus:dark:bg-slate-900 text-slate-900 dark:text-slate-100 border border-solid border-slate-200 dark:border-slate-600;

  &[disabled] {
@@ -118,7 +118,7 @@ button {
    @apply border border-woot-500 bg-transparent dark:bg-transparent dark:border-woot-500 text-woot-500 dark:text-woot-500 hover:bg-woot-50 dark:hover:bg-woot-900;

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

    &.success {
@@ -1,9 +1,9 @@
 <template>
  <button
-    class="bg-white dark:bg-slate-900 cursor-pointer flex flex-col transition-all duration-200 ease-in -m-px py-4 px-0 items-center border border-solid border-slate-25 dark:border-slate-800 hover:border-woot-500 dark:hover:border-woot-500 hover:shadow-md hover:z-50 disabled:opacity-60"
+    class="sm:w-[50%] md:w-1/3 lg:w-1/4 bg-white dark:bg-slate-900 cursor-pointer flex flex-col transition-all duration-200 ease-in -m-px py-4 px-0 items-center border border-solid border-slate-25 dark:border-slate-800 hover:border-woot-500 dark:hover:border-woot-500 hover:shadow-md hover:z-50 disabled:opacity-60"
    @click="$emit('click')"
  >
-    <img :src="src" :alt="title" class="w-1/2 my-4 mx-auto" />
+    <img :src="src" :alt="title" class="w-[50%] my-4 mx-auto" />
    <h3
      class="text-slate-800 dark:text-slate-100 text-base text-center capitalize"
    >
@@ -1,23 +1,85 @@
 <template>
  <div
-    class="flex flex-col flex-shrink-0 overflow-hidden border-r conversations-list-wrap rtl:border-r-0 rtl:border-l border-slate-50 dark:border-slate-800/50"
-    :class="[
-      { hidden: !showConversationList },
-      isOnExpandedLayout ? 'basis-full' : 'flex-basis-clamp',
-    ]"
+    class="conversations-list-wrap flex-basis-clamp flex-shrink-0 overflow-hidden flex flex-col border-r rtl:border-r-0 rtl:border-l border-slate-50 dark:border-slate-800/50"
+    :class="{
+      hide: !showConversationList,
+      'list--full-width': isOnExpandedLayout,
+    }"
  >
    <slot />
-    <chat-list-header
-      :page-title="pageTitle"
-      :has-applied-filters="hasAppliedFilters"
-      :has-active-folders="hasActiveFolders"
-      :active-status="activeStatus"
-      @add-folders="onClickOpenAddFoldersModal"
-      @delete-folders="onClickOpenDeleteFoldersModal"
-      @filters-modal="onToggleAdvanceFiltersModal"
-      @reset-filters="resetAndFetchData"
-      @basic-filter-change="onBasicFilterChange"
-    />
+    <div
+      class="flex items-center justify-between py-0 px-4"
+      :class="{
+        'pb-3 border-b border-slate-75 dark:border-slate-700':
+          hasAppliedFiltersOrActiveFolders,
+      }"
+    >
+      <div class="flex max-w-[85%] justify-center items-center">
+        <h1
+          class="text-xl break-words overflow-hidden whitespace-nowrap font-medium text-ellipsis text-black-900 dark:text-slate-100 mb-0"
+          :title="pageTitle"
+        >
+          {{ pageTitle }}
+        </h1>
+        <span
+          v-if="!hasAppliedFiltersOrActiveFolders"
+          class="p-1 my-0.5 mx-1 rounded-md capitalize bg-slate-50 dark:bg-slate-800 text-xxs text-slate-600 dark:text-slate-300"
+        >
+          {{ $t(`CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.${activeStatus}.TEXT`) }}
+        </span>
+      </div>
+      <div class="flex items-center gap-1">
+        <div v-if="hasAppliedFilters && !hasActiveFolders">
+          <woot-button
+            v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.ADD.SAVE_BUTTON')"
+            size="tiny"
+            variant="smooth"
+            color-scheme="secondary"
+            icon="save"
+            @click="onClickOpenAddFoldersModal"
+          />
+          <woot-button
+            v-tooltip.top-end="$t('FILTER.CLEAR_BUTTON_LABEL')"
+            size="tiny"
+            variant="smooth"
+            color-scheme="alert"
+            icon="dismiss-circle"
+            @click="resetAndFetchData"
+          />
+        </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"
+            variant="smooth"
+            color-scheme="alert"
+            icon="delete"
+            @click="onClickOpenDeleteFoldersModal"
+          />
+        </div>
+        <woot-button
+          v-else
+          v-tooltip.right="$t('FILTER.TOOLTIP_LABEL')"
+          variant="smooth"
+          color-scheme="secondary"
+          icon="filter"
+          size="tiny"
+          @click="onToggleAdvanceFiltersModal"
+        />
+        <conversation-basic-filter
+          v-if="!hasAppliedFiltersOrActiveFolders"
+          @changeFilter="onBasicFilterChange"
+        />
+      </div>
+    </div>

    <add-custom-views
      v-if="showAddFoldersModal"
@@ -45,7 +107,7 @@

    <p
      v-if="!chatListLoading && !conversationList.length"
-      class="flex items-center justify-center p-4 overflow-auto"
+      class="overflow-auto p-4 flex justify-center items-center"
    >
      {{ $t('CHAT_LIST.LIST.404') }}
    </p>
@@ -65,7 +127,7 @@
    />
    <div
      ref="conversationList"
-      class="flex-1 conversations-list"
+      class="conversations-list flex-1"
      :class="{ 'overflow-hidden': isContextMenuOpen }"
    >
      <virtual-list
@@ -74,16 +136,16 @@
        :data-sources="conversationList"
        :data-component="itemComponent"
        :extra-props="virtualListExtraProps"
-        class="w-full h-full overflow-auto"
+        class="w-full overflow-auto h-full"
        footer-tag="div"
      >
        <template #footer>
          <div v-if="chatListLoading" class="text-center">
-            <span class="mt-4 mb-4 spinner" />
+            <span class="spinner mt-4 mb-4" />
          </div>
          <p
            v-if="showEndOfListMessage"
-            class="p-4 text-center text-slate-400 dark:text-slate-300"
+            class="text-center text-slate-400 dark:text-slate-300 p-4"
          >
            {{ $t('CHAT_LIST.EOF') }}
          </p>
@@ -111,15 +173,6 @@
        @updateFolder="onUpdateSavedFilter"
      />
    </woot-modal>
-    <woot-modal
-      :show.sync="showCustomSnoozeModal"
-      :on-close="hideCustomSnoozeModal"
-    >
-      <custom-snooze-modal
-        @close="hideCustomSnoozeModal"
-        @choose-time="chooseSnoozeTime"
-      />
-    </woot-modal>
  </div>
 </template>

@@ -127,12 +180,12 @@
 import { mapGetters } from 'vuex';
 import VirtualList from 'vue-virtual-scroll-list';

-import ChatListHeader from './ChatListHeader.vue';
 import ConversationAdvancedFilter from './widgets/conversation/ConversationAdvancedFilter.vue';
+import ConversationBasicFilter from './widgets/conversation/ConversationBasicFilter.vue';
 import ChatTypeTabs from './widgets/ChatTypeTabs.vue';
 import ConversationItem from './ConversationItem.vue';
 import timeMixin from '../mixins/time';
-import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
+import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import conversationMixin from '../mixins/conversations';
 import wootConstants from 'dashboard/constants/globals';
 import advancedFilterTypes from './widgets/conversation/advancedFilterItems';
@@ -146,21 +199,21 @@ import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
 import countries from 'shared/constants/countries';
 import { generateValuesForEditCustomViews } from 'dashboard/helper/customViewsHelper';
+
+import {
+  hasPressedAltAndJKey,
+  hasPressedAltAndKKey,
+} from 'shared/helpers/KeyboardHelpers';
 import { conversationListPageURL } from '../helper/URLHelper';
 import {
  isOnMentionsView,
  isOnUnattendedView,
 } from '../store/modules/conversations/helpers/actionHelpers';
 import { CONVERSATION_EVENTS } from '../helper/AnalyticsHelper/events';
-import { CMD_SNOOZE_CONVERSATION } from 'dashboard/routes/dashboard/commands/commandBarBusEvents';
-import { findSnoozeTime } from 'dashboard/helper/snoozeHelpers';
-import { getUnixTime } from 'date-fns';
-import CustomSnoozeModal from 'dashboard/components/CustomSnoozeModal.vue';
 import IntersectionObserver from './IntersectionObserver.vue';

 export default {
  components: {
-    ChatListHeader,
    AddCustomViews,
    ChatTypeTabs,
    // eslint-disable-next-line vue/no-unused-components
@@ -168,14 +221,14 @@ export default {
    ConversationAdvancedFilter,
    DeleteCustomViews,
    ConversationBulkActions,
+    ConversationBasicFilter,
    IntersectionObserver,
    VirtualList,
-    CustomSnoozeModal,
  },
  mixins: [
    timeMixin,
    conversationMixin,
-    keyboardEventListenerMixins,
+    eventListenerMixins,
    alertMixin,
    filterMixin,
    uiSettingsMixin,
@@ -240,6 +293,7 @@ export default {
      foldersQuery: {},
      showAddFoldersModal: false,
      showDeleteFoldersModal: false,
+      selectedConversations: [],
      selectedInboxes: [],
      isContextMenuOpen: false,
      appliedFilter: [],
@@ -247,7 +301,6 @@ export default {
        root: this.$refs.conversationList,
        rootMargin: '100px 0px 100px 0px',
      },
-      showCustomSnoozeModal: false,

      itemComponent: ConversationItem,
      // virtualListExtraProps is to pass the props to the conversationItem component.
@@ -268,7 +321,6 @@ export default {
      chatLists: 'getAllConversations',
      mineChatsList: 'getMineChats',
      allChatList: 'getAllStatusChats',
-      chatListFilters: 'getChatListFilters',
      unAssignedChatsList: 'getUnAssignedChats',
      chatListLoading: 'getChatListLoadingStatus',
      currentUserID: 'getCurrentUserID',
@@ -282,18 +334,23 @@ export default {
      inboxesList: 'inboxes/getInboxes',
      campaigns: 'campaigns/getAllCampaigns',
      labels: 'labels/getLabels',
-      selectedConversations: 'bulkActions/getSelectedConversationIds',
-      contextMenuChatId: 'getContextMenuChatId',
    }),
    hasAppliedFilters() {
      return this.appliedFilters.length !== 0;
    },
    hasActiveFolders() {
-      return Boolean(this.activeFolder && this.foldersId !== 0);
+      return this.activeFolder && this.foldersId !== 0;
    },
    hasAppliedFiltersOrActiveFolders() {
      return this.hasAppliedFilters || this.hasActiveFolders;
    },
+    savedFoldersValue() {
+      if (this.hasActiveFolders) {
+        const payload = this.activeFolder.query;
+        this.fetchSavedFilteredConversations(payload);
+      }
+      return {};
+    },
    showEndOfListMessage() {
      return (
        this.conversationList.length &&
@@ -369,6 +426,7 @@ export default {
        labels: this.label ? [this.label] : undefined,
        teamId: this.teamId || undefined,
        conversationType: this.conversationType || undefined,
+        folders: this.hasActiveFolders ? this.savedFoldersValue : undefined,
      };
    },
    conversationListPagination() {
@@ -481,13 +539,7 @@ export default {
      this.resetAndFetchData();
      this.updateVirtualListProps('conversationType', this.conversationType);
    },
-    activeFolder(newVal, oldVal) {
-      if (newVal !== oldVal) {
-        this.$store.dispatch(
-          'customViews/setActiveConversationFolder',
-          newVal || null
-        );
-      }
+    activeFolder() {
      this.resetAndFetchData();
      this.updateVirtualListProps('foldersId', this.foldersId);
    },
@@ -497,14 +549,8 @@ export default {
    showAssigneeInConversationCard(newVal) {
      this.updateVirtualListProps('showAssignee', newVal);
    },
-    conversationFilters(newVal, oldVal) {
-      if (newVal !== oldVal) {
-        this.$store.dispatch('updateChatListFilters', newVal);
-      }
-    },
  },
  mounted() {
-    this.$store.dispatch('setChatListFilters', this.conversationFilters);
    this.setFiltersFromUISettings();
    this.$store.dispatch('setChatStatusFilter', this.activeStatus);
    this.$store.dispatch('setChatSortFilter', this.activeSortBy);
@@ -514,14 +560,9 @@ export default {
      this.$store.dispatch('campaigns/get');
    }

-    this.$emitter.on('fetch_conversation_stats', () => {
+    bus.$on('fetch_conversation_stats', () => {
      this.$store.dispatch('conversationStats/get', this.conversationFilters);
    });
-
-    this.$emitter.on(CMD_SNOOZE_CONVERSATION, this.onCmdSnoozeConversation);
-  },
-  beforeDestroy() {
-    this.$emitter.off(CMD_SNOOZE_CONVERSATION, this.onCmdSnoozeConversation);
  },
  methods: {
    updateVirtualListProps(key, value) {
@@ -650,40 +691,30 @@ export default {
        lastConversationIndex,
      };
    },
-    handlePreviousConversation() {
-      const { allConversations, activeConversationIndex } =
-        this.getKeyboardListenerParams();
-      if (activeConversationIndex === -1) {
-        allConversations[0].click();
+    handleKeyEvents(e) {
+      if (hasPressedAltAndJKey(e)) {
+        const { allConversations, activeConversationIndex } =
+          this.getKeyboardListenerParams();
+        if (activeConversationIndex === -1) {
+          allConversations[0].click();
+        }
+        if (activeConversationIndex >= 1) {
+          allConversations[activeConversationIndex - 1].click();
+        }
      }
-      if (activeConversationIndex >= 1) {
-        allConversations[activeConversationIndex - 1].click();
+      if (hasPressedAltAndKKey(e)) {
+        const {
+          allConversations,
+          activeConversationIndex,
+          lastConversationIndex,
+        } = this.getKeyboardListenerParams();
+        if (activeConversationIndex === -1) {
+          allConversations[lastConversationIndex].click();
+        } else if (activeConversationIndex < lastConversationIndex) {
+          allConversations[activeConversationIndex + 1].click();
+        }
      }
    },
-    handleNextConversation() {
-      const {
-        allConversations,
-        activeConversationIndex,
-        lastConversationIndex,
-      } = this.getKeyboardListenerParams();
-      if (activeConversationIndex === -1) {
-        allConversations[lastConversationIndex].click();
-      } else if (activeConversationIndex < lastConversationIndex) {
-        allConversations[activeConversationIndex + 1].click();
-      }
-    },
-    getKeyboardEvents() {
-      return {
-        'Alt+KeyJ': {
-          action: () => this.handlePreviousConversation(),
-          allowOnFocusedInput: true,
-        },
-        'Alt+KeyK': {
-          action: () => this.handleNextConversation(),
-          allowOnFocusedInput: true,
-        },
-      };
-    },
    resetAndFetchData() {
      this.appliedFilter = [];
      this.resetBulkActions();
@@ -700,9 +731,8 @@ export default {
      this.fetchConversations();
    },
    fetchConversations() {
-      this.$store.dispatch('updateChatListFilters', this.conversationFilters);
      this.$store
-        .dispatch('fetchAllConversations')
+        .dispatch('fetchAllConversations', this.conversationFilters)
        .then(this.emitConversationLoaded);
    },
    loadMoreConversations() {
@@ -742,7 +772,7 @@ export default {
    updateAssigneeTab(selectedTab) {
      if (this.activeAssigneeTab !== selectedTab) {
        this.resetBulkActions();
-        this.$emitter.emit('clearSearchInput');
+        bus.$emit('clearSearchInput');
        this.activeAssigneeTab = selectedTab;
        if (!this.currentPage) {
          this.fetchConversations();
@@ -764,7 +794,7 @@ export default {
      });
    },
    resetBulkActions() {
-      this.$store.dispatch('bulkActions/clearSelectedConversationIds');
+      this.selectedConversations = [];
      this.selectedInboxes = [];
    },
    onBasicFilterChange(value, type) {
@@ -795,16 +825,12 @@ export default {
      return this.selectedConversations.includes(id);
    },
    selectConversation(conversationId, inboxId) {
-      this.$store.dispatch(
-        'bulkActions/setSelectedConversationIds',
-        conversationId
-      );
+      this.selectedConversations.push(conversationId);
      this.selectedInboxes.push(inboxId);
    },
    deSelectConversation(conversationId, inboxId) {
-      this.$store.dispatch(
-        'bulkActions/removeSelectedConversationIds',
-        conversationId
+      this.selectedConversations = this.selectedConversations.filter(
+        item => item !== conversationId
      );
      this.selectedInboxes = this.selectedInboxes.filter(
        item => item !== inboxId
@@ -812,10 +838,7 @@ export default {
    },
    selectAllConversations(check) {
      if (check) {
-        this.$store.dispatch(
-          'bulkActions/setSelectedConversationIds',
-          this.conversationList.map(item => item.id)
-        );
+        this.selectedConversations = this.conversationList.map(item => item.id);
        this.selectedInboxes = this.conversationList.map(item => item.inbox_id);
      } else {
        this.resetBulkActions();
@@ -831,7 +854,7 @@ export default {
            assignee_id: agent.id,
          },
        });
-        this.$store.dispatch('bulkActions/clearSelectedConversationIds');
+        this.selectedConversations = [];
        if (conversationId) {
          this.showAlert(
            this.$t(
@@ -929,7 +952,7 @@ export default {
            add: labels,
          },
        });
-        this.$store.dispatch('bulkActions/clearSelectedConversationIds');
+        this.selectedConversations = [];
        if (conversationId) {
          this.showAlert(
            this.$t(
@@ -956,13 +979,13 @@ export default {
            team_id: team.id,
          },
        });
-        this.$store.dispatch('bulkActions/clearSelectedConversationIds');
+        this.selectedConversations = [];
        this.showAlert(this.$t('BULK_ACTION.TEAMS.ASSIGN_SUCCESFUL'));
      } catch (err) {
        this.showAlert(this.$t('BULK_ACTION.TEAMS.ASSIGN_FAILED'));
      }
    },
-    async onUpdateConversations(status, snoozedUntil) {
+    async onUpdateConversations(status) {
      try {
        await this.$store.dispatch('bulkActions/process', {
          type: 'Conversation',
@@ -970,9 +993,8 @@ export default {
          fields: {
            status,
          },
-          snoozed_until: snoozedUntil,
        });
-        this.$store.dispatch('bulkActions/clearSelectedConversationIds');
+        this.selectedConversations = [];
        this.showAlert(this.$t('BULK_ACTION.UPDATE.UPDATE_SUCCESFUL'));
      } catch (err) {
        this.showAlert(this.$t('BULK_ACTION.UPDATE.UPDATE_FAILED'));
@@ -993,49 +1015,12 @@ export default {
    allSelectedConversationsStatus(status) {
      if (!this.selectedConversations.length) return false;
      return this.selectedConversations.every(item => {
-        return this.$store.getters.getConversationById(item)?.status === status;
+        return this.$store.getters.getConversationById(item).status === status;
      });
    },
    onContextMenuToggle(state) {
      this.isContextMenuOpen = state;
    },
-    onCmdSnoozeConversation(snoozeType) {
-      if (snoozeType === wootConstants.SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME) {
-        this.showCustomSnoozeModal = true;
-      } else {
-        this.toggleStatus(
-          wootConstants.STATUS_TYPE.SNOOZED,
-          findSnoozeTime(snoozeType) || null
-        );
-      }
-    },
-    chooseSnoozeTime(customSnoozeTime) {
-      this.showCustomSnoozeModal = false;
-      if (customSnoozeTime) {
-        this.toggleStatus(
-          wootConstants.STATUS_TYPE.SNOOZED,
-          getUnixTime(customSnoozeTime)
-        );
-      }
-    },
-    toggleStatus(status, snoozedUntil) {
-      this.$store
-        .dispatch('toggleStatus', {
-          conversationId: this.currentChat?.id || this.contextMenuChatId,
-          status,
-          snoozedUntil,
-        })
-        .then(() => {
-          this.$store.dispatch('setContextMenuChatId', null);
-          this.showAlert(this.$t('CONVERSATION.CHANGE_STATUS'));
-        });
-    },
-    hideCustomSnoozeModal() {
-      // if we select custom snooze and then the custom snooze modal is open
-      // Then if the custom snooze modal is closed and set the context menu chat id to null
-      this.$store.dispatch('setContextMenuChatId', null);
-      this.showCustomSnoozeModal = false;
-    },
  },
 };
 </script>
@@ -1049,10 +1034,24 @@ export default {
 </style>

 <style scoped lang="scss">
+.conversations-list-wrap {
+  &.hide {
+    @apply hidden;
+  }
+
+  &.list--full-width {
+    @apply basis-full;
+  }
+}
+
 .conversations-list {
  @apply overflow-hidden hover:overflow-y-auto;
 }

+.load-more--button {
+  @apply text-center rounded-none;
+}
+
 .tab--chat-type {
  @apply py-0 px-4;

@@ -1,115 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import ConversationBasicFilter from './widgets/conversation/ConversationBasicFilter.vue';
-
-const props = defineProps({
-  pageTitle: {
-    type: String,
-    required: true,
-  },
-  hasAppliedFilters: {
-    type: Boolean,
-    required: true,
-  },
-  hasActiveFolders: {
-    type: Boolean,
-    required: true,
-  },
-  activeStatus: {
-    type: String,
-    required: true,
-  },
-});
-
-const emits = defineEmits([
-  'add-folders',
-  'delete-folders',
-  'reset-filters',
-  'basic-filter-change',
-  'filters-modal',
-]);
-
-const onBasicFilterChange = (value, type) => {
-  emits('basic-filter-change', value, type);
-};
-
-const hasAppliedFiltersOrActiveFolders = computed(() => {
-  return props.hasAppliedFilters || props.hasActiveFolders;
-});
-</script>
-
-<template>
-  <div
-    class="flex items-center justify-between px-4 py-0"
-    :class="{
-      'pb-3 border-b border-slate-75 dark:border-slate-700':
-        hasAppliedFiltersOrActiveFolders,
-    }"
-  >
-    <div class="flex max-w-[85%] justify-center items-center">
-      <h1
-        class="text-xl font-medium break-words truncate text-black-900 dark:text-slate-100"
-        :title="pageTitle"
-      >
-        {{ pageTitle }}
-      </h1>
-      <span
-        v-if="!hasAppliedFiltersOrActiveFolders"
-        class="p-1 my-0.5 mx-1 rounded-md capitalize bg-slate-50 dark:bg-slate-800 text-xxs text-slate-600 dark:text-slate-300"
-      >
-        {{ $t(`CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.${activeStatus}.TEXT`) }}
-      </span>
-    </div>
-    <div class="flex items-center gap-1">
-      <div v-if="hasAppliedFilters && !hasActiveFolders">
-        <woot-button
-          v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.ADD.SAVE_BUTTON')"
-          size="tiny"
-          variant="smooth"
-          color-scheme="secondary"
-          icon="save"
-          @click="emits('add-folders')"
-        />
-        <woot-button
-          v-tooltip.top-end="$t('FILTER.CLEAR_BUTTON_LABEL')"
-          size="tiny"
-          variant="smooth"
-          color-scheme="alert"
-          icon="dismiss-circle"
-          @click="emits('reset-filters')"
-        />
-      </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="emits('filters-modal')"
-        />
-        <woot-button
-          v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.DELETE.DELETE_BUTTON')"
-          size="tiny"
-          variant="smooth"
-          color-scheme="alert"
-          icon="delete"
-          @click="emits('delete-folders')"
-        />
-      </div>
-      <woot-button
-        v-else
-        v-tooltip.right="$t('FILTER.TOOLTIP_LABEL')"
-        variant="smooth"
-        color-scheme="secondary"
-        icon="filter"
-        size="tiny"
-        @click="emits('filters-modal')"
-      />
-      <conversation-basic-filter
-        v-if="!hasAppliedFiltersOrActiveFolders"
-        @changeFilter="onBasicFilterChange"
-      />
-    </div>
-  </div>
-</template>
@@ -25,10 +25,8 @@
 <script>
 import 'highlight.js/styles/default.css';
 import { copyTextToClipboard } from 'shared/helpers/clipboard';
-import alertMixin from 'shared/mixins/alertMixin';

 export default {
-  mixins: [alertMixin],
  props: {
    script: {
      type: String,
@@ -61,7 +59,7 @@ export default {
    async onCopy(e) {
      e.preventDefault();
      await copyTextToClipboard(this.script);
-      this.showAlert(this.$t('COMPONENTS.CODE.COPY_SUCCESSFUL'));
+      bus.$emit('newToastMessage', this.$t('COMPONENTS.CODE.COPY_SUCCESSFUL'));
    },
  },
 };
@@ -2,32 +2,23 @@
  <div class="py-3 px-4">
    <div class="flex items-center mb-1">
      <h4 class="text-sm flex items-center m-0 w-full error">
-        <div v-if="isAttributeTypeCheckbox" class="flex items-center">
+        <div v-if="isAttributeTypeCheckbox" class="checkbox-wrap">
          <input
            v-model="editedValue"
-            class="!my-0 mr-2 ml-0"
+            class="checkbox"
            type="checkbox"
            @change="onUpdate"
          />
        </div>
        <div class="flex items-center justify-between w-full">
          <span
-            class="w-full inline-flex gap-1.5 items-start font-medium whitespace-nowrap text-sm mb-0"
-            :class="
-              $v.editedValue.$error
-                ? 'text-red-400 dark:text-red-500'
-                : 'text-slate-800 dark:text-slate-100'
-            "
+            class="attribute-name w-full text-slate-800 dark:text-slate-100 font-medium text-sm mb-0"
+            :class="{ error: $v.editedValue.$error }"
          >
            {{ label }}
-            <helper-text-popup
-              v-if="description"
-              :message="description"
-              class="mt-0.5"
-            />
          </span>
          <woot-button
-            v-if="showActions && value"
+            v-if="showActions"
            v-tooltip.left="$t('CUSTOM_ATTRIBUTES.ACTIONS.DELETE')"
            variant="link"
            size="medium"
@@ -40,13 +31,13 @@
      </h4>
    </div>
    <div v-if="notAttributeTypeCheckboxAndList">
-      <div v-if="isEditing" v-on-clickaway="onClickAway">
+      <div v-show="isEditing">
        <div class="mb-2 w-full flex items-center">
          <input
            ref="inputfield"
            v-model="editedValue"
            :type="inputType"
-            class="!h-8 ltr:!rounded-r-none rtl:!rounded-l-none !mb-0 !text-sm"
+            class="!h-8 ltr:rounded-r-none rtl:rounded-l-none !mb-0 !text-sm"
            autofocus="true"
            :class="{ error: $v.editedValue.$error }"
            @blur="$v.editedValue.$touch"
@@ -70,7 +61,7 @@
      </div>
      <div
        v-show="!isEditing"
-        class="flex group"
+        class="value--view"
        :class="{ 'is-editable': showActions }"
      >
        <a
@@ -78,25 +69,25 @@
          :href="hrefURL"
          target="_blank"
          rel="noopener noreferrer"
-          class="group-hover:bg-slate-50 group-hover:dark:bg-slate-700 inline-block rounded-sm mb-0 break-all py-0.5 px-1"
+          class="value inline-block rounded-sm mb-0 break-all py-0.5 px-1"
        >
          {{ urlValue }}
        </a>
        <p
          v-else
-          class="group-hover:bg-slate-50 group-hover:dark:bg-slate-700 inline-block rounded-sm mb-0 break-all py-0.5 px-1"
+          class="value inline-block rounded-sm mb-0 break-all py-0.5 px-1"
        >
          {{ displayValue || '---' }}
        </p>
        <div class="flex max-w-[2rem] gap-1 ml-1 rtl:mr-1 rtl:ml-0">
          <woot-button
-            v-if="showActions && value"
+            v-if="showActions"
            v-tooltip="$t('CUSTOM_ATTRIBUTES.ACTIONS.COPY')"
            variant="link"
            size="small"
            color-scheme="secondary"
            icon="clipboard"
-            class-names="hidden group-hover:flex !w-6 flex-shrink-0"
+            class-names="edit-button"
            @click="onCopy"
          />
          <woot-button
@@ -106,7 +97,7 @@
            size="small"
            color-scheme="secondary"
            icon="edit"
-            class-names="hidden group-hover:flex !w-6 flex-shrink-0"
+            class-names="edit-button"
            @click="onEdit"
          />
        </div>
@@ -139,21 +130,17 @@ import { format, parseISO } from 'date-fns';
 import { required, url } from 'vuelidate/lib/validators';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import MultiselectDropdown from 'shared/components/ui/MultiselectDropdown.vue';
-import HelperTextPopup from 'dashboard/components/ui/HelperTextPopup.vue';
 import { isValidURL } from '../helper/URLHelper';
 import customAttributeMixin from '../mixins/customAttributeMixin';
-
 const DATE_FORMAT = 'yyyy-MM-dd';

 export default {
  components: {
    MultiselectDropdown,
-    HelperTextPopup,
  },
  mixins: [customAttributeMixin],
  props: {
    label: { type: String, required: true },
-    description: { type: String, default: '' },
    values: { type: Array, default: () => [] },
    value: { type: [String, Number, Boolean], default: '' },
    showActions: { type: Boolean, default: false },
@@ -173,12 +160,11 @@ export default {
      editedValue: null,
    };
  },
+
  computed: {
    displayValue() {
      if (this.isAttributeTypeDate) {
-        return this.value
-          ? new Date(this.value || new Date()).toLocaleDateString()
-          : '';
+        return new Date(this.value || new Date()).toLocaleDateString();
      }
      if (this.isAttributeTypeCheckbox) {
        return this.value === 'false' ? false : this.value;
@@ -244,10 +230,6 @@ export default {
      this.isEditing = false;
      this.editedValue = this.formattedValue;
    },
-    contactId() {
-      // Fix to solve validation not resetting when contactId changes in contact page
-      this.$v.$reset();
-    },
  },

  validations() {
@@ -270,10 +252,10 @@ export default {
  },
  mounted() {
    this.editedValue = this.formattedValue;
-    this.$emitter.on(BUS_EVENTS.FOCUS_CUSTOM_ATTRIBUTE, this.onFocusAttribute);
+    bus.$on(BUS_EVENTS.FOCUS_CUSTOM_ATTRIBUTE, this.onFocusAttribute);
  },
  destroyed() {
-    this.$emitter.off(BUS_EVENTS.FOCUS_CUSTOM_ATTRIBUTE, this.onFocusAttribute);
+    bus.$off(BUS_EVENTS.FOCUS_CUSTOM_ATTRIBUTE, this.onFocusAttribute);
  },
  methods: {
    onFocusAttribute(focusAttributeKey) {
@@ -286,10 +268,6 @@ export default {
        this.$refs.inputfield.focus();
      }
    },
-    onClickAway() {
-      this.$v.$reset();
-      this.isEditing = false;
-    },
    onEdit() {
      this.isEditing = true;
      this.$nextTick(() => {
@@ -316,7 +294,6 @@ export default {
    },
    onDelete() {
      this.isEditing = false;
-      this.$v.$reset();
      this.$emit('delete', this.attributeKey);
    },
    onCopy() {
@@ -327,6 +304,35 @@ export default {
 </script>

 <style lang="scss" scoped>
+.checkbox-wrap {
+  @apply flex items-center;
+}
+.checkbox {
+  @apply my-0 mr-2 ml-0;
+}
+.attribute-name {
+  &.error {
+    @apply text-red-400 dark:text-red-500;
+  }
+}
+
+.edit-button {
+  @apply hidden;
+}
+
+.value--view {
+  @apply flex;
+
+  &.is-editable:hover {
+    .value {
+      @apply bg-slate-50 dark:bg-slate-700 mb-0;
+    }
+    .edit-button {
+      @apply block;
+    }
+  }
+}
+
 ::v-deep {
  .selector-wrap {
    @apply m-0 top-1;
@@ -1,31 +0,0 @@
-<template>
-  <div class="flex flex-col items-start w-full gap-6">
-    <div class="flex flex-col w-full gap-4">
-      <h4 v-if="title" class="text-lg font-medium text-ash-900">
-        {{ title }}
-      </h4>
-      <div class="flex flex-row items-center justify-between">
-        <div class="flex-grow h-px bg-ash-200" />
-      </div>
-      <p v-if="description" class="mb-0 text-sm font-normal text-ash-900">
-        {{ description }}
-      </p>
-    </div>
-    <div class="flex flex-col w-full gap-6">
-      <slot />
-    </div>
-  </div>
-</template>
-
-<script setup>
-defineProps({
-  title: {
-    type: String,
-    default: '',
-  },
-  description: {
-    type: String,
-    default: '',
-  },
-});
-</script>
@@ -18,10 +18,8 @@
 <script>
 import 'highlight.js/styles/default.css';
 import { copyTextToClipboard } from 'shared/helpers/clipboard';
-import alertMixin from 'shared/mixins/alertMixin';

 export default {
-  mixins: [alertMixin],
  props: {
    value: {
      type: String,
@@ -37,7 +35,7 @@ export default {
    async onCopy(e) {
      e.preventDefault();
      await copyTextToClipboard(this.value);
-      this.showAlert(this.$t('COMPONENTS.CODE.COPY_SUCCESSFUL'));
+      bus.$emit('newToastMessage', this.$t('COMPONENTS.CODE.COPY_SUCCESSFUL'));
    },
    toggleMasked() {
      this.masked = !this.masked;
@@ -7,13 +7,7 @@
      @mousedown="handleMouseDown"
    >
      <div
-        :class="{
-          'modal-container rtl:text-right shadow-md max-h-full overflow-auto relative bg-white dark:bg-slate-800 skip-context-menu': true,
-          'rounded-xl w-[37.5rem]': !fullWidth,
-          'items-center rounded-none flex h-full justify-center w-full':
-            fullWidth,
-          [size]: true,
-        }"
+        :class="modalContainerClassName"
        @mouse.stop
        @mousedown="event => event.stopPropagation()"
      >
@@ -22,7 +16,7 @@
          color-scheme="secondary"
          icon="dismiss"
          variant="clear"
-          class="absolute z-10 ltr:right-2 rtl:left-2 top-2"
+          class="absolute ltr:right-2 rtl:left-2 top-2 z-10"
          @click="close"
        />
        <slot />
@@ -66,6 +60,15 @@ export default {
    };
  },
  computed: {
+    modalContainerClassName() {
+      let className =
+        'modal-container rtl:text-right shadow-md rounded-sm max-h-full overflow-auto relative w-[37.5rem] bg-white dark:bg-slate-800 skip-context-menu';
+      if (this.fullWidth) {
+        return `${className} items-center rounded-none flex h-full justify-center w-full`;
+      }
+
+      return `${className} ${this.size}`;
+    },
    modalClassName() {
      const modalClassNameMap = {
        centered: '',
@@ -99,9 +102,7 @@ export default {
    onMouseUp() {
      if (this.mousedDownOnBackdrop) {
        this.mousedDownOnBackdrop = false;
-        if (this.closeOnBackdropClick) {
-          this.onClose();
-        }
+        this.onClose();
      }
    },
  },
@@ -1,21 +1,21 @@
 <template>
-  <div class="flex flex-col items-start px-8 pt-8 pb-0">
+  <div class="flex flex-col items-start pt-8 px-8 pb-0">
    <img v-if="headerImage" :src="headerImage" alt="No image" />
    <h2
      ref="modalHeaderTitle"
-      class="text-base font-semibold leading-6 text-slate-800 dark:text-slate-50"
+      class="text-slate-800 text-lg font-semibold dark:text-slate-50"
    >
      {{ headerTitle }}
    </h2>
    <p
      v-if="headerContent"
      ref="modalHeaderContent"
-      class="w-full mt-2 text-sm leading-5 break-words text-slate-600 dark:text-slate-300"
+      class="w-full break-words text-slate-600 mt-2 text-sm dark:text-slate-300"
    >
      {{ headerContent }}
      <span
        v-if="headerContentValue"
-        class="text-sm font-semibold text-slate-600 dark:text-slate-300"
+        class="font-semibold text-sm text-slate-600 dark:text-slate-300"
      >
        {{ headerContentValue }}
      </span>
@@ -55,7 +55,7 @@ export default {

  mounted() {
    window.addEventListener('offline', this.updateOnlineStatus);
-    this.$emitter.on(BUS_EVENTS.WEBSOCKET_DISCONNECT, () => {
+    window.bus.$on(BUS_EVENTS.WEBSOCKET_DISCONNECT, () => {
      // TODO: Remove this after completing the conversation list refetching
      // TODO: DIRTY FIX : CLEAN UP THIS WITH PROPER FIX, DELAYING THE RECONNECT FOR NOW
      // THE CABLE IS FIRING IS VERY COMMON AND THUS INTERFERING USER EXPERIENCE
@@ -21,7 +21,7 @@ export default {
  },
  methods: {
    onMenuItemClick() {
-      this.$emitter.emit(BUS_EVENTS.TOGGLE_SIDEMENU);
+      bus.$emit(BUS_EVENTS.TOGGLE_SIDEMENU);
    },
  },
 };
@@ -15,13 +15,11 @@

 <script>
 import WootSnackbar from './Snackbar.vue';
-import alertMixin from 'shared/mixins/alertMixin';

 export default {
  components: {
    WootSnackbar,
  },
-  mixins: [alertMixin],
  props: {
    duration: {
      type: Number,
@@ -36,10 +34,10 @@ export default {
  },

  mounted() {
-    this.$emitter.on('newToastMessage', this.onNewToastMessage);
+    bus.$on('newToastMessage', this.onNewToastMessage);
  },
  beforeDestroy() {
-    this.$emitter.off('newToastMessage', this.onNewToastMessage);
+    bus.$off('newToastMessage', this.onNewToastMessage);
  },
  methods: {
    onNewToastMessage(message, action) {
@@ -1,5 +1,5 @@
 <template>
-  <div class="relative flex items-center justify-end resolve-actions">
+  <div class="resolve-actions relative flex items-center justify-end">
    <div class="button-group">
      <woot-button
        v-if="isOpen"
@@ -73,13 +73,31 @@
        </woot-dropdown-item>
      </woot-dropdown-menu>
    </div>
+    <woot-modal
+      :show.sync="showCustomSnoozeModal"
+      :on-close="hideCustomSnoozeModal"
+    >
+      <custom-snooze-modal
+        @close="hideCustomSnoozeModal"
+        @choose-time="chooseSnoozeTime"
+      />
+    </woot-modal>
  </div>
 </template>

 <script>
+import { getUnixTime } from 'date-fns';
 import { mapGetters } from 'vuex';
+import { mixin as clickaway } from 'vue-clickaway';
 import alertMixin from 'shared/mixins/alertMixin';
-import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
+import CustomSnoozeModal from 'dashboard/components/CustomSnoozeModal.vue';
+import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import {
+  hasPressedAltAndEKey,
+  hasPressedCommandPlusAltAndEKey,
+  hasPressedAltAndMKey,
+} from 'shared/helpers/KeyboardHelpers';
+import { findSnoozeTime } from 'dashboard/helper/snoozeHelpers';
 import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
 import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';

@@ -87,20 +105,23 @@ import wootConstants from 'dashboard/constants/globals';
 import {
  CMD_REOPEN_CONVERSATION,
  CMD_RESOLVE_CONVERSATION,
+  CMD_SNOOZE_CONVERSATION,
 } from '../../routes/dashboard/commands/commandBarBusEvents';

 export default {
  components: {
    WootDropdownItem,
    WootDropdownMenu,
+    CustomSnoozeModal,
  },
-  mixins: [alertMixin, keyboardEventListenerMixins],
+  mixins: [clickaway, alertMixin, eventListenerMixins],
  props: { conversationId: { type: [String, Number], required: true } },
  data() {
    return {
      isLoading: false,
      showActionsDropdown: false,
      STATUS_TYPE: wootConstants.STATUS_TYPE,
+      showCustomSnoozeModal: false,
    };
  },
  computed: {
@@ -128,61 +149,70 @@ export default {
    },
  },
  mounted() {
-    this.$emitter.on(CMD_REOPEN_CONVERSATION, this.onCmdOpenConversation);
-    this.$emitter.on(CMD_RESOLVE_CONVERSATION, this.onCmdResolveConversation);
+    bus.$on(CMD_SNOOZE_CONVERSATION, this.onCmdSnoozeConversation);
+    bus.$on(CMD_REOPEN_CONVERSATION, this.onCmdOpenConversation);
+    bus.$on(CMD_RESOLVE_CONVERSATION, this.onCmdResolveConversation);
  },
  destroyed() {
-    this.$emitter.off(CMD_REOPEN_CONVERSATION, this.onCmdOpenConversation);
-    this.$emitter.off(CMD_RESOLVE_CONVERSATION, this.onCmdResolveConversation);
+    bus.$off(CMD_SNOOZE_CONVERSATION, this.onCmdSnoozeConversation);
+    bus.$off(CMD_REOPEN_CONVERSATION, this.onCmdOpenConversation);
+    bus.$off(CMD_RESOLVE_CONVERSATION, this.onCmdResolveConversation);
  },
  methods: {
-    getKeyboardEvents() {
-      return {
-        'Alt+KeyM': {
-          action: () => this.$refs.arrowDownButton?.$el.click(),
-          allowOnFocusedInput: true,
-        },
-        'Alt+KeyE': this.resolveOrToast,
-        '$mod+Alt+KeyE': async event => {
-          const { all, activeIndex, lastIndex } = this.getConversationParams();
-          await this.resolveOrToast();
-
-          if (activeIndex < lastIndex) {
-            all[activeIndex + 1].click();
-          } else if (all.length > 1) {
-            all[0].click();
-            document.querySelector('.conversations-list').scrollTop = 0;
-          }
-
-          event.preventDefault();
-        },
-      };
-    },
-    getConversationParams() {
+    async handleKeyEvents(e) {
      const allConversations = document.querySelectorAll(
        '.conversations-list .conversation'
      );
-
-      const activeConversation = document.querySelector(
-        'div.conversations-list div.conversation.active'
-      );
-      const activeConversationIndex = [...allConversations].indexOf(
-        activeConversation
-      );
-      const lastConversationIndex = allConversations.length - 1;
-
-      return {
-        all: allConversations,
-        activeIndex: activeConversationIndex,
-        lastIndex: lastConversationIndex,
-      };
-    },
-    async resolveOrToast() {
-      try {
-        await this.toggleStatus(wootConstants.STATUS_TYPE.RESOLVED);
-      } catch (error) {
-        // error
+      if (hasPressedAltAndMKey(e)) {
+        if (this.$refs.arrowDownButton) {
+          this.$refs.arrowDownButton.$el.click();
+        }
      }
+      if (hasPressedAltAndEKey(e)) {
+        const activeConversation = document.querySelector(
+          'div.conversations-list div.conversation.active'
+        );
+        const activeConversationIndex = [...allConversations].indexOf(
+          activeConversation
+        );
+        const lastConversationIndex = allConversations.length - 1;
+        try {
+          await this.toggleStatus(wootConstants.STATUS_TYPE.RESOLVED);
+        } catch (error) {
+          // error
+        }
+        if (hasPressedCommandPlusAltAndEKey(e)) {
+          if (activeConversationIndex < lastConversationIndex) {
+            allConversations[activeConversationIndex + 1].click();
+          } else if (allConversations.length > 1) {
+            allConversations[0].click();
+            document.querySelector('.conversations-list').scrollTop = 0;
+          }
+          e.preventDefault();
+        }
+      }
+    },
+    onCmdSnoozeConversation(snoozeType) {
+      if (snoozeType === wootConstants.SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME) {
+        this.showCustomSnoozeModal = true;
+      } else {
+        this.toggleStatus(
+          this.STATUS_TYPE.SNOOZED,
+          findSnoozeTime(snoozeType) || null
+        );
+      }
+    },
+    chooseSnoozeTime(customSnoozeTime) {
+      this.showCustomSnoozeModal = false;
+      if (customSnoozeTime) {
+        this.toggleStatus(
+          this.STATUS_TYPE.SNOOZED,
+          getUnixTime(customSnoozeTime)
+        );
+      }
+    },
+    hideCustomSnoozeModal() {
+      this.showCustomSnoozeModal = false;
    },
    onCmdOpenConversation() {
      this.toggleStatus(this.STATUS_TYPE.OPEN);
@@ -24,7 +24,6 @@ import SubmitButton from './buttons/FormSubmitButton';
 import Tabs from './ui/Tabs/Tabs';
 import TabsItem from './ui/Tabs/TabsItem';
 import Thumbnail from './widgets/Thumbnail.vue';
-import DatePicker from './ui/DatePicker/DatePicker.vue';

 const WootUIKit = {
  AvatarUploader,
@@ -52,7 +51,6 @@ const WootUIKit = {
  Tabs,
  TabsItem,
  Thumbnail,
-  DatePicker,
  install(Vue) {
    const keys = Object.keys(this);
    keys.pop(); // remove 'install' from keys
@@ -47,6 +47,7 @@

 <script>
 import { mapGetters } from 'vuex';
+import { mixin as clickaway } from 'vue-clickaway';
 import alertMixin from 'shared/mixins/alertMixin';
 import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
 import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
@@ -66,7 +67,7 @@ export default {
    AvailabilityStatusBadge,
  },

-  mixins: [alertMixin],
+  mixins: [clickaway, alertMixin],

  data() {
    return {
@@ -1,5 +1,5 @@
 <template>
-  <aside class="flex h-full">
+  <aside class="h-full flex">
    <primary-sidebar
      :logo-source="globalConfig.logoThumbnail"
      :installation-name="globalConfig.installationName"
@@ -36,7 +36,15 @@ import alertMixin from 'shared/mixins/alertMixin';

 import PrimarySidebar from './sidebarComponents/Primary.vue';
 import SecondarySidebar from './sidebarComponents/Secondary.vue';
-import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
+import {
+  hasPressedAltAndCKey,
+  hasPressedAltAndRKey,
+  hasPressedAltAndSKey,
+  hasPressedAltAndVKey,
+  hasPressedCommandAndForwardSlash,
+  isEscape,
+} from 'shared/helpers/KeyboardHelpers';
+import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import router from '../../routes';

 export default {
@@ -44,7 +52,7 @@ export default {
    PrimarySidebar,
    SecondarySidebar,
  },
-  mixins: [adminMixin, alertMixin, keyboardEventListenerMixins],
+  mixins: [adminMixin, alertMixin, eventListenerMixins],
  props: {
    showSecondarySidebar: {
      type: Boolean,
@@ -165,27 +173,30 @@ export default {
    closeKeyShortcutModal() {
      this.$emit('close-key-shortcut-modal');
    },
-    getKeyboardEvents() {
-      return {
-        '$mod+Slash': this.toggleKeyShortcutModal,
-        '$mod+Escape': this.closeKeyShortcutModal,
-        'Alt+KeyC': {
-          action: () => this.navigateToRoute('home'),
-        },
-        'Alt+KeyV': {
-          action: () => this.navigateToRoute('contacts_dashboard'),
-        },
-        'Alt+KeyR': {
-          action: () => this.navigateToRoute('account_overview_reports'),
-        },
-        'Alt+KeyS': {
-          action: () => this.navigateToRoute('agent_list'),
-        },
-      };
-    },
-    navigateToRoute(routeName) {
-      if (!this.isCurrentRouteSameAsNavigation(routeName)) {
-        router.push({ name: routeName });
+    handleKeyEvents(e) {
+      if (hasPressedCommandAndForwardSlash(e)) {
+        this.toggleKeyShortcutModal();
+      }
+      if (isEscape(e)) {
+        this.closeKeyShortcutModal();
+      }
+
+      if (hasPressedAltAndCKey(e)) {
+        if (!this.isCurrentRouteSameAsNavigation('home')) {
+          router.push({ name: 'home' });
+        }
+      } else if (hasPressedAltAndVKey(e)) {
+        if (!this.isCurrentRouteSameAsNavigation('contacts_dashboard')) {
+          router.push({ name: 'contacts_dashboard' });
+        }
+      } else if (hasPressedAltAndRKey(e)) {
+        if (!this.isCurrentRouteSameAsNavigation('settings_account_reports')) {
+          router.push({ name: 'settings_account_reports' });
+        }
+      } else if (hasPressedAltAndSKey(e)) {
+        if (!this.isCurrentRouteSameAsNavigation('agent_list')) {
+          router.push({ name: 'agent_list' });
+        }
      }
    },
    isCurrentRouteSameAsNavigation(routeName) {
@@ -12,7 +12,6 @@ const reports = accountId => ({
    'label_reports',
    'inbox_reports',
    'team_reports',
-    'sla_reports',
  ],
  menuItems: [
    {
@@ -72,14 +71,6 @@ const reports = accountId => ({
      toState: frontendURL(`accounts/${accountId}/reports/teams`),
      toStateName: 'team_reports',
    },
-    {
-      icon: 'document-list-clock',
-      label: 'REPORTS_SLA',
-      hasSubMenu: false,
-      featureFlag: FEATURE_FLAGS.SLA,
-      toState: frontendURL(`accounts/${accountId}/reports/sla`),
-      toStateName: 'sla_reports',
-    },
  ],
 });

@@ -142,13 +142,20 @@ const settings = accountId => ({
      toStateName: 'settings_applications',
      featureFlag: FEATURE_FLAGS.INTEGRATIONS,
    },
+    {
+      icon: 'credit-card-person',
+      label: 'BILLING',
+      hasSubMenu: false,
+      toState: frontendURL(`accounts/${accountId}/settings/billing`),
+      toStateName: 'billing_settings_index',
+      showOnlyOnCloud: true,
+    },
    {
      icon: 'key',
      label: 'AUDIT_LOGS',
      hasSubMenu: false,
      toState: frontendURL(`accounts/${accountId}/settings/audit-log/list`),
      toStateName: 'auditlogs_list',
-      isEnterpriseOnly: true,
      featureFlag: FEATURE_FLAGS.AUDIT_LOGS,
      beta: true,
    },
@@ -158,18 +165,9 @@ const settings = accountId => ({
      hasSubMenu: false,
      toState: frontendURL(`accounts/${accountId}/settings/sla/list`),
      toStateName: 'sla_list',
-      isEnterpriseOnly: true,
      featureFlag: FEATURE_FLAGS.SLA,
      beta: true,
    },
-    {
-      icon: 'credit-card-person',
-      label: 'BILLING',
-      hasSubMenu: false,
-      toState: frontendURL(`accounts/${accountId}/settings/billing`),
-      toStateName: 'billing_settings_index',
-      showOnlyOnCloud: true,
-    },
  ],
 });

@@ -7,7 +7,7 @@
      :header-title="$t('SIDEBAR_ITEMS.CHANGE_ACCOUNTS')"
      :header-content="$t('SIDEBAR_ITEMS.SELECTOR_SUBTITLE')"
    />
-    <div class="px-8 py-4">
+    <div class="px-8 pt-4 pb-8">
      <div
        v-for="account in currentUser.accounts"
        :id="`account-${account.id}`"
@@ -45,10 +45,10 @@

    <div
      v-if="globalConfig.createNewAccountFromDashboard"
-      class="flex justify-end items-center px-8 pb-8 pt-4 gap-2"
+      class="flex justify-end items-center p-8 gap-2"
    >
      <button
-        class="button success large expanded nice w-full"
+        class="button success large expanded nice"
        @click="$emit('show-create-account-modal')"
      >
        {{ $t('CREATE_ACCOUNT.NEW_ACCOUNT') }}
@@ -106,6 +106,7 @@
 </template>

 <script>
+import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
 import Auth from '../../../api/auth';
 import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
@@ -118,6 +119,7 @@ export default {
    WootDropdownItem,
    AvailabilityStatus,
  },
+  mixins: [clickaway],
  props: {
    show: {
      type: Boolean,
@@ -65,11 +65,11 @@
        </div>
        <span
          v-if="warningIcon"
-          class="inline-flex mr-1 bg-red-50 dark:bg-red-900 p-0.5 rounded-sm"
+          class="inline-flex rounded-sm mr-1 bg-slate-100"
        >
          <fluent-icon
-            v-tooltip.top-end="$t('SIDEBAR.REAUTHORIZE')"
-            class="text-xxs text-red-500 dark:text-red-300"
+            v-tooltip.top-end="$t('SIDEBAR.FACEBOOK_REAUTHORIZE')"
+            class="text-xxs"
            :icon="warningIcon"
            size="12"
          />
@@ -2,7 +2,7 @@
  <li v-show="isMenuItemVisible" class="mt-1">
    <div v-if="hasSubMenu" class="flex justify-between">
      <span
-        class="px-2 pt-1 my-2 text-sm font-semibold text-slate-700 dark:text-slate-200"
+        class="text-sm text-slate-700 dark:text-slate-200 font-semibold my-2 px-2 pt-1"
      >
        {{ $t(`SIDEBAR.${menuItem.label}`) }}
      </span>
@@ -19,7 +19,7 @@
    </div>
    <router-link
      v-else
-      class="flex items-center p-2 m-0 text-sm font-medium leading-4 rounded-lg text-slate-700 dark:text-slate-100 hover:bg-slate-25 dark:hover:bg-slate-800"
+      class="rounded-lg leading-4 font-medium flex items-center p-2 m-0 text-sm text-slate-700 dark:text-slate-100 hover:bg-slate-25 dark:hover:bg-slate-800"
      :class="computedClass"
      :to="menuItem && menuItem.toState"
    >
@@ -31,7 +31,7 @@
      {{ $t(`SIDEBAR.${menuItem.label}`) }}
      <span
        v-if="showChildCount(menuItem.count)"
-        class="px-1 py-0 mx-1 font-medium rounded-md text-xxs"
+        class="rounded-md text-xxs font-medium mx-1 py-0 px-1"
        :class="{
          'text-slate-300 dark:text-slate-600': isCountZero && !isActiveView,
          'text-slate-600 dark:text-slate-50': !isCountZero && !isActiveView,
@@ -46,13 +46,13 @@
        v-if="menuItem.beta"
        data-view-component="true"
        label="Beta"
-        class="inline-block px-1 mx-1 font-medium leading-4 text-green-500 border border-green-400 rounded-lg text-xxs"
+        class="px-1 mx-1 inline-block font-medium leading-4 border border-green-400 text-green-500 rounded-lg text-xxs"
      >
        {{ $t('SIDEBAR.BETA') }}
      </span>
    </router-link>

-    <ul v-if="hasSubMenu" class="mb-0 ml-0 list-none">
+    <ul v-if="hasSubMenu" class="list-none ml-0 mb-0">
      <secondary-child-nav-item
        v-for="child in menuItem.children"
        :key="child.id"
@@ -94,7 +94,6 @@
 import { mapGetters } from 'vuex';

 import adminMixin from '../../../mixins/isAdmin';
-import configMixin from 'shared/mixins/configMixin';
 import {
  getInboxClassByType,
  getInboxWarningIconClass,
@@ -108,7 +107,7 @@ import {

 export default {
  components: { SecondaryChildNavItem },
-  mixins: [adminMixin, configMixin],
+  mixins: [adminMixin],
  props: {
    menuItem: {
      type: Object,
@@ -133,33 +132,15 @@ export default {
    },
    isMenuItemVisible() {
      if (this.menuItem.globalConfigFlag) {
-        // this checks for the `csmlEditorHost` flag in the global config
-        // if this is present, we toggle the CSML editor menu item
-        // TODO: This is very specific, and can be handled better, fix it
        return !!this.globalConfig[this.menuItem.globalConfigFlag];
      }
-
-      let isFeatureEnabled = true;
-      if (this.menuItem.featureFlag) {
-        isFeatureEnabled = this.isFeatureEnabledonAccount(
-          this.accountId,
-          this.menuItem.featureFlag
-        );
-      }
-
-      if (this.menuItem.isEnterpriseOnly) {
-        if (!this.isEnterprise) return false;
-        return isFeatureEnabled || this.globalConfig.displayManifest;
-      }
-
      if (this.menuItem.featureFlag) {
        return this.isFeatureEnabledonAccount(
          this.accountId,
          this.menuItem.featureFlag
        );
      }
-
-      return isFeatureEnabled;
+      return true;
    },
    isAllConversations() {
      return (
@@ -1,304 +0,0 @@
-<script setup>
-import { ref, watch } from 'vue';
-import {
-  getActiveDateRange,
-  moveCalendarDate,
-  DATE_RANGE_TYPES,
-  CALENDAR_TYPES,
-  CALENDAR_PERIODS,
-} from './helpers/DatePickerHelper';
-import {
-  isValid,
-  startOfMonth,
-  subDays,
-  startOfDay,
-  endOfDay,
-  isBefore,
-  subMonths,
-  addMonths,
-  isSameMonth,
-  differenceInCalendarMonths,
-  setMonth,
-  setYear,
-  isAfter,
-} from 'date-fns';
-import { useAlert } from 'dashboard/composables';
-import DatePickerButton from './components/DatePickerButton.vue';
-import CalendarDateInput from './components/CalendarDateInput.vue';
-import CalendarDateRange from './components/CalendarDateRange.vue';
-import CalendarYear from './components/CalendarYear.vue';
-import CalendarMonth from './components/CalendarMonth.vue';
-import CalendarWeek from './components/CalendarWeek.vue';
-import CalendarFooter from './components/CalendarFooter.vue';
-
-const { LAST_7_DAYS, LAST_30_DAYS, CUSTOM_RANGE } = DATE_RANGE_TYPES;
-const { START_CALENDAR, END_CALENDAR } = CALENDAR_TYPES;
-const { WEEK, MONTH, YEAR } = CALENDAR_PERIODS;
-
-const showDatePicker = ref(false);
-const calendarViews = ref({ start: WEEK, end: WEEK });
-const currentDate = ref(new Date());
-const selectedStartDate = ref(startOfDay(subDays(currentDate.value, 6))); // LAST_7_DAYS
-const selectedEndDate = ref(endOfDay(currentDate.value));
-// Setting the start and end calendar
-const startCurrentDate = ref(startOfDay(selectedStartDate.value));
-const endCurrentDate = ref(
-  isSameMonth(selectedStartDate.value, selectedEndDate.value)
-    ? startOfMonth(addMonths(selectedEndDate.value, 1)) // Moves to the start of the next month if dates are in the same month (Mounted case LAST_7_DAYS)
-    : startOfMonth(selectedEndDate.value) // Always shows the month of the end date starting from the first (Mounted case LAST_7_DAYS)
-);
-const selectingEndDate = ref(false);
-const selectedRange = ref(LAST_7_DAYS);
-const hoveredEndDate = ref(null);
-
-const manualStartDate = ref(selectedStartDate.value);
-const manualEndDate = ref(selectedEndDate.value);
-
-const emit = defineEmits(['change']);
-
-// Watcher will set the start and end dates based on the selected range
-watch(selectedRange, newRange => {
-  if (newRange !== CUSTOM_RANGE) {
-    // If selecting a range other than last 7 days or last 30 days, set the start and end dates to the selected start and end dates
-    // If selecting last 7 days or last 30 days is, set the start date to the selected start date
-    // and the end date to one month ahead of the start date if the start date and end date are in the same month
-    // Otherwise set the end date to the selected end date
-    const isLastSevenOrThirtyDays =
-      newRange === LAST_7_DAYS || newRange === LAST_30_DAYS;
-    startCurrentDate.value = selectedStartDate.value;
-    endCurrentDate.value =
-      isLastSevenOrThirtyDays &&
-      isSameMonth(selectedStartDate.value, selectedEndDate.value)
-        ? startOfMonth(addMonths(selectedStartDate.value, 1))
-        : selectedEndDate.value;
-    selectingEndDate.value = false;
-  } else if (!selectingEndDate.value) {
-    // If selecting a custom range and not selecting an end date, set the start date to the selected start date
-    startCurrentDate.value = startOfDay(currentDate.value);
-  }
-});
-
-// Watcher will set the input values based on the selected start and end dates
-watch(
-  [selectedStartDate, selectedEndDate],
-  ([newStart, newEnd]) => {
-    if (isValid(newStart)) {
-      manualStartDate.value = newStart;
-    } else {
-      manualStartDate.value = selectedStartDate.value;
-    }
-
-    if (isValid(newEnd)) {
-      manualEndDate.value = newEnd;
-    } else {
-      manualEndDate.value = selectedEndDate.value;
-    }
-  },
-  { immediate: true }
-);
-
-// Watcher to ensure dates are always in logical order
-// This watch is will ensure that the start date is always before the end date
-watch(
-  [startCurrentDate, endCurrentDate],
-  ([newStart, newEnd], [oldStart, oldEnd]) => {
-    const monthDifference = differenceInCalendarMonths(newEnd, newStart);
-
-    if (newStart !== oldStart) {
-      if (isAfter(newStart, newEnd) || monthDifference === 0) {
-        // Adjust the end date forward if the start date is adjusted and is after the end date or in the same month
-        endCurrentDate.value = addMonths(newStart, 1);
-      }
-    }
-    if (newEnd !== oldEnd) {
-      if (isBefore(newEnd, newStart) || monthDifference === 0) {
-        // Adjust the start date backward if the end date is adjusted and is before the start date or in the same month
-        startCurrentDate.value = subMonths(newEnd, 1);
-      }
-    }
-  },
-  { immediate: true, deep: true }
-);
-
-const setDateRange = range => {
-  selectedRange.value = range.value;
-  const { start, end } = getActiveDateRange(range.value, currentDate.value);
-  selectedStartDate.value = start;
-  selectedEndDate.value = end;
-};
-
-const moveCalendar = (calendar, direction, period = MONTH) => {
-  const { start, end } = moveCalendarDate(
-    calendar,
-    startCurrentDate.value,
-    endCurrentDate.value,
-    direction,
-    period
-  );
-  startCurrentDate.value = start;
-  endCurrentDate.value = end;
-};
-
-const selectDate = day => {
-  selectedRange.value = CUSTOM_RANGE;
-  if (!selectingEndDate.value || day < selectedStartDate.value) {
-    selectedStartDate.value = day;
-    selectedEndDate.value = null;
-    selectingEndDate.value = true;
-  } else {
-    selectedEndDate.value = day;
-    selectingEndDate.value = false;
-  }
-};
-
-const setViewMode = (calendar, mode) => {
-  selectedRange.value = CUSTOM_RANGE;
-  calendarViews.value[calendar] = mode;
-};
-
-const openCalendar = (index, calendarType, period = MONTH) => {
-  const current =
-    calendarType === START_CALENDAR
-      ? startCurrentDate.value
-      : endCurrentDate.value;
-  const newDate =
-    period === MONTH
-      ? setMonth(startOfMonth(current), index)
-      : setYear(current, index);
-  if (calendarType === START_CALENDAR) {
-    startCurrentDate.value = newDate;
-  } else {
-    endCurrentDate.value = newDate;
-  }
-  setViewMode(calendarType, period === MONTH ? WEEK : MONTH);
-};
-
-const updateManualInput = (newDate, calendarType) => {
-  if (calendarType === START_CALENDAR) {
-    selectedStartDate.value = newDate;
-    startCurrentDate.value = newDate;
-  } else {
-    selectedEndDate.value = newDate;
-    endCurrentDate.value = newDate;
-  }
-  selectingEndDate.value = false;
-};
-
-const handleManualInputError = message => {
-  useAlert(message);
-};
-
-const resetDatePicker = () => {
-  startCurrentDate.value = startOfDay(currentDate.value); // Resets to today at start of the day
-  endCurrentDate.value = addMonths(startOfDay(currentDate.value), 1); // Resets to one month ahead
-  selectedStartDate.value = startOfDay(subDays(currentDate.value, 6));
-  selectedEndDate.value = endOfDay(currentDate.value);
-  selectingEndDate.value = false;
-  selectedRange.value = LAST_7_DAYS;
-  // Reset view modes if they are being used to toggle between different calendar views
-  calendarViews.value = { start: WEEK, end: WEEK };
-};
-
-const emitDateRange = () => {
-  if (!isValid(selectedStartDate.value) || !isValid(selectedEndDate.value)) {
-    useAlert('Please select a valid time range');
-  } else {
-    showDatePicker.value = false;
-    emit('dateRangeChanged', [selectedStartDate.value, selectedEndDate.value]);
-  }
-};
-</script>
-
-<template>
-  <div class="relative font-inter">
-    <DatePickerButton
-      :selected-start-date="selectedStartDate"
-      :selected-end-date="selectedEndDate"
-      :selected-range="selectedRange"
-      @open="showDatePicker = !showDatePicker"
-    />
-    <div
-      v-if="showDatePicker"
-      class="flex absolute top-9 ltr:left-0 rtl:right-0 z-30 shadow-md select-none w-[880px] h-[490px] rounded-2xl border border-slate-50 dark:border-slate-800 bg-white dark:bg-slate-800"
-    >
-      <CalendarDateRange
-        :selected-range="selectedRange"
-        @set-range="setDateRange"
-      />
-      <div
-        class="flex flex-col w-[680px] ltr:border-l rtl:border-r border-slate-50 dark:border-slate-700/50"
-      >
-        <div class="flex justify-around h-fit">
-          <!-- Calendars for Start and End Dates -->
-          <div
-            v-for="calendar in [START_CALENDAR, END_CALENDAR]"
-            :key="`${calendar}-calendar`"
-            class="flex flex-col items-center"
-          >
-            <CalendarDateInput
-              :calendar-type="calendar"
-              :date-value="
-                calendar === START_CALENDAR ? manualStartDate : manualEndDate
-              "
-              :compare-date="
-                calendar === START_CALENDAR ? manualEndDate : manualStartDate
-              "
-              :is-disabled="selectedRange !== CUSTOM_RANGE"
-              @update="
-                calendar === START_CALENDAR
-                  ? (manualStartDate = $event)
-                  : (manualEndDate = $event)
-              "
-              @validate="updateManualInput($event, calendar)"
-              @error="handleManualInputError($event)"
-            />
-            <div class="py-5 border-b border-slate-50 dark:border-slate-700/50">
-              <div
-                class="flex flex-col items-center gap-2 px-5 min-w-[340px] max-h-[352px]"
-                :class="
-                  calendar === START_CALENDAR &&
-                  'ltr:border-r rtl:border-l border-slate-50 dark:border-slate-700/50'
-                "
-              >
-                <CalendarYear
-                  v-if="calendarViews[calendar] === YEAR"
-                  :calendar-type="calendar"
-                  :start-current-date="startCurrentDate"
-                  :end-current-date="endCurrentDate"
-                  @select-year="openCalendar($event, calendar, YEAR)"
-                />
-                <CalendarMonth
-                  v-else-if="calendarViews[calendar] === MONTH"
-                  :calendar-type="calendar"
-                  :start-current-date="startCurrentDate"
-                  :end-current-date="endCurrentDate"
-                  @select-month="openCalendar($event, calendar)"
-                  @set-view="setViewMode"
-                  @prev="moveCalendar(calendar, 'prev', YEAR)"
-                  @next="moveCalendar(calendar, 'next', YEAR)"
-                />
-                <CalendarWeek
-                  v-else-if="calendarViews[calendar] === WEEK"
-                  :calendar-type="calendar"
-                  :current-date="currentDate"
-                  :start-current-date="startCurrentDate"
-                  :end-current-date="endCurrentDate"
-                  :selected-start-date="selectedStartDate"
-                  :selected-end-date="selectedEndDate"
-                  :selecting-end-date="selectingEndDate"
-                  :hovered-end-date="hoveredEndDate"
-                  @update-hovered-end-date="hoveredEndDate = $event"
-                  @select-date="selectDate"
-                  @set-view="setViewMode"
-                  @prev="moveCalendar(calendar, 'prev')"
-                  @next="moveCalendar(calendar, 'next')"
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-        <CalendarFooter @change="emitDateRange" @clear="resetDatePicker" />
-      </div>
-    </div>
-  </div>
-</template>
@@ -1,79 +0,0 @@
-<script setup>
-import { CALENDAR_PERIODS } from '../helpers/DatePickerHelper';
-
-defineProps({
-  calendarType: {
-    type: String,
-    default: 'start',
-  },
-  firstButtonLabel: {
-    type: String,
-    default: '',
-  },
-  buttonLabel: {
-    type: String,
-    default: '',
-  },
-  viewMode: {
-    type: String,
-    default: '',
-  },
-});
-const emit = defineEmits(['prev', 'next', 'set-view']);
-
-const { YEAR } = CALENDAR_PERIODS;
-
-const onClickPrev = type => {
-  emit('prev', type);
-};
-
-const onClickNext = type => {
-  emit('next', type);
-};
-
-const onClickSetView = (type, mode) => {
-  emit('set-view', type, mode);
-};
-</script>
-
-<template>
-  <div class="flex items-start justify-between w-full h-9">
-    <button
-      class="p-1 rounded-lg hover:bg-slate-75 dark:hover:bg-slate-700/50 rtl:rotate-180"
-      @click="onClickPrev(calendarType)"
-    >
-      <fluent-icon
-        icon="chevron-left"
-        size="14"
-        class="text-slate-900 dark:text-slate-50"
-      />
-    </button>
-    <div class="flex items-center gap-1">
-      <button
-        v-if="firstButtonLabel"
-        class="p-0 text-sm font-medium text-center text-slate-800 dark:text-slate-50 hover:text-woot-600 dark:hover:text-woot-600"
-        @click="onClickSetView(calendarType, viewMode)"
-      >
-        {{ firstButtonLabel }}
-      </button>
-      <button
-        v-if="buttonLabel"
-        class="p-0 text-sm font-medium text-center text-slate-800 dark:text-slate-50"
-        :class="{ 'hover:text-woot-600 dark:hover:text-woot-600': viewMode }"
-        @click="onClickSetView(calendarType, YEAR)"
-      >
-        {{ buttonLabel }}
-      </button>
-    </div>
-    <button
-      class="p-1 rounded-lg hover:bg-slate-75 dark:hover:bg-slate-700/50 rtl:rotate-180"
-      @click="onClickNext(calendarType)"
-    >
-      <fluent-icon
-        icon="chevron-right"
-        size="14"
-        class="text-slate-900 dark:text-slate-50"
-      />
-    </button>
-  </div>
-</template>
@@ -1,74 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { parse, isValid, isAfter, isBefore } from 'date-fns';
-import {
-  getIntlDateFormatForLocale,
-  CALENDAR_TYPES,
-} from '../helpers/DatePickerHelper';
-
-const props = defineProps({
-  calendarType: {
-    type: String,
-    default: '',
-  },
-  dateValue: Date,
-  compareDate: Date,
-  isDisabled: Boolean,
-});
-
-const emit = defineEmits(['update', 'validate', 'error']);
-
-const { START_CALENDAR, END_CALENDAR } = CALENDAR_TYPES;
-
-const dateFormat = computed(() => getIntlDateFormatForLocale()?.toUpperCase());
-
-const localDateValue = computed({
-  get: () => props.dateValue?.toLocaleDateString(navigator.language) || '',
-  set: newValue => {
-    const format = getIntlDateFormatForLocale();
-    const parsedDate = parse(newValue, format, new Date());
-    if (isValid(parsedDate)) {
-      emit('update', parsedDate);
-    }
-  },
-});
-
-const validateDate = () => {
-  if (!isValid(props.dateValue)) {
-    emit('error', `Please enter the date in valid format: ${dateFormat.value}`);
-    return;
-  }
-
-  const { calendarType, compareDate, dateValue } = props;
-  const isStartCalendar = calendarType === START_CALENDAR;
-  const isEndCalendar = calendarType === END_CALENDAR;
-
-  if (compareDate && isStartCalendar && isAfter(dateValue, compareDate)) {
-    emit('error', 'Start date must be before the end date.');
-  } else if (compareDate && isEndCalendar && isBefore(dateValue, compareDate)) {
-    emit('error', 'End date must be after the start date.');
-  } else {
-    emit('validate', dateValue);
-  }
-};
-</script>
-
-<template>
-  <div class="h-[82px] flex flex-col items-start px-5 gap-1.5 pt-4 w-full">
-    <span class="text-sm font-medium text-slate-800 dark:text-slate-50">
-      {{
-        calendarType === START_CALENDAR
-          ? $t('DATE_PICKER.DATE_RANGE_INPUT.START')
-          : $t('DATE_PICKER.DATE_RANGE_INPUT.END')
-      }}
-    </span>
-    <input
-      v-model="localDateValue"
-      type="text"
-      class="reset-base border bg-slate-25 dark:bg-slate-900 ring-offset-ash-900 border-slate-50 dark:border-slate-700/50 w-full disabled:text-slate-200 dark:disabled:text-slate-700 disabled:cursor-not-allowed text-slate-800 dark:text-slate-50 px-1.5 py-1 text-sm rounded-xl h-10"
-      :placeholder="dateFormat"
-      :disabled="isDisabled"
-      @keypress.enter="validateDate"
-    />
-  </div>
-</template>
@@ -1,41 +0,0 @@
-<script setup>
-import { dateRanges } from '../helpers/DatePickerHelper';
-
-defineProps({
-  selectedRange: {
-    type: String,
-    default: '',
-  },
-});
-
-const emit = defineEmits(['set-range']);
-
-const setDateRange = range => {
-  emit('set-range', range);
-};
-</script>
-
-<template>
-  <div class="w-[200px] flex flex-col items-start">
-    <h4
-      class="w-full px-5 py-4 text-sm font-medium capitalize text-start text-slate-600 dark:text-slate-200"
-    >
-      {{ $t('DATE_PICKER.DATE_RANGE_OPTIONS.TITLE') }}
-    </h4>
-    <div class="flex flex-col items-start w-full">
-      <button
-        v-for="range in dateRanges"
-        :key="range.label"
-        class="w-full px-5 py-3 text-sm font-medium truncate border-none rounded-none text-start hover:bg-slate-50 dark:hover:bg-slate-700"
-        :class="
-          range.value === selectedRange
-            ? 'text-slate-800 dark:text-slate-50 bg-slate-50 dark:bg-slate-700'
-            : 'text-slate-600 dark:text-slate-200'
-        "
-        @click="setDateRange(range)"
-      >
-        {{ $t(range.label) }}
-      </button>
-    </div>
-  </div>
-</template>
@@ -1,28 +0,0 @@
-<script setup>
-const emit = defineEmits(['clear', 'apply']);
-
-const onClickClear = () => {
-  emit('clear');
-};
-
-const onClickApply = () => {
-  emit('change');
-};
-</script>
-
-<template>
-  <div class="h-[56px] flex justify-between px-5 py-3 items-center">
-    <button
-      class="p-1.5 rounded-lg w-fit text-sm font-medium text-slate-600 dark:text-slate-200 hover:text-slate-800 dark:hover:text-slate-100"
-      @click="onClickClear"
-    >
-      {{ $t('DATE_PICKER.CLEAR_BUTTON') }}
-    </button>
-    <button
-      class="p-1.5 rounded-lg w-fit text-sm font-medium text-woot-500 dark:text-woot-300 hover:text-woot-700 dark:hover:text-woot-500"
-      @click="onClickApply"
-    >
-      {{ $t('DATE_PICKER.APPLY_BUTTON') }}
-    </button>
-  </div>
-</template>
@@ -1,86 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { format, getMonth, setMonth, startOfMonth } from 'date-fns';
-import {
-  yearName,
-  CALENDAR_TYPES,
-  CALENDAR_PERIODS,
-} from '../helpers/DatePickerHelper';
-
-import CalendarAction from './CalendarAction.vue';
-
-const props = defineProps({
-  calendarType: {
-    type: String,
-    default: 'start',
-  },
-  startCurrentDate: Date,
-  endCurrentDate: Date,
-});
-
-const { START_CALENDAR } = CALENDAR_TYPES;
-const { MONTH, YEAR } = CALENDAR_PERIODS;
-
-const months = Array.from({ length: 12 }, (_, index) =>
-  format(setMonth(startOfMonth(new Date()), index), 'MMM')
-);
-
-const activeMonthIndex = computed(() => {
-  const date =
-    props.calendarType === START_CALENDAR
-      ? props.startCurrentDate
-      : props.endCurrentDate;
-  return getMonth(date);
-});
-
-const emit = defineEmits(['select-month', 'prev', 'next', 'set-view']);
-
-const setViewMode = (type, mode) => {
-  emit('set-view', type, mode);
-};
-
-const onClickPrev = () => {
-  emit('prev');
-};
-
-const onClickNext = () => {
-  emit('next');
-};
-
-const selectMonth = index => {
-  emit('select-month', index);
-};
-</script>
-
-<template>
-  <div class="flex flex-col w-full gap-2 max-h-[312px]">
-    <CalendarAction
-      :view-mode="YEAR"
-      :calendar-type="calendarType"
-      :button-label="
-        yearName(
-          calendarType === START_CALENDAR ? startCurrentDate : endCurrentDate,
-          MONTH
-        )
-      "
-      @set-view="setViewMode"
-      @prev="onClickPrev"
-      @next="onClickNext"
-    />
-
-    <div class="grid w-full grid-cols-3 gap-x-3 gap-y-2 auto-rows-[61px]">
-      <button
-        v-for="(month, index) in months"
-        :key="index"
-        class="p-2 text-sm font-medium text-center text-slate-800 dark:text-slate-50 w-[92px] h-10 rounded-lg py-2.5 px-2 hover:bg-slate-75 dark:hover:bg-slate-700"
-        :class="{
-          'bg-woot-600 dark:bg-woot-600 text-white dark:text-white hover:bg-woot-500 dark:bg-woot-700':
-            index === activeMonthIndex,
-        }"
-        @click="selectMonth(index)"
-      >
-        {{ month }}
-      </button>
-    </div>
-  </div>
-</template>
@@ -1,172 +0,0 @@
-<script setup>
-import {
-  monthName,
-  yearName,
-  getWeeksForMonth,
-  isToday,
-  dayIsInRange,
-  isCurrentMonth,
-  isLastDayOfMonth,
-  isHoveringDayInRange,
-  isHoveringNextDayInRange,
-  CALENDAR_TYPES,
-  CALENDAR_PERIODS,
-} from '../helpers/DatePickerHelper';
-
-import CalendarWeekLabel from './CalendarWeekLabel.vue';
-import CalendarAction from './CalendarAction.vue';
-
-const props = defineProps({
-  calendarType: {
-    type: String,
-    default: 'start',
-  },
-  currentDate: Date,
-  startCurrentDate: Date,
-  endCurrentDate: Date,
-  selectedStartDate: Date,
-  selectingEndDate: Boolean,
-  selectedEndDate: Date,
-  hoveredEndDate: Date,
-});
-
-const emit = defineEmits([
-  'update-hovered-end-date',
-  'select-date',
-  'prev',
-  'next',
-  'set-view',
-]);
-
-const { START_CALENDAR } = CALENDAR_TYPES;
-const { MONTH } = CALENDAR_PERIODS;
-
-const emitHoveredEndDate = day => {
-  emit('update-hovered-end-date', day);
-};
-
-const emitSelectDate = day => {
-  emit('select-date', day);
-};
-const onClickPrev = () => {
-  emit('prev');
-};
-
-const onClickNext = () => {
-  emit('next');
-};
-
-const setViewMode = (type, mode) => {
-  emit('set-view', type, mode);
-};
-
-const weeks = calendarType => {
-  return getWeeksForMonth(
-    calendarType === START_CALENDAR
-      ? props.startCurrentDate
-      : props.endCurrentDate
-  );
-};
-
-const isSelectedStartOrEndDate = day => {
-  return (
-    dayIsInRange(day, props.selectedStartDate, props.selectedStartDate) ||
-    dayIsInRange(day, props.selectedEndDate, props.selectedEndDate)
-  );
-};
-
-const isInRange = day => {
-  return dayIsInRange(day, props.selectedStartDate, props.selectedEndDate);
-};
-
-const isInCurrentMonth = day => {
-  return isCurrentMonth(
-    day,
-    props.calendarType === START_CALENDAR
-      ? props.startCurrentDate
-      : props.endCurrentDate
-  );
-};
-
-const isHoveringInRange = day => {
-  return isHoveringDayInRange(
-    day,
-    props.selectedStartDate,
-    props.selectingEndDate,
-    props.hoveredEndDate
-  );
-};
-
-const isNextDayInRange = day => {
-  return isHoveringNextDayInRange(
-    day,
-    props.selectedStartDate,
-    props.selectedEndDate,
-    props.hoveredEndDate
-  );
-};
-
-const dayClasses = day => ({
-  'text-slate-500 dark:text-slate-400 pointer-events-none':
-    !isInCurrentMonth(day),
-  'text-slate-800 dark:text-slate-50 hover:text-slate-800 dark:hover:text-white hover:bg-woot-100 dark:hover:bg-woot-700':
-    isInCurrentMonth(day),
-  'bg-woot-600 dark:bg-woot-600 text-white dark:text-white':
-    isSelectedStartOrEndDate(day) && isInCurrentMonth(day),
-  'bg-woot-50 dark:bg-woot-800':
-    (isInRange(day) || isHoveringInRange(day)) &&
-    !isSelectedStartOrEndDate(day) &&
-    isInCurrentMonth(day),
-  'outline outline-1 outline-woot-200 -outline-offset-1 dark:outline-woot-700 text-woot-600 dark:text-woot-400':
-    isToday(props.currentDate, day) && !isSelectedStartOrEndDate(day),
-});
-</script>
-
-<template>
-  <div class="flex flex-col w-full gap-2 max-h-[312px]">
-    <CalendarAction
-      :view-mode="MONTH"
-      :calendar-type="calendarType"
-      :first-button-label="
-        monthName(
-          calendarType === START_CALENDAR ? startCurrentDate : endCurrentDate
-        )
-      "
-      :button-label="
-        yearName(
-          calendarType === START_CALENDAR ? startCurrentDate : endCurrentDate
-        )
-      "
-      @prev="onClickPrev"
-      @next="onClickNext"
-      @set-view="setViewMode"
-    />
-    <CalendarWeekLabel />
-    <div
-      v-for="week in weeks(calendarType)"
-      :key="week[0].getTime()"
-      class="grid max-w-md grid-cols-7 gap-2 mx-auto overflow-hidden rounded-lg"
-    >
-      <div
-        v-for="day in week"
-        :key="day.getTime()"
-        class="flex relative items-center justify-center w-9 h-8 py-1.5 px-2 font-medium text-sm rounded-lg cursor-pointer"
-        :class="dayClasses(day)"
-        @mouseenter="emitHoveredEndDate(day)"
-        @mouseleave="emitHoveredEndDate(null)"
-        @click="emitSelectDate(day)"
-      >
-        {{ day.getDate() }}
-        <span
-          v-if="
-            (isInRange(day) || isHoveringInRange(day)) &&
-            isNextDayInRange(day) &&
-            !isLastDayOfMonth(day) &&
-            isInCurrentMonth(day)
-          "
-          class="absolute bottom-0 w-6 h-8 ltr:-right-4 rtl:-left-4 bg-woot-50 dark:bg-woot-800 -z-10"
-        />
-      </div>
-    </div>
-  </div>
-</template>
@@ -1,15 +0,0 @@
-<script setup>
-import { calendarWeeks } from '../helpers/DatePickerHelper';
-</script>
-
-<template>
-  <div class="max-w-md mx-auto grid grid-cols-7 gap-2">
-    <div
-      v-for="day in calendarWeeks"
-      :key="day.id"
-      class="flex items-center justify-center font-medium text-sm w-9 h-7 py-1.5 px-2"
-    >
-      {{ day.label }}
-    </div>
-  </div>
-</template>
@@ -1,86 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { getYear, addYears, subYears } from 'date-fns';
-import { CALENDAR_TYPES } from '../helpers/DatePickerHelper';
-
-import CalendarAction from './CalendarAction.vue';
-
-const props = defineProps({
-  calendarType: {
-    type: String,
-    default: 'start',
-  },
-  startCurrentDate: Date,
-  endCurrentDate: Date,
-});
-
-const { START_CALENDAR } = CALENDAR_TYPES;
-
-const calculateStartYear = date => {
-  const year = getYear(date);
-  return year - (year % 10); // Align with the beginning of a decade
-};
-
-const startYear = ref(
-  calculateStartYear(
-    props.calendarType === START_CALENDAR
-      ? props.startCurrentDate
-      : props.endCurrentDate
-  )
-);
-
-const years = computed(() =>
-  Array.from({ length: 10 }, (_, i) => startYear.value + i)
-);
-
-const firstYear = computed(() => years.value[0]);
-const lastYear = computed(() => years.value[years.value.length - 1]);
-
-const activeYear = computed(() => {
-  const date =
-    props.calendarType === START_CALENDAR
-      ? props.startCurrentDate
-      : props.endCurrentDate;
-  return getYear(date);
-});
-
-const onClickPrev = () => {
-  startYear.value = subYears(new Date(startYear.value, 0, 1), 10).getFullYear();
-};
-
-const onClickNext = () => {
-  startYear.value = addYears(new Date(startYear.value, 0, 1), 10).getFullYear();
-};
-
-const emit = defineEmits(['select-year']);
-
-const selectYear = year => {
-  emit('select-year', year);
-};
-</script>
-
-<template>
-  <div class="flex flex-col w-full gap-2 max-h-[312px]">
-    <CalendarAction
-      :calendar-type="calendarType"
-      :button-label="`${firstYear} - ${lastYear}`"
-      @prev="onClickPrev"
-      @next="onClickNext"
-    />
-
-    <div class="grid grid-cols-2 gap-x-3 gap-y-2 w-full auto-rows-[47px]">
-      <button
-        v-for="year in years"
-        :key="year"
-        class="p-2 text-sm font-medium text-center text-slate-800 dark:text-slate-50 w-[144px] h-10 rounded-lg py-2.5 px-2 hover:bg-slate-75 dark:hover:bg-slate-700"
-        :class="{
-          'bg-woot-600 dark:bg-woot-600 text-white dark:text-white hover:bg-woot-500 dark:hover:bg-woot-700':
-            year === activeYear,
-        }"
-        @click="selectYear(year)"
-      >
-        {{ year }}
-      </button>
-    </div>
-  </div>
-</template>
@@ -1,71 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { dateRanges } from '../helpers/DatePickerHelper';
-import { format, isSameYear, isValid } from 'date-fns';
-
-const props = defineProps({
-  selectedStartDate: Date,
-  selectedEndDate: Date,
-  selectedRange: {
-    type: String,
-    default: '',
-  },
-});
-
-const formatDateRange = computed(() => {
-  const startDate = props.selectedStartDate;
-  const endDate = props.selectedEndDate;
-
-  if (!isValid(startDate) || !isValid(endDate)) {
-    return 'Select a date range';
-  }
-
-  const formatString = isSameYear(startDate, endDate)
-    ? 'MMM d' // Same year: "Apr 1"
-    : 'MMM d yyyy'; // Different years: "Apr 1 2025"
-
-  if (isSameYear(startDate, new Date()) && isSameYear(endDate, new Date())) {
-    // Both dates are in the current year
-    return `${format(startDate, 'MMM d')} - ${format(endDate, 'MMM d')}`;
-  }
-  // At least one date is not in the current year
-  return `${format(startDate, formatString)} - ${format(
-    endDate,
-    formatString
-  )}`;
-});
-
-const activeDateRange = computed(
-  () => dateRanges.find(range => range.value === props.selectedRange).label
-);
-
-const emit = defineEmits(['open']);
-
-const openDatePicker = () => {
-  emit('open');
-};
-</script>
-
-<template>
-  <button
-    class="inline-flex relative items-center rounded-lg gap-2 py-1.5 px-3 h-8 bg-slate-50 dark:bg-slate-800 hover:bg-slate-50 dark:hover:bg-slate-800 active:bg-slate-75 dark:active:bg-slate-800"
-    @click="openDatePicker"
-  >
-    <fluent-icon
-      class="text-slate-800 dark:text-slate-50"
-      icon="calendar"
-      size="16"
-    />
-    <span class="text-sm font-medium text-slate-800 dark:text-slate-50">
-      {{ $t(activeDateRange) }}
-    </span>
-    <span class="text-sm font-medium text-slate-600 dark:text-slate-200">
-      {{ formatDateRange }}
-    </span>
-    <fluent-icon
-      class="text-slate-800 dark:text-slate-50"
-      icon="chevron-down"
-      size="14"
-    />
-  </button>
-</template>
@@ -1,219 +0,0 @@
-import {
-  startOfDay,
-  subDays,
-  endOfDay,
-  subMonths,
-  addMonths,
-  subYears,
-  addYears,
-  startOfMonth,
-  isSameMonth,
-  format,
-  startOfWeek,
-  addDays,
-  eachDayOfInterval,
-  endOfMonth,
-  isSameDay,
-  isWithinInterval,
-} from 'date-fns';
-
-// Constants for calendar and date ranges
-export const calendarWeeks = [
-  { id: 1, label: 'M' },
-  { id: 2, label: 'T' },
-  { id: 3, label: 'W' },
-  { id: 4, label: 'T' },
-  { id: 5, label: 'F' },
-  { id: 6, label: 'S' },
-  { id: 7, label: 'S' },
-];
-
-export const dateRanges = [
-  { label: 'DATE_PICKER.DATE_RANGE_OPTIONS.LAST_7_DAYS', value: 'last7days' },
-  { label: 'DATE_PICKER.DATE_RANGE_OPTIONS.LAST_30_DAYS', value: 'last30days' },
-  {
-    label: 'DATE_PICKER.DATE_RANGE_OPTIONS.LAST_3_MONTHS',
-    value: 'last3months',
-  },
-  {
-    label: 'DATE_PICKER.DATE_RANGE_OPTIONS.LAST_6_MONTHS',
-    value: 'last6months',
-  },
-  { label: 'DATE_PICKER.DATE_RANGE_OPTIONS.LAST_YEAR', value: 'lastYear' },
-  { label: 'DATE_PICKER.DATE_RANGE_OPTIONS.CUSTOM_RANGE', value: 'custom' },
-];
-
-export const DATE_RANGE_TYPES = {
-  LAST_7_DAYS: 'last7days',
-  LAST_30_DAYS: 'last30days',
-  LAST_3_MONTHS: 'last3months',
-  LAST_6_MONTHS: 'last6months',
-  LAST_YEAR: 'lastYear',
-  CUSTOM_RANGE: 'custom',
-};
-
-export const CALENDAR_TYPES = {
-  START_CALENDAR: 'start',
-  END_CALENDAR: 'end',
-};
-
-export const CALENDAR_PERIODS = {
-  WEEK: 'week',
-  MONTH: 'month',
-  YEAR: 'year',
-};
-
-// Utility functions for date operations
-export const monthName = currentDate => format(currentDate, 'MMMM');
-export const yearName = currentDate => format(currentDate, 'yyyy');
-
-export const getIntlDateFormatForLocale = () => {
-  const year = 2222;
-  const month = 12;
-  const day = 15;
-  const date = new Date(year, month - 1, day);
-  const formattedDate = new Intl.DateTimeFormat(navigator.language).format(
-    date
-  );
-  return formattedDate
-    .replace(`${year}`, 'yyyy')
-    .replace(`${month}`, 'MM')
-    .replace(`${day}`, 'dd');
-};
-
-// Utility functions for calendar operations
-export const chunk = (array, size) =>
-  Array.from({ length: Math.ceil(array.length / size) }, (_, index) =>
-    array.slice(index * size, index * size + size)
-  );
-
-export const getWeeksForMonth = (date, weekStartsOn = 1) => {
-  const startOfTheMonth = startOfMonth(date);
-  const startOfTheFirstWeek = startOfWeek(startOfTheMonth, { weekStartsOn });
-  const endOfTheLastWeek = addDays(startOfTheFirstWeek, 41); // Covering six weeks to fill the calendar
-  return chunk(
-    eachDayOfInterval({ start: startOfTheFirstWeek, end: endOfTheLastWeek }),
-    7
-  );
-};
-
-export const moveCalendarDate = (
-  calendar,
-  startCurrentDate,
-  endCurrentDate,
-  direction,
-  period
-) => {
-  const adjustFunctions = {
-    month: { prev: subMonths, next: addMonths },
-    year: { prev: subYears, next: addYears },
-  };
-
-  const adjust = adjustFunctions[period][direction];
-
-  if (calendar === 'start') {
-    const newStart = adjust(startCurrentDate, 1);
-    return { start: newStart, end: endCurrentDate };
-  }
-  const newEnd = adjust(endCurrentDate, 1);
-  return { start: startCurrentDate, end: newEnd };
-};
-
-// Date comparison functions
-export const isToday = (currentDate, date) =>
-  date.getDate() === currentDate.getDate() &&
-  date.getMonth() === currentDate.getMonth() &&
-  date.getFullYear() === currentDate.getFullYear();
-
-export const isCurrentMonth = (day, referenceDate) =>
-  isSameMonth(day, referenceDate);
-
-export const isLastDayOfMonth = day => {
-  const lastDay = endOfMonth(day);
-  return day.getDate() === lastDay.getDate();
-};
-
-export const dayIsInRange = (date, startDate, endDate) => {
-  if (!startDate || !endDate) {
-    return false;
-  }
-  // Normalize dates to ignore time differences
-  let startOfDayStart = startOfDay(startDate);
-  let startOfDayEnd = startOfDay(endDate);
-  // Swap if start is greater than end
-  if (startOfDayStart > startOfDayEnd) {
-    [startOfDayStart, startOfDayEnd] = [startOfDayEnd, startOfDayStart];
-  }
-  // Check if the date is within the interval or is the same as the start date
-  return (
-    isSameDay(date, startOfDayStart) ||
-    isWithinInterval(date, {
-      start: startOfDayStart,
-      end: startOfDayEnd,
-    })
-  );
-};
-
-// Handling hovering states in date range pickers
-export const isHoveringDayInRange = (
-  day,
-  startDate,
-  endDate,
-  hoveredEndDate
-) => {
-  if (endDate && hoveredEndDate && startDate <= hoveredEndDate) {
-    // Ensure the start date is not after the hovered end date
-    return isWithinInterval(day, { start: startDate, end: hoveredEndDate });
-  }
-  return false;
-};
-
-export const isHoveringNextDayInRange = (
-  day,
-  startDate,
-  endDate,
-  hoveredEndDate
-) => {
-  if (startDate && !endDate && hoveredEndDate) {
-    // If a start date is selected, and we're hovering (but haven't clicked an end date yet)
-    const nextDay = addDays(day, 1);
-    return isWithinInterval(nextDay, { start: startDate, end: hoveredEndDate });
-  }
-  if (startDate && endDate) {
-    // Normal range checking between selected start and end dates
-    const nextDay = addDays(day, 1);
-    return isWithinInterval(nextDay, { start: startDate, end: endDate });
-  }
-  return false;
-};
-
-// Helper func to determine active date ranges based on user selection
-export const getActiveDateRange = (range, currentDate) => {
-  const ranges = {
-    last7days: () => ({
-      start: startOfDay(subDays(currentDate, 6)),
-      end: endOfDay(currentDate),
-    }),
-    last30days: () => ({
-      start: startOfDay(subDays(currentDate, 29)),
-      end: endOfDay(currentDate),
-    }),
-    last3months: () => ({
-      start: startOfDay(subMonths(currentDate, 3)),
-      end: endOfDay(currentDate),
-    }),
-    last6months: () => ({
-      start: startOfDay(subMonths(currentDate, 6)),
-      end: endOfDay(currentDate),
-    }),
-    lastYear: () => ({
-      start: startOfDay(subMonths(currentDate, 12)),
-      end: endOfDay(currentDate),
-    }),
-    custom: () => ({ start: currentDate, end: currentDate }),
-  };
-
-  return (
-    ranges[range] || (() => ({ start: currentDate, end: currentDate }))
-  )();
-};
@@ -1,309 +0,0 @@
-import {
-  monthName,
-  yearName,
-  getIntlDateFormatForLocale,
-  getWeeksForMonth,
-  isToday,
-  isCurrentMonth,
-  isLastDayOfMonth,
-  dayIsInRange,
-  getActiveDateRange,
-  isHoveringDayInRange,
-  isHoveringNextDayInRange,
-  moveCalendarDate,
-  chunk,
-} from '../DatePickerHelper';
-
-describe('Date formatting functions', () => {
-  const testDate = new Date(2020, 4, 15); // May 15, 2020
-
-  beforeEach(() => {
-    jest.spyOn(navigator, 'language', 'get').mockReturnValue('en-US');
-  });
-
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
-
-  it('returns the correct month name from a date', () => {
-    expect(monthName(testDate)).toBe('May');
-  });
-
-  it('returns the correct year from a date', () => {
-    expect(yearName(testDate)).toBe('2020');
-  });
-
-  it('returns the correct date format for the current locale en-US', () => {
-    const expected = 'MM/dd/yyyy';
-    expect(getIntlDateFormatForLocale()).toBe(expected);
-  });
-
-  it('returns the correct date format for the current locale en-IN', () => {
-    jest.spyOn(navigator, 'language', 'get').mockReturnValue('en-IN');
-    const expected = 'dd/MM/yyyy';
-    expect(getIntlDateFormatForLocale()).toBe(expected);
-  });
-});
-
-describe('chunk', () => {
-  const array = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-
-  it('correctly chunks an array into smaller arrays of given size', () => {
-    const expected = [
-      [1, 2, 3],
-      [4, 5, 6],
-      [7, 8, 9],
-    ];
-    expect(chunk(array, 3)).toEqual(expected);
-  });
-
-  it('handles arrays that do not divide evenly by the chunk size', () => {
-    const expected = [[1, 2], [3, 4], [5, 6], [7, 8], [9]];
-    expect(chunk(array, 2)).toEqual(expected);
-  });
-});
-
-describe('getWeeksForMonth', () => {
-  it('returns the correct weeks array for a month starting on Monday', () => {
-    const date = new Date(2020, 3, 1); // April 2020
-    const weeks = getWeeksForMonth(date, 1);
-    expect(weeks.length).toBe(6);
-    expect(weeks[0][0]).toEqual(new Date(2020, 2, 30)); // Check if first day of the first week is correct
-  });
-});
-
-describe('moveCalendarDate', () => {
-  it('handles the year transition when moving the start date backward by one month from January', () => {
-    const startDate = new Date(2021, 0, 1);
-    const endDate = new Date(2021, 0, 31);
-    const result = moveCalendarDate(
-      'start',
-      startDate,
-      endDate,
-      'prev',
-      'month'
-    );
-    const expectedStartDate = new Date(2020, 11, 1);
-    expect(result.start.toISOString()).toEqual(expectedStartDate.toISOString());
-    expect(result.end.toISOString()).toEqual(endDate.toISOString());
-  });
-
-  it('handles the year transition when moving the start date forward by one month from January', () => {
-    const startDate = new Date(2020, 0, 1);
-    const endDate = new Date(2020, 1, 31);
-    const result = moveCalendarDate(
-      'start',
-      startDate,
-      endDate,
-      'next',
-      'month'
-    );
-    const expectedStartDate = new Date(2020, 1, 1);
-    expect(result.start.toISOString()).toEqual(expectedStartDate.toISOString());
-    expect(result.end.toISOString()).toEqual(endDate.toISOString());
-  });
-
-  it('handles the year transition when moving the end date forward by one month from December', () => {
-    const startDate = new Date(2021, 11, 1);
-    const endDate = new Date(2021, 11, 31);
-    const result = moveCalendarDate('end', startDate, endDate, 'next', 'month');
-    const expectedEndDate = new Date(2022, 0, 31);
-    expect(result.start).toEqual(startDate);
-    expect(result.end.toISOString()).toEqual(expectedEndDate.toISOString());
-  });
-  it('handles the year transition when moving the end date backward by one month from December', () => {
-    const startDate = new Date(2021, 11, 1);
-    const endDate = new Date(2021, 11, 31);
-    const result = moveCalendarDate('end', startDate, endDate, 'prev', 'month');
-    const expectedEndDate = new Date(2021, 10, 30);
-
-    expect(result.start).toEqual(startDate);
-    expect(result.end.toISOString()).toEqual(expectedEndDate.toISOString());
-  });
-});
-
-describe('isToday', () => {
-  it('returns true if the dates are the same', () => {
-    const today = new Date();
-    const alsoToday = new Date(today);
-    expect(isToday(today, alsoToday)).toBeTruthy();
-  });
-
-  it('returns false if the dates are not the same', () => {
-    const today = new Date();
-    const notToday = new Date(
-      today.getFullYear(),
-      today.getMonth(),
-      today.getDate() - 1
-    );
-    expect(isToday(today, notToday)).toBeFalsy();
-  });
-});
-
-describe('isCurrentMonth', () => {
-  const referenceDate = new Date(2020, 6, 15); // July 15, 2020
-
-  it('returns true if the day is in the same month as the reference date', () => {
-    const testDay = new Date(2020, 6, 1);
-    expect(isCurrentMonth(testDay, referenceDate)).toBeTruthy();
-  });
-
-  it('returns false if the day is not in the same month as the reference date', () => {
-    const testDay = new Date(2020, 5, 30);
-    expect(isCurrentMonth(testDay, referenceDate)).toBeFalsy();
-  });
-});
-
-describe('isLastDayOfMonth', () => {
-  it('returns true if the day is the last day of the month', () => {
-    const testDay = new Date(2020, 6, 31); // July 31, 2020
-    expect(isLastDayOfMonth(testDay)).toBeTruthy();
-  });
-
-  it('returns false if the day is not the last day of the month', () => {
-    const testDay = new Date(2020, 6, 30); // July 30, 2020
-    expect(isLastDayOfMonth(testDay)).toBeFalsy();
-  });
-});
-
-describe('dayIsInRange', () => {
-  it('returns true if the date is within the range', () => {
-    const start = new Date(2020, 1, 10);
-    const end = new Date(2020, 1, 20);
-    const testDate = new Date(2020, 1, 15);
-    expect(dayIsInRange(testDate, start, end)).toBeTruthy();
-  });
-
-  it('returns true if the date is the same as the start date', () => {
-    const start = new Date(2020, 1, 10);
-    const end = new Date(2020, 1, 20);
-    const testDate = new Date(2020, 1, 10);
-    expect(dayIsInRange(testDate, start, end)).toBeTruthy();
-  });
-
-  it('returns false if the date is outside the range', () => {
-    const start = new Date(2020, 1, 10);
-    const end = new Date(2020, 1, 20);
-    const testDate = new Date(2020, 1, 9);
-    expect(dayIsInRange(testDate, start, end)).toBeFalsy();
-  });
-});
-
-describe('isHoveringDayInRange', () => {
-  const startDate = new Date(2020, 6, 10);
-  const endDate = new Date(2020, 6, 20);
-  const hoveredEndDate = new Date(2020, 6, 15);
-
-  it('returns true if the day is within the start and hovered end dates', () => {
-    const testDay = new Date(2020, 6, 12);
-    expect(
-      isHoveringDayInRange(testDay, startDate, endDate, hoveredEndDate)
-    ).toBeTruthy();
-  });
-
-  it('returns false if the day is outside the hovered date range', () => {
-    const testDay = new Date(2020, 6, 16);
-    expect(
-      isHoveringDayInRange(testDay, startDate, endDate, hoveredEndDate)
-    ).toBeFalsy();
-  });
-});
-
-describe('isHoveringNextDayInRange', () => {
-  const startDate = new Date(2020, 6, 10);
-  const hoveredEndDate = new Date(2020, 6, 15);
-
-  it('returns true if the next day after the given day is within the start and hovered end dates', () => {
-    const testDay = new Date(2020, 6, 14);
-    expect(
-      isHoveringNextDayInRange(testDay, startDate, null, hoveredEndDate)
-    ).toBeTruthy();
-  });
-
-  it('returns false if the next day is outside the start and hovered end dates', () => {
-    const testDay = new Date(2020, 6, 15);
-    expect(
-      isHoveringNextDayInRange(testDay, startDate, null, hoveredEndDate)
-    ).toBeFalsy();
-  });
-});
-
-describe('getActiveDateRange', () => {
-  const currentDate = new Date(2020, 5, 15, 12, 0); // May 15, 2020, at noon
-
-  beforeAll(() => {
-    // Mocking the current date to ensure consistency in tests
-    jest.useFakeTimers().setSystemTime(currentDate.getTime());
-  });
-
-  afterAll(() => {
-    jest.useRealTimers();
-  });
-
-  it('returns the correct range for "last7days"', () => {
-    const range = getActiveDateRange('last7days', new Date());
-    const expectedStart = new Date(2020, 5, 9);
-    expectedStart.setHours(0, 0, 0, 0);
-    const expectedEnd = new Date();
-    expectedEnd.setHours(23, 59, 59, 999);
-
-    expect(range.start).toEqual(expectedStart);
-    expect(range.end).toEqual(expectedEnd);
-  });
-
-  it('returns the correct range for "last30days"', () => {
-    const range = getActiveDateRange('last30days', new Date());
-    const expectedStart = new Date(2020, 4, 17);
-    expectedStart.setHours(0, 0, 0, 0);
-    const expectedEnd = new Date();
-    expectedEnd.setHours(23, 59, 59, 999);
-
-    expect(range.start).toEqual(expectedStart);
-    expect(range.end).toEqual(expectedEnd);
-  });
-
-  it('returns the correct range for "last3months"', () => {
-    const range = getActiveDateRange('last3months', new Date());
-    const expectedStart = new Date(2020, 2, 15);
-    expectedStart.setHours(0, 0, 0, 0);
-    const expectedEnd = new Date();
-    expectedEnd.setHours(23, 59, 59, 999);
-
-    expect(range.start).toEqual(expectedStart);
-    expect(range.end).toEqual(expectedEnd);
-  });
-
-  it('returns the correct range for "last6months"', () => {
-    const range = getActiveDateRange('last6months', new Date());
-    const expectedStart = new Date(2019, 11, 15);
-    expectedStart.setHours(0, 0, 0, 0);
-    const expectedEnd = new Date();
-    expectedEnd.setHours(23, 59, 59, 999);
-
-    expect(range.start).toEqual(expectedStart);
-    expect(range.end).toEqual(expectedEnd);
-  });
-
-  it('returns the correct range for "lastYear"', () => {
-    const range = getActiveDateRange('lastYear', new Date());
-    const expectedStart = new Date(2019, 5, 15);
-    expectedStart.setHours(0, 0, 0, 0);
-    const expectedEnd = new Date();
-    expectedEnd.setHours(23, 59, 59, 999);
-
-    expect(range.start).toEqual(expectedStart);
-    expect(range.end).toEqual(expectedEnd);
-  });
-
-  it('returns the correct range for "custom date range"', () => {
-    const range = getActiveDateRange('custom', new Date());
-    expect(range.start).toEqual(new Date(currentDate));
-    expect(range.end).toEqual(new Date(currentDate));
-  });
-
-  it('handles an unknown range label gracefully', () => {
-    const range = getActiveDateRange('unknown', new Date());
-    expect(range.start).toEqual(new Date(currentDate));
-    expect(range.end).toEqual(new Date(currentDate));
-  });
-});
@@ -1,47 +0,0 @@
-<script setup>
-defineProps({
-  buttonText: {
-    type: String,
-    default: '',
-  },
-  rightIcon: {
-    type: String,
-    default: '',
-  },
-  leftIcon: {
-    type: String,
-    default: '',
-  },
-});
-</script>
-<template>
-  <button
-    class="inline-flex relative items-center p-1.5 w-fit h-8 gap-1.5 rounded-lg hover:bg-slate-50 dark:hover:bg-slate-800 active:bg-slate-75 dark:active:bg-slate-800"
-    @click="$emit('click')"
-  >
-    <slot name="leftIcon">
-      <fluent-icon
-        v-if="leftIcon"
-        :icon="leftIcon"
-        size="18"
-        class="flex-shrink-0 text-slate-900 dark:text-slate-50"
-      />
-    </slot>
-    <span
-      v-if="buttonText"
-      class="text-sm font-medium truncate text-slate-900 dark:text-slate-50"
-    >
-      {{ buttonText }}
-    </span>
-    <slot name="rightIcon">
-      <fluent-icon
-        v-if="rightIcon"
-        :icon="rightIcon"
-        size="18"
-        class="flex-shrink-0 text-slate-900 dark:text-slate-50"
-      />
-    </slot>
-
-    <slot name="dropdown" />
-  </button>
-</template>
@@ -1,15 +0,0 @@
-<script setup>
-defineProps({
-  message: {
-    type: String,
-    default: '',
-  },
-});
-</script>
-<template>
-  <div
-    class="flex items-center justify-center h-10 text-sm text-slate-500 dark:text-slate-300"
-  >
-    {{ message }}
-  </div>
-</template>
@@ -1,107 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { debounce } from '@chatwoot/utils';
-import { picoSearch } from '@scmmishra/pico-search';
-import ListItemButton from './DropdownListItemButton.vue';
-import DropdownSearch from './DropdownSearch.vue';
-import DropdownEmptyState from './DropdownEmptyState.vue';
-import DropdownLoadingState from './DropdownLoadingState.vue';
-
-const props = defineProps({
-  listItems: {
-    type: Array,
-    default: () => [],
-  },
-  enableSearch: {
-    type: Boolean,
-    default: false,
-  },
-  inputPlaceholder: {
-    type: String,
-    default: '',
-  },
-  activeFilterId: {
-    type: [String, Number],
-    default: null,
-  },
-  showClearFilter: {
-    type: Boolean,
-    default: false,
-  },
-  isLoading: {
-    type: Boolean,
-    default: false,
-  },
-  loadingPlaceholder: {
-    type: String,
-    default: '',
-  },
-});
-
-const emits = defineEmits(['on-search']);
-
-const searchTerm = ref('');
-
-const onSearch = debounce(value => {
-  searchTerm.value = value;
-  emits('on-search', value);
-}, 300);
-
-const filteredListItems = computed(() => {
-  if (!searchTerm.value) return props.listItems;
-  return picoSearch(props.listItems, searchTerm.value, ['name']);
-});
-
-const isDropdownListEmpty = computed(() => {
-  return !filteredListItems.value.length;
-});
-
-const isFilterActive = id => {
-  if (!props.activeFilterId) return false;
-  return id === props.activeFilterId;
-};
-
-const shouldShowLoadingState = computed(() => {
-  return (
-    props.isLoading && isDropdownListEmpty.value && props.loadingPlaceholder
-  );
-});
-
-const shouldShowEmptyState = computed(() => {
-  return !props.isLoading && isDropdownListEmpty.value;
-});
-</script>
-<template>
-  <div
-    class="absolute z-20 w-40 bg-white border shadow dark:bg-slate-800 rounded-xl border-slate-50 dark:border-slate-700/50 max-h-[400px]"
-    @click.stop
-  >
-    <slot name="search">
-      <dropdown-search
-        v-if="enableSearch"
-        :input-value="searchTerm"
-        :input-placeholder="inputPlaceholder"
-        :show-clear-filter="showClearFilter"
-        @input="onSearch"
-        @click="$emit('removeFilter')"
-      />
-    </slot>
-    <slot name="listItem">
-      <dropdown-loading-state
-        v-if="shouldShowLoadingState"
-        :message="loadingPlaceholder"
-      />
-      <dropdown-empty-state
-        v-else-if="shouldShowEmptyState"
-        :message="$t('REPORT.FILTER_ACTIONS.EMPTY_LIST')"
-      />
-      <list-item-button
-        v-for="item in filteredListItems"
-        :key="item.id"
-        :is-active="isFilterActive(item.id)"
-        :button-text="item.name"
-        @click="$emit('click', item)"
-      />
-    </slot>
-  </div>
-</template>
@@ -1,36 +0,0 @@
-<script setup>
-defineProps({
-  buttonText: {
-    type: String,
-    default: '',
-  },
-  isActive: {
-    type: Boolean,
-    default: false,
-  },
-});
-</script>
-<template>
-  <button
-    class="relative inline-flex items-center justify-start w-full p-3 border-0 rounded-none first:rounded-t-xl last:rounded-b-xl h-11 hover:bg-slate-50 dark:hover:bg-slate-700 active:bg-slate-75 dark:active:bg-slate-800"
-    @click.stop="$emit('click')"
-    @mouseenter="$emit('mouseenter')"
-    @mouseleave="$emit('mouseleave')"
-    @focus="$emit('focus')"
-  >
-    <div class="inline-flex items-center gap-3 overflow-hidden">
-      <span
-        class="text-sm font-medium truncate text-slate-900 dark:text-slate-50"
-      >
-        {{ buttonText }}
-      </span>
-      <fluent-icon
-        v-if="isActive"
-        icon="checkmark"
-        size="18"
-        class="flex-shrink-0 text-slate-900 dark:text-slate-50"
-      />
-    </div>
-    <slot name="dropdown" />
-  </button>
-</template>
@@ -1,15 +0,0 @@
-<script setup>
-defineProps({
-  message: {
-    type: String,
-    default: '',
-  },
-});
-</script>
-<template>
-  <div
-    class="flex items-center justify-center h-10 text-sm text-slate-500 dark:text-slate-300"
-  >
-    {{ message }}
-  </div>
-</template>
@@ -1,47 +0,0 @@
-<script setup>
-defineProps({
-  inputValue: {
-    type: String,
-    default: '',
-  },
-  inputPlaceholder: {
-    type: String,
-    default: '',
-  },
-  showClearFilter: {
-    type: Boolean,
-    default: false,
-  },
-});
-</script>
-<template>
-  <div
-    class="flex items-center justify-between h-10 min-h-[40px] sticky top-0 bg-white z-10 dark:bg-slate-800 gap-2 px-3 border-b rounded-t-xl border-slate-50 dark:border-slate-700"
-  >
-    <div class="flex items-center w-full gap-2" @keyup.space.prevent>
-      <fluent-icon
-        icon="search"
-        size="16"
-        class="text-slate-400 dark:text-slate-400 flex-shrink-0"
-      />
-      <input
-        type="text"
-        class="w-full mb-0 text-sm bg-white dark:bg-slate-800 text-slate-800 dark:text-slate-75 reset-base"
-        :placeholder="inputPlaceholder"
-        :value="inputValue"
-        @input="$emit('input', $event.target.value)"
-      />
-    </div>
-    <!-- Clear filter button -->
-    <woot-button
-      v-if="!inputValue && showClearFilter"
-      size="small"
-      variant="clear"
-      color-scheme="primary"
-      class="!px-1 !py-1.5"
-      @click="$emit('click')"
-    >
-      {{ $t('REPORT.FILTER_ACTIONS.CLEAR_FILTER') }}
-    </woot-button>
-  </div>
-</template>
@@ -1,24 +0,0 @@
-<script setup>
-defineProps({
-  message: {
-    type: String,
-    default: '',
-  },
-});
-</script>
-<template>
-  <div class="relative group w-[inherit] whitespace-normal z-20">
-    <fluent-icon
-      icon="info"
-      size="14"
-      class="mt-0.5 text-slate-600 absolute dark:text-slate-400"
-    />
-    <div
-      class="bg-white dark:bg-slate-900 w-fit ltr:left-4 rtl:right-4 top-0 border p-2.5 group-hover:flex items-center hidden absolute border-slate-75 dark:border-slate-800 rounded-lg shadow-md"
-    >
-      <p class="text-slate-800 dark:text-slate-75 mb-0 text-xs">
-        {{ message }}
-      </p>
-    </div>
-  </div>
-</template>
@@ -1,6 +1,6 @@
 <template>
  <div
-    class="inline-flex ltr:mr-1 rtl:ml-1 mb-1"
+    class="ltr:mr-1 rtl:ml-1 mb-1"
    :class="labelClass"
    :style="labelStyle"
    :title="description"
@@ -111,7 +111,7 @@ export default {

 <style scoped lang="scss">
 .label {
-  @apply items-center font-medium text-xs rounded-[4px] gap-1 p-1 bg-slate-50 dark:bg-slate-700 text-slate-800 dark:text-slate-100 border border-solid border-slate-75 dark:border-slate-600 h-6;
+  @apply inline-flex items-center font-medium text-xs rounded-[4px] gap-1 p-1 bg-slate-50 dark:bg-slate-700 text-slate-800 dark:text-slate-100 border border-solid border-slate-75 dark:border-slate-600 h-6;

  &.small {
    @apply text-xs py-0.5 px-1 leading-tight h-5;
@@ -40,7 +40,8 @@ import AIAssistanceModal from './AIAssistanceModal.vue';
 import adminMixin from 'dashboard/mixins/aiMixin';
 import aiMixin from 'dashboard/mixins/isAdmin';
 import { CMD_AI_ASSIST } from 'dashboard/routes/dashboard/commands/commandBarBusEvents';
-import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
+import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import { buildHotKeys } from 'shared/helpers/KeyboardHelpers';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import AIAssistanceCTAButton from './AIAssistanceCTAButton.vue';

@@ -50,7 +51,7 @@ export default {
    AICTAModal,
    AIAssistanceCTAButton,
  },
-  mixins: [aiMixin, keyboardEventListenerMixins, adminMixin, uiSettingsMixin],
+  mixins: [aiMixin, eventListenerMixins, adminMixin, uiSettingsMixin],
  data: () => ({
    showAIAssistanceModal: false,
    showAICtaModal: false,
@@ -81,22 +82,19 @@ export default {
  },

  mounted() {
-    this.$emitter.on(CMD_AI_ASSIST, this.onAIAssist);
+    bus.$on(CMD_AI_ASSIST, this.onAIAssist);
    this.initialMessage = this.draftMessage;
  },

  methods: {
-    getKeyboardEvents() {
-      return {
-        '$mod+KeyZ': {
-          action: () => {
-            if (this.initialMessage) {
-              this.$emit('replace-text', this.initialMessage);
-              this.initialMessage = '';
-            }
-          },
-        },
-      };
+    onKeyDownHandler(event) {
+      const keyPattern = buildHotKeys(event);
+      const shouldRevertTheContent =
+        ['meta+z', 'ctrl+z'].includes(keyPattern) && !!this.initialMessage;
+      if (shouldRevertTheContent) {
+        this.$emit('replace-text', this.initialMessage);
+        this.initialMessage = '';
+      }
    },
    hideAIAssistanceModal() {
      this.recordAnalytics('DISMISS_AI_SUGGESTION', {
@@ -1,17 +1,17 @@
 <template>
-  <div class="flex overflow-auto max-h-[12.5rem]">
+  <div class="preview-item__wrap flex overflow-auto max-h-[12.5rem]">
    <div
-      v-for="(attachment, index) in nonRecordedAudioAttachments"
+      v-for="(attachment, index) in attachments"
      :key="attachment.id"
      class="preview-item flex items-center p-1 bg-slate-50 dark:bg-slate-800 gap-1 rounded-md w-[15rem] mb-1"
    >
      <div class="max-w-[4rem] flex-shrink-0 w-6 flex items-center">
        <img
          v-if="isTypeImage(attachment.resource)"
-          class="object-cover w-6 h-6 rounded-sm"
+          class="image-thumb"
          :src="attachment.thumb"
        />
-        <span v-else class="relative w-6 h-6 text-lg text-left -top-px">
+        <span v-else class="w-6 h-6 text-lg relative -top-px text-left">
          📄
        </span>
      </div>
@@ -23,62 +23,73 @@
        </span>
      </div>
      <div class="w-[30%] justify-center">
-        <span class="overflow-hidden text-xs text-ellipsis whitespace-nowrap">
+        <span
+          class="item overflow-hidden text-xs text-ellipsis whitespace-nowrap"
+        >
          {{ formatFileSize(attachment.resource) }}
        </span>
      </div>
      <div class="flex items-center justify-center">
        <woot-button
-          class="!w-6 !h-6 text-sm rounded-md hover:bg-slate-50 dark:hover:bg-slate-800 clear secondary"
+          v-if="!isTypeAudio(attachment.resource)"
+          class="remove--attachment clear secondary"
          icon="dismiss"
-          @click="onRemoveAttachment(index)"
+          @click="() => onRemoveAttachment(index)"
        />
      </div>
    </div>
  </div>
 </template>
-
-<script setup>
-import { computed } from 'vue';
+<script>
 import { formatBytes } from 'shared/helpers/FileHelper';
-
-const props = defineProps({
-  attachments: {
-    type: Array,
-    default: () => [],
+export default {
+  props: {
+    attachments: {
+      type: Array,
+      default: () => [],
+    },
+    removeAttachment: {
+      type: Function,
+      default: () => {},
+    },
+  },
+  methods: {
+    onRemoveAttachment(index) {
+      this.removeAttachment(index);
+    },
+    formatFileSize(file) {
+      const size = file.byte_size || file.size;
+      return formatBytes(size, 0);
+    },
+    isTypeImage(file) {
+      const type = file.content_type || file.type;
+      return type.includes('image');
+    },
+    isTypeAudio(file) {
+      const type = file.content_type || file.type;
+      return type.includes('audio');
+    },
+    fileName(file) {
+      return file.filename || file.name;
+    },
  },
-});
-
-const emits = defineEmits(['remove-attachment']);
-
-const nonRecordedAudioAttachments = computed(() => {
-  return props.attachments.filter(attachment => !attachment?.isRecordedAudio);
-});
-
-const recordedAudioAttachments = computed(() =>
-  props.attachments.filter(attachment => attachment.isRecordedAudio)
-);
-
-const onRemoveAttachment = itemIndex => {
-  emits(
-    'remove-attachment',
-    nonRecordedAudioAttachments.value
-      .filter((_, index) => index !== itemIndex)
-      .concat(recordedAudioAttachments.value)
-  );
-};
-
-const formatFileSize = file => {
-  const size = file.byte_size || file.size;
-  return formatBytes(size, 0);
-};
-
-const isTypeImage = file => {
-  const type = file.content_type || file.type;
-  return type.includes('image');
-};
-
-const fileName = file => {
-  return file.filename || file.name;
 };
 </script>
+<style lang="scss" scoped>
+.image-thumb {
+  @apply w-6 h-6 object-cover rounded-sm;
+}
+
+.file-name-wrap,
+.file-size-wrap {
+  @apply flex items-center py-0 px-1;
+
+  > .item {
+    @apply m-0 overflow-hidden text-xs font-medium;
+  }
+}
+
+.remove--attachment {
+  @apply w-6 h-6 rounded-md text-sm cursor-pointer hover:bg-slate-50 dark:hover:bg-slate-800;
+}
+</style>
@@ -10,10 +10,11 @@
 </template>
 <script>
 import wootConstants from 'dashboard/constants/globals';
-import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
+import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import { hasPressedAltAndNKey } from 'shared/helpers/KeyboardHelpers';

 export default {
-  mixins: [keyboardEventListenerMixins],
+  mixins: [eventListenerMixins],
  props: {
    items: {
      type: Array,
@@ -30,18 +31,14 @@ export default {
    },
  },
  methods: {
-    getKeyboardEvents() {
-      return {
-        'Alt+KeyN': {
-          action: () => {
-            if (this.activeTab === wootConstants.ASSIGNEE_TYPE.ALL) {
-              this.onTabChange(0);
-            } else {
-              this.onTabChange(this.activeTabIndex + 1);
-            }
-          },
-        },
-      };
+    handleKeyEvents(e) {
+      if (hasPressedAltAndNKey(e)) {
+        if (this.activeTab === wootConstants.ASSIGNEE_TYPE.ALL) {
+          this.onTabChange(0);
+        } else {
+          this.onTabChange(this.activeTabIndex + 1);
+        }
+      }
    },
    onTabChange(selectedTabIndex) {
      if (this.items[selectedTabIndex].key !== this.activeTab) {
@@ -18,11 +18,13 @@

 <script>
 import { Chrome } from 'vue-color';
+import { mixin as clickaway } from 'vue-clickaway';

 export default {
  components: {
    Chrome,
  },
+  mixins: [clickaway],
  props: {
    value: {
      type: String,
@@ -31,9 +31,15 @@

 <script>
 import AddLabel from 'shared/components/ui/dropdown/AddLabel.vue';
-import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
+import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import LabelDropdown from 'shared/components/ui/label/LabelDropdown.vue';
+import { mixin as clickaway } from 'vue-clickaway';
 import adminMixin from 'dashboard/mixins/isAdmin';
+import {
+  buildHotKeys,
+  isEscape,
+  isActiveElementTypeable,
+} from 'shared/helpers/KeyboardHelpers';

 export default {
  components: {
@@ -41,7 +47,7 @@ export default {
    LabelDropdown,
  },

-  mixins: [adminMixin, keyboardEventListenerMixins],
+  mixins: [clickaway, adminMixin, eventListenerMixins],

  props: {
    allLabels: {
@@ -82,19 +88,17 @@ export default {
    closeDropdownLabel() {
      this.showSearchDropdownLabel = false;
    },
-    getKeyboardEvents() {
-      return {
-        KeyL: {
-          action: e => {
-            this.toggleLabels();
-            e.preventDefault();
-          },
-        },
-        Escape: {
-          action: () => this.closeDropdownLabel(),
-          allowOnFocusedInput: true,
-        },
-      };
+
+    handleKeyEvents(e) {
+      const keyPattern = buildHotKeys(e);
+
+      if (keyPattern === 'l' && !isActiveElementTypeable(e)) {
+        this.toggleLabels();
+        e.preventDefault();
+      } else if (isEscape(e) && this.showSearchDropdownLabel) {
+        this.closeDropdownLabel();
+        e.preventDefault();
+      }
    },
  },
 };
@@ -1,48 +1,171 @@
 <template>
  <footer
    v-if="isFooterVisible"
-    class="h-12 flex items-center justify-between px-6"
+    class="bg-white dark:bg-slate-800 h-12 border-t border-solid border-slate-75 dark:border-slate-700/50 flex items-center justify-between px-6"
  >
-    <table-footer-results
-      :first-index="firstIndex"
-      :last-index="lastIndex"
-      :total-count="totalCount"
-    />
-    <table-footer-pagination
-      v-if="totalCount"
-      :current-page="currentPage"
-      :total-pages="totalPages"
-      :total-count="totalCount"
-      :page-size="pageSize"
-      @page-change="$emit('page-change', $event)"
-    />
+    <div class="left-aligned-wrap">
+      <div class="text-xs text-slate-600 dark:text-slate-200">
+        <strong>{{ firstIndex }}</strong>
+        - <strong>{{ lastIndex }}</strong> of
+        <strong>{{ totalCount }}</strong> items
+      </div>
+    </div>
+    <div class="right-aligned-wrap">
+      <div
+        v-if="totalCount"
+        class="primary button-group pagination-button-group"
+      >
+        <woot-button
+          size="small"
+          variant="smooth"
+          color-scheme="secondary"
+          class-names="goto-first"
+          :is-disabled="hasFirstPage"
+          @click="onFirstPage"
+        >
+          <fluent-icon icon="chevron-left" size="18" />
+          <fluent-icon
+            icon="chevron-left"
+            size="18"
+            :class="pageFooterIconClass"
+          />
+        </woot-button>
+        <woot-button
+          size="small"
+          variant="smooth"
+          color-scheme="secondary"
+          :is-disabled="hasPrevPage"
+          @click="onPrevPage"
+        >
+          <fluent-icon icon="chevron-left" size="18" />
+        </woot-button>
+        <woot-button
+          size="small"
+          variant="smooth"
+          color-scheme="secondary"
+          @click.prevent
+        >
+          {{ currentPage }}
+        </woot-button>
+        <woot-button
+          size="small"
+          variant="smooth"
+          color-scheme="secondary"
+          :is-disabled="hasNextPage"
+          @click="onNextPage"
+        >
+          <fluent-icon icon="chevron-right" size="18" />
+        </woot-button>
+        <woot-button
+          size="small"
+          variant="smooth"
+          color-scheme="secondary"
+          class-names="goto-last"
+          :is-disabled="hasLastPage"
+          @click="onLastPage"
+        >
+          <fluent-icon icon="chevron-right" size="18" />
+          <fluent-icon
+            icon="chevron-right"
+            size="18"
+            :class="pageFooterIconClass"
+          />
+        </woot-button>
+      </div>
+    </div>
  </footer>
 </template>

-<script setup>
-import { computed } from 'vue';
-import TableFooterResults from './TableFooterResults.vue';
-import TableFooterPagination from './TableFooterPagination.vue';
-const props = defineProps({
-  currentPage: {
-    type: Number,
-    default: 1,
+<script>
+import rtlMixin from 'shared/mixins/rtlMixin';
+
+export default {
+  components: {},
+  mixins: [rtlMixin],
+  props: {
+    currentPage: {
+      type: Number,
+      default: 1,
+    },
+    pageSize: {
+      type: Number,
+      default: 25,
+    },
+    totalCount: {
+      type: Number,
+      default: 0,
+    },
  },
-  pageSize: {
-    type: Number,
-    default: 25,
+  computed: {
+    pageFooterIconClass() {
+      return this.isRTLView ? '-mr-3' : '-ml-3';
+    },
+    isFooterVisible() {
+      return this.totalCount && !(this.firstIndex > this.totalCount);
+    },
+    firstIndex() {
+      return this.pageSize * (this.currentPage - 1) + 1;
+    },
+    lastIndex() {
+      return Math.min(this.totalCount, this.pageSize * this.currentPage);
+    },
+    searchButtonClass() {
+      return this.searchQuery !== '' ? 'show' : '';
+    },
+    hasLastPage() {
+      return !!Math.ceil(this.totalCount / this.pageSize);
+    },
+    hasFirstPage() {
+      return this.currentPage === 1;
+    },
+    hasNextPage() {
+      return this.currentPage === Math.ceil(this.totalCount / this.pageSize);
+    },
+    hasPrevPage() {
+      return this.currentPage === 1;
+    },
  },
-  totalCount: {
-    type: Number,
-    default: 0,
+  methods: {
+    onNextPage() {
+      if (this.hasNextPage) {
+        return;
+      }
+      const newPage = this.currentPage + 1;
+      this.onPageChange(newPage);
+    },
+    onPrevPage() {
+      if (this.hasPrevPage) {
+        return;
+      }
+      const newPage = this.currentPage - 1;
+      this.onPageChange(newPage);
+    },
+    onFirstPage() {
+      if (this.hasFirstPage) {
+        return;
+      }
+      const newPage = 1;
+      this.onPageChange(newPage);
+    },
+    onLastPage() {
+      if (this.hasLastPage) {
+        return;
+      }
+      const newPage = Math.ceil(this.totalCount / this.pageSize);
+      this.onPageChange(newPage);
+    },
+    onPageChange(page) {
+      this.$emit('page-change', page);
+    },
  },
-});
-const totalPages = computed(() => Math.ceil(props.totalCount / props.pageSize));
-const firstIndex = computed(() => props.pageSize * (props.currentPage - 1) + 1);
-const lastIndex = computed(() =>
-  Math.min(props.totalCount, props.pageSize * props.currentPage)
-);
-const isFooterVisible = computed(
-  () => props.totalCount && !(firstIndex.value > props.totalCount)
-);
+};
 </script>
+
+<style lang="scss" scoped>
+.goto-first,
+.goto-last {
+  i:last-child {
+    @apply -ml-1;
+  }
+}
+</style>
@@ -1,143 +0,0 @@
-<template>
-  <div class="flex items-center bg-slate-50 dark:bg-slate-800 h-8 rounded-lg">
-    <woot-button
-      size="small"
-      variant="smooth"
-      color-scheme="secondary"
-      :is-disabled="hasFirstPage"
-      class-names="dark:!bg-slate-800 !opacity-100 ltr:rounded-l-lg ltr:rounded-r-none rtl:rounded-r-lg rtl:rounded-l-none"
-      :class="buttonClass(hasFirstPage)"
-      @click="onFirstPage"
-    >
-      <fluent-icon
-        icon="chevrons-left"
-        size="20"
-        icon-lib="lucide"
-        :class="hasFirstPage && 'opacity-40'"
-      />
-    </woot-button>
-    <div class="bg-slate-75 dark:bg-slate-700/50 w-px rounded-sm h-4" />
-    <woot-button
-      size="small"
-      variant="smooth"
-      color-scheme="secondary"
-      :is-disabled="hasPrevPage"
-      class-names="dark:!bg-slate-800 !opacity-100 rounded-none"
-      :class="buttonClass(hasPrevPage)"
-      @click="onPrevPage"
-    >
-      <fluent-icon
-        icon="chevron-left-single"
-        size="20"
-        icon-lib="lucide"
-        :class="hasPrevPage && 'opacity-40'"
-      />
-    </woot-button>
-
-    <div
-      class="flex px-3 items-center gap-3 tabular-nums bg-slate-50 dark:bg-slate-800 text-slate-700 dark:text-slate-100"
-    >
-      <span class="text-sm text-slate-800 dark:text-slate-75">
-        {{ currentPage }}
-      </span>
-      <span class="text-slate-600 dark:text-slate-500">/</span>
-      <span class="text-sm text-slate-600 dark:text-slate-500">
-        {{ totalPages }}
-      </span>
-    </div>
-    <woot-button
-      size="small"
-      variant="smooth"
-      color-scheme="secondary"
-      :is-disabled="hasNextPage"
-      class-names="dark:!bg-slate-800 !opacity-100 rounded-none"
-      :class="buttonClass(hasNextPage)"
-      @click="onNextPage"
-    >
-      <fluent-icon
-        icon="chevron-right-single"
-        size="20"
-        icon-lib="lucide"
-        :class="hasNextPage && 'opacity-40'"
-      />
-    </woot-button>
-    <div class="bg-slate-75 dark:bg-slate-700/50 w-px rounded-sm h-4" />
-    <woot-button
-      size="small"
-      variant="smooth"
-      color-scheme="secondary"
-      class-names="dark:!bg-slate-800 !opacity-100 ltr:rounded-r-lg ltr:rounded-l-none rtl:rounded-l-lg rtl:rounded-r-none"
-      :class="buttonClass(hasLastPage)"
-      :is-disabled="hasLastPage"
-      @click="onLastPage"
-    >
-      <fluent-icon
-        icon="chevrons-right"
-        size="20"
-        icon-lib="lucide"
-        :class="hasLastPage && 'opacity-40'"
-      />
-    </woot-button>
-  </div>
-</template>
-
-<script setup>
-import { computed } from 'vue';
-
-// Props
-const props = defineProps({
-  currentPage: {
-    type: Number,
-    default: 1,
-  },
-  totalCount: {
-    type: Number,
-    default: 0,
-  },
-  totalPages: {
-    type: Number,
-    default: 0,
-  },
-});
-
-const hasLastPage = computed(
-  () => props.currentPage === props.totalPages || props.totalPages === 1
-);
-const hasFirstPage = computed(() => props.currentPage === 1);
-const hasNextPage = computed(() => props.currentPage === props.totalPages);
-const hasPrevPage = computed(() => props.currentPage === 1);
-
-const emit = defineEmits(['page-change']);
-
-function buttonClass(hasPage) {
-  if (hasPage) {
-    return 'hover:!bg-slate-50 dark:hover:!bg-slate-800';
-  }
-  return 'dark:hover:!bg-slate-700/50';
-}
-
-function onPageChange(newPage) {
-  emit('page-change', newPage);
-}
-
-const onNextPage = () => {
-  if (!onNextPage.value) {
-    onPageChange(props.currentPage + 1);
-  }
-};
-const onPrevPage = () => {
-  if (!hasPrevPage.value) {
-    onPageChange(props.currentPage - 1);
-  }
-};
-const onFirstPage = () => {
-  if (!hasFirstPage.value) {
-    onPageChange(1);
-  }
-};
-const onLastPage = () => {
-  if (!hasLastPage.value) {
-    onPageChange(props.totalPages);
-  }
-};
-</script>
@@ -1,28 +0,0 @@
-<template>
-  <span class="text-sm text-slate-700 dark:text-slate-200 font-medium">
-    {{
-      $t('GENERAL.SHOWING_RESULTS', {
-        firstIndex,
-        lastIndex,
-        totalCount,
-      })
-    }}
-  </span>
-</template>
-
-<script setup>
-defineProps({
-  firstIndex: {
-    type: Number,
-    default: 0,
-  },
-  lastIndex: {
-    type: Number,
-    default: 0,
-  },
-  totalCount: {
-    type: Number,
-    default: 0,
-  },
-});
-</script>
@@ -1,39 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-const props = defineProps({
-  span: {
-    type: Number,
-    required: true,
-  },
-  label: {
-    type: String,
-    required: true,
-    default: '',
-  },
-});
-
-const spanClass = computed(() => {
-  if (props.span === 1) return 'col-span-1';
-  if (props.span === 2) return 'col-span-2';
-  if (props.span === 3) return 'col-span-3';
-  if (props.span === 4) return 'col-span-4';
-  if (props.span === 5) return 'col-span-5';
-  if (props.span === 6) return 'col-span-6';
-  if (props.span === 7) return 'col-span-7';
-  if (props.span === 8) return 'col-span-8';
-  if (props.span === 9) return 'col-span-9';
-  if (props.span === 10) return 'col-span-10';
-
-  return 'col-span-1';
-});
-</script>
-<template>
-  <div
-    class="flex items-center px-0 py-2 text-xs font-medium text-left uppercase text-slate-700 dark:text-slate-100 rtl:text-right"
-    :class="spanClass"
-  >
-    <slot>
-      {{ label }}
-    </slot>
-  </div>
-</template>
@@ -5,7 +5,6 @@
 </template>

 <script>
-import getUuid from 'widget/helpers/uuid';
 import 'video.js/dist/video-js.css';
 import 'videojs-record/dist/css/videojs.record.css';

@@ -29,25 +28,9 @@ import OpusRecorderEngine from 'videojs-record/dist/plugins/videojs.record.opus-

 import { format, addSeconds } from 'date-fns';
 import { AUDIO_FORMATS } from 'shared/constants/messages';
-import { convertWavToMp3 } from './utils/mp3ConversionUtils';

 WaveSurfer.microphone = MicrophonePlugin;

-const RECORDER_CONFIG = {
-  [AUDIO_FORMATS.WAV]: {
-    audioMimeType: 'audio/wav',
-    audioWorkerURL: waveWorker,
-  },
-  [AUDIO_FORMATS.MP3]: {
-    audioMimeType: 'audio/wav',
-    audioWorkerURL: waveWorker,
-  },
-  [AUDIO_FORMATS.OGG]: {
-    audioMimeType: 'audio/ogg',
-    audioWorkerURL: encoderWorker,
-  },
-};
-
 export default {
  name: 'WootAudioRecorder',
  mixins: [alertMixin],
@@ -56,10 +39,6 @@ export default {
      type: String,
      default: AUDIO_FORMATS.WAV,
    },
-    isAWhatsAppChannel: {
-      type: Boolean,
-      default: false,
-    },
  },
  data() {
    return {
@@ -109,7 +88,14 @@ export default {
            audioSampleRate: 48000,
            audioBitRate: 128,
            audioEngine: 'opus-recorder',
-            ...RECORDER_CONFIG[this.audioRecordFormat],
+            ...(this.audioRecordFormat === AUDIO_FORMATS.WAV && {
+              audioMimeType: 'audio/wav',
+              audioWorkerURL: waveWorker,
+            }),
+            ...(this.audioRecordFormat === AUDIO_FORMATS.OGG && {
+              audioMimeType: 'audio/ogg',
+              audioWorkerURL: encoderWorker,
+            }),
          },
        },
      },
@@ -147,11 +133,7 @@ export default {
  methods: {
    deviceReady() {
      if (this.player.record().engine instanceof OpusRecorderEngine) {
-        if (
-          [AUDIO_FORMATS.WAV, AUDIO_FORMATS.MP3].includes(
-            this.audioRecordFormat
-          )
-        ) {
+        if (this.audioRecordFormat === AUDIO_FORMATS.WAV) {
          this.player.record().engine.audioType = 'audio/wav';
        }
      }
@@ -163,16 +145,12 @@ export default {
    stopRecord() {
      this.fireStateRecorderChanged('stopped');
    },
-    async finishRecord() {
-      let recordedContent = this.player.recordedData;
-      let fileName = this.player.recordedData.name;
-      let type = this.player.recordedData.type;
-      if (this.audioRecordFormat === AUDIO_FORMATS.MP3) {
-        recordedContent = await convertWavToMp3(this.player.recordedData);
-        fileName = `${getUuid()}.mp3`;
-        type = AUDIO_FORMATS.MP3;
-      }
-      const file = new File([recordedContent], fileName, { type });
+    finishRecord() {
+      const file = new File(
+        [this.player.recordedData],
+        this.player.recordedData.name,
+        { type: this.player.recordedData.type }
+      );
      this.fireRecorderBlob(file);
    },
    progressRecord() {
@@ -253,20 +231,7 @@ export default {
    @apply bg-transparent max-h-60 min-h-[3rem] pt-4 px-0 pb-0 resize-none;
  }
 }
-
-// Added to override the default text and bg style to support dark and light mode.
-.video-js .vjs-control-bar,
-.vjs-record.video-js .vjs-control.vjs-record-indicator:before {
-  @apply text-slate-600 dark:text-slate-200 bg-transparent dark:bg-transparent;
-}
-
-// Added to fix  div overlays the screen and takes over the button clicks
-// https://github.com/collab-project/videojs-record/issues/688
-// https://github.com/collab-project/videojs-record/pull/709
-.vjs-record.video-js .vjs-control.vjs-record-indicator.vjs-hidden,
-.vjs-record.video-js .vjs-control.vjs-record-indicator,
-.vjs-record.video-js .vjs-control.vjs-record-indicator:before,
-.vjs-record.video-js .vjs-control.vjs-record-indicator:after {
-  @apply pointer-events-none;
+.video-js .vjs-control-bar {
+  background-color: transparent;
 }
 </style>
@@ -3,17 +3,17 @@
    <tag-agents
      v-if="showUserMentions && isPrivate"
      :search-key="mentionSearchKey"
-      @click="content => insertSpecialContent('mention', content)"
+      @click="insertMentionNode"
    />
    <canned-response
      v-if="shouldShowCannedResponses"
      :search-key="cannedSearchTerm"
-      @click="content => insertSpecialContent('cannedResponse', content)"
+      @click="insertCannedResponse"
    />
    <variable-list
      v-if="shouldShowVariables"
      :search-key="variableSearchTerm"
-      @click="content => insertSpecialContent('variable', content)"
+      @click="insertVariable"
    />
    <input
      ref="imageUpload"
@@ -47,9 +47,11 @@
 <script>
 import {
  messageSchema,
+  buildEditor,
  EditorView,
  MessageMarkdownTransformer,
  MessageMarkdownSerializer,
+  EditorState,
  Selection,
 } from '@chatwoot/prosemirror-schema';
 import {
@@ -68,7 +70,6 @@ import {
  scrollCursorIntoView,
  findNodeToInsertImage,
  setURLWithQueryAndSize,
-  createState,
 } from 'dashboard/helper/editorHelper';

 const TYPING_INDICATOR_IDLE_TIME = 4000;
@@ -77,11 +78,16 @@ const MAXIMUM_FILE_UPLOAD_SIZE = 4; // in MB
 import {
  hasPressedEnterAndNotCmdOrShift,
  hasPressedCommandAndEnter,
+  hasPressedAltAndPKey,
+  hasPressedAltAndLKey,
 } from 'shared/helpers/KeyboardHelpers';
-import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
+import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import { isEditorHotKeyEnabled } from 'dashboard/mixins/uiSettings';
-import { createTypingIndicator } from '@chatwoot/utils';
+import {
+  replaceVariablesInMessage,
+  createTypingIndicator,
+} from '@chatwoot/utils';
 import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import { uploadFile } from 'dashboard/helper/uploadHelper';
@@ -90,12 +96,32 @@ import {
  MESSAGE_EDITOR_MENU_OPTIONS,
  MESSAGE_EDITOR_IMAGE_RESIZES,
 } from 'dashboard/constants/editor';
-import useSpecialContent from 'dashboard/composables/editor/useSpecialContent';
+
+const createState = (
+  content,
+  placeholder,
+  // eslint-disable-next-line default-param-last
+  plugins = [],
+  // eslint-disable-next-line default-param-last
+  methods = {},
+  enabledMenuOptions
+) => {
+  return EditorState.create({
+    doc: new MessageMarkdownTransformer(messageSchema).parse(content),
+    plugins: buildEditor({
+      schema: messageSchema,
+      placeholder,
+      methods,
+      plugins,
+      enabledMenuOptions,
+    }),
+  });
+};

 export default {
  name: 'WootMessageEditor',
  components: { TagAgents, CannedResponse, VariableList },
-  mixins: [keyboardEventListenerMixins, uiSettingsMixin, alertMixin],
+  mixins: [eventListenerMixins, uiSettingsMixin, alertMixin],
  props: {
    value: { type: String, default: '' },
    editorId: { type: String, default: '' },
@@ -115,11 +141,6 @@ export default {
    channelType: { type: String, default: '' },
    showImageResizeToolbar: { type: Boolean, default: false }, // A kill switch to show or hide the image toolbar
  },
-  setup() {
-    const { getContentNode } = useSpecialContent();
-
-    return { getContentNode };
-  },
  data() {
    return {
      typingIndicator: createTypingIndicator(
@@ -333,16 +354,10 @@ export default {
    // Components using this
    // 1. SearchPopover.vue

-    this.$emitter.on(
-      BUS_EVENTS.INSERT_INTO_RICH_EDITOR,
-      this.insertContentIntoEditor
-    );
+    bus.$on(BUS_EVENTS.INSERT_INTO_RICH_EDITOR, this.insertContentIntoEditor);
  },
  beforeDestroy() {
-    this.$emitter.off(
-      BUS_EVENTS.INSERT_INTO_RICH_EDITOR,
-      this.insertContentIntoEditor
-    );
+    bus.$off(BUS_EVENTS.INSERT_INTO_RICH_EDITOR, this.insertContentIntoEditor);
  },
  methods: {
    reloadState(content = this.value) {
@@ -433,12 +448,22 @@ export default {
          this.emitOnChange();
        },
        handleDOMEvents: {
-          keyup: this.onKeyup,
-          keydown: (_view, event) => this.onKeydown(event),
-          focus: this.onFocus,
-          click: this.isEditorMouseFocusedOnAnImage,
-          blur: this.onBlur,
-          paste: (_view, event) => {
+          keyup: () => {
+            this.onKeyup();
+          },
+          keydown: (view, event) => {
+            this.onKeydown(event);
+          },
+          focus: () => {
+            this.onFocus();
+          },
+          click: () => {
+            this.isEditorMouseFocusedOnAnImage();
+          },
+          blur: () => {
+            this.onBlur();
+          },
+          paste: (view, event) => {
            const data = event.clipboardData.files;
            if (data.length > 0) {
              event.preventDefault();
@@ -497,21 +522,13 @@ export default {
    isCmdPlusEnterToSendEnabled() {
      return isEditorHotKeyEnabled(this.uiSettings, 'cmd_enter');
    },
-    getKeyboardEvents() {
-      return {
-        'Alt+KeyP': {
-          action: () => {
-            this.focusEditorInputField();
-          },
-          allowOnFocusedInput: true,
-        },
-        'Alt+KeyL': {
-          action: () => {
-            this.focusEditorInputField();
-          },
-          allowOnFocusedInput: true,
-        },
-      };
+    handleKeyEvents(e) {
+      if (hasPressedAltAndPKey(e)) {
+        this.focusEditorInputField();
+      }
+      if (hasPressedAltAndLKey(e)) {
+        this.focusEditorInputField();
+      }
    },
    focusEditorInputField(pos = 'end') {
      const { tr } = this.editorView.state;
@@ -522,39 +539,57 @@ export default {
      this.editorView.dispatch(tr.setSelection(selection));
      this.editorView.focus();
    },
-    /**
-     * Inserts special content (mention, canned response, or variable) into the editor.
-     *
-     * @param {string} type - The type of special content to insert. Possible values: 'mention', 'canned_response', 'variable'.
-     * @param {Object|string} content - The content to insert, depending on the type.
-     *   - For 'mention' type: An object with 'id' and 'name' properties representing the user mention.
-     *   - For 'canned_response' type: A string representing the canned response.
-     *   - For 'variable' type: A string representing the variable name.
-     */
-    insertSpecialContent(type, content) {
+    insertMentionNode(mentionItem) {
      if (!this.editorView) {
-        return;
+        return null;
+      }
+      const node = this.editorView.state.schema.nodes.mention.create({
+        userId: mentionItem.id,
+        userFullName: mentionItem.name,
+      });
+
+      this.insertNodeIntoEditor(node, this.range.from, this.range.to);
+      this.$track(CONVERSATION_EVENTS.USED_MENTIONS);
+
+      return false;
+    },
+    insertCannedResponse(cannedItem) {
+      const updatedMessage = replaceVariablesInMessage({
+        message: cannedItem,
+        variables: this.variables,
+      });
+
+      if (!this.editorView) {
+        return null;
      }

-      let { node, from, to } = this.getContentNode(
-        this.editorView,
-        type,
-        content,
-        this.range,
-        this.variables
+      let node = new MessageMarkdownTransformer(messageSchema).parse(
+        updatedMessage
      );

-      if (!node) return;
+      const from =
+        node.textContent === updatedMessage
+          ? this.range.from
+          : this.range.from - 1;
+
+      this.insertNodeIntoEditor(node, from, this.range.to);
+
+      this.$track(CONVERSATION_EVENTS.INSERTED_A_CANNED_RESPONSE);
+      return false;
+    },
+    insertVariable(variable) {
+      if (!this.editorView) {
+        return null;
+      }
+
+      const content = `{{${variable}}}`;
+      let node = this.editorView.state.schema.text(content);
+      const { from, to } = this.range;

      this.insertNodeIntoEditor(node, from, to);
-
-      const event_map = {
-        mention: CONVERSATION_EVENTS.USED_MENTIONS,
-        cannedResponse: CONVERSATION_EVENTS.INSERTED_A_CANNED_RESPONSE,
-        variable: CONVERSATION_EVENTS.INSERTED_A_VARIABLE,
-      };
-
-      this.$track(event_map[type]);
+      this.showVariables = false;
+      this.$track(CONVERSATION_EVENTS.INSERTED_A_VARIABLE);
+      return false;
    },
    openFileBrowser() {
      this.$refs.imageUpload.click();
@@ -25,7 +25,7 @@ import {
 } from '@chatwoot/prosemirror-schema';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import alertMixin from 'shared/mixins/alertMixin';
-import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
+import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';

 const MAXIMUM_FILE_UPLOAD_SIZE = 4; // in MB
@@ -51,7 +51,7 @@ const createState = (
 };

 export default {
-  mixins: [keyboardEventListenerMixins, uiSettingsMixin, alertMixin],
+  mixins: [eventListenerMixins, uiSettingsMixin, alertMixin],
  props: {
    value: { type: String, default: '' },
    editorId: { type: String, default: '' },
@@ -136,7 +136,8 @@
 <script>
 import FileUpload from 'vue-upload-component';
 import * as ActiveStorage from 'activestorage';
-import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
+import { hasPressedAltAndAKey } from 'shared/helpers/KeyboardHelpers';
+import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import inboxMixin from 'shared/mixins/inboxMixin';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
@@ -153,7 +154,7 @@ import { mapGetters } from 'vuex';
 export default {
  name: 'ReplyBottomPanel',
  components: { FileUpload, VideoCallButton, AIAssistanceButton },
-  mixins: [keyboardEventListenerMixins, uiSettingsMixin, inboxMixin],
+  mixins: [eventListenerMixins, uiSettingsMixin, inboxMixin],
  props: {
    mode: {
      type: String,
@@ -339,15 +340,10 @@ export default {
    ActiveStorage.start();
  },
  methods: {
-    getKeyboardEvents() {
-      return {
-        'Alt+KeyA': {
-          action: () => {
-            this.$refs.upload.$children[1].$el.click();
-          },
-          allowOnFocusedInput: true,
-        },
-      };
+    handleKeyEvents(e) {
+      if (hasPressedAltAndAKey(e)) {
+        this.$refs.upload.$children[1].$el.click();
+      }
    },
    toggleMessageSignature() {
      this.setSignatureFlagForInbox(this.channelType, !this.sendWithSignature);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shivam Mishra	42139adb7b	refactor: find_or_build_for_multiple_conversations	2024-04-03 18:09:41 +05:30
Shivam Mishra	411c6458eb	fix: resolved condition for message_builder	2024-04-03 18:07:40 +05:30
Shivam Mishra	c0232ad7c8	feat: handle conversation query order	2024-04-03 18:02:46 +05:30
Shivam Mishra	c711f78d24	Revert "refactor conversation handling in message builders" This reverts commit `ad524a5cab`.	2024-04-03 18:01:50 +05:30
Jaideep Guntupalli	ad524a5cab	refactor conversation handling in message builders	2024-04-03 15:32:11 +05:30
Jaideep GuntupalliandGitHub	9faafdbd25	Merge branch 'develop' into extending-lock-to-single-conversation-to-meta-inbox	2024-04-02 17:59:47 +05:30
Jaideep Guntupalli	e74b318772	refactor: abstracted common query	2024-03-31 10:13:20 +05:30
Jaideep Guntupalli	54d522aa50	updated rspec tests to use factories	2024-03-28 01:31:48 +05:30
Jaideep Guntupalli	3abd839c1b	refactored to independent methods	2024-03-23 11:21:34 +05:30
Jaideep Guntupalli	939f43aeb4	update: added count check	2024-03-22 01:28:25 +05:30
Jaideep GuntupalliandGitHub	f3c069b6d6	Merge branch 'develop' into extending-lock-to-single-conversation-to-meta-inbox	2024-03-22 01:24:20 +05:30
Jaideep GuntupalliandGitHub	51d3c10f57	Merge branch 'develop' into extending-lock-to-single-conversation-to-meta-inbox	2024-03-22 01:24:06 +05:30
Jaideep GuntupalliandGitHub	647b9fc029	Merge branch 'develop' into extending-lock-to-single-conversation-to-meta-inbox	2024-03-21 20:29:44 +05:30
Jaideep Guntupalli	55e9d912b2	refactored tests and the conversation function for instagram and facebook	2024-03-21 19:54:18 +05:30
Jaideep Guntupalli	2707c8b380	rspec tests for lock_to_single_conversation for meta inboxes	2024-03-21 18:33:54 +05:30
Jaideep GuntupalliandGitHub	e3a03a9efe	Merge branch 'develop' into extending-lock-to-single-conversation-to-meta-inbox	2024-03-13 12:51:35 +05:30
Jaideep Guntupalli	7c4275532d	refactor: added comments for clarity	2024-03-13 10:39:20 +05:30
Jaideep Guntupalli	617a1a9fc9	fix: added additional attributes filter and refactored conversation logic in Instagram message builder	2024-03-13 10:36:07 +05:30
Jaideep Guntupalli	f225a004e3	feat: backend Changes in Message Handling	2024-03-13 10:04:59 +05:30
Jaideep Guntupalli	bcb5165de7	feat: enable LOCK_TO_SINGLE_CONVERSATION setting for meta inbox	2024-03-12 00:50:59 +05:30