Update yarn.lock

Upgrade @chatwoot/utils
Use variable helpers from utils
2023-04-27 16:23:52 +05:30 · 2023-04-27 16:21:11 +05:30 · 2023-04-27 16:16:50 +05:30
2226 changed files with 24923 additions and 58043 deletions
@@ -7,12 +7,12 @@ defaults: &defaults
  working_directory: ~/build
  docker:
    # specify the version you desire here
-    - image: cimg/ruby:3.2.2-browsers
+    - image: cimg/ruby:3.1.3-browsers

    # Specify service dependencies here if necessary
    # CircleCI maintains a library of pre-built images
    # documented at https://circleci.com/docs/2.0/circleci-images/
-    - image: cimg/postgres:15.3
+    - image: cimg/postgres:14.1
    - image: cimg/redis:6.2.6
  environment:
      - RAILS_LOG_TO_STDOUT: false
@@ -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:
@@ -30,7 +30,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
    npm

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

-# MICROSOFT CLARITY
-# MS_CLARITY_TOKEN=xxxxxxxxx
-
 ## Scout
 ## https://scoutapm.com/docs/ruby/configuration
 # SCOUT_KEY=YOURKEY
@@ -230,11 +227,3 @@ AZURE_APP_SECRET=
 ## Change these values to fine tune performance
 # control the concurrency setting of sidekiq
 # SIDEKIQ_CONCURRENCY=10
-
-
-# AI powered features
-## OpenAI key
-# OPENAI_API_KEY=
-
-# Sentiment analysis model file path
-SENTIMENT_FILE_PATH=
@@ -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,55 +0,0 @@
-name: Log Lines Percentage Check
-
-on:
-  pull_request:
-    branches:
-      - develop
-
-jobs:
-  log_lines_check:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Check for log lines and calculate percentage
-        run: |
-          # Define the log line pattern
-          LOG_LINE_PATTERN="Rails\.logger"
-
-          # Get the list of changed files in the pull request
-          CHANGED_FILES=$(git diff --name-only)
-
-          # Initialize a flag to track if any files have insufficient log lines
-          INSUFFICIENT_LOGS=0
-
-          for file in $CHANGED_FILES; do
-            if [[ $file =~ \.rb$ && ! $file =~ _spec\.rb$ ]]; then
-              # Count the total number of lines in the file
-              total_lines=$(wc -l < "$file")
-
-              # Count the number of log lines in the file
-              log_lines=$(grep -c "$LOG_LINE_PATTERN" "$file")
-
-              # Calculate the percentage of log lines
-              if [ "$total_lines" -gt 0 ]; then
-                percentage=$(awk "BEGIN { pc=100*${log_lines}/${total_lines}; i=int(pc); print (pc-i<0.5)?i:i+1 }")
-              else
-                percentage=0
-              fi
-
-              # Check if the percentage is less than 5%
-              if [ "$percentage" -lt 5 ]; then
-                echo "Error: Log lines percentage is less than 5% ($percentage%) in $file. Please add more log lines using Rails.logger statements."
-                INSUFFICIENT_LOGS=1
-              else
-                echo "Log lines percentage is $percentage% in $file. Code looks good!"
-              fi
-            fi
-          done
-
-          # If any files have insufficient log lines, fail the action
-          if [ "$INSUFFICIENT_LOGS" -eq 1 ]; then
-            exit 1
-          fi
@@ -18,12 +18,11 @@ jobs:
    runs-on: ubuntu-20.04
    services:
      postgres:
-        image: postgres:15.3
+        image: postgres:10.8
        env:
          POSTGRES_USER: postgres
          POSTGRES_PASSWORD: ""
          POSTGRES_DB: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
        ports:
          - 5432:5432
        # needed because the postgres container does not provide a healthcheck
@@ -1,78 +0,0 @@
-# #
-# # This workflow will run specs related to response bot
-# # This can only be activated in installations Where vector extension is available.
-# #
-
-name: Run Response Bot spec
-on:
-  push:
-    branches:
-      - develop
-      - master
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: ubuntu-20.04
-    services:
-      postgres:
-        image: ankane/pgvector
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: ""
-          POSTGRES_DB: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
-        ports:
-          - 5432:5432
-        # needed because the postgres container does not provide a healthcheck
-        # tmpfs makes DB faster by using RAM
-        options: >-
-          --mount type=tmpfs,destination=/var/lib/postgresql/data
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-        options: --entrypoint redis-server
-
-    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: Create database
-      run: bundle exec rake db:create
-
-    - name: Seed database
-      run: bundle exec rake db:schema:load
-
-    - name: Enable ResponseBotService in installation
-      run: RAILS_ENV=test bundle exec rails runner "Features::ResponseBotService.new.enable_in_installation"
-
-    # Run  Response Bot specs
-    - name: Run backend tests
-      run: |
-        bundle exec rspec spec/enterprise/controllers/api/v1/accounts/response_sources_controller_spec.rb spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb:47 --profile=10 --format documentation
-
-    - name: Upload rails log folder
-      uses: actions/upload-artifact@v3
-      if: always()
-      with:
-        name: rails-log-folder
-        path: log
@@ -1,38 +0,0 @@
-name: Run Size Limit Check
-
-on:
-  pull_request:
-    branches:
-      - develop
-
-jobs:
-  test:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: yarn
-        run: yarn install
-
-      - name: Strip enterprise code
-        run: |
-          rm -rf enterprise
-          rm -rf spec/enterprise
-
-      - name: Run asset compile
-        run: bundle exec rake assets:precompile
-
-      - name: Size Check
-        run: yarn run size
@@ -67,12 +67,3 @@ test/cypress/videos/*
 # yalc for local testing
 .yalc
 yalc.lock
-
-/public/packs
-/public/packs-test
-/node_modules
-/yarn-error.log
-yarn-debug.log*
-.yarn-integrity
-
-/storybook-static
@@ -1 +1 @@
-16.20.1
+14.17.4
@@ -87,7 +87,6 @@ Style/ClassAndModuleChildren:
  EnforcedStyle: compact
  Exclude:
    - 'config/application.rb'
-    - 'config/initializers/monkey_patches/*'
 Style/MapToHash:
  Enabled: false
 Style/HashSyntax:
@@ -163,33 +162,8 @@ Rails/RenderInline:
 Performance/CollectionLiteralInLoop:
  Exclude:
    - 'db/migrate/20210315101919_enable_email_channel.rb'
-Rails/ThreeStateBooleanColumn:
-  Exclude:
-    - 'db/migrate/20200509044639_add_hide_input_flag_to_bot_config.rb'
-    - 'db/migrate/20200605130625_agent_away_message_to_auto_reply.rb'
-    - 'db/migrate/20200606132552_create_labels.rb'
-    - 'db/migrate/20201027135006_create_working_hours.rb'
-    - 'db/migrate/20210112174124_add_hmac_token_to_inbox.rb'
-    - 'db/migrate/20210114202310_create_teams.rb'
-    - 'db/migrate/20210212154240_add_request_for_email_on_channel_web_widget.rb'
-    - 'db/migrate/20210428135041_add_campaigns.rb'
-    - 'db/migrate/20210602182058_add_hmac_to_api_channel.rb'
-    - 'db/migrate/20210609133433_add_email_collect_to_inboxes.rb'
-    - 'db/migrate/20210618095823_add_csat_toggle_for_inbox.rb'
-    - 'db/migrate/20210927062350_add_trigger_only_during_business_hours_collect_to_campaigns.rb'
-    - 'db/migrate/20211027073553_add_imap_smtp_config_to_channel_email.rb'
-    - 'db/migrate/20211109143122_add_tweet_enabled_flag_to_twitter_channel.rb'
-    - 'db/migrate/20211216110209_add_allow_messages_after_resolved_to_inbox.rb'
-    - 'db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb'
-    - 'db/migrate/20220216151613_add_open_all_day_to_working_hour.rb'
-    - 'db/migrate/20220511072655_add_archive_column_to_portal.rb'
-    - 'db/migrate/20230503101201_create_sla_policies.rb'
-RSpec/IndexedLet:
-  Enabled: false
 RSpec/NamedSubject:
  Enabled: false
-
-
 # we should bring this down
 RSpec/MultipleMemoizedHelpers:
  Max: 14
@@ -1 +1 @@
-3.2.2
+3.1.3
@@ -1 +0,0 @@
-/spec
@@ -23,18 +23,6 @@ module.exports = {
    },
    '@storybook/addon-links',
    '@storybook/addon-essentials',
-    {
-      /**
-       * Fix Storybook issue with PostCSS@8
-       * @see https://github.com/storybookjs/storybook/issues/12668#issuecomment-773958085
-       */
-      name: '@storybook/addon-postcss',
-      options: {
-        postcssLoaderOptions: {
-          implementation: require('postcss'),
-        },
-      },
-    },
  ],
  webpackFinal: config => {
    const newConfig = {
@@ -47,7 +35,7 @@ module.exports = {

    newConfig.module.rules.push({
      test: /\.scss$/,
-      use: ['style-loader', 'css-loader', 'postcss-loader', 'sass-loader'],
+      use: ['style-loader', 'css-loader', 'sass-loader'],
      include: path.resolve(__dirname, '../app/javascript'),
    });

@@ -4,12 +4,10 @@ import Vuex from 'vuex';
 import VueI18n from 'vue-i18n';
 import Vuelidate from 'vuelidate';
 import Multiselect from 'vue-multiselect';
-import VueDOMPurifyHTML from 'vue-dompurify-html';
 import FluentIcon from 'shared/components/FluentIcon/DashboardIcon';

 import WootUiKit from '../app/javascript/dashboard/components';
 import i18n from '../app/javascript/dashboard/i18n';
-import { domPurifyConfig } from 'shared/helpers/HTMLSanitizer';

 import '../app/javascript/dashboard/assets/scss/storybook.scss';

@@ -17,8 +15,6 @@ Vue.use(VueI18n);
 Vue.use(Vuelidate);
 Vue.use(WootUiKit);
 Vue.use(Vuex);
-Vue.use(VueDOMPurifyHTML, domPurifyConfig);
-
 Vue.component('multiselect', Multiselect);
 Vue.component('fluent-icon', FluentIcon);

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'

-ruby '3.2.2'
+ruby '3.1.3'

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

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

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

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

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

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

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

 ##-- apm and error monitoring ---#
 # loaded only when environment variables are set.
@@ -108,14 +103,14 @@ gem 'elastic-apm', require: false
 gem 'newrelic_rpm', require: false
 gem 'newrelic-sidekiq-metrics', require: false
 gem 'scout_apm', require: false
-gem 'sentry-rails', '>= 5.10.0', require: false
+gem 'sentry-rails', require: false
 gem 'sentry-ruby', require: false
-gem 'sentry-sidekiq', '>= 5.10.0', require: false
+gem 'sentry-sidekiq', require: false

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

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

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

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

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

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

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

 # need for google auth
 gem 'omniauth'
 gem 'omniauth-google-oauth2'
 gem 'omniauth-rails_csrf_protection', '~> 1.0'

-## Gems for reponse bot
-# adds cosine similarity to postgres using vector extension
-gem 'neighbor'
-gem 'pgvector'
-# Convert Website HTML to Markdown
-gem 'reverse_markdown'
-
-# Sentiment analysis
-gem 'informers'
-
 ### Gems required only in specific deployment environments ###
 ##############################################################

@@ -187,7 +174,6 @@ group :development do
  gem 'annotate'
  gem 'bullet'
  gem 'letter_opener'
-  gem 'scss_lint', require: false
  gem 'web-console'

  # used in swagger build
@@ -197,13 +183,13 @@ group :development do
  gem 'squasher'

  # profiling
-  gem 'rack-mini-profiler', '>= 3.1.1', require: false
+  gem 'rack-mini-profiler', require: false
  gem 'stackprof'
 end

 group :test do
  # Cypress in rails.
-  gem 'cypress-on-rails'
+  gem 'cypress-on-rails', '~> 1.13', '>= 1.13.1'
  # fast cleaning of database
  gem 'database_cleaner'
  # mock http calls
@@ -220,13 +206,12 @@ group :development, :test do
  gem 'bundle-audit', require: false
  gem 'byebug', platform: :mri
  gem 'climate_control'
-  gem 'debug', '~> 1.8'
  gem 'factory_bot_rails'
  gem 'listen'
  gem 'mock_redis'
  gem 'pry-rails'
  gem 'rspec_junit_formatter'
-  gem 'rspec-rails'
+  gem 'rspec-rails', '~> 5.0.3'
  gem 'rubocop', require: false
  gem 'rubocop-performance', require: false
  gem 'rubocop-rails', require: false
@@ -30,23 +30,9 @@ burn:
 	bundle && yarn

 run:
-	@if [ -f ./.overmind.sock ]; then \
-		echo "Overmind is already running. Use 'make force_run' to start a new instance."; \
-	else \
-		overmind start -f Procfile.dev; \
-	fi
-
-force_run:
-	rm -f ./.overmind.sock
 	overmind start -f Procfile.dev

-debug:
-	overmind connect backend
-
-debug_worker:
-	overmind connect worker
-
 docker: 
 	docker build -t $(APP_NAME) -f ./docker/Dockerfile .

-.PHONY: setup db_create db_migrate db_seed db console server burn docker run force_run debug debug_worker
+.PHONY: setup db_create db_migrate db_seed db console server burn docker run
@@ -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,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
  end

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

  def message_content
@@ -96,10 +94,8 @@ 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' }
+                           contact_inbox_id: @contact_inbox.id
                         ))
  end

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

@@ -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)
@@ -20,7 +20,7 @@ class V2::ReportBuilder

  # For backward compatible with old report
  def build
-    if %w[avg_first_response_time avg_resolution_time reply_time].include?(params[:metric])
+    if %w[avg_first_response_time avg_resolution_time].include?(params[:metric])
      timeseries.each_with_object([]) do |p, arr|
        arr << { value: p[1], timestamp: p[0].in_time_zone(@timezone).to_i, count: @grouped_values.count[p[0]] }
      end
@@ -33,19 +33,18 @@ class V2::ReportBuilder

  def summary
    {
-      conversations_count: conversations.count,
-      incoming_messages_count: incoming_messages.count,
-      outgoing_messages_count: outgoing_messages.count,
+      conversations_count: conversations_count.values.sum,
+      incoming_messages_count: incoming_messages_count.values.sum,
+      outgoing_messages_count: outgoing_messages_count.values.sum,
      avg_first_response_time: avg_first_response_time_summary,
      avg_resolution_time: avg_resolution_time_summary,
-      resolutions_count: resolutions.count,
-      reply_time: reply_time_summary
+      resolutions_count: resolutions_count.values.sum
    }
  end

  def conversation_metrics
    if params[:type].equal?(:account)
-      live_conversations
+      conversations
    else
      agent_metrics.sort_by { |hash| hash[:metric][:open] }.reverse
    end
@@ -90,16 +89,17 @@ class V2::ReportBuilder
        email: @user.email,
        thumbnail: @user.avatar_url,
        availability: account_user.availability_status,
-        metric: live_conversations
+        metric: conversations
      }
    end
  end

-  def live_conversations
+  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
@@ -14,18 +14,8 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
      @facebook_inbox = Current.account.inboxes.create!(name: inbox_name, channel: facebook_channel)
      set_instagram_id(page_access_token, facebook_channel)
      set_avatar(@facebook_inbox, page_id)
-    end
-  rescue StandardError => e
-    ChatwootExceptionTracker.new(e).capture_exception
-    Rails.logger.error "Error in register_facebook_page: #{e.message}"
-    # Additional log statements
-    log_additional_info
-  end
-
-  def log_additional_info
-    Rails.logger.debug do
-      "user_access_token: #{params[:user_access_token]} , page_access_token: #{params[:page_access_token]} ,
-      page_id: #{params[:page_id]}, inbox_name: #{params[:inbox_name]}"
+    rescue StandardError => e
+      ChatwootExceptionTracker.new(e).capture_exception
    end
  end

@@ -40,8 +30,6 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController

    instagram_id = response['instagram_business_account']['id']
    facebook_channel.update(instagram_id: instagram_id)
-  rescue StandardError => e
-    Rails.logger.error "Error in set_instagram_id: #{e.message}"
  end

  # get params[:inbox_id], current_account. params[:omniauth_token]
@@ -73,7 +61,6 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
      fb_page&.reauthorized!
    rescue StandardError => e
      ChatwootExceptionTracker.new(e).capture_exception
-      Rails.logger.error "Error in update_fb_page: #{e.message}"
    end
  end

@@ -90,7 +77,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
    koala = Koala::Facebook::OAuth.new(GlobalConfigService.load('FB_APP_ID', ''), GlobalConfigService.load('FB_APP_SECRET', ''))
    koala.exchange_access_token_info(omniauth_token)['access_token']
  rescue StandardError => e
-    Rails.logger.error "Error in long_lived_token: #{e.message}"
+    Rails.logger.error e
  end

  def mark_already_existing_facebook_pages(data)
@@ -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?
@@ -18,11 +18,7 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
  end

  def authenticate_twilio
-    client = if permitted_params[:api_key_sid].present?
-               Twilio::REST::Client.new(permitted_params[:api_key_sid], permitted_params[:auth_token], permitted_params[:account_sid])
-             else
-               Twilio::REST::Client.new(permitted_params[:account_sid], permitted_params[:auth_token])
-             end
+    client = Twilio::REST::Client.new(permitted_params[:account_sid], permitted_params[:auth_token])
    client.messages.list(limit: 1)
  end

@@ -44,7 +40,6 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
    @twilio_channel = Current.account.twilio_sms.create!(
      account_sid: permitted_params[:account_sid],
      auth_token: permitted_params[:auth_token],
-      api_key_sid: permitted_params[:api_key_sid],
      messaging_service_sid: permitted_params[:messaging_service_sid].presence,
      phone_number: phone_number,
      medium: medium
@@ -57,7 +52,7 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:

  def permitted_params
    params.require(:twilio_channel).permit(
-      :account_id, :messaging_service_sid, :phone_number, :account_sid, :auth_token, :name, :medium, :api_key_sid
+      :account_id, :messaging_service_sid, :phone_number, :account_sid, :auth_token, :name, :medium
    )
  end
 end
@@ -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
@@ -4,7 +4,6 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
  sort_on :name, internal_name: :order_on_name, type: :scope, scope_params: [:direction]
  sort_on :phone_number, type: :string
  sort_on :last_activity_at, internal_name: :order_on_last_activity_at, type: :scope, scope_params: [:direction]
-  sort_on :created_at, internal_name: :order_on_created_at, type: :scope, scope_params: [:direction]
  sort_on :company, internal_name: :order_on_company_name, type: :scope, scope_params: [:direction]
  sort_on :city, internal_name: :order_on_city, type: :scope, scope_params: [:direction]
  sort_on :country, internal_name: :order_on_country_name, type: :scope, scope_params: [:direction]
@@ -43,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]
@@ -23,12 +22,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    @conversations_count = result[:count]
  end

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

+  def show; end
+
  def filter
    result = ::Conversations::FilterService.new(params.permit!, current_user).perform
    @conversations = result[:conversations]
@@ -105,6 +100,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 +148,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 = [])
@@ -1,27 +1,27 @@
 class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::BaseController
  before_action :check_admin_authorization?
-  before_action :fetch_hook, only: [:update, :destroy, :list_all_channels]
-
-  def list_all_channels
-    @channels = channel_builder.fetch_channels
-  end
+  before_action :fetch_hook, only: [:update, :destroy]

  def create
-    hook_builder = Integrations::Slack::HookBuilder.new(
-      account: Current.account,
-      code: params[:code],
-      inbox_id: params[:inbox_id]
-    )
-    @hook = hook_builder.perform
+    ActiveRecord::Base.transaction do
+      builder = Integrations::Slack::HookBuilder.new(
+        account: Current.account,
+        code: params[:code],
+        inbox_id: params[:inbox_id]
+      )
+      @hook = builder.perform
+      create_chatwoot_slack_channel
+    end
  end

  def update
-    @hook = channel_builder.update(permitted_params[:reference_id])
-    render json: { error: I18n.t('errors.slack.invalid_channel_id') }, status: :unprocessable_entity if @hook.blank?
+    create_chatwoot_slack_channel
+    render json: @hook
  end

  def destroy
    @hook.destroy!
+
    head :ok
  end

@@ -31,11 +31,11 @@ class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::Base
    @hook = Integrations::Hook.where(account: Current.account).find_by(app_id: 'slack')
  end

-  def channel_builder
-    Integrations::Slack::ChannelBuilder.new(hook: @hook)
-  end
-
-  def permitted_params
-    params.permit(:reference_id)
+  def create_chatwoot_slack_channel
+    channel = params[:channel] || 'customer-conversations'
+    builder = Integrations::Slack::ChannelBuilder.new(
+      hook: @hook, channel: channel
+    )
+    builder.perform
  end
 end
@@ -6,10 +6,6 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
    @macros = Macro.with_visibility(current_user, params)
  end

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

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

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

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

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

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

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

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

@@ -64,7 +62,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController

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

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

  def index
    render json: { version: Chatwoot.config[:version],
-                   timestamp: Time.now.utc.to_fs(:db),
+                   timestamp: Time.now.utc.to_formatted_s(:db),
                   queue_services: redis_status,
                   data_services: postgres_status }
  end
@@ -1,5 +0,0 @@
-module HmacConcern
-  def hmac_verified?
-    ActiveModel::Type::Boolean.new.cast(params[:hmac_verified]).present?
-  end
-end
@@ -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,
@@ -1,7 +1,4 @@
 class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::InboxesController
-  include Events::Types
-  before_action :set_conversation, only: [:toggle_typing, :update_last_seen]
-
  def index
    @conversations = @contact_inbox.hmac_verified? ? @contact.conversations : @contact_inbox.conversations
  end
@@ -10,36 +7,12 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
    @conversation = create_conversation
  end

-  def toggle_typing
-    case params[:typing_status]
-    when 'on'
-      trigger_typing_event(CONVERSATION_TYPING_ON)
-    when 'off'
-      trigger_typing_event(CONVERSATION_TYPING_OFF)
-    end
-    head :ok
-  end
-
-  def update_last_seen
-    @conversation.contact_last_seen_at = DateTime.now.utc
-    @conversation.save!
-    head :ok
-  end
-
  private

-  def set_conversation
-    @conversation = @contact_inbox.contact.conversations.find_by!(display_id: params[:id])
-  end
-
  def create_conversation
    ::Conversation.create!(conversation_params)
  end

-  def trigger_typing_event(event)
-    Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: @conversation.contact)
-  end
-
  def conversation_params
    {
      account_id: @contact_inbox.contact.account_id,
@@ -1,31 +1,22 @@
 class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::BaseController
  before_action :ensure_custom_domain_request, only: [:show, :index]
  before_action :portal
-  before_action :set_category, except: [:index, :show]
+  before_action :set_category, except: [:index]
  before_action :set_article, only: [:show]
  layout 'portal'

  def index
    @articles = @portal.articles
    @articles = @articles.search(list_params) if list_params.present?
-    order_by_sort_param
-    @articles.page(list_params[:page]) if list_params[:page].present?
+    @articles.order(position: :asc)
  end

  def show; end

  private

-  def order_by_sort_param
-    @articles = if list_params[:sort].present? && list_params[:sort] == 'views'
-                  @articles.order_by_views
-                else
-                  @articles.order_by_position
-                end
-  end
-
  def set_article
-    @article = @portal.articles.find_by(slug: permitted_params[:article_slug])
+    @article = @category.articles.find(permitted_params[:id])
    @article.increment_view_count
    @parsed_content = render_article_content(@article.content)
  end
@@ -44,14 +35,16 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  end

  def list_params
-    params.permit(:query, :locale, :sort)
+    params.permit(:query, :locale)
  end

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

  def render_article_content(content)
-    ChatwootMarkdownRenderer.new(content).render_article
+    # rubocop:disable Rails/OutputSafety
+    CommonMarker.render_html(content).html_safe
+    # rubocop:enable Rails/OutputSafety
  end
 end
@@ -1,18 +1,10 @@
 class Public::Api::V1::Portals::BaseController < PublicController
-  before_action :show_plain_layout
  around_action :set_locale

  private

-  def show_plain_layout
-    @is_plain_layout_enabled = params[:show_plain_layout] == 'true'
-  end
-
  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(&)
@@ -27,16 +19,4 @@ class Public::Api::V1::Portals::BaseController < PublicController

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

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

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

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

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

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

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

  def build_contact
@@ -86,10 +86,7 @@ class AccountDashboard < Administrate::BaseDashboard
    "##{account.id} #{account.name}"
  end

-  # We do not use the action parameter but we still need to define it
-  # to prevent an error from being raised (wrong number of arguments)
-  # Reference: https://github.com/thoughtbot/administrate/pull/2356/files#diff-4e220b661b88f9a19ac527c50d6f1577ef6ab7b0bed2bfdf048e22e6bfa74a05R204
-  def permitted_attributes(action)
+  def permitted_attributes
    super + [limits: {}]
  end
 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
@@ -5,9 +5,7 @@ class ConversationFinder
  SORT_OPTIONS = {
    latest: 'latest',
    sort_on_created_at: 'sort_on_created_at',
-    last_user_message_at: 'last_user_message_at',
-    sort_on_priority: 'sort_on_priority',
-    sort_on_waiting_since: 'sort_on_waiting_since'
+    last_user_message_at: 'last_user_message_at'
  }.with_indifferent_access

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

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

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

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

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

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

-  def filter_by_source_id
-    return unless params[:source_id]
-
-    @conversations = @conversations.joins(:contact_inbox)
-    @conversations = @conversations.where(contact_inboxes: { source_id: params[:source_id] })
-  end
-
  def set_count_for_all_conversations
    [
      @conversations.assigned_to(current_user).count,
@@ -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
@@ -17,36 +17,19 @@ module ReportHelper
  end

  def conversations_count
-    (get_grouped_values conversations).count
+    (get_grouped_values scope.conversations.where(account_id: account.id)).count
  end

  def incoming_messages_count
-    (get_grouped_values incoming_messages).count
+    (get_grouped_values scope.messages.where(account_id: account.id).incoming.unscope(:order)).count
  end

  def outgoing_messages_count
-    (get_grouped_values outgoing_messages).count
+    (get_grouped_values scope.messages.where(account_id: account.id).outgoing.unscope(:order)).count
  end

  def resolutions_count
-    (get_grouped_values resolutions).count
-  end
-
-  def conversations
-    scope.conversations.where(account_id: account.id, created_at: range)
-  end
-
-  def incoming_messages
-    scope.messages.where(account_id: account.id, created_at: range).incoming.unscope(:order)
-  end
-
-  def outgoing_messages
-    scope.messages.where(account_id: account.id, created_at: range).outgoing.unscope(:order)
-  end
-
-  def resolutions
-    scope.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_resolved,
-                                                                               conversations: { status: :resolved }, created_at: range).distinct
+    (get_grouped_values scope.conversations.where(account_id: account.id).resolved).count
  end

  def avg_first_response_time
@@ -56,13 +39,6 @@ module ReportHelper
    grouped_reporting_events.average(:value)
  end

-  def reply_time
-    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'reply_time', account_id: account.id))
-    return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
-
-    grouped_reporting_events.average(:value)
-  end
-
  def avg_resolution_time
    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'conversation_resolved', account_id: account.id))
    return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
@@ -73,35 +49,17 @@ module ReportHelper
  def avg_resolution_time_summary
    reporting_events = scope.reporting_events
                            .where(name: 'conversation_resolved', account_id: account.id, created_at: range)
-    avg_rt = if params[:business_hours].present?
-               reporting_events.average(:value_in_business_hours)
-             else
-               reporting_events.average(:value)
-             end
+    avg_rt = params[:business_hours] ? reporting_events.average(:value_in_business_hours) : reporting_events.average(:value)

    return 0 if avg_rt.blank?

    avg_rt
  end

-  def reply_time_summary
-    reporting_events = scope.reporting_events
-                            .where(name: 'reply_time', account_id: account.id, created_at: range)
-    reply_time = params[:business_hours] ? reporting_events.average(:value_in_business_hours) : reporting_events.average(:value)
-
-    return 0 if reply_time.blank?
-
-    reply_time
-  end
-
  def avg_first_response_time_summary
    reporting_events = scope.reporting_events
                            .where(name: 'first_response', account_id: account.id, created_at: range)
-    avg_frt = if params[:business_hours].present?
-                reporting_events.average(:value_in_business_hours)
-              else
-                reporting_events.average(:value)
-              end
+    avg_frt = params[:business_hours] ? reporting_events.average(:value_in_business_hours) : reporting_events.average(:value)

    return 0 if avg_frt.blank?

@@ -4,13 +4,8 @@
    id="app"
    class="app-wrapper app-root"
    :class="{ 'app-rtl--wrapper': isRTLView }"
-    :dir="isRTLView ? 'rtl' : 'ltr'"
  >
    <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,12 +25,9 @@ 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 { setColorTheme } from './helper/themeHelper';
 import {
  registerSubscription,
  verifyServiceWorkerExistence,
@@ -49,9 +41,7 @@ export default {
    LoadingState,
    NetworkNotification,
    UpdateBanner,
-    PaymentPendingBanner,
    WootSnackbarBox,
-    UpgradeBanner,
  },

  mixins: [rtlMixin],
@@ -69,7 +59,6 @@ export default {
      currentUser: 'getCurrentUser',
      globalConfig: 'globalConfig/get',
      authUIFlags: 'getAuthUIFlags',
-      accountUIFlags: 'accounts/getUIFlags',
      currentAccountId: 'getCurrentAccountId',
    }),
    hasAccounts() {
@@ -91,18 +80,9 @@ export default {
    },
  },
  mounted() {
-    this.initializeColorTheme();
-    this.listenToThemeChanges();
    this.setLocale(window.chatwootConfig.selectedLocale);
  },
  methods: {
-    initializeColorTheme() {
-      setColorTheme(window.matchMedia('(prefers-color-scheme: dark)').matches);
-    },
-    listenToThemeChanges() {
-      const mql = window.matchMedia('(prefers-color-scheme: dark)');
-      mql.onchange = e => setColorTheme(e.matches);
-    },
    setLocale(locale) {
      this.$root.$i18n.locale = locale;
    },
@@ -135,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>
@@ -18,10 +18,6 @@ class CacheEnabledApiClient extends ApiClient {
      return this.getFromCache();
    }

-    return this.getFromNetwork();
-  }
-
-  getFromNetwork() {
    return axios.get(this.url);
  }

@@ -36,12 +32,7 @@ class CacheEnabledApiClient extends ApiClient {
  }

  async getFromCache() {
-    try {
-      // IDB is not supported in Firefox private mode: https://bugzilla.mozilla.org/show_bug.cgi?id=781982
-      await this.dataManager.initDb();
-    } catch {
-      return this.getFromNetwork();
-    }
+    await this.dataManager.initDb();

    const { data } = await axios.get(
      `/api/v1/accounts/${this.accountIdFromRoute}/cache_keys`
@@ -64,22 +55,16 @@ class CacheEnabledApiClient extends ApiClient {
  }

  async refetchAndCommit(newKey = null) {
-    const response = await this.getFromNetwork();
+    await this.dataManager.initDb();
+    const response = await axios.get(this.url);
+    this.dataManager.replace({
+      modelName: this.cacheModelName,
+      data: this.extractDataFromResponse(response),
+    });

-    try {
-      await this.dataManager.initDb();
-
-      this.dataManager.replace({
-        modelName: this.cacheModelName,
-        data: this.extractDataFromResponse(response),
-      });
-
-      await this.dataManager.setCacheKeys({
-        [this.cacheModelName]: newKey,
-      });
-    } catch {
-      // Ignore error
-    }
+    await this.dataManager.setCacheKeys({
+      [this.cacheModelName]: newKey,
+    });

    return response;
  }
@@ -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();
@@ -14,7 +14,6 @@ class ConversationApi extends ApiClient {
    labels,
    teamId,
    conversationType,
-    sortBy,
  }) {
    return axios.get(this.url, {
      params: {
@@ -25,7 +24,6 @@ class ConversationApi extends ApiClient {
        page,
        labels,
        conversation_type: conversationType,
-        sort_by: sortBy,
      },
    });
  }
@@ -127,10 +125,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,
      }),
    });
@@ -8,19 +8,11 @@ class IntegrationsAPI extends ApiClient {
  }

  connectSlack(code) {
-    return axios.post(`${this.baseUrl()}/integrations/slack`, { code });
-  }
-
-  updateSlack({ referenceId }) {
-    return axios.patch(`${this.baseUrl()}/integrations/slack`, {
-      reference_id: referenceId,
+    return axios.post(`${this.baseUrl()}/integrations/slack`, {
+      code: code,
    });
  }

-  listAllSlackChannels() {
-    return axios.get(`${this.baseUrl()}/integrations/slack/list_all_channels`);
-  }
-
  delete(integrationId) {
    return axios.delete(`${this.baseUrl()}/integrations/${integrationId}`);
  }
@@ -2,71 +2,19 @@

 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)) {
-      data = {
-        conversation_display_id: conversationId,
-      };
-    }
-
+  processEvent({ name = 'rephrase', content, tone, hookId }) {
    return axios.post(`${this.url}/hooks/${hookId}/process_event`, {
      event: {
-        name: type,
-        data,
+        name: name,
+        data: {
+          tone,
+          content,
+        },
      },
    });
  }
@@ -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'
-      );
-    });
  });
 });
@@ -11,9 +11,7 @@ describe('#integrationAPI', () => {
    expect(integrationAPI).toHaveProperty('update');
    expect(integrationAPI).toHaveProperty('delete');
    expect(integrationAPI).toHaveProperty('connectSlack');
-    expect(integrationAPI).toHaveProperty('updateSlack');
-    expect(integrationAPI).toHaveProperty('updateSlack');
-    expect(integrationAPI).toHaveProperty('listAllSlackChannels');
+    expect(integrationAPI).toHaveProperty('createHook');
    expect(integrationAPI).toHaveProperty('deleteHook');
  });
  describeWithAPIMock('API calls', context => {
@@ -28,24 +26,6 @@ describe('#integrationAPI', () => {
      );
    });

-    it('#updateSlack', () => {
-      const updateObj = { referenceId: 'SDFSDGSVE' };
-      integrationAPI.updateSlack(updateObj);
-      expect(context.axiosMock.patch).toHaveBeenCalledWith(
-        '/api/v1/integrations/slack',
-        {
-          reference_id: updateObj.referenceId,
-        }
-      );
-    });
-
-    it('#listAllSlackChannels', () => {
-      integrationAPI.listAllSlackChannels();
-      expect(context.axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/integrations/slack/list_all_channels'
-      );
-    });
-
    it('#delete', () => {
      integrationAPI.delete(2);
      expect(context.axiosMock.delete).toHaveBeenCalledWith(
@@ -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);
 };
@@ -1,64 +1,29 @@
@import '~vue2-datepicker/scss/index';

 .mx-datepicker-popup {
-  @apply z-[99999];
+  z-index: 99999;
 }

 .date-picker {
-  &.no-margin {
-    .mx-input {
-      @apply mb-0;
-    }
-  }
-
-  &:not(.auto-width) {
-    .mx-datepicker-range {
-      @apply w-[320px];
-    }
-  }
-
  .mx-datepicker {
-    @apply w-full;
+    width: 100%;
+  }
+
+  .mx-datepicker-range {
+    width: 320px;
  }

  .mx-input {
-    @apply h-[2.5rem] flex border border-solid border-slate-200 dark:border-slate-600 rounded-md shadow-none;
+    border: 1px solid var(--s-200);
+    border-radius: var(--border-radius-normal);
+    box-shadow: none;
+    display: flex;
+    height: 4.0rem;
  }

  .mx-input:disabled,
  .mx-input[readonly] {
-    @apply bg-white dark:bg-slate-900 cursor-pointer;
-  }
-}
-
-.mx-calendar-content .cell:hover {
-  @apply bg-slate-75 dark:bg-slate-700 text-slate-900 dark:text-slate-100;
-}
-
-.mx-datepicker-inline {
-  @apply w-full;
-
-  .mx-calendar {
-    @apply w-full;
-  }
-
-  .cell.disabled {
-    @apply bg-slate-25 dark:bg-slate-900 text-slate-200 dark:text-slate-300;
-  }
-
-  .mx-time-item.disabled {
-    @apply bg-slate-25 dark:bg-slate-900;
-  }
-
-  .today {
-    @apply font-semibold;
-  }
-
-  .mx-datepicker-main {
-    @apply border-0 bg-white dark:bg-slate-800;
-  }
-
-  .mx-time-header {
-    @apply border-0;
+    background-color: var(--white);
+    cursor: pointer;
  }
 }
@@ -8,7 +8,7 @@
 }

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

 .card {
@@ -16,6 +16,19 @@ select {
  padding: var(--space-normal);
 }

+.button-wrapper .button.grey-btn {
+  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',
@@ -26,7 +39,6 @@ code {
    background: $color-background;
    border-radius: var(--border-radius-large);
    padding: $space-two;
-    @apply bg-slate-50 dark:bg-slate-600 text-slate-800 dark:text-slate-100;
  }
 }

@@ -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;

@@ -254,7 +254,7 @@ $button-sizes: (tiny: var(--font-size-micro),
  default: var(--font-size-small),
  large: var(--font-size-medium));
 $button-palette: $foundation-palette;
-$button-opacity-disabled: 0.4;
+$button-opacity-disabled: 0.25;
 $button-background-hover-lightness: -20%;
 $button-hollow-hover-lightness: -50%;
 $button-transition: background-color 0.25s ease-out,
@@ -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;
@@ -1,6 +1,90 @@
 .app-rtl--wrapper {
  direction: rtl;

+  // Primary sidebar
+  .primary--sidebar {
+    border-left: 1px solid var(--s-50);
+    border-right: 0;
+
+    .options-menu.dropdown-pane {
+      right: var(--space-smaller);
+
+      .auto-offline--toggle {
+        padding: var(--space-smaller) var(--space-one) var(--space-smaller)
+          var(--space-smaller);
+      }
+
+      .status-items .button {
+        text-align: right;
+      }
+    }
+  }
+
+  // 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 {
+      margin-left: var(--space-small);
+      margin-right: var(--space-smaller);
+    }
+  }
+
  .header-section.back-button {
    direction: initial;
    margin-left: var(--space-normal);
@@ -49,6 +133,23 @@

  // Conversation details
  .conversation-details-wrap {
+    .conv-header {
+      .user {
+        margin-left: var(--space-normal);
+        margin-right: unset;
+
+        .user--profile__meta {
+          margin-left: unset;
+          margin-right: var(--space-small);
+        }
+      }
+
+      .actions--container .resolve-actions {
+        margin-left: unset;
+        margin-right: var(--space-small);
+      }
+    }
+
    .conversation-panel {
      // Message text
      .text-content {
@@ -96,6 +197,11 @@
      }
    }

+    // Conversation sidebar toggle button
+    .sidebar-toggle--button {
+      transform: rotate(180deg);
+    }
+
    // Conversation sidebar close button
    .close-button--rtl {
      transform: rotate(180deg);
@@ -155,12 +261,6 @@
      }
    }

-    // Basic filter dropdown
-    .basic-filter {
-      left: 0;
-      right: unset;
-    }
-
    // Card label
    .label-container {
      .label {
@@ -239,6 +339,31 @@
    }
  }

+  // scss-lint:disable SelectorDepth
+  .container .header-wrap .header-left-wrap .header-left-wrap > .page-title {
+    margin-right: var(--space-small);
+  }
+
+  .portal-container .container {
+    margin-left: unset !important;
+    margin-right: var(--space-small);
+
+    .configuration-items--wrap {
+      margin-left: var(--space-mega);
+      margin-right: unset !important;
+    }
+
+    thead th {
+      padding-left: var(--space-small);
+      padding-right: 0;
+    }
+
+    tbody td {
+      padding-left: var(--space-small);
+      padding-right: 0;
+    }
+  }
+
  .portal-popover__container .portal {
    .actions-container {
      margin-left: unset;
@@ -308,7 +433,7 @@
    }

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

      &.active {
        transform: translate(
@@ -342,6 +467,11 @@
    direction: initial;
  }

+  .inbox--name .inbox--icon {
+    margin-left: var(--space-micro);
+    margin-right: 0;
+  }
+
  .colorpicker--chrome {
    direction: initial;
  }
@@ -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,7 +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;
-}
@@ -7,7 +7,6 @@
  z-index: var(--z-index-very-high);

  &.dropdown-pane--open {
-    @apply bg-white dark:bg-slate-800;
    display: block;
    visibility: visible;
  }
@@ -1,94 +1,91 @@
@mixin label-multiselect-hover {
  &::after {
-    @apply text-woot-600 dark:text-woot-600;
+    color: $color-primary-dark;
  }

  &:hover {
-    @apply bg-slate-50 dark:bg-slate-700;
+    background: $color-background;

    &::after {
-      @apply text-woot-500 dark:text-woot-500;
+      color: $color-woot;
    }
  }
 }

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

  &.multiselect--disabled {
-    @apply opacity-50 border border-slate-200 dark:border-slate-600 rounded-md cursor-not-allowed;
-
-    .multiselect__select {
-      @apply cursor-not-allowed bg-white dark:bg-slate-900 rounded-md;
-    }
-
-    .multiselect__tags {
-      @apply border-0;
-    }
+    opacity: 0.8;
  }

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

  .multiselect__select {
-    @apply min-h-[2.875rem] p-0 right-0 top-0;
+    min-height: 4.6rem;
+    padding: 0;
+    right: 0;
+    top: 0;

    &::before {
-      @apply right-0;
+      right: 0;
    }
  }

-  .multiselect__content-wrapper {
-    @apply bg-white dark:bg-slate-900 border border-solid border-slate-200 dark:border-slate-600 text-slate-800 dark:text-slate-100;
-  }
-
  .multiselect__content {
-    @apply max-w-full;
+    max-width: 100%;

    .multiselect__option {
-      @apply text-sm font-normal;
+      font-size: $font-size-small;
+      font-weight: $font-weight-normal;

      span {
-        @apply inline-block overflow-hidden text-ellipsis whitespace-nowrap w-fit;
+        display: inline-block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        width: fit-content;
      }

      p {
-        @apply mb-0;
+        margin-bottom: 0;
      }

      &.multiselect__option--highlight {
-        @apply bg-white dark:bg-slate-800 text-slate-800 dark:text-slate-100;
+        background: var(--white);
+        color: var(--color-body);
      }

      &.multiselect__option--highlight:hover {
-        @apply bg-woot-50 dark:bg-woot-600 text-slate-800 dark:text-slate-100;
+        background: var(--w-50);
+        color: var(--color-body);

        &::after {
-          @apply bg-woot-50 dark:bg-woot-600 text-slate-600 dark:text-slate-200;
+          background: var(--w-50);
+          color: var(--s-600);
        }
      }

      &.multiselect__option--highlight::after {
-        @apply bg-transparent;
+        background: transparent;
      }

      &.multiselect__option--selected {
-        @apply bg-woot-50 dark:bg-woot-600 text-slate-800 dark:text-slate-100;
+        background: var(--w-75);

        &.multiselect__option--highlight:hover {
-          @apply bg-woot-75 dark:bg-woot-600;
+          background: var(--w-75);

          &::after {
-            @apply bg-transparent;
+            background: transparent;
          }

          &::after:hover {
-            @apply text-slate-800 dark:text-slate-100;
+            color: var(--color-body);
          }
        }
      }
@@ -96,130 +93,175 @@
  }

  .multiselect__tags {
-    @apply bg-white dark:bg-slate-900 border border-solid border-slate-200 dark:border-slate-600 m-0 min-h-[2.875rem] pt-0;
+    border: 1px solid var(--s-200);
+    border-color: var(--s-200);
+    margin: 0;
+    min-height: 4.4rem;
+    padding-top: $zero;
  }

  .multiselect__tags-wrap {
-    @apply inline-block leading-none mt-1;
+    display: inline-block;
+    line-height: 1;
+    margin-top: $space-smaller;
  }

  .multiselect__placeholder {
-    @apply text-slate-400 dark:text-slate-400 font-normal pt-3;
+    color: $color-gray;
+    font-weight: $font-weight-normal;
+    padding-top: var(--space-slab);
  }

  .multiselect__tag {
-    @apply bg-slate-50 dark:bg-slate-800 mt-1 text-slate-800 dark:text-slate-100 pr-6 pl-2.5 py-1.5;
+    $vertical-space: $space-smaller + $space-micro;
+    background: $color-background;
+    color: $color-heading;
+    margin-top: $space-smaller;
+    padding: $vertical-space $space-medium $vertical-space $space-one;
  }

  .multiselect__tag-icon {
    @include label-multiselect-hover;
+    line-height: $space-medium + $space-micro;
  }

  .multiselect__input {
    @include ghost-input;
-    @apply text-sm h-[2.875rem] mb-0 p-0;
+    font-size: $font-size-small;
+    height: 4.4rem;
+    margin-bottom: $zero;
+    padding: 0;
  }

  .multiselect__single {
-    @apply bg-white dark:bg-slate-900 text-slate-800 dark:text-slate-100 inline-block mb-0 py-3 px-2.5 overflow-hidden whitespace-nowrap text-ellipsis;
+    @include text-ellipsis;
+    display: inline-block;
+    margin-bottom: 0;
+    padding: var(--space-slab) var(--space-one);
  }
 }

 .sidebar-labels-wrap {
+
  &.has-edited,
  &:hover {
    .multiselect {
-      @apply cursor-pointer;
+      cursor: pointer;
    }
  }

  .multiselect {
-    > .multiselect__select {
-      @apply invisible;
+    >.multiselect__select {
+      visibility: hidden;
    }

-    > .multiselect__tags {
-      @apply border-transparent;
+    >.multiselect__tags {
+      border-color: transparent;
    }

-    &.multiselect--active > .multiselect__tags {
-      @apply border-woot-500 dark:border-woot-500;
+    &.multiselect--active>.multiselect__tags {
+      border-color: $color-woot;
    }
  }
 }

 .multiselect-wrap--small {
+  $multiselect-height: 4.0rem;
+
  .multiselect__tags,
  .multiselect__input {
-    @apply items-center flex;
+    align-items: center;
+    display: flex;
  }

  .multiselect__tags,
  .multiselect__input,
  .multiselect {
-    @apply bg-white dark:bg-slate-900 text-slate-800 dark:text-slate-100 rounded-[5px] text-sm h-10 min-h-[2.5rem];
+    background: var(--white);
+    font-size: var(--font-size-small);
+    height: $multiselect-height;
+    min-height: $multiselect-height;
  }

  .multiselect__input {
-    @apply h-[2.375rem] min-h-[2.375rem];
+    height: $multiselect-height - $space-micro;
+    min-height: $multiselect-height - $space-micro;
  }

  .multiselect__single {
-    @apply items-center flex m-0 text-sm max-h-[2.375rem] text-slate-800 dark:text-slate-100 bg-white dark:bg-slate-900 py-1 px-0.5;
+    align-items: center;
+    display: flex;
+    font-size: var(--font-size-small);
+    margin: 0;
+    max-height: 3.8rem;
+    padding: var(--space-smaller) var(--space-micro);
  }

  .multiselect__placeholder {
-    @apply m-0 py-1 px-0.5;
+    margin: 0;
+    padding: var(--space-smaller) var(--space-micro);
  }

  .multiselect__select {
-    @apply min-h-[2.5rem];
+    min-height: $multiselect-height;
  }

  .multiselect--disabled .multiselect__current,
  .multiselect--disabled .multiselect__select {
-    @apply bg-transparent;
+    background: transparent;
  }

  .multiselect__tags-wrap {
-    @apply flex-shrink-0;
+    flex-shrink: 0;
  }
 }

 .multiselect-wrap--medium {
+  $multiselect-height: 4.8rem;
+
  .multiselect__tags,
  .multiselect__input {
-    @apply items-center flex;
+    align-items: center;
+    display: flex;
  }

  .multiselect__tags,
  .multiselect__input,
  .multiselect {
-    @apply bg-white dark:bg-slate-900 text-slate-800 dark:text-slate-100 text-sm h-12 min-h-[3rem];
+    background: var(--white);
+    font-size: var(--font-size-small);
+    height: $multiselect-height;
+    min-height: $multiselect-height;
  }

  .multiselect__input {
-    @apply h-[2.875rem] min-h-[2.875rem];
+    height: $multiselect-height - $space-micro;
+    min-height: $multiselect-height - $space-micro;
  }

  .multiselect__single {
-    @apply items-center flex m-0 text-sm py-1 px-0.5 text-slate-800 dark:text-slate-100 bg-white dark:bg-slate-900;
+    align-items: center;
+    display: flex;
+    font-size: var(--font-size-small);
+    margin: 0;
+    padding: var(--space-smaller) var(--space-micro);
  }

  .multiselect__placeholder {
-    @apply m-0 py-1 px-0.5;
+    margin: 0;
+    padding: var(--space-smaller) var(--space-micro);
  }

  .multiselect__select {
-    @apply min-h-[3rem];
+    min-height: $multiselect-height;
  }

  .multiselect--disabled .multiselect__current,
  .multiselect--disabled .multiselect__select {
-    @apply bg-transparent;
+    background: transparent;
  }

  .multiselect__tags-wrap {
-    @apply flex-shrink-0;
+    flex-shrink: 0;
  }
 }
@@ -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';
@@ -10,7 +9,7 @@
@import 'variables';

@import '~spinkit/scss/spinners/7-three-bounce';
-@import 'vue-multiselect/dist/vue-multiselect.min.css';
+@import '~vue-multiselect/dist/vue-multiselect.min.css';
@import '~shared/assets/stylesheets/ionicons';

@import 'mixins';
@@ -30,18 +29,3 @@
@import 'widgets/forms';

@import 'plugins/multiselect';
-
-@import 'widget/assets/scss/reset';
-@import 'tailwindcss/base';
-@import 'tailwindcss/components';
-@import 'tailwindcss/utilities';
-@import 'widget/assets/scss/utilities';
-
-
-html,
-body {
-  font-family: 'PlusJakarta', sans-serif;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  height: 100%;
-}
@@ -1,3 +1,3 @@
-@import 'shared/assets/fonts/plus-jakarta';
+@import 'shared/assets/fonts/inter';
@import '../variables';
@import '~shared/assets/stylesheets/ionicons';
@@ -1,112 +1,173 @@
 .settings {
-  @apply overflow-auto;
+  overflow: auto;
+}
+
+// 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;
+
+  // Resolve Button
+  .button {
+    margin: 0;
+  }
+
+  // User thumbnail and text
+  .page-title {
+    @include flex;
+    @include flex-align($x: center, $y: middle);
+    margin: 0;
+  }
 }

 .wizard-box {
  .item {
-    @apply cursor-pointer py-4 pr-4 pl-6 relative;
+    @include background-light;
+
+    cursor: pointer;
+    padding: $space-normal $space-normal $space-normal $space-medium;
+    position: relative;

    &::before,
    &::after {
-      @apply bg-slate-75 dark:bg-slate-600 content-[''] h-full absolute top-5 w-0.5;
+      background: $color-border;
+      content: '';
+      height: 100%;
+      position: absolute;
+      top: $space-normal;
+      width: 2px;
    }

    &::before {
-      @apply h-4 top-0;
+      height: $space-normal;
+      top: $zero;
    }

    &:first-child {
      &::before {
-        @apply h-0;
+        height: 0;
      }
    }

    &:last-child {
      &::after {
-        @apply h-0;
+        height: $zero;
      }
    }

    &.active {
      h3 {
-        @apply text-woot-500 dark:text-woot-500;
+        color: $color-woot;
      }

      .step {
-        @apply bg-woot-500 dark:bg-woot-500;
+        background: $color-woot;
      }
    }

    &.over {
      &::after {
-        @apply bg-woot-500 dark:bg-woot-500;
+        background: $color-woot;
      }

      .step {
-        @apply bg-woot-500 dark:bg-woot-500;
+        background: $color-woot;
      }

      & + .item {
        &::before {
-          @apply bg-woot-500 dark:bg-woot-500;
+          background: $color-woot;
        }
      }
    }

    h3 {
-      @apply text-slate-800 dark:text-slate-100 text-base pl-6;
+      color: $color-body;
+      font-size: $font-size-default;
+      line-height: 1;
+      padding-left: $space-medium;
    }

    .completed {
-      @apply text-green-500 dark:text-green-500 ml-1;
+      color: $success-color;
+      margin-left: $space-smaller;
    }

    p {
-      @apply text-slate-600 dark:text-slate-300 text-sm m-0 pl-6;
+      color: $color-light-gray;
+      font-size: $font-size-small;
+      margin: 0;
+      padding-left: $space-medium;
    }

    .step {
-      @apply bg-slate-75 dark:bg-slate-600 rounded-2xl font-medium w-4 left-4 leading-4 z-[999] absolute text-center text-white dark:text-white text-xxs top-5;
+      background: $color-border;
+      border-radius: 20px;
+      color: $color-white;
+      font-size: $font-size-micro;
+      font-weight: $font-weight-medium;
+      height: $space-normal;
+      left: $space-normal;
+      line-height: $space-normal;
+      position: absolute;
+      text-align: center;
+      top: $space-normal;
+      width: $space-normal;
+      z-index: 999;

      i {
-        @apply text-xxs;
+        font-size: $font-size-micro;
      }
    }
  }
 }

 .wizard-body {
-  @apply border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6;
+  @include background-white;
+  @include border-light;
+  @include full-height();
+  padding: $space-medium;

  &.height-auto {
-    @apply h-auto;
+    height: auto;
  }
 }

 .settings--content {
-  @apply my-2 mx-8;
+  margin: $space-small $space-large;

  .title {
-    @apply font-medium;
+    font-weight: $font-weight-medium;
  }

  .code {
-    @apply bg-slate-50 dark:bg-slate-800 overflow-auto p-2.5 whitespace-nowrap;
+    background: $color-background;
+    max-height: $space-mega;
+    overflow: auto;
+    padding: $space-one;
+    white-space: nowrap;

    code {
-      @apply bg-transparent border-0;
+      background: transparent;
+      border: 0;
    }
  }
 }

 .login-init {
-  @apply pt-[30%] text-center;
+  padding-top: 30%;
+  text-align: center;

  p {
-    @apply p-6;
+    padding: $space-medium;
  }

  > a > img {
-    @apply w-60;
+    width: $space-larger * 5;
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Muhsin Keloth	7e0b46236c	Update yarn.lock	2023-04-27 16:23:52 +05:30
Muhsin Keloth	b7a865ac82	Upgrade `@chatwoot/utils`	2023-04-27 16:21:11 +05:30
Muhsin Keloth	484ae40346	Use variable helpers from utils	2023-04-27 16:16:50 +05:30
@@ -1 +1 @@
 .20.1
 .17.4
@@ -1 +1 @@
 .2.2
 .1.3
@@ -1 +1 @@
 .17.0
 .2.0
@@ -1 +1 @@
 .3.0
 .1.0