Merge branch 'hotfix/2.17.1'

2023-05-19 20:56:06 +05:30
1634 changed files with 13588 additions and 37933 deletions
@@ -73,7 +73,7 @@ jobs:

      - run:
          name: yarn
-          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+          command: yarn install --cache-folder ~/.cache/yarn

      # Store yarn / webpacker cache
      - save_cache:
@@ -104,8 +104,9 @@ jobs:
            fi
            curl -L https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar > ~/tmp/openapi-generator-cli-6.3.0.jar
            java -jar ~/tmp/openapi-generator-cli-6.3.0.jar validate -i swagger/swagger.json
-
+            
      # Database setup
+      - run: yarn install --check-files
      - run: bundle exec rake db:create
      - run: bundle exec rake db:schema:load

@@ -116,7 +117,7 @@ jobs:
      - run:
          name: Rubocop
          command: bundle exec rubocop
-
+      
      # - run:
      #     name: Brakeman
      #     command: bundle exec brakeman
@@ -125,21 +126,6 @@ jobs:
          name: eslint
          command: yarn run eslint

-      # Run frontend tests
-      - run:
-          name: Run frontend tests
-          command: |
-            mkdir -p ~/tmp/test-results/frontend_specs
-            ~/tmp/cc-test-reporter before-build
-            TESTFILES=$(circleci tests glob **/specs/*.spec.js | circleci tests split --split-by=timings)
-            yarn test:coverage --profile 10 \
-                               --out ~/tmp/test-results/yarn.xml \
-                               -- ${TESTFILES}
-      - run:
-          name: Code Climate Test Coverage
-          command: |
-            ~/tmp/cc-test-reporter format-coverage -t lcov -o "coverage/codeclimate.frontend_$CIRCLE_NODE_INDEX.json"
-
      # Run rails tests
      - run:
          name: Run backend tests
@@ -159,6 +145,20 @@ jobs:
          command: |
            ~/tmp/cc-test-reporter format-coverage -t simplecov -o "coverage/codeclimate.$CIRCLE_NODE_INDEX.json"

+      - run:
+          name: Run frontend tests
+          command: |
+            mkdir -p ~/tmp/test-results/frontend_specs
+            ~/tmp/cc-test-reporter before-build
+            TESTFILES=$(circleci tests glob **/specs/*.spec.js | circleci tests split --split-by=timings)
+            yarn test:coverage --profile 10 \
+                               --out ~/tmp/test-results/yarn.xml \
+                               -- ${TESTFILES}
+      - run:
+          name: Code Climate Test Coverage
+          command: |
+            ~/tmp/cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.frontend_$CIRCLE_NODE_INDEX.json buildreports/lcov.info    
+            
      - persist_to_workspace:
          root: coverage
          paths:
@@ -173,9 +173,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## LogRocket
 # LOG_ROCKET_PROJECT_ID=xxxxx/some-project

-# MICROSOFT CLARITY
-# MS_CLARITY_TOKEN=xxxxxxxxx
-
 ## Scout
 ## https://scoutapm.com/docs/ruby/configuration
 # SCOUT_KEY=YOURKEY
@@ -1,23 +0,0 @@
-# ref: https://github.com/amannn/action-semantic-pull-request
-# ensure PR title is in semantic format
-
-name: "Lint PR"
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - synchronize
-
-permissions:
-  pull-requests: read
-
-jobs:
-  main:
-    name: Validate PR title
-    runs-on: ubuntu-latest
-    steps:
-      - uses: amannn/action-semantic-pull-request@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,38 +0,0 @@
-name: Run Size Limit Check
-
-on:
-  pull_request:
-    branches:
-      - develop
-
-jobs:
-  test:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: yarn
-        run: yarn install
-
-      - name: Strip enterprise code
-        run: |
-          rm -rf enterprise
-          rm -rf spec/enterprise
-
-      - name: Run asset compile
-        run: bundle exec rake assets:precompile
-
-      - name: Size Check
-        run: yarn run size
@@ -74,5 +74,3 @@ yalc.lock
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
-
-/storybook-static
@@ -162,32 +162,40 @@ Rails/RenderInline:
 Performance/CollectionLiteralInLoop:
  Exclude:
    - 'db/migrate/20210315101919_enable_email_channel.rb'
-Rails/ThreeStateBooleanColumn:
-  Exclude:
-    - 'db/migrate/20200509044639_add_hide_input_flag_to_bot_config.rb'
-    - 'db/migrate/20200605130625_agent_away_message_to_auto_reply.rb'
-    - 'db/migrate/20200606132552_create_labels.rb'
-    - 'db/migrate/20201027135006_create_working_hours.rb'
-    - 'db/migrate/20210112174124_add_hmac_token_to_inbox.rb'
-    - 'db/migrate/20210114202310_create_teams.rb'
-    - 'db/migrate/20210212154240_add_request_for_email_on_channel_web_widget.rb'
-    - 'db/migrate/20210428135041_add_campaigns.rb'
-    - 'db/migrate/20210602182058_add_hmac_to_api_channel.rb'
-    - 'db/migrate/20210609133433_add_email_collect_to_inboxes.rb'
-    - 'db/migrate/20210618095823_add_csat_toggle_for_inbox.rb'
-    - 'db/migrate/20210927062350_add_trigger_only_during_business_hours_collect_to_campaigns.rb'
-    - 'db/migrate/20211027073553_add_imap_smtp_config_to_channel_email.rb'
-    - 'db/migrate/20211109143122_add_tweet_enabled_flag_to_twitter_channel.rb'
-    - 'db/migrate/20211216110209_add_allow_messages_after_resolved_to_inbox.rb'
-    - 'db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb'
-    - 'db/migrate/20220216151613_add_open_all_day_to_working_hour.rb'
-    - 'db/migrate/20220511072655_add_archive_column_to_portal.rb'
-    - 'db/migrate/20230503101201_create_sla_policies.rb'
-RSpec/IndexedLet:
-  Enabled: false
 RSpec/NamedSubject:
  Enabled: false
-
+Style/RedundantConstantBase:
+  Enabled: false
+Rails/RootPathnameMethods:
+  Enabled: false
+RSpec/Rails/MinitestAssertions:
+  Enabled: false
+RSpec/Rails/InferredSpecType:
+  Enabled: false
+RSpec/IndexedLet:
+  Enabled: false
+RSpec/MatchArray:
+  Enabled: false
+Rails/ResponseParsedBody:
+  Enabled: false
+RSpec/FactoryBot/ConsistentParenthesesStyle:
+  Enabled: false
+Rails/ThreeStateBooleanColumn:
+  Enabled: false
+Rails/Pluck:
+  Enabled: false
+Rails/TopLevelHashWithIndifferentAccess:
+  Enabled: false
+Rails/ActionOrder:
+  Enabled: false
+Style/ArrayIntersect:
+  Enabled: false
+RSpec/NoExpectationExample:
+  Enabled: false
+Style/RedundantReturn:
+  Enabled: false
+Rails/I18nLocaleTexts:
+  Enabled: false

 # we should bring this down
 RSpec/MultipleMemoizedHelpers:
@@ -4,7 +4,7 @@ ruby '3.2.2'

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

@@ -75,7 +75,6 @@ gem 'jwt'
 gem 'pundit'
 # super admin
 gem 'administrate'
-gem 'administrate-field-active_storage'

 ##--- gems for pubsub service ---##
 # https://karolgalanciak.com/blog/2019/11/30/from-activerecord-callbacks-to-publish-slash-subscribe-pattern-and-event-driven-design/
@@ -33,70 +33,70 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actioncable (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      activejob (= 7.0.5.1)
-      activerecord (= 7.0.5.1)
-      activestorage (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actionmailbox (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      actionview (= 7.0.5.1)
-      activejob (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actionmailer (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
      rails-dom-testing (~> 2.0)
-    actionpack (7.0.5.1)
-      actionview (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
-      rack (~> 2.0, >= 2.2.4)
+    actionpack (7.0.4.3)
+      actionview (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      rack (~> 2.0, >= 2.2.0)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      activerecord (= 7.0.5.1)
-      activestorage (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actiontext (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actionview (7.0.4.3)
+      activesupport (= 7.0.4.3)
      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.5.1)
-      activesupport (= 7.0.5.1)
+    activejob (7.0.4.3)
+      activesupport (= 7.0.4.3)
      globalid (>= 0.3.6)
-    activemodel (7.0.5.1)
-      activesupport (= 7.0.5.1)
-    activerecord (7.0.5.1)
-      activemodel (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activerecord (7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
    activerecord-import (1.4.1)
      activerecord (>= 4.2)
-    activestorage (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      activejob (= 7.0.5.1)
-      activerecord (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    activestorage (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
      marcel (~> 1.0)
      mini_mime (>= 1.1.0)
-    activesupport (7.0.5.1)
+    activesupport (7.0.4.3)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@@ -113,9 +113,6 @@ GEM
      kaminari (>= 1.0)
      sassc-rails (~> 2.1)
      selectize-rails (~> 0.6)
-    administrate-field-active_storage (0.4.2)
-      administrate (>= 0.2.2)
-      rails (>= 7.0)
    annotate (3.2.0)
      activerecord (>= 3.2, < 8.0)
      rake (>= 10.4, < 14.0)
@@ -356,7 +353,7 @@ GEM
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.13.0)
      concurrent-ruby (~> 1.0)
    image_processing (1.12.2)
      mini_magick (>= 4.9.5, < 5)
@@ -423,9 +420,9 @@ GEM
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.21.3)
+    loofah (2.20.0)
      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
+      nokogiri (>= 1.5.9)
    mail (2.8.1)
      mini_mime (>= 0.1.1)
      net-imap
@@ -441,7 +438,7 @@ GEM
    mini_magick (4.12.0)
    mini_mime (1.1.2)
    mini_portile2 (2.8.2)
-    minitest (5.18.1)
+    minitest (5.18.0)
    mock_redis (0.36.0)
      ruby2_keywords
    msgpack (1.7.0)
@@ -450,7 +447,7 @@ GEM
    multipart-post (2.3.0)
    net-http-persistent (4.0.2)
      connection_pool (~> 2.2)
-    net-imap (0.3.6)
+    net-imap (0.3.4)
      date
      net-protocol
    net-pop (0.1.2)
@@ -465,14 +462,14 @@ GEM
      sidekiq
    newrelic_rpm (8.16.0)
    nio4r (2.5.9)
-    nokogiri (1.15.2)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.14.3)
+      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
-    nokogiri (1.15.2-arm64-darwin)
+    nokogiri (1.14.3-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.15.2-x86_64-darwin)
+    nokogiri (1.14.3-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.15.2-x86_64-linux)
+    nokogiri (1.14.3-x86_64-linux)
      racc (~> 1.4)
    oauth (1.1.0)
      oauth-tty (~> 1.0, >= 1.0.1)
@@ -525,7 +522,7 @@ GEM
    pundit (2.3.0)
      activesupport (>= 3.0.0)
    raabro (1.4.0)
-    racc (1.7.1)
+    racc (1.6.2)
    rack (2.2.7)
    rack-attack (6.6.1)
      rack (>= 1.0, < 3)
@@ -540,29 +537,28 @@ GEM
    rack-test (2.1.0)
      rack (>= 1.3)
    rack-timeout (0.6.3)
-    rails (7.0.5.1)
-      actioncable (= 7.0.5.1)
-      actionmailbox (= 7.0.5.1)
-      actionmailer (= 7.0.5.1)
-      actionpack (= 7.0.5.1)
-      actiontext (= 7.0.5.1)
-      actionview (= 7.0.5.1)
-      activejob (= 7.0.5.1)
-      activemodel (= 7.0.5.1)
-      activerecord (= 7.0.5.1)
-      activestorage (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    rails (7.0.4.3)
+      actioncable (= 7.0.4.3)
+      actionmailbox (= 7.0.4.3)
+      actionmailer (= 7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actiontext (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
      bundler (>= 1.15.0)
-      railties (= 7.0.5.1)
+      railties (= 7.0.4.3)
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
@@ -726,12 +722,12 @@ GEM
    stripe (8.5.0)
    telephone_number (1.4.20)
    test-prof (1.2.1)
-    thor (1.2.2)
-    tilt (2.2.0)
+    thor (1.2.1)
+    tilt (2.1.0)
    time_diff (0.3.0)
      activesupport
      i18n
-    timeout (0.4.0)
+    timeout (0.3.2)
    trailblazer-option (0.1.2)
    twilio-ruby (5.77.0)
      faraday (>= 0.9, < 3.0)
@@ -789,7 +785,6 @@ GEM
 PLATFORMS
  arm64-darwin-20
  arm64-darwin-21
-  arm64-darwin-22
  ruby
  x86_64-darwin-18
  x86_64-darwin-20
@@ -802,7 +797,6 @@ DEPENDENCIES
  activerecord-import
  acts-as-taggable-on
  administrate
-  administrate-field-active_storage
  annotate
  attr_extras
  audited (~> 5.3)
@@ -875,7 +869,7 @@ DEPENDENCIES
  rack-cors
  rack-mini-profiler
  rack-timeout
-  rails (~> 7.0.5.1)
+  rails (~> 7)
  redis
  redis-namespace
  responders
@@ -921,4 +915,4 @@ RUBY VERSION
   ruby 3.2.2p185

 BUNDLED WITH
-   2.4.6
+   2.4.10
@@ -1 +1 @@
-2.17.0
+2.2.0
@@ -1 +1 @@
-2.3.0
+2.1.0
@@ -1,6 +1,5 @@
 //= link_tree ../images
 //= link administrate/application.css
 //= link administrate/application.js
-//= link administrate-field-active_storage/application.css
 //= link dashboardChart.js
 //= link secretField.js
@@ -11,7 +11,7 @@ function prepareData(data) {

 function getChartOptions() {
  var fontFamily =
-    'PlusJakarta,-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
+    'Inter,-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
  return {
    responsive: true,
    legend: { labels: { fontFamily } },
@@ -1,10 +1,10 @@
 // Typography
-$base-font-family: PlusJakarta, Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
+$base-font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
  "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
  sans-serif !default;
 $heading-font-family: $base-font-family !default;

-$base-font-size: 16px !default;
+$base-font-size: 10px !default;

 $base-line-height: 1.5 !default;
 $heading-line-height: 1.2 !default;
@@ -63,9 +63,9 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
  end

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

  def message_content
@@ -96,7 +96,6 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder

  def build_conversation
    @contact_inbox ||= contact.contact_inboxes.find_by!(source_id: message_source_id)
-
    Conversation.create!(conversation_params.merge(
                           contact_inbox_id: @contact_inbox.id,
                           additional_attributes: { type: 'instagram_direct_message' }
@@ -48,22 +48,17 @@ class Messages::MessageBuilder
  def process_emails
    return unless @conversation.inbox&.inbox_type == 'Email'

-    cc_emails = process_email_string(@params[:cc_emails])
-    bcc_emails = process_email_string(@params[:bcc_emails])
-    to_emails = process_email_string(@params[:to_emails])
+    cc_emails = []
+    cc_emails = @params[:cc_emails].gsub(/\s+/, '').split(',') if @params[:cc_emails].present?

-    all_email_addresses = cc_emails + bcc_emails + to_emails
+    bcc_emails = []
+    bcc_emails = @params[:bcc_emails].gsub(/\s+/, '').split(',') if @params[:bcc_emails].present?
+
+    all_email_addresses = cc_emails + bcc_emails
    validate_email_addresses(all_email_addresses)

    @message.content_attributes[:cc_emails] = cc_emails
    @message.content_attributes[:bcc_emails] = bcc_emails
-    @message.content_attributes[:to_emails] = to_emails
-  end
-
-  def process_email_string(email_string)
-    return [] if email_string.blank?
-
-    email_string.gsub(/\s+/, '').split(',')
  end

  def validate_email_addresses(all_emails)
@@ -96,9 +96,10 @@ class V2::ReportBuilder

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-  def export
-    column_names = params['column_names']
-    Account::ContactsExportJob.perform_later(Current.account.id, column_names)
-    head :ok, message: I18n.t('errors.contacts.export.success')
-  end
-
  # returns online contacts
  def active
    contacts = Current.account.contacts.where(id: ::OnlineStatusTracker
@@ -1,4 +1,5 @@
 class Api::V1::Accounts::Conversations::BaseController < Api::V1::Accounts::BaseController
+  include EnsureCurrentAccountHelper
  before_action :conversation

  private
@@ -1,7 +1,6 @@
 class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseController
  include Events::Types
  include DateRangeHelper
-  include HmacConcern

  before_action :conversation, except: [:index, :meta, :search, :create, :filter]
  before_action :inbox, :contact, :contact_inbox, only: [:create]
@@ -27,8 +26,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    @attachments = @conversation.attachments
  end

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

+  def show; end
+
  def filter
    result = ::Conversations::FilterService.new(params.permit!, current_user).perform
    @conversations = result[:conversations]
@@ -105,6 +104,9 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
  end

  def set_conversation_status
+    # TODO: temporary fallback for the old bot status in conversation, we will remove after couple of releases
+    # commenting this out to see if there are any errors, if not we can remove this in subsequent releases
+    # status = params[:status] == 'bot' ? 'pending' : params[:status]
    @conversation.status = params[:status]
    @conversation.snoozed_until = parse_date_time(params[:snoozed_until].to_s) if params[:snoozed_until]
  end
@@ -150,8 +152,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    ContactInboxBuilder.new(
      contact: @contact,
      inbox: @inbox,
-      source_id: params[:source_id],
-      hmac_verified: hmac_verified?
+      source_id: params[:source_id]
    ).perform
  end

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

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

  def set_current_page_surveys
@@ -1,5 +1,4 @@
 class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseController
-  before_action :check_authorization
  before_action :fetch_custom_filters, except: [:create]
  before_action :fetch_custom_filter, only: [:show, :update, :destroy]
  DEFAULT_FILTER_TYPE = 'conversation'.freeze
@@ -12,7 +11,6 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
    @custom_filter = current_user.custom_filters.create!(
      permitted_payload.merge(account_id: Current.account.id)
    )
-    render json: { error: @custom_filter.errors.messages }, status: :unprocessable_entity and return unless @custom_filter.valid?
  end

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

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

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

  def agent_bot
@@ -63,7 +82,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  end

  def destroy
-    ::DeleteObjectJob.perform_later(@inbox, Current.user, request.ip) if @inbox.present?
+    ::DeleteObjectJob.perform_later(@inbox) if @inbox.present?
    render status: :ok, json: { message: I18n.t('messages.inbox_deletetion_response') }
  end

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

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

  def permitted_params(channel_attributes = [])
@@ -6,10 +6,6 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
    @macros = Macro.with_visibility(current_user, params)
  end

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

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

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

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

@@ -14,11 +14,6 @@ class Api::V1::AccountsController < Api::BaseController
              CustomExceptions::Account::UserErrors,
              with: :render_error_response

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

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

+  def show
+    @latest_chatwoot_version = ::Redis::Alfred.get(::Redis::Alfred::LATEST_CHATWOOT_VERSION)
+    render 'api/v1/accounts/show', format: :json
+  end
+
  def update
    @account.update!(account_params.slice(:name, :locale, :domain, :support_email, :auto_resolve_duration))
  end
@@ -17,8 +17,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
      @message.update!(submitted_email: contact_email)
      ContactIdentifyAction.new(
        contact: @contact,
-        params: { email: contact_email, name: contact_name },
-        retain_original_contact_name: true
+        params: { email: contact_email, name: contact_name }
      ).perform
    else
      @message.update!(message_update_params[:message])
@@ -1,5 +0,0 @@
-module HmacConcern
-  def hmac_verified?
-    ActiveModel::Type::Boolean.new.cast(params[:hmac_verified]).present?
-  end
-end
@@ -1,7 +1,6 @@
 class DashboardController < ActionController::Base
  include SwitchLocale

-  before_action :set_application_pack
  before_action :set_global_config
  around_action :switch_locale
  before_action :ensure_installation_onboarding, only: [:index]
@@ -15,7 +14,7 @@ class DashboardController < ActionController::Base

  def set_global_config
    @global_config = GlobalConfig.get(
-      'LOGO', 'LOGO_DARK', 'LOGO_THUMBNAIL',
+      'LOGO', 'LOGO_THUMBNAIL',
      'INSTALLATION_NAME',
      'WIDGET_BRAND_URL', 'TERMS_URL',
      'PRIVACY_URL',
@@ -61,12 +60,4 @@ class DashboardController < ActionController::Base
      GIT_SHA: GIT_HASH
    }
  end
-
-  def set_application_pack
-    @application_pack = if request.path.include?('/auth') || request.path.include?('/login')
-                          'v3app'
-                        else
-                          'application'
-                        end
-  end
 end
@@ -4,16 +4,6 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
  skip_before_action :require_no_authentication, raise: false
  skip_before_action :authenticate_user!, raise: false

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

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

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

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

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

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

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

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

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

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

+  def show; end
+
  def update
    contact_identify_action = ContactIdentifyAction.new(
      contact: @contact_inbox.contact,
@@ -43,6 +43,8 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  end

  def render_article_content(content)
-    ChatwootMarkdownRenderer.new(content).render_article
+    # rubocop:disable Rails/OutputSafety
+    CommonMarker.render_html(content).html_safe
+    # rubocop:enable Rails/OutputSafety
  end
 end
@@ -6,8 +6,6 @@ class Public::Api::V1::Portals::BaseController < PublicController
  def set_locale(&)
    switch_locale_with_portal(&) if params[:locale].present?
    switch_locale_with_article(&) if params[:article_slug].present?
-
-    yield
  end

  def switch_locale_with_portal(&)
@@ -45,24 +45,13 @@ class SuperAdmin::AccountsController < SuperAdmin::ApplicationController

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

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

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

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

  def chatwoot_version
@@ -45,17 +45,6 @@ class SuperAdmin::UsersController < SuperAdmin::ApplicationController
  # empty values into nil values. It uses other APIs such as `resource_class`
  # and `dashboard`:
  #
-
-  def destroy_avatar
-    avatar = requested_resource.avatar
-    avatar.purge
-    redirect_back(fallback_location: super_admin_users_path)
-  end
-
-  def scoped_resource
-    resource_class.with_attached_avatar
-  end
-
  def resource_params
    permitted_params = super
    permitted_params.delete(:password) if permitted_params[:password].blank?
@@ -1,7 +1,7 @@
 class SwaggerController < ApplicationController
  def respond
    if Rails.env.development? || Rails.env.test?
-      render inline: Rails.root.join('swagger', derived_path).read
+      render inline: File.read(Rails.root.join('swagger', derived_path))
    else
      head :not_found
    end
@@ -10,11 +10,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
  ATTRIBUTE_TYPES = {
    access_token: Field::HasOne,
    avatar_url: AvatarField,
-    avatar: Field::ActiveStorage.with_options(
-      destroy_url: proc do |_namespace, _resource, attachment|
-        [:avatar_super_admin_agent_bot, { attachment_id: attachment.id }]
-      end
-    ),
    id: Field::Number,
    name: Field::String,
    account: Field::BelongsTo.with_options(searchable: true, searchable_field: 'name', order: 'id DESC'),
@@ -41,7 +36,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
  # an array of attributes that will be displayed on the model's show page.
  SHOW_PAGE_ATTRIBUTES = %i[
    id
-    avatar_url
    account
    name
    description
@@ -53,7 +47,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
  # on the model's form (`new` and `edit`) pages.
  FORM_ATTRIBUTES = %i[
    name
-    avatar
    account
    description
    outgoing_url
@@ -11,11 +11,6 @@ class UserDashboard < Administrate::BaseDashboard
    account_users: Field::HasMany,
    id: Field::Number,
    avatar_url: AvatarField,
-    avatar: Field::ActiveStorage.with_options(
-      destroy_url: proc do |_namespace, _resource, attachment|
-        [:avatar_super_admin_user, { attachment_id: attachment.id }]
-      end
-    ),
    provider: Field::String,
    uid: Field::String,
    password: Field::Password,
@@ -74,7 +69,6 @@ class UserDashboard < Administrate::BaseDashboard
  # on the model's form (`new` and `edit`) pages.
  FORM_ATTRIBUTES = %i[
    name
-    avatar
    display_name
    email
    password
@@ -6,8 +6,7 @@ class ConversationFinder
    latest: 'latest',
    sort_on_created_at: 'sort_on_created_at',
    last_user_message_at: 'last_user_message_at',
-    sort_on_priority: 'sort_on_priority',
-    sort_on_waiting_since: 'sort_on_waiting_since'
+    sort_on_priority: 'sort_on_priority'
  }.with_indifferent_access

  # assumptions
@@ -103,7 +102,7 @@ class ConversationFinder
    when 'participating'
      @conversations = current_user.participating_conversations.where(account_id: current_account.id)
    when 'unattended'
-      @conversations = @conversations.unattended
+      @conversations = @conversations.where(first_reply_created_at: nil)
    end
    @conversations
  end
@@ -1,21 +0,0 @@
-module BillingHelper
-  private
-
-  def default_plan?(account)
-    installation_config = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLANS')
-    default_plan = installation_config&.value&.first
-
-    # Return false if not plans are configured, so that no checks are enforced
-    return false if default_plan.blank?
-
-    account.custom_attributes['plan_name'].nil? || account.custom_attributes['plan_name'] == default_plan['name']
-  end
-
-  def conversations_this_month(account)
-    account.conversations.where('created_at > ?', 30.days.ago).count
-  end
-
-  def non_web_inboxes(account)
-    account.inboxes.where.not(channel_type: Channel::WebWidget.to_s).count
-  end
-end
@@ -7,6 +7,8 @@ module MessageFormatHelper
  end

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

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

  def avg_first_response_time
@@ -3,14 +3,9 @@
    v-if="!authUIFlags.isFetching"
    id="app"
    class="app-wrapper app-root"
-    :class="{ 'app-rtl--wrapper': isRTLView, dark: theme === 'dark' }"
-    :dir="isRTLView ? 'rtl' : 'ltr'"
+    :class="{ 'app-rtl--wrapper': isRTLView }"
  >
    <update-banner :latest-chatwoot-version="latestChatwootVersion" />
-    <template v-if="!accountUIFlags.isFetchingItem && currentAccountId">
-      <payment-pending-banner />
-      <upgrade-banner />
-    </template>
    <transition name="fade" mode="out-in">
      <router-view />
    </transition>
@@ -30,17 +25,13 @@ import AddAccountModal from '../dashboard/components/layout/sidebarComponents/Ad
 import LoadingState from './components/widgets/LoadingState.vue';
 import NetworkNotification from './components/NetworkNotification';
 import UpdateBanner from './components/app/UpdateBanner.vue';
-import UpgradeBanner from './components/app/UpgradeBanner.vue';
-import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
 import vueActionCable from './helper/actionCable';
 import WootSnackbarBox from './components/SnackbarContainer';
 import rtlMixin from 'shared/mixins/rtlMixin';
-import { LocalStorage } from 'shared/helpers/localStorage';
 import {
  registerSubscription,
  verifyServiceWorkerExistence,
 } from './helper/pushHelper';
-import { LOCAL_STORAGE_KEYS } from './constants/localStorage';

 export default {
  name: 'App',
@@ -50,9 +41,7 @@ export default {
    LoadingState,
    NetworkNotification,
    UpdateBanner,
-    PaymentPendingBanner,
    WootSnackbarBox,
-    UpgradeBanner,
  },

  mixins: [rtlMixin],
@@ -61,7 +50,6 @@ export default {
    return {
      showAddAccountModal: false,
      latestChatwootVersion: null,
-      theme: 'light',
    };
  },

@@ -71,7 +59,6 @@ export default {
      currentUser: 'getCurrentUser',
      globalConfig: 'globalConfig/get',
      authUIFlags: 'getAuthUIFlags',
-      accountUIFlags: 'accounts/getUIFlags',
      currentAccountId: 'getCurrentAccountId',
    }),
    hasAccounts() {
@@ -93,34 +80,9 @@ export default {
    },
  },
  mounted() {
-    this.initializeColorTheme();
-    this.listenToThemeChanges();
    this.setLocale(window.chatwootConfig.selectedLocale);
  },
  methods: {
-    initializeColorTheme() {
-      this.setColorTheme(
-        window.matchMedia('(prefers-color-scheme: dark)').matches
-      );
-    },
-    setColorTheme(isOSOnDarkMode) {
-      const selectedColorScheme =
-        LocalStorage.get(LOCAL_STORAGE_KEYS.COLOR_SCHEME) || 'light';
-      if (
-        (selectedColorScheme === 'auto' && isOSOnDarkMode) ||
-        selectedColorScheme === 'dark'
-      ) {
-        this.theme = 'dark';
-        document.body.classList.add('dark');
-      } else {
-        this.theme = 'light ';
-        document.body.classList.remove('dark');
-      }
-    },
-    listenToThemeChanges() {
-      const mql = window.matchMedia('(prefers-color-scheme: dark)');
-      mql.onchange = e => this.setColorTheme(e.matches);
-    },
    setLocale(locale) {
      this.$root.$i18n.locale = locale;
    },
@@ -153,6 +115,11 @@ export default {

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

 <style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
@@ -3,11 +3,47 @@
 import Cookies from 'js-cookie';
 import endPoints from './endPoints';
 import {
+  setAuthCredentials,
  clearCookiesOnLogout,
  deleteIndexedDBOnLogout,
 } from '../store/utils/api';

 export default {
+  login(creds) {
+    return new Promise((resolve, reject) => {
+      axios
+        .post('auth/sign_in', creds)
+        .then(response => {
+          setAuthCredentials(response);
+          resolve(response.data);
+        })
+        .catch(error => {
+          reject(error.response);
+        });
+    });
+  },
+
+  register(creds) {
+    const urlData = endPoints('register');
+    const fetchPromise = new Promise((resolve, reject) => {
+      axios
+        .post(urlData.url, {
+          account_name: creds.accountName.trim(),
+          user_full_name: creds.fullName.trim(),
+          email: creds.email,
+          password: creds.password,
+          h_captcha_client_response: creds.hCaptchaClientResponse,
+        })
+        .then(response => {
+          setAuthCredentials(response);
+          resolve(response);
+        })
+        .catch(error => {
+          reject(error);
+        });
+    });
+    return fetchPromise;
+  },
  validityCheck() {
    const urlData = endPoints('validityCheck');
    return axios.get(urlData.url);
@@ -37,6 +73,45 @@ export default {
    }
    return false;
  },
+  verifyPasswordToken({ confirmationToken }) {
+    return new Promise((resolve, reject) => {
+      axios
+        .post('auth/confirmation', {
+          confirmation_token: confirmationToken,
+        })
+        .then(response => {
+          setAuthCredentials(response);
+          resolve(response);
+        })
+        .catch(error => {
+          reject(error.response);
+        });
+    });
+  },
+
+  setNewPassword({ resetPasswordToken, password, confirmPassword }) {
+    return new Promise((resolve, reject) => {
+      axios
+        .put('auth/password', {
+          reset_password_token: resetPasswordToken,
+          password_confirmation: confirmPassword,
+          password,
+        })
+        .then(response => {
+          setAuthCredentials(response);
+          resolve(response);
+        })
+        .catch(error => {
+          reject(error.response);
+        });
+    });
+  },
+
+  resetPassword({ email }) {
+    const urlData = endPoints('resetPassword');
+    return axios.post(urlData.url, { email });
+  },
+
  profileUpdate({
    password,
    password_confirmation,
@@ -75,10 +75,6 @@ class ContactAPI extends ApiClient {
  destroyAvatar(contactId) {
    return axios.delete(`${this.url}/${contactId}/avatar`);
  }
-
-  exportContacts() {
-    return axios.get(`${this.url}/export`);
-  }
 }

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

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

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

-  getMetrics({ from, to, user_ids, inbox_id, team_id, rating } = {}) {
-    // no ratings for metrics
+  getMetrics({ from, to, user_ids } = {}) {
    return axios.get(`${this.url}/metrics`, {
-      params: { since: from, until: to, user_ids, inbox_id, team_id, rating },
+      params: { since: from, until: to, user_ids },
    });
  }
 }
@@ -13,10 +13,6 @@ class EnterpriseAccountAPI extends ApiClient {
  subscription() {
    return axios.post(`${this.url}subscription`);
  }
-
-  getLimits() {
-    return axios.get(`${this.url}limits`);
-  }
 }

 export default new EnterpriseAccountAPI();
@@ -127,10 +127,6 @@ class ConversationApi extends ApiClient {
      user_ids: userIds,
    });
  }
-
-  getAllAttachments(conversationId) {
-    return axios.get(`${this.url}/${conversationId}/attachments`);
-  }
 }

 export default new ConversationApi();
@@ -10,7 +10,6 @@ export const buildCreatePayload = ({
  files,
  ccEmails = '',
  bccEmails = '',
-  toEmails = '',
  templateParams,
 }) => {
  let payload;
@@ -26,9 +25,6 @@ export const buildCreatePayload = ({
    payload.append('echo_id', echoId);
    payload.append('cc_emails', ccEmails);
    payload.append('bcc_emails', bccEmails);
-    if (toEmails) {
-      payload.append('to_emails', toEmails);
-    }
  } else {
    payload = {
      content: message,
@@ -37,7 +33,6 @@ export const buildCreatePayload = ({
      content_attributes: contentAttributes,
      cc_emails: ccEmails,
      bcc_emails: bccEmails,
-      to_emails: toEmails,
      template_params: templateParams,
    };
  }
@@ -58,7 +53,6 @@ class MessageApi extends ApiClient {
    files,
    ccEmails = '',
    bccEmails = '',
-    toEmails = '',
    templateParams,
  }) {
    return axios({
@@ -72,7 +66,6 @@ class MessageApi extends ApiClient {
        files,
        ccEmails,
        bccEmails,
-        toEmails,
        templateParams,
      }),
    });
@@ -2,62 +2,18 @@

 import ApiClient from '../ApiClient';

-/**
- * Represents the data object for a OpenAI hook.
- * @typedef {Object} ConversationMessageData
- * @property {string} [tone] - The tone of the message.
- * @property {string} [content] - The content of the message.
- * @property {string} [conversation_display_id] - The display ID of the conversation (optional).
- */
-
-/**
- * A client for the OpenAI API.
- * @extends ApiClient
- */
 class OpenAIAPI extends ApiClient {
-  /**
-   * Creates a new OpenAIAPI instance.
-   */
  constructor() {
    super('integrations', { accountScoped: true });
-
-    /**
-     * The conversation events supported by the API.
-     * @type {string[]}
-     */
-    this.conversation_events = [
-      'summarize',
-      'reply_suggestion',
-      'label_suggestion',
-    ];
-
-    /**
-     * The message events supported by the API.
-     * @type {string[]}
-     */
-    this.message_events = ['rephrase'];
  }

-  /**
-   * Processes an event using the OpenAI API.
-   * @param {Object} options - The options for the event.
-   * @param {string} [options.type='rephrase'] - The type of event to process.
-   * @param {string} [options.content] - The content of the event.
-   * @param {string} [options.tone] - The tone of the event.
-   * @param {string} [options.conversationId] - The ID of the conversation to process the event for.
-   * @param {string} options.hookId - The ID of the hook to use for processing the event.
-   * @returns {Promise} A promise that resolves with the result of the event processing.
-   */
  processEvent({ type = 'rephrase', content, tone, conversationId, hookId }) {
-    /**
-     * @type {ConversationMessageData}
-     */
    let data = {
      tone,
      content,
    };

-    if (this.conversation_events.includes(type)) {
+    if (type === 'reply_suggestion' || type === 'summarize') {
      data = {
        conversation_display_id: conversationId,
      };
@@ -210,12 +210,5 @@ describe('#ConversationAPI', () => {
        { params: { page: payload.page } }
      );
    });
-
-    it('#getAllAttachments', () => {
-      conversationAPI.getAllAttachments(1);
-      expect(context.axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/conversations/1/attachments'
-      );
-    });
  });
 });
@@ -1,6 +1,6 @@
+/* global axios */
 import wootConstants from 'dashboard/constants/globals';
-import wootAPI from './apiClient';

 export const getTestimonialContent = () => {
-  return wootAPI.get(wootConstants.TESTIMONIAL_URL);
+  return axios.get(wootConstants.TESTIMONIAL_URL);
 };
@@ -5,28 +5,20 @@
 }

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

+  .mx-datepicker-range {
+    width: 320px;
+  }
+
  .mx-input {
    border: 1px solid var(--s-200);
    border-radius: var(--border-radius-normal);
    box-shadow: none;
    display: flex;
-    height: 2.5rem;
+    height: 4.0rem;
  }

  .mx-input:disabled,
@@ -35,32 +27,3 @@
    cursor: pointer;
  }
 }
-
-.mx-datepicker-inline {
-  width: 100%;
-
-  .mx-calendar {
-    width: 100%;
-  }
-
-  .cell.disabled {
-    background-color: var(--s-25);
-    color: var(--s-200);
-  }
-
-  .mx-time-item.disabled {
-    background-color: var(--s-25);
-  }
-
-  .today {
-    font-weight: var(--font-weight-bold);
-  }
-
-  .mx-datepicker-main {
-    border: 0;
-  }
-
-  .mx-time-header {
-    border: 0;
-  }
-}
@@ -8,7 +8,7 @@
 }

 select {
-  height: 2.5rem;
+  height: 4.0rem;
 }

 .card {
@@ -20,6 +20,15 @@ select {
  margin-left: var(--space-normal);
 }

+.tooltip {
+  background-color: var(--black-transparent);
+  border-radius: $space-smaller;
+  font-size: $font-size-mini;
+  max-width: var(--space-giga);
+  padding: $space-smaller $space-small;
+  z-index: 999;
+}
+
 code {
  border: 0;
  font-family: 'ui-monospace', 'SFMono-Regular', 'Menlo', 'Monaco', 'Consolas',
@@ -48,7 +48,7 @@
 // Disable contrast warnings in Foundation.
 $contrast-warnings: false;

-$global-font-size: 16px;
+$global-font-size: 10px;
 $global-width: 100%;
 $global-lineheight: 1.5;
 $foundation-palette: (primary: $color-woot,
@@ -63,7 +63,7 @@ $black: #000;
 $white: #fff;
 $body-background: $white;
 $body-font-color: $color-body;
-$body-font-family: 'PlusJakarta',
+$body-font-family: 'Inter',
 -apple-system,
 system-ui,
 BlinkMacSystemFont,
@@ -117,7 +117,7 @@ $header-font-style: normal;
 $font-family-monospace: $body-font-family;
 $header-color: $color-heading;
 $header-lineheight: 1.4;
-$header-margin-bottom: 0.3125rem;
+$header-margin-bottom: 0.5rem;
 $header-styles: (small: ("h1": ("font-size": 24),
    "h2": ("font-size": 20),
    "h3": ("font-size": 19),
@@ -133,7 +133,7 @@ $header-styles: (small: ("h1": ("font-size": 24),
 $header-text-rendering: optimizeLegibility;
 $small-font-size: 80%;
 $header-small-font-color: $medium-gray;
-$paragraph-lineheight: 1.65;
+$paragraph-lineheight: 1.45;
 $paragraph-margin-bottom: var(--space-small);
 $paragraph-text-rendering: optimizeLegibility;
 $code-color: $black;
@@ -153,11 +153,11 @@ $list-lineheight: $paragraph-lineheight;
 $list-margin-bottom: $paragraph-margin-bottom;
 $list-style-type: disc;
 $list-style-position: outside;
-$list-side-margin: 0.78125rem;
-$list-nested-side-margin: 0.78125rem;
-$defnlist-margin-bottom: 0.6875rem;
+$list-side-margin: 1.25rem;
+$list-nested-side-margin: 1.25rem;
+$defnlist-margin-bottom: 1rem;
 $defnlist-term-weight: $global-weight-bold;
-$defnlist-term-margin-bottom: 0.1875rem;
+$defnlist-term-margin-bottom: 0.3rem;
 $blockquote-color: $dark-gray;
 $blockquote-padding: rem-calc(9 20 0 19);
 $blockquote-border: 1px solid $medium-gray;
@@ -179,9 +179,9 @@ $lead-lineheight: 1.6;
 $subheader-lineheight: 1.4;
 $subheader-color: $dark-gray;
 $subheader-font-weight: $global-weight-normal;
-$subheader-margin-top: 0.125rem;
-$subheader-margin-bottom: 0.3125rem;
-$stat-font-size: 1.5625rem;
+$subheader-margin-top: 0.2rem;
+$subheader-margin-bottom: 0.5rem;
+$stat-font-size: 2.5rem;

 // 6. Abide
 // --------
@@ -202,11 +202,11 @@ $accordion-plusminus: true;
 $accordion-title-font-size: rem-calc(12);
 $accordion-item-color: $primary-color;
 $accordion-item-background-hover: $light-gray;
-$accordion-item-padding: 0.78125rem 0.625rem;
+$accordion-item-padding: 1.25rem 1rem;
 $accordion-content-background: $white;
 $accordion-content-border: 1px solid $light-gray;
 $accordion-content-color: $body-font-color;
-$accordion-content-padding: 0.625rem;
+$accordion-content-padding: 1rem;

 // 8. Accordion Menu
 // -----------------
@@ -234,7 +234,7 @@ $breadcrumbs-item-font-size: rem-calc(11);
 $breadcrumbs-item-color: $primary-color;
 $breadcrumbs-item-color-current: $black;
 $breadcrumbs-item-color-disabled: $medium-gray;
-$breadcrumbs-item-margin: 0.46875rem;
+$breadcrumbs-item-margin: 0.75rem;
 $breadcrumbs-item-uppercase: true;
 $breadcrumbs-item-slash: true;

@@ -275,8 +275,8 @@ $buttongroup-radius-on-each: false;
 $callout-background: $white;
 $callout-background-fade: 85%;
 $callout-border: 1px solid rgba($black, 0.25);
-$callout-margin: 0 0 0.625rem 0;
-$callout-padding: 0.625rem;
+$callout-margin: 0 0 1rem 0;
+$callout-padding: 1rem;
 $callout-font-color: $body-font-color;
 $callout-font-color-alt: $body-background;
 $callout-radius: $global-radius;
@@ -320,10 +320,10 @@ $drilldown-background: $white;
 // 17. Dropdown
 // ------------

-$dropdown-padding: 0.625rem;
+$dropdown-padding: 1rem;
 $dropdown-background: $body-background;
 $dropdown-border: 1px solid $medium-gray;
-$dropdown-font-size: 0.625rem;
+$dropdown-font-size: 1rem;
 $dropdown-width: 300px;
 $dropdown-radius: $global-radius;
 $dropdown-sizes: (tiny: 100px,
@@ -354,7 +354,7 @@ $helptext-font-style: italic;
 $input-prefix-color: $color-body;
 $input-prefix-background: var(--b-100);
 $input-prefix-border: 1px solid $color-border;
-$input-prefix-padding: 0.625rem;
+$input-prefix-padding: 1rem;
 $form-label-color: $color-body;
 $form-label-font-size: rem-calc(14);
 $form-label-font-weight: $font-weight-medium;
@@ -406,14 +406,14 @@ $menu-margin-nested: $space-medium;
 $menu-item-padding: $space-slab;
 $menu-item-color-active: $white;
 $menu-item-background-active: $color-background;
-$menu-icon-spacing: 0.15625rem;
+$menu-icon-spacing: 0.25rem;
 $menu-item-background-hover: $light-gray;
 $menu-border: $light-gray;

 // 23. Meter
 // ---------

-$meter-height: 0.625rem;
+$meter-height: 1rem;
 $meter-radius: $global-radius;
 $meter-background: $medium-gray;
 $meter-fill-good: $success-color;
@@ -423,11 +423,11 @@ $meter-fill-bad: $alert-color;
 // 24. Off-canvas
 // --------------

-$offcanvas-sizes: (small: 14.375,
-  medium: 14.375,
+$offcanvas-sizes: (small: 23rem,
+  medium: 23rem,
 );
-$offcanvas-vertical-sizes: (small: 14.375,
-  medium: 14.375,
+$offcanvas-vertical-sizes: (small: 23rem,
+  medium: 23rem,
 );
 $offcanvas-background: $light-gray;
 $offcanvas-shadow: 0 0 10px rgba($black, 0.7);
@@ -445,14 +445,14 @@ $maincontent-class: 'off-canvas-content';

 $orbit-bullet-background: $medium-gray;
 $orbit-bullet-background-active: $dark-gray;
-$orbit-bullet-diameter: 0.75rem;
-$orbit-bullet-margin: 0.0625rem;
-$orbit-bullet-margin-top: 0.5rem;
-$orbit-bullet-margin-bottom: 0.5rem;
+$orbit-bullet-diameter: 1.2rem;
+$orbit-bullet-margin: 0.1rem;
+$orbit-bullet-margin-top: 0.8rem;
+$orbit-bullet-margin-bottom: 0.8rem;
 $orbit-caption-background: rgba($black, 0.5);
-$orbit-caption-padding: 0.625rem;
+$orbit-caption-padding: 1rem;
 $orbit-control-background-hover: rgba($black, 0.5);
-$orbit-control-padding: 0.625rem;
+$orbit-control-padding: 1rem;
 $orbit-control-zindex: 10;

 // 26. Pagination
@@ -476,7 +476,7 @@ $pagination-arrows: true;
 // 27. Progress Bar
 // ----------------

-$progress-height: 0.625rem;
+$progress-height: 1rem;
 $progress-background: $medium-gray;
 $progress-margin-bottom: $global-margin;
 $progress-meter-background: $primary-color;
@@ -504,13 +504,13 @@ $reveal-overlay-background: rgba($black, 0.45);
 // 30. Slider
 // ----------

-$slider-width-vertical: 0.3125rem;
+$slider-width-vertical: 0.5rem;
 $slider-transition: all 0.2s ease-in-out;
-$slider-height: 0.3125rem;
+$slider-height: 0.5rem;
 $slider-background: $light-gray;
 $slider-fill-background: $medium-gray;
-$slider-handle-height: 0.875rem;
-$slider-handle-width: 0.875rem;
+$slider-handle-height: 1.4rem;
+$slider-handle-width: 1.4rem;
 $slider-handle-background: $primary-color;
 $slider-opacity-disabled: 0.25;
 $slider-radius: $global-radius;
@@ -569,7 +569,7 @@ $tab-expand-max: 6;
 $tab-content-background: transparent;
 $tab-content-border: transparent;
 $tab-content-color: foreground($tab-background, $primary-color);
-$tab-content-padding: 0.625rem;
+$tab-content-padding: 1rem;

 // 34. Thumbnail
 // -------------
@@ -586,11 +586,11 @@ $thumbnail-radius: $global-radius;

 $titlebar-background: $black;
 $titlebar-color: $white;
-$titlebar-padding: 0.3125rem;
+$titlebar-padding: 0.5rem;
 $titlebar-text-font-weight: bold;
 $titlebar-icon-color: $white;
 $titlebar-icon-color-hover: $medium-gray;
-$titlebar-icon-spacing: 0.15625rem;
+$titlebar-icon-spacing: 0.25rem;

 // 36. Tooltip
 // -----------
@@ -599,19 +599,19 @@ $has-tip-font-weight: $global-weight-bold;
 $has-tip-border-bottom: dotted 1px $dark-gray;
 $tooltip-background-color: $black;
 $tooltip-color: $white;
-$tooltip-padding: 0.46875rem;
+$tooltip-padding: 0.75rem;
 $tooltip-font-size: $font-size-mini;
-$tooltip-pip-width: 0.46875rem;
+$tooltip-pip-width: 0.75rem;
 $tooltip-pip-height: $tooltip-pip-width * 0.866;
 $tooltip-radius: $global-radius;

 // 37. Top Bar
 // -----------

-$topbar-padding: 0.3125;
+$topbar-padding: 0.5rem;
 $topbar-background: $light-gray;
 $topbar-submenu-background: $topbar-background;
-$topbar-title-spacing: 0.3125 0.625rem 0.3125 0;
+$topbar-title-spacing: 0.5rem 1rem 0.5rem 0;
 $topbar-input-width: 200px;
 $topbar-unstack-breakpoint: medium;

@@ -1,5 +1,5 @@
 .bg-light {
-  @apply bg-slate-25 dark:bg-slate-800;
+  @include background-light;
 }

 .flex-center {
@@ -22,43 +22,43 @@ $spinner-before-border-color: rgba(255, 255, 255, 0.7);
 }

@mixin border-normal() {
-  @apply border border-slate-50 dark:border-slate-700;
+  border: 1px solid $color-border;
 }

@mixin border-normal-left() {
-  @apply border-l border-slate-50 dark:border-slate-700;
+  border-left: 1px solid $color-border;
 }

@mixin border-normal-top() {
-  @apply border-t border-slate-50 dark:border-slate-700;
+  border-top: 1px solid $color-border;
 }

@mixin border-normal-right() {
-  @apply border-r border-slate-50 dark:border-slate-700;
+  border-right: 1px solid $color-border;
 }

@mixin border-normal-bottom() {
-  @apply border-b border-slate-50 dark:border-slate-700;
+  border-bottom: 1px solid $color-border;
 }

@mixin border-light() {
-  @apply border border-slate-25 dark:border-slate-700;
+  border: 1px solid $color-border-light;
 }

@mixin border-light-left() {
-  @apply border-l border-slate-25 dark:border-slate-700;
+  border-left: 1px solid $color-border-light;
 }

@mixin border-light-top() {
-  @apply border-t border-slate-25 dark:border-slate-700;
+  border-top: 1px solid $color-border-light;
 }

@mixin border-light-right() {
-  @apply border-r border-slate-25 dark:border-slate-700;
+  border-right: 1px solid $color-border-light;
 }

@mixin border-light-bottom() {
-  @apply border-b border-slate-25 dark:border-slate-700;
+  border-bottom: 1px solid $color-border-light;
 }

 // background
@@ -67,11 +67,11 @@ $spinner-before-border-color: rgba(255, 255, 255, 0.7);
 }

@mixin background-light() {
-  @apply bg-slate-50 dark:bg-slate-800;
+  background: $color-background-light;
 }

@mixin background-white() {
-  @apply bg-white dark:bg-slate-900;
+  background: $color-white;
 }

 // input form
@@ -237,8 +237,8 @@ $spinner-before-border-color: rgba(255, 255, 255, 0.7);
  white-space: nowrap;
 }

-@mixin three-column-grid($column-one-width: 16rem,
-  $column-three-width: 16rem) {
+@mixin three-column-grid($column-one-width: 25.6rem,
+  $column-three-width: 25.6rem) {
  width: 100%;
  height: 100%;
  display: grid;
@@ -3,6 +3,9 @@

  // Primary sidebar
  .primary--sidebar {
+    border-left: 1px solid var(--s-50);
+    border-right: 0;
+
    .options-menu.dropdown-pane {
      right: var(--space-smaller);

@@ -17,6 +20,63 @@
    }
  }

+  // Secondary sidebar
+  .secondary-sidebar {
+    .secondary-menu {
+      border-left: 1px solid var(--s-50);
+      border-right: 0;
+
+      .nested.vertical.menu {
+        .badge--icon {
+          margin-left: var(--space-smaller);
+          margin-right: unset;
+        }
+
+        .menu-label {
+          text-align: right;
+        }
+      }
+
+      .secondary-menu--icon {
+        margin-left: var(--space-smaller);
+        margin-right: unset;
+      }
+
+      .account-context--group .account-context--switch-group {
+        --overlay-shadow: linear-gradient(
+          to left,
+          rgba(255, 255, 255, 0) 0%,
+          rgba(255, 255, 255, 1) 50%
+        );
+        background-image: var(--overlay-shadow);
+      }
+
+      // Help center sidebar
+      .sidebar-header--wrap .header-title--wrap {
+        margin-left: unset;
+        margin-right: var(--space-small);
+      }
+    }
+  }
+
+  // Woot button
+  .button {
+    .icon--emoji + .button__content {
+      padding-left: 0;
+      padding-right: var(--space-small);
+    }
+
+    .icon--font + .button__content {
+      padding-left: 0;
+      padding-right: var(--space-small);
+    }
+
+    .icon + .button__content {
+      padding-left: 0;
+      padding-right: var(--space-small);
+    }
+  }
+
  // Settings header
  .settings-header {
    .header--icon {
@@ -201,12 +261,6 @@
      }
    }

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

    span {
-      --minus-space-one-point-five: -0.9375rem;
+      --minus-space-one-point-five: -1.5rem;

      &.active {
        transform: translate(
@@ -29,5 +29,4 @@ a {

 p {
  font-size: $font-size-small;
-  word-spacing: .12em;
 }
@@ -43,13 +43,17 @@
 }

 .border-right {
-  @apply border-r border-slate-50 dark:border-slate-700;
+  border-right: 1px solid var(--color-border);
 }

 .border-left {
  border-left: 1px solid var(--color-border);
 }

+.bg-white {
+  background-color: var(--white);
+}
+
 .text-ellipsis {
  overflow: hidden;
  text-overflow: ellipsis;
@@ -1,30 +1,30 @@
 // Font sizes
-$font-size-nano: 0.5rem;
-$font-size-micro: 0.675rem;
-$font-size-mini: 0.75rem;
-$font-size-small: 0.875rem;
-$font-size-default: 1rem;
-$font-size-medium: 1.125rem;
-$font-size-large: 1.375rem;
-$font-size-big: 1.5rem;
-$font-size-bigger: 1.75rem;
-$font-size-mega: 2.125rem;
-$font-size-giga: 2.5rem;
+$font-size-nano: 0.8rem;
+$font-size-micro: 1.0rem;
+$font-size-mini: 1.2rem;
+$font-size-small: 1.4rem;
+$font-size-default: 1.6rem;
+$font-size-medium: 1.8rem;
+$font-size-large: 2.2rem;
+$font-size-big: 2.4rem;
+$font-size-bigger: 3.0rem;
+$font-size-mega: 3.4rem;
+$font-size-giga: 4.0rem;

 // spaces
 $zero: 0;
-$space-micro: 0.125rem;
-$space-smaller: 0.25rem;
-$space-small: 0.5rem;
-$space-one: 0.675rem;
-$space-slab: 0.75rem;
-$space-normal: 1rem;
-$space-two: 1.25rem;
-$space-medium: 1.5rem;
-$space-large: 2rem;
-$space-larger: 3rem;
-$space-jumbo: 4rem;
-$space-mega: 6.25rem;
+$space-micro: 0.2rem;
+$space-smaller: 0.4rem;
+$space-small: 0.8rem;
+$space-one: 1rem;
+$space-slab: 1.2rem;
+$space-normal: 1.6rem;
+$space-two: 2.0rem;
+$space-medium: 2.4rem;
+$space-large: 3.2rem;
+$space-larger: 4.8rem;
+$space-jumbo: 6.4rem;
+$space-mega: 10.0rem;

 // font-weight
 $font-weight-feather: 100;
@@ -35,8 +35,8 @@ $font-weight-bold: 600;
 $font-weight-black: 700;

 //Navbar
-$nav-bar-width: 14.375rem;
-$header-height: 3.5rem;
+$nav-bar-width: 23rem;
+$header-height: 5.6rem;

 $woot-logo-padding: $space-large $space-two;

@@ -71,20 +71,20 @@ $color-primary-light: #c7e3ff;
 $color-primary-dark: darken($color-woot, 20%);

 // Thumbnail
-$thumbnail-radius: 2.5rem;
+$thumbnail-radius: 4rem;

 // chat-header
-$conv-header-height: 2.5rem;
+$conv-header-height: 4rem;

 // Inbox List

-$inbox-thumb-size: 3rem;
+$inbox-thumb-size: 4.8rem;


 // Spinner
 $spinkit-spinner-color: $color-white !default;
-$spinkit-spinner-margin: 0 0 0 1rem !default;
-$spinkit-size: 1rem !default;
+$spinkit-spinner-margin: 0 0 0 1.6rem !default;
+$spinkit-size: 1.6rem !default;

 // Snackbar default
 $woot-snackbar-bg: #323232;
@@ -101,5 +101,5 @@ $ionicons-font-path: '~ionicons/fonts';
 $transition-ease-in: all 0.250s ease-in;

 :root {
-  --dashboard-app-tabs-height: 2.4375rem;
+  --dashboard-app-tabs-height: 3.9rem;
 }
@@ -1,8 +1,4 @@
-@import 'tailwindcss/base';
-@import 'tailwindcss/components';
-@import 'tailwindcss/utilities';
-
-@import 'shared/assets/fonts/plus-jakarta';
+@import 'shared/assets/fonts/inter';
@import 'shared/assets/stylesheets/animations';
@import 'shared/assets/stylesheets/colors';
@import 'shared/assets/stylesheets/spacing';
@@ -71,8 +67,3 @@
@import 'plugins/dropdown';
@import '~shared/assets/stylesheets/ionicons';
@import 'utility-helpers';
-
-
-.tooltip {
-  @apply bg-slate-900 text-white py-1 px-2 z-40 text-xs rounded-md dark:bg-slate-200 dark:text-slate-900;
-}
@@ -13,9 +13,7 @@
 }

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

  &.multiselect--disabled {
    opacity: 0.8;
@@ -28,7 +26,7 @@
  }

  .multiselect__select {
-    min-height: 2.875rem;
+    min-height: 4.6rem;
    padding: 0;
    right: 0;
    top: 0;
@@ -98,7 +96,7 @@
    border: 1px solid var(--s-200);
    border-color: var(--s-200);
    margin: 0;
-    min-height: 2.75rem;
+    min-height: 4.4rem;
    padding-top: $zero;
  }

@@ -130,7 +128,7 @@
  .multiselect__input {
    @include ghost-input;
    font-size: $font-size-small;
-    height: 2.75rem;
+    height: 4.4rem;
    margin-bottom: $zero;
    padding: 0;
  }
@@ -168,7 +166,7 @@
 }

 .multiselect-wrap--small {
-  $multiselect-height: 2.5rem;
+  $multiselect-height: 4.0rem;

  .multiselect__tags,
  .multiselect__input {
@@ -195,7 +193,7 @@
    display: flex;
    font-size: var(--font-size-small);
    margin: 0;
-    max-height: 2.375rem;
+    max-height: 3.8rem;
    padding: var(--space-smaller) var(--space-micro);
  }

@@ -219,7 +217,7 @@
 }

 .multiselect-wrap--medium {
-  $multiselect-height: 3rem;
+  $multiselect-height: 4.8rem;

  .multiselect__tags,
  .multiselect__input {
@@ -1,5 +1,4 @@
@import 'shared/assets/fonts/inter';
-@import 'shared/assets/fonts/plus-jakarta';
@import 'shared/assets/stylesheets/animations';
@import 'shared/assets/stylesheets/colors';
@import 'shared/assets/stylesheets/spacing';
@@ -1,3 +1,3 @@
-@import 'shared/assets/fonts/plus-jakarta';
+@import 'shared/assets/fonts/inter';
@import '../variables';
@import '~shared/assets/stylesheets/ionicons';
@@ -4,8 +4,10 @@

 // Conversation header - Light BG
 .settings-header {
+  @include background-white;
  @include flex;
  @include flex-align($x: justify, $y: middle);
+  border-bottom: 1px solid var(--s-50);
  height: $header-height;
  min-height: $header-height;
  padding: $space-small $space-normal;
@@ -25,7 +27,7 @@

 .wizard-box {
  .item {
-    // @include background-light;
+    @include background-light;

    cursor: pointer;
    padding: $space-normal $space-normal $space-normal $space-medium;
@@ -126,8 +128,8 @@
 }

 .wizard-body {
-  @include border-light;
  @include background-white;
+  @include border-light;
  @include full-height();
  padding: $space-medium;

@@ -8,8 +8,8 @@

    .integration--image {
      display: flex;
-      height: 6.25rem;
-      width: 6.25rem;
+      height: 10rem;
+      width: 10rem;

      img {
        max-width: 100%;
@@ -1,201 +1,207 @@
+$default-button-height: 4.0rem;
+
 .button {
-  @apply items-center inline-flex h-10 mb-0;
+  align-items: center;
+  display: inline-flex;
+  height: $default-button-height;
+  margin-bottom: 0;

  .button__content {
-    @apply w-full;
-
-    img,
-    svg {
-      @apply inline-block;
-    }
+    width: 100%;
  }

  .spinner {
-    @apply px-2 py-0;
+    padding: 0 var(--space-small);
  }

-  .icon--emoji + .button__content {
-    @apply pl-2 rtl:pr-2 rtl:pl-0;
+  .icon--emoji+.button__content {
+    padding-left: var(--space-small);
  }

-  .icon--font + .button__content {
-    @apply pl-2 rtl:pr-2 rtl:pl-0;
+  .icon--font+.button__content {
+    padding-left: var(--space-small);
  }

  // @TODDO - Remove after moving all buttons to woot-button
-  .icon + .button__content {
-    @apply pl-2 w-auto rtl:pr-2 rtl:pl-0;
+  .icon+.button__content {
+    padding-left: var(--space-small);
+    width: auto;
  }

  &.expanded {
-    @apply flex justify-center text-center;
+    display: flex;
+    justify-content: center;
  }

  &.round {
-    @apply rounded-full;
+    border-radius: $space-larger;
  }

  // @TODO Use with link

  &.compact {
-    @apply pb-0 pt-0;
+    padding-bottom: 0;
+    padding-top: 0;
  }

  &.hollow {
-    @apply border border-slate-200 text-woot-700 dark:text-woot-100 hover:bg-woot-50 dark:hover:bg-woot-900;
+    border-color: var(--s-200);
+    color: var(--w-700);

    &.secondary {
-      @apply text-slate-700 dark:text-slate-100 hover:bg-slate-50 dark:hover:bg-slate-700;
+      border-color: var(--s-200);
+      color: var(--s-700);
    }

    &.success {
-      @apply text-green-700 dark:text-green-100 hover:bg-green-50 dark:hover:bg-green-800;
+      border-color: var(--s-200);
+      color: var(--g-700);
    }

    &.alert {
-      @apply text-red-700 dark:text-red-100 hover:bg-red-50 dark:hover:bg-red-800;
+      border-color: var(--s-200);
+      color: var(--r-700);
    }

    &.warning {
-      @apply text-yellow-700 dark:text-yellow-100 hover:bg-yellow-50 dark:hover:bg-yellow-800;
+      border-color: var(--s-200);
+      color: var(--y-700);
    }

    &:hover {
-      @apply bg-slate-75 dark:bg-slate-900 border-slate-100 dark:border-slate-700;
+      background: var(--s-75);
+      border-color: var(--s-100);

      &.secondary {
-        @apply border-slate-100 dark:border-slate-700;
+        border-color: var(--s-100);
      }

      &.success {
-        @apply border-slate-100 dark:border-slate-700;
+        border-color: var(--s-100);
      }

      &.alert {
-        @apply border-slate-100 dark:border-slate-700;
+        border-color: var(--s-100);
      }

      &.warning {
-        @apply border-slate-100 dark:border-slate-700;
+        border-color: var(--s-100);
      }
    }
  }

  // Smooth style
  &.smooth {
-    @apply bg-woot-50 dark:bg-woot-800 text-woot-700 dark:text-woot-100 hover:text-woot-700 dark:hover:text-woot-700 hover:bg-woot-100 dark:hover:bg-woot-900;
+    @include button-style(var(--w-50), var(--w-100), var(--w-700));
+

    &.secondary {
-      @apply bg-slate-50 dark:bg-slate-700 text-slate-700 dark:text-slate-100 hover:bg-slate-100 dark:hover:bg-slate-800;
+      @include button-style(var(--s-50), var(--s-100), var(--s-700));
    }

    &.success {
-      @apply bg-green-50 dark:bg-green-700 text-green-700 dark:text-green-100 hover:bg-green-100 dark:hover:bg-green-800;
+      @include button-style(var(--g-50), var(--g-100), var(--g-700));
    }

    &.alert {
-      @apply bg-red-50 dark:bg-red-700 dark:bg-opacity-50 text-red-700 dark:text-red-100 hover:bg-red-100 dark:hover:bg-red-800 dark:hover:bg-opacity-30;
+      @include button-style(var(--r-50), var(--r-100), var(--r-700));
    }

    &.warning {
-      @apply bg-yellow-100 dark:bg-yellow-100 text-yellow-700 dark:text-yellow-100 hover:bg-yellow-200 dark:hover:bg-yellow-200;
+      @include button-style(var(--y-100), var(--y-200), var(--y-700));
    }
  }

  &.clear {
-    @apply text-woot-500 dark:text-woot-500;
+    color: var(--w-700);

    &.secondary {
-      @apply text-slate-700 dark:text-slate-100;
+      color: var(--s-700);
    }

    &.success {
-      @apply text-green-700 dark:text-green-100;
+      color: var(--g-700);
    }

    &.alert {
-      @apply text-red-700 dark:text-red-100;
+      color: var(--r-700);
    }

    &.warning {
-      @apply text-yellow-700 dark:text-yellow-100;
+      color: var(--y-700);
    }

    &:hover {
-      @apply hover:bg-woot-50 dark:hover:bg-woot-300;
+      background: var(--w-50);

      &.secondary {
-        @apply hover:bg-slate-50 dark:hover:bg-slate-700;
+        background: var(--s-50);
      }

      &.success {
-        @apply hover:bg-green-50 dark:hover:bg-green-800;
+        background: var(--g-50);
      }

      &.alert {
-        @apply hover:bg-red-50 dark:hover:bg-red-800;
+        background: var(--r-50);
      }

      &.warning {
-        @apply hover:bg-yellow-50 dark:hover:bg-yellow-800;
-      }
-    }
-
-    &:active {
-      &.secondary {
-        @apply active:bg-slate-100 dark:active:bg-slate-900;
-      }
-    }
-
-    &:focus {
-      &.secondary {
-        @apply focus:bg-slate-50 dark:focus:bg-slate-700;
+        background: var(--y-50);
      }
    }
  }

  // Sizes
  &.tiny {
-    @apply h-6;
+    height: var(--space-medium);

-    .icon + .button__content {
-      @apply pl-1 rtl:pr-1 rtl:pl-0;
+    .icon+.button__content {
+      padding-left: var(--space-micro);
    }
  }

  &.small {
-    @apply h-8 pb-1 pt-1;
+    height: var(--space-large);
+    padding-bottom: var(--space-smaller);
+    padding-top: var(--space-smaller);

-    .icon + .button__content {
-      @apply pl-1 rtl:pr-1 rtl:pl-0;
+    .icon+.button__content {
+      padding-left: var(--space-smaller);
    }
  }

  &.large {
-    @apply h-12;
+    height: var(--space-larger);
  }

  &.button--only-icon {
-    @apply justify-center pl-0 pr-0 w-10;
+    justify-content: center;
+    padding-left: 0;
+    padding-right: 0;
+    width: $default-button-height;

    &.tiny {
-      @apply w-6;
+      width: var(--space-medium);
    }

    &.small {
-      @apply w-8;
+      width: var(--space-large);
    }

    &.large {
-      @apply w-12;
+      width: var(--space-larger);
    }
  }

  &.link {
-    @apply h-auto m-0 p-0;
+    height: auto;
+    margin: 0;
+    padding: 0;

    &:hover {
-      @apply underline;
+      text-decoration: underline;
    }
  }
+
 }
@@ -1,4 +1,4 @@
-$resolve-button-width: 8.25rem;
+$resolve-button-width: 13.2rem;

 // Conversation header - Light BG
 .conv-header {
@@ -14,12 +14,12 @@ $resolve-button-width: 8.25rem;
    border: 1px solid var(--color-border);
    border-radius: var(--space-smaller);
    margin-right: var(--space-small);
-    width: 13.5rem;
+    width: 21.6rem;

    .icon {
      color: $medium-gray;
      font-size: $font-size-default;
-      line-height: 2.375rem;
+      line-height: 3.8rem;
      padding-left: $space-slab;
      padding-right: $space-smaller;
    }
@@ -59,6 +59,11 @@ $resolve-button-width: 8.25rem;
  flex-direction: row;
  flex-grow: 1;
  justify-content: flex-end;
+  margin-top: var(--space-small);
+
+  @include breakpoint(medium up) {
+    margin-top: 0;
+  }

  &.has-open-sidebar {
    justify-content: flex-end;
@@ -12,7 +12,9 @@
 .conversation {
  @include flex;
  @include flex-shrink;
+  border-bottom: 1px solid transparent;
  border-left: var(--space-micro) solid transparent;
+  border-top: 1px solid transparent;
  cursor: pointer;
  padding: 0 var(--space-normal);
  position: relative;
@@ -20,11 +22,35 @@
  &.active {
    animation: left-shift-animation 0.25s $swift-ease-out-function;
    background: var(--color-background);
+    border-bottom-color: var(--color-border-light);
    border-left-color: var(--color-woot);
+    border-top-color: var(--color-border-light);
+
+    .conversation--details {
+      border-top-color: transparent;
+    }
+
+    + .conversation .conversation--details {
+      border-top-color: transparent;
+    }
  }

+  &:first-child {
+    .conversation--details {
+      border-top-color: transparent;
+    }
+  }
+
+  &:last-child {
+    .conversation--details {
+      border-bottom-color: var(--color-border-light);
+    }
+  }

  .conversation--details {
+    @include border-light-bottom;
+    @include border-light-top;
+    border-bottom-color: transparent;
    padding: var(--space-slab) 0;
  }

@@ -55,12 +81,7 @@
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
-    width: 16.875rem;
-
-    img,
-    svg {
-      display: inline-block;
-    }
+    width: 27rem;
  }

  .conversation--meta {
@@ -29,13 +29,13 @@
    }

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

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

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

 .conversations-list-wrap {
@@ -273,7 +283,7 @@
  }

  .wrap {
-    --bubble-max-width: 31rem;
+    --bubble-max-width: 49.6rem;
    margin: $zero $space-normal;
    max-width: Min(var(--bubble-max-width), 84%);

@@ -391,41 +401,3 @@
  }
 }

-.conversation-sidebar-wrap {
-  flex: 0 0;
-  flex-basis: 100%;
-  height: auto;
-  overflow: auto;
-  z-index: var(--z-index-low);
-
-  @include breakpoint(medium up) {
-    flex-basis: 17.5rem;
-  }
-
-  @include breakpoint(large up) {
-    flex-basis: 18.75rem;
-  }
-
-  @include breakpoint(xlarge up) {
-    flex-basis: 19.375rem;
-  }
-
-  @include breakpoint(xxlarge up) {
-    flex-basis: 20.625rem;
-  }
-
-  @include breakpoint(xxxlarge up) {
-    flex-basis: 25rem;
-  }
-}
-
-
-.activity-wrap {
-  .message-text--metadata {
-    .time {
-      @include breakpoint(xlarge up) {
-        margin-left: var(--space-small);
-      }
-    }
-  }
-}
@@ -61,7 +61,3 @@ input {
    border-color: var(--r-400);
  }
 }
-
-label {
-  @apply dark:text-slate-300;
-}
@@ -27,22 +27,23 @@
  padding: $space-large $space-large $zero;

  img {
-    max-height: 3.75rem;
+    max-height: 6rem;
  }
 }

 .modal-container {
  @include normal-shadow;

+  background-color: $color-white;
  border-radius: $space-smaller;
  max-height: 100%;
  overflow: auto;
  position: relative;
-  width: 37.5rem;
+  width: 60rem;

  &.medium {
    max-width: 80%;
-    width: 56.25rem;
+    width: 90rem;
  }

  .content-box {
@@ -1,6 +1,6 @@
 .reply-box {
  transition: box-shadow 0.35s $swift-ease-out-function,
-  height 2s $swift-ease-out-function;
+    height 2s $swift-ease-out-function;

  &.is-focused {
    box-shadow: var(--shadow);
@@ -29,7 +29,7 @@
      // Override min-height : 50px in foundation
      //
      max-height: $space-mega * 2.4;
-      min-height: 3rem;
+      min-height: 4.8rem;
      padding: var(--space-normal) 0 0;
      resize: none;
    }
@@ -40,7 +40,7 @@
      margin: 0;
      max-height: $space-mega * 2.4;
      // Override min-height : 50px in foundation
-      min-height: 3rem;
+      min-height: 4.8rem;
      padding: var(--space-normal) 0 0;
      resize: none;
    }
@@ -47,7 +47,7 @@
  }

  .dropdown-pane {
-    bottom: 3.75rem;
+    bottom: 6rem;
    display: block;
    visibility: visible;
    width: fit-content;
@@ -1,7 +1,7 @@
 .ui-snackbar-container {
  left: 0;
  margin: 0 auto;
-  max-width: 25rem;
+  max-width: 40rem;
  overflow: hidden;
  position: absolute;
  right: 0;
@@ -16,9 +16,9 @@
  border-radius: $space-smaller;
  display: inline-flex;
  margin-bottom: $space-small;
-  max-width: 25rem;
-  min-height: 1.875rem;
-  min-width: 15rem;
+  max-width: 40rem;
+  min-height: 3rem;
+  min-width: 24rem;
  padding: $space-slab $space-medium;
  text-align: left;
 }
@@ -31,7 +31,7 @@

 .ui-snackbar-action {
  margin-left: auto;
-  padding-left: 1.875rem;
+  padding-left: 3rem;

  button {
    background: none;
@@ -1,3 +1,18 @@
+.loading-state {
+  padding: $space-jumbo $space-smaller;
+
+  .message {
+    color: $color-gray;
+    display: block;
+    text-align: center;
+    width: 100%;
+  }
+
+  .spinner {
+    float: none;
+    top: -$space-smaller;
+  }
+}

 // EMPTY STATES
 .empty-state {
@@ -4,13 +4,15 @@ table {

  thead {
    th {
-      @apply font-medium text-left uppercase text-slate-900 dark:text-slate-200;
+      font-weight: var(--font-weight-bold);
+      text-align: left;
+      text-transform: uppercase;
    }
  }

  tbody {
    tr {
-      @apply border-b border-slate-50 dark:border-slate-700;
+      border-bottom: 1px solid var(--color-border-light);
    }

    td {
@@ -41,15 +43,15 @@ table {

  .woot-thumbnail {
    border-radius: 50%;
-    height: 3.125rem;
-    width: 3.125rem;
+    height: 5rem;
+    width: 5rem;
  }

  .button-wrapper {
    @include flex-align(left, null);
    @include flex;
    flex-direction: row;
-    min-width: 12.5rem;
+    min-width: 20rem;
  }

  .button {
@@ -47,14 +47,6 @@
          />
        </div>
        <div v-if="hasActiveFolders">
-          <woot-button
-            v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.EDIT.EDIT_BUTTON')"
-            size="tiny"
-            variant="smooth"
-            color-scheme="secondary"
-            icon="edit"
-            @click="onToggleAdvanceFiltersModal"
-          />
          <woot-button
            v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.DELETE.DELETE_BUTTON')"
            size="tiny"
@@ -126,28 +118,27 @@
      class="conversations-list"
      :class="{ 'is-context-menu-open': isContextMenuOpen }"
    >
-      <div>
-        <conversation-card
-          v-for="chat in conversationList"
-          :key="chat.id"
-          :active-label="label"
-          :team-id="teamId"
-          :folders-id="foldersId"
-          :chat="chat"
-          :conversation-type="conversationType"
-          :show-assignee="showAssigneeInConversationCard"
-          :selected="isConversationSelected(chat.id)"
-          @select-conversation="selectConversation"
-          @de-select-conversation="deSelectConversation"
-          @assign-agent="onAssignAgent"
-          @assign-team="onAssignTeam"
-          @assign-label="onAssignLabels"
-          @update-conversation-status="toggleConversationStatus"
-          @context-menu-toggle="onContextMenuToggle"
-          @mark-as-unread="markAsUnread"
-          @assign-priority="assignPriority"
-        />
-      </div>
+      <conversation-card
+        v-for="chat in conversationList"
+        :key="chat.id"
+        :active-label="label"
+        :team-id="teamId"
+        :folders-id="foldersId"
+        :chat="chat"
+        :conversation-type="conversationType"
+        :show-assignee="showAssigneeInConversationCard"
+        :selected="isConversationSelected(chat.id)"
+        @select-conversation="selectConversation"
+        @de-select-conversation="deSelectConversation"
+        @assign-agent="onAssignAgent"
+        @assign-team="onAssignTeam"
+        @assign-label="onAssignLabels"
+        @update-conversation-status="toggleConversationStatus"
+        @context-menu-toggle="onContextMenuToggle"
+        @mark-as-unread="markAsUnread"
+        @assign-priority="assignPriority"
+      />
+
      <div v-if="chatListLoading" class="text-center">
        <span class="spinner" />
      </div>
@@ -156,7 +147,6 @@
        v-if="!hasCurrentPageEndReached && !chatListLoading"
        variant="clear"
        size="expanded"
-        class="text-center"
        @click="loadMoreConversations"
      >
        {{ $t('CHAT_LIST.LOAD_MORE_CONVERSATIONS') }}
@@ -178,11 +168,8 @@
        v-if="showAdvancedFilters"
        :initial-filter-types="advancedFilterTypes"
        :initial-applied-filters="appliedFilter"
-        :active-folder-name="activeFolderName"
        :on-close="closeAdvanceFiltersModal"
-        :is-folder-view="hasActiveFolders"
        @applyFilter="onApplyFilter"
-        @updateFolder="onUpdateSavedFilter"
      />
    </woot-modal>
  </div>
@@ -206,9 +193,6 @@ import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCust
 import ConversationBulkActions from './widgets/conversation/conversationBulkActions/Index.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import filterMixin from 'shared/mixins/filterMixin';
-import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
-import countries from 'shared/constants/countries';
-import { generateValuesForEditCustomViews } from 'dashboard/helper/customViewsHelper';

 import {
  hasPressedAltAndJKey,
@@ -305,11 +289,6 @@ export default {
      appliedFilters: 'getAppliedConversationFilters',
      folders: 'customViews/getCustomViews',
      inboxes: 'inboxes/getInboxes',
-      agentList: 'agents/getAgents',
-      teamsList: 'teams/getTeams',
-      inboxesList: 'inboxes/getInboxes',
-      campaigns: 'campaigns/getAllCampaigns',
-      labels: 'labels/getLabels',
    }),
    hasAppliedFilters() {
      return this.appliedFilters.length !== 0;
@@ -472,9 +451,6 @@ export default {
      }
      return undefined;
    },
-    activeFolderName() {
-      return this.activeFolder?.name;
-    },
    activeTeam() {
      if (this.teamId) {
        return this.$store.getters['teams/getTeam'](this.teamId);
@@ -507,7 +483,9 @@ export default {
      this.resetAndFetchData();
    },
    activeFolder() {
-      this.resetAndFetchData();
+      if (!this.hasAppliedFilters) {
+        this.resetAndFetchData();
+      }
    },
    chatLists() {
      this.chatsOnView = this.conversationList;
@@ -518,10 +496,6 @@ export default {
    this.$store.dispatch('setChatSortFilter', this.activeSortBy);
    this.resetAndFetchData();

-    if (this.hasActiveFolders) {
-      this.$store.dispatch('campaigns/get');
-    }
-
    bus.$on('fetch_conversation_stats', () => {
      this.$store.dispatch('conversationStats/get', this.conversationFilters);
    });
@@ -534,15 +508,6 @@ export default {
      this.$store.dispatch('emptyAllConversations');
      this.fetchFilteredConversations(payload);
    },
-    onUpdateSavedFilter(payload, folderName) {
-      const payloadData = {
-        ...this.activeFolder,
-        name: folderName,
-        query: filterQueryGenerator(payload),
-      };
-      this.$store.dispatch('customViews/update', payloadData);
-      this.closeAdvanceFiltersModal();
-    },
    onClickOpenAddFoldersModal() {
      this.showAddFoldersModal = true;
    },
@@ -556,70 +521,15 @@ export default {
      this.showDeleteFoldersModal = false;
    },
    onToggleAdvanceFiltersModal() {
-      if (!this.hasAppliedFilters && !this.hasActiveFolders) {
+      if (!this.hasAppliedFilters) {
        this.initializeExistingFilterToModal();
      }
-      if (this.hasActiveFolders) {
-        this.initializeFolderToFilterModal(this.activeFolder);
-      }
      this.showAdvancedFilters = true;
    },
    closeAdvanceFiltersModal() {
      this.showAdvancedFilters = false;
      this.appliedFilter = [];
    },
-    setParamsForEditFolderModal() {
-      // Here we are setting the params for edit folder modal to show the existing values.
-
-      // For agent, team, inboxes,and campaigns we get only the id's from the query.
-      // So we are mapping the id's to the actual values.
-
-      // For labels we get the name of the label from the query.
-      // If we delete the label from the label list then we will not be able to show the label name.
-
-      // For custom attributes we get only attribute key.
-      // So we are mapping it to find the input type of the attribute to show in the edit folder modal.
-      const params = {
-        agents: this.agentList,
-        teams: this.teamsList,
-        inboxes: this.inboxesList,
-        labels: this.labels,
-        campaigns: this.campaigns,
-        languages: languages,
-        countries: countries,
-        filterTypes: advancedFilterTypes,
-        allCustomAttributes: this.$store.getters[
-          'attributes/getAttributesByModel'
-        ]('conversation_attribute'),
-      };
-      return params;
-    },
-    initializeFolderToFilterModal(activeFolder) {
-      // Here we are setting the params for edit folder modal.
-      //  To show the existing values. when we click on edit folder button.
-
-      // Here we get the query from the active folder.
-      // And we are mapping the query to the actual values.
-      // To show in the edit folder modal by the help of generateValuesForEditCustomViews helper.
-      const query = activeFolder?.query?.payload;
-      if (!Array.isArray(query)) return;
-
-      this.appliedFilter.push(
-        ...query.map(filter => ({
-          attribute_key: filter.attribute_key,
-          attribute_model: filter.attribute_model,
-          filter_operator: filter.filter_operator,
-          values: Array.isArray(filter.values)
-            ? generateValuesForEditCustomViews(
-                filter,
-                this.setParamsForEditFolderModal()
-              )
-            : [],
-          query_operator: filter.query_operator,
-          custom_attribute_type: filter.custom_attribute_type,
-        }))
-      );
-    },
    getKeyboardListenerParams() {
      const allConversations = this.$refs.activeConversation.querySelectorAll(
        'div.conversations-list div.conversation'
@@ -665,7 +575,6 @@ export default {
      }
    },
    resetAndFetchData() {
-      this.appliedFilter = [];
      this.resetBulkActions();
      this.$store.dispatch('conversationPage/reset');
      this.$store.dispatch('emptyAllConversations');
@@ -678,6 +587,7 @@ export default {
        return;
      }
      this.fetchConversations();
+      this.appliedFilter = [];
    },
    fetchConversations() {
      this.$store
@@ -958,6 +868,8 @@ export default {
 </script>

 <style scoped lang="scss">
+@import '~dashboard/assets/scss/woot';
+
 .spinner {
  margin-top: var(--space-normal);
  margin-bottom: var(--space-normal);
@@ -972,7 +884,7 @@ export default {

 .conversations-list-wrap {
  flex-shrink: 0;
-  flex-basis: clamp(20rem, 4vw + 21.25rem, 27.5rem);
+  flex-basis: clamp(32rem, 4vw + 34rem, 44rem);
  overflow: hidden;

  &.hide {
@@ -115,7 +115,7 @@
 </template>

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

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

@@ -248,8 +249,9 @@ export default {
    onUpdate() {
      const updatedValue =
        this.attributeType === 'date'
-          ? parseISO(this.editedValue)
+          ? format(new Date(this.editedValue), DATE_FORMAT)
          : this.editedValue;
+
      this.$v.$touch();
      if (this.$v.$invalid) {
        return;
@@ -343,11 +345,11 @@ export default {
 .error-message {
  color: var(--r-400);
  display: block;
-  font-size: 0.875rem;
+  font-size: 1.4rem;
  font-size: var(--font-size-small);
  font-weight: 400;
-  margin-bottom: 0.625rem;
-  margin-top: -1rem;
+  margin-bottom: 1rem;
+  margin-top: -1.6rem;
  width: 100%;
 }

@@ -1,75 +0,0 @@
-<template>
-  <div class="column">
-    <woot-modal-header :header-title="$t('CONVERSATION.CUSTOM_SNOOZE.TITLE')" />
-    <form class="row modal-content" @submit.prevent="chooseTime">
-      <date-picker
-        v-model="snoozeTime"
-        type="datetime"
-        inline
-        :lang="lang"
-        :disabled-date="disabledDate"
-        :disabled-time="disabledTime"
-        :popup-style="{ width: '100%' }"
-      />
-      <div class="modal-footer justify-content-end w-full">
-        <woot-button variant="clear" @click.prevent="onClose">
-          {{ this.$t('CONVERSATION.CUSTOM_SNOOZE.CANCEL') }}
-        </woot-button>
-        <woot-button>
-          {{ this.$t('CONVERSATION.CUSTOM_SNOOZE.APPLY') }}
-        </woot-button>
-      </div>
-    </form>
-  </div>
-</template>
-
-<script>
-import DatePicker from 'vue2-datepicker';
-
-export default {
-  components: {
-    DatePicker,
-  },
-
-  data() {
-    return {
-      snoozeTime: null,
-      lang: {
-        days: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-        yearFormat: 'YYYY',
-        monthFormat: 'MMMM',
-      },
-    };
-  },
-
-  methods: {
-    onClose() {
-      this.$emit('close');
-    },
-    chooseTime() {
-      this.$emit('choose-time', this.snoozeTime);
-    },
-    disabledDate(date) {
-      // Disable all the previous dates
-      const yesterday = new Date();
-      yesterday.setDate(yesterday.getDate() - 1);
-      return date < yesterday;
-    },
-    disabledTime(date) {
-      // Allow only time after 1 hour
-      const now = new Date();
-      now.setHours(now.getHours() + 1);
-      return date < now;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.modal-footer {
-  padding: var(--space-two);
-}
-.modal-content {
-  padding: var(--space-small) var(--space-two) var(--space-zero);
-}
-</style>
@@ -8,7 +8,6 @@
    >
      <div :class="modalContainerClassName" @click.stop>
        <woot-button
-          v-if="showCloseButton"
          color-scheme="secondary"
          icon="dismiss"
          variant="clear"
@@ -29,10 +28,6 @@ export default {
      default: true,
    },
    show: Boolean,
-    showCloseButton: {
-      type: Boolean,
-      default: true,
-    },
    onClose: {
      type: Function,
      required: true,
@@ -52,8 +47,7 @@ export default {
  },
  computed: {
    modalContainerClassName() {
-      let className =
-        'modal-container bg-white dark:bg-slate-800 skip-context-menu';
+      let className = 'modal-container skip-context-menu';
      if (this.fullWidth) {
        return `${className} modal-container--full-width`;
      }
@@ -107,7 +101,7 @@ export default {
  .modal-container {
    border-radius: 0;
    height: 100%;
-    width: 30rem;
+    width: 48rem;
  }
 }
 .modal-big {
@@ -1,17 +1,10 @@
 <template>
  <div class="column page-top-bar">
    <img v-if="headerImage" :src="headerImage" alt="No image" />
-    <h2
-      ref="modalHeaderTitle"
-      class="text-slate-800 text-lg dark:text-slate-100"
-    >
+    <h2 class="page-sub-title">
      {{ headerTitle }}
    </h2>
-    <p
-      v-if="headerContent"
-      ref="modalHeaderContent"
-      class="small-12 column wrap-content"
-    >
+    <p v-if="headerContent" class="small-12 column wrap-content">
      {{ headerContent }}
      <span v-if="headerContentValue" class="content-value">
        {{ headerContentValue }}
@@ -77,7 +77,7 @@ export default {
@import '~dashboard/assets/scss/mixins';

 .ui-notification-container {
-  max-width: 25rem;
+  max-width: 40rem;
  position: absolute;
  right: var(--space-normal);
  top: var(--space-normal);
@@ -94,7 +94,7 @@ export default {
  border-radius: var(--border-radius-medium);
  box-shadow: var(--shadow-large);

-  min-width: 15rem;
+  min-width: 24rem;
  padding: var(--space-normal);
 }

@@ -1,11 +1,11 @@
 <template>
-  <div class="row settings--section" :class="{ 'border-bottom': showBorder }">
+  <div class="row settings--section">
    <div class="medium-4 small-12 title--section">
-      <p v-if="title" class="sub-block-title">
+      <p class="sub-block-title">
        {{ title }}
      </p>
      <p class="sub-head">
-        <slot v-if="subTitle" name="subTitle">
+        <slot name="subTitle">
          {{ subTitle }}
        </slot>
      </p>
@@ -25,15 +25,11 @@ export default {
  props: {
    title: {
      type: String,
-      default: '',
+      required: true,
    },
    subTitle: {
      type: String,
-      default: '',
-    },
-    showBorder: {
-      type: Boolean,
-      default: true,
+      required: true,
    },
    note: {
      type: String,
@@ -47,13 +43,9 @@ export default {
@import '~dashboard/assets/scss/variables';

 .settings--section {
+  border-bottom: 1px solid $color-border;
  display: flex;
-  padding: 0 $space-normal $space-normal 0;
-
-  &.border-bottom {
-    padding-top: $space-normal;
-    border-bottom: 1px solid $color-border;
-  }
+  padding: $space-normal $space-normal $space-normal 0;

  .sub-block-title {
    color: $color-woot;
@@ -3,8 +3,8 @@
    size="small"
    variant="clear"
    color-scheme="secondary"
-    class="-ml-3 text-black-900 dark:text-slate-300"
    icon="list"
+    class="toggle-sidebar"
    @click="onMenuItemClick"
  />
 </template>
@@ -20,3 +20,8 @@ export default {
  },
 };
 </script>
+<style scoped lang="scss">
+.toggle-sidebar {
+  margin-left: var(--space-minus-small);
+}
+</style>
@@ -1,84 +0,0 @@
-<template>
-  <banner
-    v-if="shouldShowBanner"
-    color-scheme="alert"
-    :banner-message="bannerMessage"
-    :action-button-label="actionButtonMessage"
-    has-action-button
-    @click="routeToBilling"
-  />
-</template>
-
-<script>
-import Banner from 'dashboard/components/ui/Banner.vue';
-import { mapGetters } from 'vuex';
-import adminMixin from 'dashboard/mixins/isAdmin';
-import accountMixin from 'dashboard/mixins/account';
-
-const EMPTY_SUBSCRIPTION_INFO = {
-  status: null,
-  endsOn: null,
-};
-
-export default {
-  components: { Banner },
-  mixins: [adminMixin, accountMixin],
-  computed: {
-    ...mapGetters({
-      isOnChatwootCloud: 'globalConfig/isOnChatwootCloud',
-      getAccount: 'accounts/getAccount',
-    }),
-    bannerMessage() {
-      return this.$t('GENERAL_SETTINGS.PAYMENT_PENDING');
-    },
-    actionButtonMessage() {
-      return this.$t('GENERAL_SETTINGS.OPEN_BILLING');
-    },
-    shouldShowBanner() {
-      if (!this.isOnChatwootCloud) {
-        return false;
-      }
-
-      if (!this.isAdmin) {
-        return false;
-      }
-
-      return this.isPaymentPending();
-    },
-  },
-  methods: {
-    routeToBilling() {
-      this.$router.push({
-        name: 'billing_settings_index',
-        params: { accountId: this.accountId },
-      });
-    },
-    isPaymentPending() {
-      const { status, endsOn } = this.getSubscriptionInfo();
-
-      if (status && endsOn) {
-        const now = new Date();
-        if (status === 'past_due' && endsOn < now) {
-          return true;
-        }
-      }
-
-      return false;
-    },
-    getSubscriptionInfo() {
-      const account = this.getAccount(this.accountId);
-      if (!account) return EMPTY_SUBSCRIPTION_INFO;
-
-      const { custom_attributes: subscription } = account;
-      if (!subscription) return EMPTY_SUBSCRIPTION_INFO;
-
-      const {
-        subscription_status: status,
-        subscription_ends_on: endsOn,
-      } = subscription;
-
-      return { status, endsOn: new Date(endsOn) };
-    },
-  },
-};
-</script>
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .17.0
 .2.0
@@ -1 +1 @@
 .3.0
 .1.0