Merge branch 'develop' into feat/conversation-screen

chore: Fix eslint
feat: Conversation header
2024-12-10 18:55:04 -08:00 · 2024-12-10 22:34:31 +05:30 · 2024-12-10 22:29:13 +05:30 · 2024-12-10 21:06:05 +05:30 · 2024-12-10 21:03:10 +05:30 · 2024-12-10 11:53:47 +05:30
2275 changed files with 42156 additions and 115792 deletions
@@ -19,19 +19,13 @@ jobs:
    steps:
      - checkout
      - node/install:
-          node-version: '23.7'
+          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: Add PostgreSQL repository and update
          command: |
            sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
            wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
            sudo apt-get update -y
      - run:
          name: Install System Dependencies
@@ -40,9 +34,7 @@ jobs:
            DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
              libpq-dev \
              redis-server \
-              postgresql-common \
+              postgresql \
              postgresql-16 \
              postgresql-16-pgvector \
              build-essential \
              git \
              curl \
@@ -82,7 +74,7 @@ jobs:
            source ~/.rvm/scripts/rvm
            rvm install "3.3.3"
            rvm use 3.3.3 --default
-            gem install bundler -v 2.5.16
+            gem install bundler
      - run:
          name: Install Application Dependencies
@@ -51,7 +51,6 @@ exclude_patterns:
  - 'app/javascript/dashboard/routes/dashboard/settings/automation/constants.js'
  - 'app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js'
  - 'app/javascript/dashboard/routes/dashboard/settings/reports/constants.js'
  - 'app/javascript/dashboard/store/captain/storeFactory.js'
  - 'app/javascript/dashboard/i18n/index.js'
  - 'app/javascript/widget/i18n/index.js'
  - 'app/javascript/survey/i18n/index.js'
@@ -5,30 +5,30 @@
 version: '3'
 services:
-  base:
+  base: 
    build:
      context: ..
      dockerfile: .devcontainer/Dockerfile.base
      args:
-        VARIANT: 'ubuntu-22.04'
+        VARIANT: "ubuntu-22.04"
-        NODE_VERSION: '23.7.0'
+        NODE_VERSION: "20.9.0"
-        RUBY_VERSION: '3.3.3'
+        RUBY_VERSION: "3.3.3"
        # 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_UID: "1000"
-        USER_GID: '1000'
+        USER_GID: "1000"
    image: base:latest
-
+        
  app:
    build:
      context: ..
      dockerfile: .devcontainer/Dockerfile
      args:
-        VARIANT: 'ubuntu-22.04'
+        VARIANT: "ubuntu-22.04"
-        NODE_VERSION: '23.7.0'
+        NODE_VERSION: "20.9.0"
-        RUBY_VERSION: '3.3.3'
+        RUBY_VERSION: "3.3.3"
        # 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_UID: "1000"
-        USER_GID: '1000'
+        USER_GID: "1000"
    volumes:
      - ..:/workspace:cached
@@ -40,7 +40,7 @@ services:
    network_mode: service:db
  db:
-    image: pgvector/pgvector:pg16
+    image: postgres:latest
    restart: unless-stopped
    volumes:
      - postgres-data:/var/lib/postgresql/data
@@ -4,8 +4,6 @@ module.exports = {
    'prettier',
    'plugin:vue/vue3-recommended',
    'plugin:vitest-globals/recommended',
    // use recommended-legacy when upgrading the plugin to v4
    'plugin:@intlify/vue-i18n/recommended',
  ],
  overrides: [
    {
@@ -231,18 +229,6 @@ module.exports = {
    'vue/singleline-html-element-content-newline': 'off',
    'import/extensions': ['off'],
    'no-console': 'error',
    '@intlify/vue-i18n/no-dynamic-keys': 'warn',
    '@intlify/vue-i18n/no-unused-keys': [
      'warn',
      {
        extensions: ['.js', '.vue'],
      },
    ],
  },
  settings: {
    'vue-i18n': {
      localeDir: './app/javascript/*/i18n/**.json',
    },
  },
  env: {
    browser: true,
@@ -23,10 +23,12 @@ jobs:
          bundler-cache: true
      - uses: pnpm/action-setup@v4
        with:
          version: 9.3.0
      - uses: actions/setup-node@v4
        with:
-          node-version: 23
+          node-version: 20
          cache: 'pnpm'
      - name: Install pnpm dependencies
@@ -1,140 +0,0 @@
 # #
 # # This action will publish Chatwoot EE docker image.
 # # This is set to run against merges to develop, master
 # # and when tags are created.
 # #
 name: Publish Chatwoot EE docker images
 on:
  push:
    branches:
      - develop
      - master
    tags:
      - v*
  workflow_dispatch:
 env:
  DOCKER_REPO: chatwoot/chatwoot
 jobs:
  build:
    strategy:
      fail-fast: false
      matrix:
        include:
          - platform: linux/amd64
            runner: ubuntu-latest
          - platform: linux/arm64
            runner: ubuntu-22.04-arm
    runs-on: ${{ matrix.runner }}
    env:
      GIT_REF: ${{ github.head_ref || github.ref_name }}
    steps:
      - name: Checkout
        uses: actions/checkout@v4
      - name: Prepare
        run: |
          platform=${{ matrix.platform }}
          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
      - name: Set Chatwoot edition
        run: |
          echo -en '\nENV CW_EDITION="ee"' >> docker/Dockerfile
      - name: Set Docker Tags
        run: |
          SANITIZED_REF=$(echo "$GIT_REF" | sed 's/\//-/g')
          if [ "${{ github.ref_name }}" = "master" ]; then
            echo "DOCKER_TAG=${DOCKER_REPO}:latest" >> $GITHUB_ENV
          else
            echo "DOCKER_TAG=${DOCKER_REPO}:${SANITIZED_REF}" >> $GITHUB_ENV
          fi
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
      - name: Login to DockerHub
        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and push by digest
        id: build
        uses: docker/build-push-action@v6
        with:
          context: .
          file: docker/Dockerfile
          platforms: ${{ matrix.platform }}
          push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
          outputs: type=image,name=${{ env.DOCKER_REPO }},push-by-digest=true,name-canonical=true,push=true
      - name: Export digest
        run: |
          mkdir -p ${{ runner.temp }}/digests
          digest="${{ steps.build.outputs.digest }}"
          touch "${{ runner.temp }}/digests/${digest#sha256:}"
      - name: Upload digest
        uses: actions/upload-artifact@v4
        with:
          name: digests-${{ env.PLATFORM_PAIR }}
          path: ${{ runner.temp }}/digests/*
          if-no-files-found: error
          retention-days: 1
  merge:
    runs-on: ubuntu-latest
    needs:
      - build
    steps:
      - name: Download digests
        uses: actions/download-artifact@v4
        with:
          path: ${{ runner.temp }}/digests
          pattern: digests-*
          merge-multiple: true
      - name: Login to DockerHub
        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
      - name: Create manifest list and push
        working-directory: ${{ runner.temp }}/digests
        env:
          GIT_REF: ${{ github.head_ref || github.ref_name }}
        run: |
          SANITIZED_REF=$(echo "$GIT_REF" | sed 's/\//-/g')
          if [ "${{ github.ref_name }}" = "master" ]; then
            TAG="${DOCKER_REPO}:latest"
          else
            TAG="${DOCKER_REPO}:${SANITIZED_REF}"
          fi
          docker buildx imagetools create -t $TAG \
            $(printf '${{ env.DOCKER_REPO }}@sha256:%s ' *)
      - name: Inspect image
        env:
          GIT_REF: ${{ github.head_ref || github.ref_name }}
        run: |
          SANITIZED_REF=$(echo "$GIT_REF" | sed 's/\//-/g')
          if [ "${{ github.ref_name }}" = "master" ]; then
            TAG="${DOCKER_REPO}:latest"
          else
            TAG="${DOCKER_REPO}:${SANITIZED_REF}"
          fi
          docker buildx imagetools inspect $TAG
@@ -5,7 +5,6 @@
 # #
 name: Publish Chatwoot CE docker images
 on:
  push:
    branches:
@@ -15,30 +14,20 @@ on:
      - v*
  workflow_dispatch:
 env:
  DOCKER_REPO: chatwoot/chatwoot
 jobs:
  build:
-    strategy:
+    runs-on: ubuntu-latest
      fail-fast: false
      matrix:
        include:
          - platform: linux/amd64
            runner: ubuntu-latest
          - platform: linux/arm64
            runner: ubuntu-22.04-arm
    runs-on: ${{ matrix.runner }}
    env:
-      GIT_REF: ${{ github.head_ref || github.ref_name }}
+      GIT_REF: ${{ github.head_ref || github.ref_name }} # ref_name to get tags/branches
    steps:
      - name: Checkout
        uses: actions/checkout@v4
-      - name: Prepare
+      - name: Set up QEMU
-        run: |
+        uses: docker/setup-qemu-action@v1
-          platform=${{ matrix.platform }}
+
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v1
      - name: Strip enterprise code
        run: |
@@ -49,97 +38,26 @@ jobs:
        run: |
          echo -en '\nENV CW_EDITION="ce"' >> docker/Dockerfile
-      - name: Set Docker Tags
+      - name: set docker tag
        run: |
-          SANITIZED_REF=$(echo "$GIT_REF" | sed 's/\//-/g')
+          echo "DOCKER_TAG=chatwoot/chatwoot:$GIT_REF-ce" >> $GITHUB_ENV
          if [ "${{ github.ref_name }}" = "master" ]; then
            echo "DOCKER_TAG=${DOCKER_REPO}:latest-ce" >> $GITHUB_ENV
          else
            echo "DOCKER_TAG=${DOCKER_REPO}:${SANITIZED_REF}-ce" >> $GITHUB_ENV
          fi
-      - name: Set up QEMU
+      - name: replace docker tag if master
-        uses: docker/setup-qemu-action@v3
+        if: github.ref_name == 'master'
-
+        run: |
-      - name: Set up Docker Buildx
+          echo "DOCKER_TAG=chatwoot/chatwoot:latest-ce" >> $GITHUB_ENV
        uses: docker/setup-buildx-action@v3
      - name: Login to DockerHub
-        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+        uses: docker/login-action@v1
        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push by digest
+      - name: Build and push
-        id: build
+        uses: docker/build-push-action@v2
        uses: docker/build-push-action@v6
        with:
          context: .
          file: docker/Dockerfile
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64
-          push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+          push: true
-          outputs: type=image,name=${{ env.DOCKER_REPO }},push-by-digest=true,name-canonical=true,push=true
+          tags: ${{ env.DOCKER_TAG }}
      - name: Export digest
        run: |
          mkdir -p ${{ runner.temp }}/digests
          digest="${{ steps.build.outputs.digest }}"
          touch "${{ runner.temp }}/digests/${digest#sha256:}"
      - name: Upload digest
        uses: actions/upload-artifact@v4
        with:
          name: digests-${{ env.PLATFORM_PAIR }}
          path: ${{ runner.temp }}/digests/*
          if-no-files-found: error
          retention-days: 1
  merge:
    runs-on: ubuntu-latest
    needs:
      - build
    steps:
      - name: Download digests
        uses: actions/download-artifact@v4
        with:
          path: ${{ runner.temp }}/digests
          pattern: digests-*
          merge-multiple: true
      - name: Login to DockerHub
        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
      - name: Create manifest list and push
        working-directory: ${{ runner.temp }}/digests
        env:
          GIT_REF: ${{ github.head_ref || github.ref_name }}
        run: |
          SANITIZED_REF=$(echo "$GIT_REF" | sed 's/\//-/g')
          if [ "${{ github.ref_name }}" = "master" ]; then
            TAG="${DOCKER_REPO}:latest-ce"
          else
            TAG="${DOCKER_REPO}:${SANITIZED_REF}-ce"
          fi
          docker buildx imagetools create -t $TAG \
            $(printf '${{ env.DOCKER_REPO }}@sha256:%s ' *)
      - name: Inspect image
        env:
          GIT_REF: ${{ github.head_ref || github.ref_name }}
        run: |
          SANITIZED_REF=$(echo "$GIT_REF" | sed 's/\//-/g')
          if [ "${{ github.ref_name }}" = "master" ]; then
            TAG="${DOCKER_REPO}:latest-ce"
          else
            TAG="${DOCKER_REPO}:${SANITIZED_REF}-ce"
          fi
          docker buildx imagetools inspect $TAG
@@ -1,3 +1,9 @@
 # #
 # # This action will strip the enterprise folder
 # # and run the spec.
 # # This is set to run against every PR.
 # #
 name: Run Chatwoot CE spec
 on:
  push:
@@ -12,7 +18,7 @@ jobs:
    runs-on: ubuntu-20.04
    services:
      postgres:
-        image: pgvector/pgvector:pg15
+        image: postgres:15.3
        env:
          POSTGRES_USER: postgres
          POSTGRES_PASSWORD: ''
@@ -38,6 +44,7 @@ jobs:
      - uses: actions/checkout@v4
      - uses: pnpm/action-setup@v4
        with:
          version: 9
          ref: ${{ github.event.pull_request.head.ref }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -47,7 +54,7 @@ jobs:
      - uses: actions/setup-node@v4
        with:
-          node-version: 23
+          node-version: 20
          cache: 'pnpm'
      - name: Install pnpm dependencies
@@ -0,0 +1,89 @@
 # #
 # # This workflow will run specs related to response bot
 # # This can only be activated in installations Where vector extension is available.
 # #
 name: Run Response Bot spec
 on:
  push:
    branches:
      - develop
      - master
  pull_request:
  workflow_dispatch:
 jobs:
  test:
    runs-on: ubuntu-20.04
    services:
      postgres:
        image: ankane/pgvector
        env:
          POSTGRES_USER: postgres
          POSTGRES_PASSWORD: ""
          POSTGRES_DB: postgres
          POSTGRES_HOST_AUTH_METHOD: trust
        ports:
          - 5432:5432
        # needed because the postgres container does not provide a healthcheck
        # tmpfs makes DB faster by using RAM
        options: >-
          --mount type=tmpfs,destination=/var/lib/postgresql/data
          --health-cmd pg_isready
          --health-interval 10s
          --health-timeout 5s
          --health-retries 5
      redis:
        image: redis
        ports:
          - 6379:6379
        options: --entrypoint redis-server
    steps:
    - uses: actions/checkout@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 # 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
    - name: pnpm
      run: pnpm install
    - name: Create database
      run: bundle exec rake db:create
    - name: Seed database
      run: bundle exec rake db:schema:load
    - name: Enable ResponseBotService in installation
      run: RAILS_ENV=test bundle exec rails runner "Features::ResponseBotService.new.enable_in_installation"
    # Run  Response Bot specs
    - name: Run backend tests
      run: |
        bundle exec rspec \
          spec/enterprise/controllers/api/v1/accounts/response_sources_controller_spec.rb \
          spec/enterprise/services/enterprise/message_templates/response_bot_service_spec.rb \
          spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb:47 \
          spec/enterprise/jobs/enterprise/account/conversations_resolution_scheduler_job_spec.rb \
          --profile=10 \
          --format documentation
    - name: Upload rails log folder
      uses: actions/upload-artifact@v4
      if: always()
      with:
        name: rails-log-folder
        path: log
@@ -19,11 +19,13 @@ jobs:
        with:
          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v2
        with:
          version: 9.3.0
      - uses: actions/setup-node@v4
        with:
-          node-version: 23
+          node-version: 20
          cache: 'pnpm'
      - name: pnpm
@@ -37,7 +39,7 @@ jobs:
      - name: setup env
        run: |
          cp .env.example .env
-
+ 
      - name: Run asset compile
        run: bundle exec rake assets:precompile
        env:
@@ -45,3 +47,5 @@ jobs:
      - name: Size Check
        run: pnpm run size
@@ -1,40 +0,0 @@
 name: Test Docker Build
 on:
  pull_request:
    branches:
      - develop
      - master
  workflow_dispatch:
 jobs:
  test-build:
    strategy:
      fail-fast: false
      matrix:
        include:
          - platform: linux/amd64
            runner: ubuntu-latest
          - platform: linux/arm64
            runner: ubuntu-22.04-arm
    runs-on: ${{ matrix.runner }}
    steps:
      - name: Checkout
        uses: actions/checkout@v4
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
      - name: Build Docker image
        uses: docker/build-push-action@v6
        with:
          context: .
          file: docker/Dockerfile
          platforms: ${{ matrix.platform }}
          push: false
          load: false
          cache-from: type=gha
          cache-to: type=gha,mode=max
@@ -73,7 +73,6 @@ test/cypress/videos/*
 #ignore files under .vscode directory
 .vscode
 .cursor
 # yalc for local testing
 .yalc
@@ -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
@@ -94,7 +94,7 @@ gem 'twitty', '~> 0.1.5'
 # facebook client
 gem 'koala'
 # slack client
-gem 'slack-ruby-client', '~> 2.5.2'
+gem 'slack-ruby-client', '~> 2.2.0'
 # for dialogflow integrations
 gem 'google-cloud-dialogflow-v2', '>= 0.24.0'
 gem 'grpc'
@@ -138,7 +138,9 @@ gem 'procore-sift'
 # parse email
 gem 'email_reply_trimmer'
-gem 'html2text'
+# TODO: we might have to fork this gem since 0.3.1 has hard depency on nokogir 1.10.
 # and this gem hasn't been updated for a while.
 gem 'html2text', git: 'https://github.com/chatwoot/html2text_ruby', branch: 'chatwoot'
 # to calculate working hours
 gem 'working_hours'
@@ -173,8 +175,6 @@ gem 'pgvector'
 # Convert Website HTML to Markdown
 gem 'reverse_markdown'
 gem 'ruby-openai'
 ### Gems required only in specific deployment environments ###
 ##############################################################
@@ -22,6 +22,14 @@ GIT
      devise (>= 4.0.0, < 5.0.0)
      railties (>= 5.0.0, < 8.0.0)
 GIT
  remote: https://github.com/chatwoot/html2text_ruby
  revision: cdbdbbbf898d846d0136d69d688a003c6b26074b
  branch: chatwoot
  specs:
    html2text (0.3.1)
      nokogiri (>= 1.13.6)
 GEM
  remote: https://rubygems.org/
  specs:
@@ -178,7 +186,7 @@ GEM
    database_cleaner-core (2.0.1)
    datadog-ci (0.8.3)
      msgpack
-    date (3.4.1)
+    date (3.3.4)
    ddtrace (1.23.2)
      datadog-ci (~> 0.8.1)
      debase-ruby_core_source (= 3.3.1)
@@ -223,7 +231,6 @@ GEM
    erubi (1.13.0)
    et-orbi (1.2.11)
      tzinfo
    event_stream_parser (1.0.0)
    execjs (2.8.1)
    facebook-messenger (2.0.1)
      httparty (~> 0.13, >= 0.13.7)
@@ -272,8 +279,7 @@ GEM
      googleauth (~> 1.0)
      grpc (~> 1.36)
    geocoder (1.8.1)
-    gli (2.22.2)
+    gli (2.21.1)
      ostruct
    globalid (1.2.1)
      activesupport (>= 6.1)
    gmail_xoauth (0.4.3)
@@ -354,8 +360,6 @@ GEM
    hana (1.3.7)
    hashdiff (1.1.0)
    hashie (5.0.0)
    html2text (0.4.0)
      nokogiri (>= 1.0, < 2.0)
    http (5.1.1)
      addressable (~> 2.8)
      http-cookie (~> 1.0)
@@ -482,7 +486,7 @@ GEM
      uri
    net-http-persistent (4.0.2)
      connection_pool (~> 2.2)
-    net-imap (0.4.19)
+    net-imap (0.4.17)
      date
      net-protocol
    net-pop (0.1.2)
@@ -498,14 +502,14 @@ GEM
    newrelic_rpm (9.6.0)
      base64
    nio4r (2.7.3)
-    nokogiri (1.18.3)
+    nokogiri (1.17.1)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.18.3-arm64-darwin)
+    nokogiri (1.17.1-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-darwin)
+    nokogiri (1.17.1-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-linux-gnu)
+    nokogiri (1.17.1-x86_64-linux)
      racc (~> 1.4)
    oauth (1.1.0)
      oauth-tty (~> 1.0, >= 1.0.1)
@@ -538,7 +542,6 @@ GEM
    openssl (3.2.0)
    orm_adapter (0.5.0)
    os (1.1.4)
    ostruct (0.6.1)
    parallel (1.23.0)
    parser (3.2.2.1)
      ast (~> 2.4.1)
@@ -561,7 +564,7 @@ GEM
      activesupport (>= 3.0.0)
    raabro (1.4.0)
    racc (1.8.1)
-    rack (2.2.11)
+    rack (2.2.10)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
    rack-contrib (2.5.0)
@@ -681,10 +684,6 @@ GEM
    rubocop-rspec (2.21.0)
      rubocop (~> 1.33)
      rubocop-capybara (~> 2.17)
    ruby-openai (7.3.1)
      event_stream_parser (>= 0.3.0, < 2.0.0)
      faraday (>= 1)
      faraday-multipart (>= 1)
    ruby-progressbar (1.13.0)
    ruby-vips (2.1.4)
      ffi (~> 1.12)
@@ -747,13 +746,12 @@ GEM
      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
    simplecov-html (0.10.2)
-    slack-ruby-client (2.5.2)
+    slack-ruby-client (2.2.0)
      faraday (>= 2.0)
      faraday-mashify
      faraday-multipart
      gli
      hashie
      logger
    snaky_hash (2.0.1)
      hashie
      version_gem (~> 1.1, >= 1.1.1)
@@ -779,7 +777,7 @@ GEM
    time_diff (0.3.0)
      activesupport
      i18n
-    timeout (0.4.3)
+    timeout (0.4.1)
    trailblazer-option (0.1.2)
    twilio-ruby (5.77.0)
      faraday (>= 0.9, < 3.0)
@@ -894,7 +892,7 @@ DEPENDENCIES
  haikunator
  hairtrigger
  hashie
-  html2text
+  html2text!
  image_processing
  jbuilder
  json_refs
@@ -943,7 +941,6 @@ DEPENDENCIES
  rubocop-performance
  rubocop-rails
  rubocop-rspec
  ruby-openai
  scout_apm
  scss_lint
  seed_dump
@@ -954,7 +951,7 @@ DEPENDENCIES
  sidekiq (>= 7.3.1)
  sidekiq-cron (>= 1.12.0)
  simplecov (= 0.17.1)
-  slack-ruby-client (~> 2.5.2)
+  slack-ruby-client (~> 2.2.0)
  spring
  spring-watcher-listen
  squasher
@@ -120,4 +120,4 @@ Thanks goes to all these [wonderful people](https://www.chatwoot.com/docs/contri
 <a href="https://github.com/chatwoot/chatwoot/graphs/contributors"><img src="https://opencollective.com/chatwoot/contributors.svg?width=890&button=false" /></a>
-*Chatwoot* &copy; 2017-2025, Chatwoot Inc - Released under the MIT License.
+*Chatwoot* &copy; 2017-2024, Chatwoot Inc - Released under the MIT License.
@@ -2,13 +2,13 @@ Chatwoot is looking forward to working with security researchers worldwide to ke
 ## Reporting a Vulnerability
-We use Github to track the security issues that affect our project. If you believe you have found a vulnerability, please disclose it via this [form](https://github.com/chatwoot/chatwoot/security/advisories/new). This will enable us to review the vulnerability, fix it promptly, and reward you for your efforts.
+We use [huntr.dev](https://huntr.dev/) for security issues that affect our project. If you believe you have found a vulnerability, please disclose it via this [form](https://huntr.dev/bounties/disclose). This will enable us to review the vulnerability, fix it promptly, and reward you for your efforts.
 If you have any questions about the process, contact security@chatwoot.com. 
-Please try your best to describe a clear and realistic impact for your report, and please don't open any public issues on GitHub or social media; we're doing our best to respond through Github as quickly as possible.
+Please try your best to describe a clear and realistic impact for your report, and please don't open any public issues on GitHub or social media; we're doing our best to respond through Huntr as quickly as possible.
-> Note: Please use the email for questions related to the process. Disclosures should be done via [Github](https://github.com/chatwoot/chatwoot/security/advisories/new)
+> Note: Please use the email for questions related to the process. Disclosures should be done via [huntr.dev](https://huntr.dev/)
 ## Supported versions
 | Version | Supported        |
@@ -48,7 +48,7 @@ We consider the following out of scope, though there may be exceptions.
 - Brute force attacks
 - DNSSEC
-If you are unsure about the scope, please create a [report](https://github.com/chatwoot/chatwoot/security/advisories/new).
+If you are unsure about the scope, please create a [report](https://huntr.dev/repos/chatwoot/chatwoot/).
 ## Thanks
@@ -1 +1 @@
-3.2.0
+3.0.0
@@ -54,7 +54,7 @@ class ContactMergeAction
    # attributes in base contact are given preference
    merged_attributes = mergee_contact_attributes.deep_merge(base_contact_attributes)
-    @mergee_contact.reload.destroy!
+    @mergee_contact.destroy!
    Rails.configuration.dispatcher.dispatch(CONTACT_MERGED, Time.zone.now, contact: @base_contact,
                                                                           tokens: [@base_contact.contact_inboxes.filter_map(&:pubsub_token)])
    @base_contact.update!(merged_attributes)
@@ -25,8 +25,6 @@ class NotificationBuilder
  def build_notification
    # Create conversation_creation notification only if user is subscribed to it
    return if notification_type == 'conversation_creation' && !user_subscribed_to_notification?
    # skip notifications for blocked conversations except for user mentions
    return if primary_actor.contact.blocked? && notification_type != 'conversation_mention'
    user.notifications.create!(
      notification_type: notification_type,
@@ -2,38 +2,52 @@ class V2::Reports::AgentSummaryBuilder < V2::Reports::BaseSummaryBuilder
  pattr_initialize [:account!, :params!]
  def build
-    load_data
+    set_grouped_conversations_count
    set_grouped_avg_reply_time
    set_grouped_avg_first_response_time
    set_grouped_avg_resolution_time
    prepare_report
  end
  private
-  attr_reader :conversations_count, :resolved_count,
+  def set_grouped_conversations_count
-              :avg_resolution_time, :avg_first_response_time, :avg_reply_time
+    @grouped_conversations_count = Current.account.conversations.where(created_at: range).group('assignee_id').count
  def fetch_conversations_count
    account.conversations.where(created_at: range).group('assignee_id').count
  end
-  def prepare_report
+  def set_grouped_avg_resolution_time
-    account.account_users.map do |account_user|
+    @grouped_avg_resolution_time = get_grouped_average(reporting_events.where(name: 'conversation_resolved'))
      build_agent_stats(account_user)
    end
  end
-  def build_agent_stats(account_user)
+  def set_grouped_avg_first_response_time
-    user_id = account_user.user_id
+    @grouped_avg_first_response_time = get_grouped_average(reporting_events.where(name: 'first_response'))
-    {
+  end
-      id: user_id,
+
-      conversations_count: conversations_count[user_id] || 0,
+  def set_grouped_avg_reply_time
-      resolved_conversations_count: resolved_count[user_id] || 0,
+    @grouped_avg_reply_time = get_grouped_average(reporting_events.where(name: 'reply_time'))
      avg_resolution_time: avg_resolution_time[user_id],
      avg_first_response_time: avg_first_response_time[user_id],
      avg_reply_time: avg_reply_time[user_id]
    }
  end
  def group_by_key
    :user_id
  end
  def reporting_events
    @reporting_events ||= Current.account.reporting_events.where(created_at: range)
  end
  def prepare_report
    account.account_users.each_with_object([]) do |account_user, arr|
      arr << {
        id: account_user.user_id,
        conversations_count: @grouped_conversations_count[account_user.user_id],
        avg_resolution_time: @grouped_avg_resolution_time[account_user.user_id],
        avg_first_response_time: @grouped_avg_first_response_time[account_user.user_id],
        avg_reply_time: @grouped_avg_reply_time[account_user.user_id]
      }
    end
  end
  def average_value_key
    ActiveModel::Type::Boolean.new.cast(params[:business_hours]).present? ? :value_in_business_hours : :value
  end
 end
@@ -1,50 +1,17 @@
 class V2::Reports::BaseSummaryBuilder
  include DateRangeHelper
  def build
    load_data
    prepare_report
  end
  private
  def load_data
    @conversations_count = fetch_conversations_count
    @resolved_count = fetch_resolved_count
    @avg_resolution_time = fetch_average_time('conversation_resolved')
    @avg_first_response_time = fetch_average_time('first_response')
    @avg_reply_time = fetch_average_time('reply_time')
  end
  def reporting_events
    @reporting_events ||= account.reporting_events.where(created_at: range)
  end
  def fetch_conversations_count
    # Override this method
  end
  def fetch_average_time(event_name)
    get_grouped_average(reporting_events.where(name: event_name))
  end
  def fetch_resolved_count
    reporting_events.where(name: 'conversation_resolved').group(group_by_key).count
  end
  def group_by_key
    # Override this method
  end
  def prepare_report
    # Override this method
  end
  def get_grouped_average(events)
    events.group(group_by_key).average(average_value_key)
  end
  def average_value_key
-    ActiveModel::Type::Boolean.new.cast(params[:business_hours]).present? ? :value_in_business_hours : :value
+    params[:business_hours].present? ? :value_in_business_hours : :value
  end
 end
@@ -1,50 +0,0 @@
 class V2::Reports::InboxSummaryBuilder < V2::Reports::BaseSummaryBuilder
  pattr_initialize [:account!, :params!]
  def build
    load_data
    prepare_report
  end
  private
  attr_reader :conversations_count, :resolved_count,
              :avg_resolution_time, :avg_first_response_time, :avg_reply_time
  def load_data
    @conversations_count = fetch_conversations_count
    @resolved_count = fetch_resolved_count
    @avg_resolution_time = fetch_average_time('conversation_resolved')
    @avg_first_response_time = fetch_average_time('first_response')
    @avg_reply_time = fetch_average_time('reply_time')
  end
  def fetch_conversations_count
    account.conversations.where(created_at: range).group(group_by_key).count
  end
  def prepare_report
    account.inboxes.map do |inbox|
      build_inbox_stats(inbox)
    end
  end
  def build_inbox_stats(inbox)
    {
      id: inbox.id,
      conversations_count: conversations_count[inbox.id] || 0,
      resolved_conversations_count: resolved_count[inbox.id] || 0,
      avg_resolution_time: avg_resolution_time[inbox.id],
      avg_first_response_time: avg_first_response_time[inbox.id],
      avg_reply_time: avg_reply_time[inbox.id]
    }
  end
  def group_by_key
    :inbox_id
  end
  def average_value_key
    ActiveModel::Type::Boolean.new.cast(params[:business_hours]) ? :value_in_business_hours : :value
  end
 end
@@ -1,37 +1,49 @@
 class V2::Reports::TeamSummaryBuilder < V2::Reports::BaseSummaryBuilder
  pattr_initialize [:account!, :params!]
  def build
    set_grouped_conversations_count
    set_grouped_avg_reply_time
    set_grouped_avg_first_response_time
    set_grouped_avg_resolution_time
    prepare_report
  end
  private
-  attr_reader :conversations_count, :resolved_count,
+  def set_grouped_conversations_count
-              :avg_resolution_time, :avg_first_response_time, :avg_reply_time
+    @grouped_conversations_count = Current.account.conversations.where(created_at: range).group('team_id').count
  end
-  def fetch_conversations_count
+  def set_grouped_avg_resolution_time
-    account.conversations.where(created_at: range).group(:team_id).count
+    @grouped_avg_resolution_time = get_grouped_average(reporting_events.where(name: 'conversation_resolved'))
  end
  def set_grouped_avg_first_response_time
    @grouped_avg_first_response_time = get_grouped_average(reporting_events.where(name: 'first_response'))
  end
  def set_grouped_avg_reply_time
    @grouped_avg_reply_time = get_grouped_average(reporting_events.where(name: 'reply_time'))
  end
  def reporting_events
-    @reporting_events ||= account.reporting_events.where(created_at: range).joins(:conversation)
+    @reporting_events ||= Current.account.reporting_events.where(created_at: range).joins(:conversation)
  end
  def prepare_report
    account.teams.map do |team|
      build_team_stats(team)
    end
  end
  def build_team_stats(team)
    {
      id: team.id,
      conversations_count: conversations_count[team.id] || 0,
      resolved_conversations_count: resolved_count[team.id] || 0,
      avg_resolution_time: avg_resolution_time[team.id],
      avg_first_response_time: avg_first_response_time[team.id],
      avg_reply_time: avg_reply_time[team.id]
    }
  end
  def group_by_key
    'conversations.team_id'
  end
  def prepare_report
    account.teams.each_with_object([]) do |team, arr|
      arr << {
        id: team.id,
        conversations_count: @grouped_conversations_count[team.id],
        avg_resolution_time: @grouped_avg_resolution_time[team.id],
        avg_first_response_time: @grouped_avg_first_response_time[team.id],
        avg_reply_time: @grouped_avg_reply_time[team.id]
      }
    end
  end
 end
@@ -28,7 +28,7 @@ class V2::Reports::Timeseries::AverageReportBuilder < V2::Reports::Timeseries::B
  end
  def object_scope
-    scope.reporting_events.where(name: event_name, created_at: range, account_id: account.id)
+    scope.reporting_events.where(name: event_name, created_at: range)
  end
  def reporting_events
@@ -2,7 +2,7 @@ class Api::V1::Accounts::Contacts::ConversationsController < Api::V1::Accounts::
  def index
    @conversations = Current.account.conversations.includes(
      :assignee, :contact, :inbox, :taggings
-    ).where(inbox_id: inbox_ids, contact_id: @contact.id).order(last_activity_at: :desc).limit(20)
+    ).where(inbox_id: inbox_ids, contact_id: @contact.id).order(id: :desc).limit(20)
  end
  private
@@ -68,7 +68,6 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
    @contacts = fetch_contacts(contacts)
  rescue CustomExceptions::CustomFilter::InvalidAttribute,
         CustomExceptions::CustomFilter::InvalidOperator,
         CustomExceptions::CustomFilter::InvalidQueryOperator,
         CustomExceptions::CustomFilter::InvalidValue => e
    render_could_not_create_error(e.message)
  end
@@ -46,7 +46,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    @conversations_count = result[:count]
  rescue CustomExceptions::CustomFilter::InvalidAttribute,
         CustomExceptions::CustomFilter::InvalidOperator,
         CustomExceptions::CustomFilter::InvalidQueryOperator,
         CustomExceptions::CustomFilter::InvalidValue => e
    render_could_not_create_error(e.message)
  end
@@ -10,7 +10,7 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
  def create
    authorize @inbox, :create?
    ActiveRecord::Base.transaction do
-      @inbox.add_members(agents_to_be_added_ids)
+      agents_to_be_added_ids.map { |user_id| @inbox.add_member(user_id) }
    end
    fetch_updated_agents
  end
@@ -24,7 +24,7 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
  def destroy
    authorize @inbox, :destroy?
    ActiveRecord::Base.transaction do
-      @inbox.remove_members(params[:user_ids])
+      params[:user_ids].map { |user_id| @inbox.remove_member(user_id) }
    end
    head :ok
  end
@@ -41,8 +41,8 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
    # the missing ones are the agents which are to be deleted from the inbox
    # the new ones are the agents which are to be added to the inbox
    ActiveRecord::Base.transaction do
-      @inbox.add_members(agents_to_be_added_ids)
+      agents_to_be_added_ids.each { |user_id| @inbox.add_member(user_id) }
-      @inbox.remove_members(agents_to_be_removed_ids)
+      agents_to_be_removed_ids.each { |user_id| @inbox.remove_member(user_id) }
    end
  end
@@ -0,0 +1,78 @@
 class Api::V1::Accounts::Integrations::CaptainController < Api::V1::Accounts::BaseController
  before_action :hook
  def proxy
    request_url = build_request_url(request_path)
    response = HTTParty.send(request_method, request_url, body: permitted_params[:body].to_json, headers: headers)
    render plain: response.body, status: response.code
  end
  def copilot
    request_url = build_request_url(build_request_path("/assistants/#{hook.settings['assistant_id']}/copilot"))
    params = {
      previous_messages: copilot_params[:previous_messages],
      conversation_history: conversation_history,
      message: copilot_params[:message]
    }
    response = HTTParty.send(:post, request_url, body: params.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 build_request_path(route)
    "api/accounts/#{hook.settings['account_id']}#{route}"
  end
  def request_path
    request_route = with_leading_hash_on_route(params[:route])
    return 'api/sessions/profile' if request_route == '/sessions/profile'
    build_request_path(request_route)
  end
  def build_request_url(request_path)
    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 conversation_history
    conversation = Current.account.conversations.find_by!(display_id: copilot_params[:conversation_id])
    conversation.to_llm_text
  end
  def copilot_params
    params.permit(:previous_messages, :conversation_id, :message)
  end
  def permitted_params
    params.permit(:method, :route, body: {})
  end
 end
@@ -1,11 +1,5 @@
 class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::BaseController
  before_action :fetch_conversation, only: [:link_issue, :linked_issues]
  before_action :fetch_hook, only: [:destroy]
  def destroy
    @hook.destroy!
    head :ok
  end
  def teams
    teams = linear_processor_service.teams
@@ -96,8 +90,4 @@ class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Bas
  def permitted_params
    params.permit(:team_id, :project_id, :conversation_id, :issue_id, :link_id, :title, :description, :assignee_id, :priority, label_ids: [])
  end
  def fetch_hook
    @hook = Integrations::Hook.where(account: Current.account).find_by(app_id: 'linear')
  end
 end
@@ -9,14 +9,14 @@ class Api::V1::Accounts::TeamMembersController < Api::V1::Accounts::BaseControll
  def create
    ActiveRecord::Base.transaction do
-      @team_members = @team.add_members(members_to_be_added_ids)
+      @team_members = members_to_be_added_ids.map { |user_id| @team.add_member(user_id) }
    end
  end
  def update
    ActiveRecord::Base.transaction do
-      @team.add_members(members_to_be_added_ids)
+      members_to_be_added_ids.each { |user_id| @team.add_member(user_id) }
-      @team.remove_members(members_to_be_removed_ids)
+      members_to_be_removed_ids.each { |user_id| @team.remove_member(user_id) }
    end
    @team_members = @team.members
    render action: 'create'
@@ -24,7 +24,7 @@ class Api::V1::Accounts::TeamMembersController < Api::V1::Accounts::BaseControll
  def destroy
    ActiveRecord::Base.transaction do
-      @team.remove_members(params[:user_ids])
+      params[:user_ids].map { |user_id| @team.remove_member(user_id) }
    end
    head :ok
  end
@@ -1,64 +0,0 @@
 class Api::V2::Accounts::LiveReportsController < Api::V1::Accounts::BaseController
  before_action :load_conversations, only: [:conversation_metrics, :grouped_conversation_metrics]
  before_action :set_group_scope, only: [:grouped_conversation_metrics]
  before_action :check_authorization
  def conversation_metrics
    render json: {
      open: @conversations.open.count,
      unattended: @conversations.open.unattended.count,
      unassigned: @conversations.open.unassigned.count,
      pending: @conversations.pending.count
    }
  end
  def grouped_conversation_metrics
    count_by_group = @conversations.open.group(@group_scope).count
    unattended_by_group = @conversations.open.unattended.group(@group_scope).count
    unassigned_by_group = @conversations.open.unassigned.group(@group_scope).count
    group_metrics = count_by_group.map do |group_id, count|
      metric = {
        open: count,
        unattended: unattended_by_group[group_id] || 0,
        unassigned: unassigned_by_group[group_id] || 0
      }
      metric[@group_scope] = group_id
      metric
    end
    render json: group_metrics
  end
  private
  def check_authorization
    authorize :report, :view?
  end
  def set_group_scope
    render json: { error: 'invalid group_by' }, status: :unprocessable_entity and return unless %w[
      team_id
      assignee_id
    ].include?(permitted_params[:group_by])
    @group_scope = permitted_params[:group_by]
  end
  def team
    return unless permitted_params[:team_id]
    @team ||= Current.account.teams.find(permitted_params[:team_id])
  end
  def load_conversations
    scope = Current.account.conversations
    scope = scope.where(team_id: team.id) if team.present?
    @conversations = scope
  end
  def permitted_params
    params.permit(:team_id, :group_by)
  end
 end
@@ -1,6 +1,6 @@
 class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseController
  before_action :check_authorization
-  before_action :prepare_builder_params, only: [:agent, :team, :inbox]
+  before_action :prepare_builder_params, only: [:agent, :team]
  def agent
    render_report_with(V2::Reports::AgentSummaryBuilder)
@@ -10,10 +10,6 @@ class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseContr
    render_report_with(V2::Reports::TeamSummaryBuilder)
  end
  def inbox
    render_report_with(V2::Reports::InboxSummaryBuilder)
  end
  private
  def check_authorization
@@ -30,7 +26,8 @@ class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseContr
  def render_report_with(builder_class)
    builder = builder_class.new(account: Current.account, params: @builder_params)
-    render json: builder.build
+    data = builder.build
    render json: data
  end
  def permitted_params
@@ -7,17 +7,13 @@ class DashboardController < ActionController::Base
  around_action :switch_locale
  before_action :ensure_installation_onboarding, only: [:index]
  before_action :render_hc_if_custom_domain, only: [:index]
-  before_action :ensure_html_format
+
  layout 'vueapp'
  def index; end
  private
  def ensure_html_format
    head :not_acceptable unless request.format.html?
  end
  def set_global_config
    @global_config = GlobalConfig.get(
      'LOGO', 'LOGO_DARK', 'LOGO_THUMBNAIL',
@@ -36,7 +32,7 @@ class DashboardController < ActionController::Base
      'LOGOUT_REDIRECT_LINK',
      'DISABLE_USER_PROFILE_UPDATE',
      'DEPLOYMENT_ENV',
-      'CSML_EDITOR_HOST', 'INSTALLATION_PRICING_PLAN'
+      'CSML_EDITOR_HOST'
    ).merge(app_config)
  end
@@ -1,73 +0,0 @@
 class Linear::CallbacksController < ApplicationController
  include Linear::IntegrationHelper
  def show
    @response = oauth_client.auth_code.get_token(
      params[:code],
      redirect_uri: "#{base_url}/linear/callback"
    )
    handle_response
  rescue StandardError => e
    Rails.logger.error("Linear callback error: #{e.message}")
    redirect_to linear_redirect_uri
  end
  private
  def oauth_client
    app_id = GlobalConfigService.load('LINEAR_CLIENT_ID', nil)
    app_secret = GlobalConfigService.load('LINEAR_CLIENT_SECRET', nil)
    OAuth2::Client.new(
      app_id,
      app_secret,
      {
        site: 'https://api.linear.app',
        token_url: '/oauth/token',
        authorize_url: '/oauth/authorize'
      }
    )
  end
  def handle_response
    hook = account.hooks.new(
      access_token: parsed_body['access_token'],
      status: 'enabled',
      app_id: 'linear',
      settings: {
        token_type: parsed_body['token_type'],
        expires_in: parsed_body['expires_in'],
        scope: parsed_body['scope']
      }
    )
    # You may wonder why we're not handling the refresh token update, since the token will expire only after 10 years, https://github.com/linear/linear/issues/251
    hook.save!
    redirect_to linear_redirect_uri
  rescue StandardError => e
    Rails.logger.error("Linear callback error: #{e.message}")
    redirect_to linear_redirect_uri
  end
  def account
    @account ||= Account.find(account_id)
  end
  def account_id
    return unless params[:state]
    verify_linear_token(params[:state])
  end
  def linear_redirect_uri
    "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{account.id}/settings/integrations/linear"
  end
  def parsed_body
    @parsed_body ||= @response.response.parsed
  end
  def base_url
    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
  end
 end
@@ -7,10 +7,9 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  def index
    @articles = @portal.articles.published
    @articles_count = @articles.count
    search_articles
    order_by_sort_param
-    @articles = @articles.page(list_params[:page]) if list_params[:page].present?
+    @articles.page(list_params[:page]) if list_params[:page].present?
  end
  def show; end
@@ -45,7 +44,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  end
  def list_params
-    params.permit(:query, :locale, :sort, :status, :page)
+    params.permit(:query, :locale, :sort, :status)
  end
  def permitted_params
@@ -39,8 +39,6 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
                         %w[AZURE_APP_ID AZURE_APP_SECRET]
                       when 'email'
                         ['MAILER_INBOUND_EMAIL_DOMAIN']
                       when 'linear'
                         %w[LINEAR_CLIENT_ID LINEAR_CLIENT_SECRET]
                       else
                         %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS]
                       end
@@ -22,5 +22,3 @@ class AsyncDispatcher < BaseDispatcher
    ]
  end
 end
 AsyncDispatcher.prepend_mod_with('AsyncDispatcher')
@@ -2,6 +2,6 @@ require 'administrate/field/base'
 class Enterprise::AccountLimitsField < Administrate::Field::Base
  def to_s
-    data.present? ? data.to_json : { agents: nil, inboxes: nil, captain_responses: nil, captain_documents: nil }.to_json
+    data.present? ? data.to_json : { agents: nil, inboxes: nil }.to_json
  end
 end
@@ -94,8 +94,7 @@ module Api::V2::Accounts::HeatmapHelper
  end
  def since_timestamp(date)
-    number_of_days = params[:days_before].present? ? params[:days_before].to_i.days : 6.days
+    (date - 6.days).to_i.to_s
    (date - number_of_days).to_i.to_s
  end
  def until_timestamp(date)
@@ -1,70 +1,58 @@
 module Api::V2::Accounts::ReportsHelper
  def generate_agents_report
    reports = V2::Reports::AgentSummaryBuilder.new(
      account: Current.account,
      params: build_params(type: :agent)
    ).build
    Current.account.users.map do |agent|
-      report = reports.find { |r| r[:id] == agent.id }
+      agent_report = report_builder({ type: :agent, id: agent.id }).summary
-      [agent.name] + generate_readable_report_metrics(report)
+      [agent.name] + generate_readable_report_metrics(agent_report)
    end
  end
  def generate_inboxes_report
    reports = V2::Reports::InboxSummaryBuilder.new(
      account: Current.account,
      params: build_params(type: :inbox)
    ).build
    Current.account.inboxes.map do |inbox|
-      report = reports.find { |r| r[:id] == inbox.id }
+      inbox_report = generate_report({ type: :inbox, id: inbox.id })
-      [inbox.name, inbox.channel&.name] + generate_readable_report_metrics(report)
+      [inbox.name, inbox.channel&.name] + generate_readable_report_metrics(inbox_report)
    end
  end
  def generate_teams_report
    reports = V2::Reports::TeamSummaryBuilder.new(
      account: Current.account,
      params: build_params(type: :team)
    ).build
    Current.account.teams.map do |team|
-      report = reports.find { |r| r[:id] == team.id }
+      team_report = report_builder({ type: :team, id: team.id }).summary
-      [team.name] + generate_readable_report_metrics(report)
+      [team.name] + generate_readable_report_metrics(team_report)
    end
  end
  def generate_labels_report
    Current.account.labels.map do |label|
-      label_report = report_builder({ type: :label, id: label.id }).short_summary
+      label_report = generate_report({ type: :label, id: label.id })
      [label.title] + generate_readable_report_metrics(label_report)
    end
  end
-  private
+  def report_builder(report_params)
-
+    V2::ReportBuilder.new(
-  def build_params(base_params)
+      Current.account,
-    base_params.merge(
+      report_params.merge(
-      {
+        {
-        since: params[:since],
+          since: params[:since],
-        until: params[:until],
+          until: params[:until],
-        business_hours: ActiveModel::Type::Boolean.new.cast(params[:business_hours])
+          business_hours: ActiveModel::Type::Boolean.new.cast(params[:business_hours])
-      }
+        }
      )
    )
  end
-  def report_builder(report_params)
+  def generate_report(report_params)
-    V2::ReportBuilder.new(Current.account, build_params(report_params))
+    report_builder(report_params).short_summary
  end
-  def generate_readable_report_metrics(report)
+  private
  def generate_readable_report_metrics(report_metric)
    [
-      report[:conversations_count],
+      report_metric[:conversations_count],
-      Reports::TimeFormatPresenter.new(report[:avg_first_response_time]).format,
+      Reports::TimeFormatPresenter.new(report_metric[:avg_first_response_time]).format,
-      Reports::TimeFormatPresenter.new(report[:avg_resolution_time]).format,
+      Reports::TimeFormatPresenter.new(report_metric[:avg_resolution_time]).format,
-      Reports::TimeFormatPresenter.new(report[:avg_reply_time]).format,
+      Reports::TimeFormatPresenter.new(report_metric[:reply_time]).format,
-      report[:resolved_conversations_count]
+      report_metric[:resolutions_count]
    ]
  end
 end
@@ -81,12 +81,4 @@ module FilterHelper
  def default_filter(query_hash, filter_operator_value)
    "#{filter_config[:table_name]}.#{query_hash[:attribute_key]} #{filter_operator_value} #{query_hash[:query_operator]}"
  end
  def validate_single_condition(condition)
    return if condition['query_operator'].nil?
    return if condition['query_operator'].empty?
    operator = condition['query_operator'].upcase
    raise CustomExceptions::CustomFilter::InvalidQueryOperator.new({}) unless %w[AND OR].include?(operator)
  end
 end
@@ -1,47 +0,0 @@
 module Linear::IntegrationHelper
  # Generates a signed JWT token for Linear integration
  #
  # @param account_id [Integer] The account ID to encode in the token
  # @return [String, nil] The encoded JWT token or nil if client secret is missing
  def generate_linear_token(account_id)
    return if client_secret.blank?
    JWT.encode(token_payload(account_id), client_secret, 'HS256')
  rescue StandardError => e
    Rails.logger.error("Failed to generate Linear token: #{e.message}")
    nil
  end
  def token_payload(account_id)
    {
      sub: account_id,
      iat: Time.current.to_i
    }
  end
  # Verifies and decodes a Linear JWT token
  #
  # @param token [String] The JWT token to verify
  # @return [Integer, nil] The account ID from the token or nil if invalid
  def verify_linear_token(token)
    return if token.blank? || client_secret.blank?
    decode_token(token, client_secret)
  end
  private
  def client_secret
    @client_secret ||= GlobalConfigService.load('LINEAR_CLIENT_SECRET', nil)
  end
  def decode_token(token, secret)
    JWT.decode(token, secret, true, {
                 algorithm: 'HS256',
                 verify_expiration: true
               }).first['sub']
  rescue StandardError => e
    Rails.logger.error("Unexpected error verifying Linear token: #{e.message}")
    nil
  end
 end
@@ -5,7 +5,8 @@ module PortalHelper
  end
  def generate_portal_bg(portal_color, theme)
-    generate_portal_bg_color(portal_color, theme)
+    bg_image = theme == 'dark' ? 'hexagon-dark.svg' : 'hexagon-light.svg'
    "url(/assets/images/hc/#{bg_image}) #{generate_portal_bg_color(portal_color, theme)}"
  end
  def generate_gradient_to_bottom(theme)
@@ -6,47 +6,4 @@ module SuperAdmin::AccountFeaturesHelper
  def self.account_premium_features
    account_features.filter { |feature| feature['premium'] }.pluck('name')
  end
  # Returns a hash mapping feature names to their display names
  def self.feature_display_names
    account_features.each_with_object({}) do |feature, hash|
      hash[feature['name']] = feature['display_name']
    end
  end
  def self.filter_internal_features(features)
    return features if GlobalConfig.get_value('DEPLOYMENT_ENV') == 'cloud'
    internal_features = account_features.select { |f| f['chatwoot_internal'] }.pluck('name')
    features.except(*internal_features)
  end
  def self.filter_deprecated_features(features)
    deprecated_features = account_features.select { |f| f['deprecated'] }.pluck('name')
    features.except(*deprecated_features)
  end
  def self.sort_and_transform_features(features, display_names)
    features.sort_by { |key, _| display_names[key] || key }
            .to_h
            .transform_keys { |key| [key, display_names[key]] }
  end
  def self.partition_features(features)
    filtered = filter_internal_features(features)
    filtered = filter_deprecated_features(filtered)
    display_names = feature_display_names
    regular, premium = filtered.partition { |key, _value| account_premium_features.exclude?(key) }
    [
      sort_and_transform_features(regular, display_names),
      sort_and_transform_features(premium, display_names)
    ]
  end
  def self.filtered_features(features)
    regular, premium = partition_features(features)
    regular.merge(premium)
  end
 end
@@ -14,7 +14,6 @@ import WootSnackbarBox from './components/SnackbarContainer.vue';
 import { setColorTheme } from './helper/themeHelper';
 import { isOnOnboardingView } from 'v3/helpers/RouteHelper';
 import { useAccount } from 'dashboard/composables/useAccount';
 import { useFontSize } from 'dashboard/composables/useFontSize';
 import {
  registerSubscription,
  verifyServiceWorkerExistence,
@@ -38,15 +37,8 @@ export default {
    const router = useRouter();
    const store = useStore();
    const { accountId } = useAccount();
    // Use the font size composable (it automatically sets up the watcher)
    const { currentFontSize } = useFontSize();
-    return {
+    return { router, store, currentAccountId: accountId };
      router,
      store,
      currentAccountId: accountId,
      currentFontSize,
    };
  },
  data() {
    return {
@@ -1,19 +0,0 @@
 /* global axios */
 import ApiClient from '../ApiClient';
 class CaptainAssistant extends ApiClient {
  constructor() {
    super('captain/assistants', { accountScoped: true });
  }
  get({ page = 1, searchKey } = {}) {
    return axios.get(this.url, {
      params: {
        page,
        searchKey,
      },
    });
  }
 }
 export default new CaptainAssistant();
@@ -1,9 +0,0 @@
 import ApiClient from '../ApiClient';
 class CaptainBulkActionsAPI extends ApiClient {
  constructor() {
    super('captain/bulk_actions', { accountScoped: true });
  }
 }
 export default new CaptainBulkActionsAPI();
@@ -1,20 +0,0 @@
 /* global axios */
 import ApiClient from '../ApiClient';
 class CaptainDocument extends ApiClient {
  constructor() {
    super('captain/documents', { accountScoped: true });
  }
  get({ page = 1, searchKey, assistantId } = {}) {
    return axios.get(this.url, {
      params: {
        page,
        searchKey,
        assistant_id: assistantId,
      },
    });
  }
 }
 export default new CaptainDocument();
@@ -1,26 +0,0 @@
 /* global axios */
 import ApiClient from '../ApiClient';
 class CaptainInboxes extends ApiClient {
  constructor() {
    super('captain/assistants', { accountScoped: true });
  }
  get({ assistantId } = {}) {
    return axios.get(`${this.url}/${assistantId}/inboxes`);
  }
  create(params = {}) {
    const { assistantId, inboxId } = params;
    return axios.post(`${this.url}/${assistantId}/inboxes`, {
      inbox: { inbox_id: inboxId },
    });
  }
  delete(params = {}) {
    const { assistantId, inboxId } = params;
    return axios.delete(`${this.url}/${assistantId}/inboxes/${inboxId}`);
  }
 }
 export default new CaptainInboxes();
@@ -1,22 +0,0 @@
 /* global axios */
 import ApiClient from '../ApiClient';
 class CaptainResponses extends ApiClient {
  constructor() {
    super('captain/assistant_responses', { accountScoped: true });
  }
  get({ page = 1, searchKey, assistantId, documentId, status } = {}) {
    return axios.get(this.url, {
      params: {
        page,
        searchKey,
        assistant_id: assistantId,
        document_id: documentId,
        status,
      },
    });
  }
 }
 export default new CaptainResponses();
@@ -133,14 +133,6 @@ class ConversationApi extends ApiClient {
  getAllAttachments(conversationId) {
    return axios.get(`${this.url}/${conversationId}/attachments`);
  }
  requestCopilot(conversationId, body) {
    return axios.post(`${this.url}/${conversationId}/copilot`, body);
  }
  getInboxAssistant(conversationId) {
    return axios.get(`${this.url}/${conversationId}/inbox_assistant`);
  }
 }
 export default new ConversationApi();
@@ -32,6 +32,14 @@ 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);
  }
  requestCaptainCopilot(body) {
    return axios.post(`${this.baseUrl()}/integrations/captain/copilot`, body);
  }
 }
 export default new IntegrationsAPI();
@@ -61,9 +61,9 @@ class ReportsAPI extends ApiClient {
    });
  }
-  getConversationTrafficCSV({ daysBefore = 6 } = {}) {
+  getConversationTrafficCSV() {
    return axios.get(`${this.url}/conversation_traffic`, {
-      params: { timezone_offset: getTimeOffset(), days_before: daysBefore },
+      params: { timezone_offset: getTimeOffset() },
    });
  }
@@ -14,29 +14,26 @@ class SearchAPI extends ApiClient {
    });
  }
-  contacts({ q, page = 1 }) {
+  contacts({ q }) {
    return axios.get(`${this.url}/contacts`, {
      params: {
        q,
        page: page,
      },
    });
  }
-  conversations({ q, page = 1 }) {
+  conversations({ q }) {
    return axios.get(`${this.url}/conversations`, {
      params: {
        q,
        page: page,
      },
    });
  }
-  messages({ q, page = 1 }) {
+  messages({ q }) {
    return axios.get(`${this.url}/messages`, {
      params: {
        q,
        page: page,
      },
    });
  }
@@ -1,40 +0,0 @@
 /* global axios */
 import ApiClient from './ApiClient';
 class SummaryReportsAPI extends ApiClient {
  constructor() {
    super('summary_reports', { accountScoped: true, apiVersion: 'v2' });
  }
  getTeamReports({ since, until, businessHours } = {}) {
    return axios.get(`${this.url}/team`, {
      params: {
        since,
        until,
        business_hours: businessHours,
      },
    });
  }
  getAgentReports({ since, until, businessHours } = {}) {
    return axios.get(`${this.url}/agent`, {
      params: {
        since,
        until,
        business_hours: businessHours,
      },
    });
  }
  getInboxReports({ since, until, businessHours } = {}) {
    return axios.get(`${this.url}/inbox`, {
      params: {
        since,
        until,
        business_hours: businessHours,
      },
    });
  }
 }
 export default new SummaryReportsAPI();
@@ -124,19 +124,6 @@
    --teal-11: 0 133 115;
    --teal-12: 13 61 56;
    --gray-1: 252 252 252;
    --gray-2: 249 249 249;
    --gray-3: 240 240 240;
    --gray-4: 232 232 232;
    --gray-5: 224 224 224;
    --gray-6: 217 217 217;
    --gray-7: 206 206 206;
    --gray-8: 187 187 187;
    --gray-9: 141 141 141;
    --gray-10: 131 131 131;
    --gray-11: 100 100 100;
    --gray-12: 32 32 32;
    --background-color: 253 253 253;
    --text-blue: 8 109 224;
    --border-container: 236 236 236;
@@ -148,7 +135,6 @@
    --solid-active: 255 255 255;
    --solid-amber: 252 232 193;
    --solid-blue: 218 236 255;
    --solid-iris: 230 231 255;
    --alpha-1: 67, 67, 67, 0.06;
    --alpha-2: 201, 202, 207, 0.15;
@@ -156,10 +142,10 @@
    --black-alpha-1: 0, 0, 0, 0.12;
    --black-alpha-2: 0, 0, 0, 0.04;
    --border-blue: 39, 129, 246, 0.5;
-    --white-alpha: 255, 255, 255, 0.8;
+    --white-alpha: 255, 255, 255, 0.1;
  }
-  .dark {
+  body.dark {
    /* slate */
    --slate-1: 17 17 19;
    --slate-2: 24 25 27;
@@ -226,19 +212,6 @@
    --teal-11: 11 216 182;
    --teal-12: 173 240 221;
    --gray-1: 17 17 17;
    --gray-2: 25 25 25;
    --gray-3: 34 34 34;
    --gray-4: 42 42 42;
    --gray-5: 49 49 49;
    --gray-6: 58 58 58;
    --gray-7: 72 72 72;
    --gray-8: 96 96 96;
    --gray-9: 110 110 110;
    --gray-10: 123 123 123;
    --gray-11: 180 180 180;
    --gray-12: 238 238 238;
    --background-color: 18 18 19;
    --border-strong: 52 52 52;
    --border-weak: 38 38 42;
@@ -248,7 +221,6 @@
    --solid-active: 53 57 66;
    --solid-amber: 42 37 30;
    --solid-blue: 16 49 91;
    --solid-iris: 38 42 101;
    --text-blue: 126 182 255;
    --alpha-1: 36, 36, 36, 0.8;
@@ -6,209 +6,3 @@
 body {
  font-family: Inter, -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !important;
 }
@layer base {
  // FIXME: Use a common color file for all packs
  // scss-lint:disable PropertySortOrder
  :root {
    --slate-1: 252 252 253;
    --slate-2: 249 249 251;
    --slate-3: 240 240 243;
    --slate-4: 232 232 236;
    --slate-5: 224 225 230;
    --slate-6: 217 217 224;
    --slate-7: 205 206 214;
    --slate-8: 185 187 198;
    --slate-9: 139 141 152;
    --slate-10: 128 131 141;
    --slate-11: 96 100 108;
    --slate-12: 28 32 36;
    --iris-1: 253 253 255;
    --iris-2: 248 248 255;
    --iris-3: 240 241 254;
    --iris-4: 230 231 255;
    --iris-5: 218 220 255;
    --iris-6: 203 205 255;
    --iris-7: 184 186 248;
    --iris-8: 155 158 240;
    --iris-9: 91 91 214;
    --iris-10: 81 81 205;
    --iris-11: 87 83 198;
    --iris-12: 39 41 98;
    --ruby-1: 255 252 253;
    --ruby-2: 255 247 248;
    --ruby-3: 254 234 237;
    --ruby-4: 255 220 225;
    --ruby-5: 255 206 214;
    --ruby-6: 248 191 200;
    --ruby-7: 239 172 184;
    --ruby-8: 229 146 163;
    --ruby-9: 229 70 102;
    --ruby-10: 220 59 93;
    --ruby-11: 202 36 77;
    --ruby-12: 100 23 43;
    --amber-1: 254 253 251;
    --amber-2: 254 251 233;
    --amber-3: 255 247 194;
    --amber-4: 255 238 156;
    --amber-5: 251 229 119;
    --amber-6: 243 214 115;
    --amber-7: 233 193 98;
    --amber-8: 226 163 54;
    --amber-9: 255 197 61;
    --amber-10: 255 186 24;
    --amber-11: 171 100 0;
    --amber-12: 79 52 34;
    --teal-1: 250 254 253;
    --teal-2: 243 251 249;
    --teal-3: 224 248 243;
    --teal-4: 204 243 234;
    --teal-5: 184 234 224;
    --teal-6: 161 222 210;
    --teal-7: 131 205 193;
    --teal-8: 83 185 171;
    --teal-9: 18 165 148;
    --teal-10: 13 155 138;
    --teal-11: 0 133 115;
    --teal-12: 13 61 56;
    --gray-1: 252 252 252;
    --gray-2: 249 249 249;
    --gray-3: 240 240 240;
    --gray-4: 232 232 232;
    --gray-5: 224 224 224;
    --gray-6: 217 217 217;
    --gray-7: 206 206 206;
    --gray-8: 187 187 187;
    --gray-9: 141 141 141;
    --gray-10: 131 131 131;
    --gray-11: 100 100 100;
    --gray-12: 32 32 32;
    --background-color: 253 253 253;
    --text-blue: 8 109 224;
    --border-container: 236 236 236;
    --border-strong: 235 235 235;
    --border-weak: 234 234 234;
    --solid-1: 255 255 255;
    --solid-2: 255 255 255;
    --solid-3: 255 255 255;
    --solid-active: 255 255 255;
    --solid-amber: 252 232 193;
    --solid-blue: 218 236 255;
    --solid-iris: 230 231 255;
    --alpha-1: 67, 67, 67, 0.06;
    --alpha-2: 201, 202, 207, 0.15;
    --alpha-3: 255, 255, 255, 0.96;
    --black-alpha-1: 0, 0, 0, 0.12;
    --black-alpha-2: 0, 0, 0, 0.04;
    --border-blue: 39, 129, 246, 0.5;
    --white-alpha: 255, 255, 255, 0.8;
  }
  .dark {
    --slate-1: 17 17 19;
    --slate-2: 24 25 27;
    --slate-3: 33 34 37;
    --slate-4: 39 42 45;
    --slate-5: 46 49 53;
    --slate-6: 54 58 63;
    --slate-7: 67 72 78;
    --slate-8: 90 97 105;
    --slate-9: 105 110 119;
    --slate-10: 119 123 132;
    --slate-11: 176 180 186;
    --slate-12: 237 238 240;
    --iris-1: 19 19 30;
    --iris-2: 23 22 37;
    --iris-3: 32 34 72;
    --iris-4: 38 42 101;
    --iris-5: 48 51 116;
    --iris-6: 61 62 130;
    --iris-7: 74 74 149;
    --iris-8: 89 88 177;
    --iris-9: 91 91 214;
    --iris-10: 84 114 228;
    --iris-11: 158 177 255;
    --iris-12: 224 223 254;
    --ruby-1: 25 17 19;
    --ruby-2: 30 21 23;
    --ruby-3: 58 20 30;
    --ruby-4: 78 19 37;
    --ruby-5: 94 26 46;
    --ruby-6: 111 37 57;
    --ruby-7: 136 52 71;
    --ruby-8: 179 68 90;
    --ruby-9: 229 70 102;
    --ruby-10: 236 90 114;
    --ruby-11: 255 148 157;
    --ruby-12: 254 210 225;
    --amber-1: 22 18 12;
    --amber-2: 29 24 15;
    --amber-3: 48 32 8;
    --amber-4: 63 39 0;
    --amber-5: 77 48 0;
    --amber-6: 92 61 5;
    --amber-7: 113 79 25;
    --amber-8: 143 100 36;
    --amber-9: 255 197 61;
    --amber-10: 255 214 10;
    --amber-11: 255 202 22;
    --amber-12: 255 231 179;
    --teal-1: 13 21 20;
    --teal-2: 17 28 27;
    --teal-3: 13 45 42;
    --teal-4: 2 59 55;
    --teal-5: 8 72 67;
    --teal-6: 20 87 80;
    --teal-7: 28 105 97;
    --teal-8: 32 126 115;
    --teal-9: 18 165 148;
    --teal-10: 14 179 158;
    --teal-11: 11 216 182;
    --teal-12: 173 240 221;
    --gray-1: 17 17 17;
    --gray-2: 25 25 25;
    --gray-3: 34 34 34;
    --gray-4: 42 42 42;
    --gray-5: 49 49 49;
    --gray-6: 58 58 58;
    --gray-7: 72 72 72;
    --gray-8: 96 96 96;
    --gray-9: 110 110 110;
    --gray-10: 123 123 123;
    --gray-11: 180 180 180;
    --gray-12: 238 238 238;
    --background-color: 18 18 19;
    --border-strong: 52 52 52;
    --border-weak: 38 38 42;
    --solid-1: 23 23 26;
    --solid-2: 29 30 36;
    --solid-3: 44 45 54;
    --solid-active: 53 57 66;
    --solid-amber: 42 37 30;
    --solid-blue: 16 49 91;
    --solid-iris: 38 42 101;
    --text-blue: 126 182 255;
    --alpha-1: 36, 36, 36, 0.8;
    --alpha-2: 139, 147, 182, 0.15;
    --alpha-3: 36, 38, 45, 0.9;
    --black-alpha-1: 0, 0, 0, 0.3;
    --black-alpha-2: 0, 0, 0, 0.2;
    --border-blue: 39, 129, 246, 0.5;
    --border-container: 236, 236, 236, 0;
    --white-alpha: 255, 255, 255, 0.1;
  }
 }
@@ -82,7 +82,7 @@ input[type='url']:not(.reset-base) {
 }
 input[type='file'] {
-  @apply bg-white dark:bg-n-solid-1 leading-[1.15] mb-4;
+  @apply bg-white dark:bg-slate-800 leading-[1.15] mb-4;
 }
 // Select
@@ -141,16 +141,11 @@ code {
  @apply text-xs border-0;
  &.hljs {
-    @apply bg-n-slate-3 dark:bg-n-solid-3 text-slate-800 dark:text-slate-50 rounded-lg p-5;
+    @apply bg-slate-50 dark:bg-slate-700 text-slate-800 dark:text-slate-50 rounded-lg p-5;
    .hljs-number,
    .hljs-string {
      @apply text-red-800 dark:text-red-400;
    }
    .hljs-name,
    .hljs-tag {
      @apply text-n-slate-11;
    }
  }
 }
@@ -31,7 +31,7 @@ button {
 }
 .button {
-  @apply items-center bg-n-brand px-2.5 text-white dark:text-white inline-flex h-10 mb-0 gap-2 font-medium;
+  @apply items-center bg-n-brand px-2.5 text-white inline-flex h-10 mb-0 gap-2 font-medium;
  .button__content {
    @apply w-full whitespace-nowrap overflow-hidden text-ellipsis;
@@ -42,9 +42,7 @@ button {
    }
  }
-  &:hover:not(.secondary):not(.success):not(.alert):not(.warning):not(
+  &:hover {
      .clear
    ):not(.smooth):not(.hollow) {
    @apply bg-n-brand/80 dark:bg-n-brand/80;
  }
@@ -54,23 +52,23 @@ button {
  }
  &.success {
-    @apply bg-n-teal-9 text-white dark:text-white;
+    @apply dark:bg-n-teal-7 bg-n-teal-10 text-white hover:bg-n-teal-11 dark:hover:bg-n-teal-8;
  }
  &.secondary {
-    @apply bg-n-solid-3 text-white dark:text-white;
+    @apply dark:bg-n-solid-3 hover:bg-n-slate-3 dark:hover:bg-n-solid-2 bg-n-slate-5 text-n-slate-12;
  }
  &.primary {
-    @apply bg-n-brand text-white dark:text-white;
+    @apply bg-n-brand text-white hover:brightness-110;
  }
  &.clear {
-    @apply text-n-blue-text dark:text-n-blue-text bg-transparent dark:bg-transparent;
+    @apply text-n-blue-text bg-transparent dark:bg-transparent;
  }
  &.alert {
-    @apply bg-n-ruby-9 text-white dark:text-white;
+    @apply bg-n-ruby-9 dark:bg-n-ruby-9 text-white dark:text-white;
    &.clear {
      @apply bg-transparent dark:bg-transparent;
@@ -78,7 +76,7 @@ button {
  }
  &.warning {
-    @apply bg-n-amber-9 text-white dark:text-white;
+    @apply bg-n-amber-9 dark:bg-n-amber-6 text-white hover:bg-n-amber-10 dark:hover:bg-n-amber-7;
    &.clear {
      @apply bg-transparent dark:bg-transparent;
@@ -117,63 +115,103 @@ button {
  }
  &.hollow {
-    @apply border border-n-brand/40 bg-transparent text-n-blue-text hover:bg-n-brand/20;
+    @apply border border-n-brand bg-transparent dark:bg-transparent dark:border-n-brand text-n-blue-text dark:text-n-brand;
    &.secondary {
-      @apply text-n-slate-12 border-n-slate-5 hover:bg-n-slate-5;
+      @apply text-n-slate-12 border-n-strong dark:text-n-slate-12 hover:bg-n-slate-4 dark:hover:bg-n-solid-3;
    }
    &.success {
-      @apply text-n-teal-9 border-n-teal-8 hover:bg-n-teal-5;
+      @apply text-n-teal-8 dark:text-n-teal-9 border-n-teal-8 hover:bg-n-teal-3 dark:hover:bg-n-teal-4;
    }
    &.alert {
-      @apply text-n-ruby-9 border-n-ruby-8 hover:bg-n-ruby-5;
+      @apply text-n-ruby-11 dark:text-n-ruby-11 border-n-ruby-8 hover:bg-n-ruby-4 dark:hover:bg-n-ruby-4;
    }
    &.warning {
-      @apply text-n-amber-9 border-n-amber-8 hover:bg-n-amber-5;
+      @apply text-n-amber-10 dark:text-n-amber-10 border-n-amber-9 dark:border-n-amber-8 hover:bg-n-amber-4 dark:hover:bg-n-amber-4;
    }
    &:hover {
      @apply hover:bg-n-brand/20 dark:hover:bg-n-brand/30 border-n-brand dark:border-n-brand/60;
      &.secondary {
        @apply border-n-strong text-n-slate-12 dark:text-n-slate-12 hover:bg-n-slate-4 dark:hover:bg-n-solid-2;
      }
      &.success {
        @apply border-n-teal-8 dark:border-n-teal-7 text-n-teal-8 dark:text-n-teal-9;
      }
      &.alert {
        @apply border-n-ruby-8 text-n-ruby-11 dark:text-n-ruby-11;
      }
      &.warning {
        @apply border-n-amber-9 dark:border-n-amber-8 text-n-amber-10 dark:text-n-amber-10;
      }
    }
  }
  // Smooth style
  &.smooth {
-    @apply bg-n-brand/10 dark:bg-n-brand/30 text-n-blue-text hover:bg-n-brand/20 dark:hover:bg-n-brand/40;
+    @apply bg-n-brand/10 dark:bg-n-brand/50 text-n-blue-text hover:bg-n-brand/20 dark:hover:bg-n-brand/60;
    &.secondary {
-      @apply bg-n-slate-4 text-n-slate-11 hover:text-n-slate-11 hover:bg-n-slate-5;
+      @apply bg-n-alpha-1 dark:bg-n-solid-3 dark:hover:bg-n-solid-2 hover:bg-n-alpha-2 text-n-slate-12;
    }
    &.success {
-      @apply bg-n-teal-4 text-n-teal-11 hover:text-n-teal-11 hover:bg-n-teal-5;
+      @apply bg-n-teal-9/10 text-n-teal-10 hover:bg-n-teal-9/20;
    }
    &.alert {
-      @apply bg-n-ruby-4 text-n-ruby-11 hover:text-n-ruby-11 hover:bg-n-ruby-5;
+      @apply bg-n-ruby-9/20 text-n-ruby-11 hover:bg-n-ruby-9/30;
    }
    &.warning {
-      @apply bg-n-amber-4 text-n-amber-11 hover:text-n-amber-11 hover:bg-n-amber-5;
+      @apply bg-n-amber-9/20 text-n-amber-10 hover:bg-n-amber-9/30;
    }
  }
  &.clear {
-    @apply text-n-blue-text hover:bg-n-brand/10 dark:hover:bg-n-brand/30;
+    @apply text-n-blue-text;
    &.secondary {
-      @apply text-n-slate-12 hover:bg-n-slate-4;
+      @apply text-n-slate-12 dark:text-n-slate-12;
    }
    &.success {
-      @apply text-n-teal-10 hover:bg-n-teal-4;
+      @apply text-n-teal-10 dark:text-n-teal-9;
    }
    &.alert {
-      @apply text-n-ruby-11 hover:bg-n-ruby-4;
+      @apply text-n-ruby-11 dark:text-n-ruby-11;
    }
    &.warning {
-      @apply text-n-amber-11 hover:bg-n-amber-4;
+      @apply text-n-amber-11 dark:text-n-amber-11;
    }
    &:hover {
      @apply hover:bg-n-brand/10 dark:hover:bg-n-brand/30 hover:text-n-brand;
      &.secondary {
        @apply hover:bg-n-slate-4 dark:hover:bg-n-solid-3 hover:text-n-slate-12 dark:hover:text-n-slate-12;
      }
      &.success {
        @apply hover:bg-n-teal-4 dark:hover:bg-n-teal-4 hover:text-n-teal-11 dark:hover:text-n-teal-9;
      }
      &.alert {
        @apply hover:bg-n-ruby-4 dark:hover:bg-n-ruby-4 hover:text-n-ruby-11 dark:hover:text-n-ruby-11;
      }
      &.warning {
        @apply hover:bg-n-amber-3 dark:hover:bg-n-amber-2 hover:text-n-amber-11 dark:hover:text-n-amber-11;
      }
    }
    &:active {
@@ -3,15 +3,7 @@
 }
 .tabs--container--with-border {
-  @apply border-b border-n-weak;
+  @apply border-b border-n-weak dark:border-n-weak;
 }
 .tabs--container--compact.tab--chat-type {
  .tabs-title {
    a {
      @apply py-2 text-sm;
    }
  }
 }
 .tabs {
@@ -42,7 +34,7 @@
  @apply flex-shrink-0 my-0 mx-2;
  .badge {
-    @apply bg-n-alpha-black2 dark:bg-n-solid-3 rounded-md text-n-slate-11 h-5 flex items-center justify-center text-xxs font-semibold my-0 mx-1 px-1 py-0;
+    @apply bg-n-slate-3 dark:bg-n-solid-3 rounded-md text-slate-600 dark:text-slate-100 h-5 flex items-center justify-center text-xxs font-semibold my-0 mx-1 px-1 py-0;
  }
  &:first-child {
@@ -56,22 +48,22 @@
  &:hover,
  &:focus {
    a {
-      @apply text-n-slate-12;
+      @apply text-slate-800 dark:text-slate-100;
    }
  }
  a {
-    @apply flex items-center flex-row border-b py-2.5 select-none cursor-pointer border-transparent text-n-slate-11 text-sm top-[1px] relative;
+    @apply flex items-center flex-row border-b py-2.5 select-none cursor-pointer border-transparent text-slate-500 dark:text-slate-200 text-sm top-[1px] relative;
    transition: border-color 0.15s $swift-ease-out-function;
  }
  &.is-active {
    a {
-      @apply border-b border-n-brand text-n-blue-text;
+      @apply border-b border-n-brand text-n-blue-text dark:text-n-blue-text;
    }
    .badge {
-      @apply bg-n-brand/10 dark:bg-n-brand/20 text-n-blue-text;
+      @apply bg-n-brand/10 dark:bg-n-brand/20 text-n-blue-text dark:text-n-blue-text dark:bg-opacity-40;
    }
  }
 }
@@ -98,7 +98,7 @@ const inboxIcon = computed(() => {
        </span>
      </div>
      <div
-        v-dompurify-html="formatMessage(message, false, false, false)"
+        v-dompurify-html="formatMessage(message)"
        class="text-sm text-n-slate-11 line-clamp-1 [&>p]:mb-0 h-6"
      />
      <div class="flex items-center w-full h-6 gap-2 overflow-hidden">
@@ -22,7 +22,7 @@ const handleButtonClick = () => {
 <template>
  <section class="flex flex-col w-full h-full overflow-hidden bg-n-background">
    <header class="sticky top-0 z-10 px-6 lg:px-0">
-      <div class="w-full max-w-[60rem] mx-auto">
+      <div class="w-full max-w-[960px] mx-auto">
        <div class="flex items-center justify-between w-full h-20 gap-2">
          <span class="text-xl font-medium text-n-slate-12">
            {{ headerTitle }}
@@ -44,7 +44,7 @@ const handleButtonClick = () => {
      </div>
    </header>
    <main class="flex-1 px-6 overflow-y-auto lg:px-0">
-      <div class="w-full max-w-[60rem] mx-auto py-4">
+      <div class="w-full max-w-[960px] mx-auto py-4">
        <slot name="default" />
      </div>
    </main>
@@ -21,11 +21,11 @@ const addCampaign = async campaignDetails => {
      type: CAMPAIGN_TYPES.ONGOING,
    });
-    useAlert(t('CAMPAIGN.LIVE_CHAT.CREATE.FORM.API.SUCCESS_MESSAGE'));
+    useAlert(t('CAMPAIGN.SMS.CREATE.FORM.API.SUCCESS_MESSAGE'));
  } catch (error) {
    const errorMessage =
      error?.response?.message ||
-      t('CAMPAIGN.LIVE_CHAT.CREATE.FORM.API.ERROR_MESSAGE');
+      t('CAMPAIGN.SMS.CREATE.FORM.API.ERROR_MESSAGE');
    useAlert(errorMessage);
  }
 };
@@ -40,7 +40,7 @@ const handleSubmit = campaignDetails => {
 <template>
  <div
-    class="w-[25rem] z-50 min-w-0 absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6 max-h-[85vh] overflow-y-auto"
+    class="w-[400px] z-50 min-w-0 absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6 max-h-[85vh] overflow-y-auto"
  >
    <h3 class="text-base font-medium text-slate-900 dark:text-slate-50">
      {{ t(`CAMPAIGN.LIVE_CHAT.CREATE.TITLE`) }}
@@ -39,7 +39,7 @@ const handleClose = () => emit('close');
 <template>
  <div
-    class="w-[25rem] z-50 min-w-0 absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6"
+    class="w-[400px] z-50 min-w-0 absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6"
  >
    <h3 class="text-base font-medium text-slate-900 dark:text-slate-50">
      {{ t(`CAMPAIGN.SMS.CREATE.TITLE`) }}
@@ -4,10 +4,6 @@ defineProps({
    type: String,
    default: 'col',
  },
  selectable: {
    type: Boolean,
    default: false,
  },
 });
 const emit = defineEmits(['click']);
@@ -22,11 +18,10 @@ const handleClick = () => {
    class="flex flex-col w-full shadow outline-1 outline outline-n-container group/cardLayout rounded-2xl bg-n-solid-2"
  >
    <div
-      class="flex w-full gap-3 py-5"
+      class="flex w-full gap-3 px-6 py-5"
-      :class="[
+      :class="
-        layout === 'col' ? 'flex-col' : 'flex-row justify-between items-center',
+        layout === 'col' ? 'flex-col' : 'flex-row justify-between items-center'
-        selectable ? 'px-10 py-6' : 'px-6',
+      "
      ]"
      @click="handleClick"
    >
      <slot />
@@ -18,11 +18,6 @@ const route = useRoute();
 const showDropdown = ref(false);
 // Store the currently hovered label's ID
 // Using JS state management instead of CSS :hover / group hover
 // This will solve the flickering issue when hovering over the last label item
 const hoveredLabel = ref(null);
 const allLabels = useMapGetter('labels/getLabels');
 const contactLabels = useMapGetter('contactLabels/getContactLabels');
@@ -42,7 +37,7 @@ const labelMenuItems = computed(() => {
      isSelected: savedLabels.value.some(
        savedLabel => savedLabel.id === label.id
      ),
-      action: 'contactLabel',
+      action: 'addLabel',
    }))
    .toSorted((a, b) => Number(a.isSelected) - Number(b.isSelected));
 });
@@ -54,7 +49,7 @@ const fetchLabels = async contactId => {
  store.dispatch('contactLabels/get', contactId);
 };
-const handleLabelAction = async ({ value }) => {
+const handleLabelAction = async ({ action, value }) => {
  try {
    // Get current label titles
    const currentLabels = savedLabels.value.map(label => label.title);
@@ -64,15 +59,16 @@ const handleLabelAction = async ({ value }) => {
    if (!selectedLabel) return;
    let updatedLabels;
-
+    if (action === 'addLabel') {
-    // If label is already selected, remove it (toggle behavior)
+      // If label is already selected, remove it (toggle behavior)
-    if (currentLabels.includes(selectedLabel.title)) {
+      if (currentLabels.includes(selectedLabel.title)) {
-      updatedLabels = currentLabels.filter(
+        updatedLabels = currentLabels.filter(
-        labelTitle => labelTitle !== selectedLabel.title
+          labelTitle => labelTitle !== selectedLabel.title
-      );
+        );
-    } else {
+      } else {
-      // Add the new label
+        // Add the new label
-      updatedLabels = [...currentLabels, selectedLabel.title];
+        updatedLabels = [...currentLabels, selectedLabel.title];
      }
    }
    await store.dispatch('contactLabels/update', {
@@ -86,10 +82,6 @@ const handleLabelAction = async ({ value }) => {
  }
 };
 const handleRemoveLabel = labelId => {
  return handleLabelAction({ value: labelId });
 };
 watch(
  () => props.contactId,
  (newVal, oldVal) => {
@@ -103,31 +95,11 @@ onMounted(() => {
    fetchLabels(route.params.contactId);
  }
 });
 const handleMouseLeave = () => {
  // Reset hover state when mouse leaves the container
  // This ensures all labels return to their default state
  hoveredLabel.value = null;
 };
 const handleLabelHover = labelId => {
  // Added this to prevent flickering on when showing remove button on hover
  // If the label item is at end of the line, it will show the remove button
  // when hovering over the last label item
  hoveredLabel.value = labelId;
 };
 </script>
 <template>
-  <div class="flex flex-wrap items-center gap-2" @mouseleave="handleMouseLeave">
+  <div class="flex flex-wrap items-center gap-2">
-    <LabelItem
+    <LabelItem v-for="label in savedLabels" :key="label.id" :label="label" />
      v-for="label in savedLabels"
      :key="label.id"
      :label="label"
      :is-hovered="hoveredLabel === label.id"
      @remove="handleRemoveLabel"
      @hover="handleLabelHover(label.id)"
    />
    <AddLabel
      :label-menu-items="labelMenuItems"
      @update-label="handleLabelAction"
@@ -8,17 +8,17 @@ import Breadcrumb from 'dashboard/components-next/breadcrumb/Breadcrumb.vue';
 import ComposeConversation from 'dashboard/components-next/NewConversation/ComposeConversation.vue';
 const props = defineProps({
  buttonLabel: {
    type: String,
    default: '',
  },
  selectedContact: {
    type: Object,
    default: () => ({}),
  },
  isUpdating: {
    type: Boolean,
    default: false,
  },
 });
-const emit = defineEmits(['goToContactsList', 'toggleBlock']);
+const emit = defineEmits(['goToContactsList']);
 const { t } = useI18n();
 const slots = useSlots();
@@ -45,17 +45,9 @@ const breadcrumbItems = computed(() => {
  return items;
 });
 const isContactBlocked = computed(() => {
  return props.selectedContact?.blocked;
 });
 const handleBreadcrumbClick = () => {
  emit('goToContactsList');
 };
 const toggleBlock = () => {
  emit('toggleBlock', isContactBlocked.value);
 };
 </script>
 <template>
@@ -65,41 +57,23 @@ const toggleBlock = () => {
    <div
      class="flex flex-col w-full h-full transition-all duration-300 ltr:2xl:ml-56 rtl:2xl:mr-56"
    >
-      <header class="sticky top-0 z-10 px-6 3xl:px-0">
+      <header class="sticky top-0 z-10 px-6 xl:px-0">
-        <div class="w-full mx-auto max-w-[40.625rem]">
+        <div class="w-full mx-auto max-w-[650px]">
          <div class="flex items-center justify-between w-full h-20 gap-2">
            <Breadcrumb
              :items="breadcrumbItems"
              @click="handleBreadcrumbClick"
            />
-            <div class="flex items-center gap-2">
+            <ComposeConversation :contact-id="contactId">
-              <Button
+              <template #trigger="{ toggle }">
-                :label="
+                <Button :label="buttonLabel" size="sm" @click="toggle" />
-                  !isContactBlocked
+              </template>
-                    ? $t('CONTACTS_LAYOUT.HEADER.BLOCK_CONTACT')
+            </ComposeConversation>
                    : $t('CONTACTS_LAYOUT.HEADER.UNBLOCK_CONTACT')
                "
                size="sm"
                slate
                :is-loading="isUpdating"
                :disabled="isUpdating"
                @click="toggleBlock"
              />
              <ComposeConversation :contact-id="contactId">
                <template #trigger="{ toggle }">
                  <Button
                    :label="$t('CONTACTS_LAYOUT.HEADER.SEND_MESSAGE')"
                    size="sm"
                    @click="toggle"
                  />
                </template>
              </ComposeConversation>
            </div>
          </div>
        </div>
      </header>
-      <main class="flex-1 px-6 overflow-y-auto 3xl:px-px">
+      <main class="flex-1 px-6 overflow-y-auto xl:px-px">
-        <div class="w-full py-4 mx-auto max-w-[40.625rem]">
+        <div class="w-full py-4 mx-auto max-w-[650px]">
          <slot name="default" />
        </div>
      </main>
@@ -107,7 +81,7 @@ const toggleBlock = () => {
    <div
      v-if="slots.sidebar"
-      class="overflow-y-auto justify-end min-w-52 w-full py-6 max-w-md border-l border-n-weak bg-n-solid-2"
+      class="overflow-y-auto justify-end min-w-[200px] w-full py-6 max-w-[440px] border-l border-n-weak bg-n-solid-2"
    >
      <slot name="sidebar" />
    </div>
@@ -50,7 +50,6 @@ const { t } = useI18n();
      </div>
      <ComboBox
        id="inbox"
        use-api-results
        :model-value="primaryContactId"
        :options="primaryContactList"
        :empty-state="
@@ -1,7 +1,7 @@
 <script setup>
 import { computed, reactive, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { required, email } from '@vuelidate/validators';
+import { required, email, minLength } from '@vuelidate/validators';
 import { useVuelidate } from '@vuelidate/core';
 import { splitName } from '@chatwoot/utils';
 import countries from 'shared/constants/countries.js';
@@ -35,7 +35,7 @@ const FORM_CONFIG = {
  EMAIL_ADDRESS: { field: 'email' },
  PHONE_NUMBER: { field: 'phoneNumber' },
  CITY: { field: 'additionalAttributes.city' },
-  COUNTRY: { field: 'additionalAttributes.countryCode' },
+  COUNTRY: { field: 'additionalAttributes.country' },
  BIO: { field: 'additionalAttributes.description' },
  COMPANY_NAME: { field: 'additionalAttributes.companyName' },
 };
@@ -74,7 +74,7 @@ const defaultState = {
 const state = reactive({ ...defaultState });
 const validationRules = {
-  firstName: { required },
+  firstName: { required, minLength: minLength(2) },
  email: { email },
 };
@@ -94,7 +94,7 @@ const prepareStateBasedOnProps = () => {
    phoneNumber,
    additionalAttributes = {},
  } = props.contactData || {};
-  const { firstName, lastName } = splitName(name || '');
+  const { firstName, lastName } = splitName(name);
  const {
    description = '',
    companyName = '',
@@ -123,7 +123,7 @@ const prepareStateBasedOnProps = () => {
 };
 const countryOptions = computed(() =>
-  countries.map(({ name, id }) => ({ label: name, value: id }))
+  countries.map(({ name }) => ({ label: name, value: name }))
 );
 const editDetailsForm = computed(() =>
@@ -205,8 +205,8 @@ const getMessageType = key => {
 };
 const handleCountrySelection = value => {
-  const selectedCountry = countries.find(option => option.id === value);
+  const selectedCountry = countries.find(option => option.name === value);
-  state.additionalAttributes.country = selectedCountry?.name || '';
+  state.additionalAttributes.countryCode = selectedCountry?.id || '';
  emit('update', state);
 };
@@ -242,7 +242,7 @@ defineExpose({
        <template v-for="item in editDetailsForm" :key="item.key">
          <ComboBox
            v-if="item.key === 'COUNTRY'"
-            v-model="state.additionalAttributes.countryCode"
+            v-model="state.additionalAttributes.country"
            :options="countryOptions"
            :placeholder="item.placeholder"
            class="[&>div>button]:h-8"
@@ -59,7 +59,6 @@ defineExpose({ dialogRef, contactsFormRef, onSuccess });
            t('CONTACTS_LAYOUT.HEADER.ACTIONS.CONTACT_CREATION.SAVE_CONTACT')
          "
          color="blue"
          :disabled="contactsFormRef?.isFormInvalid"
          :is-loading="isCreatingContact"
          @click="handleDialogConfirm"
        />
@@ -60,7 +60,7 @@ const emit = defineEmits([
 <template>
  <header class="sticky top-0 z-10">
    <div
-      class="flex items-center justify-between w-full h-20 px-6 gap-2 mx-auto max-w-[60rem]"
+      class="flex items-center justify-between w-full h-20 px-6 gap-2 mx-auto max-w-[960px]"
    >
      <span class="text-xl font-medium truncate text-n-slate-12">
        {{ headerTitle }}
@@ -106,15 +106,10 @@ const onImport = async file => {
  try {
    await store.dispatch('contacts/import', file);
    contactImportDialogRef.value?.dialogRef.close();
-    useAlert(
+    useAlert(t('IMPORT_CONTACTS.SUCCESS_MESSAGE'));
      t('CONTACTS_LAYOUT.HEADER.ACTIONS.IMPORT_CONTACT.SUCCESS_MESSAGE')
    );
    useTrack(CONTACTS_EVENTS.IMPORT_SUCCESS);
  } catch (error) {
-    useAlert(
+    useAlert(error.message ?? t('IMPORT_CONTACTS.ERROR_MESSAGE'));
      error.message ??
        t('CONTACTS_LAYOUT.HEADER.ACTIONS.IMPORT_CONTACT.ERROR_MESSAGE')
    );
    useTrack(CONTACTS_EVENTS.IMPORT_FAILURE);
  }
 };
@@ -62,7 +62,7 @@ const activeFilterQueryData = computed(() => {
      t('CONTACTS_LAYOUT.FILTER.ACTIVE_FILTERS.CLEAR_FILTERS')
    "
    :show-clear-button="!hasActiveSegments"
-    class="max-w-[60rem] px-6"
+    class="max-w-[960px] px-6"
    @open-filter="emit('openFilter')"
    @clear-filters="emit('clearFilters')"
  />
@@ -72,7 +72,7 @@ const openFilter = () => {
        @clear-filters="emit('clearFilters')"
      />
      <main class="flex-1 overflow-y-auto">
-        <div class="w-full mx-auto max-w-[60rem]">
+        <div class="w-full mx-auto max-w-[960px]">
          <ContactsActiveFiltersPreview
            v-if="
              (hasAppliedFilters || !isNotSegmentView) &&
@@ -2,7 +2,6 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useMapGetter } from 'dashboard/composables/store';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import ContactCustomAttributeItem from 'dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributeItem.vue';
@@ -15,8 +14,6 @@ const props = defineProps({
 const { t } = useI18n();
 const { uiSettings } = useUISettings();
 const searchQuery = ref('');
 const contactAttributes = useMapGetter('attributes/getContactAttributes') || [];
@@ -49,49 +46,20 @@ const processContactAttributes = (
  }, []);
 };
 const sortAttributesOrder = computed(
  () =>
    uiSettings.value.conversation_elements_order_conversation_contact_panel ??
    []
 );
 const sortByUISettings = attributes => {
  // Get saved order from UI settings
  // Same as conversation panel contact attribute order
  const order = sortAttributesOrder.value;
  // If no order defined, return original array
  if (!order?.length) return attributes;
  const orderMap = new Map(order.map((key, index) => [key, index]));
  // Sort attributes based on their position in saved order
  return [...attributes].sort((a, b) => {
    // Get positions, use Infinity if not found in order (pushes to end)
    const aPos = orderMap.get(a.attributeKey) ?? Infinity;
    const bPos = orderMap.get(b.attributeKey) ?? Infinity;
    return aPos - bPos;
  });
 };
 const usedAttributes = computed(() => {
-  const attributes = processContactAttributes(
+  return processContactAttributes(
    contactAttributes.value,
    props.selectedContact?.customAttributes,
    (key, custom) => key in custom
  );
  return sortByUISettings(attributes);
 });
 const unusedAttributes = computed(() => {
-  const attributes = processContactAttributes(
+  return processContactAttributes(
    contactAttributes.value,
    props.selectedContact?.customAttributes,
    (key, custom) => !(key in custom)
  );
  return sortByUISettings(attributes);
 });
 const filteredUnusedAttributes = computed(() => {
@@ -29,7 +29,7 @@ const getWrittenBy = note => {
  const isCurrentUser = note?.user?.id === currentUser.value.id;
  return isCurrentUser
    ? t('CONTACTS_LAYOUT.SIDEBAR.NOTES.YOU')
-    : note?.user?.name || 'Bot';
+    : note.user.name;
 };
 const onAdd = content => {
@@ -33,8 +33,8 @@ const handleDelete = () => {
    <div class="flex items-center justify-between">
      <div class="flex items-center gap-1.5 py-2.5 min-w-0">
        <Avatar
-          :name="note?.user?.name || 'Bot'"
+          :name="note.user.name"
-          :src="note?.user?.thumbnail || '/assets/images/chatwoot_bot.png'"
+          :src="note.user.thumbnail"
          :size="16"
          rounded-full
        />
@@ -21,7 +21,7 @@ const lastNonActivityMessageContent = computed(() => {
    props.conversation;
  const { email: { subject } = {} } = customAttributes;
  return getPlainText(
-    subject || lastNonActivityMessage?.content || t('CHAT_LIST.NO_CONTENT')
+    subject || lastNonActivityMessage.content || t('CHAT_LIST.NO_CONTENT')
  );
 });
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
@@ -20,8 +20,6 @@ const props = defineProps({
 const { t } = useI18n();
 const slaCardLabelRef = ref(null);
 const { getPlainText } = useMessageFormatter();
 const lastNonActivityMessageContent = computed(() => {
@@ -29,7 +27,7 @@ const lastNonActivityMessageContent = computed(() => {
    props.conversation;
  const { email: { subject } = {} } = customAttributes;
  return getPlainText(
-    subject || lastNonActivityMessage?.content || t('CHAT_LIST.NO_CONTENT')
+    subject || lastNonActivityMessage.content || t('CHAT_LIST.NO_CONTENT')
  );
 });
@@ -47,15 +45,7 @@ const unreadMessagesCount = computed(() => {
  return unreadCount;
 });
-const hasSlaThreshold = computed(() => {
+const hasSlaThreshold = computed(() => props.conversation?.slaPolicyId);
  return (
    slaCardLabelRef.value?.hasSlaThreshold && props.conversation?.slaPolicyId
  );
 });
 defineExpose({
  hasSlaThreshold,
 });
 </script>
 <template>
@@ -83,11 +73,7 @@ defineExpose({
          : 'grid-cols-[1fr_20px]'
      "
    >
-      <SLACardLabel
+      <SLACardLabel v-if="hasSlaThreshold" :conversation="conversation" />
        v-show="hasSlaThreshold"
        ref="slaCardLabelRef"
        :conversation="conversation"
      />
      <div v-if="hasSlaThreshold" class="w-px h-3 bg-n-slate-4" />
      <div class="overflow-hidden">
        <CardLabels
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { getInboxIconByType } from 'dashboard/helper/inbox';
 import { useRouter, useRoute } from 'vue-router';
 import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper.js';
@@ -33,8 +33,6 @@ const props = defineProps({
 const router = useRouter();
 const route = useRoute();
 const cardMessagePreviewWithMetaRef = ref(null);
 const currentContact = computed(() => props.contact);
 const currentContactName = computed(() => currentContact.value?.name);
@@ -58,10 +56,8 @@ const lastActivityAt = computed(() => {
 });
 const showMessagePreviewWithoutMeta = computed(() => {
-  const { labels = [] } = props.conversation;
+  const { slaPolicyId, labels = [] } = props.conversation;
-  return (
+  return !slaPolicyId && labels.length === 0;
    !cardMessagePreviewWithMetaRef.value?.hasSlaThreshold && labels.length === 0
  );
 });
 const onCardClick = e => {
@@ -86,7 +82,6 @@ const onCardClick = e => {
 <template>
  <div
    role="button"
    class="flex w-full gap-3 px-3 py-4 transition-all duration-300 ease-in-out cursor-pointer"
    @click="onCardClick"
  >
@@ -97,7 +92,7 @@ const onCardClick = e => {
      :status="currentContactStatus"
      rounded-full
    />
-    <div class="flex flex-col w-full gap-1 min-w-0">
+    <div class="flex flex-col w-full gap-1">
      <div class="flex items-center justify-between h-6 gap-2">
        <h4 class="text-base font-medium truncate text-n-slate-12">
          {{ currentContactName }}
@@ -119,12 +114,11 @@ const onCardClick = e => {
        </div>
      </div>
      <CardMessagePreview
-        v-show="showMessagePreviewWithoutMeta"
+        v-if="showMessagePreviewWithoutMeta"
        :conversation="conversation"
      />
      <CardMessagePreviewWithMeta
-        v-show="!showMessagePreviewWithoutMeta"
+        v-else
        ref="cardMessagePreviewWithMetaRef"
        :conversation="conversation"
        :account-labels="accountLabels"
      />
@@ -31,17 +31,13 @@ const convertObjectCamelCaseToSnakeCase = object => {
 const appliedSLA = computed(() => props.conversation?.appliedSla);
 const isSlaMissed = computed(() => slaStatus.value?.isSlaMissed);
 const hasSlaThreshold = computed(() => {
  return slaStatus.value?.threshold && appliedSLA.value?.id;
 });
 const slaStatusText = computed(() => {
  return slaStatus.value?.type?.toUpperCase();
 });
 const updateSlaStatus = () => {
  slaStatus.value = evaluateSLAStatus({
-    appliedSla: convertObjectCamelCaseToSnakeCase(appliedSLA.value || {}),
+    appliedSla: convertObjectCamelCaseToSnakeCase(appliedSLA.value),
    chat: props.conversation,
  });
 };
@@ -65,21 +61,6 @@ onUnmounted(() => {
 });
 watch(() => props.conversation, updateSlaStatus);
 // This expose is to provide context to the parent component, so that it can decided weather
 // a new row has to be added to the conversation card or not
 // SLACardLabel > CardMessagePreviewWithMeta > ConversationCard
 //
 // We need to do this becuase each SLA card has it's own SLA timer
 // and it's just convenient to have this logic in the SLACardLabel component
 // However this is a bit hacky, and we should change this in the future
 //
 // TODO: A better implementation would be to have the timer as a shared composable, just like the provider pattern
 // we use across the next components. Have the calculation be done on the top ConversationCard component
 // and then the value be injected to the SLACardLabel component
 defineExpose({
  hasSlaThreshold,
 });
 </script>
 <template>
@@ -41,8 +41,6 @@ const props = defineProps({
    default: 'info',
    validator: value => ['info', 'error', 'success'].includes(value),
  },
  enableVariables: { type: Boolean, default: false },
  enableCannedResponses: { type: Boolean, default: true },
 });
 const emit = defineEmits(['update:modelValue']);
@@ -118,8 +116,6 @@ watch(
        :placeholder="placeholder"
        :focus-on-mount="focusOnMount"
        :disabled="disabled"
        :enable-variables="enableVariables"
        :enable-canned-responses="enableCannedResponses"
        @input="handleInput"
        @focus="handleFocus"
        @blur="handleBlur"
@@ -1,6 +1,4 @@
 <script setup>
 import Policy from 'dashboard/components/policy.vue';
 defineProps({
  title: {
    type: String,
@@ -10,10 +8,6 @@ defineProps({
    type: String,
    required: true,
  },
  actionPerms: {
    type: Array,
    default: () => [],
  },
 });
 </script>
@@ -22,7 +16,7 @@ defineProps({
    class="relative flex flex-col items-center justify-center w-full h-full overflow-hidden"
  >
    <div
-      class="relative w-full max-w-[60rem] mx-auto overflow-hidden h-full max-h-[28rem]"
+      class="relative w-full max-w-[940px] mx-auto overflow-hidden h-full max-h-[448px]"
    >
      <div
        class="w-full h-full space-y-4 overflow-y-hidden opacity-50 pointer-events-none"
@@ -45,9 +39,7 @@ defineProps({
              {{ subtitle }}
            </p>
          </div>
-          <Policy :permissions="actionPerms">
+          <slot name="actions" />
            <slot name="actions" />
          </Policy>
        </div>
      </div>
    </div>
@@ -60,7 +60,7 @@ const togglePortalSwitcher = () => {
 <template>
  <section class="flex flex-col w-full h-full overflow-hidden bg-n-background">
    <header class="sticky top-0 z-10 px-6 pb-3 lg:px-0">
-      <div class="w-full max-w-[60rem] mx-auto lg:px-6">
+      <div class="w-full max-w-[960px] mx-auto">
        <div
          v-if="showHeaderTitle"
          class="flex items-center justify-start h-20 gap-2"
@@ -96,7 +96,7 @@ const togglePortalSwitcher = () => {
      </div>
    </header>
    <main class="flex-1 px-6 overflow-y-auto lg:px-0">
-      <div class="w-full max-w-[60rem] mx-auto py-3 lg:px-6">
+      <div class="w-full max-w-[960px] mx-auto py-3">
        <slot name="content" />
      </div>
    </main>
@@ -36,8 +36,6 @@ const emit = defineEmits([
 const { t } = useI18n();
 const isNewArticle = computed(() => !props.article?.id);
 const saveAndSync = value => {
  emit('saveArticle', value);
 };
@@ -54,32 +52,21 @@ const quickSave = debounce(
 // 2.5 seconds is enough to know that the user has stopped typing and is taking a pause
 // so we can save the data to the backend and retrieve the updated data
 // this will update the local state with response data
 // Only use to save for existing articles
 const saveAndSyncDebounced = debounce(saveAndSync, 2500, false);
 // Debounced save for new articles
 const quickSaveNewArticle = debounce(saveAndSync, 400, false);
 const handleSave = value => {
  if (isNewArticle.value) {
    quickSaveNewArticle(value);
  } else {
    quickSave(value);
    saveAndSyncDebounced(value);
  }
 };
 const articleTitle = computed({
  get: () => props.article.title,
  set: value => {
-    handleSave({ title: value });
+    quickSave({ title: value });
    saveAndSyncDebounced({ title: value });
  },
 });
 const articleContent = computed({
  get: () => props.article.content,
  set: content => {
-    handleSave({ content });
+    quickSave({ content });
    saveAndSyncDebounced({ content });
  },
 });
@@ -200,8 +200,7 @@ onMounted(() => {
        <DropdownMenu
          v-if="openAgentsList && hasAgentList"
          :menu-items="agentList"
-          show-search
+          class="z-[100] w-48 mt-2 overflow-y-auto ltr:left-0 rtl:right-0 top-full max-h-52"
          class="z-[100] w-48 mt-2 overflow-y-auto ltr:left-0 rtl:right-0 top-full max-h-60"
          @action="handleArticleAction"
        />
      </OnClickOutside>
@@ -232,8 +231,7 @@ onMounted(() => {
        <DropdownMenu
          v-if="openCategoryList && hasCategoryMenuItems"
          :menu-items="categoryList"
-          show-search
+          class="w-48 mt-2 z-[100] overflow-y-auto left-0 top-full max-h-52"
          class="w-48 mt-2 z-[100] overflow-y-auto left-0 top-full max-h-60"
          @action="handleArticleAction"
        />
      </OnClickOutside>
@@ -52,7 +52,7 @@ onMounted(() => {
 <template>
  <div
-    class="flex flex-col absolute w-[25rem] bg-n-alpha-3 outline outline-1 outline-n-container backdrop-blur-[100px] shadow-lg gap-6 rounded-xl p-6"
+    class="flex flex-col absolute w-[400px] bg-n-alpha-3 outline outline-1 outline-n-container backdrop-blur-[100px] shadow-lg gap-6 rounded-xl p-6"
  >
    <div class="flex items-center justify-between">
      <h3>
@@ -75,7 +75,7 @@ onMounted(() => {
      <div>
        <div class="flex justify-between w-full gap-4 py-2">
          <label
-            class="text-sm font-medium whitespace-nowrap min-w-[6.25rem] text-slate-900 dark:text-slate-50"
+            class="text-sm font-medium whitespace-nowrap min-w-[100px] text-slate-900 dark:text-slate-50"
          >
            {{
              t(
@@ -90,9 +90,9 @@ onMounted(() => {
                'HELP_CENTER.EDIT_ARTICLE_PAGE.ARTICLE_PROPERTIES.META_DESCRIPTION_PLACEHOLDER'
              )
            "
-            class="w-[13.75rem]"
+            class="w-[220px]"
            custom-text-area-wrapper-class="!p-0 !border-0 !rounded-none !bg-transparent transition-none"
-            custom-text-area-class="max-h-[9.375rem]"
+            custom-text-area-class="max-h-[150px]"
            auto-height
            min-height="3rem"
          />
@@ -108,12 +108,12 @@ onMounted(() => {
            :label="
              t('HELP_CENTER.EDIT_ARTICLE_PAGE.ARTICLE_PROPERTIES.META_TITLE')
            "
-            custom-label-class="min-w-[7.5rem]"
+            custom-label-class="min-w-[120px]"
          />
        </div>
        <div class="flex justify-between w-full gap-3 py-2">
          <label
-            class="text-sm font-medium whitespace-nowrap min-w-[7.5rem] text-slate-900 dark:text-slate-50"
+            class="text-sm font-medium whitespace-nowrap min-w-[120px] text-slate-900 dark:text-slate-50"
          >
            {{
              t('HELP_CENTER.EDIT_ARTICLE_PAGE.ARTICLE_PROPERTIES.META_TAGS')
@@ -126,7 +126,7 @@ onMounted(() => {
                'HELP_CENTER.EDIT_ARTICLE_PAGE.ARTICLE_PROPERTIES.META_TAGS_PLACEHOLDER'
              )
            "
-            class="w-[14rem]"
+            class="w-[224px]"
          />
        </div>
      </div>
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { OnClickOutside } from '@vueuse/components';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import {
  ARTICLE_TABS,
  CATEGORY_ALL,
@@ -38,7 +37,6 @@ const emit = defineEmits([
 const route = useRoute();
 const { t } = useI18n();
 const { updateUISettings } = useUISettings();
 const isCategoryMenuOpen = ref(false);
 const isLocaleMenuOpen = ref(false);
@@ -113,12 +111,13 @@ const localeMenuItems = computed(() => {
  }));
 });
 const hasMoreThanOneLocaleMenuItems = computed(() => {
  return localeMenuItems.value?.length > 1;
 });
 const handleLocaleAction = ({ value }) => {
  emit('localeChange', value);
  isLocaleMenuOpen.value = false;
  updateUISettings({
    last_active_locale_code: value,
  });
 };
 const handleCategoryAction = ({ value }) => {
@@ -144,7 +143,7 @@ const handleTabChange = value => {
    />
    <div class="flex items-start justify-between w-full gap-2">
      <div class="flex items-center gap-2">
-        <div class="relative group">
+        <div v-if="hasMoreThanOneLocaleMenuItems" class="relative group">
          <OnClickOutside @trigger="isLocaleMenuOpen = false">
            <Button
              :label="activeLocaleName"
@@ -158,7 +157,6 @@ const handleTabChange = value => {
            <DropdownMenu
              v-if="isLocaleMenuOpen"
              :menu-items="localeMenuItems"
              show-search
              class="left-0 w-40 max-w-[300px] mt-2 overflow-y-auto xl:right-0 top-full max-h-60"
              @action="handleLocaleAction"
            />
@@ -179,7 +177,6 @@ const handleTabChange = value => {
            <DropdownMenu
              v-if="isCategoryMenuOpen"
              :menu-items="categoryMenuItems"
              show-search
              class="left-0 w-48 mt-2 overflow-y-auto xl:right-0 top-full max-h-60"
              @action="handleCategoryAction"
            />
@@ -99,19 +99,11 @@ const getStatusMessage = (status, isSuccess) => {
    : '';
 };
-const updatePortalMeta = () => {
+const updateMeta = () => {
  const { portalSlug, locale } = route.params;
  return store.dispatch('portals/show', { portalSlug, locale });
 };
 const updateArticlesMeta = () => {
  const { portalSlug, locale } = route.params;
  return store.dispatch('articles/updateArticleMeta', {
    portalSlug,
    locale,
  });
 };
 const handleArticleAction = async (action, { status, id }) => {
  const { portalSlug } = route.params;
  try {
@@ -135,8 +127,7 @@ const handleArticleAction = async (action, { status, id }) => {
        useTrack(PORTALS_EVENTS.PUBLISH_ARTICLE);
      }
    }
-    await updateArticlesMeta();
+    await updateMeta();
    await updatePortalMeta();
  } catch (error) {
    const errorMessage =
      error?.message ||
@@ -91,7 +91,10 @@ const articlesCount = computed(() => {
 });
 const showArticleHeaderControls = computed(
-  () => !props.isCategoryArticles && !isSwitchingPortal.value
+  () =>
    !hasNoArticlesInPortal.value &&
    !props.isCategoryArticles &&
    !isSwitchingPortal.value
 );
 const showCategoryHeaderControls = computed(
@@ -90,7 +90,7 @@ const handleCategory = async formData => {
 <template>
  <div
-    class="w-[25rem] absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6"
+    class="w-[400px] absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6"
  >
    <h3 class="text-base font-medium text-slate-900 dark:text-slate-50">
      {{
@@ -201,7 +201,7 @@ defineExpose({ state, isSubmitDisabled });
                color="slate"
                size="sm"
                :icon="!state.icon ? 'i-lucide-smile-plus' : ''"
-                class="!h-[2.4rem] !w-[2.375rem] absolute top-[1.94rem] !outline-none !rounded-[0.438rem] border-0 ltr:left-px rtl:right-px ltr:!rounded-r-none rtl:!rounded-l-none"
+                class="!h-[38px] !w-[38px] absolute top-[31px] !outline-none !rounded-[7px] border-0 ltr:left-px rtl:right-px ltr:!rounded-r-none rtl:!rounded-l-none"
                @click="isEmojiPickerOpen = !isEmojiPickerOpen"
              />
              <EmojiInput
@@ -141,7 +141,6 @@ const handleBreadcrumbClick = () => {
          <DropdownMenu
            v-if="isLocaleMenuOpen"
            :menu-items="localeMenuItems"
            show-search
            class="left-0 w-40 mt-2 overflow-y-auto xl:right-0 top-full max-h-60"
            @action="handleLocaleAction"
          />
@@ -49,11 +49,8 @@ const onCreate = async () => {
  try {
    await store.dispatch('portals/update', {
-      portalSlug: props.portal?.slug,
+      portalSlug: props.portal.slug,
-      config: {
+      config: { allowed_locales: updatedLocales },
        allowed_locales: updatedLocales,
        default_locale: props.portal?.meta?.default_locale,
      },
    });
    useTrack(PORTALS_EVENTS.CREATE_LOCALE, {
@@ -2,7 +2,6 @@
 import LocaleCard from 'dashboard/components-next/HelpCenter/LocaleCard/LocaleCard.vue';
 import { useStore } from 'dashboard/composables/store';
 import { useAlert, useTrack } from 'dashboard/composables';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { PORTALS_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
@@ -21,7 +20,6 @@ const props = defineProps({
 const store = useStore();
 const { t } = useI18n();
 const route = useRoute();
 const { uiSettings, updateUISettings } = useUISettings();
 const isLocaleDefault = code => {
  return props.portal?.meta?.default_locale === code;
@@ -58,40 +56,26 @@ const changeDefaultLocale = ({ localeCode }) => {
    defaultLocale: localeCode,
    messageKey: 'CHANGE_DEFAULT_LOCALE',
  });
  useTrack(PORTALS_EVENTS.SET_DEFAULT_LOCALE, {
    newLocale: localeCode,
    from: route.name,
  });
 };
-const updateLastActivePortal = async localeCode => {
+const deletePortalLocale = ({ localeCode }) => {
  const { last_active_locale_code: lastActiveLocaleCode } =
    uiSettings.value || {};
  const defaultLocale = props.portal.meta.default_locale;
  // Update UI settings only if deleting locale matches the last active locale in UI settings.
  if (localeCode === lastActiveLocaleCode) {
    await updateUISettings({
      last_active_locale_code: defaultLocale,
    });
  }
 };
 const deletePortalLocale = async ({ localeCode }) => {
  const updatedLocales = props.locales
    .filter(locale => locale.code !== localeCode)
    .map(locale => locale.code);
  const defaultLocale = props.portal.meta.default_locale;
-  await updatePortalLocales({
+  updatePortalLocales({
    newAllowedLocales: updatedLocales,
    defaultLocale,
    messageKey: 'DELETE_LOCALE',
  });
  await updateLastActivePortal(localeCode);
  useTrack(PORTALS_EVENTS.DELETE_LOCALE, {
    deletedLocale: localeCode,
    from: route.name,
@@ -74,7 +74,7 @@ const handleDeletePortal = () => {
      </div>
      <div
        v-else-if="activePortal"
-        class="flex flex-col w-full gap-4 max-w-[40rem] pb-8"
+        class="flex flex-col w-full gap-4 max-w-[640px] pb-8"
      >
        <PortalBaseSettings
          :active-portal="activePortal"
@@ -92,7 +92,7 @@ const redirectToPortalHomePage = () => {
 <template>
  <div
-    class="pt-5 pb-3 bg-n-alpha-3 backdrop-blur-[100px] outline outline-n-container outline-1 z-50 absolute w-[27.5rem] rounded-xl shadow-md flex flex-col gap-4"
+    class="pt-5 pb-3 bg-n-alpha-3 backdrop-blur-[100px] outline outline-n-container outline-1 z-50 absolute w-[440px] rounded-xl shadow-md flex flex-col gap-4"
  >
    <div
      class="flex items-center justify-between gap-4 px-6 pb-3 border-b border-n-alpha-2"
@@ -1,248 +0,0 @@
 <script setup>
 import { computed, ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { getInboxIconByType } from 'dashboard/helper/inbox';
 import { dynamicTime, shortTimestamp } from 'shared/helpers/timeHelper';
 import {
  snoozedReopenTimeToTimestamp,
  shortenSnoozeTime,
 } from 'dashboard/helper/snoozeHelpers';
 import { NOTIFICATION_TYPES_MAPPING } from 'dashboard/routes/dashboard/inbox/helpers/InboxViewHelpers';
 import Icon from 'dashboard/components-next/icon/Icon.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
 import CardPriorityIcon from 'dashboard/components-next/Conversation/ConversationCard/CardPriorityIcon.vue';
 import SLACardLabel from 'dashboard/components-next/Conversation/ConversationCard/SLACardLabel.vue';
 import InboxContextMenu from 'dashboard/routes/dashboard/inbox/components/InboxContextMenu.vue';
 const props = defineProps({
  inboxItem: { type: Object, default: () => ({}) },
  stateInbox: { type: Object, default: () => ({}) },
 });
 const emit = defineEmits([
  'click',
  'contextMenuOpen',
  'contextMenuClose',
  'markNotificationAsRead',
  'markNotificationAsUnRead',
  'deleteNotification',
 ]);
 const { t } = useI18n();
 const isContextMenuOpen = ref(false);
 const contextMenuPosition = ref({ x: null, y: null });
 const slaCardLabel = ref(null);
 const getMessageClasses = {
  emphasis: 'text-sm font-medium text-n-slate-11',
  emphasisUnread: 'text-sm font-medium text-n-slate-12',
  normal: 'text-sm font-normal text-n-slate-11',
  normalUnread: 'text-sm text-n-slate-12',
 };
 const primaryActor = computed(() => props.inboxItem?.primaryActor);
 const meta = computed(() => primaryActor.value?.meta);
 const assigneeMeta = computed(() => meta.value?.sender);
 const isUnread = computed(() => !props.inboxItem?.readAt);
 const inbox = computed(() => props.stateInbox);
 const inboxIcon = computed(() => {
  const { phoneNumber, channelType } = inbox.value;
  return getInboxIconByType(channelType, phoneNumber);
 });
 const hasSlaThreshold = computed(() => {
  return slaCardLabel.value?.hasSlaThreshold && primaryActor.value?.slaPolicyId;
 });
 const lastActivityAt = computed(() => {
  const timestamp = props.inboxItem?.lastActivityAt;
  return timestamp ? shortTimestamp(dynamicTime(timestamp)) : '';
 });
 const menuItems = computed(() => [
  { key: 'delete', label: t('INBOX.MENU_ITEM.DELETE') },
  {
    key: isUnread.value ? 'mark_as_read' : 'mark_as_unread',
    label: t(`INBOX.MENU_ITEM.MARK_AS_${isUnread.value ? 'READ' : 'UNREAD'}`),
  },
 ]);
 const messageClasses = computed(() => ({
  emphasis: isUnread.value
    ? getMessageClasses.emphasisUnread
    : getMessageClasses.emphasis,
  normal: isUnread.value
    ? getMessageClasses.normalUnread
    : getMessageClasses.normal,
 }));
 const formatPushMessage = message => {
  if (message.startsWith(': ')) {
    return message.slice(2);
  }
  return message.replace(/^([^:]+):/g, (match, name) => {
    return `<span class="${messageClasses.value.emphasis}">${name}:</span>`;
  });
 };
 const formattedMessage = computed(() => {
  const messageContent = `<span class="${messageClasses.value.normal}">${formatPushMessage(props.inboxItem?.pushMessageBody || '')}</span>`;
  return isUnread.value
    ? `<span class="inline-flex flex-shrink-0 w-2 h-2 mb-px rounded-full bg-n-iris-10 ltr:mr-1 rtl:ml-1"></span> ${messageContent}`
    : messageContent;
 });
 const notificationDetails = computed(() => {
  const type = props.inboxItem?.notificationType?.toUpperCase() || '';
  const [icon = '', color = 'text-n-blue-text'] =
    NOTIFICATION_TYPES_MAPPING[type] || [];
  return { text: type ? t(`INBOX.TYPES_NEXT.${type}`) : '', icon, color };
 });
 const snoozedUntilTime = computed(() => {
  const { snoozedUntil } = props.inboxItem;
  if (!snoozedUntil) return null;
  return shortenSnoozeTime(
    dynamicTime(snoozedReopenTimeToTimestamp(snoozedUntil))
  );
 });
 const hasLastSnoozed = computed(() => props.inboxItem?.meta?.lastSnoozedAt);
 const snoozedText = computed(() => {
  return !hasLastSnoozed.value
    ? t('INBOX.TYPES_NEXT.SNOOZED_UNTIL', {
        time: shortTimestamp(snoozedUntilTime.value),
      })
    : t('INBOX.TYPES_NEXT.SNOOZED_ENDS');
 });
 const contextMenuActions = {
  close: () => {
    isContextMenuOpen.value = false;
    contextMenuPosition.value = { x: null, y: null };
    emit('contextMenuClose');
  },
  open: e => {
    e.preventDefault();
    contextMenuPosition.value = {
      x: e.pageX || e.clientX,
      y: e.pageY || e.clientY,
    };
    isContextMenuOpen.value = true;
    emit('contextMenuOpen');
  },
  handle: key => {
    const actions = {
      mark_as_read: () => emit('markNotificationAsRead', props.inboxItem),
      mark_as_unread: () => emit('markNotificationAsUnRead', props.inboxItem),
      delete: () => emit('deleteNotification', props.inboxItem),
    };
    actions[key]?.();
  },
 };
 onBeforeMount(contextMenuActions.close);
 </script>
 <template>
  <div
    role="button"
    class="flex flex-col w-full gap-2 p-3 transition-all duration-300 ease-in-out cursor-pointer"
    @contextmenu="contextMenuActions.open($event)"
    @click="emit('click')"
  >
    <div class="flex items-start gap-2">
      <Avatar
        :name="assigneeMeta.name"
        :src="assigneeMeta.thumbnail"
        :size="20"
        rounded-full
        class="mt-1"
      />
      <p v-dompurify-html="formattedMessage" class="mb-0 line-clamp-2" />
    </div>
    <div class="flex items-center justify-between h-6 gap-2">
      <div class="flex items-center flex-1 min-w-0 gap-1">
        <div
          v-if="snoozedUntilTime || hasLastSnoozed"
          class="flex items-center w-full min-w-0 gap-2 ltr:pl-1 rtl:pr-1"
        >
          <Icon
            :icon="
              !hasLastSnoozed
                ? 'i-lucide-alarm-clock-plus'
                : 'i-lucide-alarm-clock-off'
            "
            class="flex-shrink-0 size-4"
            :class="!isUnread ? 'text-n-slate-11' : 'text-n-blue-text'"
          />
          <span
            class="text-xs font-medium truncate"
            :class="!isUnread ? 'text-n-slate-11' : 'text-n-blue-text'"
          >
            {{ snoozedText }}
          </span>
        </div>
        <div
          v-else-if="notificationDetails.text"
          class="flex items-center w-full min-w-0 gap-2 ltr:pl-1 rtl:pr-1"
        >
          <Icon
            :icon="notificationDetails.icon"
            :class="isUnread ? notificationDetails.color : 'text-n-slate-11'"
            class="flex-shrink-0 size-4"
          />
          <span
            class="text-xs font-medium truncate"
            :class="isUnread ? notificationDetails.color : 'text-n-slate-11'"
          >
            {{ notificationDetails.text }}
          </span>
        </div>
      </div>
      <div class="flex items-center flex-shrink-0 gap-2">
        <SLACardLabel
          v-show="hasSlaThreshold"
          ref="slaCardLabel"
          :conversation="primaryActor"
          class="[&>span]:text-xs"
          :class="
            !isUnread && '[&>span]:text-n-slate-11 [&>div>svg]:fill-n-slate-11'
          "
        />
        <div v-if="hasSlaThreshold" class="w-px h-3 rounded-sm bg-n-slate-4" />
        <CardPriorityIcon
          v-if="primaryActor?.priority"
          :priority="primaryActor?.priority"
          class="[&>svg]:size-4"
        />
        <div
          v-if="inboxIcon"
          v-tooltip.left="inbox?.name"
          class="flex items-center justify-center flex-shrink-0 rounded-full bg-n-alpha-2 size-4"
        >
          <Icon
            :icon="inboxIcon"
            class="flex-shrink-0 text-n-slate-11 size-2.5"
          />
        </div>
        <span class="text-sm text-n-slate-10">
          {{ lastActivityAt }}
        </span>
      </div>
    </div>
    <InboxContextMenu
      v-if="isContextMenuOpen"
      :context-menu-position="contextMenuPosition"
      :menu-items="menuItems"
      @close="contextMenuActions.close"
      @select-action="contextMenuActions.handle"
    />
  </div>
 </template>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pranav	da79e49e3e	Merge branch 'develop' into feat/conversation-screen	2024-12-10 18:55:04 -08:00
iamsivin	f54f7c8907	chore: Fix eslint	2024-12-10 22:34:31 +05:30
iamsivin	723f01fc50	feat: Conversation header	2024-12-10 22:29:13 +05:30
iamsivin	f00a5b7572	chore: search header input	2024-12-10 21:06:05 +05:30
iamsivin	8cd6356868	feat: Search page	2024-12-10 21:03:10 +05:30
Sivin VargheseandGitHub	07b231c1b6	Merge branch 'develop' into feat/conversation-screen	2024-12-10 11:53:47 +05:30
Sivin VargheseandGitHub	eaeb3cad3b	Merge branch 'develop' into feat/conversation-screen	2024-12-10 10:15:31 +05:30
iamsivin	a19610a23b	chore: fix border color	2024-12-09 21:53:20 +05:30
Sivin VargheseandGitHub	6a986224cf	Merge branch 'develop' into feat/conversation-screen	2024-12-09 21:45:22 +05:30
iamsivin	f3c4475487	chore: Update sidebar colors	2024-12-08 21:25:44 +05:30
iamsivin	d0310611c0	chore: Clean up	2024-12-08 21:06:32 +05:30
iamsivin	b4d9ccf3d8	chore: MInor fix	2024-12-08 21:05:47 +05:30
iamsivin	d609889747	chore: More changes	2024-12-08 20:41:11 +05:30
Sivin VargheseandGitHub	919e080b83	Merge branch 'develop' into feat/conversation-screen	2024-12-07 11:37:16 +05:30
iamsivin	c8b66e74db	chore: More changes	2024-12-06 23:29:54 +05:30
iamsivin	1f4c4d759b	chore: conversation view	2024-12-06 23:09:31 +05:30
iamsivin	49b0ba28aa	chore: conversation card	2024-12-06 23:08:45 +05:30
iamsivin	7b4a83091b	chore: conversation list header	2024-12-06 23:08:28 +05:30
iamsivin	431a1b72b7	chore: Update button colors	2024-12-06 23:07:42 +05:30
`@@ -120,4 +120,4 @@ Thanks goes to all these [wonderful people](https://www.chatwoot.com/docs/contri`
	`<a href="https://github.com/chatwoot/chatwoot/graphs/contributors"><img src="https://opencollective.com/chatwoot/contributors.svg?width=890&button=false" /></a>`	`<a href="https://github.com/chatwoot/chatwoot/graphs/contributors"><img src="https://opencollective.com/chatwoot/contributors.svg?width=890&button=false" /></a>`


	`Chatwoot © 2017-2025, Chatwoot Inc - Released under the MIT License.`	`Chatwoot © 2017-2024, Chatwoot Inc - Released under the MIT License.`