refactor: find_or_build_for_multiple_conversations

fix: resolved condition for message_builder
feat: handle conversation query order
2024-04-03 18:09:41 +05:30 · 2024-04-03 18:07:40 +05:30 · 2024-04-03 18:02:46 +05:30 · 2024-04-03 18:01:50 +05:30 · 2024-04-03 15:32:11 +05:30 · 2024-04-02 17:59:47 +05:30
3598 changed files with 86808 additions and 137104 deletions
@@ -1,87 +1,84 @@
-version: 2.1
+# Ruby CircleCI 2.0 configuration file
-orbs:
+#
-  node: circleci/node@6.1.0
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
-
+#
 version: 2
 defaults: &defaults
  working_directory: ~/build
-  machine:
+  docker:
-    image: ubuntu-2204:2024.05.1
+    # specify the version you desire here
-  resource_class: large
+    - image: cimg/ruby:3.2.2-browsers
    # Specify service dependencies here if necessary
    # CircleCI maintains a library of pre-built images
    # documented at https://circleci.com/docs/2.0/circleci-images/
    - image: cimg/postgres:15.3
    - image: cimg/redis:6.2.6
  environment:
-    RAILS_LOG_TO_STDOUT: false
+    - RAILS_LOG_TO_STDOUT: false
-    COVERAGE: true
+    - COVERAGE: true
-    LOG_LEVEL: warn
+    - LOG_LEVEL: warn
  parallelism: 4
  resource_class: large
 jobs:
  build:
    <<: *defaults
    steps:
      - checkout
      - node/install:
          node-version: '20.12'
      - node/install-pnpm
      - node/install-packages:
          pkg-manager: pnpm
          override-ci-command: pnpm i
      - run: node --version
      - run: pnpm --version
      - run:
-          name: Install System Dependencies
+          name: Configure Bundler
          command: |
-            sudo apt-get update
+            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
-            DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
+            source $BASH_ENV
              libpq-dev \
              redis-server \
              postgresql \
              build-essential \
              git \
              curl \
              libssl-dev \
              zlib1g-dev \
              libreadline-dev \
              libyaml-dev \
              openjdk-11-jdk \
              jq \
              software-properties-common \
              ca-certificates \
              imagemagick \
              libxml2-dev \
              libxslt1-dev \
              file \
              g++ \
              gcc \
              autoconf \
              gnupg2 \
              patch \
              ruby-dev \
              liblzma-dev \
              libgmp-dev \
              libncurses5-dev \
              libffi-dev \
              libgdbm6 \
              libgdbm-dev \
              libvips
      - run:
          name: Install RVM and Ruby 3.3.3
          command: |
            sudo apt-get install -y gpg
            gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
            \curl -sSL https://get.rvm.io | bash -s stable
            echo 'source ~/.rvm/scripts/rvm' >> $BASH_ENV
            source ~/.rvm/scripts/rvm
            rvm install "3.3.3"
            rvm use 3.3.3 --default
            gem install bundler
      - run:
-          name: Install Application Dependencies
+          name: Which bundler?
          command: bundle -v
      - run:
          name: Swap node versions
          command: |
-            source ~/.rvm/scripts/rvm
+            set +e
-            bundle install
+            wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
-            # pnpm install
+            export NVM_DIR="$HOME/.nvm"
            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
            [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
            nvm install v20
            echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV
            echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
      # Run bundler
      # Load installed gems from cache if possible, bundle install then save cache
      # Multiple caches are used to increase the chance of a cache hit
      - restore_cache:
          keys:
            - chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-v20220524-{{ checksum "Gemfile.lock" }}
      - run: bundle install --frozen --path ~/.bundle
      - save_cache:
          paths:
            - ~/.bundle
          key: chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-v20220524-{{ checksum "Gemfile.lock" }}
      # Only necessary if app uses webpacker or yarn in some other way
      - restore_cache:
          keys:
            - chatwoot-yarn-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
            - chatwoot-yarn-
      - run:
          name: yarn
          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
      # Store yarn / webpacker cache
      - save_cache:
          key: chatwoot-yarn-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
          paths:
            - ~/.cache/yarn
      - run:
          name: Download cc-test-reporter
@@ -89,8 +86,12 @@ jobs:
            mkdir -p ~/tmp
            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ~/tmp/cc-test-reporter
            chmod +x ~/tmp/cc-test-reporter
      - persist_to_workspace:
          root: ~/tmp
          paths:
            - cc-test-reporter
-      # Swagger verification
+      # verify swagger specification
      - run:
          name: Verify swagger API specification
          command: |
@@ -103,62 +104,48 @@ jobs:
            curl -L https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar > ~/tmp/openapi-generator-cli-6.3.0.jar
            java -jar ~/tmp/openapi-generator-cli-6.3.0.jar validate -i swagger/swagger.json
      # we remove the FRONTED_URL from the .env before running the tests
      - run:
          name: Database Setup and Configure Environment Variables
          command: |
            pg_pass=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 15 ; echo '')
            sed -i "s/REPLACE_WITH_PASSWORD/${pg_pass}/g" ${PWD}/.circleci/setup_chatwoot.sql
            chmod 644 ${PWD}/.circleci/setup_chatwoot.sql
            mv ${PWD}/.circleci/setup_chatwoot.sql /tmp/
            sudo -i -u postgres psql -f /tmp/setup_chatwoot.sql
            cp .env.example .env
            sed -i '/^FRONTEND_URL/d' .env
            sed -i -e '/REDIS_URL/ s/=.*/=redis:\/\/localhost:6379/' .env
            sed -i -e '/POSTGRES_HOST/ s/=.*/=localhost/' .env
            sed -i -e '/POSTGRES_USERNAME/ s/=.*/=chatwoot/' .env
            sed -i -e "/POSTGRES_PASSWORD/ s/=.*/=$pg_pass/" .env
            echo -en "\nINSTALLATION_ENV=circleci" >> ".env"
      # Database setup
-      - run:
+      - run: bundle exec rake db:create
-          name: Run DB migrations
+      - run: bundle exec rake db:schema:load
          command: bundle exec rails db:chatwoot_prepare
      # Bundle audit
      - run:
          name: Bundle audit
          command: bundle exec bundle audit update && bundle exec bundle audit check -v
      # Rubocop linting
      - run:
          name: Rubocop
          command: bundle exec rubocop
-      # ESLint linting
+      # - run:
      #     name: Brakeman
      #     command: bundle exec brakeman
      - run:
          name: eslint
-          command: pnpm run eslint
+          command: yarn run eslint
      # Run frontend tests
      - run:
          name: Run frontend tests
          command: |
-            mkdir -p ~/build/coverage/frontend
+            mkdir -p ~/tmp/test-results/frontend_specs
            ~/tmp/cc-test-reporter before-build
-            pnpm run 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 (Frontend)
+          name: Code Climate Test Coverage
          command: |
-            ~/tmp/cc-test-reporter format-coverage -t lcov -o "~/build/coverage/frontend/codeclimate.frontend_$CIRCLE_NODE_INDEX.json"
+            ~/tmp/cc-test-reporter format-coverage -t lcov -o "coverage/codeclimate.frontend_$CIRCLE_NODE_INDEX.json"
-      # Run backend tests
+      # Run rails tests
      - run:
          name: Run backend tests
          command: |
            mkdir -p ~/tmp/test-results/rspec
            mkdir -p ~/tmp/test-artifacts
-            mkdir -p ~/build/coverage/backend
+            mkdir -p coverage
            ~/tmp/cc-test-reporter before-build
            TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
            bundle exec rspec --format progress \
@@ -166,18 +153,54 @@ jobs:
                              --out ~/tmp/test-results/rspec.xml \
                              -- ${TESTFILES}
          no_output_timeout: 30m
      - run:
-          name: Code Climate Test Coverage (Backend)
+          name: Code Climate Test Coverage
          command: |
-            ~/tmp/cc-test-reporter format-coverage -t simplecov -o "~/build/coverage/backend/codeclimate.$CIRCLE_NODE_INDEX.json"
+            ~/tmp/cc-test-reporter format-coverage -t simplecov -o "coverage/codeclimate.$CIRCLE_NODE_INDEX.json"
      - run:
          name: List coverage directory contents
          command: |
            ls -R ~/build/coverage
      - persist_to_workspace:
-          root: ~/build
+          root: coverage
          paths:
-            - coverage
+            - codeclimate.*.json
      # collect reports
      - store_test_results:
          path: ~/tmp/test-results
      - store_artifacts:
          path: ~/tmp/test-artifacts
      - store_artifacts:
          path: log
  upload-coverage:
    working_directory: ~/build
    docker:
      # specify the version you desire here
      - image: circleci/ruby:3.0.2-node-browsers
    environment:
      - CC_TEST_REPORTER_ID: caf26a895e937974a90860cfadfded20891cfd1373a5aaafb3f67406ab9d433f
    steps:
      - attach_workspace:
          at: ~/build
      - run:
          name: Download cc-test-reporter
          command: |
            mkdir -p ~/tmp
            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ~/tmp/cc-test-reporter
            chmod +x ~/tmp/cc-test-reporter
      - persist_to_workspace:
          root: ~/tmp
          paths:
            - cc-test-reporter
      - run:
          name: Upload coverage results to Code Climate
          command: |
            ~/tmp/cc-test-reporter sum-coverage --output - codeclimate.*.json |  ~/tmp/cc-test-reporter upload-coverage --debug --input -
 workflows:
  version: 2
  commit:
    jobs:
      - build
      - upload-coverage:
          requires:
            - build
@@ -1,11 +0,0 @@
 CREATE USER chatwoot CREATEDB;
 ALTER USER chatwoot PASSWORD 'REPLACE_WITH_PASSWORD';
 ALTER ROLE chatwoot SUPERUSER;
 UPDATE pg_database SET datistemplate = FALSE WHERE datname = 'template1';
 DROP DATABASE template1;
 CREATE DATABASE template1 WITH TEMPLATE = template0 ENCODING = 'UNICODE';
 UPDATE pg_database SET datistemplate = TRUE WHERE datname = 'template1';
 \c template1;
 VACUUM FREEZE;
@@ -27,8 +27,7 @@ checks:
      threshold: 50
 exclude_patterns:
  - 'spec/'
-  - '**/specs/**/**'
+  - '**/specs/'
  - '**/spec/**/**'
  - 'db/*'
  - 'bin/**/*'
  - 'db/**/*'
@@ -57,5 +56,3 @@ exclude_patterns:
  - 'app/javascript/shared/constants/locales.js'
  - 'app/javascript/dashboard/helper/specs/macrosFixtures.js'
  - 'app/javascript/dashboard/routes/dashboard/settings/macros/constants.js'
  - '**/fixtures/**'
  - '**/*/fixtures.js'
@@ -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
@@ -2,36 +2,16 @@ module.exports = {
  extends: [
    'airbnb-base/legacy',
    'prettier',
-    'plugin:vue/vue3-recommended',
+    'plugin:vue/recommended',
-    'plugin:vitest-globals/recommended',
+    'plugin:storybook/recommended',
    'plugin:cypress/recommended',
  ],
  overrides: [
    {
      files: ['**/*.spec.{j,t}s?(x)'],
      env: {
        'vitest-globals/env': true,
      },
    },
    {
      files: ['**/*.story.vue'],
      rules: {
        'vue/no-undef-components': [
          'error',
          {
            ignorePatterns: ['Variant', 'Story'],
          },
        ],
        // Story files can have static strings, it doesn't need to handle i18n always.
        'vue/no-bare-strings-in-template': 'off',
        'no-console': 'off',
      },
    },
  ],
  plugins: ['html', 'prettier'],
  parserOptions: {
-    ecmaVersion: 'latest',
+    parser: '@babel/eslint-parser',
    ecmaVersion: 2020,
    sourceType: 'module',
  },
  plugins: ['html', 'prettier', 'babel'],
  rules: {
    'prettier/prettier': ['error'],
    camelcase: 'off',
@@ -47,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',
      {
@@ -230,12 +56,19 @@ module.exports = {
    'import/extensions': ['off'],
    'no-console': 'error',
  },
  settings: {
    'import/resolver': {
      webpack: {
        config: 'config/webpack/resolve.js',
      },
    },
  },
  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,43 +0,0 @@
 name: Frontend Lint & Test
 on:
  push:
    branches:
      - develop
  pull_request:
    branches:
      - develop
 jobs:
  test:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@v4
        with:
          ref: ${{ github.event.pull_request.head.ref }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
      - uses: ruby/setup-ruby@v1
        with:
          bundler-cache: true
      - uses: pnpm/action-setup@v4
        with:
          version: 9.3.0
      - uses: actions/setup-node@v4
        with:
          node-version: 20
          cache: 'pnpm'
      - name: Install pnpm dependencies
        run: pnpm install --frozen-lockfile
      - name: Run eslint
        run: pnpm run eslint
      - name: Run frontend tests with coverage
        run: |
          mkdir -p coverage
          pnpm run test:coverage
@@ -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.
@@ -21,7 +21,7 @@ jobs:
        image: postgres:15.3
        env:
          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: ''
+          POSTGRES_PASSWORD: ""
          POSTGRES_DB: postgres
          POSTGRES_HOST_AUTH_METHOD: trust
        ports:
@@ -41,49 +41,47 @@ jobs:
        options: --entrypoint redis-server
    steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
+      with:
-        with:
+        ref: ${{ github.event.pull_request.head.ref }}
-          version: 9
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
          ref: ${{ github.event.pull_request.head.ref }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
-      - uses: ruby/setup-ruby@v1
+    - uses: ruby/setup-ruby@v1
-        with:
+      with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v4
-        with:
+      with:
-          node-version: 20
+        node-version: 20
-          cache: 'pnpm'
+        cache: yarn
-      - name: Install pnpm dependencies
+    - name: yarn
-        run: pnpm i
+      run: yarn install
-      - name: Strip enterprise code
+    - name: Strip enterprise code
-        run: |
+      run: |
-          rm -rf enterprise
+        rm -rf enterprise
-          rm -rf spec/enterprise
+        rm -rf spec/enterprise
-      - name: Create database
+    - name: Create database
-        run: bundle exec rake db:create
+      run: bundle exec rake db:create
-      - name: Seed database
+    - name: Seed database
-        run: bundle exec rake db:schema:load
+      run: bundle exec rake db:schema:load
-      - name: Run frontend tests
+    - name: yarn check-files
-        run: pnpm run test:coverage
+      run: yarn install --check-files
-      # Run rails tests
+    # Run rails tests
-      - name: Run backend tests
+    - name: Run backend tests
-        run: |
+      run: |
-          bundle exec rspec --profile=10 --format documentation
+        bundle exec rspec --profile=10 --format documentation
-        env:
+      env:
-          NODE_OPTIONS: --openssl-legacy-provider
+        NODE_OPTIONS: --openssl-legacy-provider
-      - name: Upload rails log folder
+    - name: Upload rails log folder
-        uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v4
-        if: always()
+      if: always()
-        with:
+      with:
-          name: rails-log-folder
+        name: rails-log-folder
-          path: log
+        path: log
@@ -49,17 +49,13 @@ jobs:
      with:
        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
    - uses: pnpm/action-setup@v2
      with:
        version: 9.3.0
    - uses: actions/setup-node@v4
      with:
        node-version: 20
-        cache: pnpm
+        cache: yarn
-    - name: pnpm
+    - name: yarn
-      run: pnpm install
+      run: yarn install
    - name: Create database
      run: bundle exec rake db:create
@@ -19,33 +19,23 @@ jobs:
        with:
          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
      - uses: pnpm/action-setup@v2
        with:
          version: 9.3.0
      - uses: actions/setup-node@v4
        with:
          node-version: 20
-          cache: 'pnpm'
+          cache: 'yarn'
-      - name: pnpm
+      - name: yarn
-        run: pnpm install
+        run: yarn install
      - name: Strip enterprise code
        run: |
          rm -rf enterprise
          rm -rf spec/enterprise
      - name: setup env
        run: |
          cp .env.example .env
      - name: Run asset compile
        run: bundle exec rake assets:precompile
        env:
-          RAILS_ENV: production
+          NODE_OPTIONS: --openssl-legacy-provider
      - name: Size Check
-        run: pnpm run size
+        run: yarn run size
@@ -32,16 +32,6 @@ master.key
 public/uploads
 public/packs*
 public/assets/administrate*
 public/assets/action*.js
 public/assets/activestorage*.js
 public/assets/trix*
 public/assets/belongs_to*.js
 public/assets/manifest*.js
 public/assets/manifest*.js
 public/assets/*.js.gz
 public/assets/secretField*
 public/assets/.sprockets-manifest-*.json
 # VIM files
 *.swp
@@ -85,8 +75,4 @@ yalc.lock
 yarn-debug.log*
 .yarn-integrity
-# Vite Ruby
+/storybook-static
 /public/vite*
 # Vite uses dotenv and suggests to ignore local-only env files. See
 # https://vitejs.dev/guide/env-and-mode.html#env-files
 *.local
@@ -1,11 +1,11 @@
-# #!/bin/sh
+#!/bin/sh
-# . "$(dirname "$0")/_/husky.sh"
+. "$(dirname "$0")/_/husky.sh"
-# # lint js and vue files
+# lint js and vue files
-# npx --no-install lint-staged
+npx --no-install lint-staged
-# # lint only staged ruby files
+# lint only staged ruby files
-# git diff --name-only --cached | xargs ls -1 2>/dev/null | grep '\.rb$' | xargs bundle exec rubocop --force-exclusion -a
+git diff --name-only --cached | xargs ls -1 2>/dev/null | grep '\.rb$' | xargs bundle exec rubocop --force-exclusion -a
-# # stage rubocop changes to files
+# stage rubocop changes to files
-# git diff --name-only --cached | xargs git add
+git diff --name-only --cached | xargs git add
@@ -1 +1 @@
-3.3.3
+3.2.2
@@ -0,0 +1,56 @@
 const path = require('path');
 const resolve = require('../config/webpack/resolve');
 // Chatwoot's webpack.config.js
 process.env.NODE_ENV = 'development';
 const custom = require('../config/webpack/environment');
 module.exports = {
  stories: [
    '../stories/**/*.stories.mdx',
    '../app/javascript/**/*.stories.@(js|jsx|ts|tsx)',
  ],
  addons: [
    {
      name: '@storybook/addon-docs',
      options: {
        vueDocgenOptions: {
          alias: {
            '@': path.resolve(__dirname, '../'),
          },
        },
      },
    },
    '@storybook/addon-links',
    '@storybook/addon-essentials',
    {
      /**
       * Fix Storybook issue with PostCSS@8
       * @see https://github.com/storybookjs/storybook/issues/12668#issuecomment-773958085
       */
      name: '@storybook/addon-postcss',
      options: {
        postcssLoaderOptions: {
          implementation: require('postcss'),
        },
      },
    },
  ],
  webpackFinal: config => {
    const newConfig = {
      ...config,
      resolve: {
        ...config.resolve,
        modules: custom.resolvedModules.map(i => i.value),
      },
    };
    newConfig.module.rules.push({
      test: /\.scss$/,
      use: ['style-loader', 'css-loader', 'postcss-loader', 'sass-loader'],
      include: path.resolve(__dirname, '../app/javascript'),
    });
    return newConfig;
  },
 };
@@ -0,0 +1,48 @@
 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';
 import WootUiKit from '../app/javascript/dashboard/components';
 import i18n from '../app/javascript/dashboard/i18n';
 import { domPurifyConfig } from 'shared/helpers/HTMLSanitizer';
 import '../app/javascript/dashboard/assets/scss/storybook.scss';
 Vue.use(VueI18n);
 Vue.use(Vuelidate);
 Vue.use(WootUiKit);
 Vue.use(Vuex);
 Vue.use(VueDOMPurifyHTML, domPurifyConfig);
 Vue.component('multiselect', Multiselect);
 Vue.component('fluent-icon', FluentIcon);
 const store = new Vuex.Store({});
 const i18nConfig = new VueI18n({
  locale: 'en',
  messages: i18n,
 });
 addDecorator(() => ({
  template: '<story/>',
  i18n: i18nConfig,
  store,
  beforeCreate: function() {
    this.$root._i18n = this.$i18n;
  },
 }));
 export const parameters = {
  actions: { argTypesRegex: '^on[A-Z].*' },
  controls: {
    matchers: {
      color: /(background|color)$/i,
      date: /Date$/,
    },
  },
 };
@@ -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 'rails', '~> 7.0.8.4'
+gem 'rails', '~> 7.0.8.1'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
@@ -49,7 +49,7 @@ gem 'aws-sdk-s3', require: false
 # original gem isn't maintained actively
 # we wanted updated version of faraday which is a dependency for slack-ruby-client
 gem 'azure-storage-blob', git: 'https://github.com/chatwoot/azure-storage-ruby', branch: 'chatwoot', require: false
-gem 'google-cloud-storage', '>= 1.48.0', require: false
+gem 'google-cloud-storage', require: false
 gem 'image_processing'
 ##-- gems for database --#
@@ -61,23 +61,23 @@ 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 'vite_rails'
+gem 'webpacker'
 # metrics on heroku
 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 ---##
@@ -96,12 +96,12 @@ gem 'koala'
 # slack client
 gem 'slack-ruby-client', '~> 2.2.0'
 # for dialogflow integrations
-gem 'google-cloud-dialogflow-v2', '>= 0.24.0'
+gem 'google-cloud-dialogflow-v2'
 gem 'grpc'
 # Translate integrations
 # 'google-cloud-translate' gem depends on faraday 2.0 version
 # this dependency breaks the slack-ruby-client gem
-gem 'google-cloud-translate-v3', '>= 0.7.0'
+gem 'google-cloud-translate-v3'
 ##-- apm and error monitoring ---#
 # loaded only when environment variables are set.
@@ -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.3'
+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,15 +175,15 @@ gem 'pgvector'
 # Convert Website HTML to Markdown
 gem 'reverse_markdown'
 # Sentiment analysis
 gem 'informers'
 ### Gems required only in specific deployment environments ###
 ##############################################################
 group :production do
  # we dont want request timing out in development while using byebug
  gem 'rack-timeout'
  # for heroku autoscaling
  gem 'judoscale-rails', require: false
  gem 'judoscale-sidekiq', require: false
 end
 group :development do
@@ -203,10 +203,12 @@ 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.3'
+  gem 'meta_request'
 end
 group :test do
  # Cypress in rails.
  gem 'cypress-on-rails'
  # fast cleaning of database
  gem 'database_cleaner'
  # mock http calls
@@ -229,7 +231,7 @@ group :development, :test do
  gem 'mock_redis'
  gem 'pry-rails'
  gem 'rspec_junit_formatter'
-  gem 'rspec-rails', '>= 6.1.5'
+  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.5)
+    actioncable (7.0.8.1)
-      actionpack (= 7.0.8.5)
+      actionpack (= 7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8.5)
+    actionmailbox (7.0.8.1)
-      actionpack (= 7.0.8.5)
+      actionpack (= 7.0.8.1)
-      activejob (= 7.0.8.5)
+      activejob (= 7.0.8.1)
-      activerecord (= 7.0.8.5)
+      activerecord (= 7.0.8.1)
-      activestorage (= 7.0.8.5)
+      activestorage (= 7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.0.8.5)
+    actionmailer (7.0.8.1)
-      actionpack (= 7.0.8.5)
+      actionpack (= 7.0.8.1)
-      actionview (= 7.0.8.5)
+      actionview (= 7.0.8.1)
-      activejob (= 7.0.8.5)
+      activejob (= 7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
      rails-dom-testing (~> 2.0)
-    actionpack (7.0.8.5)
+    actionpack (7.0.8.1)
-      actionview (= 7.0.8.5)
+      actionview (= 7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
      rack (~> 2.0, >= 2.2.4)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8.5)
+    actiontext (7.0.8.1)
-      actionpack (= 7.0.8.5)
+      actionpack (= 7.0.8.1)
-      activerecord (= 7.0.8.5)
+      activerecord (= 7.0.8.1)
-      activestorage (= 7.0.8.5)
+      activestorage (= 7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.0.8.5)
+    actionview (7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
    active_record_query_trace (1.8)
-    activejob (7.0.8.5)
+    activejob (7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
      globalid (>= 0.3.6)
-    activemodel (7.0.8.5)
+    activemodel (7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
-    activerecord (7.0.8.5)
+    activerecord (7.0.8.1)
-      activemodel (= 7.0.8.5)
+      activemodel (= 7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
    activerecord-import (1.4.1)
      activerecord (>= 4.2)
-    activestorage (7.0.8.5)
+    activestorage (7.0.8.1)
-      actionpack (= 7.0.8.5)
+      actionpack (= 7.0.8.1)
-      activejob (= 7.0.8.5)
+      activejob (= 7.0.8.1)
-      activerecord (= 7.0.8.5)
+      activerecord (= 7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
      marcel (~> 1.0)
      mini_mime (>= 1.1.0)
-    activesupport (7.0.8.5)
+    activesupport (7.0.8.1)
      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,58 +169,53 @@ GEM
    climate_control (1.2.0)
    coderay (1.1.3)
    commonmarker (0.23.10)
-    concurrent-ruby (1.3.4)
+    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)
+    cypress-on-rails (1.16.0)
-      csv (~> 3.0)
+      rack
    database_cleaner (2.0.2)
      database_cleaner-active_record (>= 2, < 3)
    database_cleaner-active_record (2.1.0)
      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.5)
+    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)
    dry-cli (1.1.0)
    ecma-re-validator (0.4.0)
      regexp_parser (~> 2.2)
    elastic-apm (4.6.2)
@@ -228,8 +223,8 @@ GEM
      http (>= 3.0)
      ruby2_keywords
    email_reply_trimmer (0.1.13)
-    erubi (1.13.0)
+    erubi (1.12.0)
-    et-orbi (1.2.11)
+    et-orbi (1.2.7)
      tzinfo
    execjs (2.8.1)
    facebook-messenger (2.0.1)
@@ -242,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)
@@ -251,12 +247,11 @@ 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)
-    faraday-retry (2.2.1)
+    faraday-retry (2.1.0)
      faraday (~> 2.0)
    fcm (1.0.8)
      faraday (>= 1.0.0, < 3.0)
@@ -267,10 +262,10 @@ GEM
      rake
    flag_shih_tzu (0.3.23)
    foreman (0.87.2)
-    fugit (1.11.1)
+    fugit (1.9.0)
-      et-orbi (~> 1, >= 1.2.11)
+      et-orbi (~> 1, >= 1.2.7)
      raabro (~> 1.4)
-    gapic-common (0.20.0)
+    gapic-common (0.18.0)
      faraday (>= 1.9, < 3.a)
      faraday-retry (>= 1.0, < 3.a)
      google-protobuf (~> 3.14)
@@ -284,73 +279,70 @@ GEM
      activesupport (>= 6.1)
    gmail_xoauth (0.4.3)
      oauth (>= 0.3.6)
-    google-apis-core (0.15.1)
+    google-apis-core (0.11.0)
      addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 1.9)
+      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.3, < 3.a)
+      httpclient (>= 2.8.1, < 3.a)
      mini_mime (~> 1.0)
      mutex_m
      representable (~> 3.0)
      retriable (>= 2.0, < 4.a)
-    google-apis-iamcredentials_v1 (0.22.0)
+      rexml
-      google-apis-core (>= 0.15.0, < 2.a)
+      webrick
-    google-apis-storage_v1 (0.47.0)
+    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.15.0, < 2.a)
+      google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.1)
+    google-apis-storage_v1 (0.19.0)
-      google-cloud-env (>= 1.0, < 3.a)
+      google-apis-core (>= 0.9.0, < 2.a)
    google-cloud-core (1.6.0)
      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
-    google-cloud-dialogflow-v2 (0.31.0)
+    google-cloud-dialogflow-v2 (0.23.0)
-      gapic-common (>= 0.20.0, < 2.a)
+      gapic-common (>= 0.18.0, < 2.a)
      google-cloud-errors (~> 1.0)
      google-cloud-location (>= 0.4, < 2.a)
-    google-cloud-env (2.2.1)
+    google-cloud-env (1.6.0)
-      faraday (>= 1.0, < 3.a)
+      faraday (>= 0.17.3, < 3.0)
    google-cloud-errors (1.3.1)
-    google-cloud-location (0.6.0)
+    google-cloud-location (0.4.0)
-      gapic-common (>= 0.20.0, < 2.a)
+      gapic-common (>= 0.17.1, < 2.a)
      google-cloud-errors (~> 1.0)
-    google-cloud-storage (1.52.0)
+    google-cloud-storage (1.44.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
-      google-apis-core (~> 0.13)
+      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (~> 0.19.0)
      google-apis-storage_v1 (~> 0.38)
      google-cloud-core (~> 1.6)
-      googleauth (~> 1.9)
+      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    google-cloud-translate-v3 (0.10.0)
+    google-cloud-translate-v3 (0.6.0)
-      gapic-common (>= 0.20.0, < 2.a)
+      gapic-common (>= 0.17.1, < 2.a)
      google-cloud-errors (~> 1.0)
-    google-protobuf (3.25.5)
+    google-protobuf (3.25.2)
-    google-protobuf (3.25.5-arm64-darwin)
+    google-protobuf (3.25.2-arm64-darwin)
-    google-protobuf (3.25.5-x86_64-darwin)
+    google-protobuf (3.25.2-x86_64-darwin)
-    google-protobuf (3.25.5-x86_64-linux)
+    google-protobuf (3.25.2-x86_64-linux)
-    googleapis-common-protos (1.6.0)
+    googleapis-common-protos (1.4.0)
-      google-protobuf (>= 3.18, < 5.a)
+      google-protobuf (~> 3.14)
-      googleapis-common-protos-types (~> 1.7)
+      googleapis-common-protos-types (~> 1.2)
-      grpc (~> 1.41)
+      grpc (~> 1.27)
-    googleapis-common-protos-types (1.14.0)
+    googleapis-common-protos-types (1.11.0)
      google-protobuf (~> 3.18)
-    googleauth (1.11.2)
+    googleauth (1.5.2)
-      faraday (>= 1.0, < 3.a)
+      faraday (>= 0.17.3, < 3.a)
      google-cloud-env (~> 2.1)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
      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)
@@ -358,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)
@@ -373,11 +366,15 @@ GEM
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
-    i18n (1.14.6)
+    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)
@@ -397,15 +394,7 @@ GEM
      hana (~> 1.3)
      regexp_parser (~> 2.0)
      uri_template (~> 0.7)
-    judoscale-rails (1.8.2)
+    jwt (2.7.0)
      judoscale-ruby (= 1.8.2)
      railties
    judoscale-ruby (1.8.2)
    judoscale-sidekiq (1.8.2)
      judoscale-ruby (= 1.8.2)
      sidekiq (>= 5.0)
    jwt (2.8.1)
      base64
    kaminari (1.2.2)
      activesupport (>= 4.1.0)
      kaminari-actionview (= 1.2.2)
@@ -428,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)
@@ -446,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)
@@ -460,33 +448,31 @@ GEM
      net-imap
      net-pop
      net-smtp
-    marcel (1.0.4)
+    marcel (1.0.2)
    maxminddb (0.1.22)
-    meta_request (0.8.3)
+    memoist (0.16.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.25.1)
+    minitest (5.21.2)
    mock_redis (0.36.0)
      ruby2_keywords
    msgpack (1.7.0)
    multi_json (1.15.0)
    multi_xml (0.6.0)
    multipart-post (2.3.0)
    mutex_m (0.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.17)
+    net-imap (0.4.9)
      date
      net-protocol
    net-pop (0.1.2)
@@ -501,16 +487,17 @@ GEM
      sidekiq
    newrelic_rpm (9.6.0)
      base64
-    nio4r (2.7.3)
+    nio4r (2.7.0)
-    nokogiri (1.16.7)
+    nokogiri (1.16.2)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.16.2-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.16.2-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.7-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)
@@ -528,18 +515,26 @@ GEM
      hashie (>= 3.4.6)
      rack (>= 2.2.3)
      rack-protection
-    omniauth-google-oauth2 (1.1.3)
+    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)
@@ -557,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.3)
+    puma (6.4.2)
      nio4r (~> 2.0)
    pundit (2.3.0)
      activesupport (>= 3.0.0)
    raabro (1.4.0)
-    racc (1.8.1)
+    racc (1.7.3)
-    rack (2.2.10)
+    rack (2.2.8.1)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
-    rack-contrib (2.5.0)
+    rack-contrib (2.4.0)
      rack (< 4)
    rack-cors (2.0.0)
      rack (>= 2.0.0)
    rack-mini-profiler (3.2.0)
      rack (>= 1.2.0)
-    rack-protection (3.2.0)
+    rack-protection (3.1.0)
      base64 (>= 0.1.0)
      rack (~> 2.2, >= 2.2.4)
-    rack-proxy (0.7.7)
+    rack-proxy (0.7.6)
      rack
    rack-test (2.1.0)
      rack (>= 1.3)
    rack-timeout (0.6.3)
-    rails (7.0.8.5)
+    rails (7.0.8.1)
-      actioncable (= 7.0.8.5)
+      actioncable (= 7.0.8.1)
-      actionmailbox (= 7.0.8.5)
+      actionmailbox (= 7.0.8.1)
-      actionmailer (= 7.0.8.5)
+      actionmailer (= 7.0.8.1)
-      actionpack (= 7.0.8.5)
+      actionpack (= 7.0.8.1)
-      actiontext (= 7.0.8.5)
+      actiontext (= 7.0.8.1)
-      actionview (= 7.0.8.5)
+      actionview (= 7.0.8.1)
-      activejob (= 7.0.8.5)
+      activejob (= 7.0.8.1)
-      activemodel (= 7.0.8.5)
+      activemodel (= 7.0.8.1)
-      activerecord (= 7.0.8.5)
+      activerecord (= 7.0.8.1)
-      activestorage (= 7.0.8.5)
+      activestorage (= 7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
      bundler (>= 1.15.0)
-      railties (= 7.0.8.5)
+      railties (= 7.0.8.1)
    rails-dom-testing (2.2.0)
      activesupport (>= 5.0.0)
      minitest
@@ -602,21 +596,21 @@ GEM
    rails-html-sanitizer (1.6.0)
      loofah (~> 2.21)
      nokogiri (~> 1.14)
-    railties (7.0.8.5)
+    railties (7.0.8.1)
-      actionpack (= 7.0.8.5)
+      actionpack (= 7.0.8.1)
-      activesupport (= 7.0.8.5)
+      activesupport (= 7.0.8.1)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
      zeitwerk (~> 2.5)
    rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.1.0)
    rb-fsevent (0.11.2)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    redis (5.0.6)
      redis-client (>= 0.9.0)
-    redis-client (0.22.2)
+    redis-client (0.19.1)
      connection_pool
    redis-namespace (1.10.0)
      redis (>= 4)
@@ -640,24 +634,24 @@ GEM
    retriable (3.1.2)
    reverse_markdown (2.1.1)
      nokogiri
-    rexml (3.3.9)
+    rexml (3.2.5)
-    rspec-core (3.13.0)
+    rspec-core (3.12.2)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.12.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.12.3)
      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 (7.0.1)
+    rspec-rails (6.0.2)
-      actionpack (>= 7.0)
+      actionpack (>= 6.1)
-      activesupport (>= 7.0)
+      activesupport (>= 6.1)
-      railties (>= 7.0)
+      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)
@@ -714,24 +708,23 @@ GEM
      activerecord (>= 4)
      activesupport (>= 4)
    selectize-rails (0.12.6)
-    sentry-rails (5.19.0)
+    semantic_range (3.0.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)
@@ -772,7 +765,7 @@ GEM
    stripe (8.5.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
@@ -797,19 +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 (5.2.6)
+    valid_email2 (4.0.6)
      activemodel (>= 3.2)
      mail (~> 2.5)
-    version_gem (1.1.4)
+    version_gem (1.1.3)
    vite_rails (3.0.17)
      railties (>= 5.1, < 8)
      vite_ruby (~> 3.0, >= 3.2.2)
    vite_ruby (3.8.0)
      dry-cli (>= 0.7, < 2)
      rack-proxy (~> 0.6, >= 0.6.1)
      zeitwerk (~> 2.2)
    warden (1.2.9)
      rack (>= 2.0.9)
    web-console (4.2.1)
@@ -817,13 +802,20 @@ 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)
    webpacker (5.4.4)
      activesupport (>= 5.2)
      rack-proxy (>= 0.6.1)
      railties (>= 5.2)
      semantic_range (>= 2.3.0)
    webrick (1.8.1)
    websocket-driver (0.7.6)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
@@ -831,7 +823,7 @@ GEM
    working_hours (1.4.1)
      activesupport (>= 3.2)
      tzinfo
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.12)
 PLATFORMS
  arm64-darwin-20
@@ -849,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,13 +858,14 @@ DEPENDENCIES
  climate_control
  commonmarker
  csv-safe
  cypress-on-rails
  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
@@ -884,9 +877,9 @@ DEPENDENCIES
  foreman
  geocoder
  gmail_xoauth
-  google-cloud-dialogflow-v2 (>= 0.24.0)
+  google-cloud-dialogflow-v2
-  google-cloud-storage (>= 1.48.0)
+  google-cloud-storage
-  google-cloud-translate-v3 (>= 0.7.0)
+  google-cloud-translate-v3
  groupdate
  grpc
  haikunator
@@ -894,11 +887,10 @@ DEPENDENCIES
  hashie
  html2text!
  image_processing
  informers
  jbuilder
  json_refs
  json_schemer
  judoscale-rails
  judoscale-sidekiq
  jwt
  kaminari
  koala
@@ -908,16 +900,16 @@ DEPENDENCIES
  listen
  lograge (~> 0.14.0)
  maxminddb
-  meta_request (>= 0.8.3)
+  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.3)
+  omniauth-google-oauth2
  omniauth-oauth2
-  omniauth-rails_csrf_protection (~> 1.0, >= 1.0.2)
+  omniauth-rails_csrf_protection (~> 1.0)
  pg
  pg_search
  pgvector
@@ -929,13 +921,13 @@ DEPENDENCIES
  rack-cors (= 2.0.0)
  rack-mini-profiler (>= 3.2.0)
  rack-timeout
-  rails (~> 7.0.8.4)
+  rails (~> 7.0.8.1)
  redis
  redis-namespace
  responders (>= 3.1.1)
  rest-client
  reverse_markdown
-  rspec-rails (>= 6.1.5)
+  rspec-rails
  rspec_junit_formatter
  rubocop
  rubocop-performance
@@ -944,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)
@@ -965,15 +957,15 @@ DEPENDENCIES
  tzinfo-data
  uglifier
  valid_email2
  vite_rails
  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
@@ -6,7 +6,7 @@ RAILS_ENV ?= development
 setup:
 	gem install bundler
 	bundle install
-	pnpm install
+	yarn install
 db_create:
 	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:create
@@ -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
@@ -30,7 +27,7 @@ server:
 	RAILS_ENV=$(RAILS_ENV) bundle exec rails server -b 0.0.0.0 -p 3000
 burn:
-	bundle && pnpm install
+	bundle && yarn
 run:
 	@if [ -f ./.overmind.sock ]; then \
@@ -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
@@ -1,4 +1,4 @@
 backend: bin/rails s -p 3000
 frontend: export NODE_OPTIONS=--openssl-legacy-provider && bin/webpack-dev-server
 # https://github.com/mperham/sidekiq/issues/3090#issuecomment-389748695
 worker: dotenv bundle exec sidekiq -C config/sidekiq.yml
 vite: bin/vite dev
@@ -1,3 +1,3 @@
 backend: RAILS_ENV=test bin/rails s -p 5050
-vite: bin/vite dev
+frontend: export NODE_OPTIONS=--openssl-legacy-provider && bin/webpack-dev-server
 worker: RAILS_ENV=test dotenv bundle exec sidekiq -C config/sidekiq.yml
@@ -1,12 +1,9 @@
 ## 🚨 Note: This branch is unstable. For the stable branch's source code, please use the branch [3.x](https://github.com/chatwoot/chatwoot/tree/3.x)
 <img src="https://user-images.githubusercontent.com/2246121/282256557-1570674b-d142-4198-9740-69404cc6a339.png#gh-light-mode-only" width="100%" alt="Chat dashboard dark mode"/>
 <img src="https://user-images.githubusercontent.com/2246121/282256632-87f6a01b-6467-4e0e-8a93-7bbf66d03a17.png#gh-dark-mode-only" width="100%" alt="Chat dashboard"/>
 ___
-# Chatwoot
+# Chatwoot 
 Customer engagement suite, an open-source alternative to Intercom, Zendesk, Salesforce Service Cloud etc.
 <p>
@@ -101,7 +98,7 @@ Chatwoot now supports 1-Click deployment to DigitalOcean as a kubernetes app.
 ### Other deployment options
-For other supported options, checkout our [deployment page](https://chatwoot.com/deploy).
+For other supported options, checkout our [deployment page](https://chatwoot.com/deploy). 
 ## Security
@@ -1 +1 @@
-3.13.0
+3.3.1
@@ -1 +1 @@
-3.0.0
+2.7.0
@@ -55,7 +55,7 @@
      "plan": "heroku-redis:mini"
    },
    {
-      "plan": "heroku-postgresql:essential-0"
+      "plan": "heroku-postgresql:mini"
    }
  ],
  "stack": "heroku-20",
@@ -2,4 +2,5 @@
 //= link administrate/application.css
 //= link administrate/application.js
 //= link administrate-field-active_storage/application.css
 //= link dashboardChart.js
 //= link secretField.js
@@ -0,0 +1,55 @@
 // eslint-disable-next-line
 function prepareData(data) {
  var labels = [];
  var dataSet = [];
  data.forEach(item => {
    labels.push(item[0]);
    dataSet.push(item[1]);
  });
  return { labels, dataSet };
 }
 function getChartOptions() {
  var fontFamily =
    'PlusJakarta,-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
  return {
    responsive: true,
    legend: { labels: { fontFamily } },
    scales: {
      xAxes: [
        {
          barPercentage: 1.26,
          ticks: { fontFamily },
          gridLines: { display: false },
        },
      ],
      yAxes: [
        {
          ticks: { fontFamily },
          gridLines: { display: false },
        },
      ],
    },
  };
 }
 // eslint-disable-next-line
 function drawSuperAdminDashboard(data) {
  var ctx = document.getElementById('dashboard-chart').getContext('2d');
  var chartData = prepareData(data);
  // eslint-disable-next-line
  new Chart(ctx, {
    type: 'bar',
    data: {
      labels: chartData.labels,
      datasets: [
        {
          label: 'Conversations',
          data: chartData.dataSet,
          backgroundColor: '#1f93ff',
        },
      ],
    },
    options: getChartOptions(),
  });
 }
@@ -86,5 +86,8 @@ $swift-ease-out-duration: .4s !default;
 $swift-ease-out-timing-function: cubic-bezier(.25, .8, .25, 1) !default;
 $swift-ease-out: all $swift-ease-out-duration $swift-ease-out-timing-function !default;
 // Ionicons
 $ionicons-font-path: '~ionicons/fonts';
 // Transitions
 $transition-ease-in: all 0.250s ease-in;
@@ -32,13 +32,11 @@ class AccountBuilder
  end
  def validate_email
    raise InvalidEmail.new({ domain_blocked: domain_blocked }) if domain_blocked?
    address = ValidEmail2::Address.new(@email)
-    if address.valid? && !address.disposable?
+    if address.valid? # && !address.disposable?
      true
    else
-      raise InvalidEmail.new({ valid: address.valid?, disposable: address.disposable? })
+      raise InvalidEmail.new(valid: address.valid?)
    end
  end
@@ -81,21 +79,4 @@ class AccountBuilder
    @user.confirm if @confirmed
    @user.save!
  end
  def domain_blocked?
    domain = @email.split('@').last
    blocked_domains.each do |blocked_domain|
      return true if domain.match?(blocked_domain)
    end
    false
  end
  def blocked_domains
    domains = GlobalConfigService.load('BLOCKED_EMAIL_DOMAINS', '')
    return [] if domains.blank?
    domains.split("\n").map(&:strip)
  end
 end
@@ -19,9 +19,9 @@ class ContactInboxWithContactBuilder
    ActiveRecord::Base.transaction(requires_new: true) do
      build_contact_with_contact_inbox
      update_contact_avatar(@contact) unless @contact.avatar.attached?
      @contact_inbox
    end
    update_contact_avatar(@contact) unless @contact.avatar.attached?
    @contact_inbox
  end
  private
@@ -86,7 +86,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
  end
  def find_or_build_for_multiple_conversations
-    last_conversation = instagram_direct_message_conversation.where.not(status: :resolved).order(created_at: :desc).first
+    last_conversation = instagram_direct_message_conversation..where.not(status: :resolved).order(created_at: :desc).first
    return build_conversation if last_conversation.nil?
@@ -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))
@@ -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,12 +19,12 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
      account: Current.account
    )
-    @agent = builder.perform
+    builder.perform
  end
  def update
    @agent.update!(agent_params.slice(:name).compact)
-    @agent.current_account_user.update!(agent_params.slice(*account_user_attributes).compact)
+    @agent.current_account_user.update!(agent_params.slice(:role, :availability, :auto_offline).compact)
  end
  def destroy
@@ -67,16 +67,8 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
    @agent = agents.find(params[:id])
  end
  def account_user_attributes
    [:role, :availability, :auto_offline]
  end
  def allowed_agent_params
    [:name, :email, :name, :role, :availability, :auto_offline]
  end
  def agent_params
-    params.require(:agent).permit(allowed_agent_params)
+    params.require(:agent).permit(:name, :email, :name, :role, :availability, :auto_offline)
  end
  def new_agent_params
@@ -109,5 +101,3 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
    DeleteObjectJob.perform_later(agent) if agent.reload.account_users.blank?
  end
 end
 Api::V1::Accounts::AgentsController.prepend_mod_with('Api::V1::Accounts::AgentsController')
@@ -6,15 +6,13 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
  def index
    @portal_articles = @portal.articles
-
+    @all_articles = @portal_articles.search(list_params)
-    set_article_count
+    @articles_count = @all_articles.count
    @articles = @articles.search(list_params)
    @articles = if list_params[:category_slug].present?
-                  @articles.order_by_position.page(@current_page)
+                  @all_articles.order_by_position.page(@current_page)
                else
-                  @articles.order_by_updated_at.page(@current_page)
+                  @all_articles.order_by_updated_at.page(@current_page)
                end
  end
@@ -45,19 +43,6 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
  private
  def set_article_count
    # Search the params without status and author_id, use this to
    # compute mine count published draft etc
    base_search_params = list_params.except(:status, :author_id)
    @articles = @portal_articles.search(base_search_params)
    @articles_count = @articles.count
    @mine_articles_count = @articles.search_by_author(Current.user.id).count
    @published_articles_count = @articles.published.count
    @draft_articles_count = @articles.draft.count
    @archived_articles_count = @articles.archived.count
  end
  def fetch_article
    @article = @portal.articles.find(params[:id])
  end
@@ -68,10 +53,9 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
  def article_params
    params.require(:article).permit(
-      :title, :slug, :position, :content, :description, :position, :category_id, :author_id, :associated_article_id, :status,
+      :title, :slug, :position, :content, :description, :position, :category_id, :author_id, :associated_article_id, :status, meta: [:title,
-      :locale, meta: [:title,
+                                                                                                                                     :description,
-                      :description,
+                                                                                                                                     { tags: [] }]
                      { tags: [] }]
    )
  end
@@ -21,6 +21,6 @@ class Api::V1::Accounts::BulkActionsController < Api::V1::Accounts::BaseControll
  end
  def permitted_params
-    params.permit(:type, :snoozed_until, ids: [], fields: [:status, :assignee_id, :team_id], labels: [add: [], remove: []])
+    params.permit(:type, ids: [], fields: [:status, :assignee_id, :team_id], labels: [add: [], remove: []])
  end
 end
@@ -46,8 +46,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
  def export
    column_names = params['column_names']
-    filter_params = { :payload => params.permit!['payload'], :label => params.permit!['label'] }
+    Account::ContactsExportJob.perform_later(Current.account.id, 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,7 +61,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
  def show; end
  def filter
-    result = ::Contacts::FilterService.new(Current.account, Current.user, params.permit!).perform
+    result = ::Contacts::FilterService.new(params.permit!, current_user).perform
    contacts = result[:contacts]
    @contacts_count = result[:count]
    @contacts = fetch_contacts(contacts)
@@ -1,28 +0,0 @@
 class Api::V1::Accounts::Conversations::DraftMessagesController < Api::V1::Accounts::Conversations::BaseController
  def show
    render json: { has_draft: false } and return unless Redis::Alfred.exists?(draft_redis_key)
    draft_message = Redis::Alfred.get(draft_redis_key)
    render json: { has_draft: true, message: draft_message }
  end
  def update
    Redis::Alfred.set(draft_redis_key, draft_message_params)
    head :ok
  end
  def destroy
    Redis::Alfred.delete(draft_redis_key)
    head :ok
  end
  private
  def draft_redis_key
    format(Redis::Alfred::CONVERSATION_DRAFT_MESSAGE, id: @conversation.id)
  end
  def draft_message_params
    params.dig(:draft_message, :message) || ''
  end
 end
@@ -13,7 +13,7 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
  def destroy
    ActiveRecord::Base.transaction do
-      message.update!(content: I18n.t('conversations.messages.deleted'), content_type: :text, content_attributes: { deleted: true })
+      message.update!(content: I18n.t('conversations.messages.deleted'), content_attributes: { deleted: true })
      message.attachments.destroy_all
    end
  end
@@ -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,53 +0,0 @@
 class Api::V1::Accounts::Integrations::CaptainController < Api::V1::Accounts::BaseController
  before_action :hook
  def proxy
    response = HTTParty.send(request_method, request_url, body: permitted_params[:body].to_json, headers: headers)
    render plain: response.body, status: response.code
  end
  private
  def headers
    {
      'X-User-Email' => hook.settings['account_email'],
      'X-User-Token' => hook.settings['access_token'],
      'Content-Type' => 'application/json',
      'Accept' => '*/*'
    }
  end
  def request_path
    request_route = with_leading_hash_on_route(params[:route])
    return 'api/sessions/profile' if request_route == '/sessions/profile'
    "api/accounts/#{hook.settings['account_id']}#{request_route}"
  end
  def request_url
    base_url = InstallationConfig.find_by(name: 'CAPTAIN_API_URL').value
    URI.join(base_url, request_path).to_s
  end
  def hook
    @hook ||= Current.account.hooks.find_by!(app_id: 'captain')
  end
  def request_method
    method = permitted_params[:method].downcase
    raise 'Invalid or missing HTTP method' unless %w[get post put patch delete options head].include?(method)
    method
  end
  def with_leading_hash_on_route(request_route)
    return '' if request_route.blank?
    request_route.start_with?('/') ? request_route : "/#{request_route}"
  end
  def permitted_params
    params.permit(:method, :route, body: {})
  end
 end
@@ -11,17 +11,7 @@ class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::Base
  end
  def process_event
-    response = @hook.process_event(params[:event])
+    render json: { message: @hook.process_event(params[:event]) }
    # for cases like an invalid event, or when conversation does not have enough messages
    # for a label suggestion, the response is nil
    if response.nil?
      render json: { message: nil }
    elsif response[:error]
      render json: { error: response[:error] }, status: :unprocessable_entity
    else
      render json: { message: response[:message] }
    end
  end
  def destroy
@@ -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
@@ -20,7 +20,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
  end
  def create
-    @portal = Current.account.portals.build(portal_params.merge(live_chat_widget_params))
+    @portal = Current.account.portals.build(portal_params)
    @portal.custom_domain = parsed_custom_domain
    @portal.save!
    process_attached_logo
@@ -28,7 +28,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
  def update
    ActiveRecord::Base.transaction do
-      @portal.update!(portal_params.merge(live_chat_widget_params)) if params[:portal].present?
+      @portal.update!(portal_params) if params[:portal].present?
      # @portal.custom_domain = parsed_custom_domain
      process_attached_logo if params[:blob_id].present?
    rescue StandardError => e
@@ -70,21 +70,11 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
  def portal_params
    params.require(:portal).permit(
-      :account_id, :color, :custom_domain, :header_text, :homepage_link,
+      :account_id, :color, :custom_domain, :header_text, :homepage_link, :name, :page_title, :slug, :archived, { config: [:default_locale,
-      :name, :page_title, :slug, :archived, { config: [:default_locale, { allowed_locales: [] }] }
+                                                                                                                          { allowed_locales: [] }] }
    )
  end
  def live_chat_widget_params
    permitted_params = params.permit(:inbox_id)
    return {} if permitted_params[:inbox_id].blank?
    inbox = Inbox.find(permitted_params[:inbox_id])
    return {} unless inbox.web_widget?
    { channel_web_widget_id: inbox.channel.id }
  end
  def portal_member_params
    params.require(:portal).permit(:account_id, member_ids: [])
  end
@@ -1,68 +1,13 @@
 class Api::V1::Accounts::UploadController < Api::V1::Accounts::BaseController
  def create
-    result = if params[:attachment].present?
+    file_blob = ActiveStorage::Blob.create_and_upload!(
-               create_from_file
+      key: nil,
-             elsif params[:external_url].present?
+      io: params[:attachment].tempfile,
-               create_from_url
+      filename: params[:attachment].original_filename,
-             else
+      content_type: params[:attachment].content_type
               render_error('No file or URL provided', :unprocessable_entity)
             end
    render_success(result) if result.is_a?(ActiveStorage::Blob)
  end
  private
  def create_from_file
    attachment = params[:attachment]
    create_and_save_blob(attachment.tempfile, attachment.original_filename, attachment.content_type)
  end
  def create_from_url
    uri = parse_uri(params[:external_url])
    return if performed?
    fetch_and_process_file_from_uri(uri)
  end
  def parse_uri(url)
    uri = URI.parse(url)
    validate_uri(uri)
    uri
  rescue URI::InvalidURIError, SocketError
    render_error('Invalid URL provided', :unprocessable_entity)
    nil
  end
  def validate_uri(uri)
    raise URI::InvalidURIError unless uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
  end
  def fetch_and_process_file_from_uri(uri)
    uri.open do |file|
      create_and_save_blob(file, File.basename(uri.path), file.content_type)
    end
  rescue OpenURI::HTTPError => e
    render_error("Failed to fetch file from URL: #{e.message}", :unprocessable_entity)
  rescue SocketError
    render_error('Invalid URL provided', :unprocessable_entity)
  rescue StandardError
    render_error('An unexpected error occurred', :internal_server_error)
  end
  def create_and_save_blob(io, filename, content_type)
    ActiveStorage::Blob.create_and_upload!(
      io: io,
      filename: filename,
      content_type: content_type
    )
-  end
+    file_blob.save!
  def render_success(file_blob)
    render json: { file_url: url_for(file_blob), blob_key: file_blob.key, blob_id: file_blob.id }
  end
  def render_error(message, status)
    render json: { error: message }, status: status
  end
 end
@@ -11,8 +11,6 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
      process_update_contact
      @conversation = create_conversation
      conversation.messages.create!(message_params)
      # TODO: Temporary fix for message type cast issue, since message_type is returning as string instead of integer
      conversation.reload
    end
  end
@@ -35,10 +33,10 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
  end
  def transcript
-    if conversation.present? && conversation.contact.present? && conversation.contact.email.present?
+    if permitted_params[:email].present? && conversation.present?
      ConversationReplyMailer.with(account: conversation.account).conversation_transcript(
        conversation,
-        conversation.contact.email
+        permitted_params[:email]
      )&.deliver_later
    end
    head :ok
@@ -5,17 +5,19 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
  before_action :check_authorization
  def index
-    builder = V2::Reports::Conversations::ReportBuilder.new(Current.account, report_params)
+    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)
+    summary = V2::ReportBuilder.new(Current.account, current_summary_params).bot_summary
    summary[:previous] = V2::ReportBuilder.new(Current.account, previous_summary_params).bot_summary
    render json: summary
  end
  def agents
@@ -66,9 +68,7 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
  end
  def check_authorization
-    return if Current.account_user.administrator?
+    raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
    raise Pundit::NotAuthorizedError
  end
  def common_params
@@ -126,16 +126,13 @@ 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
    V2::ReportBuilder.new(Current.account, conversation_params).conversation_metrics
  end
 end
 Api::V2::Accounts::ReportsController.prepend_mod_with('Api::V2::Accounts::ReportsController')
@@ -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
@@ -3,7 +3,6 @@ class DashboardController < ActionController::Base
  before_action :set_application_pack
  before_action :set_global_config
  before_action :set_dashboard_scripts
  around_action :switch_locale
  before_action :ensure_installation_onboarding, only: [:index]
  before_action :render_hc_if_custom_domain, only: [:index]
@@ -36,10 +35,6 @@ class DashboardController < ActionController::Base
    ).merge(app_config)
  end
  def set_dashboard_scripts
    @dashboard_scripts = 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 +58,7 @@ class DashboardController < ActionController::Base
      FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
      FACEBOOK_API_VERSION: GlobalConfigService.load('FACEBOOK_API_VERSION', 'v17.0'),
      IS_ENTERPRISE: ChatwootApp.enterprise?,
-      AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),
+      AZURE_APP_ID: ENV.fetch('AZURE_APP_ID', ''),
      GIT_SHA: GIT_HASH
    }
  end
@@ -72,17 +67,7 @@ class DashboardController < ActionController::Base
    @application_pack = if request.path.include?('/auth') || request.path.include?('/login')
                          'v3app'
                        else
-                          'dashboard'
+                          '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
@@ -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!
@@ -1,27 +0,0 @@
 class Google::CallbacksController < OauthCallbackController
  include GoogleConcern
  def find_channel_by_email
    # find by imap_login first, and then by email
    # this ensures the legacy users can migrate correctly even if inbox email address doesn't match
    imap_channel = Channel::Email.find_by(imap_login: users_data['email'], account: account)
    return imap_channel if imap_channel
    Channel::Email.find_by(email: users_data['email'], account: account)
  end
  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,112 +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 = find_channel_by_email
    # 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 find_channel_by_email
    Channel::Email.find_by(email: users_data['email'], account: account)
  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
@@ -4,7 +4,6 @@ class Platform::Api::V1::AccountsController < PlatformController
  def create
    @resource = Account.create!(account_params)
    update_resource_features
    @resource.save!
    @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
  end
@@ -6,8 +6,8 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  layout 'portal'
  def index
-    @articles = @portal.articles.published
+    @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
@@ -30,7 +26,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  def set_article
    @article = @portal.articles.find_by(slug: permitted_params[:article_slug])
-    @article.increment_view_count if @article.published?
+    @article.increment_view_count
    @parsed_content = render_article_content(@article.content)
  end
@@ -55,5 +51,3 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
    ChatwootMarkdownRenderer.new(content).render_article
  end
 end
 Public::Api::V1::Portals::ArticlesController.prepend_mod_with('Public::Api::V1::Portals::ArticlesController')
@@ -6,12 +6,6 @@ class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseControl
  def show; end
  def sitemap
    @help_center_url = @portal.custom_domain || ChatwootApp.help_center_root
    # if help_center_url does not contain a protocol, prepend it with https
    @help_center_url = "https://#{@help_center_url}" unless @help_center_url.include?('://')
  end
  private
  def portal
@@ -35,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
@@ -26,8 +26,7 @@ class AccountDashboard < Administrate::BaseDashboard
    conversations: CountField,
    locale: Field::Select.with_options(collection: LANGUAGES_CONFIG.map { |_x, y| y[:iso_639_1_code] }),
    status: Field::Select.with_options(collection: [%w[Active active], %w[Suspended suspended]]),
-    account_users: Field::HasMany,
+    account_users: Field::HasMany
    custom_attributes: Field::String
  }.merge(enterprise_attribute_types).freeze
  # COLLECTION_ATTRIBUTES
@@ -46,7 +45,7 @@ class AccountDashboard < Administrate::BaseDashboard
  # SHOW_PAGE_ATTRIBUTES
  # an array of attributes that will be displayed on the model's show page.
-  enterprise_show_page_attributes = ChatwootApp.enterprise? ? %i[custom_attributes limits all_features] : []
+  enterprise_show_page_attributes = ChatwootApp.enterprise? ? %i[limits all_features] : []
  SHOW_PAGE_ATTRIBUTES = (%i[
    id
    name
@@ -10,15 +10,14 @@ class AsyncDispatcher < BaseDispatcher
  def listeners
    [
      AutomationRuleListener.instance,
      CampaignListener.instance,
      CsatSurveyListener.instance,
      HookListener.instance,
      InstallationWebhookListener.instance,
      NotificationListener.instance,
      ParticipationListener.instance,
      ReportingEventListener.instance,
-      WebhookListener.instance
+      WebhookListener.instance,
      AutomationRuleListener.instance
    ]
  end
 end
@@ -1,7 +1,7 @@
 module Api::V2::Accounts::ReportsHelper
  def generate_agents_report
    Current.account.users.map do |agent|
-      agent_report = report_builder({ type: :agent, id: agent.id }).summary
+      agent_report = generate_report({ type: :agent, id: agent.id })
      [agent.name] + generate_readable_report_metrics(agent_report)
    end
  end
@@ -15,7 +15,7 @@ module Api::V2::Accounts::ReportsHelper
  def generate_teams_report
    Current.account.teams.map do |team|
-      team_report = report_builder({ type: :team, id: team.id }).summary
+      team_report = generate_report({ type: :team, id: team.id })
      [team.name] + generate_readable_report_metrics(team_report)
    end
  end
@@ -27,7 +27,7 @@ module Api::V2::Accounts::ReportsHelper
    end
  end
-  def report_builder(report_params)
+  def generate_report(report_params)
    V2::ReportBuilder.new(
      Current.account,
      report_params.merge(
@@ -37,11 +37,7 @@ module Api::V2::Accounts::ReportsHelper
          business_hours: ActiveModel::Type::Boolean.new.cast(params[:business_hours])
        }
      )
-    )
+    ).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
@@ -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,3 +1,30 @@
 <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 AddAccountModal from '../dashboard/components/layout/sidebarComponents/AddAccountModal.vue';
@@ -8,17 +35,14 @@ import UpgradeBanner from './components/app/UpgradeBanner.vue';
 import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
 import PendingEmailVerificationBanner from './components/app/PendingEmailVerificationBanner.vue';
 import vueActionCable from './helper/actionCable';
 import { useRouter } from 'vue-router';
 import { useStore } from 'dashboard/composables/store';
 import WootSnackbarBox from './components/SnackbarContainer.vue';
 import rtlMixin from 'shared/mixins/rtlMixin';
 import { setColorTheme } from './helper/themeHelper';
 import { isOnOnboardingView } from 'v3/helpers/RouteHelper';
 import { useAccount } from 'dashboard/composables/useAccount';
 import {
  registerSubscription,
  verifyServiceWorkerExistence,
 } from './helper/pushHelper';
 import ReconnectService from 'dashboard/helper/ReconnectService';
 export default {
  name: 'App',
@@ -33,27 +57,24 @@ export default {
    UpgradeBanner,
    PendingEmailVerificationBanner,
  },
  setup() {
    const router = useRouter();
    const store = useStore();
    const { accountId } = useAccount();
-    return { router, store, currentAccountId: accountId };
+  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',
    }),
    hasAccounts() {
      const { accounts = [] } = this.currentUser || {};
@@ -70,13 +91,10 @@ export default {
        this.showAddAccountModal = true;
      }
    },
-    currentAccountId: {
+    currentAccountId() {
-      immediate: true,
+      if (this.currentAccountId) {
-      handler() {
+        this.initializeAccount();
-        if (this.currentAccountId) {
+      }
          this.initializeAccount();
        }
      },
    },
  },
  mounted() {
@@ -84,11 +102,6 @@ export default {
    this.listenToThemeChanges();
    this.setLocale(window.chatwootConfig.selectedLocale);
  },
  unmounted() {
    if (this.reconnectService) {
      this.reconnectService.disconnect();
    }
  },
  methods: {
    initializeColorTheme() {
      setColorTheme(window.matchMedia('(prefers-color-scheme: dark)').matches);
@@ -109,10 +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(this.store, pubsubToken);
+      vueActionCable.init(pubsubToken);
      this.reconnectService = new ReconnectService(this.store, this.router);
      window.reconnectService = this.reconnectService;
      verifyServiceWorkerExistence(registration =>
        registration.pushManager.getSubscription().then(subscription => {
@@ -126,50 +138,8 @@ 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>
    <router-view v-slot="{ Component }">
      <transition name="fade" mode="out-in">
        <component :is="Component" />
      </transition>
    </router-view>
    <AddAccountModal :show="showAddAccountModal" :has-accounts="hasAccounts" />
    <WootSnackbarBox />
    <NetworkNotification />
  </div>
  <LoadingState v-else />
 </template>
 <style lang="scss">
@import './assets/scss/app';
 .v-popper--theme-tooltip .v-popper__inner {
  background: black !important;
  font-size: 0.75rem;
  padding: 4px 8px !important;
  border-radius: 6px;
  font-weight: 400;
 }
 .v-popper--theme-tooltip .v-popper__arrow-container {
  display: none;
 }
 .multiselect__input {
  margin-bottom: 0px !important;
 }
 </style>
-<style src="vue-multiselect/dist/vue-multiselect.css"></style>
+<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
@@ -1,20 +1,12 @@
 /* global axios */
 const DEFAULT_API_VERSION = 'v1';
 const DEFAULT_OPTIONS = {
  apiVersion: DEFAULT_API_VERSION,
  enterprise: false,
  accountScoped: false,
  cancelPreviousRequests: false,
 };
 class ApiClient {
  constructor(resource, options = {}) {
-    this.options = { ...DEFAULT_OPTIONS, ...options };
+    this.apiVersion = `/api/${options.apiVersion || DEFAULT_API_VERSION}`;
-    this.apiVersion = `/api/${this.options.apiVersion}`;
+    this.options = options;
    this.resource = resource;
    this.abortControllers = new Map();
    this.activeRequests = new Map();
  }
  get url() {
@@ -47,105 +39,24 @@ class ApiClient {
    return url;
  }
-  generateRequestKey(method, id = '', customRequestKey = '') {
+  get() {
-    if (customRequestKey) return customRequestKey;
+    return axios.get(this.url);
    return `${method}-${this.url}${id ? `/${id}` : ''}`;
  }
-  cancelRequest(requestKey) {
+  show(id) {
-    const controller = this.abortControllers.get(requestKey);
+    return axios.get(`${this.url}/${id}`);
    if (controller) {
      controller.abort();
      this.abortControllers.delete(requestKey);
      return true;
    }
    return false;
  }
-  setupRequest(method, options = {}) {
+  create(data) {
-    if (!this.options.cancelPreviousRequests) {
+    return axios.post(this.url, data);
      return {};
    }
    const { id, customRequestKey } = options;
    const requestKey = this.generateRequestKey(method, id, customRequestKey);
    const previousRequests = this.activeRequests.get(method) || [];
    const remainingRequests = previousRequests.filter(key => {
      if (key === requestKey) {
        this.cancelRequest(key);
        return false;
      }
      return true;
    });
    this.activeRequests.set(method, [...remainingRequests, requestKey]);
    const controller = new AbortController();
    this.abortControllers.set(requestKey, controller);
    return { requestKey, signal: controller.signal };
  }
-  async request(method, config = {}) {
+  update(id, data) {
-    const { id, data, customRequestKey, ...axiosConfig } = config;
+    return axios.patch(`${this.url}/${id}`, data);
    const { requestKey, signal } = this.setupRequest(method, {
      id,
      customRequestKey,
    });
    try {
      const url = id ? `${this.url}/${id}` : this.url;
      return await axios({
        method,
        url,
        data,
        signal,
        ...axiosConfig,
      });
    } finally {
      this.abortControllers.delete(requestKey);
      if (this.options.cancelPreviousRequests) {
        const methodRequests = this.activeRequests.get(method) || [];
        this.activeRequests.set(
          method,
          methodRequests.filter(key => key !== requestKey)
        );
      }
    }
  }
-  get(config = {}) {
+  delete(id) {
-    return this.request('GET', config);
+    return axios.delete(`${this.url}/${id}`);
  }
  show(id, config = {}) {
    return this.request('GET', { ...config, id });
  }
  create(data, config = {}) {
    return this.request('POST', { ...config, data });
  }
  update(id, data, config = {}) {
    return this.request('PATCH', { ...config, id, data });
  }
  delete(id, config = {}) {
    return this.request('DELETE', { ...config, id });
  }
  cancelAllRequests() {
    this.abortControllers.forEach(controller => controller.abort());
    this.abortControllers.clear();
    this.activeRequests.clear();
  }
  // Get all active request keys
  getActiveRequests() {
    return Array.from(this.abortControllers.keys());
  }
  destroy() {
    this.cancelAllRequests();
  }
 }
@@ -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`);
  }
 }
@@ -1,9 +0,0 @@
 import ApiClient from './ApiClient';
 class CustomRole extends ApiClient {
  constructor() {
    super('custom_roles', { accountScoped: true });
  }
 }
 export default new CustomRole();
@@ -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(() => {
@@ -52,13 +52,12 @@ class ArticlesAPI extends PortalsAPI {
  }
  createArticle({ portalSlug, articleObj }) {
-    const { content, title, authorId, categoryId, locale } = articleObj;
+    const { content, title, author_id, category_id } = articleObj;
    return axios.post(`${this.url}/${portalSlug}/articles`, {
      content,
      title,
-      author_id: authorId,
+      author_id,
-      category_id: categoryId,
+      category_id,
      locale,
    });
  }
@@ -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}`);
  }
  requestCaptain(body) {
    return axios.post(`${this.baseUrl()}/integrations/captain/proxy`, body);
  }
 }
 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();
@@ -5,11 +5,7 @@ const getTimeOffset = () => -new Date().getTimezoneOffset() / 60;
 class ReportsAPI extends ApiClient {
  constructor() {
-    super('reports', {
+    super('reports', { accountScoped: true, apiVersion: 'v2' });
      accountScoped: true,
      apiVersion: 'v2',
      cancelPreviousRequests: true,
    });
  }
  getReports({
@@ -21,8 +17,7 @@ class ReportsAPI extends ApiClient {
    groupBy,
    businessHours,
  }) {
-    return this.request('GET', {
+    return axios.get(`${this.url}`, {
      customRequestKey: `${metric}-report-GET`,
      params: {
        metric,
        since: from,
@@ -52,9 +47,7 @@ class ReportsAPI extends ApiClient {
  }
  getConversationMetric(type = 'account', page = 1) {
-    return this.request('GET', {
+    return axios.get(`${this.url}/conversations`, {
      requestPath: `${this.url}/conversations`,
      params: {
        type,
        page,
@@ -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'
      );
    });
  });
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shivam Mishra	42139adb7b	refactor: find_or_build_for_multiple_conversations	2024-04-03 18:09:41 +05:30
Shivam Mishra	411c6458eb	fix: resolved condition for message_builder	2024-04-03 18:07:40 +05:30
Shivam Mishra	c0232ad7c8	feat: handle conversation query order	2024-04-03 18:02:46 +05:30
Shivam Mishra	c711f78d24	Revert "refactor conversation handling in message builders" This reverts commit `ad524a5cab`.	2024-04-03 18:01:50 +05:30
Jaideep Guntupalli	ad524a5cab	refactor conversation handling in message builders	2024-04-03 15:32:11 +05:30
Jaideep GuntupalliandGitHub	9faafdbd25	Merge branch 'develop' into extending-lock-to-single-conversation-to-meta-inbox	2024-04-02 17:59:47 +05:30
Jaideep Guntupalli	e74b318772	refactor: abstracted common query	2024-03-31 10:13:20 +05:30
Jaideep Guntupalli	54d522aa50	updated rspec tests to use factories	2024-03-28 01:31:48 +05:30
Jaideep Guntupalli	3abd839c1b	refactored to independent methods	2024-03-23 11:21:34 +05:30
Jaideep Guntupalli	939f43aeb4	update: added count check	2024-03-22 01:28:25 +05:30
Jaideep GuntupalliandGitHub	f3c069b6d6	Merge branch 'develop' into extending-lock-to-single-conversation-to-meta-inbox	2024-03-22 01:24:20 +05:30
Jaideep GuntupalliandGitHub	51d3c10f57	Merge branch 'develop' into extending-lock-to-single-conversation-to-meta-inbox	2024-03-22 01:24:06 +05:30
Jaideep GuntupalliandGitHub	647b9fc029	Merge branch 'develop' into extending-lock-to-single-conversation-to-meta-inbox	2024-03-21 20:29:44 +05:30
Jaideep Guntupalli	55e9d912b2	refactored tests and the conversation function for instagram and facebook	2024-03-21 19:54:18 +05:30
Jaideep Guntupalli	2707c8b380	rspec tests for lock_to_single_conversation for meta inboxes	2024-03-21 18:33:54 +05:30
Jaideep GuntupalliandGitHub	e3a03a9efe	Merge branch 'develop' into extending-lock-to-single-conversation-to-meta-inbox	2024-03-13 12:51:35 +05:30
Jaideep Guntupalli	7c4275532d	refactor: added comments for clarity	2024-03-13 10:39:20 +05:30
Jaideep Guntupalli	617a1a9fc9	fix: added additional attributes filter and refactored conversation logic in Instagram message builder	2024-03-13 10:36:07 +05:30
Jaideep Guntupalli	f225a004e3	feat: backend Changes in Message Handling	2024-03-13 10:04:59 +05:30
Jaideep Guntupalli	bcb5165de7	feat: enable LOCK_TO_SINGLE_CONVERSATION setting for meta inbox	2024-03-12 00:50:59 +05:30