refactor: use MutexApplicationJob

feat: create mutex application job
feat: add mutex for slack send job
2023-08-23 11:59:24 +07:00 · 2023-08-23 11:59:06 +07:00 · 2023-08-23 11:59:06 +07:00
1986 changed files with 16270 additions and 55561 deletions
@@ -15,9 +15,9 @@ defaults: &defaults
    - image: cimg/postgres:15.3
    - image: cimg/redis:6.2.6
  environment:
-    - RAILS_LOG_TO_STDOUT: false
-    - COVERAGE: true
-    - LOG_LEVEL: warn
+      - RAILS_LOG_TO_STDOUT: false
+      - COVERAGE: true
+      - LOG_LEVEL: warn
  parallelism: 4
  resource_class: large

@@ -46,7 +46,7 @@ jobs:
            export NVM_DIR="$HOME/.nvm"
            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
            [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-            nvm install v20
+            nvm install v16
            echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV
            echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV

@@ -64,6 +64,7 @@ jobs:
            - ~/.bundle
          key: chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-v20220524-{{ checksum "Gemfile.lock" }}

+
      # Only necessary if app uses webpacker or yarn in some other way
      - restore_cache:
          keys:
@@ -81,7 +82,7 @@ jobs:
            - ~/.cache/yarn

      - run:
-          name: Download cc-test-reporter
+          name:  Download cc-test-reporter
          command: |
            mkdir -p ~/tmp
            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ~/tmp/cc-test-reporter
@@ -181,7 +182,7 @@ jobs:
      - attach_workspace:
          at: ~/build
      - run:
-          name: Download cc-test-reporter
+          name:  Download cc-test-reporter
          command: |
            mkdir -p ~/tmp
            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ~/tmp/cc-test-reporter
@@ -203,4 +204,4 @@ workflows:
      - build
      - upload-coverage:
          requires:
-            - build
+             - build
@@ -81,7 +81,7 @@ SMTP_OPENSSL_VERIFY_MODE=peer
 # Mail Incoming
 # This is the domain set for the reply emails when conversation continuity is enabled
 MAILER_INBOUND_EMAIL_DOMAIN=
-# Set this to the appropriate ingress channel with regards to incoming emails
+# Set this to appropriate ingress channel with regards to incoming emails
 # Possible values are :
 # relay for Exim, Postfix, Qmail
 # mailgun for Mailgun
@@ -91,20 +91,10 @@ MAILER_INBOUND_EMAIL_DOMAIN=
 RAILS_INBOUND_EMAIL_SERVICE=
 # Use one of the following based on the email ingress service
 # Ref: https://edgeguides.rubyonrails.org/action_mailbox_basics.html
-# Set this to a password of your choice and use it in the Inbound webhook
 RAILS_INBOUND_EMAIL_PASSWORD=
-
 MAILGUN_INGRESS_SIGNING_KEY=
 MANDRILL_INGRESS_API_KEY=

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

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

-# GOOGLE_TAG_MANAGER
-# GOOGLE_TAG = GTM-XXXXXXX
-
 ## Scout
 ## https://scoutapm.com/docs/ruby/configuration
 # SCOUT_KEY=YOURKEY
@@ -212,8 +199,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## Rack Attack configuration
 ## To prevent and throttle abusive requests
 # ENABLE_RACK_ATTACK=true
-# RACK_ATTACK_LIMIT=300
-# ENABLE_RACK_ATTACK_WIDGET_API=true

 ## Running chatwoot as an API only server
 ## setting this value to true will disable the frontend dashboard endpoints
@@ -253,9 +238,3 @@ AZURE_APP_SECRET=

 # Sentiment analysis model file path
 SENTIMENT_FILE_PATH=
-
-
-# Housekeeping/Performance related configurations
-# Set to true if you want to remove stale contact inboxes
-# contact_inboxes with no conversation older than 90 days will be removed
-# REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
@@ -4,10 +4,9 @@ module.exports = {
    'prettier',
    'plugin:vue/recommended',
    'plugin:storybook/recommended',
-    'plugin:cypress/recommended',
  ],
  parserOptions: {
-    parser: '@babel/eslint-parser',
+    parser: 'babel-eslint',
    ecmaVersion: 2020,
    sourceType: 'module',
  },
@@ -25,16 +24,13 @@ module.exports = {
    'jsx-a11y/label-has-for': 'off',
    'jsx-a11y/anchor-is-valid': 'off',
    'import/no-unresolved': 'off',
-    'vue/html-indent': 'off',
-    'vue/multi-word-component-names': 'off',
    'vue/max-attributes-per-line': [
      'error',
      {
-        singleline: {
-          max: 20,
-        },
+        singleline: 20,
        multiline: {
          max: 1,
+          allowFirstLine: false,
        },
      },
    ],
@@ -51,7 +47,6 @@ module.exports = {
      },
    ],
    'vue/no-v-html': 'off',
-    'vue/component-definition-name-casing': 'off',
    'vue/singleline-html-element-content-newline': 'off',
    'import/extensions': ['off'],
    'no-console': 'error',
@@ -52,8 +52,7 @@ jobs:

    - uses: actions/setup-node@v3
      with:
-        node-version: 20
-        cache: yarn
+        node-version: 16

    - name: yarn
      run: yarn install
@@ -76,8 +75,6 @@ jobs:
    - name: Run backend tests
      run: |
        bundle exec rspec --profile=10 --format documentation
-      env: 
-        NODE_OPTIONS: --openssl-legacy-provider

    - name: Upload rails log folder
      uses: actions/upload-artifact@v3
@@ -51,8 +51,7 @@ jobs:

    - uses: actions/setup-node@v3
      with:
-        node-version: 20
-        cache: yarn
+        node-version: 16

    - name: yarn
      run: yarn install
@@ -69,12 +68,7 @@ jobs:
    # 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/services/enterprise/message_templates/response_bot_service_spec.rb \
-          spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb:47 \
-          --profile=10 \
-          --format documentation
+        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
@@ -21,8 +21,7 @@ jobs:

      - uses: actions/setup-node@v3
        with:
-          node-version: 20
-          cache: 'yarn'
+          node-version: 16

      - name: yarn
        run: yarn install
@@ -31,11 +30,9 @@ jobs:
        run: |
          rm -rf enterprise
          rm -rf spec/enterprise
-          
+
      - name: Run asset compile
        run: bundle exec rake assets:precompile
-        env:
-          NODE_OPTIONS: --openssl-legacy-provider

      - name: Size Check
        run: yarn run size
@@ -1 +1 @@
-20.5.1
+16.20.1
@@ -8,11 +8,15 @@ Layout/LineLength:
  Max: 150

 Metrics/ClassLength:
-  Max: 175
+  Max: 125
  Exclude:
-    - 'app/models/message.rb'
    - 'app/models/conversation.rb'
-
+    - 'app/models/contact.rb'
+    - 'app/mailers/conversation_reply_mailer.rb'
+    - 'app/models/message.rb'
+    - 'app/builders/messages/facebook/message_builder.rb'
+    - 'app/controllers/api/v1/accounts/contacts_controller.rb'
+    - 'app/listeners/action_cable_listener.rb'
 RSpec/ExampleLength:
  Max: 25
 Style/Documentation:
@@ -58,7 +62,6 @@ Metrics/BlockLength:
 Metrics/ModuleLength:
  Exclude:
    - lib/seeders/message_seeder.rb
-    - spec/support/slack_stubs.rb
 Rails/ApplicationController:
  Exclude:
    - 'app/controllers/api/v1/widget/messages_controller.rb'
@@ -70,7 +73,7 @@ Rails/ApplicationController:
    - 'app/controllers/survey/responses_controller.rb'
 Rails/FindEach:
  Enabled: true
-  Include:
+  Include: 
    - 'app/**/*.rb'
 Rails/CompactBlank:
  Enabled: false
@@ -186,6 +189,7 @@ RSpec/IndexedLet:
 RSpec/NamedSubject:
  Enabled: false

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

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

@@ -15,7 +15,7 @@ gem 'browser'
 gem 'hashie'
 gem 'jbuilder'
 gem 'kaminari'
-gem 'responders', '>= 3.1.1'
+gem 'responders'
 gem 'rest-client'
 gem 'telephone_number'
 gem 'time_diff'
@@ -67,7 +67,7 @@ gem 'webpacker'
 gem 'barnes'

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

 ##--- gems for pubsub service ---##
 # https://karolgalanciak.com/blog/2019/11/30/from-activerecord-callbacks-to-publish-slash-subscribe-pattern-and-event-driven-design/
@@ -92,7 +91,7 @@ gem 'twitty', '~> 0.1.5'
 # facebook client
 gem 'koala'
 # slack client
-gem 'slack-ruby-client', '~> 2.2.0'
+gem 'slack-ruby-client', '~> 2.0.0'
 # for dialogflow integrations
 gem 'google-cloud-dialogflow-v2'
 gem 'grpc'
@@ -107,16 +106,16 @@ gem 'google-cloud-translate-v3'
 gem 'ddtrace', require: false
 gem 'elastic-apm', require: false
 gem 'newrelic_rpm', require: false
-gem 'newrelic-sidekiq-metrics', '>= 1.6.2', require: false
+gem 'newrelic-sidekiq-metrics', require: false
 gem 'scout_apm', require: false
-gem 'sentry-rails', '>= 5.14.0', require: false
+gem 'sentry-rails', '>= 5.10.0', require: false
 gem 'sentry-ruby', require: false
-gem 'sentry-sidekiq', '>= 5.14.0', require: false
+gem 'sentry-sidekiq', '>= 5.10.0', require: false

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

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

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

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

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

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

@@ -189,7 +188,7 @@ group :development do
  gem 'bullet'
  gem 'letter_opener'
  gem 'scss_lint', require: false
-  gem 'web-console', '>= 4.2.1'
+  gem 'web-console'

  # used in swagger build
  gem 'json_refs'
@@ -198,10 +197,8 @@ group :development do
  gem 'squasher'

  # profiling
-  gem 'rack-mini-profiler', '>= 3.2.0', require: false
+  gem 'rack-mini-profiler', '>= 3.1.1', require: false
  gem 'stackprof'
-  # Should install the associated chrome extension to view query logs
-  gem 'meta_request'
 end

 group :test do
@@ -224,7 +221,7 @@ group :development, :test do
  gem 'byebug', platform: :mri
  gem 'climate_control'
  gem 'debug', '~> 1.8'
-  gem 'factory_bot_rails', '>= 6.4.3'
+  gem 'factory_bot_rails'
  gem 'listen'
  gem 'mock_redis'
  gem 'pry-rails'
@@ -33,70 +33,70 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
+    actioncable (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionmailbox (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      activejob (= 7.0.5.1)
+      activerecord (= 7.0.5.1)
+      activestorage (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.0.8)
-      actionpack (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionmailer (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      actionview (= 7.0.5.1)
+      activejob (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
      rails-dom-testing (~> 2.0)
-    actionpack (7.0.8)
-      actionview (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionpack (7.0.5.1)
+      actionview (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
      rack (~> 2.0, >= 2.2.4)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8)
-      actionpack (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    actiontext (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      activerecord (= 7.0.5.1)
+      activestorage (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.0.8)
-      activesupport (= 7.0.8)
+    actionview (7.0.5.1)
+      activesupport (= 7.0.5.1)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
    active_record_query_trace (1.8)
-    activejob (7.0.8)
-      activesupport (= 7.0.8)
+    activejob (7.0.5.1)
+      activesupport (= 7.0.5.1)
      globalid (>= 0.3.6)
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
+    activemodel (7.0.5.1)
+      activesupport (= 7.0.5.1)
+    activerecord (7.0.5.1)
+      activemodel (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
    activerecord-import (1.4.1)
      activerecord (>= 4.2)
-    activestorage (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activesupport (= 7.0.8)
+    activestorage (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      activejob (= 7.0.5.1)
+      activerecord (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
      marcel (~> 1.0)
      mini_mime (>= 1.1.0)
-    activesupport (7.0.8)
+    activesupport (7.0.5.1)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@@ -113,22 +113,17 @@ GEM
      kaminari (>= 1.0)
      sassc-rails (~> 2.1)
      selectize-rails (~> 0.6)
-    administrate-field-active_storage (1.0.1)
+    administrate-field-active_storage (0.4.2)
      administrate (>= 0.2.2)
      rails (>= 7.0)
-    administrate-field-belongs_to_search (0.9.0)
-      administrate (>= 0.3, < 1.0)
-      jbuilder (~> 2)
-      rails (>= 4.2, < 7.2)
-      selectize-rails (~> 0.6)
    annotate (3.2.0)
      activerecord (>= 3.2, < 8.0)
      rake (>= 10.4, < 14.0)
    ast (2.4.2)
    attr_extras (7.1.0)
-    audited (5.4.1)
-      activerecord (>= 5.0, < 7.7)
-      activesupport (>= 5.0, < 7.7)
+    audited (5.3.3)
+      activerecord (>= 5.0, < 7.1)
+      request_store (~> 1.2)
    aws-eventstream (1.2.0)
    aws-partitions (1.760.0)
    aws-sdk-core (3.171.1)
@@ -148,8 +143,7 @@ GEM
    barnes (0.0.9)
      multi_json (~> 1)
      statsd-ruby (~> 1.1)
-    base64 (0.1.1)
-    bcrypt (3.1.19)
+    bcrypt (3.1.18)
    bindex (0.8.1)
    blingfire (0.1.8)
    bootsnap (1.16.0)
@@ -175,7 +169,7 @@ GEM
      rexml
    crass (1.0.6)
    csv-safe (3.2.1)
-    cypress-on-rails (1.16.0)
+    cypress-on-rails (1.13.1)
      rack
    database_cleaner (2.0.2)
      database_cleaner-active_record (>= 2, < 3)
@@ -183,7 +177,7 @@ GEM
      activerecord (>= 5.a)
      database_cleaner-core (~> 2.0.0)
    database_cleaner-core (2.0.1)
-    date (3.3.4)
+    date (3.3.3)
    ddtrace (1.11.1)
      debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
      libdatadog (~> 2.0.0.1.0)
@@ -194,7 +188,7 @@ GEM
      irb (>= 1.5.0)
      reline (>= 0.3.1)
    declarative (0.0.20)
-    devise (4.9.3)
+    devise (4.9.2)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0)
@@ -230,10 +224,10 @@ GEM
    facebook-messenger (2.0.1)
      httparty (~> 0.13, >= 0.13.7)
      rack (>= 1.4.5)
-    factory_bot (6.4.5)
+    factory_bot (6.2.1)
      activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.3)
-      factory_bot (~> 6.4)
+    factory_bot_rails (6.2.0)
+      factory_bot (~> 6.2.0)
      railties (>= 5.0.0)
    faker (3.2.0)
      i18n (>= 1.8.11, < 2)
@@ -256,13 +250,13 @@ GEM
    fcm (1.0.8)
      faraday (>= 1.0.0, < 3.0)
      googleauth (~> 1)
-    ffi (1.16.3)
+    ffi (1.15.5)
    ffi-compiler (1.0.1)
      ffi (>= 1.0.0)
      rake
    flag_shih_tzu (0.3.23)
    foreman (0.87.2)
-    fugit (1.9.0)
+    fugit (1.8.1)
      et-orbi (~> 1, >= 1.2.7)
      raabro (~> 1.4)
    gapic-common (0.18.0)
@@ -274,9 +268,9 @@ GEM
      googleauth (~> 1.0)
      grpc (~> 1.36)
    geocoder (1.8.1)
-    gli (2.21.1)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
+    gli (2.21.0)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
    gmail_xoauth (0.4.2)
      oauth (>= 0.3.6)
    google-apis-core (0.11.0)
@@ -435,12 +429,12 @@ GEM
    llhttp-ffi (0.4.0)
      ffi-compiler (~> 1.0)
      rake (~> 13.0)
-    lograge (0.14.0)
+    lograge (0.13.0)
      actionpack (>= 4)
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.22.0)
+    loofah (2.21.3)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    mail (2.8.1)
@@ -451,17 +445,14 @@ GEM
    marcel (1.0.2)
    maxminddb (0.1.22)
    memoist (0.16.2)
-    meta_request (0.7.4)
-      rack-contrib (>= 1.1, < 3)
-      railties (>= 3.0.0, < 7.1)
    method_source (1.0.0)
    mime-types (3.4.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2023.0218.1)
    mini_magick (4.12.0)
-    mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.4)
+    minitest (5.19.0)
    mock_redis (0.36.0)
      ruby2_keywords
    msgpack (1.7.0)
@@ -472,30 +463,29 @@ GEM
      activerecord (>= 5.2)
    net-http-persistent (4.0.2)
      connection_pool (~> 2.2)
-    net-imap (0.4.9)
+    net-imap (0.3.6)
      date
      net-protocol
    net-pop (0.1.2)
      net-protocol
-    net-protocol (0.2.2)
+    net-protocol (0.2.1)
      timeout
-    net-smtp (0.4.0)
+    net-smtp (0.3.3)
      net-protocol
    netrc (0.11.0)
-    newrelic-sidekiq-metrics (1.6.2)
-      newrelic_rpm (>= 8.0.0)
+    newrelic-sidekiq-metrics (1.6.1)
+      newrelic_rpm (~> 8)
      sidekiq
-    newrelic_rpm (9.6.0)
-      base64
-    nio4r (2.7.0)
-    nokogiri (1.16.0)
+    newrelic_rpm (8.16.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.3)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.16.0-arm64-darwin)
+    nokogiri (1.15.3-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.0-x86_64-darwin)
+    nokogiri (1.15.3-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.0-x86_64-linux)
+    nokogiri (1.15.3-x86_64-linux)
      racc (~> 1.4)
    numo-narray (0.9.2.1)
    oauth (1.1.0)
@@ -511,7 +501,7 @@ GEM
      rack (>= 1.2, < 4)
      snaky_hash (~> 2.0)
      version_gem (~> 1.1)
-    omniauth (2.1.2)
+    omniauth (2.1.1)
      hashie (>= 3.4.6)
      rack (>= 2.2.3)
      rack-protection
@@ -553,64 +543,62 @@ GEM
    pry-rails (0.3.9)
      pry (>= 0.10.4)
    public_suffix (5.0.1)
-    puma (6.4.2)
+    puma (6.2.2)
      nio4r (~> 2.0)
    pundit (2.3.0)
      activesupport (>= 3.0.0)
    raabro (1.4.0)
-    racc (1.7.3)
+    racc (1.7.1)
    rack (2.2.8)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
-    rack-contrib (2.4.0)
-      rack (< 4)
    rack-cors (2.0.1)
      rack (>= 2.0.0)
-    rack-mini-profiler (3.2.0)
+    rack-mini-profiler (3.1.1)
      rack (>= 1.2.0)
-    rack-protection (3.1.0)
-      rack (~> 2.2, >= 2.2.4)
+    rack-protection (3.0.6)
+      rack
    rack-proxy (0.7.6)
      rack
    rack-test (2.1.0)
      rack (>= 1.3)
    rack-timeout (0.6.3)
-    rails (7.0.8)
-      actioncable (= 7.0.8)
-      actionmailbox (= 7.0.8)
-      actionmailer (= 7.0.8)
-      actionpack (= 7.0.8)
-      actiontext (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activemodel (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    rails (7.0.5.1)
+      actioncable (= 7.0.5.1)
+      actionmailbox (= 7.0.5.1)
+      actionmailer (= 7.0.5.1)
+      actionpack (= 7.0.5.1)
+      actiontext (= 7.0.5.1)
+      actionview (= 7.0.5.1)
+      activejob (= 7.0.5.1)
+      activemodel (= 7.0.5.1)
+      activerecord (= 7.0.5.1)
+      activestorage (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
      bundler (>= 1.15.0)
-      railties (= 7.0.8)
-    rails-dom-testing (2.2.0)
+      railties (= 7.0.5.1)
+    rails-dom-testing (2.1.1)
      activesupport (>= 5.0.0)
      minitest
      nokogiri (>= 1.6)
    rails-html-sanitizer (1.6.0)
      loofah (~> 2.21)
      nokogiri (~> 1.14)
-    railties (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
+    railties (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
      zeitwerk (~> 2.5)
    rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.0.6)
    rb-fsevent (0.11.2)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    redis (5.0.6)
      redis-client (>= 0.9.0)
-    redis-client (0.19.0)
+    redis-client (0.14.1)
      connection_pool
    redis-namespace (1.10.0)
      redis (>= 4)
@@ -623,7 +611,7 @@ GEM
      uber (< 0.2.0)
    request_store (1.5.1)
      rack (>= 1.4)
-    responders (3.1.1)
+    responders (3.1.0)
      actionpack (>= 5.2)
      railties (>= 5.2)
    rest-client (2.1.0)
@@ -709,23 +697,23 @@ GEM
      activesupport (>= 4)
    selectize-rails (0.12.6)
    semantic_range (3.0.0)
-    sentry-rails (5.14.0)
+    sentry-rails (5.10.0)
      railties (>= 5.0)
-      sentry-ruby (~> 5.14.0)
-    sentry-ruby (5.14.0)
+      sentry-ruby (~> 5.10.0)
+    sentry-ruby (5.10.0)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.14.0)
-      sentry-ruby (~> 5.14.0)
+    sentry-sidekiq (5.10.0)
+      sentry-ruby (~> 5.10.0)
      sidekiq (>= 3.0)
    sexp_processor (4.17.0)
    shoulda-matchers (5.3.0)
      activesupport (>= 5.2.0)
-    sidekiq (7.2.0)
+    sidekiq (7.1.2)
      concurrent-ruby (< 2)
      connection_pool (>= 2.3.0)
      rack (>= 2.2.4)
      redis-client (>= 0.14.0)
-    sidekiq-cron (1.12.0)
+    sidekiq-cron (1.10.0)
      fugit (~> 1.8)
      globalid (>= 1.0.1)
      sidekiq (>= 6)
@@ -739,12 +727,13 @@ GEM
      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
    simplecov-html (0.10.2)
-    slack-ruby-client (2.2.0)
+    slack-ruby-client (2.0.0)
      faraday (>= 2.0)
      faraday-mashify
      faraday-multipart
      gli
      hashie
+      websocket-driver
    snaky_hash (2.0.1)
      hashie
      version_gem (~> 1.1, >= 1.1.1)
@@ -752,7 +741,7 @@ GEM
    spring-watcher-listen (2.1.0)
      listen (>= 2.7, < 4.0)
      spring (>= 4)
-    sprockets (4.2.1)
+    sprockets (4.2.0)
      concurrent-ruby (~> 1.0)
      rack (>= 2.2.4, < 4)
    sprockets-rails (3.4.2)
@@ -765,12 +754,12 @@ GEM
    stripe (8.5.0)
    telephone_number (1.4.20)
    test-prof (1.2.1)
-    thor (1.3.0)
-    tilt (2.3.0)
+    thor (1.2.2)
+    tilt (2.2.0)
    time_diff (0.3.0)
      activesupport
      i18n
-    timeout (0.4.1)
+    timeout (0.4.0)
    trailblazer-option (0.1.2)
    twilio-ruby (5.77.0)
      faraday (>= 0.9, < 3.0)
@@ -797,7 +786,7 @@ GEM
    version_gem (1.1.2)
    warden (1.2.9)
      rack (>= 2.0.9)
-    web-console (4.2.1)
+    web-console (4.2.0)
      actionview (>= 6.0.0)
      activemodel (>= 6.0.0)
      bindex (>= 0.4.0)
@@ -816,14 +805,14 @@ GEM
      railties (>= 5.2)
      semantic_range (>= 2.3.0)
    webrick (1.8.1)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.5)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    wisper (2.0.0)
    working_hours (1.4.1)
      activesupport (>= 3.2)
      tzinfo
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.9)

 PLATFORMS
  arm64-darwin-20
@@ -841,11 +830,10 @@ DEPENDENCIES
  activerecord-import
  acts-as-taggable-on
  administrate (>= 0.19.0)
-  administrate-field-active_storage (>= 1.0.1)
-  administrate-field-belongs_to_search (>= 0.9.0)
+  administrate-field-active_storage
  annotate
  attr_extras
-  audited (~> 5.4, >= 5.4.1)
+  audited (~> 5.3)
  aws-sdk-s3
  azure-storage-blob!
  barnes
@@ -862,7 +850,7 @@ DEPENDENCIES
  database_cleaner
  ddtrace
  debug (~> 1.8)
-  devise (>= 4.9.3)
+  devise
  devise-secure_password!
  devise_token_auth
  dotenv-rails
@@ -870,7 +858,7 @@ DEPENDENCIES
  elastic-apm
  email_reply_trimmer
  facebook-messenger
-  factory_bot_rails (>= 6.4.3)
+  factory_bot_rails
  faker
  fcm
  flag_shih_tzu
@@ -898,14 +886,13 @@ DEPENDENCIES
  line-bot-api
  liquid
  listen
-  lograge (~> 0.14.0)
+  lograge (~> 0.13.0)
  maxminddb
-  meta_request
  mock_redis
  neighbor
-  newrelic-sidekiq-metrics (>= 1.6.2)
+  newrelic-sidekiq-metrics
  newrelic_rpm
-  omniauth (>= 2.1.2)
+  omniauth
  omniauth-google-oauth2
  omniauth-oauth2
  omniauth-rails_csrf_protection (~> 1.0)
@@ -918,12 +905,12 @@ DEPENDENCIES
  pundit
  rack-attack (>= 6.7.0)
  rack-cors
-  rack-mini-profiler (>= 3.2.0)
+  rack-mini-profiler (>= 3.1.1)
  rack-timeout
-  rails (~> 7.0.8.0)
+  rails (~> 7.0.5.1)
  redis
  redis-namespace
-  responders (>= 3.1.1)
+  responders
  rest-client
  reverse_markdown
  rspec-rails
@@ -935,14 +922,14 @@ DEPENDENCIES
  scout_apm
  scss_lint
  seed_dump
-  sentry-rails (>= 5.14.0)
+  sentry-rails (>= 5.10.0)
  sentry-ruby
-  sentry-sidekiq (>= 5.14.0)
+  sentry-sidekiq (>= 5.10.0)
  shoulda-matchers
-  sidekiq (>= 7.1.3)
-  sidekiq-cron (>= 1.12.0)
+  sidekiq
+  sidekiq-cron
  simplecov (= 0.17.1)
-  slack-ruby-client (~> 2.2.0)
+  slack-ruby-client (~> 2.0.0)
  spring
  spring-watcher-listen
  squasher
@@ -956,7 +943,7 @@ DEPENDENCIES
  tzinfo-data
  uglifier
  valid_email2
-  web-console (>= 4.2.1)
+  web-console
  web-push
  webmock
  webpacker
@@ -1,4 +1,4 @@
 backend: bin/rails s -p 3000
-frontend: export NODE_OPTIONS=--openssl-legacy-provider && bin/webpack-dev-server
+frontend: bin/webpack-dev-server
 # https://github.com/mperham/sidekiq/issues/3090#issuecomment-389748695
 worker: dotenv bundle exec sidekiq -C config/sidekiq.yml
@@ -1,3 +1,3 @@
 backend: RAILS_ENV=test bin/rails s -p 5050
-frontend: export NODE_OPTIONS=--openssl-legacy-provider && bin/webpack-dev-server
-worker: RAILS_ENV=test dotenv bundle exec sidekiq -C config/sidekiq.yml
+frontend: bin/webpack-dev-server
+worker: dotenv RAILS_ENV=test bundle exec sidekiq -C config/sidekiq.yml
@@ -1,12 +1,10 @@
-<img src="https://user-images.githubusercontent.com/2246121/282256557-1570674b-d142-4198-9740-69404cc6a339.png#gh-light-mode-only" width="100%" alt="Chat dashboard dark mode"/>
-<img src="https://user-images.githubusercontent.com/2246121/282256632-87f6a01b-6467-4e0e-8a93-7bbf66d03a17.png#gh-dark-mode-only" width="100%" alt="Chat dashboard"/>
+<p align="center">
+  <img src="https://s3.us-west-2.amazonaws.com/gh-assets.chatwoot.com/brand.svg" alt="Woot-logo" width="240" />

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

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

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

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

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

@@ -118,4 +119,4 @@ Thanks goes to all these [wonderful people](https://www.chatwoot.com/docs/contri
 <a href="https://github.com/chatwoot/chatwoot/graphs/contributors"><img src="https://opencollective.com/chatwoot/contributors.svg?width=890&button=false" /></a>


-*Chatwoot* &copy; 2017-2024, Chatwoot Inc - Released under the MIT License.
+*Chatwoot* &copy; 2017-2023, Chatwoot Inc - Released under the MIT License.
@@ -1 +1 @@
-3.3.1
+2.17.0
@@ -1 +1 @@
-2.7.0
+2.3.0
@@ -60,9 +60,6 @@
  ],
  "stack": "heroku-20",
  "buildpacks": [
-    {
-      "url": "heroku/nodejs"
-    },
    {
      "url": "heroku/ruby"
    }
@@ -25,8 +25,7 @@
@import 'components/flashes';
@import 'components/form-actions';
@import 'components/main-content';
+@import 'components/navigation';
@import 'components/pagination';
@import 'components/search';
@import 'components/reports';
-
-@import 'custom_styles';
@@ -24,6 +24,14 @@ select {
  font-size: $base-font-size;
 }

+input,
+select,
+textarea {
+  display: block;
+  font-family: $base-font-family;
+  font-size: 16px;
+}
+
 [type="color"],
 [type="date"],
 [type="datetime-local"],
@@ -43,7 +51,6 @@ textarea {
  background-color: $white;
  border: $base-border;
  border-radius: $base-border-radius;
-  font-family: $base-font-family;
  padding: 0.5em;
  transition: border-color $base-duration $base-timing;
  width: 100%;
@@ -1,7 +1,7 @@
 html {
  background-color: $color-white;
  box-sizing: border-box;
-  font-size: 16px;
+  font-size: 10px;
  -webkit-font-smoothing: antialiased;
 }

@@ -4,8 +4,8 @@
  float: left;
  margin-bottom: $base-spacing;
  margin-top: 0.25em;
-  text-align: left;
-  width: calc(16% - 1rem);
+  text-align: right;
+  width: calc(15% - 1rem);
 }

 .preserve-whitespace {
@@ -16,8 +16,8 @@
 .attribute-data {
  float: left;
  margin-bottom: $base-spacing;
-  margin-left: 1.25rem;
-  width: calc(84% - 0.625rem);
+  margin-left: 2rem;
+  width: calc(85% - 1rem);
 }

 .attribute--nested {
@@ -10,7 +10,7 @@ input[type="submit"],
  color: $white;
  cursor: pointer;
  display: inline-block;
-  font-size: $font-size-small;
+  font-size: $font-size-default;
  -webkit-font-smoothing: antialiased;
  font-weight: $font-weight-medium;
  line-height: 1;
@@ -9,22 +9,22 @@

 .field-unit__label {
  float: left;
-  margin-left: 0.625rem;
+  margin-left: 1rem;
  text-align: right;
-  width: calc(15% - 0.625rem);
+  width: calc(15% - 1rem);
 }

 .field-unit__field {
  float: left;
-  margin-left: 1.25rem;
-  max-width: 31.15rem;
+  margin-left: 2rem;
+  max-width: 50rem;
  width: 100%;
 }

 .field-unit--nested {
  border: $base-border;
  margin-left: 7.5%;
-  max-width: 37.5rem;
+  max-width: 60rem;
  padding: $small-spacing;
  width: 100%;

@@ -1,3 +1,3 @@
 .form-actions {
-  margin-left: calc(15% + 1.25rem);
+  margin-left: calc(15% + 2rem);
 }
@@ -1,22 +1,13 @@
 .main-content {
  font-size: $font-size-default;
-  left: 21rem;
+  left: 23rem;
  position: absolute;
  right: 0;
  top: 0;
 }

 .main-content__body {
-  font-size: $font-size-small;
  padding: $space-two;
-
-  table {
-    font-size: $font-size-small;
-  }
-
-  form {
-    margin-top: $space-two;
-  }
 }

 .main-content__header {
@@ -24,12 +15,12 @@
  background-color: $color-white;
  border-bottom: 1px solid $color-border;
  display: flex;
-  min-height: 3.5rem;
+  min-height: 5.6rem;
  padding: $space-small $space-normal;
 }

 .main-content__page-title {
-  font-size: $font-size-medium;
+  font-size: $font-size-large;
  font-weight: $font-weight-medium;
  margin-right: auto;
 }
@@ -0,0 +1,78 @@
+.logo-brand {
+  margin-bottom: $space-normal;
+  padding: $space-normal $space-smaller $space-small;
+  text-align: center;
+}
+
+.navigation {
+  background: $white;
+  border-right: 1px solid $color-border;
+  display: flex;
+  flex-direction: column;
+  font-size: $font-size-default;
+  font-weight: $font-weight-medium;
+  height: 100%;
+  justify-content: flex-start;
+  left: 0;
+  margin: 0;
+  overflow: auto;
+  padding: $space-normal;
+  position: fixed;
+  top: 0;
+  width: 23rem;
+  z-index: 1023;
+
+  li {
+    align-items: center;
+    display: flex;
+
+    a {
+      color: $color-gray;
+      text-decoration: none;
+    }
+
+    i {
+      min-width: $space-medium;
+    }
+  }
+}
+
+.navigation__link {
+  background-color: transparent;
+  color: $color-gray;
+  display: block;
+  line-height: 1;
+  margin-bottom: $space-smaller;
+  padding: $space-one;
+
+  &:hover {
+    color: $blue;
+
+    a {
+      color: $blue;
+    }
+  }
+
+
+  &.navigation__link--active {
+    background-color: $color-background;
+    border-radius: $base-border-radius;
+    color: $blue;
+
+    a {
+      color: $blue;
+    }
+  }
+}
+
+.logout {
+  bottom: $space-normal;
+  left: $space-normal;
+  position: fixed;
+}
+
+.app-version {
+  color: $color-gray;
+  font-size: $font-size-small;
+  padding-top: $space-smaller;
+}
@@ -1,7 +1,7 @@
 .search {
  margin-left: auto;
-  margin-right: 1.25rem;
-  max-width: 27.5rem;
+  margin-right: 2rem;
+  max-width: 44rem;
  position: relative;
  width: 100%;
 }
@@ -1,24 +0,0 @@
-// custom styles for the dashboard
-
-.feature-cell {
-  background: $color-extra-light-blue;
-  border-radius: 10px;
-  float: left;
-  margin-left: 8px;
-  margin-top: 6px;
-  padding: 4px 12px;
-
-  .icon-container {
-    margin-right: 4px;
-
-  }
-
-  .value-container {
-    margin-left: 6px;
-  }
-}
-
-
-.feature-container {
-  max-width: 100rem;
-}
@@ -1,5 +1,5 @@
 // Typography
-$base-font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
+$base-font-family: PlusJakarta, 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;
@@ -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;
@@ -78,6 +78,11 @@ $conv-header-height: 4rem;
 $inbox-thumb-size: 4.8rem;


+// Spinner
+$spinkit-spinner-color: $color-white !default;
+$spinkit-spinner-margin: 0 0 0 1.6rem !default;
+$spinkit-size: 1.6rem !default;
+
 // Snackbar default
 $woot-snackbar-bg: #323232;
 $woot-snackbar-button: #ffeb3b;
@@ -25,9 +25,7 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
      build_contact_inbox
      build_message
    end
-  rescue Koala::Facebook::AuthenticationError => e
-    Rails.logger.warn("Facebook authentication error for inbox: #{@inbox.id} with error: #{e.message}")
-    Rails.logger.error e
+  rescue Koala::Facebook::AuthenticationError
    @inbox.channel.authorization_error!
  rescue StandardError => e
    ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
@@ -95,9 +93,6 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
      message_type: @message_type,
      content: response.content,
      source_id: response.identifier,
-      content_attributes: {
-        in_reply_to_external_id: response.in_reply_to_external_id
-      },
      sender: @outgoing_echo ? nil : @contact_inbox.contact
    }
  end
@@ -110,15 +105,11 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
    }
  end

-  # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/MethodLength
  def contact_params
    begin
      k = Koala::Facebook::API.new(@inbox.channel.page_access_token) if @inbox.facebook?
      result = k.get_object(@sender_id) || {}
-    rescue Koala::Facebook::AuthenticationError => e
-      Rails.logger.warn("Facebook authentication error for inbox: #{@inbox.id} with error: #{e.message}")
-      Rails.logger.error e
+    rescue Koala::Facebook::AuthenticationError
      @inbox.channel.authorization_error!
      raise
    rescue Koala::Facebook::ClientError => e
@@ -136,6 +127,4 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
    end
    process_contact_params_result(result)
  end
-  # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/MethodLength
 end
@@ -20,9 +20,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
    ActiveRecord::Base.transaction do
      build_message
    end
-  rescue Koala::Facebook::AuthenticationError => e
-    Rails.logger.warn("Instagram authentication error for inbox: #{@inbox.id} with error: #{e.message}")
-    Rails.logger.error e
+  rescue Koala::Facebook::AuthenticationError
    @inbox.channel.authorization_error!
    raise
  rescue StandardError => e
@@ -48,10 +46,6 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
    @outgoing_echo ? recipient_id : sender_id
  end

-  def message_is_unsupported?
-    message[:is_unsupported].present? && @messaging[:message][:is_unsupported] == true
-  end
-
  def sender_id
    @messaging[:sender][:id]
  end
@@ -82,10 +76,6 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
    message[:reply_to][:story] if message[:reply_to].present? && message[:reply_to][:story].present?
  end

-  def message_reply_attributes
-    message[:reply_to][:mid] if message[:reply_to].present? && message[:reply_to][:mid].present?
-  end
-
  def build_message
    return if @outgoing_echo && already_sent_from_chatwoot?
    return if message_content.blank? && all_unsupported_files?
@@ -122,20 +112,14 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
  end

  def message_params
-    params = {
+    {
      account_id: conversation.account_id,
      inbox_id: conversation.inbox_id,
      message_type: message_type,
      source_id: message_identifier,
      content: message_content,
-      sender: @outgoing_echo ? nil : contact,
-      content_attributes: {
-        in_reply_to_external_id: message_reply_attributes
-      }
+      sender: @outgoing_echo ? nil : contact
    }
-
-    params[:content_attributes][:is_unsupported] = true if message_is_unsupported?
-    params
  end

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

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

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

  private

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

@@ -149,8 +117,7 @@ class Messages::MessageBuilder
      content_type: @params[:content_type],
      items: @items,
      in_reply_to: @in_reply_to,
-      echo_id: @params[:echo_id],
-      source_id: @params[:source_id]
+      echo_id: @params[:echo_id]
    }.merge(external_created_at).merge(automation_rule_id).merge(campaign_id).merge(template_params)
  end
 end
@@ -1,5 +1,5 @@
 class NotificationBuilder
-  pattr_initialize [:notification_type!, :user!, :account!, :primary_actor!, :secondary_actor]
+  pattr_initialize [:notification_type!, :user!, :account!, :primary_actor!]

  def perform
    return unless user_subscribed_to_notification?
@@ -9,7 +9,7 @@ class NotificationBuilder

  private

-  def current_user
+  def secondary_actor
    Current.user
  end

@@ -29,8 +29,7 @@ class NotificationBuilder
      notification_type: notification_type,
      account: account,
      primary_actor: primary_actor,
-      # secondary_actor is secondary_actor if present, else current_user
-      secondary_actor: secondary_actor || current_user
+      secondary_actor: secondary_actor
    )
  end
 end
@@ -15,10 +15,7 @@ class V2::ReportBuilder
  end

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

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

  private

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

  private
@@ -10,18 +10,11 @@ class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
  def show; end

  def create
-    @agent_bot = Current.account.agent_bots.create!(permitted_params.except(:avatar_url))
-    process_avatar_from_url
+    @agent_bot = Current.account.agent_bots.create!(permitted_params)
  end

  def update
-    @agent_bot.update!(permitted_params.except(:avatar_url))
-    process_avatar_from_url
-  end
-
-  def avatar
-    @agent_bot.avatar.purge if @agent_bot.avatar.attached?
-    @agent_bot
+    @agent_bot.update!(permitted_params)
  end

  def destroy
@@ -37,10 +30,6 @@ class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
  end

  def permitted_params
-    params.permit(:name, :description, :outgoing_url, :avatar, :avatar_url, :bot_type, bot_config: [:csml_content])
-  end
-
-  def process_avatar_from_url
-    ::Avatar::AvatarFromUrlJob.perform_later(@agent_bot, params[:avatar_url]) if params[:avatar_url].present?
+    params.permit(:name, :description, :outgoing_url, :bot_type, bot_config: [:csml_content])
  end
 end
@@ -1,7 +1,7 @@
 class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
  before_action :portal
  before_action :check_authorization
-  before_action :fetch_article, except: [:index, :create, :reorder]
+  before_action :fetch_article, except: [:index, :create, :attach_file, :reorder]
  before_action :set_current_page, only: [:index]

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

    @articles = if list_params[:category_slug].present?
-                  @all_articles.order_by_position.page(@current_page)
+                  @all_articles.order_by_position.page(@current_page).per(50)
                else
                  @all_articles.order_by_updated_at.page(@current_page)
                end
@@ -36,6 +36,17 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
    head :ok
  end

+  def attach_file
+    file_blob = ActiveStorage::Blob.create_and_upload!(
+      key: nil,
+      io: params[:background_image].tempfile,
+      filename: params[:background_image].original_filename,
+      content_type: params[:background_image].content_type
+    )
+    file_blob.save!
+    render json: { file_url: url_for(file_blob) }
+  end
+
  def reorder
    Article.update_positions(params[:positions_hash])
    head :ok
@@ -20,6 +20,16 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
    @automation_rule
  end

+  def attach_file
+    file_blob = ActiveStorage::Blob.create_and_upload!(
+      key: nil,
+      io: params[:attachment].tempfile,
+      filename: params[:attachment].original_filename,
+      content_type: params[:attachment].content_type
+    )
+    render json: { blob_key: file_blob.key, blob_id: file_blob.id }
+  end
+
  def update
    ActiveRecord::Base.transaction do
      automation_rule_update
@@ -48,7 +48,7 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle

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

@@ -1,21 +0,0 @@
-class Api::V1::Accounts::ContactInboxesController < Api::V1::Accounts::BaseController
-  before_action :ensure_inbox
-
-  def filter
-    contact_inbox = @inbox.contact_inboxes.where(inbox_id: permitted_params[:inbox_id], source_id: permitted_params[:source_id])
-    return head :not_found if contact_inbox.empty?
-
-    @contact = contact_inbox.first.contact
-  end
-
-  private
-
-  def ensure_inbox
-    @inbox = Current.account.inboxes.find(permitted_params[:inbox_id])
-    authorize @inbox, :show?
-  end
-
-  def permitted_params
-    params.permit(:inbox_id, :source_id)
-  end
-end
@@ -18,19 +18,18 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController

  def index
    @contacts_count = resolved_contacts.count
-    @contacts = fetch_contacts(resolved_contacts)
+    @contacts = fetch_contacts_with_conversation_count(resolved_contacts)
  end

  def search
    render json: { error: 'Specify search string with parameter q' }, status: :unprocessable_entity if params[:q].blank? && return

    contacts = resolved_contacts.where(
-      'name ILIKE :search OR email ILIKE :search OR phone_number ILIKE :search OR contacts.identifier LIKE :search
-        OR contacts.additional_attributes->>\'company_name\' ILIKE :search',
+      'name ILIKE :search OR email ILIKE :search OR phone_number ILIKE :search OR contacts.identifier LIKE :search',
      search: "%#{params[:q].strip}%"
    )
    @contacts_count = contacts.count
-    @contacts = fetch_contacts(contacts)
+    @contacts = fetch_contacts_with_conversation_count(contacts)
  end

  def import
@@ -64,7 +63,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
    result = ::Contacts::FilterService.new(params.permit!, current_user).perform
    contacts = result[:contacts]
    @contacts_count = result[:count]
-    @contacts = fetch_contacts(contacts)
+    @contacts = fetch_contacts_with_conversation_count(contacts)
  end

  def contactable_inboxes
@@ -83,14 +82,14 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
      @contact = Current.account.contacts.new(permitted_params.except(:avatar_url))
      @contact.save!
      @contact_inbox = build_contact_inbox
-      process_avatar_from_url
+      process_avatar
    end
  end

  def update
    @contact.assign_attributes(contact_update_params)
    @contact.save!
-    process_avatar_from_url
+    process_avatar if permitted_params[:avatar].present? || permitted_params[:avatar_url].present?
  end

  def destroy
@@ -126,14 +125,17 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
    @current_page = params[:page] || 1
  end

-  def fetch_contacts(contacts)
-    contacts_with_avatar = filtrate(contacts)
-                           .includes([{ avatar_attachment: [:blob] }])
-                           .page(@current_page).per(RESULTS_PER_PAGE)
+  def fetch_contacts_with_conversation_count(contacts)
+    conversation_count_sub_query = 'SELECT COUNT(*) FROM "conversations" WHERE "conversations"."contact_id" = "contacts"."id"'
+    contacts_with_conversation_count = filtrate(contacts)
+                                       .select("contacts.*, (#{conversation_count_sub_query}) as conversations_count")
+                                       .group('contacts.id')
+                                       .includes([{ avatar_attachment: [:blob] }])
+                                       .page(@current_page).per(RESULTS_PER_PAGE)

-    return contacts_with_avatar.includes([{ contact_inboxes: [:inbox] }]) if @include_contact_inboxes
+    return contacts_with_conversation_count.includes([{ contact_inboxes: [:inbox] }]) if @include_contact_inboxes

-    contacts_with_avatar
+    contacts_with_conversation_count
  end

  def build_contact_inbox
@@ -174,7 +176,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
    @contact = Current.account.contacts.includes(contact_inboxes: [:inbox]).find(params[:id])
  end

-  def process_avatar_from_url
+  def process_avatar
    ::Avatar::AvatarFromUrlJob.perform_later(@contact, params[:avatar_url]) if params[:avatar_url].present?
  end

@@ -14,8 +14,7 @@ class Api::V1::Accounts::Conversations::AssignmentsController < Api::V1::Account

  def set_agent
    @agent = Current.account.users.find_by(id: params[:assignee_id])
-    @conversation.assignee = @agent
-    @conversation.save!
+    @conversation.update_assignee(@agent)
    render_agent
  end

@@ -18,15 +18,6 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
    end
  end

-  def retry
-    return if message.blank?
-
-    message.update!(status: :sent, content_attributes: {})
-    ::SendReplyJob.perform_later(message.id)
-  rescue StandardError => e
-    render_could_not_create_error(e.message)
-  end
-
  def translate
    return head :ok if already_translated_content_available?

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

  def toggle_status
-    # FIXME: move this logic into a service object
-    if pending_to_open_by_bot?
-      @conversation.bot_handoff!
-    elsif params[:status].present?
+    if params[:status]
      set_conversation_status
      @status = @conversation.save!
    else
      @status = @conversation.toggle_status
    end
-    assign_conversation if should_assign_conversation?
-  end
-
-  def pending_to_open_by_bot?
-    return false unless Current.user.is_a?(AgentBot)
-
-    @conversation.status == 'pending' && params[:status] == 'open'
-  end
-
-  def should_assign_conversation?
-    @conversation.status == 'open' && Current.user.is_a?(User) && Current.user&.agent?
+    assign_conversation if @conversation.status == 'open' && Current.user.is_a?(User) && Current.user&.agent?
  end

  def toggle_priority
@@ -123,8 +110,8 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
  end

  def assign_conversation
-    @conversation.assignee = current_user
-    @conversation.save!
+    @agent = Current.account.users.find(current_user.id)
+    @conversation.update_assignee(@agent)
  end

  def conversation
@@ -39,6 +39,16 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
    head :ok
  end

+  def attach_file
+    file_blob = ActiveStorage::Blob.create_and_upload!(
+      key: nil,
+      io: params[:attachment].tempfile,
+      filename: params[:attachment].original_filename,
+      content_type: params[:attachment].content_type
+    )
+    render json: { blob_key: file_blob.key, blob_id: file_blob.id }
+  end
+
  def execute
    ::MacrosExecutionJob.perform_later(@macro, conversation_ids: params[:conversation_ids], user: Current.user)

@@ -1,8 +1,7 @@
 class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseController
  RESULTS_PER_PAGE = 15
-  include DateRangeHelper

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

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

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

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

  def set_primary_actor
@@ -1,7 +1,7 @@
 class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
  include ::FileTypeHelper

-  before_action :fetch_portal, except: [:index, :create]
+  before_action :fetch_portal, except: [:index, :create, :attach_file]
  before_action :check_authorization
  before_action :set_current_page, only: [:index]

@@ -47,17 +47,22 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    head :ok
  end

-  def logo
-    @portal.logo.purge if @portal.logo.attached?
-    head :ok
-  end
-
  def process_attached_logo
    blob_id = params[:blob_id]
    blob = ActiveStorage::Blob.find_by(id: blob_id)
    @portal.logo.attach(blob)
  end

+  def attach_file
+    file_blob = ActiveStorage::Blob.create_and_upload!(
+      key: nil,
+      io: params[:logo].tempfile,
+      filename: params[:logo].original_filename,
+      content_type: params[:logo].content_type
+    )
+    render json: { blob_key: file_blob.key, blob_id: file_blob.id }
+  end
+
  private

  def fetch_portal
@@ -1,13 +0,0 @@
-class Api::V1::Accounts::UploadController < Api::V1::Accounts::BaseController
-  def create
-    file_blob = ActiveStorage::Blob.create_and_upload!(
-      key: nil,
-      io: params[:attachment].tempfile,
-      filename: params[:attachment].original_filename,
-      content_type: params[:attachment].content_type
-    )
-    file_blob.save!
-
-    render json: { file_url: url_for(file_blob), blob_key: file_blob.key, blob_id: file_blob.id }
-  end
-end
@@ -1,15 +1,7 @@
 class Api::V1::Integrations::WebhooksController < ApplicationController
  def create
-    builder = Integrations::Slack::IncomingMessageBuilder.new(permitted_params)
+    builder = Integrations::Slack::IncomingMessageBuilder.new(params)
    response = builder.perform
    render json: response
  end
-
-  private
-
-  # TODO: This is a temporary solution to permit all params for slack unfurling job.
-  # We should only permit the params that we use. Handle all the params based on events and send it to the respective services.
-  def permitted_params
-    params.permit!
-  end
 end
@@ -79,9 +79,6 @@ class Api::V1::Widget::BaseController < ApplicationController
      sender: @contact,
      content: permitted_params[:message][:content],
      inbox_id: conversation.inbox_id,
-      content_attributes: {
-        in_reply_to: permitted_params[:message][:reply_to]
-      },
      echo_id: permitted_params[:message][:echo_id],
      message_type: :incoming
    }
@@ -1,6 +1,5 @@
 class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
  include Events::Types
-  before_action :render_not_found_if_empty, only: [:toggle_typing, :toggle_status, :set_custom_attributes, :destroy_custom_attributes]

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

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

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

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

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

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

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

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

  def set_message
@@ -14,7 +14,7 @@ module AccessTokenAuthHelper
    render_unauthorized('Invalid Access Token') && return if @access_token.blank?

    @resource = @access_token.owner
-    Current.user = @resource if [User, AgentBot].include?(@resource.class)
+    Current.user = @resource if current_user.is_a?(User)
  end

  def validate_bot_access_token!
@@ -8,7 +8,7 @@ module EnsureCurrentAccountHelper

  def ensure_current_account
    account = Account.find(params[:account_id])
-    render_unauthorized('Account is suspended') and return unless account.active?
+    ensure_account_is_active?(account)

    if current_user
      account_accessible_for_user?(account)
@@ -27,4 +27,8 @@ module EnsureCurrentAccountHelper
  def account_accessible_for_bot?(account)
    render_unauthorized('You are not authorized to access this account') unless @resource.agent_bot_inboxes.find_by(account_id: account.id)
  end
+
+  def ensure_account_is_active?(account)
+    render_unauthorized('Account is suspended') unless account.active?
+  end
 end
@@ -9,14 +9,11 @@ module RequestExceptionHandler

  def handle_with_exception
    yield
-  rescue ActiveRecord::RecordNotFound => e
-    log_handled_error(e)
+  rescue ActiveRecord::RecordNotFound
    render_not_found_error('Resource could not be found')
-  rescue Pundit::NotAuthorizedError => e
-    log_handled_error(e)
+  rescue Pundit::NotAuthorizedError
    render_unauthorized('You are not authorized to do this action')
  rescue ActionController::ParameterMissing => e
-    log_handled_error(e)
    render_could_not_create_error(e.message)
  ensure
    # to address the thread variable leak issues in Puma/Thin webserver
@@ -44,7 +41,6 @@ module RequestExceptionHandler
  end

  def render_record_invalid(exception)
-    log_handled_error(exception)
    render json: {
      message: exception.record.errors.full_messages.join(', '),
      attributes: exception.record.errors.attribute_names
@@ -52,11 +48,6 @@ module RequestExceptionHandler
  end

  def render_error_response(exception)
-    log_handled_error(exception)
    render json: exception.to_hash, status: exception.http_status
  end
-
-  def log_handled_error(exception)
-    logger.info("Handled error: #{exception.inspect}")
-  end
 end
@@ -9,15 +9,13 @@ class Platform::Api::V1::AgentBotsController < PlatformController
  def show; end

  def create
-    @resource = AgentBot.new(agent_bot_params.except(:avatar_url))
+    @resource = AgentBot.new(agent_bot_params)
    @resource.save!
-    process_avatar_from_url
    @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
  end

  def update
-    @resource.update!(agent_bot_params.except(:avatar_url))
-    process_avatar_from_url
+    @resource.update!(agent_bot_params)
  end

  def destroy
@@ -25,11 +23,6 @@ class Platform::Api::V1::AgentBotsController < PlatformController
    head :ok
  end

-  def avatar
-    @resource.avatar.purge if @resource.avatar.attached?
-    @resource
-  end
-
  private

  def set_resource
@@ -37,10 +30,6 @@ class Platform::Api::V1::AgentBotsController < PlatformController
  end

  def agent_bot_params
-    params.permit(:name, :description, :account_id, :outgoing_url, :avatar, :avatar_url)
-  end
-
-  def process_avatar_from_url
-    ::Avatar::AvatarFromUrlJob.perform_later(@resource, params[:avatar_url]) if params[:avatar_url].present?
+    params.permit(:name, :description, :account_id, :outgoing_url)
  end
 end
@@ -23,7 +23,6 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
  def update_last_seen
    @conversation.contact_last_seen_at = DateTime.now.utc
    @conversation.save!
-    ::Conversations::UpdateMessageStatusJob.perform_later(@conversation.id, @conversation.contact_last_seen_at)
    head :ok
  end

@@ -34,7 +33,7 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
  end

  def create_conversation
-    ConversationBuilder.new(params: conversation_params, contact_inbox: @contact_inbox).perform
+    ::Conversation.create!(conversation_params)
  end

  def trigger_typing_event(event)
@@ -42,6 +41,11 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
  end

  def conversation_params
-    params.permit(custom_attributes: {})
+    {
+      account_id: @contact_inbox.contact.account_id,
+      inbox_id: @contact_inbox.inbox_id,
+      contact_id: @contact_inbox.contact_id,
+      contact_inbox_id: @contact_inbox.id
+    }
  end
 end
@@ -39,8 +39,12 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
    )
  end

+  def portal
+    @portal ||= Portal.find_by!(slug: permitted_params[:slug], archived: false)
+  end
+
  def list_params
-    params.permit(:query, :locale, :sort, :status)
+    params.permit(:query, :locale, :sort)
  end

  def permitted_params
@@ -1,8 +1,6 @@
 class Public::Api::V1::Portals::BaseController < PublicController
  before_action :show_plain_layout
-  before_action :set_color_scheme
  around_action :set_locale
-  after_action :allow_iframe_requests

  private

@@ -10,14 +8,6 @@ class Public::Api::V1::Portals::BaseController < PublicController
    @is_plain_layout_enabled = params[:show_plain_layout] == 'true'
  end

-  def set_color_scheme
-    @theme_from_params = params[:theme] if %w[dark light].include?(params[:theme])
-  end
-
-  def portal
-    @portal ||= Portal.find_by!(slug: params[:slug], archived: false)
-  end
-
  def set_locale(&)
    switch_locale_with_portal(&) if params[:locale].present?
    switch_locale_with_article(&) if params[:article_slug].present?
@@ -40,8 +30,6 @@ class Public::Api::V1::Portals::BaseController < PublicController

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

    @locale = if article.category.present?
                article.category.locale
@@ -51,13 +39,4 @@ class Public::Api::V1::Portals::BaseController < PublicController

    I18n.with_locale(@locale, &)
  end
-
-  def allow_iframe_requests
-    response.headers.delete('X-Frame-Options') if @is_plain_layout_enabled
-  end
-
-  def render_404
-    portal
-    render 'public/api/v1/portals/error/404', status: :not_found
-  end
 end
@@ -13,9 +13,10 @@ class Public::Api::V1::Portals::CategoriesController < Public::Api::V1::Portals:
  private

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

-    Rails.logger.info "Category: not found for slug: #{params[:category_slug]}"
-    render_404 && return if @category.blank?
+  def portal
+    @portal ||= Portal.find_by!(slug: params[:slug], archived: false)
  end
 end
@@ -1,27 +0,0 @@
-class SlackUploadsController < ApplicationController
-  include Rails.application.routes.url_helpers
-  before_action :set_blob, only: [:show]
-
-  def show
-    if @blob
-      redirect_to blob_url
-    else
-      redirect_to avatar_url
-    end
-  end
-
-  private
-
-  def set_blob
-    @blob = ActiveStorage::Blob.find_by(key: params[:blob_key])
-  end
-
-  def blob_url
-    url_for(@blob.representation(resize_to_fill: [250, nil]))
-  end
-
-  def avatar_url
-    base_url = ENV.fetch('FRONTEND_URL', nil)
-    "#{base_url}/integrations/slack/#{params[:sender_type]}.png"
-  end
-end
@@ -1,38 +1,21 @@
 class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
-  before_action :set_config
-  before_action :allowed_configs
  def show
+    @allowed_configs = %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET]
    # ref: https://github.com/rubocop/rubocop/issues/7767
    # rubocop:disable Style/HashTransformValues
-    @app_config = InstallationConfig.where(name: @allowed_configs)
-                                    .pluck(:name, :serialized_value)
-                                    .map { |name, serialized_value| [name, serialized_value['value']] }
-                                    .to_h
+    @fb_config = InstallationConfig.where(name: @allowed_configs)
+                                   .pluck(:name, :serialized_value)
+                                   .map { |name, serialized_value| [name, serialized_value['value']] }
+                                   .to_h
    # rubocop:enable Style/HashTransformValues
  end

  def create
    params['app_config'].each do |key, value|
-      next unless @allowed_configs.include?(key)
-
      i = InstallationConfig.where(name: key).first_or_create(value: value, locked: false)
      i.value = value
      i.save!
    end
-    # rubocop:disable Rails/I18nLocaleTexts
-    redirect_to super_admin_settings_path, notice: 'App Configs updated successfully'
-    # rubocop:enable Rails/I18nLocaleTexts
-  end
-
-  private
-
-  def set_config
-    @config = params[:config]
-  end
-
-  def allowed_configs
-    @allowed_configs = %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET]
+    redirect_to super_admin_app_config_url
  end
 end
-
-SuperAdmin::AppConfigsController.prepend_mod_with('SuperAdmin::AppConfigsController')
@@ -20,13 +20,4 @@ class SuperAdmin::ApplicationController < Administrate::ApplicationController
      params.fetch(resource_name, {}).fetch(:direction, 'desc')
    )
  end
-
-  private
-
-  def invalid_action_perfomed
-    # rubocop:disable Rails/I18nLocaleTexts
-    flash[:error] = 'Invalid action performed'
-    # rubocop:enable Rails/I18nLocaleTexts
-    redirect_back(fallback_location: root_path)
-  end
 end
@@ -27,8 +27,7 @@ class SuperAdmin::Devise::SessionsController < Devise::SessionsController

    true
  rescue StandardError => e
-    Rails.logger.error e.message
-    @error_message = 'Invalid credentials. Please try again.'
+    @error_message = e.message
    false
  end
 end
@@ -1,5 +1,4 @@
 class SuperAdmin::InstallationConfigsController < SuperAdmin::ApplicationController
-  rescue_from ActiveRecord::RecordNotUnique, :with => :invalid_action_perfomed
  # Overwrite any of the RESTful controller actions to implement custom behavior
  # For example, you may want to send an email after a foo is updated.
  #
@@ -6,7 +6,6 @@ class SuperAdmin::InstanceStatusesController < SuperAdmin::ApplicationController
    postgres_status
    redis_metrics
    chatwoot_edition
-    instance_meta
  end

  def chatwoot_edition
@@ -19,10 +18,6 @@ class SuperAdmin::InstanceStatusesController < SuperAdmin::ApplicationController
                                   end
  end

-  def instance_meta
-    @metrics['Database Migrations'] = ActiveRecord::Base.connection.migration_context.needs_migration? ? 'pending' : 'completed'
-  end
-
  def chatwoot_version
    @metrics['Chatwoot version'] = Chatwoot.config[:version]
  end
@@ -1,10 +0,0 @@
-class SuperAdmin::SettingsController < SuperAdmin::ApplicationController
-  def show; end
-
-  def refresh
-    Internal::CheckNewVersionsJob.perform_now
-    # rubocop:disable Rails/I18nLocaleTexts
-    redirect_to super_admin_settings_path, notice: 'Instance status refreshed'
-    # rubocop:enable Rails/I18nLocaleTexts
-  end
-end
@@ -1,21 +0,0 @@
-class Twilio::DeliveryStatusController < ApplicationController
-  def create
-    ::Twilio::DeliveryStatusService.new(params: permitted_params).perform
-
-    head :no_content
-  end
-
-  private
-
-  def permitted_params
-    params.permit(
-      :AccountSid,
-      :From,
-      :MessageSid,
-      :MessagingServiceSid,
-      :MessageStatus,
-      :ErrorCode,
-      :ErrorMessage
-    )
-  end
-end
@@ -30,7 +30,11 @@ class AccessTokenDashboard < Administrate::BaseDashboard
  # SHOW_PAGE_ATTRIBUTES
  # an array of attributes that will be displayed on the model's show page.
  SHOW_PAGE_ATTRIBUTES = %i[
+    owner
+    id
    token
+    created_at
+    updated_at
  ].freeze

  # FORM_ATTRIBUTES
@@ -18,8 +18,8 @@ class AccountDashboard < Administrate::BaseDashboard
                               end

  ATTRIBUTE_TYPES = {
-    id: Field::Number.with_options(searchable: true),
-    name: Field::String.with_options(searchable: true),
+    id: Field::Number,
+    name: Field::String,
    created_at: Field::DateTime,
    updated_at: Field::DateTime,
    users: CountField,
@@ -8,9 +8,9 @@ class AccountUserDashboard < Administrate::BaseDashboard
  # which determines how the attribute is displayed
  # on pages throughout the dashboard.
  ATTRIBUTE_TYPES = {
-    account: Field::BelongsToSearch.with_options(class_name: 'Account', searchable: true, searchable_field: [:name, :id], order: 'id DESC'),
-    user: Field::BelongsToSearch.with_options(class_name: 'User', searchable: true, searchable_field: [:name, :email, :id], order: 'id DESC'),
-    inviter: Field::BelongsToSearch.with_options(class_name: 'User', searchable: true, searchable_field: [:name, :email, :id], order: 'id DESC'),
+    account: Field::BelongsTo.with_options(searchable: true, searchable_field: 'name', order: 'id DESC'),
+    user: Field::BelongsTo.with_options(searchable: true, searchable_field: 'name', order: 'id DESC'),
+    inviter: Field::BelongsTo.with_options(class_name: 'User', searchable: true, searchable_field: 'name'),
    id: Field::Number,
    role: Field::Select.with_options(collection: AccountUser.roles.keys),
    created_at: Field::DateTime,
@@ -46,7 +46,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
    name
    description
    outgoing_url
-    access_token
  ].freeze

  # FORM_ATTRIBUTES
@@ -32,7 +32,6 @@ class PlatformAppDashboard < Administrate::BaseDashboard
    name
    created_at
    updated_at
-    access_token
  ].freeze

  # FORM_ATTRIBUTES
@@ -9,7 +9,7 @@ class UserDashboard < Administrate::BaseDashboard
  # on pages throughout the dashboard.
  ATTRIBUTE_TYPES = {
    account_users: Field::HasMany,
-    id: Field::Number.with_options(searchable: true),
+    id: Field::Number,
    avatar_url: AvatarField,
    avatar: Field::ActiveStorage.with_options(
      destroy_url: proc do |_namespace, _resource, attachment|
@@ -28,16 +28,15 @@ class UserDashboard < Administrate::BaseDashboard
    confirmed_at: Field::DateTime,
    confirmation_sent_at: Field::DateTime,
    unconfirmed_email: Field::String,
-    name: Field::String.with_options(searchable: true),
+    name: Field::String,
    display_name: Field::String,
-    email: Field::String.with_options(searchable: true),
+    email: Field::String,
    tokens: Field::String.with_options(searchable: false),
    created_at: Field::DateTime,
    updated_at: Field::DateTime,
    pubsub_token: Field::String,
    type: Field::Select.with_options(collection: [nil, 'SuperAdmin']),
-    accounts: CountField,
-    access_token: Field::HasOne
+    accounts: CountField
  }.freeze

  # COLLECTION_ATTRIBUTES
@@ -68,7 +67,6 @@ class UserDashboard < Administrate::BaseDashboard
    updated_at
    confirmed_at
    account_users
-    access_token
  ].freeze

  # FORM_ATTRIBUTES
@@ -18,9 +18,4 @@ class ContactDrop < BaseDrop
  def last_name
    @obj.try(:name).try(:split).try(:last).try(:capitalize) if @obj.try(:name).try(:split).try(:size) > 1
  end
-
-  def custom_attribute
-    custom_attributes = @obj.try(:custom_attributes) || {}
-    custom_attributes.transform_keys(&:to_s)
-  end
 end
@@ -19,11 +19,6 @@ class ConversationDrop < BaseDrop
    end
  end

-  def custom_attribute
-    custom_attributes = @obj.try(:custom_attributes) || {}
-    custom_attributes.transform_keys(&:to_s)
-  end
-
  private

  def message_sender_name(sender)
@@ -3,21 +3,13 @@ class ConversationFinder

  DEFAULT_STATUS = 'open'.freeze
  SORT_OPTIONS = {
-    'last_activity_at_asc' => %w[sort_on_last_activity_at asc],
-    'last_activity_at_desc' => %w[sort_on_last_activity_at desc],
-    'created_at_asc' => %w[sort_on_created_at asc],
-    'created_at_desc' => %w[sort_on_created_at desc],
-    'priority_asc' => %w[sort_on_priority asc],
-    'priority_desc' => %w[sort_on_priority desc],
-    'waiting_since_asc' => %w[sort_on_waiting_since asc],
-    'waiting_since_desc' => %w[sort_on_waiting_since desc],
-
-    # To be removed in v3.5.0
-    'latest' => %w[sort_on_last_activity_at desc],
-    'sort_on_created_at' => %w[sort_on_created_at asc],
-    'sort_on_priority' => %w[sort_on_priority desc],
-    'sort_on_waiting_since' => %w[sort_on_waiting_since asc]
+    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'
  }.with_indifferent_access
+
  # assumptions
  # inbox_id if not given, take from all conversations, else specific to inbox
  # assignee_type if not given, take 'all'
@@ -167,8 +159,7 @@ class ConversationFinder
    @conversations = @conversations.includes(
      :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox
    )
-
-    sort_by, sort_order = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['last_activity_at_desc']
-    @conversations.send(sort_by, sort_order).page(current_page).per(ENV.fetch('CONVERSATION_RESULTS_PER_PAGE', '25').to_i)
+    sort_by = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['latest']
+    @conversations.send(sort_by).page(current_page)
  end
 end
@@ -1,71 +0,0 @@
-module PortalHelper
-  def generate_portal_bg_color(portal_color, theme)
-    base_color = theme == 'dark' ? 'black' : 'white'
-    "color-mix(in srgb, #{portal_color} 20%, #{base_color})"
-  end
-
-  def generate_portal_bg(portal_color, theme)
-    bg_image = theme == 'dark' ? 'hexagon-dark.svg' : 'hexagon-light.svg'
-    "url(/assets/images/hc/#{bg_image}) #{generate_portal_bg_color(portal_color, theme)}"
-  end
-
-  def generate_gradient_to_bottom(theme)
-    base_color = theme == 'dark' ? '#151718' : 'white'
-    "linear-gradient(to bottom, transparent, #{base_color})"
-  end
-
-  def generate_portal_hover_color(portal_color, theme)
-    base_color = theme == 'dark' ? '#1B1B1B' : '#F9F9F9'
-    "color-mix(in srgb, #{portal_color} 5%, #{base_color})"
-  end
-
-  def language_name(locale)
-    language_map = YAML.load_file(Rails.root.join('config/languages/language_map.yml'))
-    language_map[locale] || locale
-  end
-
-  def theme_query_string(theme)
-    theme.present? && theme != 'system' ? "?theme=#{theme}" : ''
-  end
-
-  def generate_home_link(portal_slug, portal_locale, theme, is_plain_layout_enabled)
-    if is_plain_layout_enabled
-      "/hc/#{portal_slug}/#{portal_locale}#{theme_query_string(theme)}"
-    else
-      "/hc/#{portal_slug}/#{portal_locale}"
-    end
-  end
-
-  def generate_category_link(params)
-    portal_slug = params[:portal_slug]
-    category_locale = params[:category_locale]
-    category_slug = params[:category_slug]
-    theme = params[:theme]
-    is_plain_layout_enabled = params[:is_plain_layout_enabled]
-
-    if is_plain_layout_enabled
-      "/hc/#{portal_slug}/#{category_locale}/categories/#{category_slug}#{theme_query_string(theme)}"
-    else
-      "/hc/#{portal_slug}/#{category_locale}/categories/#{category_slug}"
-    end
-  end
-
-  def generate_article_link(portal_slug, article_slug, theme, is_plain_layout_enabled)
-    if is_plain_layout_enabled
-      "/hc/#{portal_slug}/articles/#{article_slug}#{theme_query_string(theme)}"
-    else
-      "/hc/#{portal_slug}/articles/#{article_slug}"
-    end
-  end
-
-  def render_category_content(content)
-    ChatwootMarkdownRenderer.new(content).render_markdown_to_plain_text
-  end
-
-  def thumbnail_bg_color(username)
-    colors = ['#6D95BA', '#A4C3C3', '#E19191']
-    return colors.sample if username.blank?
-
-    colors[username.length % colors.size]
-  end
-end
@@ -1,13 +1,13 @@
 <template>
  <div
-    v-if="!authUIFlags.isFetching && !accountUIFlags.isFetchingItem"
+    v-if="!authUIFlags.isFetching"
    id="app"
-    class="app-wrapper h-full flex-grow-0 min-h-0 w-full"
+    class="app-wrapper app-root"
    :class="{ 'app-rtl--wrapper': isRTLView }"
    :dir="isRTLView ? 'rtl' : 'ltr'"
  >
    <update-banner :latest-chatwoot-version="latestChatwootVersion" />
-    <template v-if="currentAccountId">
+    <template v-if="!accountUIFlags.isFetchingItem && currentAccountId">
      <payment-pending-banner />
      <upgrade-banner />
    </template>
@@ -26,14 +26,14 @@

 <script>
 import { mapGetters } from 'vuex';
-import AddAccountModal from '../dashboard/components/layout/sidebarComponents/AddAccountModal.vue';
+import AddAccountModal from '../dashboard/components/layout/sidebarComponents/AddAccountModal';
 import LoadingState from './components/widgets/LoadingState.vue';
-import NetworkNotification from './components/NetworkNotification.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.vue';
+import WootSnackbarBox from './components/SnackbarContainer';
 import rtlMixin from 'shared/mixins/rtlMixin';
 import { setColorTheme } from './helper/themeHelper';
 import {
@@ -111,8 +111,10 @@ export default {
      this.$store.dispatch('setActiveAccount', {
        accountId: this.currentAccountId,
      });
-      const { locale, latest_chatwoot_version: latestChatwootVersion } =
-        this.getAccount(this.currentAccountId);
+      const {
+        locale,
+        latest_chatwoot_version: latestChatwootVersion,
+      } = this.getAccount(this.currentAccountId);
      const { pubsub_token: pubsubToken } = this.currentUser || {};
      this.setLocale(locale);
      this.updateRTLDirectionView(locale);
@@ -15,8 +15,9 @@ class ApiClient {

  // eslint-disable-next-line class-methods-use-this
  get accountIdFromRoute() {
-    const isInsideAccountScopedURLs =
-      window.location.pathname.includes('/app/accounts');
+    const isInsideAccountScopedURLs = window.location.pathname.includes(
+      '/app/accounts'
+    );

    if (isInsideAccountScopedURLs) {
      return window.location.pathname.split('/')[3];
@@ -84,11 +84,6 @@ export default {
    return axios.delete(endPoints('deleteAvatar').url);
  },

-  resetPassword({ email }) {
-    const urlData = endPoints('resetPassword');
-    return axios.post(urlData.url, { email });
-  },
-
  setActiveAccount({ accountId }) {
    const urlData = endPoints('setActiveAccount');
    return axios.put(urlData.url, {
@@ -9,6 +9,14 @@ class AutomationsAPI extends ApiClient {
  clone(automationId) {
    return axios.post(`${this.url}/${automationId}/clone`);
  }
+
+  attachment(file) {
+    return axios.post(`${this.url}/attach_file`, file, {
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+    });
+  }
 }

 export default new AutomationsAPI();
@@ -53,7 +53,6 @@ class ContactAPI extends ApiClient {
    return axios.get(requestURL);
  }

-  // eslint-disable-next-line default-param-last
  filter(page = 1, sortAttr = 'name', queryPayload) {
    let requestURL = `${this.url}/filter?${buildContactParams(page, sortAttr)}`;
    return axios.post(requestURL, queryPayload);
@@ -1,5 +1,6 @@
 import accountAPI from '../account';
 import ApiClient from '../../ApiClient';
+import describeWithAPIMock from '../../specs/apiSpecHelper';

 describe('#enterpriseAccountAPI', () => {
  it('creates correct instance', () => {
@@ -12,33 +13,17 @@ describe('#enterpriseAccountAPI', () => {
    expect(accountAPI).toHaveProperty('checkout');
  });

-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#checkout', () => {
      accountAPI.checkout();
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/enterprise/api/v1/checkout'
      );
    });

    it('#subscription', () => {
      accountAPI.subscription();
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/enterprise/api/v1/subscription'
      );
    });
@@ -1,7 +1,6 @@
 /* global axios */

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

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

  getArticle({ id, portalSlug }) {
@@ -65,6 +47,20 @@ class ArticlesAPI extends PortalsAPI {
    return axios.delete(`${this.url}/${portalSlug}/articles/${articleId}`);
  }

+  uploadImage({ portalSlug, file }) {
+    let formData = new FormData();
+    formData.append('background_image', file);
+    return axios.post(
+      `${this.url}/${portalSlug}/articles/attach_file`,
+      formData,
+      {
+        headers: {
+          'Content-Type': 'multipart/form-data',
+        },
+      }
+    );
+  }
+
  reorderArticles({ portalSlug, reorderedGroup, categorySlug }) {
    return axios.post(`${this.url}/${portalSlug}/articles/reorder`, {
      positions_hash: reorderedGroup,
@@ -17,10 +17,6 @@ class PortalsAPI extends ApiClient {
  deletePortal(portalSlug) {
    return axios.delete(`${this.url}/${portalSlug}`);
  }
-
-  deleteLogo(portalSlug) {
-    return axios.delete(`${this.url}/${portalSlug}/logo`);
-  }
 }

 export default PortalsAPI;
@@ -26,13 +26,9 @@ export const buildCreatePayload = ({
    payload.append('echo_id', echoId);
    payload.append('cc_emails', ccEmails);
    payload.append('bcc_emails', bccEmails);
-
    if (toEmails) {
      payload.append('to_emails', toEmails);
    }
-    if (contentAttributes) {
-      payload.append('content_attributes', JSON.stringify(contentAttributes));
-    }
  } else {
    payload = {
      content: message,
@@ -86,12 +82,6 @@ class MessageApi extends ApiClient {
    return axios.delete(`${this.url}/${conversationID}/messages/${messageId}`);
  }

-  retry(conversationID, messageId) {
-    return axios.post(
-      `${this.url}/${conversationID}/messages/${messageId}/retry`
-    );
-  }
-
  getPreviousMessages({ conversationId, after, before }) {
    const params = { before };
    if (after && Number(after) !== Number(before)) {
@@ -31,7 +31,6 @@ class ReportsAPI extends ApiClient {
    });
  }

-  // eslint-disable-next-line default-param-last
  getSummary(since, until, type = 'account', id, groupBy, businessHours) {
    return axios.get(`${this.url}/summary`, {
      params: {
@@ -1,5 +1,6 @@
 import accountAPI from '../account';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';

 describe('#accountAPI', () => {
  it('creates correct instance', () => {
@@ -12,28 +13,12 @@ describe('#accountAPI', () => {
    expect(accountAPI).toHaveProperty('createAccount');
  });

-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#createAccount', () => {
      accountAPI.createAccount({
        name: 'Chatwoot',
      });
-      expect(axiosMock.post).toHaveBeenCalledWith('/api/v1/accounts', {
+      expect(context.axiosMock.post).toHaveBeenCalledWith('/api/v1/accounts', {
        name: 'Chatwoot',
      });
    });
@@ -1,5 +1,6 @@
 import accountActionsAPI from '../accountActions';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';

 describe('#ContactsAPI', () => {
  it('creates correct instance', () => {
@@ -7,26 +8,10 @@ describe('#ContactsAPI', () => {
    expect(accountActionsAPI).toHaveProperty('merge');
  });

-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#merge', () => {
      accountActionsAPI.merge(1, 2);
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/actions/contact_merge',
        {
          base_contact_id: 1,
@@ -0,0 +1,27 @@
+function apiSpecHelper() {
+  beforeEach(() => {
+    this.originalAxios = window.axios;
+    this.axiosMock = {
+      post: jest.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
+    };
+    window.axios = this.axiosMock;
+  });
+
+  afterEach(() => {
+    window.axios = this.originalAxios;
+  });
+}
+// https://stackoverflow.com/a/59344023/3901856
+const sharedWrapper = describe('sharedWrapper', () => {});
+export default function describeWithAPIMock(skillName, testFn) {
+  return describe(skillName, function configureContext() {
+    function Context() {}
+    Context.prototype = sharedWrapper.ctx;
+    this.ctx = new Context();
+    apiSpecHelper.call(this);
+    testFn.call(this, this);
+  });
+}
@@ -1,5 +1,6 @@
 import articlesAPI from '../helpCenter/articles';
 import ApiClient from 'dashboard/api/helpCenter/portals';
+import describeWithAPIMock from './apiSpecHelper';

 describe('#PortalAPI', () => {
  it('creates correct instance', () => {
@@ -11,114 +12,39 @@ describe('#PortalAPI', () => {
    expect(articlesAPI).toHaveProperty('delete');
    expect(articlesAPI).toHaveProperty('getArticles');
  });
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#getArticles', () => {
      articlesAPI.getArticles({
        pageNumber: 1,
        portalSlug: 'room-rental',
        locale: 'en-US',
        status: 'published',
-        authorId: '1',
+        author_id: '1',
      });
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/portals/room-rental/articles?page=1&locale=en-US&status=published&author_id=1'
      );
    });
  });
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#getArticle', () => {
      articlesAPI.getArticle({
        id: 1,
        portalSlug: 'room-rental',
      });
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/portals/room-rental/articles/1'
      );
    });
  });
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('#searchArticles', () => {
-      articlesAPI.searchArticles({
-        query: 'test',
-        portalSlug: 'room-rental',
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/portals/room-rental/articles?query=test'
-      );
-    });
-  });
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#updateArticle', () => {
      articlesAPI.updateArticle({
        articleId: 1,
        portalSlug: 'room-rental',
        articleObj: { title: 'Update shipping address' },
      });
-      expect(axiosMock.patch).toHaveBeenCalledWith(
+      expect(context.axiosMock.patch).toHaveBeenCalledWith(
        '/api/v1/portals/room-rental/articles/1',
        {
          title: 'Update shipping address',
@@ -126,29 +52,13 @@ describe('#PortalAPI', () => {
      );
    });
  });
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#deleteArticle', () => {
      articlesAPI.deleteArticle({
        articleId: 1,
        portalSlug: 'room-rental',
      });
-      expect(axiosMock.delete).toHaveBeenCalledWith(
+      expect(context.axiosMock.delete).toHaveBeenCalledWith(
        '/api/v1/portals/room-rental/articles/1'
      );
    });
@@ -1,30 +1,18 @@
 import assignableAgentsAPI from '../assignableAgents';
+import describeWithAPIMock from './apiSpecHelper';

 describe('#AssignableAgentsAPI', () => {
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#getAssignableAgents', () => {
      assignableAgentsAPI.get([1]);
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/assignable_agents', {
-        params: {
-          inbox_ids: [1],
-        },
-      });
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/assignable_agents',
+        {
+          params: {
+            inbox_ids: [1],
+          },
+        }
+      );
    });
  });
 });
@@ -1,5 +1,6 @@
 import fbChannel from '../../channel/fbChannel';
 import ApiClient from '../../ApiClient';
+import describeWithAPIMock from '../apiSpecHelper';

 describe('#FBChannel', () => {
  it('creates correct instance', () => {
@@ -10,26 +11,10 @@ describe('#FBChannel', () => {
    expect(fbChannel).toHaveProperty('update');
    expect(fbChannel).toHaveProperty('delete');
  });
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#create', () => {
      fbChannel.create({ omniauthToken: 'ASFM131CSF@#@$', appId: 'chatwoot' });
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/callbacks/register_facebook_page',
        {
          omniauthToken: 'ASFM131CSF@#@$',
@@ -42,7 +27,7 @@ describe('#FBChannel', () => {
        omniauthToken: 'ASFM131CSF@#@$',
        inboxId: 1,
      });
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/callbacks/reauthorize_page',
        {
          omniauth_token: 'ASFM131CSF@#@$',
@@ -1,5 +1,6 @@
 import contactAPI, { buildContactParams } from '../contacts';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';

 describe('#ContactsAPI', () => {
  it('creates correct instance', () => {
@@ -14,67 +15,56 @@ describe('#ContactsAPI', () => {
    expect(contactAPI).toHaveProperty('destroyAvatar');
  });

-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#get', () => {
      contactAPI.get(1, 'name', 'customer-support');
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/contacts?include_contact_inboxes=false&page=1&sort=name&labels[]=customer-support'
      );
    });

    it('#getConversations', () => {
      contactAPI.getConversations(1);
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/contacts/1/conversations'
      );
    });

    it('#getContactableInboxes', () => {
      contactAPI.getContactableInboxes(1);
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/contacts/1/contactable_inboxes'
      );
    });

    it('#getContactLabels', () => {
      contactAPI.getContactLabels(1);
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/contacts/1/labels');
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/contacts/1/labels'
+      );
    });

    it('#updateContactLabels', () => {
      const labels = ['support-query'];
      contactAPI.updateContactLabels(1, labels);
-      expect(axiosMock.post).toHaveBeenCalledWith('/api/v1/contacts/1/labels', {
-        labels,
-      });
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/contacts/1/labels',
+        {
+          labels,
+        }
+      );
    });

    it('#search', () => {
      contactAPI.search('leads', 1, 'date', 'customer-support');
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/contacts/search?include_contact_inboxes=false&page=1&sort=date&q=leads&labels[]=customer-support'
      );
    });

    it('#destroyCustomAttributes', () => {
      contactAPI.destroyCustomAttributes(1, ['cloudCustomer']);
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/contacts/1/destroy_custom_attributes',
        {
          custom_attributes: ['cloudCustomer'],
@@ -85,7 +75,7 @@ describe('#ContactsAPI', () => {
    it('#importContacts', () => {
      const file = 'file';
      contactAPI.importContacts(file);
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/contacts/import',
        expect.any(FormData),
        {
@@ -106,7 +96,7 @@ describe('#ContactsAPI', () => {
        ],
      };
      contactAPI.filter(1, 'name', queryPayload);
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/contacts/filter?include_contact_inboxes=false&page=1&sort=name',
        queryPayload
      );
@@ -114,7 +104,7 @@ describe('#ContactsAPI', () => {

    it('#destroyAvatar', () => {
      contactAPI.destroyAvatar(1);
-      expect(axiosMock.delete).toHaveBeenCalledWith(
+      expect(context.axiosMock.delete).toHaveBeenCalledWith(
        '/api/v1/contacts/1/avatar'
      );
    });
@@ -1,5 +1,6 @@
 import conversationsAPI from '../conversations';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';

 describe('#ConversationApi', () => {
  it('creates correct instance', () => {
@@ -13,26 +14,10 @@ describe('#ConversationApi', () => {
    expect(conversationsAPI).toHaveProperty('updateLabels');
  });

-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#getLabels', () => {
      conversationsAPI.getLabels(1);
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/conversations/1/labels'
      );
    });
@@ -40,7 +25,7 @@ describe('#ConversationApi', () => {
    it('#updateLabels', () => {
      const labels = ['support-query'];
      conversationsAPI.updateLabels(1, labels);
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/conversations/1/labels',
        {
          labels,
@@ -1,5 +1,6 @@
 import csatReportsAPI from '../csatReports';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';

 describe('#Reports API', () => {
  it('creates correct instance', () => {
@@ -8,26 +9,10 @@ describe('#Reports API', () => {
    expect(csatReportsAPI).toHaveProperty('get');
    expect(csatReportsAPI).toHaveProperty('getMetrics');
  });
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#get', () => {
      csatReportsAPI.get({ page: 1, from: 1622485800, to: 1623695400 });
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/csat_survey_responses',
        {
          params: {
@@ -41,7 +26,7 @@ describe('#Reports API', () => {
    });
    it('#getMetrics', () => {
      csatReportsAPI.getMetrics({ from: 1622485800, to: 1623695400 });
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/csat_survey_responses/metrics',
        {
          params: { since: 1622485800, until: 1623695400 },
@@ -54,7 +39,7 @@ describe('#Reports API', () => {
        to: 1623695400,
        user_ids: 1,
      });
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/csat_survey_responses/download',
        {
          params: {
@@ -1,5 +1,6 @@
 import conversationAPI from '../../inbox/conversation';
 import ApiClient from '../../ApiClient';
+import describeWithAPIMock from '../apiSpecHelper';

 describe('#ConversationAPI', () => {
  it('creates correct instance', () => {
@@ -21,23 +22,7 @@ describe('#ConversationAPI', () => {
    expect(conversationAPI).toHaveProperty('filter');
  });

-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#get conversations', () => {
      conversationAPI.get({
        inboxId: 1,
@@ -47,16 +32,19 @@ describe('#ConversationAPI', () => {
        labels: [],
        teamId: 1,
      });
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/conversations', {
-        params: {
-          inbox_id: 1,
-          team_id: 1,
-          status: 'open',
-          assignee_type: 'me',
-          page: 1,
-          labels: [],
-        },
-      });
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/conversations',
+        {
+          params: {
+            inbox_id: 1,
+            team_id: 1,
+            status: 'open',
+            assignee_type: 'me',
+            page: 1,
+            labels: [],
+          },
+        }
+      );
    });

    it('#search', () => {
@@ -65,7 +53,7 @@ describe('#ConversationAPI', () => {
        page: 1,
      });

-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/conversations/search',
        {
          params: {
@@ -78,7 +66,7 @@ describe('#ConversationAPI', () => {

    it('#toggleStatus', () => {
      conversationAPI.toggleStatus({ conversationId: 12, status: 'online' });
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        `/api/v1/conversations/12/toggle_status`,
        {
          status: 'online',
@@ -89,7 +77,7 @@ describe('#ConversationAPI', () => {

    it('#assignAgent', () => {
      conversationAPI.assignAgent({ conversationId: 12, agentId: 34 });
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        `/api/v1/conversations/12/assignments?assignee_id=34`,
        {}
      );
@@ -97,7 +85,7 @@ describe('#ConversationAPI', () => {

    it('#assignTeam', () => {
      conversationAPI.assignTeam({ conversationId: 12, teamId: 1 });
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        `/api/v1/conversations/12/assignments`,
        {
          team_id: 1,
@@ -107,7 +95,7 @@ describe('#ConversationAPI', () => {

    it('#markMessageRead', () => {
      conversationAPI.markMessageRead({ id: 12 });
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        `/api/v1/conversations/12/update_last_seen`
      );
    });
@@ -117,7 +105,7 @@ describe('#ConversationAPI', () => {
        conversationId: 12,
        status: 'typing_on',
      });
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        `/api/v1/conversations/12/toggle_typing_status`,
        {
          typing_status: 'typing_on',
@@ -127,14 +115,14 @@ describe('#ConversationAPI', () => {

    it('#mute', () => {
      conversationAPI.mute(45);
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/conversations/45/mute'
      );
    });

    it('#unmute', () => {
      conversationAPI.unmute(45);
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/conversations/45/unmute'
      );
    });
@@ -147,15 +135,18 @@ describe('#ConversationAPI', () => {
        labels: [],
        teamId: 1,
      });
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/conversations/meta', {
-        params: {
-          inbox_id: 1,
-          team_id: 1,
-          status: 'open',
-          assignee_type: 'me',
-          labels: [],
-        },
-      });
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/conversations/meta',
+        {
+          params: {
+            inbox_id: 1,
+            team_id: 1,
+            status: 'open',
+            assignee_type: 'me',
+            labels: [],
+          },
+        }
+      );
    });

    it('#sendEmailTranscript', () => {
@@ -163,7 +154,7 @@ describe('#ConversationAPI', () => {
        conversationId: 45,
        email: 'john@acme.inc',
      });
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/conversations/45/transcript',
        {
          email: 'john@acme.inc',
@@ -176,7 +167,7 @@ describe('#ConversationAPI', () => {
        conversationId: 45,
        customAttributes: { order_d: '1001' },
      });
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/conversations/45/custom_attributes',
        {
          custom_attributes: { order_d: '1001' },
@@ -211,7 +202,9 @@ describe('#ConversationAPI', () => {
        },
      };
      conversationAPI.filter(payload);
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(
+        context.axiosMock.post
+      ).toHaveBeenCalledWith(
        '/api/v1/conversations/filter',
        payload.queryData,
        { params: { page: payload.page } }
@@ -220,7 +213,7 @@ describe('#ConversationAPI', () => {

    it('#getAllAttachments', () => {
      conversationAPI.getAllAttachments(1);
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/conversations/1/attachments'
      );
    });
@@ -1,5 +1,6 @@
 import messageAPI, { buildCreatePayload } from '../../inbox/message';
 import ApiClient from '../../ApiClient';
+import describeWithAPIMock from '../apiSpecHelper';

 describe('#ConversationAPI', () => {
  it('creates correct instance', () => {
@@ -12,29 +13,13 @@ describe('#ConversationAPI', () => {
    expect(messageAPI).toHaveProperty('getPreviousMessages');
  });

-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#getPreviousMessages', () => {
      messageAPI.getPreviousMessages({
        conversationId: 12,
        before: 4573,
      });
-      expect(axiosMock.get).toHaveBeenCalledWith(
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
        `/api/v1/conversations/12/messages`,
        {
          params: {
@@ -50,7 +35,7 @@ describe('#ConversationAPI', () => {
        message: 'test content',
        echoId: 12,
        isPrivate: true,
-        contentAttributes: { in_reply_to: 12 },
+
        files: [new Blob(['test-content'], { type: 'application/pdf' })],
      });
      expect(formPayload).toBeInstanceOf(FormData);
@@ -58,10 +43,6 @@ describe('#ConversationAPI', () => {
      expect(formPayload.get('echo_id')).toEqual('12');
      expect(formPayload.get('private')).toEqual('true');
      expect(formPayload.get('cc_emails')).toEqual('');
-      expect(formPayload.get('bcc_emails')).toEqual('');
-      expect(formPayload.get('content_attributes')).toEqual(
-        '{"in_reply_to":12}'
-      );
    });

    it('builds object payload if file is not available', () => {
@@ -77,10 +58,8 @@ describe('#ConversationAPI', () => {
        private: false,
        echo_id: 12,
        content_attributes: { in_reply_to: 12 },
-        cc_emails: '',
        bcc_emails: '',
-        to_emails: '',
-        template_params: undefined,
+        cc_emails: '',
      });
    });
  });
@@ -1,5 +1,6 @@
 import inboxesAPI from '../inboxes';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';

 describe('#InboxesAPI', () => {
  it('creates correct instance', () => {
@@ -13,32 +14,19 @@ describe('#InboxesAPI', () => {
    expect(inboxesAPI).toHaveProperty('getAgentBot');
    expect(inboxesAPI).toHaveProperty('setAgentBot');
  });
-
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: jest.fn(() => Promise.resolve()),
-      get: jest.fn(() => Promise.resolve()),
-      patch: jest.fn(() => Promise.resolve()),
-      delete: jest.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
+  describeWithAPIMock('API calls', context => {
    it('#getCampaigns', () => {
      inboxesAPI.getCampaigns(2);
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/inboxes/2/campaigns');
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/inboxes/2/campaigns'
+      );
    });

    it('#deleteInboxAvatar', () => {
      inboxesAPI.deleteInboxAvatar(2);
-      expect(axiosMock.delete).toHaveBeenCalledWith('/api/v1/inboxes/2/avatar');
+      expect(context.axiosMock.delete).toHaveBeenCalledWith(
+        '/api/v1/inboxes/2/avatar'
+      );
    });
  });
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shivam Mishra	79a76bc9df	refactor: use MutexApplicationJob	2023-08-23 11:59:24 +07:00
Shivam Mishra	77b1804eef	feat: create mutex application job	2023-08-23 11:59:06 +07:00
Shivam Mishra	a962308a23	feat: add mutex for slack send job	2023-08-23 11:59:06 +07:00
@@ -1 +1 @@
 .5.1
 .20.1
@@ -1 +1 @@
 .3.1
 .17.0
@@ -1 +1 @@
 .7.0
 .3.0