chore: Update translations (#8983 )

feat(ee): Add support for SLA in automation rules (#8910 )
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
2024-02-22 12:18:55 +05:30 · 2024-02-22 12:18:55 +05:30 · 2024-02-22 12:18:54 +05:30
2810 changed files with 47985 additions and 90183 deletions
@@ -7,7 +7,7 @@ defaults: &defaults
  working_directory: ~/build
  docker:
    # specify the version you desire here
-    - image: cimg/ruby:3.3.3-browsers
+    - image: cimg/ruby:3.2.2-browsers
    # Specify service dependencies here if necessary
    # CircleCI maintains a library of pre-built images
@@ -130,7 +130,10 @@ jobs:
          command: |
            mkdir -p ~/tmp/test-results/frontend_specs
            ~/tmp/cc-test-reporter before-build
-            yarn test:coverage
+            TESTFILES=$(circleci tests glob **/specs/*.spec.js | circleci tests split --split-by=timings)
            yarn test:coverage --profile 10 \
                               --out ~/tmp/test-results/yarn.xml \
                               -- ${TESTFILES}
      - run:
          name: Code Climate Test Coverage
          command: |
@@ -12,7 +12,7 @@ services:
      args:
        VARIANT: "ubuntu-22.04"
        NODE_VERSION: "20.9.0"
-        RUBY_VERSION: "3.3.3"
+        RUBY_VERSION: "3.2.2"
        # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
        USER_UID: "1000"
        USER_GID: "1000"
@@ -25,7 +25,7 @@ services:
      args:
        VARIANT: "ubuntu-22.04"
        NODE_VERSION: "20.9.0"
-        RUBY_VERSION: "3.3.3"
+        RUBY_VERSION: "3.2.2"
        # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
        USER_UID: "1000"
        USER_GID: "1000"
@@ -1,9 +1,4 @@
 # Learn about the various environment variables at
 # https://www.chatwoot.com/docs/self-hosted/configuration/environment-variables/#rails-production-variables
 # Used to verify the integrity of signed cookies. so ensure a secure value is set
 # SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols. 
 # Use `rake secret` to generate this variable
 SECRET_KEY_BASE=replace_with_lengthy_secure_hex
 # Replace with the URL you are planning to use for your app
@@ -28,9 +23,6 @@ FORCE_SSL=false
 ENABLE_ACCOUNT_SIGNUP=false
 # Redis config
 # specify the configs via single URL or individual variables
 # ref: https://www.iana.org/assignments/uri-schemes/prov/redis
 # You can also use the following format for the URL: redis://:password@host:port/db_number
 REDIS_URL=redis://redis:6379
 # If you are using docker-compose, set this variable's value to be any string,
 # which will be the password for the redis service running inside the docker-compose
@@ -85,8 +77,6 @@ SMTP_OPENSSL_VERIFY_MODE=peer
 # Comment out the following environment variables if required by your SMTP server
 # SMTP_TLS=
 # SMTP_SSL=
 # SMTP_OPEN_TIMEOUT
 # SMTP_READ_TIMEOUT
 # Mail Incoming
 # This is the domain set for the reply emails when conversation continuity is enabled
@@ -190,6 +180,14 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## Sentry
 # SENTRY_DSN=
 ## LogRocket
 # LOG_ROCKET_PROJECT_ID=xxxxx/some-project
 # MICROSOFT CLARITY
 # MS_CLARITY_TOKEN=xxxxxxxxx
 # GOOGLE_TAG_MANAGER
 # GOOGLE_TAG = GTM-XXXXXXX
 ## Scout
 ## https://scoutapm.com/docs/ruby/configuration
@@ -253,8 +251,10 @@ AZURE_APP_SECRET=
 ## OpenAI key
 # OPENAI_API_KEY=
 # Sentiment analysis model file path
 SENTIMENT_FILE_PATH=
 # Housekeeping/Performance related configurations
 # Set to true if you want to remove stale contact inboxes
 # contact_inboxes with no conversation older than 90 days will be removed
 # REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
@@ -27,160 +27,6 @@ module.exports = {
    'import/no-unresolved': 'off',
    'vue/html-indent': 'off',
    'vue/multi-word-component-names': 'off',
    'vue/next-tick-style': ['error', 'callback'],
    'vue/block-order': [
      'error',
      {
        order: ['script', 'template', 'style'],
      },
    ],
    'vue/component-name-in-template-casing': [
      'error',
      'PascalCase',
      {
        registeredComponentsOnly: true,
      },
    ],
    'vue/component-options-name-casing': ['error', 'PascalCase'],
    'vue/custom-event-name-casing': ['error', 'camelCase'],
    'vue/define-emits-declaration': ['error'],
    'vue/define-macros-order': [
      'error',
      {
        order: ['defineProps', 'defineEmits'],
        defineExposeLast: false,
      },
    ],
    'vue/define-props-declaration': ['error', 'runtime'],
    'vue/match-component-import-name': ['error'],
    'vue/no-bare-strings-in-template': [
      'error',
      {
        allowlist: [
          '(',
          ')',
          ',',
          '.',
          '&',
          '+',
          '-',
          '=',
          '*',
          '/',
          '#',
          '%',
          '!',
          '?',
          ':',
          '[',
          ']',
          '{',
          '}',
          '<',
          '>',
          '⌘',
          '📄',
          '🎉',
          '💬',
          '👥',
          '📥',
          '🔖',
          '❌',
          '✅',
          '\u00b7',
          '\u2022',
          '\u2010',
          '\u2013',
          '\u2014',
          '\u2212',
          '|',
        ],
        attributes: {
          '/.+/': [
            'title',
            'aria-label',
            'aria-placeholder',
            'aria-roledescription',
            'aria-valuetext',
          ],
          input: ['placeholder'],
        },
        directives: ['v-text'],
      },
    ],
    'vue/no-empty-component-block': 'error',
    'vue/no-multiple-objects-in-class': 'error',
    'vue/no-root-v-if': 'warn',
    'vue/no-static-inline-styles': [
      'error',
      {
        allowBinding: false,
      },
    ],
    'vue/no-template-target-blank': [
      'error',
      {
        allowReferrer: false,
        enforceDynamicLinks: 'always',
      },
    ],
    'vue/no-required-prop-with-default': [
      'error',
      {
        autofix: false,
      },
    ],
    'vue/no-this-in-before-route-enter': 'error',
    'vue/no-undef-components': [
      'error',
      {
        ignorePatterns: [
          '^woot-',
          '^fluent-',
          '^multiselect',
          '^router-link',
          '^router-view',
          '^ninja-keys',
          '^FormulateForm',
          '^FormulateInput',
          '^highlightjs',
        ],
      },
    ],
    'vue/no-unused-emit-declarations': 'error',
    'vue/no-unused-refs': 'error',
    'vue/no-use-v-else-with-v-for': 'error',
    'vue/prefer-true-attribute-shorthand': 'error',
    'vue/no-useless-v-bind': [
      'error',
      {
        ignoreIncludesComment: false,
        ignoreStringEscape: false,
      },
    ],
    'vue/no-v-text': 'error',
    'vue/padding-line-between-blocks': ['error', 'always'],
    'vue/prefer-separate-static-class': 'error',
    'vue/require-explicit-slots': 'error',
    'vue/require-macro-variable-name': [
      'error',
      {
        defineProps: 'props',
        defineEmits: 'emit',
        defineSlots: 'slots',
        useSlots: 'slots',
        useAttrs: 'attrs',
      },
    ],
    'vue/no-unused-properties': [
      'error',
      {
        groups: ['props'],
        deepData: false,
        ignorePublicMembers: false,
        unreferencedOptions: [],
      },
    ],
    'vue/max-attributes-per-line': [
      'error',
      {
@@ -219,10 +65,10 @@ module.exports = {
  },
  env: {
    browser: true,
    jest: true,
    node: true,
  },
  globals: {
    bus: true,
    vi: true,
  },
 };
@@ -1,2 +1,7 @@
 ## All javascript files should be reviewed by pranav before merging
 *.js @pranavrajs
 *.vue @pranavrajs
 ## All enterprise related files should be reviewed by sojan before merging
 /enterprise/* @sojan-official
@@ -1,45 +0,0 @@
 ## github action to check deployment success
 ## curl the deployment url and check for 200 status
 ## deployment url will be of the form chatwoot-pr-<pr_number>.herokuapp.com
 name: Deploy Check
 on:
  pull_request:
 jobs:
  deployment_check:
    name: Check Deployment
    runs-on: ubuntu-latest
    steps:
      - name: Install jq
        run: sudo apt-get install -y jq
      - name: Print Deployment URL
        run: echo "https://chatwoot-pr-${{ github.event.pull_request.number }}.herokuapp.com"
      - name: Check Deployment Status
        run: |
          max_attempts=10
          attempt=1
          status_code=0
          echo "Waiting for review app to be deployed/redeployed, trying in  10 minutes..."
          sleep 600
          while [ $attempt -le $max_attempts ]; do
            response=$(curl -s -o /dev/null -w "%{http_code}" https://chatwoot-pr-${{ github.event.pull_request.number }}.herokuapp.com/api)
            status_code=$(echo $response | head -n   1)
            if [ $status_code -eq   200 ]; then
              body=$(curl -s https://chatwoot-pr-${{ github.event.pull_request.number }}.herokuapp.com/api)
              if echo "$body" | jq -e '.version and .timestamp and .queue_services == "ok" and .data_services == "ok"' > /dev/null; then
                echo "Deployment successful"
                exit 0
              else
                echo "Deployment status unknown, retrying in   3 minutes..."
                sleep 180
              fi
            else
              echo "Waiting for review app to be ready, retrying in  3 minutes..."
              sleep 180
              attempt=$((attempt +  1))
            fi
          done
          echo "Deployment failed after $max_attempts attempts"
          exit  1
          fi
@@ -25,5 +25,13 @@ jobs:
        with: 
          issue-inactive-days: '30'
          issue-lock-reason: 'resolved'
          issue-comment: >
            This issue has been automatically locked since there
            has not been any recent activity after it was closed.
            Please open a new issue for related bugs.
          pr-inactive-days: '30'
          pr-lock-reason: 'resolved'
          pr-comment: >
            This pull request has been automatically locked since there
            has not been any recent activity after it was closed.
            Please open a new issue for related bugs.
@@ -73,7 +73,6 @@ jobs:
          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 \
          spec/enterprise/jobs/enterprise/account/conversations_resolution_scheduler_job_spec.rb \
          --profile=10 \
          --format documentation
@@ -2,8 +2,6 @@ require:
  - rubocop-performance
  - rubocop-rails
  - rubocop-rspec
  - ./rubocop/use_from_email.rb
  - ./rubocop/custom_cop_location.rb
 Layout/LineLength:
  Max: 150
@@ -142,16 +140,6 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
  Max: 14
 # custom rules
 UseFromEmail:
  Enabled: true
  Exclude:
    - 'app/models/user.rb'
    - 'app/models/contact.rb'
 CustomCopLocation:
  Enabled: true
 AllCops:
  NewCops: enable
  Exclude:
@@ -1 +1 @@
-3.3.3
+3.2.2
@@ -2,6 +2,7 @@ import { addDecorator } from '@storybook/vue';
 import Vue from 'vue';
 import Vuex from 'vuex';
 import VueI18n from 'vue-i18n';
 import Vuelidate from 'vuelidate';
 import Multiselect from 'vue-multiselect';
 import VueDOMPurifyHTML from 'vue-dompurify-html';
 import FluentIcon from 'shared/components/FluentIcon/DashboardIcon';
@@ -13,6 +14,7 @@ import { domPurifyConfig } from 'shared/helpers/HTMLSanitizer';
 import '../app/javascript/dashboard/assets/scss/storybook.scss';
 Vue.use(VueI18n);
 Vue.use(Vuelidate);
 Vue.use(WootUiKit);
 Vue.use(Vuex);
 Vue.use(VueDOMPurifyHTML, domPurifyConfig);
@@ -30,7 +32,7 @@ addDecorator(() => ({
  template: '<story/>',
  i18n: i18nConfig,
  store,
-  beforeCreate: function () {
+  beforeCreate: function() {
    this.$root._i18n = this.$i18n;
  },
 }));
@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
-ruby '3.3.3'
+ruby '3.2.2'
 ##-- base gems for rails --##
-gem 'rack-cors', '2.0.0', require: 'rack/cors'
+gem 'rack-cors', require: 'rack/cors'
-gem 'rails', '~> 7.0.8.4'
+gem 'rails', '~> 7.0.8.0'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
@@ -61,7 +61,7 @@ gem 'redis-namespace'
 gem 'activerecord-import'
 ##--- gems for server & infra configuration ---##
-gem 'dotenv-rails', '>= 3.0.0'
+gem 'dotenv-rails'
 gem 'foreman'
 gem 'puma'
 gem 'webpacker'
@@ -69,15 +69,15 @@ gem 'webpacker'
 gem 'barnes'
 ##--- gems for authentication & authorization ---##
-gem 'devise', '>= 4.9.4'
+gem 'devise', '>= 4.9.3'
 gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
-gem 'devise_token_auth', '>= 1.2.3'
+gem 'devise_token_auth'
 # authorization
 gem 'jwt'
 gem 'pundit'
 # super admin
 gem 'administrate', '>= 0.20.1'
-gem 'administrate-field-active_storage', '>= 1.0.3'
+gem 'administrate-field-active_storage', '>= 1.0.1'
 gem 'administrate-field-belongs_to_search', '>= 0.9.0'
 ##--- gems for pubsub service ---##
@@ -111,18 +111,18 @@ gem 'elastic-apm', require: false
 gem 'newrelic_rpm', require: false
 gem 'newrelic-sidekiq-metrics', '>= 1.6.2', require: false
 gem 'scout_apm', require: false
-gem 'sentry-rails', '>= 5.19.0', require: false
+gem 'sentry-rails', '>= 5.14.0', require: false
 gem 'sentry-ruby', require: false
-gem 'sentry-sidekiq', '>= 5.19.0', require: false
+gem 'sentry-sidekiq', '>= 5.14.0', require: false
 ##-- background job processing --##
-gem 'sidekiq', '>= 7.3.1'
+gem 'sidekiq', '>= 7.2.1'
 # We want cron jobs
 gem 'sidekiq-cron', '>= 1.12.0'
 ##-- Push notification service --##
 gem 'fcm'
-gem 'web-push', '>= 3.0.1'
+gem 'web-push'
 ##-- geocoding / parse location from ip --##
 # http://www.rubygeocoder.com/
@@ -165,8 +165,8 @@ gem 'audited', '~> 5.4', '>= 5.4.1'
 # need for google auth
 gem 'omniauth', '>= 2.1.2'
-gem 'omniauth-google-oauth2', '>= 1.1.2'
+gem 'omniauth-google-oauth2'
-gem 'omniauth-rails_csrf_protection', '~> 1.0', '>= 1.0.2'
+gem 'omniauth-rails_csrf_protection', '~> 1.0'
 ## Gems for reponse bot
 # adds cosine similarity to postgres using vector extension
@@ -175,6 +175,9 @@ gem 'pgvector'
 # Convert Website HTML to Markdown
 gem 'reverse_markdown'
 # Sentiment analysis
 gem 'informers'
 ### Gems required only in specific deployment environments ###
 ##############################################################
@@ -200,7 +203,7 @@ group :development do
  gem 'rack-mini-profiler', '>= 3.2.0', require: false
  gem 'stackprof'
  # Should install the associated chrome extension to view query logs
-  gem 'meta_request', '>= 0.8.0'
+  gem 'meta_request'
 end
 group :test do
@@ -228,7 +231,7 @@ group :development, :test do
  gem 'mock_redis'
  gem 'pry-rails'
  gem 'rspec_junit_formatter'
-  gem 'rspec-rails', '>= 6.1.4'
+  gem 'rspec-rails'
  gem 'rubocop', require: false
  gem 'rubocop-performance', require: false
  gem 'rubocop-rails', require: false
@@ -33,78 +33,78 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.0.8.4)
+    actioncable (7.0.8)
-      actionpack (= 7.0.8.4)
+      actionpack (= 7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8.4)
+    actionmailbox (7.0.8)
-      actionpack (= 7.0.8.4)
+      actionpack (= 7.0.8)
-      activejob (= 7.0.8.4)
+      activejob (= 7.0.8)
-      activerecord (= 7.0.8.4)
+      activerecord (= 7.0.8)
-      activestorage (= 7.0.8.4)
+      activestorage (= 7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.0.8.4)
+    actionmailer (7.0.8)
-      actionpack (= 7.0.8.4)
+      actionpack (= 7.0.8)
-      actionview (= 7.0.8.4)
+      actionview (= 7.0.8)
-      activejob (= 7.0.8.4)
+      activejob (= 7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
      rails-dom-testing (~> 2.0)
-    actionpack (7.0.8.4)
+    actionpack (7.0.8)
-      actionview (= 7.0.8.4)
+      actionview (= 7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
      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.4)
+    actiontext (7.0.8)
-      actionpack (= 7.0.8.4)
+      actionpack (= 7.0.8)
-      activerecord (= 7.0.8.4)
+      activerecord (= 7.0.8)
-      activestorage (= 7.0.8.4)
+      activestorage (= 7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.0.8.4)
+    actionview (7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
      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.4)
+    activejob (7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
      globalid (>= 0.3.6)
-    activemodel (7.0.8.4)
+    activemodel (7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
-    activerecord (7.0.8.4)
+    activerecord (7.0.8)
-      activemodel (= 7.0.8.4)
+      activemodel (= 7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
    activerecord-import (1.4.1)
      activerecord (>= 4.2)
-    activestorage (7.0.8.4)
+    activestorage (7.0.8)
-      actionpack (= 7.0.8.4)
+      actionpack (= 7.0.8)
-      activejob (= 7.0.8.4)
+      activejob (= 7.0.8)
-      activerecord (= 7.0.8.4)
+      activerecord (= 7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
      marcel (~> 1.0)
      mini_mime (>= 1.1.0)
-    activesupport (7.0.8.4)
+    activesupport (7.0.8)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
      tzinfo (~> 2.0)
    acts-as-taggable-on (9.0.1)
      activerecord (>= 6.0, < 7.1)
-    addressable (2.8.7)
+    addressable (2.8.4)
-      public_suffix (>= 2.0.2, < 7.0)
+      public_suffix (>= 2.0.2, < 6.0)
    administrate (0.20.1)
      actionpack (>= 6.0, < 8.0)
      actionview (>= 6.0, < 8.0)
@@ -113,7 +113,7 @@ GEM
      kaminari (~> 1.2.2)
      sassc-rails (~> 2.1)
      selectize-rails (~> 0.6)
-    administrate-field-active_storage (1.0.3)
+    administrate-field-active_storage (1.0.1)
      administrate (>= 0.2.2)
      rails (>= 7.0)
    administrate-field-belongs_to_search (0.9.0)
@@ -148,15 +148,15 @@ GEM
    barnes (0.0.9)
      multi_json (~> 1)
      statsd-ruby (~> 1.1)
-    base64 (0.2.0)
+    base64 (0.1.1)
-    bcrypt (3.1.20)
+    bcrypt (3.1.19)
    bigdecimal (3.1.8)
    bindex (0.8.1)
    blingfire (0.1.8)
    bootsnap (1.16.0)
      msgpack (~> 1.2)
    brakeman (5.4.1)
    browser (5.3.1)
-    builder (3.3.0)
+    builder (3.2.4)
    bullet (7.0.7)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
@@ -169,15 +169,12 @@ GEM
    climate_control (1.2.0)
    coderay (1.1.3)
    commonmarker (0.23.10)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.2.3)
    connection_pool (2.4.1)
-    crack (1.0.0)
+    crack (0.4.5)
      bigdecimal
      rexml
    crass (1.0.6)
-    csv (3.3.0)
+    csv-safe (3.2.1)
    csv-safe (3.3.1)
      csv (~> 3.0)
    cypress-on-rails (1.16.0)
      rack
    database_cleaner (2.0.2)
@@ -186,40 +183,37 @@ GEM
      activerecord (>= 5.a)
      database_cleaner-core (~> 2.0.0)
    database_cleaner-core (2.0.1)
    datadog-ci (0.8.3)
      msgpack
    date (3.3.4)
-    ddtrace (1.23.2)
+    ddtrace (1.11.1)
-      datadog-ci (~> 0.8.1)
+      debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
-      debase-ruby_core_source (= 3.3.1)
+      libdatadog (~> 2.0.0.1.0)
-      libdatadog (~> 7.0.0.1.0)
+      libddwaf (~> 1.8.2.0.0)
      libddwaf (~> 1.14.0.0.0)
      msgpack
-    debase-ruby_core_source (3.3.1)
+    debase-ruby_core_source (3.2.0)
    debug (1.8.0)
      irb (>= 1.5.0)
      reline (>= 0.3.1)
    declarative (0.0.20)
-    devise (4.9.4)
+    devise (4.9.3)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0)
      responders
      warden (~> 1.2.3)
-    devise_token_auth (1.2.3)
+    devise_token_auth (1.2.1)
      bcrypt (~> 3.0)
      devise (> 3.5.2, < 5)
-      rails (>= 4.2.0, < 7.2)
+      rails (>= 4.2.0, < 7.1)
-    diff-lcs (1.5.1)
+    diff-lcs (1.5.0)
    digest-crc (0.6.4)
      rake (>= 12.0.0, < 14.0.0)
    docile (1.4.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (3.1.2)
+    dotenv (2.8.1)
-    dotenv-rails (3.1.2)
+    dotenv-rails (2.8.1)
-      dotenv (= 3.1.2)
+      dotenv (= 2.8.1)
-      railties (>= 6.1)
+      railties (>= 3.2)
    down (5.4.0)
      addressable (~> 2.8)
    ecma-re-validator (0.4.0)
@@ -229,7 +223,7 @@ GEM
      http (>= 3.0)
      ruby2_keywords
    email_reply_trimmer (0.1.13)
-    erubi (1.13.0)
+    erubi (1.12.0)
    et-orbi (1.2.7)
      tzinfo
    execjs (2.8.1)
@@ -243,8 +237,9 @@ GEM
      railties (>= 5.0.0)
    faker (3.2.0)
      i18n (>= 1.8.11, < 2)
-    faraday (2.9.0)
+    faraday (2.7.4)
-      faraday-net_http (>= 2.0, < 3.2)
+      faraday-net_http (>= 2.0, < 3.1)
      ruby2_keywords (>= 0.0.4)
    faraday-follow_redirects (0.3.0)
      faraday (>= 1, < 3)
    faraday-mashify (0.1.1)
@@ -252,8 +247,7 @@ GEM
      hashie
    faraday-multipart (1.0.4)
      multipart-post (~> 2)
-    faraday-net_http (3.1.0)
+    faraday-net_http (3.0.2)
      net-http
    faraday-net_http_persistent (2.1.0)
      faraday (~> 2.5)
      net-http-persistent (~> 4.0)
@@ -322,15 +316,15 @@ GEM
    google-cloud-translate-v3 (0.6.0)
      gapic-common (>= 0.17.1, < 2.a)
      google-cloud-errors (~> 1.0)
-    google-protobuf (3.25.3)
+    google-protobuf (3.25.2)
-    google-protobuf (3.25.3-arm64-darwin)
+    google-protobuf (3.25.2-arm64-darwin)
-    google-protobuf (3.25.3-x86_64-darwin)
+    google-protobuf (3.25.2-x86_64-darwin)
-    google-protobuf (3.25.3-x86_64-linux)
+    google-protobuf (3.25.2-x86_64-linux)
    googleapis-common-protos (1.4.0)
      google-protobuf (~> 3.14)
      googleapis-common-protos-types (~> 1.2)
      grpc (~> 1.27)
-    googleapis-common-protos-types (1.14.0)
+    googleapis-common-protos-types (1.11.0)
      google-protobuf (~> 3.18)
    googleauth (1.5.2)
      faraday (>= 0.17.3, < 3.a)
@@ -341,17 +335,14 @@ GEM
      signet (>= 0.16, < 2.a)
    groupdate (6.2.1)
      activesupport (>= 5.2)
-    grpc (1.62.0)
+    grpc (1.54.3)
-      google-protobuf (~> 3.25)
+      google-protobuf (~> 3.21)
      googleapis-common-protos-types (~> 1.0)
-    grpc (1.62.0-arm64-darwin)
+    grpc (1.54.3-x86_64-darwin)
-      google-protobuf (~> 3.25)
+      google-protobuf (~> 3.21)
      googleapis-common-protos-types (~> 1.0)
-    grpc (1.62.0-x86_64-darwin)
+    grpc (1.54.3-x86_64-linux)
-      google-protobuf (~> 3.25)
+      google-protobuf (~> 3.21)
      googleapis-common-protos-types (~> 1.0)
    grpc (1.62.0-x86_64-linux)
      google-protobuf (~> 3.25)
      googleapis-common-protos-types (~> 1.0)
    haikunator (1.1.1)
    hairtrigger (1.0.0)
@@ -359,8 +350,9 @@ GEM
      ruby2ruby (~> 2.4)
      ruby_parser (~> 3.10)
    hana (1.3.7)
-    hashdiff (1.1.0)
+    hashdiff (1.0.1)
    hashie (5.0.0)
    hkdf (1.0.0)
    http (5.1.1)
      addressable (~> 2.8)
      http-cookie (~> 1.0)
@@ -374,11 +366,15 @@ GEM
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
-    i18n (1.14.5)
+    i18n (1.14.1)
      concurrent-ruby (~> 1.0)
    image_processing (1.12.2)
      mini_magick (>= 4.9.5, < 5)
      ruby-vips (>= 2.0.17, < 3)
    informers (0.2.0)
      blingfire (>= 0.1.7)
      numo-narray
      onnxruntime (>= 0.5.1)
    io-console (0.6.0)
    irb (1.7.2)
      reline (>= 0.3.6)
@@ -398,8 +394,7 @@ GEM
      hana (~> 1.3)
      regexp_parser (~> 2.0)
      uri_template (~> 0.7)
-    jwt (2.8.1)
+    jwt (2.7.0)
      base64
    kaminari (1.2.2)
      activesupport (>= 4.1.0)
      kaminari-actionview (= 1.2.2)
@@ -422,15 +417,15 @@ GEM
      addressable (~> 2.8)
    letter_opener (1.8.1)
      launchy (>= 2.2, < 3)
-    libdatadog (7.0.0.1.0)
+    libdatadog (2.0.0.1.0)
-    libdatadog (7.0.0.1.0-x86_64-linux)
+    libdatadog (2.0.0.1.0-x86_64-linux)
-    libddwaf (1.14.0.0.0)
+    libddwaf (1.8.2.0.0)
      ffi (~> 1.0)
-    libddwaf (1.14.0.0.0-arm64-darwin)
+    libddwaf (1.8.2.0.0-arm64-darwin)
      ffi (~> 1.0)
-    libddwaf (1.14.0.0.0-x86_64-darwin)
+    libddwaf (1.8.2.0.0-x86_64-darwin)
      ffi (~> 1.0)
-    libddwaf (1.14.0.0.0-x86_64-linux)
+    libddwaf (1.8.2.0.0-x86_64-linux)
      ffi (~> 1.0)
    line-bot-api (1.28.0)
    liquid (5.4.0)
@@ -440,7 +435,6 @@ GEM
    llhttp-ffi (0.4.0)
      ffi-compiler (~> 1.0)
      rake (~> 13.0)
    logger (1.6.0)
    lograge (0.14.0)
      actionpack (>= 4)
      activesupport (>= 4)
@@ -454,20 +448,20 @@ GEM
      net-imap
      net-pop
      net-smtp
-    marcel (1.0.4)
+    marcel (1.0.2)
    maxminddb (0.1.22)
    memoist (0.16.2)
-    meta_request (0.8.2)
+    meta_request (0.7.4)
      rack-contrib (>= 1.1, < 3)
-      railties (>= 3.0.0, < 8)
+      railties (>= 3.0.0, < 7.1)
-    method_source (1.1.0)
+    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.7)
+    mini_portile2 (2.8.5)
-    minitest (5.24.1)
+    minitest (5.21.2)
    mock_redis (0.36.0)
      ruby2_keywords
    msgpack (1.7.0)
@@ -476,11 +470,9 @@ GEM
    multipart-post (2.3.0)
    neighbor (0.2.3)
      activerecord (>= 5.2)
    net-http (0.4.1)
      uri
    net-http-persistent (4.0.2)
      connection_pool (~> 2.2)
-    net-imap (0.4.12)
+    net-imap (0.4.9)
      date
      net-protocol
    net-pop (0.1.2)
@@ -495,16 +487,17 @@ GEM
      sidekiq
    newrelic_rpm (9.6.0)
      base64
-    nio4r (2.7.3)
+    nio4r (2.7.0)
-    nokogiri (1.16.6)
+    nokogiri (1.16.2)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.16.6-arm64-darwin)
+    nokogiri (1.16.2-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-darwin)
+    nokogiri (1.16.2-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.16.2-x86_64-linux)
      racc (~> 1.4)
    numo-narray (0.9.2.1)
    oauth (1.1.0)
      oauth-tty (~> 1.0, >= 1.0.1)
      snaky_hash (~> 2.0)
@@ -522,18 +515,26 @@ GEM
      hashie (>= 3.4.6)
      rack (>= 2.2.3)
      rack-protection
-    omniauth-google-oauth2 (1.1.2)
+    omniauth-google-oauth2 (1.1.1)
      jwt (>= 2.0)
-      oauth2 (~> 2.0)
+      oauth2 (~> 2.0.6)
      omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.8)
+      omniauth-oauth2 (~> 1.8.0)
    omniauth-oauth2 (1.8.0)
      oauth2 (>= 1.4, < 3)
      omniauth (~> 2.0)
-    omniauth-rails_csrf_protection (1.0.2)
+    omniauth-rails_csrf_protection (1.0.1)
      actionpack (>= 4.2)
      omniauth (~> 2.0)
-    openssl (3.2.0)
+    onnxruntime (0.7.6)
      ffi
    onnxruntime (0.7.6-arm64-darwin)
      ffi
    onnxruntime (0.7.6-x86_64-darwin)
      ffi
    onnxruntime (0.7.6-x86_64-linux)
      ffi
    openssl (3.1.0)
    orm_adapter (0.5.0)
    os (1.1.4)
    parallel (1.23.0)
@@ -551,44 +552,43 @@ GEM
      method_source (~> 1.0)
    pry-rails (0.3.9)
      pry (>= 0.10.4)
-    public_suffix (6.0.0)
+    public_suffix (5.0.1)
    puma (6.4.2)
      nio4r (~> 2.0)
    pundit (2.3.0)
      activesupport (>= 3.0.0)
    raabro (1.4.0)
-    racc (1.8.0)
+    racc (1.7.3)
-    rack (2.2.9)
+    rack (2.2.8)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
-    rack-contrib (2.5.0)
+    rack-contrib (2.4.0)
      rack (< 4)
-    rack-cors (2.0.0)
+    rack-cors (2.0.1)
      rack (>= 2.0.0)
    rack-mini-profiler (3.2.0)
      rack (>= 1.2.0)
-    rack-protection (3.2.0)
+    rack-protection (3.1.0)
      base64 (>= 0.1.0)
      rack (~> 2.2, >= 2.2.4)
    rack-proxy (0.7.6)
      rack
    rack-test (2.1.0)
      rack (>= 1.3)
    rack-timeout (0.6.3)
-    rails (7.0.8.4)
+    rails (7.0.8)
-      actioncable (= 7.0.8.4)
+      actioncable (= 7.0.8)
-      actionmailbox (= 7.0.8.4)
+      actionmailbox (= 7.0.8)
-      actionmailer (= 7.0.8.4)
+      actionmailer (= 7.0.8)
-      actionpack (= 7.0.8.4)
+      actionpack (= 7.0.8)
-      actiontext (= 7.0.8.4)
+      actiontext (= 7.0.8)
-      actionview (= 7.0.8.4)
+      actionview (= 7.0.8)
-      activejob (= 7.0.8.4)
+      activejob (= 7.0.8)
-      activemodel (= 7.0.8.4)
+      activemodel (= 7.0.8)
-      activerecord (= 7.0.8.4)
+      activerecord (= 7.0.8)
-      activestorage (= 7.0.8.4)
+      activestorage (= 7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
      bundler (>= 1.15.0)
-      railties (= 7.0.8.4)
+      railties (= 7.0.8)
    rails-dom-testing (2.2.0)
      activesupport (>= 5.0.0)
      minitest
@@ -596,21 +596,21 @@ GEM
    rails-html-sanitizer (1.6.0)
      loofah (~> 2.21)
      nokogiri (~> 1.14)
-    railties (7.0.8.4)
+    railties (7.0.8)
-      actionpack (= 7.0.8.4)
+      actionpack (= 7.0.8)
-      activesupport (= 7.0.8.4)
+      activesupport (= 7.0.8)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
      zeitwerk (~> 2.5)
    rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.1.0)
    rb-fsevent (0.11.2)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    redis (5.0.6)
      redis-client (>= 0.9.0)
-    redis-client (0.22.2)
+    redis-client (0.19.1)
      connection_pool
    redis-namespace (1.10.0)
      redis (>= 4)
@@ -634,25 +634,24 @@ GEM
    retriable (3.1.2)
    reverse_markdown (2.1.1)
      nokogiri
-    rexml (3.3.4)
+    rexml (3.2.5)
-      strscan
+    rspec-core (3.12.2)
-    rspec-core (3.13.0)
+      rspec-support (~> 3.12.0)
-      rspec-support (~> 3.13.0)
+    rspec-expectations (3.12.3)
    rspec-expectations (3.13.1)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.12.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.12.5)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.12.0)
-    rspec-rails (6.1.4)
+    rspec-rails (6.0.2)
      actionpack (>= 6.1)
      activesupport (>= 6.1)
      railties (>= 6.1)
-      rspec-core (~> 3.13)
+      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.13)
+      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.13)
+      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.13)
+      rspec-support (~> 3.12)
-    rspec-support (3.13.1)
+    rspec-support (3.12.0)
    rspec_junit_formatter (0.6.0)
      rspec-core (>= 2, < 4, != 2.12.0)
    rubocop (1.50.2)
@@ -710,24 +709,22 @@ GEM
      activesupport (>= 4)
    selectize-rails (0.12.6)
    semantic_range (3.0.0)
-    sentry-rails (5.19.0)
+    sentry-rails (5.14.0)
      railties (>= 5.0)
-      sentry-ruby (~> 5.19.0)
+      sentry-ruby (~> 5.14.0)
-    sentry-ruby (5.19.0)
+    sentry-ruby (5.14.0)
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.19.0)
+    sentry-sidekiq (5.14.0)
-      sentry-ruby (~> 5.19.0)
+      sentry-ruby (~> 5.14.0)
      sidekiq (>= 3.0)
    sexp_processor (4.17.0)
    shoulda-matchers (5.3.0)
      activesupport (>= 5.2.0)
-    sidekiq (7.3.1)
+    sidekiq (7.2.1)
      concurrent-ruby (< 2)
      connection_pool (>= 2.3.0)
      logger
      rack (>= 2.2.4)
-      redis-client (>= 0.22.2)
+      redis-client (>= 0.19.0)
    sidekiq-cron (1.12.0)
      fugit (~> 1.8)
      globalid (>= 1.0.1)
@@ -766,10 +763,9 @@ GEM
    stackprof (0.2.25)
    statsd-ruby (1.5.0)
    stripe (8.5.0)
    strscan (3.1.0)
    telephone_number (1.4.20)
    test-prof (1.2.1)
-    thor (1.3.1)
+    thor (1.3.0)
    tilt (2.3.0)
    time_diff (0.3.0)
      activesupport
@@ -794,12 +790,11 @@ GEM
    unf_ext (0.0.8.2)
    unicode-display_width (2.4.2)
    uniform_notifier (1.16.0)
    uri (0.13.0)
    uri_template (0.7.0)
    valid_email2 (4.0.6)
      activemodel (>= 3.2)
      mail (~> 2.5)
-    version_gem (1.1.4)
+    version_gem (1.1.3)
    warden (1.2.9)
      rack (>= 2.0.9)
    web-console (4.2.1)
@@ -807,10 +802,11 @@ GEM
      activemodel (>= 6.0.0)
      bindex (>= 0.4.0)
      railties (>= 6.0.0)
-    web-push (3.0.1)
+    web-push (3.0.0)
      hkdf (~> 1.0)
      jwt (~> 2.0)
      openssl (~> 3.0)
-    webmock (3.23.1)
+    webmock (3.18.1)
      addressable (>= 2.8.0)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
@@ -827,7 +823,7 @@ GEM
    working_hours (1.4.1)
      activesupport (>= 3.2)
      tzinfo
-    zeitwerk (2.6.16)
+    zeitwerk (2.6.12)
 PLATFORMS
  arm64-darwin-20
@@ -845,7 +841,7 @@ DEPENDENCIES
  activerecord-import
  acts-as-taggable-on
  administrate (>= 0.20.1)
-  administrate-field-active_storage (>= 1.0.3)
+  administrate-field-active_storage (>= 1.0.1)
  administrate-field-belongs_to_search (>= 0.9.0)
  annotate
  attr_extras
@@ -866,10 +862,10 @@ DEPENDENCIES
  database_cleaner
  ddtrace
  debug (~> 1.8)
-  devise (>= 4.9.4)
+  devise (>= 4.9.3)
  devise-secure_password!
-  devise_token_auth (>= 1.2.3)
+  devise_token_auth
-  dotenv-rails (>= 3.0.0)
+  dotenv-rails
  down
  elastic-apm
  email_reply_trimmer
@@ -891,6 +887,7 @@ DEPENDENCIES
  hashie
  html2text!
  image_processing
  informers
  jbuilder
  json_refs
  json_schemer
@@ -903,16 +900,16 @@ DEPENDENCIES
  listen
  lograge (~> 0.14.0)
  maxminddb
-  meta_request (>= 0.8.0)
+  meta_request
  mock_redis
  neighbor
  net-smtp (~> 0.3.4)
  newrelic-sidekiq-metrics (>= 1.6.2)
  newrelic_rpm
  omniauth (>= 2.1.2)
-  omniauth-google-oauth2 (>= 1.1.2)
+  omniauth-google-oauth2
  omniauth-oauth2
-  omniauth-rails_csrf_protection (~> 1.0, >= 1.0.2)
+  omniauth-rails_csrf_protection (~> 1.0)
  pg
  pg_search
  pgvector
@@ -921,16 +918,16 @@ DEPENDENCIES
  puma
  pundit
  rack-attack (>= 6.7.0)
-  rack-cors (= 2.0.0)
+  rack-cors
  rack-mini-profiler (>= 3.2.0)
  rack-timeout
-  rails (~> 7.0.8.4)
+  rails (~> 7.0.8.0)
  redis
  redis-namespace
  responders (>= 3.1.1)
  rest-client
  reverse_markdown
-  rspec-rails (>= 6.1.4)
+  rspec-rails
  rspec_junit_formatter
  rubocop
  rubocop-performance
@@ -939,11 +936,11 @@ DEPENDENCIES
  scout_apm
  scss_lint
  seed_dump
-  sentry-rails (>= 5.19.0)
+  sentry-rails (>= 5.14.0)
  sentry-ruby
-  sentry-sidekiq (>= 5.19.0)
+  sentry-sidekiq (>= 5.14.0)
  shoulda-matchers
-  sidekiq (>= 7.3.1)
+  sidekiq (>= 7.2.1)
  sidekiq-cron (>= 1.12.0)
  simplecov (= 0.17.1)
  slack-ruby-client (~> 2.2.0)
@@ -961,14 +958,14 @@ DEPENDENCIES
  uglifier
  valid_email2
  web-console (>= 4.2.1)
-  web-push (>= 3.0.1)
+  web-push
  webmock
  webpacker
  wisper (= 2.0.0)
  working_hours
 RUBY VERSION
-   ruby 3.3.3p89
+   ruby 3.2.2p185
 BUNDLED WITH
-   2.5.16
+   2.4.6
@@ -17,9 +17,6 @@ db_migrate:
 db_seed:
 	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:seed
 db_reset:
 	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:reset
 db:
 	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:chatwoot_prepare
@@ -52,4 +49,4 @@ debug_worker:
 docker: 
 	docker build -t $(APP_NAME) -f ./docker/Dockerfile .
-.PHONY: setup db_create db_migrate db_seed db_reset db console server burn docker run force_run debug debug_worker
+.PHONY: setup db_create db_migrate db_seed db console server burn docker run force_run debug debug_worker
@@ -23,6 +23,7 @@ Customer engagement suite, an open-source alternative to Intercom, Zendesk, Sale
  <img src="https://img.shields.io/github/commit-activity/m/chatwoot/chatwoot" alt="Commits-per-month">
  <a title="Crowdin" target="_self" href="https://chatwoot.crowdin.com/chatwoot"><img src="https://badges.crowdin.net/e/37ced7eba411064bd792feb3b7a28b16/localized.svg"></a>
  <a href="https://discord.gg/cJXdrwS"><img src="https://img.shields.io/discord/647412545203994635" alt="Discord"></a>
  <a href="https://huntr.dev/bounties/disclose"><img src="https://cdn.huntr.dev/huntr_security_badge_mono.svg" alt="Huntr"></a>
  <a href="https://status.chatwoot.com"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fchatwoot%2Fstatus%2Fmaster%2Fapi%2Fchatwoot%2Fuptime.json" alt="uptime"></a>
  <a href="https://status.chatwoot.com"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fchatwoot%2Fstatus%2Fmaster%2Fapi%2Fchatwoot%2Fresponse-time.json" alt="response time"></a>
  <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>
@@ -1 +1 @@
-3.9.0
+3.3.1
@@ -1 +1 @@
-2.8.0
+2.7.0
@@ -55,7 +55,7 @@
      "plan": "heroku-redis:mini"
    },
    {
-      "plan": "heroku-postgresql:essential-0"
+      "plan": "heroku-postgresql:mini"
    }
  ],
  "stack": "heroku-20",
@@ -72,11 +72,6 @@
      "scripts": {
        "test": "bundle exec rake test"
      }
    },
    "review": {
      "scripts": {
        "postdeploy": "bundle exec rails db:seed"
      }
    }
  }
 }
@@ -59,7 +59,7 @@ class ContactIdentifyAction
  def existing_email_contact
    return if params[:email].blank?
-    @existing_email_contact ||= account.contacts.from_email(params[:email])
+    @existing_email_contact ||= account.contacts.find_by(email: params[:email])
  end
  def existing_phone_number_contact
@@ -16,6 +16,7 @@ class AgentBuilder
  def perform
    ActiveRecord::Base.transaction do
      @user = find_or_create_user
      send_confirmation_if_required
      create_account_user
    end
    @user
@@ -26,13 +27,18 @@ class AgentBuilder
  # Finds a user by email or creates a new one with a temporary password.
  # @return [User] the found or created user.
  def find_or_create_user
-    user = User.from_email(email)
+    user = User.find_by(email: email)
    return user if user
    temp_password = "1!aA#{SecureRandom.alphanumeric(12)}"
    User.create!(email: email, name: name, password: temp_password, password_confirmation: temp_password)
  end
  # Sends confirmation instructions if the user is persisted and not confirmed.
  def send_confirmation_if_required
    @user.send_confirmation_instructions if user_needs_confirmation?
  end
  # Checks if the user needs confirmation.
  # @return [Boolean] true if the user is persisted and not confirmed, false otherwise.
  def user_needs_confirmation?
@@ -19,9 +19,9 @@ class ContactInboxWithContactBuilder
    ActiveRecord::Base.transaction(requires_new: true) do
      build_contact_with_contact_inbox
      update_contact_avatar(@contact) unless @contact.avatar.attached?
      @contact_inbox
    end
    update_contact_avatar(@contact) unless @contact.avatar.attached?
    @contact_inbox
  end
  private
@@ -75,7 +75,7 @@ class ContactInboxWithContactBuilder
  def find_contact_by_email(email)
    return if email.blank?
-    account.contacts.from_email(email)
+    account.contacts.find_by(email: email.downcase)
  end
  def find_contact_by_phone_number(phone_number)
@@ -53,23 +53,7 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
  end
  def conversation
-    @conversation ||= set_conversation_based_on_inbox_config
+    @conversation ||= Conversation.find_by(conversation_params) || build_conversation
  end
  def set_conversation_based_on_inbox_config
    if @inbox.lock_to_single_conversation
      Conversation.where(conversation_params).order(created_at: :desc).first || build_conversation
    else
      find_or_build_for_multiple_conversations
    end
  end
  def find_or_build_for_multiple_conversations
    # If lock to single conversation is disabled, we will create a new conversation if previous conversation is resolved
    last_conversation = Conversation.where(conversation_params).where.not(status: :resolved).order(created_at: :desc).first
    return build_conversation if last_conversation.nil?
    last_conversation
  end
  def build_conversation
@@ -69,28 +69,9 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
  end
  def conversation
-    @conversation ||= set_conversation_based_on_inbox_config
+    @conversation ||= Conversation.where(conversation_params).find_by(
-  end
+      "additional_attributes ->> 'type' = 'instagram_direct_message'"
-
+    ) || build_conversation
  def instagram_direct_message_conversation
    Conversation.where(conversation_params)
                .where("additional_attributes ->> 'type' = 'instagram_direct_message'")
  end
  def set_conversation_based_on_inbox_config
    if @inbox.lock_to_single_conversation
      instagram_direct_message_conversation.order(created_at: :desc).first || build_conversation
    else
      find_or_build_for_multiple_conversations
    end
  end
  def find_or_build_for_multiple_conversations
    last_conversation = instagram_direct_message_conversation.where.not(status: :resolved).order(created_at: :desc).first
    return build_conversation if last_conversation.nil?
    last_conversation
  end
  def message_content
@@ -27,7 +27,7 @@ class Messages::Messenger::MessageBuilder
    file_type = attachment['type'].to_sym
    params = { file_type: file_type, account_id: @message.account_id }
-    if [:image, :file, :audio, :video, :share, :story_mention, :ig_reel].include? file_type
+    if [:image, :file, :audio, :video, :share, :story_mention].include? file_type
      params.merge!(file_type_params(attachment))
    elsif file_type == :location
      params.merge!(location_params(attachment))
@@ -54,13 +54,6 @@ class V2::ReportBuilder
    }
  end
  def bot_summary
    {
      bot_resolutions_count: bot_resolutions.count,
      bot_handoffs_count: bot_handoffs.count
    }
  end
  def conversation_metrics
    if params[:type].equal?(:account)
      live_conversations
@@ -78,8 +71,6 @@ class V2::ReportBuilder
       avg_first_response_time
       avg_resolution_time reply_time
       resolutions_count
       bot_resolutions_count
       bot_handoffs_count
       reply_time].include?(params[:metric])
  end
@@ -132,7 +123,6 @@ class V2::ReportBuilder
      unattended: @open_conversations.unattended.count
    }
    metric[:unassigned] = @open_conversations.unassigned.count if params[:type].equal?(:account)
    metric[:pending] = @open_conversations.pending.count if params[:type].equal?(:account)
    metric
  end
 end
@@ -1,54 +0,0 @@
 class V2::Reports::BotMetricsBuilder
  include DateRangeHelper
  attr_reader :account, :params
  def initialize(account, params)
    @account = account
    @params = params
  end
  def metrics
    {
      conversation_count: bot_conversations.count,
      message_count: bot_messages.count,
      resolution_rate: bot_resolution_rate.to_i,
      handoff_rate: bot_handoff_rate.to_i
    }
  end
  private
  def bot_activated_inbox_ids
    @bot_activated_inbox_ids ||= account.inboxes.filter(&:active_bot?).map(&:id)
  end
  def bot_conversations
    @bot_conversations ||= account.conversations.where(inbox_id: bot_activated_inbox_ids).where(created_at: range)
  end
  def bot_messages
    @bot_messages ||= account.messages.outgoing.where(conversation_id: bot_conversations.ids).where(created_at: range)
  end
  def bot_resolutions_count
    account.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_resolved,
                                                                                 created_at: range).distinct.count
  end
  def bot_handoffs_count
    account.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_handoff,
                                                                                 created_at: range).distinct.count
  end
  def bot_resolution_rate
    return 0 if bot_conversations.count.zero?
    bot_resolutions_count.to_f / bot_conversations.count * 100
  end
  def bot_handoff_rate
    return 0 if bot_conversations.count.zero?
    bot_handoffs_count.to_f / bot_conversations.count * 100
  end
 end
@@ -1,30 +0,0 @@
 class V2::Reports::Conversations::BaseReportBuilder
  pattr_initialize :account, :params
  private
  AVG_METRICS = %w[avg_first_response_time avg_resolution_time reply_time].freeze
  COUNT_METRICS = %w[
    conversations_count
    incoming_messages_count
    outgoing_messages_count
    resolutions_count
    bot_resolutions_count
    bot_handoffs_count
  ].freeze
  def builder_class(metric)
    case metric
    when *AVG_METRICS
      V2::Reports::Timeseries::AverageReportBuilder
    when *COUNT_METRICS
      V2::Reports::Timeseries::CountReportBuilder
    end
  end
  def log_invalid_metric
    Rails.logger.error "ReportBuilder: Invalid metric - #{params[:metric]}"
    {}
  end
 end
@@ -1,30 +0,0 @@
 class V2::Reports::Conversations::MetricBuilder < V2::Reports::Conversations::BaseReportBuilder
  def summary
    {
      conversations_count: count('conversations_count'),
      incoming_messages_count: count('incoming_messages_count'),
      outgoing_messages_count: count('outgoing_messages_count'),
      avg_first_response_time: count('avg_first_response_time'),
      avg_resolution_time: count('avg_resolution_time'),
      resolutions_count: count('resolutions_count'),
      reply_time: count('reply_time')
    }
  end
  def bot_summary
    {
      bot_resolutions_count: count('bot_resolutions_count'),
      bot_handoffs_count: count('bot_handoffs_count')
    }
  end
  private
  def count(metric)
    builder_class(metric).new(account, builder_params(metric)).aggregate_value
  end
  def builder_params(metric)
    params.merge({ metric: metric })
  end
 end
@@ -1,21 +0,0 @@
 class V2::Reports::Conversations::ReportBuilder < V2::Reports::Conversations::BaseReportBuilder
  def timeseries
    perform_action(:timeseries)
  end
  def aggregate_value
    perform_action(:aggregate_value)
  end
  private
  def perform_action(method_name)
    return builder.new(account, params).public_send(method_name) if builder.present?
    log_invalid_metric
  end
  def builder
    builder_class(params[:metric])
  end
 end
@@ -1,48 +0,0 @@
 class V2::Reports::Timeseries::AverageReportBuilder < V2::Reports::Timeseries::BaseTimeseriesBuilder
  def timeseries
    grouped_average_time = reporting_events.average(average_value_key)
    grouped_event_count = reporting_events.count
    grouped_average_time.each_with_object([]) do |element, arr|
      event_date, average_time = element
      arr << {
        value: average_time,
        timestamp: event_date.in_time_zone(timezone).to_i,
        count: grouped_event_count[event_date]
      }
    end
  end
  def aggregate_value
    object_scope.average(average_value_key)
  end
  private
  def event_name
    metric_to_event_name = {
      avg_first_response_time: :first_response,
      avg_resolution_time: :conversation_resolved,
      reply_time: :reply_time
    }
    metric_to_event_name[params[:metric].to_sym]
  end
  def object_scope
    scope.reporting_events.where(name: event_name, created_at: range)
  end
  def reporting_events
    @grouped_values = object_scope.group_by_period(
      group_by,
      :created_at,
      default_value: 0,
      range: range,
      permit: %w[day week month year hour],
      time_zone: timezone
    )
  end
  def average_value_key
    @average_value_key ||= params[:business_hours].present? ? :value_in_business_hours : :value
  end
 end
@@ -1,46 +0,0 @@
 class V2::Reports::Timeseries::BaseTimeseriesBuilder
  include TimezoneHelper
  include DateRangeHelper
  DEFAULT_GROUP_BY = 'day'.freeze
  pattr_initialize :account, :params
  def scope
    case params[:type].to_sym
    when :account
      account
    when :inbox
      inbox
    when :agent
      user
    when :label
      label
    when :team
      team
    end
  end
  def inbox
    @inbox ||= account.inboxes.find(params[:id])
  end
  def user
    @user ||= account.users.find(params[:id])
  end
  def label
    @label ||= account.labels.find(params[:id])
  end
  def team
    @team ||= account.teams.find(params[:id])
  end
  def group_by
    @group_by ||= %w[day week month year hour].include?(params[:group_by]) ? params[:group_by] : DEFAULT_GROUP_BY
  end
  def timezone
    @timezone ||= timezone_name_from_offset(params[:timezone_offset])
  end
 end
@@ -1,71 +0,0 @@
 class V2::Reports::Timeseries::CountReportBuilder < V2::Reports::Timeseries::BaseTimeseriesBuilder
  def timeseries
    grouped_count.each_with_object([]) do |element, arr|
      event_date, event_count = element
      # The `event_date` is in Date format (without time), such as "Wed, 15 May 2024".
      # We need a timestamp for the start of the day. However, we can't use `event_date.to_time.to_i`
      # because it converts the date to 12:00 AM server timezone.
      # The desired output should be 12:00 AM in the specified timezone.
      arr << { value: event_count, timestamp: event_date.in_time_zone(timezone).to_i }
    end
  end
  def aggregate_value
    object_scope.count
  end
  private
  def metric
    @metric ||= params[:metric]
  end
  def object_scope
    send("scope_for_#{metric}")
  end
  def scope_for_conversations_count
    scope.conversations.where(account_id: account.id, created_at: range)
  end
  def scope_for_incoming_messages_count
    scope.messages.where(account_id: account.id, created_at: range).incoming.unscope(:order)
  end
  def scope_for_outgoing_messages_count
    scope.messages.where(account_id: account.id, created_at: range).outgoing.unscope(:order)
  end
  def scope_for_resolutions_count
    scope.reporting_events.joins(:conversation).select(:conversation_id).where(
      name: :conversation_resolved,
      conversations: { status: :resolved }, created_at: range
    ).distinct
  end
  def scope_for_bot_resolutions_count
    scope.reporting_events.joins(:conversation).select(:conversation_id).where(
      name: :conversation_bot_resolved,
      conversations: { status: :resolved }, created_at: range
    ).distinct
  end
  def scope_for_bot_handoffs_count
    scope.reporting_events.joins(:conversation).select(:conversation_id).where(
      name: :conversation_bot_handoff,
      created_at: range
    ).distinct
  end
  def grouped_count
    @grouped_values = object_scope.group_by_period(
      group_by,
      :created_at,
      default_value: 0,
      range: range,
      permit: %w[day week month year hour],
      time_zone: timezone
    ).count
  end
 end
@@ -19,7 +19,7 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
      account: Current.account
    )
-    @agent = builder.perform
+    builder.perform
  end
  def update
@@ -21,6 +21,6 @@ class Api::V1::Accounts::BulkActionsController < Api::V1::Accounts::BaseControll
  end
  def permitted_params
-    params.permit(:type, :snoozed_until, ids: [], fields: [:status, :assignee_id, :team_id], labels: [add: [], remove: []])
+    params.permit(:type, ids: [], fields: [:status, :assignee_id, :team_id], labels: [add: [], remove: []])
  end
 end
@@ -2,9 +2,13 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
  before_action :authorize_request
  def create
-    process_create
+    ActiveRecord::Base.transaction do
-  rescue StandardError => e
+      authenticate_twilio
-    render_could_not_create_error(e.message)
+      build_inbox
      setup_webhooks if @twilio_channel.sms?
    rescue StandardError => e
      render_could_not_create_error(e.message)
    end
  end
  private
@@ -13,14 +17,6 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
    authorize ::Inbox
  end
  def process_create
    ActiveRecord::Base.transaction do
      authenticate_twilio
      build_inbox
      setup_webhooks if @twilio_channel.sms?
    end
  end
  def authenticate_twilio
    client = if permitted_params[:api_key_sid].present?
               Twilio::REST::Client.new(permitted_params[:api_key_sid], permitted_params[:auth_token], permitted_params[:account_sid])
@@ -46,8 +46,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
  def export
    column_names = params['column_names']
-    filter_params = { :payload => params.permit!['payload'], :label => params.permit!['label'] }
+    Account::ContactsExportJob.perform_later(Current.account.id, column_names, Current.user.email)
    Account::ContactsExportJob.perform_later(Current.account.id, Current.user.id, column_names, filter_params)
    head :ok, message: I18n.t('errors.contacts.export.success')
  end
@@ -62,14 +61,10 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
  def show; end
  def filter
-    result = ::Contacts::FilterService.new(Current.account, Current.user, params.permit!).perform
+    result = ::Contacts::FilterService.new(params.permit!, current_user).perform
    contacts = result[:contacts]
    @contacts_count = result[:count]
    @contacts = fetch_contacts(contacts)
  rescue CustomExceptions::CustomFilter::InvalidAttribute,
         CustomExceptions::CustomFilter::InvalidOperator,
         CustomExceptions::CustomFilter::InvalidValue => e
    render_could_not_create_error(e.message)
  end
  def contactable_inboxes
@@ -1,28 +0,0 @@
 class Api::V1::Accounts::Conversations::DraftMessagesController < Api::V1::Accounts::Conversations::BaseController
  def show
    render json: { has_draft: false } and return unless Redis::Alfred.exists?(draft_redis_key)
    draft_message = Redis::Alfred.get(draft_redis_key)
    render json: { has_draft: true, message: draft_message }
  end
  def update
    Redis::Alfred.set(draft_redis_key, draft_message_params)
    head :ok
  end
  def destroy
    Redis::Alfred.delete(draft_redis_key)
    head :ok
  end
  private
  def draft_redis_key
    format(Redis::Alfred::CONVERSATION_DRAFT_MESSAGE, id: @conversation.id)
  end
  def draft_message_params
    params.dig(:draft_message, :message) || ''
  end
 end
@@ -36,18 +36,10 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    end
  end
  def update
    @conversation.update!(permitted_update_params)
  end
  def filter
    result = ::Conversations::FilterService.new(params.permit!, current_user).perform
    @conversations = result[:conversations]
    @conversations_count = result[:count]
  rescue CustomExceptions::CustomFilter::InvalidAttribute,
         CustomExceptions::CustomFilter::InvalidOperator,
         CustomExceptions::CustomFilter::InvalidValue => e
    render_could_not_create_error(e.message)
  end
  def mute
@@ -118,11 +110,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
  private
  def permitted_update_params
    # TODO: Move the other conversation attributes to this method and remove specific endpoints for each attribute
    params.permit(:priority)
  end
  def update_last_seen_on_conversation(last_seen_at, update_assignee)
    # rubocop:disable Rails/SkipsModelValidations
    @conversation.update_column(:agent_last_seen_at, last_seen_at)
@@ -189,5 +176,3 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    @conversation.assignee_id? && Current.user == @conversation.assignee
  end
 end
 Api::V1::Accounts::ConversationsController.prepend_mod_with('Api::V1::Accounts::ConversationsController')
@@ -1,32 +0,0 @@
 class Api::V1::Accounts::Google::AuthorizationsController < Api::V1::Accounts::BaseController
  include GoogleConcern
  before_action :check_authorization
  def create
    email = params[:authorization][:email]
    redirect_url = google_client.auth_code.authorize_url(
      {
        redirect_uri: "#{base_url}/google/callback",
        scope: 'email profile https://mail.google.com/',
        response_type: 'code',
        prompt: 'consent', # the oauth flow does not return a refresh token, this is supposed to fix it
        access_type: 'offline', # the default is 'online'
        client_id: GlobalConfigService.load('GOOGLE_OAUTH_CLIENT_ID', nil)
      }
    )
    if redirect_url
      cache_key = "google::#{email.downcase}"
      ::Redis::Alfred.setex(cache_key, Current.account.id, 5.minutes)
      render json: { success: true, url: redirect_url }
    else
      render json: { success: false }, status: :unprocessable_entity
    end
  end
  private
  def check_authorization
    raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
  end
 end
@@ -10,7 +10,7 @@ class Api::V1::Accounts::Integrations::AppsController < Api::V1::Accounts::BaseC
  private
  def fetch_apps
-    @apps = Integrations::App.all.select { |app| app.active?(Current.account) }
+    @apps = Integrations::App.all.select(&:active?)
  end
  def fetch_app
@@ -1,22 +0,0 @@
 class Api::V1::Accounts::Integrations::CaptainController < Api::V1::Accounts::BaseController
  before_action :check_admin_authorization?
  before_action :fetch_hook
  def sso_url
    params_string =
      "token=#{URI.encode_www_form_component(@hook['settings']['access_token'])}" \
      "&email=#{URI.encode_www_form_component(@hook['settings']['account_email'])}" \
      "&account_id=#{URI.encode_www_form_component(@hook['settings']['account_id'])}"
    installation_config = InstallationConfig.find_by(name: 'CAPTAIN_APP_URL')
    sso_url = "#{installation_config.value}/sso?#{params_string}"
    render json: { sso_url: sso_url }, status: :ok
  end
  private
  def fetch_hook
    @hook = Current.account.hooks.find_by!(app_id: 'captain')
  end
 end
@@ -1,93 +0,0 @@
 class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::BaseController
  before_action :fetch_conversation, only: [:link_issue, :linked_issues]
  def teams
    teams = linear_processor_service.teams
    if teams[:error]
      render json: { error: teams[:error] }, status: :unprocessable_entity
    else
      render json: teams[:data], status: :ok
    end
  end
  def team_entities
    team_id = permitted_params[:team_id]
    team_entities = linear_processor_service.team_entities(team_id)
    if team_entities[:error]
      render json: { error: team_entities[:error] }, status: :unprocessable_entity
    else
      render json: team_entities[:data], status: :ok
    end
  end
  def create_issue
    issue = linear_processor_service.create_issue(permitted_params)
    if issue[:error]
      render json: { error: issue[:error] }, status: :unprocessable_entity
    else
      render json: issue[:data], status: :ok
    end
  end
  def link_issue
    issue_id = permitted_params[:issue_id]
    title = permitted_params[:title]
    issue = linear_processor_service.link_issue(conversation_link, issue_id, title)
    if issue[:error]
      render json: { error: issue[:error] }, status: :unprocessable_entity
    else
      render json: issue[:data], status: :ok
    end
  end
  def unlink_issue
    link_id = permitted_params[:link_id]
    issue = linear_processor_service.unlink_issue(link_id)
    if issue[:error]
      render json: { error: issue[:error] }, status: :unprocessable_entity
    else
      render json: issue[:data], status: :ok
    end
  end
  def linked_issues
    issues = linear_processor_service.linked_issues(conversation_link)
    if issues[:error]
      render json: { error: issues[:error] }, status: :unprocessable_entity
    else
      render json: issues[:data], status: :ok
    end
  end
  def search_issue
    render json: { error: 'Specify search string with parameter q' }, status: :unprocessable_entity if params[:q].blank? && return
    term = params[:q]
    issues = linear_processor_service.search_issue(term)
    if issues[:error]
      render json: { error: issues[:error] }, status: :unprocessable_entity
    else
      render json: issues[:data], status: :ok
    end
  end
  private
  def conversation_link
    "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{Current.account.id}/conversations/#{@conversation.display_id}"
  end
  def fetch_conversation
    @conversation = Current.account.conversations.find_by!(display_id: permitted_params[:conversation_id])
  end
  def linear_processor_service
    Integrations::Linear::ProcessorService.new(account: Current.account)
  end
  def permitted_params
    params.permit(:team_id, :project_id, :conversation_id, :issue_id, :link_id, :title, :description, :assignee_id, :priority, label_ids: [])
  end
 end
@@ -12,8 +12,8 @@ class Api::V1::Accounts::Microsoft::AuthorizationsController < Api::V1::Accounts
      }
    )
    if redirect_url
-      cache_key = "microsoft::#{email.downcase}"
+      email = email.downcase
-      ::Redis::Alfred.setex(cache_key, Current.account.id, 5.minutes)
+      ::Redis::Alfred.setex(email, Current.account.id, 5.minutes)
      render json: { success: true, url: redirect_url }
    else
      render json: { success: false }, status: :unprocessable_entity
@@ -33,10 +33,10 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
  end
  def transcript
-    if conversation.present? && conversation.contact.present? && conversation.contact.email.present?
+    if permitted_params[:email].present? && conversation.present?
      ConversationReplyMailer.with(account: conversation.account).conversation_transcript(
        conversation,
-        conversation.contact.email
+        permitted_params[:email]
      )&.deliver_later
    end
    head :ok
@@ -5,17 +5,13 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
  before_action :check_authorization
  def index
-    builder = V2::Reports::Conversations::ReportBuilder.new(Current.account, report_params)
+    builder = V2::ReportBuilder.new(Current.account, report_params)
-    data = builder.timeseries
+    data = builder.build
    render json: data
  end
  def summary
-    render json: build_summary(:summary)
+    render json: summary_metrics
  end
  def bot_summary
    render json: build_summary(:bot_summary)
  end
  def agents
@@ -52,11 +48,6 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
    render json: conversation_metrics
  end
  def bot_metrics
    bot_metrics = V2::Reports::BotMetricsBuilder.new(Current.account, params).metrics
    render json: bot_metrics
  end
  private
  def generate_csv(filename, template)
@@ -124,11 +115,10 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
    }
  end
-  def build_summary(method)
+  def summary_metrics
-    builder = V2::Reports::Conversations::MetricBuilder
+    summary = V2::ReportBuilder.new(Current.account, current_summary_params).summary
-    current_summary = builder.new(Current.account, current_summary_params).send(method)
+    summary[:previous] = V2::ReportBuilder.new(Current.account, previous_summary_params).summary
-    previous_summary = builder.new(Current.account, previous_summary_params).send(method)
+    summary
    current_summary.merge(previous: previous_summary)
  end
  def conversation_metrics
@@ -25,4 +25,3 @@ class ApplicationController < ActionController::Base
    }
  end
 end
 ApplicationController.include_mod_with('Concerns::ApplicationControllerConcern')
@@ -1,6 +1,6 @@
 module AccessTokenAuthHelper
  BOT_ACCESSIBLE_ENDPOINTS = {
-    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create update],
+    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create],
    'api/v1/accounts/conversations/messages' => ['create'],
    'api/v1/accounts/conversations/assignments' => ['create']
  }.freeze
@@ -1,5 +0,0 @@
 module DomainHelper
  def self.chatwoot_domain?(domain = request.host)
    [URI.parse(ENV.fetch('FRONTEND_URL', '')).host, URI.parse(ENV.fetch('HELPCENTER_URL', '')).host].include?(domain)
  end
 end
@@ -1,20 +0,0 @@
 module GoogleConcern
  extend ActiveSupport::Concern
  def google_client
    app_id = GlobalConfigService.load('GOOGLE_OAUTH_CLIENT_ID', nil)
    app_secret = GlobalConfigService.load('GOOGLE_OAUTH_CLIENT_SECRET', nil)
    ::OAuth2::Client.new(app_id, app_secret, {
                           site: 'https://oauth2.googleapis.com',
                           authorize_url: 'https://accounts.google.com/o/oauth2/auth',
                           token_url: 'https://accounts.google.com/o/oauth2/token'
                         })
  end
  private
  def base_url
    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
  end
 end
@@ -2,10 +2,7 @@ module MicrosoftConcern
  extend ActiveSupport::Concern
  def microsoft_client
-    app_id = GlobalConfigService.load('AZURE_APP_ID', nil)
+    ::OAuth2::Client.new(ENV.fetch('AZURE_APP_ID', nil), ENV.fetch('AZURE_APP_SECRET', nil),
    app_secret = GlobalConfigService.load('AZURE_APP_SECRET', nil)
    ::OAuth2::Client.new(app_id, app_secret,
                         {
                           site: 'https://login.microsoftonline.com',
                           authorize_url: 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize',
@@ -15,6 +12,10 @@ module MicrosoftConcern
  private
  def parsed_body
    @parsed_body ||= Rack::Utils.parse_nested_query(@response.raw_response.body)
  end
  def base_url
    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
  end
@@ -6,7 +6,6 @@ module SwitchLocale
  def switch_locale(&)
    # priority is for locale set in query string (mostly for widget/from js sdk)
    locale ||= locale_from_params
    locale ||= locale_from_custom_domain
    # if locale is not set in account, let's use DEFAULT_LOCALE env variable
    locale ||= locale_from_env_variable
    set_locale(locale, &)
@@ -17,20 +16,6 @@ module SwitchLocale
    set_locale(locale, &)
  end
  # If the request is coming from a custom domain, it should be for a helpcenter portal
  # We will use the portal locale in such cases
  def locale_from_custom_domain(&)
    return if params[:locale]
    domain = request.host
    return if DomainHelper.chatwoot_domain?(domain)
    @portal = Portal.find_by(custom_domain: domain)
    return unless @portal
    @portal.default_locale
  end
  def set_locale(locale, &)
    # if locale is empty, use default_locale
    locale ||= I18n.default_locale
@@ -3,7 +3,6 @@ class DashboardController < ActionController::Base
  before_action :set_application_pack
  before_action :set_global_config
  before_action :set_dashboard_scripts
  around_action :switch_locale
  before_action :ensure_installation_onboarding, only: [:index]
  before_action :render_hc_if_custom_domain, only: [:index]
@@ -19,7 +18,6 @@ class DashboardController < ActionController::Base
      'LOGO', 'LOGO_DARK', 'LOGO_THUMBNAIL',
      'INSTALLATION_NAME',
      'WIDGET_BRAND_URL', 'TERMS_URL',
      'BRAND_URL', 'BRAND_NAME',
      'PRIVACY_URL',
      'DISPLAY_MANIFEST',
      'CREATE_NEW_ACCOUNT_FROM_DASHBOARD',
@@ -36,10 +34,6 @@ class DashboardController < ActionController::Base
    ).merge(app_config)
  end
  def set_dashboard_scripts
    @dashboard_scripts = sensitive_path? ? nil : GlobalConfig.get_value('DASHBOARD_SCRIPTS')
  end
  def ensure_installation_onboarding
    redirect_to '/installation/onboarding' if ::Redis::Alfred.get(::Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)
  end
@@ -63,7 +57,7 @@ class DashboardController < ActionController::Base
      FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
      FACEBOOK_API_VERSION: GlobalConfigService.load('FACEBOOK_API_VERSION', 'v17.0'),
      IS_ENTERPRISE: ChatwootApp.enterprise?,
-      AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),
+      AZURE_APP_ID: ENV.fetch('AZURE_APP_ID', ''),
      GIT_SHA: GIT_HASH
    }
  end
@@ -75,14 +69,4 @@ class DashboardController < ActionController::Base
                          'application'
                        end
  end
  def sensitive_path?
    # dont load dashboard scripts on sensitive paths like password reset
    sensitive_paths = [edit_user_password_path].freeze
    # remove app prefix
    current_path = request.path.gsub(%r{^/app}, '')
    sensitive_paths.include?(current_path)
  end
 end
@@ -5,7 +5,7 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
  skip_before_action :authenticate_user!, raise: false
  def create
-    @user = User.from_email(params[:email])
+    @user = User.find_by(email: params[:email])
    if @user
      @user.send_reset_password_instructions
      build_response(I18n.t('messages.reset_password_success'), 200)
@@ -4,10 +4,6 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
  wrap_parameters format: []
  before_action :process_sso_auth_token, only: [:create]
  def new
    redirect_to login_page_url(error: 'access-denied')
  end
  def create
    # Authenticate user via the temporary sso auth token
    if params[:sso_auth_token].present? && @resource.present?
@@ -25,12 +21,6 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
  private
  def login_page_url(error: nil)
    frontend_url = ENV.fetch('FRONTEND_URL', nil)
    "#{frontend_url}/app/login?error=#{error}"
  end
  def authenticate_resource_with_sso_token
    @token = @resource.create_token
    @resource.save!
@@ -43,7 +33,7 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
  def process_sso_auth_token
    return if params[:email].blank?
-    user = User.from_email(params[:email])
+    user = User.find_by(email: params[:email])
    @resource = user if user&.valid_sso_auth_token?(params[:sso_auth_token])
  end
 end
@@ -1,18 +0,0 @@
 class Google::CallbacksController < OauthCallbackController
  include GoogleConcern
  private
  def provider_name
    'google'
  end
  def imap_address
    'imap.gmail.com'
  end
  def oauth_client
    # from GoogleConcern
    google_client
  end
 end
@@ -1,17 +1,77 @@
-class Microsoft::CallbacksController < OauthCallbackController
+class Microsoft::CallbacksController < ApplicationController
  include MicrosoftConcern
  def show
    @response = microsoft_client.auth_code.get_token(
      oauth_code,
      redirect_uri: "#{base_url}/microsoft/callback"
    )
    inbox = find_or_create_inbox
    ::Redis::Alfred.delete(users_data['email'].downcase)
    redirect_to app_microsoft_inbox_agents_url(account_id: account.id, inbox_id: inbox.id)
  rescue StandardError => e
    ChatwootExceptionTracker.new(e).capture_exception
    redirect_to '/'
  end
  private
-  def oauth_client
+  def oauth_code
-    microsoft_client
+    params[:code]
  end
-  def provider_name
+  def users_data
-    'microsoft'
+    decoded_token = JWT.decode parsed_body[:id_token], nil, false
    decoded_token[0]
  end
-  def imap_address
+  def parsed_body
-    'outlook.office365.com'
+    @parsed_body ||= @response.response.parsed
  end
  def account_id
    ::Redis::Alfred.get(users_data['email'].downcase)
  end
  def account
    @account ||= Account.find(account_id)
  end
  def find_or_create_inbox
    channel_email = Channel::Email.find_by(email: users_data['email'], account: account)
    channel_email ||= create_microsoft_channel_with_inbox
    update_microsoft_channel(channel_email)
    channel_email.inbox
  end
  # Fallback name, for when name field is missing from users_data
  def fallback_name
    users_data['email'].split('@').first.parameterize.titleize
  end
  def create_microsoft_channel_with_inbox
    ActiveRecord::Base.transaction do
      channel_email = Channel::Email.create!(email: users_data['email'], account: account)
      account.inboxes.create!(
        account: account,
        channel: channel_email,
        name: users_data['name'] || fallback_name
      )
      channel_email
    end
  end
  def update_microsoft_channel(channel_email)
    channel_email.update!({
                            imap_login: users_data['email'], imap_address: 'outlook.office365.com',
                            imap_port: '993', imap_enabled: true,
                            provider: 'microsoft',
                            provider_config: {
                              access_token: parsed_body['access_token'],
                              refresh_token: parsed_body['refresh_token'],
                              expires_on: (Time.current.utc + 1.hour).to_s
                            }
                          })
  end
 end
@@ -12,6 +12,6 @@ class MicrosoftController < ApplicationController
  end
  def microsoft_indentity
-    @identity_json = GlobalConfigService.load('AZURE_APP_ID', nil)
+    @identity_json = ENV.fetch('AZURE_APP_ID', nil)
  end
 end
@@ -1,108 +0,0 @@
 class OauthCallbackController < ApplicationController
  def show
    @response = oauth_client.auth_code.get_token(
      oauth_code,
      redirect_uri: "#{base_url}/#{provider_name}/callback"
    )
    handle_response
    ::Redis::Alfred.delete(cache_key)
  rescue StandardError => e
    ChatwootExceptionTracker.new(e).capture_exception
    redirect_to '/'
  end
  private
  def handle_response
    inbox, already_exists = find_or_create_inbox
    if already_exists
      redirect_to app_email_inbox_settings_url(account_id: account.id, inbox_id: inbox.id)
    else
      redirect_to app_email_inbox_agents_url(account_id: account.id, inbox_id: inbox.id)
    end
  end
  def find_or_create_inbox
    channel_email = Channel::Email.find_by(email: users_data['email'], account: account)
    # we need this value to know where to redirect on sucessful processing of the callback
    channel_exists = channel_email.present?
    channel_email ||= create_channel_with_inbox
    update_channel(channel_email)
    # reauthorize channel, this code path only triggers when microsoft auth is successful
    # reauthorized will also update cache keys for the associated inbox
    channel_email.reauthorized!
    [channel_email.inbox, channel_exists]
  end
  def update_channel(channel_email)
    channel_email.update!({
                            imap_login: users_data['email'], imap_address: imap_address,
                            imap_port: '993', imap_enabled: true,
                            provider: provider_name,
                            provider_config: {
                              access_token: parsed_body['access_token'],
                              refresh_token: parsed_body['refresh_token'],
                              expires_on: (Time.current.utc + 1.hour).to_s
                            }
                          })
  end
  def provider_name
    raise NotImplementedError
  end
  def oauth_client
    raise NotImplementedError
  end
  def cache_key
    "#{provider_name}::#{users_data['email'].downcase}"
  end
  def create_channel_with_inbox
    ActiveRecord::Base.transaction do
      channel_email = Channel::Email.create!(email: users_data['email'], account: account)
      account.inboxes.create!(
        account: account,
        channel: channel_email,
        name: users_data['name'] || fallback_name
      )
      channel_email
    end
  end
  def users_data
    decoded_token = JWT.decode parsed_body[:id_token], nil, false
    decoded_token[0]
  end
  def account_id
    ::Redis::Alfred.get(cache_key)
  end
  def account
    @account ||= Account.find(account_id)
  end
  # Fallback name, for when name field is missing from users_data
  def fallback_name
    users_data['email'].split('@').first.parameterize.titleize
  end
  def oauth_code
    params[:code]
  end
  def base_url
    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
  end
  def parsed_body
    @parsed_body ||= @response.response.parsed
  end
 end
@@ -8,7 +8,7 @@ class Platform::Api::V1::UsersController < PlatformController
  def show; end
  def create
-    @resource = (User.from_email(user_params[:email]) || User.new(user_params))
+    @resource = (User.find_by(email: user_params[:email]) || User.new(user_params))
    @resource.skip_confirmation!
    @resource.save!
    @platform_app.platform_app_permissibles.find_or_create_by!(permissible: @resource)
@@ -7,7 +7,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  def index
    @articles = @portal.articles
-    search_articles
+    @articles = @articles.search(list_params) if list_params.present?
    order_by_sort_param
    @articles.page(list_params[:page]) if list_params[:page].present?
  end
@@ -16,10 +16,6 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  private
  def search_articles
    @articles = @articles.search(list_params) if list_params.present?
  end
  def order_by_sort_param
    @articles = if list_params[:sort].present? && list_params[:sort] == 'views'
                  @articles.order_by_views
@@ -55,5 +51,3 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
    ChatwootMarkdownRenderer.new(content).render_article
  end
 end
 Public::Api::V1::Portals::ArticlesController.prepend_mod_with('Public::Api::V1::Portals::ArticlesController')
@@ -47,7 +47,7 @@ class Public::Api::V1::Portals::BaseController < PublicController
    @locale = if article.category.present?
                article.category.locale
              else
-                article.portal.default_locale
+                'en'
              end
    I18n.with_locale(@locale, &)
@@ -6,12 +6,6 @@ class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseControl
  def show; end
  def sitemap
    @help_center_url = @portal.custom_domain || ChatwootApp.help_center_root
    # if help_center_url does not contain a protocol, prepend it with https
    @help_center_url = "https://#{@help_center_url}" unless @help_center_url.include?('://')
  end
  private
  def portal
@@ -8,7 +8,8 @@ class PublicController < ActionController::Base
  def ensure_custom_domain_request
    domain = request.host
-    return if DomainHelper.chatwoot_domain?(domain)
+
    return if [URI.parse(ENV.fetch('FRONTEND_URL', '')).host, URI.parse(ENV.fetch('HELPCENTER_URL', '')).host].include?(domain)
    @portal = ::Portal.find_by(custom_domain: domain)
    return if @portal.present?
@@ -35,12 +35,10 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
    @allowed_configs = case @config
                       when 'facebook'
                         %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET IG_VERIFY_TOKEN FACEBOOK_API_VERSION ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT]
                       when 'microsoft'
                         %w[AZURE_APP_ID AZURE_APP_SECRET]
                       when 'email'
                         ['MAILER_INBOUND_EMAIL_DOMAIN']
                       else
-                         %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS]
+                         %w[ENABLE_ACCOUNT_SIGNUP]
                       end
  end
 end
@@ -5,10 +5,6 @@
 # If you want to add pagination or other controller-level concerns,
 # you're free to overwrite the RESTful controller actions.
 class SuperAdmin::ApplicationController < Administrate::ApplicationController
  include ActionView::Helpers::TagHelper
  include ActionView::Context
  helper_method :render_vue_component
  # authenticiation done via devise : SuperAdmin Model
  before_action :authenticate_super_admin!
@@ -27,17 +23,6 @@ class SuperAdmin::ApplicationController < Administrate::ApplicationController
  private
  def render_vue_component(component_name, props = {})
    html_options = {
      id: 'app',
      data: {
        component_name: component_name,
        props: props.to_json
      }
    }
    content_tag(:div, '', html_options)
  end
  def invalid_action_perfomed
    # rubocop:disable Rails/I18nLocaleTexts
    flash[:error] = 'Invalid action performed'
@@ -10,15 +10,14 @@ class AsyncDispatcher < BaseDispatcher
  def listeners
    [
      AutomationRuleListener.instance,
      CampaignListener.instance,
      CsatSurveyListener.instance,
      HookListener.instance,
      InstallationWebhookListener.instance,
      NotificationListener.instance,
      ParticipationListener.instance,
      ReportingEventListener.instance,
-      WebhookListener.instance
+      WebhookListener.instance,
      AutomationRuleListener.instance
    ]
  end
 end
@@ -163,14 +163,10 @@ class ConversationFinder
    params[:page] || 1
  end
-  def conversations_base_query
+  def conversations
-    @conversations.includes(
+    @conversations = @conversations.includes(
      :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox
    )
  end
  def conversations
    @conversations = conversations_base_query
    sort_by, sort_order = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['last_activity_at_desc']
    @conversations = @conversations.send(sort_by, sort_order)
@@ -182,4 +178,3 @@ class ConversationFinder
    end
  end
 end
 ConversationFinder.prepend_mod_with('ConversationFinder')
@@ -1,7 +1,7 @@
 module Api::V2::Accounts::ReportsHelper
  def generate_agents_report
    Current.account.users.map do |agent|
-      agent_report = report_builder({ type: :agent, id: agent.id }).summary
+      agent_report = generate_report({ type: :agent, id: agent.id })
      [agent.name] + generate_readable_report_metrics(agent_report)
    end
  end
@@ -15,7 +15,7 @@ module Api::V2::Accounts::ReportsHelper
  def generate_teams_report
    Current.account.teams.map do |team|
-      team_report = report_builder({ type: :team, id: team.id }).summary
+      team_report = generate_report({ type: :team, id: team.id })
      [team.name] + generate_readable_report_metrics(team_report)
    end
  end
@@ -27,7 +27,7 @@ module Api::V2::Accounts::ReportsHelper
    end
  end
-  def report_builder(report_params)
+  def generate_report(report_params)
    V2::ReportBuilder.new(
      Current.account,
      report_params.merge(
@@ -37,11 +37,7 @@ module Api::V2::Accounts::ReportsHelper
          business_hours: ActiveModel::Type::Boolean.new.cast(params[:business_hours])
        }
      )
-    )
+    ).short_summary
  end
  def generate_report(report_params)
    report_builder(report_params).short_summary
  end
  private
@@ -50,9 +46,7 @@ module Api::V2::Accounts::ReportsHelper
    [
      report_metric[:conversations_count],
      Reports::TimeFormatPresenter.new(report_metric[:avg_first_response_time]).format,
-      Reports::TimeFormatPresenter.new(report_metric[:avg_resolution_time]).format,
+      Reports::TimeFormatPresenter.new(report_metric[:avg_resolution_time]).format
      Reports::TimeFormatPresenter.new(report_metric[:reply_time]).format,
      report_metric[:resolutions_count]
    ]
  end
 end
@@ -2,11 +2,4 @@ module ApplicationHelper
  def available_locales_with_name
    LANGUAGES_CONFIG.map { |_key, val| val.slice(:name, :iso_639_1_code) }
  end
  def feature_help_urls
    features = YAML.safe_load(Rails.root.join('config/features.yml').read).freeze
    features.each_with_object({}) do |feature, hash|
      hash[feature['name']] = feature['help_url'] if feature['help_url']
    end
  end
 end
@@ -1,83 +0,0 @@
 module ContactHelper
  def parse_name(full_name)
    #  If the input is nil or not a string, return a hash with all values set to nil
    return default_name_hash if invalid_name?(full_name)
    # If the input is a number, return a hash with the number as the first name
    return numeric_name_hash(full_name) if valid_number?(full_name)
    full_name = full_name.squish
    # If full name consists of only one word, consider it as the first name
    return single_word_name_hash(full_name) if single_word?(full_name)
    parts = split_name(full_name)
    parts = handle_conjunction(parts)
    build_name_hash(parts)
  end
  private
  def default_name_hash
    { first_name: nil, last_name: nil, middle_name: nil, prefix: nil, suffix: nil }
  end
  def invalid_name?(full_name)
    !full_name.is_a?(String) || full_name.empty?
  end
  def numeric_name_hash(full_name)
    { first_name: full_name, last_name: nil, middle_name: nil, prefix: nil, suffix: nil }
  end
  def valid_number?(full_name)
    full_name.gsub(/\s+/, '').match?(/\A\+?\d+\z/)
  end
  def single_word_name_hash(full_name)
    { first_name: full_name, last_name: nil, middle_name: nil, prefix: nil, suffix: nil }
  end
  def single_word?(full_name)
    full_name.split.size == 1
  end
  def split_name(full_name)
    full_name.split
  end
  def handle_conjunction(parts)
    conjunctions = ['and', '&']
    parts.each_index do |i|
      next unless conjunctions.include?(parts[i]) && i.positive?
      parts[i - 1] = [parts[i - 1], parts[i + 1]].join(' ')
      parts.delete_at(i)
      parts.delete_at(i)
    end
    parts
  end
  def build_name_hash(parts)
    suffix = parts.pop if parts.last.match?(/(\w+\.|[IVXLM]+|[A-Z]+)$/)
    last_name = parts.pop
    prefix = parts.shift if parts.first.match?(/^\w+\./)
    first_name = parts.shift
    middle_name = parts.join(' ')
    hash = {
      first_name: first_name,
      last_name: last_name,
      prefix: prefix,
      middle_name: middle_name,
      suffix: suffix
    }
    # Reverse name if "," was used in Last, First notation.
    if hash[:first_name] =~ /,$/
      hash[:first_name] = hash[:last_name]
      hash[:last_name] = Regexp.last_match.pre_match
    end
    hash
  end
 end
@@ -1,84 +0,0 @@
 module FilterHelper
  def build_condition_query(model_filters, query_hash, current_index)
    current_filter = model_filters[query_hash['attribute_key']]
    # Throw InvalidOperator Error if the attribute is a standard attribute
    # and the operator is not allowed in the config
    if current_filter.present? && current_filter['filter_operators'].exclude?(query_hash[:filter_operator])
      raise CustomExceptions::CustomFilter::InvalidOperator.new(
        attribute_name: query_hash['attribute_key'],
        allowed_keys: current_filter['filter_operators']
      )
    end
    # Every other filter expects a value to be present
    if %w[is_present is_not_present].exclude?(query_hash[:filter_operator]) && query_hash['values'].blank?
      raise CustomExceptions::CustomFilter::InvalidValue.new(attribute_name: query_hash['attribute_key'])
    end
    condition_query = build_condition_query_string(current_filter, query_hash, current_index)
    # The query becomes empty only when it doesn't match to any supported
    # standard attribute or custom attribute defined in the account.
    if condition_query.empty?
      raise CustomExceptions::CustomFilter::InvalidAttribute.new(key: query_hash['attribute_key'],
                                                                 allowed_keys: model_filters.keys)
    end
    condition_query
  end
  def build_condition_query_string(current_filter, query_hash, current_index)
    filter_operator_value = filter_operation(query_hash, current_index)
    return handle_nil_filter(query_hash, current_index) if current_filter.nil?
    case current_filter['attribute_type']
    when 'additional_attributes'
      handle_additional_attributes(query_hash, filter_operator_value, current_filter['data_type'])
    else
      handle_standard_attributes(current_filter, query_hash, current_index, filter_operator_value)
    end
  end
  def handle_nil_filter(query_hash, current_index)
    attribute_type = "#{filter_config[:entity].downcase}_attribute"
    custom_attribute_query(query_hash, attribute_type, current_index)
  end
  def handle_additional_attributes(query_hash, filter_operator_value, data_type)
    if data_type == 'text_case_insensitive'
      "LOWER(#{filter_config[:table_name]}.additional_attributes ->> '#{query_hash[:attribute_key]}') " \
        "#{filter_operator_value} #{query_hash[:query_operator]}"
    else
      "#{filter_config[:table_name]}.additional_attributes ->> '#{query_hash[:attribute_key]}' " \
        "#{filter_operator_value} #{query_hash[:query_operator]} "
    end
  end
  def handle_standard_attributes(current_filter, query_hash, current_index, filter_operator_value)
    case current_filter['data_type']
    when 'date'
      date_filter(current_filter, query_hash, filter_operator_value)
    when 'labels'
      tag_filter_query(query_hash, current_index)
    when 'text_case_insensitive'
      text_case_insensitive_filter(query_hash, filter_operator_value)
    else
      default_filter(query_hash, filter_operator_value)
    end
  end
  def date_filter(current_filter, query_hash, filter_operator_value)
    "(#{filter_config[:table_name]}.#{query_hash[:attribute_key]})::#{current_filter['data_type']} " \
      "#{filter_operator_value}#{current_filter['data_type']} #{query_hash[:query_operator]}"
  end
  def text_case_insensitive_filter(query_hash, filter_operator_value)
    "LOWER(#{filter_config[:table_name]}.#{query_hash[:attribute_key]}) " \
      "#{filter_operator_value} #{query_hash[:query_operator]}"
  end
  def default_filter(query_hash, filter_operator_value)
    "#{filter_config[:table_name]}.#{query_hash[:attribute_key]} #{filter_operator_value} #{query_hash[:query_operator]}"
  end
 end
@@ -32,14 +32,6 @@ module ReportHelper
    (get_grouped_values resolutions).count
  end
  def bot_resolutions_count
    (get_grouped_values bot_resolutions).count
  end
  def bot_handoffs_count
    (get_grouped_values bot_handoffs).count
  end
  def conversations
    scope.conversations.where(account_id: account.id, created_at: range)
  end
@@ -57,16 +49,6 @@ module ReportHelper
                                                                               conversations: { status: :resolved }, created_at: range).distinct
  end
  def bot_resolutions
    scope.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_resolved,
                                                                               conversations: { status: :resolved }, created_at: range).distinct
  end
  def bot_handoffs
    scope.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_handoff,
                                                                               created_at: range).distinct
  end
  def avg_first_response_time
    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'first_response', account_id: account.id))
    return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
@@ -1,19 +0,0 @@
 module TimezoneHelper
  # ActiveSupport TimeZone is not aware of the current time, so ActiveSupport::Timezone[offset]
  # would return the timezone without considering day light savings. To get the correct timezone,
  # this method uses zone.now.utc_offset for comparison as referenced in the issues below
  #
  # https://github.com/rails/rails/pull/22243
  # https://github.com/rails/rails/issues/21501
  # https://github.com/rails/rails/issues/7297
  def timezone_name_from_offset(offset)
    return 'UTC' if offset.blank?
    offset_in_seconds = offset.to_f * 3600
    matching_zone = ActiveSupport::TimeZone.all.find do |zone|
      zone.now.utc_offset == offset_in_seconds
    end
    return matching_zone.name if matching_zone
  end
 end
@@ -0,0 +1,11 @@
 import App from './App';
 import '../../test-matchers';
 describe(`App component`, () => {
  it(`should be a component`, () => {
    // Arrange
    // Act
    expect(App).toBeVueComponent('App');
    // Assert
  });
 });
@@ -1,6 +1,32 @@
 <template>
  <div
    v-if="!authUIFlags.isFetching && !accountUIFlags.isFetchingItem"
    id="app"
    class="flex-grow-0 w-full h-full min-h-0 app-wrapper"
    :class="{ 'app-rtl--wrapper': isRTLView }"
    :dir="isRTLView ? 'rtl' : 'ltr'"
  >
    <update-banner :latest-chatwoot-version="latestChatwootVersion" />
    <template v-if="currentAccountId">
      <pending-email-verification-banner v-if="hideOnOnboardingView" />
      <payment-pending-banner v-if="hideOnOnboardingView" />
      <upgrade-banner />
    </template>
    <transition name="fade" mode="out-in">
      <router-view />
    </transition>
    <add-account-modal
      :show="showAddAccountModal"
      :has-accounts="hasAccounts"
    />
    <woot-snackbar-box />
    <network-notification />
  </div>
  <loading-state v-else />
 </template>
 <script>
 import { mapGetters } from 'vuex';
 import router from '../dashboard/routes';
 import AddAccountModal from '../dashboard/components/layout/sidebarComponents/AddAccountModal.vue';
 import LoadingState from './components/widgets/LoadingState.vue';
 import NetworkNotification from './components/NetworkNotification.vue';
@@ -10,13 +36,13 @@ import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
 import PendingEmailVerificationBanner from './components/app/PendingEmailVerificationBanner.vue';
 import vueActionCable from './helper/actionCable';
 import WootSnackbarBox from './components/SnackbarContainer.vue';
 import rtlMixin from 'shared/mixins/rtlMixin';
 import { setColorTheme } from './helper/themeHelper';
 import { isOnOnboardingView } from 'v3/helpers/RouteHelper';
 import {
  registerSubscription,
  verifyServiceWorkerExistence,
 } from './helper/pushHelper';
 import ReconnectService from 'dashboard/helper/ReconnectService';
 export default {
  name: 'App',
@@ -31,19 +57,21 @@ export default {
    UpgradeBanner,
    PendingEmailVerificationBanner,
  },
  mixins: [rtlMixin],
  data() {
    return {
      showAddAccountModal: false,
      latestChatwootVersion: null,
      reconnectService: null,
    };
  },
  computed: {
    ...mapGetters({
      getAccount: 'accounts/getAccount',
      isRTL: 'accounts/isRTL',
      currentUser: 'getCurrentUser',
      globalConfig: 'globalConfig/get',
      authUIFlags: 'getAuthUIFlags',
      accountUIFlags: 'accounts/getUIFlags',
      currentAccountId: 'getCurrentAccountId',
@@ -74,11 +102,6 @@ export default {
    this.listenToThemeChanges();
    this.setLocale(window.chatwootConfig.selectedLocale);
  },
  beforeDestroy() {
    if (this.reconnectService) {
      this.reconnectService.disconnect();
    }
  },
  methods: {
    initializeColorTheme() {
      setColorTheme(window.matchMedia('(prefers-color-scheme: dark)').matches);
@@ -99,9 +122,9 @@ export default {
        this.getAccount(this.currentAccountId);
      const { pubsub_token: pubsubToken } = this.currentUser || {};
      this.setLocale(locale);
      this.updateRTLDirectionView(locale);
      this.latestChatwootVersion = latestChatwootVersion;
      vueActionCable.init(pubsubToken);
      this.reconnectService = new ReconnectService(this.$store, router);
      verifyServiceWorkerExistence(registration =>
        registration.pushManager.getSubscription().then(subscription => {
@@ -115,30 +138,6 @@ export default {
 };
 </script>
 <template>
  <div
    v-if="!authUIFlags.isFetching && !accountUIFlags.isFetchingItem"
    id="app"
    class="flex-grow-0 w-full h-full min-h-0 app-wrapper"
    :class="{ 'app-rtl--wrapper': isRTL }"
    :dir="isRTL ? 'rtl' : 'ltr'"
  >
    <UpdateBanner :latest-chatwoot-version="latestChatwootVersion" />
    <template v-if="currentAccountId">
      <PendingEmailVerificationBanner v-if="hideOnOnboardingView" />
      <PaymentPendingBanner v-if="hideOnOnboardingView" />
      <UpgradeBanner />
    </template>
    <transition name="fade" mode="out-in">
      <router-view />
    </transition>
    <AddAccountModal :show="showAddAccountModal" :has-accounts="hasAccounts" />
    <WootSnackbarBox />
    <NetworkNotification />
  </div>
  <LoadingState v-else />
 </template>
 <style lang="scss">
@import './assets/scss/app';
 </style>
@@ -9,13 +9,6 @@ class AccountAPI extends ApiClient {
  createAccount(data) {
    return axios.post(`${this.apiVersion}/accounts`, data);
  }
  async getCacheKeys() {
    const response = await axios.get(
      `/api/v1/accounts/${this.accountIdFromRoute}/cache_keys`
    );
    return response.data.cache_keys;
  }
 }
 export default new AccountAPI();
@@ -1,14 +0,0 @@
 /* global axios */
 import ApiClient from '../ApiClient';
 class MicrosoftClient extends ApiClient {
  constructor() {
    super('google', { accountScoped: true });
  }
  generateAuthorization(payload) {
    return axios.post(`${this.url}/authorization`, payload);
  }
 }
 export default new MicrosoftClient();
@@ -77,8 +77,8 @@ class ContactAPI extends ApiClient {
    return axios.delete(`${this.url}/${contactId}/avatar`);
  }
-  exportContacts(queryPayload) {
+  exportContacts() {
-    return axios.post(`${this.url}/export`, queryPayload);
+    return axios.get(`${this.url}/export`);
  }
 }
@@ -15,10 +15,10 @@ describe('#enterpriseAccountAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -15,7 +15,6 @@ class ConversationApi extends ApiClient {
    teamId,
    conversationType,
    sortBy,
    updatedWithin,
  }) {
    return axios.get(this.url, {
      params: {
@@ -27,7 +26,6 @@ class ConversationApi extends ApiClient {
        labels,
        conversation_type: conversationType,
        sort_by: sortBy,
        updated_within: updatedWithin,
      },
    });
  }
@@ -32,10 +32,6 @@ class IntegrationsAPI extends ApiClient {
  deleteHook(hookId) {
    return axios.delete(`${this.baseUrl()}/integrations/hooks/${hookId}`);
  }
  fetchCaptainURL() {
    return axios.get(`${this.baseUrl()}/integrations/captain/sso_url`);
  }
 }
 export default new IntegrationsAPI();
@@ -1,47 +0,0 @@
 /* global axios */
 import ApiClient from '../ApiClient';
 class LinearAPI extends ApiClient {
  constructor() {
    super('integrations/linear', { accountScoped: true });
  }
  getTeams() {
    return axios.get(`${this.url}/teams`);
  }
  getTeamEntities(teamId) {
    return axios.get(`${this.url}/team_entities?team_id=${teamId}`);
  }
  createIssue(data) {
    return axios.post(`${this.url}/create_issue`, data);
  }
  link_issue(conversationId, issueId, title) {
    return axios.post(`${this.url}/link_issue`, {
      issue_id: issueId,
      conversation_id: conversationId,
      title: title,
    });
  }
  getLinkedIssue(conversationId) {
    return axios.get(
      `${this.url}/linked_issues?conversation_id=${conversationId}`
    );
  }
  unlinkIssue(linkId) {
    return axios.post(`${this.url}/unlink_issue`, {
      link_id: linkId,
    });
  }
  searchIssues(query) {
    return axios.get(`${this.url}/search_issue?q=${query}`);
  }
 }
 export default new LinearAPI();
@@ -84,24 +84,6 @@ class ReportsAPI extends ApiClient {
      params: { since, until, business_hours: businessHours },
    });
  }
  getBotMetrics({ from, to } = {}) {
    return axios.get(`${this.url}/bot_metrics`, {
      params: { since: from, until: to },
    });
  }
  getBotSummary({ from, to, groupBy, businessHours } = {}) {
    return axios.get(`${this.url}/bot_summary`, {
      params: {
        since: from,
        until: to,
        type: 'account',
        group_by: groupBy,
        business_hours: businessHours,
      },
    });
  }
 }
 export default new ReportsAPI();
@@ -1,78 +0,0 @@
 /* global axios */
 import ApiClient from './ApiClient';
 class SLAReportsAPI extends ApiClient {
  constructor() {
    super('applied_slas', { accountScoped: true });
  }
  get({
    from,
    to,
    assigned_agent_id,
    inbox_id,
    team_id,
    sla_policy_id,
    label_list,
    page,
  } = {}) {
    return axios.get(this.url, {
      params: {
        since: from,
        until: to,
        assigned_agent_id,
        inbox_id,
        team_id,
        sla_policy_id,
        label_list,
        page,
      },
    });
  }
  download({
    from,
    to,
    assigned_agent_id,
    inbox_id,
    team_id,
    sla_policy_id,
    label_list,
  } = {}) {
    return axios.get(`${this.url}/download`, {
      params: {
        since: from,
        until: to,
        assigned_agent_id,
        inbox_id,
        team_id,
        label_list,
        sla_policy_id,
      },
    });
  }
  getMetrics({
    from,
    to,
    assigned_agent_id,
    inbox_id,
    team_id,
    label_list,
    sla_policy_id,
  } = {}) {
    return axios.get(`${this.url}/metrics`, {
      params: {
        since: from,
        until: to,
        assigned_agent_id,
        inbox_id,
        label_list,
        team_id,
        sla_policy_id,
      },
    });
  }
 }
 export default new SLAReportsAPI();
@@ -15,10 +15,10 @@ describe('#accountAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -10,10 +10,10 @@ describe('#ContactsAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -14,7 +14,7 @@ describe('#AgentAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -14,10 +14,10 @@ describe('#PortalAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -44,10 +44,10 @@ describe('#PortalAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -71,10 +71,10 @@ describe('#PortalAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -98,10 +98,10 @@ describe('#PortalAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -129,10 +129,10 @@ describe('#PortalAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -4,10 +4,10 @@ describe('#AssignableAgentsAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -13,10 +13,10 @@ describe('#FBChannel', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -17,10 +17,10 @@ describe('#ContactsAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -16,10 +16,10 @@ describe('#ConversationApi', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -11,10 +11,10 @@ describe('#Reports API', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -24,10 +24,10 @@ describe('#ConversationAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -46,7 +46,6 @@ describe('#ConversationAPI', () => {
        page: 1,
        labels: [],
        teamId: 1,
        updatedWithin: 20,
      });
      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/conversations', {
        params: {
@@ -56,7 +55,6 @@ describe('#ConversationAPI', () => {
          assignee_type: 'me',
          page: 1,
          labels: [],
          updated_within: 20,
        },
      });
    });
@@ -15,10 +15,10 @@ describe('#ConversationAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -17,10 +17,10 @@ describe('#InboxesAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -18,10 +18,10 @@ describe('#integrationAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -11,10 +11,10 @@ describe('#accountAPI', () => {
  describe('createAMeeting', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -39,10 +39,10 @@ describe('#accountAPI', () => {
  describe('addParticipantToMeeting', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
@@ -1,202 +0,0 @@
 import LinearAPIClient from '../../integrations/linear';
 import ApiClient from '../../ApiClient';
 describe('#linearAPI', () => {
  it('creates correct instance', () => {
    expect(LinearAPIClient).toBeInstanceOf(ApiClient);
    expect(LinearAPIClient).toHaveProperty('getTeams');
    expect(LinearAPIClient).toHaveProperty('getTeamEntities');
    expect(LinearAPIClient).toHaveProperty('createIssue');
    expect(LinearAPIClient).toHaveProperty('link_issue');
    expect(LinearAPIClient).toHaveProperty('getLinkedIssue');
    expect(LinearAPIClient).toHaveProperty('unlinkIssue');
    expect(LinearAPIClient).toHaveProperty('searchIssues');
  });
  describe('getTeams', () => {
    const originalAxios = window.axios;
    const axiosMock = {
      post: vi.fn(() => Promise.resolve()),
      get: vi.fn(() => Promise.resolve()),
      patch: vi.fn(() => Promise.resolve()),
      delete: vi.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
      window.axios = axiosMock;
    });
    afterEach(() => {
      window.axios = originalAxios;
    });
    it('creates a valid request', () => {
      LinearAPIClient.getTeams();
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/integrations/linear/teams'
      );
    });
  });
  describe('getTeamEntities', () => {
    const originalAxios = window.axios;
    const axiosMock = {
      post: vi.fn(() => Promise.resolve()),
      get: vi.fn(() => Promise.resolve()),
      patch: vi.fn(() => Promise.resolve()),
      delete: vi.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
      window.axios = axiosMock;
    });
    afterEach(() => {
      window.axios = originalAxios;
    });
    it('creates a valid request', () => {
      LinearAPIClient.getTeamEntities(1);
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/integrations/linear/team_entities?team_id=1'
      );
    });
  });
  describe('createIssue', () => {
    const originalAxios = window.axios;
    const axiosMock = {
      post: vi.fn(() => Promise.resolve()),
      get: vi.fn(() => Promise.resolve()),
      patch: vi.fn(() => Promise.resolve()),
      delete: vi.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
      window.axios = axiosMock;
    });
    afterEach(() => {
      window.axios = originalAxios;
    });
    it('creates a valid request', () => {
      const issueData = {
        title: 'New Issue',
        description: 'Issue description',
      };
      LinearAPIClient.createIssue(issueData);
      expect(axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/integrations/linear/create_issue',
        issueData
      );
    });
  });
  describe('link_issue', () => {
    const originalAxios = window.axios;
    const axiosMock = {
      post: vi.fn(() => Promise.resolve()),
      get: vi.fn(() => Promise.resolve()),
      patch: vi.fn(() => Promise.resolve()),
      delete: vi.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
      window.axios = axiosMock;
    });
    afterEach(() => {
      window.axios = originalAxios;
    });
    it('creates a valid request', () => {
      LinearAPIClient.link_issue(1, 2);
      expect(axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/integrations/linear/link_issue',
        {
          issue_id: 2,
          conversation_id: 1,
        }
      );
    });
  });
  describe('getLinkedIssue', () => {
    const originalAxios = window.axios;
    const axiosMock = {
      post: vi.fn(() => Promise.resolve()),
      get: vi.fn(() => Promise.resolve()),
      patch: vi.fn(() => Promise.resolve()),
      delete: vi.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
      window.axios = axiosMock;
    });
    afterEach(() => {
      window.axios = originalAxios;
    });
    it('creates a valid request', () => {
      LinearAPIClient.getLinkedIssue(1);
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/integrations/linear/linked_issues?conversation_id=1'
      );
    });
  });
  describe('unlinkIssue', () => {
    const originalAxios = window.axios;
    const axiosMock = {
      post: vi.fn(() => Promise.resolve()),
      get: vi.fn(() => Promise.resolve()),
      patch: vi.fn(() => Promise.resolve()),
      delete: vi.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
      window.axios = axiosMock;
    });
    afterEach(() => {
      window.axios = originalAxios;
    });
    it('creates a valid request', () => {
      LinearAPIClient.unlinkIssue(1);
      expect(axiosMock.post).toHaveBeenCalledWith(
        '/api/v1/integrations/linear/unlink_issue',
        {
          link_id: 1,
        }
      );
    });
  });
  describe('searchIssues', () => {
    const originalAxios = window.axios;
    const axiosMock = {
      post: vi.fn(() => Promise.resolve()),
      get: vi.fn(() => Promise.resolve()),
      patch: vi.fn(() => Promise.resolve()),
      delete: vi.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
      window.axios = axiosMock;
    });
    afterEach(() => {
      window.axios = originalAxios;
    });
    it('creates a valid request', () => {
      LinearAPIClient.searchIssues('query');
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/integrations/linear/search_issue?q=query'
      );
    });
  });
 });
@@ -13,10 +13,10 @@ describe('#NotificationAPI', () => {
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
+      post: jest.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Chatwoot BotandShivam Mishra	4bfc2da19a	chore: Update translations (#8983 )	2024-02-22 12:18:55 +05:30
Vishnu Narayanan Shivam Mishra Sivin Varghese	6a1eb799a4	feat(ee): Add support for SLA in automation rules (#8910 ) Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>	2024-02-22 12:18:55 +05:30
Sojan Jose Shivam Mishra Pranav	2ad9cd2055	feat: Ability to block contacts permanently (#8922 ) Co-authored-by: Pranav <pranav@chatwoot.com>	2024-02-22 12:18:54 +05:30