diff --git a/.circleci/config.yml b/.circleci/config.yml
index 65ceda04c..804c63857 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,6 +3,7 @@ orbs:
   node: circleci/node@6.1.0
   qlty-orb: qltysh/qlty-orb@0.0
 
+# Shared defaults for setup steps
 defaults: &defaults
   working_directory: ~/build
   machine:
@@ -12,10 +13,106 @@ defaults: &defaults
     RAILS_LOG_TO_STDOUT: false
     COVERAGE: true
     LOG_LEVEL: warn
-  parallelism: 4
 
 jobs:
-  build:
+  # Separate job for linting (no parallelism needed)
+  lint:
+    <<: *defaults
+    steps:
+      - checkout
+
+      # Install minimal system dependencies for linting
+      - run:
+          name: Install System Dependencies
+          command: |
+            sudo apt-get update
+            DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
+              libpq-dev \
+              build-essential \
+              git \
+              curl \
+              libssl-dev \
+              zlib1g-dev \
+              libreadline-dev \
+              libyaml-dev \
+              openjdk-11-jdk \
+              jq \
+              software-properties-common \
+              ca-certificates \
+              imagemagick \
+              libxml2-dev \
+              libxslt1-dev \
+              file \
+              g++ \
+              gcc \
+              autoconf \
+              gnupg2 \
+              patch \
+              ruby-dev \
+              liblzma-dev \
+              libgmp-dev \
+              libncurses5-dev \
+              libffi-dev \
+              libgdbm6 \
+              libgdbm-dev \
+              libvips
+
+      - run:
+          name: Install RVM and Ruby 3.4.4
+          command: |
+            sudo apt-get install -y gpg
+            gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+            \curl -sSL https://get.rvm.io | bash -s stable
+            echo 'source ~/.rvm/scripts/rvm' >> $BASH_ENV
+            source ~/.rvm/scripts/rvm
+            rvm install "3.4.4"
+            rvm use 3.4.4 --default
+            gem install bundler -v 2.5.16
+
+      - run:
+          name: Install Application Dependencies
+          command: |
+            source ~/.rvm/scripts/rvm
+            bundle install
+
+      - node/install:
+          node-version: '23.7'
+      - node/install-pnpm
+      - node/install-packages:
+          pkg-manager: pnpm
+          override-ci-command: pnpm i
+
+      # Swagger verification
+      - run:
+          name: Verify swagger API specification
+          command: |
+            bundle exec rake swagger:build
+            if [[ `git status swagger/swagger.json --porcelain` ]]
+            then
+              echo "ERROR: The swagger.json file is not in sync with the yaml specification. Run 'rake swagger:build' and commit 'swagger/swagger.json'."
+              exit 1
+            fi
+            mkdir -p ~/tmp
+            curl -L https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar > ~/tmp/openapi-generator-cli-6.3.0.jar
+            java -jar ~/tmp/openapi-generator-cli-6.3.0.jar validate -i swagger/swagger.json
+
+      # Bundle audit
+      - run:
+          name: Bundle audit
+          command: bundle exec bundle audit update && bundle exec bundle audit check -v
+
+      # Rubocop linting
+      - run:
+          name: Rubocop
+          command: bundle exec rubocop --parallel
+
+      # ESLint linting
+      - run:
+          name: eslint
+          command: pnpm run eslint
+
+  # Separate job for frontend tests
+  frontend-tests:
     <<: *defaults
     steps:
       - checkout
@@ -25,8 +122,38 @@ jobs:
       - node/install-packages:
           pkg-manager: pnpm
           override-ci-command: pnpm i
-      - run: node --version
-      - run: pnpm --version
+
+      - run:
+          name: Run frontend tests (with coverage)
+          command: pnpm run test:coverage
+
+      - run:
+          name: Move coverage files if they exist
+          command: |
+            if [ -d "coverage" ]; then
+              mkdir -p ~/build/coverage
+              cp -r coverage ~/build/coverage/frontend || true
+            fi
+          when: always
+
+      - persist_to_workspace:
+          root: ~/build
+          paths:
+            - coverage
+
+  # Backend tests with parallelization
+  backend-tests:
+    <<: *defaults
+    parallelism: 16
+    steps:
+      - checkout
+      - node/install:
+          node-version: '23.7'
+      - node/install-pnpm
+      - node/install-packages:
+          pkg-manager: pnpm
+          override-ci-command: pnpm i
+
       - run:
           name: Add PostgreSQL repository and update
           command: |
@@ -91,20 +218,6 @@ jobs:
             source ~/.rvm/scripts/rvm
             bundle install
 
-      # Swagger verification
-      - run:
-          name: Verify swagger API specification
-          command: |
-            bundle exec rake swagger:build
-            if [[ `git status swagger/swagger.json --porcelain` ]]
-            then
-              echo "ERROR: The swagger.json file is not in sync with the yaml specification. Run 'rake swagger:build' and commit 'swagger/swagger.json'."
-              exit 1
-            fi
-            mkdir -p ~/tmp
-            curl -L https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar > ~/tmp/openapi-generator-cli-6.3.0.jar
-            java -jar ~/tmp/openapi-generator-cli-6.3.0.jar validate -i swagger/swagger.json
-
       # Configure environment and database
       - run:
           name: Database Setup and Configure Environment Variables
@@ -127,57 +240,91 @@ jobs:
           name: Run DB migrations
           command: bundle exec rails db:chatwoot_prepare
 
-      # Bundle audit
-      - run:
-          name: Bundle audit
-          command: bundle exec bundle audit update && bundle exec bundle audit check -v
-
-      # Rubocop linting
-      - run:
-          name: Rubocop
-          command: bundle exec rubocop
-
-      # ESLint linting
-      - run:
-          name: eslint
-          command: pnpm run eslint
-
-      - run:
-          name: Run frontend tests (with coverage)
-          command: |
-            mkdir -p ~/build/coverage/frontend
-            pnpm run test:coverage
-
-      # Run backend tests
+      # Run backend tests (parallelized)
       - run:
           name: Run backend tests
           command: |
             mkdir -p ~/tmp/test-results/rspec
             mkdir -p ~/tmp/test-artifacts
             mkdir -p ~/build/coverage/backend
-            TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
+
+            # Use round-robin distribution (same as GitHub Actions) for better test isolation
+            # This prevents tests with similar timing from being grouped on the same runner
+            SPEC_FILES=($(find spec -name '*_spec.rb' | sort))
+            TESTS=""
+
+            for i in "${!SPEC_FILES[@]}"; do
+              if [ $(( i % $CIRCLE_NODE_TOTAL )) -eq $CIRCLE_NODE_INDEX ]; then
+                TESTS="$TESTS ${SPEC_FILES[$i]}"
+              fi
+            done
+
             bundle exec rspec -I ./spec --require coverage_helper --require spec_helper --format progress \
                               --format RspecJunitFormatter \
                               --out ~/tmp/test-results/rspec.xml \
-                              -- ${TESTFILES}
+                              -- $TESTS
           no_output_timeout: 30m
 
-      # Qlty coverage publish
-      - qlty-orb/coverage_publish:
-          files: |
-            coverage/coverage.json
-            coverage/lcov.info
+      # Store test results for better splitting in future runs
+      - store_test_results:
+          path: ~/tmp/test-results
 
       - run:
-          name: List coverage directory contents
+          name: Move coverage files if they exist
           command: |
-            ls -R ~/build/coverage
+            if [ -d "coverage" ]; then
+              mkdir -p ~/build/coverage
+              cp -r coverage ~/build/coverage/backend || true
+            fi
+          when: always
 
       - persist_to_workspace:
           root: ~/build
           paths:
             - coverage
 
+  # Collect coverage from all jobs
+  coverage:
+    <<: *defaults
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/build
+
+      # Qlty coverage publish
+      - qlty-orb/coverage_publish:
+          files: |
+            coverage/frontend/lcov.info
+
+      - run:
+          name: List coverage directory contents
+          command: |
+            ls -R ~/build/coverage || echo "No coverage directory"
+
       - store_artifacts:
           path: coverage
           destination: coverage
+
+  build:
+      <<: *defaults
+      steps:
+        - run:
+            name: Legacy build aggregator
+            command: |
+              echo "All main jobs passed; build job kept only for GitHub required check compatibility."
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - lint
+      - frontend-tests
+      - backend-tests
+      - coverage:
+          requires:
+            - frontend-tests
+            - backend-tests
+      - build:
+          requires:
+            - lint
+            - coverage
diff --git a/.env.example b/.env.example
index de671599c..d5c7a76f9 100644
--- a/.env.example
+++ b/.env.example
@@ -105,6 +105,7 @@ MAILER_INBOUND_EMAIL_DOMAIN=
 # mandrill for Mandrill
 # postmark for Postmark
 # sendgrid for Sendgrid
+# ses for Amazon SES
 RAILS_INBOUND_EMAIL_SERVICE=
 # Use one of the following based on the email ingress service
 # Ref: https://edgeguides.rubyonrails.org/action_mailbox_basics.html
@@ -114,6 +115,10 @@ RAILS_INBOUND_EMAIL_PASSWORD=
 MAILGUN_INGRESS_SIGNING_KEY=
 MANDRILL_INGRESS_API_KEY=
 
+# SNS topic ARN for ActionMailbox (format: arn:aws:sns:region:account-id:topic-name)
+# Configure only if the rails_inbound_email_service = ses
+ACTION_MAILBOX_SES_SNS_TOPIC=
+
 # Creating Your Inbound Webhook Instructions for Postmark and Sendgrid:
 # Inbound webhook URL format:
 #    https://actionmailbox:[YOUR_RAILS_INBOUND_EMAIL_PASSWORD]@[YOUR_CHATWOOT_DOMAIN.COM]/rails/action_mailbox/[RAILS_INBOUND_EMAIL_SERVICE]/inbound_emails
@@ -215,6 +220,7 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#environment-variables
 # DD_TRACE_AGENT_URL=
 
+
 # MaxMindDB API key to download GeoLite2 City database
 # IP_LOOKUP_API_KEY=
 
@@ -256,6 +262,8 @@ AZURE_APP_SECRET=
 ## Change these values to fine tune performance
 # control the concurrency setting of sidekiq
 # SIDEKIQ_CONCURRENCY=10
+# Enable verbose logging each time a job is dequeued in Sidekiq
+# ENABLE_SIDEKIQ_DEQUEUE_LOGGER=false
 
 
 # AI powered features
diff --git a/.github/workflows/run_foss_spec.yml b/.github/workflows/run_foss_spec.yml
index 385feddfc..011f862b0 100644
--- a/.github/workflows/run_foss_spec.yml
+++ b/.github/workflows/run_foss_spec.yml
@@ -1,4 +1,6 @@
 name: Run Chatwoot CE spec
+permissions:
+  contents: read
 on:
   push:
     branches:
@@ -8,11 +10,58 @@ on:
   workflow_dispatch:
 
 jobs:
-  test:
-    runs-on: ubuntu-22.04
+  # Separate linting jobs for faster feedback
+  lint-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Run Rubocop
+        run: bundle exec rubocop --parallel
+
+  lint-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 23
+          cache: 'pnpm'
+      - name: Install pnpm dependencies
+        run: pnpm i
+      - name: Run ESLint
+        run: pnpm run eslint
+
+  # Frontend tests run in parallel with backend
+  frontend-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 23
+          cache: 'pnpm'
+      - name: Install pnpm dependencies
+        run: pnpm i
+      - name: Run frontend tests
+        run: pnpm run test:coverage
+
+  # Backend tests with parallelization
+  backend-tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ci_node_total: [16]
+        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+
     services:
       postgres:
-        image: pgvector/pgvector:pg15
+        image: pgvector/pgvector:pg16
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: ''
@@ -20,8 +69,6 @@ jobs:
           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
@@ -29,7 +76,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
       redis:
-        image: redis
+        image: redis:alpine
         ports:
           - 6379:6379
         options: --entrypoint redis-server
@@ -43,7 +90,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          bundler-cache: true
 
       - uses: actions/setup-node@v4
         with:
@@ -64,19 +111,36 @@ jobs:
       - name: Seed database
         run: bundle exec rake db:schema:load
 
-      - name: Run frontend tests
-        run: pnpm run test:coverage
-
-      # Run rails tests
-      - name: Run backend tests
+      - name: Run backend tests (parallelized)
         run: |
-          bundle exec rspec --profile=10 --format documentation
+          # Get all spec files and split them using round-robin distribution
+          # This ensures slow tests are distributed evenly across all nodes
+          SPEC_FILES=($(find spec -name '*_spec.rb' | sort))
+          TESTS=""
+
+          for i in "${!SPEC_FILES[@]}"; do
+            # Assign spec to this node if: index % total == node_index
+            if [ $(( i % ${{ matrix.ci_node_total }} )) -eq ${{ matrix.ci_node_index }} ]; then
+              TESTS="$TESTS ${SPEC_FILES[$i]}"
+            fi
+          done
+
+          if [ -n "$TESTS" ]; then
+            bundle exec rspec --profile=10 --format progress --format json --out tmp/rspec_results.json $TESTS
+          fi
         env:
           NODE_OPTIONS: --openssl-legacy-provider
 
-      - name: Upload rails log folder
+      - name: Upload test results
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: rails-log-folder
+          name: rspec-results-${{ matrix.ci_node_index }}
+          path: tmp/rspec_results.json
+
+      - name: Upload rails log folder
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: rails-log-folder-${{ matrix.ci_node_index }}
           path: log
diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml
index 460c4ba1f..b27d90408 100644
--- a/.github/workflows/test_docker_build.yml
+++ b/.github/workflows/test_docker_build.yml
@@ -36,5 +36,5 @@ jobs:
           platforms: ${{ matrix.platform }}
           push: false
           load: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ matrix.platform }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.platform }}
diff --git a/.gitignore b/.gitignore
index 7ca033f87..bcc83c1ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,5 @@ CLAUDE.local.md
 # Histoire deployment
 .netlify
 .histoire
+.pnpm-store/*
+local/
diff --git a/.nvmrc b/.nvmrc
index 6f7af3750..b88575e38 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.5.1
\ No newline at end of file
+23.7.0
\ No newline at end of file
diff --git a/.qlty/qlty.toml b/.qlty/qlty.toml
index 57981a5f7..780b38374 100644
--- a/.qlty/qlty.toml
+++ b/.qlty/qlty.toml
@@ -39,7 +39,7 @@ exclude_patterns = [
   "**/target/**",
   "**/templates/**",
   "**/testdata/**",
-  "**/vendor/**", "spec/", "**/specs/**/**", "**/spec/**/**", "db/*", "bin/**/*", "db/**/*", "config/**/*", "public/**/*", "vendor/**/*", "node_modules/**/*", "lib/tasks/auto_annotate_models.rake", "app/test-matchers.js", "docs/*", "**/*.md", "**/*.yml", "app/javascript/dashboard/i18n/locale", "**/*.stories.js", "stories/", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js", "app/javascript/shared/constants/countries.js", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js", "app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js", "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", "app/javascript/shared/constants/locales.js", "app/javascript/dashboard/helper/specs/macrosFixtures.js", "app/javascript/dashboard/routes/dashboard/settings/macros/constants.js", "**/fixtures/**", "**/*/fixtures.js",
+  "**/vendor/**", "spec/", "**/specs/**/**", "**/spec/**/**", "db/*", "bin/**/*", "db/**/*", "config/**/*", "public/**/*", "vendor/**/*", "node_modules/**/*", "lib/tasks/auto_annotate_models.rake", "app/test-matchers.js", "docs/*", "**/*.md", "**/*.yml", "app/javascript/dashboard/i18n/locale", "**/*.stories.js", "stories/", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js", "app/javascript/shared/constants/countries.js", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js", "app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js", "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/storeFactory.js", "app/javascript/dashboard/i18n/index.js", "app/javascript/widget/i18n/index.js", "app/javascript/survey/i18n/index.js", "app/javascript/shared/constants/locales.js", "app/javascript/dashboard/helper/specs/macrosFixtures.js", "app/javascript/dashboard/routes/dashboard/settings/macros/constants.js", "**/fixtures/**", "**/*/fixtures.js",
 ]
 
 test_patterns = [
diff --git a/.rubocop.yml b/.rubocop.yml
index ea688792b..d87f08bfd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -7,6 +7,8 @@ plugins:
 require:
   - ./rubocop/use_from_email.rb
   - ./rubocop/custom_cop_location.rb
+  - ./rubocop/attachment_download.rb
+  - ./rubocop/one_class_per_file.rb
 
 Layout/LineLength:
   Max: 150
@@ -40,6 +42,12 @@ Style/SymbolArray:
 Style/OpenStructUse:
   Enabled: false
 
+Chatwoot/AttachmentDownload:
+  Enabled: true
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+
 Style/OptionalBooleanParameter:
   Exclude:
     - 'app/services/email_templates/db_resolver_service.rb'
@@ -87,7 +95,7 @@ Metrics/ModuleLength:
 Rails/HelperInstanceVariable:
   Exclude:
     - enterprise/app/helpers/captain/chat_helper.rb
-
+    - enterprise/app/helpers/captain/chat_response_helper.rb
 Rails/ApplicationController:
   Exclude:
     - 'app/controllers/api/v1/widget/messages_controller.rb'
@@ -205,6 +213,9 @@ UseFromEmail:
 CustomCopLocation:
   Enabled: true
 
+Style/OneClassPerFile:
+  Enabled: true
+
 AllCops:
   NewCops: enable
   Exclude:
diff --git a/AGENTS.md b/AGENTS.md
index e3b022a2e..ef1d3b26d 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -10,6 +10,9 @@
 - **Test Ruby**: `bundle exec rspec spec/path/to/file_spec.rb`
 - **Single Test**: `bundle exec rspec spec/path/to/file_spec.rb:LINE_NUMBER`
 - **Run Project**: `overmind start -f Procfile.dev`
+- **Ruby Version**: Manage Ruby via `rbenv` and install the version listed in `.ruby-version` (e.g., `rbenv install $(cat .ruby-version)`)
+- **rbenv setup**: Before running any `bundle` or `rspec` commands, init rbenv in your shell (`eval "$(rbenv init -)"`) so the correct Ruby/Bundler versions are used
+- Always prefer `bundle exec` for Ruby CLI tasks (rspec, rake, rubocop, etc.)
 
 ## Code Style
 
@@ -37,6 +40,8 @@
 
 - MVP focus: Least code change, happy-path only
 - No unnecessary defensive programming
+- Ship the happy path first: limit guards/fallbacks to what production has proven necessary, then iterate
+- Prefer minimal, readable code over elaborate abstractions; clarity beats cleverness
 - Break down complex tasks into small, testable units
 - Iterate after confirmation
 - Avoid writing specs unless explicitly asked
diff --git a/Gemfile b/Gemfile
index 18442e3b0..46b11ef1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,7 @@ gem 'telephone_number'
 gem 'time_diff'
 gem 'tzinfo-data'
 gem 'valid_email2'
+gem 'email-provider-info'
 # compress javascript config.assets.js_compressor
 gem 'uglifier'
 ##-- used for single column multiple binary flags in notification settings/feature flagging --##
@@ -54,6 +55,9 @@ gem 'azure-storage-blob', git: 'https://github.com/chatwoot/azure-storage-ruby',
 gem 'google-cloud-storage', '>= 1.48.0', require: false
 gem 'image_processing'
 
+##-- for actionmailbox --##
+gem 'aws-actionmailbox-ses', '~> 0'
+
 ##-- gems for database --#
 gem 'groupdate'
 gem 'pg'
@@ -158,7 +162,7 @@ gem 'working_hours'
 gem 'pg_search'
 
 # Subscriptions, Billing
-gem 'stripe'
+gem 'stripe', '~> 18.0'
 
 ## - helper gems --##
 ## to populate db with sample data
@@ -187,11 +191,16 @@ gem 'reverse_markdown'
 
 gem 'iso-639'
 gem 'ruby-openai'
-gem 'ai-agents', '>= 0.4.3'
+gem 'ai-agents', '>= 0.7.0'
 
 # TODO: Move this gem as a dependency of ai-agents
+gem 'ruby_llm', '>= 1.8.2'
 gem 'ruby_llm-schema'
 
+# OpenTelemetry for LLM observability
+gem 'opentelemetry-sdk'
+gem 'opentelemetry-exporter-otlp'
+
 gem 'shopify_api'
 
 ### Gems required only in specific deployment environments ###
diff --git a/Gemfile.lock b/Gemfile.lock
index 80a78c6b6..55cfdef7e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -126,8 +126,8 @@ GEM
       jbuilder (~> 2)
       rails (>= 4.2, < 7.2)
       selectize-rails (~> 0.6)
-    ai-agents (0.4.3)
-      ruby_llm (~> 1.3)
+    ai-agents (0.7.0)
+      ruby_llm (~> 1.8.2)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
@@ -136,9 +136,13 @@ GEM
     audited (5.4.1)
       activerecord (>= 5.0, < 7.7)
       activesupport (>= 5.0, < 7.7)
+    aws-actionmailbox-ses (0.1.0)
+      actionmailbox (>= 7.1.0)
+      aws-sdk-s3 (~> 1, >= 1.123.0)
+      aws-sdk-sns (~> 1, >= 1.61.0)
     aws-eventstream (1.2.0)
     aws-partitions (1.760.0)
-    aws-sdk-core (3.171.1)
+    aws-sdk-core (3.188.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -146,10 +150,13 @@ GEM
     aws-sdk-kms (1.64.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.126.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
+    aws-sdk-sns (1.70.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
+      aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     barnes (0.0.9)
@@ -270,6 +277,7 @@ GEM
       concurrent-ruby (~> 1.0)
       http (>= 3.0)
       ruby2_keywords
+    email-provider-info (0.0.1)
     email_reply_trimmer (0.1.13)
     erubi (1.13.0)
     et-orbi (1.2.11)
@@ -594,7 +602,7 @@ GEM
     oj (3.16.10)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    omniauth (2.1.3)
+    omniauth (2.1.4)
       hashie (>= 3.4.6)
       logger
       rack (>= 2.2.3)
@@ -617,6 +625,25 @@ GEM
       faraday (>= 1.0, < 3)
       multi_json (>= 1.0)
     openssl (3.2.0)
+    opentelemetry-api (1.7.0)
+    opentelemetry-common (0.23.0)
+      opentelemetry-api (~> 1.0)
+    opentelemetry-exporter-otlp (0.31.1)
+      google-protobuf (>= 3.18)
+      googleapis-common-protos-types (~> 1.3)
+      opentelemetry-api (~> 1.1)
+      opentelemetry-common (~> 0.20)
+      opentelemetry-sdk (~> 1.10)
+      opentelemetry-semantic_conventions
+    opentelemetry-registry (0.4.0)
+      opentelemetry-api (~> 1.1)
+    opentelemetry-sdk (1.10.0)
+      opentelemetry-api (~> 1.1)
+      opentelemetry-common (~> 0.20)
+      opentelemetry-registry (~> 0.2)
+      opentelemetry-semantic_conventions
+    opentelemetry-semantic_conventions (1.36.0)
+      opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
     os (1.1.4)
     ostruct (0.6.1)
@@ -653,7 +680,7 @@ GEM
       rack (>= 2.0.0)
     rack-mini-profiler (3.2.0)
       rack (>= 1.2.0)
-    rack-protection (4.1.1)
+    rack-protection (4.2.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
@@ -792,7 +819,7 @@ GEM
     ruby2ruby (2.5.0)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_llm (1.5.1)
+    ruby_llm (1.8.2)
       base64
       event_stream_parser (~> 1)
       faraday (>= 1.10.0)
@@ -801,7 +828,7 @@ GEM
       faraday-retry (>= 1)
       marcel (~> 1.0)
       zeitwerk (~> 2)
-    ruby_llm-schema (0.1.0)
+    ruby_llm-schema (0.2.5)
     ruby_parser (3.20.0)
       sexp_processor (~> 4.16)
     sass (3.7.4)
@@ -901,7 +928,7 @@ GEM
     squasher (0.7.2)
     stackprof (0.2.25)
     statsd-ruby (1.5.0)
-    stripe (8.5.0)
+    stripe (18.0.1)
     telephone_number (1.4.20)
     test-prof (1.2.1)
     thor (1.4.0)
@@ -990,10 +1017,11 @@ DEPENDENCIES
   administrate (>= 0.20.1)
   administrate-field-active_storage (>= 1.0.3)
   administrate-field-belongs_to_search (>= 0.9.0)
-  ai-agents (>= 0.4.3)
+  ai-agents (>= 0.7.0)
   annotate
   attr_extras
   audited (~> 5.4, >= 5.4.1)
+  aws-actionmailbox-ses (~> 0)
   aws-sdk-s3
   azure-storage-blob!
   barnes
@@ -1016,6 +1044,7 @@ DEPENDENCIES
   dotenv-rails (>= 3.0.0)
   down
   elastic-apm
+  email-provider-info
   email_reply_trimmer
   facebook-messenger
   factory_bot_rails (>= 6.4.3)
@@ -1063,6 +1092,8 @@ DEPENDENCIES
   omniauth-rails_csrf_protection (~> 1.0, >= 1.0.2)
   omniauth-saml
   opensearch-ruby
+  opentelemetry-exporter-otlp
+  opentelemetry-sdk
   pg
   pg_search
   pgvector
@@ -1088,6 +1119,7 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rspec
   ruby-openai
+  ruby_llm (>= 1.8.2)
   ruby_llm-schema
   scout_apm
   scss_lint
@@ -1108,7 +1140,7 @@ DEPENDENCIES
   spring-watcher-listen
   squasher
   stackprof
-  stripe
+  stripe (~> 18.0)
   telephone_number
   test-prof
   tidewave
diff --git a/VERSION_CW b/VERSION_CW
index fdc669880..88f181192 100644
--- a/VERSION_CW
+++ b/VERSION_CW
@@ -1 +1 @@
-4.4.0
+4.8.0
diff --git a/app.json b/app.json
index 08e725c8e..91fb0fbd5 100644
--- a/app.json
+++ b/app.json
@@ -36,6 +36,10 @@
     "REDIS_OPENSSL_VERIFY_MODE":{
       "description": "OpenSSL verification mode for Redis connections. ref https://help.heroku.com/HC0F8CUS/redis-connection-issues",
       "value": "none"
+    },
+    "NODE_OPTIONS": {
+      "description": "Increase V8 heap for Vite build to avoid OOM",
+      "value": "--max-old-space-size=4096"
     }
   },
   "formation": {
diff --git a/app/builders/contact_inbox_builder.rb b/app/builders/contact_inbox_builder.rb
index 788ae39d1..40e571f43 100644
--- a/app/builders/contact_inbox_builder.rb
+++ b/app/builders/contact_inbox_builder.rb
@@ -103,3 +103,5 @@ class ContactInboxBuilder
     @inbox.email? || @inbox.sms? || @inbox.twilio? || @inbox.whatsapp?
   end
 end
+
+ContactInboxBuilder.prepend_mod_with('ContactInboxBuilder')
diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index 12a74ed9c..7df72e14a 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -1,5 +1,8 @@
 class Messages::MessageBuilder
   include ::FileTypeHelper
+  include ::EmailHelper
+  include ::DataHelper
+
   attr_reader :message
 
   def initialize(user, conversation, params)
@@ -23,7 +26,7 @@ class Messages::MessageBuilder
     process_emails
     # When the message has no quoted content, it will just be rendered as a regular message
     # The frontend is equipped to handle this case
-    process_email_content if @account.feature_enabled?(:quoted_email_reply)
+    process_email_content
     @message.save!
     @message
   end
@@ -38,30 +41,12 @@ class Messages::MessageBuilder
     params = convert_to_hash(@params)
     content_attributes = params.fetch(:content_attributes, {})
 
-    return parse_json(content_attributes) if content_attributes.is_a?(String)
+    return safe_parse_json(content_attributes) if content_attributes.is_a?(String)
     return content_attributes if content_attributes.is_a?(Hash)
 
     {}
   end
 
-  # Converts the given object to a hash.
-  # If it's an instance of ActionController::Parameters, converts it to an unsafe hash.
-  # Otherwise, returns the object as-is.
-  def convert_to_hash(obj)
-    return obj.to_unsafe_h if obj.instance_of?(ActionController::Parameters)
-
-    obj
-  end
-
-  # Attempts to parse a string as JSON.
-  # If successful, returns the parsed hash with symbolized names.
-  # If unsuccessful, returns nil.
-  def parse_json(content)
-    JSON.parse(content, symbolize_names: true)
-  rescue JSON::ParserError
-    {}
-  end
-
   def process_attachments
     return if @attachments.blank?
 
@@ -110,12 +95,6 @@ class Messages::MessageBuilder
     email_string.gsub(/\s+/, '').split(',')
   end
 
-  def validate_email_addresses(all_emails)
-    all_emails&.each do |email|
-      raise StandardError, 'Invalid email address' unless email.match?(URI::MailTo::EMAIL_REGEXP)
-    end
-  end
-
   def message_type
     if @conversation.inbox.channel_type != 'Channel::Api' && @message_type == 'incoming'
       raise StandardError, 'Incoming messages are only allowed in Api inboxes'
@@ -159,6 +138,7 @@ class Messages::MessageBuilder
       private: @private,
       sender: sender,
       content_type: @params[:content_type],
+      content_attributes: content_attributes.presence,
       items: @items,
       in_reply_to: @in_reply_to,
       echo_id: @params[:echo_id],
@@ -178,14 +158,17 @@ class Messages::MessageBuilder
     email_attributes = ensure_indifferent_access(@message.content_attributes[:email] || {})
     normalized_content = normalize_email_body(@message.content)
 
+    # Process liquid templates in normalized content with code block protection
+    processed_content = process_liquid_in_email_body(normalized_content)
+
     # Use custom HTML content if provided, otherwise generate from message content
     email_attributes[:html_content] = if custom_email_content_provided?
                                         build_custom_html_content
                                       else
-                                        build_html_content(normalized_content)
+                                        build_html_content(processed_content)
                                       end
 
-    email_attributes[:text_content] = build_text_content(normalized_content)
+    email_attributes[:text_content] = build_text_content(processed_content)
     email_attributes
   end
 
@@ -204,22 +187,6 @@ class Messages::MessageBuilder
     text_content
   end
 
-  def ensure_indifferent_access(hash)
-    return {} if hash.blank?
-
-    hash.respond_to?(:with_indifferent_access) ? hash.with_indifferent_access : hash
-  end
-
-  def normalize_email_body(content)
-    content.to_s.gsub("\r\n", "\n")
-  end
-
-  def render_email_html(content)
-    return '' if content.blank?
-
-    ChatwootMarkdownRenderer.new(content).render_message.to_s
-  end
-
   def custom_email_content_provided?
     @params[:email_html_content].present?
   end
@@ -232,4 +199,29 @@ class Messages::MessageBuilder
 
     html_content
   end
+
+  # Liquid processing methods for email content
+  def process_liquid_in_email_body(content)
+    return content if content.blank?
+    return content unless should_process_liquid?
+
+    # Protect code blocks from liquid processing
+    modified_content = modified_liquid_content(content)
+    template = Liquid::Template.parse(modified_content)
+    template.render(drops_with_sender)
+  rescue Liquid::Error
+    content
+  end
+
+  def should_process_liquid?
+    @message_type == 'outgoing' || @message_type == 'template'
+  end
+
+  def drops_with_sender
+    message_drops(@conversation).merge({
+                                         'agent' => UserDrop.new(sender)
+                                       })
+  end
 end
+
+Messages::MessageBuilder.prepend_mod_with('Messages::MessageBuilder')
diff --git a/app/builders/messages/messenger/message_builder.rb b/app/builders/messages/messenger/message_builder.rb
index 4e7f2849d..8821da9d5 100644
--- a/app/builders/messages/messenger/message_builder.rb
+++ b/app/builders/messages/messenger/message_builder.rb
@@ -9,6 +9,8 @@ class Messages::Messenger::MessageBuilder
     attachment_obj.save!
     attach_file(attachment_obj, attachment_params(attachment)[:remote_file_url]) if attachment_params(attachment)[:remote_file_url]
     fetch_story_link(attachment_obj) if attachment_obj.file_type == 'story_mention'
+    fetch_ig_story_link(attachment_obj) if attachment_obj.file_type == 'ig_story'
+    fetch_ig_post_link(attachment_obj) if attachment_obj.file_type == 'ig_post'
     update_attachment_file_type(attachment_obj)
   end
 
@@ -27,7 +29,7 @@ class Messages::Messenger::MessageBuilder
     file_type = attachment['type'].to_sym
     params = { file_type: file_type, account_id: @message.account_id }
 
-    if [:image, :file, :audio, :video, :share, :story_mention, :ig_reel].include? file_type
+    if [:image, :file, :audio, :video, :share, :story_mention, :ig_reel, :ig_post, :ig_story].include? file_type
       params.merge!(file_type_params(attachment))
     elsif file_type == :location
       params.merge!(location_params(attachment))
@@ -39,9 +41,17 @@ class Messages::Messenger::MessageBuilder
   end
 
   def file_type_params(attachment)
+    # Handle different URL field names for different attachment types
+    url = case attachment['type'].to_sym
+          when :ig_story
+            attachment['payload']['story_media_url']
+          else
+            attachment['payload']['url']
+          end
+
     {
-      external_url: attachment['payload']['url'],
-      remote_file_url: attachment['payload']['url']
+      external_url: url,
+      remote_file_url: url
     }
   end
 
@@ -68,6 +78,21 @@ class Messages::Messenger::MessageBuilder
     message.save!
   end
 
+  def fetch_ig_story_link(attachment)
+    message = attachment.message
+    # For ig_story, we don't have the same API call as story_mention, so we'll set it up similarly but with generic content
+    message.content_attributes[:image_type] = 'ig_story'
+    message.content = I18n.t('conversations.messages.instagram_shared_story_content')
+    message.save!
+  end
+
+  def fetch_ig_post_link(attachment)
+    message = attachment.message
+    message.content_attributes[:image_type] = 'ig_post'
+    message.content = I18n.t('conversations.messages.instagram_shared_post_content')
+    message.save!
+  end
+
   # This is a placeholder method to be overridden by child classes
   def get_story_object_from_source_id(_source_id)
     {}
@@ -76,6 +101,6 @@ class Messages::Messenger::MessageBuilder
   private
 
   def unsupported_file_type?(attachment_type)
-    [:template, :unsupported_type].include? attachment_type.to_sym
+    [:template, :unsupported_type, :ephemeral].include? attachment_type.to_sym
   end
 end
diff --git a/app/controllers/api/v1/accounts/agent_bots_controller.rb b/app/controllers/api/v1/accounts/agent_bots_controller.rb
index 64c35d33d..c2f919659 100644
--- a/app/controllers/api/v1/accounts/agent_bots_controller.rb
+++ b/app/controllers/api/v1/accounts/agent_bots_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
   before_action :agent_bot, except: [:index, :create]
 
   def index
-    @agent_bots = AgentBot.where(account_id: [nil, Current.account.id])
+    @agent_bots = AgentBot.accessible_to(Current.account)
   end
 
   def show; end
@@ -37,7 +37,7 @@ class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
   private
 
   def agent_bot
-    @agent_bot = AgentBot.where(account_id: [nil, Current.account.id]).find(params[:id]) if params[:action] == 'show'
+    @agent_bot = AgentBot.accessible_to(Current.account).find(params[:id]) if params[:action] == 'show'
     @agent_bot ||= Current.account.agent_bots.find(params[:id])
   end
 
diff --git a/app/controllers/api/v1/accounts/articles_controller.rb b/app/controllers/api/v1/accounts/articles_controller.rb
index da2be2312..8a6fd61f8 100644
--- a/app/controllers/api/v1/accounts/articles_controller.rb
+++ b/app/controllers/api/v1/accounts/articles_controller.rb
@@ -22,9 +22,10 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
   def edit; end
 
   def create
-    @article = @portal.articles.create!(article_params)
+    params_with_defaults = article_params
+    params_with_defaults[:status] ||= :draft
+    @article = @portal.articles.create!(params_with_defaults)
     @article.associate_root_article(article_params[:associated_article_id])
-    @article.draft!
     render json: { error: @article.errors.messages }, status: :unprocessable_entity and return unless @article.valid?
   end
 
diff --git a/app/controllers/api/v1/accounts/bulk_actions_controller.rb b/app/controllers/api/v1/accounts/bulk_actions_controller.rb
index 34db47861..222c66714 100644
--- a/app/controllers/api/v1/accounts/bulk_actions_controller.rb
+++ b/app/controllers/api/v1/accounts/bulk_actions_controller.rb
@@ -1,13 +1,12 @@
 class Api::V1::Accounts::BulkActionsController < Api::V1::Accounts::BaseController
-  before_action :type_matches?
-
   def create
-    if type_matches?
-      ::BulkActionsJob.perform_later(
-        account: @current_account,
-        user: current_user,
-        params: permitted_params
-      )
+    case normalized_type
+    when 'Conversation'
+      enqueue_conversation_job
+      head :ok
+    when 'Contact'
+      check_authorization_for_contact_action
+      enqueue_contact_job
       head :ok
     else
       render json: { success: false }, status: :unprocessable_entity
@@ -16,11 +15,54 @@ class Api::V1::Accounts::BulkActionsController < Api::V1::Accounts::BaseControll
 
   private
 
-  def type_matches?
-    ['Conversation'].include?(params[:type])
+  def normalized_type
+    params[:type].to_s.camelize
   end
 
-  def permitted_params
-    params.permit(:type, :snoozed_until, ids: [], fields: [:status, :assignee_id, :team_id], labels: [add: [], remove: []])
+  def enqueue_conversation_job
+    ::BulkActionsJob.perform_later(
+      account: @current_account,
+      user: current_user,
+      params: conversation_params
+    )
+  end
+
+  def enqueue_contact_job
+    Contacts::BulkActionJob.perform_later(
+      @current_account.id,
+      current_user.id,
+      contact_params
+    )
+  end
+
+  def delete_contact_action?
+    params[:action_name] == 'delete'
+  end
+
+  def check_authorization_for_contact_action
+    authorize(Contact, :destroy?) if delete_contact_action?
+  end
+
+  def conversation_params
+    # TODO: Align conversation payloads with the `{ action_name, action_attributes }`
+    # and then remove this method in favor of a common params method.
+    base = params.permit(
+      :snoozed_until,
+      fields: [:status, :assignee_id, :team_id]
+    )
+    append_common_bulk_attributes(base)
+  end
+
+  def contact_params
+    # TODO: remove this method in favor of a common params method.
+    # once legacy conversation payloads are migrated.
+    append_common_bulk_attributes({})
+  end
+
+  def append_common_bulk_attributes(base_params)
+    # NOTE: Conversation payloads historically diverged per action. Going forward we
+    # want all objects to share a common contract: `{ action_name, action_attributes }`
+    common = params.permit(:type, :action_name, ids: [], labels: [add: [], remove: []])
+    base_params.merge(common)
   end
 end
diff --git a/app/controllers/api/v1/accounts/conversations/assignments_controller.rb b/app/controllers/api/v1/accounts/conversations/assignments_controller.rb
index 1fb2095e3..49806e97c 100644
--- a/app/controllers/api/v1/accounts/conversations/assignments_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations/assignments_controller.rb
@@ -1,7 +1,7 @@
 class Api::V1::Accounts::Conversations::AssignmentsController < Api::V1::Accounts::Conversations::BaseController
   # assigns agent/team to a conversation
   def create
-    if params.key?(:assignee_id)
+    if params.key?(:assignee_id) || agent_bot_assignment?
       set_agent
     elsif params.key?(:team_id)
       set_team
@@ -13,17 +13,23 @@ class Api::V1::Accounts::Conversations::AssignmentsController < Api::V1::Account
   private
 
   def set_agent
-    @agent = Current.account.users.find_by(id: params[:assignee_id])
-    @conversation.assignee = @agent
-    @conversation.save!
-    render_agent
+    resource = Conversations::AssignmentService.new(
+      conversation: @conversation,
+      assignee_id: params[:assignee_id],
+      assignee_type: params[:assignee_type]
+    ).perform
+
+    render_agent(resource)
   end
 
-  def render_agent
-    if @agent.nil?
-      render json: nil
+  def render_agent(resource)
+    case resource
+    when User
+      render partial: 'api/v1/models/agent', formats: [:json], locals: { resource: resource }
+    when AgentBot
+      render partial: 'api/v1/models/agent_bot_slim', formats: [:json], locals: { resource: resource }
     else
-      render partial: 'api/v1/models/agent', formats: [:json], locals: { resource: @agent }
+      render json: nil
     end
   end
 
@@ -32,4 +38,8 @@ class Api::V1::Accounts::Conversations::AssignmentsController < Api::V1::Account
     @conversation.update!(team: @team)
     render json: @team
   end
+
+  def agent_bot_assignment?
+    params[:assignee_type].to_s == 'AgentBot'
+  end
 end
diff --git a/app/controllers/api/v1/accounts/webhooks_controller.rb b/app/controllers/api/v1/accounts/webhooks_controller.rb
index 7ea257ed2..9f8e94821 100644
--- a/app/controllers/api/v1/accounts/webhooks_controller.rb
+++ b/app/controllers/api/v1/accounts/webhooks_controller.rb
@@ -23,7 +23,7 @@ class Api::V1::Accounts::WebhooksController < Api::V1::Accounts::BaseController
   private
 
   def webhook_params
-    params.require(:webhook).permit(:inbox_id, :url, subscriptions: [])
+    params.require(:webhook).permit(:inbox_id, :name, :url, subscriptions: [])
   end
 
   def fetch_webhook
diff --git a/app/controllers/api/v1/widget/configs_controller.rb b/app/controllers/api/v1/widget/configs_controller.rb
index ecbddd905..458d0486c 100644
--- a/app/controllers/api/v1/widget/configs_controller.rb
+++ b/app/controllers/api/v1/widget/configs_controller.rb
@@ -9,7 +9,13 @@ class Api::V1::Widget::ConfigsController < Api::V1::Widget::BaseController
   private
 
   def set_global_config
-    @global_config = GlobalConfig.get('LOGO_THUMBNAIL', 'BRAND_NAME', 'WIDGET_BRAND_URL', 'INSTALLATION_NAME')
+    @global_config = GlobalConfig.get(
+      'LOGO_THUMBNAIL',
+      'BRAND_NAME',
+      'WIDGET_BRAND_URL',
+      'MAXIMUM_FILE_UPLOAD_SIZE',
+      'INSTALLATION_NAME'
+    )
   end
 
   def set_contact
diff --git a/app/controllers/concerns/ensure_current_account_helper.rb b/app/controllers/concerns/ensure_current_account_helper.rb
index 3baf9ee1e..ea36a48f2 100644
--- a/app/controllers/concerns/ensure_current_account_helper.rb
+++ b/app/controllers/concerns/ensure_current_account_helper.rb
@@ -25,6 +25,9 @@ module EnsureCurrentAccountHelper
   end
 
   def account_accessible_for_bot?(account)
-    render_unauthorized('Bot is not authorized to access this account') unless @resource.agent_bot_inboxes.find_by(account_id: account.id)
+    return if @resource.account_id == account.id
+    return if @resource.agent_bot_inboxes.find_by(account_id: account.id)
+
+    render_unauthorized('Bot is not authorized to access this account')
   end
 end
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index d81b4c9da..5003c4c70 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -1,6 +1,31 @@
 class DashboardController < ActionController::Base
   include SwitchLocale
 
+  GLOBAL_CONFIG_KEYS = %w[
+    LOGO
+    LOGO_DARK
+    LOGO_THUMBNAIL
+    INSTALLATION_NAME
+    WIDGET_BRAND_URL
+    TERMS_URL
+    BRAND_URL
+    BRAND_NAME
+    PRIVACY_URL
+    DISPLAY_MANIFEST
+    CREATE_NEW_ACCOUNT_FROM_DASHBOARD
+    CHATWOOT_INBOX_TOKEN
+    API_CHANNEL_NAME
+    API_CHANNEL_THUMBNAIL
+    ANALYTICS_TOKEN
+    DIRECT_UPLOADS_ENABLED
+    MAXIMUM_FILE_UPLOAD_SIZE
+    HCAPTCHA_SITE_KEY
+    LOGOUT_REDIRECT_LINK
+    DISABLE_USER_PROFILE_UPDATE
+    DEPLOYMENT_ENV
+    INSTALLATION_PRICING_PLAN
+  ].freeze
+
   before_action :set_application_pack
   before_action :set_global_config
   before_action :set_dashboard_scripts
@@ -19,25 +44,7 @@ class DashboardController < ActionController::Base
   end
 
   def set_global_config
-    @global_config = GlobalConfig.get(
-      'LOGO', 'LOGO_DARK', 'LOGO_THUMBNAIL',
-      'INSTALLATION_NAME',
-      'WIDGET_BRAND_URL', 'TERMS_URL',
-      'BRAND_URL', 'BRAND_NAME',
-      'PRIVACY_URL',
-      'DISPLAY_MANIFEST',
-      'CREATE_NEW_ACCOUNT_FROM_DASHBOARD',
-      'CHATWOOT_INBOX_TOKEN',
-      'API_CHANNEL_NAME',
-      'API_CHANNEL_THUMBNAIL',
-      'ANALYTICS_TOKEN',
-      'DIRECT_UPLOADS_ENABLED',
-      'HCAPTCHA_SITE_KEY',
-      'LOGOUT_REDIRECT_LINK',
-      'DISABLE_USER_PROFILE_UPDATE',
-      'DEPLOYMENT_ENV',
-      'INSTALLATION_PRICING_PLAN'
-    ).merge(app_config)
+    @global_config = GlobalConfig.get(*GLOBAL_CONFIG_KEYS).merge(app_config)
   end
 
   def set_dashboard_scripts
@@ -71,10 +78,18 @@ class DashboardController < ActionController::Base
       WHATSAPP_CONFIGURATION_ID: GlobalConfigService.load('WHATSAPP_CONFIGURATION_ID', ''),
       IS_ENTERPRISE: ChatwootApp.enterprise?,
       AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),
-      GIT_SHA: GIT_HASH
+      GIT_SHA: GIT_HASH,
+      ALLOWED_LOGIN_METHODS: allowed_login_methods
     }
   end
 
+  def allowed_login_methods
+    methods = ['email']
+    methods << 'google_oauth' if GlobalConfigService.load('ENABLE_GOOGLE_OAUTH_LOGIN', 'true').to_s != 'false'
+    methods << 'saml' if ChatwootHub.pricing_plan != 'community' && GlobalConfigService.load('ENABLE_SAML_SSO_LOGIN', 'true').to_s != 'false'
+    methods
+  end
+
   def set_application_pack
     @application_pack = if request.path.include?('/auth') || request.path.include?('/login')
                           'v3app'
diff --git a/app/controllers/super_admin/app_configs_controller.rb b/app/controllers/super_admin/app_configs_controller.rb
index 5cf158b98..1a9539bb6 100644
--- a/app/controllers/super_admin/app_configs_controller.rb
+++ b/app/controllers/super_admin/app_configs_controller.rb
@@ -15,14 +15,20 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
   end
 
   def create
+    errors = []
     params['app_config'].each do |key, value|
       next unless @allowed_configs.include?(key)
 
       i = InstallationConfig.where(name: key).first_or_create(value: value, locked: false)
       i.value = value
-      i.save!
+      errors.concat(i.errors.full_messages) unless i.save
+    end
+
+    if errors.any?
+      redirect_to super_admin_app_config_path(config: @config), alert: errors.join(', ')
+    else
+      redirect_to super_admin_settings_path, notice: "App Configs - #{@config.titleize} updated successfully"
     end
-    redirect_to super_admin_settings_path, notice: "App Configs - #{@config.titleize} updated successfully"
   end
 
   private
@@ -42,10 +48,13 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
       'instagram' => %w[INSTAGRAM_APP_ID INSTAGRAM_APP_SECRET INSTAGRAM_VERIFY_TOKEN INSTAGRAM_API_VERSION ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT],
       'whatsapp_embedded' => %w[WHATSAPP_APP_ID WHATSAPP_APP_SECRET WHATSAPP_CONFIGURATION_ID WHATSAPP_API_VERSION],
       'notion' => %w[NOTION_CLIENT_ID NOTION_CLIENT_SECRET],
-      'google' => %w[GOOGLE_OAUTH_CLIENT_ID GOOGLE_OAUTH_CLIENT_SECRET GOOGLE_OAUTH_REDIRECT_URI]
+      'google' => %w[GOOGLE_OAUTH_CLIENT_ID GOOGLE_OAUTH_CLIENT_SECRET GOOGLE_OAUTH_REDIRECT_URI ENABLE_GOOGLE_OAUTH_LOGIN]
     }
 
-    @allowed_configs = mapping.fetch(@config, %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS])
+    @allowed_configs = mapping.fetch(
+      @config,
+      %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS WEBHOOK_TIMEOUT MAXIMUM_FILE_UPLOAD_SIZE]
+    )
   end
 end
 
diff --git a/app/controllers/widgets_controller.rb b/app/controllers/widgets_controller.rb
index 9a6a376f7..7f45ce636 100644
--- a/app/controllers/widgets_controller.rb
+++ b/app/controllers/widgets_controller.rb
@@ -14,7 +14,14 @@ class WidgetsController < ActionController::Base
   private
 
   def set_global_config
-    @global_config = GlobalConfig.get('LOGO_THUMBNAIL', 'BRAND_NAME', 'WIDGET_BRAND_URL', 'DIRECT_UPLOADS_ENABLED', 'INSTALLATION_NAME')
+    @global_config = GlobalConfig.get(
+      'LOGO_THUMBNAIL',
+      'BRAND_NAME',
+      'WIDGET_BRAND_URL',
+      'DIRECT_UPLOADS_ENABLED',
+      'MAXIMUM_FILE_UPLOAD_SIZE',
+      'INSTALLATION_NAME'
+    )
   end
 
   def set_web_widget
diff --git a/app/helpers/data_helper.rb b/app/helpers/data_helper.rb
new file mode 100644
index 000000000..66f5a9508
--- /dev/null
+++ b/app/helpers/data_helper.rb
@@ -0,0 +1,24 @@
+# Provides utility methods for data transformation, hash manipulation, and JSON parsing.
+# This module contains helper methods for converting between different data types,
+# normalizing hashes, and safely handling JSON operations.
+module DataHelper
+  # Ensures a hash supports indifferent access (string or symbol keys).
+  # Returns an empty hash if the input is blank.
+  def ensure_indifferent_access(hash)
+    return {} if hash.blank?
+
+    hash.respond_to?(:with_indifferent_access) ? hash.with_indifferent_access : hash
+  end
+
+  def convert_to_hash(obj)
+    return obj.to_unsafe_h if obj.instance_of?(ActionController::Parameters)
+
+    obj
+  end
+
+  def safe_parse_json(content)
+    JSON.parse(content, symbolize_names: true)
+  rescue JSON::ParserError
+    {}
+  end
+end
diff --git a/app/helpers/email_helper.rb b/app/helpers/email_helper.rb
index 05b6a53e3..fcc8b463d 100644
--- a/app/helpers/email_helper.rb
+++ b/app/helpers/email_helper.rb
@@ -4,6 +4,19 @@ module EmailHelper
     domain.split('.').first
   end
 
+  def render_email_html(content)
+    return '' if content.blank?
+
+    ChatwootMarkdownRenderer.new(content).render_message.to_s
+  end
+
+  # Raise a standard error if any email address is invalid
+  def validate_email_addresses(emails_to_test)
+    emails_to_test&.each do |email|
+      raise StandardError, 'Invalid email address' unless email.match?(URI::MailTo::EMAIL_REGEXP)
+    end
+  end
+
   # ref: https://www.rfc-editor.org/rfc/rfc5233.html
   # This is not a  mandatory requirement for email addresses, but it is a common practice.
   # john+test@xyc.com is the same as john@xyc.com
@@ -21,6 +34,10 @@ module EmailHelper
     end
   end
 
+  def normalize_email_body(content)
+    content.to_s.gsub("\r\n", "\n")
+  end
+
   def modified_liquid_content(email)
     # This regex is used to match the code blocks in the content
     # We don't want to process liquid in code blocks
@@ -29,7 +46,10 @@ module EmailHelper
 
   def message_drops(conversation)
     {
-      'contact' => ContactDrop.new(conversation.contact)
+      'contact' => ContactDrop.new(conversation.contact),
+      'conversation' => ConversationDrop.new(conversation),
+      'inbox' => InboxDrop.new(conversation.inbox),
+      'account' => AccountDrop.new(conversation.account)
     }
   end
 end
diff --git a/app/helpers/super_admin/features.yml b/app/helpers/super_admin/features.yml
index f49004e79..b05c603cd 100644
--- a/app/helpers/super_admin/features.yml
+++ b/app/helpers/super_admin/features.yml
@@ -9,6 +9,13 @@ captain:
   icon: 'icon-captain'
   config_key: 'captain'
   enterprise: true
+saml:
+  name: 'SAML SSO'
+  description: 'Configuration for controlling SAML Single Sign-On availability'
+  enabled: <%= ChatwootApp.enterprise? %>
+  icon: 'icon-lock-line'
+  config_key: 'saml'
+  enterprise: true
 custom_branding:
   name: 'Custom Branding'
   description: 'Apply your own branding to this installation.'
diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue
index 0fcb8c9fe..a63cb1a90 100644
--- a/app/javascript/dashboard/App.vue
+++ b/app/javascript/dashboard/App.vue
@@ -1,6 +1,5 @@
 <script>
 import { mapGetters } from 'vuex';
-import AddAccountModal from './components/app/AddAccountModal.vue';
 import LoadingState from './components/widgets/LoadingState.vue';
 import NetworkNotification from './components/NetworkNotification.vue';
 import UpdateBanner from './components/app/UpdateBanner.vue';
@@ -25,7 +24,6 @@ export default {
   name: 'App',
 
   components: {
-    AddAccountModal,
     LoadingState,
     NetworkNotification,
     UpdateBanner,
@@ -51,7 +49,6 @@ export default {
   },
   data() {
     return {
-      showAddAccountModal: false,
       latestChatwootVersion: null,
       reconnectService: null,
     };
@@ -64,21 +61,12 @@ export default {
       authUIFlags: 'getAuthUIFlags',
       accountUIFlags: 'accounts/getUIFlags',
     }),
-    hasAccounts() {
-      const { accounts = [] } = this.currentUser || {};
-      return accounts.length > 0;
-    },
     hideOnOnboardingView() {
       return !isOnOnboardingView(this.$route);
     },
   },
 
   watch: {
-    currentUser() {
-      if (!this.hasAccounts) {
-        this.showAddAccountModal = true;
-      }
-    },
     currentAccountId: {
       immediate: true,
       handler() {
@@ -156,7 +144,6 @@ export default {
         <component :is="Component" />
       </transition>
     </router-view>
-    <AddAccountModal :show="showAddAccountModal" :has-accounts="hasAccounts" />
     <WootSnackbarBox />
     <NetworkNotification />
   </div>
diff --git a/app/javascript/dashboard/api/companies.js b/app/javascript/dashboard/api/companies.js
new file mode 100644
index 000000000..090b530c4
--- /dev/null
+++ b/app/javascript/dashboard/api/companies.js
@@ -0,0 +1,37 @@
+/* global axios */
+import ApiClient from './ApiClient';
+
+export const buildCompanyParams = (page, sort) => {
+  let params = `page=${page}`;
+  if (sort) {
+    params = `${params}&sort=${sort}`;
+  }
+  return params;
+};
+
+export const buildSearchParams = (query, page, sort) => {
+  let params = `q=${encodeURIComponent(query)}&page=${page}`;
+  if (sort) {
+    params = `${params}&sort=${sort}`;
+  }
+  return params;
+};
+
+class CompanyAPI extends ApiClient {
+  constructor() {
+    super('companies', { accountScoped: true });
+  }
+
+  get(params = {}) {
+    const { page = 1, sort = 'name' } = params;
+    const requestURL = `${this.url}?${buildCompanyParams(page, sort)}`;
+    return axios.get(requestURL);
+  }
+
+  search(query = '', page = 1, sort = 'name') {
+    const requestURL = `${this.url}/search?${buildSearchParams(query, page, sort)}`;
+    return axios.get(requestURL);
+  }
+}
+
+export default new CompanyAPI();
diff --git a/app/javascript/dashboard/api/contacts.js b/app/javascript/dashboard/api/contacts.js
index 025df2122..1e76ac987 100644
--- a/app/javascript/dashboard/api/contacts.js
+++ b/app/javascript/dashboard/api/contacts.js
@@ -47,6 +47,12 @@ class ContactAPI extends ApiClient {
     return axios.get(`${this.url}/${contactId}/labels`);
   }
 
+  initiateCall(contactId, inboxId) {
+    return axios.post(`${this.url}/${contactId}/call`, {
+      inbox_id: inboxId,
+    });
+  }
+
   updateContactLabels(contactId, labels) {
     return axios.post(`${this.url}/${contactId}/labels`, { labels });
   }
diff --git a/app/javascript/dashboard/api/enterprise/account.js b/app/javascript/dashboard/api/enterprise/account.js
index 3f12dc007..9e6d40a62 100644
--- a/app/javascript/dashboard/api/enterprise/account.js
+++ b/app/javascript/dashboard/api/enterprise/account.js
@@ -23,6 +23,10 @@ class EnterpriseAccountAPI extends ApiClient {
       action_type: action,
     });
   }
+
+  createTopupCheckout(credits) {
+    return axios.post(`${this.url}topup_checkout`, { credits });
+  }
 }
 
 export default new EnterpriseAccountAPI();
diff --git a/app/javascript/dashboard/api/enterprise/specs/account.spec.js b/app/javascript/dashboard/api/enterprise/specs/account.spec.js
index 9c65b0b67..47d2eb26d 100644
--- a/app/javascript/dashboard/api/enterprise/specs/account.spec.js
+++ b/app/javascript/dashboard/api/enterprise/specs/account.spec.js
@@ -11,6 +11,8 @@ describe('#enterpriseAccountAPI', () => {
     expect(accountAPI).toHaveProperty('delete');
     expect(accountAPI).toHaveProperty('checkout');
     expect(accountAPI).toHaveProperty('toggleDeletion');
+    expect(accountAPI).toHaveProperty('createTopupCheckout');
+    expect(accountAPI).toHaveProperty('getLimits');
   });
 
   describe('API calls', () => {
@@ -59,5 +61,29 @@ describe('#enterpriseAccountAPI', () => {
         { action_type: 'undelete' }
       );
     });
+
+    it('#createTopupCheckout with credits', () => {
+      accountAPI.createTopupCheckout(1000);
+      expect(axiosMock.post).toHaveBeenCalledWith(
+        '/enterprise/api/v1/topup_checkout',
+        { credits: 1000 }
+      );
+    });
+
+    it('#createTopupCheckout with different credit amounts', () => {
+      const creditAmounts = [1000, 2500, 6000, 12000];
+      creditAmounts.forEach(credits => {
+        accountAPI.createTopupCheckout(credits);
+        expect(axiosMock.post).toHaveBeenCalledWith(
+          '/enterprise/api/v1/topup_checkout',
+          { credits }
+        );
+      });
+    });
+
+    it('#getLimits', () => {
+      accountAPI.getLimits();
+      expect(axiosMock.get).toHaveBeenCalledWith('/enterprise/api/v1/limits');
+    });
   });
 });
diff --git a/app/javascript/dashboard/api/inbox/conversation.js b/app/javascript/dashboard/api/inbox/conversation.js
index 0f539bfa9..f94fca452 100644
--- a/app/javascript/dashboard/api/inbox/conversation.js
+++ b/app/javascript/dashboard/api/inbox/conversation.js
@@ -63,10 +63,9 @@ class ConversationApi extends ApiClient {
   }
 
   assignAgent({ conversationId, agentId }) {
-    return axios.post(
-      `${this.url}/${conversationId}/assignments?assignee_id=${agentId}`,
-      {}
-    );
+    return axios.post(`${this.url}/${conversationId}/assignments`, {
+      assignee_id: agentId,
+    });
   }
 
   assignTeam({ conversationId, teamId }) {
diff --git a/app/javascript/dashboard/api/integrations/openapi.js b/app/javascript/dashboard/api/integrations/openapi.js
index ad203a14c..3fcf241ee 100644
--- a/app/javascript/dashboard/api/integrations/openapi.js
+++ b/app/javascript/dashboard/api/integrations/openapi.js
@@ -57,6 +57,12 @@ class OpenAIAPI extends ApiClient {
       content,
     };
 
+    // Always include conversation_display_id when available for session tracking
+    if (conversationId) {
+      data.conversation_display_id = conversationId;
+    }
+
+    // For conversation-level events, only send conversation_display_id
     if (this.conversation_events.includes(type)) {
       data = {
         conversation_display_id: conversationId,
diff --git a/app/javascript/dashboard/api/specs/companies.spec.js b/app/javascript/dashboard/api/specs/companies.spec.js
new file mode 100644
index 000000000..82fdc1c97
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/companies.spec.js
@@ -0,0 +1,142 @@
+import companyAPI, {
+  buildCompanyParams,
+  buildSearchParams,
+} from '../companies';
+import ApiClient from '../ApiClient';
+
+describe('#CompanyAPI', () => {
+  it('creates correct instance', () => {
+    expect(companyAPI).toBeInstanceOf(ApiClient);
+    expect(companyAPI).toHaveProperty('get');
+    expect(companyAPI).toHaveProperty('show');
+    expect(companyAPI).toHaveProperty('create');
+    expect(companyAPI).toHaveProperty('update');
+    expect(companyAPI).toHaveProperty('delete');
+    expect(companyAPI).toHaveProperty('search');
+  });
+
+  describe('API calls', () => {
+    const originalAxios = window.axios;
+    const axiosMock = {
+      post: vi.fn(() => Promise.resolve()),
+      get: vi.fn(() => Promise.resolve()),
+      patch: vi.fn(() => Promise.resolve()),
+      delete: vi.fn(() => Promise.resolve()),
+    };
+
+    beforeEach(() => {
+      window.axios = axiosMock;
+    });
+
+    afterEach(() => {
+      window.axios = originalAxios;
+    });
+
+    it('#get with default params', () => {
+      companyAPI.get({});
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/companies?page=1&sort=name'
+      );
+    });
+
+    it('#get with page and sort params', () => {
+      companyAPI.get({ page: 2, sort: 'domain' });
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/companies?page=2&sort=domain'
+      );
+    });
+
+    it('#get with descending sort', () => {
+      companyAPI.get({ page: 1, sort: '-created_at' });
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/companies?page=1&sort=-created_at'
+      );
+    });
+
+    it('#search with query', () => {
+      companyAPI.search('acme', 1, 'name');
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/companies/search?q=acme&page=1&sort=name'
+      );
+    });
+
+    it('#search with special characters in query', () => {
+      companyAPI.search('acme & co', 2, 'domain');
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/companies/search?q=acme%20%26%20co&page=2&sort=domain'
+      );
+    });
+
+    it('#search with descending sort', () => {
+      companyAPI.search('test', 1, '-created_at');
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/companies/search?q=test&page=1&sort=-created_at'
+      );
+    });
+
+    it('#search with empty query', () => {
+      companyAPI.search('', 1, 'name');
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/companies/search?q=&page=1&sort=name'
+      );
+    });
+  });
+});
+
+describe('#buildCompanyParams', () => {
+  it('returns correct string with page only', () => {
+    expect(buildCompanyParams(1)).toBe('page=1');
+  });
+
+  it('returns correct string with page and sort', () => {
+    expect(buildCompanyParams(1, 'name')).toBe('page=1&sort=name');
+  });
+
+  it('returns correct string with different page', () => {
+    expect(buildCompanyParams(3, 'domain')).toBe('page=3&sort=domain');
+  });
+
+  it('returns correct string with descending sort', () => {
+    expect(buildCompanyParams(1, '-created_at')).toBe(
+      'page=1&sort=-created_at'
+    );
+  });
+
+  it('returns correct string without sort parameter', () => {
+    expect(buildCompanyParams(2, '')).toBe('page=2');
+  });
+});
+
+describe('#buildSearchParams', () => {
+  it('returns correct string with all parameters', () => {
+    expect(buildSearchParams('acme', 1, 'name')).toBe(
+      'q=acme&page=1&sort=name'
+    );
+  });
+
+  it('returns correct string with special characters', () => {
+    expect(buildSearchParams('acme & co', 2, 'domain')).toBe(
+      'q=acme%20%26%20co&page=2&sort=domain'
+    );
+  });
+
+  it('returns correct string with empty query', () => {
+    expect(buildSearchParams('', 1, 'name')).toBe('q=&page=1&sort=name');
+  });
+
+  it('returns correct string without sort parameter', () => {
+    expect(buildSearchParams('test', 1, '')).toBe('q=test&page=1');
+  });
+
+  it('returns correct string with descending sort', () => {
+    expect(buildSearchParams('company', 3, '-created_at')).toBe(
+      'q=company&page=3&sort=-created_at'
+    );
+  });
+
+  it('encodes special characters correctly', () => {
+    expect(buildSearchParams('test@example.com', 1, 'name')).toBe(
+      'q=test%40example.com&page=1&sort=name'
+    );
+  });
+});
diff --git a/app/javascript/dashboard/api/specs/inbox/conversation.spec.js b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
index dd1615802..de0d7a7d0 100644
--- a/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
+++ b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
@@ -92,8 +92,10 @@ describe('#ConversationAPI', () => {
     it('#assignAgent', () => {
       conversationAPI.assignAgent({ conversationId: 12, agentId: 34 });
       expect(axiosMock.post).toHaveBeenCalledWith(
-        `/api/v1/conversations/12/assignments?assignee_id=34`,
-        {}
+        `/api/v1/conversations/12/assignments`,
+        {
+          assignee_id: 34,
+        }
       );
     });
 
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue b/app/javascript/dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue
new file mode 100644
index 000000000..4603521eb
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue
@@ -0,0 +1,95 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { formatDistanceToNow } from 'date-fns';
+
+import CardLayout from 'dashboard/components-next/CardLayout.vue';
+import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+
+const props = defineProps({
+  id: { type: Number, required: true },
+  name: { type: String, default: '' },
+  domain: { type: String, default: '' },
+  contactsCount: { type: Number, default: 0 },
+  description: { type: String, default: '' },
+  avatarUrl: { type: String, default: '' },
+  updatedAt: { type: [String, Number], default: null },
+});
+
+const emit = defineEmits(['showCompany']);
+
+const { t } = useI18n();
+
+const onClickViewDetails = () => emit('showCompany', props.id);
+
+const displayName = computed(() => props.name || t('COMPANIES.UNNAMED'));
+
+const avatarSource = computed(() => props.avatarUrl || null);
+
+const formattedUpdatedAt = computed(() => {
+  if (!props.updatedAt) return '';
+  return formatDistanceToNow(new Date(props.updatedAt), { addSuffix: true });
+});
+</script>
+
+<template>
+  <CardLayout layout="row" @click="onClickViewDetails">
+    <div class="flex items-center justify-start flex-1 gap-4">
+      <Avatar
+        :username="displayName"
+        :src="avatarSource"
+        class="shrink-0"
+        :name="name"
+        :size="48"
+        hide-offline-status
+        rounded-full
+      />
+      <div class="flex flex-col gap-0.5 flex-1 min-w-0">
+        <div class="flex flex-wrap items-center gap-x-4 gap-y-1 min-w-0">
+          <span class="text-base font-medium truncate text-n-slate-12">
+            {{ displayName }}
+          </span>
+          <span
+            v-if="domain && description"
+            class="inline-flex items-center gap-1.5 text-sm text-n-slate-11 truncate"
+          >
+            <Icon icon="i-lucide-globe" size="size-3.5 text-n-slate-11" />
+            <span class="truncate">{{ domain }}</span>
+          </span>
+        </div>
+        <div class="flex items-center justify-between">
+          <div class="flex flex-wrap items-center gap-x-3 gap-y-1 min-w-0">
+            <span
+              v-if="domain && !description"
+              class="inline-flex items-center gap-1.5 text-sm text-n-slate-11 truncate"
+            >
+              <Icon icon="i-lucide-globe" size="size-3.5 text-n-slate-11" />
+              <span class="truncate">{{ domain }}</span>
+            </span>
+            <span v-if="description" class="text-sm text-n-slate-11 truncate">
+              {{ description }}
+            </span>
+            <div
+              v-if="(description || domain) && contactsCount"
+              class="w-px h-3 bg-n-slate-6"
+            />
+            <span
+              v-if="contactsCount"
+              class="inline-flex items-center gap-1.5 text-sm text-n-slate-11 truncate"
+            >
+              <Icon icon="i-lucide-contact" size="size-3.5 text-n-slate-11" />
+              {{ t('COMPANIES.CONTACTS_COUNT', { n: contactsCount }) }}
+            </span>
+          </div>
+          <span
+            v-if="updatedAt"
+            class="inline-flex items-center gap-1.5 text-sm text-n-slate-11 flex-shrink-0"
+          >
+            {{ formattedUpdatedAt }}
+          </span>
+        </div>
+      </div>
+    </div>
+  </CardLayout>
+</template>
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesHeader/CompanyHeader.vue b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/CompanyHeader.vue
new file mode 100644
index 000000000..f0dc4255f
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/CompanyHeader.vue
@@ -0,0 +1,55 @@
+<script setup>
+import Input from 'dashboard/components-next/input/Input.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+import CompanySortMenu from './components/CompanySortMenu.vue';
+
+defineProps({
+  showSearch: { type: Boolean, default: true },
+  searchValue: { type: String, default: '' },
+  headerTitle: { type: String, required: true },
+  activeSort: { type: String, default: 'last_activity_at' },
+  activeOrdering: { type: String, default: '' },
+});
+
+const emit = defineEmits(['search', 'update:sort']);
+</script>
+
+<template>
+  <header class="sticky top-0 z-10">
+    <div
+      class="flex items-start sm:items-center justify-between w-full py-6 px-6 gap-2 mx-auto max-w-[60rem]"
+    >
+      <span class="text-xl font-medium truncate text-n-slate-12">
+        {{ headerTitle }}
+      </span>
+      <div class="flex items-center flex-row flex-shrink-0 gap-2">
+        <div class="flex items-center">
+          <CompanySortMenu
+            :active-sort="activeSort"
+            :active-ordering="activeOrdering"
+            @update:sort="emit('update:sort', $event)"
+          />
+        </div>
+        <div v-if="showSearch" class="flex items-center gap-2 w-full">
+          <Input
+            :model-value="searchValue"
+            type="search"
+            :placeholder="$t('CONTACTS_LAYOUT.HEADER.SEARCH_PLACEHOLDER')"
+            :custom-input-class="[
+              'h-8 [&:not(.focus)]:!border-transparent bg-n-alpha-2 dark:bg-n-solid-1 ltr:!pl-8 !py-1 rtl:!pr-8',
+            ]"
+            class="w-full"
+            @input="emit('search', $event.target.value)"
+          >
+            <template #prefix>
+              <Icon
+                icon="i-lucide-search"
+                class="absolute -translate-y-1/2 text-n-slate-11 size-4 top-1/2 ltr:left-2 rtl:right-2"
+              />
+            </template>
+          </Input>
+        </div>
+      </div>
+    </div>
+  </header>
+</template>
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanySortMenu.vue b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanySortMenu.vue
new file mode 100644
index 000000000..768123b9f
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanySortMenu.vue
@@ -0,0 +1,116 @@
+<script setup>
+import { ref, computed, toRef } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import Button from 'dashboard/components-next/button/Button.vue';
+import SelectMenu from 'dashboard/components-next/selectmenu/SelectMenu.vue';
+
+const props = defineProps({
+  activeSort: {
+    type: String,
+    default: 'name',
+  },
+  activeOrdering: {
+    type: String,
+    default: '',
+  },
+});
+
+const emit = defineEmits(['update:sort']);
+
+const { t } = useI18n();
+
+const isMenuOpen = ref(false);
+
+const sortMenus = [
+  {
+    label: t('COMPANIES.SORT_BY.OPTIONS.NAME'),
+    value: 'name',
+  },
+  {
+    label: t('COMPANIES.SORT_BY.OPTIONS.DOMAIN'),
+    value: 'domain',
+  },
+  {
+    label: t('COMPANIES.SORT_BY.OPTIONS.CREATED_AT'),
+    value: 'created_at',
+  },
+];
+
+const orderingMenus = [
+  {
+    label: t('COMPANIES.ORDER.OPTIONS.ASCENDING'),
+    value: '',
+  },
+  {
+    label: t('COMPANIES.ORDER.OPTIONS.DESCENDING'),
+    value: '-',
+  },
+];
+
+// Converted the props to refs for better reactivity
+const activeSort = toRef(props, 'activeSort');
+
+const activeOrdering = toRef(props, 'activeOrdering');
+
+const activeSortLabel = computed(() => {
+  const selectedMenu = sortMenus.find(menu => menu.value === activeSort.value);
+  return selectedMenu?.label || t('COMPANIES.SORT_BY.LABEL');
+});
+
+const activeOrderingLabel = computed(() => {
+  const selectedMenu = orderingMenus.find(
+    menu => menu.value === activeOrdering.value
+  );
+  return selectedMenu?.label || t('COMPANIES.ORDER.LABEL');
+});
+
+const handleSortChange = value => {
+  emit('update:sort', { sort: value, order: props.activeOrdering });
+};
+
+const handleOrderChange = value => {
+  emit('update:sort', { sort: props.activeSort, order: value });
+};
+</script>
+
+<template>
+  <div class="relative">
+    <Button
+      icon="i-lucide-arrow-down-up"
+      color="slate"
+      size="sm"
+      variant="ghost"
+      :class="isMenuOpen ? 'bg-n-alpha-2' : ''"
+      @click="isMenuOpen = !isMenuOpen"
+    />
+    <div
+      v-if="isMenuOpen"
+      v-on-clickaway="() => (isMenuOpen = false)"
+      class="absolute top-full mt-1 ltr:-right-32 rtl:-left-32 sm:ltr:right-0 sm:rtl:left-0 flex flex-col gap-4 bg-n-alpha-3 backdrop-blur-[100px] border border-n-weak w-72 rounded-xl p-4"
+    >
+      <div class="flex items-center justify-between gap-2">
+        <span class="text-sm text-n-slate-12">
+          {{ t('COMPANIES.SORT_BY.LABEL') }}
+        </span>
+        <SelectMenu
+          :model-value="activeSort"
+          :options="sortMenus"
+          :label="activeSortLabel"
+          @update:model-value="handleSortChange"
+        />
+      </div>
+      <div class="flex items-center justify-between gap-2">
+        <span class="text-sm text-n-slate-12">
+          {{ t('COMPANIES.ORDER.LABEL') }}
+        </span>
+        <SelectMenu
+          :model-value="activeOrdering"
+          :options="orderingMenus"
+          :label="activeOrderingLabel"
+          @update:model-value="handleOrderChange"
+        />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesListLayout.vue b/app/javascript/dashboard/components-next/Companies/CompaniesListLayout.vue
new file mode 100644
index 000000000..b69de343e
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesListLayout.vue
@@ -0,0 +1,51 @@
+<script setup>
+import CompanyHeader from './CompaniesHeader/CompanyHeader.vue';
+import PaginationFooter from 'dashboard/components-next/pagination/PaginationFooter.vue';
+
+defineProps({
+  searchValue: { type: String, default: '' },
+  headerTitle: { type: String, default: '' },
+  currentPage: { type: Number, default: 1 },
+  totalItems: { type: Number, default: 100 },
+  activeSort: { type: String, default: 'name' },
+  activeOrdering: { type: String, default: '' },
+  showPaginationFooter: { type: Boolean, default: true },
+});
+
+const emit = defineEmits(['update:currentPage', 'update:sort', 'search']);
+
+const updateCurrentPage = page => {
+  emit('update:currentPage', page);
+};
+</script>
+
+<template>
+  <section
+    class="flex w-full h-full gap-4 overflow-hidden justify-evenly bg-n-background"
+  >
+    <div class="flex flex-col w-full h-full transition-all duration-300">
+      <CompanyHeader
+        :search-value="searchValue"
+        :header-title="headerTitle"
+        :active-sort="activeSort"
+        :active-ordering="activeOrdering"
+        @search="emit('search', $event)"
+        @update:sort="emit('update:sort', $event)"
+      />
+      <main class="flex-1 overflow-y-auto">
+        <div class="w-full mx-auto max-w-[60rem]">
+          <slot name="default" />
+        </div>
+      </main>
+      <footer v-if="showPaginationFooter" class="sticky bottom-0 z-0 px-4 pb-4">
+        <PaginationFooter
+          current-page-info="COMPANIES_LAYOUT.PAGINATION_FOOTER.SHOWING"
+          :current-page="currentPage"
+          :total-items="totalItems"
+          :items-per-page="25"
+          @update:current-page="updateCurrentPage"
+        />
+      </footer>
+    </div>
+  </section>
+</template>
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactDeleteSection.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactDeleteSection.vue
index 47b779b61..041f06410 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactDeleteSection.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactDeleteSection.vue
@@ -5,6 +5,7 @@ import { useToggle } from '@vueuse/core';
 
 import Button from 'dashboard/components-next/button/Button.vue';
 import ConfirmContactDeleteDialog from 'dashboard/components-next/Contacts/ContactsForm/ConfirmContactDeleteDialog.vue';
+import Policy from 'dashboard/components/policy.vue';
 
 defineProps({
   selectedContact: {
@@ -24,42 +25,44 @@ const openConfirmDeleteContactDialog = () => {
 </script>
 
 <template>
-  <div class="flex flex-col items-start border-t border-n-strong px-6 py-5">
-    <Button
-      :label="t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT')"
-      sm
-      link
-      slate
-      class="hover:!no-underline text-n-slate-12"
-      icon="i-lucide-chevron-down"
-      trailing-icon
-      @click="toggleDeleteSection()"
-    />
+  <Policy :permissions="['administrator']">
+    <div class="flex flex-col items-start border-t border-n-strong px-6 py-5">
+      <Button
+        :label="t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT')"
+        sm
+        link
+        slate
+        class="hover:!no-underline text-n-slate-12"
+        icon="i-lucide-chevron-down"
+        trailing-icon
+        @click="toggleDeleteSection()"
+      />
 
-    <div
-      class="transition-all duration-300 ease-in-out grid w-full overflow-hidden"
-      :class="
-        showDeleteSection
-          ? 'grid-rows-[1fr] opacity-100 mt-2'
-          : 'grid-rows-[0fr] opacity-0 mt-0'
-      "
-    >
-      <div class="overflow-hidden min-h-0">
-        <span class="inline-flex text-n-slate-11 text-sm items-center gap-1">
-          {{ t('CONTACTS_LAYOUT.CARD.DELETE_CONTACT.MESSAGE') }}
-          <Button
-            :label="t('CONTACTS_LAYOUT.CARD.DELETE_CONTACT.BUTTON')"
-            sm
-            ruby
-            link
-            @click="openConfirmDeleteContactDialog()"
-          />
-        </span>
+      <div
+        class="transition-all duration-300 ease-in-out grid w-full overflow-hidden"
+        :class="
+          showDeleteSection
+            ? 'grid-rows-[1fr] opacity-100 mt-2'
+            : 'grid-rows-[0fr] opacity-0 mt-0'
+        "
+      >
+        <div class="overflow-hidden min-h-0">
+          <span class="inline-flex text-n-slate-11 text-sm items-center gap-1">
+            {{ t('CONTACTS_LAYOUT.CARD.DELETE_CONTACT.MESSAGE') }}
+            <Button
+              :label="t('CONTACTS_LAYOUT.CARD.DELETE_CONTACT.BUTTON')"
+              sm
+              ruby
+              link
+              @click="openConfirmDeleteContactDialog()"
+            />
+          </span>
+        </div>
       </div>
     </div>
-  </div>
-  <ConfirmContactDeleteDialog
-    ref="confirmDeleteContactDialogRef"
-    :selected-contact="selectedContact"
-  />
+    <ConfirmContactDeleteDialog
+      ref="confirmDeleteContactDialogRef"
+      :selected-contact="selectedContact"
+    />
+  </Policy>
 </template>
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
index 0e893b767..12bed151d 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
@@ -8,6 +8,7 @@ import Button from 'dashboard/components-next/button/Button.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
 import Flag from 'dashboard/components-next/flag/Flag.vue';
 import ContactDeleteSection from 'dashboard/components-next/Contacts/ContactsCard/ContactDeleteSection.vue';
+import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
 import countries from 'shared/constants/countries';
 
 const props = defineProps({
@@ -20,9 +21,17 @@ const props = defineProps({
   availabilityStatus: { type: String, default: null },
   isExpanded: { type: Boolean, default: false },
   isUpdating: { type: Boolean, default: false },
+  selectable: { type: Boolean, default: false },
+  isSelected: { type: Boolean, default: false },
 });
 
-const emit = defineEmits(['toggle', 'updateContact', 'showContact']);
+const emit = defineEmits([
+  'toggle',
+  'updateContact',
+  'showContact',
+  'select',
+  'avatarHover',
+]);
 
 const { t } = useI18n();
 
@@ -88,111 +97,148 @@ const onClickExpand = () => {
 };
 
 const onClickViewDetails = () => emit('showContact', props.id);
+
+const toggleSelect = checked => {
+  emit('select', checked);
+};
+
+const handleAvatarHover = isHovered => {
+  emit('avatarHover', isHovered);
+};
 </script>
 
 <template>
-  <CardLayout :key="id" layout="row">
-    <div class="flex items-center justify-start flex-1 gap-4">
-      <Avatar
-        :name="name"
-        :src="thumbnail"
-        :size="48"
-        :status="availabilityStatus"
-        hide-offline-status
-        rounded-full
-      />
-      <div class="flex flex-col gap-0.5 flex-1">
-        <div class="flex flex-wrap items-center gap-x-4 gap-y-1">
-          <span class="text-base font-medium truncate text-n-slate-12">
-            {{ name }}
-          </span>
-          <span class="inline-flex items-center gap-1">
-            <span
-              v-if="additionalAttributes?.companyName"
-              class="i-ph-building-light size-4 text-n-slate-10 mb-0.5"
-            />
-            <span
-              v-if="additionalAttributes?.companyName"
-              class="text-sm truncate text-n-slate-11"
-            >
-              {{ additionalAttributes.companyName }}
-            </span>
-          </span>
-        </div>
-        <div class="flex flex-wrap items-center justify-start gap-x-3 gap-y-1">
-          <div v-if="email" class="truncate max-w-72" :title="email">
-            <span class="text-sm text-n-slate-11">
-              {{ email }}
-            </span>
-          </div>
-          <div v-if="email" class="w-px h-3 truncate bg-n-slate-6" />
-          <span v-if="phoneNumber" class="text-sm truncate text-n-slate-11">
-            {{ phoneNumber }}
-          </span>
-          <div v-if="phoneNumber" class="w-px h-3 truncate bg-n-slate-6" />
-          <span
-            v-if="countryDetails"
-            class="inline-flex items-center gap-2 text-sm truncate text-n-slate-11"
+  <div class="relative">
+    <CardLayout
+      :key="id"
+      layout="row"
+      :class="{
+        'outline-n-weak !bg-n-slate-3 dark:!bg-n-solid-3': isSelected,
+      }"
+    >
+      <div class="flex items-center justify-start flex-1 gap-4">
+        <div
+          class="relative"
+          @mouseenter="handleAvatarHover(true)"
+          @mouseleave="handleAvatarHover(false)"
+        >
+          <Avatar
+            :name="name"
+            :src="thumbnail"
+            :size="48"
+            :status="availabilityStatus"
+            hide-offline-status
+            rounded-full
           >
-            <Flag :country="countryDetails.countryCode" class="size-3.5" />
-            {{ formattedLocation }}
-          </span>
-          <div v-if="countryDetails" class="w-px h-3 truncate bg-n-slate-6" />
-          <Button
-            :label="t('CONTACTS_LAYOUT.CARD.VIEW_DETAILS')"
-            variant="link"
-            size="xs"
-            @click="onClickViewDetails"
-          />
+            <template v-if="selectable" #overlay="{ size }">
+              <label
+                class="flex items-center justify-center rounded-full cursor-pointer absolute inset-0 z-10 backdrop-blur-[2px] border border-n-weak"
+                :style="{ width: `${size}px`, height: `${size}px` }"
+                @click.stop
+              >
+                <Checkbox
+                  :model-value="isSelected"
+                  @change="event => toggleSelect(event.target.checked)"
+                />
+              </label>
+            </template>
+          </Avatar>
         </div>
-      </div>
-    </div>
-
-    <Button
-      icon="i-lucide-chevron-down"
-      variant="ghost"
-      color="slate"
-      size="xs"
-      :class="{ 'rotate-180': isExpanded }"
-      @click="onClickExpand"
-    />
-
-    <template #after>
-      <div
-        class="transition-all duration-500 ease-in-out grid overflow-hidden"
-        :class="
-          isExpanded
-            ? 'grid-rows-[1fr] opacity-100'
-            : 'grid-rows-[0fr] opacity-0'
-        "
-      >
-        <div class="overflow-hidden">
-          <div class="flex flex-col gap-6 p-6 border-t border-n-strong">
-            <ContactsForm
-              ref="contactsFormRef"
-              :contact-data="contactData"
-              @update="handleFormUpdate"
-            />
-            <div>
-              <Button
-                :label="
-                  t('CONTACTS_LAYOUT.CARD.EDIT_DETAILS_FORM.UPDATE_BUTTON')
-                "
-                size="sm"
-                :is-loading="isUpdating"
-                :disabled="isUpdating || isFormInvalid"
-                @click="handleUpdateContact"
+        <div class="flex flex-col gap-0.5 flex-1">
+          <div class="flex flex-wrap items-center gap-x-4 gap-y-1">
+            <span class="text-base font-medium truncate text-n-slate-12">
+              {{ name }}
+            </span>
+            <span class="inline-flex items-center gap-1">
+              <span
+                v-if="additionalAttributes?.companyName"
+                class="i-ph-building-light size-4 text-n-slate-10 mb-0.5"
               />
+              <span
+                v-if="additionalAttributes?.companyName"
+                class="text-sm truncate text-n-slate-11"
+              >
+                {{ additionalAttributes.companyName }}
+              </span>
+            </span>
+          </div>
+          <div
+            class="flex flex-wrap items-center justify-start gap-x-3 gap-y-1"
+          >
+            <div v-if="email" class="truncate max-w-72" :title="email">
+              <span class="text-sm text-n-slate-11">
+                {{ email }}
+              </span>
             </div>
+            <div v-if="email" class="w-px h-3 truncate bg-n-slate-6" />
+            <span v-if="phoneNumber" class="text-sm truncate text-n-slate-11">
+              {{ phoneNumber }}
+            </span>
+            <div v-if="phoneNumber" class="w-px h-3 truncate bg-n-slate-6" />
+            <span
+              v-if="countryDetails"
+              class="inline-flex items-center gap-2 text-sm truncate text-n-slate-11"
+            >
+              <Flag :country="countryDetails.countryCode" class="size-3.5" />
+              {{ formattedLocation }}
+            </span>
+            <div v-if="countryDetails" class="w-px h-3 truncate bg-n-slate-6" />
+            <Button
+              :label="t('CONTACTS_LAYOUT.CARD.VIEW_DETAILS')"
+              variant="link"
+              size="xs"
+              @click="onClickViewDetails"
+            />
           </div>
-          <ContactDeleteSection
-            :selected-contact="{
-              id: props.id,
-              name: props.name,
-            }"
-          />
         </div>
       </div>
-    </template>
-  </CardLayout>
+
+      <Button
+        icon="i-lucide-chevron-down"
+        variant="ghost"
+        color="slate"
+        size="xs"
+        :class="{ 'rotate-180': isExpanded }"
+        @click="onClickExpand"
+      />
+
+      <template #after>
+        <div
+          class="transition-all duration-500 ease-in-out grid overflow-hidden"
+          :class="
+            isExpanded
+              ? 'grid-rows-[1fr] opacity-100'
+              : 'grid-rows-[0fr] opacity-0'
+          "
+        >
+          <div class="overflow-hidden">
+            <div class="flex flex-col gap-6 p-6 border-t border-n-strong">
+              <ContactsForm
+                ref="contactsFormRef"
+                :contact-data="contactData"
+                @update="handleFormUpdate"
+              />
+              <div>
+                <Button
+                  :label="
+                    t('CONTACTS_LAYOUT.CARD.EDIT_DETAILS_FORM.UPDATE_BUTTON')
+                  "
+                  size="sm"
+                  :is-loading="isUpdating"
+                  :disabled="isUpdating || isFormInvalid"
+                  @click="handleUpdateContact"
+                />
+              </div>
+            </div>
+            <ContactDeleteSection
+              :selected-contact="{
+                id: props.id,
+                name: props.name,
+              }"
+            />
+          </div>
+        </div>
+      </template>
+    </CardLayout>
+  </div>
 </template>
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue b/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
index 4c7b9249e..fd755022d 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
@@ -102,6 +102,7 @@ const closeMobileSidebar = () => {
               />
               <VoiceCallButton
                 :phone="selectedContact?.phoneNumber"
+                :contact-id="contactId"
                 :label="$t('CONTACT_PANEL.CALL')"
                 size="sm"
               />
diff --git a/app/javascript/dashboard/components-next/Contacts/Pages/ContactDetails.vue b/app/javascript/dashboard/components-next/Contacts/Pages/ContactDetails.vue
index aec21a976..b7014c42f 100644
--- a/app/javascript/dashboard/components-next/Contacts/Pages/ContactDetails.vue
+++ b/app/javascript/dashboard/components-next/Contacts/Pages/ContactDetails.vue
@@ -10,6 +10,7 @@ import Button from 'dashboard/components-next/button/Button.vue';
 import ContactLabels from 'dashboard/components-next/Contacts/ContactLabels/ContactLabels.vue';
 import ContactsForm from 'dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue';
 import ConfirmContactDeleteDialog from 'dashboard/components-next/Contacts/ContactsForm/ConfirmContactDeleteDialog.vue';
+import Policy from 'dashboard/components/policy.vue';
 
 const props = defineProps({
   selectedContact: {
@@ -174,27 +175,29 @@ const handleAvatarDelete = async () => {
         @click="updateContact"
       />
     </div>
-    <div
-      class="flex flex-col items-start w-full gap-4 pt-6 border-t border-n-strong"
-    >
-      <div class="flex flex-col gap-2">
-        <h6 class="text-base font-medium text-n-slate-12">
-          {{ t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT') }}
-        </h6>
-        <span class="text-sm text-n-slate-11">
-          {{ t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT_DESCRIPTION') }}
-        </span>
+    <Policy :permissions="['administrator']">
+      <div
+        class="flex flex-col items-start w-full gap-4 pt-6 border-t border-n-strong"
+      >
+        <div class="flex flex-col gap-2">
+          <h6 class="text-base font-medium text-n-slate-12">
+            {{ t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT') }}
+          </h6>
+          <span class="text-sm text-n-slate-11">
+            {{ t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT_DESCRIPTION') }}
+          </span>
+        </div>
+        <Button
+          :label="t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT')"
+          color="ruby"
+          @click="openConfirmDeleteContactDialog"
+        />
       </div>
-      <Button
-        :label="t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT')"
-        color="ruby"
-        @click="openConfirmDeleteContactDialog"
+      <ConfirmContactDeleteDialog
+        ref="confirmDeleteContactDialogRef"
+        :selected-contact="selectedContact"
+        @go-to-contacts-list="emit('goToContactsList')"
       />
-    </div>
-    <ConfirmContactDeleteDialog
-      ref="confirmDeleteContactDialogRef"
-      :selected-contact="selectedContact"
-      @go-to-contacts-list="emit('goToContactsList')"
-    />
+    </Policy>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue b/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue
index 7acc2ff55..72bc2c7dd 100644
--- a/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue
+++ b/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue
@@ -10,7 +10,15 @@ import {
 } from 'shared/helpers/CustomErrors';
 import ContactsCard from 'dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue';
 
-defineProps({ contacts: { type: Array, required: true } });
+const props = defineProps({
+  contacts: { type: Array, required: true },
+  selectedContactIds: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const emit = defineEmits(['toggleContact']);
 
 const { t } = useI18n();
 const store = useStore();
@@ -20,6 +28,9 @@ const route = useRoute();
 const uiFlags = useMapGetter('contacts/getUIFlags');
 const isUpdating = computed(() => uiFlags.value.isUpdating);
 const expandedCardId = ref(null);
+const hoveredAvatarId = ref(null);
+
+const selectedIdsSet = computed(() => new Set(props.selectedContactIds || []));
 
 const updateContact = async updatedData => {
   try {
@@ -58,25 +69,43 @@ const onClickViewDetails = async id => {
 const toggleExpanded = id => {
   expandedCardId.value = expandedCardId.value === id ? null : id;
 };
+
+const isSelected = id => selectedIdsSet.value.has(id);
+
+const shouldShowSelection = id => {
+  return hoveredAvatarId.value === id || isSelected(id);
+};
+
+const handleSelect = (id, value) => {
+  emit('toggleContact', { id, value });
+};
+
+const handleAvatarHover = (id, isHovered) => {
+  hoveredAvatarId.value = isHovered ? id : null;
+};
 </script>
 
 <template>
-  <div class="flex flex-col gap-4 px-6 pt-4 pb-6">
-    <ContactsCard
-      v-for="contact in contacts"
-      :id="contact.id"
-      :key="contact.id"
-      :name="contact.name"
-      :email="contact.email"
-      :thumbnail="contact.thumbnail"
-      :phone-number="contact.phoneNumber"
-      :additional-attributes="contact.additionalAttributes"
-      :availability-status="contact.availabilityStatus"
-      :is-expanded="expandedCardId === contact.id"
-      :is-updating="isUpdating"
-      @toggle="toggleExpanded(contact.id)"
-      @update-contact="updateContact"
-      @show-contact="onClickViewDetails"
-    />
+  <div class="flex flex-col gap-4">
+    <div v-for="contact in contacts" :key="contact.id" class="relative">
+      <ContactsCard
+        :id="contact.id"
+        :name="contact.name"
+        :email="contact.email"
+        :thumbnail="contact.thumbnail"
+        :phone-number="contact.phoneNumber"
+        :additional-attributes="contact.additionalAttributes"
+        :availability-status="contact.availabilityStatus"
+        :is-expanded="expandedCardId === contact.id"
+        :is-updating="isUpdating"
+        :selectable="shouldShowSelection(contact.id)"
+        :is-selected="isSelected(contact.id)"
+        @toggle="toggleExpanded(contact.id)"
+        @update-contact="updateContact"
+        @show-contact="onClickViewDetails"
+        @select="value => handleSelect(contact.id, value)"
+        @avatar-hover="value => handleAvatarHover(contact.id, value)"
+      />
+    </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue b/app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue
index 98e56ff8f..85738d9de 100644
--- a/app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue
+++ b/app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue
@@ -1,15 +1,18 @@
 <script setup>
 import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useMapGetter } from 'dashboard/composables/store';
+import { useRoute, useRouter } from 'vue-router';
+import { useMapGetter, useStore } from 'dashboard/composables/store';
 import { INBOX_TYPES } from 'dashboard/helper/inbox';
 import { useAlert } from 'dashboard/composables';
+import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
 
 import Button from 'dashboard/components-next/button/Button.vue';
 import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
 
 const props = defineProps({
   phone: { type: String, default: '' },
+  contactId: { type: [String, Number], required: true },
   label: { type: String, default: '' },
   icon: { type: [String, Object, Function], default: '' },
   size: { type: String, default: 'sm' },
@@ -18,10 +21,17 @@ const props = defineProps({
 
 defineOptions({ inheritAttrs: false });
 const attrs = useAttrs();
+const route = useRoute();
+const router = useRouter();
+const store = useStore();
 
 const { t } = useI18n();
 
+const dialogRef = ref(null);
+
 const inboxesList = useMapGetter('inboxes/getInboxes');
+const contactsUiFlags = useMapGetter('contacts/getUIFlags');
+
 const voiceInboxes = computed(() =>
   (inboxesList.value || []).filter(
     inbox => inbox.channel_type === INBOX_TYPES.VOICE
@@ -32,20 +42,51 @@ const hasVoiceInboxes = computed(() => voiceInboxes.value.length > 0);
 // Unified behavior: hide when no phone
 const shouldRender = computed(() => hasVoiceInboxes.value && !!props.phone);
 
-const dialogRef = ref(null);
+const isInitiatingCall = computed(() => {
+  return contactsUiFlags.value?.isInitiatingCall || false;
+});
 
-const onClick = () => {
+const navigateToConversation = conversationId => {
+  const accountId = route.params.accountId;
+  if (conversationId && accountId) {
+    const path = frontendURL(
+      conversationUrl({
+        accountId,
+        id: conversationId,
+      })
+    );
+    router.push({ path });
+  }
+};
+
+const startCall = async inboxId => {
+  if (isInitiatingCall.value) return;
+
+  try {
+    const response = await store.dispatch('contacts/initiateCall', {
+      contactId: props.contactId,
+      inboxId,
+    });
+    useAlert(t('CONTACT_PANEL.CALL_INITIATED'));
+    navigateToConversation(response?.conversation_id);
+  } catch (error) {
+    const apiError = error?.message;
+    useAlert(apiError || t('CONTACT_PANEL.CALL_FAILED'));
+  }
+};
+
+const onClick = async () => {
   if (voiceInboxes.value.length > 1) {
     dialogRef.value?.open();
     return;
   }
-  useAlert(t('CONTACT_PANEL.CALL_UNDER_DEVELOPMENT'));
+  const [inbox] = voiceInboxes.value;
+  await startCall(inbox.id);
 };
 
-const onPickInbox = () => {
-  // Placeholder until actual call wiring happens
-  useAlert(t('CONTACT_PANEL.CALL_UNDER_DEVELOPMENT'));
+const onPickInbox = async inbox => {
   dialogRef.value?.close();
+  await startCall(inbox.id);
 };
 </script>
 
@@ -55,6 +96,8 @@ const onPickInbox = () => {
       v-if="shouldRender"
       v-tooltip.top-end="tooltipLabel || null"
       v-bind="attrs"
+      :disabled="isInitiatingCall"
+      :is-loading="isInitiatingCall"
       :label="label"
       :icon="icon"
       :size="size"
diff --git a/app/javascript/dashboard/components-next/Conversation/SidepanelSwitch.vue b/app/javascript/dashboard/components-next/Conversation/SidepanelSwitch.vue
index 1ee969275..5e96df3c6 100644
--- a/app/javascript/dashboard/components-next/Conversation/SidepanelSwitch.vue
+++ b/app/javascript/dashboard/components-next/Conversation/SidepanelSwitch.vue
@@ -1,5 +1,6 @@
 <script setup>
 import Button from 'dashboard/components-next/button/Button.vue';
+import ButtonGroup from 'dashboard/components-next/buttonGroup/ButtonGroup.vue';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import { computed } from 'vue';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
@@ -55,17 +56,17 @@ useKeyboardEvents(keyboardEvents);
 </script>
 
 <template>
-  <div
-    class="flex flex-col justify-center items-center absolute top-36 xl:top-24 ltr:right-2 rtl:left-2 bg-n-solid-2 border border-n-weak rounded-full gap-2 p-1"
+  <ButtonGroup
+    class="flex flex-col justify-center items-center absolute top-36 xl:top-24 ltr:right-2 rtl:left-2 bg-n-solid-2/90 backdrop-blur-lg border border-n-weak/50 rounded-full gap-1.5 p-1.5 shadow-sm transition-shadow duration-200 hover:shadow"
   >
     <Button
       v-tooltip.top="$t('CONVERSATION.SIDEBAR.CONTACT')"
       ghost
       slate
       sm
-      class="!rounded-full"
+      class="!rounded-full transition-all duration-[250ms] ease-out active:!scale-95 active:!brightness-105 active:duration-75"
       :class="{
-        'bg-n-alpha-2': isContactSidebarOpen,
+        'bg-n-alpha-2 active:shadow-sm': isContactSidebarOpen,
       }"
       icon="i-ph-user-bold"
       @click="handleConversationSidebarToggle"
@@ -75,13 +76,14 @@ useKeyboardEvents(keyboardEvents);
       v-tooltip.bottom="$t('CONVERSATION.SIDEBAR.COPILOT')"
       ghost
       slate
-      class="!rounded-full"
-      :class="{
-        'bg-n-alpha-2 !text-n-iris-9': isCopilotPanelOpen,
-      }"
       sm
+      class="!rounded-full transition-all duration-[250ms] ease-out active:!scale-95 active:duration-75"
+      :class="{
+        'bg-n-alpha-2 !text-n-iris-9 active:!brightness-105 active:shadow-sm':
+          isCopilotPanelOpen,
+      }"
       icon="i-woot-captain"
       @click="handleCopilotSidebarToggle"
     />
-  </div>
+  </ButtonGroup>
 </template>
diff --git a/app/javascript/dashboard/components-next/Editor/Editor.vue b/app/javascript/dashboard/components-next/Editor/Editor.vue
index a2f139bdc..67936fa59 100644
--- a/app/javascript/dashboard/components-next/Editor/Editor.vue
+++ b/app/javascript/dashboard/components-next/Editor/Editor.vue
@@ -21,6 +21,10 @@ const props = defineProps({
   enableCannedResponses: { type: Boolean, default: true },
   enabledMenuOptions: { type: Array, default: () => [] },
   enableCaptainTools: { type: Boolean, default: false },
+  signature: { type: String, default: '' },
+  allowSignature: { type: Boolean, default: false },
+  sendWithSignature: { type: Boolean, default: false },
+  channelType: { type: String, default: '' },
 });
 
 const emit = defineEmits(['update:modelValue']);
@@ -100,6 +104,10 @@ watch(
         :enable-canned-responses="enableCannedResponses"
         :enabled-menu-options="enabledMenuOptions"
         :enable-captain-tools="enableCaptainTools"
+        :signature="signature"
+        :allow-signature="allowSignature"
+        :send-with-signature="sendWithSignature"
+        :channel-type="channelType"
         @input="handleInput"
         @focus="handleFocus"
         @blur="handleBlur"
diff --git a/app/javascript/dashboard/components-next/EmptyStateLayout.vue b/app/javascript/dashboard/components-next/EmptyStateLayout.vue
index f2744dde5..39eda2d85 100644
--- a/app/javascript/dashboard/components-next/EmptyStateLayout.vue
+++ b/app/javascript/dashboard/components-next/EmptyStateLayout.vue
@@ -14,6 +14,10 @@ defineProps({
     type: Array,
     default: () => [],
   },
+  showBackdrop: {
+    type: Boolean,
+    default: true,
+  },
 });
 </script>
 
@@ -25,14 +29,24 @@ defineProps({
       class="relative w-full max-w-[60rem] mx-auto overflow-hidden h-full max-h-[28rem]"
     >
       <div
+        v-if="showBackdrop"
         class="w-full h-full space-y-4 overflow-y-hidden opacity-50 pointer-events-none"
       >
         <slot name="empty-state-item" />
       </div>
       <div
-        class="absolute inset-x-0 bottom-0 flex flex-col items-center justify-end w-full h-full pb-20 bg-gradient-to-t from-n-background from-25% dark:from-n-background to-transparent"
+        class="flex flex-col items-center justify-end w-full h-full pb-20"
+        :class="{
+          'absolute inset-x-0 bottom-0 bg-gradient-to-t from-n-background from-25% dark:from-n-background to-transparent':
+            showBackdrop,
+        }"
       >
-        <div class="flex flex-col items-center justify-center gap-6">
+        <div
+          class="flex flex-col items-center justify-center gap-6"
+          :class="{
+            'mt-48': !showBackdrop,
+          }"
+        >
           <div class="flex flex-col items-center justify-center gap-3">
             <h2
               class="text-3xl font-medium text-center text-n-slate-12 font-interDisplay"
@@ -40,6 +54,7 @@ defineProps({
               {{ title }}
             </h2>
             <p
+              v-if="subtitle"
               class="max-w-xl text-base text-center text-n-slate-11 font-interDisplay tracking-[0.3px]"
             >
               {{ subtitle }}
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorHeader.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorHeader.vue
index 2d8b219f7..bec54593f 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorHeader.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorHeader.vue
@@ -14,6 +14,7 @@ import {
 } from 'dashboard/helper/portalHelper';
 import wootConstants from 'dashboard/constants/globals';
 
+import ButtonGroup from 'dashboard/components-next/buttonGroup/ButtonGroup.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
 
@@ -140,11 +141,12 @@ const updateArticleStatus = async ({ value }) => {
           :disabled="!articleId"
           @click="previewArticle"
         />
-        <div class="flex items-center">
+        <ButtonGroup class="flex items-center">
           <Button
             :label="t('HELP_CENTER.EDIT_ARTICLE_PAGE.HEADER.PUBLISH')"
             size="sm"
             class="ltr:rounded-r-none rtl:rounded-l-none"
+            no-animation
             :is-loading="isArticlePublishing"
             :disabled="
               status === ARTICLE_STATUSES.PUBLISHED ||
@@ -159,6 +161,7 @@ const updateArticleStatus = async ({ value }) => {
                 icon="i-lucide-chevron-down"
                 size="sm"
                 :disabled="!articleId"
+                no-animation
                 class="ltr:rounded-l-none rtl:rounded-r-none"
                 @click.stop="showArticleActionMenu = !showArticleActionMenu"
               />
@@ -170,7 +173,7 @@ const updateArticleStatus = async ({ value }) => {
               />
             </OnClickOutside>
           </div>
-        </div>
+        </ButtonGroup>
       </div>
     </div>
   </div>
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
index 773ebe315..92c5850de 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
@@ -92,7 +92,6 @@ const setSignature = () => {
 
 const toggleMessageSignature = () => {
   setSignatureFlagForInbox(props.channelType, !sendWithSignature.value);
-  setSignature();
 };
 
 // Added this watch to dynamically set signature on target inbox change.
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue b/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
index 4d6d41dac..a02d6d495 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
@@ -199,16 +199,20 @@ const handleInboxAction = ({ value, action, ...rest }) => {
   state.attachedFiles = [];
 };
 
-const removeTargetInbox = value => {
-  v$.value.$reset();
-  // Remove the signature from message content
-  // Based on the Advance Editor (used in isEmailOrWebWidget) and Plain editor(all other inboxes except WhatsApp)
-  if (props.sendWithSignature) {
-    const signatureToRemove = inboxTypes.value.isEmailOrWebWidget
-      ? props.messageSignature
-      : extractTextFromMarkdown(props.messageSignature);
+const removeSignatureFromMessage = () => {
+  // Always remove the signature from message content when inbox/contact is removed
+  // to ensure no leftover signature content remains
+  const signatureToRemove = inboxTypes.value.isEmailOrWebWidget
+    ? props.messageSignature
+    : extractTextFromMarkdown(props.messageSignature);
+  if (signatureToRemove) {
     state.message = removeSignature(state.message, signatureToRemove);
   }
+};
+
+const removeTargetInbox = value => {
+  v$.value.$reset();
+  removeSignatureFromMessage();
   emit('updateTargetInbox', value);
   state.attachedFiles = [];
 };
@@ -216,6 +220,7 @@ const removeTargetInbox = value => {
 const clearSelectedContact = () => {
   emit('clearSelectedContact');
   state.attachedFiles = [];
+  removeSignatureFromMessage();
 };
 
 const onClickInsertEmoji = emoji => {
@@ -354,6 +359,7 @@ const shouldShowMessageEditor = computed(() => {
       :is-email-or-web-widget-inbox="inboxTypes.isEmailOrWebWidget"
       :has-errors="validationStates.isMessageInvalid"
       :has-attachments="state.attachedFiles.length > 0"
+      :channel-type="inboxChannelType"
     />
 
     <AttachmentPreviews
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/MessageEditor.vue b/app/javascript/dashboard/components-next/NewConversation/components/MessageEditor.vue
index 01b2e4a8d..aa5a85f48 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/MessageEditor.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/MessageEditor.vue
@@ -17,6 +17,7 @@ const props = defineProps({
   hasAttachments: { type: Boolean, default: false },
   sendWithSignature: { type: Boolean, default: false },
   messageSignature: { type: String, default: '' },
+  channelType: { type: String, default: '' },
 });
 
 const { t } = useI18n();
@@ -90,6 +91,10 @@ const replaceText = async message => {
         "
         enable-variables
         :show-character-count="false"
+        :signature="messageSignature"
+        allow-signature
+        :send-with-signature="sendWithSignature"
+        :channel-type="channelType"
       />
     </template>
     <template v-else>
diff --git a/app/javascript/dashboard/components-next/button/Button.vue b/app/javascript/dashboard/components-next/button/Button.vue
index dde1d3d9a..1dfe488e9 100644
--- a/app/javascript/dashboard/components-next/button/Button.vue
+++ b/app/javascript/dashboard/components-next/button/Button.vue
@@ -36,6 +36,7 @@ const props = defineProps({
   icon: { type: [String, Object, Function], default: '' },
   trailingIcon: { type: Boolean, default: false },
   isLoading: { type: Boolean, default: false },
+  noAnimation: { type: Boolean, default: false },
 });
 
 const slots = useSlots();
@@ -179,12 +180,18 @@ const STYLE_CONFIG = {
     md: 'text-sm font-medium',
     lg: 'text-base',
   },
+  clickAnimation: {
+    xs: 'active:enabled:scale-[0.97]',
+    sm: 'active:enabled:scale-[0.97]',
+    md: 'active:enabled:scale-[0.98]',
+    lg: 'active:enabled:scale-[0.98]',
+  },
   justify: {
     start: 'justify-start',
     center: 'justify-center',
     end: 'justify-end',
   },
-  base: 'inline-flex items-center min-w-0 gap-2 transition-all duration-200 ease-in-out border-0 rounded-lg outline-1 outline disabled:opacity-50',
+  base: 'inline-flex items-center min-w-0 gap-2 transition-all duration-100 ease-out border-0 rounded-lg outline-1 outline disabled:opacity-50',
 };
 
 const variantClasses = computed(() => {
@@ -221,6 +228,12 @@ const linkButtonClasses = computed(() => {
 
   return classes.join(' ');
 });
+
+const animationClasses = computed(() => {
+  return props.noAnimation
+    ? ''
+    : STYLE_CONFIG.clickAnimation[computedSize.value];
+});
 </script>
 
 <template>
@@ -230,6 +243,7 @@ const linkButtonClasses = computed(() => {
       [STYLE_CONFIG.base]: true,
       [isLink ? linkButtonClasses : buttonClasses]: true,
       [STYLE_CONFIG.fontSize[computedSize]]: true,
+      [animationClasses]: true,
       [STYLE_CONFIG.justify[computedJustify]]: true,
       'flex-row-reverse': trailingIcon && !isIconOnly,
     }"
diff --git a/app/javascript/dashboard/components-next/buttonGroup/ButtonGroup.vue b/app/javascript/dashboard/components-next/buttonGroup/ButtonGroup.vue
new file mode 100644
index 000000000..71bb64632
--- /dev/null
+++ b/app/javascript/dashboard/components-next/buttonGroup/ButtonGroup.vue
@@ -0,0 +1,20 @@
+<script setup>
+defineProps({
+  noAnimation: {
+    type: Boolean,
+    default: false,
+  },
+});
+</script>
+
+<template>
+  <div
+    :class="
+      noAnimation
+        ? ''
+        : 'has-[button:not(:disabled):active]:scale-[0.98] transition-transform duration-150 ease-out'
+    "
+  >
+    <slot />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/captain/PageLayout.vue b/app/javascript/dashboard/components-next/captain/PageLayout.vue
index 495db1838..d9fce9e0f 100644
--- a/app/javascript/dashboard/components-next/captain/PageLayout.vue
+++ b/app/javascript/dashboard/components-next/captain/PageLayout.vue
@@ -1,11 +1,17 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
+import { OnClickOutside } from '@vueuse/components';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useMapGetter } from 'dashboard/composables/store.js';
 import { usePolicy } from 'dashboard/composables/usePolicy';
 import Button from 'dashboard/components-next/button/Button.vue';
 import BackButton from 'dashboard/components/widgets/BackButton.vue';
 import PaginationFooter from 'dashboard/components-next/pagination/PaginationFooter.vue';
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 import Policy from 'dashboard/components/policy.vue';
+import AssistantSwitcher from 'dashboard/components-next/captain/pageComponents/switcher/AssistantSwitcher.vue';
+import CreateAssistantDialog from 'dashboard/components-next/captain/pageComponents/assistant/CreateAssistantDialog.vue';
 
 const props = defineProps({
   currentPage: {
@@ -56,11 +62,36 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  showAssistantSwitcher: {
+    type: Boolean,
+    default: true,
+  },
 });
 
 const emit = defineEmits(['click', 'close', 'update:currentPage']);
+
+const { t } = useI18n();
+
+const route = useRoute();
 const { shouldShowPaywall } = usePolicy();
 
+const showAssistantSwitcherDropdown = ref(false);
+const createAssistantDialogRef = ref(null);
+
+const assistants = useMapGetter('captainAssistants/getRecords');
+const uiFlags = useMapGetter('captainAssistants/getUIFlags');
+
+const currentAssistantId = computed(() => route.params.assistantId);
+const isFetchingAssistants = computed(() => uiFlags.value?.fetchingList);
+
+const activeAssistantName = computed(() => {
+  return (
+    assistants.value?.find(
+      assistant => assistant.id === Number(currentAssistantId.value)
+    )?.name || t('CAPTAIN.ASSISTANT_SWITCHER.NEW_ASSISTANT')
+  );
+});
+
 const showPaywall = computed(() => {
   return shouldShowPaywall(props.featureFlag);
 });
@@ -72,6 +103,15 @@ const handleButtonClick = () => {
 const handlePageChange = event => {
   emit('update:currentPage', event);
 };
+
+const toggleAssistantSwitcher = () => {
+  showAssistantSwitcherDropdown.value = !showAssistantSwitcherDropdown.value;
+};
+
+const handleCreateAssistant = () => {
+  showAssistantSwitcherDropdown.value = false;
+  createAssistantDialogRef.value.dialogRef.open();
+};
 </script>
 
 <template>
@@ -81,39 +121,86 @@ const handlePageChange = event => {
         <div
           class="flex items-start lg:items-center justify-between w-full py-6 lg:py-0 lg:h-20 gap-4 lg:gap-2 flex-col lg:flex-row"
         >
-          <div class="flex gap-4 items-center">
-            <BackButton v-if="backUrl" :to="backUrl" />
-            <slot name="headerTitle">
-              <span class="text-xl font-medium text-n-slate-12">
-                {{ headerTitle }}
-              </span>
-            </slot>
+          <div class="flex gap-3 items-center">
+            <BackButton v-if="backUrl" :back-url="backUrl" />
             <div
-              v-if="!isEmpty && showKnowMore"
+              v-if="showAssistantSwitcher && !showPaywall"
               class="flex items-center gap-2"
             >
-              <div class="w-0.5 h-4 rounded-2xl bg-n-weak" />
-              <slot name="knowMore" />
+              <div class="flex items-center gap-2">
+                <span
+                  v-if="!isFetchingAssistants"
+                  class="text-xl font-medium truncate text-n-slate-12"
+                >
+                  {{ activeAssistantName }}
+                </span>
+                <div class="relative group">
+                  <OnClickOutside
+                    @trigger="showAssistantSwitcherDropdown = false"
+                  >
+                    <Button
+                      icon="i-lucide-chevron-down"
+                      variant="ghost"
+                      color="slate"
+                      size="xs"
+                      :disabled="isFetchingAssistants"
+                      :is-loading="isFetchingAssistants"
+                      class="rounded-md group-hover:bg-n-slate-3 hover:bg-n-slate-3 [&>span]:size-4"
+                      @click="toggleAssistantSwitcher"
+                    />
+
+                    <AssistantSwitcher
+                      v-if="showAssistantSwitcherDropdown"
+                      class="absolute ltr:left-0 rtl:right-0 top-9"
+                      @close="showAssistantSwitcherDropdown = false"
+                      @create-assistant="handleCreateAssistant"
+                    />
+                  </OnClickOutside>
+                </div>
+              </div>
+            </div>
+            <div class="flex items-center gap-4">
+              <div
+                v-if="showAssistantSwitcher && !showPaywall && headerTitle"
+                class="w-0.5 h-4 rounded-2xl bg-n-weak"
+              />
+              <span
+                v-if="headerTitle"
+                class="text-xl font-medium text-n-slate-12"
+              >
+                {{ headerTitle }}
+              </span>
+              <div
+                v-if="!isEmpty && showKnowMore"
+                class="flex items-center gap-2"
+              >
+                <div class="w-0.5 h-4 rounded-2xl bg-n-weak" />
+                <slot name="knowMore" />
+              </div>
             </div>
           </div>
 
-          <div
-            v-if="!showPaywall && buttonLabel"
-            v-on-clickaway="() => emit('close')"
-            class="relative group/campaign-button"
-          >
-            <Policy :permissions="buttonPolicy">
-              <Button
-                :label="buttonLabel"
-                icon="i-lucide-plus"
-                size="sm"
-                class="group-hover/campaign-button:brightness-110"
-                @click="handleButtonClick"
-              />
-            </Policy>
-            <slot name="action" />
+          <div class="flex gap-2">
+            <slot name="search" />
+            <div
+              v-if="!showPaywall && buttonLabel"
+              v-on-clickaway="() => emit('close')"
+              class="relative group/captain-button"
+            >
+              <Policy :permissions="buttonPolicy">
+                <Button
+                  :label="buttonLabel"
+                  icon="i-lucide-plus"
+                  size="sm"
+                  class="group-hover/captain-button:brightness-110"
+                  @click="handleButtonClick"
+                />
+              </Policy>
+              <slot name="action" />
+            </div>
           </div>
         </div>
+        <slot name="subHeader" />
       </div>
     </header>
     <main class="flex-1 px-6 overflow-y-auto">
@@ -143,5 +230,6 @@ const handlePageChange = event => {
         @update:current-page="handlePageChange"
       />
     </footer>
+    <CreateAssistantDialog ref="createAssistantDialogRef" type="create" />
   </section>
 </template>
diff --git a/app/javascript/dashboard/components-next/captain/SettingsPageLayout.vue b/app/javascript/dashboard/components-next/captain/SettingsPageLayout.vue
deleted file mode 100644
index 7a2232305..000000000
--- a/app/javascript/dashboard/components-next/captain/SettingsPageLayout.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<script setup>
-import { useRouter } from 'vue-router';
-import PaginationFooter from 'dashboard/components-next/pagination/PaginationFooter.vue';
-import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
-import Breadcrumb from 'dashboard/components-next/breadcrumb/Breadcrumb.vue';
-
-defineProps({
-  isFetching: {
-    type: Boolean,
-    default: false,
-  },
-  isEmpty: {
-    type: Boolean,
-    default: false,
-  },
-  currentPage: {
-    type: Number,
-    default: 1,
-  },
-  totalCount: {
-    type: Number,
-    default: 100,
-  },
-  itemsPerPage: {
-    type: Number,
-    default: 25,
-  },
-  showPaginationFooter: {
-    type: Boolean,
-    default: false,
-  },
-  breadcrumbItems: {
-    type: Array,
-    default: () => [],
-  },
-});
-
-const emit = defineEmits(['update:currentPage']);
-
-const router = useRouter();
-
-const handlePageChange = event => {
-  emit('update:currentPage', event);
-};
-
-const handleBreadcrumbClick = item => {
-  router.push({
-    name: item.routeName,
-  });
-};
-</script>
-
-<template>
-  <section
-    class="px-6 flex flex-col w-full h-screen overflow-y-auto bg-n-background"
-  >
-    <div class="max-w-[60rem] mx-auto flex flex-col w-full h-full mb-4">
-      <header class="mb-7 sticky top-0 bg-n-background pt-4 z-20">
-        <Breadcrumb :items="breadcrumbItems" @click="handleBreadcrumbClick" />
-      </header>
-      <main class="flex gap-16 w-full flex-1 pb-16">
-        <section
-          v-if="$slots.body || $slots.emptyState || isFetching"
-          class="flex flex-col w-full"
-        >
-          <div
-            v-if="isFetching"
-            class="flex items-center justify-center py-10 text-n-slate-11"
-          >
-            <Spinner />
-          </div>
-          <div v-else-if="isEmpty">
-            <slot name="emptyState" />
-          </div>
-          <slot v-else name="body" />
-        </section>
-        <section v-if="$slots.controls" class="flex w-full">
-          <slot name="controls" />
-        </section>
-      </main>
-      <footer v-if="showPaginationFooter" class="sticky bottom-0 z-10 pb-4">
-        <PaginationFooter
-          :current-page="currentPage"
-          :total-items="totalCount"
-          :items-per-page="itemsPerPage"
-          @update:current-page="handlePageChange"
-        />
-      </footer>
-    </div>
-  </section>
-</template>
diff --git a/app/javascript/dashboard/components-next/captain/assistant/AssistantCard.vue b/app/javascript/dashboard/components-next/captain/assistant/AssistantCard.vue
index 222baaecd..7e80cd32c 100644
--- a/app/javascript/dashboard/components-next/captain/assistant/AssistantCard.vue
+++ b/app/javascript/dashboard/components-next/captain/assistant/AssistantCard.vue
@@ -76,12 +76,11 @@ const handleAction = ({ action, value }) => {
 <template>
   <CardLayout>
     <div class="flex justify-between w-full gap-1">
-      <router-link
-        :to="{ name: 'captain_assistants_edit', params: { assistantId: id } }"
-        class="text-base text-n-slate-12 line-clamp-1 hover:underline transition-colors"
+      <h6
+        class="text-base font-normal text-n-slate-12 line-clamp-1 hover:underline transition-colors"
       >
         {{ name }}
-      </router-link>
+      </h6>
       <div class="flex items-center gap-2">
         <div
           v-on-clickaway="() => toggleDropdown(false)"
diff --git a/app/javascript/dashboard/components-next/captain/assistant/AssistantPlayground.vue b/app/javascript/dashboard/components-next/captain/assistant/AssistantPlayground.vue
index 28587745a..69cbb9be5 100644
--- a/app/javascript/dashboard/components-next/captain/assistant/AssistantPlayground.vue
+++ b/app/javascript/dashboard/components-next/captain/assistant/AssistantPlayground.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import NextButton from 'dashboard/components-next/button/Button.vue';
 import MessageList from './MessageList.vue';
@@ -29,6 +29,16 @@ const resetConversation = () => {
   newMessage.value = '';
 };
 
+// Watch for assistant ID changes and reset conversation
+watch(
+  () => assistantId,
+  (newId, oldId) => {
+    if (oldId && newId !== oldId) {
+      resetConversation();
+    }
+  }
+);
+
 const sendMessage = async () => {
   if (!newMessage.value.trim() || isLoading.value) return;
 
@@ -65,16 +75,17 @@ const sendMessage = async () => {
 
 <template>
   <div
-    class="flex flex-col h-full rounded-lg p-4 border border-n-slate-4 text-n-slate-11"
+    class="flex flex-col h-full rounded-xl border py-6 border-n-weak text-n-slate-11"
   >
-    <div class="mb-4">
+    <div class="mb-8 px-6">
       <div class="flex justify-between items-center mb-1">
         <h3 class="text-lg font-medium">
           {{ t('CAPTAIN.PLAYGROUND.HEADER') }}
         </h3>
         <NextButton
           ghost
-          size="small"
+          sm
+          slate
           icon="i-lucide-rotate-ccw"
           @click="resetConversation"
         />
@@ -87,17 +98,17 @@ const sendMessage = async () => {
     <MessageList :messages="messages" :is-loading="isLoading" />
 
     <div
-      class="flex items-center bg-n-solid-1 outline outline-n-container rounded-lg p-3"
+      class="flex items-center mx-6 bg-n-background outline outline-1 outline-n-weak rounded-xl p-3"
     >
       <input
         v-model="newMessage"
-        class="flex-1 bg-transparent border-none focus:outline-none text-sm mb-0"
+        class="flex-1 bg-transparent border-none focus:outline-none text-sm mb-0 text-n-slate-12 placeholder:text-n-slate-10"
         :placeholder="t('CAPTAIN.PLAYGROUND.MESSAGE_PLACEHOLDER')"
         @keyup.enter="sendMessage"
       />
       <NextButton
         ghost
-        size="small"
+        sm
         :disabled="!newMessage.trim()"
         icon="i-lucide-send"
         @click="sendMessage"
diff --git a/app/javascript/dashboard/components-next/captain/assistant/BulkSelectBar.vue b/app/javascript/dashboard/components-next/captain/assistant/BulkSelectBar.vue
index 94cab9a33..0bf2007ff 100644
--- a/app/javascript/dashboard/components-next/captain/assistant/BulkSelectBar.vue
+++ b/app/javascript/dashboard/components-next/captain/assistant/BulkSelectBar.vue
@@ -64,20 +64,23 @@ const bulkCheckboxState = computed({
       class="flex items-center gap-3 py-1 ltr:pl-3 rtl:pr-3 ltr:pr-4 rtl:pl-4 rounded-lg bg-n-solid-2 outline outline-1 outline-n-container shadow"
     >
       <div class="flex items-center gap-3">
-        <div class="flex items-center gap-1.5">
+        <div class="flex items-center gap-1.5 min-w-0">
           <Checkbox
             v-model="bulkCheckboxState"
             :indeterminate="isIndeterminate"
           />
-          <span class="text-sm font-medium text-n-slate-12 tabular-nums">
+          <span
+            class="text-sm font-medium truncate text-n-slate-12 tabular-nums"
+          >
             {{ selectAllLabel }}
           </span>
         </div>
-        <span class="text-sm text-n-slate-10 tabular-nums">
+        <span class="text-sm text-n-slate-10 truncate tabular-nums">
           {{ selectedCountLabel }}
         </span>
+        <div class="h-4 w-px bg-n-strong" />
+        <slot name="secondary-actions" />
       </div>
-      <div class="h-4 w-px bg-n-strong" />
       <div class="flex items-center gap-3">
         <slot name="actions" :selected-count="selectedCount">
           <Button
diff --git a/app/javascript/dashboard/components-next/captain/assistant/MessageList.vue b/app/javascript/dashboard/components-next/captain/assistant/MessageList.vue
index 3eca35744..961a48ac7 100644
--- a/app/javascript/dashboard/components-next/captain/assistant/MessageList.vue
+++ b/app/javascript/dashboard/components-next/captain/assistant/MessageList.vue
@@ -35,8 +35,8 @@ const getAvatarName = sender =>
 
 const getMessageStyle = sender =>
   isUserMessage(sender)
-    ? 'bg-n-strong text-n-white'
-    : 'bg-n-solid-iris text-n-slate-12';
+    ? 'bg-n-solid-blue text-n-slate-12 rounded-br-sm rounded-bl-xl rounded-t-xl'
+    : 'bg-n-solid-iris text-n-slate-12 rounded-bl-sm rounded-br-xl rounded-t-xl';
 
 const scrollToBottom = async () => {
   await nextTick();
@@ -49,7 +49,10 @@ watch(() => props.messages.length, scrollToBottom);
 </script>
 
 <template>
-  <div ref="messageContainer" class="flex-1 overflow-y-auto mb-4 space-y-2">
+  <div
+    ref="messageContainer"
+    class="flex-1 overflow-y-auto mb-4 px-6 space-y-6"
+  >
     <div
       v-for="(message, index) in messages"
       :key="index"
@@ -57,15 +60,20 @@ watch(() => props.messages.length, scrollToBottom);
       :class="getMessageAlignment(message.sender)"
     >
       <div
-        class="flex items-start gap-1.5"
+        class="flex items-end gap-1.5 max-w-[90%] md:max-w-[60%]"
         :class="getMessageDirection(message.sender)"
       >
-        <Avatar :name="getAvatarName(message.sender)" rounded-full :size="24" />
+        <Avatar
+          :name="getAvatarName(message.sender)"
+          rounded-full
+          :size="24"
+          class="shrink-0"
+        />
         <div
-          class="max-w-[80%] rounded-lg p-3 text-sm"
+          class="px-4 py-3 text-sm [overflow-wrap:break-word]"
           :class="getMessageStyle(message.sender)"
         >
-          <div class="break-words" v-html="formatMessage(message.content)" />
+          <div v-html="formatMessage(message.content)" />
         </div>
       </div>
     </div>
diff --git a/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue b/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue
index a924ca228..97227c35d 100644
--- a/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue
+++ b/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue
@@ -9,6 +9,7 @@ import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.v
 import Button from 'dashboard/components-next/button/Button.vue';
 import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
 import Policy from 'dashboard/components/policy.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
 
 const props = defineProps({
   id: {
@@ -59,6 +60,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  showActions: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits(['action', 'navigate', 'select', 'hover']);
@@ -159,73 +164,116 @@ const handleDocumentableClick = () => {
     <span class="text-n-slate-11 text-sm line-clamp-5">
       {{ answer }}
     </span>
-    <div v-if="!compact" class="items-center justify-between hidden lg:flex">
-      <div class="inline-flex items-center">
-        <span
-          class="text-sm shrink-0 truncate text-n-slate-11 inline-flex items-center gap-1"
-        >
-          <i class="i-woot-captain" />
-          {{ assistant?.name || '' }}
-        </span>
-        <div
-          v-if="documentable"
-          class="shrink-0 text-sm text-n-slate-11 inline-flex line-clamp-1 gap-1 ml-3"
-        >
+    <div
+      v-if="!compact"
+      class="flex items-start justify-between flex-col-reverse md:flex-row gap-3"
+    >
+      <Policy v-if="showActions" :permissions="['administrator']">
+        <div class="flex items-center gap-2 sm:gap-5 w-full">
+          <Button
+            v-if="status === 'pending'"
+            :label="$t('CAPTAIN.RESPONSES.OPTIONS.APPROVE')"
+            icon="i-lucide-circle-check-big"
+            sm
+            link
+            class="hover:!no-underline"
+            @click="
+              handleAssistantAction({ action: 'approve', value: 'approve' })
+            "
+          />
+          <Button
+            :label="$t('CAPTAIN.RESPONSES.OPTIONS.EDIT_RESPONSE')"
+            icon="i-lucide-pencil-line"
+            sm
+            slate
+            link
+            class="hover:!no-underline"
+            @click="
+              handleAssistantAction({
+                action: 'edit',
+                value: 'edit',
+              })
+            "
+          />
+          <Button
+            :label="$t('CAPTAIN.RESPONSES.OPTIONS.DELETE_RESPONSE')"
+            icon="i-lucide-trash"
+            sm
+            ruby
+            link
+            class="hover:!no-underline"
+            @click="
+              handleAssistantAction({ action: 'delete', value: 'delete' })
+            "
+          />
+        </div>
+      </Policy>
+      <div
+        class="flex items-center gap-3"
+        :class="{ 'justify-between w-full': !showActions }"
+      >
+        <div class="inline-flex items-center gap-3 min-w-0">
           <span
-            v-if="documentable.type === 'Captain::Document'"
-            class="inline-flex items-center gap-1 truncate over"
+            v-if="status === 'approved'"
+            class="text-sm shrink-0 truncate text-n-slate-11 inline-flex items-center gap-1"
           >
-            <i class="i-ph-files-light text-base" />
-            <span class="max-w-96 truncate" :title="documentable.name">
+            <Icon icon="i-woot-captain" class="size-3.5" />
+            {{ assistant?.name || '' }}
+          </span>
+          <div
+            v-if="documentable"
+            class="text-sm text-n-slate-11 grid grid-cols-[auto_1fr] items-center gap-1 min-w-0"
+          >
+            <Icon
+              v-if="documentable.type === 'Captain::Document'"
+              icon="i-ph-files-light"
+              class="size-3.5"
+            />
+            <Icon
+              v-else-if="documentable.type === 'User'"
+              icon="i-ph-user-circle-plus"
+              class="size-3.5"
+            />
+            <Icon
+              v-else-if="documentable.type === 'Conversation'"
+              icon="i-ph-chat-circle-dots"
+              class="size-3.5"
+            />
+            <span
+              v-if="documentable.type === 'Captain::Document'"
+              class="truncate"
+              :title="documentable.name"
+            >
               {{ documentable.name }}
             </span>
-          </span>
-          <span
-            v-if="documentable.type === 'User'"
-            class="inline-flex items-center gap-1"
-          >
-            <i class="i-ph-user-circle-plus text-base" />
             <span
-              class="max-w-96 truncate"
+              v-else-if="documentable.type === 'User'"
+              class="truncate"
               :title="documentable.available_name"
             >
               {{ documentable.available_name }}
             </span>
-          </span>
-          <span
-            v-else-if="documentable.type === 'Conversation'"
-            class="inline-flex items-center gap-1 group cursor-pointer"
-            role="button"
-            @click="handleDocumentableClick"
-          >
-            <i class="i-ph-chat-circle-dots text-base" />
-            <span class="group-hover:underline">
+            <span
+              v-else-if="documentable.type === 'Conversation'"
+              class="hover:underline truncate cursor-pointer"
+              role="button"
+              @click="handleDocumentableClick"
+            >
               {{
                 t(`CAPTAIN.RESPONSES.DOCUMENTABLE.CONVERSATION`, {
                   id: documentable.display_id,
                 })
               }}
             </span>
-          </span>
-          <span v-else />
+          </div>
         </div>
         <div
-          v-if="status !== 'approved'"
-          class="shrink-0 text-sm text-n-slate-11 line-clamp-1 inline-flex items-center gap-1 ml-3"
+          class="shrink-0 text-sm text-n-slate-11 line-clamp-1 inline-flex items-center gap-1"
         >
-          <i
-            class="i-ph-stack text-base"
-            :title="t('CAPTAIN.RESPONSES.STATUS.TITLE')"
-          />
-          {{ t(`CAPTAIN.RESPONSES.STATUS.${status.toUpperCase()}`) }}
+          <Icon icon="i-ph-calendar-dot" class="size-3.5" />
+          {{ timestamp }}
         </div>
       </div>
-      <div
-        class="shrink-0 text-sm text-n-slate-11 line-clamp-1 inline-flex items-center gap-1 ml-3"
-      >
-        <i class="i-ph-calendar-dot" />
-        {{ timestamp }}
-      </div>
     </div>
   </CardLayout>
 </template>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/AssistantSelector.vue b/app/javascript/dashboard/components-next/captain/pageComponents/AssistantSelector.vue
deleted file mode 100644
index 4998e4044..000000000
--- a/app/javascript/dashboard/components-next/captain/pageComponents/AssistantSelector.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<script setup>
-import { computed, ref } from 'vue';
-import { useMapGetter } from 'dashboard/composables/store';
-import { useI18n } from 'vue-i18n';
-import { OnClickOutside } from '@vueuse/components';
-import Button from 'dashboard/components-next/button/Button.vue';
-import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
-
-const props = defineProps({
-  assistantId: {
-    type: [String, Number],
-    required: true,
-  },
-});
-
-const emit = defineEmits(['update']);
-const { t } = useI18n();
-const isFilterOpen = ref(false);
-
-const assistants = useMapGetter('captainAssistants/getRecords');
-const assistantOptions = computed(() => [
-  {
-    label: t(`CAPTAIN.RESPONSES.FILTER.ALL_ASSISTANTS`),
-    value: 'all',
-    action: 'filter',
-  },
-  ...assistants.value.map(assistant => ({
-    value: assistant.id,
-    label: assistant.name,
-    action: 'filter',
-  })),
-]);
-
-const selectedAssistantLabel = computed(() => {
-  const assistant = assistantOptions.value.find(
-    option => option.value === props.assistantId
-  );
-  return t('CAPTAIN.RESPONSES.FILTER.ASSISTANT', {
-    selected: assistant ? assistant.label : '',
-  });
-});
-
-const handleAssistantFilterChange = ({ value }) => {
-  isFilterOpen.value = false;
-  emit('update', value);
-};
-</script>
-
-<template>
-  <OnClickOutside @trigger="isFilterOpen = false">
-    <Button
-      :label="selectedAssistantLabel"
-      icon="i-lucide-chevron-down"
-      size="sm"
-      color="slate"
-      trailing-icon
-      class="max-w-48"
-      @click="isFilterOpen = !isFilterOpen"
-    />
-
-    <DropdownMenu
-      v-if="isFilterOpen"
-      :menu-items="assistantOptions"
-      class="mt-2"
-      @action="handleAssistantFilterChange"
-    />
-  </OnClickOutside>
-</template>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/CreateAssistantDialog.vue b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/CreateAssistantDialog.vue
index ac67063ec..f2cc21495 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/CreateAssistantDialog.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/CreateAssistantDialog.vue
@@ -18,7 +18,7 @@ const props = defineProps({
     validator: value => ['create', 'edit'].includes(value),
   },
 });
-const emit = defineEmits(['close']);
+const emit = defineEmits(['close', 'created']);
 const { t } = useI18n();
 const store = useStore();
 
@@ -35,8 +35,18 @@ const i18nKey = computed(
   () => `CAPTAIN.ASSISTANTS.${props.type.toUpperCase()}`
 );
 
-const createAssistant = assistantDetails =>
-  store.dispatch('captainAssistants/create', assistantDetails);
+const createAssistant = async assistantDetails => {
+  try {
+    const newAssistant = await store.dispatch(
+      'captainAssistants/create',
+      assistantDetails
+    );
+    emit('created', newAssistant);
+  } catch (error) {
+    const errorMessage = error?.message || t(`${i18nKey.value}.ERROR_MESSAGE`);
+    useAlert(errorMessage);
+  }
+};
 
 const handleSubmit = async updatedAssistant => {
   try {
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/EditAssistantForm.vue b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/EditAssistantForm.vue
deleted file mode 100644
index cca996a44..000000000
--- a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/EditAssistantForm.vue
+++ /dev/null
@@ -1,333 +0,0 @@
-<script setup>
-import { reactive, computed, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useVuelidate } from '@vuelidate/core';
-import { required, minLength } from '@vuelidate/validators';
-import { useMapGetter } from 'dashboard/composables/store';
-
-import Input from 'dashboard/components-next/input/Input.vue';
-import Button from 'dashboard/components-next/button/Button.vue';
-import Editor from 'dashboard/components-next/Editor/Editor.vue';
-import Accordion from 'dashboard/components-next/Accordion/Accordion.vue';
-
-const props = defineProps({
-  mode: {
-    type: String,
-    required: true,
-    validator: value => ['edit', 'create'].includes(value),
-  },
-  assistant: {
-    type: Object,
-    default: () => ({}),
-  },
-});
-
-const emit = defineEmits(['submit']);
-
-const { t } = useI18n();
-
-const formState = {
-  uiFlags: useMapGetter('captainAssistants/getUIFlags'),
-};
-
-const initialState = {
-  name: '',
-  description: '',
-  productName: '',
-  welcomeMessage: '',
-  handoffMessage: '',
-  resolutionMessage: '',
-  instructions: '',
-  features: {
-    conversationFaqs: false,
-    memories: false,
-    citations: false,
-  },
-  temperature: 1,
-};
-
-const state = reactive({ ...initialState });
-
-const validationRules = {
-  name: { required, minLength: minLength(1) },
-  description: { required, minLength: minLength(1) },
-  productName: { required, minLength: minLength(1) },
-  welcomeMessage: { minLength: minLength(1) },
-  handoffMessage: { minLength: minLength(1) },
-  resolutionMessage: { minLength: minLength(1) },
-  instructions: { minLength: minLength(1) },
-};
-
-const v$ = useVuelidate(validationRules, state);
-
-const isLoading = computed(() => formState.uiFlags.value.creatingItem);
-
-const getErrorMessage = field => {
-  return v$.value[field].$error ? v$.value[field].$errors[0].$message : '';
-};
-
-const formErrors = computed(() => ({
-  name: getErrorMessage('name'),
-  description: getErrorMessage('description'),
-  productName: getErrorMessage('productName'),
-  welcomeMessage: getErrorMessage('welcomeMessage'),
-  handoffMessage: getErrorMessage('handoffMessage'),
-  resolutionMessage: getErrorMessage('resolutionMessage'),
-  instructions: getErrorMessage('instructions'),
-}));
-
-const updateStateFromAssistant = assistant => {
-  const { config = {} } = assistant;
-  state.name = assistant.name;
-  state.description = assistant.description;
-  state.productName = config.product_name;
-  state.welcomeMessage = config.welcome_message;
-  state.handoffMessage = config.handoff_message;
-  state.resolutionMessage = config.resolution_message;
-  state.instructions = config.instructions;
-  state.features = {
-    conversationFaqs: config.feature_faq || false,
-    memories: config.feature_memory || false,
-    citations: config.feature_citation || false,
-  };
-  state.temperature = config.temperature || 1;
-};
-
-const handleBasicInfoUpdate = async () => {
-  const result = await Promise.all([
-    v$.value.name.$validate(),
-    v$.value.description.$validate(),
-    v$.value.productName.$validate(),
-  ]).then(results => results.every(Boolean));
-  if (!result) return;
-
-  const payload = {
-    name: state.name,
-    description: state.description,
-    config: {
-      ...props.assistant.config,
-      product_name: state.productName,
-    },
-  };
-
-  emit('submit', payload);
-};
-
-const handleSystemMessagesUpdate = async () => {
-  const result = await Promise.all([
-    v$.value.welcomeMessage.$validate(),
-    v$.value.handoffMessage.$validate(),
-    v$.value.resolutionMessage.$validate(),
-  ]).then(results => results.every(Boolean));
-  if (!result) return;
-
-  const payload = {
-    config: {
-      ...props.assistant.config,
-      welcome_message: state.welcomeMessage,
-      handoff_message: state.handoffMessage,
-      resolution_message: state.resolutionMessage,
-    },
-  };
-
-  emit('submit', payload);
-};
-
-const handleInstructionsUpdate = async () => {
-  const result = await v$.value.instructions.$validate();
-  if (!result) return;
-
-  const payload = {
-    config: {
-      ...props.assistant.config,
-      temperature: state.temperature || 1,
-      instructions: state.instructions,
-    },
-  };
-
-  emit('submit', payload);
-};
-
-const handleFeaturesUpdate = () => {
-  const payload = {
-    config: {
-      ...props.assistant.config,
-      feature_faq: state.features.conversationFaqs,
-      feature_memory: state.features.memories,
-      feature_citation: state.features.citations,
-    },
-  };
-
-  emit('submit', payload);
-};
-
-watch(
-  () => props.assistant,
-  newAssistant => {
-    if (props.mode === 'edit' && newAssistant) {
-      updateStateFromAssistant(newAssistant);
-    }
-  },
-  { immediate: true }
-);
-</script>
-
-<template>
-  <form class="flex flex-col gap-4" @submit.prevent="handleSubmit">
-    <!-- Basic Information Section -->
-    <Accordion
-      :title="t('CAPTAIN.ASSISTANTS.FORM.SECTIONS.BASIC_INFO')"
-      is-open
-    >
-      <div class="flex flex-col gap-4 pt-4">
-        <Input
-          v-model="state.name"
-          :label="t('CAPTAIN.ASSISTANTS.FORM.NAME.LABEL')"
-          :placeholder="t('CAPTAIN.ASSISTANTS.FORM.NAME.PLACEHOLDER')"
-          :message="formErrors.name"
-          :message-type="formErrors.name ? 'error' : 'info'"
-        />
-
-        <Editor
-          v-model="state.description"
-          :label="t('CAPTAIN.ASSISTANTS.FORM.DESCRIPTION.LABEL')"
-          :placeholder="t('CAPTAIN.ASSISTANTS.FORM.DESCRIPTION.PLACEHOLDER')"
-          :message="formErrors.description"
-          :message-type="formErrors.description ? 'error' : 'info'"
-        />
-
-        <Input
-          v-model="state.productName"
-          :label="t('CAPTAIN.ASSISTANTS.FORM.PRODUCT_NAME.LABEL')"
-          :placeholder="t('CAPTAIN.ASSISTANTS.FORM.PRODUCT_NAME.PLACEHOLDER')"
-          :message="formErrors.productName"
-          :message-type="formErrors.productName ? 'error' : 'info'"
-        />
-
-        <div class="flex justify-end">
-          <Button
-            size="small"
-            :loading="isLoading"
-            @click="handleBasicInfoUpdate"
-          >
-            {{ t('CAPTAIN.ASSISTANTS.FORM.UPDATE') }}
-          </Button>
-        </div>
-      </div>
-    </Accordion>
-
-    <!-- Instructions Section -->
-    <Accordion :title="t('CAPTAIN.ASSISTANTS.FORM.SECTIONS.INSTRUCTIONS')">
-      <div class="flex flex-col gap-4">
-        <Editor
-          v-model="state.instructions"
-          :placeholder="t('CAPTAIN.ASSISTANTS.FORM.INSTRUCTIONS.PLACEHOLDER')"
-          :message="formErrors.instructions"
-          :max-length="20000"
-          :message-type="formErrors.instructions ? 'error' : 'info'"
-        />
-
-        <div class="flex flex-col gap-2 mt-4">
-          <label class="text-sm font-medium text-n-slate-12">
-            {{ t('CAPTAIN.ASSISTANTS.FORM.TEMPERATURE.LABEL') }}
-          </label>
-          <div class="flex items-center gap-4">
-            <input
-              v-model="state.temperature"
-              type="range"
-              min="0"
-              max="1"
-              step="0.1"
-              class="w-full"
-            />
-            <span class="text-sm text-n-slate-12">{{ state.temperature }}</span>
-          </div>
-          <p class="text-sm text-n-slate-11 italic">
-            {{ t('CAPTAIN.ASSISTANTS.FORM.TEMPERATURE.DESCRIPTION') }}
-          </p>
-        </div>
-        <div class="flex justify-end">
-          <Button
-            size="small"
-            :loading="isLoading"
-            :label="t('CAPTAIN.ASSISTANTS.FORM.UPDATE')"
-            @click="handleInstructionsUpdate"
-          />
-        </div>
-      </div>
-    </Accordion>
-
-    <!-- Greeting Messages Section -->
-    <Accordion :title="t('CAPTAIN.ASSISTANTS.FORM.SECTIONS.SYSTEM_MESSAGES')">
-      <div class="flex flex-col gap-4 pt-4">
-        <Editor
-          v-model="state.handoffMessage"
-          :label="t('CAPTAIN.ASSISTANTS.FORM.HANDOFF_MESSAGE.LABEL')"
-          :placeholder="
-            t('CAPTAIN.ASSISTANTS.FORM.HANDOFF_MESSAGE.PLACEHOLDER')
-          "
-          :message="formErrors.handoffMessage"
-          :message-type="formErrors.handoffMessage ? 'error' : 'info'"
-        />
-
-        <Editor
-          v-model="state.resolutionMessage"
-          :label="t('CAPTAIN.ASSISTANTS.FORM.RESOLUTION_MESSAGE.LABEL')"
-          :placeholder="
-            t('CAPTAIN.ASSISTANTS.FORM.RESOLUTION_MESSAGE.PLACEHOLDER')
-          "
-          :message="formErrors.resolutionMessage"
-          :message-type="formErrors.resolutionMessage ? 'error' : 'info'"
-        />
-
-        <div class="flex justify-end">
-          <Button
-            size="small"
-            :loading="isLoading"
-            :label="t('CAPTAIN.ASSISTANTS.FORM.UPDATE')"
-            @click="handleSystemMessagesUpdate"
-          />
-        </div>
-      </div>
-    </Accordion>
-
-    <!-- Features Section -->
-    <Accordion :title="t('CAPTAIN.ASSISTANTS.FORM.SECTIONS.FEATURES')">
-      <div class="flex flex-col gap-4 pt-4">
-        <div class="flex flex-col gap-2">
-          <label class="text-sm font-medium text-n-slate-12">
-            {{ t('CAPTAIN.ASSISTANTS.FORM.FEATURES.TITLE') }}
-          </label>
-          <div class="flex flex-col gap-2">
-            <label class="flex items-center gap-2">
-              <input
-                v-model="state.features.conversationFaqs"
-                type="checkbox"
-              />
-              {{
-                t('CAPTAIN.ASSISTANTS.FORM.FEATURES.ALLOW_CONVERSATION_FAQS')
-              }}
-            </label>
-            <label class="flex items-center gap-2">
-              <input v-model="state.features.memories" type="checkbox" />
-              {{ t('CAPTAIN.ASSISTANTS.FORM.FEATURES.ALLOW_MEMORIES') }}
-            </label>
-            <label class="flex items-center gap-2">
-              <input v-model="state.features.citations" type="checkbox" />
-              {{ t('CAPTAIN.ASSISTANTS.FORM.FEATURES.ALLOW_CITATIONS') }}
-            </label>
-          </div>
-        </div>
-
-        <div class="flex justify-end">
-          <Button
-            size="small"
-            :loading="isLoading"
-            :label="t('CAPTAIN.ASSISTANTS.FORM.UPDATE')"
-            @click="handleFeaturesUpdate"
-          />
-        </div>
-      </div>
-    </Accordion>
-  </form>
-</template>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantBasicSettingsForm.vue b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantBasicSettingsForm.vue
index 42c075ea1..70cc75dea 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantBasicSettingsForm.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantBasicSettingsForm.vue
@@ -118,6 +118,7 @@ watch(
       :placeholder="t('CAPTAIN.ASSISTANTS.FORM.DESCRIPTION.PLACEHOLDER')"
       :message="formErrors.description"
       :message-type="formErrors.description ? 'error' : 'info'"
+      class="z-0"
     />
 
     <div class="flex flex-col gap-2">
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantSystemSettingsForm.vue b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantSystemSettingsForm.vue
index b86bdacb4..ee20fded5 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantSystemSettingsForm.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantSystemSettingsForm.vue
@@ -3,6 +3,8 @@ import { reactive, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVuelidate } from '@vuelidate/core';
 import { minLength } from '@vuelidate/validators';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { useAccount } from 'dashboard/composables/useAccount';
 
 import Button from 'dashboard/components-next/button/Button.vue';
 import Editor from 'dashboard/components-next/Editor/Editor.vue';
@@ -17,10 +19,16 @@ const props = defineProps({
 const emit = defineEmits(['submit']);
 
 const { t } = useI18n();
+const { isCloudFeatureEnabled } = useAccount();
+
+const isCaptainV2Enabled = computed(() =>
+  isCloudFeatureEnabled(FEATURE_FLAGS.CAPTAIN_V2)
+);
 
 const initialState = {
   handoffMessage: '',
   resolutionMessage: '',
+  instructions: '',
   temperature: 1,
 };
 
@@ -29,6 +37,7 @@ const state = reactive({ ...initialState });
 const validationRules = {
   handoffMessage: { minLength: minLength(1) },
   resolutionMessage: { minLength: minLength(1) },
+  instructions: { minLength: minLength(1) },
 };
 
 const v$ = useVuelidate(validationRules, state);
@@ -40,20 +49,30 @@ const getErrorMessage = field => {
 const formErrors = computed(() => ({
   handoffMessage: getErrorMessage('handoffMessage'),
   resolutionMessage: getErrorMessage('resolutionMessage'),
+  instructions: getErrorMessage('instructions'),
 }));
 
 const updateStateFromAssistant = assistant => {
   const { config = {} } = assistant;
   state.handoffMessage = config.handoff_message;
   state.resolutionMessage = config.resolution_message;
+  state.instructions = config.instructions;
   state.temperature = config.temperature || 1;
 };
 
 const handleSystemMessagesUpdate = async () => {
-  const result = await Promise.all([
+  const validations = [
     v$.value.handoffMessage.$validate(),
     v$.value.resolutionMessage.$validate(),
-  ]).then(results => results.every(Boolean));
+  ];
+
+  if (!isCaptainV2Enabled.value) {
+    validations.push(v$.value.instructions.$validate());
+  }
+
+  const result = await Promise.all(validations).then(results =>
+    results.every(Boolean)
+  );
   if (!result) return;
 
   const payload = {
@@ -65,6 +84,10 @@ const handleSystemMessagesUpdate = async () => {
     },
   };
 
+  if (!isCaptainV2Enabled.value) {
+    payload.config.instructions = state.instructions;
+  }
+
   emit('submit', payload);
 };
 
@@ -85,6 +108,7 @@ watch(
       :placeholder="t('CAPTAIN.ASSISTANTS.FORM.HANDOFF_MESSAGE.PLACEHOLDER')"
       :message="formErrors.handoffMessage"
       :message-type="formErrors.handoffMessage ? 'error' : 'info'"
+      class="z-0"
     />
 
     <Editor
@@ -93,6 +117,18 @@ watch(
       :placeholder="t('CAPTAIN.ASSISTANTS.FORM.RESOLUTION_MESSAGE.PLACEHOLDER')"
       :message="formErrors.resolutionMessage"
       :message-type="formErrors.resolutionMessage ? 'error' : 'info'"
+      class="z-0"
+    />
+
+    <Editor
+      v-if="!isCaptainV2Enabled"
+      v-model="state.instructions"
+      :label="t('CAPTAIN.ASSISTANTS.FORM.INSTRUCTIONS.LABEL')"
+      :placeholder="t('CAPTAIN.ASSISTANTS.FORM.INSTRUCTIONS.PLACEHOLDER')"
+      :message="formErrors.instructions"
+      :max-length="20000"
+      :message-type="formErrors.instructions ? 'error' : 'info'"
+      class="z-0"
     />
 
     <div class="flex flex-col gap-2">
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/document/CreateDocumentDialog.vue b/app/javascript/dashboard/components-next/captain/pageComponents/document/CreateDocumentDialog.vue
index 9f701a149..05fc69342 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/document/CreateDocumentDialog.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/document/CreateDocumentDialog.vue
@@ -8,6 +8,13 @@ import { parseAPIErrorResponse } from 'dashboard/store/utils/api';
 import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
 import DocumentForm from './DocumentForm.vue';
 
+defineProps({
+  assistantId: {
+    type: Number,
+    required: true,
+  },
+});
+
 const emit = defineEmits(['close']);
 const { t } = useI18n();
 const store = useStore();
@@ -48,7 +55,11 @@ defineExpose({ dialogRef });
     :show-confirm-button="false"
     @close="handleClose"
   >
-    <DocumentForm @submit="handleSubmit" @cancel="handleCancel" />
+    <DocumentForm
+      :assistant-id="assistantId"
+      @submit="handleSubmit"
+      @cancel="handleCancel"
+    />
     <template #footer />
   </Dialog>
 </template>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/document/DocumentForm.vue b/app/javascript/dashboard/components-next/captain/pageComponents/document/DocumentForm.vue
index 784b3aad2..70fe73a5b 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/document/DocumentForm.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/document/DocumentForm.vue
@@ -2,7 +2,7 @@
 import { reactive, computed, ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVuelidate } from '@vuelidate/core';
-import { required, minLength, requiredIf, url } from '@vuelidate/validators';
+import { minLength, requiredIf, url } from '@vuelidate/validators';
 import { useMapGetter } from 'dashboard/composables/store';
 import { useAlert } from 'dashboard/composables';
 
@@ -10,6 +10,13 @@ import Input from 'dashboard/components-next/input/Input.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
 
+const props = defineProps({
+  assistantId: {
+    type: Number,
+    required: true,
+  },
+});
+
 const emit = defineEmits(['submit', 'cancel']);
 
 const MAX_FILE_SIZE = 10 * 1024 * 1024; // 10MB
@@ -18,13 +25,11 @@ const { t } = useI18n();
 
 const formState = {
   uiFlags: useMapGetter('captainDocuments/getUIFlags'),
-  assistants: useMapGetter('captainAssistants/getRecords'),
 };
 
 const initialState = {
   name: '',
   url: '',
-  assistantId: null,
   documentType: 'url',
   pdfFile: null,
 };
@@ -38,19 +43,11 @@ const validationRules = {
     url: requiredIf(() => state.documentType === 'url' && url),
     minLength: requiredIf(() => state.documentType === 'url' && minLength(1)),
   },
-  assistantId: { required },
   pdfFile: {
     required: requiredIf(() => state.documentType === 'pdf'),
   },
 };
 
-const assistantList = computed(() =>
-  formState.assistants.value.map(assistant => ({
-    value: assistant.id,
-    label: assistant.name,
-  }))
-);
-
 const documentTypeOptions = [
   { value: 'url', label: t('CAPTAIN.DOCUMENTS.FORM.TYPE.URL') },
   { value: 'pdf', label: t('CAPTAIN.DOCUMENTS.FORM.TYPE.PDF') },
@@ -70,7 +67,6 @@ const getErrorMessage = (field, errorKey) => {
 
 const formErrors = computed(() => ({
   url: getErrorMessage('url', 'URL'),
-  assistantId: getErrorMessage('assistantId', 'ASSISTANT'),
   pdfFile: getErrorMessage('pdfFile', 'PDF_FILE'),
 }));
 
@@ -106,7 +102,7 @@ const openFileDialog = () => {
 
 const prepareDocumentDetails = () => {
   const formData = new FormData();
-  formData.append('document[assistant_id]', state.assistantId);
+  formData.append('document[assistant_id]', props.assistantId);
 
   if (state.documentType === 'url') {
     formData.append('document[external_link]', state.url);
@@ -218,21 +214,6 @@ const handleSubmit = async () => {
       :placeholder="t('CAPTAIN.DOCUMENTS.FORM.NAME.PLACEHOLDER')"
     />
 
-    <div class="flex flex-col gap-1">
-      <label for="assistant" class="mb-0.5 text-sm font-medium text-n-slate-12">
-        {{ t('CAPTAIN.DOCUMENTS.FORM.ASSISTANT.LABEL') }}
-      </label>
-      <ComboBox
-        id="assistant"
-        v-model="state.assistantId"
-        :options="assistantList"
-        :has-error="!!formErrors.assistantId"
-        :placeholder="t('CAPTAIN.DOCUMENTS.FORM.ASSISTANT.PLACEHOLDER')"
-        class="[&>div>button]:bg-n-alpha-black2"
-        :message="formErrors.assistantId"
-      />
-    </div>
-
     <div class="flex gap-3 justify-between items-center w-full">
       <Button
         type="button"
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue b/app/javascript/dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue
index a1c91b2a3..d2ed12b0a 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue
@@ -6,16 +6,39 @@ import ResponseCard from 'dashboard/components-next/captain/assistant/ResponseCa
 import FeatureSpotlight from 'dashboard/components-next/feature-spotlight/FeatureSpotlight.vue';
 import { responsesList } from 'dashboard/components-next/captain/pageComponents/emptyStates/captainEmptyStateContent.js';
 
-const emit = defineEmits(['click']);
+import { computed } from 'vue';
+
+const props = defineProps({
+  variant: {
+    type: String,
+    default: 'approved',
+    validator: value => ['approved', 'pending'].includes(value),
+  },
+  hasActiveFilters: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(['click', 'clearFilters']);
+
+const isApproved = computed(() => props.variant === 'approved');
+const isPending = computed(() => props.variant === 'pending');
+
 const { isOnChatwootCloud } = useAccount();
 
 const onClick = () => {
   emit('click');
 };
+
+const onClearFilters = () => {
+  emit('clearFilters');
+};
 </script>
 
 <template>
   <FeatureSpotlight
+    v-if="isApproved"
     :title="$t('CAPTAIN.RESPONSES.EMPTY_STATE.FEATURE_SPOTLIGHT.TITLE')"
     :note="$t('CAPTAIN.RESPONSES.EMPTY_STATE.FEATURE_SPOTLIGHT.NOTE')"
     fallback-thumbnail="/assets/images/dashboard/captain/faqs-light.svg"
@@ -25,11 +48,16 @@ const onClick = () => {
     class="mb-8"
   />
   <EmptyStateLayout
-    :title="$t('CAPTAIN.RESPONSES.EMPTY_STATE.TITLE')"
-    :subtitle="$t('CAPTAIN.RESPONSES.EMPTY_STATE.SUBTITLE')"
+    :title="
+      isPending
+        ? $t('CAPTAIN.RESPONSES.EMPTY_STATE.NO_PENDING_TITLE')
+        : $t('CAPTAIN.RESPONSES.EMPTY_STATE.TITLE')
+    "
+    :subtitle="isApproved ? $t('CAPTAIN.RESPONSES.EMPTY_STATE.SUBTITLE') : ''"
     :action-perms="['administrator']"
+    :show-backdrop="isApproved"
   >
-    <template #empty-state-item>
+    <template v-if="isApproved" #empty-state-item>
       <div class="grid grid-cols-1 gap-4 p-px overflow-hidden">
         <ResponseCard
           v-for="(response, index) in responsesList.slice(0, 5)"
@@ -45,11 +73,21 @@ const onClick = () => {
       </div>
     </template>
     <template #actions>
-      <Button
-        :label="$t('CAPTAIN.RESPONSES.ADD_NEW')"
-        icon="i-lucide-plus"
-        @click="onClick"
-      />
+      <div class="flex flex-col items-center gap-3">
+        <Button
+          v-if="isApproved"
+          :label="$t('CAPTAIN.RESPONSES.ADD_NEW')"
+          icon="i-lucide-plus"
+          @click="onClick"
+        />
+        <Button
+          v-else-if="isPending && hasActiveFilters"
+          :label="$t('CAPTAIN.RESPONSES.EMPTY_STATE.CLEAR_SEARCH')"
+          variant="link"
+          size="sm"
+          @click="onClearFilters"
+        />
+      </div>
     </template>
   </EmptyStateLayout>
 </template>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/response/CreateResponseDialog.vue b/app/javascript/dashboard/components-next/captain/pageComponents/response/CreateResponseDialog.vue
index 0bae4cf17..4b9c2c76c 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/response/CreateResponseDialog.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/response/CreateResponseDialog.vue
@@ -3,6 +3,7 @@ import { ref, computed } from 'vue';
 import { useStore } from 'dashboard/composables/store';
 import { useAlert } from 'dashboard/composables';
 import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
 
 import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
 import ResponseForm from './ResponseForm.vue';
@@ -21,6 +22,7 @@ const props = defineProps({
 const emit = defineEmits(['close']);
 const { t } = useI18n();
 const store = useStore();
+const route = useRoute();
 
 const dialogRef = ref(null);
 const responseForm = ref(null);
@@ -39,9 +41,15 @@ const createResponse = responseDetails =>
 const handleSubmit = async updatedResponse => {
   try {
     if (props.type === 'edit') {
-      await updateResponse(updatedResponse);
+      await updateResponse({
+        ...updatedResponse,
+        assistant_id: route.params.assistantId,
+      });
     } else {
-      await createResponse(updatedResponse);
+      await createResponse({
+        ...updatedResponse,
+        assistant_id: route.params.assistantId,
+      });
     }
     useAlert(t(`${i18nKey.value}.SUCCESS_MESSAGE`));
     dialogRef.value.close();
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/response/ResponseForm.vue b/app/javascript/dashboard/components-next/captain/pageComponents/response/ResponseForm.vue
index 2b143fd15..49d581d8c 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/response/ResponseForm.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/response/ResponseForm.vue
@@ -8,7 +8,6 @@ import { useMapGetter } from 'dashboard/composables/store';
 import Input from 'dashboard/components-next/input/Input.vue';
 import Editor from 'dashboard/components-next/Editor/Editor.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
-import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
 
 const props = defineProps({
   mode: {
@@ -21,18 +20,17 @@ const props = defineProps({
     default: () => ({}),
   },
 });
+
 const emit = defineEmits(['submit', 'cancel']);
 const { t } = useI18n();
 
 const formState = {
   uiFlags: useMapGetter('captainResponses/getUIFlags'),
-  assistants: useMapGetter('captainAssistants/getRecords'),
 };
 
 const initialState = {
   question: '',
   answer: '',
-  assistantId: null,
 };
 
 const state = reactive({ ...initialState });
@@ -40,16 +38,8 @@ const state = reactive({ ...initialState });
 const validationRules = {
   question: { required, minLength: minLength(1) },
   answer: { required, minLength: minLength(1) },
-  assistantId: { required },
 };
 
-const assistantList = computed(() =>
-  formState.assistants.value.map(assistant => ({
-    value: assistant.id,
-    label: assistant.name,
-  }))
-);
-
 const v$ = useVuelidate(validationRules, state);
 
 const isLoading = computed(() => formState.uiFlags.value.creatingItem);
@@ -63,7 +53,6 @@ const getErrorMessage = (field, errorKey) => {
 const formErrors = computed(() => ({
   question: getErrorMessage('question', 'QUESTION'),
   answer: getErrorMessage('answer', 'ANSWER'),
-  assistantId: getErrorMessage('assistantId', 'ASSISTANT'),
 }));
 
 const handleCancel = () => emit('cancel');
@@ -71,7 +60,6 @@ const handleCancel = () => emit('cancel');
 const prepareDocumentDetails = () => ({
   question: state.question,
   answer: state.answer,
-  assistant_id: state.assistantId,
 });
 
 const handleSubmit = async () => {
@@ -86,12 +74,11 @@ const handleSubmit = async () => {
 const updateStateFromResponse = response => {
   if (!response) return;
 
-  const { question, answer, assistant } = response;
+  const { question, answer } = response;
 
   Object.assign(state, {
     question,
     answer,
-    assistantId: assistant.id,
   });
 };
 
@@ -115,7 +102,6 @@ watch(
       :message="formErrors.question"
       :message-type="formErrors.question ? 'error' : 'info'"
     />
-
     <Editor
       v-model="state.answer"
       :label="t('CAPTAIN.RESPONSES.FORM.ANSWER.LABEL')"
@@ -124,22 +110,6 @@ watch(
       :max-length="10000"
       :message-type="formErrors.answer ? 'error' : 'info'"
     />
-
-    <div class="flex flex-col gap-1">
-      <label for="assistant" class="mb-0.5 text-sm font-medium text-n-slate-12">
-        {{ t('CAPTAIN.RESPONSES.FORM.ASSISTANT.LABEL') }}
-      </label>
-      <ComboBox
-        id="assistant"
-        v-model="state.assistantId"
-        :options="assistantList"
-        :has-error="!!formErrors.assistantId"
-        :placeholder="t('CAPTAIN.RESPONSES.FORM.ASSISTANT.PLACEHOLDER')"
-        class="[&>div>button]:bg-n-alpha-black2 [&>div>button:not(.focused)]:dark:outline-n-weak [&>div>button:not(.focused)]:hover:!outline-n-slate-6"
-        :message="formErrors.assistantId"
-      />
-    </div>
-
     <div class="flex items-center justify-between w-full gap-3">
       <Button
         type="button"
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/switcher/AssistantSwitcher.vue b/app/javascript/dashboard/components-next/captain/pageComponents/switcher/AssistantSwitcher.vue
new file mode 100644
index 000000000..a67d685f5
--- /dev/null
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/switcher/AssistantSwitcher.vue
@@ -0,0 +1,148 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+import { useMapGetter, useStore } from 'dashboard/composables/store.js';
+
+import Button from 'dashboard/components-next/button/Button.vue';
+import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
+
+const emit = defineEmits(['close', 'createAssistant']);
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const store = useStore();
+
+const assistants = useMapGetter('captainAssistants/getRecords');
+
+const currentAssistantId = computed(() => route.params.assistantId);
+
+const isAssistantActive = assistant => {
+  return assistant.id === Number(currentAssistantId.value);
+};
+
+const fetchDataForRoute = async (routeName, assistantId) => {
+  const dataFetchMap = {
+    captain_assistants_responses_index: async () => {
+      await store.dispatch('captainResponses/get', { assistantId });
+      await store.dispatch('captainResponses/fetchPendingCount', assistantId);
+    },
+    captain_assistants_responses_pending: async () => {
+      await store.dispatch('captainResponses/get', {
+        assistantId,
+        status: 'pending',
+      });
+    },
+    captain_assistants_documents_index: async () => {
+      await store.dispatch('captainDocuments/get', { assistantId });
+    },
+    captain_assistants_scenarios_index: async () => {
+      await store.dispatch('captainScenarios/get', { assistantId });
+    },
+    captain_assistants_playground_index: () => {
+      // Playground doesn't need pre-fetching, it loads on interaction
+    },
+    captain_assistants_inboxes_index: async () => {
+      await store.dispatch('captainInboxes/get', { assistantId });
+    },
+    captain_tools_index: async () => {
+      await store.dispatch('captainCustomTools/get', { page: 1 });
+    },
+    captain_assistants_settings_index: async () => {
+      await store.dispatch('captainAssistants/show', assistantId);
+    },
+  };
+
+  const fetchFn = dataFetchMap[routeName];
+  if (fetchFn) {
+    await fetchFn();
+  }
+};
+
+const handleAssistantChange = async assistant => {
+  if (isAssistantActive(assistant)) return;
+
+  const currentRouteName = route.name;
+  const targetRouteName =
+    currentRouteName || 'captain_assistants_responses_index';
+
+  await fetchDataForRoute(targetRouteName, assistant.id);
+
+  await router.push({
+    name: targetRouteName,
+    params: {
+      accountId: route.params.accountId,
+      assistantId: assistant.id,
+    },
+  });
+
+  emit('close');
+};
+
+const openCreateAssistantDialog = () => {
+  emit('createAssistant');
+  emit('close');
+};
+</script>
+
+<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"
+  >
+    <div
+      class="flex items-center justify-between gap-4 px-6 pb-3 border-b border-n-alpha-2"
+    >
+      <div class="flex flex-col gap-1">
+        <div class="flex items-center gap-2">
+          <h2
+            class="text-base font-medium cursor-pointer text-n-slate-12 w-fit hover:underline"
+          >
+            {{ t('CAPTAIN.ASSISTANT_SWITCHER.ASSISTANTS') }}
+          </h2>
+        </div>
+        <p class="text-sm text-n-slate-11">
+          {{ t('CAPTAIN.ASSISTANT_SWITCHER.SWITCH_ASSISTANT') }}
+        </p>
+      </div>
+      <Button
+        :label="t('CAPTAIN.ASSISTANT_SWITCHER.NEW_ASSISTANT')"
+        color="slate"
+        icon="i-lucide-plus"
+        size="sm"
+        class="!bg-n-alpha-2 hover:!bg-n-alpha-3"
+        @click="openCreateAssistantDialog"
+      />
+    </div>
+    <div v-if="assistants.length > 0" class="flex flex-col gap-2 px-4">
+      <Button
+        v-for="assistant in assistants"
+        :key="assistant.id"
+        :label="assistant.name"
+        variant="ghost"
+        color="slate"
+        trailing-icon
+        :icon="isAssistantActive(assistant) ? 'i-lucide-check' : ''"
+        class="!justify-end !px-2 !py-2 hover:!bg-n-alpha-2 [&>.i-lucide-check]:text-n-teal-10 h-9"
+        size="sm"
+        @click="handleAssistantChange(assistant)"
+      >
+        <span class="text-sm font-medium truncate text-n-slate-12">
+          {{ assistant.name || '' }}
+        </span>
+        <Avatar
+          v-if="assistant"
+          :name="assistant.name"
+          :size="20"
+          icon-name="i-lucide-bot"
+          rounded-full
+        />
+      </Button>
+    </div>
+    <div v-else class="flex flex-col items-center gap-2 px-4 py-3">
+      <p class="text-sm text-n-slate-11">
+        {{ t('CAPTAIN.ASSISTANT_SWITCHER.EMPTY_LIST') }}
+      </p>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/combobox/ComboBox.vue b/app/javascript/dashboard/components-next/combobox/ComboBox.vue
index 76296ddde..d50134e88 100644
--- a/app/javascript/dashboard/components-next/combobox/ComboBox.vue
+++ b/app/javascript/dashboard/components-next/combobox/ComboBox.vue
@@ -96,6 +96,7 @@ watch(
         :label="selectedLabel"
         trailing-icon
         :disabled="disabled"
+        no-animation
         class="justify-between w-full !px-3 !py-2.5 text-n-slate-12 font-normal group-hover/combobox:border-n-slate-6 focus:outline-n-brand"
         :class="{
           focused: open,
diff --git a/app/javascript/dashboard/components-next/copilot/CopilotEmptyState.vue b/app/javascript/dashboard/components-next/copilot/CopilotEmptyState.vue
index 39a7eb35a..954dd60a5 100644
--- a/app/javascript/dashboard/components-next/copilot/CopilotEmptyState.vue
+++ b/app/javascript/dashboard/components-next/copilot/CopilotEmptyState.vue
@@ -78,8 +78,10 @@ const handleSuggestion = opt => {
       </p>
       <router-link
         :to="{
-          name: 'captain_assistants_index',
-          params: { accountId: route.params.accountId },
+          name: 'captain_assistants_create_index',
+          params: {
+            accountId: route.params.accountId,
+          },
         }"
         class="text-n-slate-11 underline hover:text-n-slate-12"
       >
diff --git a/app/javascript/dashboard/components-next/copilot/CopilotLauncher.vue b/app/javascript/dashboard/components-next/copilot/CopilotLauncher.vue
index 9b7ac983f..a2ecd9726 100644
--- a/app/javascript/dashboard/components-next/copilot/CopilotLauncher.vue
+++ b/app/javascript/dashboard/components-next/copilot/CopilotLauncher.vue
@@ -2,6 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import Button from 'dashboard/components-next/button/Button.vue';
+import ButtonGroup from 'dashboard/components-next/buttonGroup/ButtonGroup.vue';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import { useMapGetter } from 'dashboard/composables/store';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
@@ -53,14 +54,17 @@ const toggleSidebar = () => {
     v-if="showCopilotLauncher"
     class="fixed bottom-4 ltr:right-4 rtl:left-4 z-50"
   >
-    <div class="rounded-full bg-n-alpha-2 p-1">
+    <ButtonGroup
+      class="rounded-full bg-n-alpha-2 backdrop-blur-lg p-1 shadow hover:shadow-md"
+    >
       <Button
         icon="i-woot-captain"
-        class="!rounded-full !bg-n-solid-3 dark:!bg-n-alpha-2 !text-n-slate-12 text-xl"
+        no-animation
+        class="!rounded-full !bg-n-solid-3 dark:!bg-n-alpha-2 !text-n-slate-12 text-xl transition-all duration-200 ease-out hover:brightness-110"
         lg
         @click="toggleSidebar"
       />
-    </div>
+    </ButtonGroup>
   </div>
   <template v-else />
 </template>
diff --git a/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue b/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
index 111b9868e..6276dfec6 100644
--- a/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
+++ b/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
@@ -8,11 +8,15 @@ import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
 const props = defineProps({
   menuItems: {
     type: Array,
-    required: true,
+    default: () => [],
     validator: value => {
       return value.every(item => item.action && item.value && item.label);
     },
   },
+  menuSections: {
+    type: Array,
+    default: () => [],
+  },
   thumbnailSize: {
     type: Number,
     default: 20,
@@ -42,19 +46,62 @@ const { t } = useI18n();
 const searchInput = ref(null);
 const searchQuery = ref('');
 
-const filteredMenuItems = computed(() => {
-  if (!searchQuery.value) return props.menuItems;
+const hasSections = computed(() => props.menuSections.length > 0);
 
-  return props.menuItems.filter(item =>
+const flattenedMenuItems = computed(() => {
+  if (!hasSections.value) {
+    return props.menuItems;
+  }
+
+  return props.menuSections.flatMap(section => section.items || []);
+});
+
+const filteredMenuItems = computed(() => {
+  if (!searchQuery.value) return flattenedMenuItems.value;
+
+  return flattenedMenuItems.value.filter(item =>
     item.label.toLowerCase().includes(searchQuery.value.toLowerCase())
   );
 });
 
+const filteredMenuSections = computed(() => {
+  if (!hasSections.value) {
+    return [];
+  }
+
+  if (!searchQuery.value) {
+    return props.menuSections;
+  }
+
+  const query = searchQuery.value.toLowerCase();
+
+  return props.menuSections
+    .map(section => {
+      const filteredItems = (section.items || []).filter(item =>
+        item.label.toLowerCase().includes(query)
+      );
+
+      return {
+        ...section,
+        items: filteredItems,
+      };
+    })
+    .filter(section => section.items.length > 0);
+});
+
 const handleAction = item => {
   const { action, value, ...rest } = item;
   emit('action', { action, value, ...rest });
 };
 
+const shouldShowEmptyState = computed(() => {
+  if (hasSections.value) {
+    return filteredMenuSections.value.length === 0;
+  }
+
+  return filteredMenuItems.value.length === 0;
+});
+
 onMounted(() => {
   if (searchInput.value && props.showSearch) {
     searchInput.value.focus();
@@ -64,54 +111,122 @@ onMounted(() => {
 
 <template>
   <div
-    class="bg-n-alpha-3 backdrop-blur-[100px] border-0 outline outline-1 outline-n-container absolute rounded-xl z-50 py-2 px-2 gap-2 flex flex-col min-w-[136px] shadow-lg"
+    class="bg-n-alpha-3 backdrop-blur-[100px] border-0 outline outline-1 outline-n-container absolute rounded-xl z-50 gap-2 flex flex-col min-w-[136px] shadow-lg pb-2 px-2"
+    :class="{
+      'pt-2': !showSearch,
+    }"
   >
-    <div v-if="showSearch" class="relative">
-      <span class="absolute i-lucide-search size-3.5 top-2 left-3" />
-      <input
-        ref="searchInput"
-        v-model="searchQuery"
-        type="search"
-        :placeholder="
-          searchPlaceholder || t('DROPDOWN_MENU.SEARCH_PLACEHOLDER')
-        "
-        class="reset-base w-full h-8 py-2 pl-10 pr-2 text-sm focus:outline-none border-none rounded-lg bg-n-alpha-black2 dark:bg-n-solid-1 text-n-slate-12"
-      />
-    </div>
-    <button
-      v-for="(item, index) in filteredMenuItems"
-      :key="index"
-      type="button"
-      class="inline-flex items-center justify-start w-full h-8 min-w-0 gap-2 px-2 py-1.5 transition-all duration-200 ease-in-out border-0 rounded-lg z-60 hover:bg-n-alpha-1 dark:hover:bg-n-alpha-2 disabled:cursor-not-allowed disabled:pointer-events-none disabled:opacity-50"
-      :class="{
-        'bg-n-alpha-1 dark:bg-n-solid-active': item.isSelected,
-        'text-n-ruby-11': item.action === 'delete',
-        'text-n-slate-12': item.action !== 'delete',
-      }"
-      :disabled="item.disabled"
-      @click="handleAction(item)"
-    >
-      <slot name="thumbnail" :item="item">
-        <Avatar
-          v-if="item.thumbnail"
-          :name="item.thumbnail.name"
-          :src="item.thumbnail.src"
-          :size="thumbnailSize"
-          rounded-full
-        />
-      </slot>
-      <Icon v-if="item.icon" :icon="item.icon" class="flex-shrink-0 size-3.5" />
-      <span v-if="item.emoji" class="flex-shrink-0">{{ item.emoji }}</span>
-      <span
-        v-if="item.label"
-        class="min-w-0 text-sm truncate"
-        :class="labelClass"
-      >
-        {{ item.label }}
-      </span>
-    </button>
     <div
-      v-if="filteredMenuItems.length === 0"
+      v-if="showSearch"
+      class="sticky top-0 bg-n-alpha-3 backdrop-blur-sm pt-2"
+    >
+      <div class="relative">
+        <span class="absolute i-lucide-search size-3.5 top-2 left-3" />
+        <input
+          ref="searchInput"
+          v-model="searchQuery"
+          type="search"
+          :placeholder="
+            searchPlaceholder || t('DROPDOWN_MENU.SEARCH_PLACEHOLDER')
+          "
+          class="reset-base w-full h-8 py-2 pl-10 pr-2 text-sm focus:outline-none border-none rounded-lg bg-n-alpha-black2 dark:bg-n-solid-1 text-n-slate-12"
+        />
+      </div>
+    </div>
+    <template v-if="hasSections">
+      <div
+        v-for="(section, sectionIndex) in filteredMenuSections"
+        :key="section.title || sectionIndex"
+        class="flex flex-col gap-1"
+      >
+        <p
+          v-if="section.title"
+          class="px-2 pt-2 text-xs font-medium text-n-slate-11 uppercase tracking-wide"
+        >
+          {{ section.title }}
+        </p>
+        <button
+          v-for="(item, itemIndex) in section.items"
+          :key="item.value || itemIndex"
+          type="button"
+          class="inline-flex items-center justify-start w-full h-8 min-w-0 gap-2 px-2 py-1.5 transition-all duration-200 ease-in-out border-0 rounded-lg z-60 hover:bg-n-alpha-1 dark:hover:bg-n-alpha-2 disabled:cursor-not-allowed disabled:pointer-events-none disabled:opacity-50"
+          :class="{
+            'bg-n-alpha-1 dark:bg-n-solid-active': item.isSelected,
+            'text-n-ruby-11': item.action === 'delete',
+            'text-n-slate-12': item.action !== 'delete',
+          }"
+          :disabled="item.disabled"
+          @click="handleAction(item)"
+        >
+          <slot name="thumbnail" :item="item">
+            <Avatar
+              v-if="item.thumbnail"
+              :name="item.thumbnail.name"
+              :src="item.thumbnail.src"
+              :size="thumbnailSize"
+              rounded-full
+            />
+          </slot>
+          <Icon
+            v-if="item.icon"
+            :icon="item.icon"
+            class="flex-shrink-0 size-3.5"
+          />
+          <span v-if="item.emoji" class="flex-shrink-0">{{ item.emoji }}</span>
+          <span
+            v-if="item.label"
+            class="min-w-0 text-sm truncate"
+            :class="labelClass"
+          >
+            {{ item.label }}
+          </span>
+        </button>
+        <div
+          v-if="sectionIndex < filteredMenuSections.length - 1"
+          class="h-px bg-n-alpha-2 mx-2 my-1"
+        />
+      </div>
+    </template>
+    <template v-else>
+      <button
+        v-for="(item, index) in filteredMenuItems"
+        :key="index"
+        type="button"
+        class="inline-flex items-center justify-start w-full h-8 min-w-0 gap-2 px-2 py-1.5 transition-all duration-200 ease-in-out border-0 rounded-lg z-60 hover:bg-n-alpha-1 dark:hover:bg-n-alpha-2 disabled:cursor-not-allowed disabled:pointer-events-none disabled:opacity-50"
+        :class="{
+          'bg-n-alpha-1 dark:bg-n-solid-active': item.isSelected,
+          'text-n-ruby-11': item.action === 'delete',
+          'text-n-slate-12': item.action !== 'delete',
+        }"
+        :disabled="item.disabled"
+        @click="handleAction(item)"
+      >
+        <slot name="thumbnail" :item="item">
+          <Avatar
+            v-if="item.thumbnail"
+            :name="item.thumbnail.name"
+            :src="item.thumbnail.src"
+            :size="thumbnailSize"
+            rounded-full
+          />
+        </slot>
+        <Icon
+          v-if="item.icon"
+          :icon="item.icon"
+          class="flex-shrink-0 size-3.5"
+        />
+        <span v-if="item.emoji" class="flex-shrink-0">{{ item.emoji }}</span>
+        <span
+          v-if="item.label"
+          class="min-w-0 text-sm truncate"
+          :class="labelClass"
+        >
+          {{ item.label }}
+        </span>
+      </button>
+    </template>
+    <div
+      v-if="shouldShowEmptyState"
       class="text-sm text-n-slate-11 px-2 py-1.5"
     >
       {{
diff --git a/app/javascript/dashboard/components-next/message/Message.vue b/app/javascript/dashboard/components-next/message/Message.vue
index dd655d0cc..fabef6bc5 100644
--- a/app/javascript/dashboard/components-next/message/Message.vue
+++ b/app/javascript/dashboard/components-next/message/Message.vue
@@ -299,7 +299,12 @@ const componentToRender = computed(() => {
     return DyteBubble;
   }
 
-  if (props.contentAttributes.imageType === 'story_mention') {
+  const instagramSharedTypes = [
+    ATTACHMENT_TYPES.STORY_MENTION,
+    ATTACHMENT_TYPES.IG_STORY,
+    ATTACHMENT_TYPES.IG_POST,
+  ];
+  if (instagramSharedTypes.includes(props.contentAttributes.imageType)) {
     return InstagramStoryBubble;
   }
 
@@ -476,7 +481,7 @@ provideMessageContext({
   <div
     v-if="shouldRenderMessage"
     :id="`message${props.id}`"
-    class="flex w-full message-bubble-container mb-2"
+    class="flex mb-2 w-full message-bubble-container"
     :data-message-id="props.id"
     :class="[
       flexOrientationClass,
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Image.vue b/app/javascript/dashboard/components-next/message/bubbles/Image.vue
index 2484bb06c..f41fdad9a 100644
--- a/app/javascript/dashboard/components-next/message/bubbles/Image.vue
+++ b/app/javascript/dashboard/components-next/message/bubbles/Image.vue
@@ -1,7 +1,8 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useAlert } from 'dashboard/composables';
+import { useLoadWithRetry } from 'dashboard/composables/loadWithRetry';
 import BaseBubble from './Base.vue';
 import Button from 'next/button/Button.vue';
 import Icon from 'next/icon/Icon.vue';
@@ -11,7 +12,6 @@ import { downloadFile } from '@chatwoot/utils';
 
 import GalleryView from 'dashboard/components/widgets/conversation/components/GalleryView.vue';
 
-const emit = defineEmits(['error']);
 const { t } = useI18n();
 
 const { filteredCurrentChatAttachments, attachments } = useMessageContext();
@@ -20,14 +20,16 @@ const attachment = computed(() => {
   return attachments.value[0];
 });
 
-const hasError = ref(false);
+const { isLoaded, hasError, loadWithRetry } = useLoadWithRetry();
+
 const showGallery = ref(false);
 const isDownloading = ref(false);
 
-const handleError = () => {
-  hasError.value = true;
-  emit('error');
-};
+onMounted(() => {
+  if (attachment.value?.dataUrl) {
+    loadWithRetry(attachment.value.dataUrl);
+  }
+});
 
 const downloadAttachment = async () => {
   const { fileType, dataUrl, extension } = attachment.value;
@@ -40,6 +42,10 @@ const downloadAttachment = async () => {
     isDownloading.value = false;
   }
 };
+
+const handleImageError = () => {
+  hasError.value = true;
+};
 </script>
 
 <template>
@@ -54,14 +60,12 @@ const downloadAttachment = async () => {
         {{ $t('COMPONENTS.MEDIA.IMAGE_UNAVAILABLE') }}
       </p>
     </div>
-    <div v-else class="relative group rounded-lg overflow-hidden">
+    <div v-else-if="isLoaded" class="relative group rounded-lg overflow-hidden">
       <img
         class="skip-context-menu"
         :src="attachment.dataUrl"
         :width="attachment.width"
         :height="attachment.height"
-        @click="onClick"
-        @error="handleError"
       />
       <div
         class="inset-0 p-2 pointer-events-none absolute bg-gradient-to-tl from-n-slate-12/30 dark:from-n-slate-1/50 via-transparent to-transparent hidden group-hover:flex"
@@ -86,7 +90,7 @@ const downloadAttachment = async () => {
     v-model:show="showGallery"
     :attachment="useSnakeCase(attachment)"
     :all-attachments="filteredCurrentChatAttachments"
-    @error="handleError"
+    @error="handleImageError"
     @close="() => (showGallery = false)"
   />
 </template>
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Template/CallToAction.vue b/app/javascript/dashboard/components-next/message/bubbles/Template/CallToAction.vue
new file mode 100644
index 000000000..ae6f733c8
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/bubbles/Template/CallToAction.vue
@@ -0,0 +1,29 @@
+<script setup>
+import Button from 'dashboard/components-next/button/Button.vue';
+
+defineProps({
+  message: {
+    type: Object,
+    required: true,
+  },
+});
+</script>
+
+<template>
+  <div class="text-n-slate-12 max-w-80 flex flex-col gap-2.5">
+    <div class="p-3 bg-n-alpha-2 rounded-xl">
+      <span
+        v-dompurify-html="message.content"
+        class="prose prose-bubble font-medium text-sm"
+      />
+    </div>
+    <div class="flex gap-2">
+      <Button label="Call us" slate class="!text-n-blue-text w-full" />
+      <Button
+        label="Visit our website"
+        slate
+        class="!text-n-blue-text w-full"
+      />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Template/Card.vue b/app/javascript/dashboard/components-next/message/bubbles/Template/Card.vue
new file mode 100644
index 000000000..9a4f9f19a
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/bubbles/Template/Card.vue
@@ -0,0 +1,32 @@
+<script setup>
+import Button from 'dashboard/components-next/button/Button.vue';
+defineProps({
+  message: {
+    type: Object,
+    required: true,
+  },
+});
+</script>
+
+<template>
+  <div
+    class="bg-n-alpha-2 divide-y divide-n-strong text-n-slate-12 rounded-xl max-w-80"
+  >
+    <div class="px-3 py-2.5">
+      <img :src="message.image_url" class="max-h-44 rounded-lg w-full" />
+      <div class="pt-2.5 flex flex-col gap-2">
+        <h6 class="font-semibold">{{ message.title }}</h6>
+        <span
+          v-dompurify-html="message.content"
+          class="prose prose-bubble text-sm"
+        />
+      </div>
+    </div>
+    <div class="p-3 flex items-center justify-center">
+      <Button label="Call us to order" link class="hover:!no-underline" />
+    </div>
+    <div class="p-3 flex items-center justify-center">
+      <Button label="Visit our store" link class="hover:!no-underline" />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Template/ListPicker.vue b/app/javascript/dashboard/components-next/message/bubbles/Template/ListPicker.vue
new file mode 100644
index 000000000..7d9401b80
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/bubbles/Template/ListPicker.vue
@@ -0,0 +1,25 @@
+<script setup>
+import Button from 'dashboard/components-next/button/Button.vue';
+defineProps({
+  message: {
+    type: Object,
+    required: true,
+  },
+});
+</script>
+
+<template>
+  <div
+    class="bg-n-alpha-2 divide-y divide-n-strong text-n-slate-12 rounded-xl max-w-80"
+  >
+    <div class="p-3">
+      <span
+        v-dompurify-html="message.content"
+        class="prose prose-bubble font-medium text-sm"
+      />
+    </div>
+    <div class="p-3 flex items-center justify-center">
+      <Button label="See options" link class="hover:!no-underline" />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Template/Media.vue b/app/javascript/dashboard/components-next/message/bubbles/Template/Media.vue
new file mode 100644
index 000000000..24340ab90
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/bubbles/Template/Media.vue
@@ -0,0 +1,20 @@
+<script setup>
+defineProps({
+  message: {
+    type: Object,
+    required: true,
+  },
+});
+</script>
+
+<template>
+  <div
+    class="bg-n-alpha-2 text-n-slate-12 rounded-xl flex flex-col gap-2.5 p-3 max-w-80"
+  >
+    <img :src="message.image_url" class="max-h-44 rounded-lg w-full" />
+    <span
+      v-dompurify-html="message.content"
+      class="prose prose-bubble font-medium text-sm"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Template/QuickReply.vue b/app/javascript/dashboard/components-next/message/bubbles/Template/QuickReply.vue
new file mode 100644
index 000000000..19727578f
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/bubbles/Template/QuickReply.vue
@@ -0,0 +1,68 @@
+<script setup>
+import Button from 'dashboard/components-next/button/Button.vue';
+defineProps({
+  message: {
+    type: Object,
+    required: true,
+  },
+});
+</script>
+
+<template>
+  <div
+    class="bg-n-alpha-2 divide-y divide-n-strong text-n-slate-12 rounded-xl max-w-80"
+  >
+    <div class="p-3">
+      <span
+        v-dompurify-html="message.content"
+        class="prose prose-bubble font-medium text-sm"
+      />
+    </div>
+    <div class="p-3 flex items-center justify-center">
+      <Button label="No, that will be all" link class="hover:!no-underline">
+        <template #icon>
+          <svg
+            width="15"
+            height="15"
+            viewBox="0 0 15 15"
+            fill="none"
+            class="stroke-n-blue-text"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M.667 6.654 5.315.667v3.326c7.968 0 8.878 6.46 8.656 10.007l-.005-.027c-.334-1.79-.474-4.658-8.65-4.658v3.327z"
+              stroke-width="1.333"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+            />
+          </svg>
+        </template>
+      </Button>
+    </div>
+    <div class="p-3 flex items-center justify-center">
+      <Button
+        label="I want to talk to an agents"
+        link
+        class="hover:!no-underline"
+      >
+        <template #icon>
+          <svg
+            width="15"
+            height="15"
+            viewBox="0 0 15 15"
+            fill="none"
+            class="stroke-n-blue-text"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M.667 6.654 5.315.667v3.326c7.968 0 8.878 6.46 8.656 10.007l-.005-.027c-.334-1.79-.474-4.658-8.65-4.658v3.327z"
+              stroke-width="1.333"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+            />
+          </svg>
+        </template>
+      </Button>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Template/Text.vue b/app/javascript/dashboard/components-next/message/bubbles/Template/Text.vue
new file mode 100644
index 000000000..accefcd9e
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/bubbles/Template/Text.vue
@@ -0,0 +1,14 @@
+<script setup>
+defineProps({
+  message: {
+    type: Object,
+    required: true,
+  },
+});
+</script>
+
+<template>
+  <div class="bg-n-alpha-2 text-n-slate-12 rounded-xl p-3 max-w-80">
+    <span v-dompurify-html="message.content" class="prose prose-bubble" />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Video.vue b/app/javascript/dashboard/components-next/message/bubbles/Video.vue
index b8bc7a43d..2151b188c 100644
--- a/app/javascript/dashboard/components-next/message/bubbles/Video.vue
+++ b/app/javascript/dashboard/components-next/message/bubbles/Video.vue
@@ -47,6 +47,7 @@ const isReel = computed(() => {
           'max-w-48': isReel,
           'max-w-full': !isReel,
         }"
+        @click.stop
         @error="handleError"
       />
     </div>
diff --git a/app/javascript/dashboard/components-next/message/bubbles/VoiceCall.vue b/app/javascript/dashboard/components-next/message/bubbles/VoiceCall.vue
index b7ede029f..5a7d39a4e 100644
--- a/app/javascript/dashboard/components-next/message/bubbles/VoiceCall.vue
+++ b/app/javascript/dashboard/components-next/message/bubbles/VoiceCall.vue
@@ -1,41 +1,102 @@
 <script setup>
 import { computed } from 'vue';
-import BaseBubble from 'next/message/bubbles/Base.vue';
 import { useMessageContext } from '../provider.js';
-import { useVoiceCallStatus } from 'dashboard/composables/useVoiceCallStatus';
+import { MESSAGE_TYPES, VOICE_CALL_STATUS } from '../constants';
 
-const { contentAttributes } = useMessageContext();
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+import BaseBubble from 'next/message/bubbles/Base.vue';
+
+const LABEL_MAP = {
+  [VOICE_CALL_STATUS.IN_PROGRESS]: 'CONVERSATION.VOICE_CALL.CALL_IN_PROGRESS',
+  [VOICE_CALL_STATUS.COMPLETED]: 'CONVERSATION.VOICE_CALL.CALL_ENDED',
+};
+
+const SUBTEXT_MAP = {
+  [VOICE_CALL_STATUS.RINGING]: 'CONVERSATION.VOICE_CALL.NOT_ANSWERED_YET',
+  [VOICE_CALL_STATUS.COMPLETED]: 'CONVERSATION.VOICE_CALL.CALL_ENDED',
+};
+
+const ICON_MAP = {
+  [VOICE_CALL_STATUS.IN_PROGRESS]: 'i-ph-phone-call',
+  [VOICE_CALL_STATUS.NO_ANSWER]: 'i-ph-phone-x',
+  [VOICE_CALL_STATUS.FAILED]: 'i-ph-phone-x',
+};
+
+const BG_COLOR_MAP = {
+  [VOICE_CALL_STATUS.IN_PROGRESS]: 'bg-n-teal-9',
+  [VOICE_CALL_STATUS.RINGING]: 'bg-n-teal-9 animate-pulse',
+  [VOICE_CALL_STATUS.COMPLETED]: 'bg-n-slate-11',
+  [VOICE_CALL_STATUS.NO_ANSWER]: 'bg-n-ruby-9',
+  [VOICE_CALL_STATUS.FAILED]: 'bg-n-ruby-9',
+};
+
+const { contentAttributes, messageType } = useMessageContext();
 
 const data = computed(() => contentAttributes.value?.data);
+const status = computed(() => data.value?.status?.toString());
 
-const status = computed(() => data.value?.status);
-const direction = computed(() => data.value?.call_direction);
+const isOutbound = computed(() => messageType.value === MESSAGE_TYPES.OUTGOING);
+const isFailed = computed(() =>
+  [VOICE_CALL_STATUS.NO_ANSWER, VOICE_CALL_STATUS.FAILED].includes(status.value)
+);
 
-const { labelKey, subtextKey, bubbleIconBg, bubbleIconName } =
-  useVoiceCallStatus(status, direction);
-
-const containerRingClass = computed(() => {
-  return status.value === 'ringing' ? 'ring-1 ring-emerald-300' : '';
+const labelKey = computed(() => {
+  if (LABEL_MAP[status.value]) return LABEL_MAP[status.value];
+  if (status.value === VOICE_CALL_STATUS.RINGING) {
+    return isOutbound.value
+      ? 'CONVERSATION.VOICE_CALL.OUTGOING_CALL'
+      : 'CONVERSATION.VOICE_CALL.INCOMING_CALL';
+  }
+  return isFailed.value
+    ? 'CONVERSATION.VOICE_CALL.MISSED_CALL'
+    : 'CONVERSATION.VOICE_CALL.INCOMING_CALL';
 });
+
+const subtextKey = computed(() => {
+  if (SUBTEXT_MAP[status.value]) return SUBTEXT_MAP[status.value];
+  if (status.value === VOICE_CALL_STATUS.IN_PROGRESS) {
+    return isOutbound.value
+      ? 'CONVERSATION.VOICE_CALL.THEY_ANSWERED'
+      : 'CONVERSATION.VOICE_CALL.YOU_ANSWERED';
+  }
+  return isFailed.value
+    ? 'CONVERSATION.VOICE_CALL.NO_ANSWER'
+    : 'CONVERSATION.VOICE_CALL.NOT_ANSWERED_YET';
+});
+
+const iconName = computed(() => {
+  if (ICON_MAP[status.value]) return ICON_MAP[status.value];
+  return isOutbound.value ? 'i-ph-phone-outgoing' : 'i-ph-phone-incoming';
+});
+
+const bgColor = computed(() => BG_COLOR_MAP[status.value] || 'bg-n-teal-9');
 </script>
 
 <template>
   <BaseBubble class="p-0 border-none" hide-meta>
-    <div
-      class="flex overflow-hidden flex-col w-full max-w-xs bg-white rounded-lg border border-slate-100 text-slate-900 dark:border-slate-700 dark:bg-slate-800 dark:text-slate-100"
-      :class="containerRingClass"
-    >
+    <div class="flex overflow-hidden flex-col w-full max-w-xs">
       <div class="flex gap-3 items-center p-3 w-full">
         <div
           class="flex justify-center items-center rounded-full size-10 shrink-0"
-          :class="bubbleIconBg"
+          :class="bgColor"
         >
-          <span class="text-xl" :class="bubbleIconName" />
+          <Icon
+            class="size-5"
+            :icon="iconName"
+            :class="{
+              'text-n-slate-1': status === VOICE_CALL_STATUS.COMPLETED,
+              'text-white': status !== VOICE_CALL_STATUS.COMPLETED,
+            }"
+          />
         </div>
 
         <div class="flex overflow-hidden flex-col flex-grow">
-          <span class="text-base font-medium truncate">{{ $t(labelKey) }}</span>
-          <span class="text-xs text-slate-500">{{ $t(subtextKey) }}</span>
+          <span class="text-sm font-medium truncate text-n-slate-12">
+            {{ $t(labelKey) }}
+          </span>
+          <span class="text-xs text-n-slate-11">
+            {{ $t(subtextKey) }}
+          </span>
         </div>
       </div>
     </div>
diff --git a/app/javascript/dashboard/components-next/message/constants.js b/app/javascript/dashboard/components-next/message/constants.js
index 77ea25533..09985da81 100644
--- a/app/javascript/dashboard/components-next/message/constants.js
+++ b/app/javascript/dashboard/components-next/message/constants.js
@@ -49,6 +49,8 @@ export const ATTACHMENT_TYPES = {
   STORY_MENTION: 'story_mention',
   CONTACT: 'contact',
   IG_REEL: 'ig_reel',
+  IG_POST: 'ig_post',
+  IG_STORY: 'ig_story',
 };
 
 export const CONTENT_TYPES = {
@@ -73,3 +75,16 @@ export const MEDIA_TYPES = [
   ATTACHMENT_TYPES.AUDIO,
   ATTACHMENT_TYPES.IG_REEL,
 ];
+
+export const VOICE_CALL_STATUS = {
+  IN_PROGRESS: 'in-progress',
+  RINGING: 'ringing',
+  COMPLETED: 'completed',
+  NO_ANSWER: 'no-answer',
+  FAILED: 'failed',
+};
+
+export const VOICE_CALL_DIRECTION = {
+  INBOUND: 'inbound',
+  OUTBOUND: 'outbound',
+};
diff --git a/app/javascript/dashboard/components-next/message/stories/Template/CallToAction.story.vue b/app/javascript/dashboard/components-next/message/stories/Template/CallToAction.story.vue
new file mode 100644
index 000000000..1c2b956a3
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/stories/Template/CallToAction.story.vue
@@ -0,0 +1,21 @@
+<script setup>
+import CallToAction from '../../bubbles/Template/CallToAction.vue';
+
+const message = {
+  content:
+    'We have super cool products going live! Pre-order and customize products. Contact us for more details',
+};
+</script>
+
+<template>
+  <Story
+    title="Components/Message Bubbles/Template/CallToAction"
+    :layout="{ type: 'grid', width: '600px' }"
+  >
+    <Variant title="Call To Action">
+      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
+        <CallToAction :message="message" />
+      </div>
+    </Variant>
+  </Story>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/stories/Template/Card.story.vue b/app/javascript/dashboard/components-next/message/stories/Template/Card.story.vue
new file mode 100644
index 000000000..caa594bab
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/stories/Template/Card.story.vue
@@ -0,0 +1,23 @@
+<script setup>
+import Card from '../../bubbles/Template/Card.vue';
+
+const message = {
+  title: 'Two in one cake (1 pound)',
+  content: 'Customize your order for special occasions',
+  image_url:
+    'https://images.unsplash.com/photo-1506905925346-21bda4d32df4?w=500&h=300&fit=crop',
+};
+</script>
+
+<template>
+  <Story
+    title="Components/Message Bubbles/Template/Card"
+    :layout="{ type: 'grid', width: '600px' }"
+  >
+    <Variant title="Card">
+      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
+        <Card :message="message" />
+      </div>
+    </Variant>
+  </Story>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/stories/Template/ListPicker.story.vue b/app/javascript/dashboard/components-next/message/stories/Template/ListPicker.story.vue
new file mode 100644
index 000000000..f1e9dd8b8
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/stories/Template/ListPicker.story.vue
@@ -0,0 +1,21 @@
+<script setup>
+import ListPicker from '../../bubbles/Template/ListPicker.vue';
+
+const message = {
+  content: `Hey there! Thanks for reaching out to us. Could you let us know
+what you need to help us better assist you? `,
+};
+</script>
+
+<template>
+  <Story
+    title="Components/Message Bubbles/Template/ListPicker"
+    :layout="{ type: 'grid', width: '600px' }"
+  >
+    <Variant title="ListPicker">
+      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
+        <ListPicker :message="message" />
+      </div>
+    </Variant>
+  </Story>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/stories/Template/Media.story.vue b/app/javascript/dashboard/components-next/message/stories/Template/Media.story.vue
new file mode 100644
index 000000000..67d7fc6b8
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/stories/Template/Media.story.vue
@@ -0,0 +1,23 @@
+<script setup>
+import Media from '../../bubbles/Template/Media.vue';
+
+const message = {
+  content:
+    'Welcome to our Diwali sale! Get flat 50% off on select items. Hurry now!',
+  image_url:
+    'https://images.unsplash.com/photo-1506905925346-21bda4d32df4?w=500&h=300&fit=crop',
+};
+</script>
+
+<template>
+  <Story
+    title="Components/Message Bubbles/Template/Media"
+    :layout="{ type: 'grid', width: '600px' }"
+  >
+    <Variant title="Image Media">
+      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
+        <Media :message="message" />
+      </div>
+    </Variant>
+  </Story>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/stories/Template/QuickReply.story.vue b/app/javascript/dashboard/components-next/message/stories/Template/QuickReply.story.vue
new file mode 100644
index 000000000..1d670e07c
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/stories/Template/QuickReply.story.vue
@@ -0,0 +1,21 @@
+<script setup>
+import QuickReply from '../../bubbles/Template/QuickReply.vue';
+
+const message = {
+  content: `Hey there! Thanks for reaching out to us. Could you let us know
+what you need to help us better assist you?`,
+};
+</script>
+
+<template>
+  <Story
+    title="Components/Message Bubbles/Template/QuickReply"
+    :layout="{ type: 'grid', width: '600px' }"
+  >
+    <Variant title="Quick Replies">
+      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
+        <QuickReply :message="message" />
+      </div>
+    </Variant>
+  </Story>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/stories/Template/Text.story.vue b/app/javascript/dashboard/components-next/message/stories/Template/Text.story.vue
new file mode 100644
index 000000000..cbb6df569
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/stories/Template/Text.story.vue
@@ -0,0 +1,20 @@
+<script setup>
+import Text from '../../bubbles/Template/Text.vue';
+
+const message = {
+  content: 'Hello John, how may we assist you?',
+};
+</script>
+
+<template>
+  <Story
+    title="Components/Message Bubbles/Template/Text"
+    :layout="{ type: 'grid', width: '600px' }"
+  >
+    <Variant title="Default Text">
+      <div class="p-4 bg-n-background rounded-lg w-full min-w-4xl">
+        <Text :message="message" />
+      </div>
+    </Variant>
+  </Story>
+</template>
diff --git a/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue b/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue
index e58b2db86..0a919dbbf 100644
--- a/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue
+++ b/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useNumberFormatter } from 'shared/composables/useNumberFormatter';
 
 import Button from 'dashboard/components-next/button/Button.vue';
 
@@ -24,6 +25,7 @@ const props = defineProps({
 });
 const emit = defineEmits(['update:currentPage']);
 const { t } = useI18n();
+const { formatCompactNumber, formatFullNumber } = useNumberFormatter();
 
 const totalPages = computed(() =>
   Math.ceil(props.totalItems / props.itemsPerPage)
@@ -43,21 +45,27 @@ const changePage = newPage => {
 };
 
 const currentPageInformation = computed(() => {
+  const translationKey = props.currentPageInfo || 'PAGINATION_FOOTER.SHOWING';
   return t(
-    props.currentPageInfo ? props.currentPageInfo : 'PAGINATION_FOOTER.SHOWING',
+    translationKey,
     {
-      startItem: startItem.value,
-      endItem: endItem.value,
-      totalItems: props.totalItems,
-    }
+      startItem: formatFullNumber(startItem.value),
+      endItem: formatFullNumber(endItem.value),
+      totalItems: formatCompactNumber(props.totalItems),
+    },
+    Number(props.totalItems)
   );
 });
 
 const pageInfo = computed(() => {
-  return t('PAGINATION_FOOTER.CURRENT_PAGE_INFO', {
-    currentPage: '',
-    totalPages: totalPages.value,
-  });
+  return t(
+    'PAGINATION_FOOTER.CURRENT_PAGE_INFO',
+    {
+      currentPage: '',
+      totalPages: formatCompactNumber(totalPages.value),
+    },
+    Number(totalPages.value)
+  );
 });
 </script>
 
@@ -91,9 +99,11 @@ const pageInfo = computed(() => {
       />
       <div class="inline-flex items-center gap-2 text-sm text-n-slate-11">
         <span class="px-3 tabular-nums py-0.5 bg-n-alpha-black2 rounded-md">
-          {{ currentPage }}
+          {{ formatFullNumber(currentPage) }}
+        </span>
+        <span class="truncate">
+          {{ pageInfo }}
         </span>
-        <span class="truncate">{{ pageInfo }}</span>
       </div>
       <Button
         icon="i-lucide-chevron-right"
diff --git a/app/javascript/dashboard/components-next/sidebar/MobileSidebarLauncher.vue b/app/javascript/dashboard/components-next/sidebar/MobileSidebarLauncher.vue
index a7265f840..42da67e73 100644
--- a/app/javascript/dashboard/components-next/sidebar/MobileSidebarLauncher.vue
+++ b/app/javascript/dashboard/components-next/sidebar/MobileSidebarLauncher.vue
@@ -2,6 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import Button from 'dashboard/components-next/button/Button.vue';
+import ButtonGroup from 'dashboard/components-next/buttonGroup/ButtonGroup.vue';
 
 defineProps({
   isMobileSidebarOpen: {
@@ -45,14 +46,17 @@ const toggleSidebar = () => {
       },
     ]"
   >
-    <div class="rounded-full bg-n-alpha-2 p-1">
+    <ButtonGroup
+      class="rounded-full bg-n-alpha-2 backdrop-blur-lg p-1 shadow hover:shadow-md"
+    >
       <Button
         icon="i-lucide-menu"
-        class="!rounded-full !bg-n-solid-3 dark:!bg-n-alpha-2 !text-n-slate-12 text-xl"
+        no-animation
+        class="!rounded-full !bg-n-solid-3 dark:!bg-n-alpha-2 !text-n-slate-12 text-xl transition-all duration-200 ease-out hover:brightness-110"
         lg
         @click="toggleSidebar"
       />
-    </div>
+    </ButtonGroup>
   </div>
   <template v-else />
 </template>
diff --git a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
index edcb4106e..cd4309e6e 100644
--- a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
@@ -221,26 +221,70 @@ const menuItems = computed(() => {
       name: 'Captain',
       icon: 'i-woot-captain',
       label: t('SIDEBAR.CAPTAIN'),
+      activeOn: ['captain_assistants_create_index'],
       children: [
         {
-          name: 'Assistants',
-          label: t('SIDEBAR.CAPTAIN_ASSISTANTS'),
-          to: accountScopedRoute('captain_assistants_index'),
+          name: 'FAQs',
+          label: t('SIDEBAR.CAPTAIN_RESPONSES'),
+          activeOn: [
+            'captain_assistants_responses_index',
+            'captain_assistants_responses_pending',
+          ],
+          to: accountScopedRoute('captain_assistants_index', {
+            navigationPath: 'captain_assistants_responses_index',
+          }),
         },
         {
           name: 'Documents',
           label: t('SIDEBAR.CAPTAIN_DOCUMENTS'),
-          to: accountScopedRoute('captain_documents_index'),
+          activeOn: ['captain_assistants_documents_index'],
+          to: accountScopedRoute('captain_assistants_index', {
+            navigationPath: 'captain_assistants_documents_index',
+          }),
         },
         {
-          name: 'Responses',
-          label: t('SIDEBAR.CAPTAIN_RESPONSES'),
-          to: accountScopedRoute('captain_responses_index'),
+          name: 'Scenarios',
+          label: t('SIDEBAR.CAPTAIN_SCENARIOS'),
+          activeOn: ['captain_assistants_scenarios_index'],
+          to: accountScopedRoute('captain_assistants_index', {
+            navigationPath: 'captain_assistants_scenarios_index',
+          }),
+        },
+        {
+          name: 'Playground',
+          label: t('SIDEBAR.CAPTAIN_PLAYGROUND'),
+          activeOn: ['captain_assistants_playground_index'],
+          to: accountScopedRoute('captain_assistants_index', {
+            navigationPath: 'captain_assistants_playground_index',
+          }),
+        },
+        {
+          name: 'Inboxes',
+          label: t('SIDEBAR.CAPTAIN_INBOXES'),
+          activeOn: ['captain_assistants_inboxes_index'],
+          to: accountScopedRoute('captain_assistants_index', {
+            navigationPath: 'captain_assistants_inboxes_index',
+          }),
         },
         {
           name: 'Tools',
           label: t('SIDEBAR.CAPTAIN_TOOLS'),
-          to: accountScopedRoute('captain_tools_index'),
+          activeOn: ['captain_tools_index'],
+          to: accountScopedRoute('captain_assistants_index', {
+            navigationPath: 'captain_tools_index',
+          }),
+        },
+        {
+          name: 'Settings',
+          label: t('SIDEBAR.CAPTAIN_SETTINGS'),
+          activeOn: [
+            'captain_assistants_settings_index',
+            'captain_assistants_guidelines_index',
+            'captain_assistants_guardrails_index',
+          ],
+          to: accountScopedRoute('captain_assistants_index', {
+            navigationPath: 'captain_assistants_settings_index',
+          }),
         },
       ],
     },
@@ -307,6 +351,23 @@ const menuItems = computed(() => {
         },
       ],
     },
+    {
+      name: 'Companies',
+      label: t('SIDEBAR.COMPANIES'),
+      icon: 'i-lucide-building-2',
+      children: [
+        {
+          name: 'All Companies',
+          label: t('SIDEBAR.ALL_COMPANIES'),
+          to: accountScopedRoute(
+            'companies_dashboard_index',
+            {},
+            { page: 1, search: undefined }
+          ),
+          activeOn: ['companies_dashboard_index'],
+        },
+      ],
+    },
     {
       name: 'Reports',
       label: t('SIDEBAR.REPORTS'),
diff --git a/app/javascript/dashboard/components-next/sidebar/provider.js b/app/javascript/dashboard/components-next/sidebar/provider.js
index 642146fc9..e0639096d 100644
--- a/app/javascript/dashboard/components-next/sidebar/provider.js
+++ b/app/javascript/dashboard/components-next/sidebar/provider.js
@@ -19,19 +19,46 @@ export function useSidebarContext() {
     return '/';
   };
 
+  // Helper to find route definition by name without resolving
+  const findRouteByName = name => {
+    const routes = router.getRoutes();
+    return routes.find(route => route.name === name);
+  };
+
   const resolvePermissions = to => {
-    if (to) return router.resolve(to)?.meta?.permissions ?? [];
-    return [];
+    if (!to) return [];
+
+    // If navigationPath param exists, get the target route definition
+    if (to.params?.navigationPath) {
+      const targetRoute = findRouteByName(to.params.navigationPath);
+      return targetRoute?.meta?.permissions ?? [];
+    }
+
+    return router.resolve(to)?.meta?.permissions ?? [];
   };
 
   const resolveFeatureFlag = to => {
-    if (to) return router.resolve(to)?.meta?.featureFlag || '';
-    return '';
+    if (!to) return '';
+
+    // If navigationPath param exists, get the target route definition
+    if (to.params?.navigationPath) {
+      const targetRoute = findRouteByName(to.params.navigationPath);
+      return targetRoute?.meta?.featureFlag || '';
+    }
+
+    return router.resolve(to)?.meta?.featureFlag || '';
   };
 
   const resolveInstallationType = to => {
-    if (to) return router.resolve(to)?.meta?.installationTypes || [];
-    return [];
+    if (!to) return [];
+
+    // If navigationPath param exists, get the target route definition
+    if (to.params?.navigationPath) {
+      const targetRoute = findRouteByName(to.params.navigationPath);
+      return targetRoute?.meta?.installationTypes || [];
+    }
+
+    return router.resolve(to)?.meta?.installationTypes || [];
   };
 
   const isAllowed = to => {
diff --git a/app/javascript/dashboard/components-next/tabbar/TabBar.vue b/app/javascript/dashboard/components-next/tabbar/TabBar.vue
index 072b80907..1b08b838c 100644
--- a/app/javascript/dashboard/components-next/tabbar/TabBar.vue
+++ b/app/javascript/dashboard/components-next/tabbar/TabBar.vue
@@ -1,5 +1,7 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref, onMounted, nextTick } from 'vue';
+import { useResizeObserver } from '@vueuse/core';
+
 const props = defineProps({
   initialActiveTab: {
     type: Number,
@@ -22,6 +24,32 @@ const emit = defineEmits(['tabChanged']);
 
 const activeTab = computed(() => props.initialActiveTab);
 
+const tabRefs = ref([]);
+const indicatorStyle = ref({});
+const enableTransition = ref(false);
+
+const activeElement = computed(() => tabRefs.value[activeTab.value]);
+
+const updateIndicator = () => {
+  if (!activeElement.value) return;
+
+  indicatorStyle.value = {
+    left: `${activeElement.value.offsetLeft}px`,
+    width: `${activeElement.value.offsetWidth}px`,
+  };
+};
+
+useResizeObserver(activeElement, () => {
+  if (enableTransition.value || !activeElement.value) updateIndicator();
+});
+
+onMounted(() => {
+  updateIndicator();
+  nextTick(() => {
+    enableTransition.value = true;
+  });
+});
+
 const selectTab = index => {
   emit('tabChanged', props.tabs[index]);
 };
@@ -37,20 +65,30 @@ const showDivider = index => {
 </script>
 
 <template>
-  <div class="flex items-center h-8 rounded-lg bg-n-alpha-1 w-fit">
+  <div
+    class="relative flex items-center h-8 rounded-lg bg-n-alpha-1 w-fit transition-all duration-200 ease-out has-[button:active]:scale-[1.01]"
+  >
+    <div
+      class="absolute rounded-lg bg-n-solid-active shadow-sm pointer-events-none h-8 outline-1 outline outline-n-container inset-y-0"
+      :class="{ 'transition-all duration-300 ease-out': enableTransition }"
+      :style="indicatorStyle"
+    />
+
     <template v-for="(tab, index) in tabs" :key="index">
       <button
-        class="relative px-4 truncate py-1.5 text-sm border-0 outline-1 outline rounded-lg transition-colors duration-300 ease-in-out hover:text-n-brand"
+        :ref="el => (tabRefs[index] = el)"
+        class="relative z-10 px-4 truncate py-1.5 text-sm border-0 outline-1 outline-transparent rounded-lg transition-all duration-200 ease-out hover:text-n-brand active:scale-[1.02]"
         :class="[
           activeTab === index
-            ? 'text-n-blue-text bg-n-solid-active outline-n-container dark:outline-transparent'
-            : 'text-n-slate-10 outline-transparent h-8',
+            ? 'text-n-blue-text scale-100'
+            : 'text-n-slate-10 scale-[0.98]',
         ]"
         @click="selectTab(index)"
       >
         {{ tab.label }} {{ tab.count ? `(${tab.count})` : '' }}
       </button>
       <div
+        v-if="index < tabs.length - 1"
         class="w-px h-3.5 rounded my-auto transition-colors duration-300 ease-in-out"
         :class="
           showDivider(index)
diff --git a/app/javascript/dashboard/components/buttons/ResolveAction.vue b/app/javascript/dashboard/components/buttons/ResolveAction.vue
index a8698b4a5..c1700321a 100644
--- a/app/javascript/dashboard/components/buttons/ResolveAction.vue
+++ b/app/javascript/dashboard/components/buttons/ResolveAction.vue
@@ -15,6 +15,7 @@ import {
   CMD_RESOLVE_CONVERSATION,
 } from 'dashboard/helper/commandbar/events';
 
+import ButtonGroup from 'dashboard/components-next/buttonGroup/ButtonGroup.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 
 const store = useStore();
@@ -133,7 +134,7 @@ useEmitter(CMD_RESOLVE_CONVERSATION, onCmdResolveConversation);
 
 <template>
   <div class="relative flex items-center justify-end resolve-actions">
-    <div
+    <ButtonGroup
       class="rounded-lg shadow outline-1 outline flex-shrink-0"
       :class="!showOpenButton ? 'outline-n-container' : 'outline-transparent'"
     >
@@ -142,6 +143,7 @@ useEmitter(CMD_RESOLVE_CONVERSATION, onCmdResolveConversation);
         :label="t('CONVERSATION.HEADER.RESOLVE_ACTION')"
         size="sm"
         color="slate"
+        no-animation
         class="ltr:rounded-r-none rtl:rounded-l-none !outline-0"
         :is-loading="isLoading"
         @click="onCmdResolveConversation"
@@ -151,6 +153,7 @@ useEmitter(CMD_RESOLVE_CONVERSATION, onCmdResolveConversation);
         :label="t('CONVERSATION.HEADER.REOPEN_ACTION')"
         size="sm"
         color="slate"
+        no-animation
         class="ltr:rounded-r-none rtl:rounded-l-none !outline-0"
         :is-loading="isLoading"
         @click="onCmdOpenConversation"
@@ -160,6 +163,7 @@ useEmitter(CMD_RESOLVE_CONVERSATION, onCmdResolveConversation);
         :label="t('CONVERSATION.HEADER.OPEN_ACTION')"
         size="sm"
         color="slate"
+        no-animation
         :is-loading="isLoading"
         @click="onCmdOpenConversation"
       />
@@ -169,12 +173,13 @@ useEmitter(CMD_RESOLVE_CONVERSATION, onCmdResolveConversation);
         icon="i-lucide-chevron-down"
         :disabled="isLoading"
         size="sm"
+        no-animation
         class="ltr:rounded-l-none rtl:rounded-r-none !outline-0"
         color="slate"
         trailing-icon
         @click="openDropdown"
       />
-    </div>
+    </ButtonGroup>
     <div
       v-if="showActionsDropdown"
       v-on-clickaway="closeDropdown"
diff --git a/app/javascript/dashboard/components/ui/Dropdown/DropdownButton.vue b/app/javascript/dashboard/components/ui/Dropdown/DropdownButton.vue
index 7289267c1..5ca8bde2b 100644
--- a/app/javascript/dashboard/components/ui/Dropdown/DropdownButton.vue
+++ b/app/javascript/dashboard/components/ui/Dropdown/DropdownButton.vue
@@ -23,6 +23,7 @@ defineProps({
     slate
     sm
     class="relative"
+    no-animation
     :icon="icon"
     :trailing-icon="trailingIcon"
   >
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index b76416c2d..8d7a082b4 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -302,7 +302,16 @@ function isBodyEmpty(content) {
 }
 
 function handleEmptyBodyWithSignature() {
-  const { schema, tr } = state;
+  const { schema, tr, doc } = state;
+
+  const isEmptyParagraph = node =>
+    node && node.type === schema.nodes.paragraph && node.content.size === 0;
+
+  // Check if empty paragraph already exists to prevent duplicates when toggling signatures
+  if (isEmptyParagraph(doc.firstChild)) {
+    focusEditorInputField('start');
+    return;
+  }
 
   // create a paragraph node and
   // start a transaction to append it at the end
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/EditorModeToggle.vue b/app/javascript/dashboard/components/widgets/WootWriter/EditorModeToggle.vue
index 36fe7257c..37108b0f2 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/EditorModeToggle.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/EditorModeToggle.vue
@@ -59,7 +59,7 @@ const translateValue = computed(() => {
 
 <template>
   <button
-    class="flex items-center w-auto h-8 p-1 transition-all border rounded-full bg-n-alpha-2 group relative duration-300 ease-in-out z-0"
+    class="flex items-center w-auto h-8 p-1 transition-all border rounded-full bg-n-alpha-2 group relative duration-300 ease-in-out z-0 active:scale-[0.995] active:duration-75"
     :disabled="disabled"
     :class="{
       'cursor-not-allowed': disabled,
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 5cc59f8c8..1040ff1af 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -3,7 +3,6 @@ import { computed, ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { useStore, useMapGetter } from 'dashboard/composables/store';
 import { getLastMessage } from 'dashboard/helper/conversationHelper';
-import { useVoiceCallStatus } from 'dashboard/composables/useVoiceCallStatus';
 import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
 import Avatar from 'next/avatar/Avatar.vue';
 import MessagePreview from './MessagePreview.vue';
@@ -14,6 +13,7 @@ import CardLabels from './conversationCardComponents/CardLabels.vue';
 import PriorityMark from './PriorityMark.vue';
 import SLACardLabel from './components/SLACardLabel.vue';
 import ContextMenu from 'dashboard/components/ui/ContextMenu.vue';
+import VoiceCallStatus from './VoiceCallStatus.vue';
 
 const props = defineProps({
   activeLabel: { type: String, default: '' },
@@ -83,15 +83,10 @@ const isInboxNameVisible = computed(() => !activeInbox.value);
 
 const lastMessageInChat = computed(() => getLastMessage(props.chat));
 
-const callStatus = computed(
-  () => props.chat.additional_attributes?.call_status
-);
-const callDirection = computed(
-  () => props.chat.additional_attributes?.call_direction
-);
-
-const { labelKey: voiceLabelKey, listIconColor: voiceIconColor } =
-  useVoiceCallStatus(callStatus, callDirection);
+const voiceCallData = computed(() => ({
+  status: props.chat.additional_attributes?.call_status,
+  direction: props.chat.additional_attributes?.call_direction,
+}));
 
 const inboxId = computed(() => props.chat.inbox_id);
 
@@ -317,20 +312,13 @@ const deleteConversation = () => {
       >
         {{ currentContact.name }}
       </h4>
-      <div
-        v-if="callStatus"
+      <VoiceCallStatus
+        v-if="voiceCallData.status"
         key="voice-status-row"
-        class="my-0 mx-2 leading-6 h-6 flex-1 min-w-0 text-sm overflow-hidden text-ellipsis whitespace-nowrap"
-        :class="messagePreviewClass"
-      >
-        <span
-          class="inline-block -mt-0.5 align-middle text-[16px] i-ph-phone-incoming"
-          :class="[voiceIconColor]"
-        />
-        <span class="mx-1">
-          {{ $t(voiceLabelKey) }}
-        </span>
-      </div>
+        :status="voiceCallData.status"
+        :direction="voiceCallData.direction"
+        :message-preview-class="messagePreviewClass"
+      />
       <MessagePreview
         v-else-if="lastMessageInChat"
         key="message-preview"
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 3cb46c05f..8d35308cb 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -258,8 +258,6 @@ export default {
 
   created() {
     emitter.on(BUS_EVENTS.SCROLL_TO_MESSAGE, this.onScrollToMessage);
-    // when a new message comes in, we refetch the label suggestions
-    emitter.on(BUS_EVENTS.FETCH_LABEL_SUGGESTIONS, this.fetchSuggestions);
     // when a message is sent we set the flag to true this hides the label suggestions,
     // until the chat is changed and the flag is reset in the watch for currentChat
     emitter.on(BUS_EVENTS.MESSAGE_SENT, () => {
@@ -291,6 +289,10 @@ export default {
         return;
       }
 
+      // Early exit if conversation already has labels - no need to suggest more
+      const existingLabels = this.currentChat?.labels || [];
+      if (existingLabels.length > 0) return;
+
       // method available in mixin, need to ensure that integrations are present
       await this.fetchIntegrationsIfRequired();
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 80551eaf8..0c08b9bd3 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -174,19 +174,31 @@ export default {
       return false;
     },
     showWhatsappTemplates() {
-      return this.isAWhatsAppCloudChannel && !this.isPrivate;
+      // We support templates for API channels if someone updates templates manually via API
+      // That's why we don't explicitly check for channel type here
+      const templates = this.$store.getters['inboxes/getWhatsAppTemplates'](
+        this.inboxId
+      );
+      return !!(templates && templates.length) && !this.isPrivate;
     },
     showContentTemplates() {
       return this.isATwilioWhatsAppChannel && !this.isPrivate;
     },
     isPrivate() {
-      if (this.currentChat.can_reply || this.isAWhatsAppChannel) {
+      if (
+        this.currentChat.can_reply ||
+        this.isAWhatsAppChannel ||
+        this.isAPIInbox
+      ) {
         return this.isOnPrivateNote;
       }
       return true;
     },
     isReplyRestricted() {
-      return !this.currentChat?.can_reply && !this.isAWhatsAppChannel;
+      return (
+        !this.currentChat?.can_reply &&
+        !(this.isAWhatsAppChannel || this.isAPIInbox)
+      );
     },
     inboxId() {
       return this.currentChat.inbox_id;
@@ -442,7 +454,7 @@ export default {
         return;
       }
 
-      if (canReply || this.isAWhatsAppChannel) {
+      if (canReply || this.isAWhatsAppChannel || this.isAPIInbox) {
         this.replyType = REPLY_EDITOR_MODES.REPLY;
       } else {
         this.replyType = REPLY_EDITOR_MODES.NOTE;
@@ -861,7 +873,8 @@ export default {
       this.$store.dispatch('draftMessages/setReplyEditorMode', {
         mode,
       });
-      if (canReply || this.isAWhatsAppChannel) this.replyType = mode;
+      if (canReply || this.isAWhatsAppChannel || this.isAPIInbox)
+        this.replyType = mode;
       if (this.showRichContentEditor) {
         if (this.isRecordingAudio) {
           this.toggleAudioRecorder();
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBoxBanner.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBoxBanner.vue
index 3aea41f90..d80910343 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBoxBanner.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBoxBanner.vue
@@ -30,7 +30,7 @@ const assignedAgent = computed({
     return currentChat.value?.meta?.assignee;
   },
   set(agent) {
-    const agentId = agent ? agent.id : 0;
+    const agentId = agent ? agent.id : null;
     store.dispatch('setCurrentChatAssignee', agent);
     store.dispatch('assignAgent', {
       conversationId: currentChat.value?.id,
diff --git a/app/javascript/dashboard/components/widgets/conversation/VoiceCallStatus.vue b/app/javascript/dashboard/components/widgets/conversation/VoiceCallStatus.vue
new file mode 100644
index 000000000..f5fa54e75
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/VoiceCallStatus.vue
@@ -0,0 +1,77 @@
+<script setup>
+import { computed } from 'vue';
+import {
+  VOICE_CALL_STATUS,
+  VOICE_CALL_DIRECTION,
+} from 'dashboard/components-next/message/constants';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+
+const props = defineProps({
+  status: { type: String, default: '' },
+  direction: { type: String, default: '' },
+  messagePreviewClass: { type: [String, Array, Object], default: '' },
+});
+
+const LABEL_KEYS = {
+  [VOICE_CALL_STATUS.IN_PROGRESS]: 'CONVERSATION.VOICE_CALL.CALL_IN_PROGRESS',
+  [VOICE_CALL_STATUS.COMPLETED]: 'CONVERSATION.VOICE_CALL.CALL_ENDED',
+};
+
+const ICON_MAP = {
+  [VOICE_CALL_STATUS.IN_PROGRESS]: 'i-ph-phone-call',
+  [VOICE_CALL_STATUS.NO_ANSWER]: 'i-ph-phone-x',
+  [VOICE_CALL_STATUS.FAILED]: 'i-ph-phone-x',
+};
+
+const COLOR_MAP = {
+  [VOICE_CALL_STATUS.IN_PROGRESS]: 'text-n-teal-9',
+  [VOICE_CALL_STATUS.RINGING]: 'text-n-teal-9',
+  [VOICE_CALL_STATUS.COMPLETED]: 'text-n-slate-11',
+  [VOICE_CALL_STATUS.NO_ANSWER]: 'text-n-ruby-9',
+  [VOICE_CALL_STATUS.FAILED]: 'text-n-ruby-9',
+};
+
+const isOutbound = computed(
+  () => props.direction === VOICE_CALL_DIRECTION.OUTBOUND
+);
+const isFailed = computed(() =>
+  [VOICE_CALL_STATUS.NO_ANSWER, VOICE_CALL_STATUS.FAILED].includes(props.status)
+);
+
+const labelKey = computed(() => {
+  if (LABEL_KEYS[props.status]) return LABEL_KEYS[props.status];
+  if (props.status === VOICE_CALL_STATUS.RINGING) {
+    return isOutbound.value
+      ? 'CONVERSATION.VOICE_CALL.OUTGOING_CALL'
+      : 'CONVERSATION.VOICE_CALL.INCOMING_CALL';
+  }
+  return isFailed.value
+    ? 'CONVERSATION.VOICE_CALL.MISSED_CALL'
+    : 'CONVERSATION.VOICE_CALL.INCOMING_CALL';
+});
+
+const iconName = computed(() => {
+  if (ICON_MAP[props.status]) return ICON_MAP[props.status];
+  return isOutbound.value ? 'i-ph-phone-outgoing' : 'i-ph-phone-incoming';
+});
+
+const statusColor = computed(
+  () => COLOR_MAP[props.status] || 'text-n-slate-11'
+);
+</script>
+
+<template>
+  <div
+    class="my-0 mx-2 leading-6 h-6 flex-1 min-w-0 text-sm overflow-hidden text-ellipsis whitespace-nowrap"
+    :class="messagePreviewClass"
+  >
+    <Icon
+      class="inline-block -mt-0.5 align-middle size-4"
+      :icon="iconName"
+      :class="statusColor"
+    />
+    <span class="mx-1" :class="statusColor">
+      {{ $t(labelKey) }}
+    </span>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
index 9bb8f0ccf..f76cdb190 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
@@ -1,100 +1,129 @@
-<script>
-import { mapGetters } from 'vuex';
-import NextButton from 'dashboard/components-next/button/Button.vue';
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useMapGetter } from 'dashboard/composables/store';
+import { vOnClickOutside } from '@vueuse/components';
 
-export default {
-  components: {
-    NextButton,
-  },
-  emits: ['update', 'close', 'assign'],
-  data() {
-    return {
-      query: '',
-      selectedLabels: [],
-    };
-  },
-  computed: {
-    ...mapGetters({ labels: 'labels/getLabels' }),
-    filteredLabels() {
-      return this.labels.filter(label =>
-        label.title.toLowerCase().includes(this.query.toLowerCase())
-      );
-    },
-  },
-  methods: {
-    isLabelSelected(label) {
-      return this.selectedLabels.includes(label);
-    },
-    assignLabels(key) {
-      this.$emit('update', key);
-    },
-    onClose() {
-      this.$emit('close');
-    },
-  },
+import NextButton from 'dashboard/components-next/button/Button.vue';
+import Input from 'dashboard/components-next/input/Input.vue';
+
+const emit = defineEmits(['close', 'assign']);
+
+const { t } = useI18n();
+
+const labels = useMapGetter('labels/getLabels');
+
+const query = ref('');
+const selectedLabels = ref([]);
+
+const filteredLabels = computed(() => {
+  if (!query.value) return labels.value;
+  return labels.value.filter(label =>
+    label.title.toLowerCase().includes(query.value.toLowerCase())
+  );
+});
+
+const hasLabels = computed(() => labels.value.length > 0);
+const hasFilteredLabels = computed(() => filteredLabels.value.length > 0);
+
+const isLabelSelected = label => {
+  return selectedLabels.value.includes(label);
+};
+
+const onClose = () => {
+  emit('close');
+};
+
+const handleAssign = () => {
+  if (selectedLabels.value.length > 0) {
+    emit('assign', selectedLabels.value);
+  }
 };
 </script>
 
 <template>
-  <div v-on-clickaway="onClose" class="labels-container">
+  <div
+    v-on-click-outside="onClose"
+    class="absolute ltr:right-2 rtl:left-2 top-12 origin-top-right z-20 w-60 bg-n-alpha-3 backdrop-blur-[100px] border-n-weak rounded-lg border border-solid shadow-md"
+    role="dialog"
+    aria-labelledby="label-dialog-title"
+  >
     <div class="triangle">
       <svg height="12" viewBox="0 0 24 12" width="24">
         <path d="M20 12l-8-8-12 12" fill-rule="evenodd" stroke-width="1px" />
       </svg>
     </div>
-    <div class="flex items-center justify-between header">
-      <span>{{ $t('BULK_ACTION.LABELS.ASSIGN_LABELS') }}</span>
+    <div class="flex items-center justify-between p-2.5">
+      <span class="text-sm font-medium">{{
+        t('BULK_ACTION.LABELS.ASSIGN_LABELS')
+      }}</span>
       <NextButton ghost xs slate icon="i-lucide-x" @click="onClose" />
     </div>
-    <div class="labels-list">
-      <header class="labels-list__header">
-        <div
-          class="flex items-center justify-between h-8 gap-2 label-list-search"
-        >
-          <fluent-icon icon="search" class="search-icon" size="16" />
-          <input
-            v-model="query"
-            type="search"
-            :placeholder="$t('BULK_ACTION.SEARCH_INPUT_PLACEHOLDER')"
-            class="reset-base !outline-0 !text-sm label--search_input"
-          />
-        </div>
+    <div class="flex flex-col max-h-60 min-h-0">
+      <header class="py-2 px-2.5">
+        <Input
+          v-model="query"
+          type="search"
+          :placeholder="t('BULK_ACTION.SEARCH_INPUT_PLACEHOLDER')"
+          icon-left="i-lucide-search"
+          size="sm"
+          class="w-full"
+          :aria-label="t('BULK_ACTION.SEARCH_INPUT_PLACEHOLDER')"
+        />
       </header>
-      <ul class="labels-list__body">
+      <ul
+        v-if="hasLabels"
+        class="flex-1 overflow-y-auto m-0 list-none"
+        role="listbox"
+        :aria-label="t('BULK_ACTION.LABELS.ASSIGN_LABELS')"
+      >
+        <li v-if="!hasFilteredLabels" class="p-2 text-center">
+          <span class="text-sm text-n-slate-11">{{
+            t('BULK_ACTION.LABELS.NO_LABELS_FOUND')
+          }}</span>
+        </li>
         <li
           v-for="label in filteredLabels"
           :key="label.id"
-          class="label__list-item"
+          class="my-1 mx-0 py-0 px-2.5"
+          role="option"
+          :aria-selected="isLabelSelected(label.title)"
         >
           <label
-            class="item"
-            :class="{ 'label-selected': isLabelSelected(label.title) }"
+            class="items-center rounded-md cursor-pointer flex py-1 px-2.5 hover:bg-n-slate-3 dark:hover:bg-n-solid-3 has-[:checked]:bg-n-slate-2"
           >
             <input
               v-model="selectedLabels"
               type="checkbox"
               :value="label.title"
-              class="label-checkbox"
+              class="my-0 ltr:mr-2.5 rtl:ml-2.5"
+              :aria-label="label.title"
             />
             <span
-              class="overflow-hidden label-title whitespace-nowrap text-ellipsis"
+              class="overflow-hidden flex-grow w-full text-sm whitespace-nowrap text-ellipsis"
             >
               {{ label.title }}
             </span>
             <span
-              class="label-pill"
+              class="rounded-md h-3 w-3 flex-shrink-0 border border-solid border-n-weak"
               :style="{ backgroundColor: label.color }"
             />
           </label>
         </li>
       </ul>
-      <footer class="labels-list__footer">
+      <div v-else class="p-2 text-center">
+        <span class="text-sm text-n-slate-11">{{
+          t('CONTACTS_BULK_ACTIONS.NO_LABELS_FOUND')
+        }}</span>
+      </div>
+      <footer class="p-2">
         <NextButton
           sm
           type="submit"
-          :label="$t('BULK_ACTION.LABELS.ASSIGN_SELECTED_LABELS')"
+          class="w-full"
+          :label="t('BULK_ACTION.LABELS.ASSIGN_SELECTED_LABELS')"
           :disabled="!selectedLabels.length"
-          @click="$emit('assign', selectedLabels)"
+          @click="handleAssign"
         />
       </footer>
     </div>
@@ -102,107 +131,11 @@ export default {
 </template>
 
 <style scoped lang="scss">
-.labels-list {
-  @apply flex flex-col max-h-[15rem] min-h-[auto];
+.triangle {
+  @apply block z-10 absolute text-left -top-3 ltr:right-[--triangle-position] rtl:left-[--triangle-position];
 
-  .labels-list__header {
-    @apply bg-n-alpha-3 backdrop-blur-[100px] py-0 px-2.5;
+  svg path {
+    @apply fill-n-alpha-3 backdrop-blur-[100px]  stroke-n-weak;
   }
-
-  .labels-list__body {
-    @apply flex-1 overflow-y-auto py-2.5 mx-0;
-  }
-
-  .labels-list__footer {
-    @apply p-2;
-
-    button {
-      @apply w-full;
-
-      .button__content {
-        @apply text-center;
-      }
-    }
-  }
-}
-
-.label-list-search {
-  @apply bg-n-alpha-black2 py-0 px-2.5 border border-solid border-n-strong rounded-md;
-
-  .search-icon {
-    @apply text-n-slate-10;
-  }
-
-  .label--search_input {
-    @apply border-0 text-xs m-0 dark:bg-transparent bg-transparent h-[unset] w-full;
-  }
-}
-
-.labels-container {
-  @apply absolute ltr:right-2 rtl:left-2 top-12 origin-top-right w-auto z-20 max-w-[15rem] min-w-[15rem] bg-n-alpha-3 backdrop-blur-[100px] border-n-weak rounded-lg border border-solid shadow-md;
-
-  .header {
-    @apply p-2.5;
-
-    span {
-      @apply text-sm font-medium;
-    }
-  }
-
-  .container {
-    @apply max-h-[15rem] overflow-y-auto;
-
-    .label__list-container {
-      @apply h-full;
-    }
-  }
-
-  .triangle {
-    @apply block z-10 absolute text-left -top-3 ltr:right-[--triangle-position] rtl:left-[--triangle-position];
-
-    svg path {
-      @apply fill-n-alpha-3 backdrop-blur-[100px]  stroke-n-weak;
-    }
-  }
-}
-
-ul {
-  @apply m-0 list-none;
-}
-
-.labels-placeholder {
-  @apply p-2;
-}
-
-.label__list-item {
-  @apply my-1 mx-0 py-0 px-2.5;
-
-  .item {
-    @apply items-center rounded-md cursor-pointer flex py-1 px-2.5 hover:bg-n-slate-3 dark:hover:bg-n-solid-3;
-
-    &.label-selected {
-      @apply bg-n-slate-2;
-    }
-
-    span {
-      @apply text-sm;
-    }
-
-    .label-checkbox {
-      @apply my-0 ltr:mr-2.5 rtl:ml-2.5;
-    }
-
-    .label-title {
-      @apply flex-grow w-full;
-    }
-
-    .label-pill {
-      @apply rounded-md h-3 w-3 flex-shrink-0 border border-solid border-n-weak;
-    }
-  }
-}
-
-.search-container {
-  @apply bg-n-alpha-3 backdrop-blur-[100px] py-0 px-2.5 sticky top-0 z-20;
 }
 </style>
diff --git a/app/javascript/dashboard/composables/loadWithRetry.js b/app/javascript/dashboard/composables/loadWithRetry.js
new file mode 100644
index 000000000..0246c1e44
--- /dev/null
+++ b/app/javascript/dashboard/composables/loadWithRetry.js
@@ -0,0 +1,57 @@
+import { ref } from 'vue';
+
+export const useLoadWithRetry = (config = {}) => {
+  const maxRetry = config.max_retry || 3;
+  const backoff = config.backoff || 1000;
+
+  const isLoaded = ref(false);
+  const hasError = ref(false);
+
+  const loadWithRetry = async url => {
+    const attemptLoad = () => {
+      return new Promise((resolve, reject) => {
+        const img = new Image();
+
+        img.onload = () => {
+          isLoaded.value = true;
+          hasError.value = false;
+          resolve();
+        };
+
+        img.onerror = () => {
+          reject(new Error('Failed to load image'));
+        };
+
+        img.src = url;
+      });
+    };
+
+    const sleep = ms => {
+      return new Promise(resolve => {
+        setTimeout(resolve, ms);
+      });
+    };
+
+    const retry = async (attempt = 0) => {
+      try {
+        await attemptLoad();
+      } catch (error) {
+        if (attempt + 1 >= maxRetry) {
+          hasError.value = true;
+          isLoaded.value = false;
+          return;
+        }
+        await sleep(backoff * (attempt + 1));
+        await retry(attempt + 1);
+      }
+    };
+
+    await retry();
+  };
+
+  return {
+    isLoaded,
+    hasError,
+    loadWithRetry,
+  };
+};
diff --git a/app/javascript/dashboard/composables/spec/useFileUpload.spec.js b/app/javascript/dashboard/composables/spec/useFileUpload.spec.js
index 968a1b057..993eae2cc 100644
--- a/app/javascript/dashboard/composables/spec/useFileUpload.spec.js
+++ b/app/javascript/dashboard/composables/spec/useFileUpload.spec.js
@@ -12,7 +12,11 @@ vi.mock('dashboard/composables', () => ({
 }));
 vi.mock('vue-i18n');
 vi.mock('activestorage');
-vi.mock('shared/helpers/FileHelper');
+vi.mock('shared/helpers/FileHelper', () => ({
+  checkFileSizeLimit: vi.fn(),
+  resolveMaximumFileUploadSize: vi.fn(value => Number(value) || 40),
+  DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE: 40,
+}));
 vi.mock('@chatwoot/utils');
 
 describe('useFileUpload', () => {
@@ -36,7 +40,9 @@ describe('useFileUpload', () => {
         getCurrentAccountId: { value: '123' },
         getCurrentUser: { value: { access_token: 'test-token' } },
         getSelectedChat: { value: { id: '456' } },
-        'globalConfig/get': { value: { directUploadsEnabled: true } },
+        'globalConfig/get': {
+          value: { directUploadsEnabled: true, maximumFileUploadSize: 40 },
+        },
       };
       return getterMap[getter];
     });
@@ -86,7 +92,9 @@ describe('useFileUpload', () => {
         getCurrentAccountId: { value: '123' },
         getCurrentUser: { value: { access_token: 'test-token' } },
         getSelectedChat: { value: { id: '456' } },
-        'globalConfig/get': { value: { directUploadsEnabled: false } },
+        'globalConfig/get': {
+          value: { directUploadsEnabled: false, maximumFileUploadSize: 40 },
+        },
       };
       return getterMap[getter];
     });
diff --git a/app/javascript/dashboard/composables/useAutomationValues.js b/app/javascript/dashboard/composables/useAutomationValues.js
index 5279f15e4..6a6b507c8 100644
--- a/app/javascript/dashboard/composables/useAutomationValues.js
+++ b/app/javascript/dashboard/composables/useAutomationValues.js
@@ -14,7 +14,7 @@ import {
 } from 'dashboard/constants/automation';
 
 /**
- * This is a shared composables that holds utilites used to build dropdown and file options
+ * This is a shared composables that holds utilities used to build dropdown and file options
  * @returns {Object} An object containing various automation-related functions and computed properties.
  */
 export default function useAutomationValues() {
diff --git a/app/javascript/dashboard/composables/useCaptain.js b/app/javascript/dashboard/composables/useCaptain.js
index 3f93cfc58..a9eedcc9a 100644
--- a/app/javascript/dashboard/composables/useCaptain.js
+++ b/app/javascript/dashboard/composables/useCaptain.js
@@ -1,5 +1,5 @@
 import { computed } from 'vue';
-import { useStore } from 'dashboard/composables/store.js';
+import { useMapGetter, useStore } from 'dashboard/composables/store.js';
 import { useAccount } from 'dashboard/composables/useAccount';
 import { useConfig } from 'dashboard/composables/useConfig';
 import { useCamelCase } from 'dashboard/composables/useTransformKeys';
@@ -9,6 +9,7 @@ export function useCaptain() {
   const store = useStore();
   const { isCloudFeatureEnabled, currentAccount } = useAccount();
   const { isEnterprise } = useConfig();
+  const uiFlags = useMapGetter('accounts/getUIFlags');
 
   const captainEnabled = computed(() => {
     return isCloudFeatureEnabled(FEATURE_FLAGS.CAPTAIN);
@@ -34,6 +35,8 @@ export function useCaptain() {
     return null;
   });
 
+  const isFetchingLimits = computed(() => uiFlags.value.isFetchingLimits);
+
   const fetchLimits = () => {
     if (isEnterprise) {
       store.dispatch('accounts/limits');
@@ -46,5 +49,6 @@ export function useCaptain() {
     documentLimits,
     responseLimits,
     fetchLimits,
+    isFetchingLimits,
   };
 }
diff --git a/app/javascript/dashboard/composables/useFileUpload.js b/app/javascript/dashboard/composables/useFileUpload.js
index c0105d321..a0c7e3297 100644
--- a/app/javascript/dashboard/composables/useFileUpload.js
+++ b/app/javascript/dashboard/composables/useFileUpload.js
@@ -4,7 +4,11 @@ import { useI18n } from 'vue-i18n';
 import { DirectUpload } from 'activestorage';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import { getMaxUploadSizeByChannel } from '@chatwoot/utils';
-import { MAXIMUM_FILE_UPLOAD_SIZE } from 'shared/constants/messages';
+import {
+  DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE,
+  resolveMaximumFileUploadSize,
+} from 'shared/helpers/FileHelper';
+import { INBOX_TYPES } from 'dashboard/helper/inbox';
 
 /**
  * Composable for handling file uploads in conversations
@@ -21,18 +25,34 @@ export const useFileUpload = ({ inbox, attachFile, isPrivateNote = false }) => {
   const currentChat = useMapGetter('getSelectedChat');
   const globalConfig = useMapGetter('globalConfig/get');
 
+  const installationLimit = resolveMaximumFileUploadSize(
+    globalConfig.value?.maximumFileUploadSize
+  );
+
   // helper: compute max upload size for a given file's mime
   const maxSizeFor = mime => {
-    // Use default file size limit for private notes
+    // Use default/installation limit for private notes
     if (isPrivateNote) {
-      return MAXIMUM_FILE_UPLOAD_SIZE;
+      return installationLimit;
     }
 
-    return getMaxUploadSizeByChannel({
-      channelType: inbox?.channel_type,
+    const channelType = inbox?.channel_type;
+
+    if (!channelType || channelType === INBOX_TYPES.WEB) {
+      return installationLimit;
+    }
+
+    const channelLimit = getMaxUploadSizeByChannel({
+      channelType,
       medium: inbox?.medium, // e.g. 'sms' | 'whatsapp' | etc.
       mime, // e.g. 'image/png'
     });
+
+    if (channelLimit === DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE) {
+      return installationLimit;
+    }
+
+    return Math.min(channelLimit, installationLimit);
   };
 
   const alertOverLimit = maxSizeMB =>
diff --git a/app/javascript/dashboard/composables/useVoiceCallStatus.js b/app/javascript/dashboard/composables/useVoiceCallStatus.js
deleted file mode 100644
index 111dab2ca..000000000
--- a/app/javascript/dashboard/composables/useVoiceCallStatus.js
+++ /dev/null
@@ -1,161 +0,0 @@
-import { computed, unref } from 'vue';
-
-const CALL_STATUSES = {
-  IN_PROGRESS: 'in-progress',
-  RINGING: 'ringing',
-  NO_ANSWER: 'no-answer',
-  BUSY: 'busy',
-  FAILED: 'failed',
-  COMPLETED: 'completed',
-  CANCELED: 'canceled',
-};
-
-const CALL_DIRECTIONS = {
-  INBOUND: 'inbound',
-  OUTBOUND: 'outbound',
-};
-
-/**
- * Composable for handling voice call status display logic
- * @param {Ref|string} statusRef - Call status (ringing, in-progress, etc.)
- * @param {Ref|string} directionRef - Call direction (inbound, outbound)
- * @returns {Object} UI properties for displaying call status
- */
-export function useVoiceCallStatus(statusRef, directionRef) {
-  const status = computed(() => unref(statusRef)?.toString());
-  const direction = computed(() => unref(directionRef)?.toString());
-
-  // Status group helpers
-  const isFailedStatus = computed(() =>
-    [
-      CALL_STATUSES.NO_ANSWER,
-      CALL_STATUSES.BUSY,
-      CALL_STATUSES.FAILED,
-    ].includes(status.value)
-  );
-  const isEndedStatus = computed(() =>
-    [CALL_STATUSES.COMPLETED, CALL_STATUSES.CANCELED].includes(status.value)
-  );
-  const isOutbound = computed(
-    () => direction.value === CALL_DIRECTIONS.OUTBOUND
-  );
-
-  const labelKey = computed(() => {
-    const s = status.value;
-
-    if (s === CALL_STATUSES.IN_PROGRESS) {
-      return isOutbound.value
-        ? 'CONVERSATION.VOICE_CALL.OUTGOING_CALL'
-        : 'CONVERSATION.VOICE_CALL.CALL_IN_PROGRESS';
-    }
-
-    if (s === CALL_STATUSES.RINGING) {
-      return isOutbound.value
-        ? 'CONVERSATION.VOICE_CALL.OUTGOING_CALL'
-        : 'CONVERSATION.VOICE_CALL.INCOMING_CALL';
-    }
-
-    if (s === CALL_STATUSES.NO_ANSWER) {
-      return 'CONVERSATION.VOICE_CALL.MISSED_CALL';
-    }
-
-    if (isFailedStatus.value) {
-      return 'CONVERSATION.VOICE_CALL.NO_ANSWER';
-    }
-
-    if (isEndedStatus.value) {
-      return 'CONVERSATION.VOICE_CALL.CALL_ENDED';
-    }
-
-    return 'CONVERSATION.VOICE_CALL.INCOMING_CALL';
-  });
-
-  const subtextKey = computed(() => {
-    const s = status.value;
-
-    if (s === CALL_STATUSES.RINGING) {
-      return 'CONVERSATION.VOICE_CALL.NOT_ANSWERED_YET';
-    }
-
-    if (s === CALL_STATUSES.IN_PROGRESS) {
-      return isOutbound.value
-        ? 'CONVERSATION.VOICE_CALL.THEY_ANSWERED'
-        : 'CONVERSATION.VOICE_CALL.YOU_ANSWERED';
-    }
-
-    if (isFailedStatus.value) {
-      return 'CONVERSATION.VOICE_CALL.NO_ANSWER';
-    }
-
-    if (isEndedStatus.value) {
-      return 'CONVERSATION.VOICE_CALL.CALL_ENDED';
-    }
-
-    return 'CONVERSATION.VOICE_CALL.NOT_ANSWERED_YET';
-  });
-
-  const bubbleIconName = computed(() => {
-    const s = status.value;
-
-    if (s === CALL_STATUSES.IN_PROGRESS) {
-      return isOutbound.value
-        ? 'i-ph-phone-outgoing-fill'
-        : 'i-ph-phone-incoming-fill';
-    }
-
-    if (isFailedStatus.value) {
-      return 'i-ph-phone-x-fill';
-    }
-
-    // For ringing/completed/canceled show direction when possible
-    return isOutbound.value
-      ? 'i-ph-phone-outgoing-fill'
-      : 'i-ph-phone-incoming-fill';
-  });
-
-  const bubbleIconBg = computed(() => {
-    const s = status.value;
-
-    if (s === CALL_STATUSES.IN_PROGRESS) {
-      return 'bg-n-teal-9';
-    }
-
-    if (isFailedStatus.value) {
-      return 'bg-n-ruby-9';
-    }
-
-    if (isEndedStatus.value) {
-      return 'bg-n-slate-11';
-    }
-
-    // default (e.g., ringing)
-    return 'bg-n-teal-9 animate-pulse';
-  });
-
-  const listIconColor = computed(() => {
-    const s = status.value;
-
-    if (s === CALL_STATUSES.IN_PROGRESS || s === CALL_STATUSES.RINGING) {
-      return 'text-n-teal-9';
-    }
-
-    if (isFailedStatus.value) {
-      return 'text-n-ruby-9';
-    }
-
-    if (isEndedStatus.value) {
-      return 'text-n-slate-11';
-    }
-
-    return 'text-n-teal-9';
-  });
-
-  return {
-    status,
-    labelKey,
-    subtextKey,
-    bubbleIconName,
-    bubbleIconBg,
-    listIconColor,
-  };
-}
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 87227e74b..0508826d6 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -41,6 +41,7 @@ export const FEATURE_FLAGS = {
   CAPTAIN_V2: 'captain_integration_v2',
   SAML: 'saml',
   QUOTED_EMAIL_REPLY: 'quoted_email_reply',
+  COMPANIES: 'companies',
 };
 
 export const PREMIUM_FEATURES = [
diff --git a/app/javascript/dashboard/helper/scriptHelpers.js b/app/javascript/dashboard/helper/scriptHelpers.js
index cb9bffbea..f779a586d 100644
--- a/app/javascript/dashboard/helper/scriptHelpers.js
+++ b/app/javascript/dashboard/helper/scriptHelpers.js
@@ -21,7 +21,7 @@ export const initializeAudioAlerts = user => {
     enable_audio_alerts: audioAlertType,
     alert_if_unread_assigned_conversation_exist: alertIfUnreadConversationExist,
     notification_tone: audioAlertTone,
-    // UI Settings can be undefined initally as we don't send the
+    // UI Settings can be undefined initially as we don't send the
     // entire payload for the user during the signup process.
   } = uiSettings || {};
 
diff --git a/app/javascript/dashboard/i18n/locale/am/bulkActions.json b/app/javascript/dashboard/i18n/locale/am/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/am/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/am/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/am/contact.json b/app/javascript/dashboard/i18n/locale/am/contact.json
index 63b8f10dd..c02fa960c 100644
--- a/app/javascript/dashboard/i18n/locale/am/contact.json
+++ b/app/javascript/dashboard/i18n/locale/am/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "በአሁኑ ጊዜ ንቁ እውቂያዎች የሉም 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/am/integrations.json b/app/javascript/dashboard/i18n/locale/am/integrations.json
index 6c1c9e484..ef3e94e42 100644
--- a/app/javascript/dashboard/i18n/locale/am/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/am/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/am/report.json b/app/javascript/dashboard/i18n/locale/am/report.json
index c622170b0..dbf59f603 100644
--- a/app/javascript/dashboard/i18n/locale/am/report.json
+++ b/app/javascript/dashboard/i18n/locale/am/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/am/settings.json b/app/javascript/dashboard/i18n/locale/am/settings.json
index 812b0cd8b..50cf38b58 100644
--- a/app/javascript/dashboard/i18n/locale/am/settings.json
+++ b/app/javascript/dashboard/i18n/locale/am/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/ar/bulkActions.json b/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
index 1b0e4a6d6..474983317 100644
--- a/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "إضافة وسم",
-      "NO_LABELS_FOUND": "لم يتم العثور على تسميات لـ",
+      "NO_LABELS_FOUND": "لم يتم العثور على تصنيفات",
       "ASSIGN_SELECTED_LABELS": "تعيين التسميات المحددة",
       "ASSIGN_SUCCESFUL": "تم تعيين التسميات بنجاح.",
       "ASSIGN_FAILED": "فشل في تعيين التسميات ، الرجاء المحاولة مرة أخرى."
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index d7eccb643..7c14f9931 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "تعيين التسميات",
+    "ASSIGN_LABELS_SUCCESS": "تم تعيين التسميات بنجاح.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "حذف",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "حذف جهة الاتصال"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
index f5cc4427b..9b9f957d8 100644
--- a/app/javascript/dashboard/i18n/locale/ar/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "رابط Webhook",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "قائد",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "الإعدادات",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "الكل"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "تعديل",
+        "DELETE_RESPONSE": "حذف"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ar/report.json b/app/javascript/dashboard/i18n/locale/ar/report.json
index 8aeb7d9fa..ac8e46365 100644
--- a/app/javascript/dashboard/i18n/locale/ar/report.json
+++ b/app/javascript/dashboard/i18n/locale/ar/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "آخر 7 أيام",
       "LAST_14_DAYS": "آخر 14 يوماً",
       "LAST_30_DAYS": "آخر 30 يوماً",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "آخر 3 أشهر",
       "LAST_6_MONTHS": "آخر 6 أشهر",
       "LAST_YEAR": "العام الماضي",
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index 22b9cb254..fa09f590a 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "تم تعليق الحساب",
       "MESSAGE": "تم تعليق حسابك. يرجى الاتصال بفريق الدعم للمزيد من المعلومات."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "قنوات التواصل",
+    "CAPTAIN_SETTINGS": "الإعدادات",
     "HOME": "الرئيسية",
     "AGENTS": "وكيل الدعم",
     "AGENT_BOTS": "الروبوتات",
diff --git a/app/javascript/dashboard/i18n/locale/az/bulkActions.json b/app/javascript/dashboard/i18n/locale/az/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/az/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/az/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/az/contact.json b/app/javascript/dashboard/i18n/locale/az/contact.json
index 54d783efc..7ca051092 100644
--- a/app/javascript/dashboard/i18n/locale/az/contact.json
+++ b/app/javascript/dashboard/i18n/locale/az/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/az/integrations.json b/app/javascript/dashboard/i18n/locale/az/integrations.json
index 6c1c9e484..ef3e94e42 100644
--- a/app/javascript/dashboard/i18n/locale/az/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/az/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/az/report.json b/app/javascript/dashboard/i18n/locale/az/report.json
index c622170b0..dbf59f603 100644
--- a/app/javascript/dashboard/i18n/locale/az/report.json
+++ b/app/javascript/dashboard/i18n/locale/az/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/az/settings.json b/app/javascript/dashboard/i18n/locale/az/settings.json
index 812b0cd8b..50cf38b58 100644
--- a/app/javascript/dashboard/i18n/locale/az/settings.json
+++ b/app/javascript/dashboard/i18n/locale/az/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/bg/bulkActions.json b/app/javascript/dashboard/i18n/locale/bg/bulkActions.json
index 60f62f9b0..845af02d1 100644
--- a/app/javascript/dashboard/i18n/locale/bg/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/bg/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "Няма намерени етикети",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/bg/contact.json b/app/javascript/dashboard/i18n/locale/bg/contact.json
index 47d3a9e44..14d35b90c 100644
--- a/app/javascript/dashboard/i18n/locale/bg/contact.json
+++ b/app/javascript/dashboard/i18n/locale/bg/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Изтрий",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Изтриване на контакта"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/bg/integrations.json b/app/javascript/dashboard/i18n/locale/bg/integrations.json
index 1d9c9c370..ae4e76c2e 100644
--- a/app/javascript/dashboard/i18n/locale/bg/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/bg/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Всички"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Редактирай",
+        "DELETE_RESPONSE": "Изтрий"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/bg/report.json b/app/javascript/dashboard/i18n/locale/bg/report.json
index 5ba9c2508..fb1f34d3c 100644
--- a/app/javascript/dashboard/i18n/locale/bg/report.json
+++ b/app/javascript/dashboard/i18n/locale/bg/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 7879190b6..3d1cd4fe3 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Агенти",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/bn/bulkActions.json b/app/javascript/dashboard/i18n/locale/bn/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/bn/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/bn/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/bn/contact.json b/app/javascript/dashboard/i18n/locale/bn/contact.json
index 54d783efc..7ca051092 100644
--- a/app/javascript/dashboard/i18n/locale/bn/contact.json
+++ b/app/javascript/dashboard/i18n/locale/bn/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/bn/integrations.json b/app/javascript/dashboard/i18n/locale/bn/integrations.json
index 6c1c9e484..ef3e94e42 100644
--- a/app/javascript/dashboard/i18n/locale/bn/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/bn/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/bn/report.json b/app/javascript/dashboard/i18n/locale/bn/report.json
index c622170b0..dbf59f603 100644
--- a/app/javascript/dashboard/i18n/locale/bn/report.json
+++ b/app/javascript/dashboard/i18n/locale/bn/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/bn/settings.json b/app/javascript/dashboard/i18n/locale/bn/settings.json
index 812b0cd8b..50cf38b58 100644
--- a/app/javascript/dashboard/i18n/locale/bn/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bn/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/ca/bulkActions.json b/app/javascript/dashboard/i18n/locale/ca/bulkActions.json
index 7c131f53a..59eefd84d 100644
--- a/app/javascript/dashboard/i18n/locale/ca/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ca/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assignar etiquetes",
-      "NO_LABELS_FOUND": "No s'han trobat etiquetes per a",
+      "NO_LABELS_FOUND": "No s'han trobat etiquetes",
       "ASSIGN_SELECTED_LABELS": "Assigna les etiquetes seleccionades",
       "ASSIGN_SUCCESFUL": "L'etiqueta s'ha assignat correctament.",
       "ASSIGN_FAILED": "No s'han pogut assignar les etiquetes. Torna-ho a provar."
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index 7578e172f..3b51ad219 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "L'etiqueta s'ha assignat correctament.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Esborrar",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Contacte esborrat"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index e354ccc2e..f754e0530 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "URL del webhook",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Configuracions",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Totes"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edita",
+        "DELETE_RESPONSE": "Esborrar"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ca/report.json b/app/javascript/dashboard/i18n/locale/ca/report.json
index 2a3d6cd32..1db2cca6a 100644
--- a/app/javascript/dashboard/i18n/locale/ca/report.json
+++ b/app/javascript/dashboard/i18n/locale/ca/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Últims 7 dies",
       "LAST_14_DAYS": "Últims 14 dies",
       "LAST_30_DAYS": "Últims 30 dies",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Últims tres mesos",
       "LAST_6_MONTHS": "Últims sis mesos",
       "LAST_YEAR": "Darrer any",
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index bf9ec5edc..f46d812c2 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Compte suspès",
       "MESSAGE": "El teu compte està suspès. Posa't en contacte amb l'equip d'assistència per obtenir més informació."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Safates d'entrada",
+    "CAPTAIN_SETTINGS": "Configuracions",
     "HOME": "Inici",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/cs/bulkActions.json b/app/javascript/dashboard/i18n/locale/cs/bulkActions.json
index 6da258038..35d498708 100644
--- a/app/javascript/dashboard/i18n/locale/cs/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/cs/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index 345e0ba4f..7650aabed 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Vymazat",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/cs/integrations.json b/app/javascript/dashboard/i18n/locale/cs/integrations.json
index 97744ae27..88f86abd7 100644
--- a/app/javascript/dashboard/i18n/locale/cs/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/cs/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "URL webového háčku",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Nastavení",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Vše"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Upravit",
+        "DELETE_RESPONSE": "Vymazat"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/cs/report.json b/app/javascript/dashboard/i18n/locale/cs/report.json
index 6cf765f24..2831eeeb0 100644
--- a/app/javascript/dashboard/i18n/locale/cs/report.json
+++ b/app/javascript/dashboard/i18n/locale/cs/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Posledních 7 dní",
       "LAST_14_DAYS": "Posledních 14 dní",
       "LAST_30_DAYS": "Posledních 30 dní",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Poslední 3 měsíce",
       "LAST_6_MONTHS": "Posledních 6 měsíců",
       "LAST_YEAR": "Poslední rok",
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index 616e16942..c6e26c413 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Schránky",
+    "CAPTAIN_SETTINGS": "Nastavení",
     "HOME": "Domů",
     "AGENTS": "Agenti",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/da/bulkActions.json b/app/javascript/dashboard/i18n/locale/da/bulkActions.json
index c67f3ac46..f5fc5d031 100644
--- a/app/javascript/dashboard/i18n/locale/da/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/da/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "Ingen etiketter fundet for",
+      "NO_LABELS_FOUND": "Ingen labels fundet",
       "ASSIGN_SELECTED_LABELS": "Tildel valgte etiketter",
       "ASSIGN_SUCCESFUL": "Etiketter tildelt med succes.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index 566b72248..d3b4e8784 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Tildel Etiketter",
+    "ASSIGN_LABELS_SUCCESS": "Etiketter tildelt med succes.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Slet",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Slet kontakt"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/da/integrations.json b/app/javascript/dashboard/i18n/locale/da/integrations.json
index 4f5290ba6..b27b5f270 100644
--- a/app/javascript/dashboard/i18n/locale/da/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/da/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Indstillinger",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Alle"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Rediger",
+        "DELETE_RESPONSE": "Slet"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/da/report.json b/app/javascript/dashboard/i18n/locale/da/report.json
index 3b81e2a18..fb93cb681 100644
--- a/app/javascript/dashboard/i18n/locale/da/report.json
+++ b/app/javascript/dashboard/i18n/locale/da/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Seneste 7 dage",
       "LAST_14_DAYS": "Seneste 14 dage",
       "LAST_30_DAYS": "Seneste 30 dage",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Seneste 3 måneder",
       "LAST_6_MONTHS": "Seneste 6 måneder",
       "LAST_YEAR": "Sidste år",
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index b2db02ef5..02e958cec 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Konto Suspenderet",
       "MESSAGE": "Din konto er suspenderet. Gå ud til supportteamet for mere information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Indbakker",
+    "CAPTAIN_SETTINGS": "Indstillinger",
     "HOME": "Hjem",
     "AGENTS": "Agenter",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/de/bulkActions.json b/app/javascript/dashboard/i18n/locale/de/bulkActions.json
index 30a35899c..b29f17fdd 100644
--- a/app/javascript/dashboard/i18n/locale/de/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/de/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Labels zuweisen",
-      "NO_LABELS_FOUND": "Keine Labels gefunden für",
+      "NO_LABELS_FOUND": "Keine Labels gefunden",
       "ASSIGN_SELECTED_LABELS": "Ausgewählte Labels zuweisen",
       "ASSIGN_SUCCESFUL": "Labels erfolgreich zugewiesen.",
       "ASSIGN_FAILED": "Labels konnten nicht zugewiesen werden. Bitte versuchen Sie es erneut."
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index b91c2ce7b..8907118f6 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -18,9 +18,9 @@
     "CREATED_AT_LABEL": "Erstellt",
     "NEW_MESSAGE": "Neue Nachricht",
     "CALL": "Anruf",
-    "CALL_UNDER_DEVELOPMENT": "Calling is under development",
+    "CALL_UNDER_DEVELOPMENT": "Anrufe sind in der Entwicklung",
     "VOICE_INBOX_PICKER": {
-      "TITLE": "Choose a voice inbox"
+      "TITLE": "Spracheingang wählen"
     },
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "Es sind keine vorherigen Gespräche mit diesem Kontakt verbunden.",
@@ -554,12 +554,12 @@
         "WROTE": "schrieb",
         "YOU": "Sie",
         "SAVE": "Notiz speichern",
-        "ADD_NOTE": "Add contact note",
+        "ADD_NOTE": "Füge eine Kontakt-Notiz hinzu",
         "EXPAND": "Erweitern",
         "COLLAPSE": "Einklappen",
         "NO_NOTES": "Keine Notizen, Sie können Notizen auf der Kontakt-Detailseite hinzufügen.",
         "EMPTY_STATE": "Es gibt keine Notizen zu diesem Kontakt. Sie können eine Notiz hinzufügen, indem Sie diese in das obige Feld eingeben.",
-        "CONVERSATION_EMPTY_STATE": "There are no notes yet. Use the Add note button to create one."
+        "CONVERSATION_EMPTY_STATE": "Es sind noch keine Notizen vorhanden. Benutzen Sie die Schaltfläche \"Notiz hinzufügen\" um eine zu erstellen."
       }
     },
     "EMPTY_STATE": {
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "Im Moment sind keine Kontakte aktiv 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Labels zuweisen",
+    "ASSIGN_LABELS_SUCCESS": "Labels erfolgreich zugewiesen.",
+    "ASSIGN_LABELS_FAILED": "Fehler beim Zuweisen der Labels",
+    "DESCRIPTION": "Wählen Sie die Labels aus, die zu den ausgewählten Kontakten hinzugefügt werden sollen.",
+    "NO_LABELS_FOUND": "Noch keine Labels vorhanden.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Auswahl löschen",
+    "SELECT_ALL": "Alle auswählen ({count})",
+    "DELETE_CONTACTS": "Löschen",
+    "DELETE_SUCCESS": "Kontakte erfolgreich gelöscht.",
+    "DELETE_FAILED": "Kontakte konnten nicht gelöscht werden.",
+    "DELETE_DIALOG": {
+      "TITLE": "Ausgewählte Kontakte löschen",
+      "SINGULAR_TITLE": "Ausgewählten Kontakt löschen",
+      "DESCRIPTION": "Dies wird {count} ausgewählte Kontakte dauerhaft löschen. Diese Aktion kann nicht rückgängig gemacht werden.",
+      "SINGULAR_DESCRIPTION": "Der ausgewählte Kontakt wird dauerhaft gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.",
+      "CONFIRM_MULTIPLE": "Kontakte löschen",
+      "CONFIRM_SINGLE": "Kontakt löschen"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "Wir konnten die Suche nicht abschließen. Bitte versuch es erneut."
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index 56b39edb9..b30f38ebe 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -36,10 +36,10 @@
     "NOT_ASSIGNED_TO_YOU": "Diese Konversation ist Ihnen nicht zugeordnet. Möchten Sie dieses Gespräch sich selbst zuordnen?",
     "ASSIGN_TO_ME": "Mir zuweisen",
     "BOT_HANDOFF_MESSAGE": "Sie antworten auf eine Unterhaltung, die derzeit von einem Assistenten oder einem Bot bearbeitet wird.",
-    "BOT_HANDOFF_ACTION": "Mark open and assign to you",
-    "BOT_HANDOFF_REOPEN_ACTION": "Mark conversation open",
-    "BOT_HANDOFF_SUCCESS": "Conversation has been handed over to you",
-    "BOT_HANDOFF_ERROR": "Failed to take over the conversation. Please try again.",
+    "BOT_HANDOFF_ACTION": "Als geöffnet markieren und Ihnen zuweisen",
+    "BOT_HANDOFF_REOPEN_ACTION": "Gespräch als geöffnet markieren",
+    "BOT_HANDOFF_SUCCESS": "Die Unterhaltung wurde dir übergeben",
+    "BOT_HANDOFF_ERROR": "Die Unterhaltung konnte nicht übernommen werden. Bitte versuche es erneut.",
     "TWILIO_WHATSAPP_CAN_REPLY": "Sie können auf diese Konversation nur mit einer Nachrichtenvorlage antworten wegen",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24-Stunden-Nachrichtenfenster-Beschränkung",
     "OLD_INSTAGRAM_INBOX_REPLY_BANNER": "Dieser Instagram-Account wurde in den neuen Instagram-Kanal übertragen. Alle neuen Nachrichten werden dort erscheinen. Sie werden keine Nachrichten mehr von dieser Unterhaltung senden können.",
@@ -72,15 +72,15 @@
       "HIDE_LABELS": "Labels ausblenden"
     },
     "VOICE_CALL": {
-      "INCOMING_CALL": "Incoming call",
-      "OUTGOING_CALL": "Outgoing call",
-      "CALL_IN_PROGRESS": "Call in progress",
-      "NO_ANSWER": "No answer",
-      "MISSED_CALL": "Missed call",
-      "CALL_ENDED": "Call ended",
-      "NOT_ANSWERED_YET": "Not answered yet",
-      "THEY_ANSWERED": "They answered",
-      "YOU_ANSWERED": "You answered"
+      "INCOMING_CALL": "Eingehender Anruf",
+      "OUTGOING_CALL": "Ausgehender Anruf",
+      "CALL_IN_PROGRESS": "Anruf läuft",
+      "NO_ANSWER": "Keine Antwort",
+      "MISSED_CALL": "Entgangener Anruf",
+      "CALL_ENDED": "Anruf beendet",
+      "NOT_ANSWERED_YET": "Noch nicht beantwortet",
+      "THEY_ANSWERED": "Sie antworteten",
+      "YOU_ANSWERED": "Sie haben beantwortet"
     },
     "HEADER": {
       "RESOLVE_ACTION": "Fall schließen",
@@ -160,9 +160,9 @@
       "AGENTS_LOADING": "Agenten werden geladen...",
       "ASSIGN_TEAM": "Team zuweisen",
       "DELETE": "Unterhaltung löschen",
-      "OPEN_IN_NEW_TAB": "Open in new tab",
-      "COPY_LINK": "Copy conversation link",
-      "COPY_LINK_SUCCESS": "Conversation link copied to clipboard",
+      "OPEN_IN_NEW_TAB": "In neuem Tab öffnen",
+      "COPY_LINK": "Konversationslink kopieren",
+      "COPY_LINK_SUCCESS": "Konversationslink in Zwischenablage kopiert",
       "API": {
         "AGENT_ASSIGNMENT": {
           "SUCCESFUL": "Konversations-ID {conversationId} zugewiesen zu \"{agentName}\"",
@@ -229,11 +229,11 @@
         }
       },
       "QUOTED_REPLY": {
-        "ENABLE_TOOLTIP": "Include quoted email thread",
-        "DISABLE_TOOLTIP": "Don't include quoted email thread",
-        "REMOVE_PREVIEW": "Remove quoted email thread",
-        "COLLAPSE": "Collapse preview",
-        "EXPAND": "Expand preview"
+        "ENABLE_TOOLTIP": "Zitierten E-Mail-Thread einbeziehen",
+        "DISABLE_TOOLTIP": "Zitierten E-Mail-Thread nicht einbeziehen",
+        "REMOVE_PREVIEW": "Zitierte E-Mail-Themen entfernen",
+        "COLLAPSE": "Vorschau ausblenden",
+        "EXPAND": "Vorschau erweitern"
       }
     },
     "VISIBLE_TO_AGENTS": "Privater Hinweis: Nur für Sie und Ihr Team sichtbar",
@@ -338,7 +338,7 @@
       "CONTACT_ATTRIBUTES": "Kontakt-Attribute",
       "PREVIOUS_CONVERSATION": "Vorherige Konversationen",
       "MACROS": "Makros",
-      "LINEAR_ISSUES": "Linked Linear Issues",
+      "LINEAR_ISSUES": "Verknüpfte lineare Probleme",
       "SHOPIFY_ORDERS": "Shopify Orders"
     },
     "SHOPIFY": {
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index bf67ac1b0..33c2c2843 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -3,7 +3,7 @@
     "LIMIT_MESSAGES": {
       "CONVERSATION": "Sie haben das Konversationslimit überschritten. Der Hacker Plan erlaubt nur 500 Unterhaltungen.",
       "INBOXES": "Sie haben das Posteingang-Limit überschritten. Der Hacker-Plan unterstützt nur Live-Chat der Webseite. Zusätzliche Posteingänge wie E-Mail, WhatsApp usw. erfordern einen kostenpflichtigen Tarif.",
-      "AGENTS": "You have exceeded the agent limit. Your plan only allows {allowedAgents} agents.",
+      "AGENTS": "Sie haben das Agenten-Limit überschritten. Ihr Plan erlaubt nur {allowedAgents} Agenten.",
       "NON_ADMIN": "Bitte kontaktieren Sie Ihren Administrator, um den Plan zu upgraden und alle Funktionen weiterzunutzen."
     },
     "TITLE": "Kontoeinstellungen",
@@ -25,13 +25,13 @@
         "DISMISS": "Stornieren",
         "PLACE_HOLDER": "Bitte {accountName} zur Bestätigung eingeben"
       },
-      "SUCCESS": "Account marked for deletion",
-      "FAILURE": "Could not delete account, try again!",
+      "SUCCESS": "Konto zur Löschung markiert",
+      "FAILURE": "Konto konnte nicht gelöscht werden, versuche es erneut!",
       "SCHEDULED_DELETION": {
-        "TITLE": "Account Scheduled for Deletion",
-        "MESSAGE_MANUAL": "This account is scheduled for deletion on {deletionDate}. This was requested by an administrator. You can cancel the deletion before this date.",
-        "MESSAGE_INACTIVITY": "This account is scheduled for deletion on {deletionDate} due to account inactivity. You can cancel the deletion before this date.",
-        "CLEAR_BUTTON": "Cancel Scheduled Deletion"
+        "TITLE": "Konto für Löschung geplant",
+        "MESSAGE_MANUAL": "Dieses Konto ist für das Löschen auf {deletionDate} geplant. Dies wurde von einem Administrator angefordert. Sie können das Löschen vor diesem Datum abbrechen.",
+        "MESSAGE_INACTIVITY": "Dieses Konto ist für die Löschung auf {deletionDate} aufgrund von Kontoinaktivität vorgesehen. Sie können die Löschung vor diesem Datum abbrechen.",
+        "CLEAR_BUTTON": "Geplante Löschung abbrechen"
       }
     },
     "FORM": {
@@ -45,13 +45,13 @@
         "NOTE": "Diese ID ist erforderlich, wenn Sie eine API-basierte Integration erstellen"
       },
       "AUTO_RESOLVE": {
-        "TITLE": "Auto-resolve conversations",
-        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period of inactivity.",
+        "TITLE": "Unterhaltungen automatisch auflösen",
+        "NOTE": "Diese Konfiguration würde es Ihnen ermöglichen, die Unterhaltung nach einer gewissen Zeit der Inaktivität automatisch zu beenden.",
         "DURATION": {
-          "LABEL": "Inactivity duration",
-          "HELP": "Time period of inactivity after which conversation is auto-resolved",
+          "LABEL": "Dauer der Inaktivität",
+          "HELP": "Zeit der Inaktivität, nach der die Unterhaltung automatisch gelöst wird",
           "PLACEHOLDER": "30",
-          "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+          "ERROR": "Automatische Auflösungsdauer sollte zwischen 10 Minuten und 999 Tagen liegen",
           "API": {
             "SUCCESS": "Auto resolve settings updated successfully",
             "ERROR": "Failed to update auto resolve settings"
@@ -108,7 +108,7 @@
         "LABEL": "Inactivity duration for resolution",
         "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "ERROR": "Automatische Auflösungsdauer sollte zwischen 10 Minuten und 999 Tagen liegen",
         "API": {
           "SUCCESS": "Auto resolve settings updated successfully",
           "ERROR": "Failed to update auto resolve settings"
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index 1b23f7613..fe86cc204 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -296,17 +296,17 @@
           "WAITING_FOR_AUTH": "Waiting for authentication...",
           "INVALID_BUSINESS_DATA": "Invalid business data received from Facebook. Please try again.",
           "SIGNUP_ERROR": "Signup error occurred",
-          "AUTH_NOT_COMPLETED": "Authentication not completed. Please restart the process.",
-          "SUCCESS_FALLBACK": "WhatsApp Business Account has been successfully configured",
-          "MANUAL_FALLBACK": "If your number is already connected to the WhatsApp Business Platform (API), or if you’re a tech provider onboarding your own number, please use the {link} flow",
-          "MANUAL_LINK_TEXT": "manual setup flow"
+          "AUTH_NOT_COMPLETED": "Authentifizierung nicht abgeschlossen. Bitte starte den Prozess neu.",
+          "SUCCESS_FALLBACK": "WhatsApp Business Account wurde erfolgreich konfiguriert",
+          "MANUAL_FALLBACK": "Wenn Ihre Nummer bereits mit der WhatsApp Business Plattform (API) verbunden ist, oder wenn Sie als Technologieanbieter Ihre eigene Nummer an Bord haben, verwenden Sie bitte den {link} Flow",
+          "MANUAL_LINK_TEXT": "Manueller Einrichtungsablauf"
         },
         "API": {
           "ERROR_MESSAGE": "Wir konnten den WhatsApp-Kanal nicht speichern"
         }
       },
       "VOICE": {
-        "TITLE": "Voice Channel",
+        "TITLE": "Sprachkanal",
         "DESC": "Integrate Twilio Voice and start supporting your customers via phone calls.",
         "PHONE_NUMBER": {
           "LABEL": "Telefonnummer",
diff --git a/app/javascript/dashboard/i18n/locale/de/integrations.json b/app/javascript/dashboard/i18n/locale/de/integrations.json
index 485ab7110..c9f751b30 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook-URL",
           "PLACEHOLDER": "Beispiel: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Kapitän",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Probiere diese Prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Einstellungen",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Alle"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Bearbeiten",
+        "DELETE_RESPONSE": "Löschen"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/de/report.json b/app/javascript/dashboard/i18n/locale/de/report.json
index 820676f3f..b61ce23eb 100644
--- a/app/javascript/dashboard/i18n/locale/de/report.json
+++ b/app/javascript/dashboard/i18n/locale/de/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Letzten 7 Tage",
       "LAST_14_DAYS": "Letzten 14 Tage",
       "LAST_30_DAYS": "Letzte 30 Tage",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Die letzten 3 Monate",
       "LAST_6_MONTHS": "Die letzten 6 Monate",
       "LAST_YEAR": "Letztes Jahr",
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index 190880321..50e1cf7a5 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Konto gesperrt",
       "MESSAGE": "Ihr Account wurde gesperrt. Wenden Sie sich für weitere Informationen bitte an das Support-Team."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Posteingänge",
+    "CAPTAIN_SETTINGS": "Einstellungen",
     "HOME": "Hauptseite",
     "AGENTS": "Agenten",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/el/bulkActions.json b/app/javascript/dashboard/i18n/locale/el/bulkActions.json
index e63fe811d..0d908df18 100644
--- a/app/javascript/dashboard/i18n/locale/el/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/el/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "Δεν βρέθηκαν πρότυπα για",
+      "NO_LABELS_FOUND": "Δεν βρέθηκαν ετικέτες",
       "ASSIGN_SELECTED_LABELS": "Ανάθεση επιλεγμένων ετικετών",
       "ASSIGN_SUCCESFUL": "Επιτυχής ανάθεση ετικετών.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index bdfaec2a9..85ad20f80 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Ανάθεση Ετικετών",
+    "ASSIGN_LABELS_SUCCESS": "Επιτυχής ανάθεση ετικετών.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Διαγραφή",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Διαγραφή Επαφής"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/el/integrations.json b/app/javascript/dashboard/i18n/locale/el/integrations.json
index a79ab4253..be530ce09 100644
--- a/app/javascript/dashboard/i18n/locale/el/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/el/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Σύνδεσμος Webhook",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Ρυθμίσεις",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Όλες"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Επεξεργασία",
+        "DELETE_RESPONSE": "Διαγραφή"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/el/report.json b/app/javascript/dashboard/i18n/locale/el/report.json
index c050a93c9..aa2a68208 100644
--- a/app/javascript/dashboard/i18n/locale/el/report.json
+++ b/app/javascript/dashboard/i18n/locale/el/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Τελευταίες 7 ημέρες",
       "LAST_14_DAYS": "Τελευταίες 14 ημέρες",
       "LAST_30_DAYS": "Τελευταίες 30 ημέρες",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Τελευταίοι 3 μήνες",
       "LAST_6_MONTHS": "Τελευταίοι 6 μήνες",
       "LAST_YEAR": "Τελευταίο έτος",
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index da4c4dec5..2e8026e32 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Αναστολή Λογαριασμού",
       "MESSAGE": "Ο λογαριασμός σας έχει ανασταλεί. Επικοινωνήστε με την ομάδα υποστήριξης για περισσότερες πληροφορίες."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Κιβώτια Εισερχομένων",
+    "CAPTAIN_SETTINGS": "Ρυθμίσεις",
     "HOME": "Αρχική",
     "AGENTS": "Πράκτορες",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/en/bulkActions.json b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/en/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/en/companies.json b/app/javascript/dashboard/i18n/locale/en/companies.json
new file mode 100644
index 000000000..86190831b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/companies.json
@@ -0,0 +1,32 @@
+{
+  "COMPANIES": {
+    "HEADER": "Companies",
+    "SORT_BY": {
+      "LABEL": "Sort by",
+      "OPTIONS": {
+        "NAME": "Name",
+        "DOMAIN": "Domain",
+        "CREATED_AT": "Created at"
+      }
+    },
+    "ORDER": {
+      "LABEL": "Order",
+      "OPTIONS": {
+        "ASCENDING": "Ascending",
+        "DESCENDING": "Descending"
+      }
+    },
+    "SEARCH_PLACEHOLDER": "Search companies...",
+    "LOADING": "Loading companies...",
+    "UNNAMED": "Unnamed Company",
+    "CONTACTS_COUNT": "{n} contact | {n} contacts",
+    "EMPTY_STATE": {
+      "TITLE": "No companies found"
+    }
+  },
+  "COMPANIES_LAYOUT": {
+    "PAGINATION_FOOTER": {
+      "SHOWING": "Showing {startItem} – {endItem} of {totalItems} company | Showing {startItem} – {endItem} of {totalItems} companies"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/components.json b/app/javascript/dashboard/i18n/locale/en/components.json
index 0a2542a84..7793b419f 100644
--- a/app/javascript/dashboard/i18n/locale/en/components.json
+++ b/app/javascript/dashboard/i18n/locale/en/components.json
@@ -1,7 +1,7 @@
 {
   "PAGINATION_FOOTER": {
-    "SHOWING": "Showing {startItem} - {endItem} of {totalItems} items",
-    "CURRENT_PAGE_INFO": "{currentPage} of {totalPages} pages"
+    "SHOWING": "Showing {startItem} - {endItem} of {totalItems} item | Showing {startItem} - {endItem} of {totalItems} items",
+    "CURRENT_PAGE_INFO": "{currentPage} of {totalPages} page | {currentPage} of {totalPages} pages"
   },
   "COMBOBOX": {
     "PLACEHOLDER": "Select an option...",
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 21e8dd1b2..e324e1951 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -18,7 +18,8 @@
     "CREATED_AT_LABEL": "Created",
     "NEW_MESSAGE": "New message",
     "CALL": "Call",
-    "CALL_UNDER_DEVELOPMENT": "Calling is under development",
+    "CALL_INITIATED": "Calling the contact…",
+    "CALL_FAILED": "Unable to start the call. Please try again.",
     "VOICE_INBOX_PICKER": {
       "TITLE": "Choose a voice inbox"
     },
@@ -376,7 +377,7 @@
       }
     },
     "PAGINATION_FOOTER": {
-      "SHOWING": "Showing {startItem} - {endItem} of {totalItems} contacts"
+      "SHOWING": "Showing {startItem} - {endItem} of {totalItems} contact | Showing {startItem} - {endItem} of {totalItems} contacts"
     },
     "FILTER": {
       "NAME": "Name",
@@ -572,6 +573,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
 
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 87fe57564..a4092289e 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -381,7 +381,11 @@
         "API": {
           "ERROR_MESSAGE": "We were not able to save the email channel"
         },
-        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+        "FINISH_MESSAGE": "Your email inbox has been created successfully! You can start forwarding your emails to the address below, or configure SMTP and IMAP credentials to send and receive emails directly.",
+        "FINISH_MESSAGE_NO_FORWARDING": "Your email inbox has been created successfully! You need to configure SMTP and IMAP credentials to send and receive emails. Without these settings, no emails will be processed.",
+        "FORWARDING_ADDRESS_LABEL": "Forward emails to this address:",
+        "CONFIGURE_SMTP_IMAP_LINK": "Click here",
+        "CONFIGURE_SMTP_IMAP_TEXT": " to configure IMAP and SMTP settings"
       },
       "LINE_CHANNEL": {
         "TITLE": "LINE Channel",
@@ -707,6 +711,7 @@
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
       "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "FORWARD_EMAIL_NOT_CONFIGURED": "Forwarding emails to your inbox is currently disabled on this installation. To use this feature, it must be enabled by your administrator. Please get in touch with them to proceed.",
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index e93dcd88e..17121fc61 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -8,6 +8,7 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import companies from './companies.json';
 import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
@@ -49,6 +50,7 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...companies,
   ...components,
   ...contact,
   ...contactFilters,
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index c65d2d040..c08cde4d3 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -341,6 +345,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -480,9 +490,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -499,15 +507,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -526,9 +535,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -574,9 +580,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -622,9 +625,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -722,11 +722,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -861,6 +856,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -900,6 +896,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -916,12 +916,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -931,13 +925,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index c622170b0..dbf59f603 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 812b0cd8b..4e51ef37a 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -300,11 +306,17 @@
     "SETTINGS": "Settings",
     "CONTACTS": "Contacts",
     "ACTIVE": "Active",
+    "COMPANIES": "Companies",
+    "ALL_COMPANIES": "All Companies",
     "CAPTAIN": "Captain",
     "CAPTAIN_ASSISTANTS": "Assistants",
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
@@ -387,20 +399,45 @@
       "DESCRIPTION": "Manage usage and credits for Captain AI.",
       "BUTTON_TXT": "Buy more credits",
       "DOCUMENTS": "Documents",
-      "RESPONSES": "Responses",
-      "UPGRADE": "Captain is not available on the free plan, upgrade now to get access to assistants, copilot and more."
+      "RESPONSES": "Credits",
+      "UPGRADE": "Captain is not available on the free plan, upgrade now to get access to assistants, copilot and more.",
+      "REFRESH_CREDITS": "Refresh"
     },
     "CHAT_WITH_US": {
       "TITLE": "Need help?",
       "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
       "BUTTON_TXT": "Chat with us"
     },
-    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again.",
+    "TOPUP": {
+      "BUY_CREDITS": "Buy more credits",
+      "MODAL_TITLE": "Buy AI Credits",
+      "MODAL_DESCRIPTION": "Purchase additional credits for Captain AI.",
+      "CREDITS": "CREDITS",
+      "ONE_TIME": "one-time",
+      "POPULAR": "Most Popular",
+      "NOTE_TITLE": "Note:",
+      "NOTE_DESCRIPTION": "Credits are added immediately and expire in 6 months. An active subscription is required to use credits. Purchased credits are consumed after your monthly plan credits.",
+      "CANCEL": "Cancel",
+      "PURCHASE": "Purchase Credits",
+      "LOADING": "Loading options...",
+      "FETCH_ERROR": "Failed to load credit options. Please try again.",
+      "PURCHASE_ERROR": "Failed to process purchase. Please try again.",
+      "PURCHASE_SUCCESS": "Successfully added {credits} credits to your account",
+      "CONFIRM": {
+        "TITLE": "Confirm Purchase",
+        "DESCRIPTION": "You are about to purchase {credits} credits for {amount}.",
+        "INSTANT_DEDUCTION_NOTE": "Your saved card will be charged immediately upon confirmation.",
+        "GO_BACK": "Go Back",
+        "CONFIRM_PURCHASE": "Confirm Purchase"
+      }
+    }
   },
   "SECURITY_SETTINGS": {
     "TITLE": "Security",
     "DESCRIPTION": "Manage your account security settings.",
     "LINK_TEXT": "Learn more about SAML SSO",
+    "SAML_DISABLED_MESSAGE": "SAML SSO is currently disabled. Please contact your administrator to enable this feature.",
     "SAML": {
       "TITLE": "SAML SSO",
       "NOTE": "Configure SAML single sign-on for your account. Users will authenticate through your identity provider instead of using email/password.",
diff --git a/app/javascript/dashboard/i18n/locale/es/bulkActions.json b/app/javascript/dashboard/i18n/locale/es/bulkActions.json
index 8090fb8a2..d17d304f5 100644
--- a/app/javascript/dashboard/i18n/locale/es/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/es/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Asignar etiqueta",
-      "NO_LABELS_FOUND": "No se encontraron etiquetas para",
+      "NO_LABELS_FOUND": "No se encontraron etiquetas",
       "ASSIGN_SELECTED_LABELS": "Asignar etiquetas seleccionadas",
       "ASSIGN_SUCCESFUL": "Etiquetas asignadas correctamente.",
       "ASSIGN_FAILED": "Error al asignar etiquetas, inténtalo de nuevo."
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 4ea378323..a2fcc2a89 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No hay contactos activos por el momento 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Asignar etiquetas",
+    "ASSIGN_LABELS_SUCCESS": "Etiquetas asignadas correctamente.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Eliminar",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Eliminar contacto"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "No pudimos completar la búsqueda. Por favor, inténtalo de nuevo."
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index c81a18d41..342cab2be 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "URL de Webhook",
           "PLACEHOLDER": "Ejemplo: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Capitán",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Prueba estas sugerencias",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Ajustes",
         "BASIC_SETTINGS": {
           "TITLE": "Configuraciones básicas",
           "DESCRIPTION": ""
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "Preguntas frecuentes",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Todos"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Editar",
+        "DELETE_RESPONSE": "Eliminar"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/es/report.json b/app/javascript/dashboard/i18n/locale/es/report.json
index 1db50b270..9302dd634 100644
--- a/app/javascript/dashboard/i18n/locale/es/report.json
+++ b/app/javascript/dashboard/i18n/locale/es/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Últimos 7 días",
       "LAST_14_DAYS": "Últimos 14 días",
       "LAST_30_DAYS": "Últimos 30 días",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Últimos 3 meses",
       "LAST_6_MONTHS": "Últimos 6 meses",
       "LAST_YEAR": "Último año",
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 37a1bfda4..d3d580143 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Cuenta suspendida",
       "MESSAGE": "Tu cuenta está suspendida. Comuníquese con el equipo de soporte para obtener más información."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Cerrar sesión"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documentos",
     "CAPTAIN_RESPONSES": "Preguntas frecuentes",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Entradas",
+    "CAPTAIN_SETTINGS": "Ajustes",
     "HOME": "Inicio",
     "AGENTS": "Agentes",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/et/bulkActions.json b/app/javascript/dashboard/i18n/locale/et/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/et/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/et/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/et/contact.json b/app/javascript/dashboard/i18n/locale/et/contact.json
index 54d783efc..7ca051092 100644
--- a/app/javascript/dashboard/i18n/locale/et/contact.json
+++ b/app/javascript/dashboard/i18n/locale/et/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/et/integrations.json b/app/javascript/dashboard/i18n/locale/et/integrations.json
index 6c1c9e484..ef3e94e42 100644
--- a/app/javascript/dashboard/i18n/locale/et/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/et/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/et/report.json b/app/javascript/dashboard/i18n/locale/et/report.json
index c622170b0..dbf59f603 100644
--- a/app/javascript/dashboard/i18n/locale/et/report.json
+++ b/app/javascript/dashboard/i18n/locale/et/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/et/settings.json b/app/javascript/dashboard/i18n/locale/et/settings.json
index 812b0cd8b..50cf38b58 100644
--- a/app/javascript/dashboard/i18n/locale/et/settings.json
+++ b/app/javascript/dashboard/i18n/locale/et/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/fa/bulkActions.json b/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
index 756114b2d..226de691f 100644
--- a/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "برچسب اختصاص دهید",
-      "NO_LABELS_FOUND": "هیچ برچسبی یافت نشد برای",
+      "NO_LABELS_FOUND": "هیچ برچسبی یافت نشد",
       "ASSIGN_SELECTED_LABELS": "اختصاص برچسب‌های انتخاب شده",
       "ASSIGN_SUCCESFUL": "برچسب‌ها با موفقیت اختصاص یافتند.",
       "ASSIGN_FAILED": "اختصاص برچسب‌ به صورت موفق انجام نشد، لطفا دوباره امتحان کنید."
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 23d18cf9a..03bab99e2 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "اختصاص برچسب‌ها",
+    "ASSIGN_LABELS_SUCCESS": "برچسب‌ها با موفقیت اختصاص یافتند.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "حذف",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "حذف مخاطب"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 18402ea9c..31538b5b7 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "آدرس URL وب هوک",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "تنظیمات",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "همه"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "ویرایش",
+        "DELETE_RESPONSE": "حذف"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/fa/report.json b/app/javascript/dashboard/i18n/locale/fa/report.json
index f979b1b48..9596444e1 100644
--- a/app/javascript/dashboard/i18n/locale/fa/report.json
+++ b/app/javascript/dashboard/i18n/locale/fa/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "در ۷ روز گذشته",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "در ۳۰ روز گذشته",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "۳ ماه گذشته",
       "LAST_6_MONTHS": "۶ ماه گذشته",
       "LAST_YEAR": "پارسال",
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index ae309c5bc..4c989b0fa 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "حساب‌کاربری معلق شده است",
       "MESSAGE": "حساب‌کاربری شما به حالت تعلیق درآمده. لطفا برای اطلاعات بیشتر با تیم پشتیبانی تماس بگیرید."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "صندوق‌های ورودی",
+    "CAPTAIN_SETTINGS": "تنظیمات",
     "HOME": "صفحه اصلی",
     "AGENTS": "ایجنت ها",
     "AGENT_BOTS": "ربات‌ها",
diff --git a/app/javascript/dashboard/i18n/locale/fi/bulkActions.json b/app/javascript/dashboard/i18n/locale/fi/bulkActions.json
index 1e5bd32bf..0163c825a 100644
--- a/app/javascript/dashboard/i18n/locale/fi/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/fi/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 70f132ed8..ba992afb3 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Poista",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Poista yhteystieto"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/fi/integrations.json b/app/javascript/dashboard/i18n/locale/fi/integrations.json
index 270dcd525..3b25a48b0 100644
--- a/app/javascript/dashboard/i18n/locale/fi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fi/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhookin URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Asetukset",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Kaikki"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Muokkaa",
+        "DELETE_RESPONSE": "Poista"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/fi/report.json b/app/javascript/dashboard/i18n/locale/fi/report.json
index fc442d094..22db228b2 100644
--- a/app/javascript/dashboard/i18n/locale/fi/report.json
+++ b/app/javascript/dashboard/i18n/locale/fi/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Viimeiset 7 päivää",
       "LAST_14_DAYS": "Viimeiset 14 päivää",
       "LAST_30_DAYS": "Viimeiset 30 päivää",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index 3fbcfe345..69cd048e1 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Saapuneet-kansiot",
+    "CAPTAIN_SETTINGS": "Asetukset",
     "HOME": "Koti",
     "AGENTS": "Edustajat",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/fr/bulkActions.json b/app/javascript/dashboard/i18n/locale/fr/bulkActions.json
index a52c7df80..772e00ffe 100644
--- a/app/javascript/dashboard/i18n/locale/fr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/fr/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assigner une étiquette",
-      "NO_LABELS_FOUND": "Aucune étiquette trouvée pour",
+      "NO_LABELS_FOUND": "Aucune étiquette trouvée",
       "ASSIGN_SELECTED_LABELS": "Assigner les étiquettes sélectionnées",
       "ASSIGN_SUCCESFUL": "Étiquettes attribuées avec succès.",
       "ASSIGN_FAILED": "Impossible d'attribuer les étiquettes, veuillez réessayer."
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 7edb20e1c..e9df4e731 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "Aucun contact n'est actif pour le moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assigner des étiquettes",
+    "ASSIGN_LABELS_SUCCESS": "Étiquettes attribuées avec succès.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Supprimer",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Supprimer le contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/fr/integrations.json b/app/javascript/dashboard/i18n/locale/fr/integrations.json
index 3ee092519..b3ec7a784 100644
--- a/app/javascript/dashboard/i18n/locale/fr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fr/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Saisie de conversation désactivée"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "URL du Webhook",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Impossible de trouver l'assistant. Veuillez réessayer."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Paramètres",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Tous"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Modifier",
+        "DELETE_RESPONSE": "Supprimer"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/fr/report.json b/app/javascript/dashboard/i18n/locale/fr/report.json
index 684e4d197..5c41536e9 100644
--- a/app/javascript/dashboard/i18n/locale/fr/report.json
+++ b/app/javascript/dashboard/i18n/locale/fr/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "7 derniers jours",
       "LAST_14_DAYS": "14 derniers jours",
       "LAST_30_DAYS": "30 derniers jours",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "3 derniers mois",
       "LAST_6_MONTHS": "6 derniers mois",
       "LAST_YEAR": "Année dernière",
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index f04045ea6..66d7cefba 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Compte Suspendu",
       "MESSAGE": "Votre compte est suspendu. Veuillez contacter le support pour plus d'informations."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Outils",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Terrain de jeu",
+    "CAPTAIN_INBOXES": "Boîtes de réception",
+    "CAPTAIN_SETTINGS": "Paramètres",
     "HOME": "Accueil",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/he/bulkActions.json b/app/javascript/dashboard/i18n/locale/he/bulkActions.json
index aa99bfece..a5231bf76 100644
--- a/app/javascript/dashboard/i18n/locale/he/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/he/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "לא נצאו תוויות עבור",
+      "NO_LABELS_FOUND": "לא נמצאו תוויות",
       "ASSIGN_SELECTED_LABELS": "שייך תוויות נבחרות",
       "ASSIGN_SUCCESFUL": "תוויות שוייכו בהצלחה.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index 6f4507b71..4997ff841 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -17,10 +17,10 @@
     "IP_ADDRESS": "כתובת IP",
     "CREATED_AT_LABEL": "נוצר",
     "NEW_MESSAGE": "הודעה חדשה",
-    "CALL": "Call",
-    "CALL_UNDER_DEVELOPMENT": "Calling is under development",
+    "CALL": "שיחה",
+    "CALL_UNDER_DEVELOPMENT": "שיחות עדיין בפיתוח",
     "VOICE_INBOX_PICKER": {
-      "TITLE": "Choose a voice inbox"
+      "TITLE": "בחר תא דואר עבור שיחות"
     },
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "לא קיימות שיחות קודמות המשויכות לאיש קשר זה.",
@@ -290,7 +290,7 @@
     "HEADER": {
       "TITLE": "איש קשר",
       "SEARCH_TITLE": "Search contacts",
-      "ACTIVE_TITLE": "Active contacts",
+      "ACTIVE_TITLE": "אנשי קשר פעילים",
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "הודעה",
       "SEND_MESSAGE": "שלח הודעה",
@@ -465,8 +465,8 @@
         }
       },
       "DELETE_CONTACT": {
-        "MESSAGE": "This action is permanent and irreversible.",
-        "BUTTON": "Delete now"
+        "MESSAGE": "הפעולה הזו קבועה ובלתי ניתנת לחזרה.",
+        "BUTTON": "מחק עכשיו"
       }
     },
     "DETAILS": {
@@ -476,7 +476,7 @@
       "DELETE_CONTACT": "מחק איש קשר",
       "DELETE_DIALOG": {
         "TITLE": "אשר מחיקה",
-        "DESCRIPTION": "Are you sure you want to delete this contact?",
+        "DESCRIPTION": "אתה בטוח שאתה רוצה למחוק את איש הקשר הזה?",
         "CONFIRM": "כן, מחק",
         "API": {
           "SUCCESS_MESSAGE": "איש הקשר נמחק בהצלחה",
@@ -554,12 +554,12 @@
         "WROTE": "נכתב",
         "YOU": "You",
         "SAVE": "Save note",
-        "ADD_NOTE": "Add contact note",
+        "ADD_NOTE": "הוסף הערה לאיש הקשר",
         "EXPAND": "Expand",
-        "COLLAPSE": "Collapse",
-        "NO_NOTES": "No notes, you can add notes from the contact details page.",
+        "COLLAPSE": "צמצום",
+        "NO_NOTES": "אין הערות, אתה יכול להוסיף הערה מהעמוד של איש הקשר.",
         "EMPTY_STATE": "There are no notes associated to this contact. You can add a note by typing in the box above.",
-        "CONVERSATION_EMPTY_STATE": "There are no notes yet. Use the Add note button to create one."
+        "CONVERSATION_EMPTY_STATE": "אין הערות כרגע. השתמש בכפתור להוספת הערה."
       }
     },
     "EMPTY_STATE": {
@@ -568,7 +568,28 @@
       "BUTTON_LABEL": "Add contact",
       "SEARCH_EMPTY_STATE_TITLE": "אין אנשי קשר שתואמים לחיפוש שלך 🔍",
       "LIST_EMPTY_STATE_TITLE": "No contacts available in this view 📋",
-      "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
+      "ACTIVE_EMPTY_STATE_TITLE": "אין אנשי קשר פעילים 🌙"
+    }
+  },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "הקצה תוויות",
+    "ASSIGN_LABELS_SUCCESS": "תוויות שוייכו בהצלחה.",
+    "ASSIGN_LABELS_FAILED": "שיוך תווית נכשל",
+    "DESCRIPTION": "בחר תווית שאתה רוצה והוסף אותה לאיש קשר.",
+    "NO_LABELS_FOUND": "אין תוויות כרגע.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "נקה בחירה",
+    "SELECT_ALL": "בחר הכל ({count})",
+    "DELETE_CONTACTS": "מחק",
+    "DELETE_SUCCESS": "איש הקשר נמחק בהצלחה.",
+    "DELETE_FAILED": "מחיקת איש קשר נכשלה.",
+    "DELETE_DIALOG": {
+      "TITLE": "מחק אנשי קשר שנבחרו",
+      "SINGULAR_TITLE": "מחק איש קשר שנבחר",
+      "DESCRIPTION": "פעולה זו תמחק לצמיתות {count} אנשי קשר שנבחרו. לא ניתן לשחזר פעולה זו.",
+      "SINGULAR_DESCRIPTION": "פעולה זו תמחק לצמיתות  אנשי קשר שנבחרו. לא ניתן לשחזר פעולה זו.",
+      "CONFIRM_MULTIPLE": "מחק אנשי קשר",
+      "CONFIRM_SINGLE": "מחק איש קשר"
     }
   },
   "COMPOSE_NEW_CONVERSATION": {
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index 680924236..a26cea68d 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -32,17 +32,17 @@
     "LOADING_CONVERSATIONS": "טוען שיחות",
     "CANNOT_REPLY": "לא ניתן להשיב עקב",
     "24_HOURS_WINDOW": "הגבלת חלון הודעות של 24 שעות",
-    "API_HOURS_WINDOW": "You can only reply to this conversation within {hours} hours",
+    "API_HOURS_WINDOW": "ניתן להשיב לשיחה זו רק תוך {hours} שעות",
     "NOT_ASSIGNED_TO_YOU": "השיחה לא שייכת לך, האם תרצה לשייך אותה אליך?",
     "ASSIGN_TO_ME": "שייך לעצמך",
-    "BOT_HANDOFF_MESSAGE": "You are responding to a conversation which is currently handled by an assistant or a bot.",
-    "BOT_HANDOFF_ACTION": "Mark open and assign to you",
-    "BOT_HANDOFF_REOPEN_ACTION": "Mark conversation open",
-    "BOT_HANDOFF_SUCCESS": "Conversation has been handed over to you",
-    "BOT_HANDOFF_ERROR": "Failed to take over the conversation. Please try again.",
+    "BOT_HANDOFF_MESSAGE": "אתה מגיב לשיחה שמטופלת כרגע על ידי עוזר או בוט.",
+    "BOT_HANDOFF_ACTION": "סמן כפתוח והקצה לך",
+    "BOT_HANDOFF_REOPEN_ACTION": "סמן שיחה כפתוחה",
+    "BOT_HANDOFF_SUCCESS": "השיחה הועברה אליך",
+    "BOT_HANDOFF_ERROR": "נכשל בניסיון להשתלט על השיחה. אנא נסה שוב.",
     "TWILIO_WHATSAPP_CAN_REPLY": "אתה יכול להשיב לשיחה זו רק באמצעות הודעת תבנית בשל",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "הגבלת חלון הודעות של 24 שעות",
-    "OLD_INSTAGRAM_INBOX_REPLY_BANNER": "This Instagram account was migrated to the new Instagram channel inbox. All new messages will show up there. You won’t be able to send messages from this conversation anymore.",
+    "OLD_INSTAGRAM_INBOX_REPLY_BANNER": "חשבון אינסטגרם זה הועבר לתיבת הדואר החדשה של ערוץ אינסטגרם. כל ההודעות החדשות יופיעו שם. לא תוכל לשלוח הודעות משיחה זו יותר.",
     "REPLYING_TO": "אתה משיב ל:",
     "REMOVE_SELECTION": "הסר בחירה",
     "DOWNLOAD": "הורד",
@@ -72,21 +72,21 @@
       "HIDE_LABELS": "הסתר תוויות"
     },
     "VOICE_CALL": {
-      "INCOMING_CALL": "Incoming call",
-      "OUTGOING_CALL": "Outgoing call",
-      "CALL_IN_PROGRESS": "Call in progress",
-      "NO_ANSWER": "No answer",
-      "MISSED_CALL": "Missed call",
-      "CALL_ENDED": "Call ended",
-      "NOT_ANSWERED_YET": "Not answered yet",
-      "THEY_ANSWERED": "They answered",
-      "YOU_ANSWERED": "You answered"
+      "INCOMING_CALL": "שיחה נכנסת",
+      "OUTGOING_CALL": "שיחה יוצאת",
+      "CALL_IN_PROGRESS": "שיחה מתקיימת",
+      "NO_ANSWER": "אין מענה",
+      "MISSED_CALL": "שיחה שלא נענתה",
+      "CALL_ENDED": "השיחה הסתיימה",
+      "NOT_ANSWERED_YET": "לא ענה כרגע",
+      "THEY_ANSWERED": "ענה",
+      "YOU_ANSWERED": "אתה ענית"
     },
     "HEADER": {
       "RESOLVE_ACTION": "פתרון",
       "REOPEN_ACTION": "פתח מחדש",
       "OPEN_ACTION": "פתח",
-      "MORE_ACTIONS": "More actions",
+      "MORE_ACTIONS": "עוד פעולות",
       "OPEN": "עוד",
       "CLOSE": "סגור",
       "DETAILS": "פרטים",
@@ -139,8 +139,8 @@
       }
     },
     "DELETE_CONVERSATION": {
-      "TITLE": "Delete conversation #{conversationId}",
-      "DESCRIPTION": "Are you sure you want to delete this conversation?",
+      "TITLE": "מחק שיחה #{conversationId}",
+      "DESCRIPTION": "אתה בטוח שאתה רוצה למחוק את השיחה הזו?",
       "CONFIRM": "מחק"
     },
     "CARD_CONTEXT_MENU": {
@@ -159,10 +159,10 @@
       "ASSIGN_LABEL": "ההקצה תווית",
       "AGENTS_LOADING": "טוען סוכנים...",
       "ASSIGN_TEAM": "שייך צוות",
-      "DELETE": "Delete conversation",
-      "OPEN_IN_NEW_TAB": "Open in new tab",
-      "COPY_LINK": "Copy conversation link",
-      "COPY_LINK_SUCCESS": "Conversation link copied to clipboard",
+      "DELETE": "מחק שיחה",
+      "OPEN_IN_NEW_TAB": "פתח בכרטיסיה חדשה",
+      "COPY_LINK": "העתק קישור לשיחה",
+      "COPY_LINK_SUCCESS": "קישור לשיחה הועתק ללוח הגזירים",
       "API": {
         "AGENT_ASSIGNMENT": {
           "SUCCESFUL": "מזהה שיחה {conversationId} קושר ל {agentName}",
@@ -229,11 +229,11 @@
         }
       },
       "QUOTED_REPLY": {
-        "ENABLE_TOOLTIP": "Include quoted email thread",
-        "DISABLE_TOOLTIP": "Don't include quoted email thread",
-        "REMOVE_PREVIEW": "Remove quoted email thread",
-        "COLLAPSE": "Collapse preview",
-        "EXPAND": "Expand preview"
+        "ENABLE_TOOLTIP": "כלול שרשור אימייל מצוטט",
+        "DISABLE_TOOLTIP": "אל תכלול שרשור אימייל מצוטט",
+        "REMOVE_PREVIEW": "הסר שרשור אימייל מצוטט",
+        "COLLAPSE": "כווץ תצוגה מקדימה",
+        "EXPAND": "הרחב תצוגה מקדימה"
       }
     },
     "VISIBLE_TO_AGENTS": "פתקים פרטיים: רק אתה והצוות שלך יכולים לראות",
@@ -244,8 +244,8 @@
     "ASSIGN_LABEL_SUCCESFUL": "סמן משימה כבוצעה בהצלחה",
     "ASSIGN_LABEL_FAILED": "סמן משימה כנכשלה",
     "CHANGE_TEAM": "שיחת קבוצה השתנתה",
-    "SUCCESS_DELETE_CONVERSATION": "Conversation deleted successfully",
-    "FAIL_DELETE_CONVERSATION": "Couldn't delete conversation! Try again",
+    "SUCCESS_DELETE_CONVERSATION": "השיחה נמחקה בהצלחה",
+    "FAIL_DELETE_CONVERSATION": "לא ניתן למחוק את השיחה! נסה שוב",
     "FILE_SIZE_LIMIT": "הקובץ גדול מ{MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE}MB מגבלת העלאה",
     "MESSAGE_ERROR": "לא ניתן לשלוח הודעה, אנא נסה שוב מאוחר יותר",
     "SENT_BY": "נשלח על ידי:",
@@ -334,11 +334,11 @@
       "CONVERSATION_ACTIONS": "פעולות בשיחה",
       "CONVERSATION_LABELS": "תוויות שיחה",
       "CONVERSATION_INFO": "מידע על שיחה",
-      "CONTACT_NOTES": "Contact Notes",
+      "CONTACT_NOTES": "הערות איש קשר",
       "CONTACT_ATTRIBUTES": "תכונות יצירת קשר",
       "PREVIOUS_CONVERSATION": "שיחות קודמות",
       "MACROS": "מאקרו",
-      "LINEAR_ISSUES": "Linked Linear Issues",
+      "LINEAR_ISSUES": "בעיות ליניאריות מקושרות",
       "SHOPIFY_ORDERS": "Shopify Orders"
     },
     "SHOPIFY": {
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index 57bf89e3b..69aaef39c 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -1,7 +1,7 @@
 {
   "GENERAL_SETTINGS": {
     "LIMIT_MESSAGES": {
-      "CONVERSATION": "You have exceeded the conversation limit. Hacker plan allows only 500 conversations.",
+      "CONVERSATION": "חרגת מהמגבלה של השיחות. תוכנית Hacker מאפשרת רק 500 שיחות.",
       "INBOXES": "You have exceeded the inbox limit. Hacker plan only supports website live-chat. Additional inboxes like email, WhatsApp etc. require a paid plan.",
       "AGENTS": "You have exceeded the agent limit. Your plan only allows {allowedAgents} agents.",
       "NON_ADMIN": "Please contact your administrator to upgrade the plan and continue using all features."
@@ -16,22 +16,22 @@
     },
     "ACCOUNT_DELETE_SECTION": {
       "TITLE": "Delete your Account",
-      "NOTE": "Once you delete your account, all your data will be deleted.",
-      "BUTTON_TEXT": "Delete Your Account",
+      "NOTE": "לאחר מחיקת החשבון, כל הנתונים שלך יימחקו.",
+      "BUTTON_TEXT": "מחק את חשבונך",
       "CONFIRM": {
-        "TITLE": "Delete Account",
-        "MESSAGE": "Deleting your Account is irreversible. Enter your account name below to confirm you want to permanently delete it.",
+        "TITLE": "מחק חשבון",
+        "MESSAGE": "מחיקת החשבון איננה הפיכה. הזן את שם החשבון מטה כדי לאשר שאתה רוצה למחוק אותו.",
         "BUTTON_TEXT": "מחק",
         "DISMISS": "ביטול",
         "PLACE_HOLDER": "אנא הקלד {accountName} כדי לאשר"
       },
-      "SUCCESS": "Account marked for deletion",
-      "FAILURE": "Could not delete account, try again!",
+      "SUCCESS": "חשבון סומן למחיקה",
+      "FAILURE": "לא הצלחתי למחוק את החשבון, נסה שוב!",
       "SCHEDULED_DELETION": {
-        "TITLE": "Account Scheduled for Deletion",
-        "MESSAGE_MANUAL": "This account is scheduled for deletion on {deletionDate}. This was requested by an administrator. You can cancel the deletion before this date.",
-        "MESSAGE_INACTIVITY": ".",
-        "CLEAR_BUTTON": "Cancel Scheduled Deletion"
+        "TITLE": "החשבון תוזמן למחיקה",
+        "MESSAGE_MANUAL": "חשבון זה מתוכנן למחיקה בתאריך {deletionDate}. הבקשה הוגשה על ידי מנהל. ניתן לבטל את המחיקה לפני תאריך זה.",
+        "MESSAGE_INACTIVITY": "החשבון הזה תוסמן למחיקה ב{deletionDate} בגלל שהחשבון לא היה בשימוש. אתה יכול לבטל זאת לפני התאריך.",
+        "CLEAR_BUTTON": "בטל מחיקה מתוכננת"
       }
     },
     "FORM": {
@@ -45,10 +45,10 @@
         "NOTE": "מזהה זה נדרש אם אתה בונה אינטגרציה מבוססת API"
       },
       "AUTO_RESOLVE": {
-        "TITLE": "Auto-resolve conversations",
-        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period of inactivity.",
+        "TITLE": "פתרון אוטומטי של שיחות",
+        "NOTE": "תצורה זו מאפשרת לך לפתור אוטומטית את השיחה לאחר תקופת אי פעילות מסוימת.",
         "DURATION": {
-          "LABEL": "Inactivity duration",
+          "LABEL": "תקופת זמן של אי פעילות שלאחריה השיחה נפתרת אוטומטית",
           "HELP": "Time period of inactivity after which conversation is auto-resolved",
           "PLACEHOLDER": "30",
           "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
@@ -58,11 +58,11 @@
           }
         },
         "MESSAGE": {
-          "LABEL": "Custom auto-resolution message",
-          "PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
-          "HELP": "Message sent to the customer after conversation is auto-resolved"
+          "LABEL": "הודעת פתרון אוטומטית מותאמת אישית",
+          "PLACEHOLDER": "השיחה סומנה כפתורה על ידי המערכת עקב 15 ימים של אי פעילות",
+          "HELP": "הודעה שנשלחת ללקוח לאחר שהשיחה נפתרת אוטומטית"
         },
-        "PREFERENCES": "Preferences",
+        "PREFERENCES": "העדפות",
         "LABEL": {
           "LABEL": "Add label after auto-resolution",
           "PLACEHOLDER": "Select a label"
@@ -115,7 +115,7 @@
         },
         "UPDATE_BUTTON": "עדכן",
         "MESSAGE_LABEL": "Custom resolution message",
-        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_PLACEHOLDER": "השיחה סומנה כפתורה על ידי המערכת עקב 15 ימים של אי פעילות",
         "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
diff --git a/app/javascript/dashboard/i18n/locale/he/integrations.json b/app/javascript/dashboard/i18n/locale/he/integrations.json
index 37ca8a139..781295303 100644
--- a/app/javascript/dashboard/i18n/locale/he/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/he/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "כתובת אתר של Webhook",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "טייס משנה",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "הגדרות",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "הכל"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "ערוך",
+        "DELETE_RESPONSE": "מחק"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/he/report.json b/app/javascript/dashboard/i18n/locale/he/report.json
index c342d4649..6c84b77a1 100644
--- a/app/javascript/dashboard/i18n/locale/he/report.json
+++ b/app/javascript/dashboard/i18n/locale/he/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "7 הימים האחרונים",
       "LAST_14_DAYS": "14 הימים האחרונים",
       "LAST_30_DAYS": "30 הימים האחרונים",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "3 החודשים האחרונים",
       "LAST_6_MONTHS": "6 החודשים האחרונים",
       "LAST_YEAR": "שנה שעברה",
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index 1601016eb..44c077268 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "חשבון מושעה",
       "MESSAGE": "החשבון שלך מושעה. אנא פנה לצוות התמיכה לקבלת מידע נוסף."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "תיבות דואר נכנס",
+    "CAPTAIN_SETTINGS": "הגדרות",
     "HOME": "בית",
     "AGENTS": "סוכנים",
     "AGENT_BOTS": "בוטים",
diff --git a/app/javascript/dashboard/i18n/locale/hi/bulkActions.json b/app/javascript/dashboard/i18n/locale/hi/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/hi/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/hi/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index d295bd2e7..a6d6f891d 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/hi/integrations.json b/app/javascript/dashboard/i18n/locale/hi/integrations.json
index 97fffa5c8..c4d915418 100644
--- a/app/javascript/dashboard/i18n/locale/hi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hi/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/hi/report.json b/app/javascript/dashboard/i18n/locale/hi/report.json
index 22e285c19..a2ad6bd4a 100644
--- a/app/javascript/dashboard/i18n/locale/hi/report.json
+++ b/app/javascript/dashboard/i18n/locale/hi/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 256f77c04..aec3e852d 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/hr/bulkActions.json b/app/javascript/dashboard/i18n/locale/hr/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/hr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/hr/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/hr/contact.json b/app/javascript/dashboard/i18n/locale/hr/contact.json
index 1c30e96ba..232f5ca49 100644
--- a/app/javascript/dashboard/i18n/locale/hr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hr/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Izbriši",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/hr/integrations.json b/app/javascript/dashboard/i18n/locale/hr/integrations.json
index 8976cbb2a..44b906008 100644
--- a/app/javascript/dashboard/i18n/locale/hr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hr/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Sve"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Uredi",
+        "DELETE_RESPONSE": "Izbriši"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/hr/report.json b/app/javascript/dashboard/i18n/locale/hr/report.json
index 727964e50..c31c93369 100644
--- a/app/javascript/dashboard/i18n/locale/hr/report.json
+++ b/app/javascript/dashboard/i18n/locale/hr/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/hr/settings.json b/app/javascript/dashboard/i18n/locale/hr/settings.json
index 51e35e25b..721a1aecc 100644
--- a/app/javascript/dashboard/i18n/locale/hr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agenti",
     "AGENT_BOTS": "Botovi",
diff --git a/app/javascript/dashboard/i18n/locale/hu/bulkActions.json b/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
index 5e8129989..569388e34 100644
--- a/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Címkék hozzárendelése",
-      "NO_LABELS_FOUND": "Nem található cimke erre:",
+      "NO_LABELS_FOUND": "Nem találtunk címkét",
       "ASSIGN_SELECTED_LABELS": "Válogatott címkék hozzárendelése",
       "ASSIGN_SUCCESFUL": "Címkék hozzárendelése sikeres.",
       "ASSIGN_FAILED": "Nem sikerült címkéket hozzárendelni. Kérjük, próbálja újra."
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index 9e7f34e46..80c5a2e54 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Cimke hozzáadása",
+    "ASSIGN_LABELS_SUCCESS": "Címkék hozzárendelése sikeres.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Törlés",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Kontakt törlése"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
index 2112ef0c8..80552228b 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Beállítások",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Mind"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Szerkesztés",
+        "DELETE_RESPONSE": "Törlés"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/hu/report.json b/app/javascript/dashboard/i18n/locale/hu/report.json
index 1231d8d90..45e014b95 100644
--- a/app/javascript/dashboard/i18n/locale/hu/report.json
+++ b/app/javascript/dashboard/i18n/locale/hu/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Utolsó 7 nap",
       "LAST_14_DAYS": "Utolsó 14 nap",
       "LAST_30_DAYS": "Utolsó 30 nap",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Elmúlt 3 hónapban",
       "LAST_6_MONTHS": "Elmúlt 6 hónapban",
       "LAST_YEAR": "Elmúlt 1 évben",
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index 0bda60edd..5228bdc84 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Felfüggesztett Fiók",
       "MESSAGE": "A fiókod felfüggesztés alatt van. Bővebb információkért, kérlek, lépj kapcsolatba az ügfyélszolgálattal."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Fiókok",
+    "CAPTAIN_SETTINGS": "Beállítások",
     "HOME": "Nyitólap",
     "AGENTS": "Ügynökök",
     "AGENT_BOTS": "Botok",
diff --git a/app/javascript/dashboard/i18n/locale/hy/bulkActions.json b/app/javascript/dashboard/i18n/locale/hy/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/hy/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/hy/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/hy/contact.json b/app/javascript/dashboard/i18n/locale/hy/contact.json
index 4e84a25ff..a04f955c6 100644
--- a/app/javascript/dashboard/i18n/locale/hy/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hy/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/hy/integrations.json b/app/javascript/dashboard/i18n/locale/hy/integrations.json
index 081ddbde8..983953180 100644
--- a/app/javascript/dashboard/i18n/locale/hy/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hy/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/hy/report.json b/app/javascript/dashboard/i18n/locale/hy/report.json
index 22e285c19..a2ad6bd4a 100644
--- a/app/javascript/dashboard/i18n/locale/hy/report.json
+++ b/app/javascript/dashboard/i18n/locale/hy/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/hy/settings.json b/app/javascript/dashboard/i18n/locale/hy/settings.json
index 812b0cd8b..50cf38b58 100644
--- a/app/javascript/dashboard/i18n/locale/hy/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/id/bulkActions.json b/app/javascript/dashboard/i18n/locale/id/bulkActions.json
index a508aac51..39f035d6f 100644
--- a/app/javascript/dashboard/i18n/locale/id/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/id/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "Tidak ada label ditemukan untuk",
+      "NO_LABELS_FOUND": "Tidak ada label",
       "ASSIGN_SELECTED_LABELS": "Tugaskan label terpilih",
       "ASSIGN_SUCCESFUL": "Label berhasil ditugaskan.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index 2b6fc6037..0711232e0 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Tugaskan Label",
+    "ASSIGN_LABELS_SUCCESS": "Label berhasil ditugaskan.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Hapus",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Hapus kontak"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/id/integrations.json b/app/javascript/dashboard/i18n/locale/id/integrations.json
index 4da713720..965e4f351 100644
--- a/app/javascript/dashboard/i18n/locale/id/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/id/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "URL Webhook",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Pengaturan",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Semua"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Hapus"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/id/report.json b/app/javascript/dashboard/i18n/locale/id/report.json
index e41778480..35393f1da 100644
--- a/app/javascript/dashboard/i18n/locale/id/report.json
+++ b/app/javascript/dashboard/i18n/locale/id/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "7 hari terakhir",
       "LAST_14_DAYS": "14 hari terakhir",
       "LAST_30_DAYS": "30 hari terakhir",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "3 bulan terakhir",
       "LAST_6_MONTHS": "6 bulan terakhir",
       "LAST_YEAR": "Tahun terakhir",
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index 75324f02f..aad964a87 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Akun Ditangguhkan",
       "MESSAGE": "Akun Anda ditangguhkan. Silakan hubungi tim dukungan untuk informasi lebih lanjut."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Kotak masuk",
+    "CAPTAIN_SETTINGS": "Pengaturan",
     "HOME": "Beranda",
     "AGENTS": "Agen",
     "AGENT_BOTS": "Bot Agen",
diff --git a/app/javascript/dashboard/i18n/locale/is/bulkActions.json b/app/javascript/dashboard/i18n/locale/is/bulkActions.json
index aa0bf1d74..91c4458ec 100644
--- a/app/javascript/dashboard/i18n/locale/is/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/is/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "Engar merkingar fundust",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/is/contact.json b/app/javascript/dashboard/i18n/locale/is/contact.json
index 175b2f1df..e4eabaec6 100644
--- a/app/javascript/dashboard/i18n/locale/is/contact.json
+++ b/app/javascript/dashboard/i18n/locale/is/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Eyða",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Eyða tengilið"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/is/integrations.json b/app/javascript/dashboard/i18n/locale/is/integrations.json
index e8193f541..aa164a4fc 100644
--- a/app/javascript/dashboard/i18n/locale/is/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/is/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Stillingar",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Allt"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Breyta",
+        "DELETE_RESPONSE": "Eyða"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/is/report.json b/app/javascript/dashboard/i18n/locale/is/report.json
index d65764ba5..923b60935 100644
--- a/app/javascript/dashboard/i18n/locale/is/report.json
+++ b/app/javascript/dashboard/i18n/locale/is/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Síðustu 7 daga",
       "LAST_14_DAYS": "Síðustu 14 daga",
       "LAST_30_DAYS": "Síðustu 30 daga",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Síðustu 3 mánuði",
       "LAST_6_MONTHS": "Síðustu 6 mánuði",
       "LAST_YEAR": "Síðasta ár",
diff --git a/app/javascript/dashboard/i18n/locale/is/settings.json b/app/javascript/dashboard/i18n/locale/is/settings.json
index 076f19542..cba19a2b0 100644
--- a/app/javascript/dashboard/i18n/locale/is/settings.json
+++ b/app/javascript/dashboard/i18n/locale/is/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Reikningnum þínum er lokað. Vinsamlegast hafðu samband við þjónustusviðið okkar til að fá frekari upplýsingar."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Innhólf",
+    "CAPTAIN_SETTINGS": "Stillingar",
     "HOME": "Home",
     "AGENTS": "Þjónustufulltrúar",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/it/auditLogs.json b/app/javascript/dashboard/i18n/locale/it/auditLogs.json
index 51e6d9bf4..730365a0e 100644
--- a/app/javascript/dashboard/i18n/locale/it/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/it/auditLogs.json
@@ -50,7 +50,7 @@
       "SIGN_OUT": "{agentName} si è disconnesso"
     },
     "TEAM": {
-      "ADD": "{agentName} created a new team (#{id})",
+      "ADD": "{agentName} ha creato un nuovo team (#{id})",
       "EDIT": "{agentName} ha aggiornato un team (#{id})",
       "DELETE": "{agentName} ha eliminato un team (#{id})"
     },
diff --git a/app/javascript/dashboard/i18n/locale/it/automation.json b/app/javascript/dashboard/i18n/locale/it/automation.json
index 53d713629..b4d400e5a 100644
--- a/app/javascript/dashboard/i18n/locale/it/automation.json
+++ b/app/javascript/dashboard/i18n/locale/it/automation.json
@@ -147,7 +147,7 @@
       "SEND_WEBHOOK_EVENT": "Invia Evento Webhook",
       "SEND_ATTACHMENT": "Invia Allegato",
       "SEND_MESSAGE": "Invia un Messaggio",
-      "ADD_PRIVATE_NOTE": "Aggiungi Nota Privata",
+      "ADD_PRIVATE_NOTE": "Aggiungi una Nota Privata",
       "CHANGE_PRIORITY": "Modifica Priorità",
       "ADD_SLA": "Aggiungi SLA",
       "OPEN_CONVERSATION": "Riapri conversazione"
diff --git a/app/javascript/dashboard/i18n/locale/it/bulkActions.json b/app/javascript/dashboard/i18n/locale/it/bulkActions.json
index 74164e5d8..55431f7f2 100644
--- a/app/javascript/dashboard/i18n/locale/it/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/it/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assegna etichette",
-      "NO_LABELS_FOUND": "Nessuna etichetta trovata per",
+      "NO_LABELS_FOUND": "Nessuna etichetta trovata",
       "ASSIGN_SELECTED_LABELS": "Assegna etichette selezeionate",
       "ASSIGN_SUCCESFUL": "Etichette assegnate correttamente.",
       "ASSIGN_FAILED": "Impossibile assegnare le etichette. Riprova."
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index a27d353a4..956b79739 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -13,7 +13,7 @@
     "BROWSER": "Browser",
     "OS": "Sistema Operativo",
     "INITIATED_FROM": "Iniziato da",
-    "INITIATED_AT": "Iniziato alle",
+    "INITIATED_AT": "Avviata alle",
     "IP_ADDRESS": "Indirizzo IP",
     "CREATED_AT_LABEL": "Creato il",
     "NEW_MESSAGE": "Nuovo messaggio",
@@ -470,7 +470,7 @@
       }
     },
     "DETAILS": {
-      "CREATED_AT": "Creato il {date}",
+      "CREATED_AT": "Creato {date}",
       "LAST_ACTIVITY": "Ultima attività {date}",
       "DELETE_CONTACT_DESCRIPTION": "Elimina definitivamente questo contatto. Questa azione è irreversibile",
       "DELETE_CONTACT": "Elimina contatto",
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "Nessun contatto attivo al momento 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assegna Etichette",
+    "ASSIGN_LABELS_SUCCESS": "Etichette assegnate correttamente.",
+    "ASSIGN_LABELS_FAILED": "Assegnazione delle etichette non riuscita",
+    "DESCRIPTION": "Selezionare le etichette da aggiungere ai contatti selezionati.",
+    "NO_LABELS_FOUND": "Nessuna etichetta disponibile.",
+    "SELECTED_COUNT": "{count} selezionate",
+    "CLEAR_SELECTION": "Annulla selezione",
+    "SELECT_ALL": "Seleziona tutto ({count})",
+    "DELETE_CONTACTS": "Elimina",
+    "DELETE_SUCCESS": "Contatti eliminati con successo.",
+    "DELETE_FAILED": "Impossibile eliminare i contatti.",
+    "DELETE_DIALOG": {
+      "TITLE": "Elimina i contatti selezionati",
+      "SINGULAR_TITLE": "Elimina il contatto selezionato",
+      "DESCRIPTION": "Questo eliminerà definitivamente i {count} contatti selezionati. Questa azione non può essere annullata.",
+      "SINGULAR_DESCRIPTION": "Questo eliminerà definitivamente il contatto selezionato. Questa azione non può essere annullata.",
+      "CONFIRM_MULTIPLE": "Elimina contatti",
+      "CONFIRM_SINGLE": "Elimina contatto"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "Non siamo riusciti a completare la ricerca. Riprova."
diff --git a/app/javascript/dashboard/i18n/locale/it/contactFilters.json b/app/javascript/dashboard/i18n/locale/it/contactFilters.json
index df937f137..61c3ddad9 100644
--- a/app/javascript/dashboard/i18n/locale/it/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/it/contactFilters.json
@@ -1,6 +1,6 @@
 {
   "CONTACTS_FILTER": {
-    "TITLE": "Filtra contatti",
+    "TITLE": "Filtra Contatti",
     "SUBTITLE": "Aggiungi filtri qui sotto e premi 'Invia' per filtrare i contatti.",
     "EDIT_CUSTOM_SEGMENT": "Edit Segment",
     "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your segment.",
@@ -8,12 +8,12 @@
     "CLEAR_ALL_FILTERS": "Cancella tutti i filtri",
     "FILTER_DELETE_ERROR": "Dovresti avere almeno un filtro da salvare",
     "SUBMIT_BUTTON_LABEL": "Invia",
-    "UPDATE_BUTTON_LABEL": "Update Segment",
+    "UPDATE_BUTTON_LABEL": "Aggiorna Segmento",
     "CANCEL_BUTTON_LABEL": "Annulla",
-    "CLEAR_BUTTON_LABEL": "Cancella filtri",
-    "EMPTY_VALUE_ERROR": "Il valore è obbligatorio",
-    "SEGMENT_LABEL": "Segment Name",
-    "SEGMENT_QUERY_LABEL": "Segment Query",
+    "CLEAR_BUTTON_LABEL": "Rimuovi Filtri",
+    "EMPTY_VALUE_ERROR": "Valore richiesto",
+    "SEGMENT_LABEL": "Nome Segmento",
+    "SEGMENT_QUERY_LABEL": "Query Segmento",
     "TOOLTIP_LABEL": "Filtra contatti",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "E",
@@ -46,15 +46,15 @@
       "CUSTOM_ATTRIBUTE_LINK": "Link",
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
       "CREATED_AT": "Creato il",
-      "LAST_ACTIVITY": "Ultima attività",
-      "REFERER_LINK": "Link di riferimento",
-      "BLOCKED": "Blocked",
+      "LAST_ACTIVITY": "Ultima Attività",
+      "REFERER_LINK": "Link referente",
+      "BLOCKED": "Bloccato",
       "LABELS": "Etichette"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Filtri standard",
-      "ADDITIONAL_FILTERS": "Filtri addizionali",
-      "CUSTOM_ATTRIBUTES": "Attributi personalizzati"
+      "STANDARD_FILTERS": "Filtri Standard",
+      "ADDITIONAL_FILTERS": "Filtri Aggiuntivi",
+      "CUSTOM_ATTRIBUTES": "Attributi Personalizzati"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/contentTemplates.json b/app/javascript/dashboard/i18n/locale/it/contentTemplates.json
index 3f978cecd..76b77eaf9 100644
--- a/app/javascript/dashboard/i18n/locale/it/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/it/contentTemplates.json
@@ -3,12 +3,12 @@
     "MODAL": {
       "TITLE": "Modelli Twilio",
       "SUBTITLE": "Seleziona il modello Twilio che vuoi inviare",
-      "TEMPLATE_SELECTED_SUBTITLE": "Configura template: {templateName}"
+      "TEMPLATE_SELECTED_SUBTITLE": "Configura modello: {templateName}"
     },
     "PICKER": {
-      "SEARCH_PLACEHOLDER": "Cerca modelli",
+      "SEARCH_PLACEHOLDER": "Cerca Modelli",
       "NO_TEMPLATES_FOUND": "Nessun modello trovato per",
-      "NO_CONTENT": "No content",
+      "NO_CONTENT": "Nessun contenuto",
       "HEADER": "Intestazione",
       "BODY": "Corpo",
       "FOOTER": "Piè",
@@ -22,7 +22,7 @@
       "REFRESH_ERROR": "Impossibile aggiornare i modelli. Per favore riprova.",
       "LABELS": {
         "LANGUAGE": "Lingua",
-        "TEMPLATE_BODY": "Corpo modello",
+        "TEMPLATE_BODY": "Corpo Modello",
         "CATEGORY": "Categoria"
       },
       "TYPES": {
@@ -36,16 +36,16 @@
       "LANGUAGE": "Lingua",
       "CATEGORY": "Categoria",
       "VARIABLE_PLACEHOLDER": "Inserisci il valore di {variable}",
-      "GO_BACK_LABEL": "Torna indietro",
-      "SEND_MESSAGE_LABEL": "Invia messaggio",
-      "FORM_ERROR_MESSAGE": "Si prega di compilare tutte le variabili prima di inviare",
+      "GO_BACK_LABEL": "Torna Indietro",
+      "SEND_MESSAGE_LABEL": "Invia Messaggio",
+      "FORM_ERROR_MESSAGE": "Inserisci tutte le variabili prima di inviare",
       "MEDIA_HEADER_LABEL": "Intestazione {type}",
       "MEDIA_URL_LABEL": "Inserisci l'URL completo del media",
       "MEDIA_URL_PLACEHOLDER": "https://example.com/image.jpg"
     },
     "FORM": {
       "BACK_BUTTON": "Indietro",
-      "SEND_MESSAGE_BUTTON": "Invia messaggio"
+      "SEND_MESSAGE_BUTTON": "Invia Messaggio"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index e4a7c6edb..4506fe827 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -1,37 +1,37 @@
 {
   "CONVERSATION": {
-    "SELECT_A_CONVERSATION": "Si prega di selezionare una conversazione dal pannello sinistro",
+    "SELECT_A_CONVERSATION": "Seleziona una conversazione dal pannello a sinistra",
     "CSAT_REPLY_MESSAGE": "Valuta la conversazione",
     "404": "Siamo spiacenti, non siamo riusciti a trovare la conversazione. Riprova",
-    "SWITCH_VIEW_LAYOUT": "Cambia il layout",
+    "SWITCH_VIEW_LAYOUT": "Cambia layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messaggi",
     "UNVERIFIED_SESSION": "L'identità di questo utente non è verificata",
-    "NO_MESSAGE_1": "Oh oh! Sembra che non ci siano messaggi da parte dei clienti nella tua casella.",
+    "NO_MESSAGE_1": "Oh oh! Sembra che non ci siano messaggi dai clienti nella tua inbox.",
     "NO_MESSAGE_2": " per inviare un messaggio alla tua pagina!",
-    "NO_INBOX_1": "Hola! Sembra che tu non abbia ancora aggiunto nessuna casella.",
+    "NO_INBOX_1": "Ciao! Sembra che tu non abbia ancora aggiunto nessuna inbox.",
     "NO_INBOX_2": " per iniziare",
-    "NO_INBOX_AGENT": "Uh Oh! Sembra che tu non faccia parte di nessuna casella. Per favore contatta il tuo amministratore",
+    "NO_INBOX_AGENT": "Oh oh! Sembra che tu non faccia parte di nessuna inbox. Per favore contatta il tuo amministratore",
     "SEARCH_MESSAGES": "Cerca messaggi nelle conversazioni",
-    "VIEW_ORIGINAL": "View original",
-    "VIEW_TRANSLATED": "View translated",
+    "VIEW_ORIGINAL": "Visualizza originale",
+    "VIEW_TRANSLATED": "Visualizza traduzione",
     "EMPTY_STATE": {
-      "CMD_BAR": "to open command menu",
-      "KEYBOARD_SHORTCUTS": "to view keyboard shortcuts"
+      "CMD_BAR": "per aprire il menu dei comandi",
+      "KEYBOARD_SHORTCUTS": "per visualizzare le scorciatoie da tastiera"
     },
     "SEARCH": {
       "TITLE": "Cerca messaggi",
-      "RESULT_TITLE": "Risultati della ricerca",
-      "LOADING_MESSAGE": "Elaborazione dei dati...",
+      "RESULT_TITLE": "Risultati di Ricerca",
+      "LOADING_MESSAGE": "Elaborazione...",
       "PLACEHOLDER": "Digita qualsiasi testo per cercare i messaggi",
       "NO_MATCHING_RESULTS": "Nessun risultato trovato."
     },
-    "UNREAD_MESSAGES": "Messaggi non letti",
-    "UNREAD_MESSAGE": "Messaggio non letto",
+    "UNREAD_MESSAGES": "Messaggi Non Letti",
+    "UNREAD_MESSAGE": "Messaggio Non Letto",
     "CLICK_HERE": "Clicca qui",
-    "LOADING_INBOXES": "Caricamento casella",
-    "LOADING_CONVERSATIONS": "Caricamento conversazioni",
+    "LOADING_INBOXES": "Caricamento inbox",
+    "LOADING_CONVERSATIONS": "Caricamento Conversazioni",
     "CANNOT_REPLY": "Non puoi rispondere a causa di",
-    "24_HOURS_WINDOW": "Restrizione della finestra del messaggio a 24 ore",
+    "24_HOURS_WINDOW": "Restrizione finestra messaggio 24 ore",
     "API_HOURS_WINDOW": "Puoi rispondere a questa conversazione solo entro {hours} ore",
     "NOT_ASSIGNED_TO_YOU": "Questa conversazione non è assegnata. Vuoi assegnare questa conversazione a te stesso?",
     "ASSIGN_TO_ME": "Assegna a me",
@@ -41,35 +41,35 @@
     "BOT_HANDOFF_SUCCESS": "La conversazione ti è stata assegnata",
     "BOT_HANDOFF_ERROR": "Impossibile prendere la conversazione. Riprova.",
     "TWILIO_WHATSAPP_CAN_REPLY": "È possibile rispondere a questa conversazione solo utilizzando un messaggio modello a causa di",
-    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restrizione della finestra del messaggio a 24 ore",
+    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restrizione finestra messaggio 24 ore",
     "OLD_INSTAGRAM_INBOX_REPLY_BANNER": "Questo account Instagram è stato migrato alla nuova Inbox del canale Instagram. Tutti i nuovi messaggi verranno visualizzati lì. Non sarà più possibile inviare messaggi da questa conversazione.",
     "REPLYING_TO": "Stai rispondendo a:",
-    "REMOVE_SELECTION": "Rimuovi selezione",
+    "REMOVE_SELECTION": "Rimuovi Selezione",
     "DOWNLOAD": "Scarica",
-    "UNKNOWN_FILE_TYPE": "File sconosciuto",
-    "SAVE_CONTACT": "Save Contact",
-    "NO_CONTENT": "No content to display",
+    "UNKNOWN_FILE_TYPE": "File Sconosciuto",
+    "SAVE_CONTACT": "Salva Contatto",
+    "NO_CONTENT": "Nessun contenuto da visualizzare",
     "SHARED_ATTACHMENT": {
-      "CONTACT": "{sender} has shared a contact",
-      "LOCATION": "{sender} has shared a location",
-      "FILE": "{sender} has shared a file",
-      "MEETING": "{sender} has started a meeting"
+      "CONTACT": "{sender} ha condiviso un contatto",
+      "LOCATION": "{sender} ha condiviso una posizione",
+      "FILE": "{sender} ha condiviso un file",
+      "MEETING": "{sender} ha avviato una riunione"
     },
     "UPLOADING_ATTACHMENTS": "Caricamento allegati...",
-    "REPLIED_TO_STORY": "Replied to your story",
-    "UNSUPPORTED_MESSAGE": "This message is unsupported. You can view this message on the Facebook / Instagram app.",
-    "UNSUPPORTED_MESSAGE_FACEBOOK": "This message is unsupported. You can view this message on the Facebook Messenger app.",
-    "UNSUPPORTED_MESSAGE_INSTAGRAM": "This message is unsupported. You can view this message on the Instagram app.",
+    "REPLIED_TO_STORY": "Ha risposto alla tua storia",
+    "UNSUPPORTED_MESSAGE": "Questo messaggio non è supportato. Puoi visualizzare questo messaggio sull'app Facebook / Instagram.",
+    "UNSUPPORTED_MESSAGE_FACEBOOK": "Questo messaggio non è supportato. Puoi visualizzare questo messaggio sull'app Facebook Messenger.",
+    "UNSUPPORTED_MESSAGE_INSTAGRAM": "Questo messaggio non è supportato. Puoi visualizzare questo messaggio sull'app Instagram.",
     "SUCCESS_DELETE_MESSAGE": "Messaggio eliminato con successo",
     "FAIL_DELETE_MESSSAGE": "Impossibile eliminare il messaggio! Riprova",
     "NO_RESPONSE": "Nessuna risposta",
-    "RESPONSE": "Response",
+    "RESPONSE": "Risposta",
     "RATING_TITLE": "Valutazione",
     "FEEDBACK_TITLE": "Feedback",
-    "REPLY_MESSAGE_NOT_FOUND": "Message not available",
+    "REPLY_MESSAGE_NOT_FOUND": "Messaggio non disponibile",
     "CARD": {
-      "SHOW_LABELS": "Show labels",
-      "HIDE_LABELS": "Hide labels"
+      "SHOW_LABELS": "Mostra etichette",
+      "HIDE_LABELS": "Nascondi etichette"
     },
     "VOICE_CALL": {
       "INCOMING_CALL": "Chiamata in arrivo",
@@ -86,20 +86,20 @@
       "RESOLVE_ACTION": "Risolvi",
       "REOPEN_ACTION": "Riapri",
       "OPEN_ACTION": "Apri",
-      "MORE_ACTIONS": "Altre azioni",
+      "MORE_ACTIONS": "Più azioni",
       "OPEN": "Altro",
       "CLOSE": "Chiudi",
-      "DETAILS": "Dettagli",
-      "SNOOZED_UNTIL": "Snoozed until",
-      "SNOOZED_UNTIL_TOMORROW": "Posticipato fino a domani",
-      "SNOOZED_UNTIL_NEXT_WEEK": "Posticipato fino alla prossima settimana",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Posticipato fino alla prossima risposta",
+      "DETAILS": "dettagli",
+      "SNOOZED_UNTIL": "Posticipata fino a",
+      "SNOOZED_UNTIL_TOMORROW": "Posticipata fino a domani",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Posticipata fino alla prossima settimana",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Posticipata fino alla prossima risposta",
       "SLA_STATUS": {
         "FRT": "FRT {status}",
         "NRT": "NRT {status}",
         "RT": "RT {status}",
-        "MISSED": "missed",
-        "DUE": "due"
+        "MISSED": "persa",
+        "DUE": "in scadenza"
       }
     },
     "RESOLVE_DROPDOWN": {
@@ -114,28 +114,28 @@
     },
     "MENTION": {
       "AGENTS": "Operatori",
-      "TEAMS": "Teams"
+      "TEAMS": "Team"
     },
     "CUSTOM_SNOOZE": {
       "TITLE": "Posticipa fino a",
       "APPLY": "Posticipa",
-      "CANCEL": "annulla"
+      "CANCEL": "Annulla"
     },
     "PRIORITY": {
       "TITLE": "Priorità",
       "OPTIONS": {
-        "NONE": "Nessuno",
-        "URGENT": "Urgent",
-        "HIGH": "High",
-        "MEDIUM": "Medium",
-        "LOW": "Low"
+        "NONE": "Nessuna",
+        "URGENT": "Urgente",
+        "HIGH": "Alta",
+        "MEDIUM": "Media",
+        "LOW": "Bassa"
       },
       "CHANGE_PRIORITY": {
-        "SELECT_PLACEHOLDER": "Nessuno",
-        "INPUT_PLACEHOLDER": "Select priority",
+        "SELECT_PLACEHOLDER": "Nessuna",
+        "INPUT_PLACEHOLDER": "Seleziona priorità",
         "NO_RESULTS": "Nessun risultato trovato",
-        "SUCCESSFUL": "Changed priority of conversation id {conversationId} to {priority}",
-        "FAILED": "Couldn't change priority. Please try again."
+        "SUCCESSFUL": "Cambiata priorità della conversazione id {conversationId} in {priority}",
+        "FAILED": "Impossibile cambiare la priorità. Riprova."
       }
     },
     "DELETE_CONVERSATION": {
@@ -145,9 +145,9 @@
     },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Segna come in sospeso",
-      "RESOLVED": "Contrassegna come risolto",
-      "MARK_AS_UNREAD": "Mark as unread",
-      "MARK_AS_READ": "Segna come letto",
+      "RESOLVED": "Segna come risolta",
+      "MARK_AS_UNREAD": "Segna come da leggere",
+      "MARK_AS_READ": "Segna come letta",
       "REOPEN": "Riapri la conversazione",
       "SNOOZE": {
         "TITLE": "Posticipa",
@@ -155,9 +155,9 @@
         "TOMORROW": "Fino a domani",
         "NEXT_WEEK": "Fino alla prossima settimana"
       },
-      "ASSIGN_AGENT": "Assegna agente",
+      "ASSIGN_AGENT": "Assegna operatore",
       "ASSIGN_LABEL": "Assegna etichetta",
-      "AGENTS_LOADING": "Caricamento agenti...",
+      "AGENTS_LOADING": "Caricamento operatori...",
       "ASSIGN_TEAM": "Assegna team",
       "DELETE": "Elimina conversazione",
       "OPEN_IN_NEW_TAB": "Apri in una nuova scheda",
@@ -165,37 +165,37 @@
       "COPY_LINK_SUCCESS": "Link conversazione copiato negli appunti",
       "API": {
         "AGENT_ASSIGNMENT": {
-          "SUCCESFUL": "ID conversazione {conversationId} assegnato a \"{agentName}\"",
-          "FAILED": "Impossibile assegnare l'agente. Per favore riprova."
+          "SUCCESFUL": "Conversazione id {conversationId} assegnata a \"{agentName}\"",
+          "FAILED": "Impossibile assegnare l'operatore. Per favore riprova."
         },
         "LABEL_ASSIGNMENT": {
-          "SUCCESFUL": "Assigned label #{labelName} to conversation id {conversationId}",
+          "SUCCESFUL": "Assegnata etichetta #{labelName} alla conversazione id {conversationId}",
           "FAILED": "Impossibile assegnare l'etichetta. Per favore riprova."
         },
         "TEAM_ASSIGNMENT": {
-          "SUCCESFUL": "Assegnato il team \"{team}\" all'id conversazione {conversationId}",
+          "SUCCESFUL": "Assegnato il team \"{team}\" alla conversazione id {conversationId}",
           "FAILED": "Impossibile assegnare il team. Riprova."
         }
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Firma del messaggio",
+      "MESSAGE_SIGN_TOOLTIP": "Firma messaggio",
       "ENABLE_SIGN_TOOLTIP": "Abilita firma",
       "DISABLE_SIGN_TOOLTIP": "Disabilita firma",
-      "MSG_INPUT": "MAIUSC + INVIO per la nuova linea. Inizia con '/' per selezionare una risposta predefinita.",
-      "PRIVATE_MSG_INPUT": "MAIUSC + INVIO per nuova linea. Questo sarà visibile solo agli agenti",
+      "MSG_INPUT": "Premi MAIUSC + INVIO per andare a capo. Digita '/' per inserire una Risposta Predefinita.",
+      "PRIVATE_MSG_INPUT": "Premi MAIUSC + INVIO per andare a capo. Sarà visibile solo agli Operatori",
       "MESSAGE_SIGNATURE_NOT_CONFIGURED": "La firma del messaggio non è configurata, configurala nelle impostazioni del profilo.",
       "CLICK_HERE": "Clicca qui per aggiornare",
       "WHATSAPP_TEMPLATES": "Modelli Whatsapp"
     },
     "REPLYBOX": {
       "REPLY": "Rispondi",
-      "PRIVATE_NOTE": "Nota privata",
+      "PRIVATE_NOTE": "Nota Privata",
       "SEND": "Invia",
-      "CREATE": "Aggiungi nota",
-      "INSERT_READ_MORE": "Read more",
-      "DISMISS_REPLY": "Dismiss reply",
-      "REPLYING_TO": "Replying to:",
+      "CREATE": "Aggiungi Nota",
+      "INSERT_READ_MORE": "Leggi di più",
+      "DISMISS_REPLY": "Ignora risposta",
+      "REPLYING_TO": "Rispondendo a:",
       "TIP_FORMAT_ICON": "Mostra editor di testo ricco",
       "TIP_EMOJI_ICON": "Mostra selettore emoji",
       "TIP_ATTACH_ICON": "Allega file",
@@ -207,25 +207,25 @@
       "STOP_AUDIO_RECORDING": "Interrompi registrazione audio",
       "": "",
       "EMAIL_HEAD": {
-        "TO": "TO",
-        "ADD_BCC": "Aggiungi bcc",
+        "TO": "A",
+        "ADD_BCC": "Aggiungi Ccn",
         "CC": {
-          "LABEL": "CC",
+          "LABEL": "Cc",
           "PLACEHOLDER": "Email separate da virgole",
           "ERROR": "Inserisci indirizzi email validi"
         },
         "BCC": {
-          "LABEL": "CCN",
+          "LABEL": "Ccn",
           "PLACEHOLDER": "Email separate da virgole",
           "ERROR": "Inserisci indirizzi email validi"
         }
       },
       "UNDEFINED_VARIABLES": {
-        "TITLE": "Undefined variables",
-        "MESSAGE": "You have {undefinedVariablesCount} undefined variables in your message: {undefinedVariables}. Would you like to send the message anyway?",
+        "TITLE": "Variabili non definite",
+        "MESSAGE": "Hai {undefinedVariablesCount} variabili non definite nel tuo messaggio: {undefinedVariables}. Vuoi inviare il messaggio comunque?",
         "CONFIRM": {
           "YES": "Invia",
-          "CANCEL": "annulla"
+          "CANCEL": "Annulla"
         }
       },
       "QUOTED_REPLY": {
@@ -236,7 +236,7 @@
         "EXPAND": "Espandi anteprima"
       }
     },
-    "VISIBLE_TO_AGENTS": "Nota privata: visibile solo a te e al tuo team",
+    "VISIBLE_TO_AGENTS": "Nota Privata: visibile solo a te e al tuo team",
     "CHANGE_STATUS": "Stato conversazione cambiato",
     "CHANGE_STATUS_FAILED": "Cambio di stato conversazione non riuscito",
     "CHANGE_AGENT": "Modifica assegnatario conversazione",
@@ -253,21 +253,21 @@
     "SEND_FAILED": "Impossibile inviare il messaggio! Riprova",
     "TRY_AGAIN": "riprova",
     "ASSIGNMENT": {
-      "SELECT_AGENT": "Seleziona agente",
+      "SELECT_AGENT": "Seleziona Operatore",
       "REMOVE": "Rimuovi",
       "ASSIGN": "Assegna"
     },
     "CONTEXT_MENU": {
       "COPY": "Copia",
-      "REPLY_TO": "Reply to this message",
+      "REPLY_TO": "Rispondi a questo messaggio",
       "DELETE": "Elimina",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
-      "TRANSLATE": "Translate",
-      "COPY_PERMALINK": "Copy link to the message",
-      "LINK_COPIED": "Message URL copied to the clipboard",
+      "CREATE_A_CANNED_RESPONSE": "Aggiungi alle Risposte Predefinite",
+      "TRANSLATE": "Traduci",
+      "COPY_PERMALINK": "Copia il link al messaggio",
+      "LINK_COPIED": "URL del messaggio copiato negli appunti",
       "DELETE_CONFIRMATION": {
-        "TITLE": "Are you sure you want to delete this message?",
-        "MESSAGE": "You cannot undo this action",
+        "TITLE": "Sei sicuro di voler eliminare questo messaggio?",
+        "MESSAGE": "Non puoi annullare questa azione",
         "DELETE": "Elimina",
         "CANCEL": "Annulla"
       }
@@ -286,7 +286,7 @@
     "SEND_EMAIL_ERROR": "Si è verificato un errore, riprova",
     "FORM": {
       "SEND_TO_CONTACT": "Invia la trascrizione al cliente",
-      "SEND_TO_AGENT": "Invia la trascrizione all'agente assegnato",
+      "SEND_TO_AGENT": "Invia la trascrizione all'operatore assegnato",
       "SEND_TO_OTHER_EMAIL_ADDRESS": "Invia la trascrizione a un altro indirizzo email",
       "EMAIL": {
         "PLACEHOLDER": "Inserisci un indirizzo email",
@@ -295,69 +295,69 @@
     }
   },
   "ONBOARDING": {
-    "TITLE": "Ehi 👋, Benvenuto in {installationName}!",
-    "DESCRIPTION": "Grazie per esserti registrato. Vogliamo che tu ottenga il massimo da {installationName}. Ecco alcune cose che puoi fare in {installationName} per rendere l'esperienza deliziosa.",
-    "GREETING_MORNING": "👋 Good morning, {name}. Welcome to {installationName}.",
-    "GREETING_AFTERNOON": "👋 Good afternoon, {name}. Welcome to {installationName}.",
-    "GREETING_EVENING": "👋 Good evening, {name}. Welcome to {installationName}.",
+    "TITLE": "Ciao👋 Benvenuto in {installationName}!",
+    "DESCRIPTION": "Grazie per averci scelto! Vogliamo che tu ottenga il massimo da {installationName}. Ecco alcune cose che puoi fare in {installationName} per massimizzare la tua esperienza.",
+    "GREETING_MORNING": "👋 Buongiorno, {name}. Benvenuto in {installationName}.",
+    "GREETING_AFTERNOON": "👋 Buon pomeriggio, {name}. Benvenuto in {installationName}.",
+    "GREETING_EVENING": "👋 Buona sera, {name}. Benvenuto su {installationName}.",
     "READ_LATEST_UPDATES": "Leggi gli ultimi aggiornamenti",
     "ALL_CONVERSATION": {
-      "TITLE": "Tutte le conversazioni in un unico luogo",
-      "DESCRIPTION": "Visualizza tutte le conversazioni dai tuoi clienti in una singola dashboard. È possibile filtrare le conversazioni in base al canale, all'etichetta e allo stato in arrivo.",
-      "NEW_LINK": "Clicca qui per creare una casella di posta"
+      "TITLE": "Tutte le tue conversazioni in un unico luogo",
+      "DESCRIPTION": "Visualizza tutte le conversazioni con i clienti in una singola dashboard. Puoi filtrare le conversazioni in base al canale, all'etichetta e allo stato.",
+      "NEW_LINK": "Clicca qui per creare una Inbox"
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invita i membri del tuo team",
-      "DESCRIPTION": "Dal momento che siete sempre pronti a parlare con il vostro cliente, portare nei vostri compagni di squadra per assistervi. Puoi invitare i tuoi compagni di squadra aggiungendo i loro indirizzi email alla lista degli agenti.",
+      "DESCRIPTION": "Dato che ti stai preparando a parlare con i tuoi clienti, invita i tuoi colleghi ad aiutarti. Puoi invitarli aggiungendo i loro indirizzi email all’elenco degli operatori.",
       "NEW_LINK": "Clicca qui per invitare un membro del team"
     },
     "LABELS": {
       "TITLE": "Organizza le conversazioni con etichette",
-      "DESCRIPTION": "Le etichette forniscono un modo più semplice per categorizzare la conversazione. Crea alcune etichette come #support-enquiry, #billing-question ecc., in modo da poterle usare in una conversazione più tardi.",
+      "DESCRIPTION": "Le etichette offrono un modo semplice per categorizzare le conversazioni. Crea etichette come #supporto, #pagamenti ecc., così da poterle usare successivamente.",
       "NEW_LINK": "Clicca qui per creare etichette"
     },
     "CANNED_RESPONSES": {
-      "TITLE": "Create canned responses",
-      "DESCRIPTION": "Pre-written quick reply templates help you quickly respond to a conversation. Agents can type the '/' character followed by the shortcode to insert a response.",
-      "NEW_LINK": "Click here to create a canned response"
+      "TITLE": "Crea Risposte Predefinite",
+      "DESCRIPTION": "I modelli di risposta rapida predefiniti ti aiutano a rispondere rapidamente alle conversazioni. Gli operatori possono digitare il carattere '/' seguito dallo shortcode per inserire una risposta.",
+      "NEW_LINK": "Clicca qui per creare una Risposta Predefinita"
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "ASSIGNEE_LABEL": "Agente assegnato",
+    "ASSIGNEE_LABEL": "Operatore Assegnato",
     "SELF_ASSIGN": "Assegna a me",
-    "TEAM_LABEL": "Team assegnato",
+    "TEAM_LABEL": "Team Assegnato",
     "SELECT": {
       "PLACEHOLDER": "Nessuno"
     },
     "ACCORDION": {
-      "CONTACT_DETAILS": "Dettagli contatto",
-      "CONVERSATION_ACTIONS": "Azioni conversazione",
-      "CONVERSATION_LABELS": "Etichette conversazione",
-      "CONVERSATION_INFO": "Informazioni conversazione",
+      "CONTACT_DETAILS": "Dettagli Contatto",
+      "CONVERSATION_ACTIONS": "Azioni Conversazione",
+      "CONVERSATION_LABELS": "Etichette Conversazione",
+      "CONVERSATION_INFO": "Informazioni Conversazione",
       "CONTACT_NOTES": "Note del Contatto",
-      "CONTACT_ATTRIBUTES": "Attributi contatti",
-      "PREVIOUS_CONVERSATION": "Conversazioni precedenti",
-      "MACROS": "Macros",
-      "LINEAR_ISSUES": "Linear Issues collegati",
-      "SHOPIFY_ORDERS": "Shopify Orders"
+      "CONTACT_ATTRIBUTES": "Attributi Contatto",
+      "PREVIOUS_CONVERSATION": "Conversazioni Precedenti",
+      "MACROS": "Macro",
+      "LINEAR_ISSUES": "Issue Linear Connessi",
+      "SHOPIFY_ORDERS": "Ordini Shopify"
     },
     "SHOPIFY": {
-      "ORDER_ID": "Order #{id}",
-      "ERROR": "Error loading orders",
-      "NO_SHOPIFY_ORDERS": "No orders found",
+      "ORDER_ID": "Ordine #{id}",
+      "ERROR": "Errore nel caricamento degli ordini",
+      "NO_SHOPIFY_ORDERS": "Nessun ordine trovato",
       "FINANCIAL_STATUS": {
-        "PENDING": "In sospeso",
-        "AUTHORIZED": "Authorized",
-        "PARTIALLY_PAID": "Partially Paid",
-        "PAID": "Paid",
-        "PARTIALLY_REFUNDED": "Partially Refunded",
-        "REFUNDED": "Refunded",
-        "VOIDED": "Voided"
+        "PENDING": "In Sospeso",
+        "AUTHORIZED": "Autorizzato",
+        "PARTIALLY_PAID": "Parzialmente Pagato",
+        "PAID": "Pagato",
+        "PARTIALLY_REFUNDED": "Parzialmente Rimborsato",
+        "REFUNDED": "Rimborsato",
+        "VOIDED": "Annullato"
       },
       "FULFILLMENT_STATUS": {
-        "FULFILLED": "Fulfilled",
-        "PARTIALLY_FULFILLED": "Partially Fulfilled",
-        "UNFULFILLED": "Unfulfilled"
+        "FULFILLED": "Completato",
+        "PARTIALLY_FULFILLED": "Parzialmente Completato",
+        "UNFULFILLED": "Non Completato"
       }
     }
   },
@@ -386,44 +386,44 @@
   "EMAIL_HEADER": {
     "FROM": "Da",
     "TO": "A",
-    "BCC": "CCN",
+    "BCC": "Ccn",
     "CC": "Cc",
     "SUBJECT": "Oggetto",
-    "EXPAND": "Expand email"
+    "EXPAND": "Espandi email"
   },
   "CONVERSATION_PARTICIPANTS": {
-    "SIDEBAR_MENU_TITLE": "Participating",
-    "SIDEBAR_TITLE": "Conversation participants",
+    "SIDEBAR_MENU_TITLE": "Partecipate",
+    "SIDEBAR_TITLE": "Partecipanti alla conversazione",
     "NO_RECORDS_FOUND": "Nessun risultato trovato",
-    "ADD_PARTICIPANTS": "Select participants",
-    "REMANING_PARTICIPANTS_TEXT": "+{count} others",
-    "REMANING_PARTICIPANT_TEXT": "+{count} other",
-    "TOTAL_PARTICIPANTS_TEXT": "{count} people are participating.",
-    "TOTAL_PARTICIPANT_TEXT": "{count} person is participating.",
-    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
-    "WATCH_CONVERSATION": "Join conversation",
-    "YOU_ARE_WATCHING": "You are participating",
+    "ADD_PARTICIPANTS": "Seleziona partecipanti",
+    "REMANING_PARTICIPANTS_TEXT": "+{count} altri",
+    "REMANING_PARTICIPANT_TEXT": "+{count} altro",
+    "TOTAL_PARTICIPANTS_TEXT": "{count} persone stanno partecipando.",
+    "TOTAL_PARTICIPANT_TEXT": "{count} persona sta partecipando.",
+    "NO_PARTICIPANTS_TEXT": "Nessuno sta partecipando!",
+    "WATCH_CONVERSATION": "Unisciti alla conversazione",
+    "YOU_ARE_WATCHING": "Stai partecipando",
     "API": {
-      "ERROR_MESSAGE": "Could not update, try again!",
-      "SUCCESS_MESSAGE": "Participants updated!"
+      "ERROR_MESSAGE": "Impossibile aggiornare, riprova!",
+      "SUCCESS_MESSAGE": "Partecipanti aggiornati!"
     }
   },
   "TRANSLATE_MODAL": {
-    "TITLE": "View translated content",
-    "DESC": "You can view the translated content in each langauge.",
-    "ORIGINAL_CONTENT": "Original Content",
-    "TRANSLATED_CONTENT": "Translated Content",
-    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
+    "TITLE": "Visualizza contenuto tradotto",
+    "DESC": "Puoi visualizzare il contenuto tradotto in ogni lingua.",
+    "ORIGINAL_CONTENT": "Contenuto Originale",
+    "TRANSLATED_CONTENT": "Contenuto Tradotto",
+    "NO_TRANSLATIONS_AVAILABLE": "Nessuna traduzione disponibile per questo contenuto"
   },
   "TYPING": {
-    "ONE": "{user} is typing",
-    "TWO": "{user} and {secondUser} are typing",
-    "MULTIPLE": "{user} and {count} others are typing"
+    "ONE": "{user} sta scrivendo",
+    "TWO": "{user} e {secondUser} stanno scrivendo",
+    "MULTIPLE": "{user} e altri {count} stanno scrivendo"
   },
   "COPILOT": {
-    "TRY_THESE_PROMPTS": "Try these prompts"
+    "TRY_THESE_PROMPTS": "Prova questi prompt"
   },
   "GALLERY_VIEW": {
-    "ERROR_DOWNLOADING": "Unable to download attachment. Please try again"
+    "ERROR_DOWNLOADING": "Impossibile scaricare l'allegato. Riprova"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/csatMgmt.json b/app/javascript/dashboard/i18n/locale/it/csatMgmt.json
index ad1244ecd..7d6e5566f 100644
--- a/app/javascript/dashboard/i18n/locale/it/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/csatMgmt.json
@@ -3,11 +3,11 @@
     "TITLE": "Valuta la conversazione",
     "PLACEHOLDER": "Dicci di più...",
     "RATINGS": {
-      "POOR": "😞 Poor",
-      "FAIR": "😑 Fair",
-      "AVERAGE": "😐 Average",
-      "GOOD": "😀 Good",
-      "EXCELLENT": "😍 Excellent"
+      "POOR": "😞 Scarsa",
+      "FAIR": "😑 Sufficiente",
+      "AVERAGE": "😐 Nella Media",
+      "GOOD": "😀 Buona",
+      "EXCELLENT": "😍 Eccellente"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/customRole.json b/app/javascript/dashboard/i18n/locale/it/customRole.json
index 1bf71db4c..6e6203cf1 100644
--- a/app/javascript/dashboard/i18n/locale/it/customRole.json
+++ b/app/javascript/dashboard/i18n/locale/it/customRole.json
@@ -1,90 +1,90 @@
 {
   "CUSTOM_ROLE": {
-    "HEADER": "Custom Roles",
-    "LEARN_MORE": "Learn more about custom roles",
-    "DESCRIPTION": "Custom roles are roles that are created by the account owner or admin. These roles can be assigned to agents to define their access and permissions within the account. Custom roles can be created with specific permissions and access levels to suit the requirements of the organization.",
-    "HEADER_BTN_TXT": "Add custom role",
-    "LOADING": "Fetching custom roles...",
+    "HEADER": "Ruoli Personalizzati",
+    "LEARN_MORE": "Scopri di più sui ruoli personalizzati",
+    "DESCRIPTION": "I ruoli personalizzati sono ruoli creati dal proprietario o amministratore dell'account. Questi ruoli possono essere assegnati agli operatori per definire i loro accessi e i loro permessi all'interno dell'account. I ruoli personalizzati possono essere creati con permessi e livelli di accesso specifici per soddisfare le esigenze dell'organizzazione.",
+    "HEADER_BTN_TXT": "Aggiungi ruolo personalizzato",
+    "LOADING": "Caricamento ruoli personalizzati...",
     "SEARCH_404": "Non ci sono elementi che corrispondono a questa richiesta.",
     "PAYWALL": {
-      "TITLE": "Upgrade to create custom roles",
-      "AVAILABLE_ON": "The custom role feature is only available in the Business and Enterprise plans.",
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
-      "UPGRADE_NOW": "Upgrade now",
-      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+      "TITLE": "Aggiorna per creare ruoli personalizzati",
+      "AVAILABLE_ON": "La funzionalità ruoli personalizzati è disponibile solo nei piani Business e Enterprise.",
+      "UPGRADE_PROMPT": "Aggiorna il tuo piano per ottenere l'accesso a funzionalità avanzate come gestione del team, automazioni, attributi personalizzati e altro ancora.",
+      "UPGRADE_NOW": "Aggiorna ora",
+      "CANCEL_ANYTIME": "Puoi modificare o annullare il tuo piano in qualsiasi momento"
     },
     "ENTERPRISE_PAYWALL": {
-      "AVAILABLE_ON": "The custom role feature is only available in the paid plans.",
-      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
-      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+      "AVAILABLE_ON": "La funzionalità ruoli personalizzati è disponibile solo nei piani a pagamento.",
+      "UPGRADE_PROMPT": "Passa a un piano a pagamento per accedere a funzionalità avanzate come audit logs, capacità degli operatori e altro ancora.",
+      "ASK_ADMIN": "Contatta il tuo amministratore per l'aggiornamento."
     },
     "LIST": {
-      "404": "There are no custom roles available in this account.",
-      "TITLE": "Manage custom roles",
-      "DESC": "Custom roles are roles that are created by the account owner or admin. These roles can be assigned to agents to define their access and permissions within the account. Custom roles can be created with specific permissions and access levels to suit the requirements of the organization.",
+      "404": "Non ci sono ruoli personalizzati disponibili in questo account.",
+      "TITLE": "Gestisci ruoli personalizzati",
+      "DESC": "I ruoli personalizzati sono ruoli creati dal proprietario o amministratore dell'account. Questi ruoli possono essere assegnati agli operatori per definire i loro accessi e i loro permessi all'interno dell'account. I ruoli personalizzati possono essere creati con permessi e livelli di accesso specifici per soddisfare le esigenze dell'organizzazione.",
       "TABLE_HEADER": {
         "NAME": "Nome",
         "DESCRIPTION": "Descrizione",
-        "PERMISSIONS": "Permissions",
+        "PERMISSIONS": "Permessi",
         "ACTIONS": "Azioni"
       }
     },
     "PERMISSIONS": {
-      "CONVERSATION_MANAGE": "Manage all conversations",
-      "CONVERSATION_UNASSIGNED_MANAGE": "Manage unassigned conversations and those assigned to them",
-      "CONVERSATION_PARTICIPATING_MANAGE": "Manage participating conversations and those assigned to them",
-      "CONTACT_MANAGE": "Manage contacts",
-      "REPORT_MANAGE": "Manage reports",
-      "KNOWLEDGE_BASE_MANAGE": "Manage knowledge base"
+      "CONVERSATION_MANAGE": "Gestisci tutte le conversazioni",
+      "CONVERSATION_UNASSIGNED_MANAGE": "Gestisci le conversazioni non assegnate e quelle a loro assegnate",
+      "CONVERSATION_PARTICIPATING_MANAGE": "Gestisci le conversazioni partecipanti e quelle a loro assegnate",
+      "CONTACT_MANAGE": "Gestisci contatti",
+      "REPORT_MANAGE": "Gestisci report",
+      "KNOWLEDGE_BASE_MANAGE": "Gestisci knowledge base"
     },
     "FORM": {
       "NAME": {
         "LABEL": "Nome",
-        "PLACEHOLDER": "Please enter a name.",
+        "PLACEHOLDER": "Inserisci un nome.",
         "ERROR": "Il nome è obbligatorio."
       },
       "DESCRIPTION": {
         "LABEL": "Descrizione",
-        "PLACEHOLDER": "Please enter a description.",
+        "PLACEHOLDER": "Inserisci una descrizione.",
         "ERROR": "La descrizione è obbligatoria."
       },
       "PERMISSIONS": {
-        "LABEL": "Permissions",
-        "ERROR": "Permissions are required."
+        "LABEL": "Permessi",
+        "ERROR": "I permessi sono obbligatori."
       },
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "API": {
-        "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+        "ERROR_MESSAGE": "Impossibile connettersi al server Woot. Riprova."
       }
     },
     "ADD": {
-      "TITLE": "Add custom role",
-      "DESC": " Custom roles allows you to create roles with specific permissions and access levels to suit the requirements of the organization.",
+      "TITLE": "Aggiungi ruolo personalizzato",
+      "DESC": " I ruoli personalizzati consentono di creare ruoli con permessi e livelli di accesso specifici per soddisfare le esigenze dell'organizzazione.",
       "SUBMIT": "Invia",
       "API": {
-        "SUCCESS_MESSAGE": "Custom role added successfully."
+        "SUCCESS_MESSAGE": "Ruolo personalizzato aggiunto con successo."
       }
     },
     "EDIT": {
       "BUTTON_TEXT": "Modifica",
-      "TITLE": "Edit custom role",
-      "DESC": " Custom roles allows you to create roles with specific permissions and access levels to suit the requirements of the organization.",
+      "TITLE": "Modifica ruolo personalizzato",
+      "DESC": " I ruoli personalizzati consentono di creare ruoli con permessi e livelli di accesso specifici per soddisfare le esigenze dell'organizzazione.",
       "SUBMIT": "Aggiorna",
       "API": {
-        "SUCCESS_MESSAGE": "Custom role updated successfully."
+        "SUCCESS_MESSAGE": "Ruolo personalizzato aggiornato con successo."
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Elimina",
       "API": {
-        "SUCCESS_MESSAGE": "Custom role deleted successfully.",
-        "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+        "SUCCESS_MESSAGE": "Ruolo personalizzato eliminato con successo.",
+        "ERROR_MESSAGE": "Impossibile connettersi al server Woot. Riprova."
       },
       "CONFIRM": {
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare ",
-        "YES": "Yes, delete ",
-        "NO": "No, keep "
+        "YES": "Sì, elimina ",
+        "NO": "No, mantieni "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/datePicker.json b/app/javascript/dashboard/i18n/locale/it/datePicker.json
index 5fde2beec..de8850b70 100644
--- a/app/javascript/dashboard/i18n/locale/it/datePicker.json
+++ b/app/javascript/dashboard/i18n/locale/it/datePicker.json
@@ -1,13 +1,13 @@
 {
   "DATE_PICKER": {
     "APPLY_BUTTON": "Applica",
-    "CLEAR_BUTTON": "Clear",
+    "CLEAR_BUTTON": "Rimuovi",
     "DATE_RANGE_INPUT": {
-      "START": "Start Date",
-      "END": "End Date"
+      "START": "Data di Inizio",
+      "END": "Data di Fine"
     },
     "DATE_RANGE_OPTIONS": {
-      "TITLE": "DATE RANGE",
+      "TITLE": "RANGE DATE",
       "LAST_7_DAYS": "Ultimi 7 giorni",
       "LAST_30_DAYS": "Ultimi 30 giorni",
       "LAST_3_MONTHS": "Ultimi 3 mesi",
diff --git a/app/javascript/dashboard/i18n/locale/it/emoji.json b/app/javascript/dashboard/i18n/locale/it/emoji.json
index 4b6fa58ca..bd9cb3a4b 100644
--- a/app/javascript/dashboard/i18n/locale/it/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/it/emoji.json
@@ -1,7 +1,7 @@
 {
   "EMOJI": {
-    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search",
+    "PLACEHOLDER": "Cerca emoji",
+    "NOT_FOUND": "Nessuna emoji corrisponde alla tua ricerca",
     "REMOVE": "Rimuovi"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/general.json b/app/javascript/dashboard/i18n/locale/it/general.json
index 3c3d2f0fa..00f724b7b 100644
--- a/app/javascript/dashboard/i18n/locale/it/general.json
+++ b/app/javascript/dashboard/i18n/locale/it/general.json
@@ -1,12 +1,12 @@
 {
   "GENERAL": {
-    "SHOWING_RESULTS": "Showing {firstIndex}-{lastIndex} of {totalCount} items",
+    "SHOWING_RESULTS": "Mostrando {firstIndex}-{lastIndex} di {totalCount} elementi",
     "PHONE_INPUT": {
       "PLACEHOLDER": "Cerca",
       "EMPTY_STATE": "Nessun risultato trovato"
     },
     "CLOSE": "Chiudi",
     "BETA": "Beta",
-    "BETA_DESCRIPTION": "Questa funzione è in beta e può cambiare mentre la miglioriamo."
+    "BETA_DESCRIPTION": "Questa funzione è in beta e può subire variazioni mentre la miglioriamo."
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index a9f2dfc78..1b84b3b3c 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -1,25 +1,25 @@
 {
   "GENERAL_SETTINGS": {
     "LIMIT_MESSAGES": {
-      "CONVERSATION": "Hai superato il limite di conversazione. Il piano Hacker consente solo 500 conversazioni.",
+      "CONVERSATION": "Hai superato il limite di conversazioni. Il piano Hacker consente fino a 500 conversazioni.",
       "INBOXES": "Hai superato il limite di Inbox. Il piano Hacker supporta solo la live-chat sul sito web. Ulteriori Inbox come e-mail, WhatsApp ecc. richiedono un piano a pagamento.",
       "AGENTS": "Hai superato il limite di operatori. Il tuo piano consente solo {allowedAgents} operatori.",
       "NON_ADMIN": "Contatta l'amministratore per aggiornare il piano e continuare a utilizzare tutte le funzionalità."
     },
     "TITLE": "Impostazioni account",
-    "SUBMIT": "Aggiorna le impostazioni",
+    "SUBMIT": "Aggiorna impostazioni",
     "BACK": "Indietro",
-    "DISMISS": "Dismiss",
+    "DISMISS": "Ignora",
     "UPDATE": {
       "ERROR": "Impossibile aggiornare le impostazioni, riprova!",
       "SUCCESS": "Impostazioni account aggiornate con successo"
     },
     "ACCOUNT_DELETE_SECTION": {
-      "TITLE": "Elimina il tuo account",
+      "TITLE": "Elimina il tuo Account",
       "NOTE": "Una volta eliminato il tuo account, tutti i tuoi dati verranno eliminati.",
-      "BUTTON_TEXT": "Elimina il tuo account",
+      "BUTTON_TEXT": "Elimina il tuo Account",
       "CONFIRM": {
-        "TITLE": "Elimina account",
+        "TITLE": "Elimina Account",
         "MESSAGE": "L'eliminazione del tuo account è irreversibile. Inserisci il nome del tuo account qui sotto per confermare che vuoi eliminarlo in modo permanente.",
         "BUTTON_TEXT": "Elimina",
         "DISMISS": "Annulla",
@@ -31,7 +31,7 @@
         "TITLE": "Account pianificato per l'eliminazione",
         "MESSAGE_MANUAL": "Questo account è pianificato per la cancellazione il {deletionDate}. Questo è stato richiesto da un amministratore. Puoi annullare la cancellazione prima di questa data.",
         "MESSAGE_INACTIVITY": "Questo account è programmato per la cancellazione il {deletionDate} a causa dell'inattività dell'account. Puoi annullare la cancellazione prima di questa data.",
-        "CLEAR_BUTTON": "Annulla eliminazione pianificata"
+        "CLEAR_BUTTON": "Annulla Eliminazione Pianificata"
       }
     },
     "FORM": {
@@ -42,7 +42,7 @@
       },
       "ACCOUNT_ID": {
         "TITLE": "ID Account",
-        "NOTE": "Questo ID è richiesto se si sta costruendo un'integrazione basata su API"
+        "NOTE": "Questo ID è utile per costruire integrazioni basate su API"
       },
       "AUTO_RESOLVE": {
         "TITLE": "Risoluzione automatica delle conversazioni",
@@ -70,7 +70,7 @@
         "IGNORE_WAITING": {
           "LABEL": "Salta le conversazioni in attesa di risposta dell'operatore"
         },
-        "UPDATE_BUTTON": "Salva modifiche"
+        "UPDATE_BUTTON": "Salva Modifiche"
       },
       "NAME": {
         "LABEL": "Nome account",
@@ -78,17 +78,17 @@
         "ERROR": "Inserisci un nome account valido"
       },
       "LANGUAGE": {
-        "LABEL": "Site language",
+        "LABEL": "Lingua del sito",
         "PLACEHOLDER": "Nome del tuo account",
         "ERROR": ""
       },
       "DOMAIN": {
-        "LABEL": "Dominio email in entrata",
+        "LABEL": "Dominio Email In Arrivo",
         "PLACEHOLDER": "Il dominio in cui riceverai le email",
         "ERROR": ""
       },
       "SUPPORT_EMAIL": {
-        "LABEL": "Email di supporto",
+        "LABEL": "Email di Supporto",
         "PLACEHOLDER": "Email di supporto della tua azienda",
         "ERROR": ""
       },
@@ -98,7 +98,7 @@
       },
       "AUDIO_TRANSCRIPTION": {
         "TITLE": "Trascrizione Messaggi Audio",
-        "NOTE": "Trascrivere automaticamente i messaggi audio nelle conversazioni. Generare una trascrizione di testo ogni volta che un messaggio audio viene inviato o ricevuto, e visualizzarlo accanto al messaggio.",
+        "NOTE": "Trascrivi automaticamente i messaggi audio nelle conversazioni. Genera una trascrizione di testo ogni volta che un messaggio audio viene inviato o ricevuto, mostrandolo accanto al messaggio.",
         "API": {
           "SUCCESS": "Impostazioni di trascrizione audio aggiornate con successo",
           "ERROR": "Aggiornamento delle impostazioni di trascrizione audio non riuscito"
@@ -106,7 +106,7 @@
       },
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Durata dell'inattività per la risoluzione",
-        "HELP": "Durata dopo la quale una conversazione si dovrebbe risolvere automaticamente se non c'è attività",
+        "HELP": "Durata dopo la quale una conversazione si risolve automaticamente se non c'è attività",
         "PLACEHOLDER": "30",
         "ERROR": "La durata della risoluzione automatica deve essere compresa tra 10 minuti e 999 giorni",
         "API": {
@@ -119,16 +119,16 @@
         "MESSAGE_HELP": "Questo messaggio viene inviato al cliente quando una conversazione viene risolta automaticamente dal sistema a causa di inattività."
       },
       "FEATURES": {
-        "INBOUND_EMAIL_ENABLED": "La continuità della conversazione con le email è abilitata per il tuo account.",
+        "INBOUND_EMAIL_ENABLED": "La continuità della conversazione via email è abilitata per il tuo account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "Puoi ricevere email nel tuo dominio personalizzato ora."
       }
     },
     "UPDATE_CHATWOOT": "È disponibile un aggiornamento {latestChatwootVersion} per Chatwoot. Aggiorna la tua istanza.",
     "LEARN_MORE": "Scopri di più",
-    "PAYMENT_PENDING": "Your payment is pending. Please update your payment information to continue using Chatwoot",
+    "PAYMENT_PENDING": "Il tuo pagamento è in sospeso. Aggiorna le informazioni di pagamento per continuare a utilizzare Chatwoot",
     "UPGRADE": "Aggiorna per continuare a usare Chatwoot",
-    "LIMITS_UPGRADE": "Your account has exceeded the usage limits, please upgrade your plan to continue using Chatwoot",
-    "OPEN_BILLING": "Open billing"
+    "LIMITS_UPGRADE": "Il tuo account ha superato i limiti di utilizzo, aggiorna il tuo piano per continuare a utilizzare Chatwoot",
+    "OPEN_BILLING": "Apri fatturazione"
   },
   "FORMS": {
     "MULTISELECT": {
@@ -136,7 +136,7 @@
       "ENTER_TO_REMOVE": "Premi Invio per rimuovere",
       "NO_OPTIONS": "L'elenco è vuoto",
       "SELECT_ONE": "Selezionane uno",
-      "SELECT": "Select"
+      "SELECT": "Seleziona"
     }
   },
   "NOTIFICATIONS_PAGE": {
@@ -147,79 +147,79 @@
       "TITLE": "Notifiche non lette",
       "ALL_NOTIFICATIONS": "Visualizza tutte le notifiche",
       "LOADING_UNREAD_MESSAGE": "Caricamento notifiche non lette...",
-      "EMPTY_MESSAGE": "Non hai notifiche non lette"
+      "EMPTY_MESSAGE": "Non hai nessuna nuova notifica"
     },
     "LIST": {
       "LOADING_MESSAGE": "Caricamento notifiche...",
       "404": "Nessuna notifica",
       "TABLE_HEADER": [
         "Nome",
-        "Numero di telefono",
+        "Numero di Telefono",
         "Conversazioni",
-        "Ultimo contattato"
+        "Ultimo Contatto"
       ]
     },
     "TYPE_LABEL": {
       "conversation_creation": "Nuova conversazione",
       "conversation_assignment": "Conversazione assegnata",
-      "assigned_conversation_new_message": "Nuovo messaggio",
-      "participating_conversation_new_message": "Nuovo messaggio",
+      "assigned_conversation_new_message": "Nuovo Messaggio",
+      "participating_conversation_new_message": "Nuovo Messaggio",
       "conversation_mention": "Menzione",
-      "sla_missed_first_response": "SLA Missed",
-      "sla_missed_next_response": "SLA Missed",
-      "sla_missed_resolution": "SLA Missed"
+      "sla_missed_first_response": "SLA Mancata",
+      "sla_missed_next_response": "SLA Mancata",
+      "sla_missed_resolution": "SLA Mancata"
     }
   },
   "NETWORK": {
     "NOTIFICATION": {
       "OFFLINE": "Offline",
-      "RECONNECTING": "Reconnecting...",
-      "RECONNECT_SUCCESS": "Reconnected"
+      "RECONNECTING": "Riconnessione...",
+      "RECONNECT_SUCCESS": "Riconnesso"
     },
     "BUTTON": {
       "REFRESH": "Aggiorna"
     }
   },
   "COMMAND_BAR": {
-    "SEARCH_PLACEHOLDER": "Cerca o salta a",
+    "SEARCH_PLACEHOLDER": "Cerca o vai a",
     "SECTIONS": {
       "GENERAL": "Generale",
-      "REPORTS": "Rapporti",
-      "CONVERSATION": "Conversazioni",
-      "BULK_ACTIONS": "Bulk Actions",
+      "REPORTS": "Report",
+      "CONVERSATION": "Conversazione",
+      "BULK_ACTIONS": "Azioni Bulk",
       "CHANGE_ASSIGNEE": "Cambia assegnatario",
-      "CHANGE_PRIORITY": "Change Priority",
+      "CHANGE_PRIORITY": "Cambia Priorità",
       "CHANGE_TEAM": "Cambia Team",
-      "SNOOZE_CONVERSATION": "Posticipa conversazione",
+      "SNOOZE_CONVERSATION": "Posticipa Conversazione",
       "ADD_LABEL": "Aggiungi etichetta alla conversazione",
       "REMOVE_LABEL": "Rimuovi etichetta dalla conversazione",
       "SETTINGS": "Impostazioni",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "APPEARANCE": "Aspetto",
+      "SNOOZE_NOTIFICATION": "Posticipa Notifica"
     },
     "COMMANDS": {
-      "GO_TO_CONVERSATION_DASHBOARD": "Vai alla dashboard Conversazioni",
-      "GO_TO_CONTACTS_DASHBOARD": "Vai alla dashboard Contatti",
-      "GO_TO_REPORTS_OVERVIEW": "Vai alla panoramica dei report",
-      "GO_TO_CONVERSATION_REPORTS": "Vai ai report della conversazione",
-      "GO_TO_AGENT_REPORTS": "Vai ai report degli agenti",
-      "GO_TO_LABEL_REPORTS": "Vai ai report delle etichette",
-      "GO_TO_INBOX_REPORTS": "Vai ai report delle caselle",
-      "GO_TO_TEAM_REPORTS": "Vai ai report dei team",
-      "GO_TO_SETTINGS_AGENTS": "Vai alle impostazioni dell'agente",
-      "GO_TO_SETTINGS_TEAMS": "Vai alle impostazioni del team",
-      "GO_TO_SETTINGS_INBOXES": "Vai alle impostazioni delle caselle",
-      "GO_TO_SETTINGS_LABELS": "Vai alle impostazioni delle etichette",
-      "GO_TO_SETTINGS_CANNED_RESPONSES": "Vai alle impostazioni delle risposte predefinite",
-      "GO_TO_SETTINGS_APPLICATIONS": "Vai alle impostazioni dell'applicazione",
-      "GO_TO_SETTINGS_ACCOUNT": "Vai alle impostazioni dell'account",
-      "GO_TO_SETTINGS_PROFILE": "Vai alle impostazioni del profilo",
+      "GO_TO_CONVERSATION_DASHBOARD": "Vai alla Dashboard Conversazioni",
+      "GO_TO_CONTACTS_DASHBOARD": "Vai alla Dashboard Contatti",
+      "GO_TO_REPORTS_OVERVIEW": "Vai alla Panoramica dei Report",
+      "GO_TO_CONVERSATION_REPORTS": "Vai ai Report delle Conversazioni",
+      "GO_TO_AGENT_REPORTS": "Vai ai Report degli Operatori",
+      "GO_TO_LABEL_REPORTS": "Vai ai Report delle Etichette",
+      "GO_TO_INBOX_REPORTS": "Vai ai Report delle Inbox",
+      "GO_TO_TEAM_REPORTS": "Vai ai Report dei Team",
+      "GO_TO_SETTINGS_AGENTS": "Vai alle Impostazioni Operatore",
+      "GO_TO_SETTINGS_TEAMS": "Vai alle Impostazioni Team",
+      "GO_TO_SETTINGS_INBOXES": "Vai alle Impostazioni Inbox",
+      "GO_TO_SETTINGS_LABELS": "Vai alle Impostazioni Etichette",
+      "GO_TO_SETTINGS_CANNED_RESPONSES": "Vai alle Impostazioni delle Risposte Predefinite",
+      "GO_TO_SETTINGS_APPLICATIONS": "Vai alle Impostazioni Applicazione",
+      "GO_TO_SETTINGS_ACCOUNT": "Vai alle Impostazioni Account",
+      "GO_TO_SETTINGS_PROFILE": "Vai alle Impostazioni Profilo",
       "GO_TO_NOTIFICATIONS": "Vai alle notifiche",
       "ADD_LABELS_TO_CONVERSATION": "Aggiungi etichetta alla conversazione",
-      "ASSIGN_AN_AGENT": "Assegna un agente",
+      "ASSIGN_AN_AGENT": "Assegna un operatore",
       "AI_ASSIST": "AI Assist",
-      "ASSIGN_PRIORITY": "Assign priority",
+      "ASSIGN_PRIORITY": "Assegna priorità",
       "ASSIGN_A_TEAM": "Assegna un team",
       "MUTE_CONVERSATION": "Silenzia conversazione",
       "UNMUTE_CONVERSATION": "Riattiva conversazione",
@@ -227,25 +227,25 @@
       "REOPEN_CONVERSATION": "Riapri la conversazione",
       "RESOLVE_CONVERSATION": "Risolvi la conversazione",
       "SEND_TRANSCRIPT": "Invia una trascrizione email",
-      "SNOOZE_CONVERSATION": "Posticipa conversazione",
+      "SNOOZE_CONVERSATION": "Posticipa Conversazione",
       "UNTIL_NEXT_REPLY": "Fino alla prossima risposta",
       "UNTIL_NEXT_WEEK": "Fino alla prossima settimana",
       "UNTIL_TOMORROW": "Fino a domani",
-      "UNTIL_NEXT_MONTH": "Until next month",
-      "AN_HOUR_FROM_NOW": "Until an hour from now",
-      "UNTIL_CUSTOM_TIME": "Custom...",
-      "CHANGE_APPEARANCE": "Change Appearance",
-      "LIGHT_MODE": "Light",
-      "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "UNTIL_NEXT_MONTH": "Fino al prossimo mese",
+      "AN_HOUR_FROM_NOW": "Fino a un'ora da adesso",
+      "UNTIL_CUSTOM_TIME": "Personalizza...",
+      "CHANGE_APPEARANCE": "Modifica Aspetto",
+      "LIGHT_MODE": "Chiaro",
+      "DARK_MODE": "Scuro",
+      "SYSTEM_MODE": "Sistema",
+      "SNOOZE_NOTIFICATION": "Posticipa Notifica"
     }
   },
   "DASHBOARD_APPS": {
-    "LOADING_MESSAGE": "Loading Dashboard App..."
+    "LOADING_MESSAGE": "Caricamento Dashboard App..."
   },
   "COMMON": {
-    "OR": "Or",
+    "OR": "Oppure",
     "CLICK_HERE": "clicca qui"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/helpCenter.json b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
index c89ecc4fd..920199cca 100644
--- a/app/javascript/dashboard/i18n/locale/it/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
@@ -2,35 +2,35 @@
   "HELP_CENTER": {
     "TITLE": "Help Center",
     "NEW_PAGE": {
-      "DESCRIPTION": "Create self-service help center portals for your customers. Help them find answers quickly, without waiting. Streamline inquiries, boost agent efficiency, and elevate customer support.",
-      "CREATE_PORTAL_BUTTON": "Crea portale"
+      "DESCRIPTION": "Crea portali di assistenza self-service per i tuoi clienti. Aiutali a trovare rapidamente le risposte che cercano, senza attese. Semplifica le richieste, migliora l'efficienza degli operatori e migliora l'assistenza clienti.",
+      "CREATE_PORTAL_BUTTON": "Crea Portale"
     },
     "HEADER": {
       "FILTER": "Filtra per",
       "SORT": "Ordina per",
-      "LOCALE": "Locale",
+      "LOCALE": "Lingua",
       "SETTINGS_BUTTON": "Impostazioni",
-      "NEW_BUTTON": "Nuovo articolo",
+      "NEW_BUTTON": "Nuovo Articolo",
       "DROPDOWN_OPTIONS": {
         "PUBLISHED": "Pubblicato",
         "DRAFT": "Bozza",
         "ARCHIVED": "Archiviato"
       },
       "TITLES": {
-        "ALL_ARTICLES": "Tutti gli articoli",
-        "MINE": "I miei articoli",
-        "DRAFT": "Articoli in bozza",
-        "ARCHIVED": "Articoli archiviati"
+        "ALL_ARTICLES": "Tutti Gli Articoli",
+        "MINE": "I Miei Articoli",
+        "DRAFT": "Articoli in Bozza",
+        "ARCHIVED": "Articoli Archiviati"
       },
       "LOCALE_SELECT": {
-        "TITLE": "Select locale",
-        "PLACEHOLDER": "Select locale",
-        "NO_RESULT": "No locale found",
-        "SEARCH_PLACEHOLDER": "Search locale"
+        "TITLE": "Seleziona lingua",
+        "PLACEHOLDER": "Seleziona lingua",
+        "NO_RESULT": "Nessuna lingua trovata",
+        "SEARCH_PLACEHOLDER": "Cerca lingua"
       }
     },
     "EDIT_HEADER": {
-      "ALL_ARTICLES": "Tutti gli articoli",
+      "ALL_ARTICLES": "Tutti gli Articoli",
       "PUBLISH_BUTTON": "Pubblica",
       "MOVE_TO_ARCHIVE_BUTTON": "Sposta nell'archivio",
       "PREVIEW": "Anteprima",
@@ -44,16 +44,16 @@
       "IMAGE_UPLOAD": {
         "TITLE": "Carica immagine",
         "UPLOADING": "Caricamento...",
-        "SUCCESS": "Image uploaded successfully",
-        "ERROR": "Error while uploading image",
-        "UN_AUTHORIZED_ERROR": "You are not authorized to upload images",
-        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
-        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
-        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+        "SUCCESS": "Immagine caricata correttamente",
+        "ERROR": "Errore nel caricamento dell'immagine",
+        "UN_AUTHORIZED_ERROR": "Non sei autorizzato a caricare immagini",
+        "ERROR_FILE_SIZE": "La dimensione dell'immagine deve essere inferiore a {size}MB",
+        "ERROR_FILE_FORMAT": "Il formato immagine deve essere jpg, jpeg o png",
+        "ERROR_FILE_DIMENSIONS": "Le dimensioni dell'immagine dovrebbero essere inferiori a 2000 x 2000"
       }
     },
     "ARTICLE_SETTINGS": {
-      "TITLE": "Impostazioni articolo",
+      "TITLE": "Impostazioni Articolo",
       "FORM": {
         "CATEGORY": {
           "LABEL": "Categoria",
@@ -88,29 +88,29 @@
       }
     },
     "ARTICLE_SEARCH_RESULT": {
-      "UNCATEGORIZED": "Uncategorized",
-      "SEARCH_RESULTS": "Search results for {query}",
-      "EMPTY_TEXT": "Search for articles to insert into replies.",
-      "SEARCH_LOADER": "Searching...",
-      "INSERT_ARTICLE": "Insert",
-      "NO_RESULT": "No articles found",
-      "COPY_LINK": "Copy article link to clipboard",
-      "OPEN_LINK": "Open article in new tab",
-      "PREVIEW_LINK": "Preview article"
+      "UNCATEGORIZED": "Senza categoria",
+      "SEARCH_RESULTS": "Risultati ricerca per {query}",
+      "EMPTY_TEXT": "Cerca articoli da inserire nelle risposte.",
+      "SEARCH_LOADER": "Ricerca...",
+      "INSERT_ARTICLE": "Inserisci",
+      "NO_RESULT": "Nessun articolo trovato",
+      "COPY_LINK": "Copia il link dell'articolo negli appunti",
+      "OPEN_LINK": "Apri articolo in una nuova scheda",
+      "PREVIEW_LINK": "Anteprima articolo"
     },
     "PORTAL": {
       "HEADER": "Portali",
       "DEFAULT": "Predefinito",
-      "NEW_BUTTON": "Nuovo portale",
+      "NEW_BUTTON": "Nuovo Portale",
       "ACTIVE_BADGE": "attivo",
       "CHOOSE_LOCALE_LABEL": "Scegli una lingua",
-      "LOADING_MESSAGE": "Caricamento dei portali...",
+      "LOADING_MESSAGE": "Caricamento portali...",
       "ARTICLES_LABEL": "articoli",
       "NO_PORTALS_MESSAGE": "Non ci sono portali disponibili",
       "ADD_NEW_LOCALE": "Aggiungi una nuova lingua",
       "POPOVER": {
         "TITLE": "Portali",
-        "PORTAL_SETTINGS": "Impostazioni del portale",
+        "PORTAL_SETTINGS": "Impostazioni Portale",
         "SUBTITLE": "Hai più portali e puoi avere diverse lingue per ogni portale.",
         "CANCEL_BUTTON_LABEL": "Annulla",
         "CHOOSE_LOCALE_BUTTON": "Scegli lingua"
@@ -141,7 +141,7 @@
               "NAME": "Nome lingua",
               "CODE": "Codice lingua",
               "ARTICLE_COUNT": "N° di articoli",
-              "CATEGORIES": "N. di categorie",
+              "CATEGORIES": "N° di categorie",
               "SWAP": "Scambia",
               "DELETE": "Elimina",
               "DEFAULT_LOCALE": "Predefinito"
@@ -187,7 +187,7 @@
           "TABLE": {
             "NAME": "Nome",
             "DESCRIPTION": "Descrizione",
-            "LOCALE": "Locale",
+            "LOCALE": "Lingua",
             "ARTICLE_COUNT": "N° di articoli",
             "ACTION_BUTTON": {
               "EDIT": "Modifica categoria",
@@ -218,13 +218,13 @@
         "CREATE_FLOW_PAGE": {
           "BACK_BUTTON": "Indietro",
           "BASIC_SETTINGS_PAGE": {
-            "HEADER": "Crea portale",
-            "TITLE": "Informazioni del centro assistenza",
+            "HEADER": "Crea Portale",
+            "TITLE": "Informazioni Help Center",
             "CREATE_BASIC_SETTING_BUTTON": "Crea impostazioni di base del portale"
           },
           "CUSTOMIZATION_PAGE": {
             "HEADER": "Personalizzazione del portale",
-            "TITLE": "Personalizzazione del centro assistenza",
+            "TITLE": "Personalizzazione help center",
             "UPDATE_PORTAL_BUTTON": "Aggiorna impostazioni del portale"
           },
           "FINISH_PAGE": {
@@ -237,9 +237,9 @@
           "LABEL": "Logo",
           "UPLOAD_BUTTON": "Carica logo",
           "HELP_TEXT": "Questo logo verrà visualizzato nell'intestazione del portale.",
-          "IMAGE_UPLOAD_SUCCESS": "Logo uploaded successfully",
-          "IMAGE_UPLOAD_ERROR": "Logo deleted successfully",
-          "IMAGE_DELETE_ERROR": "Error while deleting logo"
+          "IMAGE_UPLOAD_SUCCESS": "Logo caricato correttamente",
+          "IMAGE_UPLOAD_ERROR": "Logo eliminato correttamente",
+          "IMAGE_DELETE_ERROR": "Errore durante l'eliminazione del logo"
         },
         "NAME": {
           "LABEL": "Nome",
@@ -255,14 +255,14 @@
         "DOMAIN": {
           "LABEL": "Dominio personalizzato",
           "PLACEHOLDER": "Dominio personalizzato del portale",
-          "HELP_TEXT": "Add only If you want to use a custom domain for your portals. Eg: {exampleURL}",
-          "ERROR": "Enter a valid domain URL"
+          "HELP_TEXT": "Aggiungi solo se vuoi usare un dominio personalizzato per i tuoi portali. Per es.: {exampleURL}",
+          "ERROR": "Inserisci un URL di dominio valido"
         },
         "HOME_PAGE_LINK": {
-          "LABEL": "Link pagina iniziale",
+          "LABEL": "Link Pagina Iniziale",
           "PLACEHOLDER": "Link della pagina iniziale del portale",
-          "HELP_TEXT": "The link used to return from the portal to the home page. Eg: {exampleURL}",
-          "ERROR": "Enter a valid home page URL"
+          "HELP_TEXT": "Il link utilizzato per tornare dal portale alla home page. Per es.: {exampleURL}",
+          "ERROR": "Inserisci un URL valido per la pagina iniziale"
         },
         "THEME_COLOR": {
           "LABEL": "Colore tema del portale",
@@ -292,7 +292,7 @@
         "SUB_TITLE": "Questo aggiunge un nuova lingua alla tua lista di traduzioni disponibili.",
         "PORTAL": "Portale",
         "LOCALE": {
-          "LABEL": "Locale",
+          "LABEL": "Lingua",
           "PLACEHOLDER": "Scegli una lingua",
           "ERROR": "Lingua richiesta"
         },
@@ -325,13 +325,13 @@
       "HEADERS": {
         "TITLE": "Titolo",
         "CATEGORY": "Categoria",
-        "READ_COUNT": "Views",
+        "READ_COUNT": "Visualizzazioni",
         "STATUS": "Stato",
         "LAST_EDITED": "Ultima modifica"
       },
       "COLUMNS": {
         "BY": "di",
-        "AUTHOR_NOT_AVAILABLE": "Author is not available"
+        "AUTHOR_NOT_AVAILABLE": "Autore non disponibile"
       }
     },
     "EDIT_ARTICLE": {
@@ -345,7 +345,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Errore durante la pubblicazione dell'articolo",
-        "SUCCESS": "Article published successfully"
+        "SUCCESS": "Articolo pubblicato correttamente"
       }
     },
     "ARCHIVE_ARTICLE": {
@@ -356,8 +356,8 @@
     },
     "DRAFT_ARTICLE": {
       "API": {
-        "ERROR": "Error while drafting article",
-        "SUCCESS": "Article drafted successfully"
+        "ERROR": "Errore durante il salvataggio in bozza dell'articolo",
+        "SUCCESS": "Articolo salvato in bozza"
       }
     },
     "DELETE_ARTICLE": {
@@ -391,7 +391,7 @@
         "NAME": {
           "LABEL": "Nome",
           "PLACEHOLDER": "Nome categoria",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "Il nome e l'icona della categoria saranno usati nel portale pubblico per categorizzare gli articoli.",
           "ERROR": "Il nome è obbligatorio"
         },
         "SLUG": {
@@ -422,7 +422,7 @@
         "NAME": {
           "LABEL": "Nome",
           "PLACEHOLDER": "Nome categoria",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "Il nome e l'icona della categoria saranno usati nel portale pubblico per categorizzare gli articoli.",
           "ERROR": "Il nome è obbligatorio"
         },
         "SLUG": {
@@ -453,56 +453,56 @@
       }
     },
     "ARTICLE_SEARCH": {
-      "TITLE": "Search articles",
-      "PLACEHOLDER": "Search articles",
-      "NO_RESULT": "No articles found",
-      "SEARCHING": "Searching...",
+      "TITLE": "Cerca articoli",
+      "PLACEHOLDER": "Cerca articoli",
+      "NO_RESULT": "Nessun articolo trovato",
+      "SEARCHING": "Ricerca...",
       "SEARCH_BUTTON": "Cerca",
-      "INSERT_ARTICLE": "Insert link",
-      "IFRAME_ERROR": "URL is empty or invalid. Unable to display content.",
-      "OPEN_ARTICLE_SEARCH": "Insert article from Help Center",
-      "SUCCESS_ARTICLE_INSERTED": "Article inserted successfully",
-      "PREVIEW_LINK": "Preview article",
+      "INSERT_ARTICLE": "Inserisci link",
+      "IFRAME_ERROR": "URL vuoto o non valido. Impossibile visualizzare il contenuto.",
+      "OPEN_ARTICLE_SEARCH": "Inserisci articolo dall'Help Center",
+      "SUCCESS_ARTICLE_INSERTED": "Articolo inserito correttamente",
+      "PREVIEW_LINK": "Anteprima articolo",
       "CANCEL": "Chiudi",
       "BACK": "Indietro",
-      "BACK_RESULTS": "Back to results"
+      "BACK_RESULTS": "Torna ai risultati"
     },
     "UPGRADE_PAGE": {
       "TITLE": "Help Center",
-      "DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Upgrade your subscription to enable this feature.",
-      "SELF_HOSTED_DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Please contact your administrator to enable this feature.",
+      "DESCRIPTION": "Crea portali self-service user-friendly. Aiuta i tuoi utenti ad accedere agli articoli e ottieni supporto 24/7. Aggiorna il tuo abbonamento per abilitare questa funzionalità.",
+      "SELF_HOSTED_DESCRIPTION": "Crea portali self-service user-friendly. Aiuta i tuoi utenti ad accedere agli articoli e ottieni supporto 24/7. Contatta l'amministratore per abilitare questa funzione.",
       "BUTTON": {
         "LEARN_MORE": "Scopri di più",
-        "UPGRADE": "Upgrade"
+        "UPGRADE": "Aggiorna"
       },
       "FEATURES": {
         "PORTALS": {
-          "TITLE": "Multiple portals",
-          "DESCRIPTION": "Create multiple help center portals for different products using the same account."
+          "TITLE": "Più portali",
+          "DESCRIPTION": "Crea più portali help center per diversi prodotti utilizzando lo stesso account."
         },
         "LOCALES": {
-          "TITLE": "Full support for locales",
-          "DESCRIPTION": "Localize the portal in your language. We support all locales and allow translations for every article."
+          "TITLE": "Supporto completo per le lingue",
+          "DESCRIPTION": "Localizza il portale nella tua lingua. Supportiamo tutte le lingue e permettiamo traduzioni per ogni articolo."
         },
         "SEO": {
-          "TITLE": "SEO-friendly design",
-          "DESCRIPTION": "Customize your meta tags to improve your visibility on search engines with our SEO-friendly pages."
+          "TITLE": "Design SEO-friendly",
+          "DESCRIPTION": "Personalizza i tuoi meta tag per migliorare la tua visibilità sui motori di ricerca con le nostre pagine SEO-friendly."
         },
         "API": {
-          "TITLE": "Full API support",
-          "DESCRIPTION": "Use the portal as a headless CMS with third party front-end frameworks using our APIs."
+          "TITLE": "Supporto API completo",
+          "DESCRIPTION": "Utilizzare il portale come un headless CMS con front-end di terze parti utilizzando le nostre API."
         }
       }
     },
-    "LOADING": "Loading...",
+    "LOADING": "Caricamento...",
     "ARTICLES_PAGE": {
       "ARTICLE_CARD": {
         "CARD": {
-          "VIEWS": "{count} view | {count} views",
+          "VIEWS": "{count} visualizzazione | {count} visualizzazioni",
           "DROPDOWN_MENU": {
             "PUBLISH": "Pubblica",
             "DRAFT": "Bozza",
-            "ARCHIVE": "Archive",
+            "ARCHIVE": "Archivia",
             "DELETE": "Elimina"
           },
           "STATUS": {
@@ -511,51 +511,51 @@
             "ARCHIVED": "Archiviato"
           },
           "CATEGORY": {
-            "UNCATEGORISED": "Uncategorised"
+            "UNCATEGORISED": "Senza categoria"
           }
         }
       },
       "ARTICLES_HEADER": {
         "TABS": {
-          "ALL": "All articles",
+          "ALL": "Tutti gli articoli",
           "MINE": "Mie",
           "DRAFT": "Bozza",
           "PUBLISHED": "Pubblicato",
           "ARCHIVED": "Archiviato"
         },
         "CATEGORY": {
-          "ALL": "All categories"
+          "ALL": "Tutte le categorie"
         },
         "LOCALE": {
-          "ALL": "All locales"
+          "ALL": "Tutte le lingue"
         },
-        "NEW_ARTICLE": "New article"
+        "NEW_ARTICLE": "Nuovo articolo"
       },
       "EMPTY_STATE": {
         "ALL": {
-          "TITLE": "Write an article",
-          "SUBTITLE": "Write a rich article, let’s get started!",
-          "BUTTON_LABEL": "New article"
+          "TITLE": "Scrivi un articolo",
+          "SUBTITLE": "Scrivi un articolo, iniziamo!",
+          "BUTTON_LABEL": "Nuovo articolo"
         },
         "MINE": {
-          "TITLE": "You haven't written any articles here",
-          "SUBTITLE": "All articles written by you show up here for quick access."
+          "TITLE": "Non hai scritto nessun articolo qui",
+          "SUBTITLE": "Tutti gli articoli scritti da te appaiono qui per un rapido accesso."
         },
         "DRAFT": {
-          "TITLE": "There are no articles in drafts",
-          "SUBTITLE": "Draft articles will appear here"
+          "TITLE": "Non ci sono articoli nelle bozze",
+          "SUBTITLE": "Gli articoli in bozza appariranno qui"
         },
         "PUBLISHED": {
-          "TITLE": "There are no published articles",
-          "SUBTITLE": "Published articles will appear here"
+          "TITLE": "Non ci sono articoli pubblicati",
+          "SUBTITLE": "Gli articoli pubblicati appariranno qui"
         },
         "ARCHIVED": {
-          "TITLE": "There are no articles in the archive",
-          "SUBTITLE": "Archived articles don't show up on the portal, you can use it to mark deprecated or outdated pages"
+          "TITLE": "Non ci sono articoli nell'archivio",
+          "SUBTITLE": "Gli articoli archiviati non vengono visualizzati sul portale, puoi usarli per contrassegnare pagine obsolete o deprecate"
         },
         "CATEGORY": {
-          "TITLE": "There are no articles in this category",
-          "SUBTITLE": "Articles in this category will appear here"
+          "TITLE": "Non ci sono articoli in questa categoria",
+          "SUBTITLE": "Gli articoli in questa categoria appariranno qui"
         }
       }
     },
@@ -563,18 +563,18 @@
       "CATEGORY_HEADER": {
         "NEW_CATEGORY": "Nuova categoria",
         "EDIT_CATEGORY": "Modifica categoria",
-        "CATEGORIES_COUNT": "{n} category | {n} categories",
+        "CATEGORIES_COUNT": "{n} categoria | {n} categorie",
         "BREADCRUMB": {
-          "CATEGORY_LOCALE": "Categories ({localeCode})",
-          "ACTIVE_CATEGORY": "{categoryName} ({categoryCount} articles) | {categoryName} ({categoryCount} article)"
+          "CATEGORY_LOCALE": "Categorie ({localeCode})",
+          "ACTIVE_CATEGORY": "{categoryName} ({categoryCount} articoli) | {categoryName} ({categoryCount} articolo)"
         }
       },
       "CATEGORY_EMPTY_STATE": {
         "TITLE": "Nessuna categoria trovata",
-        "SUBTITLE": "Categories will appear here. You can add a category by clicking the 'New Category' button."
+        "SUBTITLE": "Le categorie appariranno qui. Puoi aggiungere una categoria cliccando sul pulsante 'Nuova Categoria'."
       },
       "CATEGORY_CARD": {
-        "ARTICLES_COUNT": "{count} article | {count} articles"
+        "ARTICLES_COUNT": "{count} articolo | {count} articoli"
       },
       "CATEGORY_DIALOG": {
         "CREATE": {
@@ -628,22 +628,22 @@
       }
     },
     "LOCALES_PAGE": {
-      "LOCALES_COUNT": "No locales available | {n} locale | {n} locales",
-      "NEW_LOCALE_BUTTON_TEXT": "New locale",
+      "LOCALES_COUNT": "Nessuna lingua disponibile | {n} lingua | {n} lingue",
+      "NEW_LOCALE_BUTTON_TEXT": "Nuova lingua",
       "LOCALE_CARD": {
-        "ARTICLES_COUNT": "{count} article | {count} articles",
-        "CATEGORIES_COUNT": "{count} category | {count} categories",
+        "ARTICLES_COUNT": "{count} articolo | {count} articoli",
+        "CATEGORIES_COUNT": "{count} categoria | {count} categorie",
         "DEFAULT": "Predefinito",
         "DROPDOWN_MENU": {
-          "MAKE_DEFAULT": "Make default",
+          "MAKE_DEFAULT": "Imposta predefinito",
           "DELETE": "Elimina"
         }
       },
       "ADD_LOCALE_DIALOG": {
         "TITLE": "Aggiungi una nuova lingua",
-        "DESCRIPTION": "Select the language in which this article will be written. This will be added to your list of translations, and you can add more later.",
+        "DESCRIPTION": "Seleziona la lingua in cui questo articolo verrà scritto. Questo sarà aggiunto alla tua lista di traduzioni e puoi aggiungerne di più in seguito.",
         "COMBOBOX": {
-          "PLACEHOLDER": "Select locale..."
+          "PLACEHOLDER": "Seleziona lingua..."
         },
         "API": {
           "SUCCESS_MESSAGE": "Lingua aggiunta con successo",
@@ -660,44 +660,44 @@
         "PREVIEW": "Anteprima",
         "PUBLISH": "Pubblica",
         "DRAFT": "Bozza",
-        "ARCHIVE": "Archive",
-        "BACK_TO_ARTICLES": "Back to articles"
+        "ARCHIVE": "Archivia",
+        "BACK_TO_ARTICLES": "Torna agli articoli"
       },
       "EDIT_ARTICLE": {
-        "MORE_PROPERTIES": "More properties",
-        "UNCATEGORIZED": "Uncategorized",
-        "EDITOR_PLACEHOLDER": "Write something..."
+        "MORE_PROPERTIES": "Altre proprietà",
+        "UNCATEGORIZED": "Senza categoria",
+        "EDITOR_PLACEHOLDER": "Scrivi qualcosa..."
       },
       "ARTICLE_PROPERTIES": {
-        "ARTICLE_PROPERTIES": "Article properties",
+        "ARTICLE_PROPERTIES": "Proprietà articolo",
         "META_DESCRIPTION": "Descrizione meta",
-        "META_DESCRIPTION_PLACEHOLDER": "Add meta description",
+        "META_DESCRIPTION_PLACEHOLDER": "Aggiungi descrizione meta",
         "META_TITLE": "Titolo meta",
-        "META_TITLE_PLACEHOLDER": "Add meta title",
+        "META_TITLE_PLACEHOLDER": "Aggiungi titolo meta",
         "META_TAGS": "Tag meta",
-        "META_TAGS_PLACEHOLDER": "Add meta tags"
+        "META_TAGS_PLACEHOLDER": "Aggiungi tag meta"
       },
       "API": {
         "ERROR": "Errore durante il salvataggio dell'articolo"
       }
     },
     "PORTAL_SWITCHER": {
-      "NEW_PORTAL": "New portal",
+      "NEW_PORTAL": "Nuovo portale",
       "PORTALS": "Portali",
-      "CREATE_PORTAL": "Create and manage multiple portals",
+      "CREATE_PORTAL": "Crea e gestisci più portali",
       "ARTICLES": "articoli",
       "DOMAIN": "dominio",
       "PORTAL_NAME": "Nome del portale"
     },
     "CREATE_PORTAL_DIALOG": {
-      "TITLE": "Create new portal",
-      "DESCRIPTION": "Give your portal a name and create a user-friendly URL slug. You can modify both later in the settings.",
+      "TITLE": "Crea nuovo portale",
+      "DESCRIPTION": "Dai un nome al tuo portale e crea uno slug URL user-friendly. Puoi modificare entrambi in seguito nelle impostazioni.",
       "CONFIRM_BUTTON_LABEL": "Crea",
       "NAME": {
         "LABEL": "Nome",
-        "PLACEHOLDER": "User Guide | Chatwoot",
-        "MESSAGE": "Choose an name for your portal.",
-        "ERROR": "Il nome è obbligatorio"
+        "PLACEHOLDER": "Guida Utente | Chatwoot",
+        "MESSAGE": "Scegli un nome per il tuo portale.",
+        "ERROR": "Nome richiesto"
       },
       "SLUG": {
         "LABEL": "Slug",
@@ -710,72 +710,72 @@
       "FORM": {
         "AVATAR": {
           "LABEL": "Logo",
-          "IMAGE_UPLOAD_ERROR": "Couldn't upload image! Try again",
-          "IMAGE_UPLOAD_SUCCESS": "Image added successfully. Please click on save changes to save the logo",
-          "IMAGE_DELETE_SUCCESS": "Logo deleted successfully",
-          "IMAGE_DELETE_ERROR": "Unable to delete logo",
-          "IMAGE_UPLOAD_SIZE_ERROR": "Image size should be less than {size}MB"
+          "IMAGE_UPLOAD_ERROR": "Impossibile caricare l'immagine! Riprova",
+          "IMAGE_UPLOAD_SUCCESS": "Immagine aggiunta con successo. Clicca su salva le modifiche per salvare il logo",
+          "IMAGE_DELETE_SUCCESS": "Logo eliminato correttamente",
+          "IMAGE_DELETE_ERROR": "Impossibile eliminare il logo",
+          "IMAGE_UPLOAD_SIZE_ERROR": "La dimensione dell'immagine deve essere inferiore a {size}MB"
         },
         "NAME": {
           "LABEL": "Nome",
           "PLACEHOLDER": "Nome del portale",
-          "ERROR": "Il nome è obbligatorio"
+          "ERROR": "Nome richiesto"
         },
         "HEADER_TEXT": {
-          "LABEL": "Header text",
+          "LABEL": "Testo intestazione",
           "PLACEHOLDER": "Testo intestazione del portale"
         },
         "PAGE_TITLE": {
-          "LABEL": "Page title",
+          "LABEL": "Titolo della pagina",
           "PLACEHOLDER": "Titolo pagina del portale"
         },
         "HOME_PAGE_LINK": {
-          "LABEL": "Home page link",
+          "LABEL": "Link pagina iniziale",
           "PLACEHOLDER": "Link della pagina iniziale del portale",
           "ERROR": "Inserisci un URL valido. Il link della Home page deve iniziare con 'http://' o 'https://'."
         },
         "SLUG": {
           "LABEL": "Slug",
-          "PLACEHOLDER": "Portal slug"
+          "PLACEHOLDER": "Slug del portale"
         },
         "LIVE_CHAT_WIDGET": {
-          "LABEL": "Live chat widget",
-          "PLACEHOLDER": "Select live chat widget",
-          "HELP_TEXT": "Select a live chat widget that will appear on your help center",
+          "LABEL": "Widget live chat",
+          "PLACEHOLDER": "Seleziona widget live chat",
+          "HELP_TEXT": "Seleziona un widget di live chat che apparirà nel tuo help center",
           "NONE_OPTION": "Nessun widget"
         },
         "BRAND_COLOR": {
-          "LABEL": "Brand color"
+          "LABEL": "Colore del brand"
         },
-        "SAVE_CHANGES": "Save changes"
+        "SAVE_CHANGES": "Salva modifiche"
       },
       "CONFIGURATION_FORM": {
         "CUSTOM_DOMAIN": {
           "HEADER": "Dominio personalizzato",
           "LABEL": "Dominio personalizzato:",
-          "DESCRIPTION": "You can host your portal on a custom domain. For instance, if your website is yourdomain.com and you want your portal available at docs.yourdomain.com, simply enter that in this field.",
+          "DESCRIPTION": "Puoi ospitare il tuo portale su un dominio personalizzato. Per esempio, se il tuo sito web è tuodominio.com e vuoi che il tuo portale sia disponibile su docs.tuodominio.com, semplicemente inseriscilo in questo campo.",
           "STATUS_DESCRIPTION": "Il tuo portale personalizzato inizierà a funzionare non appena verrà verificato.",
           "PLACEHOLDER": "Dominio personalizzato del portale",
           "EDIT_BUTTON": "Modifica",
-          "ADD_BUTTON": "Add custom domain",
+          "ADD_BUTTON": "Aggiungi dominio personalizzato",
           "STATUS": {
             "LIVE": "Live",
             "PENDING": "In attesa di verifica",
             "ERROR": "Verifica non riuscita"
           },
           "DIALOG": {
-            "ADD_HEADER": "Add custom domain",
-            "EDIT_HEADER": "Edit custom domain",
-            "ADD_CONFIRM_BUTTON_LABEL": "Add domain",
-            "EDIT_CONFIRM_BUTTON_LABEL": "Update domain",
+            "ADD_HEADER": "Aggiungi dominio personalizzato",
+            "EDIT_HEADER": "Modifica dominio personalizzato",
+            "ADD_CONFIRM_BUTTON_LABEL": "Aggiungi dominio",
+            "EDIT_CONFIRM_BUTTON_LABEL": "Aggiorna dominio",
             "LABEL": "Dominio personalizzato",
             "PLACEHOLDER": "Dominio personalizzato del portale",
-            "ERROR": "Custom domain is required",
+            "ERROR": "Il dominio personalizzato è obbligatorio",
             "FORMAT_ERROR": "Inserisci un URL di dominio valido, ad esempio: docs.tuodominio.com"
           },
           "DNS_CONFIGURATION_DIALOG": {
-            "HEADER": "DNS configuration",
-            "DESCRIPTION": "Log in to the account you have with your DNS provider, and add a CNAME record for subdomain pointing to chatwoot.help",
+            "HEADER": "Configurazione DNS",
+            "DESCRIPTION": "Accedi al tuo provider DNS e aggiungi un record CNAME per subdominio che punta a chatwoot.help",
             "COPY": "CNAME copiato",
             "SEND_INSTRUCTIONS": {
               "HEADER": "Invia istruzioni",
@@ -787,25 +787,25 @@
           }
         },
         "DELETE_PORTAL": {
-          "BUTTON": "Delete {portalName}",
+          "BUTTON": "Elimina {portalName}",
           "HEADER": "Elimina portale",
-          "DESCRIPTION": "Permanently delete this portal. This action is irreversible",
+          "DESCRIPTION": "Elimina definitivamente questo portale. Questa azione è irreversibile",
           "DIALOG": {
-            "HEADER": "Sure you want to delete {portalName}?",
-            "DESCRIPTION": "This is a permanent action that cannot be reversed.",
+            "HEADER": "Sei sicuro di voler eliminare {portalName}?",
+            "DESCRIPTION": "Si tratta di un'azione permanente che non può essere annullata.",
             "CONFIRM_BUTTON_LABEL": "Elimina"
           }
         },
-        "EDIT_CONFIGURATION": "Edit configuration"
+        "EDIT_CONFIGURATION": "Modifica configurazione"
       },
       "API": {
         "CREATE_PORTAL": {
           "SUCCESS_MESSAGE": "Portale creato con successo",
-          "ERROR_MESSAGE": "Unable to create portal"
+          "ERROR_MESSAGE": "Impossibile creare il portale"
         },
         "UPDATE_PORTAL": {
           "SUCCESS_MESSAGE": "Portale aggiornato con successo",
-          "ERROR_MESSAGE": "Unable to update portal"
+          "ERROR_MESSAGE": "Impossibile aggiornare il portale"
         }
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/it/inbox.json b/app/javascript/dashboard/i18n/locale/it/inbox.json
index 6412a1b06..997f34f8d 100644
--- a/app/javascript/dashboard/i18n/locale/it/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/it/inbox.json
@@ -1,77 +1,77 @@
 {
   "INBOX": {
     "LIST": {
-      "TITLE": "My Inbox",
-      "DISPLAY_DROPDOWN": "Display",
-      "LOADING": "Fetching notifications",
-      "404": "There are no active notifications in this group.",
-      "NO_NOTIFICATIONS": "No notifications",
-      "NOTE": "Notifications from all subscribed inboxes",
-      "NO_MESSAGES_AVAILABLE": "Oops! Not able to fetch messages",
-      "SNOOZED_UNTIL": "Snoozed until",
-      "SNOOZED_UNTIL_TOMORROW": "Posticipato fino a domani",
-      "SNOOZED_UNTIL_NEXT_WEEK": "Posticipato fino alla prossima settimana"
+      "TITLE": "La mia Inbox",
+      "DISPLAY_DROPDOWN": "Visualizza",
+      "LOADING": "Caricamento notifiche",
+      "404": "Non ci sono notifiche attive in questo gruppo.",
+      "NO_NOTIFICATIONS": "Nessuna notifica",
+      "NOTE": "Notifiche da tutte le Inbox",
+      "NO_MESSAGES_AVAILABLE": "Oops! Impossibile recuperare i messaggi",
+      "SNOOZED_UNTIL": "Posticipata fino a",
+      "SNOOZED_UNTIL_TOMORROW": "Posticipata fino a domani",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Posticipata fino alla prossima settimana"
     },
     "ACTION_HEADER": {
-      "SNOOZE": "Snooze notification",
-      "DELETE": "Delete notification",
+      "SNOOZE": "Posticipa notifica",
+      "DELETE": "Elimina notifica",
       "BACK": "Indietro"
     },
     "TYPES": {
-      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
-      "CONVERSATION_CREATION": "New conversation created",
-      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
-      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
-      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in",
+      "CONVERSATION_MENTION": "Sei stato menzionato in una conversazione",
+      "CONVERSATION_CREATION": "Nuova conversazione creata",
+      "CONVERSATION_ASSIGNMENT": "Ti è stata assegnata una conversazione",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Nuovo messaggio in una conversazione assegnata",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Nuovo messaggio in una conversazione a cui partecipi",
       "SLA_MISSED_FIRST_RESPONSE": "SLA target first response missed for conversation",
       "SLA_MISSED_NEXT_RESPONSE": "SLA target next response missed for conversation",
       "SLA_MISSED_RESOLUTION": "SLA target resolution missed for conversation"
     },
     "TYPES_NEXT": {
-      "CONVERSATION_MENTION": "Mentioned",
-      "CONVERSATION_ASSIGNMENT": "Assigned to you",
-      "CONVERSATION_CREATION": "New Conversation",
-      "SLA_MISSED_FIRST_RESPONSE": "SLA breach",
-      "SLA_MISSED_NEXT_RESPONSE": "SLA breach",
-      "SLA_MISSED_RESOLUTION": "SLA breach",
+      "CONVERSATION_MENTION": "Menzioni",
+      "CONVERSATION_ASSIGNMENT": "Assegnate a te",
+      "CONVERSATION_CREATION": "Nuova Conversazione",
+      "SLA_MISSED_FIRST_RESPONSE": "Violazione SLA",
+      "SLA_MISSED_NEXT_RESPONSE": "Violazione SLA",
+      "SLA_MISSED_RESOLUTION": "Violazione SLA",
       "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Nuovo messaggio",
       "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Nuovo messaggio",
-      "SNOOZED_UNTIL": "Snoozed for {time}",
-      "SNOOZED_ENDS": "Snooze ended"
+      "SNOOZED_UNTIL": "Posticipata per {time}",
+      "SNOOZED_ENDS": "Posticipo terminato"
     },
     "NO_CONTENT": "Nessun contenuto disponibile",
     "MENU_ITEM": {
-      "MARK_AS_READ": "Segna come letto",
-      "MARK_AS_UNREAD": "Segna come non letto",
+      "MARK_AS_READ": "Segna come letta",
+      "MARK_AS_UNREAD": "Segna come da leggere",
       "SNOOZE": "Posticipa",
       "DELETE": "Elimina",
-      "MARK_ALL_READ": "Segna tutto come letto",
-      "DELETE_ALL": "Delete all",
-      "DELETE_ALL_READ": "Delete all read"
+      "MARK_ALL_READ": "Segna tutte come lette",
+      "DELETE_ALL": "Elimina tutte",
+      "DELETE_ALL_READ": "Elimina tutte le lette"
     },
     "DISPLAY_MENU": {
-      "SORT": "Sort",
-      "DISPLAY": "Display :",
+      "SORT": "Ordina",
+      "DISPLAY": "Visualizza:",
       "SORT_OPTIONS": {
-        "NEWEST": "Newest",
-        "OLDEST": "Oldest",
+        "NEWEST": "Più Recenti",
+        "OLDEST": "Meno Recenti",
         "PRIORITY": "Priorità"
       },
       "DISPLAY_OPTIONS": {
-        "SNOOZED": "Posticipato",
-        "READ": "Leggi",
+        "SNOOZED": "Posticipate",
+        "READ": "Lette",
         "LABELS": "Etichette",
-        "CONVERSATION_ID": "Conversation ID"
+        "CONVERSATION_ID": "ID Conversazione"
       }
     },
     "ALERTS": {
-      "MARK_AS_READ": "Notification marked as read",
-      "MARK_AS_UNREAD": "Notification marked as unread",
-      "SNOOZE": "Notification snoozed",
-      "DELETE": "Notification deleted",
-      "MARK_ALL_READ": "All notifications marked as read",
-      "DELETE_ALL": "All notifications deleted",
-      "DELETE_ALL_READ": "All read notifications deleted"
+      "MARK_AS_READ": "Notifica segnata come letta",
+      "MARK_AS_UNREAD": "Notifica segnata come non letta",
+      "SNOOZE": "Notifica posticipata",
+      "DELETE": "Notifica eliminata",
+      "MARK_ALL_READ": "Tutte le notifiche segnate come lette",
+      "DELETE_ALL": "Tutte le notifiche eliminate",
+      "DELETE_ALL_READ": "Tutte le notifiche lette cancellate"
     },
     "REAUTHORIZE": {
       "TITLE": "Riautorizzazione Necessaria",
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index 7cd6af254..1b98fb807 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -1,14 +1,14 @@
 {
   "INBOX_MGMT": {
-    "HEADER": "Posta",
-    "DESCRIPTION": "A channel is the mode of communication your customer chooses to interact with you. An inbox is where you manage interactions for a specific channel. It can include communications from various sources such as email, live chat, and social media.",
-    "LEARN_MORE": "Learn more about inboxes",
-    "RECONNECTION_REQUIRED": "Your inbox is disconnected. You won't receive new messages until you reauthorize it.",
-    "CLICK_TO_RECONNECT": "Click here to reconnect.",
+    "HEADER": "Inbox",
+    "DESCRIPTION": "Un canale è il mezzo di comunicazione che il cliente usa per interagire con te. Una Inbox è lo spazio in cui gestisci le interazioni di uno specifico canale. Può includere comunicazioni provenienti da diverse fonti, come email, live chat e social media.",
+    "LEARN_MORE": "Scopri di più sulle Inbox",
+    "RECONNECTION_REQUIRED": "La tua Inbox è disconnessa. Non riceverai nuovi messaggi finché non la autorizzerai nuovamente.",
+    "CLICK_TO_RECONNECT": "Clicca qui per riconnetterti.",
     "WHATSAPP_REGISTRATION_INCOMPLETE": "La registrazione di WhatsApp Business non è completa. Si prega di controllare lo stato del nome visualizzato in Meta Business Manager prima di riconnettersi.",
     "COMPLETE_REGISTRATION": "Completa Registrazione",
     "LIST": {
-      "404": "Non ci sono caselle allegate a questo account."
+      "404": "Non ci sono inbox allegate a questo account."
     },
     "CREATE_FLOW": {
       "CHANNEL": {
@@ -16,12 +16,12 @@
         "BODY": "Scegli il provider che vuoi integrare con Chatwoot."
       },
       "INBOX": {
-        "TITLE": "Crea casella",
-        "BODY": "Autentica il tuo account e creare una casella."
+        "TITLE": "Crea Inbox",
+        "BODY": "Autentica il tuo account e crea una inbox."
       },
       "AGENT": {
-        "TITLE": "Aggiungi agenti",
-        "BODY": "Aggiungi agenti alla casella creata."
+        "TITLE": "Aggiungi Operatori",
+        "BODY": "Aggiungi operatori alla inbox creata."
       },
       "FINISH": {
         "TITLE": "Voilà!",
@@ -30,23 +30,23 @@
     },
     "ADD": {
       "CHANNEL_NAME": {
-        "LABEL": "Nome casella",
-        "PLACEHOLDER": "Inserisci il nome della tua casella di posta (ad esempio: Acme Inc)",
-        "ERROR": "Inserisci un nome per la casella valido"
+        "LABEL": "Nome Inbox",
+        "PLACEHOLDER": "Inserisci il nome della tua Inbox (ad esempio: Acme Srl)",
+        "ERROR": "Inserisci un nome Inbox valido"
       },
       "WEBSITE_NAME": {
-        "LABEL": "Nome sito web",
-        "PLACEHOLDER": "Inserisci il nome del tuo sito web (ad esempio: Acme Inc)"
+        "LABEL": "Nome Sito Web",
+        "PLACEHOLDER": "Inserisci il nome del tuo sito web (ad esempio: Acme Srl)"
       },
       "FB": {
-        "HELP": "PS: Accedendo, abbiamo accesso solo ai messaggi della tua pagina. Chatwoot, non potrà accedere ai tuoi messaggi privati.",
-        "CHOOSE_PAGE": "Scegli una pagina",
+        "HELP": "PS: Accedendo, abbiamo accesso solo ai messaggi della tua pagina. Chatwoot non potrà accedere ai tuoi messaggi privati.",
+        "CHOOSE_PAGE": "Scegli una Pagina",
         "CHOOSE_PLACEHOLDER": "Seleziona una pagina dalla lista",
-        "INBOX_NAME": "Nome casella",
-        "ADD_NAME": "Aggiungi un nome per la tua casella",
-        "PICK_NAME": "Pick a Name for your Inbox",
+        "INBOX_NAME": "Nome Inbox",
+        "ADD_NAME": "Aggiungi un nome per la tua inbox",
+        "PICK_NAME": "Scegli un nome per la tua Inbox",
         "PICK_A_VALUE": "Scegli un valore",
-        "CREATE_INBOX": "Crea casella"
+        "CREATE_INBOX": "Crea Inbox"
       },
       "INSTAGRAM": {
         "CONTINUE_WITH_INSTAGRAM": "Continua con Instagram",
@@ -66,18 +66,18 @@
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Canale sito web",
-        "DESC": "Crea un canale per il tuo sito web ed inizia a sostenere i tuoi clienti tramite il nostro widget per siti web.",
-        "LOADING_MESSAGE": "Creazione del canale di supporto sito web",
+        "DESC": "Crea un canale per il tuo sito web ed inizia a dare supporto ai tuoi clienti tramite il nostro widget per siti web.",
+        "LOADING_MESSAGE": "Creazione del Canale di Supporto Sito Web",
         "CHANNEL_AVATAR": {
           "LABEL": "Avatar del canale"
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL del webhook",
-          "PLACEHOLDER": "Please enter your Webhook URL",
+          "PLACEHOLDER": "Inserisci il tuo URL Webhook",
           "ERROR": "Inserisci un URL valido"
         },
         "CHANNEL_DOMAIN": {
-          "LABEL": "Dominio del sito",
+          "LABEL": "Dominio del Sito",
           "PLACEHOLDER": "Inserisci il dominio del tuo sito web (es: acme.com)"
         },
         "CHANNEL_WELCOME_TITLE": {
@@ -86,15 +86,15 @@
         },
         "CHANNEL_WELCOME_TAGLINE": {
           "LABEL": "Titolo di benvenuto",
-          "PLACEHOLDER": "Rendiamo semplice connetterci con noi. Chiedete qualsiasi cosa o condividete il vostro feedback."
+          "PLACEHOLDER": "Siamo qui per aiutarti. Facci una domanda o condividi il tuo feedback."
         },
         "CHANNEL_GREETING_MESSAGE": {
           "LABEL": "Messaggio di saluto del canale",
-          "PLACEHOLDER": "Acme Inc, in genere, risponde in poche ore."
+          "PLACEHOLDER": "Acme Srl generalmente risponde in poche ore."
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Abilita messaggio di benvenuto sul canale",
-          "HELP_TEXT": "Invia automaticamente un messaggio di benvenuto quando viene creata una nuova conversazione.",
+          "HELP_TEXT": "Invia automaticamente un messaggio di benvenuto quando un cliente avvia una nuova conversazione.",
           "ENABLED": "Abilitato",
           "DISABLED": "Disabilitato"
         },
@@ -103,15 +103,15 @@
           "IN_A_FEW_MINUTES": "In pochi minuti",
           "IN_A_FEW_HOURS": "In poche ore",
           "IN_A_DAY": "In un giorno",
-          "HELP_TEXT": "Questo tempo di risposta verrà visualizzato sul widget della live chat"
+          "HELP_TEXT": "Questo tempo di risposta verrà mostrato sul widget della live chat"
         },
         "WIDGET_COLOR": {
           "LABEL": "Colore del widget",
           "PLACEHOLDER": "Aggiorna il colore del widget utilizzato nel widget"
         },
-        "SUBMIT_BUTTON": "Crea casella",
+        "SUBMIT_BUTTON": "Crea Inbox",
         "API": {
-          "ERROR_MESSAGE": "Non siamo stati in grado di creare un canale del sito web, si prega di riprovare"
+          "ERROR_MESSAGE": "Impossibile creare il canale sito web, riprova"
         }
       },
       "TWILIO": {
@@ -123,19 +123,19 @@
           "ERROR": "Questo campo è obbligatorio"
         },
         "API_KEY": {
-          "USE_API_KEY": "Use API Key Authentication",
+          "USE_API_KEY": "Usa l’autenticazione con chiave API",
           "LABEL": "API Key SID",
-          "PLACEHOLDER": "Please enter your API Key SID",
+          "PLACEHOLDER": "Inserisci la tua API Key SID",
           "ERROR": "Questo campo è obbligatorio"
         },
         "API_KEY_SECRET": {
           "LABEL": "API Key Secret",
-          "PLACEHOLDER": "Please enter your API Key Secret",
+          "PLACEHOLDER": "Inserisci la tua API Key Secret",
           "ERROR": "Questo campo è obbligatorio"
         },
         "MESSAGING_SERVICE_SID": {
-          "LABEL": "Servizio messaggi SID",
-          "PLACEHOLDER": "Inserisci il tuo servizio di messaggistica SID di Twilio",
+          "LABEL": "SID Servizio Messaggi",
+          "PLACEHOLDER": "Inserisci il SID Servizio Messaggi di Twilio",
           "ERROR": "Questo campo è obbligatorio",
           "USE_MESSAGING_SERVICE": "Usa un servizio di messaggistica Twilio"
         },
@@ -145,18 +145,18 @@
         },
         "AUTH_TOKEN": {
           "LABEL": "Token di autenticazione",
-          "PLACEHOLDER": "Inserisci il tuo token di autenticazione Twilio",
+          "PLACEHOLDER": "Inserisci il tuo Token Autenticazione Twilio",
           "ERROR": "Questo campo è obbligatorio"
         },
         "CHANNEL_NAME": {
-          "LABEL": "Nome casella",
-          "PLACEHOLDER": "Inserisci un nome della casella",
+          "LABEL": "Nome Inbox",
+          "PLACEHOLDER": "Inserisci un nome della Inbox",
           "ERROR": "Questo campo è obbligatorio"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Numero di telefono",
+          "LABEL": "Numero di Telefono",
           "PLACEHOLDER": "Inserisci il numero di telefono dal quale verrà inviato il messaggio.",
-          "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+          "ERROR": "Inserisci un numero di telefono valido che inizi con un `+` e non contenga spazi."
         },
         "API_CALLBACK": {
           "TITLE": "URL di callback",
@@ -173,45 +173,45 @@
         "PROVIDERS": {
           "LABEL": "Provider API",
           "TWILIO": "Twilio",
-          "BANDWIDTH": "Larghezza di banda"
+          "BANDWIDTH": "Bandwidth"
         },
         "API": {
-          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale SMS"
+          "ERROR_MESSAGE": "Impossibile salvare il canale SMS"
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
             "LABEL": "ID Account",
-            "PLACEHOLDER": "Inserisci l'id del tuo account di Bandwidth",
+            "PLACEHOLDER": "Inserisci il tuo Account ID Bandwidth",
             "ERROR": "Questo campo è obbligatorio"
           },
           "API_KEY": {
             "LABEL": "Chiave API",
-            "PLACEHOLDER": "Please enter your Bandwidth API Key",
+            "PLACEHOLDER": "Inserisci la tua chiave API di Bandwidth",
             "ERROR": "Questo campo è obbligatorio"
           },
           "API_SECRET": {
             "LABEL": "Chiave API segreta",
-            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
+            "PLACEHOLDER": "Inserisci la tua API Secret di Bandwidth",
             "ERROR": "Questo campo è obbligatorio"
           },
           "APPLICATION_ID": {
-            "LABEL": "ID applicazione",
-            "PLACEHOLDER": "Inserisci l'id della tua applicazione di Bandwidth",
+            "LABEL": "ID Applicazione",
+            "PLACEHOLDER": "Inserisci il tuo ID Applicazione di Bandwidth",
             "ERROR": "Questo campo è obbligatorio"
           },
           "INBOX_NAME": {
-            "LABEL": "Nome casella",
-            "PLACEHOLDER": "Inserisci un nome della casella",
+            "LABEL": "Nome Inbox",
+            "PLACEHOLDER": "Inserisci un nome della Inbox",
             "ERROR": "Questo campo è obbligatorio"
           },
           "PHONE_NUMBER": {
             "LABEL": "Numero di telefono",
             "PLACEHOLDER": "Inserisci il numero di telefono dal quale verrà inviato il messaggio.",
-            "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+            "ERROR": "Inserisci un numero di telefono valido che inizi con un `+` e non contenga spazi."
           },
-          "SUBMIT_BUTTON": "Crea un canale Bandwidth",
+          "SUBMIT_BUTTON": "Crea un Canale Bandwidth",
           "API": {
-            "ERROR_MESSAGE": "Non siamo stati in grado di autenticare le credenziali di Bandwidth, riprova"
+            "ERROR_MESSAGE": "Impossibile autenticare le credenziali di Bandwidth, riprova"
           },
           "API_CALLBACK": {
             "TITLE": "URL di callback",
@@ -236,14 +236,14 @@
           "DESCRIPTION": "Scegli il tuo provider WhatsApp. Puoi connetterti direttamente tramite Meta che non richiede alcuna configurazione o connetterti tramite Twilio utilizzando le credenziali del tuo account."
         },
         "INBOX_NAME": {
-          "LABEL": "Nome casella",
-          "PLACEHOLDER": "Inserisci un nome della casella",
+          "LABEL": "Nome Inbox",
+          "PLACEHOLDER": "Inserisci un nome della Inbox",
           "ERROR": "Questo campo è obbligatorio"
         },
         "PHONE_NUMBER": {
           "LABEL": "Numero di telefono",
           "PLACEHOLDER": "Inserisci il numero di telefono dal quale verrà inviato il messaggio.",
-          "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+          "ERROR": "Inserisci un numero di telefono valido che inizi con un `+` e non contenga spazi."
         },
         "PHONE_NUMBER_ID": {
           "LABEL": "ID numero di telefono",
@@ -251,13 +251,13 @@
           "ERROR": "Inserisci un valore valido."
         },
         "BUSINESS_ACCOUNT_ID": {
-          "LABEL": "ID account business",
-          "PLACEHOLDER": "Si prega di inserire l'ID dell'account business ottenuto dalla dashboard sviluppatore di Facebook.",
+          "LABEL": "ID Account Business",
+          "PLACEHOLDER": "Inserisci l'ID dell'Account Business ottenuto dalla dashboard sviluppatore di Facebook.",
           "ERROR": "Inserisci un valore valido."
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook verifica token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
+          "PLACEHOLDER": "Inserisci un token di verifica che vuoi configurare per i webhook Facebook.",
           "ERROR": "Inserisci un valore valido."
         },
         "API_KEY": {
@@ -268,11 +268,11 @@
         },
         "API_CALLBACK": {
           "TITLE": "URL di callback",
-          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "SUBTITLE": "È necessario configurare l'URL del webhook e il token di verifica nel portale Facebook Developer con i valori mostrati di seguito.",
           "WEBHOOK_URL": "URL del webhook",
-          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
+          "WEBHOOK_VERIFICATION_TOKEN": "Token Di Verifica Webhook"
         },
-        "SUBMIT_BUTTON": "Crea un canale WhatsApp",
+        "SUBMIT_BUTTON": "Crea Canale WhatsApp",
         "EMBEDDED_SIGNUP": {
           "TITLE": "Configurazione rapida tramite Meta",
           "DESC": "Utilizza il WhatsApp Embedded Signup per collegare rapidamente nuovi numeri. Sarai reindirizzato a Meta per accedere al tuo account WhatsApp Business. Avere accesso amministratore aiuterà a rendere la configurazione semplice e facile.",
@@ -302,25 +302,25 @@
           "MANUAL_LINK_TEXT": "flow di registrazione manuale"
         },
         "API": {
-          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale WhatsApp"
+          "ERROR_MESSAGE": "Impossibile salvare il canale WhatsApp"
         }
       },
       "VOICE": {
         "TITLE": "Canale Vocale",
         "DESC": "Integra Twilio Voice e inizia a supportare i tuoi clienti tramite telefonate.",
         "PHONE_NUMBER": {
-          "LABEL": "Numero di telefono",
+          "LABEL": "Numero di Telefono",
           "PLACEHOLDER": "Inserisci il tuo numero di telefono (es. +1234567890)",
           "ERROR": "Fornisci un numero di telefono valido in formato E.164 (ad es. +1234567890)"
         },
         "TWILIO": {
           "ACCOUNT_SID": {
-            "LABEL": "SID Account",
+            "LABEL": "SID dell'account",
             "PLACEHOLDER": "Inserisci il tuo Account SID Twilio",
             "REQUIRED": "Account SID richiesto"
           },
           "AUTH_TOKEN": {
-            "LABEL": "Token di Autenticazione",
+            "LABEL": "Token di autenticazione",
             "PLACEHOLDER": "Inserisci il tuo Auth Token Twilio",
             "REQUIRED": "Auth Token richiesto"
           },
@@ -350,36 +350,36 @@
         "TITLE": "Canale API",
         "DESC": "Integra con il canale API e inizia a supportare i tuoi clienti.",
         "CHANNEL_NAME": {
-          "LABEL": "Nome canale",
+          "LABEL": "Nome Canale",
           "PLACEHOLDER": "Inserisci un nome del canale",
           "ERROR": "Questo campo è obbligatorio"
         },
         "WEBHOOK_URL": {
           "LABEL": "URL del webhook",
-          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
+          "SUBTITLE": "Configura l'URL in cui ricevere i callback sugli eventi.",
           "PLACEHOLDER": "URL del webhook"
         },
-        "SUBMIT_BUTTON": "Crea un canale API",
+        "SUBMIT_BUTTON": "Crea Canale API",
         "API": {
-          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale api"
+          "ERROR_MESSAGE": "Impossibile salvare il Canale API"
         }
       },
       "EMAIL_CHANNEL": {
-        "TITLE": "Canale email",
-        "DESC": "Integrate your email inbox.",
+        "TITLE": "Canale Email",
+        "DESC": "Integra la tua casella di posta elettronica.",
         "CHANNEL_NAME": {
-          "LABEL": "Nome canale",
+          "LABEL": "Nome Canale",
           "PLACEHOLDER": "Inserisci un nome del canale",
           "ERROR": "Questo campo è obbligatorio"
         },
         "EMAIL": {
-          "LABEL": "email",
+          "LABEL": "Email",
           "SUBTITLE": "Email dove i tuoi clienti inviano i ticket di supporto.",
-          "PLACEHOLDER": "email"
+          "PLACEHOLDER": "Email"
         },
-        "SUBMIT_BUTTON": "Crea un canale email",
+        "SUBMIT_BUTTON": "Crea Canale Email",
         "API": {
-          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale email"
+          "ERROR_MESSAGE": "Impossibile salvare il canale email"
         },
         "FINISH_MESSAGE": "Inizia a inoltrare le tue email al seguente indirizzo email."
       },
@@ -387,7 +387,7 @@
         "TITLE": "Canale LINE",
         "DESC": "Integra con il canale LINE e inizia a supportare i tuoi clienti.",
         "CHANNEL_NAME": {
-          "LABEL": "Nome canale",
+          "LABEL": "Nome Canale",
           "PLACEHOLDER": "Inserisci un nome del canale",
           "ERROR": "Questo campo è obbligatorio"
         },
@@ -416,18 +416,18 @@
         "TITLE": "Canale Telegram",
         "DESC": "Integra con il canale Telegram e inizia a supportare i tuoi clienti.",
         "BOT_TOKEN": {
-          "LABEL": "Token bot",
+          "LABEL": "Token Bot",
           "SUBTITLE": "Configura il token del bot che hai ottenuto da Telegram BotFather.",
-          "PLACEHOLDER": "Token bot"
+          "PLACEHOLDER": "Token Bot"
         },
-        "SUBMIT_BUTTON": "Crea canale Telegram",
+        "SUBMIT_BUTTON": "Crea Canale Telegram",
         "API": {
-          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale telegram"
+          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale Telegram"
         }
       },
       "AUTH": {
         "TITLE": "Scegli un canale",
-        "DESC": "Chatwoot supporta i widget di chat live, Facebook Messenger, profili Twitter, WhatsApp, Email, ecc., come canali. Se vuoi costruire un canale personalizzato, puoi crearlo usando il canale API. Per iniziare, scegli uno dei canali qui sotto.",
+        "DESC": "Chatwoot supporta widget di live chat, Facebook Messenger, WhatsApp, Email e altro, come canali di comunicazione. Se vuoi creare un canale personalizzato, puoi farlo tramite il canale API. Per iniziare, scegli uno dei canali qui sotto.",
         "TITLE_NEXT": "Completa la configurazione",
         "TITLE_FINISH": "Voilà!",
         "CHANNEL": {
@@ -474,58 +474,58 @@
         }
       },
       "AGENTS": {
-        "TITLE": "Agenti",
-        "DESC": "Qui puoi aggiungere agenti per gestire la tua casella appena creata. Solo questi agenti selezionati avranno accesso alla tua casella. Gli operatori che non fanno parte di questa casella non saranno in grado di vedere o rispondere ai messaggi in questa casella quando effettuano il login. <br> <b>PS:</b> come amministratore, se hai bisogno di accedere a tutte le caselle, dovresti aggiungerti come agente a tutte le caselle che crei.",
-        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
-        "PICK_AGENTS": "Scegli gli agenti per la casella"
+        "TITLE": "Operatori",
+        "DESC": "Qui puoi aggiungere operatori per gestire la tua inbox appena creata. Solo questi operatori selezionati avranno accesso alla tua inbox. Gli operatori che non fanno parte di questa inbox non saranno in grado di vedere o rispondere ai messaggi in questa inbox quando effettuano il login. <br> <b>PS:</b> come amministratore, se hai bisogno di accedere a tutte le inbox, devi aggiungerti come operatore a tutte le inbox che crei.",
+        "VALIDATION_ERROR": "Aggiungi almeno un operatore alla tua nuova Inbox",
+        "PICK_AGENTS": "Scegli gli operatori per la Inbox"
       },
       "DETAILS": {
-        "TITLE": "Dettagli casella",
-        "DESC": "Dal menu a tendina qui sotto, seleziona la pagina Facebook che vuoi collegare a Chatwoot. Puoi anche assegnare un nome personalizzato alla tua casella per una migliore identificazione."
+        "TITLE": "Dettagli Inbox",
+        "DESC": "Dal menu a tendina qui sotto, seleziona la pagina Facebook che vuoi collegare a Chatwoot. Puoi anche assegnare un nome personalizzato alla tua inbox per una migliore identificazione."
       },
       "FINISH": {
         "TITLE": "Azzeccato!",
-        "DESC": "Hai completato con successo l'integrazione della tua pagina Facebook con il Chatwoot. La prossima volta che un cliente invia un messaggio alla tua pagina, la conversazione apparirà automaticamente nella tua casella.<br>Ti forniamo anche uno script per widget che puoi facilmente aggiungere al tuo sito web. Una volta dal vivo sul tuo sito web, i clienti possono inviarti messaggi direttamente dal tuo sito web senza l'aiuto di alcuno strumento esterno e la conversazione apparirà proprio qui, su Chatwoot.<br>Bello, eh? Beh, cerchiamo di esserlo :)"
+        "DESC": "Hai completato con successo l'integrazione della tua pagina Facebook con Chatwoot. La prossima volta che un cliente invia un messaggio alla tua pagina, la conversazione apparirà automaticamente nella tua inbox.<br>Ti forniamo anche uno script per widget che puoi facilmente aggiungere al tuo sito web. Una volta dal vivo sul tuo sito web, i clienti possono inviarti messaggi direttamente dal tuo sito web senza l'aiuto di alcuno strumento esterno e la conversazione apparirà proprio qui, su Chatwoot.<br>Bello, eh? Beh, ce la mettiamo tutta :)"
       },
       "EMAIL_PROVIDER": {
-        "TITLE": "Select your email provider",
-        "DESCRIPTION": "Select an email provider from the list below. If you don't see your email provider in the list, you can select the other provider option and provide the IMAP and SMTP Credentials."
+        "TITLE": "Seleziona il tuo provider email",
+        "DESCRIPTION": "Seleziona un provider email dalla lista qui sotto. Se non vedi il tuo provider di posta elettronica nella lista, puoi selezionare l'opzione altro provider e fornire le credenziali IMAP e SMTP."
       },
       "MICROSOFT": {
         "TITLE": "Microsoft Email",
-        "DESCRIPTION": "Click on the Sign in with Microsoft button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
-        "EMAIL_PLACEHOLDER": "Enter email address",
-        "SIGN_IN": "Sign in with Microsoft",
-        "ERROR_MESSAGE": "There was an error connecting to Microsoft, please try again"
+        "DESCRIPTION": "Clicca sul pulsante Accedi con Microsoft per iniziare. Sarai reindirizzato alla pagina di accesso. Una volta accettati i permessi richiesti, verrai reindirizzato alla creazione della Inbox.",
+        "EMAIL_PLACEHOLDER": "Inserisci indirizzo email",
+        "SIGN_IN": "Accedi con Microsoft",
+        "ERROR_MESSAGE": "Si è verificato un errore nella connessione a Microsoft, riprova"
       },
       "GOOGLE": {
         "TITLE": "Google Email",
-        "DESCRIPTION": "Click on the Sign in with Google button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
-        "SIGN_IN": "Sign in with Google",
-        "EMAIL_PLACEHOLDER": "Enter email address",
-        "ERROR_MESSAGE": "There was an error connecting to Google, please try again"
+        "DESCRIPTION": "Clicca sul pulsante Accedi con Google per iniziare. Sarai reindirizzato alla pagina di accesso. Una volta accettati i permessi richiesti, verrai reindirizzato alla creazione della Inbox.",
+        "SIGN_IN": "Accedi con Google",
+        "EMAIL_PLACEHOLDER": "Inserisci indirizzo email",
+        "ERROR_MESSAGE": "Si è verificato un errore nella connessione a Google, riprova"
       }
     },
     "DETAILS": {
       "LOADING_FB": "Autenticazione con Facebook...",
-      "ERROR_FB_LOADING": "Error loading Facebook SDK. Please disable any ad-blockers and try again from a different browser.",
+      "ERROR_FB_LOADING": "Errore nel caricamento di Facebook SDK. Disabilita eventuali ad-blocker e riprova da un browser diverso.",
       "ERROR_FB_AUTH": "Qualcosa è andato storto, per favore aggiorna la pagina...",
-      "ERROR_FB_UNAUTHORIZED": "You're not authorized to perform this action. ",
-      "ERROR_FB_UNAUTHORIZED_HELP": "Please ensure you have access to the Facebook page with full control. You can read more about Facebook roles <a href=\" https://www.facebook.com/help/187316341316631\">here</a>.",
-      "CREATING_CHANNEL": "Creazione della casella...",
-      "TITLE": "Configura dettagli casella",
+      "ERROR_FB_UNAUTHORIZED": "Non sei autorizzato ad eseguire questa azione. ",
+      "ERROR_FB_UNAUTHORIZED_HELP": "Assicurati di avere accesso alla pagina Facebook con pieno controllo. Puoi leggere di più sui ruoli di Facebook <a href=\" https://www.facebook.com/help/187316341316631\">qui</a>.",
+      "CREATING_CHANNEL": "Creazione Inbox...",
+      "TITLE": "Configura Dettagli Inbox",
       "DESC": ""
     },
     "AGENTS": {
-      "BUTTON_TEXT": "Aggiungi agenti",
-      "ADD_AGENTS": "Aggiunta di agenti alla tua casella..."
+      "BUTTON_TEXT": "Aggiungi operatori",
+      "ADD_AGENTS": "Aggiungendo Operatori alla Inbox..."
     },
     "FINISH": {
-      "TITLE": "La casella è pronta!",
+      "TITLE": "L'Inbox è pronta!",
       "MESSAGE": "Ora puoi interagire con i tuoi clienti attraverso il nuovo canale. Buona assistenza",
-      "BUTTON_TEXT": "Portami lì",
-      "MORE_SETTINGS": "Altre impostazioni",
-      "WEBSITE_SUCCESS": "Hai completato la creazione di un canale sito web. Copia il codice mostrato qui sotto e incollalo sul tuo sito. La prossima volta che un cliente usa la live chat, la conversazione apparirà automaticamente nella tua casella.",
+      "BUTTON_TEXT": "Fatto",
+      "MORE_SETTINGS": "Impostazioni Aggiuntive",
+      "WEBSITE_SUCCESS": "Hai completato la creazione di un canale sito web. Copia il codice mostrato qui sotto e incollalo sul tuo sito. La prossima volta che un cliente usa la live chat, la conversazione apparirà automaticamente nella tua inbox.",
       "WHATSAPP_QR_INSTRUCTION": "Scansiona il QR Code qui sopra per testare rapidamente la tua Inbox WhatsApp",
       "MESSENGER_QR_INSTRUCTION": "Scansiona il QR Code qui sopra per testare rapidamente la tua Inbox Facebook Messenger",
       "TELEGRAM_QR_INSTRUCTION": "Scansiona il QR Code qui sopra per testare rapidamente la tua Inbox Telegram"
@@ -534,9 +534,9 @@
     "VIEW": "Visualizza",
     "EDIT": {
       "API": {
-        "SUCCESS_MESSAGE": "Impostazioni della casella, aggiornate con successo",
+        "SUCCESS_MESSAGE": "Impostazioni della Inbox aggiornate con successo",
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Assegnazione automatica aggiornata correttamente",
-        "ERROR_MESSAGE": "Impossibile aggiornare le impostazioni della casella. Riprova più tardi."
+        "ERROR_MESSAGE": "Impossibile aggiornare le impostazioni della Inbox. Riprova più tardi."
       },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Abilitato",
@@ -547,22 +547,22 @@
         "DISABLED": "Disabilitato"
       },
       "SENDER_NAME_SECTION": {
-        "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
-        "FOR_EG": "For eg:",
+        "TITLE": "Nome mittente",
+        "SUB_TEXT": "Seleziona il nome mostrato ai tuoi clienti quando ricevono email dai tuoi operatori.",
+        "FOR_EG": "Per es.:",
         "FRIENDLY": {
-          "TITLE": "Friendly",
+          "TITLE": "Amichevole",
           "FROM": "da",
-          "SUBTITLE": "Add the name of the agent who sent the reply in the sender name to make it friendly."
+          "SUBTITLE": "Aggiungi il nome dell'operatore che ha inviato la risposta nel nome mittente, per renderla amichevole."
         },
         "PROFESSIONAL": {
-          "TITLE": "Professional",
-          "SUBTITLE": "Use only the configured business name as the sender name in the email header."
+          "TITLE": "Professionale",
+          "SUBTITLE": "Utilizza solo il nome dell'azienda come nome mittente nell'intestazione dell'email."
         },
         "BUSINESS_NAME": {
-          "BUTTON_TEXT": "+ Configure your business name",
-          "PLACEHOLDER": "Enter your business name",
-          "SAVE_BUTTON_TEXT": "Save"
+          "BUTTON_TEXT": "+ Configura il tuo nome azienda",
+          "PLACEHOLDER": "Inserisci il nome della tua azienda",
+          "SAVE_BUTTON_TEXT": "Salva"
         }
       },
       "ALLOW_MESSAGES_AFTER_RESOLVED": {
@@ -583,7 +583,7 @@
     },
     "DELETE": {
       "BUTTON_TEXT": "Elimina",
-      "AVATAR_DELETE_BUTTON_TEXT": "Elimina avatar",
+      "AVATAR_DELETE_BUTTON_TEXT": "Elimina Avatar",
       "CONFIRM": {
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare ",
@@ -592,10 +592,10 @@
         "NO": "No, conserva "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Casella eliminata con successo",
-        "ERROR_MESSAGE": "Impossibile eliminare la casella. Riprova più tardi.",
-        "AVATAR_SUCCESS_MESSAGE": "Avatar casella eliminata con successo",
-        "AVATAR_ERROR_MESSAGE": "Impossibile eliminare l'avatar della casella. Riprova più tardi."
+        "SUCCESS_MESSAGE": "Inbox eliminata con successo",
+        "ERROR_MESSAGE": "Impossibile eliminare l'inbox. Riprova più tardi.",
+        "AVATAR_SUCCESS_MESSAGE": "Avatar Inbox eliminata con successo",
+        "AVATAR_ERROR_MESSAGE": "Impossibile eliminare l'avatar della Inbox. Riprova più tardi."
       }
     },
     "TABS": {
@@ -604,9 +604,9 @@
       "CONFIGURATION": "Configurazione",
       "CAMPAIGN": "Campagne",
       "PRE_CHAT_FORM": "Modulo pre-chat",
-      "BUSINESS_HOURS": "Ore di lavoro",
+      "BUSINESS_HOURS": "Orario Di Lavoro",
       "WIDGET_BUILDER": "Costruttore Widget",
-      "BOT_CONFIGURATION": "Bot Configuration",
+      "BOT_CONFIGURATION": "Configurazione Bot",
       "ACCOUNT_HEALTH": "Account Health",
       "CSAT": "CSAT"
     },
@@ -614,7 +614,7 @@
       "TITLE": "Gestisci il tuo account WhatsApp",
       "DESCRIPTION": "Controlla lo stato del tuo account WhatsApp, i limiti di messaggi e la qualità. Aggiorna le impostazioni o risolvi i problemi se necessario",
       "GO_TO_SETTINGS": "Vai a Meta Business Manager",
-      "NO_DATA": "Non sono disponibili di salute",
+      "NO_DATA": "Health Data non disponibile",
       "FIELDS": {
         "DISPLAY_PHONE_NUMBER": {
           "LABEL": "Numero di telefono visualizzato",
@@ -668,10 +668,10 @@
     "SETTINGS": "Impostazioni",
     "FEATURES": {
       "LABEL": "Funzionalità",
-      "DISPLAY_FILE_PICKER": "Visualizza il selettore di file sul widget",
-      "DISPLAY_EMOJI_PICKER": "Visualizza il selettore emoji sul widget",
+      "DISPLAY_FILE_PICKER": "Mostra il selettore file sul widget",
+      "DISPLAY_EMOJI_PICKER": "Mostra il selettore emoji sul widget",
       "ALLOW_END_CONVERSATION": "Consenti agli utenti di terminare la conversazione dal widget",
-      "USE_INBOX_AVATAR_FOR_BOT": "Use inbox name and avatar for the bot"
+      "USE_INBOX_AVATAR_FOR_BOT": "Usa il nome e l'avatar della Inbox per il bot"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script Messenger",
@@ -681,39 +681,39 @@
         "SUBTITLE": "Aggiungi caratteri jolly o domini regolari separati da virgole (lasciare vuoto per consentire tutti), ad esempio *.chatwoot.dev, chatwoot.com.",
         "PLACEHOLDER": "Inserisci i domini separati da virgole (ad esempio: *.chatwoot.dev, chatwoot.com)"
       },
-      "INBOX_AGENTS": "Agenti",
-      "INBOX_AGENTS_SUB_TEXT": "Aggiungi o rimuovi agenti da questa casella",
-      "AGENT_ASSIGNMENT": "Assegnazione conversazione",
+      "INBOX_AGENTS": "Operatori",
+      "INBOX_AGENTS_SUB_TEXT": "Aggiungi o rimuovi operatori da questa inbox",
+      "AGENT_ASSIGNMENT": "Assegnazione Conversazione",
       "AGENT_ASSIGNMENT_SUB_TEXT": "Aggiorna le impostazioni di assegnazione della conversazione",
       "UPDATE": "Aggiorna",
-      "ENABLE_EMAIL_COLLECT_BOX": "Abilita casella di raccolta email",
-      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Abilita o disabilita la casella di raccolta email nella nuova conversazione",
+      "ENABLE_EMAIL_COLLECT_BOX": "Abilita raccolta indirizzi email",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Abilita o disabilita una casella/modulo di raccolta indirizzi email nelle nuove conversazioni",
       "AUTO_ASSIGNMENT": "Abilita assegnazione automatica",
-      "SENDER_NAME_SECTION": "Enable Agent Name in Email",
-      "SENDER_NAME_SECTION_TEXT": "Enable/Disable showing Agent's name in email, if disabled it will show business name",
+      "SENDER_NAME_SECTION": "Abilita il Nome Operatore nelle Email",
+      "SENDER_NAME_SECTION_TEXT": "Abilita/Disabilita la visualizzazione del nome dell'Operatore nelle email. Se disabilitato, verrà mostrato il nome dell'azienda",
       "ENABLE_CONTINUITY_VIA_EMAIL": "Abilita la continuità della conversazione via email",
       "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Le conversazioni continueranno via email se l'indirizzo email del contatto è disponibile.",
-      "LOCK_TO_SINGLE_CONVERSATION": "Lock to single conversation",
-      "LOCK_TO_SINGLE_CONVERSATION_SUB_TEXT": "Enable or disable multiple conversations for the same contact in this inbox",
-      "INBOX_UPDATE_TITLE": "Impostazioni della casella",
-      "INBOX_UPDATE_SUB_TEXT": "Aggiorna le impostazioni della casella",
+      "LOCK_TO_SINGLE_CONVERSATION": "Limita ad una conversazione unica",
+      "LOCK_TO_SINGLE_CONVERSATION_SUB_TEXT": "Abilita o disabilita conversazioni multiple per lo stesso contatto in questa Inbox",
+      "INBOX_UPDATE_TITLE": "Impostazioni Inbox",
+      "INBOX_UPDATE_SUB_TEXT": "Aggiorna le impostazioni inbox",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Abilita o disabilita l'assegnazione automatica di nuove conversazioni agli agenti aggiunti a questa casella.",
-      "HMAC_VERIFICATION": "Convalida identità utente",
-      "HMAC_DESCRIPTION": "Al fine di convalidare l'identità dell'utente, è possibile passare un `identifier_hash` per ogni utente. Puoi generare un hash HMAC sha256 usando il `identificatore` con la chiave mostrata qui.",
-      "HMAC_LINK_TO_DOCS": "You can read more here.",
-      "HMAC_MANDATORY_VERIFICATION": "Forza la convalida identità utente",
-      "HMAC_MANDATORY_DESCRIPTION": "Se abilitata, le richieste mancanti del file `identifier_hash` saranno respinte.",
-      "INBOX_IDENTIFIER": "Identificatore casella",
+      "HMAC_VERIFICATION": "Convalida Identità Utente",
+      "HMAC_DESCRIPTION": "Con questa chiave è possibile generare un token segreto che può essere utilizzato per verificare l'identità degli utenti.",
+      "HMAC_LINK_TO_DOCS": "Leggi di più qui.",
+      "HMAC_MANDATORY_VERIFICATION": "Forza Convalida Identità Utente",
+      "HMAC_MANDATORY_DESCRIPTION": "Se abilitata, le richieste che non possono essere verificate saranno respinte.",
+      "INBOX_IDENTIFIER": "Identificatore Inbox",
       "INBOX_IDENTIFIER_SUB_TEXT": "Usa il token `inbox_identifier` mostrato qui per l'autenticazione dei tuoi client API.",
-      "FORWARD_EMAIL_TITLE": "Inoltra all'email",
+      "FORWARD_EMAIL_TITLE": "Inoltra a Email",
       "FORWARD_EMAIL_SUB_TEXT": "Inizia a inoltrare le tue email al seguente indirizzo email.",
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Consenti messaggi dopo la risoluzione della conversazione",
-      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Consenti agli utenti finali di inviare messaggi anche dopo la risoluzione della conversazione.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Consenti agli utenti finali di inviare messaggi anche dopo che la conversazione è stata risolta.",
       "WHATSAPP_SECTION_SUBHEADER": "Questa chiave API viene utilizzata per l'integrazione con le API WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Inserisci la nuova chiave API da utilizzare per l'integrazione con le API WhatsApp.",
       "WHATSAPP_SECTION_TITLE": "Chiave API",
-      "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
-      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
+      "WHATSAPP_SECTION_UPDATE_TITLE": "Aggiorna Chiave API",
+      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Inserisci qui la nuova chiave API",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Aggiorna",
       "WHATSAPP_EMBEDDED_SIGNUP_TITLE": "WhatsApp Embedded Signup",
       "WHATSAPP_EMBEDDED_SIGNUP_SUBHEADER": "Questa Inbox è connessa tramite WhatsApp Embedded Signup.",
@@ -730,20 +730,20 @@
       "WHATSAPP_APP_ID_MISSING": "WhatsApp App ID non è configurato. Si prega di contattare l'amministratore.",
       "WHATSAPP_CONFIG_ID_MISSING": "WhatsApp Configuration ID non è configurato. Si prega di contattare l'amministratore.",
       "WHATSAPP_LOGIN_CANCELLED": "Il login WhatsApp è stato annullato. Riprova.",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
-      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
-      "WHATSAPP_TEMPLATES_SYNC_TITLE": "Sincronizza i Template",
+      "WHATSAPP_WEBHOOK_TITLE": "Token Di Verifica Webhook",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "Questo token viene utilizzato per verificare l'autenticità dell'endpoint webhook.",
+      "WHATSAPP_TEMPLATES_SYNC_TITLE": "Sincronizza Modelli",
       "WHATSAPP_TEMPLATES_SYNC_SUBHEADER": "Sincronizza manualmente i modelli di messaggi da WhatsApp per aggiornare i modelli disponibili.",
-      "WHATSAPP_TEMPLATES_SYNC_BUTTON": "Sincronizza i Template",
+      "WHATSAPP_TEMPLATES_SYNC_BUTTON": "Sincronizza Modelli",
       "WHATSAPP_TEMPLATES_SYNC_SUCCESS": "Sincronizzazione modelli iniziata. Potrebbe volerci qualche minuto per aggiornare.",
-      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Aggiorna le Impostazioni del Modulo Pre Chat"
     },
     "HELP_CENTER": {
       "LABEL": "Help Center",
-      "PLACEHOLDER": "Select Help Center",
-      "SELECT_PLACEHOLDER": "Select Help Center",
-      "REMOVE": "Remove Help Center",
-      "SUB_TEXT": "Attach a Help Center with the inbox"
+      "PLACEHOLDER": "Seleziona Help Center",
+      "SELECT_PLACEHOLDER": "Seleziona Help Center",
+      "REMOVE": "Rimuovi Help Center",
+      "SUB_TEXT": "Allega un Help Center con la Inbox"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Limite assegnazione automatica",
@@ -757,29 +757,29 @@
       "MESSAGE_ERROR": "Si è verificato un errore, riprova"
     },
     "PRE_CHAT_FORM": {
-      "DESCRIPTION": "I moduli di chat predefiniti consentono di acquisire le informazioni dell'utente prima di iniziare la conversazione con te.",
-      "SET_FIELDS": "Campi del modulo Pre chat",
+      "DESCRIPTION": "I moduli pre-chat consentono di acquisire le informazioni degli utenti prima che inizino la conversazione.",
+      "SET_FIELDS": "Campi del modulo pre-chat",
       "SET_FIELDS_HEADER": {
         "FIELDS": "Campi",
         "LABEL": "Etichetta",
-        "PLACE_HOLDER": "Segnaposto",
+        "PLACE_HOLDER": "Placeholder",
         "KEY": "Chiave",
         "TYPE": "Tipo",
-        "REQUIRED": "Obbligatorio"
+        "REQUIRED": "Richiesto"
       },
       "ENABLE": {
-        "LABEL": "Abilita il modulo pre chat",
+        "LABEL": "Abilita il modulo pre-chat",
         "OPTIONS": {
           "ENABLED": "Sì",
           "DISABLED": "No"
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Messaggio pre chat",
-        "PLACEHOLDER": "Questo messaggio sarebbe visibile agli utenti insieme al modulo"
+        "LABEL": "Messaggio pre-chat",
+        "PLACEHOLDER": "Questo messaggio sarà mostrato agli utenti insieme al modulo"
       },
       "REQUIRE_EMAIL": {
-        "LABEL": "I visitatori devono fornire il proprio nome e indirizzo email prima di iniziare la chat"
+        "LABEL": "Gli utenti dovranno fornire il proprio nome e indirizzo email prima di iniziare la chat"
       }
     },
     "CSAT": {
@@ -814,9 +814,9 @@
       "WEEKLY_TITLE": "Imposta le ore settimanali",
       "TIMEZONE_LABEL": "Seleziona fuso orario",
       "UPDATE": "Aggiorna le impostazioni dell'orario di lavoro",
-      "TOGGLE_AVAILABILITY": "Abilita la disponibilità aziendale per questa casella",
+      "TOGGLE_AVAILABILITY": "Abilita la disponibilità aziendale per questa Inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Messaggio non disponibile per i visitatori",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Abilitare la disponibilità aziendale mostrerà le ore disponibili sul widget live chat anche se tutti gli operatori sono offline. Al di fuori delle ore di disponibilità gli utenti possono essere avvisati con un messaggio ed un modulo pre-chat.",
       "DAY": {
         "ENABLE": "Abilita disponibilità per questo giorno",
         "UNAVAILABLE": "Non disponibile",
@@ -824,15 +824,15 @@
         "VALIDATION_ERROR": "L'orario di inizio deve essere prima dell'orario di chiusura.",
         "CHOOSE": "Scegli"
       },
-      "ALL_DAY": "Tutti i giorni"
+      "ALL_DAY": "Tutto il giorno"
     },
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Imposta i dettagli IMAP",
       "NOTE_TEXT": "Per abilitare SMTP, configurare IMAP.",
       "UPDATE": "Aggiorna impostazioni IMAP",
-      "TOGGLE_AVAILABILITY": "Abilita la configurazione IMAP per questa casella",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
+      "TOGGLE_AVAILABILITY": "Abilita la configurazione IMAP per questa Inbox",
+      "TOGGLE_HELP": "Abilitare IMAP aiuterà l'utente a ricevere email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Impostazioni IMAP aggiornate con successo",
         "ERROR_MESSAGE": "Impossibile aggiornare le impostazioni IMAP"
@@ -857,13 +857,13 @@
     },
     "MICROSOFT": {
       "TITLE": "Microsoft",
-      "SUBTITLE": "Reauthorize your MICROSOFT account"
+      "SUBTITLE": "Riautorizza il tuo account MICROSOFT"
     },
     "SMTP": {
       "TITLE": "SMTP",
       "SUBTITLE": "Imposta i dettagli SMTP",
       "UPDATE": "Aggiorna impostazioni SMTP",
-      "TOGGLE_AVAILABILITY": "Abilita la configurazione SMTP per questa casella",
+      "TOGGLE_AVAILABILITY": "Abilita la configurazione SMTP per questa Inbox",
       "TOGGLE_HELP": "Abilitare SMTP aiuterà l'utente a inviare email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Impostazioni SMTP aggiornate con successo",
@@ -899,7 +899,7 @@
     "WIDGET_BUILDER": {
       "WIDGET_OPTIONS": {
         "AVATAR": {
-          "LABEL": "Avatar sito web",
+          "LABEL": "Avatar Sito Web",
           "DELETE": {
             "API": {
               "SUCCESS_MESSAGE": "Avatar eliminato con successo",
@@ -908,9 +908,9 @@
           }
         },
         "WEBSITE_NAME": {
-          "LABEL": "Nome sito web",
-          "PLACE_HOLDER": "Inserisci il nome del tuo sito web (ad esempio: Acme Inc)",
-          "ERROR": "Inserisci un nome di sito valido"
+          "LABEL": "Nome Sito Web",
+          "PLACE_HOLDER": "Inserisci il nome del tuo sito web (ad esempio: Acme Srl)",
+          "ERROR": "Inserisci un nome sito web valido"
         },
         "WELCOME_HEADING": {
           "LABEL": "Intestazione di benvenuto",
@@ -918,7 +918,7 @@
         },
         "WELCOME_TAGLINE": {
           "LABEL": "Titolo di benvenuto",
-          "PLACE_HOLDER": "Rendiamo semplice connetterci con noi. Chiedete qualsiasi cosa o condividete il vostro feedback."
+          "PLACE_HOLDER": "Siamo qui per aiutarti. Facci una domanda o condividi il tuo feedback."
         },
         "REPLY_TIME": {
           "LABEL": "Tempo di risposta",
@@ -927,15 +927,15 @@
           "IN_A_DAY": "In un giorno"
         },
         "WIDGET_COLOR_LABEL": "Colore del widget",
-        "WIDGET_BUBBLE_POSITION_LABEL": "Posizione bolla del widget",
-        "WIDGET_BUBBLE_TYPE_LABEL": "Tipo bolla del widget",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Posizione della bubble del widget",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Tipo di bubble del widget",
         "WIDGET_BUBBLE_LAUNCHER_TITLE": {
           "DEFAULT": "Chatta con noi",
-          "LABEL": "Titolo del launcher della bolla del widget",
+          "LABEL": "Titolo del launcher della bubble del widget",
           "PLACE_HOLDER": "Chatta con noi"
         },
         "UPDATE": {
-          "BUTTON_TEXT": "Aggiorna impostazioni widget",
+          "BUTTON_TEXT": "Aggiorna Impostazioni Widget",
           "API": {
             "SUCCESS_MESSAGE": "Impostazioni widget aggiornate con successo",
             "ERROR_MESSAGE": "Impossibile aggiornare le impostazioni del widget"
@@ -951,7 +951,7 @@
         },
         "WIDGET_BUBBLE_TYPE": {
           "STANDARD": "Standard",
-          "EXPANDED_BUBBLE": "Bolla espansa"
+          "EXPANDED_BUBBLE": "Bubble espansa"
         }
       },
       "WIDGET_SCREEN": {
@@ -964,7 +964,7 @@
         "IN_A_DAY": "In genere risponde in un giorno"
       },
       "FOOTER": {
-        "START_CONVERSATION_BUTTON_TEXT": "Avvia conversazione",
+        "START_CONVERSATION_BUTTON_TEXT": "Avvia Conversazione",
         "CHAT_INPUT_PLACEHOLDER": "Scrivi il tuo messaggio"
       },
       "BODY": {
@@ -988,13 +988,13 @@
         "DESCRIPTION": "Connetti con Google"
       },
       "OTHER_PROVIDERS": {
-        "TITLE": "Other Providers",
-        "DESCRIPTION": "Connetti con altri provider"
+        "TITLE": "Altri Provider",
+        "DESCRIPTION": "Connetti con Altri Provider"
       }
     },
     "CHANNELS": {
       "MESSENGER": "Messenger",
-      "WEB_WIDGET": "Website",
+      "WEB_WIDGET": "Sito Web",
       "TWITTER_PROFILE": "Twitter",
       "TWILIO_SMS": "Twilio SMS",
       "WHATSAPP": "WhatsApp",
diff --git a/app/javascript/dashboard/i18n/locale/it/integrationApps.json b/app/javascript/dashboard/i18n/locale/it/integrationApps.json
index 84362c524..0c7592443 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrationApps.json
@@ -1,6 +1,6 @@
 {
   "INTEGRATION_APPS": {
-    "FETCHING": "Recupero delle integrazioni",
+    "FETCHING": "Caricamento Integrazioni",
     "NO_HOOK_CONFIGURED": "Non ci sono integrazioni {integrationId} configurate in questo account.",
     "HEADER": "Applicazioni",
     "STATUS": {
@@ -29,7 +29,7 @@
       }
     },
     "LIST": {
-      "FETCHING": "Recupero degli hook di integrazione",
+      "FETCHING": "Caricamento hook integrazioni",
       "INBOX": "Inbox",
       "DELETE": {
         "BUTTON_TEXT": "Elimina"
@@ -38,8 +38,8 @@
     "ADD": {
       "FORM": {
         "INBOX": {
-          "LABEL": "Seleziona casella",
-          "PLACEHOLDER": "Seleziona casella"
+          "LABEL": "Seleziona Inbox",
+          "PLACEHOLDER": "Seleziona Inbox"
         },
         "SUBMIT": "Crea",
         "CANCEL": "Annulla"
@@ -56,7 +56,7 @@
       "BUTTON_TEXT": "Disconnetti"
     },
     "SIDEBAR_DESCRIPTION": {
-      "DIALOGFLOW": "Dialogflow is a natural language processing platform for building conversational interfaces. Integrating it with {installationName} lets bots handle queries first and transfer them to agents when needed. It helps qualify leads and reduce agent workload by answering FAQs. To add Dialogflow, create a Service Account in Google Console and share the credentials. Refer to the docs for details"
+      "DIALOGFLOW": "Dialogflow è una piattaforma di elaborazione del linguaggio naturale per la costruzione di interfacce conversazionali. L'integrazione con {installationName} permette ai bot di gestire le richieste prima e trasferirle agli operatori solo quando necessario. Aiuta a qualificare i lead e ridurre il carico di lavoro dell'agente rispondendo alle domande frequenti. Per aggiungere Dialogflow, crea un Service Account in Google Console e inserisci le credenziali. Consulta i documenti per dettagli"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index be363ef39..c93f6905e 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -2,50 +2,54 @@
   "INTEGRATION_SETTINGS": {
     "SHOPIFY": {
       "DELETE": {
-        "TITLE": "Delete Shopify Integration",
-        "MESSAGE": "Are you sure you want to delete the Shopify integration?"
+        "TITLE": "Elimina Integrazione Shopify",
+        "MESSAGE": "Sei sicuro di voler eliminare l'integrazione Shopify?"
       },
       "STORE_URL": {
-        "TITLE": "Connect Shopify Store",
-        "LABEL": "Store URL",
+        "TITLE": "Connetti Store Shopify",
+        "LABEL": "URL Store",
         "PLACEHOLDER": "your-store.myshopify.com",
-        "HELP": "Enter your Shopify store's myshopify.com URL",
-        "CANCEL": "annulla",
-        "SUBMIT": "Connect Store"
+        "HELP": "Inserisci l'URL del tuo store Shopify myshopify.com",
+        "CANCEL": "Annulla",
+        "SUBMIT": "Connetti Store"
       },
-      "ERROR": "There was an error connecting to Shopify. Please try again or contact support if the issue persists."
+      "ERROR": "Si è verificato un errore nella connessione a Shopify. Si prega di riprovare o contattare il supporto se il problema persiste."
     },
     "HEADER": "Integrazioni",
-    "DESCRIPTION": "Chatwoot integrates with multiple tools and services to improve your team's efficiency. Explore the list below to configure your favorite apps.",
-    "LEARN_MORE": "Learn more about integrations",
-    "LOADING": "Fetching integrations",
+    "DESCRIPTION": "Chatwoot si integra con più strumenti e servizi per migliorare l'efficienza del tuo team. Esplora l'elenco qui sotto per configurare le tue app preferite.",
+    "LEARN_MORE": "Scopri di più sulle integrazioni",
+    "LOADING": "Caricamento integrazioni",
     "CAPTAIN": {
-      "DISABLED": "Captain is not enabled on your account.",
-      "CLICK_HERE_TO_CONFIGURE": "Click here to configure",
-      "LOADING_CONSOLE": "Loading Captain Console...",
-      "FAILED_TO_LOAD_CONSOLE": "Failed to load Captain Console. Please refresh and try again."
+      "DISABLED": "Captain non è abilitato sul tuo account.",
+      "CLICK_HERE_TO_CONFIGURE": "Clicca qui per configurare",
+      "LOADING_CONSOLE": "Caricamento Console Captain...",
+      "FAILED_TO_LOAD_CONSOLE": "Caricamento della Console Captain non riuscito. Aggiorna e riprova."
     },
     "WEBHOOK": {
-      "SUBSCRIBED_EVENTS": "Eventi iscritti",
-      "LEARN_MORE": "Learn more about webhooks",
+      "SUBSCRIBED_EVENTS": "Eventi Sottoscritti",
+      "LEARN_MORE": "Scopri di più sui webhooks",
       "FORM": {
         "CANCEL": "Annulla",
         "DESC": "Gli eventi Webhook ti forniscono le informazioni in tempo reale su ciò che sta accadendo nel tuo account Chatwoot. Per favore inserisci un URL valido per configurare un callback.",
         "SUBSCRIPTIONS": {
           "LABEL": "Eventi",
           "EVENTS": {
-            "CONVERSATION_CREATED": "Conversazione creata",
+            "CONVERSATION_CREATED": "Conversazione Creata",
             "CONVERSATION_STATUS_CHANGED": "Stato conversazione cambiato",
             "CONVERSATION_UPDATED": "Conversazione aggiornata",
             "MESSAGE_CREATED": "Messaggio creato",
             "MESSAGE_UPDATED": "Messaggio aggiornato",
             "WEBWIDGET_TRIGGERED": "Widget live chat aperto dall'utente",
-            "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated",
+            "CONTACT_CREATED": "Contatto creato",
+            "CONTACT_UPDATED": "Contatto aggiornato",
             "CONVERSATION_TYPING_ON": "Digitazione conversazione attiva",
             "CONVERSATION_TYPING_OFF": "Digitazione conversazione disattiva"
           }
         },
+        "NAME": {
+          "LABEL": "Nome Webhook",
+          "PLACEHOLDER": "Inserisci un nome per il webhook"
+        },
         "END_POINT": {
           "LABEL": "URL del webhook",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -92,95 +96,95 @@
           "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
         },
         "CONFIRM": {
-          "TITLE": "Conferma eliminazione",
+          "TITLE": "Conferma Eliminazione",
           "MESSAGE": "Sei sicuro di voler eliminare il webhook? ({webhookURL})",
-          "YES": "Sì, elimina ",
-          "NO": "No, conserva"
+          "YES": "Sì, Elimina ",
+          "NO": "No, Conserva"
         }
       }
     },
     "SLACK": {
       "DELETE": "Elimina",
       "DELETE_CONFIRMATION": {
-        "TITLE": "Delete the integration",
-        "MESSAGE": "Are you sure you want to delete the integration? Doing so will result in the loss of access to conversations on your Slack workspace."
+        "TITLE": "Elimina l'integrazione",
+        "MESSAGE": "Sei sicuro di voler eliminare l'integrazione? Così facendo si perderà l'accesso alle conversazioni nel tuo workspace Slack."
       },
       "HELP_TEXT": {
         "TITLE": "Stai utilizzando l'integrazione Slack",
-        "BODY": "With this integration, all of your incoming conversations will be synced to the ***{selectedChannelName}*** channel in your Slack workspace. You can manage all your customer conversations right within the channel and never miss a message.\n\nHere are the main features of the integration:\n\n**Respond to conversations from within Slack:** To respond to a conversation in the ***{selectedChannelName}*** Slack channel, simply type out your message and send it as a thread. This will create a response back to the customer through Chatwoot. It's that simple!\n\n **Create private notes:** If you want to create private notes instead of replies, start your message with ***`note:`***. This ensures that your message is kept private and won't be visible to the customer.\n\n**Associate an agent profile:** If the person who replied on Slack has an agent profile in Chatwoot under the same email, the replies will be associated with that agent profile automatically. This means you can easily track who said what and when. On the other hand, when the replier doesn't have an associated agent profile, the replies will appear from the bot profile to the customer.",
-        "SELECTED": "selected"
+        "BODY": "Con questa integrazione, tutte le conversazioni in arrivo verranno sincronizzate nel canale ***{selectedChannelName}*** del tuo workspace Slack. Potrai gestire tutte le conversazioni con i clienti direttamente dal canale e non perderai mai un messaggio.\n\nEcco le principali funzionalità dell’integrazione:\n\n**Rispondi alle conversazioni direttamente da Slack:** Per rispondere a una conversazione nel canale Slack ***{selectedChannelName}***, ti basta scrivere il tuo messaggio e inviarlo come thread. Questo genererà automaticamente una risposta al cliente tramite Chatwoot. Semplice, no?\n\n**Crea note private:** Se vuoi aggiungere note private invece di risposte, inizia il messaggio con ***`note:`***. In questo modo il messaggio resterà privato e non sarà visibile al cliente.\n\n**Associa un profilo operatore:** Se la persona che risponde su Slack ha un profilo operatore in app con lo stesso indirizzo email, le risposte verranno associate automaticamente a quel profilo. In questo modo potrai sapere facilmente chi ha risposto e quando. Se invece chi risponde non ha un profilo operatore associato, le risposte verranno inviate al cliente dal profilo del bot.",
+        "SELECTED": "selezionato"
       },
       "SELECT_CHANNEL": {
-        "OPTION_LABEL": "Select a channel",
+        "OPTION_LABEL": "Seleziona un canale",
         "UPDATE": "Aggiorna",
-        "BUTTON_TEXT": "Connect channel",
-        "DESCRIPTION": "Your Slack workspace is now linked with Chatwoot. However, the integration is currently inactive. To activate the integration and connect a channel to Chatwoot, please click the button below.\n\n**Note:** If you are attempting to connect a private channel, add the Chatwoot app to the Slack channel before proceeding with this step.",
-        "ATTENTION_REQUIRED": "Attention required",
-        "EXPIRED": "Your Slack integration has expired. To continue receiving messages on Slack, please delete the integration and connect your workspace again."
+        "BUTTON_TEXT": "Connetti canale",
+        "DESCRIPTION": "Il tuo workspace Slack è ora collegato a Chatwoot. Tuttavia, l'integrazione è attualmente inattiva. Per attivare l'integrazione e collegare un canale a Chatwoot, fare clic sul pulsante qui sotto.\n\n**Nota:** Se stai tentando di collegare un canale privato, aggiungi l'app Chatwoot al canale Slack prima di procedere con questo passaggio.",
+        "ATTENTION_REQUIRED": "Attenzione richiesta",
+        "EXPIRED": "La tua integrazione con Slack è scaduta. Per continuare a ricevere messaggi su Slack, elimina l'integrazione e connetti nuovamente il tuo workspace."
       },
-      "UPDATE_ERROR": "There was an error updating the integration, please try again",
-      "UPDATE_SUCCESS": "The channel is connected successfully",
-      "FAILED_TO_FETCH_CHANNELS": "There was an error fetching the channels from Slack, please try again"
+      "UPDATE_ERROR": "Si è verificato un errore durante l'aggiornamento dell'integrazione, riprova",
+      "UPDATE_SUCCESS": "Il canale è connesso con successo",
+      "FAILED_TO_FETCH_CHANNELS": "Si è verificato un errore nel recupero dei canali da Slack, per favore riprova"
     },
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
-      "LEAVE_THE_ROOM": "Leave the room",
-      "START_VIDEO_CALL_HELP_TEXT": "Start a new video call with the customer",
-      "JOIN_ERROR": "There was an error joining the call, please try again",
-      "CREATE_ERROR": "There was an error creating a meeting link, please try again"
+      "CLICK_HERE_TO_JOIN": "Clicca qui per unirti",
+      "LEAVE_THE_ROOM": "Lascia la stanza",
+      "START_VIDEO_CALL_HELP_TEXT": "Avvia una nuova videochiamata con il cliente",
+      "JOIN_ERROR": "Si è verificato un errore nell'unirsi alla chiamata, riprova",
+      "CREATE_ERROR": "Si è verificato un errore durante la creazione di un link alla riunione, riprova"
     },
     "OPEN_AI": {
       "AI_ASSIST": "AI Assist",
-      "WITH_AI": " {option} with AI ",
+      "WITH_AI": " {option} con l'AI ",
       "OPTIONS": {
-        "REPLY_SUGGESTION": "Reply Suggestion",
-        "SUMMARIZE": "Summarize",
-        "REPHRASE": "Improve Writing",
-        "FIX_SPELLING_GRAMMAR": "Fix Spelling and Grammar",
-        "SHORTEN": "Shorten",
-        "EXPAND": "Expand",
-        "MAKE_FRIENDLY": "Change message tone to friendly",
-        "MAKE_FORMAL": "Use formal tone",
-        "SIMPLIFY": "Simplify"
+        "REPLY_SUGGESTION": "Suggerimenti di Risposta",
+        "SUMMARIZE": "Riassumi",
+        "REPHRASE": "Migliora la Scrittura",
+        "FIX_SPELLING_GRAMMAR": "Correggi ortografia e grammatica",
+        "SHORTEN": "Abbrevia",
+        "EXPAND": "Espandi",
+        "MAKE_FRIENDLY": "Cambia il tono del messaggio in amichevole",
+        "MAKE_FORMAL": "Usa un tono formale",
+        "SIMPLIFY": "Semplifica"
       },
       "ASSISTANCE_MODAL": {
-        "DRAFT_TITLE": "Draft content",
-        "GENERATED_TITLE": "Generated content",
-        "AI_WRITING": "AI is writing",
+        "DRAFT_TITLE": "Contenuti in bozza",
+        "GENERATED_TITLE": "Contenuti generati",
+        "AI_WRITING": "L'AI sta scrivendo",
         "BUTTONS": {
-          "APPLY": "Use this suggestion",
-          "CANCEL": "annulla"
+          "APPLY": "Usa questo suggerimento",
+          "CANCEL": "Annulla"
         }
       },
       "CTA_MODAL": {
-        "TITLE": "Integrate with OpenAI",
-        "DESC": "Bring advanced AI features to your dashboard with OpenAI's GPT models. To begin, enter the API key from your OpenAI account.",
-        "KEY_PLACEHOLDER": "Enter your OpenAI API key",
+        "TITLE": "Integra con OpenAI",
+        "DESC": "Porta funzionalità AI avanzate nella tua dashboard con i modelli GPT di OpenAI. Per iniziare, inserisci la chiave API dal tuo account OpenAI.",
+        "KEY_PLACEHOLDER": "Inserisci la tua chiave API OpenAI",
         "BUTTONS": {
           "NEED_HELP": "Hai bisogno di aiuto?",
-          "DISMISS": "Dismiss",
-          "FINISH": "Finish Setup"
+          "DISMISS": "Ignora",
+          "FINISH": "Completa Setup"
         },
-        "DISMISS_MESSAGE": "You can setup OpenAI integration later Whenever you want.",
-        "SUCCESS_MESSAGE": "OpenAI integration setup successfully"
+        "DISMISS_MESSAGE": "Puoi configurare l'integrazione di OpenAI più tardi quando vuoi.",
+        "SUCCESS_MESSAGE": "Setup integrazione OpenAI completato con successo"
       },
-      "TITLE": "Improve With AI",
-      "SUMMARY_TITLE": "Summary with AI",
-      "REPLY_TITLE": "Reply suggestion with AI",
-      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TITLE": "Migliora con AI",
+      "SUMMARY_TITLE": "Riassunto con AI",
+      "REPLY_TITLE": "Suggerimenti di risposta con AI",
+      "SUBTITLE": "Una risposta migliorata verrà generata utilizzando l'AI, in base alla tua bozza attuale.",
       "TONE": {
-        "TITLE": "Tone",
+        "TITLE": "Tono",
         "OPTIONS": {
-          "PROFESSIONAL": "Professional",
-          "FRIENDLY": "Friendly"
+          "PROFESSIONAL": "Professionale",
+          "FRIENDLY": "Amichevole"
         }
       },
       "BUTTONS": {
-        "GENERATE": "Generate",
-        "GENERATING": "Generating...",
+        "GENERATE": "Genera",
+        "GENERATING": "Generazione...",
         "CANCEL": "Annulla"
       },
-      "GENERATE_ERROR": "There was an error processing the content, please try again"
+      "GENERATE_ERROR": "Si è verificato un errore nell'elaborazione del contenuto, verifica la tua chiave API OpenAI e riprova"
     },
     "DELETE": {
       "BUTTON_TEXT": "Elimina",
@@ -192,14 +196,14 @@
       "BUTTON_TEXT": "Connetti"
     },
     "DASHBOARD_APPS": {
-      "TITLE": "App dashboard",
-      "HEADER_BTN_TXT": "Aggiungi una nuova app dashboard",
-      "SIDEBAR_TXT": "<p><b>App dashboard</b></p><p>Le app dashboard consentono alle organizzazioni di incorporare un'applicazione all'interno del cruscotto Chatwoot per fornire il contesto per gli agenti di assistenza clienti. Questa funzione consente di creare un'applicazione in modo indipendente e incorporata all'interno della dashboard per fornire informazioni all'utente, i loro ordini, o la loro cronologia di pagamento precedente.</p><p>Quando hai incorporato la tua applicazione usando il cruscotto in Chatwoot, la tua applicazione avrà il contesto della conversazione e del contatto come evento finestra. Implementa un ascoltatore per l'evento del messaggio sulla tua pagina per ricevere il contesto.</p><p>Per aggiungere una nuova app dashboard, clicca sul pulsante 'Aggiungi una nuova app dashboard'.</p>",
-      "DESCRIPTION": "Le app dashboard consentono alle organizzazioni di incorporare un'applicazione all'interno della dashboard per fornire il contesto per gli agenti di assistenza clienti. Questa funzione consente di creare un'applicazione in modo indipendente e incorporare che per fornire informazioni sull'utente, i suoi ordini o la loro cronologia di pagamento precedente.",
-      "LEARN_MORE": "Learn more about Dashboard Apps",
+      "TITLE": "App Dashboard",
+      "HEADER_BTN_TXT": "Aggiungi una nuova App Dashboard",
+      "SIDEBAR_TXT": "<p><b>App dashboard</b></p><p>Le app dashboard consentono alle organizzazioni di incorporare un'applicazione all'interno di Chatwoot per fornire informazioni aggiuntive agli operatorii. Questa funzione consente di creare un'applicazione in modo indipendente e incorporata all'interno della dashboard per fornire informazioni degli utenti, ad esempio ordini o pagamenti effettuati.</p><p>Quando integri la tua applicazione usando la dashboard Chatwoot, la tua applicazione avrà il context della conversazione e del contatto come evento window. Implementa un listener per l'evento del messaggio sulla tua pagina per ricevere i dati.</p><p>Per aggiungere una nuova app dashboard, clicca sul pulsante 'Aggiungi una nuova app dashboard'.</p>",
+      "DESCRIPTION": "Le app dashboard consentono alle organizzazioni di incorporare un'applicazione all'interno della dashboard per fornire dati aggiuntivi agli operatori. Questa funzione consente di creare un'applicazione in modo indipendente e incorporarla per fornire informazioni sull'utente, i suoi ordini o la loro cronologia di pagamento precedente.",
+      "LEARN_MORE": "Scopri di più sulle App Dashboard",
       "LIST": {
         "404": "Non ci sono ancora app dashboard configurate su questo account",
-        "LOADING": "Recupero delle app dashboard...",
+        "LOADING": "Caricamento app dashboard...",
         "TABLE_HEADER": {
           "NAME": "Nome",
           "ENDPOINT": "Endpoint"
@@ -212,11 +216,11 @@
         "TITLE_PLACEHOLDER": "Inserisci un nome per la tua app dashboard",
         "TITLE_ERROR": "È richiesto un nome per l'app dashboard",
         "URL_LABEL": "Endpoint",
-        "URL_PLACEHOLDER": "Inserisci l'URL dell'endpoint dove la tua app è ospitata",
+        "URL_PLACEHOLDER": "Inserisci l'URL dell'endpoint dove la tua app è hostata",
         "URL_ERROR": "È richiesto un URL valido"
       },
       "CREATE": {
-        "HEADER": "Aggiungi una nuova app dashboard",
+        "HEADER": "Aggiungi una nuova App Dashboard",
         "FORM_SUBMIT": "Invia",
         "FORM_CANCEL": "Annulla",
         "API_SUCCESS": "App dashboard configurata con successo",
@@ -230,8 +234,8 @@
         "API_ERROR": "Non è stato possibile aggiornare l'app. Riprova più tardi"
       },
       "DELETE": {
-        "CONFIRM_YES": "Sì, eliminalo",
-        "CONFIRM_NO": "No, mantienilo",
+        "CONFIRM_YES": "Sì, elimina",
+        "CONFIRM_NO": "No, mantieni",
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare l'app - {appName}?",
         "API_SUCCESS": "App dashboard cancellata con successo",
@@ -239,91 +243,91 @@
       }
     },
     "LINEAR": {
-      "ADD_OR_LINK_BUTTON": "Create/Link Linear Issue",
-      "LOADING": "Fetching linear issues...",
-      "LOADING_ERROR": "There was an error fetching the linear issues, please try again",
+      "ADD_OR_LINK_BUTTON": "Crea/collega issue Linear",
+      "LOADING": "Caricamento issue Linear...",
+      "LOADING_ERROR": "Si è verificato un errore nel recupero delle issue Linear, si prega di riprovare",
       "CREATE": "Crea",
       "LINK": {
-        "SEARCH": "Search issues",
-        "SELECT": "Select issue",
+        "SEARCH": "Cerca issue",
+        "SELECT": "Seleziona issue",
         "TITLE": "Link",
-        "EMPTY_LIST": "No linear issues found",
-        "LOADING": "Loading",
-        "ERROR": "There was an error fetching the linear issues, please try again",
-        "LINK_SUCCESS": "Issue linked successfully",
-        "LINK_ERROR": "There was an error linking the issue, please try again",
-        "LINK_TITLE": "Conversation (#{conversationId}) with {name}"
+        "EMPTY_LIST": "Nessuna issue Linear trovata",
+        "LOADING": "Caricamento",
+        "ERROR": "Si è verificato un errore nel recupero delle issue Linear, si prega di riprovare",
+        "LINK_SUCCESS": "Issue collegata con successo",
+        "LINK_ERROR": "Si è verificato un errore durante il collegamento della issue, per favore riprova",
+        "LINK_TITLE": "Conversazione (#{conversationId}) con {name}"
       },
       "ADD_OR_LINK": {
-        "TITLE": "Create/link linear issue",
-        "DESCRIPTION": "Create Linear issues from conversations, or link existing ones for seamless tracking.",
+        "TITLE": "Crea/collega issue Linear",
+        "DESCRIPTION": "Creare issue Linear dalle conversazioni, o collega quelle esistenti per un monitoraggio costante.",
         "FORM": {
           "TITLE": {
             "LABEL": "Titolo",
-            "PLACEHOLDER": "Enter title",
-            "REQUIRED_ERROR": "Il titolo è obbligatorio"
+            "PLACEHOLDER": "Inserisci titolo",
+            "REQUIRED_ERROR": "Titolo richiesto"
           },
           "DESCRIPTION": {
             "LABEL": "Descrizione",
-            "PLACEHOLDER": "Enter description"
+            "PLACEHOLDER": "Inserisci descrizione"
           },
           "TEAM": {
             "LABEL": "Team",
             "PLACEHOLDER": "Seleziona team",
-            "SEARCH": "Search team",
-            "REQUIRED_ERROR": "Team is required"
+            "SEARCH": "Cerca team",
+            "REQUIRED_ERROR": "Team richiesto"
           },
           "ASSIGNEE": {
-            "LABEL": "Assignee",
-            "PLACEHOLDER": "Select assignee",
-            "SEARCH": "Search assignee"
+            "LABEL": "Assegnatario",
+            "PLACEHOLDER": "Seleziona assegnatario",
+            "SEARCH": "Cerca assegnatario"
           },
           "PRIORITY": {
             "LABEL": "Priorità",
-            "PLACEHOLDER": "Select priority",
-            "SEARCH": "Search priority"
+            "PLACEHOLDER": "Seleziona priorità",
+            "SEARCH": "Cerca priorità"
           },
           "LABEL": {
             "LABEL": "Etichetta",
-            "PLACEHOLDER": "Select label",
-            "SEARCH": "Search label"
+            "PLACEHOLDER": "Seleziona etichetta",
+            "SEARCH": "Cerca etichetta"
           },
           "STATUS": {
             "LABEL": "Stato",
-            "PLACEHOLDER": "Select status",
-            "SEARCH": "Search status"
+            "PLACEHOLDER": "Seleziona stato",
+            "SEARCH": "Cerca stato"
           },
           "PROJECT": {
-            "LABEL": "Project",
-            "PLACEHOLDER": "Select project",
-            "SEARCH": "Search project"
+            "LABEL": "Progetto",
+            "PLACEHOLDER": "Seleziona progetto",
+            "SEARCH": "Cerca progetto"
           }
         },
         "CREATE": "Crea",
-        "CANCEL": "annulla",
-        "CREATE_SUCCESS": "Issue created successfully",
-        "CREATE_ERROR": "There was an error creating the issue, please try again",
-        "LOADING_TEAM_ERROR": "There was an error fetching the teams, please try again",
-        "LOADING_TEAM_ENTITIES_ERROR": "There was an error fetching the team entities, please try again"
+        "CANCEL": "Annulla",
+        "CREATE_SUCCESS": "Issue creata con successo",
+        "CREATE_ERROR": "Si è verificato un errore durante la creazione della issue, per favore riprova",
+        "LOADING_TEAM_ERROR": "Si è verificato un errore nel caricamento dei team, riprova",
+        "LOADING_TEAM_ENTITIES_ERROR": "Si è verificato un errore nel caricamento delle entità dei team, riprova"
       },
       "ISSUE": {
         "STATUS": "Stato",
         "PRIORITY": "Priorità",
-        "ASSIGNEE": "Assignee",
+        "ASSIGNEE": "Assegnatario",
         "LABELS": "Etichette",
-        "CREATED_AT": "Created at {createdAt}"
+        "CREATED_AT": "Creato {createdAt}"
       },
       "UNLINK": {
-        "TITLE": "Unlink",
-        "SUCCESS": "Issue unlinked successfully",
-        "ERROR": "There was an error unlinking the issue, please try again"
+        "TITLE": "Disconnetti",
+        "SUCCESS": "Issue scollegata con successo",
+        "ERROR": "Si è verificato un errore durante lo scollegamento della issue, riprova"
       },
-      "NO_LINKED_ISSUES": "Nessuna issue collegato trovato",
+      "NO_LINKED_ISSUES": "Nessuna issue collegata trovata",
       "DELETE": {
-        "TITLE": "Are you sure you want to delete the integration?",
-        "MESSAGE": "Are you sure you want to delete the integration?",
-        "CONFIRM": "Yes, delete",
-        "CANCEL": "annulla"
+        "TITLE": "Sei sicuro di voler eliminare l'integrazione?",
+        "MESSAGE": "Sei sicuro di voler eliminare l'integrazione?",
+        "CONFIRM": "Sì, elimina",
+        "CANCEL": "Annulla"
       },
       "CTA": {
         "TITLE": "Connetti a Linear",
@@ -343,20 +347,26 @@
   },
   "CAPTAIN": {
     "NAME": "Captain",
-    "HEADER_KNOW_MORE": "Know more",
+    "HEADER_KNOW_MORE": "Scopri di più",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistenti",
+      "SWITCH_ASSISTANT": "Cambia assistenti",
+      "NEW_ASSISTANT": "Crea Assistente",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
-      "TRY_THESE_PROMPTS": "Try these prompts",
+      "TRY_THESE_PROMPTS": "Prova questi prompt",
       "PANEL_TITLE": "Inizia a usare Copilot",
       "KICK_OFF_MESSAGE": "Hai bisogno di un riassunto rapido, vuoi controllare le conversazioni passate o vuoi scrivere risposte migliori? Copilot è qui per te.",
       "SEND_MESSAGE": "Invia messaggio...",
       "EMPTY_MESSAGE": "Si è verificato un errore durante la generazione della risposta. Riprova.",
-      "LOADER": "Captain is thinking",
-      "YOU": "You",
-      "USE": "Use this",
+      "LOADER": "Captain sta pensando",
+      "YOU": "Tu",
+      "USE": "Usa questo",
       "RESET": "Reset",
       "SHOW_STEPS": "Mostra i passaggi",
-      "SELECT_ASSISTANT": "Select Assistant",
+      "SELECT_ASSISTANT": "Seleziona Assistente",
       "PROMPTS": {
         "SUMMARIZE": {
           "LABEL": "Riassumi questa conversazione",
@@ -381,49 +391,49 @@
       }
     },
     "PLAYGROUND": {
-      "USER": "You",
-      "ASSISTANT": "Assistant",
+      "USER": "Tu",
+      "ASSISTANT": "Assistente",
       "MESSAGE_PLACEHOLDER": "Scrivi il tuo messaggio...",
       "HEADER": "Playground",
       "DESCRIPTION": "Usa questo playground per inviare messaggi al tuo assistente e controllare se risponde correttamente, rapidamente e con il tono che ti aspetti.",
       "CREDIT_NOTE": "I messaggi inviati qui vengono scalati dai crediti Captain."
     },
     "PAYWALL": {
-      "TITLE": "Upgrade to use Captain AI",
-      "AVAILABLE_ON": "Captain is not available on the free plan.",
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to our assistants, copilot and more.",
-      "UPGRADE_NOW": "Upgrade now",
-      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+      "TITLE": "Aggiorna per usare Captain AI",
+      "AVAILABLE_ON": "Captain non è disponibile sul piano gratuito.",
+      "UPGRADE_PROMPT": "Aggiorna il tuo piano per ottenere l'accesso ai nostri assistenti, copilot e altro ancora.",
+      "UPGRADE_NOW": "Aggiorna ora",
+      "CANCEL_ANYTIME": "Puoi modificare o annullare il tuo piano in qualsiasi momento"
     },
     "ENTERPRISE_PAYWALL": {
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to our assistants, copilot and more.",
-      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+      "UPGRADE_PROMPT": "Aggiorna il tuo piano per ottenere l'accesso ai nostri assistenti, copilot e altro ancora.",
+      "ASK_ADMIN": "Contatta il tuo amministratore per l'aggiornamento."
     },
     "BANNER": {
-      "RESPONSES": "You've used over 80% of your response limit. To continue using Captain AI, please upgrade.",
-      "DOCUMENTS": "Document limit reached. Upgrade to continue using Captain AI."
+      "RESPONSES": "Hai usato oltre l'80% del tuo limite di risposte. Per continuare a utilizzare Captain AI, per favore aggiorna.",
+      "DOCUMENTS": "Raggiunto il limite di documenti. Aggiorna per continuare a usare Captain AI."
     },
     "FORM": {
-      "CANCEL": "annulla",
+      "CANCEL": "Annulla",
       "CREATE": "Crea",
       "EDIT": "Aggiorna"
     },
     "ASSISTANTS": {
-      "HEADER": "Assistants",
+      "HEADER": "Assistenti",
       "NO_ASSISTANTS_AVAILABLE": "Non ci sono assistenti disponibili nel tuo account.",
-      "ADD_NEW": "Create a new assistant",
+      "ADD_NEW": "Crea un nuovo assistente",
       "DELETE": {
-        "TITLE": "Are you sure to delete the assistant?",
-        "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
-        "CONFIRM": "Yes, delete",
-        "SUCCESS_MESSAGE": "The assistant has been successfully deleted",
-        "ERROR_MESSAGE": "There was an error deleting the assistant, please try again."
+        "TITLE": "Sei sicuro di voler eliminare l'assistente?",
+        "DESCRIPTION": "Questa azione è permanente. L'eliminazione di questo assistente la rimuoverà da tutte le inbox connesse e cancellerà definitivamente tutte le knowledge generate.",
+        "CONFIRM": "Sì, elimina",
+        "SUCCESS_MESSAGE": "L'assistente è stato eliminato con successo",
+        "ERROR_MESSAGE": "Si è verificato un errore durante l'eliminazione dell'assistente, riprova."
       },
-      "FORM_DESCRIPTION": "Fill out the details below to name your assistant, describe its purpose, and specify the product it will support.",
+      "FORM_DESCRIPTION": "Compila i dettagli qui sotto per dare un nome al tuo assistente, descriverne lo scopo e specificare il prodotto per cui offirà supporto.",
       "CREATE": {
-        "TITLE": "Create an assistant",
-        "SUCCESS_MESSAGE": "The assistant has been successfully created",
-        "ERROR_MESSAGE": "There was an error creating the assistant, please try again."
+        "TITLE": "Crea un assistente",
+        "SUCCESS_MESSAGE": "L'assistente è stato creato correttamente",
+        "ERROR_MESSAGE": "Si è verificato un errore durante la creazione dell'assistente, riprova."
       },
       "FORM": {
         "UPDATE": "Aggiorna",
@@ -449,9 +459,9 @@
           "ERROR": "La descrizione è richiesta"
         },
         "PRODUCT_NAME": {
-          "LABEL": "Product Name",
+          "LABEL": "Nome Prodotto",
           "PLACEHOLDER": "Inserisci il nome del prodotto",
-          "ERROR": "The product name is required"
+          "ERROR": "Il nome del prodotto è richiesto"
         },
         "WELCOME_MESSAGE": {
           "LABEL": "Messaggio di Benvenuto",
@@ -471,21 +481,19 @@
         },
         "FEATURES": {
           "TITLE": "Funzionalità",
-          "ALLOW_CONVERSATION_FAQS": "Generate FAQs from resolved conversations",
-          "ALLOW_MEMORIES": "Capture key details as memories from customer interactions.",
+          "ALLOW_CONVERSATION_FAQS": "Genera FAQ dalle conversazioni risolte",
+          "ALLOW_MEMORIES": "Salva memorie e dettagli chiave dalle interazioni con i clienti.",
           "ALLOW_CITATIONS": "Includi citazioni alle fonti nelle risposte"
         }
       },
       "EDIT": {
-        "TITLE": "Update the assistant",
-        "SUCCESS_MESSAGE": "The assistant has been successfully updated",
-        "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
+        "TITLE": "Aggiorna l'assistente",
+        "SUCCESS_MESSAGE": "L'assistente è stato aggiornato correttamente",
+        "ERROR_MESSAGE": "Si è verificato un errore durante l'aggiornamento dell'assistente, riprova.",
         "NOT_FOUND": "Impossibile trovare l'assistente. Riprova."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Impostazioni",
         "BASIC_SETTINGS": {
           "TITLE": "Impostazioni di base",
           "DESCRIPTION": "Personalizza ciò che l'assistente dice quando termina una conversazione o la trasferisce a un umano."
@@ -502,36 +510,34 @@
               "TITLE": "Guardrail",
               "DESCRIPTION": "Mantieni l’assistente concentrato: risponde solo ai tipi di domande che desideri, evitando argomenti fuori tema o non consentiti."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenari",
-              "DESCRIPTION": "Fornisci contesto aggiuntivo al tuo assistente, ad esempio “cosa fare quando un utente è bloccato” o “come comportarsi durante una richiesta di rimborso”."
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Linee guida per le risposte",
               "DESCRIPTION": "Imposta il tono e la struttura delle risposte del tuo assistente: chiare e amichevoli? Brevi e dirette? Dettagliate e formali?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Elimina Assistente",
+          "DESCRIPTION": "Questa azione è permanente. L'eliminazione di questo assistente la rimuoverà da tutte le inbox connesse e cancellerà definitivamente tutte le knowledge generate.",
+          "BUTTON_TEXT": "Elimina {assistantName}"
         }
       },
       "OPTIONS": {
-        "EDIT_ASSISTANT": "Edit Assistant",
-        "DELETE_ASSISTANT": "Delete Assistant",
-        "VIEW_CONNECTED_INBOXES": "View connected inboxes"
+        "EDIT_ASSISTANT": "Modifica Assistente",
+        "DELETE_ASSISTANT": "Elimina Assistente",
+        "VIEW_CONNECTED_INBOXES": "Visualizza inbox connesse"
       },
       "EMPTY_STATE": {
-        "TITLE": "No assistants available",
-        "SUBTITLE": "Create an assistant to provide quick and accurate responses to your users. It can learn from your help articles and past conversations.",
+        "TITLE": "Nessun assistente disponibile",
+        "SUBTITLE": "Crea un assistente per fornire risposte rapide e accurate agli utenti. Può imparare dagli articoli dell'Help Center e dalle conversazioni passate.",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain Assistant",
-          "NOTE": "Captain Assistant engages directly with customers, learns from your help docs and past conversations, and delivers instant, accurate responses. It handles the initial queries, providing quick resolutions before  transferring to an agent when needed."
+          "NOTE": "Captain Assistant interagisce direttamente con i clienti, impara dai documenti e dalle conversazioni passate e fornisce risposte rapide e accurate. Gestisce le richieste iniziali, fornendo risoluzioni rapide prima di trasferire ad un operatore quando necessario."
         }
       },
       "GUARDRAILS": {
         "TITLE": "Guardrail",
         "DESCRIPTION": "Mantieni l’assistente concentrato: risponde solo ai tipi di domande che desideri, evitando argomenti fuori tema o non consentiti.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrail"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} elemento selezionato | {count} elementi selezionati",
           "SELECT_ALL": "Seleziona tutto ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Linee Guida per le Risposte",
         "DESCRIPTION": "Imposta il tono e la struttura delle risposte del tuo assistente: chiare e amichevoli? Brevi e dirette? Dettagliate e formali?",
-        "BREADCRUMB": {
-          "TITLE": "Linee Guida per le Risposte"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} elemento selezionato | {count} elementi selezionati",
           "SELECT_ALL": "Seleziona tutto ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenari",
         "DESCRIPTION": "Fornisci contesto aggiuntivo al tuo assistente, ad esempio “cosa fare quando un utente è bloccato” o “come comportarsi durante una richiesta di rimborso”.",
-        "BREADCRUMB": {
-          "TITLE": "Scenari"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} elemento selezionato | {count} elementi selezionati",
           "SELECT_ALL": "Seleziona tutto ({count})",
@@ -691,17 +691,17 @@
       }
     },
     "DOCUMENTS": {
-      "HEADER": "Documents",
-      "ADD_NEW": "Create a new document",
+      "HEADER": "Documenti",
+      "ADD_NEW": "Crea un nuovo documento",
       "RELATED_RESPONSES": {
-        "TITLE": "Related FAQs",
-        "DESCRIPTION": "These FAQs are generated directly from the document."
+        "TITLE": "FAQ Correlate",
+        "DESCRIPTION": "Queste FAQ vengono generate direttamente dai Documenti."
       },
-      "FORM_DESCRIPTION": "Enter the URL of the document to add it as a knowledge source and choose the assistant to associate it with.",
+      "FORM_DESCRIPTION": "Inserisci l'URL del documento per aggiungerlo come fonte e scegli l'assistente con cui associarlo.",
       "CREATE": {
-        "TITLE": "Add a document",
-        "SUCCESS_MESSAGE": "The document has been successfully created",
-        "ERROR_MESSAGE": "There was an error creating the document, please try again."
+        "TITLE": "Aggiungi un documento",
+        "SUCCESS_MESSAGE": "Il documento è stato creato correttamente",
+        "ERROR_MESSAGE": "Si è verificato un errore durante la creazione del documento, riprova."
       },
       "FORM": {
         "TYPE": {
@@ -711,8 +711,8 @@
         },
         "URL": {
           "LABEL": "URL",
-          "PLACEHOLDER": "Enter the URL of the document",
-          "ERROR": "Please provide a valid URL for the document"
+          "PLACEHOLDER": "Inserisci l'URL del documento",
+          "ERROR": "Inserisci un URL valido per il documento"
         },
         "PDF_FILE": {
           "LABEL": "File PDF",
@@ -725,30 +725,25 @@
         "NAME": {
           "LABEL": "Nome Documento (Opzionale)",
           "PLACEHOLDER": "Inserisci un nome per il documento"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
-        "TITLE": "Are you sure to delete the document?",
-        "DESCRIPTION": "This action is permanent. Deleting this document will permanently erase all generated knowledge.",
-        "CONFIRM": "Yes, delete",
-        "SUCCESS_MESSAGE": "The document has been successfully deleted",
-        "ERROR_MESSAGE": "There was an error deleting the document, please try again."
+        "TITLE": "Sei sicuro di voler eliminare il documento?",
+        "DESCRIPTION": "Questa azione è permanente. L'eliminazione di questo documento cancellerà definitivamente tutte le conoscenze generate.",
+        "CONFIRM": "Sì, elimina",
+        "SUCCESS_MESSAGE": "Il documento è stato eliminato con successo",
+        "ERROR_MESSAGE": "Si è verificato un errore durante l'eliminazione del documento, riprova."
       },
       "OPTIONS": {
-        "VIEW_RELATED_RESPONSES": "View Related Responses",
-        "DELETE_DOCUMENT": "Delete Document"
+        "VIEW_RELATED_RESPONSES": "Visualizza FAQ Correlate",
+        "DELETE_DOCUMENT": "Elimina Documento"
       },
       "EMPTY_STATE": {
-        "TITLE": "No documents available",
-        "SUBTITLE": "Documents are used by your assistant to generate FAQs. You can import documents to provide context for your assistant.",
+        "TITLE": "Nessun documento disponibile",
+        "SUBTITLE": "I documenti sono utilizzati dal tuo assistente per generare FAQ. Puoi importare documenti per fornire contesto al tuo assistente.",
         "FEATURE_SPOTLIGHT": {
-          "TITLE": "Captain Document",
-          "NOTE": "A document in Captain serves as a knowledge resource for the assistant. By connecting your help center or guides, Captain can analyze the content and provide accurate responses for customer inquiries."
+          "TITLE": "Documento Captain",
+          "NOTE": "Un documento in Captain serve come risorsa di knowledge base per l'assistente. Collegando documenti help center e guide, Captain può analizzare il contenuto e fornire risposte accurate per le richieste dei clienti."
         }
       }
     },
@@ -846,7 +841,7 @@
           "PLACEHOLDER": "Descrizione del parametro"
         },
         "PARAM_REQUIRED": {
-          "LABEL": "Obbligatorio"
+          "LABEL": "Richiesto"
         },
         "REQUEST_TEMPLATE": {
           "LABEL": "Request Body Template (Opzionale)",
@@ -862,118 +857,120 @@
       }
     },
     "RESPONSES": {
-      "HEADER": "FAQs",
-      "ADD_NEW": "Create new FAQ",
+      "HEADER": "FAQ",
+      "PENDING_FAQS": "FAQ In Attesa",
+      "ADD_NEW": "Crea nuova FAQ",
       "DOCUMENTABLE": {
-        "CONVERSATION": "Conversation #{id}"
+        "CONVERSATION": "Conversazione #{id}"
       },
-      "SELECTED": "{count} selected",
+      "SELECTED": "{count} selezionate",
       "SELECT_ALL": "Seleziona tutto ({count})",
       "UNSELECT_ALL": "Deseleziona tutto ({count})",
       "SEARCH_PLACEHOLDER": "Cerca FAQ...",
-      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_APPROVE_BUTTON": "Approva",
       "BULK_DELETE_BUTTON": "Elimina",
       "BULK_APPROVE": {
-        "SUCCESS_MESSAGE": "FAQs approved successfully",
-        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+        "SUCCESS_MESSAGE": "FAQ approvate con successo",
+        "ERROR_MESSAGE": "Si è verificato un errore nell'approvazione delle FAQ, riprova."
       },
       "BULK_DELETE": {
-        "TITLE": "Delete FAQs?",
-        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
-        "CONFIRM": "Yes, delete all",
-        "SUCCESS_MESSAGE": "FAQs deleted successfully",
-        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+        "TITLE": "Eliminare FAQ?",
+        "DESCRIPTION": "Sei sicuro di voler eliminare le FAQ selezionate? Questa azione non può essere annullata.",
+        "CONFIRM": "Sì, elimina tutte",
+        "SUCCESS_MESSAGE": "FAQ eliminate con successo",
+        "ERROR_MESSAGE": "Si è verificato un errore durante l'eliminazione delle FAQ, riprova."
       },
       "DELETE": {
-        "TITLE": "Are you sure to delete the FAQ?",
+        "TITLE": "Sei sicuro di voler eliminare la FAQ?",
         "DESCRIPTION": "",
-        "CONFIRM": "Yes, delete",
-        "SUCCESS_MESSAGE": "FAQ deleted successfully",
-        "ERROR_MESSAGE": "There was an error deleting the FAQ, please try again."
+        "CONFIRM": "Sì, elimina",
+        "SUCCESS_MESSAGE": "FAQ eliminata con successo",
+        "ERROR_MESSAGE": "Si è verificato un errore durante l'eliminazione della FAQ, riprova."
       },
       "FILTER": {
-        "ASSISTANT": "Assistant: {selected}",
-        "STATUS": "Status: {selected}",
+        "ASSISTANT": "Assistente: {selected}",
+        "STATUS": "Stato: {selected}",
         "ALL_ASSISTANTS": "Tutti"
       },
       "STATUS": {
         "TITLE": "Stato",
-        "PENDING": "In sospeso",
-        "APPROVED": "Approved",
-        "ALL": "Tutti"
+        "PENDING": "In Sospeso",
+        "APPROVED": "Approvate",
+        "ALL": "Tutte"
       },
-      "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
+      "PENDING_BANNER": {
+        "TITLE": "Captain ha trovato delle FAQ tra le domande dei tuoi clienti.",
+        "ACTION": "Clicca qui per rivedere"
+      },
+      "FORM_DESCRIPTION": "Aggiungi una domanda e la sua risposta corrispondente alla knowledge base e seleziona l'assistente con cui dovrebbe essere associata.",
       "CREATE": {
-        "TITLE": "Add an FAQ",
-        "SUCCESS_MESSAGE": "The response has been added successfully.",
-        "ERROR_MESSAGE": "An error occurred while adding the response. Please try again."
+        "TITLE": "Aggiungi una FAQ",
+        "SUCCESS_MESSAGE": "La risposta è stata aggiunta con successo.",
+        "ERROR_MESSAGE": "Si è verificato un errore durante l'aggiunta della risposta. Riprova."
       },
       "FORM": {
         "QUESTION": {
-          "LABEL": "Question",
-          "PLACEHOLDER": "Enter the question here",
-          "ERROR": "Please provide a valid question."
+          "LABEL": "Domanda",
+          "PLACEHOLDER": "Inserisci qui la domanda",
+          "ERROR": "Inserisci una domanda valida."
         },
         "ANSWER": {
-          "LABEL": "Answer",
-          "PLACEHOLDER": "Enter the answer here",
-          "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
+          "LABEL": "Risposta",
+          "PLACEHOLDER": "Inserisci qui la risposta",
+          "ERROR": "Inserisci una risposta valida."
         }
       },
       "EDIT": {
-        "TITLE": "Update the FAQ",
-        "SUCCESS_MESSAGE": "The FAQ has been successfully updated",
-        "ERROR_MESSAGE": "There was an error updating the FAQ, please try again",
-        "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
+        "TITLE": "Aggiorna FAQ",
+        "SUCCESS_MESSAGE": "Le FAQ sono state aggiornate correttamente",
+        "ERROR_MESSAGE": "Si è verificato un errore durante l'aggiornamento delle FAQ, riprova",
+        "APPROVE_SUCCESS_MESSAGE": "La FAQ è stata contrassegnata come approvata"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approva",
+        "EDIT_RESPONSE": "Modifica",
+        "DELETE_RESPONSE": "Elimina"
       },
       "EMPTY_STATE": {
-        "TITLE": "No FAQs Found",
-        "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "TITLE": "Nessuna FAQ Trovata",
+        "NO_PENDING_TITLE": "Non ci sono più FAQ in attesa da rivedere",
+        "SUBTITLE": "Le FAQ aiutano il tuo assistente a fornire risposte rapide e accurate alle domande dei tuoi clienti. Possono essere generate automaticamente dai tuoi contenuti o possono essere aggiunte manualmente.",
+        "CLEAR_SEARCH": "Rimuovi filtri attivi",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
-          "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
+          "NOTE": "Captain FAQ rileva le domande più frequenti dei clienti, anche se mancano dalla tua knowledge base, e suggerisce delle FAQ per migliorare il supporto. È possibile rivedere ogni suggerimento e decidere se approvarlo o rifiutarlo."
         }
       }
     },
     "INBOXES": {
-      "HEADER": "Connected Inboxes",
-      "ADD_NEW": "Connect a new inbox",
+      "HEADER": "Inbox Connesse",
+      "ADD_NEW": "Collega una nuova inbox",
       "OPTIONS": {
         "DISCONNECT": "Disconnetti"
       },
       "DELETE": {
-        "TITLE": "Are you sure to disconnect the inbox?",
+        "TITLE": "Sei sicuro di voler disconnettere la inbox?",
         "DESCRIPTION": "",
-        "CONFIRM": "Yes, delete",
-        "SUCCESS_MESSAGE": "The inbox was successfully disconnected.",
-        "ERROR_MESSAGE": "There was an error disconnecting the inbox, please try again."
+        "CONFIRM": "Sì, elimina",
+        "SUCCESS_MESSAGE": "Inbox disconnessa con successo.",
+        "ERROR_MESSAGE": "Si è verificato un errore durante la disconnessione della inbox, riprova."
       },
-      "FORM_DESCRIPTION": "Choose an inbox to connect with the assistant.",
+      "FORM_DESCRIPTION": "Scegli una inbox da connettere all'assistente.",
       "CREATE": {
-        "TITLE": "Connect an Inbox",
-        "SUCCESS_MESSAGE": "The inbox was successfully connected.",
-        "ERROR_MESSAGE": "An error occurred while connecting the inbox. Please try again."
+        "TITLE": "Connetti una Inbox",
+        "SUCCESS_MESSAGE": "Inbox connessa con successo.",
+        "ERROR_MESSAGE": "Si è verificato un errore durante la connessione della inbox. Riprova."
       },
       "FORM": {
         "INBOX": {
-          "LABEL": "Casella",
-          "PLACEHOLDER": "Choose the inbox to deploy the assistant.",
-          "ERROR": "An inbox selection is required."
+          "LABEL": "Inbox",
+          "PLACEHOLDER": "Scegli la inbox in cui deployare l'assistente.",
+          "ERROR": "È richiesta una inbox."
         }
       },
       "EMPTY_STATE": {
-        "TITLE": "No Connected Inboxes",
-        "SUBTITLE": "Connecting an inbox allows the assistant to handle initial questions from your customers before transferring them to you."
+        "TITLE": "Nessuna Inbox Connessa",
+        "SUBTITLE": "Connettendo una inbox, l'assistente potrà gestire le richieste iniziali dei clienti, ed eventualmente trasferirle a voi."
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
index 2d6470d21..985b86f83 100644
--- a/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
@@ -3,8 +3,8 @@
     "HEADER": "Etichette",
     "HEADER_BTN_TXT": "Aggiungi etichetta",
     "LOADING": "Recupero etichette",
-    "DESCRIPTION": "Labels help you categorize and prioritize conversations and leads. You can assign a label to a conversation or contact using the side panel.",
-    "LEARN_MORE": "Learn more about labels",
+    "DESCRIPTION": "Le etichette aiutano a categorizzare e dare priorità alle conversazioni e ai lead. È possibile assegnare un'etichetta a una conversazione o a un contatto utilizzando il pannello laterale.",
+    "LEARN_MORE": "Maggiori informazioni sulle etichette",
     "SEARCH_404": "Non ci sono elementi che corrispondono a questa richiesta",
     "LIST": {
       "404": "Non ci sono etichette disponibili in questo account.",
@@ -18,15 +18,15 @@
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Nome etichetta",
+        "LABEL": "Nome Etichetta",
         "PLACEHOLDER": "Nome etichetta",
         "REQUIRED_ERROR": "Nome etichetta obbligatorio",
         "MINIMUM_LENGTH_ERROR": "È richiesta una lunghezza minima di 2",
-        "VALID_ERROR": "Sono ammessi solo lettere, numeri, trattino e sottolineatura"
+        "VALID_ERROR": "Sono ammessi solo lettere, numeri, trattino e underscore"
       },
       "DESCRIPTION": {
         "LABEL": "Descrizione",
-        "PLACEHOLDER": "Descrizione etichetta"
+        "PLACEHOLDER": "Descrizione Etichetta"
       },
       "COLOR": {
         "LABEL": "Colore"
@@ -41,17 +41,17 @@
     },
     "SUGGESTIONS": {
       "TOOLTIP": {
-        "SINGLE_SUGGESTION": "Add label to conversation",
-        "MULTIPLE_SUGGESTION": "Select this label",
-        "DESELECT": "Deselect label",
-        "DISMISS": "Dismiss suggestion"
+        "SINGLE_SUGGESTION": "Aggiungi etichetta alla conversazione",
+        "MULTIPLE_SUGGESTION": "Seleziona questa etichetta",
+        "DESELECT": "Deseleziona etichetta",
+        "DISMISS": "Ignora suggerimento"
       },
       "POWERED_BY": "Chatwoot AI",
-      "DISMISS": "Dismiss",
-      "ADD_SELECTED_LABELS": "Add selected labels",
-      "ADD_SELECTED_LABEL": "Add selected label",
-      "ADD_ALL_LABELS": "Add all labels",
-      "SUGGESTED_LABELS": "Suggested labels"
+      "DISMISS": "Ignora",
+      "ADD_SELECTED_LABELS": "Aggiungi etichette selezionate",
+      "ADD_SELECTED_LABEL": "Aggiungi etichetta selezionata",
+      "ADD_ALL_LABELS": "Aggiungi tutte le etichette",
+      "SUGGESTED_LABELS": "Etichette suggerite"
     },
     "ADD": {
       "TITLE": "Aggiungi etichetta",
@@ -64,7 +64,7 @@
     "EDIT": {
       "TITLE": "Modifica etichetta",
       "API": {
-        "SUCCESS_MESSAGE": "Campagna aggiornata con successo",
+        "SUCCESS_MESSAGE": "Etichetta aggiornata con successo",
         "ERROR_MESSAGE": "Si è verificato un errore, riprova"
       }
     },
@@ -75,10 +75,10 @@
         "ERROR_MESSAGE": "Si è verificato un errore, riprova"
       },
       "CONFIRM": {
-        "TITLE": "Conferma eliminazione",
+        "TITLE": "Conferma Eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare ",
-        "YES": "Sì, elimina ",
-        "NO": "No, conserva "
+        "YES": "Sì, Elimina ",
+        "NO": "No, Mantieni "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/login.json b/app/javascript/dashboard/i18n/locale/it/login.json
index 694245a88..75c9d1f35 100644
--- a/app/javascript/dashboard/i18n/locale/it/login.json
+++ b/app/javascript/dashboard/i18n/locale/it/login.json
@@ -3,7 +3,7 @@
     "TITLE": "Accedi a Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "example{'@'}companyname.com",
+      "PLACEHOLDER": "esempio{'@'}nomeazienda.com",
       "ERROR": "Inserisci un indirizzo email valido"
     },
     "PASSWORD": {
@@ -12,13 +12,13 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Accesso riuscito",
-      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi",
-      "UNAUTH": "Nome utente / Password errati. Riprova"
+      "ERROR_MESSAGE": "Impossibile connettersi al server Woot. Riprova.",
+      "UNAUTH": "Nome utente o password errati. Riprova."
     },
     "OAUTH": {
-      "GOOGLE_LOGIN": "Login with Google",
-      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
-      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+      "GOOGLE_LOGIN": "Accedi tramite Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Utilizza il tuo indirizzo email aziendale per effettuare il login",
+      "NO_ACCOUNT_FOUND": "Non siamo riusciti a trovare un account per il tuo indirizzo email."
     },
     "FORGOT_PASSWORD": "Password dimenticata?",
     "CREATE_NEW_ACCOUNT": "Crea un nuovo account",
diff --git a/app/javascript/dashboard/i18n/locale/it/macros.json b/app/javascript/dashboard/i18n/locale/it/macros.json
index d76d1f3f4..263042a2f 100644
--- a/app/javascript/dashboard/i18n/locale/it/macros.json
+++ b/app/javascript/dashboard/i18n/locale/it/macros.json
@@ -1,107 +1,107 @@
 {
   "MACROS": {
-    "HEADER": "Macros",
-    "DESCRIPTION": "A macro is a set of saved actions that help customer service agents easily complete tasks. The agents can define a set of actions like tagging a conversation with a label, sending an email transcript, updating a custom attribute, etc., and they can run these actions in a single click.",
-    "LEARN_MORE": "Learn more about macros",
-    "HEADER_BTN_TXT": "Add a new macro",
-    "HEADER_BTN_TXT_SAVE": "Save macro",
-    "LOADING": "Fetching macros",
-    "ERROR": "Something went wrong. Please try again",
-    "ORDER_INFO": "Macros will run in the order you add your actions. You can rearrange them by dragging them by the handle beside each node.",
+    "HEADER": "Macro",
+    "DESCRIPTION": "Una macro è un insieme di azioni salvate che aiutano gli operatori del servizio clienti a completare facilmente le attività. Gli operatori possono definire un insieme di azioni, come l'aggiunta di un'etichetta a una converazione, l'invio di una trascrizione e-mail, l'aggiornamento di un attributo personalizzato, ecc. e possono eseguire queste azioni in un solo clic.",
+    "LEARN_MORE": "Scopri di più sulle macro",
+    "HEADER_BTN_TXT": "Aggiungi una nuova macro",
+    "HEADER_BTN_TXT_SAVE": "Salva macro",
+    "LOADING": "Caricamento macro",
+    "ERROR": "Qualcosa è andato storto. Riprova",
+    "ORDER_INFO": "Le macro verranno eseguite nell'ordine in cui aggiungi le azioni. Puoi riordinarle trascinandole con la maniglia accanto ad ogni nodo.",
     "ADD": {
       "FORM": {
         "NAME": {
-          "LABEL": "Macro name",
-          "PLACEHOLDER": "Enter a name for your macro",
-          "ERROR": "Name is required for creating a macro"
+          "LABEL": "Nome macro",
+          "PLACEHOLDER": "Inserisci un nome per la tua macro",
+          "ERROR": "Il nome è richiesto per creare una macro"
         },
         "ACTIONS": {
           "LABEL": "Azioni"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Macro added successfully",
-        "ERROR_MESSAGE": "Unable to create macro, Please try again later"
+        "SUCCESS_MESSAGE": "Macro aggiunta correttamente",
+        "ERROR_MESSAGE": "Impossibile creare macro, riprova più tardi"
       }
     },
     "LIST": {
       "TABLE_HEADER": {
         "NAME": "Nome",
-        "CREATED BY": "Created by",
-        "LAST_UPDATED_BY": "Last updated by",
-        "VISIBILITY": "Visibility"
+        "CREATED BY": "Creata da",
+        "LAST_UPDATED_BY": "Ultimo aggiornamento di",
+        "VISIBILITY": "Visibilità"
       },
-      "404": "No macros found"
+      "404": "Nessuna macro trovata"
     },
     "DELETE": {
-      "TOOLTIP": "Delete macro",
+      "TOOLTIP": "Elimina macro",
       "CONFIRM": {
         "MESSAGE": "Sei sicuro di voler eliminare ",
         "YES": "Sì, elimina",
         "NO": "No"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Macro deleted successfully",
-        "ERROR_MESSAGE": "There was an error deleting the macro. Please try again later"
+        "SUCCESS_MESSAGE": "Macro eliminata con successo",
+        "ERROR_MESSAGE": "Si è verificato un errore durante l'eliminazione della macro. Riprova più tardi"
       }
     },
     "EDIT": {
-      "TOOLTIP": "Edit macro",
+      "TOOLTIP": "Modifica macro",
       "API": {
-        "SUCCESS_MESSAGE": "Macro updated successfully",
-        "ERROR_MESSAGE": "Could not update Macro, Please try again later"
+        "SUCCESS_MESSAGE": "Macro aggiornato con successo",
+        "ERROR_MESSAGE": "Impossibile aggiornare la macro, riprova più tardi"
       }
     },
     "EDITOR": {
-      "START_FLOW": "Start Flow",
+      "START_FLOW": "Inizia Flow",
       "END_FLOW": "End Flow",
-      "LOADING": "Fetching macro",
-      "ADD_BTN_TOOLTIP": "Add new action",
-      "DELETE_BTN_TOOLTIP": "Delete Action",
+      "LOADING": "Recupero macro",
+      "ADD_BTN_TOOLTIP": "Aggiungi nuova azione",
+      "DELETE_BTN_TOOLTIP": "Rimuovi Azione",
       "VISIBILITY": {
-        "LABEL": "Macro Visibility",
+        "LABEL": "Visibilità Macro",
         "GLOBAL": {
-          "LABEL": "Public",
-          "DESCRIPTION": "This macro is available publicly for all agents in this account."
+          "LABEL": "Pubblica",
+          "DESCRIPTION": "Questa macro è disponibile pubblicamente per tutti gli operatori di questo account."
         },
         "PERSONAL": {
-          "LABEL": "Private",
-          "DESCRIPTION": "This macro will be private to you and not be available to others."
+          "LABEL": "Privata",
+          "DESCRIPTION": "Questa macro sarà privata per te e non sarà disponibile ad altri."
         }
       }
     },
     "EXECUTE": {
-      "BUTTON_TOOLTIP": "Execute",
-      "PREVIEW": "Preview Macro",
-      "EXECUTED_SUCCESSFULLY": "Macro executed successfully"
+      "BUTTON_TOOLTIP": "Esegui",
+      "PREVIEW": "Anteprima Macro",
+      "EXECUTED_SUCCESSFULLY": "Macro eseguita correttamente"
     },
     "ERRORS": {
-      "ATTRIBUTE_KEY_REQUIRED": "Attribute key is required",
-      "FILTER_OPERATOR_REQUIRED": "Filter operator is required",
-      "VALUE_REQUIRED": "Il valore è obbligatorio",
-      "VALUE_MUST_BE_BETWEEN_1_AND_998": "Value must be between 1 and 998",
-      "ACTION_PARAMETERS_REQUIRED": "Action parameters are required",
-      "ATLEAST_ONE_CONDITION_REQUIRED": "At least one condition is required",
-      "ATLEAST_ONE_ACTION_REQUIRED": "At least one action is required"
+      "ATTRIBUTE_KEY_REQUIRED": "Chiave dell'attributo richiesta",
+      "FILTER_OPERATOR_REQUIRED": "Operatore di filtro richiesto",
+      "VALUE_REQUIRED": "Il valore è richiesto",
+      "VALUE_MUST_BE_BETWEEN_1_AND_998": "Il valore deve essere compreso tra 1 e 998",
+      "ACTION_PARAMETERS_REQUIRED": "Parametri di azione richiesti",
+      "ATLEAST_ONE_CONDITION_REQUIRED": "È richiesta almeno una condizione",
+      "ATLEAST_ONE_ACTION_REQUIRED": "È richiesta almeno un'azione"
     },
     "ACTIONS": {
-      "ASSIGN_TEAM": "Assegna Team",
+      "ASSIGN_TEAM": "Assegna a un Team",
       "ASSIGN_AGENT": "Assegna un Operatore",
       "ADD_LABEL": "Aggiungi Etichetta",
       "REMOVE_LABEL": "Rimuovi Etichetta",
       "REMOVE_ASSIGNED_TEAM": "Rimuovi Team Assegnato",
-      "SEND_EMAIL_TRANSCRIPT": "Invia trascrizione per email",
+      "SEND_EMAIL_TRANSCRIPT": "Invia una Trascrizione Email",
       "MUTE_CONVERSATION": "Silenzia Conversazione",
       "SNOOZE_CONVERSATION": "Posticipa Conversazione",
-      "RESOLVE_CONVERSATION": "Risolvi la conversazione",
+      "RESOLVE_CONVERSATION": "Risolvi Conversazione",
       "SEND_ATTACHMENT": "Invia Allegato",
       "SEND_MESSAGE": "Invia un Messaggio",
-      "CHANGE_PRIORITY": "Modifica Priorità",
+      "CHANGE_PRIORITY": "Cambia Priorità",
       "ADD_PRIVATE_NOTE": "Aggiungi una Nota Privata",
       "SEND_WEBHOOK_EVENT": "Invia Evento Webhook"
     },
     "PRIORITY_TYPES": {
-      "NONE": "Nessuno",
+      "NONE": "Nessuna",
       "LOW": "Bassa",
       "MEDIUM": "Media",
       "HIGH": "Alta",
diff --git a/app/javascript/dashboard/i18n/locale/it/mfa.json b/app/javascript/dashboard/i18n/locale/it/mfa.json
index cd344957d..23d6846f7 100644
--- a/app/javascript/dashboard/i18n/locale/it/mfa.json
+++ b/app/javascript/dashboard/i18n/locale/it/mfa.json
@@ -1,6 +1,6 @@
 {
   "MFA_SETTINGS": {
-    "TITLE": "Autenticazione A Due Fattori",
+    "TITLE": "Autenticazione a Due Fattori",
     "SUBTITLE": "Proteggi il tuo account con autenticazione basata su TOTP",
     "DESCRIPTION": "Aggiungi un ulteriore livello di sicurezza al tuo account utilizzando una password monouso a tempo (TOTP)",
     "STATUS_TITLE": "Stato dell'Autenticazione",
@@ -79,7 +79,7 @@
     }
   },
   "MFA_VERIFICATION": {
-    "TITLE": "Autenticazione A Due Fattori",
+    "TITLE": "Autenticazione a Due Fattori",
     "DESCRIPTION": "Inserisci il tuo codice di verifica per continuare",
     "AUTHENTICATOR_APP": "App di Autenticazione",
     "BACKUP_CODE": "Codice di Backup",
diff --git a/app/javascript/dashboard/i18n/locale/it/report.json b/app/javascript/dashboard/i18n/locale/it/report.json
index 3cda0ad4b..13694e2af 100644
--- a/app/javascript/dashboard/i18n/locale/it/report.json
+++ b/app/javascript/dashboard/i18n/locale/it/report.json
@@ -1,11 +1,11 @@
 {
   "REPORT": {
     "HEADER": "Conversazioni",
-    "LOADING_CHART": "Caricamento dati del grafico...",
-    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza punti dati per generare il rapporto, riprova più tardi.",
-    "DOWNLOAD_AGENT_REPORTS": "Scarica rapporti agente",
-    "DATA_FETCHING_FAILED": "Failed to fetch data, please try again later.",
-    "SUMMARY_FETCHING_FAILED": "Failed to fetch summary, please try again later.",
+    "LOADING_CHART": "Caricamento dati grafici...",
+    "NO_ENOUGH_DATA": "Non ci sono abbastanza dati per generare il report, riprova più tardi.",
+    "DOWNLOAD_AGENT_REPORTS": "Scarica report operatori",
+    "DATA_FETCHING_FAILED": "Impossibile recuperare i dati, riprova più tardi.",
+    "SUMMARY_FETCHING_FAILED": "Impossibile recuperare il riepilogo, riprova più tardi.",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversazioni",
@@ -26,7 +26,7 @@
         "TOOLTIP_TEXT": "Il tempo di prima risposta è {metricValue} (basato su {conversationCount} conversazioni)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Tempo di risoluzione",
+        "NAME": "Tempo di Risoluzione",
         "DESC": "( Media )",
         "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
         "TOOLTIP_TEXT": "Il tempo di risoluzione è {metricValue} (basato su {conversationCount} conversazioni)"
@@ -40,12 +40,12 @@
         "DESC": "( Totale )"
       },
       "BOT_HANDOFF_COUNT": {
-        "NAME": "Handoff Count",
+        "NAME": "Conteggio Handoff",
         "DESC": "( Totale )"
       },
       "REPLY_TIME": {
-        "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is {metricValue} (based on {conversationCount} replies)",
+        "NAME": "Tempo di attesa del cliente",
+        "TOOLTIP_TEXT": "Il tempo di attesa è {metricValue} (basato su {conversationCount} risposte)",
         "DESC": ""
       }
     },
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Ultimi 7 giorni",
       "LAST_14_DAYS": "Ultimi 14 giorni",
       "LAST_30_DAYS": "Ultimi 30 giorni",
+      "THIS_MONTH": "Questo mese",
+      "LAST_MONTH": "Il mese scorso",
       "LAST_3_MONTHS": "Ultimi 3 mesi",
       "LAST_6_MONTHS": "Ultimi 6 mesi",
       "LAST_YEAR": "Ultimo anno",
@@ -68,7 +70,7 @@
       "DAY": "Giorno",
       "WEEK": "Settimana",
       "MONTH": "Mese",
-      "YEAR": "Anno"
+      "YEAR": "Mese"
     },
     "GROUP_BY_DAY_OPTIONS": [
       {
@@ -101,10 +103,6 @@
       }
     ],
     "GROUP_BY_YEAR_OPTIONS": [
-      {
-        "id": 1,
-        "groupBy": "Giorno"
-      },
       {
         "id": 2,
         "groupBy": "Settimana"
@@ -112,25 +110,29 @@
       {
         "id": 3,
         "groupBy": "Mese"
+      },
+      {
+        "id": 4,
+        "groupBy": "Mese"
       }
     ],
-    "BUSINESS_HOURS": "Ore di lavoro",
+    "BUSINESS_HOURS": "Orario Di Lavoro",
     "FILTER_ACTIONS": {
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_FILTER": "Rimuovi filtro",
       "EMPTY_LIST": "Nessun risultato trovato"
     },
     "PAGINATION": {
-      "RESULTS": "Showing {start} to {end} of {total} results",
-      "PER_PAGE_TEMPLATE": "{size} / page"
+      "RESULTS": "Mostrando da {start} a {end} di {total} risultati",
+      "PER_PAGE_TEMPLATE": "{size} / pagina"
     }
   },
   "AGENT_REPORTS": {
-    "HEADER": "Panoramica degli agenti",
-    "DESCRIPTION": "Easily track agent performance with key metrics such as conversations, response times, resolution times, and resolved cases. Click an agent’s name to learn more.",
-    "LOADING_CHART": "Caricamento dati del grafico...",
-    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza punti dati per generare il rapporto, riprova più tardi.",
-    "DOWNLOAD_AGENT_REPORTS": "Scarica rapporti agente",
-    "FILTER_DROPDOWN_LABEL": "Seleziona agente",
+    "HEADER": "Panoramica degli Operatori",
+    "DESCRIPTION": "Monitora la performance degli operatori con metriche chiave, tra cui conversazioni, tempi di risposta, tempi di risoluzione e casi risolti. Fai clic sul nome di un operatore per saperne di più.",
+    "LOADING_CHART": "Caricamento dati grafici...",
+    "NO_ENOUGH_DATA": "Non ci sono abbastanza dati per generare il report, riprova più tardi.",
+    "DOWNLOAD_AGENT_REPORTS": "Scarica report operatori",
+    "FILTER_DROPDOWN_LABEL": "Seleziona Operatore",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversazioni",
@@ -193,10 +195,10 @@
     }
   },
   "LABEL_REPORTS": {
-    "HEADER": "Panoramica etichette",
+    "HEADER": "Panoramica Etichette",
     "DESCRIPTION": "Monitora la performance delle etichette con metriche chiave, tra cui conversazioni, tempi di risposta, tempi di risoluzione e casi risolti. Fai clic sul nome di un'etichetta per approfondimenti dettagliati.",
-    "LOADING_CHART": "Caricamento dati del grafico...",
-    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza punti dati per generare il rapporto, riprova più tardi.",
+    "LOADING_CHART": "Caricamento dati grafici...",
+    "NO_ENOUGH_DATA": "Non ci sono abbastanza dati per generare il report, riprova più tardi.",
     "DOWNLOAD_LABEL_REPORTS": "Scarica report etichette",
     "FILTER_DROPDOWN_LABEL": "Seleziona etichetta",
     "METRICS": {
@@ -219,7 +221,7 @@
         "TOOLTIP_TEXT": "Il tempo di prima risposta è {metricValue} (basato su {conversationCount} conversazioni)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Tempo di risoluzione",
+        "NAME": "Tempo di Risoluzione",
         "DESC": "( Media )",
         "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
         "TOOLTIP_TEXT": "Il tempo di risoluzione è {metricValue} (basato su {conversationCount} conversazioni)"
@@ -261,14 +263,14 @@
     }
   },
   "INBOX_REPORTS": {
-    "HEADER": "Panoramica casella",
-    "DESCRIPTION": "Quickly view your inbox performance with key metrics like conversations, response times, resolution times, and resolved cases—all in one place. Click an inbox name for more details.",
-    "LOADING_CHART": "Caricamento dati del grafico...",
-    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza punti dati per generare il rapporto, riprova più tardi.",
-    "DOWNLOAD_INBOX_REPORTS": "Scarica report casella",
-    "FILTER_DROPDOWN_LABEL": "Seleziona Casella",
-    "ALL_INBOXES": "Tutte le caselle",
-    "SEARCH_INBOX": "Ricerca nella Inbox",
+    "HEADER": "Panoramica Inbox",
+    "DESCRIPTION": "Visualizza rapidamente le performance della tua inbox con metriche chiave come conversazioni, tempi di risposta, tempi di risoluzione e casi risolti — tutto in un unico posto. Fai clic su una inbox per maggiori dettagli.",
+    "LOADING_CHART": "Caricamento dati grafici...",
+    "NO_ENOUGH_DATA": "Non ci sono abbastanza dati per generare il report, riprova più tardi.",
+    "DOWNLOAD_INBOX_REPORTS": "Scarica report Inbox",
+    "FILTER_DROPDOWN_LABEL": "Seleziona Inbox",
+    "ALL_INBOXES": "Tutte le Inbox",
+    "SEARCH_INBOX": "Ricerca Inbox",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversazioni",
@@ -331,12 +333,12 @@
     }
   },
   "TEAM_REPORTS": {
-    "HEADER": "Panoramica team",
-    "DESCRIPTION": "Get a snapshot of your team’s performance with essential metrics, including conversations, response times, resolution times, and resolved cases. Click a team name for more details.",
-    "LOADING_CHART": "Caricamento dati del grafico...",
-    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza punti dati per generare il rapporto, riprova più tardi.",
+    "HEADER": "Panoramica Team",
+    "DESCRIPTION": "Ottieni un'istantanea delle prestazioni del tuo team con metriche essenziali, tra cui conversazioni, tempi di risposta, tempi di risoluzione e casi risolti. Fare clic su un nome del team per maggiori dettagli.",
+    "LOADING_CHART": "Caricamento dati grafici...",
+    "NO_ENOUGH_DATA": "Non ci sono abbastanza dati per generare il report, riprova più tardi.",
     "DOWNLOAD_TEAM_REPORTS": "Scarica report del team",
-    "FILTER_DROPDOWN_LABEL": "Seleziona team",
+    "FILTER_DROPDOWN_LABEL": "Seleziona Team",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversazioni",
@@ -399,19 +401,19 @@
     }
   },
   "CSAT_REPORTS": {
-    "HEADER": "Rapporti CSAT",
-    "NO_RECORDS": "Non ci sono risposte al sondaggio CSAT disponibili.",
+    "HEADER": "Report CSAT",
+    "NO_RECORDS": "Non ci sono risposte ai sondaggi CSAT disponibili.",
     "DOWNLOAD": "Scarica report CSAT",
-    "DOWNLOAD_FAILED": "Failed to download CSAT Reports",
+    "DOWNLOAD_FAILED": "Download dei report CSAT non riuscito",
     "FILTERS": {
       "AGENTS": {
-        "PLACEHOLDER": "Scegli agenti"
+        "PLACEHOLDER": "Scegli Operatori"
       }
     },
     "TABLE": {
       "HEADER": {
         "CONTACT_NAME": "Contatto",
-        "AGENT_NAME": "Agente assegnato",
+        "AGENT_NAME": "Operatore assegnato",
         "RATING": "Valutazione",
         "FEEDBACK_TEXT": "Commento del feedback"
       }
@@ -432,23 +434,23 @@
     }
   },
   "BOT_REPORTS": {
-    "HEADER": "Bot Reports",
+    "HEADER": "Report Bot",
     "METRIC": {
       "TOTAL_CONVERSATIONS": {
-        "LABEL": "No. of Conversations",
-        "TOOLTIP": "Total number of conversations handled by the bot"
+        "LABEL": "Numero di Conversazioni",
+        "TOOLTIP": "Numero totale di conversazioni gestite dal bot"
       },
       "TOTAL_RESPONSES": {
-        "LABEL": "Total Responses",
-        "TOOLTIP": "Total number of responses sent by the bot"
+        "LABEL": "Risposte totali",
+        "TOOLTIP": "Numero totale di risposte inviate dal bot"
       },
       "RESOLUTION_RATE": {
-        "LABEL": "Resolution Rate",
-        "TOOLTIP": "Total number of conversations resolved by the bot / Total number of conversations handled by the bot * 100"
+        "LABEL": "Tasso Di Risoluzione",
+        "TOOLTIP": "Numero totale di conversazioni risolte dal bot / Numero totale di conversazioni gestite dal bot * 100"
       },
       "HANDOFF_RATE": {
-        "LABEL": "Handoff Rate",
-        "TOOLTIP": "Total number of conversations handed off to agents / Total number of conversations handled by the bot * 100"
+        "LABEL": "Tasso di Handoff",
+        "TOOLTIP": "Numero totale di conversazioni passate agli agenti / Numero totale di conversazioni gestite dal bot * 100"
       }
     }
   },
@@ -458,17 +460,17 @@
     "ACCOUNT_CONVERSATIONS": {
       "HEADER": "Conversazioni aperte",
       "LOADING_MESSAGE": "Caricamento metriche conversazioni...",
-      "OPEN": "Apri",
+      "OPEN": "Aperte",
       "UNATTENDED": "Non partecipate",
-      "UNASSIGNED": "Non assegnato",
-      "PENDING": "In sospeso"
+      "UNASSIGNED": "Non assegnate",
+      "PENDING": "In Sospeso"
     },
     "CONVERSATION_HEATMAP": {
-      "HEADER": "Conversation Traffic",
-      "NO_CONVERSATIONS": "No conversations",
-      "CONVERSATION": "{count} conversation",
-      "CONVERSATIONS": "{count} conversations",
-      "DOWNLOAD_REPORT": "Download report"
+      "HEADER": "Traffico delle Conversazioni",
+      "NO_CONVERSATIONS": "Nessuna conversazione",
+      "CONVERSATION": "{count} conversazione",
+      "CONVERSATIONS": "{count} conversazioni",
+      "DOWNLOAD_REPORT": "Scarica report"
     },
     "RESOLUTION_HEATMAP": {
       "HEADER": "Risoluzioni",
@@ -478,102 +480,102 @@
       "DOWNLOAD_REPORT": "Scarica report"
     },
     "AGENT_CONVERSATIONS": {
-      "HEADER": "Conversazioni degli agenti",
-      "LOADING_MESSAGE": "Caricamento metriche agenti...",
-      "NO_AGENTS": "Non ci sono conversazioni da parte degli agenti",
+      "HEADER": "Conversazioni per operatore",
+      "LOADING_MESSAGE": "Caricamento metriche operatori...",
+      "NO_AGENTS": "Non ci sono conversazioni per operatore",
       "TABLE_HEADER": {
-        "AGENT": "Agente",
-        "OPEN": "Apri",
+        "AGENT": "Operatore",
+        "OPEN": "Aperte",
         "UNATTENDED": "Non partecipate",
         "STATUS": "Stato"
       }
     },
     "TEAM_CONVERSATIONS": {
-      "ALL_TEAMS": "All Teams",
-      "HEADER": "Conversations by teams",
-      "LOADING_MESSAGE": "Loading team metrics...",
-      "NO_TEAMS": "There is no data available",
+      "ALL_TEAMS": "Tutti i Team",
+      "HEADER": "Conversazioni per team",
+      "LOADING_MESSAGE": "Caricamento metriche team...",
+      "NO_TEAMS": "Nessun dato disponibile",
       "TABLE_HEADER": {
         "TEAM": "Team",
-        "OPEN": "Apri",
+        "OPEN": "Aperte",
         "UNATTENDED": "Non partecipate",
         "STATUS": "Stato"
       }
     },
     "AGENT_STATUS": {
-      "HEADER": "Stato agente",
+      "HEADER": "Stato operatore",
       "ONLINE": "Online",
       "BUSY": "Occupato",
       "OFFLINE": "Offline"
     }
   },
   "DAYS_OF_WEEK": {
-    "SUNDAY": "Sunday",
-    "MONDAY": "Monday",
-    "TUESDAY": "Tuesday",
-    "WEDNESDAY": "Wednesday",
-    "THURSDAY": "Thursday",
-    "FRIDAY": "Friday",
-    "SATURDAY": "Saturday"
+    "SUNDAY": "Domenica",
+    "MONDAY": "Lunedì",
+    "TUESDAY": "Martedì",
+    "WEDNESDAY": "Mercoledì",
+    "THURSDAY": "Giovedì",
+    "FRIDAY": "Venerdì",
+    "SATURDAY": "Sabato"
   },
   "SLA_REPORTS": {
-    "HEADER": "SLA Reports",
-    "NO_RECORDS": "SLA applied conversations are not available.",
-    "LOADING": "Loading SLA data...",
-    "DOWNLOAD_SLA_REPORTS": "Download SLA reports",
-    "DOWNLOAD_FAILED": "Failed to download SLA Reports",
+    "HEADER": "Report SLA",
+    "NO_RECORDS": "Conversazioni SLA non disponibili.",
+    "LOADING": "Caricamento dati SLA...",
+    "DOWNLOAD_SLA_REPORTS": "Scarica report SLA",
+    "DOWNLOAD_FAILED": "Impossibile scaricare i report SLA",
     "DROPDOWN": {
-      "ADD_FIlTER": "Add filter",
-      "CLEAR_ALL": "Clear all",
-      "CLEAR_FILTER": "Clear filter",
+      "ADD_FIlTER": "Aggiungi filtro",
+      "CLEAR_ALL": "Rimuovi tutto",
+      "CLEAR_FILTER": "Rimuovi filtro",
       "EMPTY_LIST": "Nessun risultato trovato",
-      "NO_FILTER": "No filters available",
-      "SEARCH": "Search filter",
+      "NO_FILTER": "Nessun filtro disponibile",
+      "SEARCH": "Filtro ricerca",
       "INPUT_PLACEHOLDER": {
-        "SLA": "SLA name",
-        "AGENTS": "Nome agente",
-        "INBOXES": "Nome casella",
+        "SLA": "Nome SLA",
+        "AGENTS": "Nome operatore",
+        "INBOXES": "Nome inbox",
         "LABELS": "Nome etichetta",
         "TEAMS": "Nome del team"
       },
-      "SLA": "SLA Policy",
-      "INBOXES": "Casella",
-      "AGENTS": "Agente",
+      "SLA": "Policy SLA",
+      "INBOXES": "Inbox",
+      "AGENTS": "Operatore",
       "LABELS": "Etichetta",
       "TEAMS": "Team"
     },
-    "WITH": "with",
+    "WITH": "con",
     "METRICS": {
       "HIT_RATE": {
         "LABEL": "Hit Rate",
-        "TOOLTIP": "Percentage of SLAs created were completed successfully"
+        "TOOLTIP": "Percentuale di SLA creati completata con successo"
       },
       "NO_OF_MISSES": {
-        "LABEL": "Number of Misses",
-        "TOOLTIP": "Total SLA misses in a certain period"
+        "LABEL": "Numero di Mancate",
+        "TOOLTIP": "Totale SLA mancate in un determinato periodo"
       },
       "NO_OF_CONVERSATIONS": {
-        "LABEL": "Number of Conversations",
-        "TOOLTIP": "Total number of conversations with SLA"
+        "LABEL": "Numero di Conversazioni",
+        "TOOLTIP": "Numero totale di conversazioni con SLA"
       }
     },
     "TABLE": {
       "HEADER": {
         "POLICY": "Policy",
-        "CONVERSATION": "Conversazioni",
-        "AGENT": "Agente"
+        "CONVERSATION": "Conversazione",
+        "AGENT": "Operatore"
       },
-      "VIEW_DETAILS": "View Details"
+      "VIEW_DETAILS": "Visualizza Dettagli"
     }
   },
   "SUMMARY_REPORTS": {
-    "INBOX": "Casella",
-    "AGENT": "Agente",
+    "INBOX": "Inbox",
+    "AGENT": "Operatore",
     "TEAM": "Team",
     "LABEL": "Etichetta",
-    "AVG_RESOLUTION_TIME": "Avg. Resolution Time",
-    "AVG_FIRST_RESPONSE_TIME": "Avg. First Response Time",
-    "AVG_REPLY_TIME": "Avg. Customer Waiting Time",
+    "AVG_RESOLUTION_TIME": "Tempo Medio Di Risoluzione",
+    "AVG_FIRST_RESPONSE_TIME": "Tempo Medio Di Prima Risposta",
+    "AVG_REPLY_TIME": "Tempo Medio Di Attesa Del Cliente",
     "RESOLUTION_COUNT": "Conteggio risoluzioni",
     "CONVERSATIONS": "Numero di conversazioni"
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/resetPassword.json b/app/javascript/dashboard/i18n/locale/it/resetPassword.json
index 8bf54bdaf..b2a4da74c 100644
--- a/app/javascript/dashboard/i18n/locale/it/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/it/resetPassword.json
@@ -1,8 +1,8 @@
 {
   "RESET_PASSWORD": {
     "TITLE": "Reimposta password",
-    "DESCRIPTION": "Enter the email address you use to log in to Chatwoot to get the password reset instructions.",
-    "GO_BACK_TO_LOGIN": "If you want to go back to the login page,",
+    "DESCRIPTION": "Inserisci l'indirizzo email che usi per accedere a Chatwoot per ottenere le istruzioni per reimpostare la password.",
+    "GO_BACK_TO_LOGIN": "Se vuoi tornare alla pagina di login,",
     "EMAIL": {
       "LABEL": "Email",
       "PLACEHOLDER": "Inserisci il tuo indirizzo email.",
@@ -10,7 +10,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Il link per reimpostare la password è stato inviato alla tua email.",
-      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+      "ERROR_MESSAGE": "Impossibile connettersi al server Woot. Riprova."
     },
     "SUBMIT": "Invia"
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/search.json b/app/javascript/dashboard/i18n/locale/it/search.json
index d2813ab21..13de2d956 100644
--- a/app/javascript/dashboard/i18n/locale/it/search.json
+++ b/app/javascript/dashboard/i18n/locale/it/search.json
@@ -5,26 +5,26 @@
       "CONTACTS": "Contatti",
       "CONVERSATIONS": "Conversazioni",
       "MESSAGES": "Messaggi",
-      "ARTICLES": "Articles"
+      "ARTICLES": "Articoli"
     },
     "SECTION": {
       "CONTACTS": "Contatti",
       "CONVERSATIONS": "Conversazioni",
       "MESSAGES": "Messaggi",
-      "ARTICLES": "Articles"
+      "ARTICLES": "Articoli"
     },
-    "VIEW_MORE": "View more",
-    "LOAD_MORE": "Load more",
-    "SEARCHING_DATA": "Searching",
-    "LOADING_DATA": "Loading",
-    "EMPTY_STATE": "No {item} found for query '{query}'",
-    "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "VIEW_MORE": "Mostra di più",
+    "LOAD_MORE": "Carica altro",
+    "SEARCHING_DATA": "Ricerca",
+    "LOADING_DATA": "Caricamento",
+    "EMPTY_STATE": "Nessun {item} trovato per la ricerca '{query}'",
+    "EMPTY_STATE_FULL": "Nessun risultato trovato per la ricerca '{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ per evidenziare",
+    "INPUT_PLACEHOLDER": "Digita 3 o più caratteri da cercare",
+    "EMPTY_STATE_DEFAULT": "Ricerca per id conversazione, email, numero di telefono, messaggi per risultati di ricerca migliori. ",
     "BOT_LABEL": "Bot",
-    "READ_MORE": "Read more",
-    "WROTE": "wrote:",
+    "READ_MORE": "Leggi di più",
+    "WROTE": "ha scritto:",
     "FROM": "da",
     "EMAIL": "email",
     "EMAIL_SUBJECT": "oggetto"
diff --git a/app/javascript/dashboard/i18n/locale/it/setNewPassword.json b/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
index 2d8765627..134356144 100644
--- a/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
@@ -7,13 +7,13 @@
       "ERROR": "Password troppo corta."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Conferma password",
+      "LABEL": "Conferma password",
+      "PLACEHOLDER": "Conferma Password",
       "ERROR": "Le password non corrispondono."
     },
     "API": {
       "SUCCESS_MESSAGE": "Password cambiata con successo.",
-      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+      "ERROR_MESSAGE": "Impossibile connettersi al server Woot. Riprova."
     },
     "CAPTCHA": {
       "ERROR": "Verifica scaduta. Si prega di risolvere nuovamente il captcha."
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 5731e91d4..de761061a 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -1,17 +1,17 @@
 {
   "PROFILE_SETTINGS": {
-    "LINK": "Impostazioni profilo",
-    "TITLE": "Impostazioni profilo",
-    "BTN_TEXT": "Aggiorna profilo",
-    "DELETE_AVATAR": "Elimina avatar",
+    "LINK": "Impostazioni Profilo",
+    "TITLE": "Impostazioni Profilo",
+    "BTN_TEXT": "Aggiorna Profilo",
+    "DELETE_AVATAR": "Elimina Avatar",
     "AVATAR_DELETE_SUCCESS": "L'avatar è stato eliminato con successo",
     "AVATAR_DELETE_FAILED": "C'è un errore durante l'eliminazione dell'avatar, si prega di riprovare",
     "UPDATE_SUCCESS": "Il tuo profilo è stato aggiornato con successo",
     "PASSWORD_UPDATE_SUCCESS": "La tua password è stata modificata con successo",
-    "AFTER_EMAIL_CHANGED": "Il tuo profilo è stato aggiornato correttamente, effettua nuovamente l'accesso, siccome le tue credenziali di accesso sono state modificate",
+    "AFTER_EMAIL_CHANGED": "Il tuo profilo è stato aggiornato correttamente, effettua nuovamente l'accesso visto che le credenziali di accesso sono state modificate",
     "FORM": {
-      "PICTURE": "Profile Picture",
-      "AVATAR": "Immagine del profilo",
+      "PICTURE": "Immagine del Profilo",
+      "AVATAR": "Immagine del Profilo",
       "ERROR": "Correggi gli errori del modulo",
       "REMOVE_IMAGE": "Rimuovi",
       "UPLOAD_IMAGE": "Carica immagine",
@@ -21,35 +21,35 @@
         "NOTE": "Il tuo indirizzo email è la tua identità e viene utilizzato per l'accesso."
       },
       "SEND_MESSAGE": {
-        "TITLE": "Hotkey to send messages",
-        "NOTE": "You can select a hotkey (either Enter or Cmd/Ctrl+Enter) based on your preference of writing.",
-        "UPDATE_SUCCESS": "Your settings have been updated successfully",
+        "TITLE": "Tasto per inviare messaggi",
+        "NOTE": "Puoi selezionare un tasto di scelta rapida (Invio o Cmd/Ctrl+Invio) in base alle tue preferenze di scrittura.",
+        "UPDATE_SUCCESS": "Impostazioni aggiornate con successo",
         "CARD": {
           "ENTER_KEY": {
-            "HEADING": "Enter (↵)",
-            "CONTENT": "Send messages by pressing Enter key instead of clicking the send button."
+            "HEADING": "Invio (↵)",
+            "CONTENT": "Invia messaggi premendo il tasto Invio invece di fare clic sul pulsante Invia."
           },
           "CMD_ENTER_KEY": {
-            "HEADING": "Cmd/Ctrl + Enter (⌘ + ↵)",
-            "CONTENT": "Send messages by pressing Cmd/Ctrl + enter key instead of clicking the send button."
+            "HEADING": "Cmd/Ctrl + Invio (⌘ + ↵)",
+            "CONTENT": "Invia messaggi premendo Cmd/Ctrl + Invio invece di dover cliccare sul pulsante Invia."
           }
         }
       },
       "INTERFACE_SECTION": {
-        "TITLE": "Interface",
-        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "TITLE": "Interfaccia",
+        "NOTE": "Personalizza l'aspetto della tua dashboard.",
         "FONT_SIZE": {
-          "TITLE": "Font size",
-          "NOTE": "Adjust the text size across the dashboard based on your preference.",
-          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
-          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "TITLE": "Grandezza font",
+          "NOTE": "Regola la dimensione del testo sulla dashboard in base alle tue preferenze.",
+          "UPDATE_SUCCESS": "Le impostazioni del font sono state aggiornate con successo",
+          "UPDATE_ERROR": "C'è stato un errore durante l'aggiornamento del font, si prega di riprovare",
           "OPTIONS": {
-            "SMALLER": "Smaller",
-            "SMALL": "Small",
+            "SMALLER": "Più piccolo",
+            "SMALL": "Piccolo",
             "DEFAULT": "Predefinito",
-            "LARGE": "Large",
-            "LARGER": "Larger",
-            "EXTRA_LARGE": "Extra Large"
+            "LARGE": "Grande",
+            "LARGER": "Più Grande",
+            "EXTRA_LARGE": "Molto Grande"
           }
         },
         "LANGUAGE": {
@@ -57,18 +57,18 @@
           "NOTE": "Scegli la lingua che vuoi utilizzare.",
           "UPDATE_SUCCESS": "Le impostazioni della lingua sono state aggiornate con successo",
           "UPDATE_ERROR": "C'è stato un errore durante l'aggiornamento della lingua, si prega di riprovare",
-          "USE_ACCOUNT_DEFAULT": "Predefinita"
+          "USE_ACCOUNT_DEFAULT": "Predefinita account"
         }
       },
       "MESSAGE_SIGNATURE_SECTION": {
-        "TITLE": "Firma del messaggio personale",
-        "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
+        "TITLE": "Firma del messaggio",
+        "NOTE": "Crea una firma di messaggio univoca da visualizzare alla fine di ogni messaggio che invii da qualsiasi Inbox. È anche possibile includere un'immagine inline, che è supportata in live-chat, e-mail e API.",
         "BTN_TEXT": "Salva firma del messaggio",
         "API_ERROR": "Impossibile salvare la firma! Riprova",
         "API_SUCCESS": "Firma salvata con successo",
-        "IMAGE_UPLOAD_ERROR": "Couldn't upload image! Try again",
-        "IMAGE_UPLOAD_SUCCESS": "Image added successfully. Please click on save to save the signature",
-        "IMAGE_UPLOAD_SIZE_ERROR": "Image size should be less than {size}MB"
+        "IMAGE_UPLOAD_ERROR": "Impossibile caricare l'immagine! Riprova",
+        "IMAGE_UPLOAD_SUCCESS": "Immagine aggiunta con successo. Clicca su Salva per salvare la firma",
+        "IMAGE_UPLOAD_SIZE_ERROR": "La dimensione dell'immagine deve essere inferiore a {size}MB"
       },
       "MESSAGE_SIGNATURE": {
         "LABEL": "Firma del messaggio",
@@ -96,43 +96,43 @@
         "RESET_ERROR": "Impossibile rigenerare il token di accesso. Riprova"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Audio Alerts",
-        "NOTE": "Enable audio alerts in dashboard for new messages and conversations.",
-        "PLAY": "Play sound",
+        "TITLE": "Avvisi Audio",
+        "NOTE": "Abilita gli avvisi audio nella dashboard per nuovi messaggi e conversazioni.",
+        "PLAY": "Riproduci suono",
         "ALERT_TYPES": {
           "NONE": "Nessuno",
-          "MINE": "Assigned",
+          "MINE": "Assegnate",
           "ALL": "Tutti",
-          "ASSIGNED": "My assigned conversations",
-          "UNASSIGNED": "Unassigned conversations",
-          "NOTME": "Open conversations assigned to others"
+          "ASSIGNED": "Le conversazioni assegnate a me",
+          "UNASSIGNED": "Conversazioni non assegnate",
+          "NOTME": "Conversazioni aperte assegnate ad altri"
         },
         "ALERT_COMBINATIONS": {
-          "NONE": "You haven't selected any options, you won't receive any audio alerts.",
-          "ASSIGNED": "You'll receive alerts for conversations assigned to you.",
-          "UNASSIGNED": "You'll receive alerts for any unassigned conversations.",
-          "NOTME": "You'll receive alerts for conversations assigned to others.",
-          "ASSIGNED+UNASSIGNED": "You'll receive alerts for your assigned conversations and any unattended ones.",
-          "ASSIGNED+NOTME": "You'll receive alerts for conversations assigned to you and to others, but not for unassigned ones.",
-          "NOTME+UNASSIGNED": "You'll receive alerts for unattended conversations and those assigned to others.",
-          "ASSIGNED+NOTME+UNASSIGNED": "You'll receive alerts for all conversations."
+          "NONE": "Non hai selezionato nessuna opzione, non riceverai alcun avviso audio.",
+          "ASSIGNED": "Riceverai avvisi per le conversazioni assegnate a te.",
+          "UNASSIGNED": "Riceverai avvisi per qualsiasi conversazione non assegnata.",
+          "NOTME": "Riceverai avvisi per le conversazioni assegnate ad altri.",
+          "ASSIGNED+UNASSIGNED": "Riceverai avvisi per le conversazioni assegnate a te e per quelle non risposte.",
+          "ASSIGNED+NOTME": "Riceverai avvisi per le conversazioni assegnate a te e agli altri, ma non per quelle non assegnate.",
+          "NOTME+UNASSIGNED": "Riceverai avvisi per conversazioni non risposte e per quelle assegnate ad altri.",
+          "ASSIGNED+NOTME+UNASSIGNED": "Riceverai avvisi per tutte le conversazioni."
         },
         "ALERT_TYPE": {
-          "TITLE": "Alert events for conversations",
+          "TITLE": "Eventi di avviso per le conversazioni",
           "NONE": "Nessuno",
-          "ASSIGNED": "Conversazioni assegnate",
-          "ALL_CONVERSATIONS": "Tutte le conversazioni"
+          "ASSIGNED": "Conversazioni Assegnate",
+          "ALL_CONVERSATIONS": "Tutte le Conversazioni"
         },
         "DEFAULT_TONE": {
-          "TITLE": "Alert tone:"
+          "TITLE": "Tono avviso:"
         },
         "CONDITIONS": {
-          "TITLE": "Alert conditions:",
-          "CONDITION_ONE": "Send audio alerts only if the browser window is not active",
-          "CONDITION_TWO": "Send alerts every 30s until all the assigned conversations are read"
+          "TITLE": "Condizioni di avviso:",
+          "CONDITION_ONE": "Invia avvisi audio solo se la finestra del browser non è attiva",
+          "CONDITION_TWO": "Invia avvisi ogni 30s fino alla lettura di tutte le conversazioni assegnate"
         },
-        "SOUND_PERMISSION_ERROR": "Autoplay is disabled in your browser. To hear alerts automatically, enable sound permission in your browser settings or interact with the page.",
-        "READ_MORE": "Read more"
+        "SOUND_PERMISSION_ERROR": "La riproduzione automatica è disabilitata nel tuo browser. Per sentire gli avvisi automaticamente, abilita i permessi audio nelle impostazioni del tuo browser o interagisci con la pagina.",
+        "READ_MORE": "Leggi di più"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "Notifiche email",
@@ -141,58 +141,58 @@
         "CONVERSATION_CREATION": "Invia notifiche email quando viene creata una nuova conversazione",
         "CONVERSATION_MENTION": "Invia notifiche email quando sei menzionato in una conversazione",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Invia notifiche email quando viene creato un nuovo messaggio in una conversazione assegnata",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation",
-        "SLA_MISSED_FIRST_RESPONSE": "Send email notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Invia notifiche email quando un nuovo messaggio viene creato in una conversazione partecipata",
+        "SLA_MISSED_FIRST_RESPONSE": "Invia notifiche email quando una conversazione manca il tempo di risposta SLA",
+        "SLA_MISSED_NEXT_RESPONSE": "Invia notifiche email quando una conversazione manca il tempo di prossima risposta SLA",
+        "SLA_MISSED_RESOLUTION": "Invia notifiche email quando una conversazione manca il tempo di risoluzione SLA"
       },
       "NOTIFICATIONS": {
-        "TITLE": "Notification preferences",
-        "TYPE_TITLE": "Notification type",
+        "TITLE": "Preferenze di notifica",
+        "TYPE_TITLE": "Tipo di notifica",
         "EMAIL": "Email",
-        "PUSH": "Push notification",
+        "PUSH": "Notifica push",
         "TYPES": {
-          "CONVERSATION_CREATED": "A new conversation is created",
-          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
-          "CONVERSATION_MENTION": "You are mentioned in a conversation",
-          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
-          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
-          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
-          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
-          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+          "CONVERSATION_CREATED": "Una nuova conversazione è stata creata",
+          "CONVERSATION_ASSIGNED": "Una conversazione ti viene assegnata",
+          "CONVERSATION_MENTION": "Vieni menzionato in una conversazione",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Un nuovo messaggio è stato creato in una conversazione assegnata",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Un nuovo messaggio è stato creato in una conversazione partecipata",
+          "SLA_MISSED_FIRST_RESPONSE": "Una conversazione manca il tempo di prima risposta SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "Una conversazione manca il tempo di risposta successiva SLA",
+          "SLA_MISSED_RESOLUTION": "Una conversazione manca il tempo di risoluzione SLA"
         },
-        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+        "BROWSER_PERMISSION": "Abilita le notifiche push per il browser in modo da poterle ricevere"
       },
       "API": {
         "UPDATE_SUCCESS": "Le preferenze per le notifiche sono state aggiornate con successo",
         "UPDATE_ERROR": "C'è stato un errore durante l'aggiornamento delle preferenze, si prega di riprovare"
       },
       "PUSH_NOTIFICATIONS_SECTION": {
-        "TITLE": "Notifiche push",
+        "TITLE": "Notifiche Push",
         "NOTE": "Aggiorna qui le tue preferenze di notifiche push",
         "CONVERSATION_ASSIGNMENT": "Invia notifiche push quando una conversazione mi viene assegnata",
-        "CONVERSATION_CREATION": "Invia notifiche push quando una conversazione mi viene assegnata",
+        "CONVERSATION_CREATION": "Invia notifiche push quando viene creata una nuova conversazione",
         "CONVERSATION_MENTION": "Invia notifiche push quando sei menzionato in una conversazione",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Invia notifiche push quando viene creato un nuovo messaggio in una conversazione assegnata",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Invia notifiche push quando viene creato un nuovo messaggio in una conversazione partecipata",
         "HAS_ENABLED_PUSH": "Hai abilitato notifiche push per questo browser.",
         "REQUEST_PUSH": "Abilita notifiche push",
-        "SLA_MISSED_FIRST_RESPONSE": "Send push notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send push notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send push notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_FIRST_RESPONSE": "Invia notifiche push quando una conversazione manca il tempo di prima risposta SLA",
+        "SLA_MISSED_NEXT_RESPONSE": "Invia notifiche push quando una conversazione manca il tempo di risposta successiva SLA",
+        "SLA_MISSED_RESOLUTION": "Invia notifiche push quando una conversazione manca il tempo di risoluzione SLA"
       },
       "PROFILE_IMAGE": {
-        "LABEL": "Immagine del profilo"
+        "LABEL": "Immagine del Profilo"
       },
       "NAME": {
         "LABEL": "Il tuo nome completo",
-        "ERROR": "Per favore inserisci il nome completo",
-        "PLACEHOLDER": "Per favore inserisci il nome completo"
+        "ERROR": "Inserisci un nome completo valido",
+        "PLACEHOLDER": "Inserisci il tuo nome completo"
       },
       "DISPLAY_NAME": {
         "LABEL": "Nome visualizzato",
-        "ERROR": "Inserisci un nome di visualizzazione valido",
-        "PLACEHOLDER": "Inserisci un nome di visualizzazione, questo verrà visualizzato nelle conversazioni"
+        "ERROR": "Inserisci un nome visualizzato valido",
+        "PLACEHOLDER": "Inserisci un nome visualizzato, questo verrà mostrato nelle conversazioni"
       },
       "AVAILABILITY": {
         "LABEL": "Disponibilità",
@@ -201,14 +201,14 @@
           "BUSY": "Occupato",
           "OFFLINE": "Offline"
         },
-        "SET_AVAILABILITY_SUCCESS": "Availability has been set successfully",
-        "SET_AVAILABILITY_ERROR": "Couldn't set availability, please try again",
+        "SET_AVAILABILITY_SUCCESS": "Disponibilità impostata correttamente",
+        "SET_AVAILABILITY_ERROR": "Impossibile impostare la disponibilità, riprova",
         "IMPERSONATING_ERROR": "Impossibile modificare la disponibilità durante l'impersonazione di un utente"
       },
       "EMAIL": {
         "LABEL": "Il tuo indirizzo email",
         "ERROR": "Inserisci un indirizzo email valido",
-        "PLACEHOLDER": "Inserisci il tuo indirizzo email, che verrà visualizzato nelle conversazioni"
+        "PLACEHOLDER": "Inserisci il tuo indirizzo email, questo verrà mostrato nelle conversazioni"
       },
       "CURRENT_PASSWORD": {
         "LABEL": "Password attuale",
@@ -229,35 +229,41 @@
   },
   "SIDEBAR_ITEMS": {
     "CHANGE_AVAILABILITY_STATUS": "Cambia",
-    "CHANGE_ACCOUNTS": "Switch account",
-    "SWITCH_ACCOUNT": "Switch account",
-    "CONTACT_SUPPORT": "Contact support",
-    "SELECTOR_SUBTITLE": "Seleziona un account dal seguente elenco",
-    "PROFILE_SETTINGS": "Profile settings",
-    "KEYBOARD_SHORTCUTS": "Keyboard shortcuts",
-    "APPEARANCE": "Change appearance",
-    "SUPER_ADMIN_CONSOLE": "SuperAdmin console",
-    "DOCS": "Read documentation",
+    "CHANGE_ACCOUNTS": "Cambia account",
+    "SWITCH_ACCOUNT": "Cambia account",
+    "CONTACT_SUPPORT": "Contatta il supporto",
+    "SELECTOR_SUBTITLE": "Seleziona un account dall'elenco",
+    "PROFILE_SETTINGS": "Impostazioni profilo",
+    "KEYBOARD_SHORTCUTS": "Scorciatoie da tastiera",
+    "APPEARANCE": "Personalizza aspetto",
+    "SUPER_ADMIN_CONSOLE": "Console SuperAdmin",
+    "DOCS": "Leggi la documentazione",
     "CHANGELOG": "Changelog",
-    "LOGOUT": "Log out"
+    "LOGOUT": "Disconnetti"
   },
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "giorni di prova rimanenti.",
-    "TRAIL_BUTTON": "Acquista ora",
-    "DELETED_USER": "Utente eliminato",
-    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
-    "RESEND_VERIFICATION_MAIL": "Resend verification email",
-    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
+    "TRAIL_BUTTON": "Acquista Ora",
+    "DELETED_USER": "Utente Eliminato",
+    "EMAIL_VERIFICATION_PENDING": "Sembra che tu non abbia ancora verificato il tuo indirizzo email. Controlla la tua casella di posta per l'email di verifica.",
+    "RESEND_VERIFICATION_MAIL": "Invia nuovamente email di verifica",
+    "EMAIL_VERIFICATION_SENT": "L'email di verifica è stata inviata. Controlla la tua casella di posta.",
     "ACCOUNT_SUSPENDED": {
-      "TITLE": "Account sospeso",
+      "TITLE": "Account Sospeso",
       "MESSAGE": "Il tuo account è sospeso. Contatta il team di supporto per ulteriori informazioni."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "Nessun account trovato",
+      "MESSAGE_CLOUD": "Non fai parte di nessun account al momento. Se pensi che sia un errore, contatta il nostro team di supporto.",
+      "MESSAGE_SELF_HOSTED": "Non fai parte di nessun account al momento. Per favore contatta il tuo amministratore.",
+      "LOGOUT": "Disconnetti"
     }
   },
   "COMPONENTS": {
     "CODE": {
       "BUTTON_TEXT": "Copia",
-      "CODEPEN": "Open in CodePen",
-      "COPY_SUCCESSFUL": "Codice copiato negli appunti correttamente"
+      "CODEPEN": "Apri in CodePen",
+      "COPY_SUCCESSFUL": "Copiato negli appunti"
     },
     "SHOW_MORE_BLOCK": {
       "SHOW_MORE": "Mostra di più",
@@ -269,66 +275,70 @@
       "INSTAGRAM_STORY_UNAVAILABLE": "Questa storia non è più disponibile."
     },
     "LOCATION_BUBBLE": {
-      "SEE_ON_MAP": "See on map"
+      "SEE_ON_MAP": "Vedi sulla mappa"
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Invia"
     },
     "MEDIA": {
-      "IMAGE_UNAVAILABLE": "This image is no longer available.",
-      "LOADING_FAILED": "Loading failed"
+      "IMAGE_UNAVAILABLE": "Questa immagine non è più disponibile.",
+      "LOADING_FAILED": "Caricamento non riuscito"
     }
   },
   "CONFIRM_EMAIL": "Verifica...",
   "SETTINGS": {
     "INBOXES": {
-      "NEW_INBOX": "Aggiungi Casella"
+      "NEW_INBOX": "Aggiungi Inbox"
     }
   },
   "SIDEBAR": {
-    "NO_ITEMS": "No items",
+    "NO_ITEMS": "Nessun elemento",
     "CURRENTLY_VIEWING_ACCOUNT": "Visualizzazione attuale:",
-    "SWITCH": "Scambia",
-    "INBOX_VIEW": "Inbox View",
+    "SWITCH": "Cambia",
+    "INBOX_VIEW": "Vista Inbox",
     "CONVERSATIONS": "Conversazioni",
-    "INBOX": "My Inbox",
-    "ALL_CONVERSATIONS": "Tutte le conversazioni",
+    "INBOX": "La mia Inbox",
+    "ALL_CONVERSATIONS": "Tutte le Conversazioni",
     "MENTIONED_CONVERSATIONS": "Menzioni",
-    "PARTICIPATING_CONVERSATIONS": "Participating",
+    "PARTICIPATING_CONVERSATIONS": "Partecipate",
     "UNATTENDED_CONVERSATIONS": "Non partecipate",
-    "REPORTS": "Segnalazioni",
+    "REPORTS": "Report",
     "SETTINGS": "Impostazioni",
     "CONTACTS": "Contatti",
-    "ACTIVE": "Attiva",
+    "ACTIVE": "Attivi",
     "CAPTAIN": "Captain",
-    "CAPTAIN_ASSISTANTS": "Assistants",
-    "CAPTAIN_DOCUMENTS": "Documents",
-    "CAPTAIN_RESPONSES": "FAQs",
+    "CAPTAIN_ASSISTANTS": "Assistenti",
+    "CAPTAIN_DOCUMENTS": "Documenti",
+    "CAPTAIN_RESPONSES": "FAQ",
     "CAPTAIN_TOOLS": "Strumenti",
+    "CAPTAIN_SCENARIOS": "Scenari",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inbox",
+    "CAPTAIN_SETTINGS": "Impostazioni",
     "HOME": "Home",
-    "AGENTS": "Agenti",
+    "AGENTS": "Operatori",
     "AGENT_BOTS": "Bots",
     "AUDIT_LOGS": "Audit Logs",
-    "INBOXES": "Posta",
+    "INBOXES": "Inbox",
     "NOTIFICATIONS": "Notifiche",
-    "CANNED_RESPONSES": "Risposte predefinite",
+    "CANNED_RESPONSES": "Risposte Predefinite",
     "INTEGRATIONS": "Integrazioni",
-    "PROFILE_SETTINGS": "Impostazioni profilo",
-    "ACCOUNT_SETTINGS": "Impostazioni account",
+    "PROFILE_SETTINGS": "Impostazioni Profilo",
+    "ACCOUNT_SETTINGS": "Impostazioni Account",
     "APPLICATIONS": "Applicazioni",
     "LABELS": "Etichette",
-    "CUSTOM_ATTRIBUTES": "Attributi personalizzati",
-    "AUTOMATION": "Automazione",
-    "MACROS": "Macros",
-    "TEAMS": "Teams",
+    "CUSTOM_ATTRIBUTES": "Attributi Personalizzati",
+    "AUTOMATION": "Automazioni",
+    "MACROS": "Macro",
+    "TEAMS": "Team",
     "BILLING": "Fatturazione",
     "CUSTOM_VIEWS_FOLDER": "Cartelle",
     "CUSTOM_VIEWS_SEGMENTS": "Segmenti",
-    "ALL_CONTACTS": "Tutti i contatti",
+    "ALL_CONTACTS": "Tutti i Contatti",
     "TAGGED_WITH": "Etichettato con",
     "NEW_LABEL": "Nuova etichetta",
     "NEW_TEAM": "Nuovo team",
-    "NEW_INBOX": "Nuova casella di posta",
+    "NEW_INBOX": "Nuova Inbox",
     "REPORTS_CONVERSATION": "Conversazioni",
     "CSAT": "CSAT",
     "LIVE_CHAT": "Live Chat",
@@ -336,47 +346,47 @@
     "WHATSAPP": "WhatsApp",
     "CAMPAIGNS": "Campagne",
     "ONGOING": "In corso",
-    "ONE_OFF": "Uno fuori",
+    "ONE_OFF": "Una-tantum",
     "REPORTS_SLA": "SLA",
     "REPORTS_BOT": "Bot",
-    "REPORTS_AGENT": "Agenti",
+    "REPORTS_AGENT": "Operatori",
     "REPORTS_LABEL": "Etichette",
-    "REPORTS_INBOX": "Posta",
+    "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
-    "AGENT_ASSIGNMENT": "Assegnazione Agenti",
-    "SET_AVAILABILITY_TITLE": "Imposta te stesso come",
+    "AGENT_ASSIGNMENT": "Assegnazione Operatori",
+    "SET_AVAILABILITY_TITLE": "Impostati come",
     "SET_YOUR_AVAILABILITY": "Imposta la tua disponibilità",
     "SLA": "SLA",
-    "CUSTOM_ROLES": "Custom Roles",
+    "CUSTOM_ROLES": "Ruoli Personalizzati",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Panoramica",
-    "REAUTHORIZE": "Your inbox connection has expired, please reconnect\n to continue receiving and sending messages",
+    "REAUTHORIZE": "La tua connessione alla Inbox è scaduta, ricollegati per continuare a ricevere e inviare messaggi",
     "HELP_CENTER": {
       "TITLE": "Help Center",
-      "ARTICLES": "Articles",
+      "ARTICLES": "Articoli",
       "CATEGORIES": "Categorie",
       "LOCALES": "Lingue",
       "SETTINGS": "Impostazioni"
     },
-    "CHANNELS": "Channels",
+    "CHANNELS": "Canali",
     "SET_AUTO_OFFLINE": {
-      "TEXT": "Mark offline automatically",
-      "INFO_TEXT": "Let the system automatically mark you offline when you aren't using the app or dashboard.",
-      "INFO_SHORT": "Automatically mark offline when you aren't using the app."
+      "TEXT": "Imposta offline automaticamente",
+      "INFO_TEXT": "Consenti al sistema di impostarti automaticamente offline quando non utilizzi l'app o la dashboard.",
+      "INFO_SHORT": "Imposta automaticamente offline quando non stai usando l'app."
     },
     "DOCS": "Leggi i documenti",
     "SECURITY": "Sicurezza"
   },
   "BILLING_SETTINGS": {
     "TITLE": "Fatturazione",
-    "DESCRIPTION": "Manage your subscription here, upgrade your plan and get more for your team.",
+    "DESCRIPTION": "Gestisci qui il tuo abbonamento, aggiorna il tuo piano e ottieni di più per il tuo team.",
     "CURRENT_PLAN": {
       "TITLE": "Piano attuale",
       "PLAN_NOTE": "Sei attualmente abbonato al piano **{plan}** con **{quantity}** licenze",
-      "SEAT_COUNT": "Number of seats",
-      "RENEWS_ON": "Renews on"
+      "SEAT_COUNT": "Numero di seat",
+      "RENEWS_ON": "Si rinnova il"
     },
-    "VIEW_PRICING": "View Pricing",
+    "VIEW_PRICING": "Visualizza Prezzi",
     "MANAGE_SUBSCRIPTION": {
       "TITLE": "Gestisci il tuo abbonamento",
       "DESCRIPTION": "Visualizza le tue fatture precedenti, modifica i tuoi dati di fatturazione o annulla il tuo abbonamento.",
@@ -384,11 +394,11 @@
     },
     "CAPTAIN": {
       "TITLE": "Captain",
-      "DESCRIPTION": "Manage usage and credits for Captain AI.",
-      "BUTTON_TXT": "Buy more credits",
-      "DOCUMENTS": "Documents",
-      "RESPONSES": "Responses",
-      "UPGRADE": "Captain is not available on the free plan, upgrade now to get access to assistants, copilot and more."
+      "DESCRIPTION": "Gestisci utilizzo e crediti per Captain AI.",
+      "BUTTON_TXT": "Acquista più crediti",
+      "DOCUMENTS": "Documenti",
+      "RESPONSES": "Risposte",
+      "UPGRADE": "Captain non è disponibile sul piano gratuito, aggiorna ora per ottenere l'accesso agli assistenti, copilot e altro ancora."
     },
     "CHAT_WITH_US": {
       "TITLE": "Hai bisogno di aiuto?",
@@ -422,7 +432,7 @@
         "LABEL": "Fingerprint",
         "TOOLTIP": "Fingerprint SHA-1 del certificato — utilizzala per verificare il certificato nella configurazione del tuo IdP"
       },
-      "COPY_SUCCESS": "Codice copiato negli appunti correttamente",
+      "COPY_SUCCESS": "Copiato negli appunti",
       "SP_ENTITY_ID": {
         "LABEL": "SP Entity ID",
         "HELP": "Identificatore univoco per questa applicazione come Service Provider (generato automaticamente).",
@@ -449,14 +459,14 @@
       "ENTERPRISE_PAYWALL": {
         "AVAILABLE_ON": "La funzionalità SAML SSO è disponibile solo nei piani Enterprise.",
         "UPGRADE_PROMPT": "Passa a un piano Enterprise per accedere a SAML single sign-on e ad altre funzionalità di sicurezza avanzate.",
-        "ASK_ADMIN": "Si prega di contattare l'amministratore per l'aggiornamento."
+        "ASK_ADMIN": "Contatta il tuo amministratore per l'aggiornamento."
       },
       "PAYWALL": {
         "TITLE": "Aggiorna per abilitare SAML SSO",
         "AVAILABLE_ON": "La funzionalità SAML SSO è disponibile solo nei piani Enterprise.",
         "UPGRADE_PROMPT": "Aggiorna il tuo piano per ottenere l'accesso a SAML single sign-on e altre funzionalità avanzate.",
         "UPGRADE_NOW": "Aggiorna ora",
-        "CANCEL_ANYTIME": "È possibile modificare o annullare il piano in qualsiasi momento"
+        "CANCEL_ANYTIME": "Puoi modificare o annullare il tuo piano in qualsiasi momento"
       },
       "ATTRIBUTE_MAPPING": {
         "TITLE": "Impostazioni Attributi SAML",
@@ -479,7 +489,7 @@
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Nome azienda",
+        "LABEL": "Nome Azienda",
         "PLACEHOLDER": "Wayne Enterprises"
       },
       "SUBMIT": "Invia",
@@ -492,17 +502,17 @@
       "OPEN_CONVERSATION": "Apri conversazione",
       "RESOLVE_AND_NEXT": "Risolvi e vai alla prossima",
       "NAVIGATE_DROPDOWN": "Naviga con gli elementi a discesa",
-      "RESOLVE_CONVERSATION": "Risolvi la conversazione",
-      "GO_TO_CONVERSATION_DASHBOARD": "Vai alla dashboard Conversazioni",
+      "RESOLVE_CONVERSATION": "Risolvi Conversazione",
+      "GO_TO_CONVERSATION_DASHBOARD": "Vai alla Dashboard Conversazioni",
       "ADD_ATTACHMENT": "Aggiungi allegato",
-      "GO_TO_CONTACTS_DASHBOARD": "Vai alla dashboard Contatti",
+      "GO_TO_CONTACTS_DASHBOARD": "Vai alla Dashboard Contatti",
       "TOGGLE_SIDEBAR": "Attiva/Disattiva barra laterale",
-      "GO_TO_REPORTS_SIDEBAR": "Vai alla barra laterale dei rapporti",
+      "GO_TO_REPORTS_SIDEBAR": "Vai alla barra laterale dei Report",
       "MOVE_TO_NEXT_TAB": "Vai alla scheda successiva nell'elenco delle conversazioni",
-      "GO_TO_SETTINGS": "Vai alle impostazioni",
-      "SWITCH_TO_PRIVATE_NOTE": "Passa alle note private",
+      "GO_TO_SETTINGS": "Vai alle Impostazioni",
+      "SWITCH_TO_PRIVATE_NOTE": "Passa alle Note Private",
       "SWITCH_TO_REPLY": "Passa a Risposta",
-      "TOGGLE_SNOOZE_DROPDOWN": "Attiva/Disattiva sospensione a discesa"
+      "TOGGLE_SNOOZE_DROPDOWN": "Attiva/Disattiva menu a discesa per la Sospensione"
     }
   },
   "ASSIGNMENT_POLICY": {
@@ -593,7 +603,7 @@
         },
         "STATUS": {
           "LABEL": "Stato:",
-          "PLACEHOLDER": "Seleziona status",
+          "PLACEHOLDER": "Seleziona stato",
           "ACTIVE": "Policy attiva",
           "INACTIVE": "Policy inattiva"
         },
@@ -739,7 +749,7 @@
           "EMPTY_STATE": "Nessun operatore aggiunto",
           "API": {
             "SUCCESS_MESSAGE": "Operatore aggiunto correttamente alla policy",
-            "ERROR_MESSAGE": "Impossibile aggiungere l'operatore alla policy"
+            "ERROR_MESSAGE": "Impossibile aggiungere l’operatore alla policy"
           }
         }
       },
diff --git a/app/javascript/dashboard/i18n/locale/it/signup.json b/app/javascript/dashboard/i18n/locale/it/signup.json
index ae0b75fac..ab825e53c 100644
--- a/app/javascript/dashboard/i18n/locale/it/signup.json
+++ b/app/javascript/dashboard/i18n/locale/it/signup.json
@@ -1,15 +1,15 @@
 {
   "REGISTER": {
-    "TRY_WOOT": "Create an account",
+    "TRY_WOOT": "Crea un account",
     "TITLE": "Registrati",
-    "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
-    "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
-    "TERMS_ACCEPT": "By creating an account, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
+    "TESTIMONIAL_HEADER": "Basta uno step per proseguire",
+    "TESTIMONIAL_CONTENT": "Sei a un passo dal coinvolgere i tuoi clienti, fidelizzarli e trovarne di nuovi.",
+    "TERMS_ACCEPT": "Creando un account, accetti <a href=\"https://www.chatwoot.com/terms\">Termini e Condizioni</a> e <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
     "OAUTH": {
-      "GOOGLE_SIGNUP": "Sign up with Google"
+      "GOOGLE_SIGNUP": "Registrati con Google"
     },
     "COMPANY_NAME": {
-      "LABEL": "Company name",
+      "LABEL": "Nome azienda",
       "PLACEHOLDER": "Inserisci il nome della tua azienda. Ad esempio: Wayne Enterprises",
       "ERROR": "Il nome dell'azienda è troppo corto."
     },
@@ -20,14 +20,14 @@
     },
     "EMAIL": {
       "LABEL": "Email di lavoro",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce{'@'}wayne{'.'}enterprises",
-      "ERROR": "Si prega di inserire un indirizzo email di lavoro valido."
+      "PLACEHOLDER": "Inserisci il tuo indirizzo email di lavoro. es.: bruce{'@'}wayne{'.'}enterprises",
+      "ERROR": "Inserisci un indirizzo email di lavoro valido."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
       "ERROR": "Password troppo corta.",
-      "IS_INVALID_PASSWORD": "La password dovrebbe contenere almeno 1 lettera maiuscola, 1 lettera minuscola, 1 numero e 1 carattere speciale.",
+      "IS_INVALID_PASSWORD": "La password deve contenere almeno 1 lettera maiuscola, 1 lettera minuscola, 1 numero e 1 carattere speciale.",
       "REQUIREMENTS_LENGTH": "Almeno 6 caratteri",
       "REQUIREMENTS_UPPERCASE": "Almeno una lettera maiuscola",
       "REQUIREMENTS_LOWERCASE": "Almeno una lettera minuscola",
@@ -40,10 +40,10 @@
       "ERROR": "Le password non corrispondono."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Registrazione riuscita",
-      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi."
+      "SUCCESS_MESSAGE": "Registrazione Riuscita",
+      "ERROR_MESSAGE": "Impossibile connettersi al server Woot. Riprova."
     },
-    "SUBMIT": "Create account",
+    "SUBMIT": "Crea account",
     "HAVE_AN_ACCOUNT": "Hai già un account?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/sla.json b/app/javascript/dashboard/i18n/locale/it/sla.json
index b0e7ec69b..9be1f9102 100644
--- a/app/javascript/dashboard/i18n/locale/it/sla.json
+++ b/app/javascript/dashboard/i18n/locale/it/sla.json
@@ -1,37 +1,37 @@
 {
   "SLA": {
     "HEADER": "Service Level Agreements",
-    "ADD_ACTION": "Add SLA",
-    "ADD_ACTION_LONG": "Create a new SLA Policy",
-    "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
-    "LEARN_MORE": "Learn more about SLA",
-    "LOADING": "Fetching SLAs",
+    "ADD_ACTION": "Aggiungi SLA",
+    "ADD_ACTION_LONG": "Crea una nuova policy SLA",
+    "DESCRIPTION": "I Service Level Agreement (SLA) sono contratti che definiscono chiare aspettative tra il team e i clienti. Stabiliscono norme per i tempi di risposta e di risoluzione, creando un quadro per la responsabilità e garantendo un'esperienza coerente e di alta qualità.",
+    "LEARN_MORE": "Scopri di più su SLA",
+    "LOADING": "Caricamento SLA",
     "PAYWALL": {
-      "TITLE": "Upgrade to create SLAs",
-      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
-      "UPGRADE_NOW": "Upgrade now",
-      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+      "TITLE": "Aggiorna per creare SLA",
+      "AVAILABLE_ON": "La funzionalità SLA è disponibile solo nei piani Business e Enterprise.",
+      "UPGRADE_PROMPT": "Aggiorna il tuo piano per ottenere l'accesso a funzionalità avanzate come gestione del team, automazioni, attributi personalizzati e altro ancora.",
+      "UPGRADE_NOW": "Aggiorna ora",
+      "CANCEL_ANYTIME": "Puoi modificare o annullare il tuo piano in qualsiasi momento"
     },
     "ENTERPRISE_PAYWALL": {
-      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
-      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
-      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+      "AVAILABLE_ON": "La funzionalità SLA è disponibile solo nei piani a pagamento.",
+      "UPGRADE_PROMPT": "Passa a un piano a pagamento per accedere a funzionalità avanzate come audit logs, capacità degli operatori e altro ancora.",
+      "ASK_ADMIN": "Contatta il tuo amministratore per l'aggiornamento."
     },
     "LIST": {
-      "404": "There are no SLAs available in this account.",
+      "404": "Non ci sono SLA disponibili in questo account.",
       "EMPTY": {
         "TITLE_1": "Enterprise P0",
-        "DESC_1": "Issues raised by enterprise customers, that require immediate attention.",
+        "DESC_1": "Problemi sollevati dai clienti enterprise, che richiedono un'attenzione immediata.",
         "TITLE_2": "Enterprise P1",
-        "DESC_2": "Issues raised by enterprise customers, that needs to be acknowledged quickly."
+        "DESC_2": "Problemi sollevati dai clienti enterprise, che devono essere riconosciuti rapidamente."
       },
-      "BUSINESS_HOURS_ON": "Business hours on",
-      "BUSINESS_HOURS_OFF": "Business hours off",
+      "BUSINESS_HOURS_ON": "Orario di lavoro attivo",
+      "BUSINESS_HOURS_OFF": "Orario di lavoro disattivo",
       "RESPONSE_TYPES": {
-        "FRT": "First response time threshold",
-        "NRT": "Next response time threshold",
-        "RT": "Resolution time threshold",
+        "FRT": "Soglia tempo di prima risposta",
+        "NRT": "Soglia tempo di risposta successiva",
+        "RT": "Soglia tempo di risoluzione",
         "SHORT_HAND": {
           "FRT": "FRT",
           "NRT": "NRT",
@@ -41,68 +41,68 @@
     },
     "FORM": {
       "NAME": {
-        "LABEL": "SLA Name",
-        "PLACEHOLDER": "SLA Name",
+        "LABEL": "Nome SLA",
+        "PLACEHOLDER": "Nome SLA",
         "REQUIRED_ERROR": "SLA name is required",
         "MINIMUM_LENGTH_ERROR": "È richiesta una lunghezza minima di 2",
-        "VALID_ERROR": "Sono ammessi solo lettere, numeri, trattino e sottolineatura"
+        "VALID_ERROR": "Sono ammessi solo lettere, numeri, trattino e underscore"
       },
       "DESCRIPTION": {
         "LABEL": "Descrizione",
-        "PLACEHOLDER": "SLA for premium customers"
+        "PLACEHOLDER": "SLA per clienti premium"
       },
       "FIRST_RESPONSE_TIME": {
         "LABEL": "Tempo di prima risposta",
         "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time",
+        "LABEL": "Tempo di Risposta Successiva",
         "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Tempo di risoluzione",
+        "LABEL": "Tempo di Risoluzione",
         "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
-        "LABEL": "Ore di lavoro",
-        "PLACEHOLDER": "Only during business hours"
+        "LABEL": "Orario Di Lavoro",
+        "PLACEHOLDER": "Solo durante l'orario di lavoro"
       },
       "THRESHOLD_TIME": {
-        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+        "INVALID_FORMAT_ERROR": "La soglia deve essere un numero e maggiore di zero"
       },
       "EDIT": "Modifica",
       "CREATE": "Crea",
       "DELETE": "Elimina",
-      "CANCEL": "annulla"
+      "CANCEL": "Annulla"
     },
     "ADD": {
-      "TITLE": "Add SLA",
-      "DESC": "Friendly promises for great service!",
+      "TITLE": "Aggiungi SLA",
+      "DESC": "Amichevoli promesse per un grande servizio!",
       "API": {
-        "SUCCESS_MESSAGE": "SLA added successfully",
+        "SUCCESS_MESSAGE": "SLA aggiunta correttamente",
         "ERROR_MESSAGE": "Si è verificato un errore, riprova"
       }
     },
     "DELETE": {
-      "TITLE": "Delete SLA",
+      "TITLE": "Elimina SLA",
       "API": {
-        "SUCCESS_MESSAGE": "SLA deleted successfully",
+        "SUCCESS_MESSAGE": "SLA eliminata correttamente",
         "ERROR_MESSAGE": "Si è verificato un errore, riprova"
       },
       "CONFIRM": {
-        "TITLE": "Conferma eliminazione",
-        "MESSAGE": "Are you sure you want to delete ",
-        "YES": "Sì, elimina ",
-        "NO": "No, Conserva "
+        "TITLE": "Conferma Eliminazione",
+        "MESSAGE": "Sei sicuro di voler eliminare ",
+        "YES": "Sì, Elimina ",
+        "NO": "No, Mantieni "
       }
     },
     "EVENTS": {
-      "TITLE": "SLA Misses",
+      "TITLE": "SLA Mancate",
       "FRT": "Tempo di prima risposta",
-      "NRT": "Next response time",
-      "RT": "Resolution time",
-      "SHOW_MORE": "{count} more",
-      "HIDE": "Hide {count} rows"
+      "NRT": "Tempo di risposta successiva",
+      "RT": "Tempo di risoluzione",
+      "SHOW_MORE": "{count} altre",
+      "HIDE": "Nascondi {count} righe"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/teamsSettings.json b/app/javascript/dashboard/i18n/locale/it/teamsSettings.json
index ab5d1ca22..d83e61db2 100644
--- a/app/javascript/dashboard/i18n/locale/it/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/teamsSettings.json
@@ -1,10 +1,10 @@
 {
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Crea un nuovo team",
-    "HEADER": "Teams",
-    "LOADING": "Fetching teams",
-    "DESCRIPTION": "Teams allow you to organize agents into groups based on their responsibilities. An agent can belong to multiple teams. When working collaboratively, you can assign conversations to specific teams.",
-    "LEARN_MORE": "Learn more about teams",
+    "HEADER": "Team",
+    "LOADING": "Caricamento team",
+    "DESCRIPTION": "I Team ti permettono di organizzare gli operatori in gruppi in base alle loro responsabilità. Un operatore può appartenere a più team. Quando si lavora in collaborazione, è possibile assegnare conversazioni a team specifici.",
+    "LEARN_MORE": "Scopri di più sui team",
     "LIST": {
       "404": "Non ci sono team creati su questo account.",
       "EDIT_TEAM": "Modifica team",
@@ -16,17 +16,17 @@
         "DESC": "Aggiungi un titolo e una descrizione al tuo nuovo team."
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Aggiungi agenti al team",
-        "TITLE": "Aggiungi agenti al team - {teamName}",
-        "DESC": "Aggiungi agenti al tuo team appena creato. Questo ti permette di collaborare come team alle conversazioni, ricevere una notifica sui nuovi eventi nella stessa conversazione."
+        "BUTTON_TEXT": "Aggiungi operatori al team",
+        "TITLE": "Aggiungi operatori al team - {teamName}",
+        "DESC": "Aggiungi operatori al tuo team appena creato. Questo ti permette di collaborare come team alle conversazioni, ricevere una notifica sui nuovi eventi nella stessa conversazione."
       },
       "WIZARD_CREATE": {
         "TITLE": "Crea",
-        "BODY": "Crea un nuovo team di agenti."
+        "BODY": "Crea un nuovo team di operatori."
       },
       "WIZARD_ADD_AGENTS": {
-        "TITLE": "Aggiungi agenti",
-        "BODY": "Aggiungi agenti al team."
+        "TITLE": "Aggiungi Operatori",
+        "BODY": "Aggiungi operatori al team."
       },
       "WIZARD_FINISH": {
         "TITLE": "Termina",
@@ -40,9 +40,9 @@
         "BUTTON_TEXT": "Aggiorna il team"
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Aggiorna agenti nel team",
-        "TITLE": "Aggiungi agenti al team - {teamName}",
-        "DESC": "Aggiungi agenti al tuo team appena creato. Tutti gli agenti aggiunti verranno avvisati quando una conversazione viene assegnata a questo team."
+        "BUTTON_TEXT": "Aggiorna operatori nel team",
+        "TITLE": "Aggiungi operatori al team - {teamName}",
+        "DESC": "Aggiungi operatori al tuo team appena creato. Tutti gli operatori aggiunti verranno avvisati quando una conversazione viene assegnata a questo team."
       },
       "EDIT_WIZARD_DETAILS": {
         "TITLE": "Dettagli del team",
@@ -50,13 +50,13 @@
         "BODY": "Cambia nome, descrizione e altri dettagli."
       },
       "EDIT_WIZARD_AGENTS": {
-        "TITLE": "Modifica agenti",
+        "TITLE": "Modifica Operatori",
         "ROUTE": "settings_teams_edit_members",
-        "BODY": "Modifica agenti nel tuo team."
+        "BODY": "Modifica gli operatori nel tuo team."
       },
       "EDIT_WIZARD_FINISH": {
         "TITLE": "Termina",
-        "ROUTE": "settings_teams_edit_finisch",
+        "ROUTE": "settings_teams_edit_finish",
         "BODY": "Sei pronto per iniziare!"
       }
     },
@@ -64,22 +64,22 @@
       "ERROR_MESSAGE": "Impossibile salvare i dettagli del team. Riprova."
     },
     "AGENTS": {
-      "AGENT": "AGENTE",
+      "AGENT": "OPERATORE",
       "EMAIL": "EMAIL",
-      "BUTTON_TEXT": "Aggiungi agenti",
-      "ADD_AGENTS": "Aggiunta di agenti al tuo team...",
+      "BUTTON_TEXT": "Aggiungi operatori",
+      "ADD_AGENTS": "Aggiungendo gli Operatori al tuo Team...",
       "SELECT": "seleziona",
-      "SELECT_ALL": "seleziona tutti gli agenti",
-      "SELECTED_COUNT": "{selected} su {total} agenti selezionati."
+      "SELECT_ALL": "seleziona tutti gli operatori",
+      "SELECTED_COUNT": "{selected} su {total} operatori selezionati."
     },
     "ADD": {
-      "TITLE": "Aggiungi agenti al team - {teamName}",
-      "DESC": "Aggiungi agenti al tuo team appena creato. Questo ti permette di collaborare come team alle conversazioni, ricevere una notifica sui nuovi eventi nella stessa conversazione.",
+      "TITLE": "Aggiungi operatori al team - {teamName}",
+      "DESC": "Aggiungi operatori al tuo team appena creato. Questo ti permette di collaborare come team alle conversazioni, ricevere una notifica sui nuovi eventi nella stessa conversazione.",
       "SELECT": "seleziona",
-      "SELECT_ALL": "seleziona tutti gli agenti",
-      "SELECTED_COUNT": "{selected} su {total} agenti selezionati.",
-      "BUTTON_TEXT": "Aggiungi agenti",
-      "AGENT_VALIDATION_ERROR": "Seleziona almeno un agente."
+      "SELECT_ALL": "seleziona tutti gli operatori",
+      "SELECTED_COUNT": "{selected} su {total} operatori selezionati.",
+      "BUTTON_TEXT": "Aggiungi operatori",
+      "AGENT_VALIDATION_ERROR": "Seleziona almeno un operatore."
     },
     "FINISH": {
       "TITLE": "Il tuo team è pronto!",
@@ -93,7 +93,7 @@
         "ERROR_MESSAGE": "Impossibile eliminare il team. Riprova."
       },
       "CONFIRM": {
-        "TITLE": "Are you sure you want to delete the team?",
+        "TITLE": "Sei sicuro di voler eliminare il team?",
         "PLACE_HOLDER": "Digita {teamName} per confermare",
         "MESSAGE": "L'eliminazione del team rimuoverà l'assegnazione del team dalle conversazioni assegnate a questo team.",
         "YES": "Elimina ",
@@ -106,10 +106,10 @@
       "CREATE": "Crea un nuovo team",
       "NAME": {
         "LABEL": "Nome del team",
-        "PLACEHOLDER": "Esempio: Vendite, Assistenza clienti"
+        "PLACEHOLDER": "Esempio: Vendite, Assistenza Clienti"
       },
       "DESCRIPTION": {
-        "LABEL": "Descrizione team",
+        "LABEL": "Descrizione Team",
         "PLACEHOLDER": "Breve descrizione di questo team."
       },
       "AUTO_ASSIGN": {
diff --git a/app/javascript/dashboard/i18n/locale/it/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/it/whatsappTemplates.json
index ef6d06599..1005e8bd5 100644
--- a/app/javascript/dashboard/i18n/locale/it/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/it/whatsappTemplates.json
@@ -6,7 +6,7 @@
       "TEMPLATE_SELECTED_SUBTITLE": "Configura template: {templateName}"
     },
     "PICKER": {
-      "SEARCH_PLACEHOLDER": "Cerca modelli",
+      "SEARCH_PLACEHOLDER": "Cerca Modelli",
       "NO_TEMPLATES_FOUND": "Nessun modello trovato per",
       "HEADER": "Intestazione",
       "BODY": "Corpo",
@@ -21,7 +21,7 @@
       "REFRESH_ERROR": "Impossibile aggiornare i modelli. Per favore riprova.",
       "LABELS": {
         "LANGUAGE": "Lingua",
-        "TEMPLATE_BODY": "Corpo modello",
+        "TEMPLATE_BODY": "Corpo Modello",
         "CATEGORY": "Categoria"
       }
     },
@@ -30,9 +30,9 @@
       "LANGUAGE": "Lingua",
       "CATEGORY": "Categoria",
       "VARIABLE_PLACEHOLDER": "Inserisci il valore di {variable}",
-      "GO_BACK_LABEL": "Torna indietro",
-      "SEND_MESSAGE_LABEL": "Invia messaggio",
-      "FORM_ERROR_MESSAGE": "Si prega di compilare tutte le variabili prima di inviare",
+      "GO_BACK_LABEL": "Torna Indietro",
+      "SEND_MESSAGE_LABEL": "Invia Messaggio",
+      "FORM_ERROR_MESSAGE": "Inserisci tutte le variabili prima di inviare",
       "MEDIA_HEADER_LABEL": "Intestazione {type}",
       "OTP_CODE": "Inserisci OTP da 4 a 8 cifre",
       "EXPIRY_MINUTES": "Inserisci minuti di scadenza",
diff --git a/app/javascript/dashboard/i18n/locale/ja/bulkActions.json b/app/javascript/dashboard/i18n/locale/ja/bulkActions.json
index 20901c953..71aa033ce 100644
--- a/app/javascript/dashboard/i18n/locale/ja/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ja/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "ラベルを割り当てる",
-      "NO_LABELS_FOUND": "該当するラベルが見つかりませんでした",
+      "NO_LABELS_FOUND": "ラベルが見つかりません",
       "ASSIGN_SELECTED_LABELS": "選択したラベルを割り当てる",
       "ASSIGN_SUCCESFUL": "ラベルが正常に割り当てられました。",
       "ASSIGN_FAILED": "ラベルの割り当てに失敗しました。再試行してください。"
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index 98d092455..c90d2fc24 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "ラベルが正常に割り当てられました。",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "削除",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "連絡先を削除"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "検索を完了できませんでした。もう一度お試しください。"
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrations.json b/app/javascript/dashboard/i18n/locale/ja/integrations.json
index e287b8bb9..f83d0f848 100644
--- a/app/javascript/dashboard/i18n/locale/ja/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ja/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "例: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "キャプテン",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "アシスタント",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "コパイロット",
       "TRY_THESE_PROMPTS": "これらのプロンプトを試してください",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "アシスタント"
-        },
+        "HEADER": "設定",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "アシスタントを削除",
+          "DESCRIPTION": "この操作は永久的です。アシスタントを削除すると、すべての接続された受信トレイから削除され、生成されたすべての知識が永久に消去されます。",
+          "BUTTON_TEXT": "{assistantName}を削除"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "アシスタント",
-          "PLACEHOLDER": "アシスタントを選択",
-          "ERROR": "アシスタントの選択が必要です"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQ",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "新しいFAQを作成",
       "DOCUMENTABLE": {
         "CONVERSATION": "会話 #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "承認済み",
         "ALL": "すべて"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "質問とその対応する回答をナレッジベースに追加し、それに関連付けるアシスタントを選択してください。",
       "CREATE": {
         "TITLE": "FAQを追加",
@@ -918,11 +918,6 @@
           "LABEL": "回答",
           "PLACEHOLDER": "ここに回答を入力",
           "ERROR": "有効な回答を入力してください。"
-        },
-        "ASSISTANT": {
-          "LABEL": "アシスタント",
-          "PLACEHOLDER": "アシスタントを選択",
-          "ERROR": "アシスタントを選択してください。"
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "FAQが承認済みとしてマークされました"
       },
       "OPTIONS": {
-        "APPROVE": "承認済みとしてマーク",
-        "EDIT_RESPONSE": "FAQを編集",
-        "DELETE_RESPONSE": "FAQを削除"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "編集",
+        "DELETE_RESPONSE": "削除"
       },
       "EMPTY_STATE": {
         "TITLE": "FAQが見つかりません",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQは、アシスタントがお客様からの質問に迅速かつ正確に回答するのに役立ちます。コンテンツから自動的に生成することも、手動で追加することもできます。",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ja/report.json b/app/javascript/dashboard/i18n/locale/ja/report.json
index 75f715780..d90524f4e 100644
--- a/app/javascript/dashboard/i18n/locale/ja/report.json
+++ b/app/javascript/dashboard/i18n/locale/ja/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "過去 7 日間",
       "LAST_14_DAYS": "過去 14 日間",
       "LAST_30_DAYS": "過去 30 日間",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "過去 3 ヶ月",
       "LAST_6_MONTHS": "過去 6 ヶ月",
       "LAST_YEAR": "過去 1 年",
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index 297fb854a..27874b6fa 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "アカウント停止中",
       "MESSAGE": "アカウントが停止されています。詳細についてはサポートチームにお問い合わせください。"
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "ログアウト"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "ドキュメント",
     "CAPTAIN_RESPONSES": "FAQ",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "受信トレイ",
+    "CAPTAIN_SETTINGS": "設定",
     "HOME": "ホーム",
     "AGENTS": "担当者",
     "AGENT_BOTS": "ボット",
diff --git a/app/javascript/dashboard/i18n/locale/ka/bulkActions.json b/app/javascript/dashboard/i18n/locale/ka/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/ka/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ka/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ka/contact.json b/app/javascript/dashboard/i18n/locale/ka/contact.json
index 3710f52b5..e31804c69 100644
--- a/app/javascript/dashboard/i18n/locale/ka/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ka/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "ამ მომენტისთვის არცერთი კონტაქტი არ არის აქტიური 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ka/integrations.json b/app/javascript/dashboard/i18n/locale/ka/integrations.json
index 081ddbde8..983953180 100644
--- a/app/javascript/dashboard/i18n/locale/ka/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ka/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ka/report.json b/app/javascript/dashboard/i18n/locale/ka/report.json
index 22e285c19..a2ad6bd4a 100644
--- a/app/javascript/dashboard/i18n/locale/ka/report.json
+++ b/app/javascript/dashboard/i18n/locale/ka/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/ka/settings.json b/app/javascript/dashboard/i18n/locale/ka/settings.json
index ea45db5fa..ac11edc13 100644
--- a/app/javascript/dashboard/i18n/locale/ka/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "ინსტრუმენტები",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/ko/bulkActions.json b/app/javascript/dashboard/i18n/locale/ko/bulkActions.json
index 721cc8639..d1c06a0ce 100644
--- a/app/javascript/dashboard/i18n/locale/ko/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ko/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "라벨을 찾을 수 없습니다",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index 7d00f9751..f882757d0 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "삭제",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "연락처 지우기"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ko/integrations.json b/app/javascript/dashboard/i18n/locale/ko/integrations.json
index bb4e23b89..16add473d 100644
--- a/app/javascript/dashboard/i18n/locale/ko/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ko/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "웹훅 URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "설정",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "모두"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "수정",
+        "DELETE_RESPONSE": "삭제"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ko/report.json b/app/javascript/dashboard/i18n/locale/ko/report.json
index be85b62c7..b53d52e6f 100644
--- a/app/javascript/dashboard/i18n/locale/ko/report.json
+++ b/app/javascript/dashboard/i18n/locale/ko/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "지난 7일",
       "LAST_14_DAYS": "지난 14일",
       "LAST_30_DAYS": "지난 30일",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index 4e4af2242..b55c84e9b 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "받은 메시지함",
+    "CAPTAIN_SETTINGS": "설정",
     "HOME": "홈",
     "AGENTS": "에이전트",
     "AGENT_BOTS": "봇",
diff --git a/app/javascript/dashboard/i18n/locale/lt/contact.json b/app/javascript/dashboard/i18n/locale/lt/contact.json
index ee0011daf..b91d32d1f 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Priskirti etiketes",
+    "ASSIGN_LABELS_SUCCESS": "Etiketės sėkmingai priskirtos.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Ištrinti",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Trinti kontaktą"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/lt/integrations.json b/app/javascript/dashboard/i18n/locale/lt/integrations.json
index d1ee89a6f..466e83cce 100644
--- a/app/javascript/dashboard/i18n/locale/lt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lt/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Nustatymai",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Visi"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Redaguoti",
+        "DELETE_RESPONSE": "Ištrinti"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/lt/report.json b/app/javascript/dashboard/i18n/locale/lt/report.json
index f5fcc3d52..cbd0536d9 100644
--- a/app/javascript/dashboard/i18n/locale/lt/report.json
+++ b/app/javascript/dashboard/i18n/locale/lt/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Paskutines 7 dienas",
       "LAST_14_DAYS": "Paskutines 14 dienų",
       "LAST_30_DAYS": "Paskutines 30 dienų",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Paskutinius 3 mėnesius",
       "LAST_6_MONTHS": "Paskutinius 6 mėnesius",
       "LAST_YEAR": "Paskutinius metus",
diff --git a/app/javascript/dashboard/i18n/locale/lt/settings.json b/app/javascript/dashboard/i18n/locale/lt/settings.json
index 7b0b24e1c..e2958313b 100644
--- a/app/javascript/dashboard/i18n/locale/lt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Paskyra laikinai sustabdyta",
       "MESSAGE": "Jūsų paskyra laikinai sustabdyta. Norėdami gauti daugiau informacijos, susisiekite su palaikymo komanda."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Gautų laiškų aplankai",
+    "CAPTAIN_SETTINGS": "Nustatymai",
     "HOME": "Pagrindinis",
     "AGENTS": "Agentai",
     "AGENT_BOTS": "Botai",
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
index 994121d14..ae004f337 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Piešķirt Etiķetes",
+    "ASSIGN_LABELS_SUCCESS": "Etiķetes ir veiksmīgi piešķirtas.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "Atlasīti {count}",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Dzēst",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Dzēst kontaktpersonu"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "Mēs nevarējām pabeigt meklēšanu. Lūdzu, mēģiniet vēlreiz."
diff --git a/app/javascript/dashboard/i18n/locale/lv/integrations.json b/app/javascript/dashboard/i18n/locale/lv/integrations.json
index 35df60e06..f45afff1c 100644
--- a/app/javascript/dashboard/i18n/locale/lv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lv/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Piemēram: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Kapteinis",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Asistenti",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Kopilots",
       "TRY_THESE_PROMPTS": "Pamēģiniet",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Asistents"
-        },
+        "HEADER": "Iestatījumi",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Dzēst Asistentu",
+          "DESCRIPTION": "Šī darbība ir pastāvīga. Dzēšot šo asistentu, tas tiks noņemts no visām pievienotajām iesūtnēm un neatgriezeniski dzēstas visas ģenerētās zināšanas.",
+          "BUTTON_TEXT": "Dzēst {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Asistents",
-          "PLACEHOLDER": "Izvēlēties asistentu",
-          "ERROR": "Asistenta lauks ir obligāti jāaizpilda"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "Bieži uzdotie jautājumi",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Izveidot jaunu sarakstu ar bieži uzdotiem jautājumiem",
       "DOCUMENTABLE": {
         "CONVERSATION": "Saruna #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Apstiprināts",
         "ALL": "Visi"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Pievienot jautājumu un tā atbildi zināšanu bāzei, kā arī izvēlēties asistentu, ar kuru tas būs saistīts.",
       "CREATE": {
         "TITLE": "Pievienot bieži uzdotos jautājumus",
@@ -918,11 +918,6 @@
           "LABEL": "Atbilde",
           "PLACEHOLDER": "Ievadiet atbildi šeit",
           "ERROR": "Lūdzu, ievadiet derīgu atbildi."
-        },
-        "ASSISTANT": {
-          "LABEL": "Asistents",
-          "PLACEHOLDER": "Izvēlieties asistentu",
-          "ERROR": "Lūdzu, izvēlieties asistentu."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "Bieži uzdotie jautājumi tika atzīmēti kā apstiprināti"
       },
       "OPTIONS": {
-        "APPROVE": "Atzīmēt kā apstiprinātu",
-        "EDIT_RESPONSE": "Rediģēt bieži uzdotos jautājumus",
-        "DELETE_RESPONSE": "Dzēst bieži uzdotos jautājumus"
+        "APPROVE": "Apstiprināt",
+        "EDIT_RESPONSE": "Rediģēt",
+        "DELETE_RESPONSE": "Dzēst"
       },
       "EMPTY_STATE": {
         "TITLE": "Bieži uzdoto jautājumu saraksti nav atrasti",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "Bieži uzdotie jautājumi palīdz Jūsu asistentam sniegt ātras un precīzas atbildes uz Jūsu klientu jautājumiem. Tos var ģenerēt automātiski no jūsu satura vai pievienot manuāli.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/lv/report.json b/app/javascript/dashboard/i18n/locale/lv/report.json
index b7a04d026..305da8164 100644
--- a/app/javascript/dashboard/i18n/locale/lv/report.json
+++ b/app/javascript/dashboard/i18n/locale/lv/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Pēdējās 7 dienas",
       "LAST_14_DAYS": "Pēdējās 14 dienas",
       "LAST_30_DAYS": "Pēdējās 30 dienas",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Pēdējie 3 mēneši",
       "LAST_6_MONTHS": "Pēdējie 6 mēneši",
       "LAST_YEAR": "Pagājušais gads",
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index 663754aec..78f7a4d12 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Konts Iesaldēts",
       "MESSAGE": "Jūsu konts ir iesaldēts. Lai iegūtu papildu informāciju, lūdzu, sazinieties ar atbalsta komandu."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Izrakstīties"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Dokumenti",
     "CAPTAIN_RESPONSES": "Bieži uzdotie jautājumi",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Iesūtnes",
+    "CAPTAIN_SETTINGS": "Iestatījumi",
     "HOME": "Sākums",
     "AGENTS": "Aģenti",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/ml/bulkActions.json b/app/javascript/dashboard/i18n/locale/ml/bulkActions.json
index d090ef440..5001d61c7 100644
--- a/app/javascript/dashboard/i18n/locale/ml/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ml/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "ലേബലുകളൊന്നും കണ്ടെത്തിയില്ല",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index 643cb7484..3b1e484b1 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "ഇല്ലാതാക്കുക",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "കോൺടാക്റ്റ് ഇല്ലാതാക്കുക"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrations.json b/app/javascript/dashboard/i18n/locale/ml/integrations.json
index e09e2008d..a9024de8f 100644
--- a/app/javascript/dashboard/i18n/locale/ml/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ml/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "വെബ്‌ഹുക്ക് യുആർഎൽ",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "ക്രമീകരണങ്ങൾ",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "എല്ലാം"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "എഡിറ്റുചെയ്യുക",
+        "DELETE_RESPONSE": "ഇല്ലാതാക്കുക"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ml/report.json b/app/javascript/dashboard/i18n/locale/ml/report.json
index 3416089ff..fbbcca17c 100644
--- a/app/javascript/dashboard/i18n/locale/ml/report.json
+++ b/app/javascript/dashboard/i18n/locale/ml/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "കഴിഞ്ഞ 7 ദിവസം",
       "LAST_14_DAYS": "കഴിഞ്ഞ 14 ദിവസം",
       "LAST_30_DAYS": "കഴിഞ്ഞ 30 ദിവസം",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "കഴിഞ്ഞ 3 മാസം",
       "LAST_6_MONTHS": "കഴിഞ്ഞ 6 മാസം",
       "LAST_YEAR": "കഴിഞ്ഞ വർഷം",
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 4fa67d25e..a745f4e84 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "ഇൻ‌ബോക്സുകൾ",
+    "CAPTAIN_SETTINGS": "ക്രമീകരണങ്ങൾ",
     "HOME": "ഹോം",
     "AGENTS": "ഏജന്റുമാർ",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/ms/bulkActions.json b/app/javascript/dashboard/i18n/locale/ms/bulkActions.json
index 18476066b..7856642f2 100644
--- a/app/javascript/dashboard/i18n/locale/ms/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ms/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ms/contact.json b/app/javascript/dashboard/i18n/locale/ms/contact.json
index 4e1c7a151..1db71f042 100644
--- a/app/javascript/dashboard/i18n/locale/ms/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ms/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Padamkan",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ms/integrations.json b/app/javascript/dashboard/i18n/locale/ms/integrations.json
index bc6839c3c..50cb231ba 100644
--- a/app/javascript/dashboard/i18n/locale/ms/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ms/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Padamkan"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ms/report.json b/app/javascript/dashboard/i18n/locale/ms/report.json
index e72366e45..a70387666 100644
--- a/app/javascript/dashboard/i18n/locale/ms/report.json
+++ b/app/javascript/dashboard/i18n/locale/ms/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/ms/settings.json b/app/javascript/dashboard/i18n/locale/ms/settings.json
index 57032fa82..712408895 100644
--- a/app/javascript/dashboard/i18n/locale/ms/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Ejen",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/ne/bulkActions.json b/app/javascript/dashboard/i18n/locale/ne/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/ne/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ne/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index ed976f2b9..ffdd5e917 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ne/integrations.json b/app/javascript/dashboard/i18n/locale/ne/integrations.json
index 9bdcfa2b2..c0ea2dbff 100644
--- a/app/javascript/dashboard/i18n/locale/ne/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ne/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ne/report.json b/app/javascript/dashboard/i18n/locale/ne/report.json
index 22e285c19..a2ad6bd4a 100644
--- a/app/javascript/dashboard/i18n/locale/ne/report.json
+++ b/app/javascript/dashboard/i18n/locale/ne/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index 28cc081e0..698e5476d 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/nl/bulkActions.json b/app/javascript/dashboard/i18n/locale/nl/bulkActions.json
index 770390a1f..9751d9dd6 100644
--- a/app/javascript/dashboard/i18n/locale/nl/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/nl/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Labels toewijzen",
-      "NO_LABELS_FOUND": "Geen labels gevonden voor",
+      "NO_LABELS_FOUND": "Geen labels gevonden",
       "ASSIGN_SELECTED_LABELS": "Geselecteerde labels toewijzen",
       "ASSIGN_SUCCESFUL": "Labels met succes toegewezen.",
       "ASSIGN_FAILED": "Toewijzen van labels mislukt, probeer het opnieuw."
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 063c40247..2361b29a4 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Label toewijzen",
+    "ASSIGN_LABELS_SUCCESS": "Labels met succes toegewezen.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Verwijderen",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Contactpersoon verwijderen"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/nl/integrations.json b/app/javascript/dashboard/i18n/locale/nl/integrations.json
index d75ac2e3a..648875252 100644
--- a/app/javascript/dashboard/i18n/locale/nl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/nl/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Instellingen",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Allemaal"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Bewerken",
+        "DELETE_RESPONSE": "Verwijderen"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/nl/report.json b/app/javascript/dashboard/i18n/locale/nl/report.json
index 821a4f86c..d10ce7d5e 100644
--- a/app/javascript/dashboard/i18n/locale/nl/report.json
+++ b/app/javascript/dashboard/i18n/locale/nl/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Afgelopen 7 dagen",
       "LAST_14_DAYS": "Afgelopen 14 dagen",
       "LAST_30_DAYS": "Laatste 30 dagen",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index e75351d6d..542998bac 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxen",
+    "CAPTAIN_SETTINGS": "Instellingen",
     "HOME": "Startpagina",
     "AGENTS": "Medewerkers",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/no/bulkActions.json b/app/javascript/dashboard/i18n/locale/no/bulkActions.json
index a44ef40bd..c3b4f429a 100644
--- a/app/javascript/dashboard/i18n/locale/no/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/no/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index a1b609899..aca6f22f7 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Slett",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/no/integrations.json b/app/javascript/dashboard/i18n/locale/no/integrations.json
index 80eb47d35..0266ca280 100644
--- a/app/javascript/dashboard/i18n/locale/no/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/no/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Innstillinger",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Alle"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Rediger",
+        "DELETE_RESPONSE": "Slett"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/no/report.json b/app/javascript/dashboard/i18n/locale/no/report.json
index 1cffe8c80..9dcfa688b 100644
--- a/app/javascript/dashboard/i18n/locale/no/report.json
+++ b/app/javascript/dashboard/i18n/locale/no/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Siste 7 dager",
       "LAST_14_DAYS": "Siste 14 dager",
       "LAST_30_DAYS": "Siste 30 dager",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index 7ed01e244..df9483f5a 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Innbokser",
+    "CAPTAIN_SETTINGS": "Innstillinger",
     "HOME": "Hjem",
     "AGENTS": "Agenter",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/pl/bulkActions.json b/app/javascript/dashboard/i18n/locale/pl/bulkActions.json
index ac6443a3c..dc20e5fd7 100644
--- a/app/javascript/dashboard/i18n/locale/pl/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/pl/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "Nie znaleziono etykiet dla",
+      "NO_LABELS_FOUND": "Brak wyników",
       "ASSIGN_SELECTED_LABELS": "Przypisz wybrane etykiety",
       "ASSIGN_SUCCESFUL": "Etykiety zostały pomyślnie przypisane.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index d5ca75c0f..6a42e130e 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Przypisz etykiety",
+    "ASSIGN_LABELS_SUCCESS": "Etykiety zostały pomyślnie przypisane.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Usuń",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Usuń kontakt"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/pl/integrations.json b/app/javascript/dashboard/i18n/locale/pl/integrations.json
index eab58299c..d5fe93b75 100644
--- a/app/javascript/dashboard/i18n/locale/pl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pl/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Adres URL webhooka",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Ustawienia",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Wszystkie"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edytuj",
+        "DELETE_RESPONSE": "Usuń"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/pl/report.json b/app/javascript/dashboard/i18n/locale/pl/report.json
index 75e475b07..9a82f5b8b 100644
--- a/app/javascript/dashboard/i18n/locale/pl/report.json
+++ b/app/javascript/dashboard/i18n/locale/pl/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Ostatnie 7 dni",
       "LAST_14_DAYS": "Ostatnie 14 dni",
       "LAST_30_DAYS": "Ostatnie 30 dni",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Ostatnie 3 miesiące",
       "LAST_6_MONTHS": "Ostatnie 6 miesięcy",
       "LAST_YEAR": "Ostatni rok",
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index 0314c4375..974e9c138 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Konto zawieszone",
       "MESSAGE": "Twoje konto zostało zawieszone. Skontaktuj się z zespołem pomocy technicznej w celu uzyskania dodatkowych informacji."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Zarządzanie skrzynkami",
+    "CAPTAIN_SETTINGS": "Ustawienia",
     "HOME": "Strona główna",
     "AGENTS": "Agenci",
     "AGENT_BOTS": "Boty",
diff --git a/app/javascript/dashboard/i18n/locale/pt/bulkActions.json b/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
index 13fa87837..dc587fc41 100644
--- a/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Atribuir etiquetas",
-      "NO_LABELS_FOUND": "Nenhuma etiqueta encontrada para",
+      "NO_LABELS_FOUND": "Nenhuma etiqueta encontrada",
       "ASSIGN_SELECTED_LABELS": "Atribuir etiquetas selecionadas",
       "ASSIGN_SUCCESFUL": "Etiquetas atribuídas com sucesso.",
       "ASSIGN_FAILED": "Falha ao atribuir etiquetas. Por favor, tente novamente."
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 953566d1b..a7f717814 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "Neste momento não há contactos ativos 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Atribuir etiquetas",
+    "ASSIGN_LABELS_SUCCESS": "Etiquetas atribuídas com sucesso.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Selecionar todas ({count})",
+    "DELETE_CONTACTS": "Excluir",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Excluir contacto"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrations.json b/app/javascript/dashboard/i18n/locale/pt/integrations.json
index 992991440..59aea1d3b 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversa: a escrever desligada"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "URL do webhook",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Não foi possível encontrar o assistente. Por favor, tente novamente."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Configurações",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Selecionar todas ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Selecionar todas ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Selecionar todas ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Todas"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Editar",
+        "DELETE_RESPONSE": "Excluir"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/pt/report.json b/app/javascript/dashboard/i18n/locale/pt/report.json
index 44796931d..43b97d46d 100644
--- a/app/javascript/dashboard/i18n/locale/pt/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Últimos 7 Dias",
       "LAST_14_DAYS": "Últimos 14 Dias",
       "LAST_30_DAYS": "Últimos 30 Dias",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Últimos 3 meses",
       "LAST_6_MONTHS": "Últimos 6 meses",
       "LAST_YEAR": "Último ano",
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 8e71ed9a2..7c2ae657c 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Conta Suspensa",
       "MESSAGE": "A sua conta está suspensa. Entre em contato com a equipa de suporte para obter mais informações."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Ferramentas",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Caixas de Entrada",
+    "CAPTAIN_SETTINGS": "Configurações",
     "HOME": "Principal",
     "AGENTS": "Agentes",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json b/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
index e4153129c..2f17d25a0 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Atribuir rótulo",
-      "NO_LABELS_FOUND": "Não há etiquetas encontradas para",
+      "NO_LABELS_FOUND": "Nenhuma etiqueta encontrada",
       "ASSIGN_SELECTED_LABELS": "Atribuir etiquetas selecionadas",
       "ASSIGN_SUCCESFUL": "Rótulos atribuídos com sucesso.",
       "ASSIGN_FAILED": "Falha ao atribuir etiquetas. Por favor, tente novamente."
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 042c0c97a..a73c32f4c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "Nenhum contato está ativo no momento 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Atribuir rótulo",
+    "ASSIGN_LABELS_SUCCESS": "Rótulos atribuídos com sucesso.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selecionado",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Selecionar todos ({count})",
+    "DELETE_CONTACTS": "Excluir",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Excluir contato"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "Não foi possível completar a pesquisa. Por favor, tente novamente."
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index dcf40b7e5..6abfffa12 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Status de Digitação desativado"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "URL do Webhook",
           "PLACEHOLDER": "Exemplo: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Capitão",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistentes",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copiloto",
       "TRY_THESE_PROMPTS": "Experimente estes comandos",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Não foi possível encontrar o assistente. Tente novamente."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistente"
-        },
+        "HEADER": "Configurações",
         "BASIC_SETTINGS": {
           "TITLE": "Configurações básicas",
           "DESCRIPTION": "Personalize o que o assistente diz quando termina uma conversa ou transfere para um humano."
@@ -502,15 +510,16 @@
               "TITLE": "Proteções",
               "DESCRIPTION": "Mantém as coisas no caminho — apenas os tipos de perguntas que você quer que seu assistente responda, nada fora de limites ou fora do tópico."
             },
-            "SCENARIOS": {
-              "TITLE": "Cenários",
-              "DESCRIPTION": "Dê algum contexto ao seu assistente — como \"o que fazer quando um usuário estiver com problemas\", ou \"como agir durante uma solicitação de reembolso\"."
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Diretrizes de resposta",
               "DESCRIPTION": "O jeito e a estrutura das respostas do seu assistente — tranquilo e amigável? Curto e ágil? Detalhado e formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Excluir Assistente",
+          "DESCRIPTION": "Esta ação é permanente. Excluir este assistente irá removê-lo de todas as caixas de entrada conectadas e apagará permanentemente todo o conhecimento gerado.",
+          "BUTTON_TEXT": "Excluir {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Proteções",
         "DESCRIPTION": "Mantém as coisas no caminho — apenas os tipos de perguntas que você quer que seu assistente responda, nada fora de limites ou fora do tópico.",
-        "BREADCRUMB": {
-          "TITLE": "Proteções"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selecionado | {count} itens selecionados",
           "SELECT_ALL": "Selecionar todos ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Diretrizes de Resposta",
         "DESCRIPTION": "O jeito e a estrutura das respostas do seu assistente — tranquilo e amigável? Curto e ágil? Detalhado e formal?",
-        "BREADCRUMB": {
-          "TITLE": "Diretrizes de Resposta"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selecionado | {count} itens selecionados",
           "SELECT_ALL": "Selecionar todos ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Cenários",
         "DESCRIPTION": "Dê algum contexto ao seu assistente — como \"o que fazer quando um usuário estiver com problemas\", ou \"como agir durante uma solicitação de reembolso\".",
-        "BREADCRUMB": {
-          "TITLE": "Cenários"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selecionado | {count} itens selecionados",
           "SELECT_ALL": "Selecionar todos ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Nome do documento (opcional)",
           "PLACEHOLDER": "Insira um nome para o documento"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistente",
-          "PLACEHOLDER": "Selecione o assistente",
-          "ERROR": "O campo Assistente é obrigatório"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Criar nova FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversação #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Aceito",
         "ALL": "Todos"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Adicione uma pergunta e sua resposta correspondente à base de conhecimento e selecione o assistente ao qual deve estar associado.",
       "CREATE": {
         "TITLE": "Adicionar uma FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Responder",
           "PLACEHOLDER": "Digite a resposta aqui",
           "ERROR": "Por favor, forneça uma resposta válida."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistente",
-          "PLACEHOLDER": "Selecione um assistente",
-          "ERROR": "Por favor, selecione um assistente."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "As Perguntas Frequentes foram marcadas como aprovadas"
       },
       "OPTIONS": {
-        "APPROVE": "Marcar como aprovado",
-        "EDIT_RESPONSE": "Editar Perguntas Frequentes",
-        "DELETE_RESPONSE": "Excluir FAQ"
+        "APPROVE": "Aprovar",
+        "EDIT_RESPONSE": "Alterar",
+        "DELETE_RESPONSE": "Excluir"
       },
       "EMPTY_STATE": {
         "TITLE": "Nenhuma FAQ encontrada",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "Perguntas Frequentes ajudam seu assistente a fornecer respostas rápidas e precisas para perguntas de seus clientes. Eles podem ser gerados automaticamente a partir do seu conteúdo ou podem ser adicionados manualmente.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/report.json b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
index 7f1140fdd..426e895c1 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Últimos 7 dias",
       "LAST_14_DAYS": "Últimos 14 dias",
       "LAST_30_DAYS": "Últimos 30 dias",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Últimos 3 meses",
       "LAST_6_MONTHS": "Últimos 6 meses",
       "LAST_YEAR": "Ano passado",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 8c4f3050c..b3afb42d0 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Conta Suspensa",
       "MESSAGE": "Sua conta está suspensa. Entre em contato com a equipe de suporte para obter mais informações."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Encerrar sessão"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documentos",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Ferramentas",
+    "CAPTAIN_SCENARIOS": "Cenários",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Caixas de Entrada",
+    "CAPTAIN_SETTINGS": "Configurações",
     "HOME": "Principal",
     "AGENTS": "Agentes",
     "AGENT_BOTS": "Robôs",
diff --git a/app/javascript/dashboard/i18n/locale/ro/bulkActions.json b/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
index 32dc20728..f74467707 100644
--- a/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "Nu s-au găsit etichete pentru",
+      "NO_LABELS_FOUND": "Nu s-au găsit etichete",
       "ASSIGN_SELECTED_LABELS": "Atribuiți etichetele selectate",
       "ASSIGN_SUCCESFUL": "Etichete atribuite cu succes.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index cf81bb995..6dab83a37 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Atribuiți etichete",
+    "ASSIGN_LABELS_SUCCESS": "Etichete atribuite cu succes.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Şterge",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Șterge contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrations.json b/app/javascript/dashboard/i18n/locale/ro/integrations.json
index bd460905d..cb5ffc802 100644
--- a/app/javascript/dashboard/i18n/locale/ro/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ro/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "URL Webhook",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Setări",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Toate"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Editare",
+        "DELETE_RESPONSE": "Şterge"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ro/report.json b/app/javascript/dashboard/i18n/locale/ro/report.json
index 9c712852f..a41f15393 100644
--- a/app/javascript/dashboard/i18n/locale/ro/report.json
+++ b/app/javascript/dashboard/i18n/locale/ro/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Ultimele 7 zile",
       "LAST_14_DAYS": "Ultimele 14 zile",
       "LAST_30_DAYS": "Ultimele 30 zile",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Ultimele 3 luni",
       "LAST_6_MONTHS": "Ultimele 6 luni",
       "LAST_YEAR": "Anul trecut",
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index def3181f6..7c976827d 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Cont suspendat",
       "MESSAGE": "Contul tău este suspendat. Vă rugăm să contactați echipa de asistență pentru mai multe informații."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Căsuțe",
+    "CAPTAIN_SETTINGS": "Setări",
     "HOME": "Acasa",
     "AGENTS": "Agenți",
     "AGENT_BOTS": "Boți",
diff --git a/app/javascript/dashboard/i18n/locale/ru/bulkActions.json b/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
index ebd1975db..a11844008 100644
--- a/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Назначить метки",
-      "NO_LABELS_FOUND": "Нет меток для",
+      "NO_LABELS_FOUND": "Метки не найдены",
       "ASSIGN_SELECTED_LABELS": "Назначить выбранные метки",
       "ASSIGN_SUCCESFUL": "Метки успешно назначены.",
       "ASSIGN_FAILED": "Не удалось назначить метки, пожалуйста, попробуйте снова."
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index a8a692f31..8b2a8d862 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "В данный момент нет активных контактов 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Назначить метки",
+    "ASSIGN_LABELS_SUCCESS": "Метки успешно назначены.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "Выбрано {count}",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Выбрать все ({count})",
+    "DELETE_CONTACTS": "Удалить",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Удалить контакт"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "Поиск не удался. Пожалуйста, попробуйте еще раз."
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index 4f035ea81..d27942627 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Печатание во время разговора выключено"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "URL вебхука",
           "PLACEHOLDER": "Пример: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Капитан",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Ассистенты",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Попробуйте эти запросы",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Не удалось найти помощника. Пожалуйста, попробуйте еще раз."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Ассистент"
-        },
+        "HEADER": "Настройки",
         "BASIC_SETTINGS": {
           "TITLE": "Основные настройки",
           "DESCRIPTION": "Настройте то, что говорит ассистент, завершая диалог или передавая человеку."
@@ -502,15 +510,16 @@
               "TITLE": "Ограждения",
               "DESCRIPTION": "Сохраняет вещи в нужном контексте — только те вопросы, которые вы хотите, чтобы ваш ассистент отвечал, ничего запрещённого или не по теме."
             },
-            "SCENARIOS": {
-              "TITLE": "Сценарии",
-              "DESCRIPTION": "Дайте своему ассистенту определенный контекст, например «что делать, когда пользователь застрял» или «как действовать во время запроса на возмещение»."
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Рекомендации по ответу",
               "DESCRIPTION": "Вайб и структура ответов помощника – ясные и дружелюбные? Коротко и непросто? Детально и формально?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Удалить ассистента",
+          "DESCRIPTION": "Это действие необратимо. Удаление этого ассистента удалит его из всех подключенных источников и навсегда удалит все сгенерированные знания.",
+          "BUTTON_TEXT": "Удалить {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Ограждения",
         "DESCRIPTION": "Сохраняет вещи в нужном контексте — только те вопросы, которые вы хотите, чтобы ваш ассистент отвечал, ничего запрещённого или не по теме.",
-        "BREADCRUMB": {
-          "TITLE": "Ограждения"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} элемент выбран | {count} элементов выбрано",
           "SELECT_ALL": "Выбрать все ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Руководство по ограждению",
         "DESCRIPTION": "Вайб и структура ответов помощника – ясные и дружелюбные? Коротко и непросто? Детально и формально?",
-        "BREADCRUMB": {
-          "TITLE": "Руководство по ограждению"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} элемент выбран | {count} элементов выбрано",
           "SELECT_ALL": "Выбрать все ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Сценарии",
         "DESCRIPTION": "Дайте своему ассистенту определенный контекст, например «что делать, когда пользователь застрял» или «как действовать во время запроса на возмещение».",
-        "BREADCRUMB": {
-          "TITLE": "Сценарии"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} элемент выбран | {count} элементов выбрано",
           "SELECT_ALL": "Выбрать все ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Название документа (необязательно)",
           "PLACEHOLDER": "Введите название документа"
-        },
-        "ASSISTANT": {
-          "LABEL": "Ассистент",
-          "PLACEHOLDER": "Выберите ассистента",
-          "ERROR": "Необходимо заполнить поле ассистента"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQ",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Создать новый FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Диалог #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Одобрено",
         "ALL": "Все"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Добавьте вопрос и соответствующий ему ответ в базу знаний и выберите ассистента, с которым он должен связаться.",
       "CREATE": {
         "TITLE": "Добавить FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Ответ",
           "PLACEHOLDER": "Введите ответ",
           "ERROR": "Пожалуйста, введите корректный ответ."
-        },
-        "ASSISTANT": {
-          "LABEL": "Ассистент",
-          "PLACEHOLDER": "Выбрать ассистента",
-          "ERROR": "Выбрать ассистента"
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "FAQ был отмечен как одобренный"
       },
       "OPTIONS": {
-        "APPROVE": "Отметить как одобренный",
-        "EDIT_RESPONSE": "FAQ отмечен как одобренный",
-        "DELETE_RESPONSE": "Удалить FAQ"
+        "APPROVE": "Одобрить",
+        "EDIT_RESPONSE": "Редактировать",
+        "DELETE_RESPONSE": "Удалить"
       },
       "EMPTY_STATE": {
         "TITLE": "FAQ не найдены",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQ помогают вашему ассистенту быстро и точно отвечать на вопросы клиентов. Их можно генерировать автоматически из вашего контента или добавлять вручную.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ru/report.json b/app/javascript/dashboard/i18n/locale/ru/report.json
index c01aa0b0c..abb9be29b 100644
--- a/app/javascript/dashboard/i18n/locale/ru/report.json
+++ b/app/javascript/dashboard/i18n/locale/ru/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Последние 7 дней",
       "LAST_14_DAYS": "Последние 14 дней",
       "LAST_30_DAYS": "Последние 30 дней",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Последние 3 месяца",
       "LAST_6_MONTHS": "Последние 6 месяцев",
       "LAST_YEAR": "За прошлый год",
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 6215481fe..9c9b7ea59 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Аккаунт заблокирован",
       "MESSAGE": "Ваша учетная запись приостановлена. Пожалуйста, обратитесь в службу поддержки для получения дополнительной информации."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Выйти из системы"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Документы",
     "CAPTAIN_RESPONSES": "FAQ",
     "CAPTAIN_TOOLS": "Инструменты",
+    "CAPTAIN_SCENARIOS": "Сценарии",
+    "CAPTAIN_PLAYGROUND": "Площадка",
+    "CAPTAIN_INBOXES": "Источники",
+    "CAPTAIN_SETTINGS": "Настройки",
     "HOME": "Главная",
     "AGENTS": "Операторы",
     "AGENT_BOTS": "Боты",
diff --git a/app/javascript/dashboard/i18n/locale/sh/bulkActions.json b/app/javascript/dashboard/i18n/locale/sh/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/sh/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sh/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sh/contact.json b/app/javascript/dashboard/i18n/locale/sh/contact.json
index 7b8618ad7..f0c63eaf5 100644
--- a/app/javascript/dashboard/i18n/locale/sh/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sh/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sh/integrations.json b/app/javascript/dashboard/i18n/locale/sh/integrations.json
index 081ddbde8..983953180 100644
--- a/app/javascript/dashboard/i18n/locale/sh/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sh/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/sh/report.json b/app/javascript/dashboard/i18n/locale/sh/report.json
index 22e285c19..a2ad6bd4a 100644
--- a/app/javascript/dashboard/i18n/locale/sh/report.json
+++ b/app/javascript/dashboard/i18n/locale/sh/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/sh/settings.json b/app/javascript/dashboard/i18n/locale/sh/settings.json
index 812b0cd8b..50cf38b58 100644
--- a/app/javascript/dashboard/i18n/locale/sh/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/sk/bulkActions.json b/app/javascript/dashboard/i18n/locale/sk/bulkActions.json
index 848c4d7c6..7dee27773 100644
--- a/app/javascript/dashboard/i18n/locale/sk/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sk/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "Žiadne označenia neboli nájdené",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index d9fb176be..9e08065d0 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Vymazať",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Vymazať kontakt"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrations.json b/app/javascript/dashboard/i18n/locale/sk/integrations.json
index efb87fb1b..df29ccdbc 100644
--- a/app/javascript/dashboard/i18n/locale/sk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sk/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Nastavenia",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Všetko"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Upraviť",
+        "DELETE_RESPONSE": "Vymazať"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/sk/report.json b/app/javascript/dashboard/i18n/locale/sk/report.json
index 882ed9cab..65d7182d0 100644
--- a/app/javascript/dashboard/i18n/locale/sk/report.json
+++ b/app/javascript/dashboard/i18n/locale/sk/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Posledných 7 dní",
       "LAST_14_DAYS": "Posledných 14 dní",
       "LAST_30_DAYS": "Posledných 30 dní",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Posledné 3 mesiace",
       "LAST_6_MONTHS": "Posledných 6 mesiacov",
       "LAST_YEAR": "Posledný rok",
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index 719146e9e..7fc93a668 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Nastavenia",
     "HOME": "Home",
     "AGENTS": "Agenti",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/sl/bulkActions.json b/app/javascript/dashboard/i18n/locale/sl/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/sl/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sl/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sl/contact.json b/app/javascript/dashboard/i18n/locale/sl/contact.json
index a934ab690..d58c5c3d1 100644
--- a/app/javascript/dashboard/i18n/locale/sl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sl/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sl/integrations.json b/app/javascript/dashboard/i18n/locale/sl/integrations.json
index 660e1cf2c..ea4c1822a 100644
--- a/app/javascript/dashboard/i18n/locale/sl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sl/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Vse"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/sl/report.json b/app/javascript/dashboard/i18n/locale/sl/report.json
index efcfb05af..6aaaabb7e 100644
--- a/app/javascript/dashboard/i18n/locale/sl/report.json
+++ b/app/javascript/dashboard/i18n/locale/sl/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/sl/settings.json b/app/javascript/dashboard/i18n/locale/sl/settings.json
index b5df89409..ab3ecd93b 100644
--- a/app/javascript/dashboard/i18n/locale/sl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sl/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Boti",
diff --git a/app/javascript/dashboard/i18n/locale/sq/bulkActions.json b/app/javascript/dashboard/i18n/locale/sq/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/sq/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sq/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sq/contact.json b/app/javascript/dashboard/i18n/locale/sq/contact.json
index 92686896f..65c6f1eff 100644
--- a/app/javascript/dashboard/i18n/locale/sq/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sq/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "Asnjë kontakt nuk është aktiv për momentin 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sq/integrations.json b/app/javascript/dashboard/i18n/locale/sq/integrations.json
index 7e94c3097..ae72f4974 100644
--- a/app/javascript/dashboard/i18n/locale/sq/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sq/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Kufizime",
         "DESCRIPTION": "I mban gjërat në vijë—vetëm llojet e pyetjeve që dëshironi që asistenti juaj t’u përgjigjet, asgjë e ndaluar apo jashtë teme.",
-        "BREADCRUMB": {
-          "TITLE": "Kufizime"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Zgjidh të gjitha ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "Stili dhe struktura e përgjigjeve të asistentit tuaj—të qarta dhe miqësore? Të shkurtra dhe koncize? Të detajuara dhe formale?",
-        "BREADCRUMB": {
-          "TITLE": "Udhëzime për përgjigjet"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count, plural, one {{count} element i përzgjedhur} other {{count} elemente të përzgjedhura}}",
           "SELECT_ALL": "Zgjidh të gjitha ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Skenarë",
         "DESCRIPTION": "Jepini asistentit pak kontekst—si p.sh. “çfarë të bëjë kur një përdorues ngec” ose “si të veprojë gjatë një kërkese për rimbursim”.",
-        "BREADCRUMB": {
-          "TITLE": "Skenarë"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count, plural, one {{count} element i përzgjedhur} other {{count} elemente të përzgjedhura}}",
           "SELECT_ALL": "Zgjidh të gjitha ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/sq/report.json b/app/javascript/dashboard/i18n/locale/sq/report.json
index 4ac743070..bee450314 100644
--- a/app/javascript/dashboard/i18n/locale/sq/report.json
+++ b/app/javascript/dashboard/i18n/locale/sq/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/sq/settings.json b/app/javascript/dashboard/i18n/locale/sq/settings.json
index a05b4a5d8..bbe97e7bc 100644
--- a/app/javascript/dashboard/i18n/locale/sq/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sq/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Skenarë",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/sr/bulkActions.json b/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
index 4a2ba9cef..22ec6d65a 100644
--- a/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "Nije pronađena nijedna oznaka",
+      "NO_LABELS_FOUND": "Oznake nisu pronađene",
       "ASSIGN_SELECTED_LABELS": "Dodeli izabrane oznake",
       "ASSIGN_SUCCESFUL": "Oznake su uspešno dodeljene.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sr/contact.json b/app/javascript/dashboard/i18n/locale/sr/contact.json
index 9affc114a..720f7c3c7 100644
--- a/app/javascript/dashboard/i18n/locale/sr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sr/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Dodeli oznake",
+    "ASSIGN_LABELS_SUCCESS": "Oznake su uspešno dodeljene.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Izbriši",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Obriši kontakt"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sr/integrations.json b/app/javascript/dashboard/i18n/locale/sr/integrations.json
index ab939f0d1..82e116cff 100644
--- a/app/javascript/dashboard/i18n/locale/sr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sr/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Adresa veb zakačke",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Podešavanja",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Sve"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Uredi",
+        "DELETE_RESPONSE": "Izbriši"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/sr/report.json b/app/javascript/dashboard/i18n/locale/sr/report.json
index 5c2d928c7..94048d504 100644
--- a/app/javascript/dashboard/i18n/locale/sr/report.json
+++ b/app/javascript/dashboard/i18n/locale/sr/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Poslednjih 7 dana",
       "LAST_14_DAYS": "Poslednjih 14 dana",
       "LAST_30_DAYS": "Poslednjih 30 dana",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Poslednja 3 meseca",
       "LAST_6_MONTHS": "Poslednjih 6 meseci",
       "LAST_YEAR": "Poslednja godina",
diff --git a/app/javascript/dashboard/i18n/locale/sr/settings.json b/app/javascript/dashboard/i18n/locale/sr/settings.json
index 2bcf552c1..fd70709da 100644
--- a/app/javascript/dashboard/i18n/locale/sr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Nalog je suspendovan",
       "MESSAGE": "Vaš nalog je suspendovan. Molim vas kontaktirajte tim za podršku za dodatne informacije."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Prijemni sandučići",
+    "CAPTAIN_SETTINGS": "Podešavanja",
     "HOME": "Početak",
     "AGENTS": "Agenti",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/sv/bulkActions.json b/app/javascript/dashboard/i18n/locale/sv/bulkActions.json
index d45ef775c..3748497cb 100644
--- a/app/javascript/dashboard/i18n/locale/sv/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sv/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "Inga etiketter hittades",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index 8eaad0db0..1ae324823 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Radera",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Ta bort kontakt"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/sv/integrations.json b/app/javascript/dashboard/i18n/locale/sv/integrations.json
index a77873a93..af76bd0f1 100644
--- a/app/javascript/dashboard/i18n/locale/sv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sv/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Inställningar",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Alla"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Redigera",
+        "DELETE_RESPONSE": "Radera"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/sv/report.json b/app/javascript/dashboard/i18n/locale/sv/report.json
index 6768aaa8b..3f0b24c94 100644
--- a/app/javascript/dashboard/i18n/locale/sv/report.json
+++ b/app/javascript/dashboard/i18n/locale/sv/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "De senaste 7 dagarna",
       "LAST_14_DAYS": "De senaste 14 dagarna",
       "LAST_30_DAYS": "De senaste 30 dagarna",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index f545647b2..da9d452da 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inkorgar",
+    "CAPTAIN_SETTINGS": "Inställningar",
     "HOME": "Hem",
     "AGENTS": "Agenter",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/ta/bulkActions.json b/app/javascript/dashboard/i18n/locale/ta/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/ta/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ta/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index fe2841ec5..8d62b2bc8 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ta/integrations.json b/app/javascript/dashboard/i18n/locale/ta/integrations.json
index 8f4a50584..2c5a40fbb 100644
--- a/app/javascript/dashboard/i18n/locale/ta/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ta/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "வெப்ஹூக் URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "அமைப்புகள்",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "எல்லாம்"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "திருத்து",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ta/report.json b/app/javascript/dashboard/i18n/locale/ta/report.json
index 68b0af4fc..2a8f390fe 100644
--- a/app/javascript/dashboard/i18n/locale/ta/report.json
+++ b/app/javascript/dashboard/i18n/locale/ta/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "கடந்த 7 நாட்கள்",
       "LAST_14_DAYS": "கடந்த 14 நாட்கள்",
       "LAST_30_DAYS": "கடந்த 30 நாட்கள்",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index 8881d2028..3d25fc4d0 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "இன்பாக்ஸ்கள்",
+    "CAPTAIN_SETTINGS": "அமைப்புகள்",
     "HOME": "முகப்பு",
     "AGENTS": "ஏஜென்ட்கள்",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/th/bulkActions.json b/app/javascript/dashboard/i18n/locale/th/bulkActions.json
index 3c5393320..054da7b28 100644
--- a/app/javascript/dashboard/i18n/locale/th/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/th/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "ไม่พบหัวข้อ",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index 18d3b07b4..a09661451 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "ลบ",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "ลบผู้ติดต่อ"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/th/integrations.json b/app/javascript/dashboard/i18n/locale/th/integrations.json
index 5fc74f233..84b5c19e2 100644
--- a/app/javascript/dashboard/i18n/locale/th/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/th/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "ลิ้ง Webhook",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "ตั้งค่า",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "ทั้งหมด"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "เเก้ไข",
+        "DELETE_RESPONSE": "ลบ"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/th/report.json b/app/javascript/dashboard/i18n/locale/th/report.json
index beb3b7a33..2a042a17c 100644
--- a/app/javascript/dashboard/i18n/locale/th/report.json
+++ b/app/javascript/dashboard/i18n/locale/th/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "7 วันที่ผ่านมา",
       "LAST_14_DAYS": "14 วันที่ผ่านมา",
       "LAST_30_DAYS": "30 วันที่ผ่านมา",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "3 เดือนที่ผ่านมา",
       "LAST_6_MONTHS": "6 เดือนที่ผ่านมา",
       "LAST_YEAR": "ปีที่ผ่านมา",
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index 065d9fcb2..ede5c3cdf 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "กล่องข้อความ",
+    "CAPTAIN_SETTINGS": "ตั้งค่า",
     "HOME": "หน้าหลัก",
     "AGENTS": "พนักงาน",
     "AGENT_BOTS": "บอท",
diff --git a/app/javascript/dashboard/i18n/locale/tl/bulkActions.json b/app/javascript/dashboard/i18n/locale/tl/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/tl/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/tl/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/tl/contact.json b/app/javascript/dashboard/i18n/locale/tl/contact.json
index 54d783efc..7ca051092 100644
--- a/app/javascript/dashboard/i18n/locale/tl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tl/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/tl/integrations.json b/app/javascript/dashboard/i18n/locale/tl/integrations.json
index 6c1c9e484..ef3e94e42 100644
--- a/app/javascript/dashboard/i18n/locale/tl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tl/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/tl/report.json b/app/javascript/dashboard/i18n/locale/tl/report.json
index c622170b0..dbf59f603 100644
--- a/app/javascript/dashboard/i18n/locale/tl/report.json
+++ b/app/javascript/dashboard/i18n/locale/tl/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/tl/settings.json b/app/javascript/dashboard/i18n/locale/tl/settings.json
index 812b0cd8b..50cf38b58 100644
--- a/app/javascript/dashboard/i18n/locale/tl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tl/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
index 28ab82469..3e059d236 100644
--- a/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
@@ -13,7 +13,7 @@
       "TEXT": "Metin",
       "NUMBER": "Sayı",
       "LINK": "Bağlantı",
-      "DATE": "Date",
+      "DATE": "Tarih",
       "LIST": "Liste",
       "CHECKBOX": "Onay Kutusu"
     },
diff --git a/app/javascript/dashboard/i18n/locale/tr/bulkActions.json b/app/javascript/dashboard/i18n/locale/tr/bulkActions.json
index 2a5ee73e2..da26f2052 100644
--- a/app/javascript/dashboard/i18n/locale/tr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/tr/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Etiket atama",
-      "NO_LABELS_FOUND": "İçin etiket bulunamadı",
+      "NO_LABELS_FOUND": "Etiket bulunamadı",
       "ASSIGN_SELECTED_LABELS": "Seçili etiketleri atama",
       "ASSIGN_SUCCESFUL": "Etiketler başarıyla atandı.",
       "ASSIGN_FAILED": "Etiketler atanırken bir hata oluştu. Lütfen tekrar deneyin."
diff --git a/app/javascript/dashboard/i18n/locale/tr/campaign.json b/app/javascript/dashboard/i18n/locale/tr/campaign.json
index 0eafec38c..ba7baf98d 100644
--- a/app/javascript/dashboard/i18n/locale/tr/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/tr/campaign.json
@@ -1,26 +1,26 @@
 {
   "CAMPAIGN": {
     "LIVE_CHAT": {
-      "HEADER_TITLE": "Live chat campaigns",
-      "NEW_CAMPAIGN": "Create campaign",
+      "HEADER_TITLE": "Canlı sohbet kampanyaları",
+      "NEW_CAMPAIGN": "Kampanya Oluştur",
       "CARD": {
         "STATUS": {
           "ENABLED": "Etkin",
           "DISABLED": "Devre dışı"
         },
         "CAMPAIGN_DETAILS": {
-          "SENT_BY": "Tarafından gönderildi",
+          "SENT_BY": "Gönderen",
           "BOT": "Bot",
           "FROM": "dan",
           "URL": "URL:"
         }
       },
       "EMPTY_STATE": {
-        "TITLE": "No live chat campaigns are available",
-        "SUBTITLE": "Connect with your customers using proactive messages.  Click 'Create campaign' to get started."
+        "TITLE": "Canlı sohbet kampanyası mevcut değil",
+        "SUBTITLE": "Proaktif mesajlar kullanarak müşterilerinizle iletişim kurun. Başlamak için 'Kampanya Oluştur' butonuna tıklayın."
       },
       "CREATE": {
-        "TITLE": "Create a live chat campaign",
+        "TITLE": "Canlı sohbet kampanyası oluşturun",
         "CANCEL_BUTTON_TEXT": "İptal Et",
         "CREATE_BUTTON_TEXT": "Yarat",
         "FORM": {
@@ -41,7 +41,7 @@
           },
           "SENT_BY": {
             "LABEL": "Tarafından gönderildi",
-            "PLACEHOLDER": "Please select sender",
+            "PLACEHOLDER": "Lütfen göndereni seçin",
             "ERROR": "Gönderen bilgisi gerekli"
           },
           "END_POINT": {
@@ -55,25 +55,25 @@
             "ERROR": "Yayın süresi seçiniz"
           },
           "OTHER_PREFERENCES": {
-            "TITLE": "Other preferences",
+            "TITLE": "Diğer tercihler",
             "ENABLED": "Kampanyayı başlat",
             "TRIGGER_ONLY_BUSINESS_HOURS": "Sadece çalışma saatleri içerisinde tetikle"
           },
           "BUTTONS": {
-            "CREATE": "Yarat",
+            "CREATE": "Oluştur",
             "CANCEL": "İptal Et"
           },
           "API": {
-            "SUCCESS_MESSAGE": "Live chat campaign created successfully",
+            "SUCCESS_MESSAGE": "Canlı sohbet kampanyası başarıyla oluşturuldu",
             "ERROR_MESSAGE": "Bir hata oluştu, lütfen tekrar deneyin."
           }
         }
       },
       "EDIT": {
-        "TITLE": "Edit live chat campaign",
+        "TITLE": "Canlı sohbet kampanyasını düzenle",
         "FORM": {
           "API": {
-            "SUCCESS_MESSAGE": "Live chat campaign updated successfully",
+            "SUCCESS_MESSAGE": "Canlı sohbet kampanyası başarıyla güncellendi",
             "ERROR_MESSAGE": "Bir hata oluştu, lütfen tekrar deneyin."
           }
         }
@@ -81,7 +81,7 @@
     },
     "SMS": {
       "HEADER_TITLE": "SMS campaigns",
-      "NEW_CAMPAIGN": "Create campaign",
+      "NEW_CAMPAIGN": "Kampanya oluştur",
       "EMPTY_STATE": {
         "TITLE": "No SMS campaigns are available",
         "SUBTITLE": "Launch an SMS campaign to reach your customers directly. Send offers or make announcements with ease. Click 'Create campaign' to get started."
@@ -89,7 +89,7 @@
       "CARD": {
         "STATUS": {
           "COMPLETED": "Tamamlandı",
-          "SCHEDULED": "Scheduled"
+          "SCHEDULED": "Planlanmış"
         },
         "CAMPAIGN_DETAILS": {
           "SENT_FROM": "Sent from",
@@ -99,7 +99,7 @@
       "CREATE": {
         "TITLE": "Create SMS campaign",
         "CANCEL_BUTTON_TEXT": "İptal Et",
-        "CREATE_BUTTON_TEXT": "Yarat",
+        "CREATE_BUTTON_TEXT": "Oluştur",
         "FORM": {
           "TITLE": {
             "LABEL": "Başlık",
@@ -127,11 +127,11 @@
             "ERROR": "Planlanan zaman seçimi gerekli"
           },
           "BUTTONS": {
-            "CREATE": "Yarat",
+            "CREATE": "Oluştur",
             "CANCEL": "İptal Et"
           },
           "API": {
-            "SUCCESS_MESSAGE": "SMS campaign created successfully",
+            "SUCCESS_MESSAGE": "SMS kampanyası başarıyla oluşturuldu",
             "ERROR_MESSAGE": "Bir hata oluştu, lütfen tekrar deneyin."
           }
         }
@@ -147,7 +147,7 @@
       "CARD": {
         "STATUS": {
           "COMPLETED": "Tamamlandı",
-          "SCHEDULED": "Scheduled"
+          "SCHEDULED": "Planlanmış"
         },
         "CAMPAIGN_DETAILS": {
           "SENT_FROM": "Sent from",
@@ -191,7 +191,7 @@
             "ERROR": "Planlanan zaman seçimi gerekli"
           },
           "BUTTONS": {
-            "CREATE": "Yarat",
+            "CREATE": "Oluştur",
             "CANCEL": "İptal Et"
           },
           "API": {
@@ -203,7 +203,7 @@
     },
     "CONFIRM_DELETE": {
       "TITLE": "Silmek istediğinizden emin misiniz?",
-      "DESCRIPTION": "The delete action is permanent and cannot be reversed.",
+      "DESCRIPTION": "Silme işlemi kalıcıdır ve geri alınamaz.",
       "CONFIRM": "Sil",
       "API": {
         "SUCCESS_MESSAGE": "Kampanya başarıyla silindi",
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index a7ea52716..2ef72416f 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "Şu anda aktif kişi yok 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Etiketler başarıyla atandı.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Seçimi temizle",
+    "SELECT_ALL": "Tümünü seç ({count})",
+    "DELETE_CONTACTS": "Sil",
+    "DELETE_SUCCESS": "Kişiler başarıyla silindi.",
+    "DELETE_FAILED": "Kişiler silinemedi.",
+    "DELETE_DIALOG": {
+      "TITLE": "Seçilen kişileri sil",
+      "SINGULAR_TITLE": "Seçilen kişiyi sil",
+      "DESCRIPTION": "Bu işlem, seçilen {count} kişileri kalıcı olarak silecektir. Bu eylem geri alınamaz.",
+      "SINGULAR_DESCRIPTION": "Bu işlem, seçilen kişiyi kalıcı olarak silecektir. Bu eylem geri alınamaz.",
+      "CONFIRM_MULTIPLE": "Kişileri sil",
+      "CONFIRM_SINGLE": "Kişiyi Sil"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index 719028fc4..570bf19ac 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -32,7 +32,7 @@
     "LOADING_CONVERSATIONS": "Sohbetler Yükleniyor\n",
     "CANNOT_REPLY": "Nedeniyle cevap veremezsiniz",
     "24_HOURS_WINDOW": "24 saat mesaj penceresi kısıtlaması",
-    "API_HOURS_WINDOW": "Bu sohbete yalnızca {hours} saat içinde yanıt verebilirsiniz",
+    "API_HOURS_WINDOW": "Bu konuşmaya yalnızca {hours} saat içinde cevap verebilirsiniz",
     "NOT_ASSIGNED_TO_YOU": "Bu görüşme size atanmamış. Bu konuşmayı kendinize atamak ister misiniz?",
     "ASSIGN_TO_ME": "Bana ata",
     "BOT_HANDOFF_MESSAGE": "Şu anda bir asistan veya bot tarafından yürütülen bir konuşmaya yanıt veriyorsunuz.",
@@ -42,7 +42,7 @@
     "BOT_HANDOFF_ERROR": "Konuşma devralınamadı. Lütfen tekrar deneyin.",
     "TWILIO_WHATSAPP_CAN_REPLY": "Bu konuşmaya yalnızca şablon mesaj kullanarak yanıt verebilirsiniz, çünkü",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 saat mesaj penceresi kısıtlaması",
-    "OLD_INSTAGRAM_INBOX_REPLY_BANNER": "Bu Instagram hesabı yeni Instagram kanal gelen kutusuna taşındı. Tüm yeni mesajlar orada görünecek. Bu sohbetten artık mesaj gönderemezsiniz.",
+    "OLD_INSTAGRAM_INBOX_REPLY_BANNER": "Bu Instagram hesabı, yeni Instagram kanal gelen kutusuna taşındı. Tüm yeni mesajlar orada görünecektir. Artık bu konuşmadan mesaj gönderemeyeceksiniz.",
     "REPLYING_TO": "Cevap veriyorsun:",
     "REMOVE_SELECTION": "Seçimi Kaldır",
     "DOWNLOAD": "İndir",
@@ -139,8 +139,8 @@
       }
     },
     "DELETE_CONVERSATION": {
-      "TITLE": "#{conversationId} numaralı sohbeti sil",
-      "DESCRIPTION": "Bu sohbeti silmek istediğinizden emin misiniz?",
+      "TITLE": "#{conversationId} numaralı konuşmayı sil",
+      "DESCRIPTION": "Bu konuşmayı silmek istediğinizden emin misiniz?",
       "CONFIRM": "Sil"
     },
     "CARD_CONTEXT_MENU": {
@@ -159,7 +159,7 @@
       "ASSIGN_LABEL": "Etiket ata",
       "AGENTS_LOADING": "Temsilciler Yükleniyor...",
       "ASSIGN_TEAM": "Takım ata",
-      "DELETE": "Sohbeti sil",
+      "DELETE": "Konuşmayı sil",
       "OPEN_IN_NEW_TAB": "Yeni sekmede aç",
       "COPY_LINK": "Konuşma bağlantısını kopyala",
       "COPY_LINK_SUCCESS": "Konuşma bağlantısı panoya kopyalandı",
@@ -229,9 +229,9 @@
         }
       },
       "QUOTED_REPLY": {
-        "ENABLE_TOOLTIP": "Include quoted email thread",
-        "DISABLE_TOOLTIP": "Don't include quoted email thread",
-        "REMOVE_PREVIEW": "Remove quoted email thread",
+        "ENABLE_TOOLTIP": "Alıntılanan e-posta zincirini dahil et",
+        "DISABLE_TOOLTIP": "Alıntılanan e-posta zincirini dahil etme",
+        "REMOVE_PREVIEW": "Alıntılanan e-posta zincirini kaldır",
         "COLLAPSE": "Önizlemeyi daralt",
         "EXPAND": "Önizlemeyi genişlet"
       }
@@ -244,8 +244,8 @@
     "ASSIGN_LABEL_SUCCESFUL": "Etiket başarıyla atandı",
     "ASSIGN_LABEL_FAILED": "Etiket ataması yapılamadı",
     "CHANGE_TEAM": "Takım değişti",
-    "SUCCESS_DELETE_CONVERSATION": "Sohbet başarıyla silindi",
-    "FAIL_DELETE_CONVERSATION": "Sohbet silinemedi! Tekrar deneyin",
+    "SUCCESS_DELETE_CONVERSATION": "Konuşma başarıyla silindi",
+    "FAIL_DELETE_CONVERSATION": "Konuşma silinemedi! Tekrar deneyin",
     "FILE_SIZE_LIMIT": "Dosya, {MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE} MB ek dosya sınırını aşıyor",
     "MESSAGE_ERROR": "Bu mesaj gönderilemiyor, lütfen daha sonra tekrar deneyin",
     "SENT_BY": "Tarafından gönderildi:",
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index e1c8a6e8c..6551eb3a7 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -1,8 +1,8 @@
 {
   "GENERAL_SETTINGS": {
     "LIMIT_MESSAGES": {
-      "CONVERSATION": "Sohbet sınırını aştınız. Hacker planı yalnızca 500 sohbete izin verir.",
-      "INBOXES": "Gelen kutusu sınırını aştınız. Hacker planı yalnızca web sitesi canlı sohbetini destekler. E-posta, WhatsApp gibi ek gelen kutuları ücretli plan gerektirir.",
+      "CONVERSATION": "Konuşma limitini aştınız. Hacker planı yalnızca 500 konuşmaya izin vermektedir.",
+      "INBOXES": "Gelen kutusu limitini aştınız. Hacker planı yalnızca web sitesi canlı sohbetini desteklemektedir. E-posta, WhatsApp gibi ek gelen kutuları ücretli bir plan gerektirir.",
       "AGENTS": "Temsilci sınırını aştınız. Planınız yalnızca {allowedAgents} temsilciye izin veriyor.",
       "NON_ADMIN": "Tüm özellikleri kullanmaya devam etmek için lütfen yöneticinizle iletişime geçin ve planı yükseltin."
     },
@@ -20,10 +20,10 @@
       "BUTTON_TEXT": "Hesabınızı Silin",
       "CONFIRM": {
         "TITLE": "Hesabı Sil",
-        "MESSAGE": "Hesabınızı silmek geri alınamaz. Kalıcı olarak silmek istediğinizi onaylamak için aşağıya hesap adınızı girin.",
+        "MESSAGE": "Hesabınızı silmek geri alınamaz bir işlemdir. Kalıcı olarak silmek istediğinizi onaylamak için aşağıya hesap adınızı girin.",
         "BUTTON_TEXT": "Sil",
         "DISMISS": "İptal Et",
-        "PLACE_HOLDER": "{accountName} yazarak onaylayın"
+        "PLACE_HOLDER": "Onaylamak için lütfen {accountName} yazın"
       },
       "SUCCESS": "Hesap silinmek üzere işaretlendi",
       "FAILURE": "Hesap silinemedi, tekrar deneyin!",
@@ -45,11 +45,11 @@
         "NOTE": "API tabanlı bir entegrasyon oluşturuyorsanız bu kimlik gereklidir"
       },
       "AUTO_RESOLVE": {
-        "TITLE": "Sohbetleri otomatik çöz",
-        "NOTE": "Bu yapılandırma, belirli bir süre etkinlik olmadığında sohbeti otomatik olarak çözmenizi sağlar.",
+        "TITLE": "Konuşmaları Otomatik Çöz",
+        "NOTE": "Bu yapılandırma, belirli bir hareketsizlik süresinden sonra konuşmayı otomatik olarak çözümlemenize olanak tanır.",
         "DURATION": {
-          "LABEL": "Etkinliksizlik süresi",
-          "HELP": "Sohbetin otomatik olarak çözüleceği etkinliksizlik süresi",
+          "LABEL": "Hareketsizlik süresi",
+          "HELP": "Konuşmanın otomatik olarak çözümlenmesinden önceki hareketsizlik süresi",
           "PLACEHOLDER": "30",
           "ERROR": "Otomatik çözme süresi 10 dakika ile 999 gün arasında olmalıdır",
           "API": {
@@ -59,8 +59,8 @@
         },
         "MESSAGE": {
           "LABEL": "Özel otomatik çözüm mesajı",
-          "PLACEHOLDER": "Sohbet, 15 gün etkinlik olmadığı için sistem tarafından çözüldü olarak işaretlendi",
-          "HELP": "Sohbet otomatik olarak çözüldükten sonra müşteriye gönderilen mesaj"
+          "PLACEHOLDER": "Konuşma, 15 günlük hareketsizlik nedeniyle sistem tarafından çözümlendi olarak işaretlendi",
+          "HELP": "Konuşma otomatik olarak çözüldükten sonra müşteriye gönderilen mesaj"
         },
         "PREFERENCES": "Tercihler",
         "LABEL": {
@@ -94,19 +94,19 @@
       },
       "AUTO_RESOLVE_IGNORE_WAITING": {
         "LABEL": "Yanıtsız sohbetleri hariç tut",
-        "HELP": "Etkinleştirildiğinde, sistem hâlâ temsilci yanıtı bekleyen sohbetleri çözmeyi atlayacaktır."
+        "HELP": "Etkinleştirildiğinde, sistem hâlâ bir temsilcinin yanıtını bekleyen konuşmaları çözümlemeyi atlayacaktır."
       },
       "AUDIO_TRANSCRIPTION": {
-        "TITLE": "Sesli Mesajları Yazıya Döktür",
-        "NOTE": "Sohbetlerdeki sesli mesajları otomatik olarak yazıya dökün. Bir sesli mesaj gönderildiğinde veya alındığında bir metin dökümü oluşturun ve mesajın yanında gösterin.",
+        "TITLE": "Sesli Mesajları Metne Çevir",
+        "NOTE": "Konuşmalardaki sesli mesajları otomatik olarak metne çevirin. Bir sesli mesaj gönderildiğinde veya alındığında bir metin dökümü (transkript) oluşturun ve mesajın yanında görüntüleyin.",
         "API": {
           "SUCCESS": "Sesli mesaj transkripsiyon ayarı başarıyla güncellendi",
-          "ERROR": "Sesli yazıya dökme ayarı güncellenemedi"
+          "ERROR": "Ses transkripsiyon ayarı güncellenirken hata oluştu"
         }
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Çözüm için etkinliksizlik süresi",
-        "HELP": "Bir sohbette etkinlik yoksa otomatik çözüm için süre",
+        "LABEL": "Çözümleme için hareketsizlik süresi",
+        "HELP": "Bir konuşmanın, hiçbir etkinlik olmazsa otomatik olarak çözümlenmesi gereken süre",
         "PLACEHOLDER": "30",
         "ERROR": "Otomatik çözme süresi 10 dakika ile 999 gün arasında olmalıdır",
         "API": {
@@ -115,8 +115,8 @@
         },
         "UPDATE_BUTTON": "Güncelleme",
         "MESSAGE_LABEL": "Özel çözüm mesajı",
-        "MESSAGE_PLACEHOLDER": "Sohbet, 15 gün etkinlik olmadığı için sistem tarafından çözüldü olarak işaretlendi",
-        "MESSAGE_HELP": "Bu mesaj, bir sohbet sistem tarafından etkinliksizlik nedeniyle otomatik olarak çözüldüğünde müşteriye gönderilir."
+        "MESSAGE_PLACEHOLDER": "Konuşma, 15 günlük hareketsizlik nedeniyle sistem tarafından çözümlendi olarak işaretlendi",
+        "MESSAGE_HELP": "Bu mesaj, bir konuşma hareketsizlik nedeniyle sistem tarafından otomatik olarak çözümlendiğinde müşteriye gönderilir."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Hesabınız için e-posta ile iletişim devre dışı bırakıldı.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inbox.json b/app/javascript/dashboard/i18n/locale/tr/inbox.json
index 69d93cc31..3602e0eaf 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inbox.json
@@ -82,13 +82,13 @@
       "ERROR": "WhatsApp'a yeniden bağlanılamadı. Lütfen tekrar deneyin.",
       "WHATSAPP_APP_ID_MISSING": "WhatsApp Uygulama Kimliği yapılandırılmamış. Lütfen yöneticinize başvurun.",
       "WHATSAPP_CONFIG_ID_MISSING": "WhatsApp Yapılandırma Kimliği yapılandırılmamış. Lütfen yöneticinize başvurun.",
-      "CONFIGURATION_ERROR": "Configuration error occurred during reauthorization.",
-      "FACEBOOK_LOAD_ERROR": "Failed to load Facebook SDK. Please try again.",
+      "CONFIGURATION_ERROR": "Yeniden yetkilendirme sırasında yapılandırma hatası oluştu.",
+      "FACEBOOK_LOAD_ERROR": "Facebook SDK yüklenemedi. Lütfen tekrar deneyin.",
       "TROUBLESHOOTING": {
-        "TITLE": "Troubleshooting",
-        "POPUP_BLOCKED": "Ensure pop-ups are allowed for this site",
-        "COOKIES": "Third-party cookies must be enabled",
-        "ADMIN_ACCESS": "You need admin access to the WhatsApp Business Account"
+        "TITLE": "Sorun Giderme",
+        "POPUP_BLOCKED": "Bu site için açılır pencerelere izin verildiğinden emin olun",
+        "COOKIES": "Üçüncü taraf çerezlerin etkinleştirilmesi gerekir",
+        "ADMIN_ACCESS": "WhatsApp Business Hesabına yönetici erişiminizin olması gerekir"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index 43588da40..9af6714e7 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -5,8 +5,8 @@
     "LEARN_MORE": "Learn more about inboxes",
     "RECONNECTION_REQUIRED": "Your inbox is disconnected. You won't receive new messages until you reauthorize it.",
     "CLICK_TO_RECONNECT": "Click here to reconnect.",
-    "WHATSAPP_REGISTRATION_INCOMPLETE": "Your WhatsApp Business registration isn’t complete. Please check your display name status in Meta Business Manager before reconnecting.",
-    "COMPLETE_REGISTRATION": "Complete Registration",
+    "WHATSAPP_REGISTRATION_INCOMPLETE": "WhatsApp Business kaydınız tamamlanmadı. Yeniden bağlanmadan önce lütfen Meta Business Manager'da görünen adınızın (display name) durumunu kontrol edin.",
+    "COMPLETE_REGISTRATION": "Kaydı Tamamla",
     "LIST": {
       "404": "Bu hesaba bağlı gelen kutusu yok."
     },
@@ -51,10 +51,10 @@
       "INSTAGRAM": {
         "CONTINUE_WITH_INSTAGRAM": "Instagram ile devam et",
         "CONNECT_YOUR_INSTAGRAM_PROFILE": "Instagram profilinizi bağlayın",
-        "HELP": "Bu Instagram hesabı yeni Instagram kanal gelen kutusuna taşındı. Artık bu gelen kutusundan Instagram mesajı gönderip alamayacaksınız ",
+        "HELP": "Instagram profilinizi kanal olarak eklemek için, 'Instagram ile Devam Et' seçeneğine tıklayarak Instagram Profilinizin kimliğini doğrulamanız gerekmektedir. ",
         "ERROR_MESSAGE": "Instagram'a bağlanırken bir hata oluştu, lütfen tekrar deneyin",
         "ERROR_AUTH": "Instagram'a bağlanırken bir hata oluştu, lütfen tekrar deneyin",
-        "NEW_INBOX_SUGGESTION": "Bu Instagram hesabı daha önce farklı bir gelen kutusuna bağlıydı ve şimdi buraya taşındı. Tüm yeni mesajlar burada görünecek. Eski gelen kutusu artık bu hesap için mesaj gönderip alamayacak.",
+        "NEW_INBOX_SUGGESTION": "Bu Instagram hesabı daha önce farklı bir gelen kutusuna bağlıydı ve şimdi buraya taşındı. Tüm yeni mesajlar burada görünecektir. Eski gelen kutusu, bu hesap için artık mesaj gönderemeyecek veya alamayacaktır.",
         "DUPLICATE_INBOX_BANNER": "Bu Instagram hesabı yeni Instagram kanal gelen kutusuna taşındı. Artık bu gelen kutusundan Instagram mesajı gönderip alamayacaksınız."
       },
       "TWITTER": {
@@ -337,13 +337,13 @@
         },
         "CONFIGURATION": {
           "TWILIO_VOICE_URL_TITLE": "Twilio Ses URL",
-          "TWILIO_VOICE_URL_SUBTITLE": "Configure this URL as the Voice URL on your Twilio phone number and TwiML App.",
-          "TWILIO_STATUS_URL_TITLE": "Twilio Status Callback URL",
-          "TWILIO_STATUS_URL_SUBTITLE": "Configure this URL as the Status Callback URL on your Twilio phone number."
+          "TWILIO_VOICE_URL_SUBTITLE": "Bu URL'yi Twilio telefon numaranızda ve TwiML Uygulamanızda Sesli Görüşme URL'si (Voice URL) olarak yapılandırın.",
+          "TWILIO_STATUS_URL_TITLE": "Twilio Durum Geri Çağırma URL'si (Status Callback URL)",
+          "TWILIO_STATUS_URL_SUBTITLE": "Bu URL'yi Twilio telefon numaranızda Durum Geri Çağırma URL'si (Status Callback URL) olarak yapılandırın."
         },
-        "SUBMIT_BUTTON": "Create Voice Channel",
+        "SUBMIT_BUTTON": "Ses Kanalı Oluştur",
         "API": {
-          "ERROR_MESSAGE": "We were not able to create the voice channel"
+          "ERROR_MESSAGE": "Ses kanalı oluşturulamadı"
         }
       },
       "API_CHANNEL": {
@@ -437,39 +437,39 @@
           },
           "FACEBOOK": {
             "TITLE": "Facebook\n",
-            "DESCRIPTION": "Connect your Facebook page"
+            "DESCRIPTION": "Facebook sayfanızı bağlayın"
           },
           "WHATSAPP": {
             "TITLE": "WhatsApp",
-            "DESCRIPTION": "Support your customers on WhatsApp"
+            "DESCRIPTION": "Müşterilerinize WhatsApp üzerinden destek sağlayın"
           },
           "EMAIL": {
             "TITLE": "E-Posta",
-            "DESCRIPTION": "Connect with Gmail, Outlook, or other providers"
+            "DESCRIPTION": "Gmail, Outlook veya diğer sağlayıcılarla bağlantı kurun"
           },
           "SMS": {
             "TITLE": "SMS",
-            "DESCRIPTION": "Integrate SMS channel with Twilio or bandwidth"
+            "DESCRIPTION": "SMS kanalını Twilio veya Bandwidth ile entegre edin"
           },
           "API": {
             "TITLE": "API",
-            "DESCRIPTION": "Make a custom channel using our API"
+            "DESCRIPTION": "API'mizi kullanarak özel bir kanal oluşturun"
           },
           "TELEGRAM": {
             "TITLE": "Telegram",
-            "DESCRIPTION": "Configure Telegram channel using Bot token"
+            "DESCRIPTION": "Bot token kullanarak Telegram kanalını yapılandırın"
           },
           "LINE": {
             "TITLE": "Line",
-            "DESCRIPTION": "Integrate your Line channel"
+            "DESCRIPTION": "Line kanalınızı entegre edin"
           },
           "INSTAGRAM": {
             "TITLE": "Instagram",
-            "DESCRIPTION": "Connect your instagram account"
+            "DESCRIPTION": "Instagram hesabınızı bağlayın"
           },
           "VOICE": {
             "TITLE": "Ses",
-            "DESCRIPTION": "Integrate with Twilio Voice"
+            "DESCRIPTION": "Twilio Voice ile entegre edin"
           }
         }
       },
@@ -526,9 +526,9 @@
       "BUTTON_TEXT": "Beni oraya götür",
       "MORE_SETTINGS": "Daha fazla ayar",
       "WEBSITE_SUCCESS": "Bir web sitesi kanalı oluşturmayı başarıyla tamamladınız. Aşağıda gösterilen kodu kopyalayın ve web sitenize yapıştırın. Bir müşteri canlı sohbeti bir dahaki sefere kullandığında, konuşma otomatik olarak gelen kutunuzda görünecektir.",
-      "WHATSAPP_QR_INSTRUCTION": "Scan the QR code above to quickly test your WhatsApp inbox",
-      "MESSENGER_QR_INSTRUCTION": "Scan the QR code above to quickly test your Facebook Messenger inbox",
-      "TELEGRAM_QR_INSTRUCTION": "Scan the QR code above to quickly test your Telegram inbox"
+      "WHATSAPP_QR_INSTRUCTION": "WhatsApp gelen kutunuzu hızlıca test etmek için yukarıdaki QR kodu tarayın",
+      "MESSENGER_QR_INSTRUCTION": "Facebook Messenger gelen kutunuzu hızlıca test etmek için yukarıdaki QR kodu tarayın",
+      "TELEGRAM_QR_INSTRUCTION": "Telegram gelen kutunuzu hızlıca test etmek için yukarıdaki QR kodu tarayın"
     },
     "REAUTH": "Yeniden yetkilendir",
     "VIEW": "Görünüm",
@@ -607,56 +607,56 @@
       "BUSINESS_HOURS": "İş Saatleri",
       "WIDGET_BUILDER": "Widget Oluşturucu",
       "BOT_CONFIGURATION": "Bot Yapılandırma",
-      "ACCOUNT_HEALTH": "Account Health",
+      "ACCOUNT_HEALTH": "Hesap Sağlığı",
       "CSAT": "CSAT"
     },
     "ACCOUNT_HEALTH": {
-      "TITLE": "Manage your WhatsApp account",
-      "DESCRIPTION": "Review your WhatsApp account status, messaging limits, and quality. Update settings or resolve issues if needed",
-      "GO_TO_SETTINGS": "Go to Meta Business Manager",
-      "NO_DATA": "Health data is not available",
+      "TITLE": "WhatsApp hesabınızı yönetin",
+      "DESCRIPTION": "WhatsApp hesap durumunuzu, mesajlaşma limitlerinizi ve kalitesini inceleyin. Gerekirse ayarları güncelleyin veya sorunları çözün",
+      "GO_TO_SETTINGS": "Meta Business Manager'a gidin",
+      "NO_DATA": "Sağlık verisi mevcut değil",
       "FIELDS": {
         "DISPLAY_PHONE_NUMBER": {
-          "LABEL": "Display phone number",
-          "TOOLTIP": "Phone number displayed to customers"
+          "LABEL": "Telefon numarasını göster",
+          "TOOLTIP": "Müşterilere gösterilen telefon numarası"
         },
         "VERIFIED_NAME": {
-          "LABEL": "Business name",
-          "TOOLTIP": "Business name verified by WhatsApp"
+          "LABEL": "İşletme adı",
+          "TOOLTIP": "WhatsApp tarafından onaylanmış işletme adı"
         },
         "DISPLAY_NAME_STATUS": {
-          "LABEL": "Display name status",
-          "TOOLTIP": "Status of your business name verification"
+          "LABEL": "Görünen adın durumu",
+          "TOOLTIP": "İşletme adı doğrulamanızın durumu"
         },
         "QUALITY_RATING": {
-          "LABEL": "Quality rating",
-          "TOOLTIP": "WhatsApp quality rating for your account"
+          "LABEL": "Kalite puanı",
+          "TOOLTIP": "Hesabınız için WhatsApp kalite puanı"
         },
         "MESSAGING_LIMIT_TIER": {
-          "LABEL": "Messaging limit tier",
-          "TOOLTIP": "Daily messaging limit for your account"
+          "LABEL": "Mesajlaşma limiti seviyesi",
+          "TOOLTIP": "Hesabınız için günlük mesajlaşma limiti"
         },
         "ACCOUNT_MODE": {
-          "LABEL": "Account mode",
-          "TOOLTIP": "Current operating mode of your WhatsApp account"
+          "LABEL": "Hesap modu",
+          "TOOLTIP": "WhatsApp hesabınızın mevcut çalışma modu"
         }
       },
       "VALUES": {
         "TIERS": {
-          "TIER_250": "250 customers per 24h",
-          "TIER_1000": "1K customers per 24h",
-          "TIER_1K": "1K customers per 24h",
-          "TIER_10K": "10K customers per 24h",
-          "TIER_100K": "100K customers per 24h",
-          "TIER_UNLIMITED": "Unlimited customers per 24h",
+          "TIER_250": "24 saatte 250 müşteri",
+          "TIER_1000": "24 saatte 1000 müşteri",
+          "TIER_1K": "24 saatte 1000 müşteri",
+          "TIER_10K": "24 saatte 10000 müşteri",
+          "TIER_100K": "24 saatte 100000 müşteri",
+          "TIER_UNLIMITED": "24 saatte sınırsız müşteri",
           "UNKNOWN": "Değerlendirme mevcut değil"
         },
         "STATUSES": {
           "APPROVED": "Approved",
           "PENDING_REVIEW": "İnceleme Bekliyor",
-          "AVAILABLE_WITHOUT_REVIEW": "Available Without Review",
+          "AVAILABLE_WITHOUT_REVIEW": "İnceleme Olmadan Kullanılabilir",
           "REJECTED": "Reddedildi",
-          "DECLINED": "Declined",
+          "DECLINED": "Reddedildi",
           "NON_EXISTS": "Mevcut değil"
         },
         "MODES": {
@@ -678,8 +678,8 @@
       "MESSENGER_SUB_HEAD": "Bu düğmeyi gövde etiketinizin içine yerleştirin",
       "ALLOWED_DOMAINS": {
         "TITLE": "İzin Verilen Alan Adları",
-        "SUBTITLE": "Add wildcard or regular domains separated by commas (leave blank to allow all), e.g. *.chatwoot.dev, chatwoot.com.",
-        "PLACEHOLDER": "Enter domains separated by commas (eg: *.chatwoot.dev, chatwoot.com)"
+        "SUBTITLE": "Virgülle ayrılmış joker karakterli veya normal alan adları ekleyin (hepsine izin vermek için boş bırakın), örneğin *.chatwoot.dev, chatwoot.com.",
+        "PLACEHOLDER": "Virgülle ayrılmış alan adlarını girin (ör: *.chatwoot.dev, chatwoot.com)"
       },
       "INBOX_AGENTS": "Kullanıcılar",
       "INBOX_AGENTS_SUB_TEXT": "Bu gelen kutusuna aracı ekleyin veya aracıları kaldırın",
@@ -716,26 +716,26 @@
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Yeni API Anahtarını buraya girin",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Güncelleme",
       "WHATSAPP_EMBEDDED_SIGNUP_TITLE": "WhatsApp Embedded Signup",
-      "WHATSAPP_EMBEDDED_SIGNUP_SUBHEADER": "This inbox is connected through WhatsApp embedded signup.",
-      "WHATSAPP_EMBEDDED_SIGNUP_DESCRIPTION": "You can reconfigure this inbox to update your WhatsApp Business settings.",
+      "WHATSAPP_EMBEDDED_SIGNUP_SUBHEADER": "Bu gelen kutusu, WhatsApp embedded signup yoluyla bağlandı.",
+      "WHATSAPP_EMBEDDED_SIGNUP_DESCRIPTION": "WhatsApp Business ayarlarınızı güncellemek için bu gelen kutusunu yeniden yapılandırabilirsiniz.",
       "WHATSAPP_RECONFIGURE_BUTTON": "Yeniden yapılandır",
-      "WHATSAPP_CONNECT_TITLE": "Connect to WhatsApp Business",
-      "WHATSAPP_CONNECT_SUBHEADER": "Upgrade to WhatsApp embedded signup for easier management.",
-      "WHATSAPP_CONNECT_DESCRIPTION": "Connect this inbox to WhatsApp Business for enhanced features and easier management.",
+      "WHATSAPP_CONNECT_TITLE": "WhatsApp Business'a Bağlan",
+      "WHATSAPP_CONNECT_SUBHEADER": "Daha kolay yönetim için WhatsApp gömülü kayda (embedded signup) yükseltin.",
+      "WHATSAPP_CONNECT_DESCRIPTION": "Gelişmiş özellikler ve daha kolay yönetim için bu gelen kutusunu WhatsApp Business'a bağlayın.",
       "WHATSAPP_CONNECT_BUTTON": "Bağlan",
-      "WHATSAPP_CONNECT_SUCCESS": "Successfully connected to WhatsApp Business!",
-      "WHATSAPP_CONNECT_ERROR": "Failed to connect to WhatsApp Business. Please try again.",
-      "WHATSAPP_RECONFIGURE_SUCCESS": "Successfully reconfigured WhatsApp Business!",
-      "WHATSAPP_RECONFIGURE_ERROR": "Failed to reconfigure WhatsApp Business. Please try again.",
+      "WHATSAPP_CONNECT_SUCCESS": "WhatsApp Business'a başarıyla bağlandı!",
+      "WHATSAPP_CONNECT_ERROR": "WhatsApp Business'a bağlanılamadı. Lütfen tekrar deneyin.",
+      "WHATSAPP_RECONFIGURE_SUCCESS": "WhatsApp Business başarıyla yeniden yapılandırıldı!",
+      "WHATSAPP_RECONFIGURE_ERROR": "WhatsApp Business yeniden yapılandırılamadı. Lütfen tekrar deneyin.",
       "WHATSAPP_APP_ID_MISSING": "WhatsApp Uygulama Kimliği yapılandırılmamış. Lütfen yöneticinize başvurun.",
       "WHATSAPP_CONFIG_ID_MISSING": "WhatsApp Yapılandırma Kimliği yapılandırılmamış. Lütfen yöneticinize başvurun.",
-      "WHATSAPP_LOGIN_CANCELLED": "WhatsApp login was cancelled. Please try again.",
+      "WHATSAPP_LOGIN_CANCELLED": "WhatsApp oturum açma işlemi iptal edildi. Lütfen tekrar deneyin.",
       "WHATSAPP_WEBHOOK_TITLE": "Webhook Onay Anahtarı",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Bu belirteç, webhook uç noktasının gerçekliğini doğrulamak için kullanılır.",
       "WHATSAPP_TEMPLATES_SYNC_TITLE": "Şablonları Senkronize Et",
       "WHATSAPP_TEMPLATES_SYNC_SUBHEADER": "WhatsApp'tan mesaj şablonlarını manuel olarak senkronize ederek mevcut şablonlarınızı güncelleyin.",
       "WHATSAPP_TEMPLATES_SYNC_BUTTON": "Şablonları Senkronize Et",
-      "WHATSAPP_TEMPLATES_SYNC_SUCCESS": "Templates sync initiated successfully. It may take a couple of minutes to update.",
+      "WHATSAPP_TEMPLATES_SYNC_SUCCESS": "Şablon senkronizasyonu başarıyla başlatıldı. Güncellenmesi birkaç dakika sürebilir.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Sohbet Öncesi Form Ayarlarını Güncelleme"
     },
     "HELP_CENTER": {
@@ -784,7 +784,7 @@
     },
     "CSAT": {
       "TITLE": "CSAT'yi etkinleştir",
-      "SUBTITLE": "Müşterilerin destek deneyimleri hakkında ne hissettiklerini anlamak için sohbetlerin sonunda otomatik olarak CSAT anketleri başlatın. Memnuniyet eğilimlerini takip edin ve zaman içinde iyileştirme alanlarını belirleyin.",
+      "SUBTITLE": "Müşterilerin destek deneyimleri hakkındaki düşüncelerini anlamak için konuşma sonunda CSAT anketlerini (Müşteri Memnuniyeti Anketleri) otomatik olarak tetikleyin. Memnuniyet eğilimlerini takip edin ve zaman içinde iyileştirme alanlarını belirleyin.",
       "DISPLAY_TYPE": {
         "LABEL": "Görüntüleme türü"
       },
@@ -802,7 +802,7 @@
         },
         "SELECT_PLACEHOLDER": "etiketleri seç"
       },
-      "NOTE": "Not: CSAT anketleri her sohbet için yalnızca bir kez gönderilir",
+      "NOTE": "Not: CSAT anketleri, konuşma başına yalnızca bir kez gönderilir",
       "API": {
         "SUCCESS_MESSAGE": "CSAT ayarları başarıyla güncellendi",
         "ERROR_MESSAGE": "CSAT ayarları güncellenemedi. Lütfen daha sonra tekrar deneyin."
@@ -981,15 +981,15 @@
     "EMAIL_PROVIDERS": {
       "MICROSOFT": {
         "TITLE": "Microsoft",
-        "DESCRIPTION": "Connect with Microsoft"
+        "DESCRIPTION": "Microsoft ile giriş yap"
       },
       "GOOGLE": {
         "TITLE": "Google",
-        "DESCRIPTION": "Connect with Google"
+        "DESCRIPTION": "Google ile giriş yap"
       },
       "OTHER_PROVIDERS": {
         "TITLE": "Diğer Sağlayıcılar",
-        "DESCRIPTION": "Connect with Other Providers"
+        "DESCRIPTION": "Diğer Sağlayıcılar ile giriş yap"
       }
     },
     "CHANNELS": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrations.json b/app/javascript/dashboard/i18n/locale/tr/integrations.json
index 765b5d8c7..d6abfc310 100644
--- a/app/javascript/dashboard/i18n/locale/tr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tr/integrations.json
@@ -34,7 +34,7 @@
         "SUBSCRIPTIONS": {
           "LABEL": "Olaylar",
           "EVENTS": {
-            "CONVERSATION_CREATED": "Görüşme Oluşturuldu",
+            "CONVERSATION_CREATED": "Konuşma Oluşturuldu",
             "CONVERSATION_STATUS_CHANGED": "Görüşme Durumu Değişti",
             "CONVERSATION_UPDATED": "Görüşme Güncellendi",
             "MESSAGE_CREATED": "Mesaj Oluşturuldu",
@@ -42,10 +42,14 @@
             "WEBWIDGET_TRIGGERED": "Kullanıcı tarafından canlı sohbet widget'ı açıldı",
             "CONTACT_CREATED": "Kişi Oluşturuldu",
             "CONTACT_UPDATED": "Kişi Güncellendi",
-            "CONVERSATION_TYPING_ON": "Sohbet Yazıyor Açık",
-            "CONVERSATION_TYPING_OFF": "Sohbet Yazıyor Kapalı"
+            "CONVERSATION_TYPING_ON": "Konuşmada Yazıyor Açık",
+            "CONVERSATION_TYPING_OFF": "Konuşmada Yazıyor Kapalı"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Web kancası URL'si",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -327,7 +331,7 @@
       },
       "CTA": {
         "TITLE": "Linear'a bağlan",
-        "AGENT_DESCRIPTION": "Doğrusal çalışma alanı bağlı değil. Bu entegrasyonu kullanmak için yöneticinizden bir çalışma alanı bağlamasını isteyin.",
+        "AGENT_DESCRIPTION": "Linear çalışma alanı bağlı değil. Bu entegrasyonu kullanmak için yöneticinizden bir çalışma alanı bağlamasını isteyin.",
         "DESCRIPTION": "Linear çalışma alanı bağlı değil. Bu entegrasyonu kullanmak için çalışma alanınızı bağlamak üzere aşağıdaki düğmeye tıklayın.",
         "BUTTON_TEXT": "Linear çalışma alanını bağlayın"
       }
@@ -344,11 +348,17 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "Asistan bulunamadı, başlamak için bir tane oluşturun"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
       "PANEL_TITLE": "Copilot ile başlayın",
-      "KICK_OFF_MESSAGE": "Hızlı bir özet mi lazım, geçmiş sohbetleri mi kontrol etmek istiyorsunuz ya da daha iyi bir yanıt mı yazmak istiyorsunuz? Copilot işleri hızlandırmak için burada.",
+      "KICK_OFF_MESSAGE": "Hızlı bir özet mi gerekiyor, geçmiş konuşmaları mı kontrol etmek istiyorsunuz, yoksa daha iyi bir yanıt mı tasarlamak istiyorsunuz? Copilot işleri hızlandırmak için burada.",
       "SEND_MESSAGE": "Mesajı Gönder...",
       "EMPTY_MESSAGE": "Yanıt oluşturulurken bir hata oluştu. Lütfen tekrar deneyin.",
       "LOADER": "Captain is thinking",
@@ -371,8 +381,8 @@
           "CONTENT": "Sohbetin müşterinin ihtiyaçlarını ne kadar karşıladığını gözden geçirin. Ton, açıklık ve etkililik açısından 5 üzerinden bir puan verin."
         },
         "HIGH_PRIORITY": {
-          "LABEL": "Yüksek öncelikli sohbetler",
-          "CONTENT": "Tüm yüksek öncelikli açık sohbetlerin bir özetini verin. Sohbet kimliği, müşteri adı (varsa), son mesaj içeriği ve atanan temsilciyi ekleyin. Gerekirse duruma göre gruplayın."
+          "LABEL": "Yüksek öncelikli konuşmalar",
+          "CONTENT": "Tüm yüksek öncelikli açık konuşmaların bir özetini verin. Konuşma kimliği, müşteri adı (varsa), son mesaj içeriği ve atanan temsilciyi ekleyin. Gerekirse duruma göre gruplayın."
         },
         "LIST_CONTACTS": {
           "LABEL": "Kişileri listele",
@@ -383,7 +393,7 @@
     "PLAYGROUND": {
       "USER": "Sen",
       "ASSISTANT": "Assistant",
-      "MESSAGE_PLACEHOLDER": "Mesajınız...",
+      "MESSAGE_PLACEHOLDER": "Mesajınızı yazın...",
       "HEADER": "Oyun Alanı",
       "DESCRIPTION": "Bu oyun alanını asistanınıza mesaj göndermek ve yanıtlarının doğru, hızlı ve beklediğiniz tonda olup olmadığını kontrol etmek için kullanın.",
       "CREDIT_NOTE": "Buradan gönderilen mesajlar Captain kredilerinize sayılacaktır."
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Asistan bulunamadı. Lütfen tekrar deneyin."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Ayarlar",
         "BASIC_SETTINGS": {
           "TITLE": "Temel ayarlar",
           "DESCRIPTION": "Konuşmayı sonlandırırken veya bir operatöre aktarırken asistanın söyleyeceği sözleri özelleştirin."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,11 +538,8 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
-          "SELECTED": "{count} item selected | {count} items selected",
+          "SELECTED": "{count} eşya seçildi | {count} eşya seçildi",
           "SELECT_ALL": "Tümünü seç ({count})",
           "UNSELECT_ALL": "Tümünü kaldır ({count})",
           "BULK_DELETE_BUTTON": "Sil"
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} eşya seçildi | {count} eşya seçildi",
           "SELECT_ALL": "Tümünü seç ({count})",
@@ -625,11 +628,8 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
-          "SELECTED": "{count} item selected | {count} items selected",
+          "SELECTED": "{count} eşya seçildi | {count} eşya seçildi",
           "SELECT_ALL": "Tümünü seç ({count})",
           "UNSELECT_ALL": "Tümünü kaldır ({count})",
           "BULK_DELETE_BUTTON": "Sil"
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Belge Adı (İsteğe Bağlı)",
           "PLACEHOLDER": "Belgeye bir ad girin"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Hepsi"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Düzenle",
+        "DELETE_RESPONSE": "Sil"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/tr/login.json b/app/javascript/dashboard/i18n/locale/tr/login.json
index 8460a575b..6b4b4a693 100644
--- a/app/javascript/dashboard/i18n/locale/tr/login.json
+++ b/app/javascript/dashboard/i18n/locale/tr/login.json
@@ -24,17 +24,17 @@
     "CREATE_NEW_ACCOUNT": "Yeni hesap oluştur",
     "SUBMIT": "Oturum aç",
     "SAML": {
-      "LABEL": "Login via SSO",
-      "TITLE": "Initiate Single Sign-on (SSO)",
-      "SUBTITLE": "Enter your work email to access your organization",
+      "LABEL": "SSO ile giriş yapın",
+      "TITLE": "Tek Oturum Açma (SSO)",
+      "SUBTITLE": "Kuruluşunuza erişmek için iş e-posta adresinizi girin",
       "BACK_TO_LOGIN": "Şifre ile giriş yap",
       "WORK_EMAIL": {
-        "LABEL": "Work Email",
-        "PLACEHOLDER": "Enter your work email"
+        "LABEL": "İş E-Postası",
+        "PLACEHOLDER": "İş e-posta adresinizi girin"
       },
-      "SUBMIT": "Continue with SSO",
+      "SUBMIT": "SSO ile devam et",
       "API": {
-        "ERROR_MESSAGE": "SSO authentication failed. Please check your credentials and try again."
+        "ERROR_MESSAGE": "SSO (Tek Oturum Açma) kimlik doğrulaması başarısız oldu. Lütfen kimlik bilgilerinizi kontrol edin ve tekrar deneyin."
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/tr/report.json b/app/javascript/dashboard/i18n/locale/tr/report.json
index 2895f8119..ae3d54d3f 100644
--- a/app/javascript/dashboard/i18n/locale/tr/report.json
+++ b/app/javascript/dashboard/i18n/locale/tr/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Son 7 gün",
       "LAST_14_DAYS": "Son 14 gün",
       "LAST_30_DAYS": "Son 30 gün",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Son 3 ay",
       "LAST_6_MONTHS": "Son 6 ay",
       "LAST_YEAR": "Geçen yıl",
@@ -194,7 +196,7 @@
   },
   "LABEL_REPORTS": {
     "HEADER": "Etiketler Genel Bakış",
-    "DESCRIPTION": "Konuşmalar, yanıt süreleri, çözüm süreleri ve çözülmüş vakalar gibi temel ölçümlerle etiket performansını takip edin. Ayrıntılı içgörüler için bir etiket adına tıklayın.",
+    "DESCRIPTION": "Etiket performansını; konuşmalar, yanıt süreleri, çözüm süreleri ve çözümlenen vakalar dahil olmak üzere temel metriklerle takip edin. Ayrıntılı analizler için bir etiket adına tıklayın.",
     "LOADING_CHART": "Grafik verileri yükleniyor...",
     "NO_ENOUGH_DATA": "Rapor oluşturmak için yeterli veri yok, Lütfen daha sonra tekrar deneyin.",
     "DOWNLOAD_LABEL_REPORTS": "Etiket raporlarını indir",
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 120acd2f4..88bc7346f 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Hesap Askıya Alındı",
       "MESSAGE": "Hesabınız askıya alındı. Daha fazla bilgi için lütfen destek ekibine ulaşın."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "Hesap bulunamadı",
+      "MESSAGE_CLOUD": "Şu anda herhangi bir hesabın parçası değilsiniz. Bunun bir hata olduğunu düşünüyorsanız, lütfen destek ekibimizle iletişime geçin.",
+      "MESSAGE_SELF_HOSTED": "Şu anda herhangi bir hesabın parçası değilsiniz. Lütfen yöneticinizle iletişime geçin.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Araçlar",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Oyun Alanı",
+    "CAPTAIN_INBOXES": "Gelen kutuları",
+    "CAPTAIN_SETTINGS": "Ayarlar",
     "HOME": "Anasayfa",
     "AGENTS": "Kullanıcılar",
     "AGENT_BOTS": "Botlar",
@@ -419,8 +429,8 @@
         "PLACEHOLDER": "-----BEGIN CERTIFICATE-----\nMIIC..."
       },
       "FINGERPRINT": {
-        "LABEL": "Fingerprint",
-        "TOOLTIP": "SHA-1 fingerprint of the certificate - Use this to verify the certificate in your IdP configuration"
+        "LABEL": "Parmak izi",
+        "TOOLTIP": "Sertifikanın SHA-1 parmak izi – Bunu, Kimlik Sağlayıcısı (IdP) yapılandırmanızda sertifikayı doğrulamak için kullanın"
       },
       "COPY_SUCCESS": "Kod başarıyla panoya kopyalandı",
       "SP_ENTITY_ID": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/signup.json b/app/javascript/dashboard/i18n/locale/tr/signup.json
index c804e8968..9900d3ba6 100644
--- a/app/javascript/dashboard/i18n/locale/tr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/tr/signup.json
@@ -28,11 +28,11 @@
       "PLACEHOLDER": "Parola",
       "ERROR": "Parola çok kısa.",
       "IS_INVALID_PASSWORD": "Şifre en az 1 büyük harf, 1 küçük harf, 1 rakam ve 1 özel karakter içermelidir.",
-      "REQUIREMENTS_LENGTH": "At least 6 characters long",
-      "REQUIREMENTS_UPPERCASE": "At least one uppercase letter",
-      "REQUIREMENTS_LOWERCASE": "At least one lowercase letter",
-      "REQUIREMENTS_NUMBER": "At least one number",
-      "REQUIREMENTS_SPECIAL": "At least one special character"
+      "REQUIREMENTS_LENGTH": "En az 6 karakter uzunluğunda olmalı",
+      "REQUIREMENTS_UPPERCASE": "En az bir büyük harf içermeli",
+      "REQUIREMENTS_LOWERCASE": "En az bir küçük harf içermeli",
+      "REQUIREMENTS_NUMBER": "En az bir rakam içermeli",
+      "REQUIREMENTS_SPECIAL": "En az bir özel karakter içermeli"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Parolayı onayla",
@@ -40,7 +40,7 @@
       "ERROR": "Parola eşleşmiyor."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Registration Successful",
+      "SUCCESS_MESSAGE": "Başarıyla Kayıt Olundu",
       "ERROR_MESSAGE": "Woot sunucusuna bağlanılamadı. Lütfen tekrar deneyin."
     },
     "SUBMIT": "Hesap oluştur",
diff --git a/app/javascript/dashboard/i18n/locale/uk/bulkActions.json b/app/javascript/dashboard/i18n/locale/uk/bulkActions.json
index d231caf73..b80380077 100644
--- a/app/javascript/dashboard/i18n/locale/uk/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/uk/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Призначити мітки",
-      "NO_LABELS_FOUND": "Міток не знайдено для",
+      "NO_LABELS_FOUND": "Міток не знайдено",
       "ASSIGN_SELECTED_LABELS": "Призначити вибрані мітки",
       "ASSIGN_SUCCESFUL": "Мітки додано успішно.",
       "ASSIGN_FAILED": "Не вдалося призначити мітки, будь ласка, спробуйте ще раз."
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index 5bc5d2535..648b2725b 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Призначити мітки",
+    "ASSIGN_LABELS_SUCCESS": "Мітки додано успішно.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Видалити",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Видалити контакт"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index d08bbf1c7..dcca01734 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "URL вебхука",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Налаштування",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Всі"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Редагувати",
+        "DELETE_RESPONSE": "Видалити"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/uk/report.json b/app/javascript/dashboard/i18n/locale/uk/report.json
index bf40caef6..6af3bdc23 100644
--- a/app/javascript/dashboard/i18n/locale/uk/report.json
+++ b/app/javascript/dashboard/i18n/locale/uk/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Останні 7 днів",
       "LAST_14_DAYS": "Останні 14 днів",
       "LAST_30_DAYS": "Останні 30 днів",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Останні 3 місяці",
       "LAST_6_MONTHS": "Останні 6 місяців",
       "LAST_YEAR": "Минулий рік",
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index 6d480d63b..2fcc4fd2f 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Обліковий запис призупинено",
       "MESSAGE": "Ваш обліковий запис призупинено. Будь ласка, зверніться до служби підтримки для отримання додаткової інформації."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Вхідні",
+    "CAPTAIN_SETTINGS": "Налаштування",
     "HOME": "Головна",
     "AGENTS": "Агенти",
     "AGENT_BOTS": "Боти",
diff --git a/app/javascript/dashboard/i18n/locale/ur/bulkActions.json b/app/javascript/dashboard/i18n/locale/ur/bulkActions.json
index bf9bc63f6..062627b3b 100644
--- a/app/javascript/dashboard/i18n/locale/ur/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ur/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "کوئی لیبل نہیں ملے",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ur/contact.json b/app/javascript/dashboard/i18n/locale/ur/contact.json
index 89d34ae09..ed2521670 100644
--- a/app/javascript/dashboard/i18n/locale/ur/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "حذف کریں۔",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "کانٹیکٹ حذف کریں۔"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ur/integrations.json b/app/javascript/dashboard/i18n/locale/ur/integrations.json
index 4bae35b73..ba9130a1d 100644
--- a/app/javascript/dashboard/i18n/locale/ur/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "تمام"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "ترمیم",
+        "DELETE_RESPONSE": "حذف کریں۔"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ur/report.json b/app/javascript/dashboard/i18n/locale/ur/report.json
index 6c25d30c7..a4c1fb9b3 100644
--- a/app/javascript/dashboard/i18n/locale/ur/report.json
+++ b/app/javascript/dashboard/i18n/locale/ur/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
index dda7ab163..8b15e3009 100644
--- a/app/javascript/dashboard/i18n/locale/ur/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "ایجنٹ",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json b/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
index d64d9d38c..0c8d6602c 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "No labels found",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
index 7b8618ad7..f0c63eaf5 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Delete",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Delete contact"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
index 081ddbde8..983953180 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Settings",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "All"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Edit",
+        "DELETE_RESPONSE": "Delete"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/report.json b/app/javascript/dashboard/i18n/locale/ur_IN/report.json
index 22e285c19..a2ad6bd4a 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/report.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "Last 7 days",
       "LAST_14_DAYS": "Last 14 days",
       "LAST_30_DAYS": "Last 30 days",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "Last 3 months",
       "LAST_6_MONTHS": "Last 6 months",
       "LAST_YEAR": "Last year",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
index 256f77c04..aec3e852d 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Inboxes",
+    "CAPTAIN_SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/vi/bulkActions.json b/app/javascript/dashboard/i18n/locale/vi/bulkActions.json
index fb0ef62c1..b7c34ab22 100644
--- a/app/javascript/dashboard/i18n/locale/vi/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/vi/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "NO_LABELS_FOUND": "Không tìm thấy nhãn nào cho",
+      "NO_LABELS_FOUND": "Không tìm thấy nhãn",
       "ASSIGN_SELECTED_LABELS": "Gán các nhãn đã chọn",
       "ASSIGN_SUCCESFUL": "Các nhãn được gán thành công.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index 6b889a835..75ea39597 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Gán nhãn",
+    "ASSIGN_LABELS_SUCCESS": "Các nhãn được gán thành công.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "Xoá",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "Xoá liên hệ"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
index 6d8fee8ae..2caf8e3ee 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "Cài đặt",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "Tất cả"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "Chỉnh sửa",
+        "DELETE_RESPONSE": "Xoá"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/vi/report.json b/app/javascript/dashboard/i18n/locale/vi/report.json
index 6713bb3a9..69b10453e 100644
--- a/app/javascript/dashboard/i18n/locale/vi/report.json
+++ b/app/javascript/dashboard/i18n/locale/vi/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "7 ngày cuối",
       "LAST_14_DAYS": "14 ngày cuối",
       "LAST_30_DAYS": "30 ngày cuối",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "3 tháng vừa qua",
       "LAST_6_MONTHS": "6 tháng vừa qua",
       "LAST_YEAR": "Năm ngoái",
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index 1f5c43834..5d52a58c5 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Tài khoản bị ngưng",
       "MESSAGE": "Tài khoản của bạn bị tạm ngưng. Vui lòng liên hệ với nhóm hỗ trợ để biết thêm thông tin."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "Hộp thư đến",
+    "CAPTAIN_SETTINGS": "Cài đặt",
     "HOME": "Trang Chủ",
     "AGENTS": "Đại lý",
     "AGENT_BOTS": "Bots",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index aad2d58d2..8f686b106 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "目前没有联系人在线 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "分配标签",
+    "ASSIGN_LABELS_SUCCESS": "已成功分配标签.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} 已选择",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "全选 ({count})",
+    "DELETE_CONTACTS": "删除",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "删除联系人"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "我们无法完成搜索。请稍后再试。"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
index fdc96f2ba..ca4a76367 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "对话输入关闭"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook 网址",
           "PLACEHOLDER": "例如：{webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "了解更多",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "助手",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "尝试这些提示信息",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "无法找到助手。请重试。"
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "助手"
-        },
+        "HEADER": "设置",
         "BASIC_SETTINGS": {
           "TITLE": "基本设置",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "删除助手",
+          "DESCRIPTION": "此操作是永久性的。删除此文档将永久删除所有生成的知识。",
+          "BUTTON_TEXT": "删除 {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "全选 ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "全选 ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "全选 ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "文档名称(可选)",
           "PLACEHOLDER": "输入文档的名称"
-        },
-        "ASSISTANT": {
-          "LABEL": "助手",
-          "PLACEHOLDER": "选择助手",
-          "ERROR": "助手字段是必需的"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "常见问题",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "创建新常见问题",
       "DOCUMENTABLE": {
         "CONVERSATION": "对话 #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "已批准",
         "ALL": "所有"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "将问题及其对应的答案添加到知识库，并选择应关联的助手。",
       "CREATE": {
         "TITLE": "添加常见问题",
@@ -918,11 +918,6 @@
           "LABEL": "答案",
           "PLACEHOLDER": "在此输入答案",
           "ERROR": "请提供有效的答案"
-        },
-        "ASSISTANT": {
-          "LABEL": "助手",
-          "PLACEHOLDER": "选择助手",
-          "ERROR": "请选择助手"
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "常见问题已标记为已批准"
       },
       "OPTIONS": {
-        "APPROVE": "标记为已批准",
-        "EDIT_RESPONSE": "编辑常见问题",
-        "DELETE_RESPONSE": "删除常见问题"
+        "APPROVE": "批准",
+        "EDIT_RESPONSE": "编辑",
+        "DELETE_RESPONSE": "删除"
       },
       "EMPTY_STATE": {
         "TITLE": "未找到常见问题",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "常见问题帮助您的助手为客户提供快速准确的答案。它们可以从您的内容自动生成，也可以手动添加。",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain 常见问题",
           "NOTE": "Captain FAQs 检测常见的客户问题——无论是知识库中缺失的问题还是经常被问到的问题——并生成相关的常见问题以改善支持。您可以查看每个建议，并决定是否批准或拒绝它。"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/report.json b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
index b6b89b17e..57c9ef3af 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "最近7天",
       "LAST_14_DAYS": "最近14天",
       "LAST_30_DAYS": "最近30天",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "最近3个月",
       "LAST_6_MONTHS": "最近6个月",
       "LAST_YEAR": "最近一年",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 478816f53..1a60e9538 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "账户已暂停",
       "MESSAGE": "您的账户已被暂停。请联系支持团队以获取更多信息。"
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "注销"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "文档",
     "CAPTAIN_RESPONSES": "常见问题",
     "CAPTAIN_TOOLS": "工具",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "试验场",
+    "CAPTAIN_INBOXES": "收件箱",
+    "CAPTAIN_SETTINGS": "设置",
     "HOME": "首页",
     "AGENTS": "客服代理",
     "AGENT_BOTS": "机器人",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json b/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
index e0cb95926..d536d294e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
@@ -24,7 +24,7 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "標記標籤",
-      "NO_LABELS_FOUND": "No labels found for",
+      "NO_LABELS_FOUND": "查無標籤",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
       "ASSIGN_FAILED": "Failed to assign labels. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index 527561074..b49071a36 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -571,6 +571,27 @@
       "ACTIVE_EMPTY_STATE_TITLE": "No contacts are active at the moment 🌙"
     }
   },
+  "CONTACTS_BULK_ACTIONS": {
+    "ASSIGN_LABELS": "Assign Labels",
+    "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
+    "ASSIGN_LABELS_FAILED": "Failed to assign labels",
+    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
+    "NO_LABELS_FOUND": "No labels available yet.",
+    "SELECTED_COUNT": "{count} selected",
+    "CLEAR_SELECTION": "Clear selection",
+    "SELECT_ALL": "Select all ({count})",
+    "DELETE_CONTACTS": "刪除",
+    "DELETE_SUCCESS": "Contacts deleted successfully.",
+    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_DIALOG": {
+      "TITLE": "Delete selected contacts",
+      "SINGULAR_TITLE": "Delete selected contact",
+      "DESCRIPTION": "This will permanently delete {count} selected contacts. This action cannot be undone.",
+      "SINGULAR_DESCRIPTION": "This will permanently delete the selected contact. This action cannot be undone.",
+      "CONFIRM_MULTIPLE": "Delete contacts",
+      "CONFIRM_SINGLE": "刪除聯絡人"
+    }
+  },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
       "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
index a781e7728..feb3146ed 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
@@ -46,6 +46,10 @@
             "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook 網址",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
@@ -344,6 +348,12 @@
   "CAPTAIN": {
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
+    "ASSISTANT_SWITCHER": {
+      "ASSISTANTS": "Assistants",
+      "SWITCH_ASSISTANT": "Switch between assistants",
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
+    },
     "COPILOT": {
       "TITLE": "Copilot",
       "TRY_THESE_PROMPTS": "Try these prompts",
@@ -483,9 +493,7 @@
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
       "SETTINGS": {
-        "BREADCRUMB": {
-          "ASSISTANT": "Assistant"
-        },
+        "HEADER": "設定",
         "BASIC_SETTINGS": {
           "TITLE": "Basic settings",
           "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
@@ -502,15 +510,16 @@
               "TITLE": "Guardrails",
               "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
             },
-            "SCENARIOS": {
-              "TITLE": "Scenarios",
-              "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”"
-            },
             "RESPONSE_GUIDELINES": {
               "TITLE": "Response guidelines",
               "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
             }
           }
+        },
+        "DELETE": {
+          "TITLE": "Delete Assistant",
+          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+          "BUTTON_TEXT": "Delete {assistantName}"
         }
       },
       "OPTIONS": {
@@ -529,9 +538,6 @@
       "GUARDRAILS": {
         "TITLE": "Guardrails",
         "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
-        "BREADCRUMB": {
-          "TITLE": "Guardrails"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -577,9 +583,6 @@
       "RESPONSE_GUIDELINES": {
         "TITLE": "Response Guidelines",
         "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
-        "BREADCRUMB": {
-          "TITLE": "Response Guidelines"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -625,9 +628,6 @@
       "SCENARIOS": {
         "TITLE": "Scenarios",
         "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
-        "BREADCRUMB": {
-          "TITLE": "Scenarios"
-        },
         "BULK_ACTION": {
           "SELECTED": "{count} item selected | {count} items selected",
           "SELECT_ALL": "Select all ({count})",
@@ -725,11 +725,6 @@
         "NAME": {
           "LABEL": "Document Name (Optional)",
           "PLACEHOLDER": "Enter a name for the document"
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
         }
       },
       "DELETE": {
@@ -863,6 +858,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -902,6 +898,10 @@
         "APPROVED": "Approved",
         "ALL": "所有的"
       },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
+      },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
         "TITLE": "Add an FAQ",
@@ -918,11 +918,6 @@
           "LABEL": "Answer",
           "PLACEHOLDER": "Enter the answer here",
           "ERROR": "Please provide a valid answer."
-        },
-        "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
         }
       },
       "EDIT": {
@@ -932,13 +927,15 @@
         "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "Approve",
+        "EDIT_RESPONSE": "編輯",
+        "DELETE_RESPONSE": "刪除"
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
           "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/report.json b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
index 76a86db03..3f36b9ef5 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
@@ -53,6 +53,8 @@
       "LAST_7_DAYS": "最近7天",
       "LAST_14_DAYS": "最近14天",
       "LAST_30_DAYS": "最近30天",
+      "THIS_MONTH": "This month",
+      "LAST_MONTH": "Last month",
       "LAST_3_MONTHS": "三個月內",
       "LAST_6_MONTHS": "六個月內",
       "LAST_YEAR": "去年",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index 814517a19..1ba1d30ff 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "退出登入"
     }
   },
   "COMPONENTS": {
@@ -305,6 +311,10 @@
     "CAPTAIN_DOCUMENTS": "Documents",
     "CAPTAIN_RESPONSES": "FAQs",
     "CAPTAIN_TOOLS": "Tools",
+    "CAPTAIN_SCENARIOS": "Scenarios",
+    "CAPTAIN_PLAYGROUND": "Playground",
+    "CAPTAIN_INBOXES": "收件匣",
+    "CAPTAIN_SETTINGS": "設定",
     "HOME": "首頁",
     "AGENTS": "客服",
     "AGENT_BOTS": "機器人",
diff --git a/app/javascript/dashboard/mixins/fileUploadMixin.js b/app/javascript/dashboard/mixins/fileUploadMixin.js
index 5313be812..965846401 100644
--- a/app/javascript/dashboard/mixins/fileUploadMixin.js
+++ b/app/javascript/dashboard/mixins/fileUploadMixin.js
@@ -3,27 +3,48 @@ import { useAlert } from 'dashboard/composables';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import { getMaxUploadSizeByChannel } from '@chatwoot/utils';
 import { DirectUpload } from 'activestorage';
-import { MAXIMUM_FILE_UPLOAD_SIZE } from 'shared/constants/messages';
+import {
+  DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE,
+  resolveMaximumFileUploadSize,
+} from 'shared/helpers/FileHelper';
+import { INBOX_TYPES } from 'dashboard/helper/inbox';
 
 export default {
   computed: {
     ...mapGetters({
       accountId: 'getCurrentAccountId',
     }),
+    installationLimit() {
+      return resolveMaximumFileUploadSize(
+        this.globalConfig.maximumFileUploadSize
+      );
+    },
   },
 
   methods: {
     maxSizeFor(mime) {
-      // Use default file size limit for private notes
+      // Use default/installation limit for private notes
       if (this.isOnPrivateNote) {
-        return MAXIMUM_FILE_UPLOAD_SIZE;
+        return this.installationLimit;
       }
 
-      return getMaxUploadSizeByChannel({
-        channelType: this.inbox?.channel_type,
+      const channelType = this.inbox?.channel_type;
+
+      if (!channelType || channelType === INBOX_TYPES.WEB) {
+        return this.installationLimit;
+      }
+
+      const channelLimit = getMaxUploadSizeByChannel({
+        channelType,
         medium: this.inbox?.medium, // e.g. 'sms' | 'whatsapp'
         mime, // e.g. 'image/png'
       });
+
+      if (channelLimit === DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE) {
+        return this.installationLimit;
+      }
+
+      return Math.min(channelLimit, this.installationLimit);
     },
     alertOverLimit(maxSizeMB) {
       useAlert(
diff --git a/app/javascript/dashboard/mixins/specs/fileUploadMixin.spec.js b/app/javascript/dashboard/mixins/specs/fileUploadMixin.spec.js
index a873b1859..273e89e97 100644
--- a/app/javascript/dashboard/mixins/specs/fileUploadMixin.spec.js
+++ b/app/javascript/dashboard/mixins/specs/fileUploadMixin.spec.js
@@ -6,6 +6,8 @@ import { reactive } from 'vue';
 
 vi.mock('shared/helpers/FileHelper', () => ({
   checkFileSizeLimit: vi.fn(),
+  resolveMaximumFileUploadSize: vi.fn(value => Number(value) || 40),
+  DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE: 40,
 }));
 
 vi.mock('activestorage', () => ({
@@ -27,6 +29,7 @@ describe('FileUploadMixin', () => {
   beforeEach(() => {
     mockGlobalConfig = reactive({
       directUploadsEnabled: true,
+      maximumFileUploadSize: 40,
     });
 
     mockCurrentChat = reactive({
diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/Edit.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/Edit.vue
deleted file mode 100644
index 2b2506934..000000000
--- a/app/javascript/dashboard/routes/dashboard/captain/assistants/Edit.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<script setup>
-import { computed, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
-import { useStore } from 'dashboard/composables/store';
-import { useMapGetter } from 'dashboard/composables/store';
-import { useAlert } from 'dashboard/composables';
-import { useI18n } from 'vue-i18n';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
-import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
-import EditAssistantForm from '../../../../components-next/captain/pageComponents/assistant/EditAssistantForm.vue';
-import AssistantPlayground from 'dashboard/components-next/captain/assistant/AssistantPlayground.vue';
-
-import AssistantSettings from 'dashboard/routes/dashboard/captain/assistants/settings/Settings.vue';
-
-const route = useRoute();
-const store = useStore();
-const { t } = useI18n();
-const assistantId = route.params.assistantId;
-const uiFlags = useMapGetter('captainAssistants/getUIFlags');
-const isFetching = computed(() => uiFlags.value.fetchingItem);
-const assistant = computed(() =>
-  store.getters['captainAssistants/getRecord'](Number(assistantId))
-);
-
-const isFeatureEnabledonAccount = useMapGetter(
-  'accounts/isFeatureEnabledonAccount'
-);
-const currentAccountId = useMapGetter('getCurrentAccountId');
-
-const isCaptainV2Enabled = isFeatureEnabledonAccount.value(
-  currentAccountId.value,
-  FEATURE_FLAGS.CAPTAIN_V2
-);
-
-const isAssistantAvailable = computed(() => !!assistant.value?.id);
-
-const handleSubmit = async updatedAssistant => {
-  try {
-    await store.dispatch('captainAssistants/update', {
-      id: assistantId,
-      ...updatedAssistant,
-    });
-    useAlert(t('CAPTAIN.ASSISTANTS.EDIT.SUCCESS_MESSAGE'));
-  } catch (error) {
-    const errorMessage =
-      error?.message || t('CAPTAIN.ASSISTANTS.EDIT.ERROR_MESSAGE');
-    useAlert(errorMessage);
-  }
-};
-
-onMounted(() => {
-  if (!isAssistantAvailable.value || !isCaptainV2Enabled) {
-    store.dispatch('captainAssistants/show', assistantId);
-  }
-});
-</script>
-
-<template>
-  <AssistantSettings v-if="isCaptainV2Enabled" />
-  <PageLayout
-    v-else
-    :header-title="assistant?.name"
-    :show-pagination-footer="false"
-    :is-fetching="isFetching"
-    :show-know-more="false"
-    :back-url="{ name: 'captain_assistants_index' }"
-  >
-    <template #body>
-      <div v-if="!isAssistantAvailable">
-        {{ t('CAPTAIN.ASSISTANTS.EDIT.NOT_FOUND') }}
-      </div>
-      <div v-else class="flex gap-4 h-full">
-        <div class="flex-1 lg:overflow-auto pr-4 h-full md:h-auto">
-          <EditAssistantForm
-            :assistant="assistant"
-            mode="edit"
-            @submit="handleSubmit"
-          />
-        </div>
-        <div class="w-[400px] hidden lg:block h-full">
-          <AssistantPlayground :assistant-id="Number(assistantId)" />
-        </div>
-      </div>
-    </template>
-  </PageLayout>
-</template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/Index.vue
index 4d2f30231..c6403f104 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/assistants/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/assistants/Index.vue
@@ -1,91 +1,57 @@
 <script setup>
-import { computed, onMounted, ref, nextTick } from 'vue';
-import { useMapGetter, useStore } from 'dashboard/composables/store';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { computed, ref, nextTick } from 'vue';
 import { useRouter } from 'vue-router';
+import { useMapGetter } from 'dashboard/composables/store';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { useAccount } from 'dashboard/composables/useAccount';
 
-import AssistantCard from 'dashboard/components-next/captain/assistant/AssistantCard.vue';
-import DeleteDialog from 'dashboard/components-next/captain/pageComponents/DeleteDialog.vue';
 import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
 import CaptainPaywall from 'dashboard/components-next/captain/pageComponents/Paywall.vue';
 import CreateAssistantDialog from 'dashboard/components-next/captain/pageComponents/assistant/CreateAssistantDialog.vue';
 import AssistantPageEmptyState from 'dashboard/components-next/captain/pageComponents/emptyStates/AssistantPageEmptyState.vue';
 import FeatureSpotlightPopover from 'dashboard/components-next/feature-spotlight/FeatureSpotlightPopover.vue';
-import LimitBanner from 'dashboard/components-next/captain/pageComponents/response/LimitBanner.vue';
 
 const { isOnChatwootCloud } = useAccount();
 
-const router = useRouter();
-
-const store = useStore();
 const dialogType = ref('');
 const uiFlags = useMapGetter('captainAssistants/getUIFlags');
-const assistants = useMapGetter('captainAssistants/getRecords');
 const isFetching = computed(() => uiFlags.value.fetchingList);
 
 const selectedAssistant = ref(null);
-const deleteAssistantDialog = ref(null);
-
-const handleDelete = () => {
-  deleteAssistantDialog.value.dialogRef.open();
-};
-
 const createAssistantDialog = ref(null);
+const router = useRouter();
 
 const handleCreate = () => {
   dialogType.value = 'create';
   nextTick(() => createAssistantDialog.value.dialogRef.open());
 };
 
-const handleEdit = () => {
-  router.push({
-    name: 'captain_assistants_edit',
-    params: { assistantId: selectedAssistant.value.id },
-  });
-};
-
-const handleViewConnectedInboxes = () => {
-  router.push({
-    name: 'captain_assistants_inboxes_index',
-    params: { assistantId: selectedAssistant.value.id },
-  });
-};
-
-const handleAction = ({ action, id }) => {
-  selectedAssistant.value = assistants.value.find(
-    assistant => id === assistant.id
-  );
-  nextTick(() => {
-    if (action === 'delete') {
-      handleDelete();
-    }
-    if (action === 'edit') {
-      handleEdit();
-    }
-    if (action === 'viewConnectedInboxes') {
-      handleViewConnectedInboxes();
-    }
-  });
-};
-
 const handleCreateClose = () => {
   dialogType.value = '';
   selectedAssistant.value = null;
 };
 
-onMounted(() => store.dispatch('captainAssistants/get'));
+const handleAfterCreate = newAssistant => {
+  // Navigate directly to documents page with the new assistant ID
+  if (newAssistant?.id) {
+    router.push({
+      name: 'captain_assistants_responses_index',
+      params: {
+        accountId: router.currentRoute.value.params.accountId,
+        assistantId: newAssistant.id,
+      },
+    });
+  }
+};
 </script>
 
 <template>
   <PageLayout
     :header-title="$t('CAPTAIN.ASSISTANTS.HEADER')"
-    :button-label="$t('CAPTAIN.ASSISTANTS.ADD_NEW')"
-    :button-policy="['administrator']"
     :show-pagination-footer="false"
     :is-fetching="isFetching"
-    :is-empty="!assistants.length"
     :feature-flag="FEATURE_FLAGS.CAPTAIN"
+    is-empty
     @click="handleCreate"
   >
     <template #knowMore>
@@ -107,36 +73,13 @@ onMounted(() => store.dispatch('captainAssistants/get'));
       <CaptainPaywall />
     </template>
 
-    <template #body>
-      <LimitBanner class="mb-5" />
-
-      <div class="flex flex-col gap-4">
-        <AssistantCard
-          v-for="assistant in assistants"
-          :id="assistant.id"
-          :key="assistant.id"
-          :name="assistant.name"
-          :description="assistant.description"
-          :updated-at="assistant.updated_at || assistant.created_at"
-          :created-at="assistant.created_at"
-          @action="handleAction"
-        />
-      </div>
-    </template>
-
-    <DeleteDialog
-      v-if="selectedAssistant"
-      ref="deleteAssistantDialog"
-      :entity="selectedAssistant"
-      type="Assistants"
-    />
-
     <CreateAssistantDialog
       v-if="dialogType"
       ref="createAssistantDialog"
       :type="dialogType"
       :selected-assistant="selectedAssistant"
       @close="handleCreateClose"
+      @created="handleAfterCreate"
     />
   </PageLayout>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/guardrails/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/guardrails/Index.vue
index 670a40dc3..f61c2ed53 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/assistants/guardrails/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/assistants/guardrails/Index.vue
@@ -10,7 +10,7 @@ import { useUISettings } from 'dashboard/composables/useUISettings';
 import Input from 'dashboard/components-next/input/Input.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 
-import SettingsPageLayout from 'dashboard/components-next/captain/SettingsPageLayout.vue';
+import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
 import SettingsHeader from 'dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue';
 import SuggestedRules from 'dashboard/components-next/captain/assistant/SuggestedRules.vue';
 import AddNewRulesInput from 'dashboard/components-next/captain/assistant/AddNewRulesInput.vue';
@@ -23,30 +23,27 @@ const route = useRoute();
 const store = useStore();
 const { uiSettings, updateUISettings } = useUISettings();
 
-const assistantId = route.params.assistantId;
 const uiFlags = useMapGetter('captainAssistants/getUIFlags');
+const assistantId = computed(() => Number(route.params.assistantId));
 const isFetching = computed(() => uiFlags.value.fetchingItem);
 const assistant = computed(() =>
-  store.getters['captainAssistants/getRecord'](Number(assistantId))
+  store.getters['captainAssistants/getRecord'](assistantId.value)
 );
 
 const searchQuery = ref('');
 const newInlineRule = ref('');
 const newDialogRule = ref('');
 
-const breadcrumbItems = computed(() => {
-  return [
-    {
-      label: t('CAPTAIN.ASSISTANTS.SETTINGS.BREADCRUMB.ASSISTANT'),
-      routeName: 'captain_assistants_index',
-    },
-    { label: assistant.value?.name, routeName: 'captain_assistants_edit' },
-    { label: t('CAPTAIN.ASSISTANTS.GUARDRAILS.BREADCRUMB.TITLE') },
-  ];
-});
-
 const guardrailsContent = computed(() => assistant.value?.guardrails || []);
 
+const backUrl = computed(() => ({
+  name: 'captain_assistants_settings_index',
+  params: {
+    accountId: route.params.accountId,
+    assistantId: assistantId.value,
+  },
+}));
+
 const displayGuardrails = computed(() =>
   guardrailsContent.value.map((c, idx) => ({ id: idx, content: c }))
 );
@@ -113,7 +110,7 @@ const selectedCountLabel = computed(() => {
 
 const saveGuardrails = async list => {
   await store.dispatch('captainAssistants/update', {
-    id: assistantId,
+    id: assistantId.value,
     assistant: { guardrails: list },
   });
 };
@@ -176,9 +173,13 @@ const addAllExample = () => {
 </script>
 
 <template>
-  <SettingsPageLayout
-    :breadcrumb-items="breadcrumbItems"
+  <PageLayout
+    :header-title="$t('CAPTAIN.ASSISTANTS.GUARDRAILS.TITLE')"
     :is-fetching="isFetching"
+    :back-url="backUrl"
+    :show-know-more="false"
+    :show-pagination-footer="false"
+    :show-assistant-switcher="false"
   >
     <template #body>
       <SettingsHeader
@@ -297,5 +298,5 @@ const addAllExample = () => {
         />
       </div>
     </template>
-  </SettingsPageLayout>
+  </PageLayout>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/guidelines/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/guidelines/Index.vue
index 711b99f71..89aebd992 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/assistants/guidelines/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/assistants/guidelines/Index.vue
@@ -10,7 +10,7 @@ import { useUISettings } from 'dashboard/composables/useUISettings';
 import Input from 'dashboard/components-next/input/Input.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 
-import SettingsPageLayout from 'dashboard/components-next/captain/SettingsPageLayout.vue';
+import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
 import SettingsHeader from 'dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue';
 import SuggestedRules from 'dashboard/components-next/captain/assistant/SuggestedRules.vue';
 import AddNewRulesInput from 'dashboard/components-next/captain/assistant/AddNewRulesInput.vue';
@@ -23,32 +23,29 @@ const route = useRoute();
 const store = useStore();
 const { uiSettings, updateUISettings } = useUISettings();
 
-const assistantId = route.params.assistantId;
 const uiFlags = useMapGetter('captainAssistants/getUIFlags');
+const assistantId = computed(() => Number(route.params.assistantId));
 const isFetching = computed(() => uiFlags.value.fetchingItem);
 const assistant = computed(() =>
-  store.getters['captainAssistants/getRecord'](Number(assistantId))
+  store.getters['captainAssistants/getRecord'](assistantId.value)
 );
 
 const searchQuery = ref('');
 const newInlineRule = ref('');
 const newDialogRule = ref('');
 
-const breadcrumbItems = computed(() => {
-  return [
-    {
-      label: t('CAPTAIN.ASSISTANTS.SETTINGS.BREADCRUMB.ASSISTANT'),
-      routeName: 'captain_assistants_index',
-    },
-    { label: assistant.value?.name, routeName: 'captain_assistants_edit' },
-    { label: t('CAPTAIN.ASSISTANTS.RESPONSE_GUIDELINES.TITLE') },
-  ];
-});
-
 const guidelinesContent = computed(
   () => assistant.value?.response_guidelines || []
 );
 
+const backUrl = computed(() => ({
+  name: 'captain_assistants_settings_index',
+  params: {
+    accountId: route.params.accountId,
+    assistantId: assistantId.value,
+  },
+}));
+
 const displayGuidelines = computed(() =>
   guidelinesContent.value.map((c, idx) => ({ id: idx, content: c }))
 );
@@ -119,7 +116,7 @@ const selectedCountLabel = computed(() => {
 
 const saveGuidelines = async list => {
   await store.dispatch('captainAssistants/update', {
-    id: assistantId,
+    id: assistantId.value,
     assistant: { response_guidelines: list },
   });
 };
@@ -183,9 +180,13 @@ const addAllExample = async () => {
 </script>
 
 <template>
-  <SettingsPageLayout
-    :breadcrumb-items="breadcrumbItems"
+  <PageLayout
+    :header-title="$t('CAPTAIN.ASSISTANTS.RESPONSE_GUIDELINES.TITLE')"
     :is-fetching="isFetching"
+    :back-url="backUrl"
+    :show-know-more="false"
+    :show-pagination-footer="false"
+    :show-assistant-switcher="false"
   >
     <template #body>
       <SettingsHeader
@@ -321,5 +322,5 @@ const addAllExample = async () => {
         />
       </div>
     </template>
-  </SettingsPageLayout>
+  </PageLayout>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/inboxes/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/inboxes/Index.vue
index 81b6ccc04..62db5e495 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/assistants/inboxes/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/assistants/inboxes/Index.vue
@@ -1,14 +1,9 @@
 <script setup>
-import { computed, onBeforeMount, onMounted, ref, nextTick } from 'vue';
-import {
-  useMapGetter,
-  useStore,
-  useStoreGetters,
-} from 'dashboard/composables/store';
+import { computed, onMounted, ref, nextTick } from 'vue';
+import { useMapGetter, useStore } from 'dashboard/composables/store';
 import { useRoute } from 'vue-router';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
-import BackButton from 'dashboard/components/widgets/BackButton.vue';
 import DeleteDialog from 'dashboard/components-next/captain/pageComponents/DeleteDialog.vue';
 import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
 import ConnectInboxDialog from 'dashboard/components-next/captain/pageComponents/inbox/ConnectInboxDialog.vue';
@@ -18,6 +13,8 @@ import InboxPageEmptyState from 'dashboard/components-next/captain/pageComponent
 const store = useStore();
 const dialogType = ref('');
 const route = useRoute();
+
+const assistantId = computed(() => route.params.assistantId);
 const assistantUiFlags = useMapGetter('captainAssistants/getUIFlags');
 const uiFlags = useMapGetter('captainInboxes/getUIFlags');
 const isFetchingAssistant = computed(() => assistantUiFlags.value.fetchingItem);
@@ -52,43 +49,25 @@ const handleCreateClose = () => {
   selectedInbox.value = null;
 };
 
-const getters = useStoreGetters();
-const assistantId = Number(route.params.assistantId);
-const assistant = computed(() =>
-  getters['captainAssistants/getRecord'].value(assistantId)
-);
-onBeforeMount(() => store.dispatch('captainAssistants/show', assistantId));
-
 onMounted(() =>
   store.dispatch('captainInboxes/get', {
-    assistantId: assistantId,
+    assistantId: assistantId.value,
   })
 );
 </script>
 
 <template>
   <PageLayout
+    :header-title="$t('CAPTAIN.INBOXES.HEADER')"
     :button-label="$t('CAPTAIN.INBOXES.ADD_NEW')"
     :button-policy="['administrator']"
     :is-fetching="isFetchingAssistant || isFetching"
     :is-empty="!captainInboxes.length"
     :show-pagination-footer="false"
+    :show-know-more="false"
     :feature-flag="FEATURE_FLAGS.CAPTAIN"
     @click="handleCreate"
   >
-    <template v-if="!isFetchingAssistant" #headerTitle>
-      <div class="flex flex-row items-center gap-4">
-        <BackButton compact />
-        <span
-          class="flex items-center gap-1 text-lg font-medium text-n-slate-12"
-        >
-          {{ assistant.name }}
-          <span class="i-lucide-chevron-right text-xl text-n-slate-10" />
-          {{ $t('CAPTAIN.INBOXES.HEADER') }}
-        </span>
-      </div>
-    </template>
-
     <template #emptyState>
       <InboxPageEmptyState @click="handleCreate" />
     </template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/playground/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/playground/Index.vue
new file mode 100644
index 000000000..54b2dab4f
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/captain/assistants/playground/Index.vue
@@ -0,0 +1,24 @@
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
+import AssistantPlayground from 'dashboard/components-next/captain/assistant/AssistantPlayground.vue';
+
+const route = useRoute();
+const assistantId = computed(() => Number(route.params.assistantId));
+</script>
+
+<template>
+  <PageLayout
+    show-assistant-switcher
+    :show-pagination-footer="false"
+    :show-know-more="false"
+    class="h-full"
+  >
+    <template #body>
+      <div class="flex flex-col h-full">
+        <AssistantPlayground :assistant-id="assistantId" class="bg-n-solid-1" />
+      </div>
+    </template>
+  </PageLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/scenarios/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/scenarios/Index.vue
index 3175500dd..27deb4070 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/assistants/scenarios/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/assistants/scenarios/Index.vue
@@ -10,7 +10,7 @@ import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
 import Button from 'dashboard/components-next/button/Button.vue';
 import Input from 'dashboard/components-next/input/Input.vue';
 
-import SettingsPageLayout from 'dashboard/components-next/captain/SettingsPageLayout.vue';
+import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
 import SettingsHeader from 'dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue';
 import SuggestedScenarios from 'dashboard/components-next/captain/assistant/SuggestedRules.vue';
 import ScenariosCard from 'dashboard/components-next/captain/assistant/ScenariosCard.vue';
@@ -22,28 +22,14 @@ const route = useRoute();
 const store = useStore();
 const { uiSettings, updateUISettings } = useUISettings();
 const { formatMessage } = useMessageFormatter();
-const assistantId = route.params.assistantId;
+const assistantId = computed(() => Number(route.params.assistantId));
 
 const uiFlags = useMapGetter('captainScenarios/getUIFlags');
 const isFetching = computed(() => uiFlags.value.fetchingList);
-const assistant = computed(() =>
-  store.getters['captainAssistants/getRecord'](Number(assistantId))
-);
 const scenarios = useMapGetter('captainScenarios/getRecords');
 
 const searchQuery = ref('');
 
-const breadcrumbItems = computed(() => {
-  return [
-    {
-      label: t('CAPTAIN.ASSISTANTS.SETTINGS.BREADCRUMB.ASSISTANT'),
-      routeName: 'captain_assistants_index',
-    },
-    { label: assistant.value?.name, routeName: 'captain_assistants_edit' },
-    { label: t('CAPTAIN.ASSISTANTS.SCENARIOS.BREADCRUMB.TITLE') },
-  ];
-});
-
 const LINK_INSTRUCTION_CLASS =
   '[&_a[href^="tool://"]]:text-n-iris-11 [&_a:not([href^="tool://"])]:text-n-slate-12 [&_a]:pointer-events-none [&_a]:cursor-default';
 
@@ -119,7 +105,7 @@ const updateScenario = async scenario => {
   try {
     await store.dispatch('captainScenarios/update', {
       id: scenario.id,
-      assistantId: route.params.assistantId,
+      assistantId: assistantId.value,
       ...scenario,
       tools: getToolsFromInstruction(scenario.instruction),
     });
@@ -136,7 +122,7 @@ const deleteScenario = async id => {
   try {
     await store.dispatch('captainScenarios/delete', {
       id,
-      assistantId: route.params.assistantId,
+      assistantId: assistantId.value,
     });
     useAlert(t('CAPTAIN.ASSISTANTS.SCENARIOS.API.DELETE.SUCCESS'));
   } catch (error) {
@@ -154,7 +140,7 @@ const bulkDeleteScenarios = async ids => {
     idsArray.map(id =>
       store.dispatch('captainScenarios/delete', {
         id,
-        assistantId: route.params.assistantId,
+        assistantId: assistantId.value,
       })
     )
   );
@@ -165,7 +151,7 @@ const bulkDeleteScenarios = async ids => {
 const addScenario = async scenario => {
   try {
     await store.dispatch('captainScenarios/create', {
-      assistantId: route.params.assistantId,
+      assistantId: assistantId.value,
       ...scenario,
       tools: getToolsFromInstruction(scenario.instruction),
     });
@@ -182,7 +168,7 @@ const addAllExampleScenarios = async () => {
   try {
     scenariosExample.forEach(async scenario => {
       await store.dispatch('captainScenarios/create', {
-        assistantId: route.params.assistantId,
+        assistantId: assistantId.value,
         ...scenario,
       });
     });
@@ -197,16 +183,18 @@ const addAllExampleScenarios = async () => {
 
 onMounted(() => {
   store.dispatch('captainScenarios/get', {
-    assistantId: assistantId,
+    assistantId: assistantId.value,
   });
   store.dispatch('captainTools/getTools');
 });
 </script>
 
 <template>
-  <SettingsPageLayout
-    :breadcrumb-items="breadcrumbItems"
+  <PageLayout
+    :header-title="$t('CAPTAIN.DOCUMENTS.HEADER')"
     :is-fetching="isFetching"
+    :show-know-more="false"
+    :show-pagination-footer="false"
   >
     <template #body>
       <SettingsHeader
@@ -310,5 +298,5 @@ onMounted(() => {
         </div>
       </div>
     </template>
-  </SettingsPageLayout>
+  </PageLayout>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/settings/Settings.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/settings/Settings.vue
index d1324791c..7e667ffe9 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/assistants/settings/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/assistants/settings/Settings.vue
@@ -1,27 +1,39 @@
 <script setup>
-import { computed, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
+import { computed, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useAlert } from 'dashboard/composables';
 import { useStore } from 'dashboard/composables/store';
 import { useMapGetter } from 'dashboard/composables/store';
-import SettingsPageLayout from 'dashboard/components-next/captain/SettingsPageLayout.vue';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { useAccount } from 'dashboard/composables/useAccount';
+import Button from 'dashboard/components-next/button/Button.vue';
+import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
 import SettingsHeader from 'dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue';
 import AssistantBasicSettingsForm from 'dashboard/components-next/captain/pageComponents/assistant/settings/AssistantBasicSettingsForm.vue';
 import AssistantSystemSettingsForm from 'dashboard/components-next/captain/pageComponents/assistant/settings/AssistantSystemSettingsForm.vue';
 import AssistantControlItems from 'dashboard/components-next/captain/pageComponents/assistant/settings/AssistantControlItems.vue';
+import DeleteDialog from 'dashboard/components-next/captain/pageComponents/DeleteDialog.vue';
 
 const { t } = useI18n();
-const route = useRoute();
-const store = useStore();
-const assistantId = route.params.assistantId;
-const uiFlags = useMapGetter('captainAssistants/getUIFlags');
-const isFetching = computed(() => uiFlags.value.fetchingItem);
-const assistant = computed(() =>
-  store.getters['captainAssistants/getRecord'](Number(assistantId))
-);
+const { isCloudFeatureEnabled } = useAccount();
 
-const isAssistantAvailable = computed(() => !!assistant.value?.id);
+const isCaptainV2Enabled = computed(() =>
+  isCloudFeatureEnabled(FEATURE_FLAGS.CAPTAIN_V2)
+);
+const route = useRoute();
+const router = useRouter();
+const store = useStore();
+
+const deleteAssistantDialog = ref(null);
+
+const uiFlags = useMapGetter('captainAssistants/getUIFlags');
+const assistants = useMapGetter('captainAssistants/getRecords');
+const isFetching = computed(() => uiFlags.value.fetchingItem);
+const assistantId = computed(() => Number(route.params.assistantId));
+const assistant = computed(() =>
+  store.getters['captainAssistants/getRecord'](assistantId.value)
+);
 
 const controlItems = computed(() => {
   return [
@@ -34,15 +46,6 @@ const controlItems = computed(() => {
       ),
       routeName: 'captain_assistants_guardrails_index',
     },
-    {
-      name: t(
-        'CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.OPTIONS.SCENARIOS.TITLE'
-      ),
-      description: t(
-        'CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.OPTIONS.SCENARIOS.DESCRIPTION'
-      ),
-      routeName: 'captain_assistants_scenarios_index',
-    },
     {
       name: t(
         'CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.OPTIONS.RESPONSE_GUIDELINES.TITLE'
@@ -55,32 +58,10 @@ const controlItems = computed(() => {
   ];
 });
 
-const breadcrumbItems = computed(() => {
-  const activeControlItem = controlItems.value?.find(
-    item => item.routeName === route.name
-  );
-
-  return [
-    {
-      label: t('CAPTAIN.ASSISTANTS.SETTINGS.BREADCRUMB.ASSISTANT'),
-      routeName: 'captain_assistants_index',
-    },
-    { label: assistant.value?.name, routeName: 'captain_assistants_edit' },
-    ...(activeControlItem
-      ? [
-          {
-            label: activeControlItem.name,
-            routeName: activeControlItem.routeName,
-          },
-        ]
-      : []),
-  ];
-});
-
 const handleSubmit = async updatedAssistant => {
   try {
     await store.dispatch('captainAssistants/update', {
-      id: assistantId,
+      id: assistantId.value,
       ...updatedAssistant,
     });
     useAlert(t('CAPTAIN.ASSISTANTS.EDIT.SUCCESS_MESSAGE'));
@@ -91,64 +72,125 @@ const handleSubmit = async updatedAssistant => {
   }
 };
 
-onMounted(() => {
-  if (!isAssistantAvailable.value) {
-    store.dispatch('captainAssistants/show', assistantId);
+const handleDelete = () => {
+  deleteAssistantDialog.value.dialogRef.open();
+};
+
+const handleDeleteSuccess = () => {
+  // Get remaining assistants after deletion
+  const remainingAssistants = assistants.value.filter(
+    a => a.id !== assistantId.value
+  );
+
+  if (remainingAssistants.length > 0) {
+    // Navigate to the first available assistant's settings
+    const nextAssistant = remainingAssistants[0];
+    router.push({
+      name: 'captain_assistants_settings_index',
+      params: {
+        accountId: route.params.accountId,
+        assistantId: nextAssistant.id,
+      },
+    });
+  } else {
+    // No assistants left, redirect to create assistant page
+    router.push({
+      name: 'captain_assistants_create_index',
+      params: { accountId: route.params.accountId },
+    });
   }
-});
+};
 </script>
 
 <template>
-  <SettingsPageLayout
-    :breadcrumb-items="breadcrumbItems"
+  <PageLayout
     :is-fetching="isFetching"
-    class="[&>div]:max-w-[80rem]"
+    :show-pagination-footer="false"
+    :show-know-more="false"
+    :class="{
+      '[&>header>div]:max-w-[80rem] [&>main>div]:max-w-[80rem]':
+        isCaptainV2Enabled,
+    }"
   >
     <template #body>
-      <div class="flex flex-col gap-6">
+      <div
+        class="gap-6 lg:gap-16 pb-8"
+        :class="{ 'grid grid-cols-2': isCaptainV2Enabled }"
+      >
         <div class="flex flex-col gap-6">
-          <SettingsHeader
-            :heading="t('CAPTAIN.ASSISTANTS.SETTINGS.BASIC_SETTINGS.TITLE')"
-            :description="
-              t('CAPTAIN.ASSISTANTS.SETTINGS.BASIC_SETTINGS.DESCRIPTION')
-            "
-          />
-          <AssistantBasicSettingsForm
-            :assistant="assistant"
-            @submit="handleSubmit"
-          />
+          <div class="flex flex-col gap-6">
+            <SettingsHeader
+              :heading="t('CAPTAIN.ASSISTANTS.SETTINGS.BASIC_SETTINGS.TITLE')"
+              :description="
+                t('CAPTAIN.ASSISTANTS.SETTINGS.BASIC_SETTINGS.DESCRIPTION')
+              "
+            />
+            <AssistantBasicSettingsForm
+              :assistant="assistant"
+              @submit="handleSubmit"
+            />
+          </div>
+          <span class="h-px w-full bg-n-weak mt-2" />
+          <div class="flex flex-col gap-6">
+            <SettingsHeader
+              :heading="t('CAPTAIN.ASSISTANTS.SETTINGS.SYSTEM_SETTINGS.TITLE')"
+              :description="
+                t('CAPTAIN.ASSISTANTS.SETTINGS.SYSTEM_SETTINGS.DESCRIPTION')
+              "
+            />
+            <AssistantSystemSettingsForm
+              :assistant="assistant"
+              @submit="handleSubmit"
+            />
+          </div>
+          <span class="h-px w-full bg-n-weak mt-2" />
+          <div class="flex items-end justify-between w-full gap-4">
+            <div class="flex flex-col gap-2">
+              <h6 class="text-n-slate-12 text-base font-medium">
+                {{ t('CAPTAIN.ASSISTANTS.SETTINGS.DELETE.TITLE') }}
+              </h6>
+              <span class="text-n-slate-11 text-sm">
+                {{ t('CAPTAIN.ASSISTANTS.SETTINGS.DELETE.DESCRIPTION') }}
+              </span>
+            </div>
+            <div class="flex-shrink-0">
+              <Button
+                :label="
+                  t('CAPTAIN.ASSISTANTS.SETTINGS.DELETE.BUTTON_TEXT', {
+                    assistantName: assistant.name,
+                  })
+                "
+                color="ruby"
+                class="max-w-56 !w-fit"
+                @click="handleDelete"
+              />
+            </div>
+          </div>
         </div>
-        <span class="h-px w-full bg-n-weak mt-2" />
-        <div class="flex flex-col gap-6">
+        <div v-if="isCaptainV2Enabled" class="flex flex-col gap-6">
           <SettingsHeader
-            :heading="t('CAPTAIN.ASSISTANTS.SETTINGS.SYSTEM_SETTINGS.TITLE')"
+            :heading="t('CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.TITLE')"
             :description="
-              t('CAPTAIN.ASSISTANTS.SETTINGS.SYSTEM_SETTINGS.DESCRIPTION')
+              t('CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.DESCRIPTION')
             "
           />
-          <AssistantSystemSettingsForm
-            :assistant="assistant"
-            @submit="handleSubmit"
-          />
+          <div class="flex flex-col gap-6">
+            <AssistantControlItems
+              v-for="item in controlItems"
+              :key="item.name"
+              :control-item="item"
+            />
+          </div>
         </div>
       </div>
     </template>
-    <template #controls>
-      <div class="flex flex-col gap-6">
-        <SettingsHeader
-          :heading="t('CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.TITLE')"
-          :description="
-            t('CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.DESCRIPTION')
-          "
-        />
-        <div class="flex flex-col gap-6">
-          <AssistantControlItems
-            v-for="item in controlItems"
-            :key="item.name"
-            :control-item="item"
-          />
-        </div>
-      </div>
-    </template>
-  </SettingsPageLayout>
+    <DeleteDialog
+      v-if="assistant"
+      ref="deleteAssistantDialog"
+      :entity="assistant"
+      type="Assistants"
+      translation-key="ASSISTANTS"
+      @delete-success="handleDeleteSuccess"
+    />
+  </PageLayout>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js b/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
index 9d5609ab7..4bc11ba1c 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
@@ -1,98 +1,106 @@
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { INSTALLATION_TYPES } from 'dashboard/constants/installationTypes';
 import { frontendURL } from '../../../helper/URLHelper';
-import AssistantIndex from './assistants/Index.vue';
-import AssistantEdit from './assistants/Edit.vue';
-// import AssistantSettings from './assistants/settings/Settings.vue';
+
+import CaptainPageRouteView from './pages/CaptainPageRouteView.vue';
+import AssistantsIndexPage from './pages/AssistantsIndexPage.vue';
+import AssistantEmptyStateIndex from './assistants/Index.vue';
+
+import AssistantSettingsIndex from './assistants/settings/Settings.vue';
 import AssistantInboxesIndex from './assistants/inboxes/Index.vue';
+import AssistantPlaygroundIndex from './assistants/playground/Index.vue';
 import AssistantGuardrailsIndex from './assistants/guardrails/Index.vue';
 import AssistantGuidelinesIndex from './assistants/guidelines/Index.vue';
 import AssistantScenariosIndex from './assistants/scenarios/Index.vue';
 import DocumentsIndex from './documents/Index.vue';
 import ResponsesIndex from './responses/Index.vue';
+import ResponsesPendingIndex from './responses/Pending.vue';
 import CustomToolsIndex from './tools/Index.vue';
 
-export const routes = [
+const meta = {
+  permissions: ['administrator', 'agent'],
+  featureFlag: FEATURE_FLAGS.CAPTAIN,
+  installationTypes: [INSTALLATION_TYPES.CLOUD, INSTALLATION_TYPES.ENTERPRISE],
+};
+
+const metaV2 = {
+  permissions: ['administrator', 'agent'],
+  featureFlag: FEATURE_FLAGS.CAPTAIN_V2,
+  installationTypes: [INSTALLATION_TYPES.CLOUD, INSTALLATION_TYPES.ENTERPRISE],
+};
+
+const assistantRoutes = [
   {
-    path: frontendURL('accounts/:accountId/captain/assistants'),
-    component: AssistantIndex,
-    name: 'captain_assistants_index',
-    meta: {
-      permissions: ['administrator', 'agent'],
-      featureFlag: FEATURE_FLAGS.CAPTAIN,
-      installationTypes: [
-        INSTALLATION_TYPES.CLOUD,
-        INSTALLATION_TYPES.ENTERPRISE,
-      ],
-    },
+    path: frontendURL('accounts/:accountId/captain/:assistantId/faqs'),
+    component: ResponsesIndex,
+    name: 'captain_assistants_responses_index',
+    meta,
   },
   {
-    path: frontendURL('accounts/:accountId/captain/assistants/:assistantId'),
-    component: AssistantEdit,
-    name: 'captain_assistants_edit',
-    meta: {
-      permissions: ['administrator', 'agent'],
-      featureFlag: FEATURE_FLAGS.CAPTAIN,
-      installationTypes: [
-        INSTALLATION_TYPES.CLOUD,
-        INSTALLATION_TYPES.ENTERPRISE,
-      ],
-    },
+    path: frontendURL('accounts/:accountId/captain/:assistantId/documents'),
+    component: DocumentsIndex,
+    name: 'captain_assistants_documents_index',
+    meta,
   },
   {
-    path: frontendURL(
-      'accounts/:accountId/captain/assistants/:assistantId/inboxes'
-    ),
+    path: frontendURL('accounts/:accountId/captain/:assistantId/tools'),
+    component: CustomToolsIndex,
+    name: 'captain_tools_index',
+    meta: metaV2,
+  },
+  {
+    path: frontendURL('accounts/:accountId/captain/:assistantId/scenarios'),
+    component: AssistantScenariosIndex,
+    name: 'captain_assistants_scenarios_index',
+    meta: metaV2,
+  },
+  {
+    path: frontendURL('accounts/:accountId/captain/:assistantId/playground'),
+    component: AssistantPlaygroundIndex,
+    name: 'captain_assistants_playground_index',
+    meta,
+  },
+  {
+    path: frontendURL('accounts/:accountId/captain/:assistantId/inboxes'),
     component: AssistantInboxesIndex,
     name: 'captain_assistants_inboxes_index',
-    meta: {
-      permissions: ['administrator', 'agent'],
-      featureFlag: FEATURE_FLAGS.CAPTAIN,
-      installationTypes: [
-        INSTALLATION_TYPES.CLOUD,
-        INSTALLATION_TYPES.ENTERPRISE,
-      ],
-    },
+    meta,
   },
+  {
+    path: frontendURL('accounts/:accountId/captain/:assistantId/faqs/pending'),
+    component: ResponsesPendingIndex,
+    name: 'captain_assistants_responses_pending',
+    meta,
+  },
+  {
+    path: frontendURL('accounts/:accountId/captain/:assistantId/settings'),
+    component: AssistantSettingsIndex,
+    name: 'captain_assistants_settings_index',
+    meta,
+  },
+  // Settings sub-pages (guardrails and guidelines)
   {
     path: frontendURL(
-      'accounts/:accountId/captain/assistants/:assistantId/guardrails'
+      'accounts/:accountId/captain/:assistantId/settings/guardrails'
     ),
     component: AssistantGuardrailsIndex,
     name: 'captain_assistants_guardrails_index',
-    meta: {
-      permissions: ['administrator', 'agent'],
-      featureFlag: FEATURE_FLAGS.CAPTAIN,
-      installationTypes: [
-        INSTALLATION_TYPES.CLOUD,
-        INSTALLATION_TYPES.ENTERPRISE,
-      ],
-    },
+    meta: metaV2,
   },
   {
     path: frontendURL(
-      'accounts/:accountId/captain/assistants/:assistantId/scenarios'
-    ),
-    component: AssistantScenariosIndex,
-    name: 'captain_assistants_scenarios_index',
-    meta: {
-      permissions: ['administrator', 'agent'],
-      featureFlag: FEATURE_FLAGS.CAPTAIN,
-      installationTypes: [
-        INSTALLATION_TYPES.CLOUD,
-        INSTALLATION_TYPES.ENTERPRISE,
-      ],
-    },
-  },
-  {
-    path: frontendURL(
-      'accounts/:accountId/captain/assistants/:assistantId/guidelines'
+      'accounts/:accountId/captain/:assistantId/settings/guidelines'
     ),
     component: AssistantGuidelinesIndex,
     name: 'captain_assistants_guidelines_index',
+    meta: metaV2,
+  },
+  {
+    path: frontendURL('accounts/:accountId/captain/assistants'),
+    component: AssistantEmptyStateIndex,
+    name: 'captain_assistants_create_index',
     meta: {
       permissions: ['administrator', 'agent'],
-      featureFlag: FEATURE_FLAGS.CAPTAIN,
       installationTypes: [
         INSTALLATION_TYPES.CLOUD,
         INSTALLATION_TYPES.ENTERPRISE,
@@ -100,42 +108,26 @@ export const routes = [
     },
   },
   {
-    path: frontendURL('accounts/:accountId/captain/documents'),
-    component: DocumentsIndex,
-    name: 'captain_documents_index',
-    meta: {
-      permissions: ['administrator', 'agent'],
-      featureFlag: FEATURE_FLAGS.CAPTAIN,
-      installationTypes: [
-        INSTALLATION_TYPES.CLOUD,
-        INSTALLATION_TYPES.ENTERPRISE,
-      ],
-    },
-  },
-  {
-    path: frontendURL('accounts/:accountId/captain/responses'),
-    component: ResponsesIndex,
-    name: 'captain_responses_index',
-    meta: {
-      permissions: ['administrator', 'agent'],
-      featureFlag: FEATURE_FLAGS.CAPTAIN,
-      installationTypes: [
-        INSTALLATION_TYPES.CLOUD,
-        INSTALLATION_TYPES.ENTERPRISE,
-      ],
-    },
+    path: frontendURL('accounts/:accountId/captain/:navigationPath'),
+    component: AssistantsIndexPage,
+    name: 'captain_assistants_index',
+    meta,
   },
+];
+
+export const routes = [
   {
-    path: frontendURL('accounts/:accountId/captain/tools'),
-    component: CustomToolsIndex,
-    name: 'captain_tools_index',
-    meta: {
-      permissions: ['administrator', 'agent'],
-      featureFlag: FEATURE_FLAGS.CAPTAIN_V2,
-      installationTypes: [
-        INSTALLATION_TYPES.CLOUD,
-        INSTALLATION_TYPES.ENTERPRISE,
-      ],
+    path: frontendURL('accounts/:accountId/captain'),
+    component: CaptainPageRouteView,
+    redirect: to => {
+      return {
+        name: 'captain_assistants_index',
+        params: {
+          navigationPath: 'captain_assistants_responses_index',
+          ...to.params,
+        },
+      };
     },
+    children: [...assistantRoutes],
   },
 ];
diff --git a/app/javascript/dashboard/routes/dashboard/captain/documents/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/documents/Index.vue
index c90762abb..fe38d5ca1 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/documents/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/documents/Index.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { computed, onMounted, ref, nextTick } from 'vue';
 import { useMapGetter, useStore } from 'dashboard/composables/store';
+import { useRoute } from 'vue-router';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { useAccount } from 'dashboard/composables/useAccount';
 
@@ -10,20 +11,20 @@ import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
 import CaptainPaywall from 'dashboard/components-next/captain/pageComponents/Paywall.vue';
 import RelatedResponses from 'dashboard/components-next/captain/pageComponents/document/RelatedResponses.vue';
 import CreateDocumentDialog from 'dashboard/components-next/captain/pageComponents/document/CreateDocumentDialog.vue';
-import AssistantSelector from 'dashboard/components-next/captain/pageComponents/AssistantSelector.vue';
 import DocumentPageEmptyState from 'dashboard/components-next/captain/pageComponents/emptyStates/DocumentPageEmptyState.vue';
 import FeatureSpotlightPopover from 'dashboard/components-next/feature-spotlight/FeatureSpotlightPopover.vue';
 import LimitBanner from 'dashboard/components-next/captain/pageComponents/document/LimitBanner.vue';
 
+const route = useRoute();
 const store = useStore();
 
 const { isOnChatwootCloud } = useAccount();
 const uiFlags = useMapGetter('captainDocuments/getUIFlags');
 const documents = useMapGetter('captainDocuments/getRecords');
-const assistants = useMapGetter('captainAssistants/getRecords');
 const isFetching = computed(() => uiFlags.value.fetchingList);
 const documentsMeta = useMapGetter('captainDocuments/getMeta');
-const selectedAssistant = ref('all');
+
+const selectedAssistantId = computed(() => Number(route.params.assistantId));
 
 const selectedDocument = ref(null);
 const deleteDocumentDialog = ref(null);
@@ -37,12 +38,6 @@ const showCreateDialog = ref(false);
 const createDocumentDialog = ref(null);
 const relationQuestionDialog = ref(null);
 
-const shouldShowAssistantSelector = computed(() => {
-  if (assistants.value.length === 0) return false;
-
-  return !isFetching.value;
-});
-
 const handleShowRelatedDocument = () => {
   showRelatedResponses.value = true;
   nextTick(() => relationQuestionDialog.value.dialogRef.open());
@@ -77,17 +72,12 @@ const handleAction = ({ action, id }) => {
 const fetchDocuments = (page = 1) => {
   const filterParams = { page };
 
-  if (selectedAssistant.value !== 'all') {
-    filterParams.assistantId = selectedAssistant.value;
+  if (selectedAssistantId.value) {
+    filterParams.assistantId = selectedAssistantId.value;
   }
   store.dispatch('captainDocuments/get', filterParams);
 };
 
-const handleAssistantFilterChange = assistant => {
-  selectedAssistant.value = assistant;
-  fetchDocuments();
-};
-
 const onPageChange = page => fetchDocuments(page);
 
 const onDeleteSuccess = () => {
@@ -97,9 +87,6 @@ const onDeleteSuccess = () => {
 };
 
 onMounted(() => {
-  if (!assistants.value.length) {
-    store.dispatch('captainAssistants/get');
-  }
   fetchDocuments();
 });
 </script>
@@ -114,6 +101,7 @@ onMounted(() => {
     :show-pagination-footer="!isFetching && !!documents.length"
     :is-fetching="isFetching"
     :is-empty="!documents.length"
+    :show-know-more="false"
     :feature-flag="FEATURE_FLAGS.CAPTAIN"
     @update:current-page="onPageChange"
     @click="handleCreateDocument"
@@ -138,15 +126,6 @@ onMounted(() => {
       <CaptainPaywall />
     </template>
 
-    <template #controls>
-      <div v-if="shouldShowAssistantSelector" class="mb-4 -mt-3 flex gap-3">
-        <AssistantSelector
-          :assistant-id="selectedAssistant"
-          @update="handleAssistantFilterChange"
-        />
-      </div>
-    </template>
-
     <template #body>
       <LimitBanner class="mb-5" />
 
@@ -173,6 +152,7 @@ onMounted(() => {
     <CreateDocumentDialog
       v-if="showCreateDialog"
       ref="createDocumentDialog"
+      :assistant-id="selectedAssistantId"
       @close="handleCreateDialogClose"
     />
     <DeleteDialog
diff --git a/app/javascript/dashboard/routes/dashboard/captain/pages/AssistantsIndexPage.vue b/app/javascript/dashboard/routes/dashboard/captain/pages/AssistantsIndexPage.vue
new file mode 100644
index 000000000..24c7296c7
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/captain/pages/AssistantsIndexPage.vue
@@ -0,0 +1,89 @@
+<script setup>
+import { computed, nextTick, onMounted } from 'vue';
+import { useStore } from 'vuex';
+import { useRoute, useRouter } from 'vue-router';
+import { useUISettings } from 'dashboard/composables/useUISettings';
+
+import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
+
+const store = useStore();
+const router = useRouter();
+const { uiSettings } = useUISettings();
+const route = useRoute();
+
+const assistants = computed(
+  () => store.getters['captainAssistants/getRecords']
+);
+
+const isAssistantPresent = assistantId => {
+  return !!assistants.value.find(a => a.id === Number(assistantId));
+};
+
+const routeToView = (name, params) => {
+  router.replace({ name, params, replace: true });
+};
+
+const generateRouterParams = () => {
+  const { last_active_assistant_id: lastActiveAssistantId } =
+    uiSettings.value || {};
+
+  if (isAssistantPresent(lastActiveAssistantId)) {
+    return {
+      assistantId: lastActiveAssistantId,
+    };
+  }
+
+  if (assistants.value.length > 0) {
+    const { id: assistantId } = assistants.value[0];
+    return { assistantId };
+  }
+
+  return null;
+};
+
+const routeToLastActiveAssistant = () => {
+  const params = generateRouterParams();
+
+  // No assistants found, redirect to create page
+  if (!params) {
+    return routeToView('captain_assistants_create_index', {
+      accountId: route.params.accountId,
+    });
+  }
+
+  const { navigationPath } = route.params;
+  const isAValidRoute = [
+    'captain_assistants_responses_index', // Faq page
+    'captain_assistants_documents_index', // Document page
+    'captain_assistants_scenarios_index', // Scenario page
+    'captain_assistants_playground_index', // Playground page
+    'captain_assistants_inboxes_index', // Inboxes page
+    'captain_tools_index', // Tools page
+    'captain_assistants_settings_index', // Settings page
+  ].includes(navigationPath);
+
+  const navigateTo = isAValidRoute
+    ? navigationPath
+    : 'captain_assistants_responses_index';
+
+  return routeToView(navigateTo, {
+    accountId: route.params.accountId,
+    ...params,
+  });
+};
+
+const performRouting = async () => {
+  await store.dispatch('captainAssistants/get');
+  nextTick(() => routeToLastActiveAssistant());
+};
+
+onMounted(() => performRouting());
+</script>
+
+<template>
+  <div
+    class="flex items-center justify-center w-full bg-n-background text-n-slate-11"
+  >
+    <Spinner />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/pages/CaptainPageRouteView.vue b/app/javascript/dashboard/routes/dashboard/captain/pages/CaptainPageRouteView.vue
new file mode 100644
index 000000000..f0edfb589
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/captain/pages/CaptainPageRouteView.vue
@@ -0,0 +1,30 @@
+<script setup>
+import { watch } from 'vue';
+import { useRoute } from 'vue-router';
+import { useUISettings } from 'dashboard/composables/useUISettings';
+
+const route = useRoute();
+const { uiSettings, updateUISettings } = useUISettings();
+
+watch(
+  () => route.params.assistantId,
+  newAssistantId => {
+    if (
+      newAssistantId &&
+      newAssistantId !== String(uiSettings.value.last_active_assistant_id)
+    ) {
+      updateUISettings({
+        last_active_assistant_id: Number(newAssistantId),
+      });
+    }
+  }
+);
+</script>
+
+<template>
+  <div class="flex w-full h-full min-h-0">
+    <section class="flex flex-1 h-full px-0 overflow-hidden bg-n-background">
+      <router-view />
+    </section>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
index a20b96e45..2144f6f05 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
@@ -1,23 +1,19 @@
 <script setup>
 import { computed, onMounted, ref, nextTick } from 'vue';
 import { useMapGetter, useStore } from 'dashboard/composables/store';
-import { useAlert } from 'dashboard/composables';
 import { useI18n } from 'vue-i18n';
-import { OnClickOutside } from '@vueuse/components';
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { debounce } from '@chatwoot/utils';
 import { useAccount } from 'dashboard/composables/useAccount';
 
-import Button from 'dashboard/components-next/button/Button.vue';
-import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
-import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
+import Banner from 'dashboard/components-next/banner/Banner.vue';
 import Input from 'dashboard/components-next/input/Input.vue';
+import BulkSelectBar from 'dashboard/components-next/captain/assistant/BulkSelectBar.vue';
 import DeleteDialog from 'dashboard/components-next/captain/pageComponents/DeleteDialog.vue';
 import BulkDeleteDialog from 'dashboard/components-next/captain/pageComponents/BulkDeleteDialog.vue';
 import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
 import CaptainPaywall from 'dashboard/components-next/captain/pageComponents/Paywall.vue';
-import AssistantSelector from 'dashboard/components-next/captain/pageComponents/AssistantSelector.vue';
 import ResponseCard from 'dashboard/components-next/captain/assistant/ResponseCard.vue';
 import CreateResponseDialog from 'dashboard/components-next/captain/pageComponents/response/CreateResponseDialog.vue';
 import ResponsePageEmptyState from 'dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue';
@@ -25,10 +21,10 @@ import FeatureSpotlightPopover from 'dashboard/components-next/feature-spotlight
 import LimitBanner from 'dashboard/components-next/captain/pageComponents/response/LimitBanner.vue';
 
 const router = useRouter();
+const route = useRoute();
 const store = useStore();
 const { isOnChatwootCloud } = useAccount();
 const uiFlags = useMapGetter('captainResponses/getUIFlags');
-const assistants = useMapGetter('captainAssistants/getRecords');
 const responseMeta = useMapGetter('captainResponses/getMeta');
 const responses = useMapGetter('captainResponses/getRecords');
 const isFetching = computed(() => uiFlags.value.fetchingList);
@@ -37,62 +33,19 @@ const selectedResponse = ref(null);
 const deleteDialog = ref(null);
 const bulkDeleteDialog = ref(null);
 
-const selectedStatus = ref('all');
-const selectedAssistant = ref('all');
 const dialogType = ref('');
 const searchQuery = ref('');
 const { t } = useI18n();
 
 const createDialog = ref(null);
 
-const isStatusFilterOpen = ref(false);
-const shouldShowDropdown = computed(() => {
-  if (assistants.value.length === 0) return false;
+const selectedAssistantId = computed(() => Number(route.params.assistantId));
 
-  return !isFetching.value;
-});
-
-const statusOptions = computed(() =>
-  ['all', 'pending', 'approved'].map(key => ({
-    label: t(`CAPTAIN.RESPONSES.STATUS.${key.toUpperCase()}`),
-    value: key,
-    action: 'filter',
-  }))
-);
-
-const filteredResponses = computed(() => {
-  return selectedStatus.value === 'pending'
-    ? responses.value.filter(r => r.status === 'pending')
-    : responses.value;
-});
-
-const selectedStatusLabel = computed(() => {
-  const status = statusOptions.value.find(
-    option => option.value === selectedStatus.value
-  );
-  return t('CAPTAIN.RESPONSES.FILTER.STATUS', {
-    selected: status ? status.label : '',
-  });
-});
+const pendingCount = useMapGetter('captainResponses/getPendingCount');
 
 const handleDelete = () => {
   deleteDialog.value.dialogRef.open();
 };
-const handleAccept = async () => {
-  try {
-    await store.dispatch('captainResponses/update', {
-      id: selectedResponse.value.id,
-      status: 'approved',
-    });
-    useAlert(t(`CAPTAIN.RESPONSES.EDIT.APPROVE_SUCCESS_MESSAGE`));
-  } catch (error) {
-    const errorMessage =
-      error?.message || t(`CAPTAIN.RESPONSES.EDIT.ERROR_MESSAGE`);
-    useAlert(errorMessage);
-  } finally {
-    selectedResponse.value = null;
-  }
-};
 
 const handleCreate = () => {
   dialogType.value = 'create';
@@ -105,9 +58,7 @@ const handleEdit = () => {
 };
 
 const handleAction = ({ action, id }) => {
-  selectedResponse.value = filteredResponses.value.find(
-    response => id === response.id
-  );
+  selectedResponse.value = responses.value.find(response => id === response.id);
   nextTick(() => {
     if (action === 'delete') {
       handleDelete();
@@ -115,9 +66,6 @@ const handleAction = ({ action, id }) => {
     if (action === 'edit') {
       handleEdit();
     }
-    if (action === 'approve') {
-      handleAccept();
-    }
   });
 };
 
@@ -135,17 +83,31 @@ const handleCreateClose = () => {
   selectedResponse.value = null;
 };
 
-const fetchResponses = (page = 1) => {
-  const filterParams = { page };
-  if (selectedStatus.value !== 'all') {
-    filterParams.status = selectedStatus.value;
+const updateURLWithFilters = (page, search) => {
+  const query = {
+    page: page || 1,
+  };
+
+  if (search) {
+    query.search = search;
   }
-  if (selectedAssistant.value !== 'all') {
-    filterParams.assistantId = selectedAssistant.value;
+
+  router.replace({ query });
+};
+
+const fetchResponses = (page = 1) => {
+  const filterParams = { page, status: 'approved' };
+
+  if (selectedAssistantId.value) {
+    filterParams.assistantId = selectedAssistantId.value;
   }
   if (searchQuery.value) {
     filterParams.search = searchQuery.value;
   }
+
+  // Update URL with current filters
+  updateURLWithFilters(page, searchQuery.value);
+
   store.dispatch('captainResponses/get', filterParams);
 };
 
@@ -153,33 +115,20 @@ const fetchResponses = (page = 1) => {
 const bulkSelectedIds = ref(new Set());
 const hoveredCard = ref(null);
 
-const bulkSelectionState = computed(() => {
-  const selectedCount = bulkSelectedIds.value.size;
-  const totalCount = filteredResponses.value?.length || 0;
-
-  return {
-    hasSelected: selectedCount > 0,
-    isIndeterminate: selectedCount > 0 && selectedCount < totalCount,
-    allSelected: totalCount > 0 && selectedCount === totalCount,
-  };
-});
-
-const bulkCheckbox = computed({
-  get: () => bulkSelectionState.value.allSelected,
-  set: value => {
-    bulkSelectedIds.value = value
-      ? new Set(filteredResponses.value.map(r => r.id))
-      : new Set();
-  },
-});
-
 const buildSelectedCountLabel = computed(() => {
-  const count = filteredResponses.value?.length || 0;
-  return bulkSelectionState.value.allSelected
+  const count = responses.value?.length || 0;
+  const isAllSelected = bulkSelectedIds.value.size === count && count > 0;
+  return isAllSelected
     ? t('CAPTAIN.RESPONSES.UNSELECT_ALL', { count })
     : t('CAPTAIN.RESPONSES.SELECT_ALL', { count });
 });
 
+const selectedCountLabel = computed(() => {
+  return t('CAPTAIN.RESPONSES.SELECTED', {
+    count: bulkSelectedIds.value.size,
+  });
+});
+
 const handleCardHover = (isHovered, id) => {
   hoveredCard.value = isHovered ? id : null;
 };
@@ -191,7 +140,7 @@ const handleCardSelect = id => {
 };
 
 const fetchResponseAfterBulkAction = () => {
-  const hasNoResponsesLeft = filteredResponses.value?.length === 0;
+  const hasNoResponsesLeft = responses.value?.length === 0;
   const currentPage = responseMeta.value?.page;
 
   if (hasNoResponsesLeft) {
@@ -208,37 +157,18 @@ const fetchResponseAfterBulkAction = () => {
   bulkSelectedIds.value = new Set();
 };
 
-const handleBulkApprove = async () => {
-  try {
-    await store.dispatch(
-      'captainBulkActions/handleBulkApprove',
-      Array.from(bulkSelectedIds.value)
-    );
-
-    fetchResponseAfterBulkAction();
-    useAlert(t('CAPTAIN.RESPONSES.BULK_APPROVE.SUCCESS_MESSAGE'));
-  } catch (error) {
-    useAlert(
-      error?.message || t('CAPTAIN.RESPONSES.BULK_APPROVE.ERROR_MESSAGE')
-    );
-  }
-};
-
 const onPageChange = page => {
-  // Store current selection state before fetching new page
-  const wasAllPageSelected = bulkSelectionState.value.allSelected;
-  const hadPartialSelection = bulkSelectedIds.value.size > 0;
+  const hadSelection = bulkSelectedIds.value.size > 0;
 
   fetchResponses(page);
 
-  // Reset selection if we had any selections on page change
-  if (wasAllPageSelected || hadPartialSelection) {
+  if (hadSelection) {
     bulkSelectedIds.value = new Set();
   }
 };
 
 const onDeleteSuccess = () => {
-  if (filteredResponses.value?.length === 0 && responseMeta.value?.page > 1) {
+  if (responses.value?.length === 0 && responseMeta.value?.page > 1) {
     onPageChange(responseMeta.value.page - 1);
   }
 };
@@ -247,24 +177,28 @@ const onBulkDeleteSuccess = () => {
   fetchResponseAfterBulkAction();
 };
 
-const handleStatusFilterChange = ({ value }) => {
-  selectedStatus.value = value;
-  isStatusFilterOpen.value = false;
-  fetchResponses();
-};
-
-const handleAssistantFilterChange = assistant => {
-  selectedAssistant.value = assistant;
-  fetchResponses();
-};
-
 const debouncedSearch = debounce(async () => {
-  fetchResponses();
+  fetchResponses(1);
 }, 500);
 
+const initializeFromURL = () => {
+  if (route.query.search) {
+    searchQuery.value = route.query.search;
+  }
+  const pageFromURL = parseInt(route.query.page, 10) || 1;
+  fetchResponses(pageFromURL);
+};
+
+const navigateToPendingFAQs = () => {
+  router.push({ name: 'captain_assistants_responses_pending' });
+};
+
 onMounted(() => {
-  store.dispatch('captainAssistants/get');
-  fetchResponses();
+  initializeFromURL();
+  store.dispatch(
+    'captainResponses/fetchPendingCount',
+    selectedAssistantId.value
+  );
 });
 </script>
 
@@ -276,8 +210,8 @@ onMounted(() => {
     :header-title="$t('CAPTAIN.RESPONSES.HEADER')"
     :button-label="$t('CAPTAIN.RESPONSES.ADD_NEW')"
     :is-fetching="isFetching"
-    :is-empty="!filteredResponses.length"
-    :show-pagination-footer="!isFetching && !!filteredResponses.length"
+    :is-empty="!responses.length"
+    :show-pagination-footer="!isFetching && !!responses.length"
     :feature-flag="FEATURE_FLAGS.CAPTAIN"
     @update:current-page="onPageChange"
     @click="handleCreate"
@@ -294,6 +228,38 @@ onMounted(() => {
       />
     </template>
 
+    <template #search>
+      <div
+        v-if="bulkSelectedIds.size === 0"
+        class="flex gap-3 justify-between w-full items-center"
+      >
+        <Input
+          v-model="searchQuery"
+          :placeholder="$t('CAPTAIN.RESPONSES.SEARCH_PLACEHOLDER')"
+          class="w-64"
+          size="sm"
+          type="search"
+          autofocus
+          @input="debouncedSearch"
+        />
+      </div>
+    </template>
+
+    <template #subHeader>
+      <BulkSelectBar
+        v-model="bulkSelectedIds"
+        :all-items="responses"
+        :select-all-label="buildSelectedCountLabel"
+        :selected-count-label="selectedCountLabel"
+        :delete-label="$t('CAPTAIN.RESPONSES.BULK_DELETE_BUTTON')"
+        class="w-fit"
+        :class="{
+          'mb-2': bulkSelectedIds.size > 0,
+        }"
+        @bulk-delete="bulkDeleteDialog.dialogRef.open()"
+      />
+    </template>
+
     <template #emptyState>
       <ResponsePageEmptyState @click="handleCreate" />
     </template>
@@ -302,114 +268,21 @@ onMounted(() => {
       <CaptainPaywall />
     </template>
 
-    <template #controls>
-      <div
-        v-if="shouldShowDropdown"
-        class="mb-4 -mt-3 flex justify-between items-center py-1"
-        :class="{
-          'ltr:pl-3 rtl:pr-3 ltr:pr-1 rtl:pl-1 rounded-lg outline outline-1 outline-n-weak bg-n-solid-3 w-fit':
-            bulkSelectionState.hasSelected,
-        }"
-      >
-        <div
-          v-if="!bulkSelectionState.hasSelected"
-          class="flex gap-3 justify-between w-full items-center"
-        >
-          <div class="flex gap-3">
-            <OnClickOutside @trigger="isStatusFilterOpen = false">
-              <Button
-                :label="selectedStatusLabel"
-                icon="i-lucide-chevron-down"
-                size="sm"
-                color="slate"
-                trailing-icon
-                class="max-w-48"
-                @click="isStatusFilterOpen = !isStatusFilterOpen"
-              />
-
-              <DropdownMenu
-                v-if="isStatusFilterOpen"
-                :menu-items="statusOptions"
-                class="mt-2"
-                @action="handleStatusFilterChange"
-              />
-            </OnClickOutside>
-            <AssistantSelector
-              :assistant-id="selectedAssistant"
-              @update="handleAssistantFilterChange"
-            />
-          </div>
-          <Input
-            v-model="searchQuery"
-            :placeholder="$t('CAPTAIN.RESPONSES.SEARCH_PLACEHOLDER')"
-            class="w-64"
-            size="sm"
-            autofocus
-            @input="debouncedSearch"
-          />
-        </div>
-
-        <transition
-          name="slide-fade"
-          enter-active-class="transition-all duration-300 ease-out"
-          enter-from-class="opacity-0 transform ltr:-translate-x-4 rtl:translate-x-4"
-          enter-to-class="opacity-100 transform translate-x-0"
-          leave-active-class="hidden opacity-0"
-        >
-          <div
-            v-if="bulkSelectionState.hasSelected"
-            class="flex items-center gap-3"
-          >
-            <div class="flex items-center gap-3">
-              <div class="flex items-center gap-1.5">
-                <Checkbox
-                  v-model="bulkCheckbox"
-                  :indeterminate="bulkSelectionState.isIndeterminate"
-                />
-                <span class="text-sm text-n-slate-12 font-medium tabular-nums">
-                  {{ buildSelectedCountLabel }}
-                </span>
-              </div>
-              <span class="text-sm text-n-slate-10 tabular-nums">
-                {{
-                  $t('CAPTAIN.RESPONSES.SELECTED', {
-                    count: bulkSelectedIds.size,
-                  })
-                }}
-              </span>
-            </div>
-            <div class="h-4 w-px bg-n-strong" />
-            <div class="flex gap-3 items-center">
-              <Button
-                :label="$t('CAPTAIN.RESPONSES.BULK_APPROVE_BUTTON')"
-                sm
-                ghost
-                icon="i-lucide-check"
-                class="!px-1.5"
-                @click="handleBulkApprove"
-              />
-              <div class="h-4 w-px bg-n-strong" />
-              <Button
-                :label="$t('CAPTAIN.RESPONSES.BULK_DELETE_BUTTON')"
-                sm
-                ruby
-                ghost
-                class="!px-1.5"
-                icon="i-lucide-trash"
-                @click="bulkDeleteDialog.dialogRef.open()"
-              />
-            </div>
-          </div>
-        </transition>
-      </div>
-    </template>
-
     <template #body>
       <LimitBanner class="mb-5" />
+      <Banner
+        v-if="pendingCount > 0"
+        color="blue"
+        class="mb-4 -mt-3"
+        :action-label="$t('CAPTAIN.RESPONSES.PENDING_BANNER.ACTION')"
+        @action="navigateToPendingFAQs"
+      >
+        {{ $t('CAPTAIN.RESPONSES.PENDING_BANNER.TITLE') }}
+      </Banner>
 
       <div class="flex flex-col gap-4">
         <ResponseCard
-          v-for="response in filteredResponses"
+          v-for="response in responses"
           :id="response.id"
           :key="response.id"
           :question="response.question"
@@ -422,6 +295,7 @@ onMounted(() => {
           :is-selected="bulkSelectedIds.has(response.id)"
           :selectable="hoveredCard === response.id || bulkSelectedIds.size > 0"
           :show-menu="!bulkSelectedIds.has(response.id)"
+          :show-actions="false"
           @action="handleAction"
           @navigate="handleNavigationAction"
           @select="handleCardSelect"
diff --git a/app/javascript/dashboard/routes/dashboard/captain/responses/Pending.vue b/app/javascript/dashboard/routes/dashboard/captain/responses/Pending.vue
new file mode 100644
index 000000000..b26658f9c
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/captain/responses/Pending.vue
@@ -0,0 +1,376 @@
+<script setup>
+import { computed, onMounted, ref, nextTick } from 'vue';
+import { useMapGetter, useStore } from 'dashboard/composables/store';
+import { useAlert } from 'dashboard/composables';
+import { useI18n } from 'vue-i18n';
+import { useRouter, useRoute } from 'vue-router';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { debounce } from '@chatwoot/utils';
+import { useAccount } from 'dashboard/composables/useAccount';
+
+import Button from 'dashboard/components-next/button/Button.vue';
+import Input from 'dashboard/components-next/input/Input.vue';
+import BulkSelectBar from 'dashboard/components-next/captain/assistant/BulkSelectBar.vue';
+import DeleteDialog from 'dashboard/components-next/captain/pageComponents/DeleteDialog.vue';
+import BulkDeleteDialog from 'dashboard/components-next/captain/pageComponents/BulkDeleteDialog.vue';
+import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
+import CaptainPaywall from 'dashboard/components-next/captain/pageComponents/Paywall.vue';
+import ResponseCard from 'dashboard/components-next/captain/assistant/ResponseCard.vue';
+import CreateResponseDialog from 'dashboard/components-next/captain/pageComponents/response/CreateResponseDialog.vue';
+import ResponsePageEmptyState from 'dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue';
+import FeatureSpotlightPopover from 'dashboard/components-next/feature-spotlight/FeatureSpotlightPopover.vue';
+import LimitBanner from 'dashboard/components-next/captain/pageComponents/response/LimitBanner.vue';
+
+const router = useRouter();
+const route = useRoute();
+const store = useStore();
+const { isOnChatwootCloud } = useAccount();
+const uiFlags = useMapGetter('captainResponses/getUIFlags');
+const responseMeta = useMapGetter('captainResponses/getMeta');
+const responses = useMapGetter('captainResponses/getRecords');
+const isFetching = computed(() => uiFlags.value.fetchingList);
+
+const selectedResponse = ref(null);
+const deleteDialog = ref(null);
+const bulkDeleteDialog = ref(null);
+
+const selectedAssistantId = computed(() => route.params.assistantId);
+const dialogType = ref('');
+const searchQuery = ref('');
+const { t } = useI18n();
+
+const createDialog = ref(null);
+
+const backUrl = computed(() => ({
+  name: 'captain_assistants_responses_index',
+  params: {
+    accountId: route.params.accountId,
+    assistantId: selectedAssistantId.value,
+  },
+}));
+
+// Filter out approved responses in pending view
+const filteredResponses = computed(() =>
+  responses.value.filter(response => response.status !== 'approved')
+);
+
+const handleDelete = () => {
+  deleteDialog.value.dialogRef.open();
+};
+
+const handleAccept = async () => {
+  try {
+    await store.dispatch('captainResponses/update', {
+      id: selectedResponse.value.id,
+      status: 'approved',
+    });
+    useAlert(t(`CAPTAIN.RESPONSES.EDIT.APPROVE_SUCCESS_MESSAGE`));
+  } catch (error) {
+    const errorMessage =
+      error?.message || t(`CAPTAIN.RESPONSES.EDIT.ERROR_MESSAGE`);
+    useAlert(errorMessage);
+  } finally {
+    selectedResponse.value = null;
+  }
+};
+
+const handleEdit = () => {
+  dialogType.value = 'edit';
+  nextTick(() => createDialog.value.dialogRef.open());
+};
+
+const handleAction = ({ action, id }) => {
+  selectedResponse.value = filteredResponses.value.find(
+    response => id === response.id
+  );
+  nextTick(() => {
+    if (action === 'delete') {
+      handleDelete();
+    }
+    if (action === 'edit') {
+      handleEdit();
+    }
+    if (action === 'approve') {
+      handleAccept();
+    }
+  });
+};
+
+const handleNavigationAction = ({ id, type }) => {
+  if (type === 'Conversation') {
+    router.push({
+      name: 'inbox_conversation',
+      params: { conversation_id: id },
+    });
+  }
+};
+
+const handleCreateClose = () => {
+  dialogType.value = '';
+  selectedResponse.value = null;
+};
+
+const updateURLWithFilters = (page, search) => {
+  const query = {
+    page: page || 1,
+  };
+
+  if (search) {
+    query.search = search;
+  }
+
+  router.replace({ query });
+};
+
+const fetchResponses = (page = 1) => {
+  const filterParams = { page, status: 'pending' };
+
+  if (selectedAssistantId.value) {
+    filterParams.assistantId = selectedAssistantId.value;
+  }
+  if (searchQuery.value) {
+    filterParams.search = searchQuery.value;
+  }
+
+  // Update URL with current filters
+  updateURLWithFilters(page, searchQuery.value);
+
+  store.dispatch('captainResponses/get', filterParams);
+};
+
+// Bulk action
+const bulkSelectedIds = ref(new Set());
+const hoveredCard = ref(null);
+
+const buildSelectedCountLabel = computed(() => {
+  const count = filteredResponses.value?.length || 0;
+  const isAllSelected = bulkSelectedIds.value.size === count && count > 0;
+  return isAllSelected
+    ? t('CAPTAIN.RESPONSES.UNSELECT_ALL', { count })
+    : t('CAPTAIN.RESPONSES.SELECT_ALL', { count });
+});
+
+const selectedCountLabel = computed(() => {
+  return t('CAPTAIN.RESPONSES.SELECTED', {
+    count: bulkSelectedIds.value.size,
+  });
+});
+
+const handleCardHover = (isHovered, id) => {
+  hoveredCard.value = isHovered ? id : null;
+};
+
+const handleCardSelect = id => {
+  const selected = new Set(bulkSelectedIds.value);
+  selected[selected.has(id) ? 'delete' : 'add'](id);
+  bulkSelectedIds.value = selected;
+};
+
+const fetchResponseAfterBulkAction = () => {
+  const hasNoResponsesLeft = filteredResponses.value?.length === 0;
+  const currentPage = responseMeta.value?.page;
+
+  if (hasNoResponsesLeft) {
+    const pageToFetch = currentPage > 1 ? currentPage - 1 : currentPage;
+    fetchResponses(pageToFetch);
+  } else {
+    fetchResponses(currentPage);
+  }
+
+  bulkSelectedIds.value = new Set();
+};
+
+const handleBulkApprove = async () => {
+  try {
+    await store.dispatch(
+      'captainBulkActions/handleBulkApprove',
+      Array.from(bulkSelectedIds.value)
+    );
+
+    fetchResponseAfterBulkAction();
+    useAlert(t('CAPTAIN.RESPONSES.BULK_APPROVE.SUCCESS_MESSAGE'));
+  } catch (error) {
+    useAlert(
+      error?.message || t('CAPTAIN.RESPONSES.BULK_APPROVE.ERROR_MESSAGE')
+    );
+  }
+};
+
+const onPageChange = page => {
+  const hadSelection = bulkSelectedIds.value.size > 0;
+
+  fetchResponses(page);
+
+  if (hadSelection) {
+    bulkSelectedIds.value = new Set();
+  }
+};
+
+const onDeleteSuccess = () => {
+  if (filteredResponses.value?.length === 0 && responseMeta.value?.page > 1) {
+    onPageChange(responseMeta.value.page - 1);
+  }
+};
+
+const onBulkDeleteSuccess = () => {
+  fetchResponseAfterBulkAction();
+};
+
+const debouncedSearch = debounce(async () => {
+  fetchResponses(1);
+}, 500);
+
+const hasActiveFilters = computed(() => {
+  return Boolean(searchQuery.value);
+});
+
+const clearFilters = () => {
+  searchQuery.value = '';
+  fetchResponses(1);
+};
+
+const initializeFromURL = () => {
+  if (route.query.search) {
+    searchQuery.value = route.query.search;
+  }
+  const pageFromURL = parseInt(route.query.page, 10) || 1;
+  fetchResponses(pageFromURL);
+};
+
+onMounted(() => {
+  initializeFromURL();
+});
+</script>
+
+<template>
+  <PageLayout
+    :total-count="responseMeta.totalCount"
+    :current-page="responseMeta.page"
+    :header-title="$t('CAPTAIN.RESPONSES.PENDING_FAQS')"
+    :is-fetching="isFetching"
+    :is-empty="!filteredResponses.length"
+    :show-pagination-footer="!isFetching && !!filteredResponses.length"
+    :show-know-more="false"
+    :feature-flag="FEATURE_FLAGS.CAPTAIN"
+    :back-url="backUrl"
+    @update:current-page="onPageChange"
+  >
+    <template #knowMore>
+      <FeatureSpotlightPopover
+        :button-label="$t('CAPTAIN.HEADER_KNOW_MORE')"
+        :title="$t('CAPTAIN.RESPONSES.EMPTY_STATE.FEATURE_SPOTLIGHT.TITLE')"
+        :note="$t('CAPTAIN.RESPONSES.EMPTY_STATE.FEATURE_SPOTLIGHT.NOTE')"
+        :hide-actions="!isOnChatwootCloud"
+        fallback-thumbnail="/assets/images/dashboard/captain/faqs-popover-light.svg"
+        fallback-thumbnail-dark="/assets/images/dashboard/captain/faqs-popover-dark.svg"
+        learn-more-url="https://chwt.app/captain-faq"
+      />
+    </template>
+
+    <template #search>
+      <div
+        v-if="bulkSelectedIds.size === 0"
+        class="flex gap-3 justify-between w-full items-center"
+      >
+        <Input
+          v-model="searchQuery"
+          :placeholder="$t('CAPTAIN.RESPONSES.SEARCH_PLACEHOLDER')"
+          class="w-64"
+          size="sm"
+          type="search"
+          autofocus
+          @input="debouncedSearch"
+        />
+      </div>
+    </template>
+
+    <template #subHeader>
+      <BulkSelectBar
+        v-model="bulkSelectedIds"
+        :all-items="filteredResponses"
+        :select-all-label="buildSelectedCountLabel"
+        :selected-count-label="selectedCountLabel"
+        :delete-label="$t('CAPTAIN.RESPONSES.BULK_DELETE_BUTTON')"
+        class="w-fit"
+        :class="{
+          'mb-2': bulkSelectedIds.size > 0,
+        }"
+        @bulk-delete="bulkDeleteDialog.dialogRef.open()"
+      >
+        <template #secondary-actions>
+          <Button
+            :label="$t('CAPTAIN.RESPONSES.BULK_APPROVE_BUTTON')"
+            sm
+            ghost
+            icon="i-lucide-check"
+            class="!px-1.5"
+            @click="handleBulkApprove"
+          />
+        </template>
+      </BulkSelectBar>
+    </template>
+
+    <template #emptyState>
+      <ResponsePageEmptyState
+        variant="pending"
+        :has-active-filters="hasActiveFilters"
+        @clear-filters="clearFilters"
+      />
+    </template>
+
+    <template #paywall>
+      <CaptainPaywall />
+    </template>
+
+    <template #body>
+      <LimitBanner class="mb-5" />
+
+      <div class="flex flex-col gap-4">
+        <ResponseCard
+          v-for="response in filteredResponses"
+          :id="response.id"
+          :key="response.id"
+          :question="response.question"
+          :answer="response.answer"
+          :assistant="response.assistant"
+          :documentable="response.documentable"
+          :status="response.status"
+          :created-at="response.created_at"
+          :updated-at="response.updated_at"
+          :is-selected="bulkSelectedIds.has(response.id)"
+          :selectable="hoveredCard === response.id || bulkSelectedIds.size > 0"
+          :show-menu="false"
+          :show-actions="!bulkSelectedIds.has(response.id)"
+          @action="handleAction"
+          @navigate="handleNavigationAction"
+          @select="handleCardSelect"
+          @hover="isHovered => handleCardHover(isHovered, response.id)"
+        />
+      </div>
+    </template>
+
+    <DeleteDialog
+      v-if="selectedResponse"
+      ref="deleteDialog"
+      :entity="selectedResponse"
+      type="Responses"
+      @delete-success="onDeleteSuccess"
+    />
+
+    <BulkDeleteDialog
+      v-if="bulkSelectedIds"
+      ref="bulkDeleteDialog"
+      :bulk-ids="bulkSelectedIds"
+      type="Responses"
+      @delete-success="onBulkDeleteSuccess"
+    />
+
+    <CreateResponseDialog
+      v-if="dialogType"
+      ref="createDialog"
+      :type="dialogType"
+      :selected-response="selectedResponse"
+      @close="handleCreateClose"
+    />
+  </PageLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/tools/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/tools/Index.vue
index 880bdbbf3..c350e76f3 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/tools/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/tools/Index.vue
@@ -87,6 +87,7 @@ onMounted(() => {
     :is-fetching="isFetching"
     :is-empty="!customTools.length"
     :feature-flag="FEATURE_FLAGS.CAPTAIN_V2"
+    :show-know-more="false"
     @update:current-page="onPageChange"
     @click="openCreateDialog"
   >
diff --git a/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue b/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
new file mode 100644
index 000000000..cab05b8f4
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
@@ -0,0 +1,171 @@
+<script setup>
+import { ref, computed, onMounted, reactive } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useUISettings } from 'dashboard/composables/useUISettings';
+import { debounce } from '@chatwoot/utils';
+import { useCompaniesStore } from 'dashboard/stores/companies';
+
+import CompaniesListLayout from 'dashboard/components-next/Companies/CompaniesListLayout.vue';
+import CompaniesCard from 'dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue';
+
+const DEFAULT_SORT_FIELD = 'created_at';
+const DEBOUNCE_DELAY = 300;
+
+const companiesStore = useCompaniesStore();
+
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
+
+const { updateUISettings, uiSettings } = useUISettings();
+
+const companies = computed(() => companiesStore.getCompaniesList);
+const meta = computed(() => companiesStore.getMeta);
+const uiFlags = computed(() => companiesStore.getUIFlags);
+
+const searchQuery = computed(() => route.query?.search || '');
+const searchValue = ref(searchQuery.value);
+const pageNumber = computed(() => Number(route.query?.page) || 1);
+
+const parseSortSettings = (sortString = '') => {
+  const hasDescending = sortString.startsWith('-');
+  const sortField = hasDescending ? sortString.slice(1) : sortString;
+  return {
+    sort: sortField || DEFAULT_SORT_FIELD,
+    order: hasDescending ? '-' : '',
+  };
+};
+
+const { companies_sort_by: companySortBy = `-${DEFAULT_SORT_FIELD}` } =
+  uiSettings.value ?? {};
+const { sort: initialSort, order: initialOrder } =
+  parseSortSettings(companySortBy);
+
+const sortState = reactive({
+  activeSort: initialSort,
+  activeOrdering: initialOrder,
+});
+
+const activeSort = computed(() => sortState.activeSort);
+const activeOrdering = computed(() => sortState.activeOrdering);
+
+const isFetchingList = computed(() => uiFlags.value.fetchingList);
+
+const buildSortAttr = () =>
+  `${sortState.activeOrdering}${sortState.activeSort}`;
+
+const sortParam = computed(() => buildSortAttr());
+
+const updateURLParams = (page, search = '', sort = '') => {
+  const query = {
+    ...route.query,
+    page: page.toString(),
+  };
+
+  if (search) {
+    query.search = search;
+  } else {
+    delete query.search;
+  }
+
+  if (sort) {
+    query.sort = sort;
+  } else {
+    delete query.sort;
+  }
+
+  router.replace({ query });
+};
+
+const fetchCompanies = async (page, search, sort) => {
+  const currentPage = page ?? pageNumber.value;
+  const currentSearch = search ?? searchQuery.value;
+  const currentSort = sort ?? sortParam.value;
+
+  // Only update URL if arguments were explicitly provided
+  if (page !== undefined || search !== undefined || sort !== undefined) {
+    updateURLParams(currentPage, currentSearch, currentSort);
+  }
+
+  if (currentSearch) {
+    await companiesStore.search({
+      search: currentSearch,
+      page: currentPage,
+      sort: currentSort,
+    });
+  } else {
+    await companiesStore.get({
+      page: currentPage,
+      sort: currentSort,
+    });
+  }
+};
+
+const onSearch = debounce(query => {
+  searchValue.value = query;
+  fetchCompanies(1, query, sortParam.value);
+}, DEBOUNCE_DELAY);
+
+const onPageChange = page => {
+  fetchCompanies(page, searchValue.value, sortParam.value);
+};
+
+const handleSort = async ({ sort, order }) => {
+  Object.assign(sortState, { activeSort: sort, activeOrdering: order });
+
+  await updateUISettings({
+    companies_sort_by: buildSortAttr(),
+  });
+
+  fetchCompanies(1, searchValue.value, buildSortAttr());
+};
+
+onMounted(() => {
+  searchValue.value = searchQuery.value;
+  fetchCompanies();
+});
+</script>
+
+<template>
+  <CompaniesListLayout
+    :search-value="searchValue"
+    :header-title="t('COMPANIES.HEADER')"
+    :current-page="pageNumber"
+    :total-items="Number(meta.totalCount || 0)"
+    :active-sort="activeSort"
+    :active-ordering="activeOrdering"
+    :is-fetching-list="isFetchingList"
+    :show-pagination-footer="!!companies.length"
+    @update:current-page="onPageChange"
+    @update:sort="handleSort"
+    @search="onSearch"
+  >
+    <div v-if="isFetchingList" class="flex items-center justify-center p-8">
+      <span class="text-n-slate-11 text-base">{{
+        t('COMPANIES.LOADING')
+      }}</span>
+    </div>
+    <div
+      v-else-if="companies.length === 0"
+      class="flex items-center justify-center p-8"
+    >
+      <span class="text-n-slate-11 text-base">{{
+        t('COMPANIES.EMPTY_STATE.TITLE')
+      }}</span>
+    </div>
+    <div v-else class="flex flex-col gap-4 p-4">
+      <CompaniesCard
+        v-for="company in companies"
+        :id="company.id"
+        :key="company.id"
+        :name="company.name"
+        :domain="company.domain"
+        :contacts-count="company.contactsCount || 0"
+        :description="company.description"
+        :avatar-url="company.avatarUrl"
+        :updated-at="company.updatedAt"
+      />
+    </div>
+  </CompaniesListLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/companies/routes.js b/app/javascript/dashboard/routes/dashboard/companies/routes.js
new file mode 100644
index 000000000..69cbba762
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/companies/routes.js
@@ -0,0 +1,26 @@
+import { frontendURL } from '../../../helper/URLHelper';
+import CompaniesIndex from './pages/CompaniesIndex.vue';
+import { FEATURE_FLAGS } from '../../../featureFlags';
+import { INSTALLATION_TYPES } from 'dashboard/constants/installationTypes';
+
+const commonMeta = {
+  featureFlag: FEATURE_FLAGS.COMPANIES,
+  permissions: ['administrator', 'agent'],
+  installationTypes: [INSTALLATION_TYPES.CLOUD, INSTALLATION_TYPES.ENTERPRISE],
+};
+
+export const routes = [
+  {
+    path: frontendURL('accounts/:accountId/companies'),
+    component: CompaniesIndex,
+    meta: commonMeta,
+    children: [
+      {
+        path: '',
+        name: 'companies_dashboard_index',
+        component: CompaniesIndex,
+        meta: commonMeta,
+      },
+    ],
+  },
+];
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsBulkActionBar.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsBulkActionBar.vue
new file mode 100644
index 000000000..e8ddd5223
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsBulkActionBar.vue
@@ -0,0 +1,167 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { vOnClickOutside } from '@vueuse/components';
+
+import BulkSelectBar from 'dashboard/components-next/captain/assistant/BulkSelectBar.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+import LabelActions from 'dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue';
+import Policy from 'dashboard/components/policy.vue';
+
+const props = defineProps({
+  visibleContactIds: {
+    type: Array,
+    default: () => [],
+  },
+  selectedContactIds: {
+    type: Array,
+    default: () => [],
+  },
+  isLoading: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits([
+  'clearSelection',
+  'assignLabels',
+  'toggleAll',
+  'deleteSelected',
+]);
+
+const { t } = useI18n();
+
+const selectedCount = computed(() => props.selectedContactIds.length);
+const totalVisibleContacts = computed(() => props.visibleContactIds.length);
+const showLabelSelector = ref(false);
+
+const selectAllLabel = computed(() => {
+  if (!totalVisibleContacts.value) {
+    return '';
+  }
+
+  return t('CONTACTS_BULK_ACTIONS.SELECT_ALL', {
+    count: totalVisibleContacts.value,
+  });
+});
+
+const selectedCountLabel = computed(() =>
+  t('CONTACTS_BULK_ACTIONS.SELECTED_COUNT', {
+    count: selectedCount.value,
+  })
+);
+
+const allItems = computed(() =>
+  props.visibleContactIds.map(id => ({
+    id,
+  }))
+);
+
+const selectionModel = computed({
+  get: () => new Set(props.selectedContactIds),
+  set: newSet => {
+    if (!props.visibleContactIds.length) {
+      emit('toggleAll', false);
+      return;
+    }
+
+    const shouldSelectAll =
+      newSet.size === props.visibleContactIds.length && newSet.size > 0;
+    emit('toggleAll', shouldSelectAll);
+  },
+});
+
+const emitClearSelection = () => {
+  showLabelSelector.value = false;
+  emit('clearSelection');
+};
+
+const toggleLabelSelector = () => {
+  if (!selectedCount.value || props.isLoading) return;
+  showLabelSelector.value = !showLabelSelector.value;
+};
+
+const closeLabelSelector = () => {
+  showLabelSelector.value = false;
+};
+
+const handleAssignLabels = labels => {
+  emit('assignLabels', labels);
+  closeLabelSelector();
+};
+</script>
+
+<template>
+  <div
+    class="sticky top-0 z-10 bg-gradient-to-b from-n-background from-90% to-transparent px-6 pt-1 pb-2"
+  >
+    <BulkSelectBar
+      v-model="selectionModel"
+      :all-items="allItems"
+      :select-all-label="selectAllLabel"
+      :selected-count-label="selectedCountLabel"
+      class="py-2 ltr:!pr-3 rtl:!pl-3 justify-between"
+    >
+      <template #secondary-actions>
+        <Button
+          sm
+          ghost
+          slate
+          :label="t('CONTACTS_BULK_ACTIONS.CLEAR_SELECTION')"
+          class="!px-1.5"
+          @click="emitClearSelection"
+        />
+      </template>
+      <template #actions>
+        <div class="flex items-center gap-2 ml-auto">
+          <div
+            v-on-click-outside="closeLabelSelector"
+            class="relative flex items-center"
+          >
+            <Button
+              sm
+              faded
+              slate
+              icon="i-lucide-tags"
+              :label="t('CONTACTS_BULK_ACTIONS.ASSIGN_LABELS')"
+              :disabled="!selectedCount || isLoading"
+              :is-loading="isLoading"
+              class="[&>span:nth-child(2)]:hidden sm:[&>span:nth-child(2)]:inline w-fit"
+              @click="toggleLabelSelector"
+            />
+            <transition
+              enter-active-class="transition ease-out duration-100"
+              enter-from-class="transform opacity-0 scale-95"
+              enter-to-class="transform opacity-100 scale-100"
+              leave-active-class="transition ease-in duration-75"
+              leave-from-class="transform opacity-100 scale-100"
+              leave-to-class="transform opacity-0 scale-95"
+            >
+              <LabelActions
+                v-if="showLabelSelector"
+                class="[&>.triangle]:!hidden [&>div>button]:!hidden ltr:!right-0 rtl:!left-0 top-8 mt-0.5"
+                @assign="handleAssignLabels"
+              />
+            </transition>
+          </div>
+          <Policy :permissions="['administrator']">
+            <Button
+              v-tooltip.bottom="t('CONTACTS_BULK_ACTIONS.DELETE_CONTACTS')"
+              sm
+              faded
+              ruby
+              icon="i-lucide-trash"
+              :label="t('CONTACTS_BULK_ACTIONS.DELETE_CONTACTS')"
+              :aria-label="t('CONTACTS_BULK_ACTIONS.DELETE_CONTACTS')"
+              :disabled="!selectedCount || isLoading"
+              :is-loading="isLoading"
+              class="!px-1.5 [&>span:nth-child(2)]:hidden"
+              @click="emit('deleteSelected')"
+            />
+          </Policy>
+        </div>
+      </template>
+    </BulkSelectBar>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactsIndex.vue b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactsIndex.vue
index 33a3d4fd5..c2b832388 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactsIndex.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactsIndex.vue
@@ -3,14 +3,18 @@ import { onMounted, computed, ref, reactive, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useStore, useMapGetter } from 'dashboard/composables/store';
+import { useAlert } from 'dashboard/composables';
 import { debounce } from '@chatwoot/utils';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import filterQueryGenerator from 'dashboard/helper/filterQueryGenerator';
 
 import ContactsListLayout from 'dashboard/components-next/Contacts/ContactsListLayout.vue';
-import ContactsList from 'dashboard/components-next/Contacts/Pages/ContactsList.vue';
 import ContactEmptyState from 'dashboard/components-next/Contacts/EmptyState/ContactEmptyState.vue';
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
+import ContactsList from 'dashboard/components-next/Contacts/Pages/ContactsList.vue';
+import ContactsBulkActionBar from '../components/ContactsBulkActionBar.vue';
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+import BulkActionsAPI from 'dashboard/api/bulkActions';
 
 const DEFAULT_SORT_FIELD = 'last_activity_at';
 const DEBOUNCE_DELAY = 300;
@@ -58,6 +62,29 @@ const isFetchingList = computed(
 );
 const currentPage = computed(() => Number(meta.value?.currentPage));
 const totalItems = computed(() => meta.value?.count);
+
+const selectedContactIds = ref([]);
+const isBulkActionLoading = ref(false);
+const bulkDeleteDialogRef = ref(null);
+const selectedCount = computed(() => selectedContactIds.value.length);
+const bulkDeleteDialogTitle = computed(() =>
+  selectedCount.value > 1
+    ? t('CONTACTS_BULK_ACTIONS.DELETE_DIALOG.TITLE')
+    : t('CONTACTS_BULK_ACTIONS.DELETE_DIALOG.SINGULAR_TITLE')
+);
+const bulkDeleteDialogDescription = computed(() =>
+  selectedCount.value > 1
+    ? t('CONTACTS_BULK_ACTIONS.DELETE_DIALOG.DESCRIPTION', {
+        count: selectedCount.value,
+      })
+    : t('CONTACTS_BULK_ACTIONS.DELETE_DIALOG.SINGULAR_DESCRIPTION')
+);
+const bulkDeleteDialogConfirmLabel = computed(() =>
+  selectedCount.value > 1
+    ? t('CONTACTS_BULK_ACTIONS.DELETE_DIALOG.CONFIRM_MULTIPLE')
+    : t('CONTACTS_BULK_ACTIONS.DELETE_DIALOG.CONFIRM_SINGLE')
+);
+const hasSelection = computed(() => selectedCount.value > 0);
 const activeSegment = computed(() => {
   if (!activeSegmentId.value) return undefined;
   return segments.value.find(view => view.id === Number(activeSegmentId.value));
@@ -105,6 +132,36 @@ const emptyStateMessage = computed(() => {
   return t('CONTACTS_LAYOUT.EMPTY_STATE.SEARCH_EMPTY_STATE_TITLE');
 });
 
+const visibleContactIds = computed(() =>
+  contacts.value.map(contact => contact.id)
+);
+
+const clearSelection = () => {
+  selectedContactIds.value = [];
+};
+
+const openBulkDeleteDialog = () => {
+  if (!selectedContactIds.value.length || isBulkActionLoading.value) return;
+  bulkDeleteDialogRef.value?.open?.();
+};
+
+const toggleSelectAll = shouldSelect => {
+  selectedContactIds.value = shouldSelect ? [...visibleContactIds.value] : [];
+};
+
+const toggleContactSelection = ({ id, value }) => {
+  const isAlreadySelected = selectedContactIds.value.includes(id);
+  const shouldSelect = value ?? !isAlreadySelected;
+
+  if (shouldSelect && !isAlreadySelected) {
+    selectedContactIds.value = [...selectedContactIds.value, id];
+  } else if (!shouldSelect && isAlreadySelected) {
+    selectedContactIds.value = selectedContactIds.value.filter(
+      contactId => contactId !== id
+    );
+  }
+};
+
 const updatePageParam = (page, search = '') => {
   const query = {
     ...route.query,
@@ -129,6 +186,7 @@ const getCommonFetchParams = (page = 1) => ({
 });
 
 const fetchContacts = async (page = 1) => {
+  clearSelection();
   await store.dispatch('contacts/clearContactFilters');
   await store.dispatch('contacts/get', getCommonFetchParams(page));
   updatePageParam(page);
@@ -136,6 +194,7 @@ const fetchContacts = async (page = 1) => {
 
 const fetchSavedOrAppliedFilteredContact = async (payload, page = 1) => {
   if (!activeSegmentId.value && !hasAppliedFilters.value) return;
+  clearSelection();
   await store.dispatch('contacts/filter', {
     ...getCommonFetchParams(page),
     queryPayload: payload,
@@ -144,6 +203,7 @@ const fetchSavedOrAppliedFilteredContact = async (payload, page = 1) => {
 };
 
 const fetchActiveContacts = async (page = 1) => {
+  clearSelection();
   await store.dispatch('contacts/clearContactFilters');
   await store.dispatch('contacts/active', {
     page,
@@ -153,6 +213,7 @@ const fetchActiveContacts = async (page = 1) => {
 };
 
 const searchContacts = debounce(async (value, page = 1) => {
+  clearSelection();
   await store.dispatch('contacts/clearContactFilters');
   searchValue.value = value;
 
@@ -170,6 +231,7 @@ const searchContacts = debounce(async (value, page = 1) => {
 }, DEBOUNCE_DELAY);
 
 const fetchContactsBasedOnContext = async page => {
+  clearSelection();
   updatePageParam(page, searchValue.value);
   if (isFetchingList.value) return;
   if (searchQuery.value) {
@@ -197,6 +259,51 @@ const fetchContactsBasedOnContext = async page => {
   await fetchContacts(page);
 };
 
+const assignLabels = async labels => {
+  if (!labels.length || !selectedContactIds.value.length) {
+    return;
+  }
+
+  isBulkActionLoading.value = true;
+  try {
+    await BulkActionsAPI.create({
+      type: 'Contact',
+      ids: selectedContactIds.value,
+      labels: { add: labels },
+    });
+    useAlert(t('CONTACTS_BULK_ACTIONS.ASSIGN_LABELS_SUCCESS'));
+    clearSelection();
+    await fetchContactsBasedOnContext(pageNumber.value);
+  } catch (error) {
+    useAlert(t('CONTACTS_BULK_ACTIONS.ASSIGN_LABELS_FAILED'));
+  } finally {
+    isBulkActionLoading.value = false;
+  }
+};
+
+const deleteContacts = async () => {
+  if (!selectedContactIds.value.length) {
+    return;
+  }
+
+  isBulkActionLoading.value = true;
+  try {
+    await BulkActionsAPI.create({
+      type: 'Contact',
+      ids: selectedContactIds.value,
+      action_name: 'delete',
+    });
+    useAlert(t('CONTACTS_BULK_ACTIONS.DELETE_SUCCESS'));
+    clearSelection();
+    await fetchContactsBasedOnContext(pageNumber.value);
+    bulkDeleteDialogRef.value?.close?.();
+  } catch (error) {
+    useAlert(t('CONTACTS_BULK_ACTIONS.DELETE_FAILED'));
+  } finally {
+    isBulkActionLoading.value = false;
+  }
+};
+
 const handleSort = async ({ sort, order }) => {
   Object.assign(sortState, { activeSort: sort, activeOrdering: order });
 
@@ -227,6 +334,23 @@ const createContact = async contact => {
   await store.dispatch('contacts/create', contact);
 };
 
+watch(
+  contacts,
+  newContacts => {
+    const idsOnPage = newContacts.map(contact => contact.id);
+    selectedContactIds.value = selectedContactIds.value.filter(id =>
+      idsOnPage.includes(id)
+    );
+  },
+  { deep: true }
+);
+
+watch(hasSelection, value => {
+  if (!value) {
+    bulkDeleteDialogRef.value?.close?.();
+  }
+});
+
 watch(
   () => uiSettings.value?.contacts_sort_by,
   newSortBy => {
@@ -313,6 +437,16 @@ onMounted(async () => {
       </div>
 
       <template v-else>
+        <ContactsBulkActionBar
+          v-if="hasSelection"
+          :visible-contact-ids="visibleContactIds"
+          :selected-contact-ids="selectedContactIds"
+          :is-loading="isBulkActionLoading"
+          @toggle-all="toggleSelectAll"
+          @clear-selection="clearSelection"
+          @assign-labels="assignLabels"
+          @delete-selected="openBulkDeleteDialog"
+        />
         <ContactEmptyState
           v-if="showEmptyStateLayout"
           class="pt-14"
@@ -321,7 +455,6 @@ onMounted(async () => {
           :button-label="t('CONTACTS_LAYOUT.EMPTY_STATE.BUTTON_LABEL')"
           @create="createContact"
         />
-
         <div
           v-else-if="showEmptyText"
           class="flex items-center justify-center py-10"
@@ -330,8 +463,23 @@ onMounted(async () => {
             {{ emptyStateMessage }}
           </span>
         </div>
-
-        <ContactsList v-else :contacts="contacts" />
+        <div v-else class="flex flex-col gap-4 px-6 pt-4 pb-6">
+          <ContactsList
+            :contacts="contacts"
+            :selected-contact-ids="selectedContactIds"
+            @toggle-contact="toggleContactSelection"
+          />
+          <Dialog
+            v-if="selectedCount"
+            ref="bulkDeleteDialogRef"
+            type="alert"
+            :title="bulkDeleteDialogTitle"
+            :description="bulkDeleteDialogDescription"
+            :confirm-button-label="bulkDeleteDialogConfirmLabel"
+            :is-loading="isBulkActionLoading"
+            @confirm="deleteContacts"
+          />
+        </div>
       </template>
     </ContactsListLayout>
   </div>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
index f94fc7a9b..76533a94d 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
@@ -84,7 +84,7 @@ export default {
         return this.currentChat.meta.assignee;
       },
       set(agent) {
-        const agentId = agent ? agent.id : 0;
+        const agentId = agent ? agent.id : null;
         this.$store.dispatch('setCurrentChatAssignee', agent);
         this.$store
           .dispatch('assignAgent', {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index bfdb5d68a..d1c43b3f2 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -282,6 +282,7 @@ export default {
         </ComposeConversation>
         <VoiceCallButton
           :phone="contact.phone_number"
+          :contact-id="contact.id"
           icon="i-ri-phone-fill"
           size="sm"
           :tooltip-label="$t('CONTACT_PANEL.CALL')"
diff --git a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
index a36d00a42..1882923bd 100644
--- a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
@@ -2,6 +2,7 @@ import settings from './settings/settings.routes';
 import conversation from './conversation/conversation.routes';
 import { routes as searchRoutes } from '../../modules/search/search.routes';
 import { routes as contactRoutes } from './contacts/routes';
+import { routes as companyRoutes } from './companies/routes';
 import { routes as notificationRoutes } from './notifications/routes';
 import { routes as inboxRoutes } from './inbox/routes';
 import { frontendURL } from '../../helper/URLHelper';
@@ -10,6 +11,7 @@ import campaignsRoutes from './campaigns/campaigns.routes';
 import { routes as captainRoutes } from './captain/captain.routes';
 import AppContainer from './Dashboard.vue';
 import Suspended from './suspended/Index.vue';
+import NoAccounts from './noAccounts/Index.vue';
 
 export default {
   routes: [
@@ -22,6 +24,7 @@ export default {
         ...conversation.routes,
         ...settings.routes,
         ...contactRoutes,
+        ...companyRoutes,
         ...searchRoutes,
         ...notificationRoutes,
         ...helpcenterRoutes.routes,
@@ -36,5 +39,10 @@ export default {
       },
       component: Suspended,
     },
+    {
+      path: frontendURL('no-accounts'),
+      name: 'no_accounts',
+      component: NoAccounts,
+    },
   ],
 };
diff --git a/app/javascript/dashboard/routes/dashboard/noAccounts/Index.vue b/app/javascript/dashboard/routes/dashboard/noAccounts/Index.vue
new file mode 100644
index 000000000..2df89e58f
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/noAccounts/Index.vue
@@ -0,0 +1,39 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useMapGetter } from 'dashboard/composables/store';
+import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+import Auth from 'dashboard/api/auth';
+
+const { t } = useI18n();
+const isOnChatwootCloud = useMapGetter('globalConfig/isOnChatwootCloud');
+
+const message = computed(() => {
+  if (isOnChatwootCloud.value) {
+    return t('APP_GLOBAL.NO_ACCOUNTS.MESSAGE_CLOUD');
+  }
+  return t('APP_GLOBAL.NO_ACCOUNTS.MESSAGE_SELF_HOSTED');
+});
+
+const handleLogout = () => {
+  Auth.logout();
+};
+</script>
+
+<template>
+  <div
+    class="flex flex-col flex-1 items-center justify-center w-full h-full gap-6 bg-n-slate-2"
+  >
+    <EmptyState
+      :title="$t('APP_GLOBAL.NO_ACCOUNTS.TITLE')"
+      :message="message"
+    />
+    <NextButton
+      variant="smooth"
+      color-scheme="secondary"
+      :label="$t('APP_GLOBAL.NO_ACCOUNTS.LOGOUT')"
+      @click="handleLogout"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue
index 8ba3d69a9..bcfa46193 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue
@@ -11,6 +11,7 @@ import BillingMeter from './components/BillingMeter.vue';
 import BillingCard from './components/BillingCard.vue';
 import BillingHeader from './components/BillingHeader.vue';
 import DetailItem from './components/DetailItem.vue';
+import PurchaseCreditsModal from './components/PurchaseCreditsModal.vue';
 import BaseSettingsHeader from '../components/BaseSettingsHeader.vue';
 import SettingsLayout from '../SettingsLayout.vue';
 import ButtonV4 from 'next/button/Button.vue';
@@ -23,6 +24,7 @@ const {
   documentLimits,
   responseLimits,
   fetchLimits,
+  isFetchingLimits,
 } = useCaptain();
 
 const uiFlags = useMapGetter('accounts/getUIFlags');
@@ -32,6 +34,7 @@ const BILLING_REFRESH_ATTEMPTED = 'billing_refresh_attempted';
 
 // State for handling refresh attempts and loading
 const isWaitingForBilling = ref(false);
+const purchaseCreditsModalRef = ref(null);
 
 const customAttributes = computed(() => {
   return currentAccount.value.custom_attributes || {};
@@ -45,6 +48,11 @@ const planName = computed(() => {
   return customAttributes.value.plan_name;
 });
 
+const canPurchaseCredits = computed(() => {
+  const plan = planName.value?.toLowerCase();
+  return plan && plan !== 'hacker';
+});
+
 /**
  * Computed property for subscribed quantity
  * @returns {number|undefined}
@@ -71,8 +79,9 @@ const hasABillingPlan = computed(() => {
 const fetchAccountDetails = async () => {
   if (!hasABillingPlan.value) {
     await store.dispatch('accounts/subscription');
-    fetchLimits();
   }
+  // Always fetch limits for billing page to show credit usage
+  fetchLimits();
 };
 
 const handleBillingPageLogic = async () => {
@@ -119,6 +128,15 @@ const onToggleChatWindow = () => {
   }
 };
 
+const openPurchaseCreditsModal = () => {
+  purchaseCreditsModalRef.value?.open();
+};
+
+const handleTopupSuccess = () => {
+  // Refresh limits to show updated credit balance
+  fetchLimits();
+};
+
 onMounted(handleBillingPageLogic);
 </script>
 
@@ -178,9 +196,27 @@ onMounted(handleBillingPageLogic);
           :description="$t('BILLING_SETTINGS.CAPTAIN.DESCRIPTION')"
         >
           <template #action>
-            <ButtonV4 sm faded slate disabled>
-              {{ $t('BILLING_SETTINGS.CAPTAIN.BUTTON_TXT') }}
-            </ButtonV4>
+            <div class="flex gap-2">
+              <ButtonV4
+                sm
+                flushed
+                slate
+                icon="i-lucide-refresh-cw"
+                :is-loading="isFetchingLimits"
+                @click="fetchLimits"
+              >
+                {{ $t('BILLING_SETTINGS.CAPTAIN.REFRESH_CREDITS') }}
+              </ButtonV4>
+              <ButtonV4
+                v-if="canPurchaseCredits"
+                sm
+                solid
+                blue
+                @click="openPurchaseCreditsModal"
+              >
+                {{ $t('BILLING_SETTINGS.TOPUP.BUY_CREDITS') }}
+              </ButtonV4>
+            </div>
           </template>
           <div v-if="captainLimits && responseLimits" class="px-5">
             <BillingMeter
@@ -217,12 +253,16 @@ onMounted(handleBillingPageLogic);
             solid
             slate
             icon="i-lucide-life-buoy"
-            @open="onToggleChatWindow"
+            @click="onToggleChatWindow"
           >
             {{ $t('BILLING_SETTINGS.CHAT_WITH_US.BUTTON_TXT') }}
           </ButtonV4>
         </BillingHeader>
       </section>
+      <PurchaseCreditsModal
+        ref="purchaseCreditsModalRef"
+        @success="handleTopupSuccess"
+      />
     </template>
   </SettingsLayout>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/components/CreditPackageCard.vue b/app/javascript/dashboard/routes/dashboard/settings/billing/components/CreditPackageCard.vue
new file mode 100644
index 000000000..d557e9a71
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/billing/components/CreditPackageCard.vue
@@ -0,0 +1,101 @@
+<script setup>
+defineProps({
+  credits: {
+    type: Number,
+    required: true,
+  },
+  amount: {
+    type: Number,
+    required: true,
+  },
+  currency: {
+    type: String,
+    default: 'usd',
+  },
+  isSelected: {
+    type: Boolean,
+    default: false,
+  },
+  isPopular: {
+    type: Boolean,
+    default: false,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+});
+
+const emit = defineEmits(['select']);
+
+const formatCredits = credits => {
+  return credits.toLocaleString();
+};
+
+const formatAmount = (amount, currency) => {
+  return new Intl.NumberFormat('en-US', {
+    style: 'currency',
+    currency: currency.toUpperCase(),
+    minimumFractionDigits: 0,
+  }).format(amount);
+};
+</script>
+
+<template>
+  <label
+    class="relative flex flex-col p-6 border-2 rounded-xl transition-all cursor-pointer bg-n-solid-1 hover:bg-n-solid-2"
+    :class="[
+      isSelected ? 'border-woot-500' : 'border-n-weak hover:border-n-strong',
+    ]"
+  >
+    <input
+      type="radio"
+      :name="name"
+      :value="credits"
+      :checked="isSelected"
+      class="sr-only"
+      @change="emit('select')"
+    />
+    <span
+      v-if="isPopular"
+      class="absolute -top-3 left-4 px-3 py-1 text-xs font-medium rounded"
+      :class="
+        isSelected ? 'bg-woot-500 text-white' : 'bg-n-solid-3 text-n-slate-11'
+      "
+    >
+      {{ $t('BILLING_SETTINGS.TOPUP.POPULAR') }}
+    </span>
+    <div
+      v-if="isSelected"
+      class="absolute top-4 right-4 flex items-center justify-center w-6 h-6 rounded-full bg-woot-500"
+    >
+      <svg
+        class="w-4 h-4 text-white"
+        fill="none"
+        stroke="currentColor"
+        viewBox="0 0 24 24"
+      >
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M5 13l4 4L19 7"
+        />
+      </svg>
+    </div>
+    <span class="text-3xl font-normal text-n-slate-12 mb-2 tracking-tighter">
+      {{ formatCredits(credits) }}
+    </span>
+    <span
+      class="text-xs font-normal text-n-slate-11 uppercase tracking-tight mb-6"
+    >
+      {{ $t('BILLING_SETTINGS.TOPUP.CREDITS') }}
+    </span>
+    <span class="text-2xl font-normal text-n-slate-12 tracking-tight">
+      {{ formatAmount(amount, currency) }}
+      <span class="text-sm text-n-slate-11 ml-0.5">{{
+        $t('BILLING_SETTINGS.TOPUP.ONE_TIME')
+      }}</span>
+    </span>
+  </label>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/components/PurchaseCreditsModal.vue b/app/javascript/dashboard/routes/dashboard/settings/billing/components/PurchaseCreditsModal.vue
new file mode 100644
index 000000000..33f299b9b
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/billing/components/PurchaseCreditsModal.vue
@@ -0,0 +1,220 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+import CreditPackageCard from './CreditPackageCard.vue';
+import EnterpriseAccountAPI from 'dashboard/api/enterprise/account';
+
+const emit = defineEmits(['close', 'success']);
+
+const { t } = useI18n();
+
+const TOPUP_OPTIONS = [
+  { credits: 1000, amount: 20.0, currency: 'usd' },
+  { credits: 2500, amount: 50.0, currency: 'usd' },
+  { credits: 6000, amount: 100.0, currency: 'usd' },
+  { credits: 12000, amount: 200.0, currency: 'usd' },
+];
+
+const POPULAR_CREDITS_AMOUNT = 6000;
+const STEP_SELECT = 'select';
+const STEP_CONFIRM = 'confirm';
+
+const dialogRef = ref(null);
+const selectedCredits = ref(null);
+const isLoading = ref(false);
+const currentStep = ref(STEP_SELECT);
+
+const selectedOption = computed(() => {
+  return TOPUP_OPTIONS.find(o => o.credits === selectedCredits.value);
+});
+
+const formattedAmount = computed(() => {
+  if (!selectedOption.value) return '';
+  return new Intl.NumberFormat('en-US', {
+    style: 'currency',
+    currency: selectedOption.value.currency.toUpperCase(),
+  }).format(selectedOption.value.amount);
+});
+
+const formattedCredits = computed(() => {
+  if (!selectedOption.value) return '';
+  return selectedOption.value.credits.toLocaleString();
+});
+
+const dialogTitle = computed(() => {
+  return currentStep.value === STEP_SELECT
+    ? t('BILLING_SETTINGS.TOPUP.MODAL_TITLE')
+    : t('BILLING_SETTINGS.TOPUP.CONFIRM.TITLE');
+});
+
+const dialogDescription = computed(() => {
+  return currentStep.value === STEP_SELECT
+    ? t('BILLING_SETTINGS.TOPUP.MODAL_DESCRIPTION')
+    : '';
+});
+
+const dialogWidth = computed(() => {
+  return currentStep.value === STEP_SELECT ? 'xl' : 'md';
+});
+
+const handlePackageSelect = credits => {
+  selectedCredits.value = credits;
+};
+
+const open = () => {
+  const popularOption = TOPUP_OPTIONS.find(
+    o => o.credits === POPULAR_CREDITS_AMOUNT
+  );
+  selectedCredits.value = popularOption?.credits || TOPUP_OPTIONS[0]?.credits;
+  currentStep.value = STEP_SELECT;
+  isLoading.value = false;
+  dialogRef.value?.open();
+};
+
+const close = () => {
+  dialogRef.value?.close();
+};
+
+const handleClose = () => {
+  emit('close');
+};
+
+const goToConfirmStep = () => {
+  if (!selectedOption.value) return;
+  currentStep.value = STEP_CONFIRM;
+};
+
+const goBackToSelectStep = () => {
+  currentStep.value = STEP_SELECT;
+};
+
+const handlePurchase = async () => {
+  if (!selectedOption.value) return;
+
+  isLoading.value = true;
+  try {
+    const response = await EnterpriseAccountAPI.createTopupCheckout(
+      selectedOption.value.credits
+    );
+
+    close();
+    emit('success', response.data);
+    useAlert(
+      t('BILLING_SETTINGS.TOPUP.PURCHASE_SUCCESS', {
+        credits: response.data.credits,
+      })
+    );
+  } catch (error) {
+    const errorMessage =
+      error.response?.data?.error || t('BILLING_SETTINGS.TOPUP.PURCHASE_ERROR');
+    useAlert(errorMessage);
+  } finally {
+    isLoading.value = false;
+  }
+};
+
+defineExpose({ open, close });
+</script>
+
+<template>
+  <Dialog
+    ref="dialogRef"
+    :title="dialogTitle"
+    :description="dialogDescription"
+    :width="dialogWidth"
+    :show-confirm-button="false"
+    :show-cancel-button="false"
+    @close="handleClose"
+  >
+    <!-- Step 1: Select Credits Package -->
+    <template v-if="currentStep === 'select'">
+      <div class="grid grid-cols-2 gap-4">
+        <CreditPackageCard
+          v-for="option in TOPUP_OPTIONS"
+          :key="option.credits"
+          name="credit-package"
+          :credits="option.credits"
+          :amount="option.amount"
+          :currency="option.currency"
+          :is-popular="option.credits === POPULAR_CREDITS_AMOUNT"
+          :is-selected="selectedCredits === option.credits"
+          @select="handlePackageSelect(option.credits)"
+        />
+      </div>
+
+      <div class="p-4 mt-6 rounded-lg bg-n-solid-2 border border-n-weak">
+        <p class="text-sm text-n-slate-11">
+          <span class="font-semibold text-n-slate-12">{{
+            $t('BILLING_SETTINGS.TOPUP.NOTE_TITLE')
+          }}</span>
+          {{ $t('BILLING_SETTINGS.TOPUP.NOTE_DESCRIPTION') }}
+        </p>
+      </div>
+    </template>
+
+    <!-- Step 2: Confirm Purchase -->
+    <template v-else>
+      <div class="flex flex-col gap-4">
+        <p class="text-sm text-n-slate-11">
+          {{
+            $t('BILLING_SETTINGS.TOPUP.CONFIRM.DESCRIPTION', {
+              credits: formattedCredits,
+              amount: formattedAmount,
+            })
+          }}
+        </p>
+
+        <div class="p-2.5 rounded-lg bg-n-amber-2 border border-n-amber-6">
+          <p class="text-sm text-n-amber-11">
+            {{ $t('BILLING_SETTINGS.TOPUP.CONFIRM.INSTANT_DEDUCTION_NOTE') }}
+          </p>
+        </div>
+      </div>
+    </template>
+
+    <template #footer>
+      <!-- Step 1 Footer -->
+      <div
+        v-if="currentStep === 'select'"
+        class="flex items-center justify-between w-full gap-3"
+      >
+        <Button
+          variant="faded"
+          color="slate"
+          :label="$t('BILLING_SETTINGS.TOPUP.CANCEL')"
+          class="w-full"
+          @click="close"
+        />
+        <Button
+          color="blue"
+          :label="$t('BILLING_SETTINGS.TOPUP.PURCHASE')"
+          class="w-full"
+          :disabled="!selectedCredits"
+          @click="goToConfirmStep"
+        />
+      </div>
+
+      <!-- Step 2 Footer -->
+      <div v-else class="flex items-center justify-between w-full gap-3">
+        <Button
+          variant="faded"
+          color="slate"
+          :label="$t('BILLING_SETTINGS.TOPUP.CONFIRM.GO_BACK')"
+          class="w-full"
+          :disabled="isLoading"
+          @click="goBackToSelectStep"
+        />
+        <Button
+          color="blue"
+          :label="$t('BILLING_SETTINGS.TOPUP.CONFIRM.CONFIRM_PURCHASE')"
+          class="w-full"
+          :is-loading="isLoading"
+          @click="handlePurchase"
+        />
+      </div>
+    </template>
+  </Dialog>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
index b19416137..ec89ec930 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
@@ -7,6 +7,7 @@ import QRCode from 'qrcode';
 import EmptyState from '../../../../components/widgets/EmptyState.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
 import DuplicateInboxBanner from './channels/instagram/DuplicateInboxBanner.vue';
+import EmailInboxFinish from './channels/emailChannels/EmailInboxFinish.vue';
 import { useInbox } from 'dashboard/composables/useInbox';
 import { INBOX_TYPES } from 'dashboard/helper/inbox';
 
@@ -86,10 +87,6 @@ const message = computed(() => {
     )}`;
   }
 
-  if (isAnEmailChannel.value && !currentInbox.value.provider) {
-    return t('INBOX_MGMT.ADD.EMAIL_CHANNEL.FINISH_MESSAGE');
-  }
-
   if (currentInbox.value.web_widget_script) {
     return t('INBOX_MGMT.FINISH.WEBSITE_SUCCESS');
   }
@@ -176,7 +173,7 @@ onMounted(() => {
     />
     <EmptyState
       :title="$t('INBOX_MGMT.FINISH.TITLE')"
-      :message="message"
+      :message="isAnEmailChannel && !currentInbox.provider ? '' : message"
       :button-text="$t('INBOX_MGMT.FINISH.BUTTON_TEXT')"
     >
       <div class="w-full text-center">
@@ -197,7 +194,7 @@ onMounted(() => {
           v-if="shouldShowWhatsAppWebhookDetails"
           class="w-[50%] max-w-[50%] ml-[25%]"
         >
-          <p class="mt-8 font-medium text-slate-700 dark:text-slate-200">
+          <p class="mt-8 font-medium text-n-slate-11">
             {{ $t('INBOX_MGMT.ADD.WHATSAPP.API_CALLBACK.WEBHOOK_URL') }}
           </p>
           <woot-code lang="html" :script="currentInbox.callback_webhook_url" />
@@ -227,12 +224,11 @@ onMounted(() => {
             :script="currentInbox.callback_webhook_url"
           />
         </div>
-        <div
+        <EmailInboxFinish
           v-if="isAnEmailChannel && !currentInbox.provider"
-          class="w-[50%] max-w-[50%] ml-[25%]"
-        >
-          <woot-code lang="html" :script="currentInbox.forward_to_email" />
-        </div>
+          :inbox="currentInbox"
+          :inbox-id="$route.params.inbox_id"
+        />
         <div
           v-if="isAWhatsAppChannel && qrCodes.whatsapp"
           class="flex flex-col gap-3 items-center mt-8"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
index c6c021a45..b8b8126c7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
@@ -73,10 +73,10 @@ const handleManualLinkClick = () => {
   <div class="overflow-auto col-span-6 p-6 w-full h-full">
     <div v-if="showProviderSelection">
       <div class="mb-10 text-left">
-        <h1 class="mb-2 text-lg font-medium text-slate-12">
+        <h1 class="mb-2 text-lg font-medium text-n-slate-12">
           {{ $t('INBOX_MGMT.ADD.WHATSAPP.SELECT_PROVIDER.TITLE') }}
         </h1>
-        <p class="text-sm leading-relaxed text-slate-11">
+        <p class="text-sm leading-relaxed text-n-slate-11">
           {{ $t('INBOX_MGMT.ADD.WHATSAPP.SELECT_PROVIDER.DESCRIPTION') }}
         </p>
       </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/EmailInboxFinish.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/EmailInboxFinish.vue
new file mode 100644
index 000000000..be5b94087
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/EmailInboxFinish.vue
@@ -0,0 +1,55 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const props = defineProps({
+  inbox: {
+    type: Object,
+    required: true,
+  },
+  inboxId: {
+    type: [String, Number],
+    required: true,
+  },
+});
+
+const { t } = useI18n();
+
+const message = computed(() => {
+  return props.inbox.forwarding_enabled
+    ? t('INBOX_MGMT.ADD.EMAIL_CHANNEL.FINISH_MESSAGE')
+    : t('INBOX_MGMT.ADD.EMAIL_CHANNEL.FINISH_MESSAGE_NO_FORWARDING');
+});
+
+const showForwardingAddress = computed(() => {
+  return props.inbox.forwarding_enabled;
+});
+</script>
+
+<template>
+  <div class="w-full text-center">
+    <p class="text-base text-n-slate-11 mt-4 w-4/5 mx-auto leading-7">
+      {{ message }}
+    </p>
+
+    <div v-if="showForwardingAddress" class="w-[50%] max-w-[50%] mx-auto">
+      <p class="mt-8 mb-4 font-medium text-n-slate-11">
+        {{ $t('INBOX_MGMT.ADD.EMAIL_CHANNEL.FORWARDING_ADDRESS_LABEL') }}
+      </p>
+      <woot-code lang="html" :script="inbox.forward_to_email" />
+    </div>
+
+    <p class="mt-8 text-sm text-n-slate-11 pb-4">
+      <router-link
+        :to="{
+          name: 'settings_inbox_show',
+          params: { inboxId: inboxId, tab: 'configuration' },
+        }"
+        class="text-n-woot-600 hover:text-n-woot-700 underline"
+      >
+        {{ $t('INBOX_MGMT.ADD.EMAIL_CHANNEL.CONFIGURE_SMTP_IMAP_LINK') }}
+      </router-link>
+      {{ $t('INBOX_MGMT.ADD.EMAIL_CHANNEL.CONFIGURE_SMTP_IMAP_TEXT') }}
+    </p>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
index 186fcc48e..25f96ad3e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -50,6 +50,9 @@ export default {
     whatsappAppId() {
       return window.chatwootConfig?.whatsappAppId;
     },
+    isForwardingEnabled() {
+      return !!this.inbox.forwarding_enabled;
+    },
   },
   watch: {
     inbox() {
@@ -300,9 +303,24 @@ export default {
     <div class="mx-8">
       <SettingsSection
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_TITLE')"
-        :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_SUB_TEXT')"
+        :sub-title="
+          isForwardingEnabled
+            ? $t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_SUB_TEXT')
+            : ''
+        "
       >
-        <woot-code :script="inbox.forward_to_email" />
+        <woot-code
+          v-if="isForwardingEnabled"
+          :script="inbox.forward_to_email"
+        />
+        <div
+          v-else
+          class="p-4 bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded-lg"
+        >
+          <p class="text-sm text-yellow-800 dark:text-yellow-200 mb-0">
+            {{ $t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_NOT_CONFIGURED') }}
+          </p>
+        </div>
       </SettingsSection>
     </div>
     <ImapSettings :inbox="inbox" />
@@ -322,7 +340,7 @@ export default {
           "
         >
           <div class="flex gap-4 items-center">
-            <p class="text-sm text-slate-600">
+            <p class="text-sm text-n-slate-11">
               {{
                 $t(
                   'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_EMBEDDED_SIGNUP_DESCRIPTION'
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/NewHook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/NewHook.vue
index 5fe350215..1a4d36fee 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/NewHook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/NewHook.vue
@@ -4,6 +4,7 @@ import { mapGetters } from 'vuex';
 import { useAlert } from 'dashboard/composables';
 import { useIntegrationHook } from 'dashboard/composables/useIntegrationHook';
 import { FormKit } from '@formkit/vue';
+import { useBranding } from 'shared/composables/useBranding';
 
 import NextButton from 'dashboard/components-next/button/Button.vue';
 
@@ -23,8 +24,9 @@ export default {
     const { integration, isHookTypeInbox } = useIntegrationHook(
       props.integrationId
     );
+    const { replaceInstallationName } = useBranding();
 
-    return { integration, isHookTypeInbox };
+    return { integration, isHookTypeInbox, replaceInstallationName };
   },
   data() {
     return {
@@ -117,7 +119,7 @@ export default {
   <div class="flex flex-col h-auto overflow-auto integration-hooks">
     <woot-modal-header
       :header-title="integration.name"
-      :header-content="integration.short_description"
+      :header-content="replaceInstallationName(integration.short_description)"
     />
     <FormKit
       v-model="values"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/SingleIntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/SingleIntegrationHooks.vue
index a1bd609cd..f32926d79 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/SingleIntegrationHooks.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/SingleIntegrationHooks.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { defineProps, defineEmits } from 'vue';
 import { useIntegrationHook } from 'dashboard/composables/useIntegrationHook';
+import { useBranding } from 'shared/composables/useBranding';
 import Button from 'dashboard/components-next/button/Button.vue';
 
 const props = defineProps({
@@ -15,6 +16,8 @@ defineEmits(['add', 'delete']);
 const { integration, hasConnectedHooks } = useIntegrationHook(
   props.integrationId
 );
+
+const { replaceInstallationName } = useBranding();
 </script>
 
 <template>
@@ -37,7 +40,7 @@ const { integration, hasConnectedHooks } = useIntegrationHook(
           {{ integration.name }}
         </h3>
         <p class="text-n-slate-11 text-sm leading-6">
-          {{ integration.description }}
+          {{ replaceInstallationName(integration.description) }}
         </p>
       </div>
       <div class="flex justify-center items-center mb-0 w-[15%]">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
index 430658329..3f4b31299 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
@@ -55,6 +55,7 @@ export default {
   data() {
     return {
       url: this.value.url || '',
+      name: this.value.name || '',
       subscriptions: this.value.subscriptions || [],
       supportedWebhookEvents: SUPPORTED_WEBHOOK_EVENTS,
     };
@@ -68,11 +69,15 @@ export default {
         }
       );
     },
+    webhookNameInputPlaceholder() {
+      return this.$t('INTEGRATION_SETTINGS.WEBHOOK.FORM.NAME.PLACEHOLDER');
+    },
   },
   methods: {
     onSubmit() {
       this.$emit('submit', {
         url: this.url,
+        name: this.name,
         subscriptions: this.subscriptions,
       });
     },
@@ -97,6 +102,15 @@ export default {
           {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.END_POINT.ERROR') }}
         </span>
       </label>
+      <label>
+        {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.NAME.LABEL') }}
+        <input
+          v-model="name"
+          type="text"
+          name="name"
+          :placeholder="webhookNameInputPlaceholder"
+        />
+      </label>
       <label :class="{ error: v$.url.$error }" class="mb-2">
         {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.SUBSCRIPTIONS.LABEL') }}
       </label>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
index e2bf986e0..3dfb177e5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
@@ -37,8 +37,16 @@ const subscribedEvents = computed(() => {
 <template>
   <tr>
     <td class="py-4 ltr:pr-4 rtl:pl-4">
-      <div class="font-medium break-words text-n-slate-12">
-        {{ webhook.url }}
+      <div class="flex gap-2 font-medium break-words text-n-slate-12">
+        <template v-if="webhook.name">
+          {{ webhook.name }}
+          <span class="text-n-slate-11">
+            {{ webhook.url }}
+          </span>
+        </template>
+        <template v-else>
+          {{ webhook.url }}
+        </template>
       </div>
       <div class="block mt-1 text-sm text-n-slate-11">
         <span class="font-medium">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/heatmaps/BaseHeatmap.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/heatmaps/BaseHeatmap.vue
index 3f9dd9db4..bed1128fd 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/heatmaps/BaseHeatmap.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/heatmaps/BaseHeatmap.vue
@@ -119,7 +119,7 @@ const tooltip = useHeatmapTooltip();
 <!-- eslint-disable vue/no-static-inline-styles -->
 <template>
   <div
-    class="grid relative w-full gap-x-4 gap-y-2.5 overflow-y-scroll md:overflow-visible grid-cols-[80px_1fr] min-h-72"
+    class="grid relative w-full gap-x-4 gap-y-2.5 overflow-y-scroll md:overflow-visible grid-cols-[80px_1fr]"
   >
     <template v-if="isLoading">
       <div class="grid gap-[5px] flex-shrink-0">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/heatmaps/BaseHeatmapContainer.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/heatmaps/BaseHeatmapContainer.vue
index 2a692b12a..3050e12c7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/heatmaps/BaseHeatmapContainer.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/heatmaps/BaseHeatmapContainer.vue
@@ -1,15 +1,18 @@
 <script setup>
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import { useToggle } from '@vueuse/core';
 import MetricCard from '../overview/MetricCard.vue';
 import BaseHeatmap from './BaseHeatmap.vue';
+import HeatmapDateRangeSelector from './HeatmapDateRangeSelector.vue';
 import { useStore, useMapGetter } from 'dashboard/composables/store';
 import { useLiveRefresh } from 'dashboard/composables/useLiveRefresh';
+import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
 import endOfDay from 'date-fns/endOfDay';
+import format from 'date-fns/format';
 import getUnixTime from 'date-fns/getUnixTime';
 import startOfDay from 'date-fns/startOfDay';
+import startOfMonth from 'date-fns/startOfMonth';
 import subDays from 'date-fns/subDays';
-import format from 'date-fns/format';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import { useI18n } from 'vue-i18n';
@@ -57,27 +60,33 @@ const uiFlags = useMapGetter('getOverviewUIFlags');
 const heatmapData = useMapGetter(props.storeGetter);
 const inboxes = useMapGetter('inboxes/getInboxes');
 
-const menuItems = [
-  {
-    label: t('REPORT.DATE_RANGE_OPTIONS.LAST_7_DAYS'),
-    value: 6,
-  },
-  {
-    label: t('REPORT.DATE_RANGE_OPTIONS.LAST_14_DAYS'),
-    value: 13,
-  },
-  {
-    label: t('REPORT.DATE_RANGE_OPTIONS.LAST_30_DAYS'),
-    value: 29,
-  },
-];
-
-const selectedDays = ref(6);
+const selectedFrom = ref(null);
+const selectedTo = ref(null);
+const selectedDaysBefore = ref(null);
 const selectedInbox = ref(null);
+const isMonthFilter = ref(false);
+const currentMonthOffset = ref(0);
 
-const selectedDayFilter = computed(() =>
-  menuItems.find(menuItem => menuItem.value === selectedDays.value)
-);
+const selectedRange = computed(() => {
+  if (!selectedFrom.value || !selectedTo.value) {
+    return null;
+  }
+  return {
+    from: selectedFrom.value,
+    to: selectedTo.value,
+  };
+});
+
+const numberOfRows = computed(() => {
+  if (!selectedRange.value) {
+    return 0;
+  }
+  const dateDifference = differenceInCalendarDays(
+    selectedRange.value.to,
+    selectedRange.value.from
+  );
+  return dateDifference + 1;
+});
 
 const inboxMenuItems = computed(() => {
   return [
@@ -105,13 +114,42 @@ const selectedInboxFilter = computed(() => {
 
 const isLoading = computed(() => uiFlags.value[props.uiFlagKey]);
 
+// Keeps relative presets (last 7 days / this month) aligned with "now" during live refreshes.
+const resolveActiveRange = () => {
+  if (isMonthFilter.value && currentMonthOffset.value === 0) {
+    const now = new Date();
+    const monthStart = startOfMonth(now);
+    return {
+      from: startOfDay(monthStart),
+      to: endOfDay(now),
+    };
+  }
+
+  if (!isMonthFilter.value && selectedDaysBefore.value !== null) {
+    const to = endOfDay(new Date());
+    return {
+      from: startOfDay(subDays(to, Number(selectedDaysBefore.value))),
+      to,
+    };
+  }
+
+  return selectedRange.value;
+};
+
 const downloadHeatmapData = () => {
-  const to = endOfDay(new Date());
+  const range = resolveActiveRange();
+  if (!range) {
+    return;
+  }
+
+  const { to } = range;
+  const shouldUseBackendDownload =
+    !isMonthFilter.value && !selectedInbox.value && props.downloadAction;
 
   // If no inbox is selected and download action exists, use backend endpoint
-  if (!selectedInbox.value && props.downloadAction) {
+  if (shouldUseBackendDownload) {
     store.dispatch(props.downloadAction, {
-      daysBefore: selectedDays.value,
+      daysBefore: selectedDaysBefore.value,
       to: getUnixTime(to),
     });
     return;
@@ -150,7 +188,6 @@ const downloadHeatmapData = () => {
   downloadCsvFile(fileName, csvContent);
 };
 
-const [showDropdown, toggleDropdown] = useToggle();
 const [showInboxDropdown, toggleInboxDropdown] = useToggle();
 
 const fetchHeatmapData = () => {
@@ -158,8 +195,12 @@ const fetchHeatmapData = () => {
     return;
   }
 
-  let to = endOfDay(new Date());
-  let from = startOfDay(subDays(to, Number(selectedDays.value)));
+  const range = resolveActiveRange();
+  if (!range) {
+    return;
+  }
+
+  const { from, to } = range;
 
   const params = {
     metric: props.metric,
@@ -178,25 +219,43 @@ const fetchHeatmapData = () => {
   store.dispatch(props.storeAction, params);
 };
 
-const handleAction = ({ value }) => {
-  toggleDropdown(false);
-  selectedDays.value = value;
-  fetchHeatmapData();
-};
-
 const handleInboxAction = ({ value }) => {
   toggleInboxDropdown(false);
   selectedInbox.value = value
     ? inboxes.value.find(inbox => inbox.id === value)
     : null;
-  fetchHeatmapData();
 };
 
 const { startRefetching } = useLiveRefresh(fetchHeatmapData);
 
+const handleRangeTypeChange = type => {
+  isMonthFilter.value = type === 'month';
+};
+
+const handleMonthOffsetChange = offset => {
+  currentMonthOffset.value = offset;
+};
+
+watch(
+  () => [selectedFrom.value, selectedTo.value],
+  ([from, to]) => {
+    if (from && to) {
+      fetchHeatmapData();
+    }
+  }
+);
+
+watch(
+  () => selectedInbox.value,
+  () => {
+    if (selectedRange.value) {
+      fetchHeatmapData();
+    }
+  }
+);
+
 onMounted(() => {
   store.dispatch('inboxes/get');
-  fetchHeatmapData();
   startRefetching();
 });
 </script>
@@ -205,25 +264,13 @@ onMounted(() => {
   <div class="flex flex-row flex-wrap max-w-full">
     <MetricCard :header="title">
       <template #control>
-        <div
-          v-on-clickaway="() => toggleDropdown(false)"
-          class="relative flex items-center group"
-        >
-          <Button
-            sm
-            slate
-            faded
-            :label="selectedDayFilter.label"
-            class="rounded-md group-hover:bg-n-alpha-2"
-            @click="toggleDropdown()"
-          />
-          <DropdownMenu
-            v-if="showDropdown"
-            :menu-items="menuItems"
-            class="mt-1 ltr:right-0 rtl:left-0 xl:ltr:right-0 xl:rtl:left-0 top-full"
-            @action="handleAction($event)"
-          />
-        </div>
+        <HeatmapDateRangeSelector
+          v-model:from="selectedFrom"
+          v-model:to="selectedTo"
+          v-model:days-num="selectedDaysBefore"
+          @range-type-change="handleRangeTypeChange"
+          @month-offset-change="handleMonthOffsetChange"
+        />
         <div
           v-on-clickaway="() => toggleInboxDropdown(false)"
           class="relative flex items-center group"
@@ -241,22 +288,23 @@ onMounted(() => {
             :menu-items="inboxMenuItems"
             show-search
             :search-placeholder="t('INBOX_REPORTS.SEARCH_INBOX')"
-            class="mt-1 ltr:right-0 rtl:left-0 xl:ltr:right-0 xl:rtl:left-0 top-full min-w-[200px]"
+            class="mt-1 ltr:right-0 rtl:left-0 xl:ltr:right-0 xl:rtl:left-0 top-full !min-w-56 max-w-56 max-h-96 overflow-y-auto"
             @action="handleInboxAction($event)"
           />
         </div>
         <Button
+          v-tooltip="t('OVERVIEW_REPORTS.CONVERSATION_HEATMAP.DOWNLOAD_REPORT')"
           sm
           slate
           faded
-          :label="t('OVERVIEW_REPORTS.CONVERSATION_HEATMAP.DOWNLOAD_REPORT')"
+          icon="i-lucide-download"
           class="rounded-md group-hover:bg-n-alpha-2"
           @click="downloadHeatmapData"
         />
       </template>
       <BaseHeatmap
         :heatmap-data="heatmapData"
-        :number-of-rows="selectedDays + 1"
+        :number-of-rows="numberOfRows"
         :is-loading="isLoading"
         :color-scheme="colorScheme"
       />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/heatmaps/HeatmapDateRangeSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/heatmaps/HeatmapDateRangeSelector.vue
new file mode 100644
index 000000000..9e9021e93
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/heatmaps/HeatmapDateRangeSelector.vue
@@ -0,0 +1,212 @@
+<script setup>
+import { computed, ref, watch, defineModel } from 'vue';
+import { useToggle } from '@vueuse/core';
+import { useI18n } from 'vue-i18n';
+import addMonths from 'date-fns/addMonths';
+import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
+import endOfDay from 'date-fns/endOfDay';
+import endOfMonth from 'date-fns/endOfMonth';
+import startOfDay from 'date-fns/startOfDay';
+import startOfMonth from 'date-fns/startOfMonth';
+import subDays from 'date-fns/subDays';
+import { vOnClickOutside } from '@vueuse/components';
+import Button from 'dashboard/components-next/button/Button.vue';
+import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
+
+const emit = defineEmits(['rangeTypeChange', 'monthOffsetChange']);
+
+const fromModel = defineModel('from', { type: Date, default: null });
+const toModel = defineModel('to', { type: Date, default: null });
+const daysNumModel = defineModel('daysNum', { type: Number, default: null });
+
+const { t, locale } = useI18n();
+
+const DATE_FILTER_TYPES = {
+  DAY: 'day',
+  MONTH: 'month',
+};
+
+const DATE_FILTER_ACTION = 'select_date_range';
+
+const dayMenuItemConfigs = computed(() => [
+  {
+    label: t('REPORT.DATE_RANGE_OPTIONS.LAST_7_DAYS'),
+    value: 'last_7_days',
+    action: DATE_FILTER_ACTION,
+    type: DATE_FILTER_TYPES.DAY,
+    daysBefore: 6,
+  },
+  {
+    label: t('REPORT.DATE_RANGE_OPTIONS.LAST_14_DAYS'),
+    value: 'last_14_days',
+    action: DATE_FILTER_ACTION,
+    type: DATE_FILTER_TYPES.DAY,
+    daysBefore: 13,
+  },
+  {
+    label: t('REPORT.DATE_RANGE_OPTIONS.LAST_30_DAYS'),
+    value: 'last_30_days',
+    action: DATE_FILTER_ACTION,
+    type: DATE_FILTER_TYPES.DAY,
+    daysBefore: 29,
+  },
+]);
+
+const resolvedLocale = computed(() => {
+  const currentLocale =
+    locale.value ||
+    (typeof navigator !== 'undefined' ? navigator.language : 'en');
+  return currentLocale.replace('_', '-');
+});
+
+const monthFormatter = computed(
+  () =>
+    new Intl.DateTimeFormat(resolvedLocale.value, {
+      month: 'long',
+      year: 'numeric',
+    })
+);
+
+const monthMenuItemConfigs = computed(() => {
+  const now = new Date();
+  const offsets = [0, -1, -2];
+
+  return offsets.map(offset => ({
+    label:
+      offset === 0
+        ? t('REPORT.DATE_RANGE_OPTIONS.THIS_MONTH')
+        : monthFormatter.value.format(addMonths(now, offset)),
+    value: offset === 0 ? 'this_month' : `month_${offset}`,
+    action: DATE_FILTER_ACTION,
+    type: DATE_FILTER_TYPES.MONTH,
+    monthOffset: offset,
+  }));
+});
+
+const selectedDateRangeValue = ref('');
+
+const [showDropdown, toggleDropdown] = useToggle();
+const monthOffset = ref(0);
+
+const menuItems = computed(() => {
+  const selectedValue = selectedDateRangeValue.value;
+  return [...dayMenuItemConfigs.value, ...monthMenuItemConfigs.value].map(
+    config => ({
+      ...config,
+      isSelected: selectedValue === config.value,
+    })
+  );
+});
+
+selectedDateRangeValue.value = menuItems.value[0]?.value || '';
+
+const menuSections = computed(() => {
+  const dayItems = menuItems.value.filter(
+    item => item.type === DATE_FILTER_TYPES.DAY
+  );
+  const monthItems = menuItems.value.filter(
+    item => item.type === DATE_FILTER_TYPES.MONTH
+  );
+
+  return [{ items: dayItems }, { items: monthItems }].filter(
+    section => section.items.length > 0
+  );
+});
+
+const selectedConfig = computed(
+  () =>
+    menuItems.value.find(
+      menuItem => menuItem.value === selectedDateRangeValue.value
+    ) || menuItems.value[0]
+);
+
+const selectedLabel = computed(() => {
+  const selectedItem = menuItems.value.find(
+    item => item.value === selectedDateRangeValue.value
+  );
+  return selectedItem?.label || '';
+});
+
+const computeRange = config => {
+  if (!config) {
+    return null;
+  }
+
+  if (config.type === DATE_FILTER_TYPES.MONTH) {
+    const now = new Date();
+    const baseMonthStart = startOfMonth(addMonths(now, monthOffset.value));
+    const from = startOfDay(baseMonthStart);
+    const isCurrentMonth =
+      config.value === 'this_month' && monthOffset.value === 0;
+    const to = isCurrentMonth
+      ? endOfDay(now)
+      : endOfDay(endOfMonth(baseMonthStart));
+    const daysBefore = differenceInCalendarDays(to, from);
+    return { from, to, daysBefore };
+  }
+
+  const to = endOfDay(new Date());
+  const from = startOfDay(subDays(to, Number(config.daysBefore)));
+  return { from, to, daysBefore: Number(config.daysBefore) };
+};
+
+const applySelection = config => {
+  if (!config) return;
+
+  if (config.type === DATE_FILTER_TYPES.MONTH) {
+    monthOffset.value = config.monthOffset || 0;
+  } else {
+    monthOffset.value = 0;
+  }
+
+  const range = computeRange(config);
+  if (!range) return;
+
+  const { from, to, daysBefore } = range;
+  fromModel.value = from;
+  toModel.value = to;
+  daysNumModel.value = daysBefore;
+
+  emit('rangeTypeChange', config.type);
+  emit('monthOffsetChange', monthOffset.value);
+};
+
+const handleAction = ({ action, value }) => {
+  toggleDropdown(false);
+  if (action !== DATE_FILTER_ACTION) {
+    return;
+  }
+  selectedDateRangeValue.value = value;
+};
+
+watch(
+  () => selectedConfig.value,
+  config => {
+    applySelection(config);
+  },
+  { immediate: true }
+);
+</script>
+
+<template>
+  <div
+    v-on-click-outside="() => toggleDropdown(false)"
+    class="relative flex items-center group"
+  >
+    <Button
+      sm
+      slate
+      faded
+      :label="selectedLabel"
+      class="rounded-md group-hover:bg-n-alpha-2"
+      @click="toggleDropdown()"
+    />
+    <DropdownMenu
+      v-if="showDropdown"
+      :menu-items="menuItems"
+      :menu-sections="menuSections"
+      class="mt-1 ltr:right-0 rtl:left-0 xl:ltr:right-0 xl:rtl:left-0 top-full"
+      @action="handleAction($event)"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/security/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/security/Index.vue
index 0ac35c9e2..b8e7a7bf4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/security/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/security/Index.vue
@@ -10,13 +10,23 @@ import { INSTALLATION_TYPES } from 'dashboard/constants/installationTypes';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 const { shouldShow, shouldShowPaywall } = usePolicy();
 
-const shouldShowSaml = computed(() =>
-  shouldShow(
+const allowedLoginMethods = computed(
+  () => window.chatwootConfig.allowedLoginMethods || ['email']
+);
+
+const isSamlSsoEnabled = computed(() =>
+  allowedLoginMethods.value.includes('saml')
+);
+
+const shouldShowSaml = computed(() => {
+  const hasPermission = shouldShow(
     FEATURE_FLAGS.SAML,
     ['administrator'],
     [INSTALLATION_TYPES.CLOUD, INSTALLATION_TYPES.ENTERPRISE]
-  )
-);
+  );
+  return hasPermission && isSamlSsoEnabled.value;
+});
+
 const showPaywall = computed(() => shouldShowPaywall('saml'));
 </script>
 
@@ -36,6 +46,9 @@ const showPaywall = computed(() => shouldShowPaywall('saml'));
     <template #body>
       <SamlPaywall v-if="showPaywall" />
       <SamlSettings v-else-if="shouldShowSaml" />
+      <div v-else class="mt-6 text-sm text-slate-600">
+        {{ $t('SECURITY_SETTINGS.SAML_DISABLED_MESSAGE') }}
+      </div>
     </template>
   </SettingsLayout>
 </template>
diff --git a/app/javascript/dashboard/routes/index.js b/app/javascript/dashboard/routes/index.js
index e69d0b5ad..27465eb39 100644
--- a/app/javascript/dashboard/routes/index.js
+++ b/app/javascript/dashboard/routes/index.js
@@ -18,8 +18,17 @@ export const validateAuthenticateRoutePermission = (to, next) => {
     return '';
   }
 
-  if (!to.name) {
-    return next(frontendURL(`accounts/${user.account_id}/dashboard`));
+  const { accounts = [], account_id: accountId } = user;
+
+  if (!accounts.length) {
+    if (to.name === 'no_accounts') {
+      return next();
+    }
+    return next(frontendURL('no-accounts'));
+  }
+
+  if (to.name === 'no_accounts' || !to.name) {
+    return next(frontendURL(`accounts/${accountId}/dashboard`));
   }
 
   const nextRoute = validateLoggedInRoutes(to, store.getters.getCurrentUser);
diff --git a/app/javascript/dashboard/store/captain/assistant.js b/app/javascript/dashboard/store/captain/assistant.js
index 405e3d9c8..e690944ba 100644
--- a/app/javascript/dashboard/store/captain/assistant.js
+++ b/app/javascript/dashboard/store/captain/assistant.js
@@ -1,5 +1,5 @@
 import CaptainAssistantAPI from 'dashboard/api/captain/assistant';
-import { createStore } from './storeFactory';
+import { createStore } from '../storeFactory';
 
 export default createStore({
   name: 'CaptainAssistant',
diff --git a/app/javascript/dashboard/store/captain/bulkActions.js b/app/javascript/dashboard/store/captain/bulkActions.js
index 7c8ea058f..42ffcd294 100644
--- a/app/javascript/dashboard/store/captain/bulkActions.js
+++ b/app/javascript/dashboard/store/captain/bulkActions.js
@@ -1,5 +1,5 @@
 import CaptainBulkActionsAPI from 'dashboard/api/captain/bulkActions';
-import { createStore } from './storeFactory';
+import { createStore } from '../storeFactory';
 import { throwErrorMessage } from 'dashboard/store/utils/api';
 
 export default createStore({
diff --git a/app/javascript/dashboard/store/captain/copilotMessages.js b/app/javascript/dashboard/store/captain/copilotMessages.js
index 2b296cdc1..7b73ee89f 100644
--- a/app/javascript/dashboard/store/captain/copilotMessages.js
+++ b/app/javascript/dashboard/store/captain/copilotMessages.js
@@ -1,5 +1,5 @@
 import CopilotMessagesAPI from 'dashboard/api/captain/copilotMessages';
-import { createStore } from './storeFactory';
+import { createStore } from '../storeFactory';
 
 export default createStore({
   name: 'CopilotMessages',
diff --git a/app/javascript/dashboard/store/captain/copilotThreads.js b/app/javascript/dashboard/store/captain/copilotThreads.js
index 8d820f305..5b0f07756 100644
--- a/app/javascript/dashboard/store/captain/copilotThreads.js
+++ b/app/javascript/dashboard/store/captain/copilotThreads.js
@@ -1,5 +1,5 @@
 import CopilotThreadsAPI from 'dashboard/api/captain/copilotThreads';
-import { createStore } from './storeFactory';
+import { createStore } from '../storeFactory';
 
 export default createStore({
   name: 'CopilotThreads',
diff --git a/app/javascript/dashboard/store/captain/customTools.js b/app/javascript/dashboard/store/captain/customTools.js
index 3d3af03c0..62cb4c3c5 100644
--- a/app/javascript/dashboard/store/captain/customTools.js
+++ b/app/javascript/dashboard/store/captain/customTools.js
@@ -1,5 +1,5 @@
 import CaptainCustomTools from 'dashboard/api/captain/customTools';
-import { createStore } from './storeFactory';
+import { createStore } from '../storeFactory';
 import { throwErrorMessage } from 'dashboard/store/utils/api';
 
 export default createStore({
diff --git a/app/javascript/dashboard/store/captain/document.js b/app/javascript/dashboard/store/captain/document.js
index 25d9c3b94..f5766f827 100644
--- a/app/javascript/dashboard/store/captain/document.js
+++ b/app/javascript/dashboard/store/captain/document.js
@@ -1,5 +1,5 @@
 import CaptainDocumentAPI from 'dashboard/api/captain/document';
-import { createStore } from './storeFactory';
+import { createStore } from '../storeFactory';
 
 export default createStore({
   name: 'CaptainDocument',
diff --git a/app/javascript/dashboard/store/captain/inboxes.js b/app/javascript/dashboard/store/captain/inboxes.js
index ef66e4fe4..78182979f 100644
--- a/app/javascript/dashboard/store/captain/inboxes.js
+++ b/app/javascript/dashboard/store/captain/inboxes.js
@@ -1,5 +1,5 @@
 import CaptainInboxes from 'dashboard/api/captain/inboxes';
-import { createStore } from './storeFactory';
+import { createStore } from '../storeFactory';
 import { throwErrorMessage } from 'dashboard/store/utils/api';
 
 export default createStore({
diff --git a/app/javascript/dashboard/store/captain/response.js b/app/javascript/dashboard/store/captain/response.js
index 5f8c2eee1..a818fe9fd 100644
--- a/app/javascript/dashboard/store/captain/response.js
+++ b/app/javascript/dashboard/store/captain/response.js
@@ -1,9 +1,22 @@
 import CaptainResponseAPI from 'dashboard/api/captain/response';
-import { createStore } from './storeFactory';
+import { createStore } from '../storeFactory';
+
+const SET_PENDING_COUNT = 'SET_PENDING_COUNT';
 
 export default createStore({
   name: 'CaptainResponse',
   API: CaptainResponseAPI,
+  getters: {
+    getPendingCount: state => state.meta.pendingCount || 0,
+  },
+  mutations: {
+    [SET_PENDING_COUNT](state, count) {
+      state.meta = {
+        ...state.meta,
+        pendingCount: Number(count),
+      };
+    },
+  },
   actions: mutations => ({
     removeBulkResponses: ({ commit, state }, ids) => {
       const updatedRecords = state.records.filter(
@@ -28,5 +41,18 @@ export default createStore({
 
       commit(mutations.SET, updatedRecords);
     },
+    fetchPendingCount: async ({ commit }, assistantId) => {
+      try {
+        const response = await CaptainResponseAPI.get({
+          status: 'pending',
+          page: 1,
+          assistantId,
+        });
+        const count = response.data?.meta?.total_count || 0;
+        commit(SET_PENDING_COUNT, count);
+      } catch (error) {
+        commit(SET_PENDING_COUNT, 0);
+      }
+    },
   }),
 });
diff --git a/app/javascript/dashboard/store/captain/scenarios.js b/app/javascript/dashboard/store/captain/scenarios.js
index d66992d85..1ee5b2bd6 100644
--- a/app/javascript/dashboard/store/captain/scenarios.js
+++ b/app/javascript/dashboard/store/captain/scenarios.js
@@ -1,5 +1,5 @@
 import CaptainScenarios from 'dashboard/api/captain/scenarios';
-import { createStore } from './storeFactory';
+import { createStore } from '../storeFactory';
 import { throwErrorMessage } from 'dashboard/store/utils/api';
 
 export default createStore({
diff --git a/app/javascript/dashboard/store/captain/storeFactory.js b/app/javascript/dashboard/store/captain/storeFactory.js
deleted file mode 100644
index ad669f62b..000000000
--- a/app/javascript/dashboard/store/captain/storeFactory.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
-import {
-  createRecord,
-  deleteRecord,
-  getRecords,
-  showRecord,
-  updateRecord,
-} from './storeFactoryHelper';
-
-export const generateMutationTypes = name => {
-  const capitalizedName = name.toUpperCase();
-  return {
-    SET_UI_FLAG: `SET_${capitalizedName}_UI_FLAG`,
-    SET: `SET_${capitalizedName}`,
-    ADD: `ADD_${capitalizedName}`,
-    EDIT: `EDIT_${capitalizedName}`,
-    DELETE: `DELETE_${capitalizedName}`,
-    SET_META: `SET_${capitalizedName}_META`,
-    UPSERT: `UPSERT_${capitalizedName}`,
-  };
-};
-
-export const createInitialState = () => ({
-  records: [],
-  meta: {},
-  uiFlags: {
-    fetchingList: false,
-    fetchingItem: false,
-    creatingItem: false,
-    updatingItem: false,
-    deletingItem: false,
-  },
-});
-
-export const createGetters = () => ({
-  getRecords: state => state.records.sort((r1, r2) => r2.id - r1.id),
-  getRecord: state => id =>
-    state.records.find(record => record.id === Number(id)) || {},
-  getUIFlags: state => state.uiFlags,
-  getMeta: state => state.meta,
-});
-
-export const createMutations = mutationTypes => ({
-  [mutationTypes.SET_UI_FLAG](state, data) {
-    state.uiFlags = {
-      ...state.uiFlags,
-      ...data,
-    };
-  },
-  [mutationTypes.SET_META](state, meta) {
-    state.meta = {
-      totalCount: Number(meta.total_count),
-      page: Number(meta.page),
-    };
-  },
-  [mutationTypes.SET]: MutationHelpers.set,
-  [mutationTypes.ADD]: MutationHelpers.create,
-  [mutationTypes.EDIT]: MutationHelpers.update,
-  [mutationTypes.DELETE]: MutationHelpers.destroy,
-  [mutationTypes.UPSERT]: MutationHelpers.setSingleRecord,
-});
-
-export const createCrudActions = (API, mutationTypes) => ({
-  get: getRecords(mutationTypes, API),
-  show: showRecord(mutationTypes, API),
-  create: createRecord(mutationTypes, API),
-  update: updateRecord(mutationTypes, API),
-  delete: deleteRecord(mutationTypes, API),
-});
-
-export const createStore = options => {
-  const { name, API, actions, getters } = options;
-  const mutationTypes = generateMutationTypes(name);
-
-  const customActions = actions ? actions(mutationTypes) : {};
-
-  return {
-    namespaced: true,
-    state: createInitialState(),
-    getters: {
-      ...createGetters(),
-      ...(getters || {}),
-    },
-    mutations: createMutations(mutationTypes),
-    actions: {
-      ...createCrudActions(API, mutationTypes),
-      ...customActions,
-    },
-  };
-};
diff --git a/app/javascript/dashboard/store/captain/storeFactory.spec.js b/app/javascript/dashboard/store/captain/storeFactory.spec.js
deleted file mode 100644
index 0aec26e40..000000000
--- a/app/javascript/dashboard/store/captain/storeFactory.spec.js
+++ /dev/null
@@ -1,380 +0,0 @@
-import { throwErrorMessage } from 'dashboard/store/utils/api';
-import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
-import {
-  generateMutationTypes,
-  createInitialState,
-  createGetters,
-  createMutations,
-  createCrudActions,
-  createStore,
-} from './storeFactory';
-
-vi.mock('dashboard/store/utils/api', () => ({
-  throwErrorMessage: vi.fn(),
-}));
-
-vi.mock('shared/helpers/vuex/mutationHelpers', () => ({
-  set: vi.fn(),
-  create: vi.fn(),
-  update: vi.fn(),
-  destroy: vi.fn(),
-  setSingleRecord: vi.fn(),
-}));
-
-describe('storeFactory', () => {
-  describe('generateMutationTypes', () => {
-    it('generates correct mutation types with capitalized name', () => {
-      const result = generateMutationTypes('test');
-      expect(result).toEqual({
-        SET_UI_FLAG: 'SET_TEST_UI_FLAG',
-        SET: 'SET_TEST',
-        ADD: 'ADD_TEST',
-        EDIT: 'EDIT_TEST',
-        DELETE: 'DELETE_TEST',
-        SET_META: 'SET_TEST_META',
-        UPSERT: 'UPSERT_TEST',
-      });
-    });
-  });
-
-  describe('createInitialState', () => {
-    it('returns the correct initial state structure', () => {
-      const result = createInitialState();
-      expect(result).toEqual({
-        records: [],
-        meta: {},
-        uiFlags: {
-          fetchingList: false,
-          fetchingItem: false,
-          creatingItem: false,
-          updatingItem: false,
-          deletingItem: false,
-        },
-      });
-    });
-  });
-
-  describe('createGetters', () => {
-    it('returns getters with correct implementations', () => {
-      const getters = createGetters();
-
-      const state = {
-        records: [{ id: 2 }, { id: 1 }, { id: 3 }],
-        uiFlags: { fetchingList: true },
-        meta: { totalCount: 10, page: 1 },
-      };
-      expect(getters.getRecords(state)).toEqual([
-        { id: 3 },
-        { id: 2 },
-        { id: 1 },
-      ]);
-
-      expect(getters.getRecord(state)(2)).toEqual({ id: 2 });
-      expect(getters.getRecord(state)(4)).toEqual({});
-
-      expect(getters.getUIFlags(state)).toEqual({
-        fetchingList: true,
-      });
-
-      expect(getters.getMeta(state)).toEqual({
-        totalCount: 10,
-        page: 1,
-      });
-    });
-  });
-
-  describe('createMutations', () => {
-    it('creates mutations with correct implementations', () => {
-      const mutationTypes = generateMutationTypes('test');
-      const mutations = createMutations(mutationTypes);
-
-      const state = { uiFlags: { fetchingList: false } };
-      mutations[mutationTypes.SET_UI_FLAG](state, { fetchingList: true });
-      expect(state.uiFlags).toEqual({ fetchingList: true });
-
-      const metaState = { meta: {} };
-      mutations[mutationTypes.SET_META](metaState, {
-        total_count: '10',
-        page: '2',
-      });
-      expect(metaState.meta).toEqual({ totalCount: 10, page: 2 });
-
-      expect(mutations[mutationTypes.SET]).toBe(MutationHelpers.set);
-      expect(mutations[mutationTypes.ADD]).toBe(MutationHelpers.create);
-      expect(mutations[mutationTypes.EDIT]).toBe(MutationHelpers.update);
-      expect(mutations[mutationTypes.DELETE]).toBe(MutationHelpers.destroy);
-      expect(mutations[mutationTypes.UPSERT]).toBe(
-        MutationHelpers.setSingleRecord
-      );
-    });
-  });
-
-  describe('createCrudActions', () => {
-    let API;
-    let commit;
-    let mutationTypes;
-    let actions;
-
-    beforeEach(() => {
-      API = {
-        get: vi.fn(),
-        show: vi.fn(),
-        create: vi.fn(),
-        update: vi.fn(),
-        delete: vi.fn(),
-      };
-      commit = vi.fn();
-      mutationTypes = generateMutationTypes('test');
-      actions = createCrudActions(API, mutationTypes);
-    });
-
-    describe('get action', () => {
-      it('handles successful API response', async () => {
-        const payload = [{ id: 1 }];
-        const meta = { total_count: 10, page: 1 };
-        API.get.mockResolvedValue({ data: { payload, meta } });
-
-        const result = await actions.get({ commit });
-
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          fetchingList: true,
-        });
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET, payload);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_META, meta);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          fetchingList: false,
-        });
-        expect(result).toEqual(payload);
-      });
-
-      it('handles API error', async () => {
-        const error = new Error('API Error');
-        API.get.mockRejectedValue(error);
-        throwErrorMessage.mockReturnValue('Error thrown');
-
-        const result = await actions.get({ commit });
-
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          fetchingList: true,
-        });
-        expect(throwErrorMessage).toHaveBeenCalledWith(error);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          fetchingList: false,
-        });
-        expect(result).toEqual('Error thrown');
-      });
-    });
-
-    describe('show action', () => {
-      it('handles successful API response', async () => {
-        const data = { id: 1, name: 'Test' };
-        API.show.mockResolvedValue({ data });
-
-        const result = await actions.show({ commit }, 1);
-
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          fetchingItem: true,
-        });
-        expect(commit).toHaveBeenCalledWith(mutationTypes.ADD, data);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          fetchingItem: false,
-        });
-        expect(result).toEqual(data);
-      });
-
-      it('handles API error', async () => {
-        const error = new Error('API Error');
-        API.show.mockRejectedValue(error);
-        throwErrorMessage.mockReturnValue('Error thrown');
-
-        const result = await actions.show({ commit }, 1);
-
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          fetchingItem: true,
-        });
-        expect(throwErrorMessage).toHaveBeenCalledWith(error);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          fetchingItem: false,
-        });
-        expect(result).toEqual('Error thrown');
-      });
-    });
-
-    describe('create action', () => {
-      it('handles successful API response', async () => {
-        const data = { id: 1, name: 'Test' };
-        API.create.mockResolvedValue({ data });
-
-        const result = await actions.create({ commit }, { name: 'Test' });
-
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          creatingItem: true,
-        });
-        expect(commit).toHaveBeenCalledWith(mutationTypes.UPSERT, data);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          creatingItem: false,
-        });
-        expect(result).toEqual(data);
-      });
-
-      it('handles API error', async () => {
-        const error = new Error('API Error');
-        API.create.mockRejectedValue(error);
-        throwErrorMessage.mockReturnValue('Error thrown');
-
-        const result = await actions.create({ commit }, { name: 'Test' });
-
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          creatingItem: true,
-        });
-        expect(throwErrorMessage).toHaveBeenCalledWith(error);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          creatingItem: false,
-        });
-        expect(result).toEqual('Error thrown');
-      });
-    });
-
-    describe('update action', () => {
-      it('handles successful API response', async () => {
-        const data = { id: 1, name: 'Updated' };
-        API.update.mockResolvedValue({ data });
-
-        const result = await actions.update(
-          { commit },
-          { id: 1, name: 'Updated' }
-        );
-
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          updatingItem: true,
-        });
-        expect(API.update).toHaveBeenCalledWith(1, { name: 'Updated' });
-        expect(commit).toHaveBeenCalledWith(mutationTypes.EDIT, data);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          updatingItem: false,
-        });
-        expect(result).toEqual(data);
-      });
-
-      it('handles API error', async () => {
-        const error = new Error('API Error');
-        API.update.mockRejectedValue(error);
-        throwErrorMessage.mockReturnValue('Error thrown');
-
-        const result = await actions.update(
-          { commit },
-          { id: 1, name: 'Updated' }
-        );
-
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          updatingItem: true,
-        });
-        expect(throwErrorMessage).toHaveBeenCalledWith(error);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          updatingItem: false,
-        });
-        expect(result).toEqual('Error thrown');
-      });
-    });
-
-    describe('delete action', () => {
-      it('handles successful API response', async () => {
-        API.delete.mockResolvedValue({});
-
-        const result = await actions.delete({ commit }, 1);
-
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          deletingItem: true,
-        });
-        expect(API.delete).toHaveBeenCalledWith(1);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.DELETE, 1);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          deletingItem: false,
-        });
-        expect(result).toEqual(1);
-      });
-
-      it('handles API error', async () => {
-        const error = new Error('API Error');
-        API.delete.mockRejectedValue(error);
-        throwErrorMessage.mockReturnValue('Error thrown');
-
-        const result = await actions.delete({ commit }, 1);
-
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          deletingItem: true,
-        });
-        expect(throwErrorMessage).toHaveBeenCalledWith(error);
-        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
-          deletingItem: false,
-        });
-        expect(result).toEqual('Error thrown');
-      });
-    });
-  });
-
-  describe('createStore', () => {
-    it('creates a complete store with default options', () => {
-      const API = {};
-      const store = createStore({ name: 'test', API });
-
-      expect(store.namespaced).toBe(true);
-      expect(store.state).toEqual(createInitialState());
-      expect(Object.keys(store.getters)).toEqual([
-        'getRecords',
-        'getRecord',
-        'getUIFlags',
-        'getMeta',
-      ]);
-      expect(Object.keys(store.mutations)).toEqual([
-        'SET_TEST_UI_FLAG',
-        'SET_TEST_META',
-        'SET_TEST',
-        'ADD_TEST',
-        'EDIT_TEST',
-        'DELETE_TEST',
-        'UPSERT_TEST',
-      ]);
-      expect(Object.keys(store.actions)).toEqual([
-        'get',
-        'show',
-        'create',
-        'update',
-        'delete',
-      ]);
-    });
-
-    it('creates a store with custom actions and getters', () => {
-      const API = {};
-      const customGetters = { customGetter: () => 'custom' };
-      const customActions = () => ({
-        customAction: () => 'custom',
-      });
-
-      const store = createStore({
-        name: 'test',
-        API,
-        getters: customGetters,
-        actions: customActions,
-      });
-
-      expect(store.getters).toHaveProperty('customGetter');
-      expect(store.actions).toHaveProperty('customAction');
-      expect(Object.keys(store.getters)).toEqual([
-        'getRecords',
-        'getRecord',
-        'getUIFlags',
-        'getMeta',
-        'customGetter',
-      ]);
-      expect(Object.keys(store.actions)).toEqual([
-        'get',
-        'show',
-        'create',
-        'update',
-        'delete',
-        'customAction',
-      ]);
-    });
-  });
-});
diff --git a/app/javascript/dashboard/store/captain/storeFactoryHelper.js b/app/javascript/dashboard/store/captain/storeFactoryHelper.js
deleted file mode 100644
index 7a04d2e81..000000000
--- a/app/javascript/dashboard/store/captain/storeFactoryHelper.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import { throwErrorMessage } from 'dashboard/store/utils/api';
-
-export const getRecords =
-  (mutationTypes, API) =>
-  async ({ commit }, params = {}) => {
-    commit(mutationTypes.SET_UI_FLAG, { fetchingList: true });
-    try {
-      const response = await API.get(params);
-      commit(mutationTypes.SET, response.data.payload);
-      commit(mutationTypes.SET_META, response.data.meta);
-      return response.data.payload;
-    } catch (error) {
-      return throwErrorMessage(error);
-    } finally {
-      commit(mutationTypes.SET_UI_FLAG, { fetchingList: false });
-    }
-  };
-
-export const showRecord =
-  (mutationTypes, API) =>
-  async ({ commit }, id) => {
-    commit(mutationTypes.SET_UI_FLAG, { fetchingItem: true });
-    try {
-      const response = await API.show(id);
-      commit(mutationTypes.ADD, response.data);
-      return response.data;
-    } catch (error) {
-      return throwErrorMessage(error);
-    } finally {
-      commit(mutationTypes.SET_UI_FLAG, { fetchingItem: false });
-    }
-  };
-
-export const createRecord =
-  (mutationTypes, API) =>
-  async ({ commit }, dataObj) => {
-    commit(mutationTypes.SET_UI_FLAG, { creatingItem: true });
-    try {
-      const response = await API.create(dataObj);
-      commit(mutationTypes.UPSERT, response.data);
-      return response.data;
-    } catch (error) {
-      return throwErrorMessage(error);
-    } finally {
-      commit(mutationTypes.SET_UI_FLAG, { creatingItem: false });
-    }
-  };
-
-export const updateRecord =
-  (mutationTypes, API) =>
-  async ({ commit }, { id, ...updateObj }) => {
-    commit(mutationTypes.SET_UI_FLAG, { updatingItem: true });
-    try {
-      const response = await API.update(id, updateObj);
-      commit(mutationTypes.EDIT, response.data);
-      return response.data;
-    } catch (error) {
-      return throwErrorMessage(error);
-    } finally {
-      commit(mutationTypes.SET_UI_FLAG, { updatingItem: false });
-    }
-  };
-
-export const deleteRecord =
-  (mutationTypes, API) =>
-  async ({ commit }, id) => {
-    commit(mutationTypes.SET_UI_FLAG, { deletingItem: true });
-    try {
-      await API.delete(id);
-      commit(mutationTypes.DELETE, id);
-      return id;
-    } catch (error) {
-      return throwErrorMessage(error);
-    } finally {
-      commit(mutationTypes.SET_UI_FLAG, { deletingItem: false });
-    }
-  };
diff --git a/app/javascript/dashboard/store/captain/tools.js b/app/javascript/dashboard/store/captain/tools.js
index 9638e45c3..b644caf5b 100644
--- a/app/javascript/dashboard/store/captain/tools.js
+++ b/app/javascript/dashboard/store/captain/tools.js
@@ -1,4 +1,4 @@
-import { createStore } from './storeFactory';
+import { createStore } from '../storeFactory';
 import CaptainToolsAPI from '../../api/captain/tools';
 import { throwErrorMessage } from 'dashboard/store/utils/api';
 
diff --git a/app/javascript/dashboard/store/modules/accounts.js b/app/javascript/dashboard/store/modules/accounts.js
index 1eef59cfe..44134e19d 100644
--- a/app/javascript/dashboard/store/modules/accounts.js
+++ b/app/javascript/dashboard/store/modules/accounts.js
@@ -18,6 +18,7 @@ const state = {
     isFetchingItem: false,
     isUpdating: false,
     isCheckoutInProcess: false,
+    isFetchingLimits: false,
   },
 };
 
@@ -141,11 +142,14 @@ export const actions = {
   },
 
   limits: async ({ commit }) => {
+    commit(types.default.SET_ACCOUNT_UI_FLAG, { isFetchingLimits: true });
     try {
       const response = await EnterpriseAccountAPI.getLimits();
       commit(types.default.SET_ACCOUNT_LIMITS, response.data);
     } catch (error) {
       // silent error
+    } finally {
+      commit(types.default.SET_ACCOUNT_UI_FLAG, { isFetchingLimits: false });
     }
   },
 
diff --git a/app/javascript/dashboard/store/modules/contacts/actions.js b/app/javascript/dashboard/store/modules/contacts/actions.js
index 02911d9d9..0f20a00d2 100644
--- a/app/javascript/dashboard/store/modules/contacts/actions.js
+++ b/app/javascript/dashboard/store/modules/contacts/actions.js
@@ -302,4 +302,22 @@ export const actions = {
   clearContactFilters({ commit }) {
     commit(types.CLEAR_CONTACT_FILTERS);
   },
+
+  initiateCall: async ({ commit }, { contactId, inboxId }) => {
+    commit(types.SET_CONTACT_UI_FLAG, { isInitiatingCall: true });
+    try {
+      const response = await ContactAPI.initiateCall(contactId, inboxId);
+      commit(types.SET_CONTACT_UI_FLAG, { isInitiatingCall: false });
+      return response.data;
+    } catch (error) {
+      commit(types.SET_CONTACT_UI_FLAG, { isInitiatingCall: false });
+      if (error.response?.data?.message) {
+        throw new ExceptionWithMessage(error.response.data.message);
+      } else if (error.response?.data?.error) {
+        throw new ExceptionWithMessage(error.response.data.error);
+      } else {
+        throw new Error(error);
+      }
+    }
+  },
 };
diff --git a/app/javascript/dashboard/store/modules/contacts/index.js b/app/javascript/dashboard/store/modules/contacts/index.js
index eb1e92434..c8b476e24 100644
--- a/app/javascript/dashboard/store/modules/contacts/index.js
+++ b/app/javascript/dashboard/store/modules/contacts/index.js
@@ -17,6 +17,7 @@ const state = {
     isDeleting: false,
     isExporting: false,
     isImporting: false,
+    isInitiatingCall: false,
   },
   sortOrder: [],
   appliedFilters: [],
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 2ee6fd061..c79e31de1 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -194,7 +194,6 @@ export const mutations = {
       const { conversation: { unread_count: unreadCount = 0 } = {} } = message;
       chat.unread_count = unreadCount;
       if (selectedChatId === conversationId) {
-        emitter.emit(BUS_EVENTS.FETCH_LABEL_SUGGESTIONS);
         emitter.emit(BUS_EVENTS.SCROLL_TO_MESSAGE);
       }
     }
@@ -225,7 +224,6 @@ export const mutations = {
       const { messages, ...updates } = conversation;
       allConversations[index] = { ...selectedConversation, ...updates };
       if (_state.selectedChatId === conversation.id) {
-        emitter.emit(BUS_EVENTS.FETCH_LABEL_SUGGESTIONS);
         emitter.emit(BUS_EVENTS.SCROLL_TO_MESSAGE);
       }
     } else {
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index 9886be679..5d788e8ce 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -78,6 +78,11 @@ export const getters = {
         return false;
       }
 
+      // Filter out authentication templates
+      if (template.category === 'AUTHENTICATION') {
+        return false;
+      }
+
       // Filter out interactive templates (LIST, PRODUCT, CATALOG), location templates, and call permission templates
       const hasUnsupportedComponents = template.components.some(
         component =>
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
index 79852a42e..00b7bb83b 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
@@ -359,4 +359,83 @@ describe('#actions', () => {
       ).rejects.toThrow(Error);
     });
   });
+
+  describe('#initiateCall', () => {
+    const contactId = 123;
+    const inboxId = 456;
+
+    it('sends correct mutations if API is success', async () => {
+      const mockResponse = {
+        data: {
+          conversation_id: 789,
+          status: 'initiated',
+        },
+      };
+      axios.post.mockResolvedValue(mockResponse);
+
+      const result = await actions.initiateCall(
+        { commit },
+        { contactId, inboxId }
+      );
+
+      expect(commit.mock.calls).toEqual([
+        [types.SET_CONTACT_UI_FLAG, { isInitiatingCall: true }],
+        [types.SET_CONTACT_UI_FLAG, { isInitiatingCall: false }],
+      ]);
+      expect(result).toEqual(mockResponse.data);
+    });
+
+    it('sends correct actions if API returns error with message', async () => {
+      const errorMessage = 'Failed to initiate call';
+      axios.post.mockRejectedValue({
+        response: {
+          data: {
+            message: errorMessage,
+          },
+        },
+      });
+
+      await expect(
+        actions.initiateCall({ commit }, { contactId, inboxId })
+      ).rejects.toThrow(ExceptionWithMessage);
+
+      expect(commit.mock.calls).toEqual([
+        [types.SET_CONTACT_UI_FLAG, { isInitiatingCall: true }],
+        [types.SET_CONTACT_UI_FLAG, { isInitiatingCall: false }],
+      ]);
+    });
+
+    it('sends correct actions if API returns error with error field', async () => {
+      const errorMessage = 'Call initiation error';
+      axios.post.mockRejectedValue({
+        response: {
+          data: {
+            error: errorMessage,
+          },
+        },
+      });
+
+      await expect(
+        actions.initiateCall({ commit }, { contactId, inboxId })
+      ).rejects.toThrow(ExceptionWithMessage);
+
+      expect(commit.mock.calls).toEqual([
+        [types.SET_CONTACT_UI_FLAG, { isInitiatingCall: true }],
+        [types.SET_CONTACT_UI_FLAG, { isInitiatingCall: false }],
+      ]);
+    });
+
+    it('sends correct actions if API returns generic error', async () => {
+      axios.post.mockRejectedValue({ message: 'Network error' });
+
+      await expect(
+        actions.initiateCall({ commit }, { contactId, inboxId })
+      ).rejects.toThrow(Error);
+
+      expect(commit.mock.calls).toEqual([
+        [types.SET_CONTACT_UI_FLAG, { isInitiatingCall: true }],
+        [types.SET_CONTACT_UI_FLAG, { isInitiatingCall: false }],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
index b8660b20d..48e676215 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
@@ -753,7 +753,6 @@ describe('#mutations', () => {
       };
 
       mutations[types.UPDATE_CONVERSATION](state, conversation);
-      expect(emitter.emit).toHaveBeenCalledWith('FETCH_LABEL_SUGGESTIONS');
       expect(emitter.emit).toHaveBeenCalledWith('SCROLL_TO_MESSAGE');
     });
 
diff --git a/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js b/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
index eeb52b1dc..ac2aab26b 100644
--- a/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
@@ -265,6 +265,39 @@ describe('#getters', () => {
       expect(result[0].name).toBe('regular_template');
     });
 
+    it('filters out authentication templates', () => {
+      const authenticationTemplates = [
+        {
+          name: 'auth_template',
+          status: 'approved',
+          category: 'AUTHENTICATION',
+          components: [
+            { type: 'BODY', text: 'Your verification code is {{1}}' },
+          ],
+        },
+        {
+          name: 'regular_template',
+          status: 'approved',
+          category: 'MARKETING',
+          components: [{ type: 'BODY', text: 'Regular message' }],
+        },
+      ];
+
+      const state = {
+        records: [
+          {
+            id: 1,
+            channel_type: 'Channel::Whatsapp',
+            message_templates: authenticationTemplates,
+          },
+        ],
+      };
+
+      const result = getters.getFilteredWhatsAppTemplates(state)(1);
+      expect(result).toHaveLength(1);
+      expect(result[0].name).toBe('regular_template');
+    });
+
     it('returns valid templates from fixture data', () => {
       const state = {
         records: [
diff --git a/app/javascript/dashboard/store/storeFactory.js b/app/javascript/dashboard/store/storeFactory.js
new file mode 100644
index 000000000..a623b4785
--- /dev/null
+++ b/app/javascript/dashboard/store/storeFactory.js
@@ -0,0 +1,226 @@
+/**
+ * Universal Store Factory
+ *
+ * This factory creates stores for both Vuex and Pinia, allowing gradual
+ * migration from Vuex to Pinia without breaking existing functionality.
+ *
+ * @module storeFactory
+ * @see https://pinia.vuejs.org/ - Pinia documentation
+ * @see https://vuex.vuejs.org/ - Vuex documentation
+ */
+
+import { defineStore } from 'pinia';
+import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
+import {
+  // Vuex helpers
+  createRecord,
+  deleteRecord,
+  getRecords,
+  showRecord,
+  updateRecord,
+  // Pinia helpers
+  piniaGetRecords,
+  piniaShowRecord,
+  piniaCreateRecord,
+  piniaUpdateRecord,
+  piniaDeleteRecord,
+} from './storeFactoryHelper';
+
+export const generateMutationTypes = name => {
+  const capitalizedName = name.toUpperCase();
+  return {
+    SET_UI_FLAG: `SET_${capitalizedName}_UI_FLAG`,
+    SET: `SET_${capitalizedName}`,
+    ADD: `ADD_${capitalizedName}`,
+    EDIT: `EDIT_${capitalizedName}`,
+    DELETE: `DELETE_${capitalizedName}`,
+    SET_META: `SET_${capitalizedName}_META`,
+    UPSERT: `UPSERT_${capitalizedName}`,
+  };
+};
+
+export const createInitialState = () => ({
+  records: [],
+  meta: {},
+  uiFlags: {
+    fetchingList: false,
+    fetchingItem: false,
+    creatingItem: false,
+    updatingItem: false,
+    deletingItem: false,
+  },
+});
+
+export const createGetters = () => ({
+  getRecords: state => state.records.sort((r1, r2) => r2.id - r1.id),
+  getRecord: state => id =>
+    state.records.find(record => record.id === Number(id)) || {},
+  getUIFlags: state => state.uiFlags,
+  getMeta: state => state.meta,
+});
+
+export const createMutations = mutationTypes => ({
+  [mutationTypes.SET_UI_FLAG](state, data) {
+    state.uiFlags = {
+      ...state.uiFlags,
+      ...data,
+    };
+  },
+  [mutationTypes.SET_META](state, meta) {
+    state.meta = {
+      ...state.meta,
+      totalCount: Number(meta.total_count),
+      page: Number(meta.page),
+    };
+  },
+  [mutationTypes.SET]: MutationHelpers.set,
+  [mutationTypes.ADD]: MutationHelpers.create,
+  [mutationTypes.EDIT]: MutationHelpers.update,
+  [mutationTypes.DELETE]: MutationHelpers.destroy,
+  [mutationTypes.UPSERT]: MutationHelpers.setSingleRecord,
+});
+
+export const createCrudActions = (API, mutationTypes) => ({
+  get: getRecords(mutationTypes, API),
+  show: showRecord(mutationTypes, API),
+  create: createRecord(mutationTypes, API),
+  update: updateRecord(mutationTypes, API),
+  delete: deleteRecord(mutationTypes, API),
+});
+
+/**
+ * Create Vuex store with standard CRUD operations
+ *
+ * @param {Object} options - Store configuration
+ * @param {string} options.name - Store name
+ * @param {Object} options.API - API client
+ * @param {Object} [options.getters] - Custom getters
+ * @param {Function} [options.actions] - Custom actions function
+ * @param {Object} [options.mutations] - Custom mutations
+ * @returns {Object} Vuex module configuration
+ */
+export const createVuexStore = options => {
+  const { name, API, actions, getters, mutations } = options;
+
+  const mutationTypes = generateMutationTypes(name);
+  const customActions = actions ? actions(mutationTypes) : {};
+
+  return {
+    namespaced: true,
+    state: createInitialState(),
+    getters: {
+      ...createGetters(),
+      ...(getters || {}),
+    },
+    mutations: {
+      ...createMutations(mutationTypes),
+      ...(mutations || {}),
+    },
+    actions: {
+      ...createCrudActions(API, mutationTypes),
+      ...customActions,
+    },
+  };
+};
+
+/**
+ * Create Pinia store with standard CRUD operations
+ *
+ * @param {Object} options - Store configuration
+ * @param {string} options.name - Store name
+ * @param {Object} options.API - API client
+ * @param {Object} [options.getters] - Custom getters
+ * @param {Function} [options.actions] - Custom actions function
+ * @returns {Function} Pinia store composable
+ */
+export const createPiniaStore = options => {
+  const { name, API, actions, getters } = options;
+
+  return defineStore(name.toLowerCase(), {
+    state: createInitialState,
+
+    getters: {
+      ...createGetters(),
+      ...(getters || {}),
+    },
+
+    actions: {
+      setUIFlag(data) {
+        this.uiFlags = {
+          ...this.uiFlags,
+          ...data,
+        };
+      },
+
+      setMeta(meta) {
+        this.meta = {
+          ...this.meta,
+          totalCount: Number(meta.total_count || meta.totalCount || 0),
+          page: Number(meta.page || 1),
+        };
+      },
+
+      async get(params) {
+        return piniaGetRecords(this, API, params);
+      },
+
+      async show(id) {
+        return piniaShowRecord(this, API, id);
+      },
+
+      async create(obj) {
+        return piniaCreateRecord(this, API, obj);
+      },
+
+      async update(payload) {
+        return piniaUpdateRecord(this, API, payload);
+      },
+
+      async delete(id) {
+        return piniaDeleteRecord(this, API, id);
+      },
+
+      ...(actions ? actions() : {}),
+    },
+  });
+};
+
+/**
+ * Universal Store Factory - Main Entry Point
+ *
+ * Creates either a Vuex or Pinia store based on the 'type' parameter.
+ * Defaults to Vuex for backward compatibility.
+ *
+ * @param {Object} options - Store configuration
+ * @param {string} options.name - Store name
+ * @param {Object} options.API - API client for CRUD operations
+ * @param {string} [options.type='vuex'] - Store type: 'vuex' or 'pinia'
+ * @param {Object} [options.getters] - Custom getters
+ * @param {Function} [options.actions] - Custom actions function
+ * @param {Object} [options.mutations] - Custom mutations (Vuex only)
+ *
+ * @returns {Object|Function} Vuex module or Pinia store composable
+ *
+ * @example
+ * Create Vuex store (default)
+ * export default createStore({
+ *   name: 'Company',
+ *   API: CompanyAPI,
+ * });
+ *
+ * @example
+ * Create Pinia store
+ * export const useCompaniesStore = createStore({
+ *   name: 'Company',
+ *   type: 'pinia',
+ *   API: CompanyAPI,
+ * });
+ */
+export const createStore = options => {
+  const { type = 'vuex' } = options;
+
+  if (type === 'pinia') {
+    return createPiniaStore(options);
+  }
+  return createVuexStore(options);
+};
diff --git a/app/javascript/dashboard/store/storeFactory.spec.js b/app/javascript/dashboard/store/storeFactory.spec.js
new file mode 100644
index 000000000..3dc2eedd7
--- /dev/null
+++ b/app/javascript/dashboard/store/storeFactory.spec.js
@@ -0,0 +1,761 @@
+import { setActivePinia, createPinia } from 'pinia';
+import { throwErrorMessage } from 'dashboard/store/utils/api';
+import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
+import {
+  generateMutationTypes,
+  createInitialState,
+  createGetters,
+  createMutations,
+  createCrudActions,
+  createStore,
+} from './storeFactory';
+
+vi.mock('dashboard/store/utils/api', () => ({
+  throwErrorMessage: vi.fn(),
+}));
+
+vi.mock('shared/helpers/vuex/mutationHelpers', () => ({
+  set: vi.fn(),
+  create: vi.fn(),
+  update: vi.fn(),
+  destroy: vi.fn(),
+  setSingleRecord: vi.fn(),
+}));
+
+describe('storeFactory', () => {
+  describe('createStore with type parameter', () => {
+    beforeEach(() => {
+      setActivePinia(createPinia());
+    });
+
+    it('creates Vuex store by default', () => {
+      const API = {};
+      const store = createStore({ name: 'test', API });
+
+      expect(store.namespaced).toBe(true);
+      expect(store.state).toBeDefined();
+      expect(store.mutations).toBeDefined();
+    });
+
+    it('creates Pinia store when type is "pinia"', () => {
+      const API = {
+        get: vi.fn(),
+        show: vi.fn(),
+        create: vi.fn(),
+        update: vi.fn(),
+        delete: vi.fn(),
+      };
+
+      const useTestStore = createStore({
+        name: 'test',
+        API,
+        type: 'pinia',
+      });
+
+      const store = useTestStore();
+
+      expect(store.records).toBeDefined();
+      expect(store.get).toBeTypeOf('function');
+      expect(store.setUIFlag).toBeTypeOf('function');
+    });
+
+    it('creates Vuex store when type is "vuex"', () => {
+      const API = {};
+      const store = createStore({
+        name: 'test',
+        API,
+        type: 'vuex',
+      });
+
+      expect(store.namespaced).toBe(true);
+      expect(store.state).toBeDefined();
+    });
+  });
+
+  describe('generateMutationTypes', () => {
+    it('generates correct mutation types with capitalized name', () => {
+      const result = generateMutationTypes('test');
+      expect(result).toEqual({
+        SET_UI_FLAG: 'SET_TEST_UI_FLAG',
+        SET: 'SET_TEST',
+        ADD: 'ADD_TEST',
+        EDIT: 'EDIT_TEST',
+        DELETE: 'DELETE_TEST',
+        SET_META: 'SET_TEST_META',
+        UPSERT: 'UPSERT_TEST',
+      });
+    });
+  });
+
+  describe('createInitialState', () => {
+    it('returns the correct initial state structure', () => {
+      const result = createInitialState();
+      expect(result).toEqual({
+        records: [],
+        meta: {},
+        uiFlags: {
+          fetchingList: false,
+          fetchingItem: false,
+          creatingItem: false,
+          updatingItem: false,
+          deletingItem: false,
+        },
+      });
+    });
+  });
+
+  describe('createGetters', () => {
+    it('returns getters with correct implementations', () => {
+      const getters = createGetters();
+
+      const state = {
+        records: [{ id: 2 }, { id: 1 }, { id: 3 }],
+        uiFlags: { fetchingList: true },
+        meta: { totalCount: 10, page: 1 },
+      };
+      expect(getters.getRecords(state)).toEqual([
+        { id: 3 },
+        { id: 2 },
+        { id: 1 },
+      ]);
+
+      expect(getters.getRecord(state)(2)).toEqual({ id: 2 });
+      expect(getters.getRecord(state)(4)).toEqual({});
+
+      expect(getters.getUIFlags(state)).toEqual({
+        fetchingList: true,
+      });
+
+      expect(getters.getMeta(state)).toEqual({
+        totalCount: 10,
+        page: 1,
+      });
+    });
+  });
+
+  describe('createMutations', () => {
+    it('creates mutations with correct implementations', () => {
+      const mutationTypes = generateMutationTypes('test');
+      const mutations = createMutations(mutationTypes);
+
+      const state = { uiFlags: { fetchingList: false } };
+      mutations[mutationTypes.SET_UI_FLAG](state, { fetchingList: true });
+      expect(state.uiFlags).toEqual({ fetchingList: true });
+
+      const metaState = { meta: {} };
+      mutations[mutationTypes.SET_META](metaState, {
+        total_count: '10',
+        page: '2',
+      });
+      expect(metaState.meta).toEqual({ totalCount: 10, page: 2 });
+
+      expect(mutations[mutationTypes.SET]).toBe(MutationHelpers.set);
+      expect(mutations[mutationTypes.ADD]).toBe(MutationHelpers.create);
+      expect(mutations[mutationTypes.EDIT]).toBe(MutationHelpers.update);
+      expect(mutations[mutationTypes.DELETE]).toBe(MutationHelpers.destroy);
+      expect(mutations[mutationTypes.UPSERT]).toBe(
+        MutationHelpers.setSingleRecord
+      );
+    });
+  });
+
+  describe('createCrudActions', () => {
+    let API;
+    let commit;
+    let mutationTypes;
+    let actions;
+
+    beforeEach(() => {
+      API = {
+        get: vi.fn(),
+        show: vi.fn(),
+        create: vi.fn(),
+        update: vi.fn(),
+        delete: vi.fn(),
+      };
+      commit = vi.fn();
+      mutationTypes = generateMutationTypes('test');
+      actions = createCrudActions(API, mutationTypes);
+    });
+
+    describe('get action', () => {
+      it('handles successful API response', async () => {
+        const payload = [{ id: 1 }];
+        const meta = { total_count: 10, page: 1 };
+        API.get.mockResolvedValue({ data: { payload, meta } });
+
+        const result = await actions.get({ commit });
+
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          fetchingList: true,
+        });
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET, payload);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_META, meta);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          fetchingList: false,
+        });
+        expect(result).toEqual(payload);
+      });
+
+      it('handles API error', async () => {
+        const error = new Error('API Error');
+        API.get.mockRejectedValue(error);
+        throwErrorMessage.mockReturnValue('Error thrown');
+
+        const result = await actions.get({ commit });
+
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          fetchingList: true,
+        });
+        expect(throwErrorMessage).toHaveBeenCalledWith(error);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          fetchingList: false,
+        });
+        expect(result).toEqual('Error thrown');
+      });
+    });
+
+    describe('show action', () => {
+      it('handles successful API response', async () => {
+        const data = { id: 1, name: 'Test' };
+        API.show.mockResolvedValue({ data });
+
+        const result = await actions.show({ commit }, 1);
+
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          fetchingItem: true,
+        });
+        expect(commit).toHaveBeenCalledWith(mutationTypes.UPSERT, data);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          fetchingItem: false,
+        });
+        expect(result).toEqual(data);
+      });
+
+      it('handles API error', async () => {
+        const error = new Error('API Error');
+        API.show.mockRejectedValue(error);
+        throwErrorMessage.mockReturnValue('Error thrown');
+
+        const result = await actions.show({ commit }, 1);
+
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          fetchingItem: true,
+        });
+        expect(throwErrorMessage).toHaveBeenCalledWith(error);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          fetchingItem: false,
+        });
+        expect(result).toEqual('Error thrown');
+      });
+    });
+
+    describe('create action', () => {
+      it('handles successful API response', async () => {
+        const data = { id: 1, name: 'Test' };
+        API.create.mockResolvedValue({ data });
+
+        const result = await actions.create({ commit }, { name: 'Test' });
+
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          creatingItem: true,
+        });
+        expect(commit).toHaveBeenCalledWith(mutationTypes.UPSERT, data);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          creatingItem: false,
+        });
+        expect(result).toEqual(data);
+      });
+
+      it('handles API error', async () => {
+        const error = new Error('API Error');
+        API.create.mockRejectedValue(error);
+        throwErrorMessage.mockReturnValue('Error thrown');
+
+        const result = await actions.create({ commit }, { name: 'Test' });
+
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          creatingItem: true,
+        });
+        expect(throwErrorMessage).toHaveBeenCalledWith(error);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          creatingItem: false,
+        });
+        expect(result).toEqual('Error thrown');
+      });
+    });
+
+    describe('update action', () => {
+      it('handles successful API response', async () => {
+        const data = { id: 1, name: 'Updated' };
+        API.update.mockResolvedValue({ data });
+
+        const result = await actions.update(
+          { commit },
+          { id: 1, name: 'Updated' }
+        );
+
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          updatingItem: true,
+        });
+        expect(API.update).toHaveBeenCalledWith(1, { name: 'Updated' });
+        expect(commit).toHaveBeenCalledWith(mutationTypes.EDIT, data);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          updatingItem: false,
+        });
+        expect(result).toEqual(data);
+      });
+
+      it('handles API error', async () => {
+        const error = new Error('API Error');
+        API.update.mockRejectedValue(error);
+        throwErrorMessage.mockReturnValue('Error thrown');
+
+        const result = await actions.update(
+          { commit },
+          { id: 1, name: 'Updated' }
+        );
+
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          updatingItem: true,
+        });
+        expect(throwErrorMessage).toHaveBeenCalledWith(error);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          updatingItem: false,
+        });
+        expect(result).toEqual('Error thrown');
+      });
+    });
+
+    describe('delete action', () => {
+      it('handles successful API response', async () => {
+        API.delete.mockResolvedValue({});
+
+        const result = await actions.delete({ commit }, 1);
+
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          deletingItem: true,
+        });
+        expect(API.delete).toHaveBeenCalledWith(1);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.DELETE, 1);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          deletingItem: false,
+        });
+        expect(result).toEqual(1);
+      });
+
+      it('handles API error', async () => {
+        const error = new Error('API Error');
+        API.delete.mockRejectedValue(error);
+        throwErrorMessage.mockReturnValue('Error thrown');
+
+        const result = await actions.delete({ commit }, 1);
+
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          deletingItem: true,
+        });
+        expect(throwErrorMessage).toHaveBeenCalledWith(error);
+        expect(commit).toHaveBeenCalledWith(mutationTypes.SET_UI_FLAG, {
+          deletingItem: false,
+        });
+        expect(result).toEqual('Error thrown');
+      });
+    });
+  });
+
+  describe('createStore - Vuex type', () => {
+    it('creates a complete Vuex store with default options', () => {
+      const API = {};
+      const store = createStore({ name: 'test', API, type: 'vuex' });
+
+      expect(store.namespaced).toBe(true);
+      expect(store.state).toEqual(createInitialState());
+      expect(Object.keys(store.getters)).toEqual([
+        'getRecords',
+        'getRecord',
+        'getUIFlags',
+        'getMeta',
+      ]);
+      expect(Object.keys(store.mutations)).toEqual([
+        'SET_TEST_UI_FLAG',
+        'SET_TEST_META',
+        'SET_TEST',
+        'ADD_TEST',
+        'EDIT_TEST',
+        'DELETE_TEST',
+        'UPSERT_TEST',
+      ]);
+      expect(Object.keys(store.actions)).toEqual([
+        'get',
+        'show',
+        'create',
+        'update',
+        'delete',
+      ]);
+    });
+
+    it('creates a Vuex store with custom actions and getters', () => {
+      const API = {};
+      const customGetters = { customGetter: () => 'custom' };
+      const customActions = () => ({
+        customAction: () => 'custom',
+      });
+
+      const store = createStore({
+        name: 'test',
+        API,
+        type: 'vuex',
+        getters: customGetters,
+        actions: customActions,
+      });
+
+      expect(store.getters).toHaveProperty('customGetter');
+      expect(store.actions).toHaveProperty('customAction');
+      expect(Object.keys(store.getters)).toEqual([
+        'getRecords',
+        'getRecord',
+        'getUIFlags',
+        'getMeta',
+        'customGetter',
+      ]);
+      expect(Object.keys(store.actions)).toEqual([
+        'get',
+        'show',
+        'create',
+        'update',
+        'delete',
+        'customAction',
+      ]);
+    });
+
+    it('creates a Vuex store with custom mutations', () => {
+      const API = {};
+      const customMutations = {
+        CUSTOM_MUTATION: state => {
+          state.custom = true;
+        },
+      };
+
+      const store = createStore({
+        name: 'test',
+        API,
+        type: 'vuex',
+        mutations: customMutations,
+      });
+
+      expect(store.mutations).toHaveProperty('CUSTOM_MUTATION');
+    });
+  });
+
+  describe('createStore - Pinia type', () => {
+    let API;
+
+    beforeEach(() => {
+      setActivePinia(createPinia());
+      API = {
+        get: vi.fn(),
+        show: vi.fn(),
+        create: vi.fn(),
+        update: vi.fn(),
+        delete: vi.fn(),
+      };
+    });
+
+    it('creates a Pinia store with correct structure', () => {
+      const useTestStore = createStore({
+        name: 'test',
+        API,
+        type: 'pinia',
+      });
+
+      const store = useTestStore();
+
+      expect(store.records).toEqual([]);
+      expect(store.meta).toEqual({});
+      expect(store.uiFlags).toEqual({
+        fetchingList: false,
+        fetchingItem: false,
+        creatingItem: false,
+        updatingItem: false,
+        deletingItem: false,
+      });
+    });
+
+    it('has standard getters', () => {
+      const useTestStore = createStore({
+        name: 'test',
+        API,
+        type: 'pinia',
+      });
+
+      const store = useTestStore();
+      store.records = [{ id: 2 }, { id: 1 }, { id: 3 }];
+      store.meta = { totalCount: 10, page: 1 };
+      store.uiFlags = { fetchingList: true };
+
+      expect(store.getRecords).toEqual([{ id: 3 }, { id: 2 }, { id: 1 }]);
+      expect(store.getRecord(2)).toEqual({ id: 2 });
+      expect(store.getRecord(4)).toEqual({});
+      expect(store.getUIFlags).toEqual({ fetchingList: true });
+      expect(store.getMeta).toEqual({ totalCount: 10, page: 1 });
+    });
+
+    it('has custom getters', () => {
+      const useTestStore = createStore({
+        name: 'test',
+        API,
+        type: 'pinia',
+        getters: {
+          customGetter: state => state.records.length,
+        },
+      });
+
+      const store = useTestStore();
+      store.records = [{ id: 1 }, { id: 2 }];
+
+      expect(store.customGetter).toBe(2);
+    });
+
+    describe('setUIFlag action', () => {
+      it('updates UI flags correctly', () => {
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+
+        store.setUIFlag({ fetchingList: true });
+        expect(store.uiFlags.fetchingList).toBe(true);
+
+        store.setUIFlag({ creatingItem: true });
+        expect(store.uiFlags.fetchingList).toBe(true);
+        expect(store.uiFlags.creatingItem).toBe(true);
+      });
+    });
+
+    describe('setMeta action', () => {
+      it('updates meta with snake_case input', () => {
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+
+        store.setMeta({ total_count: '10', page: '2' });
+        expect(store.meta.totalCount).toBe(10);
+        expect(store.meta.page).toBe(2);
+      });
+
+      it('updates meta with camelCase input', () => {
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+
+        store.setMeta({ totalCount: 15, page: 3 });
+        expect(store.meta.totalCount).toBe(15);
+        expect(store.meta.page).toBe(3);
+      });
+    });
+
+    describe('get action', () => {
+      it('fetches records successfully', async () => {
+        const payload = [{ id: 1, name: 'Test' }];
+        const meta = { total_count: 1, page: 1 };
+        API.get.mockResolvedValue({ data: { payload, meta } });
+
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+
+        await store.get({ page: 1 });
+
+        expect(API.get).toHaveBeenCalledWith({ page: 1 });
+        expect(store.records).toEqual(payload);
+        expect(store.meta.totalCount).toBe(1);
+        expect(store.meta.page).toBe(1);
+        expect(store.uiFlags.fetchingList).toBe(false);
+      });
+
+      it('handles API response without meta', async () => {
+        const data = [{ id: 1, name: 'Test' }];
+        API.get.mockResolvedValue({ data });
+
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+
+        await store.get();
+
+        expect(store.records).toEqual(data);
+      });
+
+      it('handles errors and resets UI flags', async () => {
+        const error = new Error('API Error');
+        API.get.mockRejectedValue(error);
+        throwErrorMessage.mockReturnValue('Error thrown');
+
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+
+        const result = await store.get();
+
+        expect(throwErrorMessage).toHaveBeenCalledWith(error);
+        expect(store.uiFlags.fetchingList).toBe(false);
+        expect(result).toBe('Error thrown');
+      });
+    });
+
+    describe('show action', () => {
+      it('fetches and upserts a record', async () => {
+        const data = { id: 1, name: 'Test' };
+        API.show.mockResolvedValue({ data });
+
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+
+        const result = await store.show(1);
+
+        expect(API.show).toHaveBeenCalledWith(1);
+        expect(store.records).toContainEqual(data);
+        expect(result).toEqual(data);
+        expect(store.uiFlags.fetchingItem).toBe(false);
+      });
+
+      it('updates existing record', async () => {
+        const data = { id: 1, name: 'Updated' };
+        API.show.mockResolvedValue({ data });
+
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+        store.records = [{ id: 1, name: 'Original' }];
+
+        await store.show(1);
+
+        expect(store.records).toHaveLength(1);
+        expect(store.records[0].name).toBe('Updated');
+      });
+
+      it('handles payload wrapper', async () => {
+        const record = { id: 1, name: 'Test' };
+        API.show.mockResolvedValue({ data: { payload: record } });
+
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+
+        const result = await store.show(1);
+
+        expect(result).toEqual(record);
+        expect(store.records).toContainEqual(record);
+      });
+    });
+
+    describe('create action', () => {
+      it('creates a new record', async () => {
+        const data = { id: 1, name: 'New' };
+        API.create.mockResolvedValue({ data });
+
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+
+        const result = await store.create({ name: 'New' });
+
+        expect(API.create).toHaveBeenCalledWith({ name: 'New' });
+        expect(store.records).toContainEqual(data);
+        expect(result).toEqual(data);
+        expect(store.uiFlags.creatingItem).toBe(false);
+      });
+
+      it('handles payload wrapper', async () => {
+        const record = { id: 1, name: 'New' };
+        API.create.mockResolvedValue({ data: { payload: record } });
+
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+
+        const result = await store.create({ name: 'New' });
+
+        expect(result).toEqual(record);
+        expect(store.records).toContainEqual(record);
+      });
+    });
+
+    describe('update action', () => {
+      it('updates an existing record', async () => {
+        const data = { id: 1, name: 'Updated' };
+        API.update.mockResolvedValue({ data });
+
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+        store.records = [{ id: 1, name: 'Original' }];
+
+        const result = await store.update({ id: 1, name: 'Updated' });
+
+        expect(API.update).toHaveBeenCalledWith(1, { name: 'Updated' });
+        expect(store.records[0].name).toBe('Updated');
+        expect(result).toEqual(data);
+        expect(store.uiFlags.updatingItem).toBe(false);
+      });
+
+      it('handles payload wrapper', async () => {
+        const record = { id: 1, name: 'Updated' };
+        API.update.mockResolvedValue({ data: { payload: record } });
+
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+        store.records = [{ id: 1, name: 'Original' }];
+
+        const result = await store.update({ id: 1, name: 'Updated' });
+
+        expect(result).toEqual(record);
+        expect(store.records[0]).toEqual(record);
+      });
+    });
+
+    describe('delete action', () => {
+      it('deletes a record', async () => {
+        API.delete.mockResolvedValue({});
+
+        const useTestStore = createStore({ name: 'test', API, type: 'pinia' });
+        const store = useTestStore();
+        store.records = [{ id: 1 }, { id: 2 }, { id: 3 }];
+
+        const result = await store.delete(2);
+
+        expect(API.delete).toHaveBeenCalledWith(2);
+        expect(store.records).toHaveLength(2);
+        expect(store.records).not.toContainEqual({ id: 2 });
+        expect(result).toBe(2);
+        expect(store.uiFlags.deletingItem).toBe(false);
+      });
+    });
+
+    describe('custom actions', () => {
+      it('includes custom actions', async () => {
+        const useTestStore = createStore({
+          name: 'test',
+          API,
+          type: 'pinia',
+          actions: () => ({
+            customAction() {
+              return 'custom result';
+            },
+          }),
+        });
+
+        const store = useTestStore();
+        const result = store.customAction();
+
+        expect(result).toBe('custom result');
+      });
+
+      it('custom actions can access store state', () => {
+        const useTestStore = createStore({
+          name: 'test',
+          API,
+          type: 'pinia',
+          actions: () => ({
+            getRecordCount() {
+              return this.records.length;
+            },
+          }),
+        });
+
+        const store = useTestStore();
+        store.records = [{ id: 1 }, { id: 2 }];
+
+        expect(store.getRecordCount()).toBe(2);
+      });
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/storeFactoryHelper.js b/app/javascript/dashboard/store/storeFactoryHelper.js
new file mode 100644
index 000000000..f87be165a
--- /dev/null
+++ b/app/javascript/dashboard/store/storeFactoryHelper.js
@@ -0,0 +1,203 @@
+import { throwErrorMessage } from 'dashboard/store/utils/api';
+
+// ============================================================================
+// VUEX HELPERS
+// ============================================================================
+
+export const getRecords =
+  (mutationTypes, API) =>
+  async ({ commit }, params = {}) => {
+    commit(mutationTypes.SET_UI_FLAG, { fetchingList: true });
+    try {
+      const response = await API.get(params);
+      commit(mutationTypes.SET, response.data.payload);
+      commit(mutationTypes.SET_META, response.data.meta);
+      return response.data.payload;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(mutationTypes.SET_UI_FLAG, { fetchingList: false });
+    }
+  };
+
+export const showRecord =
+  (mutationTypes, API) =>
+  async ({ commit }, id) => {
+    commit(mutationTypes.SET_UI_FLAG, { fetchingItem: true });
+    try {
+      const response = await API.show(id);
+      commit(mutationTypes.UPSERT, response.data);
+      return response.data;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(mutationTypes.SET_UI_FLAG, { fetchingItem: false });
+    }
+  };
+
+export const createRecord =
+  (mutationTypes, API) =>
+  async ({ commit }, dataObj) => {
+    commit(mutationTypes.SET_UI_FLAG, { creatingItem: true });
+    try {
+      const response = await API.create(dataObj);
+      commit(mutationTypes.UPSERT, response.data);
+      return response.data;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(mutationTypes.SET_UI_FLAG, { creatingItem: false });
+    }
+  };
+
+export const updateRecord =
+  (mutationTypes, API) =>
+  async ({ commit }, { id, ...updateObj }) => {
+    commit(mutationTypes.SET_UI_FLAG, { updatingItem: true });
+    try {
+      const response = await API.update(id, updateObj);
+      commit(mutationTypes.EDIT, response.data);
+      return response.data;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(mutationTypes.SET_UI_FLAG, { updatingItem: false });
+    }
+  };
+
+export const deleteRecord =
+  (mutationTypes, API) =>
+  async ({ commit }, id) => {
+    commit(mutationTypes.SET_UI_FLAG, { deletingItem: true });
+    try {
+      await API.delete(id);
+      commit(mutationTypes.DELETE, id);
+      return id;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(mutationTypes.SET_UI_FLAG, { deletingItem: false });
+    }
+  };
+
+// ============================================================================
+// PINIA HELPERS
+// ============================================================================
+
+/**
+ * Get records from API and update Pinia store
+ * @param {Object} store - Pinia store instance (this context)
+ * @param {Object} API - API client
+ * @param {Object} params - Query parameters
+ */
+export const piniaGetRecords = async (store, API, params = {}) => {
+  store.setUIFlag({ fetchingList: true });
+  try {
+    const response = await API.get(params);
+    const { data } = response;
+    store.records = data.payload || data;
+    if (data.meta) {
+      store.setMeta(data.meta);
+    }
+    return data.payload || data;
+  } catch (error) {
+    return throwErrorMessage(error);
+  } finally {
+    store.setUIFlag({ fetchingList: false });
+  }
+};
+
+/**
+ * Show single record from API and upsert to Pinia store
+ * @param {Object} store - Pinia store instance (this context)
+ * @param {Object} API - API client
+ * @param {Number|String} id - Record ID
+ */
+export const piniaShowRecord = async (store, API, id) => {
+  store.setUIFlag({ fetchingItem: true });
+  try {
+    const response = await API.show(id);
+    const { data } = response;
+    const record = data.payload || data;
+
+    // Upsert logic
+    const index = store.records.findIndex(r => r.id === record.id);
+    if (index !== -1) {
+      store.records[index] = record;
+    } else {
+      store.records.push(record);
+    }
+
+    return record;
+  } catch (error) {
+    return throwErrorMessage(error);
+  } finally {
+    store.setUIFlag({ fetchingItem: false });
+  }
+};
+
+/**
+ * Create new record via API and add to Pinia store
+ * @param {Object} store - Pinia store instance (this context)
+ * @param {Object} API - API client
+ * @param {Object} dataObj - Data to create
+ */
+export const piniaCreateRecord = async (store, API, dataObj) => {
+  store.setUIFlag({ creatingItem: true });
+  try {
+    const response = await API.create(dataObj);
+    const { data } = response;
+    const record = data.payload || data;
+    store.records.push(record);
+    return record;
+  } catch (error) {
+    return throwErrorMessage(error);
+  } finally {
+    store.setUIFlag({ creatingItem: false });
+  }
+};
+
+/**
+ * Update existing record via API and update in Pinia store
+ * @param {Object} store - Pinia store instance (this context)
+ * @param {Object} API - API client
+ * @param {Object} payload - Update payload with id
+ */
+export const piniaUpdateRecord = async (store, API, { id, ...updateObj }) => {
+  store.setUIFlag({ updatingItem: true });
+  try {
+    const response = await API.update(id, updateObj);
+    const { data } = response;
+    const record = data.payload || data;
+
+    const index = store.records.findIndex(r => r.id === record.id);
+    if (index !== -1) {
+      store.records[index] = record;
+    }
+
+    return record;
+  } catch (error) {
+    return throwErrorMessage(error);
+  } finally {
+    store.setUIFlag({ updatingItem: false });
+  }
+};
+
+/**
+ * Delete record via API and remove from Pinia store
+ * @param {Object} store - Pinia store instance (this context)
+ * @param {Object} API - API client
+ * @param {Number|String} id - Record ID to delete
+ */
+export const piniaDeleteRecord = async (store, API, id) => {
+  store.setUIFlag({ deletingItem: true });
+  try {
+    await API.delete(id);
+    store.records = store.records.filter(record => record.id !== id);
+    return id;
+  } catch (error) {
+    return throwErrorMessage(error);
+  } finally {
+    store.setUIFlag({ deletingItem: false });
+  }
+};
diff --git a/app/javascript/dashboard/stores/companies.js b/app/javascript/dashboard/stores/companies.js
new file mode 100644
index 000000000..d1e8e56e9
--- /dev/null
+++ b/app/javascript/dashboard/stores/companies.js
@@ -0,0 +1,31 @@
+import CompanyAPI from 'dashboard/api/companies';
+import { createStore } from 'dashboard/store/storeFactory';
+import { throwErrorMessage } from 'dashboard/store/utils/api';
+import camelcaseKeys from 'camelcase-keys';
+
+export const useCompaniesStore = createStore({
+  name: 'companies',
+  type: 'pinia',
+  API: CompanyAPI,
+  getters: {
+    getCompaniesList: state => {
+      return camelcaseKeys(state.records, { deep: true });
+    },
+  },
+  actions: () => ({
+    async search({ search, page, sort }) {
+      this.setUIFlag({ fetchingList: true });
+      try {
+        const {
+          data: { payload, meta },
+        } = await CompanyAPI.search(search, page, sort);
+        this.records = payload;
+        this.setMeta(meta);
+      } catch (error) {
+        throwErrorMessage(error);
+      } finally {
+        this.setUIFlag({ fetchingList: false });
+      }
+    },
+  }),
+});
diff --git a/app/javascript/entrypoints/dashboard.js b/app/javascript/entrypoints/dashboard.js
index 88bd35926..cd2cda6bd 100644
--- a/app/javascript/entrypoints/dashboard.js
+++ b/app/javascript/entrypoints/dashboard.js
@@ -16,6 +16,7 @@ import createAxios from 'dashboard/helper/APIHelper';
 
 import commonHelpers, { isJSONValid } from 'dashboard/helper/commons';
 import { sync } from 'vuex-router-sync';
+import { createPinia } from 'pinia';
 import router, { initalizeRouter } from 'dashboard/routes';
 import store from 'dashboard/store';
 import constants from 'dashboard/constants/globals';
@@ -41,9 +42,12 @@ const i18n = createI18n({
 
 sync(store, router);
 
+const pinia = createPinia();
+
 const app = createApp(App);
 app.use(i18n);
 app.use(store);
+app.use(pinia);
 app.use(router);
 
 // [VITE] Disabled this, need to renable later
diff --git a/app/javascript/shared/composables/specs/useLocale.spec.js b/app/javascript/shared/composables/specs/useLocale.spec.js
new file mode 100644
index 000000000..2b9f04b9d
--- /dev/null
+++ b/app/javascript/shared/composables/specs/useLocale.spec.js
@@ -0,0 +1,188 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { useLocale } from '../useLocale';
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+
+vi.mock('vue-i18n');
+
+describe('useLocale', () => {
+  beforeEach(() => {
+    vi.mocked(useI18n).mockReturnValue({
+      locale: ref('en-US'),
+    });
+  });
+
+  describe('resolvedLocale', () => {
+    it('should return normalized locale for valid hyphen-based tags', () => {
+      const mockLocale = ref('en-US');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+      expect(resolvedLocale.value).toBe('en-US');
+    });
+
+    it('should normalize underscore-based locale tags to hyphens', () => {
+      const mockLocale = ref('pt_BR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+      // Should normalize pt_BR to pt-BR
+      expect(resolvedLocale.value).toMatch(/^pt(-BR)?$/);
+    });
+
+    it('should normalize zh_CN to zh-CN or fall back to zh', () => {
+      const mockLocale = ref('zh_CN');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+      // Should normalize zh_CN to zh-CN or fall back to zh
+      expect(resolvedLocale.value).toMatch(/^zh(-CN)?$/);
+    });
+
+    it('should normalize en_US to en-US or fall back to en', () => {
+      const mockLocale = ref('en_US');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+      // Should normalize en_US to en-US or fall back to en
+      expect(resolvedLocale.value).toMatch(/^en(-US)?$/);
+    });
+
+    it('should fall back to base language when specific locale not supported', () => {
+      // Use a specific locale that might not be fully supported
+      const mockLocale = ref('pt-BR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+      // Should return either pt-BR or pt (base language)
+      expect(resolvedLocale.value).toMatch(/^pt(-BR)?$/);
+    });
+
+    it('should fall back to English for completely unsupported locales', () => {
+      const mockLocale = ref('xx-YY');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+      // Should fall back to 'en'
+      expect(resolvedLocale.value).toBe('en');
+    });
+
+    it('should handle null locale gracefully', () => {
+      const mockLocale = ref(null);
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+      // Should fall back to 'en'
+      expect(resolvedLocale.value).toBe('en');
+    });
+
+    it('should handle undefined locale gracefully', () => {
+      const mockLocale = ref(undefined);
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+      // Should fall back to 'en'
+      expect(resolvedLocale.value).toBe('en');
+    });
+
+    it('should handle base language code without region', () => {
+      const mockLocale = ref('pt');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+      // Should work with base language
+      expect(resolvedLocale.value).toBe('pt');
+    });
+
+    it('should handle multiple underscores in locale tag', () => {
+      const mockLocale = ref('zh_Hans_CN');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+      // Should normalize all underscores to hyphens
+      expect(resolvedLocale.value).toMatch(/^zh(-Hans-CN|-Hans|-CN)?$/);
+    });
+
+    it('should be reactive to locale changes', () => {
+      const mockLocale = ref('en-US');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+
+      expect(resolvedLocale.value).toBe('en-US');
+
+      // Change locale
+      mockLocale.value = 'pt_BR';
+
+      // Should update reactively
+      expect(resolvedLocale.value).toMatch(/^pt(-BR)?$/);
+    });
+
+    it('should work with common locales', () => {
+      const testCases = [
+        { input: 'de-DE', expected: /^de(-DE)?$/ },
+        { input: 'fr-FR', expected: /^fr(-FR)?$/ },
+        { input: 'es-ES', expected: /^es(-ES)?$/ },
+        { input: 'ja-JP', expected: /^ja(-JP)?$/ },
+        { input: 'ko-KR', expected: /^ko(-KR)?$/ },
+        { input: 'ar-SA', expected: /^ar(-SA)?$/ },
+        { input: 'hi-IN', expected: /^hi(-IN)?$/ },
+        { input: 'ru-RU', expected: /^ru(-RU)?$/ },
+        { input: 'tr-TR', expected: /^tr(-TR)?$/ },
+      ];
+
+      testCases.forEach(({ input, expected }) => {
+        const mockLocale = ref(input);
+        vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+        const { resolvedLocale } = useLocale();
+        expect(resolvedLocale.value).toMatch(expected);
+      });
+    });
+  });
+
+  describe('locale (raw)', () => {
+    it('should expose raw locale value', () => {
+      const mockLocale = ref('pt_BR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { locale } = useLocale();
+      // Raw locale should be unchanged
+      expect(locale.value).toBe('pt_BR');
+    });
+
+    it('should be reactive', () => {
+      const mockLocale = ref('en-US');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { locale } = useLocale();
+
+      expect(locale.value).toBe('en-US');
+
+      mockLocale.value = 'pt-BR';
+
+      expect(locale.value).toBe('pt-BR');
+    });
+  });
+
+  describe('Intl API compatibility', () => {
+    it('should work with Intl.NumberFormat', () => {
+      const mockLocale = ref('pt_BR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+
+      // Should not throw error
+      expect(() => {
+        new Intl.NumberFormat(resolvedLocale.value).format(1234567);
+      }).not.toThrow();
+    });
+
+    it('should work with Intl.DateTimeFormat', () => {
+      const mockLocale = ref('zh_CN');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+
+      // Should not throw error
+      expect(() => {
+        new Intl.DateTimeFormat(resolvedLocale.value).format(new Date());
+      }).not.toThrow();
+    });
+
+    it('should work with Intl.Collator', () => {
+      const mockLocale = ref('en_US');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { resolvedLocale } = useLocale();
+
+      // Should not throw error
+      expect(() => {
+        new Intl.Collator(resolvedLocale.value).compare('a', 'b');
+      }).not.toThrow();
+    });
+  });
+});
diff --git a/app/javascript/shared/composables/specs/useNumberFormatter.spec.js b/app/javascript/shared/composables/specs/useNumberFormatter.spec.js
new file mode 100644
index 000000000..3a9b8d41b
--- /dev/null
+++ b/app/javascript/shared/composables/specs/useNumberFormatter.spec.js
@@ -0,0 +1,364 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { useNumberFormatter } from '../useNumberFormatter';
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+
+vi.mock('vue-i18n');
+
+describe('useNumberFormatter', () => {
+  beforeEach(() => {
+    vi.mocked(useI18n).mockReturnValue({
+      locale: ref('en-US'),
+    });
+  });
+
+  describe('formatCompactNumber', () => {
+    it('should return exact numbers for values under 1,000', () => {
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(0)).toBe('0');
+      expect(formatCompactNumber(1)).toBe('1');
+      expect(formatCompactNumber(42)).toBe('42');
+      expect(formatCompactNumber(999)).toBe('999');
+    });
+
+    it('should return "Xk" for exact thousands and "Xk+" for values with remainder', () => {
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(1000)).toBe('1k');
+      expect(formatCompactNumber(1020)).toBe('1k+');
+      expect(formatCompactNumber(1500)).toBe('1k+');
+      expect(formatCompactNumber(1999)).toBe('1k+');
+      expect(formatCompactNumber(2000)).toBe('2k');
+      expect(formatCompactNumber(15000)).toBe('15k');
+      expect(formatCompactNumber(15500)).toBe('15k+');
+      expect(formatCompactNumber(999999)).toBe('999k+');
+    });
+
+    it('should return millions/billion/trillion format for values 1,000,000 and above', () => {
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(1000000)).toBe('1M');
+      expect(formatCompactNumber(1000001)).toBe('1.0M');
+      expect(formatCompactNumber(1200000)).toBe('1.2M');
+      expect(formatCompactNumber(1234000)).toBe('1.2M');
+      expect(formatCompactNumber(2500000)).toBe('2.5M');
+      expect(formatCompactNumber(10000000)).toBe('10M');
+      expect(formatCompactNumber(1000000000)).toBe('1B');
+      expect(formatCompactNumber(1100000000)).toBe('1.1B');
+      expect(formatCompactNumber(10000000000)).toBe('10B');
+      expect(formatCompactNumber(11000000000)).toBe('11B');
+      expect(formatCompactNumber(1000000000000)).toBe('1T');
+      expect(formatCompactNumber(1100000000000)).toBe('1.1T');
+      expect(formatCompactNumber(10000000000000)).toBe('10T');
+      expect(formatCompactNumber(11000000000000)).toBe('11T');
+    });
+
+    it('should handle edge cases gracefully', () => {
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(null)).toBe('0');
+      expect(formatCompactNumber(undefined)).toBe('0');
+      expect(formatCompactNumber(NaN)).toBe('0');
+      expect(formatCompactNumber('string')).toBe('0');
+    });
+
+    it('should handle negative numbers', () => {
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(-500)).toBe('-500');
+      expect(formatCompactNumber(-1000)).toBe('-1k');
+      expect(formatCompactNumber(-1500)).toBe('-1k+');
+      expect(formatCompactNumber(-2000)).toBe('-2k');
+      expect(formatCompactNumber(-1200000)).toBe('-1.2M');
+    });
+
+    it('should format with en-US locale', () => {
+      const mockLocale = ref('en-US');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(1500)).toBe('1k+');
+    });
+
+    it('should format with de-DE locale', () => {
+      const mockLocale = ref('de-DE');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(2000)).toBe('2k');
+    });
+
+    it('should format with fr-FR locale (compact notation)', () => {
+      const mockLocale = ref('fr-FR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      const result = formatCompactNumber(1000000);
+      expect(result).toMatch(/1\s*M/); // French uses space before M
+    });
+
+    it('should format with ja-JP locale', () => {
+      const mockLocale = ref('ja-JP');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(999)).toBe('999');
+    });
+
+    it('should format with ar-SA locale (Arabic numerals)', () => {
+      const mockLocale = ref('ar-SA');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      const result = formatCompactNumber(5000);
+      expect(result).toContain('k');
+      expect(typeof result).toBe('string');
+    });
+
+    it('should format with es-ES locale', () => {
+      const mockLocale = ref('es-ES');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(7500)).toBe('7k+');
+    });
+
+    it('should format with hi-IN locale', () => {
+      const mockLocale = ref('hi-IN');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(100000)).toBe('100k');
+    });
+
+    it('should format with ru-RU locale', () => {
+      const mockLocale = ref('ru-RU');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(3000)).toBe('3k');
+    });
+
+    it('should format with ko-KR locale (uses 만 for 10,000)', () => {
+      const mockLocale = ref('ko-KR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      const result = formatCompactNumber(2500000);
+      expect(result).toContain('만'); // Korean uses 만 (10,000) as a unit, so 2,500,000 should contain 만
+    });
+
+    it('should format with pt-BR locale', () => {
+      const mockLocale = ref('pt-BR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      expect(formatCompactNumber(8888)).toBe('8k+');
+    });
+
+    it('should handle underscore-based locale tags (pt_BR)', () => {
+      const mockLocale = ref('pt_BR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      // Should normalize pt_BR to pt-BR and work correctly
+      expect(formatCompactNumber(8888)).toBe('8k+');
+      expect(formatCompactNumber(1000000)).toBe('1\u00a0mi');
+    });
+
+    it('should handle underscore-based locale tags (zh_CN)', () => {
+      const mockLocale = ref('zh_CN');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      // Should normalize zh_CN to zh-CN and work correctly
+      expect(formatCompactNumber(999)).toBe('999');
+      expect(formatCompactNumber(5000)).toBe('5k');
+    });
+
+    it('should handle underscore-based locale tags (en_US)', () => {
+      const mockLocale = ref('en_US');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      // Should normalize en_US to en-US and work correctly
+      expect(formatCompactNumber(1500)).toBe('1k+');
+      expect(formatCompactNumber(1000000)).toBe('1M');
+    });
+
+    it('should handle null/undefined locale gracefully', () => {
+      const mockLocale = ref(null);
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      // Should fall back to 'en' locale
+      expect(formatCompactNumber(1500)).toBe('1k+');
+    });
+
+    it('should fall back to base language when specific locale not supported', () => {
+      // Simulate a case where pt-BR might not be fully supported but pt is
+      const mockLocale = ref('pt-BR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      // Should work with either pt-BR or pt fallback
+      const result = formatCompactNumber(1500);
+      expect(result).toMatch(/1k\+/);
+    });
+
+    it('should fall back to English for completely unsupported locales', () => {
+      // Use a completely made-up locale
+      const mockLocale = ref('xx-YY');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      // Should fall back to 'en' and work
+      expect(formatCompactNumber(1500)).toBe('1k+');
+      expect(formatCompactNumber(1000000)).toBe('1M');
+    });
+
+    it('should handle edge case with only base language code', () => {
+      const mockLocale = ref('pt');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatCompactNumber } = useNumberFormatter();
+      // Should work with base language
+      expect(formatCompactNumber(2000)).toBe('2k');
+    });
+  });
+
+  describe('formatFullNumber', () => {
+    it('should format numbers with locale-specific formatting', () => {
+      const { formatFullNumber } = useNumberFormatter();
+      expect(formatFullNumber(1000)).toBe('1,000');
+      expect(formatFullNumber(1234567)).toBe('1,234,567');
+      expect(formatFullNumber(1234567890)).toBe('1,234,567,890');
+      expect(formatFullNumber(1234567890123)).toBe('1,234,567,890,123');
+    });
+
+    it('should handle edge cases gracefully', () => {
+      const { formatFullNumber } = useNumberFormatter();
+      expect(formatFullNumber(null)).toBe('0');
+      expect(formatFullNumber(undefined)).toBe('0');
+      expect(formatFullNumber(NaN)).toBe('0');
+      expect(formatFullNumber('string')).toBe('0');
+    });
+
+    it('should format with en-US locale (comma separator)', () => {
+      const mockLocale = ref('en-US');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      expect(formatFullNumber(1234567)).toBe('1,234,567');
+    });
+
+    it('should format with de-DE locale (period separator)', () => {
+      const mockLocale = ref('de-DE');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      expect(formatFullNumber(9876543)).toBe('9.876.543');
+    });
+
+    it('should format with es-ES locale (period separator)', () => {
+      const mockLocale = ref('es-ES');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      expect(formatFullNumber(5555555)).toBe('5.555.555');
+    });
+
+    it('should format with zh-CN locale', () => {
+      const mockLocale = ref('zh-CN');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      expect(formatFullNumber(1000000)).toBe('1,000,000');
+    });
+
+    it('should format with ar-EG locale (Arabic numerals, RTL)', () => {
+      const mockLocale = ref('ar-EG');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      const result = formatFullNumber(7654321);
+      // Arabic locale uses Eastern Arabic numerals (٠-٩)
+      // Just verify it's formatted (length should be reasonable)
+      expect(result.length).toBeGreaterThan(6);
+    });
+
+    it('should format with fr-FR locale (narrow no-break space)', () => {
+      const mockLocale = ref('fr-FR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      const result = formatFullNumber(3333333);
+      expect(result).toContain('3');
+      expect(result).toContain('333');
+    });
+
+    it('should format with hi-IN locale (Indian numbering system)', () => {
+      const mockLocale = ref('hi-IN');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      expect(formatFullNumber(9999999)).toBe('99,99,999');
+    });
+
+    it('should format with th-TH locale', () => {
+      const mockLocale = ref('th-TH');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      expect(formatFullNumber(4444444)).toBe('4,444,444');
+    });
+
+    it('should format with tr-TR locale', () => {
+      const mockLocale = ref('tr-TR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      expect(formatFullNumber(6666666)).toBe('6.666.666');
+    });
+
+    it('should format with pt-PT locale (space separator)', () => {
+      const mockLocale = ref('pt-PT');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      const result = formatFullNumber(2222222);
+      // Portuguese (Portugal) uses narrow no-break space as separator
+      expect(result).toMatch(/2[\s\u202f]222[\s\u202f]222/);
+    });
+
+    it('should handle underscore-based locale tags (pt_BR)', () => {
+      const mockLocale = ref('pt_BR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      // Should normalize pt_BR to pt-BR and work correctly
+      expect(formatFullNumber(1234567)).toBe('1.234.567');
+    });
+
+    it('should handle underscore-based locale tags (zh_CN)', () => {
+      const mockLocale = ref('zh_CN');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      // Should normalize zh_CN to zh-CN and work correctly
+      expect(formatFullNumber(1000000)).toBe('1,000,000');
+    });
+
+    it('should handle underscore-based locale tags (en_US)', () => {
+      const mockLocale = ref('en_US');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      // Should normalize en_US to en-US and work correctly
+      expect(formatFullNumber(1234567)).toBe('1,234,567');
+    });
+
+    it('should handle null/undefined locale gracefully', () => {
+      const mockLocale = ref(null);
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      // Should fall back to 'en' locale
+      expect(formatFullNumber(1234567)).toBe('1,234,567');
+    });
+
+    it('should fall back to base language when specific locale not supported', () => {
+      // Simulate a case where pt-BR might not be fully supported but pt is
+      const mockLocale = ref('pt-BR');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      // Should work with either pt-BR or pt fallback
+      const result = formatFullNumber(1234567);
+      // Portuguese uses period as thousands separator
+      expect(result).toMatch(/1[.,\s]234[.,\s]567/);
+    });
+
+    it('should fall back to English for completely unsupported locales', () => {
+      // Use a completely made-up locale
+      const mockLocale = ref('xx-YY');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      // Should fall back to 'en' and work
+      expect(formatFullNumber(1234567)).toBe('1,234,567');
+    });
+
+    it('should handle edge case with only base language code', () => {
+      const mockLocale = ref('pt');
+      vi.mocked(useI18n).mockReturnValue({ locale: mockLocale });
+      const { formatFullNumber } = useNumberFormatter();
+      // Should work with base language
+      const result = formatFullNumber(1000000);
+      expect(result).toMatch(/1[.,\s]000[.,\s]000/);
+    });
+  });
+});
diff --git a/app/javascript/shared/composables/useLocale.js b/app/javascript/shared/composables/useLocale.js
new file mode 100644
index 000000000..b496d15dd
--- /dev/null
+++ b/app/javascript/shared/composables/useLocale.js
@@ -0,0 +1,57 @@
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+/**
+ * Composable for locale resolution and validation
+ * Provides a normalized, validated locale that works with Intl APIs
+ */
+export function useLocale() {
+  const { locale } = useI18n();
+
+  /**
+   * Resolves and validates the current locale for use with Intl APIs
+   *
+   * Handles multiple fallback scenarios:
+   * 1. Normalizes underscore-based tags (pt_BR → pt-BR, zh_CN → zh-CN)
+   * 2. Falls back to base language if specific locale unsupported (pt-BR → pt)
+   * 3. Falls back to English if base language unsupported (xx-YY → en)
+   *
+   * @returns {string} Valid BCP 47 locale tag for Intl APIs
+   *
+   * @example
+   * const { resolvedLocale } = useLocale();
+   * new Intl.NumberFormat(resolvedLocale.value).format(1234);
+   * new Intl.DateTimeFormat(resolvedLocale.value).format(new Date());
+   */
+  const resolvedLocale = computed(() => {
+    // Handle null/undefined locale
+    if (!locale.value) return 'en';
+
+    // Normalize underscore to hyphen (pt_BR → pt-BR, zh_CN → zh-CN)
+    const normalized = locale.value.replace(/_/g, '-');
+
+    // Check if the specific locale is supported (e.g., pt-BR, zh-CN)
+    const supportedLocales = Intl.NumberFormat.supportedLocalesOf([normalized]);
+    if (supportedLocales.length > 0) {
+      return normalized;
+    }
+
+    // If specific locale not supported, try base language (pt-BR → pt, zh-CN → zh)
+    const baseLocale = normalized.split('-')[0];
+    const baseSupportedLocales = Intl.NumberFormat.supportedLocalesOf([
+      baseLocale,
+    ]);
+    if (baseSupportedLocales.length > 0) {
+      return baseLocale;
+    }
+
+    // If base language also not supported, fall back to English
+    return 'en';
+  });
+
+  return {
+    resolvedLocale,
+    // Also expose the raw locale for cases where you need it
+    locale,
+  };
+}
diff --git a/app/javascript/shared/composables/useNumberFormatter.js b/app/javascript/shared/composables/useNumberFormatter.js
new file mode 100644
index 000000000..54ded0e93
--- /dev/null
+++ b/app/javascript/shared/composables/useNumberFormatter.js
@@ -0,0 +1,67 @@
+import { useLocale } from './useLocale';
+
+/**
+ * Composable for number formatting with i18n locale support
+ * Provides methods to format numbers in compact and full display formats
+ */
+export function useNumberFormatter() {
+  const { resolvedLocale } = useLocale();
+
+  /**
+   * Formats numbers for display with clean, minimal formatting
+   * - Up to 1,000: show exact number (e.g., 999)
+   * - 1,000 to 999,999: show as "Xk" for exact thousands or "Xk+" for remainder (e.g., 1000 → "1k", 1500 → "1k+")
+   * - 1,000,000+: show in millions with 1 decimal place (e.g., 1,234,000 → "1.2M")
+   *
+   * Uses browser-native Intl.NumberFormat with proper i18n locale support
+   *
+   * @param {number} num - The number to format
+   * @returns {string} Formatted number string
+   */
+  const formatCompactNumber = num => {
+    if (typeof num !== 'number' || Number.isNaN(num)) {
+      return '0';
+    }
+
+    // For numbers between -1000 and 1000 (exclusive), show exact number with locale formatting
+    if (Math.abs(num) < 1000) {
+      return new Intl.NumberFormat(resolvedLocale.value).format(num);
+    }
+
+    // For numbers with absolute value above 1,000,000, show in millions with 1 decimal place
+    if (Math.abs(num) >= 1000000) {
+      const millions = num / 1000000;
+      return new Intl.NumberFormat(resolvedLocale.value, {
+        notation: 'compact',
+        compactDisplay: 'short',
+        maximumFractionDigits: 1,
+        minimumFractionDigits: millions % 1 === 0 ? 0 : 1,
+      }).format(num);
+    }
+
+    // For numbers with absolute value between 1,000 and 1,000,000, show as "Xk" or "Xk+" using floor value
+    // For negative numbers, we want to floor towards zero (truncate), not towards negative infinity
+    const thousands = num >= 0 ? Math.floor(num / 1000) : Math.ceil(num / 1000);
+    const remainder = Math.abs(num) % 1000;
+    const suffix = remainder === 0 ? 'k' : 'k+';
+    return `${new Intl.NumberFormat(resolvedLocale.value).format(thousands)}${suffix}`;
+  };
+
+  /**
+   * Format a number for full display with locale-specific formatting
+   * @param {number} num - The number to format
+   * @returns {string} Formatted number string with full precision and locale formatting (e.g., 1,234,567)
+   */
+  const formatFullNumber = num => {
+    if (typeof num !== 'number' || Number.isNaN(num)) {
+      return '0';
+    }
+
+    return new Intl.NumberFormat(resolvedLocale.value).format(num);
+  };
+
+  return {
+    formatCompactNumber,
+    formatFullNumber,
+  };
+}
diff --git a/app/javascript/shared/constants/busEvents.js b/app/javascript/shared/constants/busEvents.js
index 0d5661d26..ef8f24155 100644
--- a/app/javascript/shared/constants/busEvents.js
+++ b/app/javascript/shared/constants/busEvents.js
@@ -4,7 +4,6 @@ export const BUS_EVENTS = {
   FOCUS_CUSTOM_ATTRIBUTE: 'FOCUS_CUSTOM_ATTRIBUTE',
   SCROLL_TO_MESSAGE: 'SCROLL_TO_MESSAGE',
   MESSAGE_SENT: 'MESSAGE_SENT',
-  FETCH_LABEL_SUGGESTIONS: 'FETCH_LABEL_SUGGESTIONS',
   ON_MESSAGE_LIST_SCROLL: 'ON_MESSAGE_LIST_SCROLL',
   WEBSOCKET_DISCONNECT: 'WEBSOCKET_DISCONNECT',
   WEBSOCKET_RECONNECT: 'WEBSOCKET_RECONNECT',
diff --git a/app/javascript/shared/constants/messages.js b/app/javascript/shared/constants/messages.js
index 47c1e8651..8e9d06beb 100644
--- a/app/javascript/shared/constants/messages.js
+++ b/app/javascript/shared/constants/messages.js
@@ -34,9 +34,6 @@ export const CONVERSATION_PRIORITY_ORDER = {
   low: 1,
 };
 
-// Size in mega bytes
-export const MAXIMUM_FILE_UPLOAD_SIZE = 40;
-
 export const ALLOWED_FILE_TYPES =
   'image/*,' +
   'audio/*,' +
diff --git a/app/javascript/shared/helpers/FileHelper.js b/app/javascript/shared/helpers/FileHelper.js
index d0d9daaaa..3866fb6b4 100644
--- a/app/javascript/shared/helpers/FileHelper.js
+++ b/app/javascript/shared/helpers/FileHelper.js
@@ -1,3 +1,5 @@
+export const DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE = 40;
+
 export const formatBytes = (bytes, decimals = 2) => {
   if (bytes === 0) return '0 Bytes';
 
@@ -19,3 +21,13 @@ export const checkFileSizeLimit = (file, maximumUploadLimit) => {
   const fileSizeInMB = fileSizeInMegaBytes(fileSize);
   return fileSizeInMB <= maximumUploadLimit;
 };
+
+export const resolveMaximumFileUploadSize = value => {
+  const parsedValue = Number(value);
+
+  if (!Number.isFinite(parsedValue) || parsedValue <= 0) {
+    return DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE;
+  }
+
+  return parsedValue;
+};
diff --git a/app/javascript/shared/helpers/specs/FileHelper.spec.js b/app/javascript/shared/helpers/specs/FileHelper.spec.js
index 750eab52c..e8abe506a 100644
--- a/app/javascript/shared/helpers/specs/FileHelper.spec.js
+++ b/app/javascript/shared/helpers/specs/FileHelper.spec.js
@@ -1,7 +1,9 @@
 import {
+  DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE,
   formatBytes,
   fileSizeInMegaBytes,
   checkFileSizeLimit,
+  resolveMaximumFileUploadSize,
 } from '../FileHelper';
 
 describe('#File Helpers', () => {
@@ -19,6 +21,7 @@ describe('#File Helpers', () => {
       expect(formatBytes(10000000)).toBe('9.54 MB');
     });
   });
+
   describe('fileSizeInMegaBytes', () => {
     it('should return zero if 0 is passed', () => {
       expect(fileSizeInMegaBytes(0)).toBe(0);
@@ -27,6 +30,7 @@ describe('#File Helpers', () => {
       expect(fileSizeInMegaBytes(20000000)).toBeCloseTo(19.07, 2);
     });
   });
+
   describe('checkFileSizeLimit', () => {
     it('should return false if file with size 62208194 and file size limit 40 are passed', () => {
       expect(checkFileSizeLimit({ file: { size: 62208194 } }, 40)).toBe(false);
@@ -35,4 +39,26 @@ describe('#File Helpers', () => {
       expect(checkFileSizeLimit({ file: { size: 199154 } }, 40)).toBe(true);
     });
   });
+
+  describe('resolveMaximumFileUploadSize', () => {
+    it('should return default when value is undefined', () => {
+      expect(resolveMaximumFileUploadSize(undefined)).toBe(
+        DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE
+      );
+    });
+
+    it('should return default when value is not a positive number', () => {
+      expect(resolveMaximumFileUploadSize('not-a-number')).toBe(
+        DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE
+      );
+      expect(resolveMaximumFileUploadSize(-5)).toBe(
+        DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE
+      );
+    });
+
+    it('should parse numeric strings and numbers', () => {
+      expect(resolveMaximumFileUploadSize('50')).toBe(50);
+      expect(resolveMaximumFileUploadSize(75)).toBe(75);
+    });
+  });
 });
diff --git a/app/javascript/shared/store/globalConfig.js b/app/javascript/shared/store/globalConfig.js
index 8abeba123..6b4c9a5ee 100644
--- a/app/javascript/shared/store/globalConfig.js
+++ b/app/javascript/shared/store/globalConfig.js
@@ -1,4 +1,5 @@
 import { parseBoolean } from '@chatwoot/utils';
+import { resolveMaximumFileUploadSize } from 'shared/helpers/FileHelper';
 
 const {
   API_CHANNEL_NAME: apiChannelName,
@@ -11,6 +12,7 @@ const {
   DIRECT_UPLOADS_ENABLED: directUploadsEnabled,
   DISPLAY_MANIFEST: displayManifest,
   GIT_SHA: gitSha,
+  MAXIMUM_FILE_UPLOAD_SIZE: maximumFileUploadSize,
   HCAPTCHA_SITE_KEY: hCaptchaSiteKey,
   INSTALLATION_NAME: installationName,
   LOGO_THUMBNAIL: logoThumbnail,
@@ -37,6 +39,7 @@ const state = {
   disableUserProfileUpdate: parseBoolean(disableUserProfileUpdate),
   displayManifest,
   gitSha,
+  maximumFileUploadSize: resolveMaximumFileUploadSize(maximumFileUploadSize),
   hCaptchaSiteKey,
   installationName,
   logo,
diff --git a/app/javascript/survey/i18n/locale/it.json b/app/javascript/survey/i18n/locale/it.json
index 55459b9da..d7d71320f 100644
--- a/app/javascript/survey/i18n/locale/it.json
+++ b/app/javascript/survey/i18n/locale/it.json
@@ -1,13 +1,13 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Caro cliente 👋, si prega di prendere qualche minuto per condividere i commenti sulla conversazione che hai avuto con {inboxName}.",
+    "DESCRIPTION": "Caro cliente 👋, ti chiediamo gentilmente di prenderti qualche minuto per condividere il tuo feedback sulla conversazione avuta con {inboxName}.",
     "RATING": {
       "LABEL": "Valuta la conversazione",
       "SUCCESS_MESSAGE": "Grazie per aver inviato la valutazione"
     },
     "FEEDBACK": {
       "LABEL": "Hai dei pensieri che vorresti condividere?",
-      "PLACEHOLDER": "Il tuo feedback (facoltativo)",
+      "PLACEHOLDER": "Il tuo feedback (opzionale)",
       "BUTTON_TEXT": "Invia feedback"
     },
     "API": {
diff --git a/app/javascript/v3/views/auth/signup/components/Signup/Form.vue b/app/javascript/v3/views/auth/signup/components/Signup/Form.vue
index 6a4497948..cb7345ef1 100644
--- a/app/javascript/v3/views/auth/signup/components/Signup/Form.vue
+++ b/app/javascript/v3/views/auth/signup/components/Signup/Form.vue
@@ -99,8 +99,14 @@ export default {
       }
       return '';
     },
+    allowedLoginMethods() {
+      return window.chatwootConfig.allowedLoginMethods || ['email'];
+    },
     showGoogleOAuth() {
-      return Boolean(window.chatwootConfig.googleOAuthClientId);
+      return (
+        this.allowedLoginMethods.includes('google_oauth') &&
+        Boolean(window.chatwootConfig.googleOAuthClientId)
+      );
     },
     isFormValid() {
       return !this.v$.$invalid && this.hasAValidCaptcha;
@@ -296,7 +302,7 @@ export default {
     </form>
     <div class="flex flex-col">
       <SimpleDivider
-        v-if="showGoogleOAuth || showSamlLogin"
+        v-if="showGoogleOAuth"
         :label="$t('COMMON.OR')"
         bg="bg-n-background"
         class="uppercase"
diff --git a/app/javascript/v3/views/login/Index.vue b/app/javascript/v3/views/login/Index.vue
index 11a61d3dd..23e598dbd 100644
--- a/app/javascript/v3/views/login/Index.vue
+++ b/app/javascript/v3/views/login/Index.vue
@@ -2,7 +2,6 @@
 // utils and composables
 import { login } from '../../api/auth';
 import { mapGetters } from 'vuex';
-import { parseBoolean } from '@chatwoot/utils';
 import { useAlert } from 'dashboard/composables';
 import { required, email } from '@vuelidate/validators';
 import { useVuelidate } from '@vuelidate/core';
@@ -85,14 +84,20 @@ export default {
   },
   computed: {
     ...mapGetters({ globalConfig: 'globalConfig/get' }),
+    allowedLoginMethods() {
+      return window.chatwootConfig.allowedLoginMethods || ['email'];
+    },
     showGoogleOAuth() {
-      return Boolean(window.chatwootConfig.googleOAuthClientId);
+      return (
+        this.allowedLoginMethods.includes('google_oauth') &&
+        Boolean(window.chatwootConfig.googleOAuthClientId)
+      );
     },
     showSignupLink() {
-      return parseBoolean(window.chatwootConfig.signupEnabled);
+      return window.chatwootConfig.signupEnabled === 'true';
     },
     showSamlLogin() {
-      return this.globalConfig.isEnterprise;
+      return this.allowedLoginMethods.includes('saml');
     },
   },
   created() {
diff --git a/app/javascript/widget/components/Availability/AvailabilityContainer.vue b/app/javascript/widget/components/Availability/AvailabilityContainer.vue
index 367564751..28abfa082 100644
--- a/app/javascript/widget/components/Availability/AvailabilityContainer.vue
+++ b/app/javascript/widget/components/Availability/AvailabilityContainer.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, toRef } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useMapGetter } from 'dashboard/composables/store.js';
 import GroupedAvatars from 'widget/components/GroupedAvatars.vue';
@@ -30,13 +30,15 @@ const { t } = useI18n();
 const availableMessage = useMapGetter('appConfig/getAvailableMessage');
 const unavailableMessage = useMapGetter('appConfig/getUnavailableMessage');
 
+// Pass toRef(props, 'agents') instead of props.agents to maintain reactivity
+// when the parent component's agents prop updates (e.g., after API response)
 const {
   currentTime,
   hasOnlineAgents,
   isOnline,
   inboxConfig,
   isInWorkingHours,
-} = useAvailability(props.agents);
+} = useAvailability(toRef(props, 'agents'));
 
 const workingHours = computed(() => inboxConfig.value.workingHours || []);
 const workingHoursEnabled = computed(
diff --git a/app/javascript/widget/components/ChatAttachment.vue b/app/javascript/widget/components/ChatAttachment.vue
index 64a20bcc7..169749527 100755
--- a/app/javascript/widget/components/ChatAttachment.vue
+++ b/app/javascript/widget/components/ChatAttachment.vue
@@ -1,11 +1,11 @@
 <script>
 import FileUpload from 'vue-upload-component';
 import Spinner from 'shared/components/Spinner.vue';
-import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import {
-  MAXIMUM_FILE_UPLOAD_SIZE,
-  ALLOWED_FILE_TYPES,
-} from 'shared/constants/messages';
+  checkFileSizeLimit,
+  resolveMaximumFileUploadSize,
+} from 'shared/helpers/FileHelper';
+import { ALLOWED_FILE_TYPES } from 'shared/constants/messages';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
 import { DirectUpload } from 'activestorage';
@@ -29,7 +29,9 @@ export default {
       shouldShowFilePicker: 'appConfig/getShouldShowFilePicker',
     }),
     fileUploadSizeLimit() {
-      return MAXIMUM_FILE_UPLOAD_SIZE;
+      return resolveMaximumFileUploadSize(
+        this.globalConfig.maximumFileUploadSize
+      );
     },
     allowedFileTypes() {
       return ALLOWED_FILE_TYPES;
@@ -73,7 +75,7 @@ export default {
       }
       this.isUploading = true;
       try {
-        if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
+        if (checkFileSizeLimit(file, this.fileUploadSizeLimit)) {
           const { websiteToken } = window.chatwootWebChannel;
           const upload = new DirectUpload(
             file.file,
@@ -115,7 +117,7 @@ export default {
       }
       this.isUploading = true;
       try {
-        if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
+        if (checkFileSizeLimit(file, this.fileUploadSizeLimit)) {
           await this.onAttach({
             file: file.file,
             ...this.getLocalFileAttributes(file),
diff --git a/app/javascript/widget/composables/useAvailability.js b/app/javascript/widget/composables/useAvailability.js
index 621584c01..cbe02a98a 100644
--- a/app/javascript/widget/composables/useAvailability.js
+++ b/app/javascript/widget/composables/useAvailability.js
@@ -1,4 +1,4 @@
-import { computed, toRef } from 'vue';
+import { computed, unref } from 'vue';
 import {
   isOnline as checkIsOnline,
   isInWorkingHours as checkInWorkingHours,
@@ -14,7 +14,11 @@ const DEFAULT_REPLY_TIME = 'in_a_few_minutes';
  * @returns {Object} Availability utilities and computed properties
  */
 export function useAvailability(agents = []) {
-  const availableAgents = toRef(agents);
+  // Now receives toRef(props, 'agents') from caller, which maintains reactivity.
+  // Use unref() inside computed to unwrap the ref value properly.
+  // This ensures availableAgents updates when the parent's agents prop changes
+  // (e.g., after API response updates the Vuex store).
+  const availableAgents = computed(() => unref(agents));
 
   const channelConfig = computed(() => window.chatwootWebChannel || {});
 
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
index ad355f61b..d4592d856 100644
--- a/app/javascript/widget/i18n/locale/it.json
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -1,7 +1,7 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
+      "DOWNLOAD": "Scarica",
       "UPLOADING": "Caricamento..."
     },
     "FORM_BUBBLE": {
@@ -26,28 +26,28 @@
     "IN_A_FEW_MINUTES": "In genere risponde in pochi minuti",
     "IN_A_FEW_HOURS": "In genere risponde in poche ore",
     "IN_A_DAY": "In genere risponde in un giorno",
-    "BACK_IN_HOURS": "Torneremo online in {n} ore | Torneremo online in {n} ore",
+    "BACK_IN_HOURS": "Torneremo online in {n} ora | Torneremo online in {n} ore",
     "BACK_IN_MINUTES": "Torneremo online in {time} minuti",
     "BACK_AT_TIME": "Torneremo online alle {time}",
-    "BACK_ON_DAY": "Torneremo online {day}",
+    "BACK_ON_DAY": "Torneremo online il {day}",
     "BACK_TOMORROW": "Torneremo online domani",
     "BACK_IN_SOME_TIME": "Torneremo online a breve"
   },
   "DAY_NAMES": {
-    "SUNDAY": "Sunday",
-    "MONDAY": "Monday",
-    "TUESDAY": "Tuesday",
-    "WEDNESDAY": "Wednesday",
-    "THURSDAY": "Thursday",
-    "FRIDAY": "Friday",
-    "SATURDAY": "Saturday"
+    "SUNDAY": "Domenica",
+    "MONDAY": "Lunedì",
+    "TUESDAY": "Martedì",
+    "WEDNESDAY": "Mercoledì",
+    "THURSDAY": "Giovedì",
+    "FRIDAY": "Venerdì",
+    "SATURDAY": "Sabato"
   },
-  "START_CONVERSATION": "Avvia conversazione",
-  "END_CONVERSATION": "Termina conversazione",
+  "START_CONVERSATION": "Avvia Conversazione",
+  "END_CONVERSATION": "Termina Conversazione",
   "CONTINUE_CONVERSATION": "Continua conversazione",
-  "YOU": "You",
+  "YOU": "Tu",
   "START_NEW_CONVERSATION": "Avvia una nuova conversazione",
-  "VIEW_UNREAD_MESSAGES": "You have unread messages",
+  "VIEW_UNREAD_MESSAGES": "Hai dei messaggi non letti",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Vedi i nuovi messaggi",
     "CLOSE_MESSAGES_BUTTON": "Chiudi",
@@ -65,35 +65,35 @@
   "PRE_CHAT_FORM": {
     "FIELDS": {
       "FULL_NAME": {
-        "LABEL": "Nome completo",
-        "PLACEHOLDER": "Per favore inserisci il tuo nome completo",
-        "REQUIRED_ERROR": "Il nome completo è obbligatorio"
+        "LABEL": "Nome Completo",
+        "PLACEHOLDER": "Inserisci il tuo nome completo",
+        "REQUIRED_ERROR": "Nome completo richiesto"
       },
       "EMAIL_ADDRESS": {
-        "LABEL": "Indirizzo email",
+        "LABEL": "Indirizzo Email",
         "PLACEHOLDER": "Inserisci il tuo indirizzo email",
-        "REQUIRED_ERROR": "L'indirizzo email è obbligatorio",
+        "REQUIRED_ERROR": "Indirizzo email richiesto",
         "VALID_ERROR": "Inserisci un indirizzo email valido"
       },
       "PHONE_NUMBER": {
-        "LABEL": "Numero di telefono",
+        "LABEL": "Numero di Telefono",
         "PLACEHOLDER": "Inserisci il tuo numero di telefono",
-        "REQUIRED_ERROR": "Il numero di telefono è obbligatorio",
-        "DIAL_CODE_VALID_ERROR": "Please select a country code",
-        "VALID_ERROR": "Please enter a valid phone number",
+        "REQUIRED_ERROR": "Numero di telefono richiesto",
+        "DIAL_CODE_VALID_ERROR": "Inserisci un codice Paese",
+        "VALID_ERROR": "Inserisci un numero di telefono valido",
         "DROPDOWN_EMPTY": "Nessun risultato trovato",
-        "DROPDOWN_SEARCH": "Search country"
+        "DROPDOWN_SEARCH": "Cerca Paese"
       },
       "MESSAGE": {
         "LABEL": "Messaggio",
-        "PLACEHOLDER": "Per favore inserisci il tuo messaggio",
+        "PLACEHOLDER": "Inserisci il tuo messaggio",
         "ERROR": "Messaggio troppo corto"
       }
     },
-    "CAMPAIGN_HEADER": "Per favore inserisci il tuo nome ed email prima di iniziare la conversazione",
-    "IS_REQUIRED": "è obbligatorio",
-    "REQUIRED": "Obbligatorio",
-    "REGEX_ERROR": "Please provide a valid input"
+    "CAMPAIGN_HEADER": "Inserisci il tuo nome ed email prima di iniziare la conversazione",
+    "IS_REQUIRED": "è richiesto",
+    "REQUIRED": "Richiesto",
+    "REGEX_ERROR": "Inserisci un input valido"
   },
   "FILE_SIZE_LIMIT": "Il file supera il limite di {MAXIMUM_FILE_UPLOAD_SIZE} per poter essere allegato",
   "CHAT_FORM": {
@@ -102,14 +102,14 @@
     }
   },
   "EMOJI": {
-    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search",
-    "ARIA_LABEL": "Emoji picker"
+    "PLACEHOLDER": "Cerca emoji",
+    "NOT_FOUND": "Nessuna emoji corrisponde alla tua ricerca",
+    "ARIA_LABEL": "Selettore emoji"
   },
   "CSAT": {
     "TITLE": "Valuta la conversazione",
     "SUBMITTED_TITLE": "Grazie per aver inviato la valutazione",
-    "PLACEHOLDER": "Raccontaci di più..."
+    "PLACEHOLDER": "Dicci di più..."
   },
   "EMAIL_TRANSCRIPT": {
     "BUTTON_TEXT": "Richiedi la trascrizione della conversazione",
@@ -118,14 +118,14 @@
   },
   "INTEGRATIONS": {
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
-      "LEAVE_THE_ROOM": "Leave the call"
+      "CLICK_HERE_TO_JOIN": "Clicca qui per unirti",
+      "LEAVE_THE_ROOM": "Abbandona la chiamata"
     }
   },
   "PORTAL": {
     "POPULAR_ARTICLES": "Articoli Popolari",
-    "VIEW_ALL_ARTICLES": "View all articles",
-    "IFRAME_LOAD_ERROR": "There was an error loading the article, please refresh the page and try again."
+    "VIEW_ALL_ARTICLES": "Visualizza tutti gli articoli",
+    "IFRAME_LOAD_ERROR": "C'è stato un errore nel caricamento dell'articolo, ricarica la pagina e riprova."
   },
   "ATTACHMENTS": {
     "image": {
@@ -138,7 +138,7 @@
       "CONTENT": "Messaggio video"
     },
     "file": {
-      "CONTENT": "File allegato"
+      "CONTENT": "File Allegato"
     },
     "location": {
       "CONTENT": "Posizione"
@@ -148,6 +148,6 @@
     }
   },
   "FOOTER_REPLY_TO": {
-    "REPLY_TO": "Replying to:"
+    "REPLY_TO": "Rispondendo a:"
   }
 }
diff --git a/app/jobs/auto_assignment/assignment_job.rb b/app/jobs/auto_assignment/assignment_job.rb
new file mode 100644
index 000000000..9c6760ecc
--- /dev/null
+++ b/app/jobs/auto_assignment/assignment_job.rb
@@ -0,0 +1,22 @@
+class AutoAssignment::AssignmentJob < ApplicationJob
+  queue_as :default
+
+  def perform(inbox_id:)
+    inbox = Inbox.find_by(id: inbox_id)
+    return unless inbox
+
+    service = AutoAssignment::AssignmentService.new(inbox: inbox)
+
+    assigned_count = service.perform_bulk_assignment(limit: bulk_assignment_limit)
+    Rails.logger.info "Assigned #{assigned_count} conversations for inbox #{inbox.id}"
+  rescue StandardError => e
+    Rails.logger.error "Bulk assignment failed for inbox #{inbox_id}: #{e.message}"
+    raise e if Rails.env.test?
+  end
+
+  private
+
+  def bulk_assignment_limit
+    ENV.fetch('AUTO_ASSIGNMENT_BULK_LIMIT', 100).to_i
+  end
+end
diff --git a/app/jobs/auto_assignment/periodic_assignment_job.rb b/app/jobs/auto_assignment/periodic_assignment_job.rb
new file mode 100644
index 000000000..63500507e
--- /dev/null
+++ b/app/jobs/auto_assignment/periodic_assignment_job.rb
@@ -0,0 +1,19 @@
+class AutoAssignment::PeriodicAssignmentJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  def perform
+    Account.find_in_batches do |accounts|
+      accounts.each do |account|
+        next unless account.feature_enabled?('assignment_v2')
+
+        account.inboxes.joins(:assignment_policy).find_in_batches do |inboxes|
+          inboxes.each do |inbox|
+            next unless inbox.auto_assignment_v2_enabled?
+
+            AutoAssignment::AssignmentJob.perform_later(inbox_id: inbox.id)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/jobs/contacts/bulk_action_job.rb b/app/jobs/contacts/bulk_action_job.rb
new file mode 100644
index 000000000..e05a9541f
--- /dev/null
+++ b/app/jobs/contacts/bulk_action_job.rb
@@ -0,0 +1,14 @@
+class Contacts::BulkActionJob < ApplicationJob
+  queue_as :medium
+
+  def perform(account_id, user_id, params)
+    account = Account.find(account_id)
+    user = User.find(user_id)
+
+    Contacts::BulkActionService.new(
+      account: account,
+      user: user,
+      params: params
+    ).perform
+  end
+end
diff --git a/app/jobs/data_import_job.rb b/app/jobs/data_import_job.rb
index 630e5840e..9b94e3a16 100644
--- a/app/jobs/data_import_job.rb
+++ b/app/jobs/data_import_job.rb
@@ -1,154 +1,176 @@
 # TODO: logic is written tailored to contact import since its the only import available
-# let's break this logic and clean this up in future
+  # let's break this logic and clean this up in future
 
-class DataImportJob < ApplicationJob
-  queue_as :low
-  retry_on ActiveStorage::FileNotFoundError, wait: 1.minute, attempts: 3
+  class DataImportJob < ApplicationJob
+    queue_as :low
+    retry_on ActiveStorage::FileNotFoundError, wait: 1.minute, attempts: 3
 
-  def perform(data_import)
-    @data_import = data_import
-    @contact_manager = DataImport::ContactManager.new(@data_import.account)
-    begin
-      process_import_file
-      send_import_notification_to_admin
-    rescue CSV::MalformedCSVError => e
-      handle_csv_error(e)
+    def perform(data_import)
+      @data_import = data_import
+      @contact_manager = DataImport::ContactManager.new(@data_import.account)
+      begin
+        process_import_file
+        send_import_notification_to_admin
+      rescue CSV::MalformedCSVError => e
+        handle_csv_error(e)
+      end
     end
-  end
 
-  private
+    private
 
-  def process_import_file
-    @data_import.update!(status: :processing)
-    identifiable_contacts, non_identifiable_contacts, rejected_contacts, total_csv_records = parse_csv_and_build_contacts
+    def process_import_file
+      @data_import.update!(status: :processing)
+      identifiable_contacts, non_identifiable_contacts, rejected_contacts, total_csv_records = parse_csv_and_build_contacts
 
-    all_valid_contacts = identifiable_contacts + non_identifiable_contacts
+      all_valid_contacts = identifiable_contacts + non_identifiable_contacts
 
-    # Count contacts before import
-    contacts_before = @data_import.account.contacts.count
+      # Count contacts before import
+      contacts_before = @data_import.account.contacts.count
 
-    import_contacts(all_valid_contacts)
+      import_contacts(all_valid_contacts)
 
-    # Count contacts after import to get actual imported count
-    contacts_after = @data_import.account.contacts.count
-    actual_imported_count = contacts_after - contacts_before
+      # Count contacts after import to get actual imported count
+      contacts_after = @data_import.account.contacts.count
+      actual_imported_count = contacts_after - contacts_before
 
-    # Calculate actual imported counts based on what we built vs what was imported
-    actual_identifiable_count, actual_non_identifiable_count = calculate_actual_import_counts(
-      identifiable_contacts, non_identifiable_contacts, actual_imported_count
-    )
+      # Calculate actual imported counts based on what we built vs what was imported
+      actual_identifiable_count, actual_non_identifiable_count = calculate_actual_import_counts(
+        identifiable_contacts, non_identifiable_contacts, actual_imported_count
+      )
 
-    update_data_import_status(actual_identifiable_count, actual_non_identifiable_count, rejected_contacts.length, total_csv_records)
-    save_failed_records_csv(rejected_contacts)
-  end
+      update_data_import_status(actual_identifiable_count, actual_non_identifiable_count, rejected_contacts.length, total_csv_records)
+      save_failed_records_csv(rejected_contacts)
+    end
 
-  # rubocop:disable Metrics/MethodLength
-  def parse_csv_and_build_contacts
-    identifiable_contacts = []
-    non_identifiable_contacts = []
-    rejected_contacts = []
-    # Ensuring that importing non utf-8 characters will not throw error
-    data = @data_import.import_file.download
-    utf8_data = data.force_encoding('UTF-8')
+    # rubocop:disable Metrics/MethodLength
+    def parse_csv_and_build_contacts
+      identifiable_contacts = []
+      non_identifiable_contacts = []
+      rejected_contacts = []
+      total_csv_records = 0
 
-    # Ensure that the data is valid UTF-8, preserving valid characters
-    clean_data = utf8_data.valid_encoding? ? utf8_data : utf8_data.encode('UTF-16le', invalid: :replace, replace: '').encode('UTF-8')
+      with_import_file do |file|
+        csv_reader(file).each do |row|
+          total_csv_records += 1
+          current_contact = @contact_manager.build_contact(row.to_h.with_indifferent_access)
+          if current_contact.valid?
+            is_identifiable = @contact_manager.contact_identifiable?(current_contact)
 
-    csv = CSV.parse(clean_data, headers: true)
-    total_csv_records = csv.length
-
-    csv.each do |row|
-      current_contact = @contact_manager.build_contact(row.to_h.with_indifferent_access)
-      if current_contact.valid?
-        is_identifiable = @contact_manager.contact_identifiable?(current_contact)
-
-        if is_identifiable
-          identifiable_contacts << current_contact
-        else
-          non_identifiable_contacts << current_contact
+            if is_identifiable
+              identifiable_contacts << current_contact
+            else
+              non_identifiable_contacts << current_contact
+            end
+          else
+            append_rejected_contact(row, current_contact, rejected_contacts)
+          end
         end
+      end
+
+      [identifiable_contacts, non_identifiable_contacts, rejected_contacts, total_csv_records]
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    def append_rejected_contact(row, contact, rejected_contacts)
+      row['errors'] = contact.errors.full_messages.join(', ')
+      rejected_contacts << row
+    end
+
+    def import_contacts(contacts)
+      # Returns ActiveRecord::Import::Result with info about what was actually imported
+      Contact.import(contacts, synchronize: contacts, on_duplicate_key_ignore: true, track_validation_failures: true, validate: true, batch_size: 1000)
+    end
+
+    def calculate_actual_import_counts(identifiable_contacts, non_identifiable_contacts, actual_imported_count)
+      Rails.logger.info "Actual imported: #{actual_imported_count}, expected identifiable: #{identifiable_contacts.length}, " \
+                        "expected non-identifiable: #{non_identifiable_contacts.length}"
+
+      expected_count = identifiable_contacts.length + non_identifiable_contacts.length
+
+      if actual_imported_count <= expected_count
+        # Prioritize identifiable contacts in the count since they're more important
+        actual_identifiable_count = [actual_imported_count, identifiable_contacts.length].min
+        actual_non_identifiable_count = actual_imported_count - actual_identifiable_count
       else
-        append_rejected_contact(row, current_contact, rejected_contacts)
+        # This shouldn't happen, but fallback to expected counts
+        actual_identifiable_count = identifiable_contacts.length
+        actual_non_identifiable_count = non_identifiable_contacts.length
+      end
+
+      Rails.logger.info "Final counts: identifiable=#{actual_identifiable_count}, non-identifiable=#{actual_non_identifiable_count}"
+
+      [actual_identifiable_count, actual_non_identifiable_count]
+    end
+
+    def update_data_import_status(identifiable_records, non_identifiable_records, _rejected_records, total_csv_records)
+      processed_records = identifiable_records + non_identifiable_records
+      @data_import.update!(
+        status: :completed,
+        processed_records: processed_records,
+        non_identifiable_records: non_identifiable_records,
+        total_records: total_csv_records
+      )
+    end
+
+    def save_failed_records_csv(rejected_contacts)
+      csv_data = generate_csv_data(rejected_contacts)
+      return if csv_data.blank?
+
+      @data_import.failed_records.attach(io: StringIO.new(csv_data), filename: "#{Time.zone.today.strftime('%Y%m%d')}_contacts.csv",
+                                         content_type: 'text/csv')
+      send_import_notification_to_admin
+    end
+
+    def generate_csv_data(rejected_contacts)
+      headers = csv_headers
+      headers << 'errors'
+      return if rejected_contacts.blank?
+
+      CSV.generate do |csv|
+        csv << headers
+        rejected_contacts.each do |record|
+          csv << record
+        end
       end
     end
 
-    [identifiable_contacts, non_identifiable_contacts, rejected_contacts, total_csv_records]
-  end
-  # rubocop:enable Metrics/MethodLength
-
-  def append_rejected_contact(row, contact, rejected_contacts)
-    row['errors'] = contact.errors.full_messages.join(', ')
-    rejected_contacts << row
-  end
-
-  def import_contacts(contacts)
-    # Returns ActiveRecord::Import::Result with info about what was actually imported
-    Contact.import(contacts, synchronize: contacts, on_duplicate_key_ignore: true, track_validation_failures: true, validate: true, batch_size: 1000)
-  end
-
-  def calculate_actual_import_counts(identifiable_contacts, non_identifiable_contacts, actual_imported_count)
-    Rails.logger.info "Actual imported: #{actual_imported_count}, expected identifiable: #{identifiable_contacts.length}, " \
-                      "expected non-identifiable: #{non_identifiable_contacts.length}"
-
-    expected_count = identifiable_contacts.length + non_identifiable_contacts.length
-
-    if actual_imported_count <= expected_count
-      # Prioritize identifiable contacts in the count since they're more important
-      actual_identifiable_count = [actual_imported_count, identifiable_contacts.length].min
-      actual_non_identifiable_count = actual_imported_count - actual_identifiable_count
-    else
-      # This shouldn't happen, but fallback to expected counts
-      actual_identifiable_count = identifiable_contacts.length
-      actual_non_identifiable_count = non_identifiable_contacts.length
+    def handle_csv_error(error) # rubocop:disable Lint/UnusedMethodArgument
+      @data_import.update!(status: :failed)
+      send_import_failed_notification_to_admin
     end
 
-    Rails.logger.info "Final counts: identifiable=#{actual_identifiable_count}, non-identifiable=#{actual_non_identifiable_count}"
+    def send_import_notification_to_admin
+      AdministratorNotifications::AccountNotificationMailer.with(account: @data_import.account).contact_import_complete(@data_import).deliver_later
+    end
 
-    [actual_identifiable_count, actual_non_identifiable_count]
-  end
+    def send_import_failed_notification_to_admin
+      AdministratorNotifications::AccountNotificationMailer.with(account: @data_import.account).contact_import_failed.deliver_later
+    end
 
-  def update_data_import_status(identifiable_records, non_identifiable_records, _rejected_records, total_csv_records)
-    processed_records = identifiable_records + non_identifiable_records
-    @data_import.update!(
-      status: :completed,
-      processed_records: processed_records,
-      non_identifiable_records: non_identifiable_records,
-      total_records: total_csv_records
-    )
-  end
+    def csv_headers
+      header_row = nil
+      with_import_file do |file|
+        header_row = csv_reader(file).first
+      end
+      header_row&.headers || []
+    end
 
-  def save_failed_records_csv(rejected_contacts)
-    csv_data = generate_csv_data(rejected_contacts)
-    return if csv_data.blank?
+    def csv_reader(file)
+      file.rewind
+      raw_data = file.read
+      utf8_data = raw_data.force_encoding('UTF-8')
+      clean_data = utf8_data.valid_encoding? ? utf8_data : utf8_data.encode('UTF-16le', invalid: :replace, replace: '').encode('UTF-8')
 
-    @data_import.failed_records.attach(io: StringIO.new(csv_data), filename: "#{Time.zone.today.strftime('%Y%m%d')}_contacts.csv",
-                                       content_type: 'text/csv')
-    send_import_notification_to_admin
-  end
+      CSV.new(StringIO.new(clean_data), headers: true)
+    end
 
-  def generate_csv_data(rejected_contacts)
-    headers = CSV.parse(@data_import.import_file.download, headers: true).headers
-    headers << 'errors'
-    return if rejected_contacts.blank?
+    def with_import_file
+      temp_dir = Rails.root.join('tmp/imports')
+      FileUtils.mkdir_p(temp_dir)
 
-    CSV.generate do |csv|
-      csv << headers
-      rejected_contacts.each do |record|
-        csv << record
+      @data_import.import_file.open(tmpdir: temp_dir) do |file|
+        file.binmode
+        yield file
       end
     end
-  end
-
-  def handle_csv_error(error) # rubocop:disable Lint/UnusedMethodArgument
-    @data_import.update!(status: :failed)
-    send_import_failed_notification_to_admin
-  end
-
-  def send_import_notification_to_admin
-    AdministratorNotifications::AccountNotificationMailer.with(account: @data_import.account).contact_import_complete(@data_import).deliver_later
-  end
-
-  def send_import_failed_notification_to_admin
-    AdministratorNotifications::AccountNotificationMailer.with(account: @data_import.account).contact_import_failed.deliver_later
-  end
-end
+  end
\ No newline at end of file
diff --git a/app/jobs/migration/backfill_companies_contacts_count_job.rb b/app/jobs/migration/backfill_companies_contacts_count_job.rb
new file mode 100644
index 000000000..2cae9eeee
--- /dev/null
+++ b/app/jobs/migration/backfill_companies_contacts_count_job.rb
@@ -0,0 +1,13 @@
+class Migration::BackfillCompaniesContactsCountJob < ApplicationJob
+  queue_as :async_database_migration
+
+  def perform
+    return unless ChatwootApp.enterprise?
+
+    Company.find_in_batches(batch_size: 100) do |company_batch|
+      company_batch.each do |company|
+        Company.reset_counters(company.id, :contacts)
+      end
+    end
+  end
+end
diff --git a/app/jobs/webhooks/instagram_events_job.rb b/app/jobs/webhooks/instagram_events_job.rb
index 3db8b6ba9..6383daff8 100644
--- a/app/jobs/webhooks/instagram_events_job.rb
+++ b/app/jobs/webhooks/instagram_events_job.rb
@@ -8,7 +8,7 @@ class Webhooks::InstagramEventsJob < MutexApplicationJob
   def perform(entries)
     @entries = entries
 
-    key = format(::Redis::Alfred::IG_MESSAGE_MUTEX, sender_id: sender_id, ig_account_id: ig_account_id)
+    key = format(::Redis::Alfred::IG_MESSAGE_MUTEX, sender_id: contact_instagram_id, ig_account_id: ig_account_id)
     with_lock(key) do
       process_entries(entries)
     end
@@ -77,6 +77,23 @@ class Webhooks::InstagramEventsJob < MutexApplicationJob
     @entries&.first&.dig(:id)
   end
 
+  def contact_instagram_id
+    entry = @entries&.first
+    return nil unless entry
+
+    # Handle both messaging and standby arrays
+    messaging = (entry[:messaging].presence || entry[:standby] || []).first
+    return nil unless messaging
+
+    # For echo messages (outgoing from our account), use recipient's ID (the contact)
+    # For incoming messages (from contact), use sender's ID (the contact)
+    if messaging.dig(:message, :is_echo)
+      messaging.dig(:recipient, :id)
+    else
+      messaging.dig(:sender, :id)
+    end
+  end
+
   def sender_id
     @entries&.dig(0, :messaging, 0, :sender, :id)
   end
diff --git a/app/listeners/agent_bot_listener.rb b/app/listeners/agent_bot_listener.rb
index 38c046e34..ccac8005f 100644
--- a/app/listeners/agent_bot_listener.rb
+++ b/app/listeners/agent_bot_listener.rb
@@ -2,61 +2,60 @@ class AgentBotListener < BaseListener
   def conversation_resolved(event)
     conversation = extract_conversation_and_account(event)[0]
     inbox = conversation.inbox
-    return unless connected_agent_bot_exist?(inbox)
-
     event_name = __method__.to_s
     payload = conversation.webhook_data.merge(event: event_name)
-    process_webhook_bot_event(inbox.agent_bot, payload)
+    agent_bots_for(inbox, conversation).each { |agent_bot| process_webhook_bot_event(agent_bot, payload) }
   end
 
   def conversation_opened(event)
     conversation = extract_conversation_and_account(event)[0]
     inbox = conversation.inbox
-    return unless connected_agent_bot_exist?(inbox)
-
     event_name = __method__.to_s
     payload = conversation.webhook_data.merge(event: event_name)
-    process_webhook_bot_event(inbox.agent_bot, payload)
+    agent_bots_for(inbox, conversation).each { |agent_bot| process_webhook_bot_event(agent_bot, payload) }
   end
 
   def message_created(event)
     message = extract_message_and_account(event)[0]
     inbox = message.inbox
-    return unless connected_agent_bot_exist?(inbox)
     return unless message.webhook_sendable?
 
     method_name = __method__.to_s
-    process_message_event(method_name, inbox.agent_bot, message, event)
+    agent_bots_for(inbox, message.conversation).each { |agent_bot| process_message_event(method_name, agent_bot, message, event) }
   end
 
   def message_updated(event)
     message = extract_message_and_account(event)[0]
     inbox = message.inbox
-    return unless connected_agent_bot_exist?(inbox)
     return unless message.webhook_sendable?
 
     method_name = __method__.to_s
-    process_message_event(method_name, inbox.agent_bot, message, event)
+    agent_bots_for(inbox, message.conversation).each { |agent_bot| process_message_event(method_name, agent_bot, message, event) }
   end
 
   def webwidget_triggered(event)
     contact_inbox = event.data[:contact_inbox]
     inbox = contact_inbox.inbox
-    return unless connected_agent_bot_exist?(inbox)
-
     event_name = __method__.to_s
     payload = contact_inbox.webhook_data.merge(event: event_name)
     payload[:event_info] = event.data[:event_info]
-    process_webhook_bot_event(inbox.agent_bot, payload)
+    agent_bots_for(inbox).each { |agent_bot| process_webhook_bot_event(agent_bot, payload) }
   end
 
   private
 
-  def connected_agent_bot_exist?(inbox)
-    return if inbox.agent_bot_inbox.blank?
-    return unless inbox.agent_bot_inbox.active?
+  def agent_bots_for(inbox, conversation = nil)
+    bots = []
+    bots << conversation.assignee_agent_bot if conversation&.assignee_agent_bot.present?
+    inbox_bot = active_inbox_agent_bot(inbox)
+    bots << inbox_bot if inbox_bot.present?
+    bots.compact.uniq
+  end
 
-    true
+  def active_inbox_agent_bot(inbox)
+    return unless inbox.agent_bot_inbox&.active?
+
+    inbox.agent_bot
   end
 
   def process_message_event(method_name, agent_bot, message, _event)
diff --git a/app/mailboxes/application_mailbox.rb b/app/mailboxes/application_mailbox.rb
index 9fc7a435d..a77f5ea43 100644
--- a/app/mailboxes/application_mailbox.rb
+++ b/app/mailboxes/application_mailbox.rb
@@ -4,38 +4,21 @@ class ApplicationMailbox < ActionMailbox::Base
   # Last part is the regex for the UUID
   # Eg: email should be something like : reply+6bdc3f4d-0bec-4515-a284-5d916fdde489@domain.com
   REPLY_EMAIL_UUID_PATTERN = /^reply\+([0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12})$/i
-  CONVERSATION_MESSAGE_ID_PATTERN = %r{conversation/([a-zA-Z0-9-]*?)/messages/(\d+?)@(\w+\.\w+)}
 
-  # routes as a reply to existing conversations
+  # Route all emails to verified channels to the unified reply mailbox
+  # The ConversationFinder will determine if it's a reply or new conversation
   routing(
-    ->(inbound_mail) { valid_to_address?(inbound_mail) && (reply_uuid_mail?(inbound_mail) || in_reply_to_mail?(inbound_mail)) } => :reply
-  )
-
-  # routes as a new conversation in email channel
-  routing(
-    ->(inbound_mail) { valid_to_address?(inbound_mail) && EmailChannelFinder.new(inbound_mail.mail).perform.present? } => :support
+    lambda { |inbound_mail|
+      valid_to_address?(inbound_mail) &&
+      (reply_uuid_mail?(inbound_mail) || EmailChannelFinder.new(inbound_mail.mail).perform.present?)
+    } => :reply
   )
 
   # catchall
   routing(all: :default)
 
   class << self
-    # checks if follow this pattern then send it to reply_mailbox
-    # <account/#{@account.id}/conversation/#{@conversation.uuid}@#{@account.inbound_email_domain}>
-    def in_reply_to_mail?(inbound_mail)
-      in_reply_to = inbound_mail.mail.in_reply_to
-
-      in_reply_to.present? && (
-        in_reply_to_matches?(in_reply_to) || Message.exists?(source_id: in_reply_to)
-      )
-    end
-
-    def in_reply_to_matches?(in_reply_to)
-      Array.wrap(in_reply_to).any? { it.match?(CONVERSATION_MESSAGE_ID_PATTERN) }
-    end
-
-    # checks if follow this pattern  send it to reply_mailbox
-    # reply+<conversation-uuid>@<mailer-domain.com>
+    # checks if follows this pattern: reply+<conversation-uuid>@<mailer-domain.com>
     def reply_uuid_mail?(inbound_mail)
       inbound_mail.mail.to&.any? do |email|
         conversation_uuid = email.split('@')[0]
diff --git a/app/mailboxes/imap/imap_mailbox.rb b/app/mailboxes/imap/imap_mailbox.rb
index 5fea49722..27bc88e06 100644
--- a/app/mailboxes/imap/imap_mailbox.rb
+++ b/app/mailboxes/imap/imap_mailbox.rb
@@ -3,6 +3,8 @@ class Imap::ImapMailbox
   include IncomingEmailValidityHelper
   attr_accessor :channel, :account, :inbox, :conversation, :processed_mail
 
+  FALLBACK_CONVERSATION_PATTERN = %r{account/(\d+)/conversation/([a-zA-Z0-9-]+)@}
+
   def process(mail, channel)
     @inbound_mail = mail
     @channel = channel
@@ -49,19 +51,32 @@ class Imap::ImapMailbox
   end
 
   def find_conversation_by_reference_ids
-    return if @inbound_mail.references.blank? && in_reply_to.present?
+    return if @inbound_mail.references.blank?
 
     message = find_message_by_references
+    if message.present?
+      conversation = @inbox.conversations.find_by(id: message.conversation_id)
+      return conversation if conversation.present?
+    end
 
-    return if message.nil?
-
-    @inbox.conversations.find(message.conversation_id)
+    # FALLBACK_PATTERN use to find a conversation that is started by an agent (no incoming message yet)
+    conversation_id = find_conversation_by_references
+    @inbox.conversations.find_by(uuid: conversation_id) if conversation_id.present?
   end
 
   def in_reply_to
     @processed_mail.in_reply_to
   end
 
+  def find_conversation_by_references
+    references = Array.wrap(@inbound_mail.references)
+    references.each do |message_id|
+      match = FALLBACK_CONVERSATION_PATTERN.match(message_id)
+
+      return match[2] if match.present?
+    end
+  end
+
   def find_message_by_references
     message_to_return = nil
 
diff --git a/app/mailboxes/reply_mailbox.rb b/app/mailboxes/reply_mailbox.rb
index 0b1efd09a..6e766f83e 100644
--- a/app/mailboxes/reply_mailbox.rb
+++ b/app/mailboxes/reply_mailbox.rb
@@ -1,88 +1,38 @@
 class ReplyMailbox < ApplicationMailbox
-  attr_accessor :conversation_uuid, :processed_mail
+  attr_accessor :conversation, :processed_mail
 
-  # Last part is the regex for the UUID
-  # Eg: email should be something like : reply+6bdc3f4d-0bec-4515-a284-5d916fdde489@domain.com
-  EMAIL_PART_PATTERN = /^reply\+([0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12})$/i
-
-  before_processing :conversation_uuid_from_to_address,
-                    :find_relative_conversation
+  before_processing :find_conversation
 
   def process
-    return if @conversation.blank?
+    # Return early if no conversation was found (e.g., notification emails, suspended accounts)
+    return unless @conversation
 
-    decorate_mail
-    create_message
-    add_attachments_to_message
+    # Wrap everything in a transaction to ensure atomicity
+    # This prevents orphan conversations if message/attachment creation fails
+    # and ensures idempotency on job retry (conversation won't be duplicated)
+    ActiveRecord::Base.transaction do
+      persist_conversation_if_needed
+      decorate_mail
+      create_message
+      add_attachments_to_message
+    end
   end
 
   private
 
-  def find_relative_conversation
-    if @conversation_uuid
-      find_conversation_with_uuid
-    elsif mail.in_reply_to.present?
-      find_conversation_with_in_reply_to
-    end
+  def find_conversation
+    @conversation = Mailbox::ConversationFinder.new(mail).find
+    # Log when email is rejected
+    Rails.logger.info "Email #{mail.message_id} rejected - no conversation found" unless @conversation
   end
 
-  def conversation_uuid_from_to_address
-    @mail = MailPresenter.new(mail)
+  def persist_conversation_if_needed
+    # Save the conversation if it's a new record (from NewConversationStrategy)
+    # We persist here instead of in the strategy to maintain transaction integrity
+    return unless @conversation.new_record?
 
-    return if @mail.mail_receiver.blank?
-
-    @mail.mail_receiver.each do |email|
-      username = email.split('@')[0]
-      match_result = username.match(ApplicationMailbox::REPLY_EMAIL_UUID_PATTERN)
-      if match_result
-        @conversation_uuid = match_result.captures
-        break
-      end
-    end
-    @conversation_uuid
-  end
-
-  # find conversation uuid from below pattern
-  # reply+<conversation-uuid>@<mailer-domain.com>
-  def find_conversation_with_uuid
-    @conversation = Conversation.find_by(uuid: conversation_uuid)
-    validate_resource @conversation
-  end
-
-  def find_conversation_by_uuid(match_result)
-    @conversation_uuid = match_result.captures[0]
-
-    find_conversation_with_uuid
-  end
-
-  def find_conversation_by_message_id(in_reply_to)
-    @message = Message.find_by(source_id: in_reply_to)
-    @conversation = @message.conversation if @message.present?
-    @conversation_uuid = @conversation.uuid if @conversation.present?
-  end
-
-  # find conversation uuid from below pattern
-  # <conversation/#{@conversation.uuid}/messages/#{@messages&.last&.id}@#{@account.inbound_email_domain}>
-  def find_conversation_with_in_reply_to
-    match_result = nil
-    in_reply_to_addresses = mail.in_reply_to
-    in_reply_to_addresses = [in_reply_to_addresses] if in_reply_to_addresses.is_a?(String)
-    in_reply_to_addresses.each do |in_reply_to|
-      match_result = in_reply_to.match(::ApplicationMailbox::CONVERSATION_MESSAGE_ID_PATTERN)
-      break if match_result
-    end
-    find_by_in_reply_to_addresses(match_result, in_reply_to_addresses)
-  end
-
-  def find_by_in_reply_to_addresses(match_result, in_reply_to_addresses)
-    find_conversation_by_uuid(match_result) if match_result
-    find_conversation_by_message_id(in_reply_to_addresses) if @conversation.blank?
-  end
-
-  def validate_resource(resource)
-    Rails.logger.error "[App::Mailboxes::ReplyMailbox] Email conversation with uuid: #{conversation_uuid} not found" if resource.nil?
-
-    resource
+    @conversation.save!
+    Rails.logger.info "Created new conversation #{@conversation.id} for email #{mail.message_id}"
   end
 
   def decorate_mail
diff --git a/app/mailboxes/support_mailbox.rb b/app/mailboxes/support_mailbox.rb
deleted file mode 100644
index 6279293b2..000000000
--- a/app/mailboxes/support_mailbox.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-class SupportMailbox < ApplicationMailbox
-  include IncomingEmailValidityHelper
-  attr_accessor :channel, :account, :inbox, :conversation, :processed_mail
-
-  before_processing :find_channel,
-                    :load_account,
-                    :load_inbox,
-                    :decorate_mail
-
-  def process
-    Rails.logger.info "Processing email #{mail.message_id} from #{original_sender_email} to #{mail.to} with subject #{mail.subject}"
-
-    # Skip processing email if it belongs to any of the edge cases
-    return unless incoming_email_from_valid_email?
-
-    ActiveRecord::Base.transaction do
-      find_or_create_contact
-      find_or_create_conversation
-      create_message
-      add_attachments_to_message
-    end
-  end
-
-  private
-
-  def find_channel
-    find_channel_with_to_mail if @channel.blank?
-
-    raise 'Email channel/inbox not found' if @channel.nil?
-
-    @channel
-  end
-
-  def find_channel_with_to_mail
-    @channel = EmailChannelFinder.new(mail).perform
-  end
-
-  def load_account
-    @account = @channel.account
-  end
-
-  def load_inbox
-    @inbox = @channel.inbox
-  end
-
-  def decorate_mail
-    @processed_mail = MailPresenter.new(mail, @account)
-  end
-
-  def find_conversation_by_in_reply_to
-    return if in_reply_to.blank?
-
-    @account.conversations.where("additional_attributes->>'in_reply_to' = ?", in_reply_to).first
-  end
-
-  def in_reply_to
-    mail['In-Reply-To'].try(:value)
-  end
-
-  def original_sender_email
-    @processed_mail.original_sender&.downcase
-  end
-
-  def find_or_create_conversation
-    @conversation = find_conversation_by_in_reply_to || ::Conversation.create!({
-                                                                                 account_id: @account.id,
-                                                                                 inbox_id: @inbox.id,
-                                                                                 contact_id: @contact.id,
-                                                                                 contact_inbox_id: @contact_inbox.id,
-                                                                                 additional_attributes: {
-                                                                                   in_reply_to: in_reply_to,
-                                                                                   source: 'email',
-                                                                                   auto_reply: @processed_mail.auto_reply?,
-                                                                                   mail_subject: @processed_mail.subject,
-                                                                                   initiated_at: {
-                                                                                     timestamp: Time.now.utc
-                                                                                   }
-                                                                                 }
-                                                                               })
-  end
-
-  def find_or_create_contact
-    @contact = @inbox.contacts.from_email(original_sender_email)
-    if @contact.present?
-      @contact_inbox = ContactInbox.find_by(inbox: @inbox, contact: @contact)
-    else
-      create_contact
-    end
-  end
-
-  def identify_contact_name
-    processed_mail.sender_name || processed_mail.from.first.split('@').first
-  end
-end
diff --git a/app/mailers/conversation_reply_mailer_attachment_helper.rb b/app/mailers/conversation_reply_mailer_attachment_helper.rb
new file mode 100644
index 000000000..f4c0e2282
--- /dev/null
+++ b/app/mailers/conversation_reply_mailer_attachment_helper.rb
@@ -0,0 +1,51 @@
+# Handles attachment processing for ConversationReplyMailer flows.
+module ConversationReplyMailerAttachmentHelper
+  private
+
+  def process_attachments_as_files_for_email_reply
+    # Attachment processing for direct email replies (when replying to a single message)
+    #
+    # How attachments are handled:
+    # 1. Total file size (<20MB): Added directly to the email as proper attachments
+    # 2. Total file size (>20MB): Added to @large_attachments to be displayed as links in the email
+
+    @options[:attachments] = []
+    @large_attachments = []
+    current_total_size = 0
+
+    @message.attachments.each do |attachment|
+      current_total_size = handle_attachment_inline(current_total_size, attachment)
+    end
+  end
+
+  def read_blob_content(blob)
+    buffer = +''
+    blob.open do |file|
+      while (chunk = file.read(64.kilobytes))
+        buffer << chunk
+      end
+    end
+    buffer
+  end
+
+  def handle_attachment_inline(current_total_size, attachment)
+    blob = attachment.file.blob
+    return current_total_size if blob.blank?
+
+    file_size = blob.byte_size
+    attachment_name = attachment.file.filename.to_s
+
+    if current_total_size + file_size <= 20.megabytes
+      content = read_blob_content(blob)
+      mail.attachments[attachment_name] = {
+        mime_type: attachment.file.content_type || 'application/octet-stream',
+        content: content
+      }
+      @options[:attachments] << { name: attachment_name }
+      current_total_size + file_size
+    else
+      @large_attachments << attachment
+      current_total_size
+    end
+  end
+end
diff --git a/app/mailers/conversation_reply_mailer_helper.rb b/app/mailers/conversation_reply_mailer_helper.rb
index 2fe3695f9..cce236ec7 100644
--- a/app/mailers/conversation_reply_mailer_helper.rb
+++ b/app/mailers/conversation_reply_mailer_helper.rb
@@ -1,4 +1,6 @@
 module ConversationReplyMailerHelper
+  include ConversationReplyMailerAttachmentHelper
+
   def prepare_mail(cc_bcc_enabled)
     @options = {
       to: to_emails,
@@ -27,34 +29,6 @@ module ConversationReplyMailerHelper
     mail(@options)
   end
 
-  def process_attachments_as_files_for_email_reply
-    # Attachment processing for direct email replies (when replying to a single message)
-    #
-    # How attachments are handled:
-    # 1. Total file size (<20MB): Added directly to the email as proper attachments
-    # 2. Total file size (>20MB): Added to @large_attachments to be displayed as links in the email
-
-    @options[:attachments] = []
-    @large_attachments = []
-    current_total_size = 0
-
-    @message.attachments.each do |attachment|
-      raw_data = attachment.file.download
-      attachment_name = attachment.file.filename.to_s
-      file_size = raw_data.bytesize
-
-      # Attach files directly until we hit 20MB total
-      # After reaching 20MB, send remaining files as links
-      if current_total_size + file_size <= 20.megabytes
-        mail.attachments[attachment_name] = raw_data
-        @options[:attachments] << { name: attachment_name }
-        current_total_size += file_size
-      else
-        @large_attachments << attachment
-      end
-    end
-  end
-
   private
 
   def oauth_smtp_settings
diff --git a/app/models/account.rb b/app/models/account.rb
index 7efb13bb5..06767939d 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -48,6 +48,7 @@ class Account < ApplicationRecord
     check_for_column: false
   }.freeze
 
+  validates :name, presence: true
   validates :domain, length: { maximum: 100 }
   validates_with JsonSchemaValidator,
                  schema: SETTINGS_PARAMS_SCHEMA,
diff --git a/app/models/agent_bot.rb b/app/models/agent_bot.rb
index be63aebc5..b839f21b4 100644
--- a/app/models/agent_bot.rb
+++ b/app/models/agent_bot.rb
@@ -21,9 +21,18 @@ class AgentBot < ApplicationRecord
   include AccessTokenable
   include Avatarable
 
+  scope :accessible_to, lambda { |account|
+    account_id = account&.id
+    where(account_id: [nil, account_id])
+  }
+
   has_many :agent_bot_inboxes, dependent: :destroy_async
   has_many :inboxes, through: :agent_bot_inboxes
   has_many :messages, as: :sender, dependent: :nullify
+  has_many :assigned_conversations, class_name: 'Conversation',
+                                    foreign_key: :assignee_agent_bot_id,
+                                    dependent: :nullify,
+                                    inverse_of: :assignee_agent_bot
   belongs_to :account, optional: true
   enum bot_type: { webhook: 0 }
 
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 42ca79d6c..0c45f2292 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -40,7 +40,7 @@ class Attachment < ApplicationRecord
   validate :acceptable_file
   validates :external_url, length: { maximum: Limits::URL_LENGTH_LIMIT }
   enum file_type: { :image => 0, :audio => 1, :video => 2, :file => 3, :location => 4, :fallback => 5, :share => 6, :story_mention => 7,
-                    :contact => 8, :ig_reel => 9 }
+                    :contact => 8, :ig_reel => 9, :ig_post => 10, :ig_story => 11 }
 
   def push_event_data
     return unless file_type
@@ -166,7 +166,10 @@ class Attachment < ApplicationRecord
   end
 
   def validate_file_size(byte_size)
-    errors.add(:file, 'size is too big') if byte_size > 40.megabytes
+    limit_mb = GlobalConfigService.load('MAXIMUM_FILE_UPLOAD_SIZE', 40).to_i
+    limit_mb = 40 if limit_mb <= 0
+
+    errors.add(:file, 'size is too big') if byte_size > limit_mb.megabytes
   end
 
   def media_file?(file_content_type)
diff --git a/app/models/channel/line.rb b/app/models/channel/line.rb
index 63b0924da..ad1d2a843 100644
--- a/app/models/channel/line.rb
+++ b/app/models/channel/line.rb
@@ -40,6 +40,8 @@ class Channel::Line < ApplicationRecord
       config.channel_id = line_channel_id
       config.channel_secret = line_channel_secret
       config.channel_token = line_channel_token
+      # Skip SSL verification in development to avoid certificate issues
+      config.http_options = { verify_mode: OpenSSL::SSL::VERIFY_NONE } if Rails.env.development?
     end
   end
 end
diff --git a/app/models/concerns/auto_assignment_handler.rb b/app/models/concerns/auto_assignment_handler.rb
index de5fdae7d..a1198200a 100644
--- a/app/models/concerns/auto_assignment_handler.rb
+++ b/app/models/concerns/auto_assignment_handler.rb
@@ -14,7 +14,13 @@ module AutoAssignmentHandler
     return unless conversation_status_changed_to_open?
     return unless should_run_auto_assignment?
 
-    ::AutoAssignment::AgentAssignmentService.new(conversation: self, allowed_agent_ids: inbox.member_ids_with_assignment_capacity).perform
+    if inbox.auto_assignment_v2_enabled?
+      # Use new assignment system
+      AutoAssignment::AssignmentJob.perform_later(inbox_id: inbox.id)
+    else
+      # Use legacy assignment system
+      AutoAssignment::AgentAssignmentService.new(conversation: self, allowed_agent_ids: inbox.member_ids_with_assignment_capacity).perform
+    end
   end
 
   def should_run_auto_assignment?
diff --git a/app/models/concerns/inbox_agent_availability.rb b/app/models/concerns/inbox_agent_availability.rb
new file mode 100644
index 000000000..289da7db9
--- /dev/null
+++ b/app/models/concerns/inbox_agent_availability.rb
@@ -0,0 +1,28 @@
+module InboxAgentAvailability
+  extend ActiveSupport::Concern
+
+  def available_agents
+    online_agent_ids = fetch_online_agent_ids
+    return inbox_members.none if online_agent_ids.empty?
+
+    inbox_members
+      .joins(:user)
+      .where(users: { id: online_agent_ids })
+      .includes(:user)
+  end
+
+  def member_ids_with_assignment_capacity
+    member_ids
+  end
+
+  private
+
+  def fetch_online_agent_ids
+    OnlineStatusTracker.get_available_users(account_id)
+                       .select { |_key, value| value.eql?('online') }
+                       .keys
+                       .map(&:to_i)
+  end
+end
+
+InboxAgentAvailability.prepend_mod_with('InboxAgentAvailability')
diff --git a/app/models/contact_inbox.rb b/app/models/contact_inbox.rb
index 6d034880e..893ab87f3 100644
--- a/app/models/contact_inbox.rb
+++ b/app/models/contact_inbox.rb
@@ -9,7 +9,7 @@
 #  updated_at    :datetime         not null
 #  contact_id    :bigint
 #  inbox_id      :bigint
-#  source_id     :string           not null
+#  source_id     :text             not null
 #
 # Indexes
 #
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 4ec63acc2..ac0985416 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -20,6 +20,7 @@
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
 #  account_id             :integer          not null
+#  assignee_agent_bot_id  :bigint
 #  assignee_id            :integer
 #  campaign_id            :bigint
 #  contact_id             :bigint
@@ -40,6 +41,7 @@
 #  index_conversations_on_contact_inbox_id            (contact_inbox_id)
 #  index_conversations_on_first_reply_created_at      (first_reply_created_at)
 #  index_conversations_on_id_and_account_id           (account_id,id)
+#  index_conversations_on_identifier_and_account_id   (identifier,account_id)
 #  index_conversations_on_inbox_id                    (inbox_id)
 #  index_conversations_on_priority                    (priority)
 #  index_conversations_on_status_and_account_id       (status,account_id)
@@ -64,6 +66,7 @@ class Conversation < ApplicationRecord
   validates :inbox_id, presence: true
   validates :contact_id, presence: true
   before_validation :validate_additional_attributes
+  before_validation :reset_agent_bot_when_assignee_present
   validates :additional_attributes, jsonb_attributes_length: true
   validates :custom_attributes, jsonb_attributes_length: true
   validates :uuid, uniqueness: true
@@ -97,6 +100,7 @@ class Conversation < ApplicationRecord
   belongs_to :account
   belongs_to :inbox
   belongs_to :assignee, class_name: 'User', optional: true, inverse_of: :assigned_conversations
+  belongs_to :assignee_agent_bot, class_name: 'AgentBot', optional: true
   belongs_to :contact
   belongs_to :contact_inbox
   belongs_to :team, optional: true
@@ -179,6 +183,18 @@ class Conversation < ApplicationRecord
     true
   end
 
+  # Virtual attribute till we switch completely to polymorphic assignee
+  def assignee_type
+    return 'AgentBot' if assignee_agent_bot_id.present?
+    return 'User' if assignee_id.present?
+
+    nil
+  end
+
+  def assigned_entity
+    assignee_agent_bot || assignee
+  end
+
   def tweet?
     inbox.inbox_type == 'Twitter' && additional_attributes['type'] == 'tweet'
   end
@@ -225,17 +241,26 @@ class Conversation < ApplicationRecord
     self.additional_attributes = {} unless additional_attributes.is_a?(Hash)
   end
 
+  def reset_agent_bot_when_assignee_present
+    return if assignee_id.blank?
+
+    self.assignee_agent_bot_id = nil
+  end
+
   def determine_conversation_status
     self.status = :resolved and return if contact.blocked?
 
-    # Message template hooks aren't executed for conversations from campaigns
-    # So making these conversations open for agent visibility
-    return if campaign.present?
+    return handle_campaign_status if campaign.present?
 
     # TODO: make this an inbox config instead of assuming bot conversations should start as pending
     self.status = :pending if inbox.active_bot?
   end
 
+  def handle_campaign_status
+    # If campaign has no sender (bot-initiated) and inbox has active bot, let bot handle it
+    self.status = :pending if campaign.sender_id.nil? && inbox.active_bot?
+  end
+
   def notify_conversation_creation
     dispatcher_dispatch(CONVERSATION_CREATED)
   end
@@ -247,8 +272,8 @@ class Conversation < ApplicationRecord
   end
 
   def list_of_keys
-    %w[team_id assignee_id status snoozed_until custom_attributes label_list waiting_since first_reply_created_at
-       priority]
+    %w[team_id assignee_id assignee_agent_bot_id status snoozed_until custom_attributes label_list waiting_since
+       first_reply_created_at priority]
   end
 
   def allowed_keys?
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index b0f13d222..894c57bcc 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -44,6 +44,7 @@ class Inbox < ApplicationRecord
   include Avatarable
   include OutOfOffisable
   include AccountCacheRevalidator
+  include InboxAgentAvailability
 
   # Not allowing characters:
   validates :name, presence: true
@@ -190,6 +191,10 @@ class Inbox < ApplicationRecord
     members.ids
   end
 
+  def auto_assignment_v2_enabled?
+    account.feature_enabled?('assignment_v2')
+  end
+
   private
 
   def default_name_for_blank_name
diff --git a/app/models/installation_config.rb b/app/models/installation_config.rb
index 5ea438916..a7400460c 100644
--- a/app/models/installation_config.rb
+++ b/app/models/installation_config.rb
@@ -23,6 +23,7 @@ class InstallationConfig < ApplicationRecord
 
   before_validation :set_lock
   validates :name, presence: true
+  validate :saml_sso_users_check, if: -> { name == 'ENABLE_SAML_SSO_LOGIN' }
 
   # TODO: Get rid of default scope
   # https://stackoverflow.com/a/1834250/939299
@@ -54,4 +55,11 @@ class InstallationConfig < ApplicationRecord
   def clear_cache
     GlobalConfig.clear_cache
   end
+
+  def saml_sso_users_check
+    return unless value == false || value == 'false'
+    return unless User.exists?(provider: 'saml')
+
+    errors.add(:base, 'Cannot disable SAML SSO login while users are using SAML authentication')
+  end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
index 5f98493d0..2faba1215 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -20,7 +20,7 @@
 #  conversation_id           :integer          not null
 #  inbox_id                  :integer          not null
 #  sender_id                 :bigint
-#  source_id                 :string
+#  source_id                 :text
 #
 # Indexes
 #
@@ -153,15 +153,6 @@ class Message < ApplicationRecord
     merge_sender_attributes(data)
   end
 
-  def search_data
-    data = attributes.symbolize_keys
-    data[:conversation] = conversation.present? ? conversation_push_event_data : nil
-    data[:attachments] = attachments.map(&:push_event_data) if attachments.present?
-    data[:sender] = sender.push_event_data if sender
-    data[:inbox] = inbox
-    data
-  end
-
   def conversation_push_event_data
     {
       assignee_id: conversation.assignee_id,
@@ -259,6 +250,10 @@ class Message < ApplicationRecord
     true
   end
 
+  def search_data
+    Messages::SearchDataPresenter.new(self).search_data
+  end
+
   private
 
   def prevent_message_flooding
diff --git a/app/models/reporting_event.rb b/app/models/reporting_event.rb
index 2f141786b..f083e32a1 100644
--- a/app/models/reporting_event.rb
+++ b/app/models/reporting_event.rb
@@ -35,4 +35,21 @@ class ReportingEvent < ApplicationRecord
   belongs_to :user, optional: true
   belongs_to :inbox, optional: true
   belongs_to :conversation, optional: true
+
+  # Scopes for filtering
+  scope :filter_by_date_range, lambda { |range|
+    where(created_at: range) if range.present?
+  }
+
+  scope :filter_by_inbox_id, lambda { |inbox_id|
+    where(inbox_id: inbox_id) if inbox_id.present?
+  }
+
+  scope :filter_by_user_id, lambda { |user_id|
+    where(user_id: user_id) if user_id.present?
+  }
+
+  scope :filter_by_name, lambda { |name|
+    where(name: name) if name.present?
+  }
 end
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
index 105ffdc91..3fafb4354 100644
--- a/app/models/webhook.rb
+++ b/app/models/webhook.rb
@@ -3,6 +3,7 @@
 # Table name: webhooks
 #
 #  id            :bigint           not null, primary key
+#  name          :string
 #  subscriptions :jsonb
 #  url           :string
 #  webhook_type  :integer          default("account_type")
diff --git a/app/policies/account_policy.rb b/app/policies/account_policy.rb
index 61e02ae77..bd7b3cefe 100644
--- a/app/policies/account_policy.rb
+++ b/app/policies/account_policy.rb
@@ -30,4 +30,8 @@ class AccountPolicy < ApplicationPolicy
   def toggle_deletion?
     @account_user.administrator?
   end
+
+  def topup_checkout?
+    @account_user.administrator?
+  end
 end
diff --git a/app/presenters/conversations/event_data_presenter.rb b/app/presenters/conversations/event_data_presenter.rb
index 2ef69080d..4a9216b05 100644
--- a/app/presenters/conversations/event_data_presenter.rb
+++ b/app/presenters/conversations/event_data_presenter.rb
@@ -30,7 +30,8 @@ class Conversations::EventDataPresenter < SimpleDelegator
   def push_meta
     {
       sender: contact.push_event_data,
-      assignee: assignee&.push_event_data,
+      assignee: assigned_entity&.push_event_data,
+      assignee_type: assignee_type,
       team: team&.push_event_data,
       hmac_verified: contact_inbox&.hmac_verified
     }
diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index e98d2d085..202c255a1 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -125,7 +125,7 @@ class MailPresenter < SimpleDelegator
 
   def from
     # changing to downcase to avoid case mismatch while finding contact
-    (@mail.reply_to.presence || @mail.from).map(&:downcase)
+    Array.wrap(@mail.reply_to.presence || @mail.from).map(&:downcase)
   end
 
   def sender_name
diff --git a/app/presenters/messages/search_data_presenter.rb b/app/presenters/messages/search_data_presenter.rb
new file mode 100644
index 000000000..7d0638add
--- /dev/null
+++ b/app/presenters/messages/search_data_presenter.rb
@@ -0,0 +1,58 @@
+class Messages::SearchDataPresenter < SimpleDelegator
+  def search_data
+    {
+      **searchable_content,
+      **message_attributes,
+      additional_attributes: additional_attributes_data,
+      conversation: conversation_data
+    }
+  end
+
+  private
+
+  def searchable_content
+    {
+      content: content,
+      attachments: attachment_data,
+      content_attributes: content_attributes_data
+    }
+  end
+
+  def message_attributes
+    {
+      account_id: account_id,
+      inbox_id: inbox_id,
+      conversation_id: conversation_id,
+      message_type: message_type,
+      private: private,
+      created_at: created_at,
+      source_id: source_id,
+      sender_id: sender_id,
+      sender_type: sender_type
+    }
+  end
+
+  def attachment_data
+    attachments.filter_map do |a|
+      { transcribed_text: a.meta&.dig('transcribed_text') }
+    end.presence
+  end
+
+  def content_attributes_data
+    email_subject = content_attributes.dig(:email, :subject)
+    return {} if email_subject.blank?
+
+    { email: { subject: email_subject } }
+  end
+
+  def conversation_data
+    { id: conversation.display_id }
+  end
+
+  def additional_attributes_data
+    {
+      campaign_id: additional_attributes&.dig('campaign_id'),
+      automation_rule_id: content_attributes&.dig('automation_rule_id')
+    }
+  end
+end
diff --git a/app/services/auto_assignment/assignment_service.rb b/app/services/auto_assignment/assignment_service.rb
new file mode 100644
index 000000000..59e7b5a7b
--- /dev/null
+++ b/app/services/auto_assignment/assignment_service.rb
@@ -0,0 +1,90 @@
+class AutoAssignment::AssignmentService
+  pattr_initialize [:inbox!]
+
+  def perform_bulk_assignment(limit: 100)
+    return 0 unless inbox.auto_assignment_v2_enabled?
+
+    assigned_count = 0
+
+    unassigned_conversations(limit).each do |conversation|
+      assigned_count += 1 if perform_for_conversation(conversation)
+    end
+
+    assigned_count
+  end
+
+  private
+
+  def perform_for_conversation(conversation)
+    return false unless assignable?(conversation)
+
+    agent = find_available_agent
+    return false unless agent
+
+    assign_conversation(conversation, agent)
+  end
+
+  def assignable?(conversation)
+    conversation.status == 'open' &&
+      conversation.assignee_id.nil?
+  end
+
+  def unassigned_conversations(limit)
+    scope = inbox.conversations.unassigned.open
+
+    scope = if assignment_config['conversation_priority'].to_s == 'longest_waiting'
+              scope.reorder(last_activity_at: :asc, created_at: :asc)
+            else
+              scope.reorder(created_at: :asc)
+            end
+
+    scope.limit(limit)
+  end
+
+  def find_available_agent
+    agents = filter_agents_by_rate_limit(inbox.available_agents)
+    return nil if agents.empty?
+
+    round_robin_selector.select_agent(agents)
+  end
+
+  def filter_agents_by_rate_limit(agents)
+    agents.select do |agent_member|
+      rate_limiter = build_rate_limiter(agent_member.user)
+      rate_limiter.within_limit?
+    end
+  end
+
+  def assign_conversation(conversation, agent)
+    conversation.update!(assignee: agent)
+
+    rate_limiter = build_rate_limiter(agent)
+    rate_limiter.track_assignment(conversation)
+
+    dispatch_assignment_event(conversation, agent)
+    true
+  end
+
+  def dispatch_assignment_event(conversation, agent)
+    Rails.configuration.dispatcher.dispatch(
+      Events::Types::ASSIGNEE_CHANGED,
+      Time.zone.now,
+      conversation: conversation,
+      user: agent
+    )
+  end
+
+  def build_rate_limiter(agent)
+    AutoAssignment::RateLimiter.new(inbox: inbox, agent: agent)
+  end
+
+  def round_robin_selector
+    @round_robin_selector ||= AutoAssignment::RoundRobinSelector.new(inbox: inbox)
+  end
+
+  def assignment_config
+    @assignment_config ||= inbox.auto_assignment_config || {}
+  end
+end
+
+AutoAssignment::AssignmentService.prepend_mod_with('AutoAssignment::AssignmentService')
diff --git a/app/services/auto_assignment/rate_limiter.rb b/app/services/auto_assignment/rate_limiter.rb
new file mode 100644
index 000000000..d22f1f9b7
--- /dev/null
+++ b/app/services/auto_assignment/rate_limiter.rb
@@ -0,0 +1,49 @@
+class AutoAssignment::RateLimiter
+  pattr_initialize [:inbox!, :agent!]
+
+  def within_limit?
+    return true unless enabled?
+
+    current_count < limit
+  end
+
+  def track_assignment(conversation)
+    return unless enabled?
+
+    assignment_key = build_assignment_key(conversation.id)
+    Redis::Alfred.set(assignment_key, conversation.id.to_s, ex: window)
+  end
+
+  def current_count
+    return 0 unless enabled?
+
+    pattern = assignment_key_pattern
+    Redis::Alfred.keys_count(pattern)
+  end
+
+  private
+
+  def enabled?
+    limit.present? && limit.positive?
+  end
+
+  def limit
+    config&.fair_distribution_limit&.to_i || Math
+  end
+
+  def window
+    config&.fair_distribution_window&.to_i || 24.hours.to_i
+  end
+
+  def config
+    @config ||= inbox.assignment_policy
+  end
+
+  def assignment_key_pattern
+    format(Redis::RedisKeys::ASSIGNMENT_KEY_PATTERN, inbox_id: inbox.id, agent_id: agent.id)
+  end
+
+  def build_assignment_key(conversation_id)
+    format(Redis::RedisKeys::ASSIGNMENT_KEY, inbox_id: inbox.id, agent_id: agent.id, conversation_id: conversation_id)
+  end
+end
diff --git a/app/services/auto_assignment/round_robin_selector.rb b/app/services/auto_assignment/round_robin_selector.rb
new file mode 100644
index 000000000..65e72090d
--- /dev/null
+++ b/app/services/auto_assignment/round_robin_selector.rb
@@ -0,0 +1,16 @@
+class AutoAssignment::RoundRobinSelector
+  pattr_initialize [:inbox!]
+
+  def select_agent(available_agents)
+    return nil if available_agents.empty?
+
+    agent_user_ids = available_agents.map(&:user_id).map(&:to_s)
+    round_robin_service.available_agent(allowed_agent_ids: agent_user_ids)
+  end
+
+  private
+
+  def round_robin_service
+    @round_robin_service ||= AutoAssignment::InboxRoundRobinService.new(inbox: inbox)
+  end
+end
diff --git a/app/services/contacts/bulk_action_service.rb b/app/services/contacts/bulk_action_service.rb
new file mode 100644
index 000000000..a0e11ad9a
--- /dev/null
+++ b/app/services/contacts/bulk_action_service.rb
@@ -0,0 +1,44 @@
+class Contacts::BulkActionService
+  def initialize(account:, user:, params:)
+    @account = account
+    @user = user
+    @params = params.deep_symbolize_keys
+  end
+
+  def perform
+    return delete_contacts if delete_requested?
+    return assign_labels if labels_to_add.any?
+
+    Rails.logger.warn("Unknown contact bulk operation payload: #{@params.keys}")
+    { success: false, error: 'unknown_operation' }
+  end
+
+  private
+
+  def assign_labels
+    Contacts::BulkAssignLabelsService.new(
+      account: @account,
+      contact_ids: ids,
+      labels: labels_to_add
+    ).perform
+  end
+
+  def delete_contacts
+    Contacts::BulkDeleteService.new(
+      account: @account,
+      contact_ids: ids
+    ).perform
+  end
+
+  def ids
+    Array(@params[:ids]).compact
+  end
+
+  def labels_to_add
+    @labels_to_add ||= Array(@params.dig(:labels, :add)).reject(&:blank?)
+  end
+
+  def delete_requested?
+    @params[:action_name] == 'delete'
+  end
+end
diff --git a/app/services/contacts/bulk_assign_labels_service.rb b/app/services/contacts/bulk_assign_labels_service.rb
new file mode 100644
index 000000000..4aa4a5de5
--- /dev/null
+++ b/app/services/contacts/bulk_assign_labels_service.rb
@@ -0,0 +1,19 @@
+class Contacts::BulkAssignLabelsService
+  def initialize(account:, contact_ids:, labels:)
+    @account = account
+    @contact_ids = Array(contact_ids)
+    @labels = Array(labels).compact_blank
+  end
+
+  def perform
+    return { success: true, updated_contact_ids: [] } if @contact_ids.blank? || @labels.blank?
+
+    contacts = @account.contacts.where(id: @contact_ids)
+
+    contacts.find_each do |contact|
+      contact.add_labels(@labels)
+    end
+
+    { success: true, updated_contact_ids: contacts.pluck(:id) }
+  end
+end
diff --git a/app/services/contacts/bulk_delete_service.rb b/app/services/contacts/bulk_delete_service.rb
new file mode 100644
index 000000000..d197f17f6
--- /dev/null
+++ b/app/services/contacts/bulk_delete_service.rb
@@ -0,0 +1,18 @@
+class Contacts::BulkDeleteService
+  def initialize(account:, contact_ids: [])
+    @account = account
+    @contact_ids = Array(contact_ids).compact
+  end
+
+  def perform
+    return if @contact_ids.blank?
+
+    contacts.find_each(&:destroy!)
+  end
+
+  private
+
+  def contacts
+    @account.contacts.where(id: @contact_ids)
+  end
+end
diff --git a/app/services/contacts/contactable_inboxes_service.rb b/app/services/contacts/contactable_inboxes_service.rb
index 92d4160fe..c86b9529a 100644
--- a/app/services/contacts/contactable_inboxes_service.rb
+++ b/app/services/contacts/contactable_inboxes_service.rb
@@ -71,3 +71,5 @@ class Contacts::ContactableInboxesService
     end
   end
 end
+
+Contacts::ContactableInboxesService.prepend_mod_with('Contacts::ContactableInboxesService')
diff --git a/app/services/conversations/assignment_service.rb b/app/services/conversations/assignment_service.rb
new file mode 100644
index 000000000..adca34f06
--- /dev/null
+++ b/app/services/conversations/assignment_service.rb
@@ -0,0 +1,43 @@
+class Conversations::AssignmentService
+  def initialize(conversation:, assignee_id:, assignee_type: nil)
+    @conversation = conversation
+    @assignee_id = assignee_id
+    @assignee_type = assignee_type
+  end
+
+  def perform
+    agent_bot_assignment? ? assign_agent_bot : assign_agent
+  end
+
+  private
+
+  attr_reader :conversation, :assignee_id, :assignee_type
+
+  def assign_agent
+    conversation.assignee = assignee
+    conversation.assignee_agent_bot = nil
+    conversation.save!
+    assignee
+  end
+
+  def assign_agent_bot
+    return unless agent_bot
+
+    conversation.assignee = nil
+    conversation.assignee_agent_bot = agent_bot
+    conversation.save!
+    agent_bot
+  end
+
+  def assignee
+    @assignee ||= conversation.account.users.find_by(id: assignee_id)
+  end
+
+  def agent_bot
+    @agent_bot ||= AgentBot.accessible_to(conversation.account).find_by(id: assignee_id)
+  end
+
+  def agent_bot_assignment?
+    assignee_type.to_s == 'AgentBot'
+  end
+end
diff --git a/app/services/instagram/message_text.rb b/app/services/instagram/message_text.rb
index 3b371a2f4..3bdc569eb 100644
--- a/app/services/instagram/message_text.rb
+++ b/app/services/instagram/message_text.rb
@@ -59,11 +59,20 @@ class Instagram::MessageText < Instagram::BaseMessageText
     # We can safely create an unknown contact, making this integration work.
     return unknown_user(ig_scope_id) if error_code == 9010
 
+    # Handle error code 100: Object doesn't exist or missing permissions
+    # This typically occurs when trying to fetch a user that doesn't exist or has privacy restrictions
+    # We can safely create an unknown contact, similar to error 9010
+    return unknown_user(ig_scope_id) if error_code == 100
+
     Rails.logger.warn("[InstagramUserFetchError]: account_id #{@inbox.account_id} inbox_id #{@inbox.id} ig_scope_id #{ig_scope_id}")
     Rails.logger.warn("[InstagramUserFetchError]: #{error_message} #{error_code}")
 
     exception = StandardError.new("#{error_message} (Code: #{error_code}, IG Scope ID: #{ig_scope_id})")
     ChatwootExceptionTracker.new(exception, account: @inbox.account).capture_exception
+
+    # Explicitly return empty hash for any unhandled error codes
+    # This prevents the exception tracker result from being returned
+    {}
   end
 
   def base_uri
diff --git a/app/services/llm_formatter/conversation_llm_formatter.rb b/app/services/llm_formatter/conversation_llm_formatter.rb
index 8654e0adf..4e0bd7013 100644
--- a/app/services/llm_formatter/conversation_llm_formatter.rb
+++ b/app/services/llm_formatter/conversation_llm_formatter.rb
@@ -39,7 +39,14 @@ class LlmFormatter::ConversationLlmFormatter < LlmFormatter::DefaultLlmFormatter
   end
 
   def format_message(message)
-    sender = message.message_type == 'incoming' ? 'User' : 'Support agent'
+    sender = case message.sender_type
+             when 'User'
+               'Support Agent'
+             when 'Contact'
+               'User'
+             else
+               'Bot'
+             end
     sender = "[Private Note] #{sender}" if message.private?
     "#{sender}: #{message.content}\n"
   end
diff --git a/app/services/mailbox/conversation_finder.rb b/app/services/mailbox/conversation_finder.rb
new file mode 100644
index 000000000..2f8128ecd
--- /dev/null
+++ b/app/services/mailbox/conversation_finder.rb
@@ -0,0 +1,29 @@
+class Mailbox::ConversationFinder
+  DEFAULT_STRATEGIES = [
+    Mailbox::ConversationFinderStrategies::ReceiverUuidStrategy,
+    Mailbox::ConversationFinderStrategies::InReplyToStrategy,
+    Mailbox::ConversationFinderStrategies::ReferencesStrategy,
+    Mailbox::ConversationFinderStrategies::NewConversationStrategy
+  ].freeze
+
+  def initialize(mail, strategies: DEFAULT_STRATEGIES)
+    @mail = mail
+    @strategies = strategies
+  end
+
+  def find
+    @strategies.each do |strategy_class|
+      conversation = strategy_class.new(@mail).find
+
+      next unless conversation
+
+      strategy_name = strategy_class.name.demodulize.underscore
+      Rails.logger.info "Conversation found via #{strategy_name} strategy"
+      return conversation
+    end
+
+    # Should not reach here if NewConversationStrategy is in the chain
+    Rails.logger.error 'No conversation found via any strategy (NewConversationStrategy missing?)'
+    nil
+  end
+end
diff --git a/app/services/mailbox/conversation_finder_strategies/base_strategy.rb b/app/services/mailbox/conversation_finder_strategies/base_strategy.rb
new file mode 100644
index 000000000..c1e738805
--- /dev/null
+++ b/app/services/mailbox/conversation_finder_strategies/base_strategy.rb
@@ -0,0 +1,13 @@
+class Mailbox::ConversationFinderStrategies::BaseStrategy
+  attr_reader :mail
+
+  def initialize(mail)
+    @mail = mail
+  end
+
+  # Returns Conversation or nil
+  # Subclasses must implement this method
+  def find
+    raise NotImplementedError, "#{self.class} must implement #find"
+  end
+end
diff --git a/app/services/mailbox/conversation_finder_strategies/in_reply_to_strategy.rb b/app/services/mailbox/conversation_finder_strategies/in_reply_to_strategy.rb
new file mode 100644
index 000000000..b14f851f5
--- /dev/null
+++ b/app/services/mailbox/conversation_finder_strategies/in_reply_to_strategy.rb
@@ -0,0 +1,48 @@
+class Mailbox::ConversationFinderStrategies::InReplyToStrategy < Mailbox::ConversationFinderStrategies::BaseStrategy
+  # Patterns from ApplicationMailbox
+  MESSAGE_PATTERN = %r{conversation/([a-zA-Z0-9-]+)/messages/(\d+)@}
+
+  # FALLBACK_PATTERN is used when building In-Reply-To headers in ConversationReplyMailer
+  # when there's no actual message to reply to (see app/mailers/conversation_reply_mailer.rb#in_reply_to_email).
+  # This happens when:
+  # - A conversation is started by an agent (no incoming message yet)
+  # - The conversation originated from a non-email channel (widget, WhatsApp, etc.) but is now using email
+  # - The incoming message doesn't have email metadata with a message_id
+  # In these cases, we use a conversation-level identifier instead of a message-level one.
+  FALLBACK_PATTERN = %r{account/(\d+)/conversation/([a-zA-Z0-9-]+)@}
+
+  def find
+    return nil if mail.in_reply_to.blank?
+
+    in_reply_to_addresses = Array.wrap(mail.in_reply_to)
+
+    in_reply_to_addresses.each do |in_reply_to|
+      # Try extracting UUID from patterns
+      uuid = extract_uuid_from_patterns(in_reply_to)
+      if uuid
+        conversation = Conversation.find_by(uuid: uuid)
+        return conversation if conversation
+      end
+
+      # Try finding by message source_id
+      message = Message.find_by(source_id: in_reply_to)
+      return message.conversation if message&.conversation
+    end
+
+    nil
+  end
+
+  private
+
+  def extract_uuid_from_patterns(message_id)
+    # Try message-specific pattern first
+    match = MESSAGE_PATTERN.match(message_id)
+    return match[1] if match
+
+    # Try conversation fallback pattern
+    match = FALLBACK_PATTERN.match(message_id)
+    return match[2] if match
+
+    nil
+  end
+end
diff --git a/app/services/mailbox/conversation_finder_strategies/new_conversation_strategy.rb b/app/services/mailbox/conversation_finder_strategies/new_conversation_strategy.rb
new file mode 100644
index 000000000..a21fcebe5
--- /dev/null
+++ b/app/services/mailbox/conversation_finder_strategies/new_conversation_strategy.rb
@@ -0,0 +1,83 @@
+class Mailbox::ConversationFinderStrategies::NewConversationStrategy < Mailbox::ConversationFinderStrategies::BaseStrategy
+  include MailboxHelper
+  include IncomingEmailValidityHelper
+
+  attr_accessor :processed_mail, :account, :inbox, :contact, :contact_inbox, :conversation, :channel
+
+  def initialize(mail)
+    super(mail)
+    @channel = EmailChannelFinder.new(mail).perform
+    return unless @channel
+
+    @account = @channel.account
+    @inbox = @channel.inbox
+    @processed_mail = MailPresenter.new(mail, @account)
+  end
+
+  # This strategy prepares a new conversation but doesn't persist it yet.
+  # Why we don't use create! here:
+  # - Avoids orphan conversations if message/attachment creation fails later
+  # - Prevents duplicate conversations on job retry (no idempotency issue)
+  # - Follows the pattern from old SupportMailbox where everything was in one transaction
+  # The actual persistence happens in ReplyMailbox within a transaction that includes message creation.
+  def find
+    return nil unless @channel # No valid channel found
+    return nil unless incoming_email_from_valid_email? # Skip edge cases
+
+    # Check if conversation already exists by in_reply_to
+    existing_conversation = find_conversation_by_in_reply_to
+    return existing_conversation if existing_conversation
+
+    # Prepare contact (persisted) and build conversation (not persisted)
+    find_or_create_contact
+    build_conversation
+  end
+
+  private
+
+  def find_or_create_contact
+    @contact = @inbox.contacts.from_email(original_sender_email)
+    if @contact.present?
+      @contact_inbox = ContactInbox.find_by(inbox: @inbox, contact: @contact)
+    else
+      create_contact
+    end
+  end
+
+  def original_sender_email
+    @processed_mail.original_sender&.downcase
+  end
+
+  def identify_contact_name
+    @processed_mail.sender_name || @processed_mail.from.first.split('@').first
+  end
+
+  def build_conversation
+    # Build but don't persist - ReplyMailbox will save in transaction with message
+    @conversation = ::Conversation.new(
+      account_id: @account.id,
+      inbox_id: @inbox.id,
+      contact_id: @contact.id,
+      contact_inbox_id: @contact_inbox.id,
+      additional_attributes: {
+        in_reply_to: in_reply_to,
+        source: 'email',
+        auto_reply: @processed_mail.auto_reply?,
+        mail_subject: @processed_mail.subject,
+        initiated_at: {
+          timestamp: Time.now.utc
+        }
+      }
+    )
+  end
+
+  def in_reply_to
+    mail['In-Reply-To'].try(:value)
+  end
+
+  def find_conversation_by_in_reply_to
+    return if in_reply_to.blank?
+
+    @account.conversations.where("additional_attributes->>'in_reply_to' = ?", in_reply_to).first
+  end
+end
diff --git a/app/services/mailbox/conversation_finder_strategies/receiver_uuid_strategy.rb b/app/services/mailbox/conversation_finder_strategies/receiver_uuid_strategy.rb
new file mode 100644
index 000000000..39b155cf8
--- /dev/null
+++ b/app/services/mailbox/conversation_finder_strategies/receiver_uuid_strategy.rb
@@ -0,0 +1,26 @@
+class Mailbox::ConversationFinderStrategies::ReceiverUuidStrategy < Mailbox::ConversationFinderStrategies::BaseStrategy
+  # Pattern from ApplicationMailbox::REPLY_EMAIL_UUID_PATTERN
+  UUID_PATTERN = /^reply\+([0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12})$/i
+
+  def find
+    uuid = extract_uuid_from_receivers
+    return nil unless uuid
+
+    Conversation.find_by(uuid: uuid)
+  end
+
+  private
+
+  def extract_uuid_from_receivers
+    mail_presenter = MailPresenter.new(mail)
+    return nil if mail_presenter.mail_receiver.blank?
+
+    mail_presenter.mail_receiver.each do |email|
+      username = email.split('@').first
+      match = username.match(UUID_PATTERN)
+      return match[1] if match
+    end
+
+    nil
+  end
+end
diff --git a/app/services/mailbox/conversation_finder_strategies/references_strategy.rb b/app/services/mailbox/conversation_finder_strategies/references_strategy.rb
new file mode 100644
index 000000000..86a0aa3c5
--- /dev/null
+++ b/app/services/mailbox/conversation_finder_strategies/references_strategy.rb
@@ -0,0 +1,59 @@
+class Mailbox::ConversationFinderStrategies::ReferencesStrategy < Mailbox::ConversationFinderStrategies::BaseStrategy
+  # Patterns from ApplicationMailbox
+  MESSAGE_PATTERN = %r{conversation/([a-zA-Z0-9-]+)/messages/(\d+)@}
+
+  # FALLBACK_PATTERN is used when building References headers in ConversationReplyMailer
+  # when there's no actual message to reply to (see app/mailers/conversation_reply_mailer.rb#in_reply_to_email).
+  # This happens when:
+  # - A conversation is started by an agent (no incoming message yet)
+  # - The conversation originated from a non-email channel (widget, WhatsApp, etc.) but is now using email
+  # - The incoming message doesn't have email metadata with a message_id
+  # In these cases, we use a conversation-level identifier instead of a message-level one.
+  FALLBACK_PATTERN = %r{account/(\d+)/conversation/([a-zA-Z0-9-]+)@}
+
+  def initialize(mail)
+    super(mail)
+    # Get channel once upfront to use for scoped queries
+    @channel = EmailChannelFinder.new(mail).perform
+  end
+
+  def find
+    return nil if mail.references.blank?
+    return nil unless @channel # No valid channel found
+
+    references = Array.wrap(mail.references)
+
+    references.each do |reference|
+      conversation = find_conversation_from_reference(reference)
+      return conversation if conversation
+    end
+
+    nil
+  end
+
+  private
+
+  def find_conversation_from_reference(reference)
+    # Try extracting UUID from patterns
+    uuid = extract_uuid_from_patterns(reference)
+    if uuid
+      # Query scoped to inbox - prevents cross-account/cross-inbox matches at database level
+      conversation = Conversation.find_by(uuid: uuid, inbox_id: @channel.inbox.id)
+      return conversation if conversation
+    end
+
+    # We scope to the inbox, that way we filter out messages and conversations that don't belong to the channel
+    message = Message.find_by(source_id: reference, inbox_id: @channel.inbox.id)
+    message&.conversation
+  end
+
+  def extract_uuid_from_patterns(message_id)
+    match = MESSAGE_PATTERN.match(message_id)
+    return match[1] if match
+
+    match = FALLBACK_PATTERN.match(message_id)
+    return match[2] if match
+
+    nil
+  end
+end
diff --git a/app/services/telegram/send_attachments_service.rb b/app/services/telegram/send_attachments_service.rb
index e214fe78f..5ba8fd4ae 100644
--- a/app/services/telegram/send_attachments_service.rb
+++ b/app/services/telegram/send_attachments_service.rb
@@ -96,11 +96,16 @@ class Telegram::SendAttachmentsService
   # Telegram picks up the file name from original field name, so we need to save the file with the original name.
   # Hence not using Tempfile here.
   def save_attachment_to_tempfile(attachment)
-    raw_data = attachment.file.download
-    temp_dir = Rails.root.join('tmp/uploads')
+    temp_dir = Rails.root.join('tmp/uploads', "telegram-#{attachment.message_id}")
     FileUtils.mkdir_p(temp_dir)
     temp_file_path = File.join(temp_dir, attachment.file.filename.to_s)
-    File.write(temp_file_path, raw_data, mode: 'wb')
+
+    File.open(temp_file_path, 'wb') do |file|
+      attachment.file.blob.open do |blob_file|
+        IO.copy_stream(blob_file, file)
+      end
+    end
+
     temp_file_path
   end
 
diff --git a/app/services/whatsapp/channel_creation_service.rb b/app/services/whatsapp/channel_creation_service.rb
index 154f55520..74882c7e5 100644
--- a/app/services/whatsapp/channel_creation_service.rb
+++ b/app/services/whatsapp/channel_creation_service.rb
@@ -10,7 +10,7 @@ class Whatsapp::ChannelCreationService
     validate_parameters!
 
     existing_channel = find_existing_channel
-    raise "Channel already exists: #{existing_channel.phone_number}" if existing_channel
+    raise I18n.t('errors.whatsapp.phone_number_already_exists', phone_number: existing_channel.phone_number) if existing_channel
 
     create_channel_with_inbox
   end
@@ -26,7 +26,6 @@ class Whatsapp::ChannelCreationService
 
   def find_existing_channel
     Channel::Whatsapp.find_by(
-      account: @account,
       phone_number: @phone_info[:phone_number]
     )
   end
diff --git a/app/services/whatsapp/oneoff_campaign_service.rb b/app/services/whatsapp/oneoff_campaign_service.rb
index de2713ac0..5917838cb 100644
--- a/app/services/whatsapp/oneoff_campaign_service.rb
+++ b/app/services/whatsapp/oneoff_campaign_service.rb
@@ -3,8 +3,9 @@ class Whatsapp::OneoffCampaignService
 
   def perform
     validate_campaign!
-    process_audience(extract_audience_labels)
+    # marks campaign completed so that other jobs won't pick it up
     campaign.completed!
+    process_audience(extract_audience_labels)
   end
 
   private
diff --git a/app/views/api/v1/accounts/conversations/assignments/create.json.jbuilder b/app/views/api/v1/accounts/conversations/assignments/create.json.jbuilder
deleted file mode 100644
index 1c5bd4846..000000000
--- a/app/views/api/v1/accounts/conversations/assignments/create.json.jbuilder
+++ /dev/null
@@ -1,4 +0,0 @@
-json.payload do
-  json.assignee @conversation.assignee
-  json.conversation_id @conversation.display_id
-end
diff --git a/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder b/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
index fac8fdcf2..5406cf183 100644
--- a/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
+++ b/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
@@ -1,4 +1,5 @@
 json.id webhook.id
+json.name webhook.name
 json.url webhook.url
 json.account_id webhook.account_id
 json.subscriptions webhook.subscriptions
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index 8867ba695..4cb13f543 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -7,10 +7,16 @@ json.meta do
     json.partial! 'api/v1/models/contact', formats: [:json], resource: conversation.contact
   end
   json.channel conversation.inbox.try(:channel_type)
-  if conversation.assignee&.account
+  if conversation.assigned_entity.is_a?(AgentBot)
     json.assignee do
-      json.partial! 'api/v1/models/agent', formats: [:json], resource: conversation.assignee
+      json.partial! 'api/v1/models/agent_bot_slim', formats: [:json], resource: conversation.assigned_entity
     end
+    json.assignee_type 'AgentBot'
+  elsif conversation.assigned_entity&.account
+    json.assignee do
+      json.partial! 'api/v1/models/agent', formats: [:json], resource: conversation.assigned_entity
+    end
+    json.assignee_type 'User'
   end
   if conversation.team.present?
     json.team do
diff --git a/app/views/api/v1/models/_agent_bot_slim.json.jbuilder b/app/views/api/v1/models/_agent_bot_slim.json.jbuilder
new file mode 100644
index 000000000..29f1e12a5
--- /dev/null
+++ b/app/views/api/v1/models/_agent_bot_slim.json.jbuilder
@@ -0,0 +1,6 @@
+json.id resource.id
+json.name resource.name
+json.description resource.description
+json.thumbnail resource.avatar_url
+json.outgoing_url resource.outgoing_url unless resource.system_bot?
+json.bot_type resource.bot_type
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index d9134d563..cf7346dde 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -74,8 +74,9 @@ end
 
 if resource.email?
   ## Email Channel Attributes
-  json.forward_to_email resource.channel.try(:forward_to_email)
   json.email resource.channel.try(:email)
+  json.forwarding_enabled ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN', '').present?
+  json.forward_to_email resource.channel.try(:forward_to_email) if ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN', '').present?
 
   ## IMAP
   if Current.account_user&.administrator?
diff --git a/app/views/api/v1/widget/inbox_members/index.json.jbuilder b/app/views/api/v1/widget/inbox_members/index.json.jbuilder
index 417c23756..126482110 100644
--- a/app/views/api/v1/widget/inbox_members/index.json.jbuilder
+++ b/app/views/api/v1/widget/inbox_members/index.json.jbuilder
@@ -3,6 +3,6 @@ json.payload do
     json.id inbox_member.user.id
     json.name inbox_member.user.available_name
     json.avatar_url inbox_member.user.avatar_url
-    json.availability_status inbox_member.user.account_users.find_by(account_id: @current_account.id).availability_status
+    json.availability_status inbox_member.user.account_users.find_by(account_id: @current_account.id)&.availability_status
   end
 end
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index 4d71a547d..3c21850ca 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -38,6 +38,7 @@
         instagramAppId: '<%= @global_config['INSTAGRAM_APP_ID'] %>',
         googleOAuthClientId: '<%= ENV.fetch('GOOGLE_OAUTH_CLIENT_ID', nil) %>',
         googleOAuthCallbackUrl: '<%= ENV.fetch('GOOGLE_OAUTH_CALLBACK_URL', nil) %>',
+        allowedLoginMethods: <%= @global_config['ALLOWED_LOGIN_METHODS'].to_json.html_safe %>,
         fbApiVersion: '<%= @global_config['FACEBOOK_API_VERSION'] %>',
         whatsappAppId: '<%= @global_config['WHATSAPP_APP_ID'] %>',
         whatsappConfigurationId: '<%= @global_config['WHATSAPP_CONFIGURATION_ID'] %>',
diff --git a/config/app.yml b/config/app.yml
index e3d9c2c69..a9f671005 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '4.7.0'
+  version: '4.8.0'
 
 development:
   <<: *shared
diff --git a/config/features.yml b/config/features.yml
index e1f3b20d9..ae6dec8e0 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -180,7 +180,6 @@
   display_name: Captain V2
   enabled: false
   premium: true
-  chatwoot_internal: true
 - name: whatsapp_embedded_signup
   display_name: WhatsApp Embedded Signup
   enabled: false
@@ -223,3 +222,8 @@
 - name: quoted_email_reply
   display_name: Quoted Email Reply
   enabled: false
+- name: companies
+  display_name: Companies
+  enabled: false
+  premium: true
+  chatwoot_internal: true
diff --git a/config/initializers/mailer.rb b/config/initializers/mailer.rb
index a0e5d7b73..3d585d8b6 100644
--- a/config/initializers/mailer.rb
+++ b/config/initializers/mailer.rb
@@ -46,5 +46,9 @@ Rails.application.configure do
   # :mandrill for Mandrill
   # :postmark for Postmark
   # :sendgrid for Sendgrid
+  # :ses for Amazon SES
   config.action_mailbox.ingress = ENV.fetch('RAILS_INBOUND_EMAIL_SERVICE', 'relay').to_sym
+
+  # Amazon SES ActionMailbox configuration
+  config.action_mailbox.ses.subscribed_topic = ENV['ACTION_MAILBOX_SES_SNS_TOPIC'] if ENV['ACTION_MAILBOX_SES_SNS_TOPIC'].present?
 end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 04d605c2e..dd5c71a4d 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -18,8 +18,10 @@ end
 Sidekiq.configure_server do |config|
   config.redis = Redis::Config.app
 
-  config.server_middleware do |chain|
-    chain.add ChatwootDequeuedLogger
+  if ActiveModel::Type::Boolean.new.cast(ENV.fetch('ENABLE_SIDEKIQ_DEQUEUE_LOGGER', false))
+    config.server_middleware do |chain|
+      chain.add ChatwootDequeuedLogger
+    end
   end
 
   # skip the default start stop logging
diff --git a/config/installation_config.yml b/config/installation_config.yml
index 9eb6af14f..40c758f72 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -79,11 +79,21 @@
   display_title: 'System events Webhook URL'
   description: 'The URL to which the system events like new accounts created will be sent'
   locked: false
+- name: WEBHOOK_TIMEOUT
+  value: 5
+  display_title: 'Webhook request timeout (seconds)'
+  description: 'Maximum time Chatwoot waits for a webhook response before failing the request'
+  locked: false
 - name: DIRECT_UPLOADS_ENABLED
   type: boolean
   value: false
   description: 'Enable direct uploads to cloud storage'
   locked: false
+- name: MAXIMUM_FILE_UPLOAD_SIZE
+  value: 40
+  display_title: 'Attachment size limit (MB)'
+  description: 'Maximum attachment size in MB allowed for uploads'
+  locked: false
 # ------- End of Account Related Config ------- #
 
 # ------- Email Related Config ------- #
@@ -189,7 +199,6 @@
   description: 'The limits for the Captain AI service for different plans'
   value:
   type: code
-
 # End of Captain Config
 
 # ------- Chatwoot Internal Config for Cloud ----#
@@ -428,8 +437,23 @@
   value:
   locked: false
   description: 'The redirect URI configured in your Google OAuth app'
+- name: ENABLE_GOOGLE_OAUTH_LOGIN
+  display_title: 'Enable Google OAuth login'
+  value: true
+  locked: false
+  description: 'Show Google OAuth as a login option when credentials are configured'
+  type: boolean
 ## ------ End of Configs added for Google OAuth ------ ##
 
+## ------ Configs added for SAML SSO ------ ##
+- name: ENABLE_SAML_SSO_LOGIN
+  display_title: 'Enable SAML SSO login'
+  value: true
+  locked: false
+  description: 'Show SAML SSO as a login option. Cannot be disabled if any users are using SAML authentication.'
+  type: boolean
+## ------ End of Configs added for SAML SSO ------ ##
+
 ## ------ Configs added for Cloudflare ------ ##
 - name: CLOUDFLARE_API_KEY
   display_title: 'Cloudflare API Key'
@@ -451,3 +475,28 @@
   locked: false
   description: 'Token expiry in days'
 ## ------ End of Customizations for Customers ------ ##
+
+## ----- LLM Observability ---- ##
+- name: OTEL_PROVIDER
+  display_title: 'OpenTelemetry Provider'
+  description: 'LLM observability provider (langfuse, langsmith, etc.)'
+  value: ''
+  locked: false
+- name: LANGFUSE_PUBLIC_KEY
+  display_title: 'Langfuse Public Key'
+  description: 'Public key for Langfuse authentication'
+  value: ''
+  locked: false
+  type: secret
+- name: LANGFUSE_SECRET_KEY
+  display_title: 'Langfuse Secret Key'
+  description: 'Secret key for Langfuse authentication'
+  value: ''
+  locked: false
+  type: secret
+- name: LANGFUSE_BASE_URL
+  display_title: 'Langfuse Base URL'
+  description: 'Langfuse endpoint (US: https://us.cloud.langfuse.com, EU: https://cloud.langfuse.com)'
+  value: 'https://us.cloud.langfuse.com'
+  locked: false
+## ---- End of LLM Observability ---- ##
diff --git a/config/locales/am.yml b/config/locales/am.yml
index f1e9bf52b..59ecaf187 100644
--- a/config/locales/am.yml
+++ b/config/locales/am.yml
@@ -76,6 +76,7 @@ am:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index b4998c6e4..77c3f3c21 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -76,6 +76,7 @@ ar:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 4ca5260f5..ecf46da3b 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -76,6 +76,7 @@ az:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 9a83df74a..9f806ddb8 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -76,6 +76,7 @@ bg:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 6e2cedeb1..6bea58292 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -76,6 +76,7 @@ bn:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index cd0e36f29..51a3e06e4 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -76,6 +76,7 @@ ca:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 3fb647b48..9daeea48a 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -76,6 +76,7 @@ cs:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/da.yml b/config/locales/da.yml
index d7c02426f..81834a427 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -76,6 +76,7 @@ da:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/de.yml b/config/locales/de.yml
index c59576720..c805c47d3 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -76,6 +76,7 @@ de:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 22fce73b7..63c4a686d 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -76,6 +76,7 @@ el:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ad54b8dfa..3cc8eb9cf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -64,6 +64,7 @@ en:
       not_found: Assignment policy not found
     saml:
       feature_not_enabled: SAML feature not enabled for this account
+      sso_not_enabled: SAML SSO is not enabled for this installation
     data_import:
       data_type:
         invalid: Invalid data type
@@ -79,6 +80,8 @@ en:
     companies:
       domain:
         invalid: must be a valid domain name
+      search:
+        query_missing: Specify search string with parameter q
     categories:
       locale:
         unique: should be unique in the category and portal
@@ -90,6 +93,7 @@ en:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
@@ -118,6 +122,13 @@ en:
       invalid_token: Invalid or expired MFA token
       invalid_credentials: Invalid credentials or verification code
       feature_unavailable: MFA feature is not available. Please configure encryption keys.
+    topup:
+      credits_required: Credits amount is required
+      invalid_credits: Invalid credits amount
+      invalid_option: Invalid topup option
+      plan_not_eligible: Top-ups are only available for paid plans. Please upgrade your plan first.
+      stripe_customer_not_configured: Stripe customer not configured
+      no_payment_method: No payment methods found. Please add a payment method before making a purchase.
   profile:
     mfa:
       enabled: MFA enabled successfully
@@ -193,6 +204,8 @@ en:
     messages:
       instagram_story_content: '%{story_sender} mentioned you in the story: '
       instagram_deleted_story_content: This story is no longer available.
+      instagram_shared_story_content: 'Shared story'
+      instagram_shared_post_content: 'Shared post'
       deleted: This message was deleted
       whatsapp:
         list_button_label: 'Choose an item'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index cfe468dee..8a035df7b 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -76,6 +76,7 @@ es:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/et.yml b/config/locales/et.yml
index dcf81c6e3..e60df2b42 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -76,6 +76,7 @@ et:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 536c78f47..bb9db01e9 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -76,6 +76,7 @@ fa:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 7e8c3e14b..94f68aa8d 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -76,6 +76,7 @@ fi:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 53435aafa..460e520aa 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -76,6 +76,7 @@ fr:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/he.yml b/config/locales/he.yml
index a8c729959..56e32d142 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -76,6 +76,7 @@ he:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 26b89c2e5..0e47a998c 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -76,6 +76,7 @@ hi:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 4b4117eed..3239824bf 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -76,6 +76,7 @@ hr:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 87c496aa0..585afcd24 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -76,6 +76,7 @@ hu:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 063db291d..8b61be9c4 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -76,6 +76,7 @@ hy:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 41383befc..167b860a9 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -76,6 +76,7 @@ id:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 7f671ac54..47db2a83c 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -76,6 +76,7 @@ is:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a92071f9d..ba6c7cf5e 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -17,23 +17,23 @@
 #To learn more, please read the Rails Internationalization guide
 #available at https://guides.rubyonrails.org/i18n.html.
 it:
-  hello: 'Ciao mondo'
+  hello: 'Hello world'
   inbox:
     reauthorization:
       success: 'Canale riautorizzato con successo'
-      not_required: 'Riautorizzazione non richiesta per questo canale'
+      not_required: 'Riautorizzazione non necessaria per questo canale'
       invalid_channel: 'Canale non valido per riautorizzazione'
   auth:
     saml:
       invalid_email: 'Inserisci un indirizzo email valido'
       authentication_failed: 'Autenticazione fallita. Verifica le credenziali e riprova.'
   messages:
-    reset_password_success: Woot! Richiesta di reimpostazione della password riuscita. Controlla la tua mail per le istruzioni.
-    reset_password_failure: Uh ho! Non siamo riusciti a trovare alcun utente con l'email specificata.
+    reset_password_success: Wooh! Richiesta di reimpostazione della password riuscita. Controlla la tua mail per le istruzioni.
+    reset_password_failure: Oh oh! Non siamo riusciti a trovare alcun utente con l'email specificata.
     reset_password_saml_user: Questo account utilizza autenticazione SAML. Non è possibile resettare la password. Contatta il tuo amministratore.
     login_saml_user: Questo account utilizza autenticazione SAML. Effettua il login dal portale SAML della tua organizzazione.
     saml_not_available: Autenticazione SAML non disponibile in questa installazione.
-    inbox_deletetion_response: Your inbox deletion request will be processed in some time.
+    inbox_deletetion_response: La tua richiesta di cancellazione inbox verrà elaborata.
   errors:
     validations:
       presence: non deve essere vuoto
@@ -41,10 +41,10 @@ it:
       invalid: Eventi non validi
     signup:
       disposable_email: Non consentiamo email usa e getta
-      blocked_domain: This domain is not allowed. If you believe this is a mistake, please contact support.
+      blocked_domain: Questo dominio non è consentito. Se credi che sia un errore, contatta il supporto.
       invalid_email: Hai inserito un'email non valida
       email_already_exists: 'Ti sei già registrato per un account con %{email}'
-      invalid_params: 'Invalid, please check the signup paramters and try again'
+      invalid_params: 'Non valido, controlla i dati di registrazione e riprova'
       failed: Registrazione non riuscita
     assignment_policy:
       not_found: Policy di assegnazione non trovata
@@ -57,27 +57,28 @@ it:
       import:
         failed: Il file è vuoto
       export:
-        success: We will notify you once contacts export file is ready to view.
+        success: Verrai avvisato una volta che il file di esportazione dei contatti è pronto per essere visualizzato.
       email:
         invalid: Email non valida
       phone_number:
-        invalid: dovrebbe essere nel formato e164
+        invalid: deve essere nel formato e164
     companies:
       domain:
         invalid: deve essere un dominio valido
     categories:
       locale:
-        unique: dovrebbe essere unico nella categoria e nel portale
+        unique: deve essere unico nella categoria e nel portale
     dyte:
-      invalid_message_type: 'Invalid message type. Action not permitted'
+      invalid_message_type: 'Tipo messaggio non valido. Azione non consentita'
     slack:
-      invalid_channel_id: 'Invalid slack channel. Please try again'
+      invalid_channel_id: 'Canale slack non valido. Riprova'
     whatsapp:
       token_exchange_failed: 'Impossibile scambiare il codice con il token di accesso. Riprova.'
       invalid_token_permissions: 'Il token di accesso non dispone dei permessi richiesti per WhatsApp.'
       phone_info_fetch_failed: 'Impossibile recuperare le informazioni sul numero di telefono. Riprova.'
+      phone_number_already_exists: 'Esiste già un canale per questo numero di telefono: %{phone_number}, si prega di contattare il supporto se l''errore persiste'
       reauthorization:
-        generic: 'Impossibile reautorizzare WhatsApp. Riprova.'
+        generic: 'Impossibile riautorizzare WhatsApp. Riprova.'
         not_supported: 'La riautorizzazione non è supportata per questo tipo di canale WhatsApp.'
     inboxes:
       imap:
@@ -87,15 +88,15 @@ it:
         connection_timed_out_error: Connessione scaduta per %{address}:%{port}
         connection_closed_error: Connessione chiusa.
       validations:
-        name: non dovrebbe iniziare o terminare con i simboli, e non dovrebbe avere < > / \ @ caratteri.
+        name: non dovrebbe iniziare o terminare con simboli, e non dovrebbe avere i caratteri < > / \ @
     custom_filters:
-      number_of_records: Limit reached. The maximum number of allowed custom filters for a user per account is 1000.
-      invalid_attribute: Invalid attribute key - [%{key}]. The key should be one of [%{allowed_keys}] or a custom attribute defined in the account.
-      invalid_operator: Invalid operator. The allowed operators for %{attribute_name} are [%{allowed_keys}].
-      invalid_query_operator: Query operator must be either "AND" or "OR".
-      invalid_value: Invalid value. The values provided for %{attribute_name} are invalid
+      number_of_records: Limite raggiunto. Il numero massimo di filtri personalizzati consentiti per un utente per account è 1000.
+      invalid_attribute: Chiave di attributo non valida - [%{key}]. La chiave dovrebbe essere una di [%{allowed_keys}] o un attributo personalizzato definito nell'account.
+      invalid_operator: Operatore non valido. Gli operatori consentiti per %{attribute_name} sono [%{allowed_keys}].
+      invalid_query_operator: L'operatore della query deve essere "E" o "O".
+      invalid_value: Valore non valido. I valori forniti per %{attribute_name} non sono validi
     custom_attribute_definition:
-      key_conflict: The provided key is not allowed as it might conflict with default attributes.
+      key_conflict: La chiave fornita non è consentita in quanto potrebbe entrare in conflitto con gli attributi predefiniti.
     mfa:
       already_enabled: MFA già attiva
       not_enabled: MFA non attiva
@@ -112,67 +113,67 @@ it:
       invalid_certificate: deve essere un certificato X.509 valido in formato PEM
   reports:
     period: Periodo di segnalazione da %{since} a %{until}
-    utc_warning: The report generated is in UTC timezone
+    utc_warning: Il report generato è nel fuso orario UTC
     agent_csv:
-      agent_name: Nome agente
-      conversations_count: Assigned conversations
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      agent_name: Nome operatore
+      conversations_count: Conversazioni assegnate
+      avg_first_response_time: Tempo medio di prima risposta
+      avg_resolution_time: Tempo medio di risoluzione
       resolution_count: Conteggio risoluzioni
-      avg_customer_waiting_time: Avg customer waiting time
+      avg_customer_waiting_time: Tempo medio di attesa cliente
     inbox_csv:
-      inbox_name: Nome casella
-      inbox_type: Tipo casella
+      inbox_name: Nome inbox
+      inbox_type: Tipo inbox
       conversations_count: Numero di conversazioni
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      avg_first_response_time: Tempo medio di prima risposta
+      avg_resolution_time: Tempo medio di risoluzione
     label_csv:
       label_title: Etichetta
       conversations_count: Numero di conversazioni
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      avg_first_response_time: Tempo medio di prima risposta
+      avg_resolution_time: Tempo medio di risoluzione
       avg_reply_time: Tempo medio di risposta
       resolution_count: Conteggio risoluzioni
     team_csv:
       team_name: Nome del team
       conversations_count: Numero di conversazioni
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      avg_first_response_time: Tempo medio di prima risposta
+      avg_resolution_time: Tempo medio di risoluzione
       resolution_count: Conteggio risoluzioni
-      avg_customer_waiting_time: Avg customer waiting time
+      avg_customer_waiting_time: Tempo medio di attesa cliente
     conversation_traffic_csv:
-      timezone: Timezone
+      timezone: Fuso Orario
     sla_csv:
-      conversation_id: Conversation ID
-      sla_policy_breached: SLA Policy
-      assignee: Assignee
+      conversation_id: ID Conversazione
+      sla_policy_breached: Policy SLA
+      assignee: Assegnatario
       team: Team
-      inbox: Casella
+      inbox: Inbox
       labels: Etichette
-      conversation_link: Link to the Conversation
-      breached_events: Breached Events
+      conversation_link: Link alla Conversazione
+      breached_events: Eventi Violati
     default_group_by: giorno
     csat:
       headers:
-        contact_name: Nome contatto
-        contact_email_address: Indirizzo email contatto
-        contact_phone_number: Numero di telefono contatto
+        contact_name: Nome Contatto
+        contact_email_address: Indirizzo Email Contatto
+        contact_phone_number: Numero di Telefono Contatto
         link_to_the_conversation: Link alla conversazione
-        agent_name: Nome dell'agente
+        agent_name: Nome Operatore
         rating: Valutazione
-        feedback: Commento del feedback
+        feedback: Commento di Feedback
         recorded_at: Data di registrazione
   notifications:
     notification_title:
-      conversation_creation: 'A conversation (#%{display_id}) has been created in %{inbox_name}'
-      conversation_assignment: 'A conversation (#%{display_id}) has been assigned to you'
-      assigned_conversation_new_message: 'A new message is created in conversation (#%{display_id})'
-      conversation_mention: 'You have been mentioned in conversation (#%{display_id})'
-      sla_missed_first_response: 'SLA target first response missed for conversation (#%{display_id})'
-      sla_missed_next_response: 'SLA target next response missed for conversation (#%{display_id})'
-      sla_missed_resolution: 'SLA target resolution missed for conversation (#%{display_id})'
-    attachment: 'Attachment'
-    no_content: 'No content'
+      conversation_creation: 'Una conversazione (#%{display_id}) è stata creata in %{inbox_name}'
+      conversation_assignment: 'Una conversazione (#%{display_id}) ti è stata assegnata'
+      assigned_conversation_new_message: 'Un nuovo messaggio è stato creato nella conversazione (#%{display_id})'
+      conversation_mention: 'Sei stato menzionato nella conversazione (#%{display_id})'
+      sla_missed_first_response: 'Target SLA di prima risposta mancato per la conversazione (#%{display_id})'
+      sla_missed_next_response: 'Target SLA di risposta successiva mancato per la conversazione (#%{display_id})'
+      sla_missed_resolution: 'Target SLA di risoluzione mancato per la conversazione (#%{display_id})'
+    attachment: 'Allegato'
+    no_content: 'Nessun contenuto'
   conversations:
     captain:
       handoff: 'Trasferendo ad un altro operatore per ulteriore assistenza.'
@@ -183,10 +184,10 @@ it:
       whatsapp:
         list_button_label: 'Scegli un elemento'
       delivery_status:
-        error_code: 'Error code: %{error_code}'
+        error_code: 'Codice errore: %{error_code}'
     activity:
       captain:
-        resolved: 'La conversazione è stata segnata risolta da %{user_name} a causa di inattività'
+        resolved: 'La conversazione è stata segnata risolta da %{user_name} per inattività'
         open: 'La conversazione è stata riaperta da %{user_name}'
       agent_bot:
         error_moved_to_open: 'La conversazione è stata riaperta dal sistema a causa di un errore con il Bot Agente.'
@@ -199,25 +200,25 @@ it:
         auto_resolved_days: 'La conversazione è stata contrassegnata come risolta dal sistema a causa di %{count} giorni d''inattività'
         auto_resolved_hours: 'La conversazione è stata contrassegnata come risolta dal sistema a causa di %{count} ore d''inattività'
         auto_resolved_minutes: 'La conversazione è stata contrassegnata come risolta dal sistema a causa di %{count} minuti d''inattività'
-        system_auto_open: System reopened the conversation due to a new incoming message.
+        system_auto_open: Il sistema ha riaperto la conversazione a causa di un nuovo messaggio in arrivo.
       priority:
-        added: '%{user_name} set the priority to %{new_priority}'
-        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
-        removed: '%{user_name} removed the priority'
+        added: '%{user_name} ha impostato la priorità su %{new_priority}'
+        updated: '%{user_name} ha modificato la priorità da %{old_priority} a %{new_priority}'
+        removed: '%{user_name} ha rimosso la priorità'
       assignee:
         self_assigned: '%{user_name} si è assegnato a questa conversazione'
         assigned: 'Assegnato a %{assignee_name} da %{user_name}'
-        removed: 'Conversazione non assegnata da %{user_name}'
+        removed: 'Conversazione disassegnata da %{user_name}'
       team:
-        assigned: 'Assegnato a %{team_name} da %{user_name}'
-        assigned_with_assignee: 'Assegnato a %{assignee_name} tramite %{team_name} da %{user_name}'
+        assigned: 'Assegnata a %{team_name} da %{user_name}'
+        assigned_with_assignee: 'Assegnata a %{assignee_name} via %{team_name} da %{user_name}'
         removed: 'Assegnazione a %{team_name} rimossa da %{user_name}'
       labels:
         added: '%{user_name} ha aggiunto %{labels}'
         removed: '%{user_name} ha rimosso %{labels}'
       sla:
-        added: '%{user_name} added SLA policy %{sla_name}'
-        removed: '%{user_name} removed SLA policy %{sla_name}'
+        added: '%{user_name} ha aggiunto la policy SLA %{sla_name}'
+        removed: '%{user_name} ha rimosso la policy SLA %{sla_name}'
       linear:
         issue_created: 'Issue Linear %{issue_id} è stata creata da %{user_name}'
         issue_linked: 'Issue Linear %{issue_id} è stata collegata da %{user_name}'
@@ -228,10 +229,10 @@ it:
         not_sent_due_to_messaging_window: 'Messaggio di auto-risoluzione non inviato a causa di restrizioni sui messaggi in uscita'
       muted: '%{user_name} ha silenziato la conversazione'
       unmuted: '%{user_name} ha riattivato l''audio della conversazione'
-      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
+      auto_resolution_message: 'La conversazione sta per essere risolta per inattività. Avvia una nuova conversazione se hai bisogno di ulteriore assistenza.'
     templates:
       greeting_message_body: '%{account_name}, in genere, risponde in poche ore.'
-      ways_to_reach_you_message_body: 'Offri al team un modo per raggiungerti.'
+      ways_to_reach_you_message_body: 'Dai al team un modo per contattarti.'
       email_input_box_message_body: 'Ricevi notifiche via email'
       csat_input_message_body: 'Valuta la conversazione'
     reply:
@@ -247,7 +248,7 @@ it:
           reply_with_name: '%{assignee_name} da %{inbox_name} <%{from_email}>'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: 'Nuovi messaggi in questa conversazione'
-      transcript_subject: 'Trascrizione della conversazione'
+      transcript_subject: 'Trascrizione della Conversazione'
     survey:
       response: 'Valuta questa conversazione, %{link}'
   contacts:
@@ -256,52 +257,52 @@ it:
   integration_apps:
     #Note: webhooks and dashboard_apps don't need short_description as they use different modal components
     dashboard_apps:
-      name: 'App dashboard'
-      description: 'Dashboard Apps allow you to create and embed applications that display user information, orders, or payment history, providing more context to your customer support agents.'
+      name: 'App Dashboard'
+      description: 'Le App Dashboard consentono di creare e incorporare applicazioni che mostrano informazioni sugli utenti, ordini o cronologia dei pagamenti, fornendo maggiore contesto agli operatori.'
     dyte:
       name: 'Dyte'
       short_description: 'Avvia chiamate/videochiamate con i clienti direttamente da Chatwoot.'
-      description: 'Dyte is a product that integrates audio and video functionalities into your application. With this integration, your agents can start video/voice calls with your customers directly from Chatwoot.'
-      meeting_name: '%{agent_name} has started a meeting'
+      description: 'Dyte è un prodotto che integra funzionalità audio e video nella tua applicazione. Grazie a questa integrazione, i tuoi operatori possono avviare videochiamate/chiamate vocali con i tuoi clienti direttamente da qui.'
+      meeting_name: '%{agent_name} ha avviato un meeting'
     slack:
       name: 'Slack'
       short_description: 'Ricevi notifiche e rispondi alle conversazioni direttamente in Slack.'
-      description: "Integrate Chatwoot with Slack to keep your team in sync. This integration allows you to receive notifications for new conversations and respond to them directly within Slack's interface."
+      description: "Integra Slack per mantenere il tuo team sempre aggiornato. Questa integrazione ti consente di ricevere notifiche per le nuove conversazioni e di rispondere direttamente dall'interfaccia di Slack."
     webhooks:
       name: 'Webhook'
-      description: 'Webhook events provide real-time updates about activities in your Chatwoot account. You can subscribe to your preferred events, and Chatwoot will send you HTTP callbacks with the updates.'
+      description: 'Gli eventi Webhook forniscono aggiornamenti in tempo reale sulle attività nel tuo account Chatwoot. Puoi iscriverti ai tuoi eventi preferiti, e Chatwoot ti invierà i callback HTTP con gli aggiornamenti.'
     dialogflow:
       name: 'Dialogflow'
-      short_description: 'Configura chatbot per gestire le domande iniziali prima di trasferire agli operatori.'
-      description: 'Build chatbots with Dialogflow and easily integrate them into your inbox. These bots can handle initial queries before transferring them to a customer service agent.'
+      short_description: 'Configura chatbot per gestire le richieste iniziali prima di trasferire agli operatori.'
+      description: 'Crea chatbot con Dialogflow e integrali facilmente nella tua Inbox. Questi bot possono gestire le richieste iniziali prima di trasferirle a un operatore del servizio clienti.'
     google_translate:
       name: 'Google Translate'
       short_description: 'Traduci automaticamente i messaggi dei clienti per gli operatori.'
-      description: "Integrate Google Translate to help agents easily translate customer messages. This integration automatically detects the language and converts it to the agent's or admin's preferred language."
+      description: "Integra Google Translate per aiutare gli operatori a tradurre facilmente i messaggi dei clienti. Questa integrazione rileva automaticamente la lingua e la converte nella lingua preferita dall'operatore o dall'amministratore."
     openai:
       name: 'OpenAI'
       short_description: 'Suggerimenti di risposta, riassunti, e miglioramento dei messaggi tramite AI.'
-      description: 'Leverage the power of large language models from OpenAI with the features such as reply suggestions, summarization, message rephrasing, spell-checking, and label classification.'
+      description: 'Sfrutta la potenza degli LLM di OpenAI con funzionalità quali suggerimenti di risposta, riepilogo, riformulazione dei messaggi, controllo ortografico e classificazione delle etichette.'
     linear:
       name: 'Linear'
       short_description: 'Crea e collega issue Linear direttamente dalle conversazioni.'
-      description: 'Create issues in Linear directly from your conversation window. Alternatively, link existing Linear issues for a more streamlined and efficient issue tracking process.'
+      description: 'Crea issue in Linear direttamente dalla finestra di conversazione. In alternativa, collega issue Linear esistenti per un processo di monitoraggio più snello ed efficiente.'
     notion:
       name: 'Notion'
       short_description: 'Integra database, documenti e pagine direttamente con Captain.'
-      description: 'Collega il tuo spazio di lavoro Notion per consentire al Captain di accedere e generare risposte intelligenti utilizzando i contenuti dai tuoi database, documenti, e pagine per fornire più assistenza clienti contestuale.'
+      description: 'Collega il tuo workspace Notion per consentire a Captain di accedere e generare risposte intelligenti utilizzando i contenuti dai tuoi database, documenti, e pagine per fornire assistenza clienti più contestuale.'
     shopify:
       name: 'Shopify'
       short_description: 'Integra ordini e clienti dal tuo store Shopify.'
-      description: 'Connect your Shopify store to access order details, customer information, and product data directly within your conversations and helps your support team provide faster, more contextual assistance to your customers.'
+      description: 'Collega il tuo store Shopify per accedere ai dettagli degli ordini, alle informazioni sui clienti e ai dati dei prodotti direttamente all''interno delle tue conversazioni e aiuta il tuo team di supporto a fornire un''assistenza più rapida e contestualizzata ai tuoi clienti.'
     leadsquared:
       name: 'LeadSquared'
       short_description: 'Sincronizza contatti e conversazioni con LeadSquared CRM.'
       description: 'Sincronizza i contatti e conversazioni con il CRM LeadSquared. Questa integrazione crea automaticamente i lead in LeadSquared quando vengono aggiunti nuovi contatti e registra l''attività di conversazione per fornire al team di vendita un contesto completo.'
   captain:
     copilot_message_required: Messaggio richiesto
-    copilot_error: 'Please connect an assistant to this inbox to use Copilot'
-    copilot_limit: 'You are out of Copilot credits. You can buy more credits from the billing section.'
+    copilot_error: 'Connetti un assistente a questa Inbox per usare Copilot'
+    copilot_limit: 'Hai terminato i crediti Copilot. Puoi acquistare altri crediti dalla sezione fatturazione.'
     copilot:
       using_tool: 'Utilizzando tool %{function_name}'
       completed_tool_call: 'Tool %{function_name} utilizzato'
@@ -313,8 +314,8 @@ it:
       pdf_size_error: 'deve essere inferiore a 10MB'
       pdf_upload_failed: 'Caricamento PDF a OpenAI fallito'
       pdf_upload_success: 'PDF caricato con successo (file_id: %{file_id})'
-      pdf_processing_failed: 'Errore nel processare il documento PDF %{document_id}: %{error}'
-      pdf_processing_success: 'Documento PDF %{document_id} processato correttamente'
+      pdf_processing_failed: 'Errore nell''elaborazione del documento PDF %{document_id}: %{error}'
+      pdf_processing_success: 'Documento PDF %{document_id} elaborato correttamente'
       faq_generation_complete: 'Generazione FAQ completata. Totale FAQ generate: %{count}'
       using_paginated_faq: 'Uso della generazione di FAQ paginate per il documento %{document_id}'
       using_standard_faq: 'Uso della generazione di FAQ standard per il documento %{document_id}'
@@ -331,64 +332,64 @@ it:
       slug_generation_failed: 'Impossibile generare slug univoco dopo 5 tentativi'
   public_portal:
     search:
-      search_placeholder: Search for article by title or body...
+      search_placeholder: Cerca articolo tramite titolo o testo...
       empty_placeholder: Nessun risultato trovato.
-      loading_placeholder: Searching...
-      results_title: Search results
-    toc_header: 'On this page'
+      loading_placeholder: Ricerca...
+      results_title: Risultati di ricerca
+    toc_header: 'Su questa pagina'
     hero:
-      sub_title: Search for the articles here or browse the categories below.
+      sub_title: Cerca gli articoli qui oppure sfoglia le categorie qui sotto.
     common:
       home: Home
-      last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all
-      article: article
+      last_updated_on: Ultimo aggiornamento %{last_updated_on}
+      view_all_articles: Vedi tutti
+      article: articolo
       articles: articoli
       author: autore
-      authors: authors
-      other: other
-      others: others
-      by: By
-      no_articles: There are no articles here
+      authors: autori
+      other: altro
+      others: altri
+      by: Da
+      no_articles: Non ci sono articoli qui
     footer:
-      made_with: Made with
+      made_with: Realizzato con
     header:
-      go_to_homepage: Website
+      go_to_homepage: Sito Web
       visit_website: Visita sito
       appearance:
-        system: System
-        light: Light
-        dark: Dark
-      featured_articles: Featured Articles
-      uncategorized: Uncategorized
+        system: Sistema
+        light: Chiaro
+        dark: Scuro
+      featured_articles: Articoli in evidenza
+      uncategorized: Senza categoria
     404:
-      title: Page not found
-      description: We couldn't find the page you were looking for.
-      back_to_home: Go to home page
+      title: Pagina non trovata
+      description: Non siamo riusciti a trovare la pagina che stavi cercando.
+      back_to_home: Vai alla pagina iniziale
   slack_unfurl:
     fields:
       name: Nome
       email: Email
-      phone_number: Phone
+      phone_number: Telefono
       company_name: Azienda
-      inbox_name: Casella
-      inbox_type: Inbox Type
+      inbox_name: Inbox
+      inbox_type: Tipo Inbox
     button: Apri conversazione
   time_units:
     days:
-      one: '%{count} day'
-      other: '%{count} days'
+      one: '%{count} giorno'
+      other: '%{count} giorni'
     hours:
-      one: '%{count} hour'
-      other: '%{count} hours'
+      one: '%{count} ora'
+      other: '%{count} ore'
     minutes:
-      one: '%{count} minute'
-      other: '%{count} minutes'
+      one: '%{count} minuto'
+      other: '%{count} minuti'
     seconds:
-      one: '%{count} second'
-      other: '%{count} seconds'
+      one: '%{count} secondo'
+      other: '%{count} secondi'
   automation:
-    system_name: 'Sistema di Automazione'
+    system_name: 'Automation System'
   crm:
     no_message: 'Nessun messaggio nella conversazione'
     attachment: '[Allegato: %{type}]'
@@ -397,7 +398,7 @@ it:
       Nuova conversazione iniziata su %{brand_name}
 
       Canale: %{channel_info}
-      Creato: %{formatted_creation_time}
+      Creata: %{formatted_creation_time}
       ID Conversazione: %{display_id}
       Visualizza in %{brand_name}: %{url}
     transcript_activity: |
@@ -413,10 +414,10 @@ it:
     inbox_already_assigned: 'La Inbox è già stata assegnata a questa policy'
   portals:
     send_instructions:
-      email_required: 'L''email è obbligatoria'
+      email_required: 'Email richiesta'
       invalid_email_format: 'Formato email non valido'
-      custom_domain_not_configured: 'Dominio personalizzato non configurato'
+      custom_domain_not_configured: 'Il dominio personalizzato non è configurato'
       instructions_sent_successfully: 'Istruzioni inviate con successo'
       subject: 'Termina la configurazione di %{custom_domain}'
     ssl_status:
-      custom_domain_not_configured: 'Dominio personalizzato non configurato'
+      custom_domain_not_configured: 'Il dominio personalizzato non è configurato'
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index eb205d1f5..d1753cb7a 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -76,6 +76,7 @@ ja:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index df7caec35..25e2370ee 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -76,6 +76,7 @@ ka:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 8200fe4cf..707332172 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -76,6 +76,7 @@ ko:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 4fca6066f..daf7b00ee 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -76,6 +76,7 @@ lt:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index baac1bbfe..3fd92993b 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -76,6 +76,7 @@ lv:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index ef716ae26..ee5ee8f7f 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -76,6 +76,7 @@ ml:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 8dc3b396d..460986218 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -76,6 +76,7 @@ ms:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 6a1d0cdb0..57b0ddc4c 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -76,6 +76,7 @@ ne:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 75d536a5c..73e15b0c3 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -76,6 +76,7 @@ nl:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/no.yml b/config/locales/no.yml
index e45fe8b88..41ce03ef5 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -76,6 +76,7 @@
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 863bd6671..5b727d944 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -76,6 +76,7 @@ pl:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index cc5f4b940..168941db0 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -76,6 +76,7 @@ pt:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 52a0b4226..f8f6c0428 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -76,6 +76,7 @@ pt_BR:
       token_exchange_failed: 'Falha ao trocar o código por um token de acesso. Por favor, tente novamente.'
       invalid_token_permissions: 'O token de acesso não tem as permissões necessárias para o WhatsApp.'
       phone_info_fetch_failed: 'Falha ao obter a informação do número de telefone. Por favor, tente novamente.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Falha ao reautenticar o WhatsApp. Por favor, tente novamente.'
         not_supported: 'Reautenticação não é suportado por este tipo de canal WhatsApp.'
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index b998feb84..b00c1689c 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -76,6 +76,7 @@ ro:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2484b30b4..90d41e87b 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -76,6 +76,7 @@ ru:
       token_exchange_failed: 'Не удалось обменять код на токена доступа. Пожалуйста, попробуйте еще раз.'
       invalid_token_permissions: 'Токен доступа не имеет необходимых прав для WhatsApp.'
       phone_info_fetch_failed: 'Не удалось получить информацию о номере телефона. Пожалуйста, попробуйте еще раз.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Не удалось повторно авторизовать WhatsApp. Пожалуйста, попробуйте еще раз.'
         not_supported: 'Повторная авторизация не поддерживается для данного типа канала WhatsApp.'
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 612db81a8..e918e4f58 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -76,6 +76,7 @@ sh:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 149af73cd..51c376df2 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -76,6 +76,7 @@ sk:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 40333e298..ba73fed9f 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -76,6 +76,7 @@ sl:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index ac7d5e4b9..b2874d78f 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -76,6 +76,7 @@ sq:
       token_exchange_failed: 'Dështoi shkëmbimi i kodit për tokenin e aksesit. Ju lutemi, provoni përsëri.'
       invalid_token_permissions: 'Tokeni i aksesit nuk ka lejet e nevojshme për WhatsApp.'
       phone_info_fetch_failed: 'Dështoi marrja e informacionit të numrit të telefonit. Ju lutemi, provoni përsëri.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Dështoi riautorizimi i WhatsApp-it. Ju lutemi, provoni përsëri.'
         not_supported: 'Riautorizimi nuk mbështetet për këtë lloj kanali të WhatsApp-it.'
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 685b736be..c0d384a15 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -76,6 +76,7 @@ sr-Latn:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 5c0c18b22..c12ee447d 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -76,6 +76,7 @@ sv:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 752ec6e6c..1f84cf894 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -76,6 +76,7 @@ ta:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 1ad957730..c6882b804 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -76,6 +76,7 @@ th:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 4ccbe3f16..a82593d8b 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -76,6 +76,7 @@ tl:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index e0c86304a..5cca4e559 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -76,6 +76,7 @@ tr:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Bu telefon numarası için zaten bir kanal mevcut: %{phone_number}, hata devam ederse lütfen destek ile iletişime geçin'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
@@ -186,8 +187,8 @@ tr:
         error_code: 'Hata kodu: %{error_code}'
     activity:
       captain:
-        resolved: 'Sohbet, %{user_name} tarafından etkinlik olmadığı için çözüldü olarak işaretlendi'
-        open: 'Sohbet, %{user_name} tarafından açık olarak işaretlendi'
+        resolved: 'Konuşma, %{user_name} tarafından etkinlik olmadığı için çözüldü olarak işaretlendi'
+        open: 'Konuşma, %{user_name} tarafından açık olarak işaretlendi'
       agent_bot:
         error_moved_to_open: 'Conversation was marked open by system due to an error with the agent bot.'
       status:
@@ -196,9 +197,9 @@ tr:
         open: 'Konuşma %{user_name} tarafından açık olarak işaretlendi'
         pending: 'Konuşma, %{user_name} tarafından bekleyen olarak işaretlendi'
         snoozed: 'Konuşma, %{user_name} tarafından erteledi olarak işaretlendi'
-        auto_resolved_days: ' %{count} günlük hareketsizlik nedeniyle konuşma, sistem tarafından çözümlendi olarak işaretlendi'
-        auto_resolved_hours: 'Sohbet, sistem tarafından %{count} saat etkinlik olmadığı için çözüldü olarak işaretlendi'
-        auto_resolved_minutes: 'Sohbet, sistem tarafından %{count} dakika etkinlik olmadığı için çözüldü olarak işaretlendi'
+        auto_resolved_days: 'Konuşma, %{count} günlük hareketsizlik nedeniyle sistem tarafından çözümlendi olarak işaretlendi'
+        auto_resolved_hours: 'Konuşma, %{count} saatlik hareketsizlik nedeniyle sistem tarafından çözümlendi olarak işaretlendi'
+        auto_resolved_minutes: 'Konuşma, %{count} dakikalık hareketsizlik nedeniyle sistem tarafından çözümlendi olarak işaretlendi'
         system_auto_open: Sistem, yeni gelen bir mesaj nedeniyle konuşmayı tekrar açtı.
       priority:
         added: '%{user_name} önceliği %{new_priority} olarak ayarladı'
@@ -217,7 +218,7 @@ tr:
         removed: '%{user_name}, %{labels} kaldırdı'
       sla:
         added: '%{user_name} added SLA policy %{sla_name}'
-        removed: '%{user_name} removed SLA policy %{sla_name}'
+        removed: '%{user_name}, %{sla_name} adlı SLA politikasını kaldırdı'
       linear:
         issue_created: 'Linear sorun %{issue_id} %{user_name} tarafından oluşturuldu'
         issue_linked: 'Linear sorun %{issue_id} %{user_name} tarafından bağlandı'
@@ -265,7 +266,7 @@ tr:
       meeting_name: '%{agent_name} bir toplantı başlattı'
     slack:
       name: 'Slack'
-      short_description: 'Slack üzerinden doğrudan bildirim alın ve sohbetlere yanıt verin.'
+      short_description: 'Doğrudan Slack''te bildirimler alın ve konuşmalara yanıt verin.'
       description: "Integrate Chatwoot with Slack to keep your team in sync. This integration allows you to receive notifications for new conversations and respond to them directly within Slack's interface."
     webhooks:
       name: 'Webhooks'
@@ -390,21 +391,21 @@ tr:
   automation:
     system_name: 'Otomasyon Sistemi'
   crm:
-    no_message: 'Sohbette mesaj yok'
+    no_message: 'Konuşmada mesaj yok'
     attachment: '[Ek: %{type}]'
-    no_content: '[No content]'
+    no_content: '[İçerik yok]'
     created_activity: |
-      Yeni sohbet başlatıldı: %{brand_name}
+      Yeni konuşma başlatıldı: %{brand_name}
 
       Kanal: %{channel_info}
       Oluşturulma: %{formatted_creation_time}
-      Sohbet Kimliği: %{display_id}
+      Konuşma Kimliği: %{display_id}
       %{brand_name}'de görüntüle: %{url}
     transcript_activity: |
       %{brand_name} sohbet dökümü
 
       Kanal: %{channel_info}
-      Sohbet Kimliği: %{display_id}
+      Konuşma Kimliği: %{display_id}
       %{brand_name}'de görüntüle: %{url}
 
       Döküm:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 543241725..b993f11cc 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -76,6 +76,7 @@ uk:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 859babbfa..3ce206c7a 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -76,6 +76,7 @@ ur:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 9a402fa1c..1c60bbbe2 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -76,6 +76,7 @@ ur:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 281b3bab4..4a58f028e 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -76,6 +76,7 @@ vi:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index b706cdca3..86a9ca702 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -76,6 +76,7 @@ zh_CN:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index f35ced777..de3b45df9 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -76,6 +76,7 @@ zh_TW:
       token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
diff --git a/config/markdown_embeds.yml b/config/markdown_embeds.yml
index 878276c5a..f85e181e3 100644
--- a/config/markdown_embeds.yml
+++ b/config/markdown_embeds.yml
@@ -52,10 +52,25 @@ mp4:
       Your browser does not support the video tag.
     </video>
 
+arcade_tab:
+  regex: 'https?://(?:www\.)?app\.arcade\.software/share/(?<video_id>[^&/?]+)\?(?:[^&#]*&)*embed_mobile=tab(?:[&#?][^ ]*)?'
+  template: |
+    <div style="position: relative; padding-bottom: calc(62.793% + 41px); height: 0px; width: 100%;">
+      <iframe
+        src="https://app.arcade.software/embed/%{video_id}?embed&embed_mobile=tab"
+        frameborder="0"
+        webkitallowfullscreen
+        mozallowfullscreen
+        allowfullscreen
+        allow="fullscreen"
+        style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;">
+      </iframe>
+    </div>
+
 arcade:
   regex: 'https?://(?:www\.)?app\.arcade\.software/share/(?<video_id>[^&/]+)'
   template: |
-    <div style="position: relative; padding-bottom: 62.5%; height: 0;">
+    <div style="position: relative; padding-bottom: calc(62.793% + 41px); height: 0px; width: 100%;">
       <iframe
         src="https://app.arcade.software/embed/%{video_id}"
         frameborder="0"
diff --git a/config/routes.rb b/config/routes.rb
index 639c51da7..9b22cb333 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -141,6 +141,7 @@ Rails.application.routes.draw do
               post :custom_attributes
               get :attachments
               get :inbox_assistant
+              get :reporting_events if ChatwootApp.enterprise?
             end
           end
 
@@ -153,7 +154,11 @@ Rails.application.routes.draw do
             end
           end
 
-          resources :companies, only: [:index, :show, :create, :update, :destroy]
+          resources :companies, only: [:index, :show, :create, :update, :destroy] do
+            collection do
+              get :search
+            end
+          end
           resources :contacts, only: [:index, :show, :update, :create, :destroy] do
             collection do
               get :active
@@ -172,6 +177,7 @@ Rails.application.routes.draw do
               resources :contact_inboxes, only: [:create]
               resources :labels, only: [:create, :index]
               resources :notes
+              post :call, on: :member, to: 'calls#create' if ChatwootApp.enterprise?
             end
           end
           resources :csat_survey_responses, only: [:index] do
@@ -186,6 +192,7 @@ Rails.application.routes.draw do
               get :download
             end
           end
+          resources :reporting_events, only: [:index] if ChatwootApp.enterprise?
           resources :custom_attribute_definitions, only: [:index, :show, :create, :update, :destroy]
           resources :custom_filters, only: [:index, :show, :create, :update, :destroy]
           resources :inboxes, only: [:index, :show, :create, :update, :destroy] do
@@ -431,6 +438,7 @@ Rails.application.routes.draw do
               post :subscription
               get :limits
               post :toggle_deletion
+              post :topup_checkout
             end
           end
         end
@@ -544,6 +552,7 @@ Rails.application.routes.draw do
         collection do
           post 'call/:phone', action: :call_twiml
           post 'status/:phone', action: :status
+          post 'conference_status/:phone', action: :conference_status
         end
       end
     end
diff --git a/config/schedule.yml b/config/schedule.yml
index b5b21b4ce..c039719fa 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -53,3 +53,9 @@ bulk_auto_assignment_job:
   cron: '*/15 * * * *'
   class: 'Inboxes::BulkAutoAssignmentJob'
   queue: scheduled_jobs
+
+# executed every 30 minutes for assignment_v2
+periodic_assignment_job:
+  cron: '*/30 * * * *'
+  class: 'AutoAssignment::PeriodicAssignmentJob'
+  queue: scheduled_jobs
diff --git a/db/migrate/20230515051424_update_article_image_keys.rb b/db/migrate/20230515051424_update_article_image_keys.rb
index db208470f..3e8b9f77d 100644
--- a/db/migrate/20230515051424_update_article_image_keys.rb
+++ b/db/migrate/20230515051424_update_article_image_keys.rb
@@ -44,6 +44,7 @@ class ArticleKeyConverter
   end
 end
 
+# rubocop:disable Style/OneClassPerFile
 class UpdateArticleImageKeys < ActiveRecord::Migration[7.0]
   def change
     # Iterate through all articles
@@ -53,3 +54,4 @@ class UpdateArticleImageKeys < ActiveRecord::Migration[7.0]
     end
   end
 end
+# rubocop:enable Style/OneClassPerFile
diff --git a/db/migrate/20251010143218_add_name_to_webhooks.rb b/db/migrate/20251010143218_add_name_to_webhooks.rb
new file mode 100644
index 000000000..693ecc35a
--- /dev/null
+++ b/db/migrate/20251010143218_add_name_to_webhooks.rb
@@ -0,0 +1,5 @@
+class AddNameToWebhooks < ActiveRecord::Migration[7.1]
+  def change
+    add_column :webhooks, :name, :string, null: true
+  end
+end
diff --git a/db/migrate/20251021082242_add_unique_index_to_companies_domain.rb b/db/migrate/20251021082242_add_unique_index_to_companies_domain.rb
new file mode 100644
index 000000000..2fb387242
--- /dev/null
+++ b/db/migrate/20251021082242_add_unique_index_to_companies_domain.rb
@@ -0,0 +1,16 @@
+class AddUniqueIndexToCompaniesDomain < ActiveRecord::Migration[7.1]
+  def up
+    remove_index :companies, name: 'index_companies_on_domain_and_account_id', if_exists: true
+
+    add_index :companies, [:account_id, :domain],
+              unique: true,
+              name: 'index_companies_on_account_and_domain',
+              where: 'domain IS NOT NULL'
+  end
+
+  def down
+    remove_index :companies, name: 'index_companies_on_account_and_domain', if_exists: true
+    add_index :companies, [:domain, :account_id],
+              name: 'index_companies_on_domain_and_account_id'
+  end
+end
diff --git a/db/migrate/20251022162159_add_assignee_agent_bot_id_to_conversations.rb b/db/migrate/20251022162159_add_assignee_agent_bot_id_to_conversations.rb
new file mode 100644
index 000000000..0a96c319e
--- /dev/null
+++ b/db/migrate/20251022162159_add_assignee_agent_bot_id_to_conversations.rb
@@ -0,0 +1,5 @@
+class AddAssigneeAgentBotIdToConversations < ActiveRecord::Migration[7.1]
+  def change
+    add_column :conversations, :assignee_agent_bot_id, :bigint
+  end
+end
diff --git a/db/migrate/20251111094402_add_contacts_count_to_companies.rb b/db/migrate/20251111094402_add_contacts_count_to_companies.rb
new file mode 100644
index 000000000..2bd1ac5dc
--- /dev/null
+++ b/db/migrate/20251111094402_add_contacts_count_to_companies.rb
@@ -0,0 +1,5 @@
+class AddContactsCountToCompanies < ActiveRecord::Migration[7.1]
+  def change
+    add_column :companies, :contacts_count, :integer, default: 0, null: false
+  end
+end
diff --git a/db/migrate/20251114173609_change_source_id_to_text.rb b/db/migrate/20251114173609_change_source_id_to_text.rb
new file mode 100644
index 000000000..c6a41131f
--- /dev/null
+++ b/db/migrate/20251114173609_change_source_id_to_text.rb
@@ -0,0 +1,9 @@
+class ChangeSourceIdToText < ActiveRecord::Migration[7.1]
+  def up
+    change_column :contact_inboxes, :source_id, :text, null: false
+  end
+
+  def down
+    change_column :contact_inboxes, :source_id, :string, null: false
+  end
+end
diff --git a/db/migrate/20251119161025_change_messages_source_id_to_text.rb b/db/migrate/20251119161025_change_messages_source_id_to_text.rb
new file mode 100644
index 000000000..3d8a10f0e
--- /dev/null
+++ b/db/migrate/20251119161025_change_messages_source_id_to_text.rb
@@ -0,0 +1,9 @@
+class ChangeMessagesSourceIdToText < ActiveRecord::Migration[7.1]
+  def up
+    change_column :messages, :source_id, :text
+  end
+
+  def down
+    change_column :messages, :source_id, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a04096c98..a03615b24 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,1285 +1,177 @@
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# This file is the source Rails uses to define your schema when running `bin/rails
-# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
-# be faster and is potentially less error prone than running all of your
-# migrations from scratch. Old migrations may fail to apply correctly if those
-# migrations use external dependencies or application code.
-#
-# It's strongly recommended that you check this file into your version control system.
+# TODO: logic is written tailored to contact import since its the only import available
+# let's break this logic and clean this up in future
 
-ActiveRecord::Schema[7.1].define(version: 2025_10_25_033349) do
-  # These extensions should be enabled to support this database
-  enable_extension "pg_stat_statements"
-  enable_extension "pg_trgm"
-  enable_extension "pgcrypto"
-  enable_extension "plpgsql"
-  enable_extension "vector"
+class DataImportJob < ApplicationJob
+  queue_as :low
+  retry_on ActiveStorage::FileNotFoundError, wait: 1.minute, attempts: 3
 
-  create_table "access_tokens", force: :cascade do |t|
-    t.string "owner_type"
-    t.bigint "owner_id"
-    t.string "token"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["owner_type", "owner_id"], name: "index_access_tokens_on_owner_type_and_owner_id"
-    t.index ["token"], name: "index_access_tokens_on_token", unique: true
+  def perform(data_import)
+    @data_import = data_import
+    @contact_manager = DataImport::ContactManager.new(@data_import.account)
+    begin
+      process_import_file
+      send_import_notification_to_admin
+    rescue CSV::MalformedCSVError => e
+      handle_csv_error(e)
+    end
   end
 
-  create_table "account_saml_settings", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.string "sso_url"
-    t.text "certificate"
-    t.string "sp_entity_id"
-    t.string "idp_entity_id"
-    t.json "role_mappings", default: {}
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_account_saml_settings_on_account_id"
-  end
+  private
 
-  create_table "account_users", force: :cascade do |t|
-    t.bigint "account_id"
-    t.bigint "user_id"
-    t.integer "role", default: 0
-    t.bigint "inviter_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.datetime "active_at", precision: nil
-    t.integer "availability", default: 0, null: false
-    t.boolean "auto_offline", default: true, null: false
-    t.bigint "custom_role_id"
-    t.bigint "agent_capacity_policy_id"
-    t.index ["account_id", "user_id"], name: "uniq_user_id_per_account_id", unique: true
-    t.index ["account_id"], name: "index_account_users_on_account_id"
-    t.index ["agent_capacity_policy_id"], name: "index_account_users_on_agent_capacity_policy_id"
-    t.index ["custom_role_id"], name: "index_account_users_on_custom_role_id"
-    t.index ["user_id"], name: "index_account_users_on_user_id"
-  end
+  def process_import_file
+    @data_import.update!(status: :processing)
+    identifiable_contacts, non_identifiable_contacts, rejected_contacts, total_csv_records = parse_csv_and_build_contacts
 
-  create_table "accounts", id: :serial, force: :cascade do |t|
-    t.string "name", null: false
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.integer "locale", default: 0
-    t.string "domain", limit: 100
-    t.string "support_email", limit: 100
-    t.bigint "feature_flags", default: 0, null: false
-    t.integer "auto_resolve_duration"
-    t.jsonb "limits", default: {}
-    t.jsonb "custom_attributes", default: {}
-    t.integer "status", default: 0
-    t.jsonb "internal_attributes", default: {}, null: false
-    t.jsonb "settings", default: {}
-    t.index ["status"], name: "index_accounts_on_status"
-  end
+    all_valid_contacts = identifiable_contacts + non_identifiable_contacts
 
-  create_table "action_mailbox_inbound_emails", force: :cascade do |t|
-    t.integer "status", default: 0, null: false
-    t.string "message_id", null: false
-    t.string "message_checksum", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["message_id", "message_checksum"], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true
-  end
+    # Count contacts before import
+    contacts_before = @data_import.account.contacts.count
 
-  create_table "active_storage_attachments", force: :cascade do |t|
-    t.string "name", null: false
-    t.string "record_type", null: false
-    t.bigint "record_id", null: false
-    t.bigint "blob_id", null: false
-    t.datetime "created_at", precision: nil, null: false
-    t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
-    t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
-  end
+    import_contacts(all_valid_contacts)
 
-  create_table "active_storage_blobs", force: :cascade do |t|
-    t.string "key", null: false
-    t.string "filename", null: false
-    t.string "content_type"
-    t.text "metadata"
-    t.bigint "byte_size", null: false
-    t.string "checksum"
-    t.datetime "created_at", precision: nil, null: false
-    t.string "service_name", null: false
-    t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
-  end
+    # Count contacts after import to get actual imported count
+    contacts_after = @data_import.account.contacts.count
+    actual_imported_count = contacts_after - contacts_before
 
-  create_table "active_storage_variant_records", force: :cascade do |t|
-    t.bigint "blob_id", null: false
-    t.string "variation_digest", null: false
-    t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
-  end
+    # Calculate actual imported counts based on what we built vs what was imported
+    actual_identifiable_count, actual_non_identifiable_count = calculate_actual_import_counts(
+      identifiable_contacts, non_identifiable_contacts, actual_imported_count
+    )
 
-  create_table "agent_bot_inboxes", force: :cascade do |t|
-    t.integer "inbox_id"
-    t.integer "agent_bot_id"
-    t.integer "status", default: 0
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "account_id"
+    update_data_import_status(actual_identifiable_count, actual_non_identifiable_count, rejected_contacts.length, total_csv_records)
+    save_failed_records_csv(rejected_contacts)
   end
 
-  create_table "agent_bots", force: :cascade do |t|
-    t.string "name"
-    t.string "description"
-    t.string "outgoing_url"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.bigint "account_id"
-    t.integer "bot_type", default: 0
-    t.jsonb "bot_config", default: {}
-    t.index ["account_id"], name: "index_agent_bots_on_account_id"
-  end
+  # rubocop:disable Metrics/MethodLength
+  def parse_csv_and_build_contacts
+    identifiable_contacts = []
+    non_identifiable_contacts = []
+    rejected_contacts = []
+    total_csv_records = 0
 
-  create_table "agent_capacity_policies", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.string "name", limit: 255, null: false
-    t.text "description"
-    t.jsonb "exclusion_rules", default: {}, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_agent_capacity_policies_on_account_id"
-  end
+    with_import_file do |file|
+      csv_reader(file).each do |row|
+        total_csv_records += 1
+        current_contact = @contact_manager.build_contact(row.to_h.with_indifferent_access)
+        if current_contact.valid?
+          is_identifiable = @contact_manager.contact_identifiable?(current_contact)
 
-  create_table "applied_slas", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.bigint "sla_policy_id", null: false
-    t.bigint "conversation_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "sla_status", default: 0
-    t.index ["account_id", "sla_policy_id", "conversation_id"], name: "index_applied_slas_on_account_sla_policy_conversation", unique: true
-    t.index ["account_id"], name: "index_applied_slas_on_account_id"
-    t.index ["conversation_id"], name: "index_applied_slas_on_conversation_id"
-    t.index ["sla_policy_id"], name: "index_applied_slas_on_sla_policy_id"
-  end
+          if is_identifiable
+            identifiable_contacts << current_contact
+          else
+            non_identifiable_contacts << current_contact
+          end
+        else
+          append_rejected_contact(row, current_contact, rejected_contacts)
+        end
+      end
+    end
 
-  create_table "article_embeddings", force: :cascade do |t|
-    t.bigint "article_id", null: false
-    t.text "term", null: false
-    t.vector "embedding", limit: 1536
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["embedding"], name: "index_article_embeddings_on_embedding", using: :ivfflat
+    [identifiable_contacts, non_identifiable_contacts, rejected_contacts, total_csv_records]
   end
+  # rubocop:enable Metrics/MethodLength
 
-  create_table "articles", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "portal_id", null: false
-    t.integer "category_id"
-    t.integer "folder_id"
-    t.string "title"
-    t.text "description"
-    t.text "content"
-    t.integer "status"
-    t.integer "views"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.bigint "author_id"
-    t.bigint "associated_article_id"
-    t.jsonb "meta", default: {}
-    t.string "slug", null: false
-    t.integer "position"
-    t.string "locale", default: "en", null: false
-    t.index ["account_id"], name: "index_articles_on_account_id"
-    t.index ["associated_article_id"], name: "index_articles_on_associated_article_id"
-    t.index ["author_id"], name: "index_articles_on_author_id"
-    t.index ["portal_id"], name: "index_articles_on_portal_id"
-    t.index ["slug"], name: "index_articles_on_slug", unique: true
-    t.index ["status"], name: "index_articles_on_status"
-    t.index ["views"], name: "index_articles_on_views"
+  def append_rejected_contact(row, contact, rejected_contacts)
+    row['errors'] = contact.errors.full_messages.join(', ')
+    rejected_contacts << row
   end
 
-  create_table "assignment_policies", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.string "name", limit: 255, null: false
-    t.text "description"
-    t.integer "assignment_order", default: 0, null: false
-    t.integer "conversation_priority", default: 0, null: false
-    t.integer "fair_distribution_limit", default: 100, null: false
-    t.integer "fair_distribution_window", default: 3600, null: false
-    t.boolean "enabled", default: true, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id", "name"], name: "index_assignment_policies_on_account_id_and_name", unique: true
-    t.index ["account_id"], name: "index_assignment_policies_on_account_id"
-    t.index ["enabled"], name: "index_assignment_policies_on_enabled"
+  def import_contacts(contacts)
+    # Returns ActiveRecord::Import::Result with info about what was actually imported
+    Contact.import(contacts, synchronize: contacts, on_duplicate_key_ignore: true, track_validation_failures: true, validate: true,
+                             batch_size: 1000)
   end
 
-  create_table "attachments", id: :serial, force: :cascade do |t|
-    t.integer "file_type", default: 0
-    t.string "external_url"
-    t.float "coordinates_lat", default: 0.0
-    t.float "coordinates_long", default: 0.0
-    t.integer "message_id", null: false
-    t.integer "account_id", null: false
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.string "fallback_title"
-    t.string "extension"
-    t.jsonb "meta", default: {}
-    t.index ["account_id"], name: "index_attachments_on_account_id"
-    t.index ["message_id"], name: "index_attachments_on_message_id"
-  end
+  def calculate_actual_import_counts(identifiable_contacts, non_identifiable_contacts, actual_imported_count)
+    Rails.logger.info "Actual imported: #{actual_imported_count}, expected identifiable: #{identifiable_contacts.length}, " \
+                      "expected non-identifiable: #{non_identifiable_contacts.length}"
 
-  create_table "audits", force: :cascade do |t|
-    t.bigint "auditable_id"
-    t.string "auditable_type"
-    t.bigint "associated_id"
-    t.string "associated_type"
-    t.bigint "user_id"
-    t.string "user_type"
-    t.string "username"
-    t.string "action"
-    t.jsonb "audited_changes"
-    t.integer "version", default: 0
-    t.string "comment"
-    t.string "remote_address"
-    t.string "request_uuid"
-    t.datetime "created_at", precision: nil
-    t.index ["associated_type", "associated_id"], name: "associated_index"
-    t.index ["auditable_type", "auditable_id", "version"], name: "auditable_index"
-    t.index ["created_at"], name: "index_audits_on_created_at"
-    t.index ["request_uuid"], name: "index_audits_on_request_uuid"
-    t.index ["user_id", "user_type"], name: "user_index"
-  end
+    expected_count = identifiable_contacts.length + non_identifiable_contacts.length
 
-  create_table "automation_rules", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.string "name", null: false
-    t.text "description"
-    t.string "event_name", null: false
-    t.jsonb "conditions", default: "{}", null: false
-    t.jsonb "actions", default: "{}", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.boolean "active", default: true, null: false
-    t.index ["account_id"], name: "index_automation_rules_on_account_id"
-  end
+    if actual_imported_count <= expected_count
+      # Prioritize identifiable contacts in the count since they're more important
+      actual_identifiable_count = [actual_imported_count, identifiable_contacts.length].min
+      actual_non_identifiable_count = actual_imported_count - actual_identifiable_count
+    else
+      # This shouldn't happen, but fallback to expected counts
+      actual_identifiable_count = identifiable_contacts.length
+      actual_non_identifiable_count = non_identifiable_contacts.length
+    end
 
-  create_table "campaigns", force: :cascade do |t|
-    t.integer "display_id", null: false
-    t.string "title", null: false
-    t.text "description"
-    t.text "message", null: false
-    t.integer "sender_id"
-    t.boolean "enabled", default: true
-    t.bigint "account_id", null: false
-    t.bigint "inbox_id", null: false
-    t.jsonb "trigger_rules", default: {}
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "campaign_type", default: 0, null: false
-    t.integer "campaign_status", default: 0, null: false
-    t.jsonb "audience", default: []
-    t.datetime "scheduled_at", precision: nil
-    t.boolean "trigger_only_during_business_hours", default: false
-    t.jsonb "template_params"
-    t.index ["account_id"], name: "index_campaigns_on_account_id"
-    t.index ["campaign_status"], name: "index_campaigns_on_campaign_status"
-    t.index ["campaign_type"], name: "index_campaigns_on_campaign_type"
-    t.index ["inbox_id"], name: "index_campaigns_on_inbox_id"
-    t.index ["scheduled_at"], name: "index_campaigns_on_scheduled_at"
-  end
+    Rails.logger.info "Final counts: identifiable=#{actual_identifiable_count}, non-identifiable=#{actual_non_identifiable_count}"
 
-  create_table "canned_responses", id: :serial, force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.string "short_code"
-    t.text "content"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
+    [actual_identifiable_count, actual_non_identifiable_count]
   end
 
-  create_table "captain_assistant_responses", force: :cascade do |t|
-    t.string "question", null: false
-    t.text "answer", null: false
-    t.vector "embedding", limit: 1536
-    t.bigint "assistant_id", null: false
-    t.bigint "documentable_id"
-    t.bigint "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "status", default: 1, null: false
-    t.string "documentable_type"
-    t.index ["account_id"], name: "index_captain_assistant_responses_on_account_id"
-    t.index ["assistant_id"], name: "index_captain_assistant_responses_on_assistant_id"
-    t.index ["documentable_id", "documentable_type"], name: "idx_cap_asst_resp_on_documentable"
-    t.index ["embedding"], name: "vector_idx_knowledge_entries_embedding", using: :ivfflat
-    t.index ["status"], name: "index_captain_assistant_responses_on_status"
+  def update_data_import_status(identifiable_records, non_identifiable_records, _rejected_records, total_csv_records)
+    processed_records = identifiable_records + non_identifiable_records
+    @data_import.update!(
+      status: :completed,
+      processed_records: processed_records,
+      non_identifiable_records: non_identifiable_records,
+      total_records: total_csv_records
+    )
   end
 
-  create_table "captain_assistants", force: :cascade do |t|
-    t.string "name", null: false
-    t.bigint "account_id", null: false
-    t.string "description"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.jsonb "config", default: {}, null: false
-    t.jsonb "response_guidelines", default: []
-    t.jsonb "guardrails", default: []
-    t.index ["account_id"], name: "index_captain_assistants_on_account_id"
-  end
+  def save_failed_records_csv(rejected_contacts)
+    csv_data = generate_csv_data(rejected_contacts)
+    return if csv_data.blank?
 
-  create_table "captain_custom_tools", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.string "slug", null: false
-    t.string "title", null: false
-    t.text "description"
-    t.string "http_method", default: "GET", null: false
-    t.text "endpoint_url", null: false
-    t.text "request_template"
-    t.text "response_template"
-    t.string "auth_type", default: "none"
-    t.jsonb "auth_config", default: {}
-    t.jsonb "param_schema", default: []
-    t.boolean "enabled", default: true, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id", "slug"], name: "index_captain_custom_tools_on_account_id_and_slug", unique: true
-    t.index ["account_id"], name: "index_captain_custom_tools_on_account_id"
+    @data_import.failed_records.attach(io: StringIO.new(csv_data), filename: "#{Time.zone.today.strftime('%Y%m%d')}_contacts.csv",
+                                       content_type: 'text/csv')
+    send_import_notification_to_admin
   end
 
-  create_table "captain_documents", force: :cascade do |t|
-    t.string "name"
-    t.string "external_link", null: false
-    t.text "content"
-    t.bigint "assistant_id", null: false
-    t.bigint "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "status", default: 0, null: false
-    t.jsonb "metadata", default: {}
-    t.index ["account_id"], name: "index_captain_documents_on_account_id"
-    t.index ["assistant_id", "external_link"], name: "index_captain_documents_on_assistant_id_and_external_link", unique: true
-    t.index ["assistant_id"], name: "index_captain_documents_on_assistant_id"
-    t.index ["status"], name: "index_captain_documents_on_status"
-  end
+  def generate_csv_data(rejected_contacts)
+    headers = csv_headers
+    headers << 'errors'
+    return if rejected_contacts.blank?
 
-  create_table "captain_inboxes", force: :cascade do |t|
-    t.bigint "captain_assistant_id", null: false
-    t.bigint "inbox_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["captain_assistant_id", "inbox_id"], name: "index_captain_inboxes_on_captain_assistant_id_and_inbox_id", unique: true
-    t.index ["captain_assistant_id"], name: "index_captain_inboxes_on_captain_assistant_id"
-    t.index ["inbox_id"], name: "index_captain_inboxes_on_inbox_id"
+    CSV.generate do |csv|
+      csv << headers
+      rejected_contacts.each do |record|
+        csv << record
+      end
+    end
   end
 
-  create_table "captain_scenarios", force: :cascade do |t|
-    t.string "title"
-    t.text "description"
-    t.text "instruction"
-    t.jsonb "tools", default: []
-    t.boolean "enabled", default: true, null: false
-    t.bigint "assistant_id", null: false
-    t.bigint "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_captain_scenarios_on_account_id"
-    t.index ["assistant_id", "enabled"], name: "index_captain_scenarios_on_assistant_id_and_enabled"
-    t.index ["assistant_id"], name: "index_captain_scenarios_on_assistant_id"
-    t.index ["enabled"], name: "index_captain_scenarios_on_enabled"
+  def handle_csv_error(error) # rubocop:disable Lint/UnusedMethodArgument
+    @data_import.update!(status: :failed)
+    send_import_failed_notification_to_admin
   end
 
-  create_table "categories", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "portal_id", null: false
-    t.string "name"
-    t.text "description"
-    t.integer "position"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.string "locale", default: "en"
-    t.string "slug", null: false
-    t.bigint "parent_category_id"
-    t.bigint "associated_category_id"
-    t.string "icon", default: ""
-    t.index ["associated_category_id"], name: "index_categories_on_associated_category_id"
-    t.index ["locale", "account_id"], name: "index_categories_on_locale_and_account_id"
-    t.index ["locale"], name: "index_categories_on_locale"
-    t.index ["parent_category_id"], name: "index_categories_on_parent_category_id"
-    t.index ["slug", "locale", "portal_id"], name: "index_categories_on_slug_and_locale_and_portal_id", unique: true
+  def send_import_notification_to_admin
+    AdministratorNotifications::AccountNotificationMailer.with(account: @data_import.account).contact_import_complete(@data_import).deliver_later
   end
 
-  create_table "channel_api", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.string "webhook_url"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.string "identifier"
-    t.string "hmac_token"
-    t.boolean "hmac_mandatory", default: false
-    t.jsonb "additional_attributes", default: {}
-    t.index ["hmac_token"], name: "index_channel_api_on_hmac_token", unique: true
-    t.index ["identifier"], name: "index_channel_api_on_identifier", unique: true
+  def send_import_failed_notification_to_admin
+    AdministratorNotifications::AccountNotificationMailer.with(account: @data_import.account).contact_import_failed.deliver_later
   end
 
-  create_table "channel_email", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.string "email", null: false
-    t.string "forward_to_email", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.boolean "imap_enabled", default: false
-    t.string "imap_address", default: ""
-    t.integer "imap_port", default: 0
-    t.string "imap_login", default: ""
-    t.string "imap_password", default: ""
-    t.boolean "imap_enable_ssl", default: true
-    t.boolean "smtp_enabled", default: false
-    t.string "smtp_address", default: ""
-    t.integer "smtp_port", default: 0
-    t.string "smtp_login", default: ""
-    t.string "smtp_password", default: ""
-    t.string "smtp_domain", default: ""
-    t.boolean "smtp_enable_starttls_auto", default: true
-    t.string "smtp_authentication", default: "login"
-    t.string "smtp_openssl_verify_mode", default: "none"
-    t.boolean "smtp_enable_ssl_tls", default: false
-    t.jsonb "provider_config", default: {}
-    t.string "provider"
-    t.boolean "verified_for_sending", default: false, null: false
-    t.index ["email"], name: "index_channel_email_on_email", unique: true
-    t.index ["forward_to_email"], name: "index_channel_email_on_forward_to_email", unique: true
+  def csv_headers
+    header_row = nil
+    with_import_file do |file|
+      header_row = csv_reader(file).first
+    end
+    header_row&.headers || []
   end
 
-  create_table "channel_facebook_pages", id: :serial, force: :cascade do |t|
-    t.string "page_id", null: false
-    t.string "user_access_token", null: false
-    t.string "page_access_token", null: false
-    t.integer "account_id", null: false
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.string "instagram_id"
-    t.index ["page_id", "account_id"], name: "index_channel_facebook_pages_on_page_id_and_account_id", unique: true
-    t.index ["page_id"], name: "index_channel_facebook_pages_on_page_id"
-  end
+  def csv_reader(file)
+    file.rewind
+    raw_data = file.read
+    utf8_data = raw_data.force_encoding('UTF-8')
+    clean_data = utf8_data.valid_encoding? ? utf8_data : utf8_data.encode('UTF-16le', invalid: :replace, replace: '').encode('UTF-8')
 
-  create_table "channel_instagram", force: :cascade do |t|
-    t.string "access_token", null: false
-    t.datetime "expires_at", null: false
-    t.integer "account_id", null: false
-    t.string "instagram_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["instagram_id"], name: "index_channel_instagram_on_instagram_id", unique: true
+    CSV.new(StringIO.new(clean_data), headers: true)
   end
 
-  create_table "channel_line", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.string "line_channel_id", null: false
-    t.string "line_channel_secret", null: false
-    t.string "line_channel_token", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["line_channel_id"], name: "index_channel_line_on_line_channel_id", unique: true
-  end
-
-  create_table "channel_sms", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.string "phone_number", null: false
-    t.string "provider", default: "default"
-    t.jsonb "provider_config", default: {}
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["phone_number"], name: "index_channel_sms_on_phone_number", unique: true
-  end
-
-  create_table "channel_telegram", force: :cascade do |t|
-    t.string "bot_name"
-    t.integer "account_id", null: false
-    t.string "bot_token", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["bot_token"], name: "index_channel_telegram_on_bot_token", unique: true
-  end
-
-  create_table "channel_twilio_sms", force: :cascade do |t|
-    t.string "phone_number"
-    t.string "auth_token", null: false
-    t.string "account_sid", null: false
-    t.integer "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "medium", default: 0
-    t.string "messaging_service_sid"
-    t.string "api_key_sid"
-    t.jsonb "content_templates", default: {}
-    t.datetime "content_templates_last_updated"
-    t.index ["account_sid", "phone_number"], name: "index_channel_twilio_sms_on_account_sid_and_phone_number", unique: true
-    t.index ["messaging_service_sid"], name: "index_channel_twilio_sms_on_messaging_service_sid", unique: true
-    t.index ["phone_number"], name: "index_channel_twilio_sms_on_phone_number", unique: true
-  end
-
-  create_table "channel_twitter_profiles", force: :cascade do |t|
-    t.string "profile_id", null: false
-    t.string "twitter_access_token", null: false
-    t.string "twitter_access_token_secret", null: false
-    t.integer "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.boolean "tweets_enabled", default: true
-    t.index ["account_id", "profile_id"], name: "index_channel_twitter_profiles_on_account_id_and_profile_id", unique: true
-  end
-
-  create_table "channel_voice", force: :cascade do |t|
-    t.string "phone_number", null: false
-    t.string "provider", default: "twilio", null: false
-    t.jsonb "provider_config", null: false
-    t.integer "account_id", null: false
-    t.jsonb "additional_attributes", default: {}
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_channel_voice_on_account_id"
-    t.index ["phone_number"], name: "index_channel_voice_on_phone_number", unique: true
-  end
-
-  create_table "channel_web_widgets", id: :serial, force: :cascade do |t|
-    t.string "website_url"
-    t.integer "account_id"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.string "website_token"
-    t.string "widget_color", default: "#1f93ff"
-    t.string "welcome_title"
-    t.string "welcome_tagline"
-    t.integer "feature_flags", default: 7, null: false
-    t.integer "reply_time", default: 0
-    t.string "hmac_token"
-    t.boolean "pre_chat_form_enabled", default: false
-    t.jsonb "pre_chat_form_options", default: {}
-    t.boolean "hmac_mandatory", default: false
-    t.boolean "continuity_via_email", default: true, null: false
-    t.text "allowed_domains", default: ""
-    t.index ["hmac_token"], name: "index_channel_web_widgets_on_hmac_token", unique: true
-    t.index ["website_token"], name: "index_channel_web_widgets_on_website_token", unique: true
-  end
-
-  create_table "channel_whatsapp", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.string "phone_number", null: false
-    t.string "provider", default: "default"
-    t.jsonb "provider_config", default: {}
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.jsonb "message_templates", default: {}
-    t.datetime "message_templates_last_updated", precision: nil
-    t.index ["phone_number"], name: "index_channel_whatsapp_on_phone_number", unique: true
-  end
+  def with_import_file
+    temp_dir = Rails.root.join('tmp/imports')
+    FileUtils.mkdir_p(temp_dir)
 
-  create_table "companies", force: :cascade do |t|
-    t.string "name", null: false
-    t.string "domain"
-    t.text "description"
-    t.bigint "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_companies_on_account_id"
-    t.index ["domain", "account_id"], name: "index_companies_on_domain_and_account_id"
-    t.index ["name", "account_id"], name: "index_companies_on_name_and_account_id"
+    @data_import.import_file.open(tmpdir: temp_dir) do |file|
+      file.binmode
+      yield file
+    end
   end
-
-  create_table "contact_inboxes", force: :cascade do |t|
-    t.bigint "contact_id"
-    t.bigint "inbox_id"
-    t.string "source_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.boolean "hmac_verified", default: false
-    t.string "pubsub_token"
-    t.index ["contact_id"], name: "index_contact_inboxes_on_contact_id"
-    t.index ["inbox_id", "source_id"], name: "index_contact_inboxes_on_inbox_id_and_source_id", unique: true
-    t.index ["inbox_id"], name: "index_contact_inboxes_on_inbox_id"
-    t.index ["pubsub_token"], name: "index_contact_inboxes_on_pubsub_token", unique: true
-    t.index ["source_id"], name: "index_contact_inboxes_on_source_id"
-  end
-
-  create_table "contacts", id: :serial, force: :cascade do |t|
-    t.string "name", default: ""
-    t.string "email"
-    t.string "phone_number"
-    t.integer "account_id", null: false
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.jsonb "additional_attributes", default: {}
-    t.string "identifier"
-    t.jsonb "custom_attributes", default: {}
-    t.datetime "last_activity_at", precision: nil
-    t.integer "contact_type", default: 0
-    t.string "middle_name", default: ""
-    t.string "last_name", default: ""
-    t.string "location", default: ""
-    t.string "country_code", default: ""
-    t.boolean "blocked", default: false, null: false
-    t.bigint "company_id"
-    t.index "lower((email)::text), account_id", name: "index_contacts_on_lower_email_account_id"
-    t.index ["account_id", "contact_type"], name: "index_contacts_on_account_id_and_contact_type"
-    t.index ["account_id", "email", "phone_number", "identifier"], name: "index_contacts_on_nonempty_fields", where: "(((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text))"
-    t.index ["account_id", "last_activity_at"], name: "index_contacts_on_account_id_and_last_activity_at", order: { last_activity_at: "DESC NULLS LAST" }
-    t.index ["account_id"], name: "index_contacts_on_account_id"
-    t.index ["account_id"], name: "index_resolved_contact_account_id", where: "(((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text))"
-    t.index ["blocked"], name: "index_contacts_on_blocked"
-    t.index ["company_id"], name: "index_contacts_on_company_id"
-    t.index ["email", "account_id"], name: "uniq_email_per_account_contact", unique: true
-    t.index ["identifier", "account_id"], name: "uniq_identifier_per_account_contact", unique: true
-    t.index ["name", "email", "phone_number", "identifier"], name: "index_contacts_on_name_email_phone_number_identifier", opclass: :gin_trgm_ops, using: :gin
-    t.index ["phone_number", "account_id"], name: "index_contacts_on_phone_number_and_account_id"
-  end
-
-  create_table "conversation_participants", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.bigint "user_id", null: false
-    t.bigint "conversation_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_conversation_participants_on_account_id"
-    t.index ["conversation_id"], name: "index_conversation_participants_on_conversation_id"
-    t.index ["user_id", "conversation_id"], name: "index_conversation_participants_on_user_id_and_conversation_id", unique: true
-    t.index ["user_id"], name: "index_conversation_participants_on_user_id"
-  end
-
-  create_table "conversations", id: :serial, force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "inbox_id", null: false
-    t.integer "status", default: 0, null: false
-    t.integer "assignee_id"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.bigint "contact_id"
-    t.integer "display_id", null: false
-    t.datetime "contact_last_seen_at", precision: nil
-    t.datetime "agent_last_seen_at", precision: nil
-    t.jsonb "additional_attributes", default: {}
-    t.bigint "contact_inbox_id"
-    t.uuid "uuid", default: -> { "gen_random_uuid()" }, null: false
-    t.string "identifier"
-    t.datetime "last_activity_at", precision: nil, default: -> { "CURRENT_TIMESTAMP" }, null: false
-    t.bigint "team_id"
-    t.bigint "campaign_id"
-    t.datetime "snoozed_until", precision: nil
-    t.jsonb "custom_attributes", default: {}
-    t.datetime "assignee_last_seen_at", precision: nil
-    t.datetime "first_reply_created_at", precision: nil
-    t.integer "priority"
-    t.bigint "sla_policy_id"
-    t.datetime "waiting_since"
-    t.text "cached_label_list"
-    t.index ["account_id", "display_id"], name: "index_conversations_on_account_id_and_display_id", unique: true
-    t.index ["account_id", "id"], name: "index_conversations_on_id_and_account_id"
-    t.index ["account_id", "inbox_id", "status", "assignee_id"], name: "conv_acid_inbid_stat_asgnid_idx"
-    t.index ["account_id"], name: "index_conversations_on_account_id"
-    t.index ["assignee_id", "account_id"], name: "index_conversations_on_assignee_id_and_account_id"
-    t.index ["campaign_id"], name: "index_conversations_on_campaign_id"
-    t.index ["contact_id"], name: "index_conversations_on_contact_id"
-    t.index ["contact_inbox_id"], name: "index_conversations_on_contact_inbox_id"
-    t.index ["first_reply_created_at"], name: "index_conversations_on_first_reply_created_at"
-    t.index ["identifier", "account_id"], name: "index_conversations_on_identifier_and_account_id" 
-    t.index ["inbox_id"], name: "index_conversations_on_inbox_id"
-    t.index ["priority"], name: "index_conversations_on_priority"
-    t.index ["status", "account_id"], name: "index_conversations_on_status_and_account_id"
-    t.index ["status", "priority"], name: "index_conversations_on_status_and_priority"
-    t.index ["team_id"], name: "index_conversations_on_team_id"
-    t.index ["uuid"], name: "index_conversations_on_uuid", unique: true
-    t.index ["waiting_since"], name: "index_conversations_on_waiting_since"
-  end
-
-  create_table "copilot_messages", force: :cascade do |t|
-    t.bigint "copilot_thread_id", null: false
-    t.bigint "account_id", null: false
-    t.jsonb "message", default: {}, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "message_type", default: 0
-    t.index ["account_id"], name: "index_copilot_messages_on_account_id"
-    t.index ["copilot_thread_id"], name: "index_copilot_messages_on_copilot_thread_id"
-  end
-
-  create_table "copilot_threads", force: :cascade do |t|
-    t.string "title", null: false
-    t.bigint "user_id", null: false
-    t.bigint "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "assistant_id"
-    t.index ["account_id"], name: "index_copilot_threads_on_account_id"
-    t.index ["assistant_id"], name: "index_copilot_threads_on_assistant_id"
-    t.index ["user_id"], name: "index_copilot_threads_on_user_id"
-  end
-
-  create_table "csat_survey_responses", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.bigint "conversation_id", null: false
-    t.bigint "message_id", null: false
-    t.integer "rating", null: false
-    t.text "feedback_message"
-    t.bigint "contact_id", null: false
-    t.bigint "assigned_agent_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_csat_survey_responses_on_account_id"
-    t.index ["assigned_agent_id"], name: "index_csat_survey_responses_on_assigned_agent_id"
-    t.index ["contact_id"], name: "index_csat_survey_responses_on_contact_id"
-    t.index ["conversation_id"], name: "index_csat_survey_responses_on_conversation_id"
-    t.index ["message_id"], name: "index_csat_survey_responses_on_message_id", unique: true
-  end
-
-  create_table "custom_attribute_definitions", force: :cascade do |t|
-    t.string "attribute_display_name"
-    t.string "attribute_key"
-    t.integer "attribute_display_type", default: 0
-    t.integer "default_value"
-    t.integer "attribute_model", default: 0
-    t.bigint "account_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.text "attribute_description"
-    t.jsonb "attribute_values", default: []
-    t.string "regex_pattern"
-    t.string "regex_cue"
-    t.index ["account_id"], name: "index_custom_attribute_definitions_on_account_id"
-    t.index ["attribute_key", "attribute_model", "account_id"], name: "attribute_key_model_index", unique: true
-  end
-
-  create_table "custom_filters", force: :cascade do |t|
-    t.string "name", null: false
-    t.integer "filter_type", default: 0, null: false
-    t.jsonb "query", default: "{}", null: false
-    t.bigint "account_id", null: false
-    t.bigint "user_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_custom_filters_on_account_id"
-    t.index ["user_id"], name: "index_custom_filters_on_user_id"
-  end
-
-  create_table "custom_roles", force: :cascade do |t|
-    t.string "name"
-    t.string "description"
-    t.bigint "account_id", null: false
-    t.text "permissions", default: [], array: true
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_custom_roles_on_account_id"
-  end
-
-  create_table "dashboard_apps", force: :cascade do |t|
-    t.string "title", null: false
-    t.jsonb "content", default: []
-    t.bigint "account_id", null: false
-    t.bigint "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_dashboard_apps_on_account_id"
-    t.index ["user_id"], name: "index_dashboard_apps_on_user_id"
-  end
-
-  create_table "data_imports", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.string "data_type", null: false
-    t.integer "status", default: 0, null: false
-    t.text "processing_errors"
-    t.integer "total_records"
-    t.integer "processed_records"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "non_identifiable_records", default: 0, null: false
-    t.index ["account_id"], name: "index_data_imports_on_account_id"
-  end
-
-  create_table "email_templates", force: :cascade do |t|
-    t.string "name", null: false
-    t.text "body", null: false
-    t.integer "account_id"
-    t.integer "template_type", default: 1
-    t.integer "locale", default: 0, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["name", "account_id"], name: "index_email_templates_on_name_and_account_id", unique: true
-  end
-
-  create_table "folders", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "category_id", null: false
-    t.string "name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
-  create_table "inbox_assignment_policies", force: :cascade do |t|
-    t.bigint "inbox_id", null: false
-    t.bigint "assignment_policy_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["assignment_policy_id"], name: "index_inbox_assignment_policies_on_assignment_policy_id"
-    t.index ["inbox_id"], name: "index_inbox_assignment_policies_on_inbox_id", unique: true
-  end
-
-  create_table "inbox_capacity_limits", force: :cascade do |t|
-    t.bigint "agent_capacity_policy_id", null: false
-    t.bigint "inbox_id", null: false
-    t.integer "conversation_limit", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["agent_capacity_policy_id", "inbox_id"], name: "idx_on_agent_capacity_policy_id_inbox_id_71c7ec4caf", unique: true
-    t.index ["agent_capacity_policy_id"], name: "index_inbox_capacity_limits_on_agent_capacity_policy_id"
-    t.index ["inbox_id"], name: "index_inbox_capacity_limits_on_inbox_id"
-  end
-
-  create_table "inbox_members", id: :serial, force: :cascade do |t|
-    t.integer "user_id", null: false
-    t.integer "inbox_id", null: false
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.index ["inbox_id", "user_id"], name: "index_inbox_members_on_inbox_id_and_user_id", unique: true
-    t.index ["inbox_id"], name: "index_inbox_members_on_inbox_id"
-  end
-
-  create_table "inboxes", id: :serial, force: :cascade do |t|
-    t.integer "channel_id", null: false
-    t.integer "account_id", null: false
-    t.string "name", null: false
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.string "channel_type"
-    t.boolean "enable_auto_assignment", default: true
-    t.boolean "greeting_enabled", default: false
-    t.string "greeting_message"
-    t.string "email_address"
-    t.boolean "working_hours_enabled", default: false
-    t.string "out_of_office_message"
-    t.string "timezone", default: "UTC"
-    t.boolean "enable_email_collect", default: true
-    t.boolean "csat_survey_enabled", default: false
-    t.boolean "allow_messages_after_resolved", default: true
-    t.jsonb "auto_assignment_config", default: {}
-    t.boolean "lock_to_single_conversation", default: false, null: false
-    t.bigint "portal_id"
-    t.integer "sender_name_type", default: 0, null: false
-    t.string "business_name"
-    t.jsonb "csat_config", default: {}, null: false
-    t.index ["account_id"], name: "index_inboxes_on_account_id"
-    t.index ["channel_id", "channel_type"], name: "index_inboxes_on_channel_id_and_channel_type"
-    t.index ["portal_id"], name: "index_inboxes_on_portal_id"
-  end
-
-  create_table "installation_configs", force: :cascade do |t|
-    t.string "name", null: false
-    t.jsonb "serialized_value", default: {}, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.boolean "locked", default: true, null: false
-    t.index ["name", "created_at"], name: "index_installation_configs_on_name_and_created_at", unique: true
-    t.index ["name"], name: "index_installation_configs_on_name", unique: true
-  end
-
-  create_table "integrations_hooks", force: :cascade do |t|
-    t.integer "status", default: 1
-    t.integer "inbox_id"
-    t.integer "account_id"
-    t.string "app_id"
-    t.integer "hook_type", default: 0
-    t.string "reference_id"
-    t.string "access_token"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.jsonb "settings", default: {}
-  end
-
-  create_table "labels", force: :cascade do |t|
-    t.string "title"
-    t.text "description"
-    t.string "color", default: "#1f93ff", null: false
-    t.boolean "show_on_sidebar"
-    t.bigint "account_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_labels_on_account_id"
-    t.index ["title", "account_id"], name: "index_labels_on_title_and_account_id", unique: true
-  end
-
-  create_table "leaves", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.bigint "user_id", null: false
-    t.date "start_date", null: false
-    t.date "end_date", null: false
-    t.integer "leave_type", default: 0, null: false
-    t.integer "status", default: 0, null: false
-    t.text "reason"
-    t.bigint "approved_by_id"
-    t.datetime "approved_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id", "status"], name: "index_leaves_on_account_id_and_status"
-    t.index ["account_id"], name: "index_leaves_on_account_id"
-    t.index ["approved_by_id"], name: "index_leaves_on_approved_by_id"
-    t.index ["user_id"], name: "index_leaves_on_user_id"
-  end
-
-  create_table "macros", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.string "name", null: false
-    t.integer "visibility", default: 0
-    t.bigint "created_by_id"
-    t.bigint "updated_by_id"
-    t.jsonb "actions", default: {}, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_macros_on_account_id"
-  end
-
-  create_table "mentions", force: :cascade do |t|
-    t.bigint "user_id", null: false
-    t.bigint "conversation_id", null: false
-    t.bigint "account_id", null: false
-    t.datetime "mentioned_at", precision: nil, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_mentions_on_account_id"
-    t.index ["conversation_id"], name: "index_mentions_on_conversation_id"
-    t.index ["user_id", "conversation_id"], name: "index_mentions_on_user_id_and_conversation_id", unique: true
-    t.index ["user_id"], name: "index_mentions_on_user_id"
-  end
-
-  create_table "messages", id: :serial, force: :cascade do |t|
-    t.text "content"
-    t.integer "account_id", null: false
-    t.integer "inbox_id", null: false
-    t.integer "conversation_id", null: false
-    t.integer "message_type", null: false
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.boolean "private", default: false, null: false
-    t.integer "status", default: 0
-    t.string "source_id"
-    t.integer "content_type", default: 0, null: false
-    t.json "content_attributes", default: {}
-    t.string "sender_type"
-    t.bigint "sender_id"
-    t.jsonb "external_source_ids", default: {}
-    t.jsonb "additional_attributes", default: {}
-    t.text "processed_message_content"
-    t.jsonb "sentiment", default: {}
-    t.index "((additional_attributes -> 'campaign_id'::text))", name: "index_messages_on_additional_attributes_campaign_id", using: :gin
-    t.index ["account_id", "content_type", "created_at"], name: "idx_messages_account_content_created"
-    t.index ["account_id", "created_at", "message_type"], name: "index_messages_on_account_created_type"
-    t.index ["account_id", "inbox_id"], name: "index_messages_on_account_id_and_inbox_id"
-    t.index ["account_id"], name: "index_messages_on_account_id"
-    t.index ["content"], name: "index_messages_on_content", opclass: :gin_trgm_ops, using: :gin
-    t.index ["conversation_id", "account_id", "message_type", "created_at"], name: "index_messages_on_conversation_account_type_created"
-    t.index ["conversation_id"], name: "index_messages_on_conversation_id"
-    t.index ["created_at"], name: "index_messages_on_created_at"
-    t.index ["inbox_id"], name: "index_messages_on_inbox_id"
-    t.index ["sender_type", "sender_id"], name: "index_messages_on_sender_type_and_sender_id"
-    t.index ["source_id"], name: "index_messages_on_source_id"
-  end
-
-  create_table "notes", force: :cascade do |t|
-    t.text "content", null: false
-    t.bigint "account_id", null: false
-    t.bigint "contact_id", null: false
-    t.bigint "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_notes_on_account_id"
-    t.index ["contact_id"], name: "index_notes_on_contact_id"
-    t.index ["user_id"], name: "index_notes_on_user_id"
-  end
-
-  create_table "notification_settings", force: :cascade do |t|
-    t.integer "account_id"
-    t.integer "user_id"
-    t.integer "email_flags", default: 0, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "push_flags", default: 0, null: false
-    t.index ["account_id", "user_id"], name: "by_account_user", unique: true
-  end
-
-  create_table "notification_subscriptions", force: :cascade do |t|
-    t.bigint "user_id", null: false
-    t.integer "subscription_type", null: false
-    t.jsonb "subscription_attributes", default: {}, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.text "identifier"
-    t.index ["identifier"], name: "index_notification_subscriptions_on_identifier", unique: true
-    t.index ["user_id"], name: "index_notification_subscriptions_on_user_id"
-  end
-
-  create_table "notifications", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.bigint "user_id", null: false
-    t.integer "notification_type", null: false
-    t.string "primary_actor_type", null: false
-    t.bigint "primary_actor_id", null: false
-    t.string "secondary_actor_type"
-    t.bigint "secondary_actor_id"
-    t.datetime "read_at", precision: nil
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.datetime "snoozed_until"
-    t.datetime "last_activity_at", default: -> { "CURRENT_TIMESTAMP" }
-    t.jsonb "meta", default: {}
-    t.index ["account_id"], name: "index_notifications_on_account_id"
-    t.index ["last_activity_at"], name: "index_notifications_on_last_activity_at"
-    t.index ["primary_actor_type", "primary_actor_id"], name: "uniq_primary_actor_per_account_notifications"
-    t.index ["secondary_actor_type", "secondary_actor_id"], name: "uniq_secondary_actor_per_account_notifications"
-    t.index ["user_id", "account_id", "snoozed_until", "read_at"], name: "idx_notifications_performance"
-    t.index ["user_id"], name: "index_notifications_on_user_id"
-  end
-
-  create_table "platform_app_permissibles", force: :cascade do |t|
-    t.bigint "platform_app_id", null: false
-    t.string "permissible_type", null: false
-    t.bigint "permissible_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["permissible_type", "permissible_id"], name: "index_platform_app_permissibles_on_permissibles"
-    t.index ["platform_app_id", "permissible_id", "permissible_type"], name: "unique_permissibles_index", unique: true
-    t.index ["platform_app_id"], name: "index_platform_app_permissibles_on_platform_app_id"
-  end
-
-  create_table "platform_apps", force: :cascade do |t|
-    t.string "name", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
-  create_table "portals", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.string "name", null: false
-    t.string "slug", null: false
-    t.string "custom_domain"
-    t.string "color"
-    t.string "homepage_link"
-    t.string "page_title"
-    t.text "header_text"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.jsonb "config", default: {"allowed_locales" => ["en"]}
-    t.boolean "archived", default: false
-    t.bigint "channel_web_widget_id"
-    t.jsonb "ssl_settings", default: {}, null: false
-    t.index ["channel_web_widget_id"], name: "index_portals_on_channel_web_widget_id"
-    t.index ["custom_domain"], name: "index_portals_on_custom_domain", unique: true
-    t.index ["slug"], name: "index_portals_on_slug", unique: true
-  end
-
-  create_table "portals_members", id: false, force: :cascade do |t|
-    t.bigint "portal_id", null: false
-    t.bigint "user_id", null: false
-    t.index ["portal_id", "user_id"], name: "index_portals_members_on_portal_id_and_user_id", unique: true
-    t.index ["portal_id"], name: "index_portals_members_on_portal_id"
-    t.index ["user_id"], name: "index_portals_members_on_user_id"
-  end
-
-  create_table "related_categories", force: :cascade do |t|
-    t.bigint "category_id"
-    t.bigint "related_category_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["category_id", "related_category_id"], name: "index_related_categories_on_category_id_and_related_category_id", unique: true
-    t.index ["related_category_id", "category_id"], name: "index_related_categories_on_related_category_id_and_category_id", unique: true
-  end
-
-  create_table "reporting_events", force: :cascade do |t|
-    t.string "name"
-    t.float "value"
-    t.integer "account_id"
-    t.integer "inbox_id"
-    t.integer "user_id"
-    t.integer "conversation_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.float "value_in_business_hours"
-    t.datetime "event_start_time", precision: nil
-    t.datetime "event_end_time", precision: nil
-    t.index ["account_id", "name", "created_at"], name: "reporting_events__account_id__name__created_at"
-    t.index ["account_id"], name: "index_reporting_events_on_account_id"
-    t.index ["conversation_id"], name: "index_reporting_events_on_conversation_id"
-    t.index ["created_at"], name: "index_reporting_events_on_created_at"
-    t.index ["inbox_id"], name: "index_reporting_events_on_inbox_id"
-    t.index ["name"], name: "index_reporting_events_on_name"
-    t.index ["user_id"], name: "index_reporting_events_on_user_id"
-  end
-
-  create_table "sla_events", force: :cascade do |t|
-    t.bigint "applied_sla_id", null: false
-    t.bigint "conversation_id", null: false
-    t.bigint "account_id", null: false
-    t.bigint "sla_policy_id", null: false
-    t.bigint "inbox_id", null: false
-    t.integer "event_type"
-    t.jsonb "meta", default: {}
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_sla_events_on_account_id"
-    t.index ["applied_sla_id"], name: "index_sla_events_on_applied_sla_id"
-    t.index ["conversation_id"], name: "index_sla_events_on_conversation_id"
-    t.index ["inbox_id"], name: "index_sla_events_on_inbox_id"
-    t.index ["sla_policy_id"], name: "index_sla_events_on_sla_policy_id"
-  end
-
-  create_table "sla_policies", force: :cascade do |t|
-    t.string "name", null: false
-    t.float "first_response_time_threshold"
-    t.float "next_response_time_threshold"
-    t.boolean "only_during_business_hours", default: false
-    t.bigint "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.string "description"
-    t.float "resolution_time_threshold"
-    t.index ["account_id"], name: "index_sla_policies_on_account_id"
-  end
-
-  create_table "taggings", id: :serial, force: :cascade do |t|
-    t.integer "tag_id"
-    t.string "taggable_type"
-    t.integer "taggable_id"
-    t.string "tagger_type"
-    t.integer "tagger_id"
-    t.string "context", limit: 128
-    t.datetime "created_at", precision: nil
-    t.index ["context"], name: "index_taggings_on_context"
-    t.index ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
-    t.index ["tag_id"], name: "index_taggings_on_tag_id"
-    t.index ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
-    t.index ["taggable_id", "taggable_type", "tagger_id", "context"], name: "taggings_idy"
-    t.index ["taggable_id"], name: "index_taggings_on_taggable_id"
-    t.index ["taggable_type"], name: "index_taggings_on_taggable_type"
-    t.index ["tagger_id", "tagger_type"], name: "index_taggings_on_tagger_id_and_tagger_type"
-    t.index ["tagger_id"], name: "index_taggings_on_tagger_id"
-  end
-
-  create_table "tags", id: :serial, force: :cascade do |t|
-    t.string "name"
-    t.integer "taggings_count", default: 0
-    t.index "lower((name)::text) gin_trgm_ops", name: "tags_name_trgm_idx", using: :gin
-    t.index ["name"], name: "index_tags_on_name", unique: true
-  end
-
-  create_table "team_members", force: :cascade do |t|
-    t.bigint "team_id", null: false
-    t.bigint "user_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["team_id", "user_id"], name: "index_team_members_on_team_id_and_user_id", unique: true
-    t.index ["team_id"], name: "index_team_members_on_team_id"
-    t.index ["user_id"], name: "index_team_members_on_user_id"
-  end
-
-  create_table "teams", force: :cascade do |t|
-    t.string "name", null: false
-    t.text "description"
-    t.boolean "allow_auto_assign", default: true
-    t.bigint "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_teams_on_account_id"
-    t.index ["name", "account_id"], name: "index_teams_on_name_and_account_id", unique: true
-  end
-
-  create_table "users", id: :serial, force: :cascade do |t|
-    t.string "provider", default: "email", null: false
-    t.string "uid", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at", precision: nil
-    t.datetime "remember_created_at", precision: nil
-    t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at", precision: nil
-    t.datetime "last_sign_in_at", precision: nil
-    t.string "current_sign_in_ip"
-    t.string "last_sign_in_ip"
-    t.string "confirmation_token"
-    t.datetime "confirmed_at", precision: nil
-    t.datetime "confirmation_sent_at", precision: nil
-    t.string "unconfirmed_email"
-    t.string "name", null: false
-    t.string "display_name"
-    t.string "email"
-    t.json "tokens"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.string "pubsub_token"
-    t.integer "availability", default: 0
-    t.jsonb "ui_settings", default: {}
-    t.jsonb "custom_attributes", default: {}
-    t.string "type"
-    t.text "message_signature"
-    t.string "otp_secret"
-    t.integer "consumed_timestep"
-    t.boolean "otp_required_for_login", default: false
-    t.text "otp_backup_codes"
-    t.index ["email"], name: "index_users_on_email"
-    t.index ["otp_required_for_login"], name: "index_users_on_otp_required_for_login"
-    t.index ["otp_secret"], name: "index_users_on_otp_secret", unique: true
-    t.index ["pubsub_token"], name: "index_users_on_pubsub_token", unique: true
-    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-    t.index ["uid", "provider"], name: "index_users_on_uid_and_provider", unique: true
-  end
-
-  create_table "webhooks", force: :cascade do |t|
-    t.integer "account_id"
-    t.integer "inbox_id"
-    t.string "url"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "webhook_type", default: 0
-    t.jsonb "subscriptions", default: ["conversation_status_changed", "conversation_updated", "conversation_created", "contact_created", "contact_updated", "message_created", "message_updated", "webwidget_triggered"]
-    t.index ["account_id", "url"], name: "index_webhooks_on_account_id_and_url", unique: true
-  end
-
-  create_table "working_hours", force: :cascade do |t|
-    t.bigint "inbox_id"
-    t.bigint "account_id"
-    t.integer "day_of_week", null: false
-    t.boolean "closed_all_day", default: false
-    t.integer "open_hour"
-    t.integer "open_minutes"
-    t.integer "close_hour"
-    t.integer "close_minutes"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.boolean "open_all_day", default: false
-    t.index ["account_id"], name: "index_working_hours_on_account_id"
-    t.index ["inbox_id"], name: "index_working_hours_on_inbox_id"
-  end
-
-  add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
-  add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
-  add_foreign_key "inboxes", "portals"
-  create_trigger("accounts_after_insert_row_tr", :generated => true, :compatibility => 1).
-      on("accounts").
-      after(:insert).
-      for_each(:row) do
-    "execute format('create sequence IF NOT EXISTS conv_dpid_seq_%s', NEW.id);"
-  end
-
-  create_trigger("conversations_before_insert_row_tr", :generated => true, :compatibility => 1).
-      on("conversations").
-      before(:insert).
-      for_each(:row) do
-    "NEW.display_id := nextval('conv_dpid_seq_' || NEW.account_id);"
-  end
-
-  create_trigger("camp_dpid_before_insert", :generated => true, :compatibility => 1).
-      on("accounts").
-      name("camp_dpid_before_insert").
-      after(:insert).
-      for_each(:row) do
-    "execute format('create sequence IF NOT EXISTS camp_dpid_seq_%s', NEW.id);"
-  end
-
-  create_trigger("campaigns_before_insert_row_tr", :generated => true, :compatibility => 1).
-      on("campaigns").
-      before(:insert).
-      for_each(:row) do
-    "NEW.display_id := nextval('camp_dpid_seq_' || NEW.account_id);"
-  end
-
 end
diff --git a/deployment/chatwoot-worker.1.service b/deployment/chatwoot-worker.1.service
index ea893d20c..da009a944 100644
--- a/deployment/chatwoot-worker.1.service
+++ b/deployment/chatwoot-worker.1.service
@@ -16,8 +16,8 @@ KillMode=mixed
 StandardInput=null
 SyslogIdentifier=%p
 
-MemoryMax=1.5G
-MemoryHigh=1.4G
+MemoryMax=1.2G
+MemoryHigh=infinity
 MemorySwapMax=0
 OOMPolicy=stop
 
diff --git a/enterprise/app/builders/enterprise/contact_inbox_builder.rb b/enterprise/app/builders/enterprise/contact_inbox_builder.rb
new file mode 100644
index 000000000..043505f7f
--- /dev/null
+++ b/enterprise/app/builders/enterprise/contact_inbox_builder.rb
@@ -0,0 +1,21 @@
+module Enterprise::ContactInboxBuilder
+  private
+
+  def generate_source_id
+    return super unless @inbox.channel_type == 'Channel::Voice'
+
+    phone_source_id
+  end
+
+  def phone_source_id
+    return super unless @inbox.channel_type == 'Channel::Voice'
+
+    return SecureRandom.uuid if @contact.phone_number.blank?
+
+    @contact.phone_number
+  end
+
+  def allowed_channels?
+    super || @inbox.channel_type == 'Channel::Voice'
+  end
+end
diff --git a/enterprise/app/builders/enterprise/messages/message_builder.rb b/enterprise/app/builders/enterprise/messages/message_builder.rb
new file mode 100644
index 000000000..727248956
--- /dev/null
+++ b/enterprise/app/builders/enterprise/messages/message_builder.rb
@@ -0,0 +1,9 @@
+module Enterprise::Messages::MessageBuilder
+  private
+
+  def message_type
+    return @message_type if @message_type == 'incoming' && @conversation.inbox.channel_type == 'Channel::Voice'
+
+    super
+  end
+end
diff --git a/enterprise/app/controllers/api/v1/accounts/companies_controller.rb b/enterprise/app/controllers/api/v1/accounts/companies_controller.rb
index a33e4c6b2..86216b03c 100644
--- a/enterprise/app/controllers/api/v1/accounts/companies_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/companies_controller.rb
@@ -1,9 +1,29 @@
 class Api::V1::Accounts::CompaniesController < Api::V1::Accounts::EnterpriseAccountsController
+  include Sift
+  sort_on :name, type: :string
+  sort_on :domain, type: :string
+  sort_on :created_at, type: :datetime
+
+  RESULTS_PER_PAGE = 25
+
   before_action :check_authorization
+  before_action :set_current_page, only: [:index, :search]
   before_action :fetch_company, only: [:show, :update, :destroy]
 
   def index
-    @companies = Current.account.companies.ordered_by_name
+    @companies = fetch_companies(resolved_companies)
+    @companies_count = @companies.total_count
+  end
+
+  def search
+    if params[:q].blank?
+      return render json: { error: I18n.t('errors.companies.search.query_missing') },
+                    status: :unprocessable_entity
+    end
+
+    companies = resolved_companies.search_by_name_or_domain(params[:q])
+    @companies = fetch_companies(companies)
+    @companies_count = @companies.total_count
   end
 
   def show; end
@@ -24,6 +44,20 @@ class Api::V1::Accounts::CompaniesController < Api::V1::Accounts::EnterpriseAcco
 
   private
 
+  def resolved_companies
+    @resolved_companies ||= Current.account.companies
+  end
+
+  def set_current_page
+    @current_page = params[:page] || 1
+  end
+
+  def fetch_companies(companies)
+    filtrate(companies)
+      .page(@current_page)
+      .per(RESULTS_PER_PAGE)
+  end
+
   def check_authorization
     raise Pundit::NotAuthorizedError unless ChatwootApp.enterprise?
 
diff --git a/enterprise/app/controllers/api/v1/accounts/contacts/calls_controller.rb b/enterprise/app/controllers/api/v1/accounts/contacts/calls_controller.rb
new file mode 100644
index 000000000..bcdd178fe
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/contacts/calls_controller.rb
@@ -0,0 +1,38 @@
+class Api::V1::Accounts::Contacts::CallsController < Api::V1::Accounts::BaseController
+  before_action :contact
+  before_action :voice_inbox
+
+  def create
+    authorize contact, :show?
+    authorize voice_inbox, :show?
+
+    result = Voice::OutboundCallBuilder.perform!(
+      account: Current.account,
+      inbox: voice_inbox,
+      user: Current.user,
+      contact: contact
+    )
+
+    conversation = result[:conversation]
+
+    render json: {
+      conversation_id: conversation.display_id,
+      inbox_id: voice_inbox.id,
+      call_sid: result[:call_sid],
+      conference_sid: conversation.additional_attributes['conference_sid']
+    }
+  end
+
+  private
+
+  def contact
+    @contact ||= Current.account.contacts.find(params[:id])
+  end
+
+  def voice_inbox
+    @voice_inbox ||= Current.user.assigned_inboxes.where(
+      account_id: Current.account.id,
+      channel_type: 'Channel::Voice'
+    ).find(params.require(:inbox_id))
+  end
+end
diff --git a/enterprise/app/controllers/api/v1/accounts/reporting_events_controller.rb b/enterprise/app/controllers/api/v1/accounts/reporting_events_controller.rb
new file mode 100644
index 000000000..eb282b0ee
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/reporting_events_controller.rb
@@ -0,0 +1,30 @@
+class Api::V1::Accounts::ReportingEventsController < Api::V1::Accounts::EnterpriseAccountsController
+  include DateRangeHelper
+
+  RESULTS_PER_PAGE = 25
+
+  before_action :check_admin_authorization?
+  before_action :set_reporting_events, only: [:index]
+  before_action :set_current_page, only: [:index]
+
+  def index
+    @reporting_events = @reporting_events.page(@current_page).per(RESULTS_PER_PAGE)
+    @total_count = @reporting_events.total_count
+  end
+
+  private
+
+  def set_reporting_events
+    @reporting_events = Current.account.reporting_events
+                               .includes(:conversation, :user, :inbox)
+                               .filter_by_date_range(range)
+                               .filter_by_inbox_id(params[:inbox_id])
+                               .filter_by_user_id(params[:user_id])
+                               .filter_by_name(params[:name])
+                               .order(created_at: :desc)
+  end
+
+  def set_current_page
+    @current_page = (params[:page] || 1).to_i
+  end
+end
diff --git a/enterprise/app/controllers/api/v1/accounts/saml_settings_controller.rb b/enterprise/app/controllers/api/v1/accounts/saml_settings_controller.rb
index 9f00138cb..e70804073 100644
--- a/enterprise/app/controllers/api/v1/accounts/saml_settings_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/saml_settings_controller.rb
@@ -1,4 +1,5 @@
 class Api::V1::Accounts::SamlSettingsController < Api::V1::Accounts::BaseController
+  before_action :check_saml_sso_enabled
   before_action :check_saml_feature_enabled
   before_action :check_authorization
   before_action :set_saml_settings
@@ -53,4 +54,10 @@ class Api::V1::Accounts::SamlSettingsController < Api::V1::Accounts::BaseControl
 
     render json: { error: I18n.t('errors.saml.feature_not_enabled') }, status: :forbidden
   end
+
+  def check_saml_sso_enabled
+    return if GlobalConfigService.load('ENABLE_SAML_SSO_LOGIN', 'true').to_s == 'true'
+
+    render json: { error: I18n.t('errors.saml.sso_not_enabled') }, status: :forbidden
+  end
 end
diff --git a/enterprise/app/controllers/api/v1/auth_controller.rb b/enterprise/app/controllers/api/v1/auth_controller.rb
index b0d8e1366..c25af3cc1 100644
--- a/enterprise/app/controllers/api/v1/auth_controller.rb
+++ b/enterprise/app/controllers/api/v1/auth_controller.rb
@@ -3,6 +3,11 @@ class Api::V1::AuthController < Api::BaseController
   before_action :find_user_and_account, only: [:saml_login]
 
   def saml_login
+    unless saml_sso_enabled?
+      render json: { error: 'SAML SSO login is not enabled' }, status: :forbidden
+      return
+    end
+
     return if @account.nil?
 
     relay_state = params[:target] || 'web'
@@ -69,4 +74,8 @@ class Api::V1::AuthController < Api::BaseController
 
     "#{frontend_url}/app/login/sso#{query_fragment}"
   end
+
+  def saml_sso_enabled?
+    GlobalConfigService.load('ENABLE_SAML_SSO_LOGIN', 'true').to_s == 'true'
+  end
 end
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb
index c0ecc2a45..f87c06658 100644
--- a/enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb
@@ -11,6 +11,10 @@ module Enterprise::Api::V1::Accounts::ConversationsController
     end
   end
 
+  def reporting_events
+    @reporting_events = @conversation.reporting_events.order(created_at: :asc)
+  end
+
   def permitted_update_params
     super.merge(params.permit(:sla_policy_id))
   end
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts_controller.rb
index 339fbdf3c..0f829b973 100644
--- a/enterprise/app/controllers/enterprise/api/v1/accounts_controller.rb
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts_controller.rb
@@ -55,6 +55,22 @@ class Enterprise::Api::V1::AccountsController < Api::BaseController
     end
   end
 
+  def topup_checkout
+    return render json: { error: I18n.t('errors.topup.credits_required') }, status: :unprocessable_entity if params[:credits].blank?
+
+    service = Enterprise::Billing::TopupCheckoutService.new(account: @account)
+    result = service.create_checkout_session(credits: params[:credits].to_i)
+
+    @account.reload
+    render json: result.merge(
+      id: @account.id,
+      limits: @account.limits,
+      custom_attributes: @account.custom_attributes
+    )
+  rescue Enterprise::Billing::TopupCheckoutService::Error, Stripe::StripeError => e
+    render_could_not_create_error(e.message)
+  end
+
   private
 
   def check_cloud_env
diff --git a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
index 934462b93..0ed7ee67a 100644
--- a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
+++ b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
@@ -11,6 +11,8 @@ module Enterprise::SuperAdmin::AppConfigsController
       @allowed_configs = internal_config_options
     when 'captain'
       @allowed_configs = captain_config_options
+    when 'saml'
+      @allowed_configs = saml_config_options
     else
       super
     end
@@ -34,7 +36,8 @@ module Enterprise::SuperAdmin::AppConfigsController
   def internal_config_options
     %w[CHATWOOT_INBOX_TOKEN CHATWOOT_INBOX_HMAC_KEY ANALYTICS_TOKEN CLEARBIT_API_KEY DASHBOARD_SCRIPTS INACTIVE_WHATSAPP_NUMBERS BLOCKED_EMAIL_DOMAINS
        SKIP_INCOMING_BCC_PROCESSING CAPTAIN_CLOUD_PLAN_LIMITS ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL CHATWOOT_INSTANCE_ADMIN_EMAIL
-       OG_IMAGE_CDN_URL OG_IMAGE_CLIENT_REF CLOUDFLARE_API_KEY CLOUDFLARE_ZONE_ID]
+       OG_IMAGE_CDN_URL OG_IMAGE_CLIENT_REF CLOUDFLARE_API_KEY CLOUDFLARE_ZONE_ID
+       OTEL_PROVIDER LANGFUSE_PUBLIC_KEY LANGFUSE_SECRET_KEY LANGFUSE_BASE_URL]
   end
 
   def captain_config_options
@@ -46,4 +49,8 @@ module Enterprise::SuperAdmin::AppConfigsController
       CAPTAIN_FIRECRAWL_API_KEY
     ]
   end
+
+  def saml_config_options
+    %w[ENABLE_SAML_SSO_LOGIN]
+  end
 end
diff --git a/enterprise/app/controllers/twilio/voice_controller.rb b/enterprise/app/controllers/twilio/voice_controller.rb
index 436083f14..f25e819c2 100644
--- a/enterprise/app/controllers/twilio/voice_controller.rb
+++ b/enterprise/app/controllers/twilio/voice_controller.rb
@@ -1,38 +1,189 @@
 class Twilio::VoiceController < ApplicationController
+  CONFERENCE_EVENT_PATTERNS = {
+    /conference-start/i => 'start',
+    /participant-join/i => 'join',
+    /participant-leave/i => 'leave',
+    /conference-end/i => 'end'
+  }.freeze
+
   before_action :set_inbox!
 
   def status
     Voice::StatusUpdateService.new(
-      account: @inbox.account,
-      call_sid: params[:CallSid],
-      call_status: params[:CallStatus]
+      account: current_account,
+      call_sid: twilio_call_sid,
+      call_status: params[:CallStatus],
+      payload: params.to_unsafe_h
     ).perform
+
     head :no_content
   end
 
   def call_twiml
-    account = @inbox.account
-    call_sid = params[:CallSid]
-    from_number = params[:From].to_s
-    to_number = params[:To].to_s
+    account = current_account
+    Rails.logger.info(
+      "TWILIO_VOICE_TWIML account=#{account.id} call_sid=#{twilio_call_sid} from=#{twilio_from} direction=#{twilio_direction}"
+    )
 
-    builder = Voice::InboundCallBuilder.new(
-      account: account,
-      inbox: @inbox,
-      from_number: from_number,
-      to_number: to_number,
-      call_sid: call_sid
-    ).perform
-    render xml: builder.twiml_response
+    conversation = resolve_conversation
+    conference_sid = ensure_conference_sid!(conversation)
+
+    render xml: conference_twiml(conference_sid, agent_leg?(twilio_from))
+  end
+
+  def conference_status
+    event = mapped_conference_event
+    return head :no_content unless event
+
+    conversation = find_conversation_for_conference!(
+      friendly_name: params[:FriendlyName],
+      call_sid: twilio_call_sid
+    )
+
+    Voice::Conference::Manager.new(
+      conversation: conversation,
+      event: event,
+      call_sid: twilio_call_sid,
+      participant_label: participant_label
+    ).process
+
+    head :no_content
   end
 
   private
 
+  def twilio_call_sid
+    params[:CallSid]
+  end
+
+  def twilio_from
+    params[:From].to_s
+  end
+
+  def twilio_to
+    params[:To]
+  end
+
+  def twilio_direction
+    @twilio_direction ||= (params['Direction'] || params['CallDirection']).to_s
+  end
+
+  def mapped_conference_event
+    event = params[:StatusCallbackEvent].to_s
+    CONFERENCE_EVENT_PATTERNS.each do |pattern, mapped|
+      return mapped if event.match?(pattern)
+    end
+    nil
+  end
+
+  def agent_leg?(from_number)
+    from_number.start_with?('client:')
+  end
+
+  def resolve_conversation
+    return find_conversation_for_agent if agent_leg?(twilio_from)
+
+    case twilio_direction
+    when 'inbound'
+      Voice::InboundCallBuilder.perform!(
+        account: current_account,
+        inbox: inbox,
+        from_number: twilio_from,
+        call_sid: twilio_call_sid
+      )
+    when 'outbound-api', 'outbound-dial'
+      sync_outbound_leg(
+        call_sid: twilio_call_sid,
+        from_number: twilio_from,
+        direction: twilio_direction
+      )
+    else
+      raise ArgumentError, "Unsupported Twilio direction: #{twilio_direction}"
+    end
+  end
+
+  def find_conversation_for_agent
+    if params[:conversation_id].present?
+      current_account.conversations.find_by!(display_id: params[:conversation_id])
+    else
+      current_account.conversations.find_by!(identifier: twilio_call_sid)
+    end
+  end
+
+  def sync_outbound_leg(call_sid:, from_number:, direction:)
+    parent_sid = params['ParentCallSid'].presence
+    lookup_sid = direction == 'outbound-dial' ? parent_sid || call_sid : call_sid
+    conversation = current_account.conversations.find_by!(identifier: lookup_sid)
+
+    Voice::CallSessionSyncService.new(
+      conversation: conversation,
+      call_sid: call_sid,
+      message_call_sid: conversation.identifier,
+      leg: {
+        from_number: from_number,
+        to_number: twilio_to,
+        direction: 'outbound'
+      }
+    ).perform
+  end
+
+  def ensure_conference_sid!(conversation)
+    attrs = conversation.additional_attributes || {}
+    attrs['conference_sid'] ||= Voice::Conference::Name.for(conversation)
+    conversation.update!(additional_attributes: attrs)
+    attrs['conference_sid']
+  end
+
+  def conference_twiml(conference_sid, agent_leg)
+    Twilio::TwiML::VoiceResponse.new.tap do |response|
+      response.dial do |dial|
+        dial.conference(
+          conference_sid,
+          start_conference_on_enter: agent_leg,
+          end_conference_on_exit: false,
+          status_callback: conference_status_callback_url,
+          status_callback_event: 'start end join leave',
+          status_callback_method: 'POST',
+          participant_label: agent_leg ? 'agent' : 'contact'
+        )
+      end
+    end.to_s
+  end
+
+  def conference_status_callback_url
+    host = ENV.fetch('FRONTEND_URL', '')
+    phone_digits = inbox_channel.phone_number.delete_prefix('+')
+    "#{host}/twilio/voice/conference_status/#{phone_digits}"
+  end
+
+  def find_conversation_for_conference!(friendly_name:, call_sid:)
+    name = friendly_name.to_s
+    scope = current_account.conversations
+
+    if name.present?
+      conversation = scope.where("additional_attributes->>'conference_sid' = ?", name).first
+      return conversation if conversation
+    end
+
+    scope.find_by!(identifier: call_sid)
+  end
+
   def set_inbox!
-    # Resolve from the digits in the route param and look up exact E.164 match
     digits = params[:phone].to_s.gsub(/\D/, '')
     e164 = "+#{digits}"
     channel = Channel::Voice.find_by!(phone_number: e164)
     @inbox = channel.inbox
   end
+
+  def current_account
+    @current_account ||= inbox_account
+  end
+
+  def participant_label
+    params[:ParticipantLabel].to_s
+  end
+
+  attr_reader :inbox
+
+  delegate :account, :channel, to: :inbox, prefix: true
 end
diff --git a/enterprise/app/helpers/captain/chat_helper.rb b/enterprise/app/helpers/captain/chat_helper.rb
index f90b8d07e..a60e3015f 100644
--- a/enterprise/app/helpers/captain/chat_helper.rb
+++ b/enterprise/app/helpers/captain/chat_helper.rb
@@ -1,18 +1,17 @@
 module Captain::ChatHelper
+  include Integrations::LlmInstrumentation
+  include Captain::ChatResponseHelper
+
   def request_chat_completion
     log_chat_completion_request
 
-    response = @client.chat(
-      parameters: {
-        model: @model,
-        messages: @messages,
-        tools: @tool_registry&.registered_tools || [],
-        response_format: { type: 'json_object' },
-        temperature: @assistant&.config&.[]('temperature').to_f || 1
-      }
-    )
+    chat = build_chat
 
-    handle_response(response)
+    add_messages_to_chat(chat)
+    with_agent_session do
+      response = chat.ask(conversation_messages.last[:content])
+      build_response(response)
+    end
   rescue StandardError => e
     Rails.logger.error "#{self.class.name} Assistant: #{@assistant.id}, Error in chat completion: #{e}"
     raise e
@@ -20,81 +19,110 @@ module Captain::ChatHelper
 
   private
 
-  def handle_response(response)
-    Rails.logger.debug { "#{self.class.name} Assistant: #{@assistant.id}, Received response #{response}" }
-    message = response.dig('choices', 0, 'message')
-    if message['tool_calls']
-      process_tool_calls(message['tool_calls'])
-    else
-      message = JSON.parse(message['content'].strip)
-      persist_message(message, 'assistant')
-      message
+  def build_chat
+    llm_chat = chat(model: @model, temperature: temperature)
+    llm_chat.with_params(response_format: { type: 'json_object' })
+
+    llm_chat = setup_tools(llm_chat)
+    setup_system_instructions(llm_chat)
+    setup_event_handlers(llm_chat)
+
+    llm_chat
+  end
+
+  def setup_tools(chat)
+    @tools&.each do |tool|
+      chat.with_tool(tool)
+    end
+    chat
+  end
+
+  def setup_system_instructions(chat)
+    system_messages = @messages.select { |m| m[:role] == 'system' || m[:role] == :system }
+    combined_instructions = system_messages.pluck(:content).join("\n\n")
+    chat.with_instructions(combined_instructions)
+  end
+
+  def setup_event_handlers(chat)
+    chat.on_new_message { start_llm_turn_span(instrumentation_params(chat)) }
+    chat.on_end_message { |message| end_llm_turn_span(message) }
+    chat.on_tool_call { |tool_call| handle_tool_call(tool_call) }
+    chat.on_tool_result { |result| handle_tool_result(result) }
+
+    chat
+  end
+
+  def handle_tool_call(tool_call)
+    persist_thinking_message(tool_call)
+    start_tool_span(tool_call)
+    @pending_tool_calls ||= []
+    @pending_tool_calls.push(tool_call)
+  end
+
+  def handle_tool_result(result)
+    end_tool_span(result)
+    persist_tool_completion
+  end
+
+  def add_messages_to_chat(chat)
+    conversation_messages[0...-1].each do |msg|
+      chat.add_message(role: msg[:role].to_sym, content: msg[:content])
     end
   end
 
-  def process_tool_calls(tool_calls)
-    append_tool_calls(tool_calls)
-    tool_calls.each do |tool_call|
-      process_tool_call(tool_call)
-    end
-    request_chat_completion
-  end
-
-  def process_tool_call(tool_call)
-    arguments = JSON.parse(tool_call['function']['arguments'])
-    function_name = tool_call['function']['name']
-    tool_call_id = tool_call['id']
-
-    if @tool_registry.respond_to?(function_name)
-      execute_tool(function_name, arguments, tool_call_id)
-    else
-      process_invalid_tool_call(function_name, tool_call_id)
-    end
-  end
-
-  def execute_tool(function_name, arguments, tool_call_id)
-    persist_message(
-      {
-        content: I18n.t('captain.copilot.using_tool', function_name: function_name),
-        function_name: function_name
-      },
-      'assistant_thinking'
-    )
-    result = @tool_registry.send(function_name, arguments)
-    persist_message(
-      {
-        content: I18n.t('captain.copilot.completed_tool_call', function_name: function_name),
-        function_name: function_name
-      },
-      'assistant_thinking'
-    )
-    append_tool_response(result, tool_call_id)
-  end
-
-  def append_tool_calls(tool_calls)
-    @messages << {
-      role: 'assistant',
-      tool_calls: tool_calls
+  def instrumentation_params(chat = nil)
+    {
+      span_name: "llm.captain.#{feature_name}",
+      account_id: resolved_account_id,
+      conversation_id: @conversation_id,
+      feature_name: feature_name,
+      model: @model,
+      messages: chat ? chat.messages.map { |m| { role: m.role.to_s, content: m.content.to_s } } : @messages,
+      temperature: temperature,
+      metadata: {
+        assistant_id: @assistant&.id
+      }
     }
   end
 
-  def process_invalid_tool_call(function_name, tool_call_id)
-    persist_message({ content: I18n.t('captain.copilot.invalid_tool_call'), function_name: function_name }, 'assistant_thinking')
-    append_tool_response(I18n.t('captain.copilot.tool_not_available'), tool_call_id)
+  def conversation_messages
+    @messages.reject { |m| m[:role] == 'system' || m[:role] == :system }
   end
 
-  def append_tool_response(content, tool_call_id)
-    @messages << {
-      role: 'tool',
-      tool_call_id: tool_call_id,
-      content: content
-    }
+  def temperature
+    @assistant&.config&.[]('temperature').to_f || 1
+  end
+
+  def resolved_account_id
+    @account&.id || @assistant&.account_id
+  end
+
+  # Ensures all LLM calls and tool executions within an agentic loop
+  # are grouped under a single trace/session in Langfuse.
+  #
+  # Without this guard, each recursive call to request_chat_completion
+  # (triggered by tool calls) would create a separate trace instead of
+  # nesting within the existing session span.
+  def with_agent_session(&)
+    already_active = @agent_session_active
+    return yield if already_active
+
+    @agent_session_active = true
+    instrument_agent_session(instrumentation_params, &)
+  ensure
+    @agent_session_active = false unless already_active
+  end
+
+  # Must be implemented by including class to identify the feature for instrumentation.
+  # Used for Langfuse tagging and span naming.
+  def feature_name
+    raise NotImplementedError, "#{self.class.name} must implement #feature_name"
   end
 
   def log_chat_completion_request
     Rails.logger.info(
       "#{self.class.name} Assistant: #{@assistant.id}, Requesting chat completion
-      for messages #{@messages} with #{@tool_registry&.registered_tools&.length || 0} tools
+      for messages #{@messages} with #{@tools&.length || 0} tools
       "
     )
   end
diff --git a/enterprise/app/helpers/captain/chat_response_helper.rb b/enterprise/app/helpers/captain/chat_response_helper.rb
new file mode 100644
index 000000000..e0323996f
--- /dev/null
+++ b/enterprise/app/helpers/captain/chat_response_helper.rb
@@ -0,0 +1,52 @@
+module Captain::ChatResponseHelper
+  private
+
+  def build_response(response)
+    Rails.logger.debug { "#{self.class.name} Assistant: #{@assistant.id}, Received response #{response}" }
+
+    parsed = parse_json_response(response.content)
+
+    persist_message(parsed, 'assistant')
+    parsed
+  end
+
+  def parse_json_response(content)
+    content = content.gsub('```json', '').gsub('```', '')
+    content = content.strip
+    JSON.parse(content)
+  rescue JSON::ParserError => e
+    Rails.logger.error "#{self.class.name} Assistant: #{@assistant.id}, Error parsing JSON response: #{e.message}"
+    { 'content' => content }
+  end
+
+  def persist_thinking_message(tool_call)
+    return if @copilot_thread.blank?
+
+    tool_name = tool_call.name.to_s
+
+    persist_message(
+      {
+        'content' => "Using #{tool_name}",
+        'function_name' => tool_name
+      },
+      'assistant_thinking'
+    )
+  end
+
+  def persist_tool_completion
+    return if @copilot_thread.blank?
+
+    tool_call = @pending_tool_calls&.pop
+    return unless tool_call
+
+    tool_name = tool_call.name.to_s
+
+    persist_message(
+      {
+        'content' => "Completed #{tool_name}",
+        'function_name' => tool_name
+      },
+      'assistant_thinking'
+    )
+  end
+end
diff --git a/enterprise/app/jobs/captain/conversation/response_builder_job.rb b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
index 15f2ace56..f218ff68c 100644
--- a/enterprise/app/jobs/captain/conversation/response_builder_job.rb
+++ b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
@@ -10,8 +10,12 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
 
     Current.executed_by = @assistant
 
-    ActiveRecord::Base.transaction do
-      generate_and_process_response
+    if captain_v2_enabled?
+      generate_response_with_v2
+    else
+      ActiveRecord::Base.transaction do
+        generate_and_process_response
+      end
     end
   rescue StandardError => e
     raise e if e.is_a?(ActiveStorage::FileNotFoundError) || e.is_a?(Faraday::BadRequestError)
@@ -26,16 +30,20 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
   delegate :account, :inbox, to: :@conversation
 
   def generate_and_process_response
-    @response = if captain_v2_enabled?
-                  Captain::Assistant::AgentRunnerService.new(assistant: @assistant, conversation: @conversation).generate_response(
-                    message_history: collect_previous_messages
-                  )
-                else
-                  Captain::Llm::AssistantChatService.new(assistant: @assistant).generate_response(
-                    message_history: collect_previous_messages
-                  )
-                end
+    @response = Captain::Llm::AssistantChatService.new(assistant: @assistant, conversation_id: @conversation.id).generate_response(
+      message_history: collect_previous_messages
+    )
+    process_response
+  end
 
+  def generate_response_with_v2
+    @response = Captain::Assistant::AgentRunnerService.new(assistant: @assistant, conversation: @conversation).generate_response(
+      message_history: collect_previous_messages
+    )
+    process_response
+  end
+
+  def process_response
     return process_action('handoff') if handoff_requested?
 
     create_messages
@@ -123,6 +131,6 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
   end
 
   def captain_v2_enabled?
-    return account.feature_enabled?('captain_integration_v2')
+    account.feature_enabled?('captain_integration_v2')
   end
 end
diff --git a/enterprise/app/jobs/captain/copilot/response_job.rb b/enterprise/app/jobs/captain/copilot/response_job.rb
index fca5b0cce..f3e2653f7 100644
--- a/enterprise/app/jobs/captain/copilot/response_job.rb
+++ b/enterprise/app/jobs/captain/copilot/response_job.rb
@@ -15,11 +15,14 @@ class Captain::Copilot::ResponseJob < ApplicationJob
   private
 
   def generate_chat_response(assistant:, conversation_id:, user_id:, copilot_thread_id:, message:)
-    Captain::Copilot::ChatService.new(
+    service = Captain::Copilot::ChatService.new(
       assistant,
       user_id: user_id,
       copilot_thread_id: copilot_thread_id,
       conversation_id: conversation_id
-    ).generate_response(message)
+    )
+    # When using copilot_thread, message is already in previous_history
+    # Pass nil to avoid duplicate
+    service.generate_response(copilot_thread_id.present? ? nil : message)
   end
 end
diff --git a/enterprise/app/jobs/captain/tools/firecrawl_parser_job.rb b/enterprise/app/jobs/captain/tools/firecrawl_parser_job.rb
index 41a50a35e..f34b9a640 100644
--- a/enterprise/app/jobs/captain/tools/firecrawl_parser_job.rb
+++ b/enterprise/app/jobs/captain/tools/firecrawl_parser_job.rb
@@ -5,11 +5,13 @@ class Captain::Tools::FirecrawlParserJob < ApplicationJob
     assistant = Captain::Assistant.find(assistant_id)
     metadata = payload[:metadata]
 
+    canonical_url = normalize_link(metadata['url'])
     document = assistant.documents.find_or_initialize_by(
-      external_link: metadata['url']
+      external_link: canonical_url
     )
 
     document.update!(
+      external_link: canonical_url,
       content: payload[:markdown],
       name: metadata['title'],
       status: :available
@@ -17,4 +19,10 @@ class Captain::Tools::FirecrawlParserJob < ApplicationJob
   rescue StandardError => e
     raise "Failed to parse FireCrawl data: #{e.message}"
   end
+
+  private
+
+  def normalize_link(raw_url)
+    raw_url.to_s.delete_suffix('/')
+  end
 end
diff --git a/enterprise/app/jobs/captain/tools/simple_page_crawl_parser_job.rb b/enterprise/app/jobs/captain/tools/simple_page_crawl_parser_job.rb
index ccf34adf2..89054f385 100644
--- a/enterprise/app/jobs/captain/tools/simple_page_crawl_parser_job.rb
+++ b/enterprise/app/jobs/captain/tools/simple_page_crawl_parser_job.rb
@@ -15,11 +15,11 @@ class Captain::Tools::SimplePageCrawlParserJob < ApplicationJob
     page_title = crawler.page_title || ''
     content = crawler.body_text_content || ''
 
-    document = assistant.documents.find_or_initialize_by(
-      external_link: page_link
-    )
+    normalized_link = normalize_link(page_link)
+    document = assistant.documents.find_or_initialize_by(external_link: normalized_link)
 
     document.update!(
+      external_link: normalized_link,
       name: page_title[0..254], content: content[0..14_999], status: :available
     )
   rescue StandardError => e
@@ -28,6 +28,10 @@ class Captain::Tools::SimplePageCrawlParserJob < ApplicationJob
 
   private
 
+  def normalize_link(raw_link)
+    raw_link.to_s.delete_suffix('/')
+  end
+
   def limit_exceeded?(account)
     limits = account.usage_limits[:captain][:documents]
     limits[:current_available].negative? || limits[:current_available].zero?
diff --git a/enterprise/app/jobs/migration/company_account_batch_job.rb b/enterprise/app/jobs/migration/company_account_batch_job.rb
new file mode 100644
index 000000000..2e6c20f19
--- /dev/null
+++ b/enterprise/app/jobs/migration/company_account_batch_job.rb
@@ -0,0 +1,54 @@
+class Migration::CompanyAccountBatchJob < ApplicationJob
+  queue_as :low
+
+  def perform(account)
+    account.contacts
+           .where.not(email: nil)
+           .find_in_batches(batch_size: 1000) do |contact_batch|
+      process_contact_batch(contact_batch, account)
+    end
+  end
+
+  private
+
+  def process_contact_batch(contacts, account)
+    contacts.each do |contact|
+      next unless should_process?(contact)
+
+      company = find_or_create_company(contact, account)
+      # rubocop:disable Rails/SkipsModelValidations
+      contact.update_column(:company_id, company.id) if company
+      # rubocop:enable Rails/SkipsModelValidations
+    end
+  end
+
+  def should_process?(contact)
+    return false if contact.company_id.present?
+    return false if contact.email.blank?
+
+    Companies::BusinessEmailDetectorService.new(contact.email).perform
+  end
+
+  def find_or_create_company(contact, account)
+    domain = extract_domain(contact.email)
+    company_name = derive_company_name(contact, domain)
+
+    Company.find_or_create_by!(account: account, domain: domain) do |company|
+      company.name = company_name
+    end
+  rescue ActiveRecord::RecordNotUnique
+    # Race condition: Another job created it between our check and create
+    # just find the one that was created
+
+    Company.find_by(account: account, domain: domain)
+  end
+
+  def extract_domain(email)
+    email.split('@').last&.downcase
+  end
+
+  def derive_company_name(contact, domain)
+    contact.additional_attributes&.dig('company_name').presence ||
+      domain.split('.').first.tr('-_', ' ').titleize
+  end
+end
diff --git a/enterprise/app/jobs/migration/company_backfill_job.rb b/enterprise/app/jobs/migration/company_backfill_job.rb
new file mode 100644
index 000000000..db9a3370f
--- /dev/null
+++ b/enterprise/app/jobs/migration/company_backfill_job.rb
@@ -0,0 +1,17 @@
+class Migration::CompanyBackfillJob < ApplicationJob
+  queue_as :low
+
+  def perform
+    Rails.logger.info 'Starting company backfill migration...'
+    account_count = 0
+    Account.find_in_batches(batch_size: 100) do |accounts|
+      accounts.each do |account|
+        Rails.logger.info "Enqueuing company backfill for account #{account.id}"
+        Migration::CompanyAccountBatchJob.perform_later(account)
+        account_count += 1
+      end
+    end
+
+    Rails.logger.info "Company backfill migration complete. Enqueued jobs for #{account_count} accounts."
+  end
+end
diff --git a/enterprise/app/models/applied_sla.rb b/enterprise/app/models/applied_sla.rb
index 6adeee036..112f9deea 100644
--- a/enterprise/app/models/applied_sla.rb
+++ b/enterprise/app/models/applied_sla.rb
@@ -22,7 +22,7 @@ class AppliedSla < ApplicationRecord
   belongs_to :sla_policy
   belongs_to :conversation
 
-  has_many :sla_events, dependent: :destroy
+  has_many :sla_events, dependent: :destroy_async
 
   validates :account_id, uniqueness: { scope: %i[sla_policy_id conversation_id] }
   before_validation :ensure_account_id
diff --git a/enterprise/app/models/captain/document.rb b/enterprise/app/models/captain/document.rb
index c278eb879..751162b28 100644
--- a/enterprise/app/models/captain/document.rb
+++ b/enterprise/app/models/captain/document.rb
@@ -37,6 +37,7 @@ class Captain::Document < ApplicationRecord
   validate :validate_file_attachment, if: -> { pdf_file.attached? }
   before_validation :ensure_account_id
   before_validation :set_external_link_for_pdf
+  before_validation :normalize_external_link
 
   enum status: {
     in_progress: 0,
@@ -47,7 +48,7 @@ class Captain::Document < ApplicationRecord
   after_create_commit :enqueue_crawl_job
   after_create_commit :update_document_usage
   after_destroy :update_document_usage
-  after_commit :enqueue_response_builder_job, on: :update, if: :should_enqueue_response_builder?
+  after_commit :enqueue_response_builder_job
   scope :ordered, -> { order(created_at: :desc) }
 
   scope :for_account, ->(account_id) { where(account_id: account_id) }
@@ -94,15 +95,18 @@ class Captain::Document < ApplicationRecord
   end
 
   def enqueue_response_builder_job
-    return if status != 'available'
+    return unless should_enqueue_response_builder?
 
     Captain::Documents::ResponseBuilderJob.perform_later(self)
   end
 
   def should_enqueue_response_builder?
-    # Only enqueue when status changes to available
-    # Avoid re-enqueueing when metadata is updated by the job itself
-    saved_change_to_status? && status == 'available'
+    return false if destroyed?
+    return false unless available?
+
+    return saved_change_to_status? if pdf_document?
+
+    (saved_change_to_status? || saved_change_to_content?) && content.present?
   end
 
   def update_document_usage
@@ -140,4 +144,11 @@ class Captain::Document < ApplicationRecord
     timestamp = Time.current.strftime('%Y%m%d%H%M%S')
     self.external_link = "PDF: #{pdf_file.filename.base}_#{timestamp}"
   end
+
+  def normalize_external_link
+    return if external_link.blank?
+    return if pdf_document?
+
+    self.external_link = external_link.delete_suffix('/')
+  end
 end
diff --git a/enterprise/app/models/channel/voice.rb b/enterprise/app/models/channel/voice.rb
index 2662b7284..1f00e74d1 100644
--- a/enterprise/app/models/channel/voice.rb
+++ b/enterprise/app/models/channel/voice.rb
@@ -42,6 +42,17 @@ class Channel::Voice < ApplicationRecord
     false
   end
 
+  def initiate_call(to:)
+    case provider
+    when 'twilio'
+      Voice::Provider::TwilioAdapter.new(self).initiate_call(
+        to: to
+      )
+    else
+      raise "Unsupported voice provider: #{provider}"
+    end
+  end
+
   # Public URLs used to configure Twilio webhooks
   def voice_call_webhook_url
     digits = phone_number.delete_prefix('+')
@@ -76,6 +87,15 @@ class Channel::Voice < ApplicationRecord
       errors.add(:provider_config, "#{key} is required for Twilio provider") if config[key].blank?
     end
   end
+  # twilio_client and initiate_twilio_call moved to Voice::Provider::TwilioAdapter
+
+  def provider_config_hash
+    if provider_config.is_a?(Hash)
+      provider_config
+    else
+      JSON.parse(provider_config.to_s)
+    end
+  end
 
   def provision_twilio_on_create
     service = ::Twilio::VoiceWebhookSetupService.new(channel: self)
@@ -96,4 +116,6 @@ class Channel::Voice < ApplicationRecord
     Rails.logger.error("TWILIO_VOICE_SETUP_ON_CREATE_ERROR: #{error_details}")
     errors.add(:base, "Twilio setup failed: #{e.message}")
   end
+
+  public :provider_config_hash
 end
diff --git a/enterprise/app/models/company.rb b/enterprise/app/models/company.rb
index 764cb2a9c..9fa18b8ad 100644
--- a/enterprise/app/models/company.rb
+++ b/enterprise/app/models/company.rb
@@ -2,19 +2,20 @@
 #
 # Table name: companies
 #
-#  id          :bigint           not null, primary key
-#  description :text
-#  domain      :string
-#  name        :string           not null
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  account_id  :bigint           not null
+#  id             :bigint           not null, primary key
+#  contacts_count :integer
+#  description    :text
+#  domain         :string
+#  name           :string           not null
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#  account_id     :bigint           not null
 #
 # Indexes
 #
-#  index_companies_on_account_id             (account_id)
-#  index_companies_on_domain_and_account_id  (domain,account_id)
-#  index_companies_on_name_and_account_id    (name,account_id)
+#  index_companies_on_account_and_domain   (account_id,domain) UNIQUE WHERE (domain IS NOT NULL)
+#  index_companies_on_account_id           (account_id)
+#  index_companies_on_name_and_account_id  (name,account_id)
 #
 class Company < ApplicationRecord
   include Avatarable
@@ -24,10 +25,14 @@ class Company < ApplicationRecord
     with: /\A[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?)+\z/,
     message: I18n.t('errors.companies.domain.invalid')
   }
+  validates :domain, uniqueness: { scope: :account_id }, if: -> { domain.present? }
   validates :description, length: { maximum: Limits::COMPANY_DESCRIPTION_LENGTH_LIMIT }
 
   belongs_to :account
   has_many :contacts, dependent: :nullify
 
   scope :ordered_by_name, -> { order(:name) }
+  scope :search_by_name_or_domain, lambda { |query|
+    where('name ILIKE :search OR domain ILIKE :search', search: "%#{query.strip}%")
+  }
 end
diff --git a/enterprise/app/models/enterprise/concerns/contact.rb b/enterprise/app/models/enterprise/concerns/contact.rb
index 9139fc67e..daca6c431 100644
--- a/enterprise/app/models/enterprise/concerns/contact.rb
+++ b/enterprise/app/models/enterprise/concerns/contact.rb
@@ -1,6 +1,31 @@
 module Enterprise::Concerns::Contact
   extend ActiveSupport::Concern
   included do
-    belongs_to :company, optional: true
+    belongs_to :company, optional: true, counter_cache: true
+
+    after_commit :associate_company_from_email,
+                 on: [:create, :update],
+                 if: :should_associate_company?
+  end
+
+  private
+
+  def should_associate_company?
+    # Only trigger if:
+    # 1. Contact has an email
+    # 2. Contact doesn't have a compan yet
+    # 3. Email was just set/changed
+    # 4. Email was previously nil (first time getting email)
+    email.present? &&
+      company_id.nil? &&
+      saved_change_to_email? &&
+      saved_change_to_email.first.nil?
+  end
+
+  def associate_company_from_email
+    Contacts::CompanyAssociationService.new.associate_company_from_email(self)
+  rescue StandardError => e
+    Rails.logger.error("Failed to associate company for contact #{id}: #{e.message}")
+    # Don't fail the contact save if the company association fails
   end
 end
diff --git a/enterprise/app/models/enterprise/concerns/inbox.rb b/enterprise/app/models/enterprise/concerns/inbox.rb
index 6f450bed1..0de61db23 100644
--- a/enterprise/app/models/enterprise/concerns/inbox.rb
+++ b/enterprise/app/models/enterprise/concerns/inbox.rb
@@ -6,5 +6,6 @@ module Enterprise::Concerns::Inbox
     has_one :captain_assistant,
             through: :captain_inbox,
             class_name: 'Captain::Assistant'
+    has_many :inbox_capacity_limits, dependent: :destroy
   end
 end
diff --git a/enterprise/app/models/enterprise/inbox_agent_availability.rb b/enterprise/app/models/enterprise/inbox_agent_availability.rb
new file mode 100644
index 000000000..886b55278
--- /dev/null
+++ b/enterprise/app/models/enterprise/inbox_agent_availability.rb
@@ -0,0 +1,31 @@
+module Enterprise::InboxAgentAvailability
+  extend ActiveSupport::Concern
+
+  def member_ids_with_assignment_capacity
+    return member_ids unless capacity_filtering_enabled?
+
+    # Get online agents with capacity
+    agents = available_agents
+    agents = filter_by_capacity(agents)
+    agents.map(&:user_id)
+  end
+
+  private
+
+  def filter_by_capacity(inbox_members_scope)
+    return inbox_members_scope unless capacity_filtering_enabled?
+
+    inbox_members_scope.select do |inbox_member|
+      capacity_service.agent_has_capacity?(inbox_member.user, self)
+    end
+  end
+
+  def capacity_filtering_enabled?
+    account.feature_enabled?('assignment_v2') &&
+      account.account_users.joins(:agent_capacity_policy).exists?
+  end
+
+  def capacity_service
+    @capacity_service ||= Enterprise::AutoAssignment::CapacityService.new
+  end
+end
diff --git a/enterprise/app/policies/company_policy.rb b/enterprise/app/policies/company_policy.rb
index 1c252967c..756edfc32 100644
--- a/enterprise/app/policies/company_policy.rb
+++ b/enterprise/app/policies/company_policy.rb
@@ -3,6 +3,10 @@ class CompanyPolicy < ApplicationPolicy
     true
   end
 
+  def search?
+    true
+  end
+
   def show?
     true
   end
diff --git a/enterprise/app/services/captain/copilot/chat_service.rb b/enterprise/app/services/captain/copilot/chat_service.rb
index ca7057c86..229bf90ca 100644
--- a/enterprise/app/services/captain/copilot/chat_service.rb
+++ b/enterprise/app/services/captain/copilot/chat_service.rb
@@ -1,6 +1,4 @@
-require 'openai'
-
-class Captain::Copilot::ChatService < Llm::BaseOpenAiService
+class Captain::Copilot::ChatService < Llm::BaseAiService
   include Captain::ChatHelper
 
   attr_reader :assistant, :account, :user, :copilot_thread, :previous_history, :messages
@@ -13,9 +11,11 @@ class Captain::Copilot::ChatService < Llm::BaseOpenAiService
     @user = nil
     @copilot_thread = nil
     @previous_history = []
+    @conversation_id = config[:conversation_id]
+
     setup_user(config)
     setup_message_history(config)
-    register_tools
+    @tools = build_tools
     @messages = build_messages(config)
   end
 
@@ -59,16 +59,19 @@ class Captain::Copilot::ChatService < Llm::BaseOpenAiService
                         end
   end
 
-  def register_tools
-    @tool_registry = Captain::ToolRegistryService.new(@assistant, user: @user)
-    @tool_registry.register_tool(Captain::Tools::SearchDocumentationService)
-    @tool_registry.register_tool(Captain::Tools::Copilot::GetArticleService)
-    @tool_registry.register_tool(Captain::Tools::Copilot::GetContactService)
-    @tool_registry.register_tool(Captain::Tools::Copilot::GetConversationService)
-    @tool_registry.register_tool(Captain::Tools::Copilot::SearchArticlesService)
-    @tool_registry.register_tool(Captain::Tools::Copilot::SearchContactsService)
-    @tool_registry.register_tool(Captain::Tools::Copilot::SearchConversationsService)
-    @tool_registry.register_tool(Captain::Tools::Copilot::SearchLinearIssuesService)
+  def build_tools
+    tools = []
+
+    tools << Captain::Tools::SearchDocumentationService.new(@assistant, user: @user)
+    tools << Captain::Tools::Copilot::GetConversationService.new(@assistant, user: @user)
+    tools << Captain::Tools::Copilot::SearchConversationsService.new(@assistant, user: @user)
+    tools << Captain::Tools::Copilot::GetContactService.new(@assistant, user: @user)
+    tools << Captain::Tools::Copilot::GetArticleService.new(@assistant, user: @user)
+    tools << Captain::Tools::Copilot::SearchArticlesService.new(@assistant, user: @user)
+    tools << Captain::Tools::Copilot::SearchContactsService.new(@assistant, user: @user)
+    tools << Captain::Tools::Copilot::SearchLinearIssuesService.new(@assistant, user: @user)
+
+    tools.select(&:active?)
   end
 
   def system_message
@@ -76,12 +79,16 @@ class Captain::Copilot::ChatService < Llm::BaseOpenAiService
       role: 'system',
       content: Captain::Llm::SystemPromptsService.copilot_response_generator(
         @assistant.config['product_name'],
-        @tool_registry.tools_summary,
+        tools_summary,
         @assistant.config
       )
     }
   end
 
+  def tools_summary
+    @tools.map { |tool| "- #{tool.class.name}: #{tool.class.description}" }.join("\n")
+  end
+
   def account_id_context
     {
       role: 'system',
@@ -113,4 +120,8 @@ class Captain::Copilot::ChatService < Llm::BaseOpenAiService
       message_type: message_type
     )
   end
+
+  def feature_name
+    'copilot'
+  end
 end
diff --git a/enterprise/app/services/captain/llm/assistant_chat_service.rb b/enterprise/app/services/captain/llm/assistant_chat_service.rb
index ca8fafaa0..5a2976e39 100644
--- a/enterprise/app/services/captain/llm/assistant_chat_service.rb
+++ b/enterprise/app/services/captain/llm/assistant_chat_service.rb
@@ -1,15 +1,15 @@
-require 'openai'
-
-class Captain::Llm::AssistantChatService < Llm::BaseOpenAiService
+class Captain::Llm::AssistantChatService < Llm::BaseAiService
   include Captain::ChatHelper
 
-  def initialize(assistant: nil)
+  def initialize(assistant: nil, conversation_id: nil)
     super()
 
     @assistant = assistant
+    @conversation_id = conversation_id
+
     @messages = [system_message]
     @response = ''
-    register_tools
+    @tools = build_tools
   end
 
   # additional_message: A single message (String) from the user that should be appended to the chat.
@@ -27,9 +27,8 @@ class Captain::Llm::AssistantChatService < Llm::BaseOpenAiService
 
   private
 
-  def register_tools
-    @tool_registry = Captain::ToolRegistryService.new(@assistant, user: nil)
-    @tool_registry.register_tool(Captain::Tools::SearchDocumentationService)
+  def build_tools
+    [Captain::Tools::SearchDocumentationService.new(@assistant, user: nil)]
   end
 
   def system_message
@@ -42,4 +41,8 @@ class Captain::Llm::AssistantChatService < Llm::BaseOpenAiService
   def persist_message(message, message_type = 'assistant')
     # No need to implement
   end
+
+  def feature_name
+    'assistant'
+  end
 end
diff --git a/enterprise/app/services/captain/llm/contact_attributes_service.rb b/enterprise/app/services/captain/llm/contact_attributes_service.rb
index e7976bf27..f2c48de57 100644
--- a/enterprise/app/services/captain/llm/contact_attributes_service.rb
+++ b/enterprise/app/services/captain/llm/contact_attributes_service.rb
@@ -1,4 +1,4 @@
-class Captain::Llm::ContactAttributesService < Llm::BaseOpenAiService
+class Captain::Llm::ContactAttributesService < Llm::LegacyBaseOpenAiService
   def initialize(assistant, conversation)
     super()
     @assistant = assistant
diff --git a/enterprise/app/services/captain/llm/contact_notes_service.rb b/enterprise/app/services/captain/llm/contact_notes_service.rb
index 480225a03..4ee4fcb5e 100644
--- a/enterprise/app/services/captain/llm/contact_notes_service.rb
+++ b/enterprise/app/services/captain/llm/contact_notes_service.rb
@@ -1,4 +1,4 @@
-class Captain::Llm::ContactNotesService < Llm::BaseOpenAiService
+class Captain::Llm::ContactNotesService < Llm::LegacyBaseOpenAiService
   def initialize(assistant, conversation)
     super()
     @assistant = assistant
diff --git a/enterprise/app/services/captain/llm/conversation_faq_service.rb b/enterprise/app/services/captain/llm/conversation_faq_service.rb
index 077791a2c..47d1433bd 100644
--- a/enterprise/app/services/captain/llm/conversation_faq_service.rb
+++ b/enterprise/app/services/captain/llm/conversation_faq_service.rb
@@ -1,4 +1,4 @@
-class Captain::Llm::ConversationFaqService < Llm::BaseOpenAiService
+class Captain::Llm::ConversationFaqService < Llm::LegacyBaseOpenAiService
   DISTANCE_THRESHOLD = 0.3
 
   def initialize(assistant, conversation)
diff --git a/enterprise/app/services/captain/llm/embedding_service.rb b/enterprise/app/services/captain/llm/embedding_service.rb
index 1dbb0ce5b..5190ed28a 100644
--- a/enterprise/app/services/captain/llm/embedding_service.rb
+++ b/enterprise/app/services/captain/llm/embedding_service.rb
@@ -1,6 +1,6 @@
 require 'openai'
 
-class Captain::Llm::EmbeddingService < Llm::BaseOpenAiService
+class Captain::Llm::EmbeddingService < Llm::LegacyBaseOpenAiService
   class EmbeddingsError < StandardError; end
 
   def self.embedding_model
diff --git a/enterprise/app/services/captain/llm/faq_generator_service.rb b/enterprise/app/services/captain/llm/faq_generator_service.rb
index 5cecc0e81..634385b36 100644
--- a/enterprise/app/services/captain/llm/faq_generator_service.rb
+++ b/enterprise/app/services/captain/llm/faq_generator_service.rb
@@ -1,4 +1,4 @@
-class Captain::Llm::FaqGeneratorService < Llm::BaseOpenAiService
+class Captain::Llm::FaqGeneratorService < Llm::LegacyBaseOpenAiService
   def initialize(content, language = 'english')
     super()
     @language = language
diff --git a/enterprise/app/services/captain/llm/paginated_faq_generator_service.rb b/enterprise/app/services/captain/llm/paginated_faq_generator_service.rb
index 2d326f081..ebfef4b5c 100644
--- a/enterprise/app/services/captain/llm/paginated_faq_generator_service.rb
+++ b/enterprise/app/services/captain/llm/paginated_faq_generator_service.rb
@@ -1,4 +1,4 @@
-class Captain::Llm::PaginatedFaqGeneratorService < Llm::BaseOpenAiService
+class Captain::Llm::PaginatedFaqGeneratorService < Llm::LegacyBaseOpenAiService
   # Default pages per chunk - easily configurable
   DEFAULT_PAGES_PER_CHUNK = 10
   MAX_ITERATIONS = 20 # Safety limit to prevent infinite loops
diff --git a/enterprise/app/services/captain/llm/pdf_processing_service.rb b/enterprise/app/services/captain/llm/pdf_processing_service.rb
index 026ef4e48..55177b78d 100644
--- a/enterprise/app/services/captain/llm/pdf_processing_service.rb
+++ b/enterprise/app/services/captain/llm/pdf_processing_service.rb
@@ -1,4 +1,4 @@
-class Captain::Llm::PdfProcessingService < Llm::BaseOpenAiService
+class Captain::Llm::PdfProcessingService < Llm::LegacyBaseOpenAiService
   def initialize(document)
     super()
     @document = document
@@ -29,12 +29,16 @@ class Captain::Llm::PdfProcessingService < Llm::BaseOpenAiService
     end
   end
 
-  def with_tempfile(&)
+  def with_tempfile
     Tempfile.create(['pdf_upload', '.pdf'], binmode: true) do |temp_file|
-      temp_file.write(document.pdf_file.download)
-      temp_file.close
+      document.pdf_file.blob.open do |blob_file|
+        IO.copy_stream(blob_file, temp_file)
+      end
 
-      File.open(temp_file.path, 'rb', &)
+      temp_file.flush
+      temp_file.rewind
+
+      yield temp_file
     end
   end
 end
diff --git a/enterprise/app/services/captain/onboarding/website_analyzer_service.rb b/enterprise/app/services/captain/onboarding/website_analyzer_service.rb
index d3e7d4983..02ba35571 100644
--- a/enterprise/app/services/captain/onboarding/website_analyzer_service.rb
+++ b/enterprise/app/services/captain/onboarding/website_analyzer_service.rb
@@ -1,4 +1,4 @@
-class Captain::Onboarding::WebsiteAnalyzerService < Llm::BaseOpenAiService
+class Captain::Onboarding::WebsiteAnalyzerService < Llm::LegacyBaseOpenAiService
   MAX_CONTENT_LENGTH = 8000
 
   def initialize(website_url)
diff --git a/enterprise/app/services/captain/tools/base_tool.rb b/enterprise/app/services/captain/tools/base_tool.rb
new file mode 100644
index 000000000..dbc2902d8
--- /dev/null
+++ b/enterprise/app/services/captain/tools/base_tool.rb
@@ -0,0 +1,26 @@
+class Captain::Tools::BaseTool < RubyLLM::Tool
+  attr_accessor :assistant
+
+  def initialize(assistant, user: nil)
+    @assistant = assistant
+    @user = user
+    super()
+  end
+
+  def active?
+    true
+  end
+
+  private
+
+  def user_has_permission(permission)
+    return false if @user.blank?
+
+    account_user = AccountUser.find_by(account_id: @assistant.account_id, user_id: @user.id)
+    return false if account_user.blank?
+
+    return account_user.custom_role.permissions.include?(permission) if account_user.custom_role.present?
+
+    account_user.administrator? || account_user.agent?
+  end
+end
diff --git a/enterprise/app/services/captain/tools/copilot/get_article_service.rb b/enterprise/app/services/captain/tools/copilot/get_article_service.rb
index 9c2ee02da..e870afd06 100644
--- a/enterprise/app/services/captain/tools/copilot/get_article_service.rb
+++ b/enterprise/app/services/captain/tools/copilot/get_article_service.rb
@@ -1,32 +1,11 @@
-class Captain::Tools::Copilot::GetArticleService < Captain::Tools::BaseService
-  def name
+class Captain::Tools::Copilot::GetArticleService < Captain::Tools::BaseTool
+  def self.name
     'get_article'
   end
+  description 'Get details of an article including its content and metadata'
+  param :article_id, type: :number, desc: 'The ID of the article to retrieve', required: true
 
-  def description
-    'Get details of an article including its content and metadata'
-  end
-
-  def parameters
-    {
-      type: 'object',
-      properties: {
-        article_id: {
-          type: 'number',
-          description: 'The ID of the article to retrieve'
-        }
-      },
-      required: %w[article_id]
-    }
-  end
-
-  def execute(arguments)
-    article_id = arguments['article_id']
-
-    Rails.logger.info { "#{self.class.name}: Article ID: #{article_id}" }
-
-    return 'Missing required parameters' if article_id.blank?
-
+  def execute(article_id:)
     article = Article.find_by(id: article_id, account_id: @assistant.account_id)
     return 'Article not found' if article.nil?
 
diff --git a/enterprise/app/services/captain/tools/copilot/get_contact_service.rb b/enterprise/app/services/captain/tools/copilot/get_contact_service.rb
index 290433301..da5453cae 100644
--- a/enterprise/app/services/captain/tools/copilot/get_contact_service.rb
+++ b/enterprise/app/services/captain/tools/copilot/get_contact_service.rb
@@ -1,32 +1,11 @@
-class Captain::Tools::Copilot::GetContactService < Captain::Tools::BaseService
-  def name
+class Captain::Tools::Copilot::GetContactService < Captain::Tools::BaseTool
+  def self.name
     'get_contact'
   end
+  description 'Get details of a contact including their profile information'
+  param :contact_id, type: :number, desc: 'The ID of the contact to retrieve', required: true
 
-  def description
-    'Get details of a contact including their profile information'
-  end
-
-  def parameters
-    {
-      type: 'object',
-      properties: {
-        contact_id: {
-          type: 'number',
-          description: 'The ID of the contact to retrieve'
-        }
-      },
-      required: %w[contact_id]
-    }
-  end
-
-  def execute(arguments)
-    contact_id = arguments['contact_id']
-
-    Rails.logger.info "#{self.class.name}: Contact ID: #{contact_id}"
-
-    return 'Missing required parameters' if contact_id.blank?
-
+  def execute(contact_id:)
     contact = Contact.find_by(id: contact_id, account_id: @assistant.account_id)
     return 'Contact not found' if contact.nil?
 
diff --git a/enterprise/app/services/captain/tools/copilot/get_conversation_service.rb b/enterprise/app/services/captain/tools/copilot/get_conversation_service.rb
index 6f942ee8e..6b52a147d 100644
--- a/enterprise/app/services/captain/tools/copilot/get_conversation_service.rb
+++ b/enterprise/app/services/captain/tools/copilot/get_conversation_service.rb
@@ -1,32 +1,12 @@
-class Captain::Tools::Copilot::GetConversationService < Captain::Tools::BaseService
-  def name
+class Captain::Tools::Copilot::GetConversationService < Captain::Tools::BaseTool
+  def self.name
     'get_conversation'
   end
+  description 'Get details of a conversation including messages and contact information'
 
-  def description
-    'Get details of a conversation including messages and contact information'
-  end
-
-  def parameters
-    {
-      type: 'object',
-      properties: {
-        conversation_id: {
-          type: 'number',
-          description: 'The ID of the conversation to retrieve'
-        }
-      },
-      required: %w[conversation_id]
-    }
-  end
-
-  def execute(arguments)
-    conversation_id = arguments['conversation_id']
-
-    Rails.logger.info "#{self.class.name}: Conversation ID: #{conversation_id}"
-
-    return 'Missing required parameters' if conversation_id.blank?
+  param :conversation_id, type: :integer, desc: 'ID of the conversation to retrieve', required: true
 
+  def execute(conversation_id:)
     conversation = Conversation.find_by(display_id: conversation_id, account_id: @assistant.account_id)
     return 'Conversation not found' if conversation.blank?
 
diff --git a/enterprise/app/services/captain/tools/copilot/search_articles_service.rb b/enterprise/app/services/captain/tools/copilot/search_articles_service.rb
index 5061968ad..1647c939b 100644
--- a/enterprise/app/services/captain/tools/copilot/search_articles_service.rb
+++ b/enterprise/app/services/captain/tools/copilot/search_articles_service.rb
@@ -1,36 +1,18 @@
-class Captain::Tools::Copilot::SearchArticlesService < Captain::Tools::BaseService
-  def name
+class Captain::Tools::Copilot::SearchArticlesService < Captain::Tools::BaseTool
+  def self.name
     'search_articles'
   end
+  description 'Search articles based on parameters'
+  param :query, desc: 'Search articles by title or content (partial match)', required: false
+  param :category_id, type: :number, desc: 'Filter articles by category ID', required: false
+  param :status, type: :string, desc: 'Filter articles by status - MUST BE ONE OF: draft, published, archived', required: false
 
-  def description
-    'Search articles based on parameters'
-  end
-
-  def parameters
-    {
-      type: 'object',
-      properties: properties,
-      required: ['query']
-    }
-  end
-
-  def execute(arguments)
-    query = arguments['query']
-    category_id = arguments['category_id']
-    status = arguments['status']
-
-    Rails.logger.info "#{self.class.name}: Query: #{query}, Category ID: #{category_id}, Status: #{status}"
-
-    return 'Missing required parameters' if query.blank?
-
-    articles = fetch_articles(query, category_id, status)
-
+  def execute(query: nil, category_id: nil, status: nil)
+    articles = fetch_articles(query: query, category_id: category_id, status: status)
     return 'No articles found' unless articles.exists?
 
     total_count = articles.count
     articles = articles.limit(100)
-
     <<~RESPONSE
       #{total_count > 100 ? "Found #{total_count} articles (showing first 100)" : "Total number of articles: #{total_count}"}
       #{articles.map(&:to_llm_text).join("\n---\n")}
@@ -43,29 +25,11 @@ class Captain::Tools::Copilot::SearchArticlesService < Captain::Tools::BaseServi
 
   private
 
-  def fetch_articles(query, category_id, status)
+  def fetch_articles(query:, category_id:, status:)
     articles = Article.where(account_id: @assistant.account_id)
     articles = articles.where('title ILIKE :query OR content ILIKE :query', query: "%#{query}%") if query.present?
     articles = articles.where(category_id: category_id) if category_id.present?
     articles = articles.where(status: status) if status.present?
     articles
   end
-
-  def properties
-    {
-      query: {
-        type: 'string',
-        description: 'Search articles by title or content (partial match)'
-      },
-      category_id: {
-        type: 'number',
-        description: 'Filter articles by category ID'
-      },
-      status: {
-        type: 'string',
-        enum: %w[draft published archived],
-        description: 'Filter articles by status'
-      }
-    }
-  end
 end
diff --git a/enterprise/app/services/captain/tools/copilot/search_contacts_service.rb b/enterprise/app/services/captain/tools/copilot/search_contacts_service.rb
index 557fc731a..5c49cf674 100644
--- a/enterprise/app/services/captain/tools/copilot/search_contacts_service.rb
+++ b/enterprise/app/services/captain/tools/copilot/search_contacts_service.rb
@@ -1,27 +1,14 @@
-class Captain::Tools::Copilot::SearchContactsService < Captain::Tools::BaseService
-  def name
+class Captain::Tools::Copilot::SearchContactsService < Captain::Tools::BaseTool
+  def self.name
     'search_contacts'
   end
 
-  def description
-    'Search contacts based on query parameters'
-  end
-
-  def parameters
-    {
-      type: 'object',
-      properties: properties,
-      required: []
-    }
-  end
-
-  def execute(arguments)
-    email = arguments['email']
-    phone_number = arguments['phone_number']
-    name = arguments['name']
-
-    Rails.logger.info "#{self.class.name} Email: #{email}, Phone Number: #{phone_number}, Name: #{name}"
+  description 'Search contacts based on query parameters'
+  param :email, type: :string, desc: 'Filter contacts by email'
+  param :phone_number, type: :string, desc: 'Filter contacts by phone number'
+  param :name, type: :string, desc: 'Filter contacts by name (partial match)'
 
+  def execute(email: nil, phone_number: nil, name: nil)
     contacts = Contact.where(account_id: @assistant.account_id)
     contacts = contacts.where(email: email) if email.present?
     contacts = contacts.where(phone_number: phone_number) if phone_number.present?
@@ -39,23 +26,4 @@ class Captain::Tools::Copilot::SearchContactsService < Captain::Tools::BaseServi
   def active?
     user_has_permission('contact_manage')
   end
-
-  private
-
-  def properties
-    {
-      email: {
-        type: 'string',
-        description: 'Filter contacts by email'
-      },
-      phone_number: {
-        type: 'string',
-        description: 'Filter contacts by phone number'
-      },
-      name: {
-        type: 'string',
-        description: 'Filter contacts by name (partial match)'
-      }
-    }
-  end
 end
diff --git a/enterprise/app/services/captain/tools/copilot/search_conversations_service.rb b/enterprise/app/services/captain/tools/copilot/search_conversations_service.rb
index 6dfdf3897..9e824d1f5 100644
--- a/enterprise/app/services/captain/tools/copilot/search_conversations_service.rb
+++ b/enterprise/app/services/captain/tools/copilot/search_conversations_service.rb
@@ -1,26 +1,15 @@
-class Captain::Tools::Copilot::SearchConversationsService < Captain::Tools::BaseService
-  def name
-    'search_conversations'
+class Captain::Tools::Copilot::SearchConversationsService < Captain::Tools::BaseTool
+  def self.name
+    'search_conversation'
   end
+  description 'Search conversations based on parameters'
 
-  def description
-    'Search conversations based on parameters'
-  end
-
-  def parameters
-    {
-      type: 'object',
-      properties: properties,
-      required: []
-    }
-  end
-
-  def execute(arguments)
-    status = arguments['status']
-    contact_id = arguments['contact_id']
-    priority = arguments['priority']
-    labels = arguments['labels']
+  param :status, type: :string, desc: 'Status of the conversation'
+  param :contact_id, type: :number, desc: 'Contact id'
+  param :priority, type: :string, desc: 'Priority of conversation'
+  param :labels, type: :string, desc: 'Labels available'
 
+  def execute(status: nil, contact_id: nil, priority: nil, labels: nil)
     conversations = get_conversations(status, contact_id, priority, labels)
 
     return 'No conversations found' unless conversations.exists?
@@ -58,13 +47,4 @@ class Captain::Tools::Copilot::SearchConversationsService < Captain::Tools::Base
       @assistant.account
     ).perform
   end
-
-  def properties
-    {
-      contact_id: { type: 'number', description: 'Filter conversations by contact ID' },
-      status: { type: 'string', enum: %w[open resolved pending snoozed], description: 'Filter conversations by status' },
-      priority: { type: 'string', enum: %w[low medium high urgent], description: 'Filter conversations by priority' },
-      labels: { type: 'array', items: { type: 'string' }, description: 'Filter conversations by labels' }
-    }
-  end
 end
diff --git a/enterprise/app/services/captain/tools/copilot/search_linear_issues_service.rb b/enterprise/app/services/captain/tools/copilot/search_linear_issues_service.rb
index 0d59e194d..0d19534e7 100644
--- a/enterprise/app/services/captain/tools/copilot/search_linear_issues_service.rb
+++ b/enterprise/app/services/captain/tools/copilot/search_linear_issues_service.rb
@@ -1,34 +1,14 @@
-class Captain::Tools::Copilot::SearchLinearIssuesService < Captain::Tools::BaseService
-  def name
+class Captain::Tools::Copilot::SearchLinearIssuesService < Captain::Tools::BaseTool
+  def self.name
     'search_linear_issues'
   end
 
-  def description
-    'Search Linear issues based on a search term'
-  end
+  description 'Search Linear issues based on a search term'
+  param :term, type: :string, desc: 'The search term to find Linear issues', required: true
 
-  def parameters
-    {
-      type: 'object',
-      properties: {
-        term: {
-          type: 'string',
-          description: 'The search term to find Linear issues'
-        }
-      },
-      required: %w[term]
-    }
-  end
-
-  def execute(arguments)
+  def execute(term:)
     return 'Linear integration is not enabled' unless active?
 
-    term = arguments['term']
-
-    Rails.logger.info "#{self.class.name}: Service called with the search term #{term}"
-
-    return 'Missing required parameters' if term.blank?
-
     linear_service = Integrations::Linear::ProcessorService.new(account: @assistant.account)
     result = linear_service.search_issue(term)
 
diff --git a/enterprise/app/services/captain/tools/search_documentation_service.rb b/enterprise/app/services/captain/tools/search_documentation_service.rb
index 672baf24a..fbc8f4154 100644
--- a/enterprise/app/services/captain/tools/search_documentation_service.rb
+++ b/enterprise/app/services/captain/tools/search_documentation_service.rb
@@ -1,27 +1,12 @@
-class Captain::Tools::SearchDocumentationService < Captain::Tools::BaseService
-  def name
+class Captain::Tools::SearchDocumentationService < Captain::Tools::BaseTool
+  def self.name
     'search_documentation'
   end
+  description 'Search and retrieve documentation from knowledge base'
 
-  def description
-    'Search and retrieve documentation from knowledge base'
-  end
+  param :query, desc: 'Search Query', required: true
 
-  def parameters
-    {
-      type: 'object',
-      properties: {
-        search_query: {
-          type: 'string',
-          description: 'The search query to look up in the documentation.'
-        }
-      },
-      required: ['search_query']
-    }
-  end
-
-  def execute(arguments)
-    query = arguments['search_query']
+  def execute(query:)
     Rails.logger.info { "#{self.class.name}: #{query}" }
 
     responses = assistant.responses.approved.search(query)
diff --git a/enterprise/app/services/companies/business_email_detector_service.rb b/enterprise/app/services/companies/business_email_detector_service.rb
new file mode 100644
index 000000000..422ef41c8
--- /dev/null
+++ b/enterprise/app/services/companies/business_email_detector_service.rb
@@ -0,0 +1,19 @@
+class Companies::BusinessEmailDetectorService
+  attr_reader :email
+
+  def initialize(email)
+    @email = email
+  end
+
+  def perform
+    return false if email.blank?
+
+    address = ValidEmail2::Address.new(email)
+    return false unless address.valid?
+    return false if address.disposable_domain?
+
+    provider = EmailProviderInfo.call(email)
+
+    provider.nil?
+  end
+end
diff --git a/enterprise/app/services/contacts/company_association_service.rb b/enterprise/app/services/contacts/company_association_service.rb
new file mode 100644
index 000000000..cb56f5309
--- /dev/null
+++ b/enterprise/app/services/contacts/company_association_service.rb
@@ -0,0 +1,47 @@
+class Contacts::CompanyAssociationService
+  def associate_company_from_email(contact)
+    return nil if skip_association?(contact)
+
+    company = find_or_create_company(contact)
+    if company
+      # rubocop:disable Rails/SkipsModelValidations
+      # Using update_column and increment_counter to avoid triggering callbacks while maintaining counter cache
+      contact.update_column(:company_id, company.id)
+      Company.increment_counter(:contacts_count, company.id)
+      # rubocop:enable Rails/SkipsModelValidations
+    end
+    company
+  end
+
+  private
+
+  def skip_association?(contact)
+    return true if contact.company_id.present?
+    return true if contact.email.blank?
+
+    detector = Companies::BusinessEmailDetectorService.new(contact.email)
+    return true unless detector.perform
+
+    false
+  end
+
+  def find_or_create_company(contact)
+    domain = extract_domain(contact.email)
+    company_name = derive_company_name(contact, domain)
+
+    Company.find_or_create_by!(account: contact.account, domain: domain) do |company|
+      company.name = company_name
+    end
+  rescue ActiveRecord::RecordNotUnique
+    # If another process created it first, just find that
+    Company.find_by(account: contact.account, domain: domain)
+  end
+
+  def extract_domain(email)
+    email.split('@').last&.downcase
+  end
+
+  def derive_company_name(contact, domain)
+    contact.additional_attributes&.dig('company_name') || domain.split('.').first.tr('-_', ' ').titleize
+  end
+end
diff --git a/enterprise/app/services/enterprise/auto_assignment/assignment_service.rb b/enterprise/app/services/enterprise/auto_assignment/assignment_service.rb
new file mode 100644
index 000000000..4f3da08ee
--- /dev/null
+++ b/enterprise/app/services/enterprise/auto_assignment/assignment_service.rb
@@ -0,0 +1,94 @@
+module Enterprise::AutoAssignment::AssignmentService
+  private
+
+  # Override assignment config to use policy if available
+  def assignment_config
+    return super unless policy
+
+    {
+      'conversation_priority' => policy.conversation_priority,
+      'fair_distribution_limit' => policy.fair_distribution_limit,
+      'fair_distribution_window' => policy.fair_distribution_window,
+      'balanced' => policy.balanced?
+    }.compact
+  end
+
+  # Extend agent finding to add capacity checks
+  def find_available_agent
+    agents = filter_agents_by_rate_limit(inbox.available_agents)
+    agents = filter_agents_by_capacity(agents) if capacity_filtering_enabled?
+    return nil if agents.empty?
+
+    selector = policy&.balanced? ? balanced_selector : round_robin_selector
+    selector.select_agent(agents)
+  end
+
+  def filter_agents_by_capacity(agents)
+    return agents unless capacity_filtering_enabled?
+
+    capacity_service = Enterprise::AutoAssignment::CapacityService.new
+    agents.select { |agent_member| capacity_service.agent_has_capacity?(agent_member.user, inbox) }
+  end
+
+  def capacity_filtering_enabled?
+    account.feature_enabled?('assignment_v2') &&
+      account.account_users.joins(:agent_capacity_policy).exists?
+  end
+
+  def round_robin_selector
+    @round_robin_selector ||= AutoAssignment::RoundRobinSelector.new(inbox: inbox)
+  end
+
+  def balanced_selector
+    @balanced_selector ||= Enterprise::AutoAssignment::BalancedSelector.new(inbox: inbox)
+  end
+
+  def policy
+    @policy ||= inbox.assignment_policy
+  end
+
+  def account
+    inbox.account
+  end
+
+  # Override to apply exclusion rules
+  def unassigned_conversations(limit)
+    scope = inbox.conversations.unassigned.open
+
+    # Apply exclusion rules from capacity policy or assignment policy
+    scope = apply_exclusion_rules(scope)
+
+    # Apply conversation priority using enum methods if policy exists
+    scope = if policy&.longest_waiting?
+              scope.reorder(last_activity_at: :asc, created_at: :asc)
+            else
+              scope.reorder(created_at: :asc)
+            end
+
+    scope.limit(limit)
+  end
+
+  def apply_exclusion_rules(scope)
+    capacity_policy = inbox.inbox_capacity_limits.first&.agent_capacity_policy
+    return scope unless capacity_policy
+
+    exclusion_rules = capacity_policy.exclusion_rules || {}
+    scope = apply_label_exclusions(scope, exclusion_rules['excluded_labels'])
+    apply_age_exclusions(scope, exclusion_rules['exclude_older_than_hours'])
+  end
+
+  def apply_label_exclusions(scope, excluded_labels)
+    return scope if excluded_labels.blank?
+
+    scope.tagged_with(excluded_labels, exclude: true, on: :labels)
+  end
+
+  def apply_age_exclusions(scope, hours_threshold)
+    return scope if hours_threshold.blank?
+
+    hours = hours_threshold.to_i
+    return scope unless hours.positive?
+
+    scope.where('conversations.created_at >= ?', hours.hours.ago)
+  end
+end
diff --git a/enterprise/app/services/enterprise/auto_assignment/balanced_selector.rb b/enterprise/app/services/enterprise/auto_assignment/balanced_selector.rb
new file mode 100644
index 000000000..57017b6bb
--- /dev/null
+++ b/enterprise/app/services/enterprise/auto_assignment/balanced_selector.rb
@@ -0,0 +1,26 @@
+class Enterprise::AutoAssignment::BalancedSelector
+  pattr_initialize [:inbox!]
+
+  def select_agent(available_agents)
+    return nil if available_agents.empty?
+
+    agent_users = available_agents.map(&:user)
+    assignment_counts = fetch_assignment_counts(agent_users)
+
+    agent_users.min_by { |user| assignment_counts[user.id] || 0 }
+  end
+
+  private
+
+  def fetch_assignment_counts(users)
+    user_ids = users.map(&:id)
+
+    counts = inbox.conversations
+                  .open
+                  .where(assignee_id: user_ids)
+                  .group(:assignee_id)
+                  .count
+
+    Hash.new(0).merge(counts)
+  end
+end
diff --git a/enterprise/app/services/enterprise/auto_assignment/capacity_service.rb b/enterprise/app/services/enterprise/auto_assignment/capacity_service.rb
new file mode 100644
index 000000000..f82da9267
--- /dev/null
+++ b/enterprise/app/services/enterprise/auto_assignment/capacity_service.rb
@@ -0,0 +1,25 @@
+class Enterprise::AutoAssignment::CapacityService
+  def agent_has_capacity?(user, inbox)
+    # Get the account_user for this specific account
+    account_user = user.account_users.find_by(account: inbox.account)
+
+    # If no account_user or no capacity policy, agent has unlimited capacity
+    return true unless account_user&.agent_capacity_policy
+
+    policy = account_user.agent_capacity_policy
+
+    # Check if there's a specific limit for this inbox
+    inbox_limit = policy.inbox_capacity_limits.find_by(inbox: inbox)
+
+    # If no specific limit for this inbox, agent has unlimited capacity for this inbox
+    return true unless inbox_limit
+
+    # Count current open conversations for this agent in this inbox
+    current_count = user.assigned_conversations
+                        .where(inbox: inbox, status: :open)
+                        .count
+
+    # Agent has capacity if current count is below the limit
+    current_count < inbox_limit.conversation_limit
+  end
+end
diff --git a/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb b/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
index d0d2f73d8..ecbc481a4 100644
--- a/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
+++ b/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
@@ -1,5 +1,6 @@
 class Enterprise::Billing::HandleStripeEventService
   CLOUD_PLANS_CONFIG = 'CHATWOOT_CLOUD_PLANS'.freeze
+  CAPTAIN_CLOUD_PLAN_LIMITS = 'CAPTAIN_CLOUD_PLAN_LIMITS'.freeze
 
   # Plan hierarchy: Hacker (default) -> Startups -> Business -> Enterprise
   # Each higher tier includes all features from the lower tiers
@@ -16,6 +17,7 @@ class Enterprise::Billing::HandleStripeEventService
     channel_instagram
     captain_integration
     advanced_search_indexing
+    advanced_search
   ].freeze
 
   # Additional features available starting with the Business plan
@@ -45,9 +47,25 @@ class Enterprise::Billing::HandleStripeEventService
     # skipping self hosted plan events
     return if plan.blank? || account.blank?
 
+    previous_usage = capture_previous_usage
     update_account_attributes(subscription, plan)
     update_plan_features
-    reset_captain_usage
+    handle_subscription_credits(plan, previous_usage)
+    account.reset_response_usage
+  end
+
+  def capture_previous_usage
+    {
+      responses: account.custom_attributes['captain_responses_usage'].to_i,
+      monthly: current_plan_credits[:responses]
+    }
+  end
+
+  def current_plan_credits
+    plan_name = account.custom_attributes['plan_name']
+    return { responses: 0, documents: 0 } if plan_name.blank?
+
+    get_plan_credits(plan_name)
   end
 
   def update_account_attributes(subscription, plan)
@@ -100,8 +118,23 @@ class Enterprise::Billing::HandleStripeEventService
     enable_plan_specific_features
   end
 
-  def reset_captain_usage
-    account.reset_response_usage
+  def handle_subscription_credits(plan, previous_usage)
+    current_limits = account.limits || {}
+
+    current_credits = current_limits['captain_responses'].to_i
+    new_plan_credits = get_plan_credits(plan['name'])[:responses]
+
+    consumed_topup_credits = [previous_usage[:responses] - previous_usage[:monthly], 0].max
+    updated_credits = current_credits - consumed_topup_credits - previous_usage[:monthly] + new_plan_credits
+
+    Rails.logger.info("Updating subscription credits for account #{account.id}: #{current_credits} -> #{updated_credits}")
+    account.update!(limits: current_limits.merge('captain_responses' => updated_credits))
+  end
+
+  def get_plan_credits(plan_name)
+    config = InstallationConfig.find_by(name: CAPTAIN_CLOUD_PLAN_LIMITS).value
+    config = JSON.parse(config) if config.is_a?(String)
+    config[plan_name.downcase]&.symbolize_keys
   end
 
   def enable_plan_specific_features
diff --git a/enterprise/app/services/enterprise/billing/topup_checkout_service.rb b/enterprise/app/services/enterprise/billing/topup_checkout_service.rb
new file mode 100644
index 000000000..e11269110
--- /dev/null
+++ b/enterprise/app/services/enterprise/billing/topup_checkout_service.rb
@@ -0,0 +1,95 @@
+class Enterprise::Billing::TopupCheckoutService
+  include BillingHelper
+
+  class Error < StandardError; end
+
+  TOPUP_OPTIONS = [
+    { credits: 1000, amount: 20.0, currency: 'usd' },
+    { credits: 2500, amount: 50.0, currency: 'usd' },
+    { credits: 6000, amount: 100.0, currency: 'usd' },
+    { credits: 12_000, amount: 200.0, currency: 'usd' }
+  ].freeze
+
+  pattr_initialize [:account!]
+
+  def create_checkout_session(credits:)
+    topup_option = validate_and_find_topup_option(credits)
+    charge_customer(topup_option, credits)
+    fulfill_credits(credits, topup_option)
+
+    {
+      credits: credits,
+      amount: topup_option[:amount],
+      currency: topup_option[:currency]
+    }
+  end
+
+  private
+
+  def validate_and_find_topup_option(credits)
+    raise Error, I18n.t('errors.topup.invalid_credits') unless credits.to_i.positive?
+    raise Error, I18n.t('errors.topup.plan_not_eligible') if default_plan?(account)
+    raise Error, I18n.t('errors.topup.stripe_customer_not_configured') if stripe_customer_id.blank?
+
+    topup_option = find_topup_option(credits)
+    raise Error, I18n.t('errors.topup.invalid_option') unless topup_option
+
+    # Validate payment method exists
+    validate_payment_method!
+
+    topup_option
+  end
+
+  def validate_payment_method!
+    customer = Stripe::Customer.retrieve(stripe_customer_id)
+
+    return if customer.invoice_settings.default_payment_method.present? || customer.default_source.present?
+
+    # Auto-set first payment method as default if available
+    payment_methods = Stripe::PaymentMethod.list(customer: stripe_customer_id, limit: 1)
+    raise Error, I18n.t('errors.topup.no_payment_method') if payment_methods.data.empty?
+
+    Stripe::Customer.update(stripe_customer_id, invoice_settings: { default_payment_method: payment_methods.data.first.id })
+  end
+
+  def charge_customer(topup_option, credits)
+    amount_cents = (topup_option[:amount] * 100).to_i
+    currency = topup_option[:currency]
+    description = "AI Credits Topup: #{credits} credits"
+
+    invoice = Stripe::Invoice.create(
+      customer: stripe_customer_id,
+      currency: currency,
+      collection_method: 'charge_automatically',
+      auto_advance: false,
+      description: description
+    )
+
+    Stripe::InvoiceItem.create(
+      customer: stripe_customer_id,
+      amount: amount_cents,
+      currency: currency,
+      invoice: invoice.id,
+      description: description
+    )
+
+    Stripe::Invoice.finalize_invoice(invoice.id, { auto_advance: false })
+    Stripe::Invoice.pay(invoice.id)
+  end
+
+  def fulfill_credits(credits, topup_option)
+    Enterprise::Billing::TopupFulfillmentService.new(account: account).fulfill(
+      credits: credits,
+      amount_cents: (topup_option[:amount] * 100).to_i,
+      currency: topup_option[:currency]
+    )
+  end
+
+  def stripe_customer_id
+    account.custom_attributes['stripe_customer_id']
+  end
+
+  def find_topup_option(credits)
+    TOPUP_OPTIONS.find { |opt| opt[:credits] == credits.to_i }
+  end
+end
diff --git a/enterprise/app/services/enterprise/billing/topup_fulfillment_service.rb b/enterprise/app/services/enterprise/billing/topup_fulfillment_service.rb
new file mode 100644
index 000000000..9e70918b8
--- /dev/null
+++ b/enterprise/app/services/enterprise/billing/topup_fulfillment_service.rb
@@ -0,0 +1,51 @@
+class Enterprise::Billing::TopupFulfillmentService
+  pattr_initialize [:account!]
+
+  def fulfill(credits:, amount_cents:, currency:)
+    account.with_lock do
+      create_stripe_credit_grant(credits, amount_cents, currency)
+      update_account_credits(credits)
+    end
+
+    Rails.logger.info("Topup fulfilled for account #{account.id}: #{credits} credits, #{amount_cents} cents")
+  end
+
+  private
+
+  def create_stripe_credit_grant(credits, amount_cents, currency)
+    Stripe::Billing::CreditGrant.create(
+      customer: stripe_customer_id,
+      name: "Topup: #{credits} credits",
+      amount: {
+        type: 'monetary',
+        monetary: { currency: currency, value: amount_cents }
+      },
+      applicability_config: {
+        scope: { price_type: 'metered' }
+      },
+      category: 'paid',
+      expires_at: 6.months.from_now.to_i,
+      metadata: {
+        account_id: account.id.to_s,
+        source: 'topup',
+        credits: credits.to_s
+      }
+    )
+  end
+
+  def update_account_credits(credits)
+    current_limits = account.limits || {}
+    current_total = current_limits['captain_responses'].to_i
+    new_total = current_total + credits
+
+    account.update!(
+      limits: current_limits.merge(
+        'captain_responses' => new_total
+      )
+    )
+  end
+
+  def stripe_customer_id
+    account.custom_attributes['stripe_customer_id']
+  end
+end
diff --git a/enterprise/app/services/enterprise/contacts/contactable_inboxes_service.rb b/enterprise/app/services/enterprise/contacts/contactable_inboxes_service.rb
new file mode 100644
index 000000000..546d5f4bc
--- /dev/null
+++ b/enterprise/app/services/enterprise/contacts/contactable_inboxes_service.rb
@@ -0,0 +1,16 @@
+module Enterprise::Contacts::ContactableInboxesService
+  private
+
+  # Extend base selection to include Voice inboxes
+  def get_contactable_inbox(inbox)
+    return voice_contactable_inbox(inbox) if inbox.channel_type == 'Channel::Voice'
+
+    super
+  end
+
+  def voice_contactable_inbox(inbox)
+    return if @contact.phone_number.blank?
+
+    { source_id: @contact.phone_number, inbox: inbox }
+  end
+end
diff --git a/enterprise/app/services/internal/account_analysis/content_evaluator_service.rb b/enterprise/app/services/internal/account_analysis/content_evaluator_service.rb
index e88c46091..586e9fad0 100644
--- a/enterprise/app/services/internal/account_analysis/content_evaluator_service.rb
+++ b/enterprise/app/services/internal/account_analysis/content_evaluator_service.rb
@@ -1,4 +1,4 @@
-class Internal::AccountAnalysis::ContentEvaluatorService < Llm::BaseOpenAiService
+class Internal::AccountAnalysis::ContentEvaluatorService < Llm::LegacyBaseOpenAiService
   def initialize
     super()
 
diff --git a/enterprise/app/services/llm/base_ai_service.rb b/enterprise/app/services/llm/base_ai_service.rb
new file mode 100644
index 000000000..504685e3a
--- /dev/null
+++ b/enterprise/app/services/llm/base_ai_service.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# Base service for LLM operations using RubyLLM.
+# New features should inherit from this class.
+class Llm::BaseAiService
+  DEFAULT_MODEL = Llm::Config::DEFAULT_MODEL
+  DEFAULT_TEMPERATURE = 1.0
+
+  attr_reader :model, :temperature
+
+  def initialize
+    Llm::Config.initialize!
+    setup_model
+    setup_temperature
+  end
+
+  # Returns a configured RubyLLM chat instance.
+  # Subclasses can override model/temperature via instance variables or pass them explicitly.
+  def chat(model: @model, temperature: @temperature)
+    RubyLLM.chat(model: model).with_temperature(temperature)
+  end
+
+  private
+
+  def setup_model
+    config_value = InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_MODEL')&.value
+    @model = (config_value.presence || DEFAULT_MODEL)
+  end
+
+  def setup_temperature
+    @temperature = DEFAULT_TEMPERATURE
+  end
+end
diff --git a/enterprise/app/services/llm/base_open_ai_service.rb b/enterprise/app/services/llm/legacy_base_open_ai_service.rb
similarity index 69%
rename from enterprise/app/services/llm/base_open_ai_service.rb
rename to enterprise/app/services/llm/legacy_base_open_ai_service.rb
index e3e88453c..ede9f0d8f 100644
--- a/enterprise/app/services/llm/base_open_ai_service.rb
+++ b/enterprise/app/services/llm/legacy_base_open_ai_service.rb
@@ -1,5 +1,11 @@
-class Llm::BaseOpenAiService
-  DEFAULT_MODEL = 'gpt-4o-mini'.freeze
+# frozen_string_literal: true
+
+# DEPRECATED: This class uses the legacy OpenAI Ruby gem directly.
+# New features should use Llm::BaseAiService with RubyLLM instead.
+# This class will be removed once all services are migrated to RubyLLM.
+class Llm::LegacyBaseOpenAiService
+  DEFAULT_MODEL = 'gpt-4o-mini'
+
   attr_reader :client, :model
 
   def initialize
diff --git a/enterprise/app/services/messages/audio_transcription_service.rb b/enterprise/app/services/messages/audio_transcription_service.rb
index 278f41d71..d3cc91376 100644
--- a/enterprise/app/services/messages/audio_transcription_service.rb
+++ b/enterprise/app/services/messages/audio_transcription_service.rb
@@ -1,4 +1,4 @@
-class Messages::AudioTranscriptionService < Llm::BaseOpenAiService
+class Messages::AudioTranscriptionService < Llm::LegacyBaseOpenAiService
   attr_reader :attachment, :message, :account
 
   def initialize(attachment)
@@ -27,10 +27,16 @@ class Messages::AudioTranscriptionService < Llm::BaseOpenAiService
   end
 
   def fetch_audio_file
-    temp_dir = Rails.root.join('tmp/uploads')
+    temp_dir = Rails.root.join('tmp/uploads/audio-transcriptions')
     FileUtils.mkdir_p(temp_dir)
-    temp_file_path = File.join(temp_dir, attachment.file.filename.to_s)
-    File.write(temp_file_path, attachment.file.download, mode: 'wb')
+    temp_file_path = File.join(temp_dir, "#{attachment.file.blob.key}-#{attachment.file.filename}")
+
+    File.open(temp_file_path, 'wb') do |file|
+      attachment.file.blob.open do |blob_file|
+        IO.copy_stream(blob_file, file)
+      end
+    end
+
     temp_file_path
   end
 
@@ -40,18 +46,24 @@ class Messages::AudioTranscriptionService < Llm::BaseOpenAiService
 
     temp_file_path = fetch_audio_file
 
-    response = @client.audio.transcribe(
-      parameters: {
-        model: 'whisper-1',
-        file: File.open(temp_file_path),
-        temperature: 0.4
-      }
-    )
+    response_text = nil
+
+    File.open(temp_file_path, 'rb') do |file|
+      response = @client.audio.transcribe(
+        parameters: {
+          model: 'whisper-1',
+          file: file,
+          temperature: 0.4
+        }
+      )
+
+      response_text = response['text']
+    end
 
     FileUtils.rm_f(temp_file_path)
 
-    update_transcription(response['text'])
-    response['text']
+    update_transcription(response_text)
+    response_text
   end
 
   def update_transcription(transcribed_text)
diff --git a/enterprise/app/services/voice/call_message_builder.rb b/enterprise/app/services/voice/call_message_builder.rb
new file mode 100644
index 000000000..adf72f67c
--- /dev/null
+++ b/enterprise/app/services/voice/call_message_builder.rb
@@ -0,0 +1,90 @@
+class Voice::CallMessageBuilder
+  def self.perform!(conversation:, direction:, payload:, user: nil, timestamps: {})
+    new(
+      conversation: conversation,
+      direction: direction,
+      payload: payload,
+      user: user,
+      timestamps: timestamps
+    ).perform!
+  end
+
+  def initialize(conversation:, direction:, payload:, user:, timestamps:)
+    @conversation = conversation
+    @direction = direction
+    @payload = payload
+    @user = user
+    @timestamps = timestamps
+  end
+
+  def perform!
+    validate_sender!
+    message = latest_message
+    message ? update_message!(message) : create_message!
+  end
+
+  private
+
+  attr_reader :conversation, :direction, :payload, :user, :timestamps
+
+  def latest_message
+    conversation.messages.voice_calls.order(created_at: :desc).first
+  end
+
+  def update_message!(message)
+    message.update!(
+      message_type: message_type,
+      content_attributes: { 'data' => base_payload },
+      sender: sender
+    )
+  end
+
+  def create_message!
+    params = {
+      content: 'Voice Call',
+      message_type: message_type,
+      content_type: 'voice_call',
+      content_attributes: { 'data' => base_payload }
+    }
+    Messages::MessageBuilder.new(sender, conversation, params).perform
+  end
+
+  def base_payload
+    @base_payload ||= begin
+      data = payload.slice(
+        :call_sid,
+        :status,
+        :call_direction,
+        :conference_sid,
+        :from_number,
+        :to_number
+      ).stringify_keys
+      data['call_direction'] = direction
+      data['meta'] = {
+        'created_at' => timestamps[:created_at] || current_timestamp,
+        'ringing_at' => timestamps[:ringing_at] || current_timestamp
+      }.compact
+      data
+    end
+  end
+
+  def message_type
+    direction == 'outbound' ? 'outgoing' : 'incoming'
+  end
+
+  def sender
+    return user if direction == 'outbound'
+
+    conversation.contact
+  end
+
+  def validate_sender!
+    return unless direction == 'outbound'
+
+    raise ArgumentError, 'Agent sender required for outbound calls' unless user
+  end
+
+  def current_timestamp
+    @current_timestamp ||= Time.zone.now.to_i
+  end
+end
diff --git a/enterprise/app/services/voice/call_session_sync_service.rb b/enterprise/app/services/voice/call_session_sync_service.rb
new file mode 100644
index 000000000..8ce80ae0e
--- /dev/null
+++ b/enterprise/app/services/voice/call_session_sync_service.rb
@@ -0,0 +1,94 @@
+class Voice::CallSessionSyncService
+  attr_reader :conversation, :call_sid, :message_call_sid, :from_number, :to_number, :direction
+
+  def initialize(conversation:, call_sid:, leg:, message_call_sid: nil)
+    @conversation = conversation
+    @call_sid = call_sid
+    @message_call_sid = message_call_sid || call_sid
+    @from_number = leg[:from_number]
+    @to_number = leg[:to_number]
+    @direction = leg[:direction]
+  end
+
+  def perform
+    ActiveRecord::Base.transaction do
+      attrs = refreshed_attributes
+      conversation.update!(
+        additional_attributes: attrs,
+        last_activity_at: current_time
+      )
+      sync_voice_call_message!(attrs)
+    end
+
+    conversation
+  end
+
+  private
+
+  def refreshed_attributes
+    attrs = (conversation.additional_attributes || {}).dup
+    attrs['call_direction'] = direction
+    attrs['call_status'] ||= 'ringing'
+    attrs['conference_sid'] ||= Voice::Conference::Name.for(conversation)
+    attrs['meta'] ||= {}
+    attrs['meta']['initiated_at'] ||= current_timestamp
+    attrs
+  end
+
+  def sync_voice_call_message!(attrs)
+    Voice::CallMessageBuilder.perform!(
+      conversation: conversation,
+      direction: direction,
+      payload: {
+        call_sid: message_call_sid,
+        status: attrs['call_status'],
+        conference_sid: attrs['conference_sid'],
+        from_number: origin_number_for(direction),
+        to_number: target_number_for(direction)
+      },
+      user: agent_for(attrs),
+      timestamps: {
+        created_at: attrs.dig('meta', 'initiated_at'),
+        ringing_at: attrs.dig('meta', 'ringing_at')
+      }
+    )
+  end
+
+  def origin_number_for(current_direction)
+    return outbound_origin if current_direction == 'outbound'
+
+    from_number.presence || inbox_number
+  end
+
+  def target_number_for(current_direction)
+    return conversation.contact&.phone_number || to_number if current_direction == 'outbound'
+
+    to_number || conversation.contact&.phone_number
+  end
+
+  def agent_for(attrs)
+    agent_id = attrs['agent_id']
+    return nil unless agent_id
+
+    agent = conversation.account.users.find_by(id: agent_id)
+    raise ArgumentError, 'Agent sender required for outbound call sync' if direction == 'outbound' && agent.nil?
+
+    agent
+  end
+
+  def current_timestamp
+    @current_timestamp ||= current_time.to_i
+  end
+
+  def current_time
+    @current_time ||= Time.zone.now
+  end
+
+  def outbound_origin
+    inbox_number || from_number
+  end
+
+  def inbox_number
+    conversation.inbox&.channel&.phone_number
+  end
+end
diff --git a/enterprise/app/services/voice/call_status/manager.rb b/enterprise/app/services/voice/call_status/manager.rb
new file mode 100644
index 000000000..82d7efde7
--- /dev/null
+++ b/enterprise/app/services/voice/call_status/manager.rb
@@ -0,0 +1,66 @@
+class Voice::CallStatus::Manager
+  pattr_initialize [:conversation!, :call_sid]
+
+  ALLOWED_STATUSES = %w[ringing in-progress completed no-answer failed].freeze
+  TERMINAL_STATUSES = %w[completed no-answer failed].freeze
+
+  def process_status_update(status, duration: nil, timestamp: nil)
+    return unless ALLOWED_STATUSES.include?(status)
+
+    current_status = conversation.additional_attributes&.dig('call_status')
+    return if current_status == status
+
+    apply_status(status, duration: duration, timestamp: timestamp)
+    update_message(status)
+  end
+
+  private
+
+  def apply_status(status, duration:, timestamp:)
+    attrs = (conversation.additional_attributes || {}).dup
+    attrs['call_status'] = status
+
+    if status == 'in-progress'
+      attrs['call_started_at'] ||= timestamp || now_seconds
+    elsif TERMINAL_STATUSES.include?(status)
+      attrs['call_ended_at'] = timestamp || now_seconds
+      attrs['call_duration'] = resolved_duration(attrs, duration, timestamp)
+    end
+
+    conversation.update!(
+      additional_attributes: attrs,
+      last_activity_at: current_time
+    )
+  end
+
+  def resolved_duration(attrs, provided_duration, timestamp)
+    return provided_duration if provided_duration
+
+    started_at = attrs['call_started_at']
+    return unless started_at && timestamp
+
+    [timestamp - started_at.to_i, 0].max
+  end
+
+  def update_message(status)
+    message = conversation.messages
+                          .where(content_type: 'voice_call')
+                          .order(created_at: :desc)
+                          .first
+    return unless message
+
+    data = (message.content_attributes || {}).dup
+    data['data'] ||= {}
+    data['data']['status'] = status
+
+    message.update!(content_attributes: data)
+  end
+
+  def now_seconds
+    current_time.to_i
+  end
+
+  def current_time
+    @current_time ||= Time.zone.now
+  end
+end
diff --git a/enterprise/app/services/voice/conference/manager.rb b/enterprise/app/services/voice/conference/manager.rb
new file mode 100644
index 000000000..0b54f6ae8
--- /dev/null
+++ b/enterprise/app/services/voice/conference/manager.rb
@@ -0,0 +1,71 @@
+class Voice::Conference::Manager
+  pattr_initialize [:conversation!, :event!, :call_sid!, :participant_label]
+
+  def process
+    case event
+    when 'start'
+      ensure_conference_sid!
+      mark_ringing!
+    when 'join'
+      mark_in_progress! if agent_participant?
+    when 'leave'
+      handle_leave!
+    when 'end'
+      finalize_conference!
+    end
+  end
+
+  private
+
+  def status_manager
+    @status_manager ||= Voice::CallStatus::Manager.new(
+      conversation: conversation,
+      call_sid: call_sid
+    )
+  end
+
+  def ensure_conference_sid!
+    attrs = conversation.additional_attributes || {}
+    return if attrs['conference_sid'].present?
+
+    attrs['conference_sid'] = Voice::Conference::Name.for(conversation)
+    conversation.update!(additional_attributes: attrs)
+  end
+
+  def mark_ringing!
+    return if current_status
+
+    status_manager.process_status_update('ringing')
+  end
+
+  def mark_in_progress!
+    status_manager.process_status_update('in-progress', timestamp: current_timestamp)
+  end
+
+  def handle_leave!
+    case current_status
+    when 'ringing'
+      status_manager.process_status_update('no-answer', timestamp: current_timestamp)
+    when 'in-progress'
+      status_manager.process_status_update('completed', timestamp: current_timestamp)
+    end
+  end
+
+  def finalize_conference!
+    return if %w[completed no-answer failed].include?(current_status)
+
+    status_manager.process_status_update('completed', timestamp: current_timestamp)
+  end
+
+  def current_status
+    conversation.additional_attributes&.dig('call_status')
+  end
+
+  def agent_participant?
+    participant_label.to_s.start_with?('agent')
+  end
+
+  def current_timestamp
+    Time.zone.now.to_i
+  end
+end
diff --git a/enterprise/app/services/voice/conference/name.rb b/enterprise/app/services/voice/conference/name.rb
new file mode 100644
index 000000000..027937b4c
--- /dev/null
+++ b/enterprise/app/services/voice/conference/name.rb
@@ -0,0 +1,5 @@
+module Voice::Conference::Name
+  def self.for(conversation)
+    "conf_account_#{conversation.account_id}_conv_#{conversation.display_id}"
+  end
+end
diff --git a/enterprise/app/services/voice/inbound_call_builder.rb b/enterprise/app/services/voice/inbound_call_builder.rb
index f5ae18801..03981ac58 100644
--- a/enterprise/app/services/voice/inbound_call_builder.rb
+++ b/enterprise/app/services/voice/inbound_call_builder.rb
@@ -1,82 +1,99 @@
 class Voice::InboundCallBuilder
-  pattr_initialize [:account!, :inbox!, :from_number!, :to_number, :call_sid!]
+  attr_reader :account, :inbox, :from_number, :call_sid
 
-  attr_reader :conversation
-
-  def perform
-    contact = find_or_create_contact!
-    contact_inbox = find_or_create_contact_inbox!(contact)
-    @conversation = find_or_create_conversation!(contact, contact_inbox)
-    create_call_message_if_needed!
-    self
+  def self.perform!(account:, inbox:, from_number:, call_sid:)
+    new(account: account, inbox: inbox, from_number: from_number, call_sid: call_sid).perform!
   end
 
-  def twiml_response
-    response = Twilio::TwiML::VoiceResponse.new
-    response.say(message: 'Please wait while we connect you to an agent')
-    response.to_s
+  def initialize(account:, inbox:, from_number:, call_sid:)
+    @account = account
+    @inbox = inbox
+    @from_number = from_number
+    @call_sid = call_sid
+  end
+
+  def perform!
+    timestamp = current_timestamp
+
+    ActiveRecord::Base.transaction do
+      contact = ensure_contact!
+      contact_inbox = ensure_contact_inbox!(contact)
+      conversation = find_conversation || create_conversation!(contact, contact_inbox)
+      conversation.reload
+      update_conversation!(conversation, timestamp)
+      build_voice_message!(conversation, timestamp)
+      conversation
+    end
   end
 
   private
 
-  def find_or_create_conversation!(contact, contact_inbox)
-    account.conversations.find_or_create_by!(
-      account_id: account.id,
-      inbox_id: inbox.id,
-      identifier: call_sid
-    ) do |conv|
-      conv.contact_id = contact.id
-      conv.contact_inbox_id = contact_inbox.id
-      conv.additional_attributes = {
-        'call_direction' => 'inbound',
-        'call_status' => 'ringing'
-      }
+  def ensure_contact!
+    account.contacts.find_or_create_by!(phone_number: from_number) do |record|
+      record.name = from_number if record.name.blank?
     end
   end
 
-  def create_call_message!
-    content_attrs = call_message_content_attributes
+  def ensure_contact_inbox!(contact)
+    ContactInbox.find_or_create_by!(
+      contact_id: contact.id,
+      inbox_id: inbox.id
+    ) do |record|
+      record.source_id = from_number
+    end
+  end
 
-    @conversation.messages.create!(
-      account_id: account.id,
+  def find_conversation
+    return if call_sid.blank?
+
+    account.conversations.includes(:contact).find_by(identifier: call_sid)
+  end
+
+  def create_conversation!(contact, contact_inbox)
+    account.conversations.create!(
+      contact_inbox_id: contact_inbox.id,
       inbox_id: inbox.id,
-      message_type: :incoming,
-      sender: @conversation.contact,
-      content: 'Voice Call',
-      content_type: 'voice_call',
-      content_attributes: content_attrs
+      contact_id: contact.id,
+      status: :open,
+      identifier: call_sid
     )
   end
 
-  def create_call_message_if_needed!
-    return if @conversation.messages.voice_calls.exists?
+  def update_conversation!(conversation, timestamp)
+    attrs = {
+      'call_direction' => 'inbound',
+      'call_status' => 'ringing',
+      'conference_sid' => Voice::Conference::Name.for(conversation),
+      'meta' => { 'initiated_at' => timestamp }
+    }
 
-    create_call_message!
+    conversation.update!(
+      identifier: call_sid,
+      additional_attributes: attrs,
+      last_activity_at: current_time
+    )
   end
 
-  def call_message_content_attributes
-    {
-      data: {
+  def build_voice_message!(conversation, timestamp)
+    Voice::CallMessageBuilder.perform!(
+      conversation: conversation,
+      direction: 'inbound',
+      payload: {
         call_sid: call_sid,
         status: 'ringing',
-        conversation_id: @conversation.display_id,
-        call_direction: 'inbound',
+        conference_sid: conversation.additional_attributes['conference_sid'],
         from_number: from_number,
-        to_number: to_number,
-        meta: {
-          created_at: Time.current.to_i,
-          ringing_at: Time.current.to_i
-        }
-      }
-    }
+        to_number: inbox.channel&.phone_number
+      },
+      timestamps: { created_at: timestamp, ringing_at: timestamp }
+    )
   end
 
-  def find_or_create_contact!
-    account.contacts.find_by(phone_number: from_number) ||
-      account.contacts.create!(phone_number: from_number, name: 'Unknown Caller')
+  def current_timestamp
+    @current_timestamp ||= current_time.to_i
   end
 
-  def find_or_create_contact_inbox!(contact)
-    ContactInbox.where(contact_id: contact.id, inbox_id: inbox.id, source_id: from_number).first_or_create!
+  def current_time
+    @current_time ||= Time.zone.now
   end
 end
diff --git a/enterprise/app/services/voice/outbound_call_builder.rb b/enterprise/app/services/voice/outbound_call_builder.rb
new file mode 100644
index 000000000..1ebcade8a
--- /dev/null
+++ b/enterprise/app/services/voice/outbound_call_builder.rb
@@ -0,0 +1,98 @@
+class Voice::OutboundCallBuilder
+  attr_reader :account, :inbox, :user, :contact
+
+  def self.perform!(account:, inbox:, user:, contact:)
+    new(account: account, inbox: inbox, user: user, contact: contact).perform!
+  end
+
+  def initialize(account:, inbox:, user:, contact:)
+    @account = account
+    @inbox = inbox
+    @user = user
+    @contact = contact
+  end
+
+  def perform!
+    raise ArgumentError, 'Contact phone number required' if contact.phone_number.blank?
+    raise ArgumentError, 'Agent required' if user.blank?
+
+    timestamp = current_timestamp
+
+    ActiveRecord::Base.transaction do
+      contact_inbox = ensure_contact_inbox!
+      conversation = create_conversation!(contact_inbox)
+      conversation.reload
+      conference_sid = Voice::Conference::Name.for(conversation)
+      call_sid = initiate_call!
+      update_conversation!(conversation, call_sid, conference_sid, timestamp)
+      build_voice_message!(conversation, call_sid, conference_sid, timestamp)
+      { conversation: conversation, call_sid: call_sid }
+    end
+  end
+
+  private
+
+  def ensure_contact_inbox!
+    ContactInbox.find_or_create_by!(
+      contact_id: contact.id,
+      inbox_id: inbox.id
+    ) do |record|
+      record.source_id = contact.phone_number
+    end
+  end
+
+  def create_conversation!(contact_inbox)
+    account.conversations.create!(
+      contact_inbox_id: contact_inbox.id,
+      inbox_id: inbox.id,
+      contact_id: contact.id,
+      status: :open
+    )
+  end
+
+  def initiate_call!
+    inbox.channel.initiate_call(
+      to: contact.phone_number
+    )[:call_sid]
+  end
+
+  def update_conversation!(conversation, call_sid, conference_sid, timestamp)
+    attrs = {
+      'call_direction' => 'outbound',
+      'call_status' => 'ringing',
+      'agent_id' => user.id,
+      'conference_sid' => conference_sid,
+      'meta' => { 'initiated_at' => timestamp }
+    }
+
+    conversation.update!(
+      identifier: call_sid,
+      additional_attributes: attrs,
+      last_activity_at: current_time
+    )
+  end
+
+  def build_voice_message!(conversation, call_sid, conference_sid, timestamp)
+    Voice::CallMessageBuilder.perform!(
+      conversation: conversation,
+      direction: 'outbound',
+      payload: {
+        call_sid: call_sid,
+        status: 'ringing',
+        conference_sid: conference_sid,
+        from_number: inbox.channel&.phone_number,
+        to_number: contact.phone_number
+      },
+      user: user,
+      timestamps: { created_at: timestamp, ringing_at: timestamp }
+    )
+  end
+
+  def current_timestamp
+    @current_timestamp ||= current_time.to_i
+  end
+
+  def current_time
+    @current_time ||= Time.zone.now
+  end
+end
diff --git a/enterprise/app/services/voice/provider/twilio_adapter.rb b/enterprise/app/services/voice/provider/twilio_adapter.rb
new file mode 100644
index 000000000..2a73cd960
--- /dev/null
+++ b/enterprise/app/services/voice/provider/twilio_adapter.rb
@@ -0,0 +1,32 @@
+class Voice::Provider::TwilioAdapter
+  def initialize(channel)
+    @channel = channel
+  end
+
+  def initiate_call(to:, _conference_sid: nil, _agent_id: nil)
+    cfg = @channel.provider_config_hash
+
+    host = ENV.fetch('FRONTEND_URL')
+    phone_digits = @channel.phone_number.delete_prefix('+')
+    callback_url = "#{host}/twilio/voice/call/#{phone_digits}"
+
+    params = {
+      from: @channel.phone_number,
+      to: to,
+      url: callback_url,
+      status_callback: "#{host}/twilio/voice/status/#{phone_digits}",
+      status_callback_event: %w[initiated ringing answered completed],
+      status_callback_method: 'POST'
+    }
+
+    call = twilio_client(cfg).calls.create(**params)
+
+    { call_sid: call.sid }
+  end
+
+  private
+
+  def twilio_client(config)
+    Twilio::REST::Client.new(config['account_sid'], config['auth_token'])
+  end
+end
diff --git a/enterprise/app/services/voice/status_update_service.rb b/enterprise/app/services/voice/status_update_service.rb
index 18152c549..8503d8d3b 100644
--- a/enterprise/app/services/voice/status_update_service.rb
+++ b/enterprise/app/services/voice/status_update_service.rb
@@ -1,29 +1,60 @@
 class Voice::StatusUpdateService
-  pattr_initialize [:account!, :call_sid!, :call_status]
+  pattr_initialize [:account!, :call_sid!, :call_status, { payload: {} }]
+
+  TWILIO_STATUS_MAP = {
+    'queued' => 'ringing',
+    'initiated' => 'ringing',
+    'ringing' => 'ringing',
+    'in-progress' => 'in-progress',
+    'inprogress' => 'in-progress',
+    'answered' => 'in-progress',
+    'completed' => 'completed',
+    'busy' => 'no-answer',
+    'no-answer' => 'no-answer',
+    'failed' => 'failed',
+    'canceled' => 'failed'
+  }.freeze
 
   def perform
+    normalized_status = normalize_status(call_status)
+    return if normalized_status.blank?
+
     conversation = account.conversations.find_by(identifier: call_sid)
     return unless conversation
-    return if call_status.to_s.strip.empty?
 
-    update_conversation!(conversation)
-    update_last_call_message!(conversation)
+    Voice::CallStatus::Manager.new(
+      conversation: conversation,
+      call_sid: call_sid
+    ).process_status_update(
+      normalized_status,
+      duration: payload_duration,
+      timestamp: payload_timestamp
+    )
   end
 
   private
 
-  def update_conversation!(conversation)
-    attrs = (conversation.additional_attributes || {}).merge('call_status' => call_status)
-    conversation.update!(additional_attributes: attrs)
+  def normalize_status(status)
+    return if status.to_s.strip.empty?
+
+    TWILIO_STATUS_MAP[status.to_s.downcase]
   end
 
-  def update_last_call_message!(conversation)
-    msg = conversation.messages.voice_calls.order(created_at: :desc).first
-    return unless msg
+  def payload_duration
+    return unless payload.is_a?(Hash)
 
-    data = msg.content_attributes.is_a?(Hash) ? msg.content_attributes : {}
-    data['data'] ||= {}
-    data['data']['status'] = call_status
-    msg.update!(content_attributes: data)
+    duration = payload['CallDuration'] || payload['call_duration']
+    duration&.to_i
+  end
+
+  def payload_timestamp
+    return unless payload.is_a?(Hash)
+
+    ts = payload['Timestamp'] || payload['timestamp']
+    return unless ts
+
+    Time.zone.parse(ts).to_i
+  rescue ArgumentError
+    nil
   end
 end
diff --git a/enterprise/app/views/api/v1/accounts/companies/_company.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/_company.json.jbuilder
index 71c4d3b9b..8b8772507 100644
--- a/enterprise/app/views/api/v1/accounts/companies/_company.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/companies/_company.json.jbuilder
@@ -1,5 +1,6 @@
 json.id company.id
 json.name company.name
+json.contacts_count company.contacts_count
 json.domain company.domain
 json.description company.description
 json.avatar_url company.avatar_url
diff --git a/enterprise/app/views/api/v1/accounts/companies/index.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/index.json.jbuilder
index e68bd8543..ef9c67723 100644
--- a/enterprise/app/views/api/v1/accounts/companies/index.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/companies/index.json.jbuilder
@@ -1,3 +1,8 @@
+json.meta do
+  json.total_count @companies_count
+  json.page @current_page
+end
+
 json.payload do
   json.array! @companies do |company|
     json.partial! 'company', company: company
diff --git a/enterprise/app/views/api/v1/accounts/companies/search.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/search.json.jbuilder
new file mode 100644
index 000000000..ef9c67723
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/companies/search.json.jbuilder
@@ -0,0 +1,10 @@
+json.meta do
+  json.total_count @companies_count
+  json.page @current_page
+end
+
+json.payload do
+  json.array! @companies do |company|
+    json.partial! 'company', company: company
+  end
+end
diff --git a/enterprise/app/views/api/v1/accounts/conversations/reporting_events.json.jbuilder b/enterprise/app/views/api/v1/accounts/conversations/reporting_events.json.jbuilder
new file mode 100644
index 000000000..691296522
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/conversations/reporting_events.json.jbuilder
@@ -0,0 +1,3 @@
+json.array! @reporting_events do |reporting_event|
+  json.partial! 'api/v1/models/reporting_event', formats: [:json], reporting_event: reporting_event
+end
diff --git a/enterprise/app/views/api/v1/accounts/reporting_events/index.json.jbuilder b/enterprise/app/views/api/v1/accounts/reporting_events/index.json.jbuilder
new file mode 100644
index 000000000..ae8531955
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/reporting_events/index.json.jbuilder
@@ -0,0 +1,11 @@
+json.payload do
+  json.array! @reporting_events do |reporting_event|
+    json.partial! 'api/v1/models/reporting_event', formats: [:json], reporting_event: reporting_event
+  end
+end
+
+json.meta do
+  json.count @total_count
+  json.current_page @current_page
+  json.total_pages @reporting_events.total_pages
+end
diff --git a/enterprise/app/views/api/v1/models/_reporting_event.json.jbuilder b/enterprise/app/views/api/v1/models/_reporting_event.json.jbuilder
new file mode 100644
index 000000000..f8e5f08ba
--- /dev/null
+++ b/enterprise/app/views/api/v1/models/_reporting_event.json.jbuilder
@@ -0,0 +1,12 @@
+json.id reporting_event.id
+json.name reporting_event.name
+json.value reporting_event.value
+json.value_in_business_hours reporting_event.value_in_business_hours
+json.event_start_time reporting_event.event_start_time
+json.event_end_time reporting_event.event_end_time
+json.account_id reporting_event.account_id
+json.inbox_id reporting_event.inbox_id
+json.user_id reporting_event.user_id
+json.conversation_id reporting_event.conversation_id
+json.created_at reporting_event.created_at
+json.updated_at reporting_event.updated_at
diff --git a/enterprise/lib/captain/tools/faq_lookup_tool.rb b/enterprise/lib/captain/tools/faq_lookup_tool.rb
index d09b7c2d7..93dd90259 100644
--- a/enterprise/lib/captain/tools/faq_lookup_tool.rb
+++ b/enterprise/lib/captain/tools/faq_lookup_tool.rb
@@ -28,7 +28,7 @@ class Captain::Tools::FaqLookupTool < Captain::Tools::BasePublicTool
         Question: #{response.question}
         Answer: #{response.answer}
         "
-    if response.documentable.present? && response.documentable.try(:external_link)
+    if should_show_source?(response)
       formatted_response += "
           Source: #{response.documentable.external_link}
           "
@@ -36,4 +36,13 @@ class Captain::Tools::FaqLookupTool < Captain::Tools::BasePublicTool
 
     formatted_response
   end
+
+  def should_show_source?(response)
+    return false if response.documentable.blank?
+    return false unless response.documentable.try(:external_link)
+
+    # Don't show source if it's a PDF placeholder
+    external_link = response.documentable.external_link
+    !external_link.start_with?('PDF:')
+  end
 end
diff --git a/lib/chatwoot_app.rb b/lib/chatwoot_app.rb
index 5606c0b37..3afb7579e 100644
--- a/lib/chatwoot_app.rb
+++ b/lib/chatwoot_app.rb
@@ -42,4 +42,11 @@ module ChatwootApp
   def self.advanced_search_allowed?
     enterprise? && ENV.fetch('OPENSEARCH_URL', nil).present?
   end
+
+  def self.otel_enabled?
+    otel_provider = InstallationConfig.find_by(name: 'OTEL_PROVIDER')&.value
+    secret_key = InstallationConfig.find_by(name: 'LANGFUSE_SECRET_KEY')&.value
+
+    otel_provider.present? && secret_key.present? && otel_provider == 'langfuse'
+  end
 end
diff --git a/lib/integrations/openai_base_service.rb b/lib/integrations/llm_base_service.rb
similarity index 51%
rename from lib/integrations/openai_base_service.rb
rename to lib/integrations/llm_base_service.rb
index 7b4a93f95..ca9459fc8 100644
--- a/lib/integrations/openai_base_service.rb
+++ b/lib/integrations/llm_base_service.rb
@@ -1,11 +1,12 @@
-class Integrations::OpenaiBaseService
+class Integrations::LlmBaseService
+  include Integrations::LlmInstrumentation
+
   # gpt-4o-mini supports 128,000 tokens
   # 1 token is approx 4 characters
   # sticking with 120000 to be safe
   # 120000 * 4 = 480,000 characters (rounding off downwards to 400,000 to be safe)
   TOKEN_LIMIT = 400_000
-  GPT_MODEL = ENV.fetch('OPENAI_GPT_MODEL', 'gpt-4o-mini').freeze
-
+  GPT_MODEL = Llm::Config::DEFAULT_MODEL
   ALLOWED_EVENT_NAMES = %w[rephrase summarize reply_suggestion fix_spelling_grammar shorten expand make_friendly make_formal simplify].freeze
   CACHEABLE_EVENTS = %w[].freeze
 
@@ -80,28 +81,89 @@ class Integrations::OpenaiBaseService
     self.class::CACHEABLE_EVENTS.include?(event_name)
   end
 
-  def api_url
+  def api_base
     endpoint = InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_ENDPOINT')&.value.presence || 'https://api.openai.com/'
     endpoint = endpoint.chomp('/')
-    "#{endpoint}/v1/chat/completions"
+    "#{endpoint}/v1"
   end
 
   def make_api_call(body)
-    headers = {
-      'Content-Type' => 'application/json',
-      'Authorization' => "Bearer #{hook.settings['api_key']}"
+    parsed_body = JSON.parse(body)
+    instrumentation_params = build_instrumentation_params(parsed_body)
+
+    instrument_llm_call(instrumentation_params) do
+      execute_ruby_llm_request(parsed_body)
+    end
+  end
+
+  def execute_ruby_llm_request(parsed_body)
+    messages = parsed_body['messages']
+    model = parsed_body['model']
+
+    Llm::Config.with_api_key(hook.settings['api_key'], api_base: api_base) do |context|
+      chat = context.chat(model: model)
+      setup_chat_with_messages(chat, messages)
+    end
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: hook.account).capture_exception
+    build_error_response_from_exception(e, messages)
+  end
+
+  def setup_chat_with_messages(chat, messages)
+    apply_system_instructions(chat, messages)
+    response = send_conversation_messages(chat, messages)
+    return { error: 'No conversation messages provided', error_code: 400, request_messages: messages } if response.nil?
+
+    build_ruby_llm_response(response, messages)
+  end
+
+  def apply_system_instructions(chat, messages)
+    system_msg = messages.find { |m| m['role'] == 'system' }
+    chat.with_instructions(system_msg['content']) if system_msg
+  end
+
+  def send_conversation_messages(chat, messages)
+    conversation_messages = messages.reject { |m| m['role'] == 'system' }
+
+    return nil if conversation_messages.empty?
+
+    return chat.ask(conversation_messages.first['content']) if conversation_messages.length == 1
+
+    add_conversation_history(chat, conversation_messages[0...-1])
+    chat.ask(conversation_messages.last['content'])
+  end
+
+  def add_conversation_history(chat, messages)
+    messages.each do |msg|
+      chat.add_message(role: msg['role'].to_sym, content: msg['content'])
+    end
+  end
+
+  def build_ruby_llm_response(response, messages)
+    {
+      message: response.content,
+      usage: {
+        'prompt_tokens' => response.input_tokens,
+        'completion_tokens' => response.output_tokens,
+        'total_tokens' => (response.input_tokens || 0) + (response.output_tokens || 0)
+      },
+      request_messages: messages
     }
+  end
 
-    Rails.logger.info("OpenAI API request: #{body}")
-    response = HTTParty.post(api_url, headers: headers, body: body)
-    Rails.logger.info("OpenAI API response: #{response.body}")
+  def build_instrumentation_params(parsed_body)
+    {
+      span_name: "llm.#{event_name}",
+      account_id: hook.account_id,
+      conversation_id: conversation&.display_id,
+      feature_name: event_name,
+      model: parsed_body['model'],
+      messages: parsed_body['messages'],
+      temperature: parsed_body['temperature']
+    }
+  end
 
-    return { error: response.parsed_response, error_code: response.code } unless response.success?
-
-    choices = JSON.parse(response.body)['choices']
-
-    return { message: choices.first['message']['content'] } if choices.present?
-
-    { message: nil }
+  def build_error_response_from_exception(error, messages)
+    { error: error.message, request_messages: messages }
   end
 end
diff --git a/lib/integrations/llm_instrumentation.rb b/lib/integrations/llm_instrumentation.rb
new file mode 100644
index 000000000..aff41fbce
--- /dev/null
+++ b/lib/integrations/llm_instrumentation.rb
@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+require 'opentelemetry_config'
+
+module Integrations::LlmInstrumentation
+  include Integrations::LlmInstrumentationConstants
+  include Integrations::LlmInstrumentationHelpers
+  include Integrations::LlmInstrumentationSpans
+
+  PROVIDER_PREFIXES = {
+    'openai' => %w[gpt- o1 o3 o4 text-embedding- whisper- tts-],
+    'anthropic' => %w[claude-],
+    'google' => %w[gemini-],
+    'mistral' => %w[mistral- codestral-],
+    'deepseek' => %w[deepseek-]
+  }.freeze
+
+  def instrument_llm_call(params)
+    return yield unless ChatwootApp.otel_enabled?
+
+    result = nil
+    executed = false
+    tracer.in_span(params[:span_name]) do |span|
+      setup_span_attributes(span, params)
+      result = yield
+      executed = true
+      record_completion(span, result)
+      result
+    end
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: resolve_account(params)).capture_exception
+    executed ? result : yield
+  end
+
+  def instrument_agent_session(params)
+    return yield unless ChatwootApp.otel_enabled?
+
+    result = nil
+    executed = false
+    tracer.in_span(params[:span_name]) do |span|
+      set_request_attributes(span, params)
+      set_metadata_attributes(span, params)
+
+      # By default, the input and output of a trace are set from the root observation
+      span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, params[:messages].to_json)
+      result = yield
+      executed = true
+      span.set_attribute(ATTR_LANGFUSE_OBSERVATION_OUTPUT, result.to_json)
+      result
+    end
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: resolve_account(params)).capture_exception
+    executed ? result : yield
+  end
+
+  def instrument_tool_call(tool_name, arguments)
+    # There is no error handling because tools can fail and LLMs should be
+    # aware of those failures and factor them into their response.
+    return yield unless ChatwootApp.otel_enabled?
+
+    tracer.in_span(format(TOOL_SPAN_NAME, tool_name)) do |span|
+      span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, arguments.to_json)
+      result = yield
+      span.set_attribute(ATTR_LANGFUSE_OBSERVATION_OUTPUT, result.to_json)
+      result
+    end
+  end
+
+  def determine_provider(model_name)
+    return 'openai' if model_name.blank?
+
+    model = model_name.to_s.downcase
+
+    PROVIDER_PREFIXES.each do |provider, prefixes|
+      return provider if prefixes.any? { |prefix| model.start_with?(prefix) }
+    end
+
+    'openai'
+  end
+
+  private
+
+  def resolve_account(params)
+    return params[:account] if params[:account].is_a?(Account)
+    return Account.find_by(id: params[:account_id]) if params[:account_id].present?
+
+    nil
+  end
+
+  def setup_span_attributes(span, params)
+    set_request_attributes(span, params)
+    set_prompt_messages(span, params[:messages])
+    set_metadata_attributes(span, params)
+  end
+
+  def record_completion(span, result)
+    if result.respond_to?(:content)
+      span.set_attribute(ATTR_GEN_AI_COMPLETION_ROLE, result.role.to_s) if result.respond_to?(:role)
+      span.set_attribute(ATTR_GEN_AI_COMPLETION_CONTENT, result.content.to_s)
+    elsif result.is_a?(Hash)
+      set_completion_attributes(span, result) if result.is_a?(Hash)
+    end
+  end
+
+  def set_request_attributes(span, params)
+    provider = determine_provider(params[:model])
+    span.set_attribute(ATTR_GEN_AI_PROVIDER, provider)
+    span.set_attribute(ATTR_GEN_AI_REQUEST_MODEL, params[:model])
+    span.set_attribute(ATTR_GEN_AI_REQUEST_TEMPERATURE, params[:temperature]) if params[:temperature]
+  end
+
+  def set_prompt_messages(span, messages)
+    messages.each_with_index do |msg, idx|
+      role = msg[:role] || msg['role']
+      content = msg[:content] || msg['content']
+
+      span.set_attribute(format(ATTR_GEN_AI_PROMPT_ROLE, idx), role)
+      span.set_attribute(format(ATTR_GEN_AI_PROMPT_CONTENT, idx), content.to_s)
+    end
+  end
+end
diff --git a/lib/integrations/llm_instrumentation_constants.rb b/lib/integrations/llm_instrumentation_constants.rb
new file mode 100644
index 000000000..6ce296ee9
--- /dev/null
+++ b/lib/integrations/llm_instrumentation_constants.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Integrations::LlmInstrumentationConstants
+  # OpenTelemetry attribute names following GenAI semantic conventions
+  # https://opentelemetry.io/docs/specs/semconv/gen-ai/
+  ATTR_GEN_AI_PROVIDER = 'gen_ai.provider.name'
+  ATTR_GEN_AI_REQUEST_MODEL = 'gen_ai.request.model'
+  ATTR_GEN_AI_REQUEST_TEMPERATURE = 'gen_ai.request.temperature'
+  ATTR_GEN_AI_PROMPT_ROLE = 'gen_ai.prompt.%d.role'
+  ATTR_GEN_AI_PROMPT_CONTENT = 'gen_ai.prompt.%d.content'
+  ATTR_GEN_AI_COMPLETION_ROLE = 'gen_ai.completion.0.role'
+  ATTR_GEN_AI_COMPLETION_CONTENT = 'gen_ai.completion.0.content'
+  ATTR_GEN_AI_USAGE_INPUT_TOKENS = 'gen_ai.usage.input_tokens'
+  ATTR_GEN_AI_USAGE_OUTPUT_TOKENS = 'gen_ai.usage.output_tokens'
+  ATTR_GEN_AI_USAGE_TOTAL_TOKENS = 'gen_ai.usage.total_tokens'
+  ATTR_GEN_AI_RESPONSE_ERROR = 'gen_ai.response.error'
+  ATTR_GEN_AI_RESPONSE_ERROR_CODE = 'gen_ai.response.error_code'
+
+  TOOL_SPAN_NAME = 'tool.%s'
+
+  # Langfuse-specific attributes
+  # https://langfuse.com/integrations/native/opentelemetry#property-mapping
+  ATTR_LANGFUSE_USER_ID = 'langfuse.user.id'
+  ATTR_LANGFUSE_SESSION_ID = 'langfuse.session.id'
+  ATTR_LANGFUSE_TAGS = 'langfuse.trace.tags'
+  ATTR_LANGFUSE_METADATA = 'langfuse.trace.metadata.%s'
+  ATTR_LANGFUSE_TRACE_INPUT = 'langfuse.trace.input'
+  ATTR_LANGFUSE_TRACE_OUTPUT = 'langfuse.trace.output'
+  ATTR_LANGFUSE_OBSERVATION_INPUT = 'langfuse.observation.input'
+  ATTR_LANGFUSE_OBSERVATION_OUTPUT = 'langfuse.observation.output'
+end
diff --git a/lib/integrations/llm_instrumentation_helpers.rb b/lib/integrations/llm_instrumentation_helpers.rb
new file mode 100644
index 000000000..c03e3e9c7
--- /dev/null
+++ b/lib/integrations/llm_instrumentation_helpers.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Integrations::LlmInstrumentationHelpers
+  include Integrations::LlmInstrumentationConstants
+
+  private
+
+  def set_completion_attributes(span, result)
+    set_completion_message(span, result)
+    set_usage_metrics(span, result)
+    set_error_attributes(span, result)
+  end
+
+  def set_completion_message(span, result)
+    message = result[:message] || result.dig('choices', 0, 'message', 'content')
+    return if message.blank?
+
+    span.set_attribute(ATTR_GEN_AI_COMPLETION_ROLE, 'assistant')
+    span.set_attribute(ATTR_GEN_AI_COMPLETION_CONTENT, message)
+  end
+
+  def set_usage_metrics(span, result)
+    usage = result[:usage] || result['usage']
+    return if usage.blank?
+
+    span.set_attribute(ATTR_GEN_AI_USAGE_INPUT_TOKENS, usage['prompt_tokens']) if usage['prompt_tokens']
+    span.set_attribute(ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, usage['completion_tokens']) if usage['completion_tokens']
+    span.set_attribute(ATTR_GEN_AI_USAGE_TOTAL_TOKENS, usage['total_tokens']) if usage['total_tokens']
+  end
+
+  def set_error_attributes(span, result)
+    error = result[:error] || result['error']
+    return if error.blank?
+
+    span.set_attribute(ATTR_GEN_AI_RESPONSE_ERROR, error.to_json)
+    span.status = OpenTelemetry::Trace::Status.error(error.to_s.truncate(1000))
+  end
+
+  def set_metadata_attributes(span, params)
+    session_id = params[:conversation_id].present? ? "#{params[:account_id]}_#{params[:conversation_id]}" : nil
+    span.set_attribute(ATTR_LANGFUSE_USER_ID, params[:account_id].to_s) if params[:account_id]
+    span.set_attribute(ATTR_LANGFUSE_SESSION_ID, session_id) if session_id.present?
+    span.set_attribute(ATTR_LANGFUSE_TAGS, [params[:feature_name]].to_json)
+
+    return unless params[:metadata].is_a?(Hash)
+
+    params[:metadata].each do |key, value|
+      span.set_attribute(format(ATTR_LANGFUSE_METADATA, key), value.to_s)
+    end
+  end
+end
diff --git a/lib/integrations/llm_instrumentation_spans.rb b/lib/integrations/llm_instrumentation_spans.rb
new file mode 100644
index 000000000..9199aaa10
--- /dev/null
+++ b/lib/integrations/llm_instrumentation_spans.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require 'opentelemetry_config'
+require_relative 'llm_instrumentation_constants'
+
+module Integrations::LlmInstrumentationSpans
+  include Integrations::LlmInstrumentationConstants
+
+  def tracer
+    @tracer ||= OpentelemetryConfig.tracer
+  end
+
+  def start_llm_turn_span(params)
+    return unless ChatwootApp.otel_enabled?
+
+    span = tracer.start_span(params[:span_name])
+    set_llm_turn_request_attributes(span, params)
+    set_llm_turn_prompt_attributes(span, params[:messages]) if params[:messages]
+
+    @pending_llm_turn_spans ||= []
+    @pending_llm_turn_spans.push(span)
+  rescue StandardError => e
+    Rails.logger.warn "Failed to start LLM turn span: #{e.message}"
+  end
+
+  def end_llm_turn_span(message)
+    return unless ChatwootApp.otel_enabled?
+
+    span = @pending_llm_turn_spans&.pop
+    return unless span
+
+    set_llm_turn_response_attributes(span, message) if message
+    span.finish
+  rescue StandardError => e
+    Rails.logger.warn "Failed to end LLM turn span: #{e.message}"
+  end
+
+  def start_tool_span(tool_call)
+    return unless ChatwootApp.otel_enabled?
+
+    tool_name = tool_call.name.to_s
+    span = tracer.start_span(format(TOOL_SPAN_NAME, tool_name))
+    span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, tool_call.arguments.to_json)
+
+    @pending_tool_spans ||= []
+    @pending_tool_spans.push(span)
+  rescue StandardError => e
+    Rails.logger.warn "Failed to start tool span: #{e.message}"
+  end
+
+  def end_tool_span(result)
+    return unless ChatwootApp.otel_enabled?
+
+    span = @pending_tool_spans&.pop
+    return unless span
+
+    output = result.is_a?(String) ? result : result.to_json
+    span.set_attribute(ATTR_LANGFUSE_OBSERVATION_OUTPUT, output)
+    span.finish
+  rescue StandardError => e
+    Rails.logger.warn "Failed to end tool span: #{e.message}"
+  end
+
+  private
+
+  def set_llm_turn_request_attributes(span, params)
+    provider = determine_provider(params[:model])
+    span.set_attribute(ATTR_GEN_AI_PROVIDER, provider)
+    span.set_attribute(ATTR_GEN_AI_REQUEST_MODEL, params[:model]) if params[:model]
+    span.set_attribute(ATTR_GEN_AI_REQUEST_TEMPERATURE, params[:temperature]) if params[:temperature]
+  end
+
+  def set_llm_turn_prompt_attributes(span, messages)
+    messages.each_with_index do |msg, idx|
+      span.set_attribute(format(ATTR_GEN_AI_PROMPT_ROLE, idx), msg[:role])
+      span.set_attribute(format(ATTR_GEN_AI_PROMPT_CONTENT, idx), msg[:content])
+    end
+    span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, messages.to_json)
+  end
+
+  def set_llm_turn_response_attributes(span, message)
+    span.set_attribute(ATTR_GEN_AI_COMPLETION_ROLE, message.role.to_s) if message.respond_to?(:role)
+    span.set_attribute(ATTR_GEN_AI_COMPLETION_CONTENT, message.content.to_s) if message.respond_to?(:content)
+    set_llm_turn_usage_attributes(span, message)
+    span.set_attribute(ATTR_LANGFUSE_OBSERVATION_OUTPUT, message.content.to_s) if message.respond_to?(:content)
+  end
+
+  def set_llm_turn_usage_attributes(span, message)
+    span.set_attribute(ATTR_GEN_AI_USAGE_INPUT_TOKENS, message.input_tokens) if message.respond_to?(:input_tokens) && message.input_tokens
+    span.set_attribute(ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, message.output_tokens) if message.respond_to?(:output_tokens) && message.output_tokens
+  end
+end
diff --git a/lib/integrations/openai/processor_service.rb b/lib/integrations/openai/processor_service.rb
index 1359c6aff..0a0dfa8ae 100644
--- a/lib/integrations/openai/processor_service.rb
+++ b/lib/integrations/openai/processor_service.rb
@@ -1,4 +1,4 @@
-class Integrations::Openai::ProcessorService < Integrations::OpenaiBaseService
+class Integrations::Openai::ProcessorService < Integrations::LlmBaseService
   AGENT_INSTRUCTION = 'You are a helpful support agent.'.freeze
   LANGUAGE_INSTRUCTION = 'Ensure that the reply should be in user language.'.freeze
   def reply_suggestion_message
diff --git a/lib/integrations/slack/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index 46c111a83..4e959c469 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -121,8 +121,6 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
   end
 
   def upload_files
-    return unless message.attachments.any?
-
     files = build_files_array
     return if files.empty?
 
@@ -136,6 +134,8 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
       Rails.logger.info "slack_upload_result: #{result}"
     rescue Slack::Web::Api::Errors::SlackError => e
       Rails.logger.error "Failed to upload files: #{e.message}"
+    ensure
+      files.each { |file| file[:content]&.clear }
     end
   end
 
@@ -143,14 +143,31 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
     message.attachments.filter_map do |attachment|
       next unless attachment.with_attached_file?
 
-      {
-        filename: attachment.file.filename.to_s,
-        content: attachment.file.download,
-        title: attachment.file.filename.to_s
-      }
+      build_file_payload(attachment)
     end
   end
 
+  def build_file_payload(attachment)
+    content = download_attachment_content(attachment)
+    return if content.blank?
+
+    {
+      filename: attachment.file.filename.to_s,
+      content: content,
+      title: attachment.file.filename.to_s
+    }
+  end
+
+  def download_attachment_content(attachment)
+    buffer = +''
+    attachment.file.blob.open do |file|
+      while (chunk = file.read(64.kilobytes))
+        buffer << chunk
+      end
+    end
+    buffer
+  end
+
   def sender_name(sender)
     sender.try(:name) ? "#{sender.try(:name)} (#{sender_type(sender)})" : sender_type(sender)
   end
diff --git a/lib/llm/config.rb b/lib/llm/config.rb
new file mode 100644
index 000000000..94836d746
--- /dev/null
+++ b/lib/llm/config.rb
@@ -0,0 +1,48 @@
+require 'ruby_llm'
+
+module Llm::Config
+  DEFAULT_MODEL = 'gpt-4o-mini'.freeze
+  class << self
+    def initialized?
+      @initialized ||= false
+    end
+
+    def initialize!
+      return if @initialized
+
+      configure_ruby_llm
+      @initialized = true
+    end
+
+    def reset!
+      @initialized = false
+    end
+
+    def with_api_key(api_key, api_base: nil)
+      context = RubyLLM.context do |config|
+        config.openai_api_key = api_key
+        config.openai_api_base = api_base
+      end
+
+      yield context
+    end
+
+    private
+
+    def configure_ruby_llm
+      RubyLLM.configure do |config|
+        config.openai_api_key = system_api_key if system_api_key.present?
+        config.openai_api_base = openai_endpoint.chomp('/') if openai_endpoint.present?
+        config.logger = Rails.logger
+      end
+    end
+
+    def system_api_key
+      InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_API_KEY')&.value
+    end
+
+    def openai_endpoint
+      InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_ENDPOINT')&.value
+    end
+  end
+end
diff --git a/lib/opentelemetry_config.rb b/lib/opentelemetry_config.rb
new file mode 100644
index 000000000..5ed17e098
--- /dev/null
+++ b/lib/opentelemetry_config.rb
@@ -0,0 +1,91 @@
+require 'opentelemetry/sdk'
+require 'opentelemetry/exporter/otlp'
+require 'base64'
+
+module OpentelemetryConfig
+  class << self
+    def tracer
+      initialize! unless initialized?
+      OpenTelemetry.tracer_provider.tracer('chatwoot')
+    end
+
+    def initialized?
+      @initialized ||= false
+    end
+
+    def initialize!
+      return if @initialized
+      return mark_initialized unless langfuse_provider?
+      return mark_initialized unless langfuse_credentials_present?
+
+      configure_opentelemetry
+      mark_initialized
+    rescue StandardError => e
+      Rails.logger.error "Failed to configure OpenTelemetry: #{e.message}"
+      mark_initialized
+    end
+
+    def reset!
+      @initialized = false
+    end
+
+    private
+
+    def mark_initialized
+      @initialized = true
+    end
+
+    def langfuse_provider?
+      otel_provider = InstallationConfig.find_by(name: 'OTEL_PROVIDER')&.value
+      otel_provider == 'langfuse'
+    end
+
+    def langfuse_credentials_present?
+      endpoint = InstallationConfig.find_by(name: 'LANGFUSE_BASE_URL')&.value
+      public_key = InstallationConfig.find_by(name: 'LANGFUSE_PUBLIC_KEY')&.value
+      secret_key = InstallationConfig.find_by(name: 'LANGFUSE_SECRET_KEY')&.value
+
+      if endpoint.blank? || public_key.blank? || secret_key.blank?
+        Rails.logger.error 'OpenTelemetry disabled (LANGFUSE_BASE_URL, LANGFUSE_PUBLIC_KEY or LANGFUSE_SECRET_KEY is missing)'
+        return false
+      end
+
+      true
+    end
+
+    def langfuse_credentials
+      {
+        endpoint: InstallationConfig.find_by(name: 'LANGFUSE_BASE_URL')&.value,
+        public_key: InstallationConfig.find_by(name: 'LANGFUSE_PUBLIC_KEY')&.value,
+        secret_key: InstallationConfig.find_by(name: 'LANGFUSE_SECRET_KEY')&.value
+      }
+    end
+
+    def traces_endpoint
+      credentials = langfuse_credentials
+      "#{credentials[:endpoint]}/api/public/otel/v1/traces"
+    end
+
+    def exporter_config
+      credentials = langfuse_credentials
+      auth_header = Base64.strict_encode64("#{credentials[:public_key]}:#{credentials[:secret_key]}")
+
+      config = {
+        endpoint: traces_endpoint,
+        headers: { 'Authorization' => "Basic #{auth_header}" }
+      }
+
+      config[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE if Rails.env.development?
+      config
+    end
+
+    def configure_opentelemetry
+      OpenTelemetry::SDK.configure do |c|
+        c.service_name = 'chatwoot'
+        exporter = OpenTelemetry::Exporter::OTLP::Exporter.new(**exporter_config)
+        c.add_span_processor(OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(exporter))
+        Rails.logger.info 'OpenTelemetry initialized and configured to export to Langfuse'
+      end
+    end
+  end
+end
diff --git a/lib/redis/alfred.rb b/lib/redis/alfred.rb
index b3e156420..e7e04ed60 100644
--- a/lib/redis/alfred.rb
+++ b/lib/redis/alfred.rb
@@ -35,6 +35,25 @@ module Redis::Alfred
       $alfred.with { |conn| conn.exists?(key) }
     end
 
+    # set expiry on a key in seconds
+    def expire(key, seconds)
+      $alfred.with { |conn| conn.expire(key, seconds) }
+    end
+
+    # scan keys matching a pattern
+    def scan_each(match: nil, count: 100, &)
+      $alfred.with do |conn|
+        conn.scan_each(match: match, count: count, &)
+      end
+    end
+
+    # count keys matching a pattern
+    def keys_count(pattern)
+      count = 0
+      scan_each(match: pattern) { count += 1 }
+      count
+    end
+
     # list operations
 
     def llen(key)
@@ -81,8 +100,15 @@ module Redis::Alfred
     # sorted set operations
 
     # add score and value for a key
-    def zadd(key, score, value)
-      $alfred.with { |conn| conn.zadd(key, score, value) }
+    # Modern Redis syntax: zadd(key, [[score, member], ...])
+    def zadd(key, score, value = nil)
+      if value.nil? && score.is_a?(Array)
+        # New syntax: score is actually an array of [score, member] pairs
+        $alfred.with { |conn| conn.zadd(key, score) }
+      else
+        # Support old syntax for backward compatibility
+        $alfred.with { |conn| conn.zadd(key, [[score, value]]) }
+      end
     end
 
     # get score of a value for key
@@ -90,9 +116,22 @@ module Redis::Alfred
       $alfred.with { |conn| conn.zscore(key, value) }
     end
 
+    # count members in a sorted set with scores within the given range
+    def zcount(key, min_score, max_score)
+      $alfred.with { |conn| conn.zcount(key, min_score, max_score) }
+    end
+
+    # get the number of members in a sorted set
+    def zcard(key)
+      $alfred.with { |conn| conn.zcard(key) }
+    end
+
     # get values by score
-    def zrangebyscore(key, range_start, range_end)
-      $alfred.with { |conn| conn.zrangebyscore(key, range_start, range_end) }
+    def zrangebyscore(key, range_start, range_end, with_scores: false, limit: nil)
+      options = {}
+      options[:with_scores] = with_scores if with_scores
+      options[:limit] = limit if limit
+      $alfred.with { |conn| conn.zrangebyscore(key, range_start, range_end, **options) }
     end
 
     # remove values by score
diff --git a/lib/redis/redis_keys.rb b/lib/redis/redis_keys.rb
index fa64d1043..f5d297e5f 100644
--- a/lib/redis/redis_keys.rb
+++ b/lib/redis/redis_keys.rb
@@ -42,4 +42,9 @@ module Redis::RedisKeys
   SLACK_MESSAGE_MUTEX = 'SLACK_MESSAGE_LOCK::%<conversation_id>s::%<reference_id>s'.freeze
   EMAIL_MESSAGE_MUTEX = 'EMAIL_CHANNEL_LOCK::%<inbox_id>s'.freeze
   CRM_PROCESS_MUTEX = 'CRM_PROCESS_MUTEX::%<hook_id>s'.freeze
+
+  ## Auto Assignment Keys
+  # Track conversation assignments to agents for rate limiting
+  ASSIGNMENT_KEY = 'ASSIGNMENT::%<inbox_id>d::AGENT::%<agent_id>d::CONVERSATION::%<conversation_id>d'.freeze
+  ASSIGNMENT_KEY_PATTERN = 'ASSIGNMENT::%<inbox_id>d::AGENT::%<agent_id>d::*'.freeze
 end
diff --git a/lib/tasks/companies.rake b/lib/tasks/companies.rake
new file mode 100644
index 000000000..11fb5dc10
--- /dev/null
+++ b/lib/tasks/companies.rake
@@ -0,0 +1,12 @@
+namespace :companies do
+  desc 'Backfill companies from existing contact email domains'
+  task backfill: :environment do
+    puts 'Starting company backfill migration...'
+    puts 'This will process all accounts and create companies from contact email domains.'
+    puts 'The job will run in the background via Sidekiq'
+    puts ''
+    Migration::CompanyBackfillJob.perform_later
+    puts 'Company backfill job has been enqueued.'
+    puts 'Monitor progress in logs or Sidekiq dashboard.'
+  end
+end
diff --git a/lib/webhooks/trigger.rb b/lib/webhooks/trigger.rb
index 95c399d54..54bd7499d 100644
--- a/lib/webhooks/trigger.rb
+++ b/lib/webhooks/trigger.rb
@@ -26,7 +26,7 @@ class Webhooks::Trigger
       url: @url,
       payload: @payload.to_json,
       headers: { content_type: :json, accept: :json },
-      timeout: 5
+      timeout: webhook_timeout
     )
   end
 
@@ -73,4 +73,11 @@ class Webhooks::Trigger
   def message_id
     @payload[:id]
   end
+
+  def webhook_timeout
+    raw_timeout = GlobalConfig.get_value('WEBHOOK_TIMEOUT')
+    timeout = raw_timeout.presence&.to_i
+
+    timeout&.positive? ? timeout : 5
+  end
 end
diff --git a/package.json b/package.json
index 6fb7156cb..406e83b13 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@breezystack/lamejs": "^1.2.7",
     "@chatwoot/ninja-keys": "1.2.3",
-    "@chatwoot/prosemirror-schema": "1.2.1",
+    "@chatwoot/prosemirror-schema": "1.2.3",
     "@chatwoot/utils": "^0.0.51",
     "@formkit/core": "^1.6.7",
     "@formkit/vue": "^1.6.7",
@@ -45,7 +45,7 @@
     "@rails/actioncable": "6.1.3",
     "@rails/ujs": "^7.1.400",
     "@scmmishra/pico-search": "0.5.4",
-    "@sentry/vue": "^8.31.0",
+    "@sentry/vue": "^8.55.0",
     "@sindresorhus/slugify": "2.2.1",
     "@tailwindcss/typography": "^0.5.15",
     "@tanstack/vue-table": "^8.20.5",
@@ -56,7 +56,7 @@
     "@vueuse/components": "^12.0.0",
     "@vueuse/core": "^12.0.0",
     "activestorage": "^5.2.6",
-    "axios": "^1.8.2",
+    "axios": "^1.13.2",
     "camelcase-keys": "^9.1.3",
     "chart.js": "~4.4.4",
     "color2k": "^2.0.2",
@@ -79,8 +79,9 @@
     "md5": "^2.3.0",
     "mitt": "^3.0.1",
     "opus-recorder": "^8.0.5",
-    "qrcode": "^1.5.4",
+    "pinia": "^3.0.4",
     "posthog-js": "^1.260.2",
+    "qrcode": "^1.5.4",
     "semver": "7.6.3",
     "snakecase-keys": "^8.0.1",
     "timezone-phone-codes": "^0.0.2",
@@ -131,8 +132,8 @@
     "fake-indexeddb": "^6.0.0",
     "histoire": "0.17.15",
     "husky": "^7.0.0",
-    "jsdom": "^24.1.3",
-    "lint-staged": "14.0.1",
+    "jsdom": "^27.2.0",
+    "lint-staged": "^16.2.7",
     "postcss": "^8.4.47",
     "postcss-preset-env": "^8.5.1",
     "prettier": "^3.3.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 22c662d89..65dacb287 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,8 +20,8 @@ importers:
         specifier: 1.2.3
         version: 1.2.3
       '@chatwoot/prosemirror-schema':
-        specifier: 1.2.1
-        version: 1.2.1
+        specifier: 1.2.3
+        version: 1.2.3
       '@chatwoot/utils':
         specifier: ^0.0.51
         version: 0.0.51
@@ -56,8 +56,8 @@ importers:
         specifier: 0.5.4
         version: 0.5.4
       '@sentry/vue':
-        specifier: ^8.31.0
-        version: 8.31.0(vue@3.5.12(typescript@5.6.2))
+        specifier: ^8.55.0
+        version: 8.55.0(pinia@3.0.4(typescript@5.6.2)(vue@3.5.12(typescript@5.6.2)))(vue@3.5.12(typescript@5.6.2))
       '@sindresorhus/slugify':
         specifier: 2.2.1
         version: 2.2.1
@@ -89,8 +89,8 @@ importers:
         specifier: ^5.2.6
         version: 5.2.8
       axios:
-        specifier: ^1.8.2
-        version: 1.8.2
+        specifier: ^1.13.2
+        version: 1.13.2
       camelcase-keys:
         specifier: ^9.1.3
         version: 9.1.3
@@ -157,6 +157,9 @@ importers:
       opus-recorder:
         specifier: ^8.0.5
         version: 8.0.5
+      pinia:
+        specifier: ^3.0.4
+        version: 3.0.4(typescript@5.6.2)(vue@3.5.12(typescript@5.6.2))
       posthog-js:
         specifier: ^1.260.2
         version: 1.260.3
@@ -265,7 +268,7 @@ importers:
         version: 8.2.6(size-limit@8.2.6)
       '@vitest/coverage-v8':
         specifier: 3.0.5
-        version: 3.0.5(vitest@3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0))
+        version: 3.0.5(vitest@3.0.5(@types/node@22.7.0)(jsdom@27.2.0)(sass@1.79.3)(terser@5.33.0))
       '@vue/test-utils':
         specifier: ^2.4.6
         version: 2.4.6
@@ -309,11 +312,11 @@ importers:
         specifier: ^7.0.0
         version: 7.0.4
       jsdom:
-        specifier: ^24.1.3
-        version: 24.1.3
+        specifier: ^27.2.0
+        version: 27.2.0
       lint-staged:
-        specifier: 14.0.1
-        version: 14.0.1(enquirer@2.4.1)
+        specifier: ^16.2.7
+        version: 16.2.7
       postcss:
         specifier: ^8.4.47
         version: 8.4.47
@@ -340,7 +343,7 @@ importers:
         version: 5.0.0(vite@5.4.21(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       vitest:
         specifier: 3.0.5
-        version: 3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0)
+        version: 3.0.5(@types/node@22.7.0)(jsdom@27.2.0)(sass@1.79.3)(terser@5.33.0)
 
 packages:
 
@@ -348,6 +351,9 @@ packages:
     resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
     engines: {node: '>=0.10.0'}
 
+  '@acemir/cssom@0.9.24':
+    resolution: {integrity: sha512-5YjgMmAiT2rjJZU7XK1SNI7iqTy92DpaYVgG6x63FxkJ11UpYfLndHJATtinWJClAXiOlW9XWaUyAQf8pMrQPg==}
+
   '@akryum/tinypool@0.3.1':
     resolution: {integrity: sha512-nznEC1ZA/m3hQDEnrGQ4c5gkaa9pcaVnw4LFJyzBAaR7E3nfiAPEHS3otnSafpZouVnoKeITl5D+2LsnwlnK8g==}
     engines: {node: '>=14.0.0'}
@@ -366,6 +372,15 @@ packages:
   '@antfu/utils@0.7.10':
     resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==}
 
+  '@asamuzakjp/css-color@4.1.0':
+    resolution: {integrity: sha512-9xiBAtLn4aNsa4mDnpovJvBn72tNEIACyvlqaNJ+ADemR+yeMJWnBudOi2qGDviJa7SwcDOU/TRh5dnET7qk0w==}
+
+  '@asamuzakjp/dom-selector@6.7.5':
+    resolution: {integrity: sha512-Eks6dY8zau4m4wNRQjRVaKQRTalNcPcBvU1ZQ35w5kKRk1gUeNCkVLsRiATurjASTp3TKM4H10wsI50nx3NZdw==}
+
+  '@asamuzakjp/nwsapi@2.3.9':
+    resolution: {integrity: sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==}
+
   '@babel/helper-string-parser@7.25.9':
     resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
     engines: {node: '>=6.9.0'}
@@ -406,8 +421,8 @@ packages:
   '@chatwoot/ninja-keys@1.2.3':
     resolution: {integrity: sha512-xM8d9P5ikDMZm2WbaCTk/TW5HFauylrU3cJ75fq5je6ixKwyhl/0kZbVN/vbbZN4+AUX/OaSIn6IJbtCgIF67g==}
 
-  '@chatwoot/prosemirror-schema@1.2.1':
-    resolution: {integrity: sha512-UbiEvG5tgi1d0lMbkaqxgTh7vHfywEYKLQo1sxqp4Q7aLZh4QFtbLzJ2zyBtu4Nhipe+guFfEJdic7i43MP/XQ==}
+  '@chatwoot/prosemirror-schema@1.2.3':
+    resolution: {integrity: sha512-q/EfirVK9jt8FJAx3Gf6y3LoVadmYVLknbYvPrkUe81WO0f2mkZ/kY2UQgpUISVvOGEkCH4bkfYMp5UQ+Buz3g==}
 
   '@chatwoot/utils@0.0.51':
     resolution: {integrity: sha512-WlEmWfOTzR7YZRUWzn5Wpm15/BRudpwqoNckph8TohyDbiim1CP4UZGa+qjajxTbNGLLhtKlm0Xl+X16+5Wceg==}
@@ -445,6 +460,10 @@ packages:
     resolution: {integrity: sha512-OWkqBa7PDzZuJ3Ha7T5bxdSVfSCfTq6K1mbAhbO1MD+GSULGjrp45i5RudyJOedstSarN/3mdwu9upJE7gDXfw==}
     engines: {node: ^14 || ^16 || >=18}
 
+  '@csstools/color-helpers@5.1.0':
+    resolution: {integrity: sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==}
+    engines: {node: '>=18'}
+
   '@csstools/css-calc@1.1.1':
     resolution: {integrity: sha512-Nh+iLCtjlooTzuR0lpmB8I6hPX/VupcGQ3Z1U2+wgJJ4fa8+cWkub+lCsbZcYPzBGsZLEL8fQAg+Na5dwEFJxg==}
     engines: {node: ^14 || ^16 || >=18}
@@ -452,6 +471,13 @@ packages:
       '@csstools/css-parser-algorithms': ^2.1.1
       '@csstools/css-tokenizer': ^2.1.1
 
+  '@csstools/css-calc@2.1.4':
+    resolution: {integrity: sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^3.0.5
+      '@csstools/css-tokenizer': ^3.0.4
+
   '@csstools/css-color-parser@1.2.1':
     resolution: {integrity: sha512-NcmaoJIEycIH0HnzZRrwRcBljPh1AWcXl4CNL8MAD3+Zy8XyIpdTtTMaY/phnLHHIYkyjaoSTdxAecss6+PCcg==}
     engines: {node: ^14 || ^16 || >=18}
@@ -459,16 +485,37 @@ packages:
       '@csstools/css-parser-algorithms': ^2.1.1
       '@csstools/css-tokenizer': ^2.1.1
 
+  '@csstools/css-color-parser@3.1.0':
+    resolution: {integrity: sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^3.0.5
+      '@csstools/css-tokenizer': ^3.0.4
+
   '@csstools/css-parser-algorithms@2.2.0':
     resolution: {integrity: sha512-9BoQ/jSrPq4vv3b9jjLW+PNNv56KlDH5JMx5yASSNrCtvq70FCNZUjXRvbCeR9hYj9ZyhURtqpU/RFIgg6kiOw==}
     engines: {node: ^14 || ^16 || >=18}
     peerDependencies:
       '@csstools/css-tokenizer': ^2.1.1
 
+  '@csstools/css-parser-algorithms@3.0.5':
+    resolution: {integrity: sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-tokenizer': ^3.0.4
+
+  '@csstools/css-syntax-patches-for-csstree@1.0.20':
+    resolution: {integrity: sha512-8BHsjXfSciZxjmHQOuVdW2b8WLUPts9a+mfL13/PzEviufUEW2xnvQuOlKs9dRBHgRqJ53SF/DUoK9+MZk72oQ==}
+    engines: {node: '>=18'}
+
   '@csstools/css-tokenizer@2.1.1':
     resolution: {integrity: sha512-GbrTj2Z8MCTUv+52GE0RbFGM527xuXZ0Xa5g0Z+YN573uveS4G0qi6WNOMyz3yrFM/jaILTTwJ0+umx81EzqfA==}
     engines: {node: ^14 || ^16 || >=18}
 
+  '@csstools/css-tokenizer@3.0.4':
+    resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
+    engines: {node: '>=18'}
+
   '@csstools/media-query-list-parser@2.1.1':
     resolution: {integrity: sha512-pUjtFbaKbiFNjJo8pprrIaXLvQvWIlwPiFnRI4sEnc4F0NIGTOsw8kaJSR3CmZAKEvV8QYckovgAnWQC0bgLLQ==}
     engines: {node: ^14 || ^16 || >=18}
@@ -1163,43 +1210,39 @@ packages:
   '@scmmishra/pico-search@0.5.4':
     resolution: {integrity: sha512-JdV8KumQ+pE5tqgQ71xUT9biE/qV//tx3NCqTLkW9Z4tsjKGN0B6kVowmtaZBAtErqir9XiMxsKXRTMF/MpUww==}
 
-  '@sentry-internal/browser-utils@8.31.0':
-    resolution: {integrity: sha512-Bq7TFMhPr1PixRGYkB/6ar9ws7sj224XzQ+hgpz6OxGEc9fQakvD8t/Nn7dp14k3FI/hcBRA6BBvpOKUUuPgGA==}
+  '@sentry-internal/browser-utils@8.55.0':
+    resolution: {integrity: sha512-ROgqtQfpH/82AQIpESPqPQe0UyWywKJsmVIqi3c5Fh+zkds5LUxnssTj3yNd1x+kxaPDVB023jAP+3ibNgeNDw==}
     engines: {node: '>=14.18'}
 
-  '@sentry-internal/feedback@8.31.0':
-    resolution: {integrity: sha512-R3LcC2IaTe8lgi5AU9h0rMgyVPpaTiMSLRhRlVeQPVmAKCz8pSG/um13q37t0BsXpTaImW9yYQ71Aj6h6IrShQ==}
+  '@sentry-internal/feedback@8.55.0':
+    resolution: {integrity: sha512-cP3BD/Q6pquVQ+YL+rwCnorKuTXiS9KXW8HNKu4nmmBAyf7urjs+F6Hr1k9MXP5yQ8W3yK7jRWd09Yu6DHWOiw==}
     engines: {node: '>=14.18'}
 
-  '@sentry-internal/replay-canvas@8.31.0':
-    resolution: {integrity: sha512-ConyrhWozx4HluRj0+9teN4XTC1ndXjxMdJQvDnbLFsQhCCEdwUfaZVshV1CFe9T08Bfyjruaw33yR7pDXYktw==}
+  '@sentry-internal/replay-canvas@8.55.0':
+    resolution: {integrity: sha512-nIkfgRWk1091zHdu4NbocQsxZF1rv1f7bbp3tTIlZYbrH62XVZosx5iHAuZG0Zc48AETLE7K4AX9VGjvQj8i9w==}
     engines: {node: '>=14.18'}
 
-  '@sentry-internal/replay@8.31.0':
-    resolution: {integrity: sha512-r8hmFDwWxeAxpdzBCRWTKQ/QHl8QanFw8XfM0fvFes/H1d/b43Vwc/IiUnsYoMOdooIP8hJFGDKlfq+Y5uVVGA==}
+  '@sentry-internal/replay@8.55.0':
+    resolution: {integrity: sha512-roCDEGkORwolxBn8xAKedybY+Jlefq3xYmgN2fr3BTnsXjSYOPC7D1/mYqINBat99nDtvgFvNfRcZPiwwZ1hSw==}
     engines: {node: '>=14.18'}
 
-  '@sentry/browser@8.31.0':
-    resolution: {integrity: sha512-LZK0uLPGB4Al+qWc1eaad+H/1SR6CY9a0V2XWpUbNAT3+VkEo0Z/78bW1kb43N0cok87hNPOe+c66SfwdxphVQ==}
+  '@sentry/browser@8.55.0':
+    resolution: {integrity: sha512-1A31mCEWCjaMxJt6qGUK+aDnLDcK6AwLAZnqpSchNysGni1pSn1RWSmk9TBF8qyTds5FH8B31H480uxMPUJ7Cw==}
     engines: {node: '>=14.18'}
 
-  '@sentry/core@8.31.0':
-    resolution: {integrity: sha512-5zsMBOML18e5a/ZoR5XpcYF59e2kSxb6lTg13u52f/+NA27EPgxKgXim5dz6L/6+0cizgwwmFaZFGJiFc2qoAA==}
+  '@sentry/core@8.55.0':
+    resolution: {integrity: sha512-6g7jpbefjHYs821Z+EBJ8r4Z7LT5h80YSWRJaylGS4nW5W5Z2KXzpdnyFarv37O7QjauzVC2E+PABmpkw5/JGA==}
     engines: {node: '>=14.18'}
 
-  '@sentry/types@8.31.0':
-    resolution: {integrity: sha512-prRM/n5nlP+xQZSpdEkSR8BwwZtgsLk0NbI8eCjTMu2isVlrlggop8pVaJb7y9HmElVtDA1Q6y4u8TD2htQKFQ==}
-    engines: {node: '>=14.18'}
-
-  '@sentry/utils@8.31.0':
-    resolution: {integrity: sha512-9W2LZ9QIHKc0HSyH/7UmTolc01Q4vX/qMSZk7i1noinlkQtnRUmTP39r1DSITjKCrDHj6zvB/J1RPDUoRcTXxQ==}
-    engines: {node: '>=14.18'}
-
-  '@sentry/vue@8.31.0':
-    resolution: {integrity: sha512-w512J2XLs43OZ7KBcdy4ho+IWMf37TQDJ5+JBONC+OLmGo7rixAZZxwIA7nI1/kZsBYEZ6JZL1uPCMrwwe/BsQ==}
+  '@sentry/vue@8.55.0':
+    resolution: {integrity: sha512-J6lcpzL39snV/spoGpwyk5Rp1wSFxOV4qV1NhQ9OlLHORVBp/Xpw7cEA0oKqG2w1wVtCV+gC5Jjf9HTmYiHQOQ==}
     engines: {node: '>=14.18'}
     peerDependencies:
+      pinia: 2.x || 3.x
       vue: 2.x || 3.x
+    peerDependenciesMeta:
+      pinia:
+        optional: true
 
   '@sindresorhus/slugify@2.2.1':
     resolution: {integrity: sha512-MkngSCRZ8JdSOCHRaYd+D01XhvU3Hjy6MGl06zhOk614hp9EOAp5gIkBeQg7wtmxpitU6eAL4kdiRMcJa2dlrw==}
@@ -1371,6 +1414,15 @@ packages:
   '@vue/devtools-api@6.6.4':
     resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
 
+  '@vue/devtools-api@7.7.8':
+    resolution: {integrity: sha512-BtFcAmDbtXGwurWUFf8ogIbgZyR+rcVES1TSNEI8Em80fD8Anu+qTRN1Fc3J6vdRHlVM3fzPV1qIo+B4AiqGzw==}
+
+  '@vue/devtools-kit@7.7.8':
+    resolution: {integrity: sha512-4Y8op+AoxOJhB9fpcEF6d5vcJXWKgHxC3B0ytUB8zz15KbP9g9WgVzral05xluxi2fOeAy6t140rdQ943GcLRQ==}
+
+  '@vue/devtools-shared@7.7.8':
+    resolution: {integrity: sha512-XHpO3jC5nOgYr40M9p8Z4mmKfTvUxKyRcUnpBAYg11pE78eaRFBKb0kG5yKLroMuJeeNH9LWmKp2zMU5LUc7CA==}
+
   '@vue/reactivity@3.5.12':
     resolution: {integrity: sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==}
 
@@ -1496,8 +1548,8 @@ packages:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
 
-  agent-base@7.1.1:
-    resolution: {integrity: sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==}
+  agent-base@7.1.4:
+    resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
     engines: {node: '>= 14'}
 
   ajv@6.12.6:
@@ -1517,6 +1569,10 @@ packages:
     resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==}
     engines: {node: '>=12'}
 
+  ansi-escapes@7.2.0:
+    resolution: {integrity: sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==}
+    engines: {node: '>=18'}
+
   ansi-regex@5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
@@ -1610,12 +1666,15 @@ packages:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
 
-  axios@1.8.2:
-    resolution: {integrity: sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==}
+  axios@1.13.2:
+    resolution: {integrity: sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==}
 
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
+  bidi-js@1.0.3:
+    resolution: {integrity: sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==}
+
   binary-extensions@2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
@@ -1623,6 +1682,9 @@ packages:
   birpc@0.1.1:
     resolution: {integrity: sha512-B64AGL4ug2IS2jvV/zjTYDD1L+2gOJTT7Rv+VaK7KVQtQOo/xZbCDsh7g727ipckmU+QJYRqo5RcifVr0Kgcmg==}
 
+  birpc@2.8.0:
+    resolution: {integrity: sha512-Bz2a4qD/5GRhiHSwj30c/8kC8QGj12nNDwz3D4ErQ4Xhy35dsSDvF+RA/tWpjyU0pdGtSDiEk6B5fBGE1qNVhw==}
+
   boolbase@1.0.0:
     resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
 
@@ -1743,10 +1805,6 @@ packages:
     resolution: {integrity: sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==}
     engines: {node: '>=10'}
 
-  cli-cursor@4.0.0:
-    resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
   cli-cursor@5.0.0:
     resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
     engines: {node: '>=18'}
@@ -1755,9 +1813,9 @@ packages:
     resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
     engines: {node: '>=6'}
 
-  cli-truncate@3.1.0:
-    resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  cli-truncate@5.1.1:
+    resolution: {integrity: sha512-SroPvNHxUnk+vIW/dOSfNqdy1sPEFkrTk6TUtqLCnBlo3N7TNYYkzzN7uSD6+jVjrdO4+p8nH7JzH6cIvUem6A==}
+    engines: {node: '>=20'}
 
   cliui@6.0.0:
     resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
@@ -1790,9 +1848,9 @@ packages:
     resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
     engines: {node: '>=14'}
 
-  commander@11.0.0:
-    resolution: {integrity: sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==}
-    engines: {node: '>=16'}
+  commander@14.0.2:
+    resolution: {integrity: sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==}
+    engines: {node: '>=20'}
 
   commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
@@ -1827,6 +1885,10 @@ packages:
   constant-case@3.0.4:
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
 
+  copy-anything@4.0.5:
+    resolution: {integrity: sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==}
+    engines: {node: '>=18'}
+
   core-js@3.38.1:
     resolution: {integrity: sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==}
 
@@ -1862,6 +1924,10 @@ packages:
     peerDependencies:
       postcss: ^8.4
 
+  css-tree@3.1.0:
+    resolution: {integrity: sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
   cssdb@7.6.0:
     resolution: {integrity: sha512-Nna7rph8V0jC6+JBY4Vk4ndErUmfJfV6NJCaZdurL0omggabiy+QB2HCQtu5c/ACLZ0I7REv7A4QyPIoYzZx0w==}
 
@@ -1880,9 +1946,9 @@ packages:
     resolution: {integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==}
     engines: {node: '>=8'}
 
-  cssstyle@4.0.1:
-    resolution: {integrity: sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==}
-    engines: {node: '>=18'}
+  cssstyle@5.3.3:
+    resolution: {integrity: sha512-OytmFH+13/QXONJcC75QNdMtKpceNk3u8ThBjyyYjkEcy/ekBwR1mMAuNvi3gdBPW3N5TlCzQ0WZw8H0lN/bDw==}
+    engines: {node: '>=20'}
 
   csstype@3.1.3:
     resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
@@ -1891,9 +1957,9 @@ packages:
     resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==}
     engines: {node: '>=12'}
 
-  data-urls@5.0.0:
-    resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==}
-    engines: {node: '>=18'}
+  data-urls@6.0.0:
+    resolution: {integrity: sha512-BnBS08aLUM+DKamupXs3w2tJJoqU+AkaE/+6vQxi/G/DPmIZFJJp9Dkb1kM03AZx8ADehDUZgsNxju3mPXZYIA==}
+    engines: {node: '>=20'}
 
   data-view-buffer@1.0.1:
     resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
@@ -1939,15 +2005,6 @@ packages:
       supports-color:
         optional: true
 
-  debug@4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
   debug@4.3.5:
     resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==}
     engines: {node: '>=6.0'}
@@ -1966,6 +2023,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
@@ -1973,6 +2039,9 @@ packages:
   decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
 
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
+
   deep-eql@5.0.2:
     resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
     engines: {node: '>=6'}
@@ -2103,6 +2172,14 @@ packages:
     resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
     engines: {node: '>=0.12'}
 
+  entities@6.0.1:
+    resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
+    engines: {node: '>=0.12'}
+
+  environment@1.1.0:
+    resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==}
+    engines: {node: '>=18'}
+
   es-abstract@1.22.2:
     resolution: {integrity: sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==}
     engines: {node: '>= 0.4'}
@@ -2111,10 +2188,6 @@ packages:
     resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
     engines: {node: '>= 0.4'}
 
-  es-define-property@1.0.0:
-    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
-    engines: {node: '>= 0.4'}
-
   es-define-property@1.0.1:
     resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
     engines: {node: '>= 0.4'}
@@ -2313,10 +2386,6 @@ packages:
   eventemitter3@5.0.1:
     resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
 
-  execa@7.2.0:
-    resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==}
-    engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0}
-
   expect-type@1.1.0:
     resolution: {integrity: sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==}
     engines: {node: '>=12.0.0'}
@@ -2404,8 +2473,8 @@ packages:
       '@nuxt/kit':
         optional: true
 
-  follow-redirects@1.15.9:
-    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
+  follow-redirects@1.15.11:
+    resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==}
     engines: {node: '>=4.0'}
     peerDependencies:
       debug: '*'
@@ -2420,12 +2489,8 @@ packages:
     resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
     engines: {node: '>=14'}
 
-  form-data@4.0.0:
-    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
-    engines: {node: '>= 6'}
-
-  form-data@4.0.2:
-    resolution: {integrity: sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==}
+  form-data@4.0.5:
+    resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==}
     engines: {node: '>= 6'}
 
   fraction.js@4.3.7:
@@ -2461,6 +2526,10 @@ packages:
     resolution: {integrity: sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==}
     engines: {node: '>=18'}
 
+  get-east-asian-width@1.4.0:
+    resolution: {integrity: sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==}
+    engines: {node: '>=18'}
+
   get-intrinsic@1.2.4:
     resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
     engines: {node: '>= 0.4'}
@@ -2473,10 +2542,6 @@ packages:
     resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
     engines: {node: '>= 0.4'}
 
-  get-stream@6.0.1:
-    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
-    engines: {node: '>=10'}
-
   get-symbol-description@1.0.0:
     resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
     engines: {node: '>= 0.4'}
@@ -2536,9 +2601,6 @@ packages:
     resolution: {integrity: sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  gopd@1.0.1:
-    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
-
   gopd@1.2.0:
     resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
     engines: {node: '>= 0.4'}
@@ -2607,6 +2669,9 @@ packages:
     peerDependencies:
       vite: 5.4.21
 
+  hookable@5.5.3:
+    resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==}
+
   hotkeys-js@3.8.7:
     resolution: {integrity: sha512-ckAx3EkUr5XjDwjEHDorHxRO2Kb7z6Z2Sxul4MbBkN8Nho7XDslQsgMJT+CiJ5Z4TgRxxvKHEpuLE3imzqy4Lg==}
 
@@ -2636,14 +2701,10 @@ packages:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
 
-  https-proxy-agent@7.0.5:
-    resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==}
+  https-proxy-agent@7.0.6:
+    resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
     engines: {node: '>= 14'}
 
-  human-signals@4.3.1:
-    resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==}
-    engines: {node: '>=14.18.0'}
-
   husky@7.0.4:
     resolution: {integrity: sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==}
     engines: {node: '>=12'}
@@ -2749,9 +2810,9 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
-  is-fullwidth-code-point@4.0.0:
-    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
-    engines: {node: '>=12'}
+  is-fullwidth-code-point@5.1.0:
+    resolution: {integrity: sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==}
+    engines: {node: '>=18'}
 
   is-function@1.0.2:
     resolution: {integrity: sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==}
@@ -2809,10 +2870,6 @@ packages:
     resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
     engines: {node: '>= 0.4'}
 
-  is-stream@3.0.0:
-    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
   is-string@1.0.7:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
     engines: {node: '>= 0.4'}
@@ -2840,6 +2897,10 @@ packages:
   is-weakref@1.0.2:
     resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
 
+  is-what@5.5.0:
+    resolution: {integrity: sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==}
+    engines: {node: '>=18'}
+
   isarray@2.0.5:
     resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
 
@@ -2895,11 +2956,11 @@ packages:
       canvas:
         optional: true
 
-  jsdom@24.1.3:
-    resolution: {integrity: sha512-MyL55p3Ut3cXbeBEG7Hcv0mVM8pp8PBNWxRqchZnSfAiES1v1mRnMeFfaHWIPULpwsYfvO+ZmMZz5tGCnjzDUQ==}
-    engines: {node: '>=18'}
+  jsdom@27.2.0:
+    resolution: {integrity: sha512-454TI39PeRDW1LgpyLPyURtB4Zx1tklSr6+OFOipsxGUH1WMTvk6C65JQdrj455+DP2uJ1+veBEHTGFKWVLFoA==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
     peerDependencies:
-      canvas: ^2.11.2
+      canvas: ^3.0.0
     peerDependenciesMeta:
       canvas:
         optional: true
@@ -2981,19 +3042,14 @@ packages:
   linkify-it@5.0.0:
     resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==}
 
-  lint-staged@14.0.1:
-    resolution: {integrity: sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==}
-    engines: {node: ^16.14.0 || >=18.0.0}
+  lint-staged@16.2.7:
+    resolution: {integrity: sha512-lDIj4RnYmK7/kXMya+qJsmkRFkGolciXjrsZ6PC25GdTfWOAWetR0ZbsNXRAj1EHHImRSalc+whZFg56F5DVow==}
+    engines: {node: '>=20.17'}
     hasBin: true
 
-  listr2@6.6.1:
-    resolution: {integrity: sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      enquirer: '>= 2.3.0 < 3'
-    peerDependenciesMeta:
-      enquirer:
-        optional: true
+  listr2@9.0.5:
+    resolution: {integrity: sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==}
+    engines: {node: '>=20.0.0'}
 
   lit-element@3.3.3:
     resolution: {integrity: sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA==}
@@ -3039,9 +3095,9 @@ packages:
     resolution: {integrity: sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==}
     engines: {node: '>=18'}
 
-  log-update@5.0.1:
-    resolution: {integrity: sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  log-update@6.1.0:
+    resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==}
+    engines: {node: '>=18'}
 
   loupe@3.1.3:
     resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==}
@@ -3052,6 +3108,10 @@ packages:
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
+  lru-cache@11.2.4:
+    resolution: {integrity: sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==}
+    engines: {node: 20 || >=22}
+
   lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
@@ -3120,23 +3180,19 @@ packages:
   md5@2.3.0:
     resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
 
+  mdn-data@2.12.2:
+    resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
+
   mdurl@1.0.1:
     resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==}
 
   mdurl@2.0.0:
     resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==}
 
-  merge-stream@2.0.0:
-    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
-
   merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
 
-  micromatch@4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
-    engines: {node: '>=8.6'}
-
   micromatch@4.0.8:
     resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
     engines: {node: '>=8.6'}
@@ -3149,14 +3205,6 @@ packages:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
 
-  mimic-fn@2.1.0:
-    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: '>=6'}
-
-  mimic-fn@4.0.0:
-    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
-    engines: {node: '>=12'}
-
   mimic-function@5.0.1:
     resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
     engines: {node: '>=18'}
@@ -3224,6 +3272,10 @@ packages:
   mz@2.7.0:
     resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
 
+  nano-spawn@2.0.0:
+    resolution: {integrity: sha512-tacvGzUY5o2D8CBh2rrwxyNojUsZNU2zjNTzKQrkgGJQTbGAfArVWXSKMBokBeeg6C7OLRGUEyoFlYbfeWQIqw==}
+    engines: {node: '>=20.17'}
+
   nanoid@3.3.11:
     resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -3262,10 +3314,6 @@ packages:
     resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
     engines: {node: '>=0.10.0'}
 
-  npm-run-path@5.1.0:
-    resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
@@ -3322,14 +3370,6 @@ packages:
   once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
-  onetime@5.1.2:
-    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
-    engines: {node: '>=6'}
-
-  onetime@6.0.0:
-    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
-    engines: {node: '>=12'}
-
   onetime@7.0.0:
     resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
     engines: {node: '>=18'}
@@ -3392,6 +3432,9 @@ packages:
   parse5@7.1.2:
     resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
 
+  parse5@8.0.0:
+    resolution: {integrity: sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==}
+
   parseurl@1.3.3:
     resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
     engines: {node: '>= 0.8'}
@@ -3418,10 +3461,6 @@ packages:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
 
-  path-key@4.0.0:
-    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
-    engines: {node: '>=12'}
-
   path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
@@ -3443,6 +3482,9 @@ packages:
     resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==}
     engines: {node: '>= 14.16'}
 
+  perfect-debounce@1.0.0:
+    resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
+
   picocolors@1.0.1:
     resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
 
@@ -3465,6 +3507,15 @@ packages:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
     engines: {node: '>=0.10.0'}
 
+  pinia@3.0.4:
+    resolution: {integrity: sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==}
+    peerDependencies:
+      typescript: '>=4.5.0'
+      vue: ^3.5.11
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
   pirates@4.0.6:
     resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
     engines: {node: '>= 6'}
@@ -3857,10 +3908,6 @@ packages:
     resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
     hasBin: true
 
-  restore-cursor@4.0.0:
-    resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
   restore-cursor@5.1.0:
     resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}
     engines: {node: '>=18'}
@@ -3869,8 +3916,8 @@ packages:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  rfdc@1.3.0:
-    resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
+  rfdc@1.4.1:
+    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
 
   rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
@@ -3885,12 +3932,6 @@ packages:
   rope-sequence@1.3.2:
     resolution: {integrity: sha512-ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg==}
 
-  rrweb-cssom@0.6.0:
-    resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==}
-
-  rrweb-cssom@0.7.1:
-    resolution: {integrity: sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==}
-
   run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
 
@@ -3988,9 +4029,6 @@ packages:
   siginfo@2.0.0:
     resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
 
-  signal-exit@3.0.7:
-    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
-
   signal-exit@4.1.0:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
@@ -4016,9 +4054,9 @@ packages:
     resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
     engines: {node: '>=10'}
 
-  slice-ansi@5.0.0:
-    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
-    engines: {node: '>=12'}
+  slice-ansi@7.1.2:
+    resolution: {integrity: sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==}
+    engines: {node: '>=18'}
 
   snake-case@3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
@@ -4044,6 +4082,10 @@ packages:
   spark-md5@3.0.2:
     resolution: {integrity: sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==}
 
+  speakingurl@14.0.1:
+    resolution: {integrity: sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==}
+    engines: {node: '>=0.10.0'}
+
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
@@ -4077,6 +4119,10 @@ packages:
     resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
     engines: {node: '>=18'}
 
+  string-width@8.1.0:
+    resolution: {integrity: sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==}
+    engines: {node: '>=20'}
+
   string.prototype.trim@1.2.8:
     resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==}
     engines: {node: '>= 0.4'}
@@ -4114,10 +4160,6 @@ packages:
     resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
     engines: {node: '>=4'}
 
-  strip-final-newline@3.0.0:
-    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
-    engines: {node: '>=12'}
-
   strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
@@ -4130,6 +4172,10 @@ packages:
     engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
 
+  superjson@2.2.5:
+    resolution: {integrity: sha512-zWPTX96LVsA/eVYnqOM2+ofcdPqdS1dAF1LN4TS2/MWuUpfitd9ctTa87wt4xrYnZnkLtS69xpBdSxVBP5Rm6w==}
+    engines: {node: '>=16'}
+
   supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
     engines: {node: '>=8'}
@@ -4205,6 +4251,13 @@ packages:
     resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
     engines: {node: '>=14.0.0'}
 
+  tldts-core@7.0.19:
+    resolution: {integrity: sha512-lJX2dEWx0SGH4O6p+7FPwYmJ/bu1JbcGJ8RLaG9b7liIgZ85itUVEPbMtWRVrde/0fnDPEPHW10ZsKW3kVsE9A==}
+
+  tldts@7.0.19:
+    resolution: {integrity: sha512-8PWx8tvC4jDB39BQw1m4x8y5MH1BcQ5xHeL2n7UVFulMPH/3Q0uiamahFJ3lXA0zO2SUyRXuVVbWSDmstlt9YA==}
+    hasBin: true
+
   to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
@@ -4217,13 +4270,17 @@ packages:
     resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==}
     engines: {node: '>=6'}
 
+  tough-cookie@6.0.0:
+    resolution: {integrity: sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w==}
+    engines: {node: '>=16'}
+
   tr46@3.0.0:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
 
-  tr46@5.0.0:
-    resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==}
-    engines: {node: '>=18'}
+  tr46@6.0.0:
+    resolution: {integrity: sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==}
+    engines: {node: '>=20'}
 
   ts-interface-checker@0.1.13:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
@@ -4568,6 +4625,10 @@ packages:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
     engines: {node: '>=12'}
 
+  webidl-conversions@8.0.0:
+    resolution: {integrity: sha512-n4W4YFyz5JzOfQeA8oN7dUYpR+MBP3PIUsn2jLjWXwK5ASUzt0Jc/A5sAUZoCYFJRGF0FBKJ+1JjN43rNdsQzA==}
+    engines: {node: '>=20'}
+
   webrtc-adapter@9.0.1:
     resolution: {integrity: sha512-1AQO+d4ElfVSXyzNVTOewgGT/tAomwwztX/6e3totvyyzXPvXIIuUUjAmyZGbKBKbZOXauuJooZm3g6IuFuiNQ==}
     engines: {node: '>=6.0.0', npm: '>=3.10.0'}
@@ -4592,9 +4653,9 @@ packages:
     resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==}
     engines: {node: '>=12'}
 
-  whatwg-url@14.0.0:
-    resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==}
-    engines: {node: '>=18'}
+  whatwg-url@15.1.0:
+    resolution: {integrity: sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==}
+    engines: {node: '>=20'}
 
   which-boxed-primitive@1.0.2:
     resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
@@ -4655,6 +4716,18 @@ packages:
       utf-8-validate:
         optional: true
 
+  ws@8.18.3:
+    resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
   xml-name-validator@4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
     engines: {node: '>=12'}
@@ -4680,15 +4753,16 @@ packages:
     resolution: {integrity: sha512-4wZWvE398hCP7O8n3nXKu/vdq1HcH01ixYlCREaJL5NUMwQ0g3MaGFUBNSlmBtKmhbtVG/Cm6lyYmSVTEVil8A==}
     engines: {node: ^14.17.0 || >=16.0.0}
 
-  yaml@2.3.1:
-    resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==}
-    engines: {node: '>= 14'}
-
   yaml@2.5.1:
     resolution: {integrity: sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==}
     engines: {node: '>= 14'}
     hasBin: true
 
+  yaml@2.8.2:
+    resolution: {integrity: sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==}
+    engines: {node: '>= 14.6'}
+    hasBin: true
+
   yargs-parser@18.1.3:
     resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
     engines: {node: '>=6'}
@@ -4717,6 +4791,8 @@ snapshots:
 
   '@aashutoshrathi/word-wrap@1.2.6': {}
 
+  '@acemir/cssom@0.9.24': {}
+
   '@akryum/tinypool@0.3.1': {}
 
   '@alloc/quick-lru@5.2.0': {}
@@ -4733,6 +4809,24 @@ snapshots:
 
   '@antfu/utils@0.7.10': {}
 
+  '@asamuzakjp/css-color@4.1.0':
+    dependencies:
+      '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+      lru-cache: 11.2.4
+
+  '@asamuzakjp/dom-selector@6.7.5':
+    dependencies:
+      '@asamuzakjp/nwsapi': 2.3.9
+      bidi-js: 1.0.3
+      css-tree: 3.1.0
+      is-potential-custom-element-name: 1.0.1
+      lru-cache: 11.2.4
+
+  '@asamuzakjp/nwsapi@2.3.9': {}
+
   '@babel/helper-string-parser@7.25.9': {}
 
   '@babel/helper-validator-identifier@7.25.9': {}
@@ -4768,7 +4862,7 @@ snapshots:
       hotkeys-js: 3.8.7
       lit: 2.2.6
 
-  '@chatwoot/prosemirror-schema@1.2.1':
+  '@chatwoot/prosemirror-schema@1.2.3':
     dependencies:
       markdown-it-sup: 2.0.0
       prosemirror-commands: 1.6.0
@@ -4839,11 +4933,18 @@ snapshots:
 
   '@csstools/color-helpers@2.1.0': {}
 
+  '@csstools/color-helpers@5.1.0': {}
+
   '@csstools/css-calc@1.1.1(@csstools/css-parser-algorithms@2.2.0(@csstools/css-tokenizer@2.1.1))(@csstools/css-tokenizer@2.1.1)':
     dependencies:
       '@csstools/css-parser-algorithms': 2.2.0(@csstools/css-tokenizer@2.1.1)
       '@csstools/css-tokenizer': 2.1.1
 
+  '@csstools/css-calc@2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
+    dependencies:
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+
   '@csstools/css-color-parser@1.2.1(@csstools/css-parser-algorithms@2.2.0(@csstools/css-tokenizer@2.1.1))(@csstools/css-tokenizer@2.1.1)':
     dependencies:
       '@csstools/color-helpers': 2.1.0
@@ -4851,12 +4952,27 @@ snapshots:
       '@csstools/css-parser-algorithms': 2.2.0(@csstools/css-tokenizer@2.1.1)
       '@csstools/css-tokenizer': 2.1.1
 
+  '@csstools/css-color-parser@3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
+    dependencies:
+      '@csstools/color-helpers': 5.1.0
+      '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+
   '@csstools/css-parser-algorithms@2.2.0(@csstools/css-tokenizer@2.1.1)':
     dependencies:
       '@csstools/css-tokenizer': 2.1.1
 
+  '@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4)':
+    dependencies:
+      '@csstools/css-tokenizer': 3.0.4
+
+  '@csstools/css-syntax-patches-for-csstree@1.0.20': {}
+
   '@csstools/css-tokenizer@2.1.1': {}
 
+  '@csstools/css-tokenizer@3.0.4': {}
+
   '@csstools/media-query-list-parser@2.1.1(@csstools/css-parser-algorithms@2.2.0(@csstools/css-tokenizer@2.1.1))(@csstools/css-tokenizer@2.1.1)':
     dependencies:
       '@csstools/css-parser-algorithms': 2.2.0(@csstools/css-tokenizer@2.1.1)
@@ -5541,60 +5657,41 @@ snapshots:
 
   '@scmmishra/pico-search@0.5.4': {}
 
-  '@sentry-internal/browser-utils@8.31.0':
+  '@sentry-internal/browser-utils@8.55.0':
     dependencies:
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry/core': 8.55.0
 
-  '@sentry-internal/feedback@8.31.0':
+  '@sentry-internal/feedback@8.55.0':
     dependencies:
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry/core': 8.55.0
 
-  '@sentry-internal/replay-canvas@8.31.0':
+  '@sentry-internal/replay-canvas@8.55.0':
     dependencies:
-      '@sentry-internal/replay': 8.31.0
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry-internal/replay': 8.55.0
+      '@sentry/core': 8.55.0
 
-  '@sentry-internal/replay@8.31.0':
+  '@sentry-internal/replay@8.55.0':
     dependencies:
-      '@sentry-internal/browser-utils': 8.31.0
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry-internal/browser-utils': 8.55.0
+      '@sentry/core': 8.55.0
 
-  '@sentry/browser@8.31.0':
+  '@sentry/browser@8.55.0':
     dependencies:
-      '@sentry-internal/browser-utils': 8.31.0
-      '@sentry-internal/feedback': 8.31.0
-      '@sentry-internal/replay': 8.31.0
-      '@sentry-internal/replay-canvas': 8.31.0
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry-internal/browser-utils': 8.55.0
+      '@sentry-internal/feedback': 8.55.0
+      '@sentry-internal/replay': 8.55.0
+      '@sentry-internal/replay-canvas': 8.55.0
+      '@sentry/core': 8.55.0
 
-  '@sentry/core@8.31.0':
+  '@sentry/core@8.55.0': {}
+
+  '@sentry/vue@8.55.0(pinia@3.0.4(typescript@5.6.2)(vue@3.5.12(typescript@5.6.2)))(vue@3.5.12(typescript@5.6.2))':
     dependencies:
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
-
-  '@sentry/types@8.31.0': {}
-
-  '@sentry/utils@8.31.0':
-    dependencies:
-      '@sentry/types': 8.31.0
-
-  '@sentry/vue@8.31.0(vue@3.5.12(typescript@5.6.2))':
-    dependencies:
-      '@sentry/browser': 8.31.0
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry/browser': 8.55.0
+      '@sentry/core': 8.55.0
       vue: 3.5.12(typescript@5.6.2)
+    optionalDependencies:
+      pinia: 3.0.4(typescript@5.6.2)(vue@3.5.12(typescript@5.6.2))
 
   '@sindresorhus/slugify@2.2.1':
     dependencies:
@@ -5690,7 +5787,7 @@ snapshots:
       vite: 5.4.21(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
       vue: 3.5.12(typescript@5.6.2)
 
-  '@vitest/coverage-v8@3.0.5(vitest@3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0))':
+  '@vitest/coverage-v8@3.0.5(vitest@3.0.5(@types/node@22.7.0)(jsdom@27.2.0)(sass@1.79.3)(terser@5.33.0))':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 1.0.2
@@ -5704,7 +5801,7 @@ snapshots:
       std-env: 3.8.0
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0)
+      vitest: 3.0.5(@types/node@22.7.0)(jsdom@27.2.0)(sass@1.79.3)(terser@5.33.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -5842,6 +5939,24 @@ snapshots:
 
   '@vue/devtools-api@6.6.4': {}
 
+  '@vue/devtools-api@7.7.8':
+    dependencies:
+      '@vue/devtools-kit': 7.7.8
+
+  '@vue/devtools-kit@7.7.8':
+    dependencies:
+      '@vue/devtools-shared': 7.7.8
+      birpc: 2.8.0
+      hookable: 5.5.3
+      mitt: 3.0.1
+      perfect-debounce: 1.0.0
+      speakingurl: 14.0.1
+      superjson: 2.2.5
+
+  '@vue/devtools-shared@7.7.8':
+    dependencies:
+      rfdc: 1.4.1
+
   '@vue/reactivity@3.5.12':
     dependencies:
       '@vue/shared': 3.5.12
@@ -5981,11 +6096,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  agent-base@7.1.1:
-    dependencies:
-      debug: 4.4.0
-    transitivePeerDependencies:
-      - supports-color
+  agent-base@7.1.4: {}
 
   ajv@6.12.6:
     dependencies:
@@ -6011,6 +6122,10 @@ snapshots:
     dependencies:
       type-fest: 1.4.0
 
+  ansi-escapes@7.2.0:
+    dependencies:
+      environment: 1.1.0
+
   ansi-regex@5.0.1: {}
 
   ansi-regex@6.0.1: {}
@@ -6086,7 +6201,7 @@ snapshots:
       call-bind: 1.0.2
       define-properties: 1.2.0
       es-abstract: 1.22.2
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.3.0
       is-array-buffer: 3.0.2
       is-shared-array-buffer: 1.0.2
 
@@ -6123,20 +6238,26 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.0.0
 
-  axios@1.8.2:
+  axios@1.13.2:
     dependencies:
-      follow-redirects: 1.15.9
-      form-data: 4.0.2
+      follow-redirects: 1.15.11
+      form-data: 4.0.5
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
 
   balanced-match@1.0.2: {}
 
+  bidi-js@1.0.3:
+    dependencies:
+      require-from-string: 2.0.2
+
   binary-extensions@2.2.0: {}
 
   birpc@0.1.1: {}
 
+  birpc@2.8.0: {}
+
   boolbase@1.0.0: {}
 
   boxen@8.0.1:
@@ -6192,11 +6313,11 @@ snapshots:
   call-bind@1.0.2:
     dependencies:
       function-bind: 1.1.2
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.3.0
 
   call-bind@1.0.7:
     dependencies:
-      es-define-property: 1.0.0
+      es-define-property: 1.0.1
       es-errors: 1.3.0
       function-bind: 1.1.2
       get-intrinsic: 1.2.4
@@ -6299,20 +6420,16 @@ snapshots:
 
   cli-boxes@3.0.0: {}
 
-  cli-cursor@4.0.0:
-    dependencies:
-      restore-cursor: 4.0.0
-
   cli-cursor@5.0.0:
     dependencies:
       restore-cursor: 5.1.0
 
   cli-spinners@2.9.2: {}
 
-  cli-truncate@3.1.0:
+  cli-truncate@5.1.1:
     dependencies:
-      slice-ansi: 5.0.0
-      string-width: 5.1.2
+      slice-ansi: 7.1.2
+      string-width: 8.1.0
 
   cliui@6.0.0:
     dependencies:
@@ -6344,7 +6461,7 @@ snapshots:
 
   commander@10.0.1: {}
 
-  commander@11.0.0: {}
+  commander@14.0.2: {}
 
   commander@2.20.3:
     optional: true
@@ -6383,6 +6500,10 @@ snapshots:
       tslib: 2.8.1
       upper-case: 2.0.2
 
+  copy-anything@4.0.5:
+    dependencies:
+      is-what: 5.5.0
+
   core-js@3.38.1: {}
 
   countries-and-timezones@3.6.0: {}
@@ -6413,6 +6534,11 @@ snapshots:
     dependencies:
       postcss: 8.4.47
 
+  css-tree@3.1.0:
+    dependencies:
+      mdn-data: 2.12.2
+      source-map-js: 1.2.1
+
   cssdb@7.6.0: {}
 
   cssesc@3.0.0: {}
@@ -6425,9 +6551,11 @@ snapshots:
     dependencies:
       cssom: 0.3.8
 
-  cssstyle@4.0.1:
+  cssstyle@5.3.3:
     dependencies:
-      rrweb-cssom: 0.6.0
+      '@asamuzakjp/css-color': 4.1.0
+      '@csstools/css-syntax-patches-for-csstree': 1.0.20
+      css-tree: 3.1.0
 
   csstype@3.1.3: {}
 
@@ -6437,10 +6565,10 @@ snapshots:
       whatwg-mimetype: 3.0.0
       whatwg-url: 11.0.0
 
-  data-urls@5.0.0:
+  data-urls@6.0.0:
     dependencies:
       whatwg-mimetype: 4.0.0
-      whatwg-url: 14.0.0
+      whatwg-url: 15.1.0
 
   data-view-buffer@1.0.1:
     dependencies:
@@ -6480,10 +6608,6 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
-  debug@4.3.4:
-    dependencies:
-      ms: 2.1.2
-
   debug@4.3.5:
     dependencies:
       ms: 2.1.2
@@ -6492,19 +6616,25 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  debug@4.4.3:
+    dependencies:
+      ms: 2.1.3
+
   decamelize@1.2.0: {}
 
   decimal.js@10.4.3: {}
 
+  decimal.js@10.6.0: {}
+
   deep-eql@5.0.2: {}
 
   deep-is@0.1.4: {}
 
   define-data-property@1.1.4:
     dependencies:
-      es-define-property: 1.0.0
+      es-define-property: 1.0.1
       es-errors: 1.3.0
-      gopd: 1.0.1
+      gopd: 1.2.0
 
   define-properties@1.2.0:
     dependencies:
@@ -6616,6 +6746,10 @@ snapshots:
 
   entities@4.5.0: {}
 
+  entities@6.0.1: {}
+
+  environment@1.1.0: {}
+
   es-abstract@1.22.2:
     dependencies:
       array-buffer-byte-length: 1.0.0
@@ -6625,14 +6759,14 @@ snapshots:
       es-set-tostringtag: 2.1.0
       es-to-primitive: 1.2.1
       function.prototype.name: 1.1.6
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.3.0
       get-symbol-description: 1.0.0
       globalthis: 1.0.3
-      gopd: 1.0.1
+      gopd: 1.2.0
       has: 1.0.3
       has-property-descriptors: 1.0.2
       has-proto: 1.0.1
-      has-symbols: 1.0.3
+      has-symbols: 1.1.0
       internal-slot: 1.0.5
       is-array-buffer: 3.0.2
       is-callable: 1.2.7
@@ -6667,7 +6801,7 @@ snapshots:
       data-view-buffer: 1.0.1
       data-view-byte-length: 1.0.1
       data-view-byte-offset: 1.0.0
-      es-define-property: 1.0.0
+      es-define-property: 1.0.1
       es-errors: 1.3.0
       es-object-atoms: 1.0.0
       es-set-tostringtag: 2.1.0
@@ -6676,10 +6810,10 @@ snapshots:
       get-intrinsic: 1.2.4
       get-symbol-description: 1.0.2
       globalthis: 1.0.4
-      gopd: 1.0.1
+      gopd: 1.2.0
       has-property-descriptors: 1.0.2
       has-proto: 1.0.3
-      has-symbols: 1.0.3
+      has-symbols: 1.1.0
       hasown: 2.0.2
       internal-slot: 1.0.7
       is-array-buffer: 3.0.4
@@ -6707,10 +6841,6 @@ snapshots:
       unbox-primitive: 1.0.2
       which-typed-array: 1.1.15
 
-  es-define-property@1.0.0:
-    dependencies:
-      get-intrinsic: 1.2.4
-
   es-define-property@1.0.1: {}
 
   es-errors@1.3.0: {}
@@ -6975,18 +7105,6 @@ snapshots:
 
   eventemitter3@5.0.1: {}
 
-  execa@7.2.0:
-    dependencies:
-      cross-spawn: 7.0.6
-      get-stream: 6.0.1
-      human-signals: 4.3.1
-      is-stream: 3.0.0
-      merge-stream: 2.0.0
-      npm-run-path: 5.1.0
-      onetime: 6.0.0
-      signal-exit: 3.0.7
-      strip-final-newline: 3.0.0
-
   expect-type@1.1.0: {}
 
   extend-shallow@2.0.1:
@@ -7077,7 +7195,7 @@ snapshots:
       vue: 3.5.12(typescript@5.6.2)
       vue-resize: 2.0.0-alpha.1(vue@3.5.12(typescript@5.6.2))
 
-  follow-redirects@1.15.9: {}
+  follow-redirects@1.15.11: {}
 
   for-each@0.3.3:
     dependencies:
@@ -7088,17 +7206,12 @@ snapshots:
       cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
-  form-data@4.0.0:
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-
-  form-data@4.0.2:
+  form-data@4.0.5:
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       es-set-tostringtag: 2.1.0
+      hasown: 2.0.2
       mime-types: 2.1.35
 
   fraction.js@4.3.7: {}
@@ -7129,12 +7242,14 @@ snapshots:
 
   get-east-asian-width@1.2.0: {}
 
+  get-east-asian-width@1.4.0: {}
+
   get-intrinsic@1.2.4:
     dependencies:
       es-errors: 1.3.0
       function-bind: 1.1.2
       has-proto: 1.0.3
-      has-symbols: 1.0.3
+      has-symbols: 1.1.0
       hasown: 2.0.2
 
   get-intrinsic@1.3.0:
@@ -7155,12 +7270,10 @@ snapshots:
       dunder-proto: 1.0.1
       es-object-atoms: 1.1.1
 
-  get-stream@6.0.1: {}
-
   get-symbol-description@1.0.0:
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.3.0
 
   get-symbol-description@1.0.2:
     dependencies:
@@ -7218,7 +7331,7 @@ snapshots:
   globalthis@1.0.4:
     dependencies:
       define-properties: 1.2.1
-      gopd: 1.0.1
+      gopd: 1.2.0
 
   globby@11.1.0:
     dependencies:
@@ -7237,10 +7350,6 @@ snapshots:
       merge2: 1.4.1
       slash: 4.0.0
 
-  gopd@1.0.1:
-    dependencies:
-      get-intrinsic: 1.2.4
-
   gopd@1.2.0: {}
 
   graceful-fs@4.2.11: {}
@@ -7264,7 +7373,7 @@ snapshots:
 
   has-property-descriptors@1.0.2:
     dependencies:
-      es-define-property: 1.0.0
+      es-define-property: 1.0.1
 
   has-proto@1.0.1: {}
 
@@ -7341,6 +7450,8 @@ snapshots:
       - terser
       - utf-8-validate
 
+  hookable@5.5.3: {}
+
   hotkeys-js@3.8.7: {}
 
   html-encoding-sniffer@3.0.0:
@@ -7370,8 +7481,8 @@ snapshots:
 
   http-proxy-agent@7.0.2:
     dependencies:
-      agent-base: 7.1.1
-      debug: 4.4.0
+      agent-base: 7.1.4
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -7382,15 +7493,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  https-proxy-agent@7.0.5:
+  https-proxy-agent@7.0.6:
     dependencies:
-      agent-base: 7.1.1
-      debug: 4.4.0
+      agent-base: 7.1.4
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
-  human-signals@4.3.1: {}
-
   husky@7.0.4: {}
 
   iconv-lite@0.6.3:
@@ -7428,7 +7537,7 @@ snapshots:
 
   internal-slot@1.0.5:
     dependencies:
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.3.0
       has: 1.0.3
       side-channel: 1.0.6
 
@@ -7441,7 +7550,7 @@ snapshots:
   is-array-buffer@3.0.2:
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.3.0
       is-typed-array: 1.1.12
 
   is-array-buffer@3.0.4:
@@ -7484,7 +7593,9 @@ snapshots:
 
   is-fullwidth-code-point@3.0.0: {}
 
-  is-fullwidth-code-point@4.0.0: {}
+  is-fullwidth-code-point@5.1.0:
+    dependencies:
+      get-east-asian-width: 1.4.0
 
   is-function@1.0.2: {}
 
@@ -7532,15 +7643,13 @@ snapshots:
     dependencies:
       call-bind: 1.0.7
 
-  is-stream@3.0.0: {}
-
   is-string@1.0.7:
     dependencies:
       has-tostringtag: 1.0.2
 
   is-symbol@1.0.4:
     dependencies:
-      has-symbols: 1.0.3
+      has-symbols: 1.1.0
 
   is-typed-array@1.1.12:
     dependencies:
@@ -7558,6 +7667,8 @@ snapshots:
     dependencies:
       call-bind: 1.0.7
 
+  is-what@5.5.0: {}
+
   isarray@2.0.5: {}
 
   isexe@2.0.0: {}
@@ -7621,7 +7732,7 @@ snapshots:
       decimal.js: 10.4.3
       domexception: 4.0.0
       escodegen: 2.1.0
-      form-data: 4.0.2
+      form-data: 4.0.5
       html-encoding-sniffer: 3.0.0
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
@@ -7643,28 +7754,27 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  jsdom@24.1.3:
+  jsdom@27.2.0:
     dependencies:
-      cssstyle: 4.0.1
-      data-urls: 5.0.0
-      decimal.js: 10.4.3
-      form-data: 4.0.0
+      '@acemir/cssom': 0.9.24
+      '@asamuzakjp/dom-selector': 6.7.5
+      cssstyle: 5.3.3
+      data-urls: 6.0.0
+      decimal.js: 10.6.0
       html-encoding-sniffer: 4.0.0
       http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.5
+      https-proxy-agent: 7.0.6
       is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.12
-      parse5: 7.1.2
-      rrweb-cssom: 0.7.1
+      parse5: 8.0.0
       saxes: 6.0.0
       symbol-tree: 3.2.4
-      tough-cookie: 4.1.4
+      tough-cookie: 6.0.0
       w3c-xmlserializer: 5.0.0
-      webidl-conversions: 7.0.0
+      webidl-conversions: 8.0.0
       whatwg-encoding: 3.1.1
       whatwg-mimetype: 4.0.0
-      whatwg-url: 14.0.0
-      ws: 8.18.0
+      whatwg-url: 15.1.0
+      ws: 8.18.3
       xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -7742,32 +7852,24 @@ snapshots:
     dependencies:
       uc.micro: 2.1.0
 
-  lint-staged@14.0.1(enquirer@2.4.1):
+  lint-staged@16.2.7:
     dependencies:
-      chalk: 5.3.0
-      commander: 11.0.0
-      debug: 4.3.4
-      execa: 7.2.0
-      lilconfig: 2.1.0
-      listr2: 6.6.1(enquirer@2.4.1)
-      micromatch: 4.0.5
+      commander: 14.0.2
+      listr2: 9.0.5
+      micromatch: 4.0.8
+      nano-spawn: 2.0.0
       pidtree: 0.6.0
       string-argv: 0.3.2
-      yaml: 2.3.1
-    transitivePeerDependencies:
-      - enquirer
-      - supports-color
+      yaml: 2.8.2
 
-  listr2@6.6.1(enquirer@2.4.1):
+  listr2@9.0.5:
     dependencies:
-      cli-truncate: 3.1.0
+      cli-truncate: 5.1.1
       colorette: 2.0.20
       eventemitter3: 5.0.1
-      log-update: 5.0.1
-      rfdc: 1.3.0
-      wrap-ansi: 8.1.0
-    optionalDependencies:
-      enquirer: 2.4.1
+      log-update: 6.1.0
+      rfdc: 1.4.1
+      wrap-ansi: 9.0.0
 
   lit-element@3.3.3:
     dependencies:
@@ -7817,13 +7919,13 @@ snapshots:
       chalk: 5.3.0
       is-unicode-supported: 1.3.0
 
-  log-update@5.0.1:
+  log-update@6.1.0:
     dependencies:
-      ansi-escapes: 5.0.0
-      cli-cursor: 4.0.0
-      slice-ansi: 5.0.0
+      ansi-escapes: 7.2.0
+      cli-cursor: 5.0.0
+      slice-ansi: 7.1.2
       strip-ansi: 7.1.0
-      wrap-ansi: 8.1.0
+      wrap-ansi: 9.0.0
 
   loupe@3.1.3: {}
 
@@ -7833,6 +7935,8 @@ snapshots:
 
   lru-cache@10.4.3: {}
 
+  lru-cache@11.2.4: {}
+
   lru-cache@6.0.0:
     dependencies:
       yallist: 4.0.0
@@ -7913,19 +8017,14 @@ snapshots:
       crypt: 0.0.2
       is-buffer: 1.1.6
 
+  mdn-data@2.12.2: {}
+
   mdurl@1.0.1: {}
 
   mdurl@2.0.0: {}
 
-  merge-stream@2.0.0: {}
-
   merge2@1.4.1: {}
 
-  micromatch@4.0.5:
-    dependencies:
-      braces: 3.0.3
-      picomatch: 2.3.1
-
   micromatch@4.0.8:
     dependencies:
       braces: 3.0.3
@@ -7937,10 +8036,6 @@ snapshots:
     dependencies:
       mime-db: 1.52.0
 
-  mimic-fn@2.1.0: {}
-
-  mimic-fn@4.0.0: {}
-
   mimic-function@5.0.1: {}
 
   min-document@2.19.0:
@@ -8004,6 +8099,8 @@ snapshots:
       object-assign: 4.1.1
       thenify-all: 1.6.0
 
+  nano-spawn@2.0.0: {}
+
   nanoid@3.3.11: {}
 
   nanoid@3.3.8: {}
@@ -8031,10 +8128,6 @@ snapshots:
 
   normalize-range@0.1.2: {}
 
-  npm-run-path@5.1.0:
-    dependencies:
-      path-key: 4.0.0
-
   nth-check@2.1.1:
     dependencies:
       boolbase: 1.0.0
@@ -8062,7 +8155,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      has-symbols: 1.0.3
+      has-symbols: 1.1.0
       object-keys: 1.1.1
 
   object.entries@1.1.7:
@@ -8098,14 +8191,6 @@ snapshots:
     dependencies:
       wrappy: 1.0.2
 
-  onetime@5.1.2:
-    dependencies:
-      mimic-fn: 2.1.0
-
-  onetime@6.0.0:
-    dependencies:
-      mimic-fn: 4.0.0
-
   onetime@7.0.0:
     dependencies:
       mimic-function: 5.0.1
@@ -8178,6 +8263,10 @@ snapshots:
     dependencies:
       entities: 4.5.0
 
+  parse5@8.0.0:
+    dependencies:
+      entities: 6.0.1
+
   parseurl@1.3.3: {}
 
   pascal-case@3.1.2:
@@ -8198,8 +8287,6 @@ snapshots:
 
   path-key@3.1.1: {}
 
-  path-key@4.0.0: {}
-
   path-parse@1.0.7: {}
 
   path-scurry@1.11.1:
@@ -8215,6 +8302,8 @@ snapshots:
 
   pathval@2.0.0: {}
 
+  perfect-debounce@1.0.0: {}
+
   picocolors@1.0.1: {}
 
   picocolors@1.1.0: {}
@@ -8227,6 +8316,13 @@ snapshots:
 
   pify@2.3.0: {}
 
+  pinia@3.0.4(typescript@5.6.2)(vue@3.5.12(typescript@5.6.2)):
+    dependencies:
+      '@vue/devtools-api': 7.7.8
+      vue: 3.5.12(typescript@5.6.2)
+    optionalDependencies:
+      typescript: 5.6.2
+
   pirates@4.0.6: {}
 
   pkcs7@1.0.4:
@@ -8672,11 +8768,6 @@ snapshots:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  restore-cursor@4.0.0:
-    dependencies:
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-
   restore-cursor@5.1.0:
     dependencies:
       onetime: 7.0.0
@@ -8684,7 +8775,7 @@ snapshots:
 
   reusify@1.0.4: {}
 
-  rfdc@1.3.0: {}
+  rfdc@1.4.1: {}
 
   rimraf@3.0.2:
     dependencies:
@@ -8720,10 +8811,6 @@ snapshots:
 
   rope-sequence@1.3.2: {}
 
-  rrweb-cssom@0.6.0: {}
-
-  rrweb-cssom@0.7.1: {}
-
   run-parallel@1.2.0:
     dependencies:
       queue-microtask: 1.2.3
@@ -8739,15 +8826,15 @@ snapshots:
   safe-array-concat@1.0.1:
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.2.4
-      has-symbols: 1.0.3
+      get-intrinsic: 1.3.0
+      has-symbols: 1.1.0
       isarray: 2.0.5
 
   safe-array-concat@1.1.2:
     dependencies:
       call-bind: 1.0.7
       get-intrinsic: 1.2.4
-      has-symbols: 1.0.3
+      has-symbols: 1.1.0
       isarray: 2.0.5
 
   safe-json-parse@4.0.0:
@@ -8757,7 +8844,7 @@ snapshots:
   safe-regex-test@1.0.0:
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.3.0
       is-regex: 1.1.4
 
   safe-regex-test@1.0.3:
@@ -8808,7 +8895,7 @@ snapshots:
       es-errors: 1.3.0
       function-bind: 1.1.2
       get-intrinsic: 1.2.4
-      gopd: 1.0.1
+      gopd: 1.2.0
       has-property-descriptors: 1.0.2
 
   set-function-name@2.0.2:
@@ -8837,8 +8924,6 @@ snapshots:
 
   siginfo@2.0.0: {}
 
-  signal-exit@3.0.7: {}
-
   signal-exit@4.1.0: {}
 
   sirv@2.0.4:
@@ -8866,10 +8951,10 @@ snapshots:
       astral-regex: 2.0.0
       is-fullwidth-code-point: 3.0.0
 
-  slice-ansi@5.0.0:
+  slice-ansi@7.1.2:
     dependencies:
       ansi-styles: 6.2.1
-      is-fullwidth-code-point: 4.0.0
+      is-fullwidth-code-point: 5.1.0
 
   snake-case@3.0.4:
     dependencies:
@@ -8897,6 +8982,8 @@ snapshots:
 
   spark-md5@3.0.2: {}
 
+  speakingurl@14.0.1: {}
+
   sprintf-js@1.0.3: {}
 
   stackback@0.0.2: {}
@@ -8927,6 +9014,11 @@ snapshots:
       get-east-asian-width: 1.2.0
       strip-ansi: 7.1.0
 
+  string-width@8.1.0:
+    dependencies:
+      get-east-asian-width: 1.4.0
+      strip-ansi: 7.1.0
+
   string.prototype.trim@1.2.8:
     dependencies:
       call-bind: 1.0.2
@@ -8976,8 +9068,6 @@ snapshots:
 
   strip-bom@3.0.0: {}
 
-  strip-final-newline@3.0.0: {}
-
   strip-json-comments@3.1.1: {}
 
   style-mod@4.1.2: {}
@@ -8992,6 +9082,10 @@ snapshots:
       pirates: 4.0.6
       ts-interface-checker: 0.1.13
 
+  superjson@2.2.5:
+    dependencies:
+      copy-anything: 4.0.5
+
   supports-color@7.2.0:
     dependencies:
       has-flag: 4.0.0
@@ -9088,6 +9182,12 @@ snapshots:
 
   tinyspy@3.0.2: {}
 
+  tldts-core@7.0.19: {}
+
+  tldts@7.0.19:
+    dependencies:
+      tldts-core: 7.0.19
+
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
@@ -9101,11 +9201,15 @@ snapshots:
       universalify: 0.2.0
       url-parse: 1.5.10
 
+  tough-cookie@6.0.0:
+    dependencies:
+      tldts: 7.0.19
+
   tr46@3.0.0:
     dependencies:
       punycode: 2.3.1
 
-  tr46@5.0.0:
+  tr46@6.0.0:
     dependencies:
       punycode: 2.3.1
 
@@ -9137,7 +9241,7 @@ snapshots:
   typed-array-buffer@1.0.0:
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.3.0
       is-typed-array: 1.1.12
 
   typed-array-buffer@1.0.2:
@@ -9157,7 +9261,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.7
       for-each: 0.3.3
-      gopd: 1.0.1
+      gopd: 1.2.0
       has-proto: 1.0.3
       is-typed-array: 1.1.13
 
@@ -9174,7 +9278,7 @@ snapshots:
       available-typed-arrays: 1.0.7
       call-bind: 1.0.7
       for-each: 0.3.3
-      gopd: 1.0.1
+      gopd: 1.2.0
       has-proto: 1.0.3
       is-typed-array: 1.1.13
 
@@ -9188,7 +9292,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.7
       for-each: 0.3.3
-      gopd: 1.0.1
+      gopd: 1.2.0
       has-proto: 1.0.3
       is-typed-array: 1.1.13
       possible-typed-array-names: 1.0.0
@@ -9206,7 +9310,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.7
       has-bigints: 1.0.2
-      has-symbols: 1.0.3
+      has-symbols: 1.1.0
       which-boxed-primitive: 1.0.2
 
   undici-types@6.19.8: {}
@@ -9325,7 +9429,7 @@ snapshots:
       sass: 1.79.3
       terser: 5.33.0
 
-  vitest@3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0):
+  vitest@3.0.5(@types/node@22.7.0)(jsdom@27.2.0)(sass@1.79.3)(terser@5.33.0):
     dependencies:
       '@vitest/expect': 3.0.5
       '@vitest/mocker': 3.0.5(vite@5.4.21(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
@@ -9349,7 +9453,7 @@ snapshots:
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 22.7.0
-      jsdom: 24.1.3
+      jsdom: 27.2.0
     transitivePeerDependencies:
       - less
       - lightningcss
@@ -9483,6 +9587,8 @@ snapshots:
 
   webidl-conversions@7.0.0: {}
 
+  webidl-conversions@8.0.0: {}
+
   webrtc-adapter@9.0.1:
     dependencies:
       sdp: 3.2.0
@@ -9504,10 +9610,10 @@ snapshots:
       tr46: 3.0.0
       webidl-conversions: 7.0.0
 
-  whatwg-url@14.0.0:
+  whatwg-url@15.1.0:
     dependencies:
-      tr46: 5.0.0
-      webidl-conversions: 7.0.0
+      tr46: 6.0.0
+      webidl-conversions: 8.0.0
 
   which-boxed-primitive@1.0.2:
     dependencies:
@@ -9524,7 +9630,7 @@ snapshots:
       available-typed-arrays: 1.0.5
       call-bind: 1.0.2
       for-each: 0.3.3
-      gopd: 1.0.1
+      gopd: 1.2.0
       has-tostringtag: 1.0.2
 
   which-typed-array@1.1.15:
@@ -9532,7 +9638,7 @@ snapshots:
       available-typed-arrays: 1.0.7
       call-bind: 1.0.7
       for-each: 0.3.3
-      gopd: 1.0.1
+      gopd: 1.2.0
       has-tostringtag: 1.0.2
 
   which@2.0.2:
@@ -9576,6 +9682,8 @@ snapshots:
 
   ws@8.18.0: {}
 
+  ws@8.18.3: {}
+
   xml-name-validator@4.0.0: {}
 
   xml-name-validator@5.0.0: {}
@@ -9594,10 +9702,10 @@ snapshots:
       lodash: 4.17.21
       yaml: 2.5.1
 
-  yaml@2.3.1: {}
-
   yaml@2.5.1: {}
 
+  yaml@2.8.2: {}
+
   yargs-parser@18.1.3:
     dependencies:
       camelcase: 5.3.1
diff --git a/rubocop/attachment_download.rb b/rubocop/attachment_download.rb
new file mode 100644
index 000000000..14c56203a
--- /dev/null
+++ b/rubocop/attachment_download.rb
@@ -0,0 +1,17 @@
+require 'rubocop'
+
+module RuboCop::Cop::Chatwoot; end
+
+class RuboCop::Cop::Chatwoot::AttachmentDownload < RuboCop::Cop::Base
+  MSG = 'Avoid calling `.file/.blob.download`; use `blob.open` or streaming IO instead.'.freeze
+
+  def_node_matcher :unsafe_download?, <<~PATTERN
+    (send (send _ {:file :blob}) :download ...)
+  PATTERN
+
+  def on_send(node)
+    return unless unsafe_download?(node)
+
+    add_offense(node.loc.selector, message: MSG)
+  end
+end
diff --git a/rubocop/one_class_per_file.rb b/rubocop/one_class_per_file.rb
new file mode 100644
index 000000000..47fe9a481
--- /dev/null
+++ b/rubocop/one_class_per_file.rb
@@ -0,0 +1,86 @@
+require 'rubocop'
+
+# Enforces having only one class definition per file
+# Excludes common Ruby patterns:
+# - Nested Scope classes (Pundit pattern)
+# - Single-line exception classes inheriting from StandardError or other exceptions
+# - Nested classes within exception/error hierarchies
+class RuboCop::Cop::Style::OneClassPerFile < RuboCop::Cop::Base
+  MSG = 'Define only one class per file.'.freeze
+
+  def on_new_investigation
+    return unless processed_source.ast
+
+    class_nodes = processed_source.ast.each_node(:class).to_a
+    return if class_nodes.size <= 1
+
+    class_nodes[1..].each do |node|
+      next if allowed_nested_class?(node)
+
+      add_offense(node, message: MSG)
+    end
+  end
+
+  private
+
+  def allowed_nested_class?(node)
+    # Allow nested Scope classes (Pundit pattern)
+    return true if scope_class?(node)
+
+    # Allow nested Request classes (Rack::Attack pattern)
+    return true if rack_attack_request_class?(node)
+
+    # Allow exception classes (single-line or multi-line)
+    return true if exception_class?(node)
+
+    # Allow classes within CustomExceptions modules
+    return true if in_custom_exceptions_module?(node)
+
+    # Allow common nested patterns: Builder, Factory, Result, Response, Params, etc.
+    return true if common_nested_pattern?(node)
+
+    false
+  end
+
+  def scope_class?(node)
+    class_name = node.identifier.source
+    class_name == 'Scope'
+  end
+
+  def rack_attack_request_class?(node)
+    class_name = node.identifier.source
+    return false unless class_name == 'Request'
+
+    # Check if we're inside a Rack::Attack class
+    node.each_ancestor(:class).any? do |ancestor|
+      ancestor.identifier.source.include?('Rack::Attack')
+    end
+  end
+
+  def exception_class?(node)
+    # Check if the class inherits from StandardError or ends with 'Error'
+    return false unless node.parent_class
+
+    parent_class = node.parent_class.source
+    parent_class.include?('Error') || parent_class.include?('StandardError')
+  end
+
+  def in_custom_exceptions_module?(node)
+    # Check if any parent node is a module containing 'CustomExceptions'
+    node.each_ancestor(:module).any? do |ancestor|
+      ancestor.identifier.source.include?('CustomExceptions')
+    end
+  end
+
+  def common_nested_pattern?(node)
+    class_name = node.identifier.source
+
+    # Common nested class patterns in Ruby/Rails
+    nested_patterns = %w[Builder Factory Result Response Params Config Configuration
+                         Context Query Form Validator Serializer Presenter Decorator
+                         Command Handler]
+
+    # Check if class name ends with any of these patterns
+    nested_patterns.any? { |pattern| class_name.end_with?(pattern) }
+  end
+end
diff --git a/spec/builders/messages/message_builder_spec.rb b/spec/builders/messages/message_builder_spec.rb
index 2eb4dbf90..71b3cbf5a 100644
--- a/spec/builders/messages/message_builder_spec.rb
+++ b/spec/builders/messages/message_builder_spec.rb
@@ -199,19 +199,6 @@ describe Messages::MessageBuilder do
           expect(message.content_attributes.dig('email', 'text_content', 'reply')).to eq 'Regular message content'
         end
 
-        it 'does not process custom email content when quoted_email_reply feature is disabled' do
-          account.disable_features('quoted_email_reply')
-          params = ActionController::Parameters.new({
-                                                      content: 'Regular message content',
-                                                      email_html_content: '<p>Custom HTML content</p>'
-                                                    })
-
-          message = described_class.new(user, conversation, params).perform
-
-          expect(message.content_attributes.dig('email', 'html_content')).to be_nil
-          expect(message.content_attributes.dig('email', 'text_content')).to be_nil
-        end
-
         it 'does not process custom email content for private messages' do
           params = ActionController::Parameters.new({
                                                       content: 'Regular message content',
@@ -236,6 +223,69 @@ describe Messages::MessageBuilder do
           expect(message.content_attributes.dig('email', 'text_content', 'full')).to eq 'Regular **markdown** content'
         end
       end
+
+      context 'when liquid templates are present in email content' do
+        let(:contact) { create(:contact, name: 'John', email: 'john@example.com') }
+        let(:conversation) { create(:conversation, inbox: channel_email.inbox, account: account, contact: contact) }
+
+        it 'processes liquid variables in email content' do
+          params = ActionController::Parameters.new({
+                                                      content: 'Hello {{contact.name}}, your email is {{contact.email}}'
+                                                    })
+
+          message = described_class.new(user, conversation, params).perform
+
+          expect(message.content_attributes.dig('email', 'html_content', 'full')).to include('Hello John')
+          expect(message.content_attributes.dig('email', 'html_content', 'full')).to include('john@example.com')
+          expect(message.content_attributes.dig('email', 'text_content', 'full')).to eq 'Hello John, your email is john@example.com'
+        end
+
+        it 'does not process liquid in code blocks' do
+          params = ActionController::Parameters.new({
+                                                      content: 'Hello {{contact.name}}, use this code: `{{contact.email}}`'
+                                                    })
+
+          message = described_class.new(user, conversation, params).perform
+
+          expect(message.content_attributes.dig('email', 'text_content', 'full')).to eq 'Hello John, use this code: `{{contact.email}}`'
+        end
+
+        it 'handles broken liquid syntax gracefully' do
+          params = ActionController::Parameters.new({
+                                                      content: 'Hello {{contact.name}  {{invalid}}'
+                                                    })
+
+          message = described_class.new(user, conversation, params).perform
+
+          expect(message.content_attributes.dig('email', 'text_content', 'full')).to eq 'Hello {{contact.name}  {{invalid}}'
+        end
+
+        it 'does not process liquid for incoming messages' do
+          params = ActionController::Parameters.new({
+                                                      content: 'Hello {{contact.name}}',
+                                                      message_type: 'incoming'
+                                                    })
+
+          api_channel = create(:channel_api, account: account)
+          api_conversation = create(:conversation, inbox: api_channel.inbox, account: account, contact: contact)
+
+          message = described_class.new(user, api_conversation, params).perform
+
+          expect(message.content).to eq 'Hello {{contact.name}}'
+        end
+
+        it 'does not process liquid for private messages' do
+          params = ActionController::Parameters.new({
+                                                      content: 'Hello {{contact.name}}',
+                                                      private: true
+                                                    })
+
+          message = described_class.new(user, conversation, params).perform
+
+          expect(message.content_attributes.dig('email', 'html_content')).to be_nil
+          expect(message.content_attributes.dig('email', 'text_content')).to be_nil
+        end
+      end
     end
   end
 end
diff --git a/spec/builders/v2/report_builder_spec.rb b/spec/builders/v2/report_builder_spec.rb
index 7498ce3ac..3f86b0348 100644
--- a/spec/builders/v2/report_builder_spec.rb
+++ b/spec/builders/v2/report_builder_spec.rb
@@ -7,7 +7,9 @@ describe V2::ReportBuilder do
   let_it_be(:label_2) { create(:label, title: 'Label_2', account: account) }
 
   describe '#timeseries' do
-    before do
+    # Use before_all to share expensive setup across all tests in this describe block
+    # This runs once instead of 21 times, dramatically speeding up the suite
+    before_all do
       travel_to(Time.zone.today) do
         user = create(:user, account: account)
         inbox = create(:inbox, account: account)
diff --git a/spec/config/markdown_embeds_spec.rb b/spec/config/markdown_embeds_spec.rb
index 2eff75bcd..9e9e56898 100644
--- a/spec/config/markdown_embeds_spec.rb
+++ b/spec/config/markdown_embeds_spec.rb
@@ -21,7 +21,7 @@ describe 'Markdown Embeds Configuration' do
     end
 
     it 'contains expected embed types' do
-      expected_types = %w[youtube loom vimeo mp4 arcade wistia bunny codepen github_gist]
+      expected_types = %w[youtube loom vimeo mp4 arcade_tab arcade wistia bunny codepen github_gist]
       expect(config.keys).to match_array(expected_types)
     end
   end
@@ -50,6 +50,12 @@ describe 'Markdown Embeds Configuration' do
           { url: 'https://app.arcade.software/share/arcade123', expected: { 'video_id' => 'arcade123' } },
           { url: 'https://www.app.arcade.software/share/demo456', expected: { 'video_id' => 'demo456' } }
         ],
+        'arcade_tab' => [
+          { url: 'https://app.arcade.software/share/arcade789?embed_mobile=tab', expected: { 'video_id' => 'arcade789' } },
+          { url: 'https://app.arcade.software/share/demo789?foo=bar&embed_mobile=tab', expected: { 'video_id' => 'demo789' } },
+          { url: 'https://app.arcade.software/share/demo-with-query?foo=bar&embed_mobile=tab?user_id=1',
+            expected: { 'video_id' => 'demo-with-query' } }
+        ],
         'wistia' => [
           { url: 'https://chatwoot.wistia.com/medias/kjwjeq6f9i', expected: { 'video_id' => 'kjwjeq6f9i' } },
           { url: 'https://www.company.wistia.com/medias/abc123def', expected: { 'video_id' => 'abc123def' } }
diff --git a/spec/controllers/api/v1/accounts/articles_controller_spec.rb b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
index 42fd062dc..e74be76e2 100644
--- a/spec/controllers/api/v1/accounts/articles_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
         expect(response).to have_http_status(:success)
         json_response = response.parsed_body
         expect(json_response['payload']['title']).to eql('MyTitle')
-        expect(json_response['payload']['status']).to eql('draft')
+        expect(json_response['payload']['status']).to eql('published')
         expect(json_response['payload']['position']).to be(3)
       end
 
@@ -59,10 +59,30 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
         expect(response).to have_http_status(:success)
         json_response = response.parsed_body
         expect(json_response['payload']['title']).to eql('MyTitle')
-        expect(json_response['payload']['status']).to eql('draft')
+        expect(json_response['payload']['status']).to eql('published')
         expect(json_response['payload']['position']).to be(3)
       end
 
+      it 'creates article as draft when status is not provided' do
+        article_params = {
+          article: {
+            category_id: category.id,
+            description: 'test description',
+            title: 'DraftTitle',
+            slug: 'draft-title',
+            content: 'This is my draft content.',
+            author_id: agent.id
+          }
+        }
+        post "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles",
+             params: article_params,
+             headers: admin.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+        expect(json_response['payload']['title']).to eql('DraftTitle')
+        expect(json_response['payload']['status']).to eql('draft')
+      end
+
       it 'associate to the root article' do
         root_article = create(:article, category: category, slug: 'root-article', portal: portal, account_id: account.id, author_id: agent.id,
                                         associated_article_id: nil)
diff --git a/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb b/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
index ec6af61be..1ab490a96 100644
--- a/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
@@ -225,4 +225,49 @@ RSpec.describe 'Api::V1::Accounts::BulkActionsController', type: :request do
       end
     end
   end
+
+  describe 'POST /api/v1/accounts/{account.id}/bulk_actions (contacts)' do
+    context 'when it is an authenticated user' do
+      let!(:agent) { create(:user, account: account, role: :agent) }
+
+      it 'enqueues Contacts::BulkActionJob with permitted params' do
+        contact_one = create(:contact, account: account)
+        contact_two = create(:contact, account: account)
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/bulk_actions",
+               headers: agent.create_new_auth_token,
+               params: {
+                 type: 'Contact',
+                 ids: [contact_one.id, contact_two.id],
+                 labels: { add: %w[vip support] },
+                 extra: 'ignored'
+               }
+        end.to have_enqueued_job(Contacts::BulkActionJob).with(
+          account.id,
+          agent.id,
+          hash_including(
+            'ids' => [contact_one.id.to_s, contact_two.id.to_s],
+            'labels' => hash_including('add' => %w[vip support])
+          )
+        )
+
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'returns unauthorized for delete action when user is not admin' do
+        contact = create(:contact, account: account)
+
+        post "/api/v1/accounts/#{account.id}/bulk_actions",
+             headers: agent.create_new_auth_token,
+             params: {
+               type: 'Contact',
+               ids: [contact.id],
+               action_name: 'delete'
+             }
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
 end
diff --git a/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
index 8ed70b7a2..18c652c0a 100644
--- a/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Conversation Assignment API', type: :request do
     end
 
     context 'when it is an authenticated bot with out access to the inbox' do
-      let(:agent_bot) { create(:agent_bot, account: account) }
+      let(:agent_bot) { create(:agent_bot) }
       let(:agent) { create(:user, account: account, role: :agent) }
 
       before do
@@ -36,6 +36,7 @@ RSpec.describe 'Conversation Assignment API', type: :request do
 
     context 'when it is an authenticated user with access to the inbox' do
       let(:agent) { create(:user, account: account, role: :agent) }
+      let(:agent_bot) { create(:agent_bot, account: account) }
       let(:team) { create(:team, account: account) }
 
       before do
@@ -54,6 +55,25 @@ RSpec.describe 'Conversation Assignment API', type: :request do
         expect(conversation.reload.assignee).to eq(agent)
       end
 
+      it 'assigns an agent bot to the conversation' do
+        params = { assignee_id: agent_bot.id, assignee_type: 'AgentBot' }
+
+        expect(Conversations::AssignmentService).to receive(:new)
+          .with(hash_including(conversation: conversation, assignee_id: agent_bot.id, assignee_type: 'AgentBot'))
+          .and_call_original
+
+        post api_v1_account_conversation_assignments_url(account_id: account.id, conversation_id: conversation.display_id),
+             params: params,
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(response.parsed_body['name']).to eq(agent_bot.name)
+        conversation.reload
+        expect(conversation.assignee_agent_bot).to eq(agent_bot)
+        expect(conversation.assignee).to be_nil
+      end
+
       it 'assigns a team to the conversation' do
         team_member = create(:user, account: account, role: :agent, auto_offline: false)
         create(:inbox_member, inbox: conversation.inbox, user: team_member)
@@ -125,7 +145,7 @@ RSpec.describe 'Conversation Assignment API', type: :request do
       end
 
       it 'unassigns the assignee from the conversation' do
-        params = { assignee_id: 0 }
+        params = { assignee_id: nil }
         post api_v1_account_conversation_assignments_url(account_id: account.id, conversation_id: conversation.display_id),
              params: params,
              headers: agent.create_new_auth_token,
diff --git a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
index 3a68d8921..86f4d4e7e 100644
--- a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'Webhooks API', type: :request do
   let(:account) { create(:account) }
   let(:inbox) { create(:inbox, account: account) }
-  let(:webhook) { create(:webhook, account: account, inbox: inbox, url: 'https://hello.com') }
+  let(:webhook) { create(:webhook, account: account, inbox: inbox, url: 'https://hello.com', name: 'My Webhook') }
   let(:administrator) { create(:user, account: account, role: :administrator) }
   let(:agent) { create(:user, account: account, role: :agent) }
 
@@ -49,6 +49,16 @@ RSpec.describe 'Webhooks API', type: :request do
         expect(response.parsed_body['payload']['webhook']['url']).to eql 'https://hello.com'
       end
 
+      it 'creates webhook with name' do
+        post "/api/v1/accounts/#{account.id}/webhooks",
+             params: { account_id: account.id, inbox_id: inbox.id, url: 'https://hello.com', name: 'My Webhook' },
+             headers: administrator.create_new_auth_token,
+             as: :json
+        expect(response).to have_http_status(:success)
+
+        expect(response.parsed_body['payload']['webhook']['name']).to eql 'My Webhook'
+      end
+
       it 'throws error when invalid url provided' do
         post "/api/v1/accounts/#{account.id}/webhooks",
              params: { account_id: account.id, inbox_id: inbox.id, url: 'javascript:alert(1)' },
@@ -103,11 +113,12 @@ RSpec.describe 'Webhooks API', type: :request do
     context 'when it is an authenticated admin user' do
       it 'updates webhook' do
         put "/api/v1/accounts/#{account.id}/webhooks/#{webhook.id}",
-            params: { url: 'https://hello.com' },
+            params: { url: 'https://hello.com', name: 'Another Webhook' },
             headers: administrator.create_new_auth_token,
             as: :json
         expect(response).to have_http_status(:success)
         expect(response.parsed_body['payload']['webhook']['url']).to eql 'https://hello.com'
+        expect(response.parsed_body['payload']['webhook']['name']).to eql 'Another Webhook'
       end
     end
   end
diff --git a/spec/controllers/shopify/callbacks_controller_spec.rb b/spec/controllers/shopify/callbacks_controller_spec.rb
index cb75e23b4..c57440347 100644
--- a/spec/controllers/shopify/callbacks_controller_spec.rb
+++ b/spec/controllers/shopify/callbacks_controller_spec.rb
@@ -9,6 +9,13 @@ RSpec.describe Shopify::CallbacksController, type: :request do
   let(:shopify_redirect_uri) { "#{frontend_url}/app/accounts/#{account.id}/settings/integrations/shopify" }
   let(:oauth_client) { instance_double(OAuth2::Client) }
   let(:auth_code_strategy) { instance_double(OAuth2::Strategy::AuthCode) }
+  let(:token_response) do
+    instance_double(
+      OAuth2::AccessToken,
+      response: instance_double(OAuth2::Response, parsed: response_body),
+      token: access_token
+    )
+  end
 
   describe 'GET /shopify/callback' do
     let(:access_token) { SecureRandom.hex(10) }
@@ -23,12 +30,24 @@ RSpec.describe Shopify::CallbacksController, type: :request do
       stub_const('ENV', ENV.to_hash.merge('FRONTEND_URL' => frontend_url))
     end
 
-    context 'when successful' do
+    shared_context 'with stubbed account' do
       before do
-        controller = described_class.new
-        allow(controller).to receive(:verify_shopify_token).with(state).and_return(account.id)
-        allow(described_class).to receive(:new).and_return(controller)
+        allow(described_class).to receive(:new).and_wrap_original do |original, *args|
+          controller = original.call(*args)
+          allow(controller).to receive(:verify_shopify_token).and_return(account.id)
+          allow(controller).to receive(:oauth_client).and_return(oauth_client)
+          controller
+        end
+        allow(Account).to receive(:find).and_return(account)
 
+        allow(oauth_client).to receive(:auth_code).and_return(auth_code_strategy)
+      end
+    end
+
+    context 'when successful' do
+      include_context 'with stubbed account'
+      before do
+        allow(auth_code_strategy).to receive(:get_token).and_return(token_response)
         stub_request(:post, "https://#{shop}/admin/oauth/access_token")
           .to_return(
             status: 200,
@@ -55,12 +74,11 @@ RSpec.describe Shopify::CallbacksController, type: :request do
     end
 
     context 'when the code is missing' do
+      include_context 'with stubbed account'
       before do
-        controller = described_class.new
-        allow(controller).to receive(:verify_shopify_token).with(state).and_return(account.id)
-        allow(controller).to receive(:oauth_client).and_return(oauth_client)
-        allow(oauth_client).to receive(:auth_code).and_raise(StandardError)
-        allow(described_class).to receive(:new).and_return(controller)
+        allow(auth_code_strategy).to receive(:get_token).and_raise(StandardError)
+        stub_request(:post, "https://#{shop}/admin/oauth/access_token")
+          .to_return(status: 400, body: { error: 'invalid_grant' }.to_json)
       end
 
       it 'redirects to the shopify_redirect_uri with error' do
@@ -70,11 +88,8 @@ RSpec.describe Shopify::CallbacksController, type: :request do
     end
 
     context 'when the token is invalid' do
+      include_context 'with stubbed account'
       before do
-        controller = described_class.new
-        allow(controller).to receive(:verify_shopify_token).with(state).and_return(account.id)
-        allow(controller).to receive(:oauth_client).and_return(oauth_client)
-        allow(oauth_client).to receive(:auth_code).and_return(auth_code_strategy)
         allow(auth_code_strategy).to receive(:get_token).and_raise(
           OAuth2::Error.new(
             OpenStruct.new(
@@ -83,7 +98,9 @@ RSpec.describe Shopify::CallbacksController, type: :request do
             )
           )
         )
-        allow(described_class).to receive(:new).and_return(controller)
+
+        stub_request(:post, "https://#{shop}/admin/oauth/access_token")
+          .to_return(status: 400, body: { error: 'invalid_grant' }.to_json)
       end
 
       it 'redirects to the shopify_redirect_uri with error' do
@@ -94,10 +111,11 @@ RSpec.describe Shopify::CallbacksController, type: :request do
 
     context 'when state parameter is invalid' do
       before do
-        controller = described_class.new
-        allow(controller).to receive(:verify_shopify_token).with(state).and_return(nil)
-        allow(controller).to receive(:account).and_return(nil)
-        allow(described_class).to receive(:new).and_return(controller)
+        # rubocop:disable RSpec/AnyInstance, RSpec/DescribedClass
+        # Explicit class name and any_instance required for parallel CI stability
+        allow_any_instance_of(Shopify::CallbacksController).to receive(:verify_shopify_token).and_return(nil)
+        allow_any_instance_of(Shopify::CallbacksController).to receive(:account).and_return(nil)
+        # rubocop:enable RSpec/AnyInstance, RSpec/DescribedClass
       end
 
       it 'redirects to the frontend URL with error' do
diff --git a/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb
index f62991ad1..f5d82310a 100644
--- a/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb
@@ -25,10 +25,150 @@ RSpec.describe 'Companies API', type: :request do
         expect(response_body['payload'].size).to eq(2)
         expect(response_body['payload'].map { |c| c['name'] }).to contain_exactly(company1.name, company2.name)
       end
+
+      it 'returns companies with pagination' do
+        create_list(:company, 30, account: account)
+
+        get "/api/v1/accounts/#{account.id}/companies",
+            params: { page: 1 },
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_body = response.parsed_body
+        expect(response_body['payload'].size).to eq(25)
+        expect(response_body['meta']['total_count']).to eq(32)
+        expect(response_body['meta']['page']).to eq(1)
+      end
+
+      it 'returns second page of companies' do
+        create_list(:company, 30, account: account)
+        get "/api/v1/accounts/#{account.id}/companies",
+            params: { page: 2 },
+            headers: admin.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:success)
+        response_body = response.parsed_body
+        expect(response_body['payload'].size).to eq(7)
+        expect(response_body['meta']['total_count']).to eq(32)
+        expect(response_body['meta']['page']).to eq(2)
+      end
+
+      it 'returns companies with contacts_count' do
+        company_with_contacts = create(:company, name: 'Company With Contacts', account: account)
+        create_list(:contact, 5, company: company_with_contacts, account: account)
+
+        get "/api/v1/accounts/#{account.id}/companies",
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_body = response.parsed_body
+        company_data = response_body['payload'].find { |c| c['id'] == company_with_contacts.id }
+        expect(company_data['contacts_count']).to eq(5)
+      end
+
+      it 'does not return companies from other accounts' do
+        other_account = create(:account)
+        create(:company, name: 'Other Account Company', account: other_account)
+        create(:company, name: 'My Company', account: account)
+        get "/api/v1/accounts/#{account.id}/companies",
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_body = response.parsed_body
+        expect(response_body['payload'].size).to eq(3)
+        expect(response_body['payload'].map { |c| c['name'] }).not_to include('Other Account Company')
+      end
+    end
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/companies/search' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/companies/search"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:admin) { create(:user, account: account, role: :administrator) }
+
+      it 'returns error when q parameter is missing' do
+        get "/api/v1/accounts/#{account.id}/companies/search",
+            headers: admin.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.parsed_body['error']).to eq('Specify search string with parameter q')
+      end
+
+      it 'searches companies by name' do
+        create(:company, name: 'Acme Corp', domain: 'acme.com', account: account)
+        create(:company, name: 'Tech Solutions', domain: 'tech.com', account: account)
+        create(:company, name: 'Global Inc', domain: 'global.com', account: account)
+
+        get "/api/v1/accounts/#{account.id}/companies/search",
+            params: { q: 'tech' },
+            headers: admin.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:success)
+        response_body = response.parsed_body
+        expect(response_body['payload'].size).to eq(1)
+        expect(response_body['payload'].first['name']).to eq('Tech Solutions')
+      end
+
+      it 'searches companies by domain' do
+        create(:company, name: 'Acme Corp', domain: 'acme.com', account: account)
+        create(:company, name: 'Tech Solutions', domain: 'tech.com', account: account)
+        create(:company, name: 'Global Inc', domain: 'global.com', account: account)
+
+        get "/api/v1/accounts/#{account.id}/companies/search",
+            params: { q: 'acme.com' },
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_body = response.parsed_body
+        expect(response_body['payload'].size).to eq(1)
+        expect(response_body['payload'].first['domain']).to eq('acme.com')
+      end
+
+      it 'search is case insensitive' do
+        create(:company, name: 'Acme Corp', domain: 'acme.com', account: account)
+        get "/api/v1/accounts/#{account.id}/companies/search",
+            params: { q: 'ACME' },
+            headers: admin.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:success)
+        response_body = response.parsed_body
+
+        expect(response_body['payload'].size).to eq(1)
+      end
+
+      it 'returns empty array when no companies match search' do
+        create(:company, name: 'Acme Corp', domain: 'acme.com', account: account)
+        get "/api/v1/accounts/#{account.id}/companies/search",
+            params: { q: 'nonexistent' },
+            headers: admin.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:success)
+        response_body = response.parsed_body
+        expect(response_body['payload'].size).to eq(0)
+        expect(response_body['meta']['total_count']).to eq(0)
+      end
     end
   end
 
   describe 'GET /api/v1/accounts/{account.id}/companies/{id}' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        company = create(:company, account: account)
+        get "/api/v1/accounts/#{account.id}/companies/#{company.id}"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
     context 'when it is an authenticated user' do
       let(:admin) { create(:user, account: account, role: :administrator) }
       let(:company) { create(:company, account: account) }
@@ -46,6 +186,13 @@ RSpec.describe 'Companies API', type: :request do
   end
 
   describe 'POST /api/v1/accounts/{account.id}/companies' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/companies"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
     context 'when it is an authenticated user' do
       let(:admin) { create(:user, account: account, role: :administrator) }
       let(:valid_params) do
@@ -85,6 +232,14 @@ RSpec.describe 'Companies API', type: :request do
   end
 
   describe 'PATCH /api/v1/accounts/{account.id}/companies/{id}' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        company = create(:company, account: account)
+        patch "/api/v1/accounts/#{account.id}/companies/#{company.id}"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
     context 'when it is an authenticated user' do
       let(:admin) { create(:user, account: account, role: :administrator) }
       let(:company) { create(:company, account: account) }
@@ -111,6 +266,14 @@ RSpec.describe 'Companies API', type: :request do
   end
 
   describe 'DELETE /api/v1/accounts/{account.id}/companies/{id}' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        company = create(:company, account: account)
+        delete "/api/v1/accounts/#{account.id}/companies/#{company.id}"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
     context 'when it is an authenticated administrator' do
       let(:admin) { create(:user, account: account, role: :administrator) }
       let(:company) { create(:company, account: account) }
diff --git a/spec/enterprise/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/conversations_controller_spec.rb
index bbb3f1eb3..472dc959b 100644
--- a/spec/enterprise/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -102,4 +102,146 @@ RSpec.describe 'Conversations API', type: :request do
       end
     end
   end
+
+  describe 'GET /api/v1/accounts/{account.id}/conversations/:id/reporting_events' do
+    let(:conversation) { create(:conversation, account: account) }
+    let(:inbox) { conversation.inbox }
+    let(:agent) { administrator }
+
+    before do
+      # Create reporting events for this conversation
+      @event1 = create(:reporting_event,
+                       account: account,
+                       conversation: conversation,
+                       inbox: inbox,
+                       user: agent,
+                       name: 'first_response',
+                       value: 120,
+                       created_at: 3.hours.ago)
+
+      @event2 = create(:reporting_event,
+                       account: account,
+                       conversation: conversation,
+                       inbox: inbox,
+                       user: agent,
+                       name: 'reply_time',
+                       value: 45,
+                       created_at: 2.hours.ago)
+
+      @event3 = create(:reporting_event,
+                       account: account,
+                       conversation: conversation,
+                       inbox: inbox,
+                       user: agent,
+                       name: 'resolution',
+                       value: 300,
+                       created_at: 1.hour.ago)
+
+      # Create an event for a different conversation (should not be included)
+      other_conversation = create(:conversation, account: account)
+      create(:reporting_event,
+             account: account,
+             conversation: other_conversation,
+             inbox: other_conversation.inbox,
+             user: agent,
+             name: 'other_conversation_event',
+             value: 60)
+    end
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/reporting_events",
+            as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user with conversation access' do
+      it 'returns all reporting events for the conversation' do
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/reporting_events",
+            headers: administrator.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+
+        # Should return array directly (no pagination)
+        expect(json_response).to be_an(Array)
+        expect(json_response.size).to eq(3)
+
+        # Check they are sorted by created_at asc (oldest first)
+        expect(json_response.first['name']).to eq('first_response')
+        expect(json_response.last['name']).to eq('resolution')
+
+        # Verify it doesn't include events from other conversations
+        event_names = json_response.map { |e| e['name'] }
+        expect(event_names).not_to include('other_conversation_event')
+      end
+
+      it 'returns empty array when conversation has no reporting events' do
+        conversation_without_events = create(:conversation, account: account)
+
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation_without_events.display_id}/reporting_events",
+            headers: administrator.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+
+        expect(json_response).to be_an(Array)
+        expect(json_response).to be_empty
+      end
+    end
+
+    context 'when agent has limited access' do
+      let(:limited_agent) { create(:user, account: account, role: :agent) }
+
+      it 'returns unauthorized for unassigned conversation without permission' do
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/reporting_events",
+            headers: limited_agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'returns reporting events when agent is assigned to the conversation' do
+        conversation.update!(assignee: limited_agent)
+        # Also create inbox member for the agent
+        create(:inbox_member, user: limited_agent, inbox: conversation.inbox)
+
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/reporting_events",
+            headers: limited_agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+
+        expect(json_response).to be_an(Array)
+        expect(json_response.size).to eq(3)
+      end
+    end
+
+    context 'when agent has team access' do
+      let(:team_agent) { create(:user, account: account, role: :agent) }
+      let(:team) { create(:team, account: account) }
+
+      before do
+        create(:team_member, team: team, user: team_agent)
+        conversation.update!(team: team)
+      end
+
+      it 'allows accessing conversation reporting events via team membership' do
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/reporting_events",
+            headers: team_agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+
+        expect(json_response).to be_an(Array)
+        expect(json_response.size).to eq(3)
+      end
+    end
+  end
 end
diff --git a/spec/enterprise/controllers/api/v1/accounts/reporting_events_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/reporting_events_controller_spec.rb
new file mode 100644
index 000000000..6b3ffc4ba
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/reporting_events_controller_spec.rb
@@ -0,0 +1,217 @@
+require 'rails_helper'
+
+RSpec.describe 'Enterprise Reporting Events API', type: :request do
+  let!(:account) { create(:account) }
+  let!(:admin) { create(:user, account: account, role: :administrator) }
+  let!(:agent) { create(:user, account: account, role: :agent) }
+  let!(:inbox) { create(:inbox, account: account) }
+  let!(:conversation) { create(:conversation, account: account, inbox: inbox, assignee: agent) }
+
+  describe 'GET /api/v1/accounts/{account.id}/reporting_events' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/reporting_events",
+            as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated normal agent user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/reporting_events",
+            headers: agent.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated admin user' do
+      before do
+        create(:reporting_event,
+               account: account,
+               conversation: conversation,
+               inbox: inbox,
+               user: agent,
+               name: 'first_response',
+               value: 120,
+               created_at: 3.days.ago)
+        create(:reporting_event,
+               account: account,
+               conversation: conversation,
+               inbox: inbox,
+               user: agent,
+               name: 'resolution',
+               value: 300,
+               created_at: 2.days.ago)
+        create(:reporting_event,
+               account: account,
+               conversation: conversation,
+               inbox: inbox,
+               user: agent,
+               name: 'reply_time',
+               value: 45,
+               created_at: 1.day.ago)
+      end
+
+      it 'fetches reporting events with pagination' do
+        get "/api/v1/accounts/#{account.id}/reporting_events",
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+
+        # Check structure and pagination
+        expect(json_response).to have_key('payload')
+        expect(json_response).to have_key('meta')
+        expect(json_response['meta']['count']).to eq(3)
+
+        # Check events are sorted by created_at desc (newest first)
+        events = json_response['payload']
+        expect(events.size).to eq(3)
+        expect(events.first['name']).to eq('reply_time')
+        expect(events.last['name']).to eq('first_response')
+      end
+
+      it 'filters reporting events by date range using since and until' do
+        get "/api/v1/accounts/#{account.id}/reporting_events",
+            params: { since: 2.5.days.ago.to_time.to_i.to_s, until: 1.5.days.ago.to_time.to_i.to_s },
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+
+        expect(json_response['meta']['count']).to eq(1)
+        expect(json_response['payload'].first['name']).to eq('resolution')
+      end
+
+      it 'filters reporting events by inbox_id' do
+        other_inbox = create(:inbox, account: account)
+        other_conversation = create(:conversation, account: account, inbox: other_inbox)
+        create(:reporting_event,
+               account: account,
+               conversation: other_conversation,
+               inbox: other_inbox,
+               user: agent,
+               name: 'other_inbox_event')
+
+        get "/api/v1/accounts/#{account.id}/reporting_events",
+            params: { inbox_id: inbox.id },
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+
+        expect(json_response['meta']['count']).to eq(3)
+        expect(json_response['payload'].map { |e| e['name'] }).not_to include('other_inbox_event')
+      end
+
+      it 'filters reporting events by user_id (agent)' do
+        other_agent = create(:user, account: account, role: :agent)
+        create(:reporting_event,
+               account: account,
+               conversation: conversation,
+               inbox: inbox,
+               user: other_agent,
+               name: 'other_agent_event')
+
+        get "/api/v1/accounts/#{account.id}/reporting_events",
+            params: { user_id: agent.id },
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+
+        expect(json_response['meta']['count']).to eq(3)
+        expect(json_response['payload'].map { |e| e['name'] }).not_to include('other_agent_event')
+      end
+
+      it 'filters reporting events by name' do
+        get "/api/v1/accounts/#{account.id}/reporting_events",
+            params: { name: 'first_response' },
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+
+        expect(json_response['meta']['count']).to eq(1)
+        expect(json_response['payload'].first['name']).to eq('first_response')
+      end
+
+      it 'supports combining multiple filters' do
+        # Create more test data
+        other_conversation = create(:conversation, account: account, inbox: inbox, assignee: agent)
+        create(:reporting_event,
+               account: account,
+               conversation: other_conversation,
+               inbox: inbox,
+               user: agent,
+               name: 'first_response',
+               value: 90,
+               created_at: 2.days.ago)
+
+        get "/api/v1/accounts/#{account.id}/reporting_events",
+            params: {
+              inbox_id: inbox.id,
+              user_id: agent.id,
+              name: 'first_response',
+              since: 4.days.ago.to_time.to_i.to_s,
+              until: Time.zone.now.to_time.to_i.to_s
+            },
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+
+        expect(json_response['meta']['count']).to eq(2)
+        expect(json_response['payload'].map { |e| e['name'] }).to all(eq('first_response'))
+      end
+
+      context 'with pagination' do
+        before do
+          # Create more events to test pagination
+          30.times do |i|
+            create(:reporting_event,
+                   account: account,
+                   conversation: conversation,
+                   inbox: inbox,
+                   user: agent,
+                   name: "event_#{i}",
+                   created_at: i.hours.ago)
+          end
+        end
+
+        it 'returns 25 events per page by default' do
+          get "/api/v1/accounts/#{account.id}/reporting_events",
+              headers: admin.create_new_auth_token,
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          json_response = response.parsed_body
+
+          expect(json_response['payload'].size).to eq(25)
+          expect(json_response['meta']['count']).to eq(33) # 30 + 3 original events
+          expect(json_response['meta']['current_page']).to eq(1)
+        end
+
+        it 'supports page navigation' do
+          get "/api/v1/accounts/#{account.id}/reporting_events",
+              params: { page: 2 },
+              headers: admin.create_new_auth_token,
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          json_response = response.parsed_body
+
+          expect(json_response['payload'].size).to eq(8) # Remaining events
+          expect(json_response['meta']['current_page']).to eq(2)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb
index 33941cee8..e79cbd237 100644
--- a/spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb
+++ b/spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb
@@ -245,6 +245,78 @@ RSpec.describe 'Enterprise Billing APIs', type: :request do
     end
   end
 
+  describe 'POST /enterprise/api/v1/accounts/{account.id}/topup_checkout' do
+    let(:stripe_customer_id) { 'cus_test123' }
+    let(:invoice_settings) { Struct.new(:default_payment_method).new('pm_test123') }
+    let(:stripe_customer) { Struct.new(:invoice_settings, :default_source).new(invoice_settings, nil) }
+    let(:stripe_invoice) { Struct.new(:id).new('inv_test123') }
+
+    before do
+      create(:installation_config, name: 'CHATWOOT_CLOUD_PLANS', value: [
+               { 'name' => 'Hacker', 'product_id' => ['prod_hacker'], 'price_ids' => ['price_hacker'] },
+               { 'name' => 'Business', 'product_id' => ['prod_business'], 'price_ids' => ['price_business'] }
+             ])
+    end
+
+    it 'returns unauthorized for unauthenticated user' do
+      post "/enterprise/api/v1/accounts/#{account.id}/topup_checkout", as: :json
+      expect(response).to have_http_status(:unauthorized)
+    end
+
+    it 'returns unauthorized for agent' do
+      post "/enterprise/api/v1/accounts/#{account.id}/topup_checkout",
+           headers: agent.create_new_auth_token,
+           params: { credits: 1000 },
+           as: :json
+      expect(response).to have_http_status(:unauthorized)
+    end
+
+    context 'when it is an admin' do
+      before do
+        account.update!(
+          custom_attributes: { plan_name: 'Business', stripe_customer_id: stripe_customer_id },
+          limits: { 'captain_responses' => 1000 }
+        )
+        allow(Stripe::Customer).to receive(:retrieve).with(stripe_customer_id).and_return(stripe_customer)
+        allow(Stripe::Invoice).to receive(:create).and_return(stripe_invoice)
+        allow(Stripe::InvoiceItem).to receive(:create)
+        allow(Stripe::Invoice).to receive(:finalize_invoice)
+        allow(Stripe::Invoice).to receive(:pay)
+        allow(Stripe::Billing::CreditGrant).to receive(:create)
+      end
+
+      it 'successfully processes topup and returns correct response' do
+        post "/enterprise/api/v1/accounts/#{account.id}/topup_checkout",
+             headers: admin.create_new_auth_token,
+             params: { credits: 1000 },
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['credits']).to eq(1000)
+        expect(json_response['amount']).to eq(20.0)
+        expect(json_response['limits']['captain_responses']).to eq(2000)
+      end
+
+      it 'returns error when credits parameter is missing' do
+        post "/enterprise/api/v1/accounts/#{account.id}/topup_checkout",
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it 'returns error for invalid credits amount' do
+        post "/enterprise/api/v1/accounts/#{account.id}/topup_checkout",
+             headers: admin.create_new_auth_token,
+             params: { credits: 999 },
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+    end
+  end
+
   describe 'POST /enterprise/api/v1/accounts/{account.id}/toggle_deletion' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
diff --git a/spec/enterprise/controllers/twilio/voice_controller_spec.rb b/spec/enterprise/controllers/twilio/voice_controller_spec.rb
index 0f5e4d00a..43141414e 100644
--- a/spec/enterprise/controllers/twilio/voice_controller_spec.rb
+++ b/spec/enterprise/controllers/twilio/voice_controller_spec.rb
@@ -18,36 +18,94 @@ RSpec.describe 'Twilio::VoiceController', type: :request do
     let(:from_number) { '+15550003333' }
     let(:to_number) { channel.phone_number }
 
-    it 'invokes Voice::InboundCallBuilder with expected params and renders its TwiML' do
-      builder_double = instance_double(Voice::InboundCallBuilder)
-      expect(Voice::InboundCallBuilder).to receive(:new).with(
-        hash_including(
-          account: account,
-          inbox: inbox,
-          from_number: from_number,
-          to_number: to_number,
-          call_sid: call_sid
-        )
-      ).and_return(builder_double)
-      expect(builder_double).to receive(:perform).and_return(builder_double)
-      expect(builder_double).to receive(:twiml_response).and_return('<Response/>')
+    it 'invokes Voice::InboundCallBuilder for inbound calls and renders conference TwiML' do
+      instance_double(Voice::InboundCallBuilder)
+      conversation = create(:conversation, account: account, inbox: inbox)
+
+      expect(Voice::InboundCallBuilder).to receive(:perform!).with(
+        account: account,
+        inbox: inbox,
+        from_number: from_number,
+        call_sid: call_sid
+      ).and_return(conversation)
 
       post "/twilio/voice/call/#{digits}", params: {
         'CallSid' => call_sid,
         'From' => from_number,
-        'To' => to_number
+        'To' => to_number,
+        'Direction' => 'inbound'
+      }
+
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to include('<Response>')
+      expect(response.body).to include('<Dial>')
+    end
+
+    it 'syncs an existing outbound conversation when Twilio sends the PSTN leg' do
+      conversation = create(:conversation, account: account, inbox: inbox, identifier: call_sid)
+      sync_double = instance_double(Voice::CallSessionSyncService, perform: conversation)
+
+      expect(Voice::CallSessionSyncService).to receive(:new).with(
+        hash_including(
+          conversation: conversation,
+          call_sid: call_sid,
+          message_call_sid: conversation.identifier,
+          leg: {
+            from_number: from_number,
+            to_number: to_number,
+            direction: 'outbound'
+          }
+        )
+      ).and_return(sync_double)
+
+      post "/twilio/voice/call/#{digits}", params: {
+        'CallSid' => call_sid,
+        'From' => from_number,
+        'To' => to_number,
+        'Direction' => 'outbound-api'
+      }
+
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to include('<Response>')
+    end
+
+    it 'uses the parent call SID when syncing outbound-dial legs' do
+      parent_sid = 'CA_parent'
+      child_sid = 'CA_child'
+      conversation = create(:conversation, account: account, inbox: inbox, identifier: parent_sid)
+      sync_double = instance_double(Voice::CallSessionSyncService, perform: conversation)
+
+      expect(Voice::CallSessionSyncService).to receive(:new).with(
+        hash_including(
+          conversation: conversation,
+          call_sid: child_sid,
+          message_call_sid: parent_sid,
+          leg: {
+            from_number: from_number,
+            to_number: to_number,
+            direction: 'outbound'
+          }
+        )
+      ).and_return(sync_double)
+
+      post "/twilio/voice/call/#{digits}", params: {
+        'CallSid' => child_sid,
+        'ParentCallSid' => parent_sid,
+        'From' => from_number,
+        'To' => to_number,
+        'Direction' => 'outbound-dial'
       }
 
       expect(response).to have_http_status(:ok)
-      expect(response.body).to eq('<Response/>')
     end
 
     it 'raises not found when inbox is not present' do
-      expect(Voice::InboundCallBuilder).not_to receive(:new)
+      expect(Voice::InboundCallBuilder).not_to receive(:perform!)
       post '/twilio/voice/call/19998887777', params: {
         'CallSid' => call_sid,
         'From' => from_number,
-        'To' => to_number
+        'To' => to_number,
+        'Direction' => 'inbound'
       }
       expect(response).to have_http_status(:not_found)
     end
@@ -62,7 +120,8 @@ RSpec.describe 'Twilio::VoiceController', type: :request do
         hash_including(
           account: account,
           call_sid: call_sid,
-          call_status: 'completed'
+          call_status: 'completed',
+          payload: hash_including('CallSid' => call_sid, 'CallStatus' => 'completed')
         )
       ).and_return(service_double)
       expect(service_double).to receive(:perform)
diff --git a/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb b/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb
index 23ed2ecec..565fc26cf 100644
--- a/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb
+++ b/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Captain::Conversation::ResponseBuilderJob, type: :job do
       end
 
       it 'uses Captain::Llm::AssistantChatService' do
-        expect(Captain::Llm::AssistantChatService).to receive(:new).with(assistant: assistant)
+        expect(Captain::Llm::AssistantChatService).to receive(:new).with(assistant: assistant, conversation_id: conversation.id)
         expect(Captain::Assistant::AgentRunnerService).not_to receive(:new)
 
         described_class.perform_now(conversation, assistant)
diff --git a/spec/enterprise/jobs/captain/copilot/response_job_spec.rb b/spec/enterprise/jobs/captain/copilot/response_job_spec.rb
index c8aacda5e..6f88a18ba 100644
--- a/spec/enterprise/jobs/captain/copilot/response_job_spec.rb
+++ b/spec/enterprise/jobs/captain/copilot/response_job_spec.rb
@@ -18,7 +18,9 @@ RSpec.describe Captain::Copilot::ResponseJob, type: :job do
         copilot_thread_id: copilot_thread.id,
         conversation_id: conversation_id
       ).and_return(chat_service)
-      allow(chat_service).to receive(:generate_response).with(message)
+      # When copilot_thread_id is present, message is already in previous_history
+      # so nil is passed to avoid duplicate
+      allow(chat_service).to receive(:generate_response).with(nil)
     end
 
     it 'initializes ChatService with correct parameters and calls generate_response' do
@@ -28,7 +30,9 @@ RSpec.describe Captain::Copilot::ResponseJob, type: :job do
         copilot_thread_id: copilot_thread.id,
         conversation_id: conversation_id
       )
-      expect(chat_service).to receive(:generate_response).with(message)
+      # Message is already persisted in copilot_thread.previous_history,
+      # so we pass nil to prevent duplicate user messages
+      expect(chat_service).to receive(:generate_response).with(nil)
       described_class.perform_now(
         assistant: assistant,
         conversation_id: conversation_id,
diff --git a/spec/enterprise/jobs/captain/tools/firecrawl_parser_job_spec.rb b/spec/enterprise/jobs/captain/tools/firecrawl_parser_job_spec.rb
index f2a42c7a2..bfffe7894 100644
--- a/spec/enterprise/jobs/captain/tools/firecrawl_parser_job_spec.rb
+++ b/spec/enterprise/jobs/captain/tools/firecrawl_parser_job_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Captain::Tools::FirecrawlParserJob, type: :job do
       expect(document).to have_attributes(
         content: payload[:markdown],
         name: payload[:metadata]['title'],
-        external_link: payload[:metadata]['url'],
+        external_link: 'https://www.firecrawl.dev',
         status: 'available'
       )
     end
@@ -32,7 +32,7 @@ RSpec.describe Captain::Tools::FirecrawlParserJob, type: :job do
       existing_document = create(:captain_document,
                                  assistant: assistant,
                                  account: assistant.account,
-                                 external_link: payload[:metadata]['url'],
+                                 external_link: 'https://www.firecrawl.dev',
                                  content: 'old content',
                                  name: 'old title',
                                  status: :in_progress)
@@ -42,7 +42,9 @@ RSpec.describe Captain::Tools::FirecrawlParserJob, type: :job do
       end.not_to change(assistant.documents, :count)
 
       existing_document.reload
+      # Payload URL ends with '/', but we persist the canonical URL without it.
       expect(existing_document).to have_attributes(
+        external_link: 'https://www.firecrawl.dev',
         content: payload[:markdown],
         name: payload[:metadata]['title'],
         status: 'available'
diff --git a/spec/enterprise/jobs/captain/tools/simple_page_crawl_parser_job_spec.rb b/spec/enterprise/jobs/captain/tools/simple_page_crawl_parser_job_spec.rb
index f563ba44d..3872629e5 100644
--- a/spec/enterprise/jobs/captain/tools/simple_page_crawl_parser_job_spec.rb
+++ b/spec/enterprise/jobs/captain/tools/simple_page_crawl_parser_job_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Captain::Tools::SimplePageCrawlParserJob, type: :job do
   describe '#perform' do
     let(:assistant) { create(:captain_assistant) }
-    let(:page_link) { 'https://example.com/page' }
+    let(:page_link) { 'https://example.com/page/' }
     let(:page_title) { 'Example Page Title' }
     let(:content) { 'Some page content here' }
     let(:crawler) { instance_double(Captain::Tools::SimplePageCrawlService) }
@@ -24,7 +24,7 @@ RSpec.describe Captain::Tools::SimplePageCrawlParserJob, type: :job do
         end.to change(assistant.documents, :count).by(1)
 
         document = assistant.documents.last
-        expect(document.external_link).to eq(page_link)
+        expect(document.external_link).to eq('https://example.com/page')
         expect(document.name).to eq(page_title)
         expect(document.content).to eq(content)
         expect(document.status).to eq('available')
@@ -33,7 +33,7 @@ RSpec.describe Captain::Tools::SimplePageCrawlParserJob, type: :job do
       it 'updates existing document if one exists' do
         existing_document = create(:captain_document,
                                    assistant: assistant,
-                                   external_link: page_link,
+                                   external_link: 'https://example.com/page',
                                    name: 'Old Title',
                                    content: 'Old content')
 
diff --git a/spec/enterprise/jobs/migration/company_account_batch_job_spec.rb b/spec/enterprise/jobs/migration/company_account_batch_job_spec.rb
new file mode 100644
index 000000000..499b96287
--- /dev/null
+++ b/spec/enterprise/jobs/migration/company_account_batch_job_spec.rb
@@ -0,0 +1,133 @@
+require 'rails_helper'
+
+RSpec.describe Migration::CompanyAccountBatchJob, type: :job do
+  let(:account) { create(:account) }
+
+  describe '#perform' do
+    before do
+      # Stub EmailProvideInfo to control behavior in tests
+      allow(EmailProviderInfo).to receive(:call) do |email|
+        domain = email.split('@').last&.downcase
+        case domain
+        when 'gmail.com', 'yahoo.com', 'hotmail.com', 'uol.com.br'
+          'free_provider' # generic free provider name
+        end
+      end
+    end
+
+    context 'when contact has business email' do
+      let!(:contact) { create(:contact, account: account, email: 'user@acme.com') }
+
+      it 'creates a company and associates the contact' do
+        # Clean up companies created by Part 2's callback
+        Company.delete_all
+        # rubocop:disable Rails/SkipsModelValidations
+        contact.update_column(:company_id, nil)
+        # rubocop:enable Rails/SkipsModelValidations
+
+        expect do
+          described_class.perform_now(account)
+        end.to change(Company, :count).by(1)
+        contact.reload
+        expect(contact.company).to be_present
+        expect(contact.company.domain).to eq('acme.com')
+        expect(contact.company.name).to eq('Acme')
+      end
+    end
+
+    context 'when contact has free email' do
+      let!(:contact) { create(:contact, account: account, email: 'user@gmail.com') }
+
+      it 'does not create a company' do
+        expect do
+          described_class.perform_now(account)
+        end.not_to change(Company, :count)
+        contact.reload
+        expect(contact.company_id).to be_nil
+      end
+    end
+
+    context 'when contact has company_name in additional_attributes' do
+      let!(:contact) do
+        create(:contact, account: account, email: 'user@acme.com', additional_attributes: { 'company_name' => 'Acme Corporation' })
+      end
+
+      it 'uses the saved company name' do
+        described_class.perform_now(account)
+        contact.reload
+        expect(contact.company.name).to eq('Acme Corporation')
+      end
+    end
+
+    context 'when contact already has a company' do
+      let!(:existing_company) { create(:company, account: account, domain: 'existing.com') }
+      let!(:contact) do
+        create(:contact, account: account, email: 'user@acme.com', company: existing_company)
+      end
+
+      it 'does not change the existing company' do
+        described_class.perform_now(account)
+        contact.reload
+        expect(contact.company_id).to eq(existing_company.id)
+      end
+    end
+
+    context 'when multiple contacts have the same domain' do
+      let!(:contact1) { create(:contact, account: account, email: 'user1@acme.com') }
+      let!(:contact2) { create(:contact, account: account, email: 'user2@acme.com') }
+
+      it 'creates only one company for the domain' do
+        # Clean up companies created by Part 2's callback
+        Company.delete_all
+        # rubocop:disable Rails/SkipsModelValidations
+        contact1.update_column(:company_id, nil)
+        contact2.update_column(:company_id, nil)
+        # rubocop:enable Rails/SkipsModelValidations
+
+        expect do
+          described_class.perform_now(account)
+        end.to change(Company, :count).by(1)
+        contact1.reload
+        contact2.reload
+        expect(contact1.company_id).to eq(contact2.company_id)
+        expect(contact1.company.domain).to eq('acme.com')
+      end
+    end
+
+    context 'when contact has no email' do
+      let!(:contact) { create(:contact, account: account, email: nil) }
+
+      it 'skips the contact' do
+        expect do
+          described_class.perform_now(account)
+        end.not_to change(Company, :count)
+        contact.reload
+        expect(contact.company_id).to be_nil
+      end
+    end
+
+    context 'when processing large batch' do
+      before do
+        contacts_data = Array.new(2000) do |i|
+          {
+            account_id: account.id,
+            email: "user#{i}@company#{i % 100}.com",
+            name: "User #{i}",
+            created_at: Time.current,
+            updated_at: Time.current
+          }
+        end
+        # rubocop:disable Rails/SkipsModelValidations
+        Contact.insert_all(contacts_data)
+        # rubocop:enable Rails/SkipsModelValidations
+      end
+
+      it 'processes all contacts in batches' do
+        expect do
+          described_class.perform_now(account)
+        end.to change(Company, :count).by(100)
+        expect(account.contacts.where.not(company_id: nil).count).to eq(2000)
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/jobs/migration/company_backfill_job_spec.rb b/spec/enterprise/jobs/migration/company_backfill_job_spec.rb
new file mode 100644
index 000000000..e60b84487
--- /dev/null
+++ b/spec/enterprise/jobs/migration/company_backfill_job_spec.rb
@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+RSpec.describe Migration::CompanyBackfillJob, type: :job do
+  describe '#perform' do
+    it 'enqueues the job' do
+      expect { described_class.perform_later }
+        .to have_enqueued_job(described_class)
+        .on_queue('low')
+    end
+
+    context 'when accounts exist' do
+      let!(:account1) { create(:account) }
+      let!(:account2) { create(:account) }
+
+      it 'enqueues CompanyAccountBatchJob for each account' do
+        expect do
+          described_class.perform_now
+        end.to have_enqueued_job(Migration::CompanyAccountBatchJob)
+          .with(account1)
+          .and have_enqueued_job(Migration::CompanyAccountBatchJob)
+          .with(account2)
+      end
+    end
+
+    context 'when no accounts exist' do
+      it 'completes without error' do
+        expect { described_class.perform_now }.not_to raise_error
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/lib/integrations/openai/processor_service_spec.rb b/spec/enterprise/lib/integrations/openai/processor_service_spec.rb
index 4707aff87..88e75ea07 100644
--- a/spec/enterprise/lib/integrations/openai/processor_service_spec.rb
+++ b/spec/enterprise/lib/integrations/openai/processor_service_spec.rb
@@ -5,21 +5,39 @@ RSpec.describe Integrations::Openai::ProcessorService do
 
   let(:account) { create(:account) }
   let(:hook) { create(:integrations_hook, :openai, account: account) }
-  let(:expected_headers) { { 'Authorization' => "Bearer #{hook.settings['api_key']}" } }
-  let(:openai_response) do
-    {
-      'choices' => [
-        {
-          'message' => {
-            'content' => 'This is a reply from openai.'
-          }
-        }
-      ]
-    }.to_json
+
+  # Mock RubyLLM objects
+  let(:mock_chat) { instance_double(RubyLLM::Chat) }
+  let(:mock_context) { instance_double(RubyLLM::Context) }
+  let(:mock_config) { OpenStruct.new }
+  let(:mock_response) do
+    instance_double(
+      RubyLLM::Message,
+      content: 'This is a reply from openai.',
+      input_tokens: nil,
+      output_tokens: nil
+    )
+  end
+  let(:mock_empty_response) do
+    instance_double(
+      RubyLLM::Message,
+      content: '',
+      input_tokens: nil,
+      output_tokens: nil
+    )
   end
 
   let(:conversation) { create(:conversation, account: account) }
 
+  before do
+    allow(RubyLLM).to receive(:context).and_yield(mock_config).and_return(mock_context)
+    allow(mock_context).to receive(:chat).and_return(mock_chat)
+
+    allow(mock_chat).to receive(:with_instructions).and_return(mock_chat)
+    allow(mock_chat).to receive(:add_message).and_return(mock_chat)
+    allow(mock_chat).to receive(:ask).and_return(mock_response)
+  end
+
   describe '#perform' do
     context 'when event name is label_suggestion with labels with < 3 messages' do
       let(:event) { { 'name' => 'label_suggestion', 'data' => { 'conversation_display_id' => conversation.display_id } } }
@@ -49,21 +67,15 @@ RSpec.describe Integrations::Openai::ProcessorService do
       end
 
       it 'returns the label suggestions' do
-        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-          .with(body: anything, headers: expected_headers)
-          .to_return(status: 200, body: openai_response, headers: {})
-
         result = subject.perform
-        expect(result).to eq({ :message => 'This is a reply from openai.' })
+        expect(result).to eq({ message: 'This is a reply from openai.' })
       end
 
       it 'returns empty string if openai response is blank' do
-        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-          .with(body: anything, headers: expected_headers)
-          .to_return(status: 200, body: '{}', headers: {})
+        allow(mock_chat).to receive(:ask).and_return(mock_empty_response)
 
         result = subject.perform
-        expect(result).to eq({ :message => '' })
+        expect(result[:message]).to eq('')
       end
     end
 
diff --git a/spec/enterprise/models/captain/document_spec.rb b/spec/enterprise/models/captain/document_spec.rb
index 56dc1727c..e6543e0d7 100644
--- a/spec/enterprise/models/captain/document_spec.rb
+++ b/spec/enterprise/models/captain/document_spec.rb
@@ -4,6 +4,17 @@ RSpec.describe Captain::Document, type: :model do
   let(:account) { create(:account) }
   let(:assistant) { create(:captain_assistant, account: account) }
 
+  describe 'URL normalization' do
+    it 'removes a trailing slash before validation' do
+      document = create(:captain_document,
+                        assistant: assistant,
+                        account: account,
+                        external_link: 'https://example.com/path/')
+
+      expect(document.external_link).to eq('https://example.com/path')
+    end
+  end
+
   describe 'PDF support' do
     let(:pdf_document) do
       doc = build(:captain_document, assistant: assistant, account: account)
@@ -82,4 +93,161 @@ RSpec.describe Captain::Document, type: :model do
       end
     end
   end
+
+  describe 'response builder job callback' do
+    before { clear_enqueued_jobs }
+
+    describe 'non-PDF documents' do
+      it 'enqueues when created with available status and content' do
+        expect do
+          create(:captain_document, assistant: assistant, account: account, status: :available)
+        end.to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+
+      it 'does not enqueue when created available without content' do
+        expect do
+          create(:captain_document, assistant: assistant, account: account, status: :available, content: nil)
+        end.not_to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+
+      it 'enqueues when status transitions to available with existing content' do
+        document = create(:captain_document, assistant: assistant, account: account, status: :in_progress)
+
+        expect do
+          document.update!(status: :available)
+        end.to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+
+      it 'does not enqueue when status transitions to available without content' do
+        document = create(
+          :captain_document,
+          assistant: assistant,
+          account: account,
+          status: :in_progress,
+          content: nil
+        )
+
+        expect do
+          document.update!(status: :available)
+        end.not_to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+
+      it 'enqueues when content is populated on an available document' do
+        document = create(
+          :captain_document,
+          assistant: assistant,
+          account: account,
+          status: :available,
+          content: nil
+        )
+        clear_enqueued_jobs
+
+        expect do
+          document.update!(content: 'Fresh content from crawl')
+        end.to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+
+      it 'enqueues when content changes on an available document' do
+        document = create(
+          :captain_document,
+          assistant: assistant,
+          account: account,
+          status: :available,
+          content: 'Initial content'
+        )
+        clear_enqueued_jobs
+
+        expect do
+          document.update!(content: 'Updated crawl content')
+        end.to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+
+      it 'does not enqueue when content is cleared on an available document' do
+        document = create(
+          :captain_document,
+          assistant: assistant,
+          account: account,
+          status: :available,
+          content: 'Initial content'
+        )
+        clear_enqueued_jobs
+
+        expect do
+          document.update!(content: nil)
+        end.not_to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+
+      it 'does not enqueue for metadata-only updates' do
+        document = create(:captain_document, assistant: assistant, account: account, status: :available)
+        clear_enqueued_jobs
+
+        expect do
+          document.update!(metadata: { 'title' => 'Updated Again' })
+        end.not_to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+
+      it 'does not enqueue while document remains in progress' do
+        document = create(:captain_document, assistant: assistant, account: account, status: :in_progress)
+
+        expect do
+          document.update!(metadata: { 'title' => 'Updated' })
+        end.not_to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+    end
+
+    describe 'PDF documents' do
+      def build_pdf_document(status:, content:)
+        build(
+          :captain_document,
+          assistant: assistant,
+          account: account,
+          status: status,
+          content: content
+        ).tap do |doc|
+          doc.pdf_file.attach(
+            io: StringIO.new('PDF content'),
+            filename: 'sample.pdf',
+            content_type: 'application/pdf'
+          )
+        end
+      end
+
+      it 'enqueues when created available without content' do
+        document = build_pdf_document(status: :available, content: nil)
+
+        expect do
+          document.save!
+        end.to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+
+      it 'enqueues when status transitions to available' do
+        document = build_pdf_document(status: :in_progress, content: nil)
+        document.save!
+        clear_enqueued_jobs
+
+        expect do
+          document.update!(status: :available)
+        end.to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+
+      it 'does not enqueue when content updates without status change' do
+        document = build_pdf_document(status: :available, content: nil)
+        document.save!
+        clear_enqueued_jobs
+
+        expect do
+          document.update!(content: 'Extracted PDF text')
+        end.not_to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+      end
+    end
+
+    it 'does not enqueue when the document is destroyed' do
+      document = create(:captain_document, assistant: assistant, account: account, status: :available)
+      clear_enqueued_jobs
+
+      expect do
+        document.destroy!
+      end.not_to have_enqueued_job(Captain::Documents::ResponseBuilderJob)
+    end
+  end
 end
diff --git a/spec/enterprise/models/captain/scenario_spec.rb b/spec/enterprise/models/captain/scenario_spec.rb
index 45009a3b0..163581f01 100644
--- a/spec/enterprise/models/captain/scenario_spec.rb
+++ b/spec/enterprise/models/captain/scenario_spec.rb
@@ -23,8 +23,8 @@ RSpec.describe Captain::Scenario, type: :model do
         enabled_scenario = create(:captain_scenario, assistant: assistant, account: account, enabled: true)
         disabled_scenario = create(:captain_scenario, assistant: assistant, account: account, enabled: false)
 
-        expect(described_class.enabled).to include(enabled_scenario)
-        expect(described_class.enabled).not_to include(disabled_scenario)
+        expect(described_class.enabled.pluck(:id)).to include(enabled_scenario.id)
+        expect(described_class.enabled.pluck(:id)).not_to include(disabled_scenario.id)
       end
     end
   end
diff --git a/spec/enterprise/models/contact_company_association_spec.rb b/spec/enterprise/models/contact_company_association_spec.rb
new file mode 100644
index 000000000..065d5bc97
--- /dev/null
+++ b/spec/enterprise/models/contact_company_association_spec.rb
@@ -0,0 +1,61 @@
+require 'rails_helper'
+
+RSpec.describe Contact, type: :model do
+  describe 'company auto-association' do
+    let(:account) { create(:account) }
+
+    context 'when creating a new contact with business email' do
+      it 'automatically creates and associates a company' do
+        expect do
+          create(:contact, email: 'john@acme.com', account: account)
+        end.to change(Company, :count).by(1)
+        contact = described_class.last
+        expect(contact.company).to be_present
+        expect(contact.company.domain).to eq('acme.com')
+      end
+
+      it 'does not create company for free email providers' do
+        expect do
+          create(:contact, email: 'john@gmail.com', account: account)
+        end.not_to change(Company, :count)
+      end
+    end
+
+    context 'when updating a contact to add email for first time' do
+      it 'creates and associates company' do
+        contact = create(:contact, email: nil, account: account)
+        expect do
+          contact.update(email: 'john@acme.com')
+        end.to change(Company, :count).by(1)
+        contact.reload
+        expect(contact.company.domain).to eq('acme.com')
+      end
+    end
+
+    context 'when updating a contact that already has a company' do
+      it 'does not change company when email changes' do
+        existing_company = create(:company, domain: 'oldcompany.com', account: account)
+        contact = create(:contact, email: 'john@oldcompany.com', company: existing_company, account: account)
+
+        expect do
+          contact.update(email: 'john@new_company.com')
+        end.not_to change(Company, :count)
+        contact.reload
+        expect(contact.company).to eq(existing_company)
+      end
+    end
+
+    context 'when multiple contacts share the same domain' do
+      it 'associates all contacts with the same company' do
+        contacts = ['john@acme.com', 'jane@acme.com', 'bob@acme.com']
+        contacts.each do |contact|
+          create(:contact, email: contact, account: account)
+        end
+
+        expect(Company.where(domain: 'acme.com', account: account).count).to eq(1)
+        company = Company.find_by(domain: 'acme.com', account: account)
+        expect(company.contacts.count).to eq(contacts.length)
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/copilot/chat_service_spec.rb b/spec/enterprise/services/captain/copilot/chat_service_spec.rb
index a02063b5e..4903fb6a5 100644
--- a/spec/enterprise/services/captain/copilot/chat_service_spec.rb
+++ b/spec/enterprise/services/captain/copilot/chat_service_spec.rb
@@ -7,7 +7,6 @@ RSpec.describe Captain::Copilot::ChatService do
   let(:assistant) { create(:captain_assistant, account: account) }
   let(:contact) { create(:contact, account: account) }
   let(:conversation) { create(:conversation, account: account, inbox: inbox, contact: contact) }
-  let(:mock_openai_client) { instance_double(OpenAI::Client) }
   let(:copilot_thread) { create(:captain_copilot_thread, account: account, user: user) }
   let!(:copilot_message) do
     create(
@@ -20,13 +19,29 @@ RSpec.describe Captain::Copilot::ChatService do
     { user_id: user.id, copilot_thread_id: copilot_thread.id, conversation_id: conversation.display_id }
   end
 
+  # RubyLLM mocks
+  let(:mock_chat) { instance_double(RubyLLM::Chat) }
+  let(:mock_response) do
+    instance_double(RubyLLM::Message, content: '{ "content": "Hey", "reasoning": "Test reasoning", "reply_suggestion": false }')
+  end
+
   before do
-    create(:installation_config, name: 'CAPTAIN_OPEN_AI_API_KEY', value: 'test-key')
-    create(:installation_config, name: 'CAPTAIN_OPEN_AI_ENDPOINT', value: 'https://api.openai.com/')
-    allow(OpenAI::Client).to receive(:new).and_return(mock_openai_client)
-    allow(mock_openai_client).to receive(:chat).and_return({
-      choices: [{ message: { content: '{ "content": "Hey" }' } }]
-    }.with_indifferent_access)
+    InstallationConfig.find_or_create_by(name: 'CAPTAIN_OPEN_AI_API_KEY') do |c|
+      c.value = 'test-key'
+    end
+
+    allow(RubyLLM).to receive(:chat).and_return(mock_chat)
+    allow(mock_chat).to receive(:with_temperature).and_return(mock_chat)
+    allow(mock_chat).to receive(:with_params).and_return(mock_chat)
+    allow(mock_chat).to receive(:with_tool).and_return(mock_chat)
+    allow(mock_chat).to receive(:with_instructions).and_return(mock_chat)
+    allow(mock_chat).to receive(:add_message).and_return(mock_chat)
+    allow(mock_chat).to receive(:on_new_message).and_return(mock_chat)
+    allow(mock_chat).to receive(:on_end_message).and_return(mock_chat)
+    allow(mock_chat).to receive(:on_tool_call).and_return(mock_chat)
+    allow(mock_chat).to receive(:on_tool_result).and_return(mock_chat)
+    allow(mock_chat).to receive(:messages).and_return([])
+    allow(mock_chat).to receive(:ask).and_return(mock_response)
   end
 
   describe '#initialize' do
@@ -48,48 +63,6 @@ RSpec.describe Captain::Copilot::ChatService do
       expect(messages.second[:role]).to eq('system')
       expect(messages.second[:content]).to include(account.id.to_s)
     end
-
-    it 'initializes OpenAI client with configured endpoint' do
-      expect(OpenAI::Client).to receive(:new).with(
-        access_token: 'test-key',
-        uri_base: 'https://api.openai.com/',
-        log_errors: Rails.env.development?
-      )
-
-      described_class.new(assistant, config)
-    end
-
-    context 'when CAPTAIN_OPEN_AI_ENDPOINT is not configured' do
-      before do
-        InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_ENDPOINT')&.destroy
-      end
-
-      it 'uses default OpenAI endpoint' do
-        expect(OpenAI::Client).to receive(:new).with(
-          access_token: 'test-key',
-          uri_base: 'https://api.openai.com/',
-          log_errors: Rails.env.development?
-        )
-
-        described_class.new(assistant, config)
-      end
-    end
-
-    context 'when custom endpoint is configured' do
-      before do
-        InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_ENDPOINT').update!(value: 'https://custom.azure.com/')
-      end
-
-      it 'uses custom endpoint for OpenAI client' do
-        expect(OpenAI::Client).to receive(:new).with(
-          access_token: 'test-key',
-          uri_base: 'https://custom.azure.com/',
-          log_errors: Rails.env.development?
-        )
-
-        described_class.new(assistant, config)
-      end
-    end
   end
 
   describe '#generate_response' do
@@ -112,82 +85,19 @@ RSpec.describe Captain::Copilot::ChatService do
     end
 
     it 'returns the response from request_chat_completion' do
-      expect(service.generate_response('Hello')).to eq({ 'content' => 'Hey' })
+      result = service.generate_response('Hello')
+
+      expect(result).to eq({ 'content' => 'Hey', 'reasoning' => 'Test reasoning', 'reply_suggestion' => false })
     end
 
-    context 'when response contains tool calls' do
-      before do
-        allow(mock_openai_client).to receive(:chat).and_return(
-          {
-            choices: [{ message: { 'tool_calls' => tool_calls } }]
-          }.with_indifferent_access,
-          {
-            choices: [{ message: { content: '{ "content": "Tool response processed" }' } }]
-          }.with_indifferent_access
-        )
-      end
-
-      context 'when tool call is valid' do
-        let(:tool_calls) do
-          [{
-            'id' => 'call_123',
-            'function' => {
-              'name' => 'get_conversation',
-              'arguments' => "{ \"conversation_id\": #{conversation.display_id} }"
-            }
-          }]
-        end
-
-        it 'processes tool calls and appends them to messages' do
-          result = service.generate_response("Find conversation #{conversation.id}")
-
-          expect(result).to eq({ 'content' => 'Tool response processed' })
-          expect(service.messages).to include(
-            { role: 'assistant', tool_calls: tool_calls }
-          )
-          expect(service.messages).to include(
-            {
-              role: 'tool', tool_call_id: 'call_123', content: conversation.to_llm_text
-            }
-          )
-
-          expect(result).to eq({ 'content' => 'Tool response processed' })
-        end
-      end
-
-      context 'when tool call is invalid' do
-        let(:tool_calls) do
-          [{
-            'id' => 'call_123',
-            'function' => {
-              'name' => 'get_settings',
-              'arguments' => '{}'
-            }
-          }]
-        end
-
-        it 'handles invalid tool calls' do
-          result = service.generate_response('Find settings')
-
-          expect(result).to eq({ 'content' => 'Tool response processed' })
-          expect(service.messages).to include(
-            {
-              role: 'assistant', tool_calls: tool_calls
-            }
-          )
-          expect(service.messages).to include(
-            {
-              role: 'tool',
-              tool_call_id: 'call_123',
-              content: 'Tool not available'
-            }
-          )
-        end
-      end
+    it 'increments response usage for the account' do
+      expect do
+        service.generate_response('Hello')
+      end.to(change { account.reload.custom_attributes['captain_responses_usage'].to_i }.by(1))
     end
   end
 
-  describe '#setup_user' do
+  describe 'user setup behavior' do
     it 'sets user when user_id is present in config' do
       service = described_class.new(assistant, { user_id: user.id })
       expect(service.user).to eq(user)
@@ -199,7 +109,7 @@ RSpec.describe Captain::Copilot::ChatService do
     end
   end
 
-  describe '#setup_message_history' do
+  describe 'message history behavior' do
     context 'when copilot_thread_id is present' do
       it 'finds the copilot thread and sets previous history from it' do
         service = described_class.new(assistant, { copilot_thread_id: copilot_thread.id })
@@ -227,7 +137,7 @@ RSpec.describe Captain::Copilot::ChatService do
     end
   end
 
-  describe '#build_messages' do
+  describe 'message building behavior' do
     it 'includes system message and account context' do
       service = described_class.new(assistant, {})
       messages = service.messages
@@ -257,13 +167,9 @@ RSpec.describe Captain::Copilot::ChatService do
     end
   end
 
-  describe '#persist_message' do
+  describe 'message persistence behavior' do
     context 'when copilot_thread is present' do
-      it 'creates a copilot message' do
-        allow(mock_openai_client).to receive(:chat).and_return({
-          choices: [{ message: { content: '{ "content": "Hey" }' } }]
-        }.with_indifferent_access)
-
+      it 'creates a copilot message with the response' do
         expect do
           described_class.new(assistant, { copilot_thread_id: copilot_thread.id }).generate_response('Hello')
         end.to change(CopilotMessage, :count).by(1)
@@ -276,10 +182,6 @@ RSpec.describe Captain::Copilot::ChatService do
 
     context 'when copilot_thread is not present' do
       it 'does not create a copilot message' do
-        allow(mock_openai_client).to receive(:chat).and_return({
-          choices: [{ message: { content: '{ "content": "Hey" }' } }]
-        }.with_indifferent_access)
-
         expect do
           described_class.new(assistant, {}).generate_response('Hello')
         end.not_to(change(CopilotMessage, :count))
diff --git a/spec/enterprise/services/captain/llm/pdf_processing_service_spec.rb b/spec/enterprise/services/captain/llm/pdf_processing_service_spec.rb
index 9dc416685..fd519dcdd 100644
--- a/spec/enterprise/services/captain/llm/pdf_processing_service_spec.rb
+++ b/spec/enterprise/services/captain/llm/pdf_processing_service_spec.rb
@@ -28,13 +28,14 @@ RSpec.describe Captain::Llm::PdfProcessingService do
     context 'when uploading PDF to OpenAI' do
       let(:mock_client) { instance_double(OpenAI::Client) }
       let(:pdf_content) { 'PDF content' }
+      let(:blob_double) { instance_double(ActiveStorage::Blob) }
+      let(:pdf_file) { instance_double(ActiveStorage::Attachment) }
 
       before do
         allow(document).to receive(:openai_file_id).and_return(nil)
-
-        # Use a simple double for ActiveStorage since it's a complex Rails object
-        pdf_file = double('pdf_file', download: pdf_content) # rubocop:disable RSpec/VerifiedDoubles
         allow(document).to receive(:pdf_file).and_return(pdf_file)
+        allow(pdf_file).to receive(:blob).and_return(blob_double)
+        allow(blob_double).to receive(:open).and_yield(StringIO.new(pdf_content))
 
         allow(OpenAI::Client).to receive(:new).and_return(mock_client)
         # Use a simple double for OpenAI::Files as it may not be loaded
diff --git a/spec/enterprise/services/captain/tools/copilot/get_article_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/get_article_service_spec.rb
index 72f4e1cb4..5227a3201 100644
--- a/spec/enterprise/services/captain/tools/copilot/get_article_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/copilot/get_article_service_spec.rb
@@ -19,19 +19,8 @@ RSpec.describe Captain::Tools::Copilot::GetArticleService do
   end
 
   describe '#parameters' do
-    it 'returns the expected parameter schema' do
-      expect(service.parameters).to eq(
-        {
-          type: 'object',
-          properties: {
-            article_id: {
-              type: 'number',
-              description: 'The ID of the article to retrieve'
-            }
-          },
-          required: %w[article_id]
-        }
-      )
+    it 'defines article_id parameter' do
+      expect(service.parameters.keys).to contain_exactly(:article_id)
     end
   end
 
@@ -79,13 +68,13 @@ RSpec.describe Captain::Tools::Copilot::GetArticleService do
   describe '#execute' do
     context 'when article_id is blank' do
       it 'returns error message' do
-        expect(service.execute({})).to eq('Missing required parameters')
+        expect(service.execute(article_id: nil)).to eq('Article not found')
       end
     end
 
     context 'when article is not found' do
       it 'returns not found message' do
-        expect(service.execute({ 'article_id' => 999 })).to eq('Article not found')
+        expect(service.execute(article_id: 999)).to eq('Article not found')
       end
     end
 
@@ -94,7 +83,7 @@ RSpec.describe Captain::Tools::Copilot::GetArticleService do
       let(:article) { create(:article, account: account, portal: portal, author: user, title: 'Test Article', content: 'Content') }
 
       it 'returns the article in llm text format' do
-        result = service.execute({ 'article_id' => article.id })
+        result = service.execute(article_id: article.id)
         expect(result).to eq(article.to_llm_text)
       end
 
@@ -104,7 +93,7 @@ RSpec.describe Captain::Tools::Copilot::GetArticleService do
         let(:other_article) { create(:article, account: other_account, portal: other_portal, author: user, title: 'Other Article') }
 
         it 'returns not found message' do
-          expect(service.execute({ 'article_id' => other_article.id })).to eq('Article not found')
+          expect(service.execute(article_id: other_article.id)).to eq('Article not found')
         end
       end
     end
diff --git a/spec/enterprise/services/captain/tools/copilot/get_contact_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/get_contact_service_spec.rb
index de319bfa1..df2e5c159 100644
--- a/spec/enterprise/services/captain/tools/copilot/get_contact_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/copilot/get_contact_service_spec.rb
@@ -19,19 +19,8 @@ RSpec.describe Captain::Tools::Copilot::GetContactService do
   end
 
   describe '#parameters' do
-    it 'returns the expected parameter schema' do
-      expect(service.parameters).to eq(
-        {
-          type: 'object',
-          properties: {
-            contact_id: {
-              type: 'number',
-              description: 'The ID of the contact to retrieve'
-            }
-          },
-          required: %w[contact_id]
-        }
-      )
+    it 'defines contact_id parameter' do
+      expect(service.parameters.keys).to contain_exactly(:contact_id)
     end
   end
 
@@ -78,14 +67,14 @@ RSpec.describe Captain::Tools::Copilot::GetContactService do
 
   describe '#execute' do
     context 'when contact_id is blank' do
-      it 'returns error message' do
-        expect(service.execute({})).to eq('Missing required parameters')
+      it 'returns not found message' do
+        expect(service.execute(contact_id: nil)).to eq('Contact not found')
       end
     end
 
     context 'when contact is not found' do
       it 'returns not found message' do
-        expect(service.execute({ 'contact_id' => 999 })).to eq('Contact not found')
+        expect(service.execute(contact_id: 999)).to eq('Contact not found')
       end
     end
 
@@ -93,7 +82,7 @@ RSpec.describe Captain::Tools::Copilot::GetContactService do
       let(:contact) { create(:contact, account: account) }
 
       it 'returns the contact in llm text format' do
-        result = service.execute({ 'contact_id' => contact.id })
+        result = service.execute(contact_id: contact.id)
         expect(result).to eq(contact.to_llm_text)
       end
 
@@ -102,7 +91,7 @@ RSpec.describe Captain::Tools::Copilot::GetContactService do
         let(:other_contact) { create(:contact, account: other_account) }
 
         it 'returns not found message' do
-          expect(service.execute({ 'contact_id' => other_contact.id })).to eq('Contact not found')
+          expect(service.execute(contact_id: other_contact.id)).to eq('Contact not found')
         end
       end
     end
diff --git a/spec/enterprise/services/captain/tools/copilot/get_conversation_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/get_conversation_service_spec.rb
index b8265bbbf..ad2a78cc3 100644
--- a/spec/enterprise/services/captain/tools/copilot/get_conversation_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/copilot/get_conversation_service_spec.rb
@@ -19,19 +19,8 @@ RSpec.describe Captain::Tools::Copilot::GetConversationService do
   end
 
   describe '#parameters' do
-    it 'returns the expected parameter schema' do
-      expect(service.parameters).to eq(
-        {
-          type: 'object',
-          properties: {
-            conversation_id: {
-              type: 'number',
-              description: 'The ID of the conversation to retrieve'
-            }
-          },
-          required: %w[conversation_id]
-        }
-      )
+    it 'defines conversation_id parameter' do
+      expect(service.parameters.keys).to contain_exactly(:conversation_id)
     end
   end
 
@@ -107,15 +96,9 @@ RSpec.describe Captain::Tools::Copilot::GetConversationService do
   end
 
   describe '#execute' do
-    context 'when conversation_id is blank' do
-      it 'returns error message' do
-        expect(service.execute({})).to eq('Missing required parameters')
-      end
-    end
-
     context 'when conversation is not found' do
       it 'returns not found message' do
-        expect(service.execute({ 'conversation_id' => 999 })).to eq('Conversation not found')
+        expect(service.execute(conversation_id: 999)).to eq('Conversation not found')
       end
     end
 
@@ -124,7 +107,7 @@ RSpec.describe Captain::Tools::Copilot::GetConversationService do
       let(:conversation) { create(:conversation, account: account, inbox: inbox) }
 
       it 'returns the conversation in llm text format' do
-        result = service.execute({ 'conversation_id' => conversation.display_id })
+        result = service.execute(conversation_id: conversation.display_id)
         expect(result).to eq(conversation.to_llm_text)
       end
 
@@ -143,7 +126,7 @@ RSpec.describe Captain::Tools::Copilot::GetConversationService do
                content: 'Private note content',
                private: true)
 
-        result = service.execute({ 'conversation_id' => conversation.display_id })
+        result = service.execute(conversation_id: conversation.display_id)
 
         # Verify that the result includes both regular and private messages
         expect(result).to include('Regular message')
@@ -157,7 +140,7 @@ RSpec.describe Captain::Tools::Copilot::GetConversationService do
         let(:other_conversation) { create(:conversation, account: other_account, inbox: other_inbox) }
 
         it 'returns not found message' do
-          expect(service.execute({ 'conversation_id' => other_conversation.display_id })).to eq('Conversation not found')
+          expect(service.execute(conversation_id: other_conversation.display_id)).to eq('Conversation not found')
         end
       end
     end
diff --git a/spec/enterprise/services/captain/tools/copilot/search_articles_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/search_articles_service_spec.rb
index eb11e0d69..5623dce3d 100644
--- a/spec/enterprise/services/captain/tools/copilot/search_articles_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/copilot/search_articles_service_spec.rb
@@ -18,32 +18,6 @@ RSpec.describe Captain::Tools::Copilot::SearchArticlesService do
     end
   end
 
-  describe '#parameters' do
-    it 'returns the expected parameter schema' do
-      expect(service.parameters).to eq(
-        {
-          type: 'object',
-          properties: {
-            query: {
-              type: 'string',
-              description: 'Search articles by title or content (partial match)'
-            },
-            category_id: {
-              type: 'number',
-              description: 'Filter articles by category ID'
-            },
-            status: {
-              type: 'string',
-              enum: %w[draft published archived],
-              description: 'Filter articles by status'
-            }
-          },
-          required: ['query']
-        }
-      )
-    end
-  end
-
   describe '#active?' do
     context 'when user is an admin' do
       let(:user) { create(:user, :administrator, account: account) }
@@ -95,15 +69,9 @@ RSpec.describe Captain::Tools::Copilot::SearchArticlesService do
   end
 
   describe '#execute' do
-    context 'when query is blank' do
-      it 'returns error message' do
-        expect(service.execute({})).to eq('Missing required parameters')
-      end
-    end
-
     context 'when no articles are found' do
       it 'returns no articles found message' do
-        expect(service.execute({ 'query' => 'test' })).to eq('No articles found')
+        expect(service.execute(query: 'test', category_id: nil, status: nil)).to eq('No articles found')
       end
     end
 
@@ -113,7 +81,7 @@ RSpec.describe Captain::Tools::Copilot::SearchArticlesService do
       let!(:article2) { create(:article, account: account, portal: portal, author: user, title: 'Test Article 2', content: 'Content 2') }
 
       it 'returns formatted articles with count' do
-        result = service.execute({ 'query' => 'Test' })
+        result = service.execute(query: 'Test', category_id: nil, status: nil)
         expect(result).to include('Total number of articles: 2')
         expect(result).to include(article1.to_llm_text)
         expect(result).to include(article2.to_llm_text)
@@ -124,7 +92,7 @@ RSpec.describe Captain::Tools::Copilot::SearchArticlesService do
         let!(:article3) { create(:article, account: account, portal: portal, author: user, category: category, title: 'Test Article 3') }
 
         it 'returns only articles from the specified category' do
-          result = service.execute({ 'query' => 'Test', 'category_id' => category.id })
+          result = service.execute(query: 'Test', category_id: category.id, status: nil)
           expect(result).to include('Total number of articles: 1')
           expect(result).to include(article3.to_llm_text)
           expect(result).not_to include(article1.to_llm_text)
@@ -137,7 +105,7 @@ RSpec.describe Captain::Tools::Copilot::SearchArticlesService do
         let!(:article4) { create(:article, account: account, portal: portal, author: user, title: 'Test Article 4', status: 'draft') }
 
         it 'returns only articles with the specified status' do
-          result = service.execute({ 'query' => 'Test', 'status' => 'published' })
+          result = service.execute(query: 'Test', category_id: nil, status: 'published')
           expect(result).to include(article3.to_llm_text)
           expect(result).not_to include(article4.to_llm_text)
         end
diff --git a/spec/enterprise/services/captain/tools/copilot/search_contacts_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/search_contacts_service_spec.rb
index f54b2eddf..09bd09ec2 100644
--- a/spec/enterprise/services/captain/tools/copilot/search_contacts_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/copilot/search_contacts_service_spec.rb
@@ -19,27 +19,8 @@ RSpec.describe Captain::Tools::Copilot::SearchContactsService do
   end
 
   describe '#parameters' do
-    it 'returns the expected parameter schema' do
-      expect(service.parameters).to eq(
-        {
-          type: 'object',
-          properties: {
-            email: {
-              type: 'string',
-              description: 'Filter contacts by email'
-            },
-            phone_number: {
-              type: 'string',
-              description: 'Filter contacts by phone number'
-            },
-            name: {
-              type: 'string',
-              description: 'Filter contacts by name (partial match)'
-            }
-          },
-          required: []
-        }
-      )
+    it 'defines email, phone_number, and name parameters' do
+      expect(service.parameters.keys).to contain_exactly(:email, :phone_number, :name)
     end
   end
 
@@ -86,25 +67,25 @@ RSpec.describe Captain::Tools::Copilot::SearchContactsService do
       end
 
       it 'returns contacts when filtered by email' do
-        result = service.execute({ 'email' => 'test1@example.com' })
+        result = service.execute(email: 'test1@example.com')
         expect(result).to include(contact1.to_llm_text)
         expect(result).not_to include(contact2.to_llm_text)
       end
 
       it 'returns contacts when filtered by phone number' do
-        result = service.execute({ 'phone_number' => '+1234567890' })
+        result = service.execute(phone_number: '+1234567890')
         expect(result).to include(contact1.to_llm_text)
         expect(result).not_to include(contact2.to_llm_text)
       end
 
       it 'returns contacts when filtered by name' do
-        result = service.execute({ 'name' => 'Contact 1' })
+        result = service.execute(name: 'Contact 1')
         expect(result).to include(contact1.to_llm_text)
         expect(result).not_to include(contact2.to_llm_text)
       end
 
       it 'returns all matching contacts when no filters are provided' do
-        result = service.execute({})
+        result = service.execute
         expect(result).to include(contact1.to_llm_text)
         expect(result).to include(contact2.to_llm_text)
       end
diff --git a/spec/enterprise/services/captain/tools/copilot/search_conversations_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/search_conversations_service_spec.rb
index ab0865bc2..a02d05404 100644
--- a/spec/enterprise/services/captain/tools/copilot/search_conversations_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/copilot/search_conversations_service_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Captain::Tools::Copilot::SearchConversationsService do
 
   describe '#name' do
     it 'returns the correct service name' do
-      expect(service.name).to eq('search_conversations')
+      expect(service.name).to eq('search_conversation')
     end
   end
 
@@ -19,10 +19,8 @@ RSpec.describe Captain::Tools::Copilot::SearchConversationsService do
   end
 
   describe '#parameters' do
-    it 'returns the correct parameter schema' do
-      params = service.parameters
-      expect(params[:type]).to eq('object')
-      expect(params[:properties]).to include(:contact_id, :status, :priority)
+    it 'defines the expected parameters' do
+      expect(service.parameters.keys).to contain_exactly(:status, :contact_id, :priority, :labels)
     end
   end
 
@@ -90,35 +88,35 @@ RSpec.describe Captain::Tools::Copilot::SearchConversationsService do
     let!(:resolved_conversation) { create(:conversation, account: account, status: 'resolved', priority: 'low') }
 
     it 'returns all conversations when no filters are applied' do
-      result = service.execute({})
+      result = service.execute
       expect(result).to include('Total number of conversations: 2')
       expect(result).to include(open_conversation.to_llm_text(include_contact_details: true))
       expect(result).to include(resolved_conversation.to_llm_text(include_contact_details: true))
     end
 
     it 'filters conversations by status' do
-      result = service.execute({ 'status' => 'open' })
+      result = service.execute(status: 'open')
       expect(result).to include('Total number of conversations: 1')
       expect(result).to include(open_conversation.to_llm_text(include_contact_details: true))
       expect(result).not_to include(resolved_conversation.to_llm_text(include_contact_details: true))
     end
 
     it 'filters conversations by contact_id' do
-      result = service.execute({ 'contact_id' => contact.id })
+      result = service.execute(contact_id: contact.id)
       expect(result).to include('Total number of conversations: 1')
       expect(result).to include(open_conversation.to_llm_text(include_contact_details: true))
       expect(result).not_to include(resolved_conversation.to_llm_text(include_contact_details: true))
     end
 
     it 'filters conversations by priority' do
-      result = service.execute({ 'priority' => 'high' })
+      result = service.execute(priority: 'high')
       expect(result).to include('Total number of conversations: 1')
       expect(result).to include(open_conversation.to_llm_text(include_contact_details: true))
       expect(result).not_to include(resolved_conversation.to_llm_text(include_contact_details: true))
     end
 
     it 'returns appropriate message when no conversations are found' do
-      result = service.execute({ 'status' => 'snoozed' })
+      result = service.execute(status: 'snoozed')
       expect(result).to eq('No conversations found')
     end
   end
diff --git a/spec/enterprise/services/captain/tools/copilot/search_linear_issues_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/search_linear_issues_service_spec.rb
index f987b7a6a..a88504bb1 100644
--- a/spec/enterprise/services/captain/tools/copilot/search_linear_issues_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/copilot/search_linear_issues_service_spec.rb
@@ -19,19 +19,8 @@ RSpec.describe Captain::Tools::Copilot::SearchLinearIssuesService do
   end
 
   describe '#parameters' do
-    it 'returns the expected parameter schema' do
-      expect(service.parameters).to eq(
-        {
-          type: 'object',
-          properties: {
-            term: {
-              type: 'string',
-              description: 'The search term to find Linear issues'
-            }
-          },
-          required: %w[term]
-        }
-      )
+    it 'defines term parameter' do
+      expect(service.parameters.keys).to contain_exactly(:term)
     end
   end
 
@@ -76,7 +65,7 @@ RSpec.describe Captain::Tools::Copilot::SearchLinearIssuesService do
   describe '#execute' do
     context 'when Linear integration is not enabled' do
       it 'returns error message' do
-        expect(service.execute({ 'term' => 'test' })).to eq('Linear integration is not enabled')
+        expect(service.execute(term: 'test')).to eq('Linear integration is not enabled')
       end
     end
 
@@ -89,8 +78,12 @@ RSpec.describe Captain::Tools::Copilot::SearchLinearIssuesService do
       end
 
       context 'when term is blank' do
-        it 'returns error message' do
-          expect(service.execute({ 'term' => '' })).to eq('Missing required parameters')
+        before do
+          allow(linear_service).to receive(:search_issue).with('').and_return({ data: [] })
+        end
+
+        it 'returns no issues found message' do
+          expect(service.execute(term: '')).to eq('No issues found, I should try another similar search term')
         end
       end
 
@@ -100,7 +93,7 @@ RSpec.describe Captain::Tools::Copilot::SearchLinearIssuesService do
         end
 
         it 'returns the error message' do
-          expect(service.execute({ 'term' => 'test' })).to eq('API Error')
+          expect(service.execute(term: 'test')).to eq('API Error')
         end
       end
 
@@ -110,7 +103,7 @@ RSpec.describe Captain::Tools::Copilot::SearchLinearIssuesService do
         end
 
         it 'returns no issues found message' do
-          expect(service.execute({ 'term' => 'test' })).to eq('No issues found, I should try another similar search term')
+          expect(service.execute(term: 'test')).to eq('No issues found, I should try another similar search term')
         end
       end
 
@@ -131,7 +124,7 @@ RSpec.describe Captain::Tools::Copilot::SearchLinearIssuesService do
         end
 
         it 'returns formatted issues' do
-          result = service.execute({ 'term' => 'test' })
+          result = service.execute(term: 'test')
           expect(result).to include('Total number of issues: 1')
           expect(result).to include('Title: Test Issue')
           expect(result).to include('ID: TEST-123')
diff --git a/spec/enterprise/services/captain/tools/search_documentation_service_spec.rb b/spec/enterprise/services/captain/tools/search_documentation_service_spec.rb
index 9f5586e6b..41cec35f5 100644
--- a/spec/enterprise/services/captain/tools/search_documentation_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/search_documentation_service_spec.rb
@@ -20,19 +20,8 @@ RSpec.describe Captain::Tools::SearchDocumentationService do
   end
 
   describe '#parameters' do
-    it 'returns the required parameters schema' do
-      expected_schema = {
-        type: 'object',
-        properties: {
-          search_query: {
-            type: 'string',
-            description: 'The search query to look up in the documentation.'
-          }
-        },
-        required: ['search_query']
-      }
-
-      expect(service.parameters).to eq(expected_schema)
+    it 'defines query parameter' do
+      expect(service.parameters.keys).to contain_exactly(:query)
     end
   end
 
@@ -56,7 +45,7 @@ RSpec.describe Captain::Tools::SearchDocumentationService do
       end
 
       it 'returns formatted responses for the search query' do
-        result = service.execute({ 'search_query' => question })
+        result = service.execute(query: question)
 
         expect(result).to include(question)
         expect(result).to include(answer)
@@ -70,7 +59,7 @@ RSpec.describe Captain::Tools::SearchDocumentationService do
       end
 
       it 'returns an empty string' do
-        expect(service.execute({ 'search_query' => question })).to eq('No FAQs found for the given query')
+        expect(service.execute(query: question)).to eq('No FAQs found for the given query')
       end
     end
   end
diff --git a/spec/enterprise/services/companies/business_email_detector_service_spec.rb b/spec/enterprise/services/companies/business_email_detector_service_spec.rb
new file mode 100644
index 000000000..ceabfa905
--- /dev/null
+++ b/spec/enterprise/services/companies/business_email_detector_service_spec.rb
@@ -0,0 +1,99 @@
+require 'rails_helper'
+
+RSpec.describe Companies::BusinessEmailDetectorService, type: :service do
+  let(:service) { described_class.new(email) }
+
+  describe '#perform' do
+    context 'when email is from a business domain' do
+      let(:email) { 'user@acme.com' }
+      let(:valid_email_address) { instance_double(ValidEmail2::Address, valid?: true, disposable_domain?: false) }
+
+      before do
+        allow(ValidEmail2::Address).to receive(:new).with(email).and_return(valid_email_address)
+        allow(EmailProviderInfo).to receive(:call).with(email).and_return(nil)
+      end
+
+      it 'returns true' do
+        expect(service.perform).to be(true)
+      end
+    end
+
+    context 'when email is from gmail' do
+      let(:email) { 'user@gmail.com' }
+      let(:valid_email_address) { instance_double(ValidEmail2::Address, valid?: true, disposable_domain?: false) }
+
+      before do
+        allow(ValidEmail2::Address).to receive(:new).with(email).and_return(valid_email_address)
+        allow(EmailProviderInfo).to receive(:call).with(email).and_return('gmail')
+      end
+
+      it 'returns false' do
+        expect(service.perform).to be(false)
+      end
+    end
+
+    context 'when email is from Brazilian free provider' do
+      let(:email) { 'user@uol.com.br' }
+      let(:valid_email_address) { instance_double(ValidEmail2::Address, valid?: true, disposable_domain?: false) }
+
+      before do
+        allow(ValidEmail2::Address).to receive(:new).with(email).and_return(valid_email_address)
+        allow(EmailProviderInfo).to receive(:call).with(email).and_return('uol')
+      end
+
+      it 'returns false' do
+        expect(service.perform).to be(false)
+      end
+    end
+
+    context 'when email is disposable' do
+      let(:email) { 'user@mailinator.com' }
+      let(:disposable_email_address) { instance_double(ValidEmail2::Address, valid?: true, disposable_domain?: true) }
+
+      it 'returns false' do
+        allow(ValidEmail2::Address).to receive(:new).with(email).and_return(disposable_email_address)
+        expect(service.perform).to be(false)
+      end
+    end
+
+    context 'when email is invalid format' do
+      let(:email) { 'invalid-email' }
+      let(:invalid_email_address) { instance_double(ValidEmail2::Address, valid?: false) }
+
+      it 'returns false' do
+        allow(ValidEmail2::Address).to receive(:new).with(email).and_return(invalid_email_address)
+        expect(service.perform).to be(false)
+      end
+    end
+
+    context 'when email is nil' do
+      let(:email) { nil }
+
+      it 'remains false' do
+        expect(service.perform).to be(false)
+      end
+    end
+
+    context 'when email is empty string' do
+      let(:email) { '' }
+
+      it 'returns false' do
+        expect(service.perform).to be(false)
+      end
+    end
+
+    context 'when email domain is uppercase' do
+      let(:email) { 'user@GMAIL.COM' }
+      let(:valid_email_address) { instance_double(ValidEmail2::Address, valid?: true, disposable_domain?: false) }
+
+      before do
+        allow(ValidEmail2::Address).to receive(:new).with(email).and_return(valid_email_address)
+        allow(EmailProviderInfo).to receive(:call).with(email).and_return('gmail')
+      end
+
+      it 'returns false (case insensitive)' do
+        expect(service.perform).to be(false)
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/contacts/company_association_service_spec.rb b/spec/enterprise/services/contacts/company_association_service_spec.rb
new file mode 100644
index 000000000..78ee739c8
--- /dev/null
+++ b/spec/enterprise/services/contacts/company_association_service_spec.rb
@@ -0,0 +1,102 @@
+require 'rails_helper'
+
+RSpec.describe Contacts::CompanyAssociationService, type: :service do
+  let(:account) { create(:account) }
+  let(:service) { described_class.new }
+
+  describe '#associate_company_from_email' do
+    context 'when contact has business email and no company' do
+      it 'creates a new company and associates it' do
+        contact = create(:contact, email: 'john@acme.com', account: account, company_id: nil)
+        Company.delete_all # Delete any companies created by the callback
+        # rubocop:disable Rails/SkipsModelValidations
+        contact.update_column(:company_id, nil) # Delete the company association created by the callback
+        # rubocop:enable Rails/SkipsModelValidations
+
+        valid_email_address = instance_double(ValidEmail2::Address, valid?: true, disposable_domain?: false)
+        allow(ValidEmail2::Address).to receive(:new).with('john@acme.com').and_return(valid_email_address)
+        allow(EmailProviderInfo).to receive(:call).with('john@acme.com').and_return(nil)
+
+        expect do
+          service.associate_company_from_email(contact)
+        end.to change(Company, :count).by(1)
+
+        contact.reload
+        expect(contact.company).to be_present
+        expect(contact.company.domain).to eq('acme.com')
+        expect(contact.company.name).to eq('Acme')
+      end
+
+      it 'reuses existing company with same domain' do
+        existing_company = create(:company, domain: 'acme.com', account: account)
+        contact = create(:contact, email: 'john@acme.com', account: account, company_id: nil)
+        # rubocop:disable Rails/SkipsModelValidations
+        contact.update_column(:company_id, nil) # Delete the company association created by the callback
+        # rubocop:enable Rails/SkipsModelValidations
+
+        valid_email_address = instance_double(ValidEmail2::Address, valid?: true, disposable_domain?: false)
+        allow(ValidEmail2::Address).to receive(:new).with('john@acme.com').and_return(valid_email_address)
+        allow(EmailProviderInfo).to receive(:call).with('john@acme.com').and_return(nil)
+
+        expect do
+          service.associate_company_from_email(contact)
+        end.not_to change(Company, :count)
+
+        contact.reload
+        expect(contact.company).to eq(existing_company)
+      end
+
+      it 'increments company contacts_count when associating contact' do
+        # Create contact without email to avoid auto-association
+        contact = create(:contact, email: nil, account: account)
+        # Manually set email to bypass callbacks
+        # rubocop:disable Rails/SkipsModelValidations
+        contact.update_column(:email, 'jane@techcorp.com')
+        # rubocop:enable Rails/SkipsModelValidations
+
+        valid_email_address = instance_double(ValidEmail2::Address, valid?: true, disposable_domain?: false)
+        allow(ValidEmail2::Address).to receive(:new).with('jane@techcorp.com').and_return(valid_email_address)
+        allow(EmailProviderInfo).to receive(:call).with('jane@techcorp.com').and_return(nil)
+
+        service.associate_company_from_email(contact)
+
+        contact.reload
+        expect(contact.company).to be_present
+        expect(contact.company.contacts_count).to eq(1)
+      end
+    end
+
+    context 'when contact already has a company' do
+      it 'skips association and returns nil' do
+        existing_company = create(:company, account: account)
+        contact = create(:contact, email: 'john@acme.com', account: account, company_id: existing_company.id)
+        result = service.associate_company_from_email(contact)
+
+        expect(result).to be_nil
+        contact.reload
+        expect(contact.company).to eq(existing_company)
+      end
+    end
+
+    context 'when contact has free email provider' do
+      it 'skips association for email' do
+        contact = create(:contact, email: 'john@gmail.com', account: account, company_id: nil)
+        expect do
+          service.associate_company_from_email(contact)
+        end.not_to change(Company, :count)
+        contact.reload
+        expect(contact.company).to be_nil
+      end
+    end
+
+    context 'when contact has no email' do
+      it 'skips association' do
+        contact = create(:contact, email: nil, account: account, company_id: nil)
+
+        result = service.associate_company_from_email(contact)
+        expect(result).to be_nil
+        expect(contact.reload.company).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/enterprise/auto_assignment/assignment_service_spec.rb b/spec/enterprise/services/enterprise/auto_assignment/assignment_service_spec.rb
new file mode 100644
index 000000000..432f397be
--- /dev/null
+++ b/spec/enterprise/services/enterprise/auto_assignment/assignment_service_spec.rb
@@ -0,0 +1,185 @@
+require 'rails_helper'
+
+RSpec.describe Enterprise::AutoAssignment::AssignmentService, type: :service do
+  let(:account) { create(:account) }
+  let(:assignment_policy) { create(:assignment_policy, account: account, enabled: true) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:agent1) { create(:user, account: account, name: 'Agent 1') }
+  let(:agent2) { create(:user, account: account, name: 'Agent 2') }
+  let(:assignment_service) { AutoAssignment::AssignmentService.new(inbox: inbox) }
+
+  before do
+    # Create inbox members
+    create(:inbox_member, inbox: inbox, user: agent1)
+    create(:inbox_member, inbox: inbox, user: agent2)
+
+    # Link inbox to assignment policy
+    create(:inbox_assignment_policy, inbox: inbox, assignment_policy: assignment_policy)
+
+    allow(account).to receive(:feature_enabled?).and_return(false)
+    allow(account).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
+
+    # Set agents as online
+    OnlineStatusTracker.update_presence(account.id, 'User', agent1.id)
+    OnlineStatusTracker.set_status(account.id, agent1.id, 'online')
+    OnlineStatusTracker.update_presence(account.id, 'User', agent2.id)
+    OnlineStatusTracker.set_status(account.id, agent2.id, 'online')
+  end
+
+  describe 'exclusion rules' do
+    let(:capacity_policy) { create(:agent_capacity_policy, account: account) }
+    let(:label1) { create(:label, account: account, title: 'high-priority') }
+    let(:label2) { create(:label, account: account, title: 'vip') }
+
+    before do
+      create(:inbox_capacity_limit, inbox: inbox, agent_capacity_policy: capacity_policy, conversation_limit: 10)
+      inbox.enable_auto_assignment = true
+      inbox.save!
+    end
+
+    context 'when excluding conversations by label' do
+      let!(:conversation_with_label) { create(:conversation, inbox: inbox, assignee: nil) }
+      let!(:conversation_without_label) { create(:conversation, inbox: inbox, assignee: nil) }
+
+      before do
+        conversation_with_label.update_labels([label1.title])
+
+        capacity_policy.update!(exclusion_rules: {
+                                  'excluded_labels' => [label1.title]
+                                })
+      end
+
+      it 'excludes conversations with specified labels' do
+        # First check conversations are unassigned
+        expect(conversation_with_label.assignee).to be_nil
+        expect(conversation_without_label.assignee).to be_nil
+
+        # Run bulk assignment
+        assigned_count = assignment_service.perform_bulk_assignment(limit: 10)
+
+        # Only the conversation without label should be assigned
+        expect(assigned_count).to eq(1)
+        expect(conversation_with_label.reload.assignee).to be_nil
+        expect(conversation_without_label.reload.assignee).to be_present
+      end
+
+      it 'handles bulk assignment correctly' do
+        assigned_count = assignment_service.perform_bulk_assignment(limit: 10)
+
+        # Only 1 conversation should be assigned (the one without label)
+        expect(assigned_count).to eq(1)
+        expect(conversation_with_label.reload.assignee).to be_nil
+        expect(conversation_without_label.reload.assignee).to be_present
+      end
+
+      it 'excludes conversations with multiple labels' do
+        conversation_without_label.update_labels([label2.title])
+
+        capacity_policy.update!(exclusion_rules: {
+                                  'excluded_labels' => [label1.title, label2.title]
+                                })
+
+        assigned_count = assignment_service.perform_bulk_assignment(limit: 10)
+
+        # Both conversations should be excluded
+        expect(assigned_count).to eq(0)
+        expect(conversation_with_label.reload.assignee).to be_nil
+        expect(conversation_without_label.reload.assignee).to be_nil
+      end
+    end
+
+    context 'when excluding conversations by age' do
+      let!(:old_conversation) { create(:conversation, inbox: inbox, assignee: nil, created_at: 25.hours.ago) }
+      let!(:recent_conversation) { create(:conversation, inbox: inbox, assignee: nil, created_at: 1.hour.ago) }
+
+      before do
+        capacity_policy.update!(exclusion_rules: {
+                                  'exclude_older_than_hours' => 24
+                                })
+      end
+
+      it 'excludes conversations older than specified hours' do
+        assigned_count = assignment_service.perform_bulk_assignment(limit: 10)
+
+        # Only recent conversation should be assigned
+        expect(assigned_count).to eq(1)
+        expect(old_conversation.reload.assignee).to be_nil
+        expect(recent_conversation.reload.assignee).to be_present
+      end
+
+      it 'handles different time thresholds' do
+        capacity_policy.update!(exclusion_rules: {
+                                  'exclude_older_than_hours' => 2
+                                })
+
+        assigned_count = assignment_service.perform_bulk_assignment(limit: 10)
+
+        # Only conversation created within 2 hours should be assigned
+        expect(assigned_count).to eq(1)
+        expect(recent_conversation.reload.assignee).to be_present
+      end
+    end
+
+    context 'when combining exclusion rules' do
+      it 'applies both exclusion rules' do
+        # Create conversations
+        old_conversation_with_label = create(:conversation, inbox: inbox, assignee: nil, created_at: 25.hours.ago)
+        old_conversation_without_label = create(:conversation, inbox: inbox, assignee: nil, created_at: 25.hours.ago)
+        recent_conversation_with_label = create(:conversation, inbox: inbox, assignee: nil, created_at: 1.hour.ago)
+        recent_conversation_without_label = create(:conversation, inbox: inbox, assignee: nil, created_at: 1.hour.ago)
+
+        # Add labels
+        old_conversation_with_label.update_labels([label1.title])
+        recent_conversation_with_label.update_labels([label1.title])
+
+        capacity_policy.update!(exclusion_rules: {
+                                  'excluded_labels' => [label1.title],
+                                  'exclude_older_than_hours' => 24
+                                })
+
+        assigned_count = assignment_service.perform_bulk_assignment(limit: 10)
+
+        # Only recent conversation without label should be assigned
+        expect(assigned_count).to eq(1)
+        expect(old_conversation_with_label.reload.assignee).to be_nil
+        expect(old_conversation_without_label.reload.assignee).to be_nil
+        expect(recent_conversation_with_label.reload.assignee).to be_nil
+        expect(recent_conversation_without_label.reload.assignee).to be_present
+      end
+    end
+
+    context 'when exclusion rules are empty' do
+      let!(:conversation1) { create(:conversation, inbox: inbox, assignee: nil) }
+      let!(:conversation2) { create(:conversation, inbox: inbox, assignee: nil) }
+
+      before do
+        capacity_policy.update!(exclusion_rules: {})
+      end
+
+      it 'assigns all eligible conversations' do
+        assigned_count = assignment_service.perform_bulk_assignment(limit: 10)
+
+        expect(assigned_count).to eq(2)
+        expect(conversation1.reload.assignee).to be_present
+        expect(conversation2.reload.assignee).to be_present
+      end
+    end
+
+    context 'when no capacity policy exists' do
+      let!(:conversation1) { create(:conversation, inbox: inbox, assignee: nil) }
+      let!(:conversation2) { create(:conversation, inbox: inbox, assignee: nil) }
+
+      before do
+        InboxCapacityLimit.destroy_all
+      end
+
+      it 'assigns all eligible conversations without exclusions' do
+        assigned_count = assignment_service.perform_bulk_assignment(limit: 10)
+
+        expect(assigned_count).to eq(2)
+        expect(conversation1.reload.assignee).to be_present
+        expect(conversation2.reload.assignee).to be_present
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/enterprise/auto_assignment/balanced_selector_spec.rb b/spec/enterprise/services/enterprise/auto_assignment/balanced_selector_spec.rb
new file mode 100644
index 000000000..a2340ab0e
--- /dev/null
+++ b/spec/enterprise/services/enterprise/auto_assignment/balanced_selector_spec.rb
@@ -0,0 +1,88 @@
+require 'rails_helper'
+
+RSpec.describe Enterprise::AutoAssignment::BalancedSelector do
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:selector) { described_class.new(inbox: inbox) }
+  let(:agent1) { create(:user, account: account, role: :agent, availability: :online) }
+  let(:agent2) { create(:user, account: account, role: :agent, availability: :online) }
+  let(:agent3) { create(:user, account: account, role: :agent, availability: :online) }
+  let(:member1) { create(:inbox_member, inbox: inbox, user: agent1) }
+  let(:member2) { create(:inbox_member, inbox: inbox, user: agent2) }
+  let(:member3) { create(:inbox_member, inbox: inbox, user: agent3) }
+
+  describe '#select_agent' do
+    context 'when selecting based on workload' do
+      let(:available_agents) { [member1, member2, member3] }
+
+      it 'selects the agent with least open conversations' do
+        # Agent1 has 3 open conversations
+        3.times { create(:conversation, inbox: inbox, assignee: agent1, status: 'open') }
+
+        # Agent2 has 1 open conversation
+        create(:conversation, inbox: inbox, assignee: agent2, status: 'open')
+
+        # Agent3 has 2 open conversations
+        2.times { create(:conversation, inbox: inbox, assignee: agent3, status: 'open') }
+
+        selected_agent = selector.select_agent(available_agents)
+
+        # Should select agent2 as they have the least conversations
+        expect(selected_agent).to eq(agent2)
+      end
+
+      it 'considers only open conversations' do
+        # Agent1 has 1 open and 3 resolved conversations
+        create(:conversation, inbox: inbox, assignee: agent1, status: 'open')
+        3.times { create(:conversation, inbox: inbox, assignee: agent1, status: 'resolved') }
+
+        # Agent2 has 2 open conversations
+        2.times { create(:conversation, inbox: inbox, assignee: agent2, status: 'open') }
+
+        selected_agent = selector.select_agent([member1, member2])
+
+        # Should select agent1 as they have fewer open conversations
+        expect(selected_agent).to eq(agent1)
+      end
+
+      it 'selects any agent when agents have equal workload' do
+        # All agents have same number of conversations
+        [member1, member2, member3].each do |member|
+          create(:conversation, inbox: inbox, assignee: member.user, status: 'open')
+        end
+
+        selected_agent = selector.select_agent(available_agents)
+
+        # Should select one of the agents (when equal, min_by returns the first one it finds)
+        expect([agent1, agent2, agent3]).to include(selected_agent)
+      end
+    end
+
+    context 'when no agents are available' do
+      it 'returns nil' do
+        selected_agent = selector.select_agent([])
+        expect(selected_agent).to be_nil
+      end
+    end
+
+    context 'when one agent is available' do
+      it 'returns that agent' do
+        selected_agent = selector.select_agent([member1])
+        expect(selected_agent).to eq(agent1)
+      end
+    end
+
+    context 'with new agents (no conversations)' do
+      it 'prioritizes agents with no conversations' do
+        # Agent1 and 2 have conversations
+        create(:conversation, inbox: inbox, assignee: agent1, status: 'open')
+        create(:conversation, inbox: inbox, assignee: agent2, status: 'open')
+
+        # Agent3 is new with no conversations
+        selected_agent = selector.select_agent([member1, member2, member3])
+
+        expect(selected_agent).to eq(agent3)
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/enterprise/auto_assignment/capacity_service_spec.rb b/spec/enterprise/services/enterprise/auto_assignment/capacity_service_spec.rb
new file mode 100644
index 000000000..98d7c2172
--- /dev/null
+++ b/spec/enterprise/services/enterprise/auto_assignment/capacity_service_spec.rb
@@ -0,0 +1,119 @@
+require 'rails_helper'
+
+RSpec.describe Enterprise::AutoAssignment::CapacityService, type: :service do
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account, enable_auto_assignment: true) }
+
+  # Assignment policy with rate limiting
+  let(:assignment_policy) do
+    create(:assignment_policy,
+           account: account,
+           enabled: true,
+           fair_distribution_limit: 5,
+           fair_distribution_window: 3600)
+  end
+
+  # Agent capacity policy
+  let(:agent_capacity_policy) do
+    create(:agent_capacity_policy, account: account, name: 'Limited Capacity')
+  end
+
+  # Agents with different capacity settings
+  let(:agent_with_capacity) { create(:user, account: account, role: :agent, availability: :online) }
+  let(:agent_without_capacity) { create(:user, account: account, role: :agent, availability: :online) }
+  let(:agent_at_capacity) { create(:user, account: account, role: :agent, availability: :online) }
+
+  before do
+    # Create inbox assignment policy
+    create(:inbox_assignment_policy, inbox: inbox, assignment_policy: assignment_policy)
+
+    # Set inbox capacity limit
+    create(:inbox_capacity_limit,
+           agent_capacity_policy: agent_capacity_policy,
+           inbox: inbox,
+           conversation_limit: 3)
+
+    # Assign capacity policy to specific agents
+    agent_with_capacity.account_users.find_by(account: account)
+                       .update!(agent_capacity_policy: agent_capacity_policy)
+
+    agent_at_capacity.account_users.find_by(account: account)
+                     .update!(agent_capacity_policy: agent_capacity_policy)
+
+    # Create inbox members
+    create(:inbox_member, inbox: inbox, user: agent_with_capacity)
+    create(:inbox_member, inbox: inbox, user: agent_without_capacity)
+    create(:inbox_member, inbox: inbox, user: agent_at_capacity)
+
+    # Mock online status
+    allow(OnlineStatusTracker).to receive(:get_available_users).and_return({
+                                                                             agent_with_capacity.id.to_s => 'online',
+                                                                             agent_without_capacity.id.to_s => 'online',
+                                                                             agent_at_capacity.id.to_s => 'online'
+                                                                           })
+
+    # Enable assignment_v2 feature
+    allow(account).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
+
+    # Create existing assignments for agent_at_capacity (at limit)
+    3.times do
+      create(:conversation, inbox: inbox, assignee: agent_at_capacity, status: :open)
+    end
+  end
+
+  describe 'capacity filtering' do
+    it 'excludes agents at capacity' do
+      # Get available agents respecting capacity
+      capacity_service = described_class.new
+      online_agents = inbox.available_agents
+      filtered_agents = online_agents.select do |inbox_member|
+        capacity_service.agent_has_capacity?(inbox_member.user, inbox)
+      end
+      available_users = filtered_agents.map(&:user)
+
+      expect(available_users).to include(agent_with_capacity)
+      expect(available_users).to include(agent_without_capacity) # No capacity policy = unlimited
+      expect(available_users).not_to include(agent_at_capacity) # At capacity limit
+    end
+
+    it 'respects inbox-specific capacity limits' do
+      capacity_service = described_class.new
+
+      expect(capacity_service.agent_has_capacity?(agent_with_capacity, inbox)).to be true
+      expect(capacity_service.agent_has_capacity?(agent_without_capacity, inbox)).to be true
+      expect(capacity_service.agent_has_capacity?(agent_at_capacity, inbox)).to be false
+    end
+  end
+
+  describe 'assignment with capacity' do
+    let(:service) { AutoAssignment::AssignmentService.new(inbox: inbox) }
+
+    it 'assigns to agents with available capacity' do
+      # Create conversation before assignment
+      conversation = create(:conversation, inbox: inbox, assignee: nil, status: :open)
+
+      # Mock the selector to prefer agent_at_capacity (but should skip due to capacity)
+      selector = instance_double(AutoAssignment::RoundRobinSelector)
+      allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(selector)
+      allow(selector).to receive(:select_agent) do |agents|
+        agents.map(&:user).find { |u| [agent_with_capacity, agent_without_capacity].include?(u) }
+      end
+
+      assigned_count = service.perform_bulk_assignment(limit: 1)
+      expect(assigned_count).to eq(1)
+      expect(conversation.reload.assignee).to be_in([agent_with_capacity, agent_without_capacity])
+      expect(conversation.reload.assignee).not_to eq(agent_at_capacity)
+    end
+
+    it 'returns false when all agents are at capacity' do
+      # Fill up remaining agents
+      3.times { create(:conversation, inbox: inbox, assignee: agent_with_capacity, status: :open) }
+
+      # agent_without_capacity has no limit, so should still be available
+      conversation2 = create(:conversation, inbox: inbox, assignee: nil, status: :open)
+      assigned_count = service.perform_bulk_assignment(limit: 1)
+      expect(assigned_count).to eq(1)
+      expect(conversation2.reload.assignee).to eq(agent_without_capacity)
+    end
+  end
+end
diff --git a/spec/enterprise/services/enterprise/billing/handle_stripe_event_service_spec.rb b/spec/enterprise/services/enterprise/billing/handle_stripe_event_service_spec.rb
index 67ccd168b..db029ad0f 100644
--- a/spec/enterprise/services/enterprise/billing/handle_stripe_event_service_spec.rb
+++ b/spec/enterprise/services/enterprise/billing/handle_stripe_event_service_spec.rb
@@ -19,6 +19,16 @@ describe Enterprise::Billing::HandleStripeEventService do
                { 'name' => 'Enterprise', 'product_id' => ['plan_id_enterprise'], 'price_ids' => ['price_enterprise'] }
              ]
            })
+
+    create(:installation_config, {
+             name: 'CAPTAIN_CLOUD_PLAN_LIMITS',
+             value: {
+               'hacker' => { 'responses' => 0 },
+               'startups' => { 'responses' => 300 },
+               'business' => { 'responses' => 500 },
+               'enterprise' => { 'responses' => 800 }
+             }
+           })
     # Setup common subscription mocks
     allow(event).to receive(:data).and_return(data)
     allow(data).to receive(:object).and_return(subscription)
diff --git a/spec/enterprise/services/enterprise/billing/topup_checkout_service_spec.rb b/spec/enterprise/services/enterprise/billing/topup_checkout_service_spec.rb
new file mode 100644
index 000000000..8a64e6fd2
--- /dev/null
+++ b/spec/enterprise/services/enterprise/billing/topup_checkout_service_spec.rb
@@ -0,0 +1,60 @@
+require 'rails_helper'
+
+describe Enterprise::Billing::TopupCheckoutService do
+  subject(:service) { described_class.new(account: account) }
+
+  let(:account) { create(:account) }
+  let(:stripe_customer_id) { 'cus_test123' }
+  let(:invoice_settings) { Struct.new(:default_payment_method).new('pm_test') }
+  let(:stripe_customer) { Struct.new(:invoice_settings, :default_source).new(invoice_settings, nil) }
+  let(:stripe_invoice) { Struct.new(:id).new('inv_test123') }
+
+  before do
+    create(:installation_config, name: 'CHATWOOT_CLOUD_PLANS', value: [
+             { 'name' => 'Hacker', 'product_id' => ['prod_hacker'], 'price_ids' => ['price_hacker'] },
+             { 'name' => 'Business', 'product_id' => ['prod_business'], 'price_ids' => ['price_business'] }
+           ])
+
+    account.update!(
+      custom_attributes: { plan_name: 'Business', stripe_customer_id: stripe_customer_id },
+      limits: { 'captain_responses' => 500 }
+    )
+
+    allow(Stripe::Customer).to receive(:retrieve).and_return(stripe_customer)
+    allow(Stripe::Invoice).to receive(:create).and_return(stripe_invoice)
+    allow(Stripe::InvoiceItem).to receive(:create)
+    allow(Stripe::Invoice).to receive(:finalize_invoice)
+    allow(Stripe::Invoice).to receive(:pay)
+    allow(Stripe::Billing::CreditGrant).to receive(:create)
+  end
+
+  describe '#create_checkout_session' do
+    it 'successfully processes topup and returns correct response' do
+      result = service.create_checkout_session(credits: 1000)
+
+      expect(result[:credits]).to eq(1000)
+      expect(result[:amount]).to eq(20.0)
+      expect(result[:currency]).to eq('usd')
+    end
+
+    it 'updates account limits after successful topup' do
+      service.create_checkout_session(credits: 1000)
+
+      expect(account.reload.limits['captain_responses']).to eq(1500)
+    end
+
+    it 'raises error for invalid credits' do
+      expect do
+        service.create_checkout_session(credits: 500)
+      end.to raise_error(Enterprise::Billing::TopupCheckoutService::Error)
+    end
+
+    it 'raises error when account is on free plan' do
+      account.update!(custom_attributes: { plan_name: 'Hacker', stripe_customer_id: stripe_customer_id })
+
+      expect do
+        service.create_checkout_session(credits: 1000)
+      end.to raise_error(Enterprise::Billing::TopupCheckoutService::Error)
+    end
+  end
+end
diff --git a/spec/enterprise/services/enterprise/billing/topup_fulfillment_service_spec.rb b/spec/enterprise/services/enterprise/billing/topup_fulfillment_service_spec.rb
new file mode 100644
index 000000000..2dda12f35
--- /dev/null
+++ b/spec/enterprise/services/enterprise/billing/topup_fulfillment_service_spec.rb
@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+describe Enterprise::Billing::TopupFulfillmentService do
+  subject(:service) { described_class.new(account: account) }
+
+  let(:account) { create(:account) }
+  let(:stripe_customer_id) { 'cus_test123' }
+
+  before do
+    account.update!(
+      custom_attributes: { stripe_customer_id: stripe_customer_id },
+      limits: { 'captain_responses' => 1000 }
+    )
+    allow(Stripe::Billing::CreditGrant).to receive(:create)
+  end
+
+  describe '#fulfill' do
+    it 'adds credits to account limits' do
+      service.fulfill(credits: 1000, amount_cents: 2000, currency: 'usd')
+
+      expect(account.reload.limits['captain_responses']).to eq(2000)
+    end
+
+    it 'creates a Stripe credit grant' do
+      service.fulfill(credits: 1000, amount_cents: 2000, currency: 'usd')
+
+      expect(Stripe::Billing::CreditGrant).to have_received(:create).with(
+        hash_including(
+          customer: stripe_customer_id,
+          name: 'Topup: 1000 credits',
+          category: 'paid'
+        )
+      )
+    end
+  end
+end
diff --git a/spec/enterprise/services/voice/inbound_call_builder_spec.rb b/spec/enterprise/services/voice/inbound_call_builder_spec.rb
index 12e2d7235..e8953da3c 100644
--- a/spec/enterprise/services/voice/inbound_call_builder_spec.rb
+++ b/spec/enterprise/services/voice/inbound_call_builder_spec.rb
@@ -4,54 +4,118 @@ require 'rails_helper'
 
 RSpec.describe Voice::InboundCallBuilder do
   let(:account) { create(:account) }
-  let(:channel) { create(:channel_voice, account: account, phone_number: '+15551230001') }
+  let(:channel) { create(:channel_voice, account: account, phone_number: '+15551239999') }
   let(:inbox) { channel.inbox }
-
   let(:from_number) { '+15550001111' }
   let(:to_number) { channel.phone_number }
   let(:call_sid) { 'CA1234567890abcdef' }
 
   before do
     allow(Twilio::VoiceWebhookSetupService).to receive(:new)
-      .and_return(instance_double(Twilio::VoiceWebhookSetupService, perform: "AP#{SecureRandom.hex(16)}"))
+      .and_return(instance_double(Twilio::VoiceWebhookSetupService, perform: "AP#{SecureRandom.hex(8)}"))
   end
 
-  def build_and_perform
-    described_class.new(
+  def perform_builder
+    described_class.perform!(
       account: account,
       inbox: inbox,
       from_number: from_number,
-      to_number: to_number,
       call_sid: call_sid
-    ).perform
+    )
   end
 
-  it 'creates a new conversation with inbound ringing attributes' do
-    builder = build_and_perform
-    conversation = builder.conversation
-    expect(conversation).to be_present
-    expect(conversation.account_id).to eq(account.id)
-    expect(conversation.inbox_id).to eq(inbox.id)
-    expect(conversation.identifier).to eq(call_sid)
-    expect(conversation.additional_attributes['call_direction']).to eq('inbound')
-    expect(conversation.additional_attributes['call_status']).to eq('ringing')
+  context 'when no existing conversation matches call_sid' do
+    it 'creates a new inbound conversation with ringing status' do
+      conversation = nil
+      expect { conversation = perform_builder }.to change(account.conversations, :count).by(1)
+
+      attrs = conversation.additional_attributes
+      expect(conversation.identifier).to eq(call_sid)
+      expect(attrs['call_direction']).to eq('inbound')
+      expect(attrs['call_status']).to eq('ringing')
+      expect(attrs['conference_sid']).to be_present
+      expect(attrs.dig('meta', 'initiated_at')).to be_present
+      expect(conversation.contact.phone_number).to eq(from_number)
+    end
+
+    it 'creates a single voice_call message marked as incoming' do
+      conversation = perform_builder
+      voice_message = conversation.messages.voice_calls.last
+
+      expect(voice_message).to be_present
+      expect(voice_message.message_type).to eq('incoming')
+      data = voice_message.content_attributes['data']
+      expect(data).to include(
+        'call_sid' => call_sid,
+        'status' => 'ringing',
+        'call_direction' => 'inbound',
+        'conference_sid' => conversation.additional_attributes['conference_sid'],
+        'from_number' => from_number,
+        'to_number' => inbox.channel.phone_number
+      )
+      expect(data['meta']['created_at']).to be_present
+      expect(data['meta']['ringing_at']).to be_present
+    end
+
+    it 'sets the contact name to the phone number for new callers' do
+      conversation = perform_builder
+
+      expect(conversation.contact.name).to eq(from_number)
+    end
+
+    it 'ensures the conversation has a display_id before building the conference SID' do
+      allow(Voice::Conference::Name).to receive(:for).and_wrap_original do |original, conversation|
+        expect(conversation.display_id).to be_present
+        original.call(conversation)
+      end
+
+      perform_builder
+    end
   end
 
-  it 'creates a voice_call message with ringing status' do
-    builder = build_and_perform
-    conversation = builder.conversation
-    msg = conversation.messages.voice_calls.last
-    expect(msg).to be_present
-    expect(msg.message_type).to eq('incoming')
-    expect(msg.content_type).to eq('voice_call')
-    expect(msg.content_attributes.dig('data', 'call_sid')).to eq(call_sid)
-    expect(msg.content_attributes.dig('data', 'status')).to eq('ringing')
-  end
+  context 'when a conversation already exists for the call_sid' do
+    let(:contact) { create(:contact, account: account, phone_number: from_number) }
+    let!(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox, source_id: from_number) }
+    let!(:existing_conversation) do
+      create(
+        :conversation,
+        account: account,
+        inbox: inbox,
+        contact: contact,
+        contact_inbox: contact_inbox,
+        identifier: call_sid,
+        additional_attributes: { 'call_direction' => 'outbound', 'conference_sid' => nil }
+      )
+    end
+    let(:existing_message) do
+      create(
+        :message,
+        account: account,
+        inbox: inbox,
+        conversation: existing_conversation,
+        message_type: :incoming,
+        content_type: :voice_call,
+        sender: contact,
+        content_attributes: { 'data' => { 'call_sid' => call_sid, 'status' => 'queued' } }
+      )
+    end
 
-  it 'returns TwiML that informs the caller we are connecting' do
-    builder = build_and_perform
-    xml = builder.twiml_response
-    expect(xml).to include('Please wait while we connect you to an agent')
-    expect(xml).to include('<Say')
+    it 'reuses the conversation without creating a duplicate' do
+      existing_message
+      expect { perform_builder }.not_to change(account.conversations, :count)
+      existing_conversation.reload
+      expect(existing_conversation.additional_attributes['call_direction']).to eq('inbound')
+      expect(existing_conversation.additional_attributes['call_status']).to eq('ringing')
+    end
+
+    it 'updates the existing voice call message instead of creating a new one' do
+      existing_message
+      expect { perform_builder }.not_to(change { existing_conversation.reload.messages.voice_calls.count })
+      updated_message = existing_conversation.reload.messages.voice_calls.last
+
+      data = updated_message.content_attributes['data']
+      expect(data['status']).to eq('ringing')
+      expect(data['call_direction']).to eq('inbound')
+    end
   end
 end
diff --git a/spec/enterprise/services/voice/outbound_call_builder_spec.rb b/spec/enterprise/services/voice/outbound_call_builder_spec.rb
new file mode 100644
index 000000000..fb75b404b
--- /dev/null
+++ b/spec/enterprise/services/voice/outbound_call_builder_spec.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Voice::OutboundCallBuilder do
+  let(:account) { create(:account) }
+  let(:channel) { create(:channel_voice, account: account, phone_number: '+15551230000') }
+  let(:inbox) { channel.inbox }
+  let(:user) { create(:user, account: account) }
+  let(:contact) { create(:contact, account: account, phone_number: '+15550001111') }
+  let(:call_sid) { 'CA1234567890abcdef' }
+
+  before do
+    allow(Twilio::VoiceWebhookSetupService).to receive(:new)
+      .and_return(instance_double(Twilio::VoiceWebhookSetupService, perform: "AP#{SecureRandom.hex(8)}"))
+    allow(inbox).to receive(:channel).and_return(channel)
+    allow(channel).to receive(:initiate_call).and_return({ call_sid: call_sid })
+    allow(Voice::Conference::Name).to receive(:for).and_call_original
+  end
+
+  describe '.perform!' do
+    it 'creates a conversation and voice call message' do
+      conversation_count = account.conversations.count
+      inbox_link_count = contact.contact_inboxes.where(inbox_id: inbox.id).count
+
+      result = described_class.perform!(
+        account: account,
+        inbox: inbox,
+        user: user,
+        contact: contact
+      )
+
+      expect(account.conversations.count).to eq(conversation_count + 1)
+      expect(contact.contact_inboxes.where(inbox_id: inbox.id).count).to eq(inbox_link_count + 1)
+
+      conversation = result[:conversation].reload
+      attrs = conversation.additional_attributes
+
+      aggregate_failures do
+        expect(result[:call_sid]).to eq(call_sid)
+        expect(conversation.identifier).to eq(call_sid)
+        expect(attrs).to include('call_direction' => 'outbound', 'call_status' => 'ringing')
+        expect(attrs['agent_id']).to eq(user.id)
+        expect(attrs['conference_sid']).to be_present
+
+        voice_message = conversation.messages.voice_calls.last
+        expect(voice_message.message_type).to eq('outgoing')
+
+        message_data = voice_message.content_attributes['data']
+        expect(message_data).to include(
+          'call_sid' => call_sid,
+          'conference_sid' => attrs['conference_sid'],
+          'from_number' => channel.phone_number,
+          'to_number' => contact.phone_number
+        )
+      end
+    end
+
+    it 'raises an error when contact is missing a phone number' do
+      contact.update!(phone_number: nil)
+
+      expect do
+        described_class.perform!(
+          account: account,
+          inbox: inbox,
+          user: user,
+          contact: contact
+        )
+      end.to raise_error(ArgumentError, 'Contact phone number required')
+    end
+
+    it 'raises an error when user is nil' do
+      expect do
+        described_class.perform!(
+          account: account,
+          inbox: inbox,
+          user: nil,
+          contact: contact
+        )
+      end.to raise_error(ArgumentError, 'Agent required')
+    end
+
+    it 'ensures the conversation has a display_id before building the conference SID' do
+      allow(Voice::Conference::Name).to receive(:for).and_wrap_original do |original, conversation|
+        expect(conversation.display_id).to be_present
+        original.call(conversation)
+      end
+
+      described_class.perform!(
+        account: account,
+        inbox: inbox,
+        user: user,
+        contact: contact
+      )
+    end
+  end
+end
diff --git a/spec/enterprise/services/voice/status_update_service_spec.rb b/spec/enterprise/services/voice/status_update_service_spec.rb
index 61596e35c..fab626fb6 100644
--- a/spec/enterprise/services/voice/status_update_service_spec.rb
+++ b/spec/enterprise/services/voice/status_update_service_spec.rb
@@ -55,6 +55,23 @@ RSpec.describe Voice::StatusUpdateService do
     expect(message.content_attributes.dig('data', 'status')).to eq('completed')
   end
 
+  it 'normalizes busy to no-answer' do
+    conversation
+    message
+
+    described_class.new(
+      account: account,
+      call_sid: call_sid,
+      call_status: 'busy'
+    ).perform
+
+    conversation.reload
+    message.reload
+
+    expect(conversation.additional_attributes['call_status']).to eq('no-answer')
+    expect(message.content_attributes.dig('data', 'status')).to eq('no-answer')
+  end
+
   it 'no-ops when conversation not found' do
     expect do
       described_class.new(account: account, call_sid: 'UNKNOWN', call_status: 'busy').perform
diff --git a/spec/factories/instagram/instagram_message_create_event.rb b/spec/factories/instagram/instagram_message_create_event.rb
index a5de8e7d3..8450ff11d 100644
--- a/spec/factories/instagram/instagram_message_create_event.rb
+++ b/spec/factories/instagram/instagram_message_create_event.rb
@@ -348,6 +348,85 @@ FactoryBot.define do
     initialize_with { attributes }
   end
 
+  factory :instagram_ig_story_event, class: Hash do
+    transient do
+      ig_entry_id { SecureRandom.uuid }
+      sender_id { "Sender-id-#{SecureRandom.hex(4)}" }
+    end
+    entry do
+      [
+        {
+          'id': ig_entry_id,
+          'time': '2021-09-08T06:34:04+0000',
+          'messaging': [
+            {
+              'sender': {
+                'id': sender_id
+              },
+              'recipient': {
+                'id': 'chatwoot-app-user-id-1'
+              },
+              'timestamp': '2021-09-08T06:34:04+0000',
+              'message': {
+                'mid': 'ig-story-message-id-1',
+                'attachments': [
+                  {
+                    'type': 'ig_story',
+                    'payload': {
+                      'story_media_id': '17949487764033669',
+                      'story_media_url': 'https://lookaside.fbsbx.com/ig_messaging_cdn/?asset_id=17949487764033669&signature=test'
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ]
+    end
+    initialize_with { attributes }
+  end
+
+  factory :instagram_ig_post_event, class: Hash do
+    transient do
+      ig_entry_id { SecureRandom.uuid }
+      sender_id { "Sender-id-#{SecureRandom.hex(4)}" }
+    end
+    entry do
+      [
+        {
+          'id': ig_entry_id,
+          'time': '2021-09-08T06:34:04+0000',
+          'messaging': [
+            {
+              'sender': {
+                'id': sender_id
+              },
+              'recipient': {
+                'id': 'chatwoot-app-user-id-1'
+              },
+              'timestamp': '2021-09-08T06:34:04+0000',
+              'message': {
+                'mid': 'ig-post-message-id-1',
+                'attachments': [
+                  {
+                    'type': 'ig_post',
+                    'payload': {
+                      'ig_post_media_id': '18091626484740369',
+                      'title': 'Shared Instagram post',
+                      'url': 'https://lookaside.fbsbx.com/ig_messaging_cdn/?asset_id=18091626484740369&signature=test'
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ]
+    end
+    initialize_with { attributes }
+  end
+
   factory :instagram_message_unsupported_event, class: Hash do
     transient do
       ig_entry_id { SecureRandom.uuid }
diff --git a/spec/factories/messages.rb b/spec/factories/messages.rb
index b2ae41c5e..99a2c7cd8 100644
--- a/spec/factories/messages.rb
+++ b/spec/factories/messages.rb
@@ -27,6 +27,13 @@ FactoryBot.define do
       end
     end
 
+    trait :bot_message do
+      message_type { 'outgoing' }
+      after(:build) do |message|
+        message.sender = nil
+      end
+    end
+
     after(:build) do |message|
       message.sender ||= message.outgoing? ? create(:user, account: message.account) : create(:contact, account: message.account)
       message.inbox ||= message.conversation&.inbox || create(:inbox, account: message.account)
diff --git a/spec/factories/reporting_events.rb b/spec/factories/reporting_events.rb
index 1db6a87df..aff731ba1 100644
--- a/spec/factories/reporting_events.rb
+++ b/spec/factories/reporting_events.rb
@@ -1,11 +1,13 @@
 FactoryBot.define do
   factory :reporting_event do
-    name { 'MyString' }
+    name { 'first_response' }
     value { 1.5 }
     value_in_business_hours { 1 }
-    account_id { 1 }
-    inbox_id { 1 }
-    user_id { 1 }
-    conversation_id { 1 }
+    account
+    inbox { association :inbox, account: account }
+    user { association :user, account: account }
+    conversation { association :conversation, account: account, inbox: inbox }
+    event_start_time { 2.hours.ago }
+    event_end_time { 1.hour.ago }
   end
 end
diff --git a/spec/factories/webhooks.rb b/spec/factories/webhooks.rb
index 42acc2be6..a4a875c84 100644
--- a/spec/factories/webhooks.rb
+++ b/spec/factories/webhooks.rb
@@ -3,6 +3,7 @@ FactoryBot.define do
     account_id { 1 }
     inbox_id { 1 }
     url { 'https://api.chatwoot.com' }
+    name { 'My Webhook' }
     subscriptions do
       %w[
         conversation_status_changed
diff --git a/spec/jobs/auto_assignment/assignment_job_spec.rb b/spec/jobs/auto_assignment/assignment_job_spec.rb
new file mode 100644
index 000000000..d13f9fef8
--- /dev/null
+++ b/spec/jobs/auto_assignment/assignment_job_spec.rb
@@ -0,0 +1,85 @@
+require 'rails_helper'
+
+RSpec.describe AutoAssignment::AssignmentJob, type: :job do
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account, enable_auto_assignment: true) }
+  let(:agent) { create(:user, account: account, role: :agent, availability: :online) }
+
+  before do
+    create(:inbox_member, inbox: inbox, user: agent)
+  end
+
+  describe '#perform' do
+    context 'when inbox exists' do
+      context 'when auto assignment is enabled' do
+        it 'calls the assignment service' do
+          service = instance_double(AutoAssignment::AssignmentService)
+          allow(AutoAssignment::AssignmentService).to receive(:new).with(inbox: inbox).and_return(service)
+          expect(service).to receive(:perform_bulk_assignment).with(limit: 100).and_return(5)
+
+          described_class.new.perform(inbox_id: inbox.id)
+        end
+
+        it 'logs the assignment count' do
+          service = instance_double(AutoAssignment::AssignmentService)
+          allow(AutoAssignment::AssignmentService).to receive(:new).and_return(service)
+          allow(service).to receive(:perform_bulk_assignment).and_return(3)
+
+          expect(Rails.logger).to receive(:info).with("Assigned 3 conversations for inbox #{inbox.id}")
+
+          described_class.new.perform(inbox_id: inbox.id)
+        end
+
+        it 'uses custom bulk limit from environment' do
+          allow(ENV).to receive(:fetch).with('AUTO_ASSIGNMENT_BULK_LIMIT', 100).and_return('50')
+
+          service = instance_double(AutoAssignment::AssignmentService)
+          allow(AutoAssignment::AssignmentService).to receive(:new).with(inbox: inbox).and_return(service)
+          expect(service).to receive(:perform_bulk_assignment).with(limit: 50).and_return(2)
+
+          described_class.new.perform(inbox_id: inbox.id)
+        end
+      end
+
+      context 'when auto assignment is disabled' do
+        before { inbox.update!(enable_auto_assignment: false) }
+
+        it 'calls the service which handles the disabled state' do
+          service = instance_double(AutoAssignment::AssignmentService)
+          allow(AutoAssignment::AssignmentService).to receive(:new).with(inbox: inbox).and_return(service)
+          expect(service).to receive(:perform_bulk_assignment).with(limit: 100).and_return(0)
+
+          described_class.new.perform(inbox_id: inbox.id)
+        end
+      end
+    end
+
+    context 'when inbox does not exist' do
+      it 'returns early without processing' do
+        expect(AutoAssignment::AssignmentService).not_to receive(:new)
+
+        described_class.new.perform(inbox_id: 999_999)
+      end
+    end
+
+    context 'when an error occurs' do
+      it 'logs the error and re-raises in test environment' do
+        service = instance_double(AutoAssignment::AssignmentService)
+        allow(AutoAssignment::AssignmentService).to receive(:new).and_return(service)
+        allow(service).to receive(:perform_bulk_assignment).and_raise(StandardError, 'Something went wrong')
+
+        expect(Rails.logger).to receive(:error).with("Bulk assignment failed for inbox #{inbox.id}: Something went wrong")
+
+        expect do
+          described_class.new.perform(inbox_id: inbox.id)
+        end.to raise_error(StandardError, 'Something went wrong')
+      end
+    end
+  end
+
+  describe 'job configuration' do
+    it 'is queued in the default queue' do
+      expect(described_class.queue_name).to eq('default')
+    end
+  end
+end
diff --git a/spec/jobs/auto_assignment/periodic_assignment_job_spec.rb b/spec/jobs/auto_assignment/periodic_assignment_job_spec.rb
new file mode 100644
index 000000000..4b06decd0
--- /dev/null
+++ b/spec/jobs/auto_assignment/periodic_assignment_job_spec.rb
@@ -0,0 +1,123 @@
+require 'rails_helper'
+
+RSpec.describe AutoAssignment::PeriodicAssignmentJob, type: :job do
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account, enable_auto_assignment: true) }
+  let(:assignment_policy) { create(:assignment_policy, account: account) }
+  let(:inbox_assignment_policy) { create(:inbox_assignment_policy, inbox: inbox, assignment_policy: assignment_policy) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+
+  before do
+    create(:inbox_member, inbox: inbox, user: agent)
+  end
+
+  describe '#perform' do
+    context 'when account has assignment_v2 feature enabled' do
+      before do
+        allow(account).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
+        allow(Account).to receive(:find_in_batches).and_yield([account])
+      end
+
+      context 'when inbox has auto_assignment_v2 enabled' do
+        before do
+          allow(inbox).to receive(:auto_assignment_v2_enabled?).and_return(true)
+          inbox_relation = instance_double(ActiveRecord::Relation)
+          allow(account).to receive(:inboxes).and_return(inbox_relation)
+          allow(inbox_relation).to receive(:joins).with(:assignment_policy).and_return(inbox_relation)
+          allow(inbox_relation).to receive(:find_in_batches).and_yield([inbox])
+        end
+
+        it 'queues assignment job for eligible inboxes' do
+          inbox_assignment_policy # ensure it exists
+          expect(AutoAssignment::AssignmentJob).to receive(:perform_later).with(inbox_id: inbox.id)
+
+          described_class.new.perform
+        end
+
+        it 'processes multiple accounts' do
+          inbox_assignment_policy # ensure it exists
+          account2 = create(:account)
+          inbox2 = create(:inbox, account: account2, enable_auto_assignment: true)
+          policy2 = create(:assignment_policy, account: account2)
+          create(:inbox_assignment_policy, inbox: inbox2, assignment_policy: policy2)
+
+          allow(account2).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
+          allow(inbox2).to receive(:auto_assignment_v2_enabled?).and_return(true)
+
+          inbox_relation2 = instance_double(ActiveRecord::Relation)
+          allow(account2).to receive(:inboxes).and_return(inbox_relation2)
+          allow(inbox_relation2).to receive(:joins).with(:assignment_policy).and_return(inbox_relation2)
+          allow(inbox_relation2).to receive(:find_in_batches).and_yield([inbox2])
+
+          allow(Account).to receive(:find_in_batches).and_yield([account]).and_yield([account2])
+
+          expect(AutoAssignment::AssignmentJob).to receive(:perform_later).with(inbox_id: inbox.id)
+          expect(AutoAssignment::AssignmentJob).to receive(:perform_later).with(inbox_id: inbox2.id)
+
+          described_class.new.perform
+        end
+      end
+
+      context 'when inbox does not have auto_assignment_v2 enabled' do
+        before do
+          allow(inbox).to receive(:auto_assignment_v2_enabled?).and_return(false)
+        end
+
+        it 'does not queue assignment job' do
+          expect(AutoAssignment::AssignmentJob).not_to receive(:perform_later)
+
+          described_class.new.perform
+        end
+      end
+    end
+
+    context 'when account does not have assignment_v2 feature enabled' do
+      before do
+        allow(account).to receive(:feature_enabled?).with('assignment_v2').and_return(false)
+        allow(Account).to receive(:find_in_batches).and_yield([account])
+      end
+
+      it 'does not process the account' do
+        expect(AutoAssignment::AssignmentJob).not_to receive(:perform_later)
+
+        described_class.new.perform
+      end
+    end
+
+    context 'with batch processing' do
+      it 'processes accounts in batches' do
+        accounts = []
+        # Create multiple accounts
+        5.times do |_i|
+          acc = create(:account)
+          inb = create(:inbox, account: acc, enable_auto_assignment: true)
+          policy = create(:assignment_policy, account: acc)
+          create(:inbox_assignment_policy, inbox: inb, assignment_policy: policy)
+          allow(acc).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
+          allow(inb).to receive(:auto_assignment_v2_enabled?).and_return(true)
+
+          inbox_relation = instance_double(ActiveRecord::Relation)
+          allow(acc).to receive(:inboxes).and_return(inbox_relation)
+          allow(inbox_relation).to receive(:joins).with(:assignment_policy).and_return(inbox_relation)
+          allow(inbox_relation).to receive(:find_in_batches).and_yield([inb])
+
+          accounts << acc
+        end
+
+        allow(Account).to receive(:find_in_batches) do |&block|
+          accounts.each { |acc| block.call([acc]) }
+        end
+
+        expect(Account).to receive(:find_in_batches).and_call_original
+
+        described_class.new.perform
+      end
+    end
+  end
+
+  describe 'job configuration' do
+    it 'is queued in the scheduled_jobs queue' do
+      expect(described_class.queue_name).to eq('scheduled_jobs')
+    end
+  end
+end
diff --git a/spec/jobs/contacts/bulk_action_job_spec.rb b/spec/jobs/contacts/bulk_action_job_spec.rb
new file mode 100644
index 000000000..12a727000
--- /dev/null
+++ b/spec/jobs/contacts/bulk_action_job_spec.rb
@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+RSpec.describe Contacts::BulkActionJob, type: :job do
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account) }
+  let(:params) { { 'ids' => [1], 'labels' => { 'add' => ['vip'] } } }
+
+  it 'invokes the bulk action service with account and user' do
+    service_instance = instance_double(Contacts::BulkActionService, perform: true)
+
+    allow(Contacts::BulkActionService).to receive(:new).and_return(service_instance)
+
+    described_class.perform_now(account.id, user.id, params)
+
+    expect(Contacts::BulkActionService).to have_received(:new).with(
+      account: account,
+      user: user,
+      params: params
+    )
+    expect(service_instance).to have_received(:perform)
+  end
+end
diff --git a/spec/jobs/data_import_job_spec.rb b/spec/jobs/data_import_job_spec.rb
index d4048365b..7f640e584 100644
--- a/spec/jobs/data_import_job_spec.rb
+++ b/spec/jobs/data_import_job_spec.rb
@@ -15,8 +15,11 @@ RSpec.describe DataImportJob do
 
   describe 'retrying the job' do
     context 'when ActiveStorage::FileNotFoundError is raised' do
+      let(:import_file_double) { instance_double(ActiveStorage::Blob) }
+
       before do
-        allow(data_import.import_file).to receive(:download).and_raise(ActiveStorage::FileNotFoundError)
+        allow(data_import).to receive(:import_file).and_return(import_file_double)
+        allow(import_file_double).to receive(:open).and_raise(ActiveStorage::FileNotFoundError)
       end
 
       it 'retries the job' do
@@ -196,7 +199,9 @@ RSpec.describe DataImportJob do
       end
 
       before do
-        allow(data_import.import_file).to receive(:download).and_return(invalid_csv_content)
+        import_file_double = instance_double(ActiveStorage::Blob)
+        allow(data_import).to receive(:import_file).and_return(import_file_double)
+        allow(import_file_double).to receive(:open).and_yield(StringIO.new(invalid_csv_content))
       end
 
       it 'does not import any data and handles the MalformedCSVError' do
diff --git a/spec/jobs/delete_object_job_spec.rb b/spec/jobs/delete_object_job_spec.rb
index cb01ceb34..8267ba0f0 100644
--- a/spec/jobs/delete_object_job_spec.rb
+++ b/spec/jobs/delete_object_job_spec.rb
@@ -24,11 +24,12 @@ RSpec.describe DeleteObjectJob, type: :job do
 
         described_class.perform_now(inbox)
 
-        expect(Conversation.where(id: conv_ids)).to be_empty
-        expect(ContactInbox.where(id: ci_ids)).to be_empty
-        expect(ReportingEvent.where(id: re_ids)).to be_empty
+        # Reload associations to ensure database state is current
+        expect(Conversation.where(id: conv_ids).reload).to be_empty
+        expect(ContactInbox.where(id: ci_ids).reload).to be_empty
+        expect(ReportingEvent.where(id: re_ids).reload).to be_empty
         # Contacts should not be deleted for inbox destroy
-        expect(Contact.where(id: contact_ids)).not_to be_empty
+        expect(Contact.where(id: contact_ids).reload).not_to be_empty
         expect { inbox.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
@@ -53,10 +54,11 @@ RSpec.describe DeleteObjectJob, type: :job do
 
         described_class.perform_now(account)
 
-        expect(Conversation.where(id: conv_ids)).to be_empty
-        expect(Contact.where(id: contact_ids)).to be_empty
-        expect(Inbox.where(id: inbox_ids)).to be_empty
-        expect(ReportingEvent.where(id: re_ids)).to be_empty
+        # Reload associations to ensure database state is current
+        expect(Conversation.where(id: conv_ids).reload).to be_empty
+        expect(Contact.where(id: contact_ids).reload).to be_empty
+        expect(Inbox.where(id: inbox_ids).reload).to be_empty
+        expect(ReportingEvent.where(id: re_ids).reload).to be_empty
         expect { account.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
diff --git a/spec/jobs/mutex_application_job_spec.rb b/spec/jobs/mutex_application_job_spec.rb
index b62db00f0..91a56407d 100644
--- a/spec/jobs/mutex_application_job_spec.rb
+++ b/spec/jobs/mutex_application_job_spec.rb
@@ -32,8 +32,7 @@ RSpec.describe MutexApplicationJob do
         described_class.new.send(:with_lock, lock_key) do
           # Do nothing
         end
-      end.to raise_error(MutexApplicationJob::LockAcquisitionError)
-      expect(lock_manager).not_to receive(:unlock)
+      end.to raise_error(StandardError) { |error| expect(error.class.name).to eq('MutexApplicationJob::LockAcquisitionError') }
     end
 
     it 'raises StandardError if it execution raises it' do
diff --git a/spec/jobs/webhooks/instagram_events_job_spec.rb b/spec/jobs/webhooks/instagram_events_job_spec.rb
index 21f042f1f..4128385cf 100644
--- a/spec/jobs/webhooks/instagram_events_job_spec.rb
+++ b/spec/jobs/webhooks/instagram_events_job_spec.rb
@@ -7,6 +7,10 @@ describe Webhooks::InstagramEventsJob do
     stub_request(:post, /graph\.facebook\.com/)
     stub_request(:get, 'https://www.example.com/test.jpeg')
       .to_return(status: 200, body: '', headers: {})
+    stub_request(:get, 'https://lookaside.fbsbx.com/ig_messaging_cdn/?asset_id=17949487764033669&signature=test')
+      .to_return(status: 200, body: '', headers: {})
+    stub_request(:get, 'https://lookaside.fbsbx.com/ig_messaging_cdn/?asset_id=18091626484740369&signature=test')
+      .to_return(status: 200, body: '', headers: {})
   end
 
   let!(:account) { create(:account) }
@@ -131,6 +135,52 @@ describe Webhooks::InstagramEventsJob do
         expect(attachment.push_event_data[:data_url]).to eq(attachment.external_url)
       end
 
+      it 'creates incoming message with ig_story attachment in the instagram inbox' do
+        ig_story_event = build(:instagram_ig_story_event).with_indifferent_access
+        sender_id = ig_story_event[:entry][0][:messaging][0][:sender][:id]
+
+        allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
+        allow(fb_object).to receive(:get_object).and_return(
+          return_object_for(sender_id).with_indifferent_access
+        )
+
+        instagram_webhook.perform_now(ig_story_event[:entry])
+
+        expect(instagram_messenger_inbox.messages.count).to be 1
+        expect(instagram_messenger_inbox.messages.last.attachments.count).to be 1
+
+        message = instagram_messenger_inbox.messages.last
+        attachment = message.attachments.last
+
+        expect(attachment.file_type).to eq 'ig_story'
+        expect(attachment.external_url).to include 'lookaside.fbsbx.com'
+        expect(message.content).to eq 'Shared story'
+        expect(message.content_attributes['image_type']).to eq 'ig_story'
+      end
+
+      it 'creates incoming message with ig_post attachment in the instagram inbox' do
+        ig_post_event = build(:instagram_ig_post_event).with_indifferent_access
+        sender_id = ig_post_event[:entry][0][:messaging][0][:sender][:id]
+
+        allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
+        allow(fb_object).to receive(:get_object).and_return(
+          return_object_for(sender_id).with_indifferent_access
+        )
+
+        instagram_webhook.perform_now(ig_post_event[:entry])
+
+        expect(instagram_messenger_inbox.messages.count).to be 1
+        expect(instagram_messenger_inbox.messages.last.attachments.count).to be 1
+
+        message = instagram_messenger_inbox.messages.last
+        attachment = message.attachments.last
+
+        expect(attachment.file_type).to eq 'ig_post'
+        expect(attachment.external_url).to include 'ig_messaging_cdn'
+        expect(message.content).to eq 'Shared post'
+        expect(message.content_attributes['image_type']).to eq 'ig_post'
+      end
+
       it 'does not create contact or messages when Facebook API call fails' do
         story_mention_echo_event = build(:instagram_story_mention_event_with_echo).with_indifferent_access
 
@@ -262,6 +312,38 @@ describe Webhooks::InstagramEventsJob do
         expect(instagram_inbox.messages.last.content_attributes['is_unsupported']).to be true
       end
 
+      it 'creates incoming message with ig_story attachment in the instagram direct inbox' do
+        ig_story_event = build(:instagram_ig_story_event).with_indifferent_access
+        instagram_webhook.perform_now(ig_story_event[:entry])
+
+        expect(instagram_inbox.messages.count).to be 1
+        expect(instagram_inbox.messages.last.attachments.count).to be 1
+
+        message = instagram_inbox.messages.last
+        attachment = message.attachments.last
+
+        expect(attachment.file_type).to eq 'ig_story'
+        expect(attachment.external_url).to include 'lookaside.fbsbx.com'
+        expect(message.content).to eq 'Shared story'
+        expect(message.content_attributes['image_type']).to eq 'ig_story'
+      end
+
+      it 'creates incoming message with ig_post attachment in the instagram direct inbox' do
+        ig_post_event = build(:instagram_ig_post_event).with_indifferent_access
+        instagram_webhook.perform_now(ig_post_event[:entry])
+
+        expect(instagram_inbox.messages.count).to be 1
+        expect(instagram_inbox.messages.last.attachments.count).to be 1
+
+        message = instagram_inbox.messages.last
+        attachment = message.attachments.last
+
+        expect(attachment.file_type).to eq 'ig_post'
+        expect(attachment.external_url).to include 'ig_messaging_cdn'
+        expect(message.content).to eq 'Shared post'
+        expect(message.content_attributes['image_type']).to eq 'ig_post'
+      end
+
       it 'does not create contact or messages when Instagram API call fails' do
         story_mention_echo_event = build(:instagram_story_mention_event_with_echo).with_indifferent_access
 
diff --git a/spec/lib/custom_markdown_renderer_spec.rb b/spec/lib/custom_markdown_renderer_spec.rb
index 23574e8c4..b329105d5 100644
--- a/spec/lib/custom_markdown_renderer_spec.rb
+++ b/spec/lib/custom_markdown_renderer_spec.rb
@@ -138,7 +138,28 @@ describe CustomMarkdownRenderer do
 
       it 'wraps iframe in responsive container' do
         output = render_markdown_link(arcade_url)
-        expect(output).to include('position: relative; padding-bottom: 62.5%; height: 0;')
+        expect(output).to include('position: relative; padding-bottom: calc(62.793% + 41px); height: 0px; width: 100%;')
+        expect(output).to include('position: absolute; top: 0; left: 0; width: 100%; height: 100%;')
+      end
+    end
+
+    context 'when link is an Arcade tab URL' do
+      let(:arcade_tab_url) { 'https://app.arcade.software/share/ARCADE_TAB_ID?embed_mobile=tab' }
+
+      it 'renders an iframe with Arcade tab embed code' do
+        output = render_markdown_link(arcade_tab_url)
+        expect(output).to include('src="https://app.arcade.software/embed/ARCADE_TAB_ID?embed&embed_mobile=tab"')
+      end
+
+      it 'supports additional query params after embed_mobile' do
+        url = 'https://app.arcade.software/share/ARCADE_TAB_ID?foo=bar&embed_mobile=tab?user_id=1'
+        output = render_markdown_link(url)
+        expect(output).to include('src="https://app.arcade.software/embed/ARCADE_TAB_ID?embed&embed_mobile=tab"')
+      end
+
+      it 'wraps iframe in responsive container' do
+        output = render_markdown_link(arcade_tab_url)
+        expect(output).to include('position: relative; padding-bottom: calc(62.793% + 41px); height: 0px; width: 100%;')
         expect(output).to include('position: absolute; top: 0; left: 0; width: 100%; height: 100%;')
       end
     end
diff --git a/spec/lib/integrations/llm_instrumentation_spec.rb b/spec/lib/integrations/llm_instrumentation_spec.rb
new file mode 100644
index 000000000..97a45a414
--- /dev/null
+++ b/spec/lib/integrations/llm_instrumentation_spec.rb
@@ -0,0 +1,258 @@
+require 'rails_helper'
+
+RSpec.describe Integrations::LlmInstrumentation do
+  let(:test_class) do
+    Class.new do
+      include Integrations::LlmInstrumentation
+    end
+  end
+
+  let(:instance) { test_class.new }
+  let!(:otel_config) do
+    InstallationConfig.find_or_create_by(name: 'OTEL_PROVIDER') do |config|
+      config.value = 'langfuse'
+    end
+  end
+
+  let(:params) do
+    {
+      span_name: 'llm.test',
+      account_id: 123,
+      conversation_id: 456,
+      feature_name: 'reply_suggestion',
+      model: 'gpt-4o-mini',
+      messages: [{ 'role' => 'user', 'content' => 'Hello' }],
+      temperature: 0.7
+    }
+  end
+
+  before do
+    InstallationConfig.find_or_create_by(name: 'LANGFUSE_SECRET_KEY') do |config|
+      config.value = 'test-secret-key'
+    end
+  end
+
+  describe '#instrument_llm_call' do
+    context 'when OTEL provider is not configured' do
+      before { otel_config.update(value: '') }
+
+      it 'executes the block without tracing' do
+        result = instance.instrument_llm_call(params) { 'my_result' }
+        expect(result).to eq('my_result')
+      end
+    end
+
+    context 'when OTEL provider is configured' do
+      it 'executes the block and returns the result' do
+        mock_span = instance_double(OpenTelemetry::Trace::Span)
+        allow(mock_span).to receive(:set_attribute)
+        allow(mock_span).to receive(:status=)
+        mock_tracer = instance_double(OpenTelemetry::Trace::Tracer)
+        allow(instance).to receive(:tracer).and_return(mock_tracer)
+        allow(mock_tracer).to receive(:in_span).and_yield(mock_span)
+
+        result = instance.instrument_llm_call(params) { 'my_result' }
+
+        expect(result).to eq('my_result')
+      end
+
+      it 'creates a tracing span with the provided span name' do
+        mock_span = instance_double(OpenTelemetry::Trace::Span)
+        allow(mock_span).to receive(:set_attribute)
+        allow(mock_span).to receive(:status=)
+        mock_tracer = instance_double(OpenTelemetry::Trace::Tracer)
+        allow(instance).to receive(:tracer).and_return(mock_tracer)
+        allow(mock_tracer).to receive(:in_span).and_yield(mock_span)
+
+        instance.instrument_llm_call(params) { 'result' }
+
+        expect(mock_tracer).to have_received(:in_span).with('llm.test')
+      end
+
+      it 'returns the block result even if instrumentation has errors' do
+        mock_tracer = instance_double(OpenTelemetry::Trace::Tracer)
+        allow(instance).to receive(:tracer).and_return(mock_tracer)
+        allow(mock_tracer).to receive(:in_span).and_raise(StandardError.new('Instrumentation failed'))
+
+        result = instance.instrument_llm_call(params) { 'my_result' }
+
+        expect(result).to eq('my_result')
+      end
+
+      it 'handles errors gracefully and captures exceptions' do
+        mock_span = instance_double(OpenTelemetry::Trace::Span)
+        allow(mock_span).to receive(:status=)
+        mock_tracer = instance_double(OpenTelemetry::Trace::Tracer)
+        allow(instance).to receive(:tracer).and_return(mock_tracer)
+        allow(mock_tracer).to receive(:in_span).and_yield(mock_span)
+        allow(mock_span).to receive(:set_attribute).and_raise(StandardError.new('Span error'))
+        allow(ChatwootExceptionTracker).to receive(:new).and_call_original
+
+        result = instance.instrument_llm_call(params) { 'my_result' }
+
+        expect(result).to eq('my_result')
+        expect(ChatwootExceptionTracker).to have_received(:new)
+      end
+
+      it 'sets correct request attributes on the span' do
+        mock_span = instance_double(OpenTelemetry::Trace::Span)
+        allow(mock_span).to receive(:set_attribute)
+        allow(mock_span).to receive(:status=)
+        mock_tracer = instance_double(OpenTelemetry::Trace::Tracer)
+        allow(instance).to receive(:tracer).and_return(mock_tracer)
+        allow(mock_tracer).to receive(:in_span).and_yield(mock_span)
+
+        instance.instrument_llm_call(params) { 'result' }
+
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.provider.name', 'openai')
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.request.model', 'gpt-4o-mini')
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.request.temperature', 0.7)
+      end
+
+      it 'sets correct prompt message attributes' do
+        mock_span = instance_double(OpenTelemetry::Trace::Span)
+        allow(mock_span).to receive(:set_attribute)
+        allow(mock_span).to receive(:status=)
+        mock_tracer = instance_double(OpenTelemetry::Trace::Tracer)
+        allow(instance).to receive(:tracer).and_return(mock_tracer)
+        allow(mock_tracer).to receive(:in_span).and_yield(mock_span)
+
+        custom_params = params.merge(
+          messages: [
+            { 'role' => 'system', 'content' => 'You are a helpful assistant' },
+            { 'role' => 'user', 'content' => 'Hello' }
+          ]
+        )
+
+        instance.instrument_llm_call(custom_params) { 'result' }
+
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.prompt.0.role', 'system')
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.prompt.0.content', 'You are a helpful assistant')
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.prompt.1.role', 'user')
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.prompt.1.content', 'Hello')
+      end
+
+      it 'sets correct metadata attributes' do
+        mock_span = instance_double(OpenTelemetry::Trace::Span)
+        allow(mock_span).to receive(:set_attribute)
+        allow(mock_span).to receive(:status=)
+        mock_tracer = instance_double(OpenTelemetry::Trace::Tracer)
+        allow(instance).to receive(:tracer).and_return(mock_tracer)
+        allow(mock_tracer).to receive(:in_span).and_yield(mock_span)
+
+        instance.instrument_llm_call(params) { 'result' }
+
+        expect(mock_span).to have_received(:set_attribute).with('langfuse.user.id', '123')
+        expect(mock_span).to have_received(:set_attribute).with('langfuse.session.id', '123_456')
+        expect(mock_span).to have_received(:set_attribute).with('langfuse.trace.tags', '["reply_suggestion"]')
+      end
+
+      it 'sets completion message attributes when result contains message' do
+        mock_span = instance_double(OpenTelemetry::Trace::Span)
+        allow(mock_span).to receive(:set_attribute)
+        allow(mock_span).to receive(:status=)
+        mock_tracer = instance_double(OpenTelemetry::Trace::Tracer)
+        allow(instance).to receive(:tracer).and_return(mock_tracer)
+        allow(mock_tracer).to receive(:in_span).and_yield(mock_span)
+
+        result = instance.instrument_llm_call(params) do
+          { message: 'AI response here' }
+        end
+
+        expect(result).to eq({ message: 'AI response here' })
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.completion.0.role', 'assistant')
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.completion.0.content', 'AI response here')
+      end
+
+      it 'sets usage metrics when result contains usage data' do
+        mock_span = instance_double(OpenTelemetry::Trace::Span)
+        allow(mock_span).to receive(:set_attribute)
+        allow(mock_span).to receive(:status=)
+        mock_tracer = instance_double(OpenTelemetry::Trace::Tracer)
+        allow(instance).to receive(:tracer).and_return(mock_tracer)
+        allow(mock_tracer).to receive(:in_span).and_yield(mock_span)
+
+        result = instance.instrument_llm_call(params) do
+          {
+            usage: {
+              'prompt_tokens' => 150,
+              'completion_tokens' => 200,
+              'total_tokens' => 350
+            }
+          }
+        end
+
+        expect(result[:usage]['prompt_tokens']).to eq(150)
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.usage.input_tokens', 150)
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.usage.output_tokens', 200)
+        expect(mock_span).to have_received(:set_attribute).with('gen_ai.usage.total_tokens', 350)
+      end
+
+      it 'sets error attributes when result contains error' do
+        mock_span = instance_double(OpenTelemetry::Trace::Span)
+        mock_status = instance_double(OpenTelemetry::Trace::Status)
+        allow(mock_span).to receive(:set_attribute)
+        allow(mock_span).to receive(:status=)
+        allow(OpenTelemetry::Trace::Status).to receive(:error).and_return(mock_status)
+        mock_tracer = instance_double(OpenTelemetry::Trace::Tracer)
+        allow(instance).to receive(:tracer).and_return(mock_tracer)
+        allow(mock_tracer).to receive(:in_span).and_yield(mock_span)
+
+        result = instance.instrument_llm_call(params) do
+          {
+            error: 'API rate limit exceeded'
+          }
+        end
+
+        expect(result[:error]).to eq('API rate limit exceeded')
+        expect(mock_span).to have_received(:set_attribute)
+          .with('gen_ai.response.error', '"API rate limit exceeded"')
+        expect(mock_span).to have_received(:status=).with(mock_status)
+        expect(OpenTelemetry::Trace::Status).to have_received(:error).with('API rate limit exceeded')
+      end
+    end
+
+    describe '#instrument_agent_session' do
+      context 'when OTEL provider is not configured' do
+        before { otel_config.update(value: '') }
+
+        it 'executes the block without tracing' do
+          result = instance.instrument_agent_session(params) { 'my_result' }
+          expect(result).to eq('my_result')
+        end
+      end
+
+      context 'when OTEL provider is configured' do
+        let(:mock_span) { instance_double(OpenTelemetry::Trace::Span) }
+        let(:mock_tracer) { instance_double(OpenTelemetry::Trace::Tracer) }
+
+        before do
+          allow(mock_span).to receive(:set_attribute)
+          allow(instance).to receive(:tracer).and_return(mock_tracer)
+          allow(mock_tracer).to receive(:in_span).and_yield(mock_span)
+        end
+
+        it 'executes the block and returns the result' do
+          result = instance.instrument_agent_session(params) { 'my_result' }
+          expect(result).to eq('my_result')
+        end
+
+        it 'returns the block result even if instrumentation has errors' do
+          allow(mock_tracer).to receive(:in_span).and_raise(StandardError.new('Instrumentation failed'))
+
+          result = instance.instrument_agent_session(params) { 'my_result' }
+
+          expect(result).to eq('my_result')
+        end
+
+        it 'sets trace input and output attributes' do
+          result_data = { content: 'AI response' }
+          instance.instrument_agent_session(params) { result_data }
+
+          expect(mock_span).to have_received(:set_attribute).with('langfuse.observation.input', params[:messages].to_json)
+          expect(mock_span).to have_received(:set_attribute).with('langfuse.observation.output', result_data.to_json)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/integrations/openai/processor_service_spec.rb b/spec/lib/integrations/openai/processor_service_spec.rb
index a22c8e815..28488cc15 100644
--- a/spec/lib/integrations/openai/processor_service_spec.rb
+++ b/spec/lib/integrations/openai/processor_service_spec.rb
@@ -1,302 +1,199 @@
 require 'rails_helper'
 
 RSpec.describe Integrations::Openai::ProcessorService do
-  subject { described_class.new(hook: hook, event: event) }
+  subject(:service) { described_class.new(hook: hook, event: event) }
 
   let(:account) { create(:account) }
   let(:hook) { create(:integrations_hook, :openai, account: account) }
-  let(:expected_headers) { { 'Authorization' => "Bearer #{hook.settings['api_key']}" } }
-  let(:openai_response) do
-    {
-      'choices' => [
-        {
-          'message' => {
-            'content' => 'This is a reply from openai.'
-          }
-        }
-      ]
-    }.to_json
+
+  # Mock RubyLLM objects
+  let(:mock_chat) { instance_double(RubyLLM::Chat) }
+  let(:mock_context) { instance_double(RubyLLM::Context) }
+  let(:mock_config) { OpenStruct.new }
+  let(:mock_response) do
+    instance_double(
+      RubyLLM::Message,
+      content: 'This is a reply from openai.',
+      input_tokens: nil,
+      output_tokens: nil
+    )
   end
-  let!(:conversation) { create(:conversation, account: account) }
-  let!(:customer_message) { create(:message, account: account, conversation: conversation, message_type: :incoming, content: 'hello agent') }
-  let!(:agent_message) { create(:message, account: account, conversation: conversation, message_type: :outgoing, content: 'hello customer') }
-  let!(:summary_prompt) do
-    if ChatwootApp.enterprise?
-      Rails.root.join('enterprise/lib/enterprise/integrations/openai_prompts/summary.txt').read
-    else
-      'Please summarize the key points from the following conversation between support agents and customer as bullet points for the next ' \
-        "support agent looking into the conversation. Reply in the user's language."
-    end
+  let(:mock_response_with_usage) do
+    instance_double(
+      RubyLLM::Message,
+      content: 'This is a reply from openai.',
+      input_tokens: 50,
+      output_tokens: 20
+    )
+  end
+
+  before do
+    allow(RubyLLM).to receive(:context).and_yield(mock_config).and_return(mock_context)
+    allow(mock_context).to receive(:chat).and_return(mock_chat)
+
+    allow(mock_chat).to receive(:with_instructions).and_return(mock_chat)
+    allow(mock_chat).to receive(:add_message).and_return(mock_chat)
+    allow(mock_chat).to receive(:ask).and_return(mock_response)
   end
 
   describe '#perform' do
-    context 'when event name is rephrase' do
-      let(:event) { { 'name' => 'rephrase', 'data' => { 'tone' => 'friendly', 'content' => 'This is a test message' } } }
+    describe 'text transformation operations' do
+      shared_examples 'text transformation operation' do |event_name|
+        let(:event) { { 'name' => event_name, 'data' => { 'content' => 'This is a test' } } }
 
-      it 'returns the rephrased message using the tone in data' do
-        request_body = {
-          'model' => 'gpt-4o-mini',
-          'messages' => [
-            {
-              'role' => 'system',
-              'content' => 'You are a helpful support agent. ' \
-                           'Please rephrase the following response. ' \
-                           'Ensure that the reply should be in user language.'
-            },
-            { 'role' => 'user', 'content' => event['data']['content'] }
-          ]
-        }.to_json
+        it 'returns the transformed text' do
+          result = service.perform
+          expect(result[:message]).to eq('This is a reply from openai.')
+        end
 
-        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-          .with(body: request_body, headers: expected_headers)
-          .to_return(status: 200, body: openai_response, headers: {})
+        it 'sends the user content to the LLM' do
+          service.perform
+          expect(mock_chat).to have_received(:ask).with('This is a test')
+        end
 
-        result = subject.perform
-        expect(result).to eq({ :message => 'This is a reply from openai.' })
-      end
-    end
-
-    context 'when event name is reply_suggestion' do
-      let(:event) { { 'name' => 'reply_suggestion', 'data' => { 'conversation_display_id' => conversation.display_id } } }
-
-      it 'returns the suggested reply' do
-        request_body = {
-          'model' => 'gpt-4o-mini',
-          'messages' => [
-            { role: 'system',
-              content: Rails.root.join('lib/integrations/openai/openai_prompts/reply.txt').read },
-            { role: 'user', content: customer_message.content },
-            { role: 'assistant', content: agent_message.content }
-          ]
-        }.to_json
-
-        # Update the stub_request with the correct messages order
-        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-          .with(body: request_body, headers: expected_headers)
-          .to_return(status: 200, body: openai_response, headers: {})
-
-        result = subject.perform
-        expect(result).to eq({ :message => 'This is a reply from openai.' })
-      end
-    end
-
-    context 'when event name is summarize' do
-      let(:event) { { 'name' => 'summarize', 'data' => { 'conversation_display_id' => conversation.display_id } } }
-      let(:conversation_messages) do
-        "Customer #{customer_message.sender.name} : #{customer_message.content}\nAgent #{agent_message.sender.name} : #{agent_message.content}\n"
-      end
-
-      it 'returns the summarized message' do
-        request_body = {
-          'model' => 'gpt-4o-mini',
-          'messages' => [
-            { 'role' => 'system',
-              'content' => summary_prompt },
-            { 'role' => 'user', 'content' => conversation_messages }
-          ]
-        }.to_json
-
-        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-          .with(body: request_body, headers: expected_headers)
-          .to_return(status: 200, body: openai_response, headers: {})
-
-        result = subject.perform
-        expect(result).to eq({ :message => 'This is a reply from openai.' })
-      end
-    end
-
-    context 'when event name is label_suggestion with no labels' do
-      let(:event) { { 'name' => 'label_suggestion', 'data' => { 'conversation_display_id' => conversation.display_id } } }
-
-      it 'returns nil' do
-        result = subject.perform
-        expect(result).to be_nil
-      end
-    end
-
-    context 'when event name is not one that can be processed' do
-      let(:event) { { 'name' => 'unknown', 'data' => {} } }
-
-      it 'returns nil' do
-        expect(subject.perform).to be_nil
-      end
-    end
-
-    context 'when event name is fix_spelling_grammar' do
-      let(:event) { { 'name' => 'fix_spelling_grammar', 'data' => { 'content' => 'This is a test' } } }
-
-      it 'returns the corrected text' do
-        request_body = {
-          'model' => 'gpt-4o-mini',
-          'messages' => [
-            { 'role' => 'system', 'content' => 'You are a helpful support agent. Please fix the spelling and grammar of the following response. ' \
-                                               'Ensure that the reply should be in user language.' },
-            { 'role' => 'user', 'content' => event['data']['content'] }
-          ]
-        }.to_json
-
-        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-          .with(body: request_body, headers: expected_headers)
-          .to_return(status: 200, body: openai_response, headers: {})
-
-        result = subject.perform
-        expect(result).to eq({ :message => 'This is a reply from openai.' })
-      end
-    end
-
-    context 'when event name is shorten' do
-      let(:event) { { 'name' => 'shorten', 'data' => { 'content' => 'This is a test' } } }
-
-      it 'returns the shortened text' do
-        request_body = {
-          'model' => 'gpt-4o-mini',
-          'messages' => [
-            { 'role' => 'system', 'content' => 'You are a helpful support agent. Please shorten the following response. ' \
-                                               'Ensure that the reply should be in user language.' },
-            { 'role' => 'user', 'content' => event['data']['content'] }
-          ]
-        }.to_json
-
-        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-          .with(body: request_body, headers: expected_headers)
-          .to_return(status: 200, body: openai_response, headers: {})
-
-        result = subject.perform
-        expect(result).to eq({ :message => 'This is a reply from openai.' })
-      end
-    end
-
-    context 'when event name is expand' do
-      let(:event) { { 'name' => 'expand', 'data' => { 'content' => 'help you' } } }
-
-      it 'returns the expanded text' do
-        request_body = {
-          'model' => 'gpt-4o-mini',
-          'messages' => [
-            { 'role' => 'system', 'content' => 'You are a helpful support agent. Please expand the following response. ' \
-                                               'Ensure that the reply should be in user language.' },
-            { 'role' => 'user', 'content' => event['data']['content'] }
-          ]
-        }.to_json
-
-        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-          .with(body: request_body, headers: expected_headers)
-          .to_return(status: 200, body: openai_response, headers: {})
-
-        result = subject.perform
-        expect(result).to eq({ :message => 'This is a reply from openai.' })
-      end
-    end
-
-    context 'when event name is make_friendly' do
-      let(:event) { { 'name' => 'make_friendly', 'data' => { 'content' => 'This is a test' } } }
-
-      it 'returns the friendly text' do
-        request_body = {
-          'model' => 'gpt-4o-mini',
-          'messages' => [
-            { 'role' => 'system', 'content' => 'You are a helpful support agent. Please make the following response more friendly. ' \
-                                               'Ensure that the reply should be in user language.' },
-            { 'role' => 'user', 'content' => event['data']['content'] }
-          ]
-        }.to_json
-
-        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-          .with(body: request_body, headers: expected_headers)
-          .to_return(status: 200, body: openai_response, headers: {})
-
-        result = subject.perform
-        expect(result).to eq({ :message => 'This is a reply from openai.' })
-      end
-    end
-
-    context 'when event name is make_formal' do
-      let(:event) { { 'name' => 'make_formal', 'data' => { 'content' => 'This is a test' } } }
-
-      it 'returns the formal text' do
-        request_body = {
-          'model' => 'gpt-4o-mini',
-          'messages' => [
-            { 'role' => 'system', 'content' => 'You are a helpful support agent. Please make the following response more formal. ' \
-                                               'Ensure that the reply should be in user language.' },
-            { 'role' => 'user', 'content' => event['data']['content'] }
-          ]
-        }.to_json
-
-        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-          .with(body: request_body, headers: expected_headers)
-          .to_return(status: 200, body: openai_response, headers: {})
-
-        result = subject.perform
-        expect(result).to eq({ :message => 'This is a reply from openai.' })
-      end
-    end
-
-    context 'when event name is simplify' do
-      let(:event) { { 'name' => 'simplify', 'data' => { 'content' => 'This is a test' } } }
-
-      it 'returns the simplified text' do
-        request_body = {
-          'model' => 'gpt-4o-mini',
-          'messages' => [
-            { 'role' => 'system', 'content' => 'You are a helpful support agent. Please simplify the following response. ' \
-                                               'Ensure that the reply should be in user language.' },
-            { 'role' => 'user', 'content' => event['data']['content'] }
-          ]
-        }.to_json
-
-        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-          .with(body: request_body, headers: expected_headers)
-          .to_return(status: 200, body: openai_response, headers: {})
-
-        result = subject.perform
-        expect(result).to eq({ :message => 'This is a reply from openai.' })
-      end
-    end
-
-    context 'when testing endpoint configuration' do
-      let(:event) { { 'name' => 'rephrase', 'data' => { 'content' => 'test message' } } }
-
-      context 'when CAPTAIN_OPEN_AI_ENDPOINT is not configured' do
-        it 'uses default OpenAI endpoint' do
-          InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_ENDPOINT')&.destroy
-
-          stub_request(:post, 'https://api.openai.com/v1/chat/completions')
-            .with(body: anything, headers: expected_headers)
-            .to_return(status: 200, body: openai_response, headers: {})
-
-          result = subject.perform
-          expect(result).to eq({ :message => 'This is a reply from openai.' })
+        it 'sets system instructions' do
+          service.perform
+          expect(mock_chat).to have_received(:with_instructions).with(a_string_including('You are a helpful support agent'))
         end
       end
 
-      context 'when CAPTAIN_OPEN_AI_ENDPOINT is configured' do
+      it_behaves_like 'text transformation operation', 'rephrase'
+      it_behaves_like 'text transformation operation', 'fix_spelling_grammar'
+      it_behaves_like 'text transformation operation', 'shorten'
+      it_behaves_like 'text transformation operation', 'expand'
+      it_behaves_like 'text transformation operation', 'make_friendly'
+      it_behaves_like 'text transformation operation', 'make_formal'
+      it_behaves_like 'text transformation operation', 'simplify'
+    end
+
+    describe 'conversation-based operations' do
+      let!(:conversation) { create(:conversation, account: account) }
+
+      before do
+        create(:message, account: account, conversation: conversation, message_type: :incoming, content: 'hello agent')
+        create(:message, account: account, conversation: conversation, message_type: :outgoing, content: 'hello customer')
+      end
+
+      context 'with reply_suggestion event' do
+        let(:event) { { 'name' => 'reply_suggestion', 'data' => { 'conversation_display_id' => conversation.display_id } } }
+
+        it 'returns the suggested reply' do
+          result = service.perform
+          expect(result[:message]).to eq('This is a reply from openai.')
+        end
+
+        it 'adds conversation history before asking' do
+          service.perform
+          # Should add the first message as history, then ask with the last message
+          expect(mock_chat).to have_received(:add_message).with(role: :user, content: 'hello agent')
+          expect(mock_chat).to have_received(:ask).with('hello customer')
+        end
+      end
+
+      context 'with summarize event' do
+        let(:event) { { 'name' => 'summarize', 'data' => { 'conversation_display_id' => conversation.display_id } } }
+
+        it 'returns the summary' do
+          result = service.perform
+          expect(result[:message]).to eq('This is a reply from openai.')
+        end
+
+        it 'sends formatted conversation as a single message' do
+          service.perform
+          # Summarize sends conversation as a formatted string in one user message
+          expect(mock_chat).to have_received(:ask).with(a_string_matching(/Customer.*hello agent.*Agent.*hello customer/m))
+        end
+      end
+
+      context 'with label_suggestion event and no labels' do
+        let(:event) { { 'name' => 'label_suggestion', 'data' => { 'conversation_display_id' => conversation.display_id } } }
+
+        it 'returns nil' do
+          expect(service.perform).to be_nil
+        end
+      end
+    end
+
+    describe 'edge cases' do
+      context 'with unknown event name' do
+        let(:event) { { 'name' => 'unknown', 'data' => {} } }
+
+        it 'returns nil' do
+          expect(service.perform).to be_nil
+        end
+      end
+    end
+
+    describe 'response structure' do
+      let(:event) { { 'name' => 'rephrase', 'data' => { 'content' => 'test message' } } }
+
+      context 'when response includes usage data' do
         before do
+          allow(mock_chat).to receive(:ask).and_return(mock_response_with_usage)
+        end
+
+        it 'returns message with usage data' do
+          result = service.perform
+
+          expect(result[:message]).to eq('This is a reply from openai.')
+          expect(result[:usage]['prompt_tokens']).to eq(50)
+          expect(result[:usage]['completion_tokens']).to eq(20)
+          expect(result[:usage]['total_tokens']).to eq(70)
+        end
+
+        it 'includes request_messages in response' do
+          result = service.perform
+
+          expect(result[:request_messages]).to be_an(Array)
+          expect(result[:request_messages].length).to eq(2)
+        end
+      end
+
+      context 'when response does not include usage data' do
+        it 'returns message with zero total tokens' do
+          result = service.perform
+
+          expect(result[:message]).to eq('This is a reply from openai.')
+          expect(result[:usage]['total_tokens']).to eq(0)
+        end
+
+        it 'includes request_messages in response' do
+          result = service.perform
+
+          expect(result[:request_messages]).to be_an(Array)
+        end
+      end
+    end
+
+    describe 'endpoint configuration' do
+      let(:event) { { 'name' => 'rephrase', 'data' => { 'content' => 'test message' } } }
+
+      context 'without CAPTAIN_OPEN_AI_ENDPOINT configured' do
+        before { InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_ENDPOINT')&.destroy }
+
+        it 'uses default OpenAI endpoint' do
+          expect(Llm::Config).to receive(:with_api_key).with(
+            hook.settings['api_key'],
+            api_base: 'https://api.openai.com/v1'
+          ).and_call_original
+
+          service.perform
+        end
+      end
+
+      context 'with CAPTAIN_OPEN_AI_ENDPOINT configured' do
+        before do
+          InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_ENDPOINT')&.destroy
           create(:installation_config, name: 'CAPTAIN_OPEN_AI_ENDPOINT', value: 'https://custom.azure.com/')
         end
 
         it 'uses custom endpoint' do
-          stub_request(:post, 'https://custom.azure.com/v1/chat/completions')
-            .with(body: anything, headers: expected_headers)
-            .to_return(status: 200, body: openai_response, headers: {})
+          expect(Llm::Config).to receive(:with_api_key).with(
+            hook.settings['api_key'],
+            api_base: 'https://custom.azure.com/v1'
+          ).and_call_original
 
-          result = subject.perform
-          expect(result).to eq({ :message => 'This is a reply from openai.' })
-        end
-      end
-
-      context 'when CAPTAIN_OPEN_AI_ENDPOINT has trailing slash' do
-        before do
-          create(:installation_config, name: 'CAPTAIN_OPEN_AI_ENDPOINT', value: 'https://custom.azure.com/')
-        end
-
-        it 'properly handles trailing slash' do
-          stub_request(:post, 'https://custom.azure.com/v1/chat/completions')
-            .with(body: anything, headers: expected_headers)
-            .to_return(status: 200, body: openai_response, headers: {})
-
-          result = subject.perform
-          expect(result).to eq({ :message => 'This is a reply from openai.' })
+          service.perform
         end
       end
     end
diff --git a/spec/lib/integrations/slack/send_on_slack_service_spec.rb b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
index 87d58b79b..5d75a8c2b 100644
--- a/spec/lib/integrations/slack/send_on_slack_service_spec.rb
+++ b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
@@ -206,6 +206,21 @@ describe Integrations::Slack::SendOnSlackService do
         expect(message.attachments.count).to eq 2
       end
 
+      it 'streams attachment blobs and uploads only once' do
+        expect(slack_client).to receive(:chat_postMessage).and_return(slack_message)
+
+        attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
+        attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+        blob = attachment.file.blob
+        allow(blob).to receive(:open).and_call_original
+
+        expect(blob).to receive(:open).and_call_original
+        expect(slack_client).to receive(:files_upload_v2).once.and_return(file_attachment)
+
+        message.save!
+        builder.perform
+      end
+
       it 'handles file upload errors gracefully' do
         expect(slack_client).to receive(:chat_postMessage).with(
           channel: hook.reference_id,
diff --git a/spec/lib/webhooks/trigger_spec.rb b/spec/lib/webhooks/trigger_spec.rb
index 224a35e07..3a4acf4e9 100644
--- a/spec/lib/webhooks/trigger_spec.rb
+++ b/spec/lib/webhooks/trigger_spec.rb
@@ -13,9 +13,12 @@ describe Webhooks::Trigger do
   let(:webhook_type) { :api_inbox_webhook }
   let!(:url) { 'https://test.com' }
   let(:agent_bot_error_content) { I18n.t('conversations.activity.agent_bot.error_moved_to_open') }
+  let(:default_timeout) { 5 }
+  let(:webhook_timeout) { default_timeout }
 
   before do
     ActiveJob::Base.queue_adapter = :test
+    allow(GlobalConfig).to receive(:get_value).with('WEBHOOK_TIMEOUT').and_return(webhook_timeout)
   end
 
   after do
@@ -33,7 +36,7 @@ describe Webhooks::Trigger do
           url: url,
           payload: payload.to_json,
           headers: { content_type: :json, accept: :json },
-          timeout: 5
+          timeout: webhook_timeout
         ).once
       trigger.execute(url, payload, webhook_type)
     end
@@ -47,7 +50,7 @@ describe Webhooks::Trigger do
           url: url,
           payload: payload.to_json,
           headers: { content_type: :json, accept: :json },
-          timeout: 5
+          timeout: webhook_timeout
         ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
 
       expect { trigger.execute(url, payload, webhook_type) }.to change { message.reload.status }.from('sent').to('failed')
@@ -62,7 +65,7 @@ describe Webhooks::Trigger do
           url: url,
           payload: payload.to_json,
           headers: { content_type: :json, accept: :json },
-          timeout: 5
+          timeout: webhook_timeout
         ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
       expect { trigger.execute(url, payload, webhook_type) }.to change { message.reload.status }.from('sent').to('failed')
     end
@@ -80,7 +83,7 @@ describe Webhooks::Trigger do
             url: url,
             payload: payload.to_json,
             headers: { content_type: :json, accept: :json },
-            timeout: 5
+            timeout: webhook_timeout
           ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
 
         expect do
@@ -105,7 +108,7 @@ describe Webhooks::Trigger do
             url: url,
             payload: payload.to_json,
             headers: { content_type: :json, accept: :json },
-            timeout: 5
+            timeout: webhook_timeout
           ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
 
         expect do
@@ -128,9 +131,47 @@ describe Webhooks::Trigger do
         url: url,
         payload: payload.to_json,
         headers: { content_type: :json, accept: :json },
-        timeout: 5
+        timeout: webhook_timeout
       ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
 
     expect { trigger.execute(url, payload, webhook_type) }.not_to(change { message.reload.status })
   end
+
+  context 'when webhook timeout configuration is blank' do
+    let(:webhook_timeout) { nil }
+
+    it 'falls back to default timeout' do
+      payload = { hello: :hello }
+
+      expect(RestClient::Request).to receive(:execute)
+        .with(
+          method: :post,
+          url: url,
+          payload: payload.to_json,
+          headers: { content_type: :json, accept: :json },
+          timeout: default_timeout
+        ).once
+
+      trigger.execute(url, payload, webhook_type)
+    end
+  end
+
+  context 'when webhook timeout configuration is invalid' do
+    let(:webhook_timeout) { -1 }
+
+    it 'falls back to default timeout' do
+      payload = { hello: :hello }
+
+      expect(RestClient::Request).to receive(:execute)
+        .with(
+          method: :post,
+          url: url,
+          payload: payload.to_json,
+          headers: { content_type: :json, accept: :json },
+          timeout: default_timeout
+        ).once
+
+      trigger.execute(url, payload, webhook_type)
+    end
+  end
 end
diff --git a/spec/listeners/agent_bot_listener_spec.rb b/spec/listeners/agent_bot_listener_spec.rb
index 2dc2b41df..56c478a1b 100644
--- a/spec/listeners/agent_bot_listener_spec.rb
+++ b/spec/listeners/agent_bot_listener_spec.rb
@@ -36,6 +36,24 @@ describe AgentBotListener do
         expect(AgentBots::WebhookJob).not_to receive(:perform_later)
         listener.message_created(event)
       end
+
+      context 'when conversation has a different assignee agent bot' do
+        let!(:conversation_bot) { create(:agent_bot) }
+
+        before do
+          create(:agent_bot_inbox, inbox: inbox, agent_bot: agent_bot)
+          conversation.update!(assignee_agent_bot: conversation_bot, assignee: nil)
+        end
+
+        it 'sends message to both bots exactly once' do
+          payload = message.webhook_data.merge(event: 'message_created')
+
+          expect(AgentBots::WebhookJob).to receive(:perform_later).with(agent_bot.outgoing_url, payload).once
+          expect(AgentBots::WebhookJob).to receive(:perform_later).with(conversation_bot.outgoing_url, payload).once
+
+          listener.message_created(event)
+        end
+      end
     end
   end
 
diff --git a/spec/mailboxes/application_mailbox_spec.rb b/spec/mailboxes/application_mailbox_spec.rb
index 33bbf9de8..1bc4d0fd1 100644
--- a/spec/mailboxes/application_mailbox_spec.rb
+++ b/spec/mailboxes/application_mailbox_spec.rb
@@ -41,28 +41,31 @@ RSpec.describe ApplicationMailbox do
     describe 'Support' do
       let!(:channel_email) { create(:channel_email) }
 
-      it 'routes support emails to Support Mailbox when mail is to channel email' do
+      it 'routes support emails to Reply Mailbox when mail is to channel email' do
         # this email is hardcoded in the support.eml, that's why we are updating this
+        # With NewConversationStrategy, all channel emails route to ReplyMailbox
         channel_email.update(email: 'care@example.com')
         dbl = double
-        expect(SupportMailbox).to receive(:new).and_return(dbl)
+        expect(ReplyMailbox).to receive(:new).and_return(dbl)
         expect(dbl).to receive(:perform_processing).and_return(true)
         described_class.route support_mail
       end
 
-      it 'routes support emails to Support Mailbox when mail is to channel forward to email' do
+      it 'routes support emails to Reply Mailbox when mail is to channel forward to email' do
         # this email is hardcoded in the support.eml, that's why we are updating this
+        # With NewConversationStrategy, all channel emails route to ReplyMailbox
         channel_email.update(forward_to_email: 'care@example.com')
         dbl = double
-        expect(SupportMailbox).to receive(:new).and_return(dbl)
+        expect(ReplyMailbox).to receive(:new).and_return(dbl)
         expect(dbl).to receive(:perform_processing).and_return(true)
         described_class.route support_mail
       end
 
-      it 'routes support emails to Support Mailbox with cc email' do
+      it 'routes support emails to Reply Mailbox with cc email' do
+        # With NewConversationStrategy, all channel emails route to ReplyMailbox
         channel_email.update(email: 'test@example.com')
         dbl = double
-        expect(SupportMailbox).to receive(:new).and_return(dbl)
+        expect(ReplyMailbox).to receive(:new).and_return(dbl)
         expect(dbl).to receive(:perform_processing).and_return(true)
         described_class.route reply_cc_mail
       end
diff --git a/spec/mailboxes/imap/imap_mailbox_spec.rb b/spec/mailboxes/imap/imap_mailbox_spec.rb
index 4535899cf..309a38a65 100644
--- a/spec/mailboxes/imap/imap_mailbox_spec.rb
+++ b/spec/mailboxes/imap/imap_mailbox_spec.rb
@@ -264,5 +264,54 @@ RSpec.describe Imap::ImapMailbox do
         expect(conversation.additional_attributes['in_reply_to']).to eq(multiple_in_reply_to_mail.in_reply_to.first)
       end
     end
+
+    context 'when a reply to a conversation started by an agent' do
+      let(:agent_conversation) { create(:conversation, account: account, inbox: channel.inbox, assignee: agent) }
+      let(:reply_mail_with_fallback_reference) do
+        # Simulate an email reply with a reference that matches FALLBACK_PATTERN
+        reference_id = "account/#{account.id}/conversation/#{agent_conversation.uuid}@chatwoot.com"
+        create_inbound_email_from_mail(
+          from: 'email@gmail.com',
+          to: 'imap@gmail.com',
+          subject: 'Re: Agent started conversation',
+          references: [reference_id]
+        )
+      end
+
+      it 'appends email to the existing conversation using FALLBACK_PATTERN' do
+        expect(agent_conversation.messages.size).to eq(0)
+
+        class_instance.process(reply_mail_with_fallback_reference.mail, channel)
+
+        agent_conversation.reload
+        expect(agent_conversation.messages.size).to eq(1)
+        expect(agent_conversation.messages.last.content_attributes['email']['from']).to eq(reply_mail_with_fallback_reference.mail.from)
+      end
+    end
+
+    context 'when references contain both message and fallback patterns' do
+      let(:agent_conversation) { create(:conversation, account: account, inbox: channel.inbox, assignee: agent) }
+      let(:reply_mail_with_multiple_references) do
+        # Multiple references including both patterns
+        fallback_reference = "account/#{account.id}/conversation/#{agent_conversation.uuid}@chatwoot.com"
+        other_reference = 'some-other-message-id@example.com'
+        create_inbound_email_from_mail(
+          from: 'email@gmail.com',
+          to: 'imap@gmail.com',
+          subject: 'Re: Multiple references',
+          references: [other_reference, fallback_reference]
+        )
+      end
+
+      it 'finds conversation using fallback pattern when message lookup fails' do
+        expect(agent_conversation.messages.size).to eq(0)
+
+        class_instance.process(reply_mail_with_multiple_references.mail, channel)
+
+        agent_conversation.reload
+        expect(agent_conversation.messages.size).to eq(1)
+        expect(agent_conversation.messages.last.content_attributes['email']['from']).to eq(reply_mail_with_multiple_references.mail.from)
+      end
+    end
   end
 end
diff --git a/spec/mailboxes/reply_mailbox_spec.rb b/spec/mailboxes/reply_mailbox_spec.rb
index 167777218..2658731bc 100644
--- a/spec/mailboxes/reply_mailbox_spec.rb
+++ b/spec/mailboxes/reply_mailbox_spec.rb
@@ -248,5 +248,448 @@ RSpec.describe ReplyMailbox do
         )
       end
     end
+
+    context 'with references header' do
+      let(:reply_mail_with_references) { create_inbound_email_from_fixture('reply_mail_without_uuid.eml') }
+      let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
+      let(:conversation_1) do
+        create(
+          :conversation,
+          assignee: agent,
+          inbox: email_channel.inbox,
+          account: account,
+          additional_attributes: { mail_subject: "Discussion: Let's debate these attachments" }
+        )
+      end
+
+      before do
+        conversation_1.update!(uuid: '6bdc3f4d-0bec-4515-a284-5d916fdde489')
+      end
+
+      context 'with message-specific pattern in references' do
+        before do
+          reply_mail_with_references.mail['References'] = '<conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123@test.com>'
+        end
+
+        it 'finds conversation from references header with message pattern' do
+          described_class.receive reply_mail_with_references
+          expect(conversation_1.messages.last.content).to include("Let's talk about these images:")
+        end
+      end
+
+      context 'with conversation fallback pattern in references' do
+        before do
+          reply_mail_with_references.mail['References'] = "<account/#{account.id}/conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489@test.com>"
+        end
+
+        it 'finds conversation from references header with fallback pattern' do
+          described_class.receive reply_mail_with_references
+          expect(conversation_1.messages.last.content).to include("Let's talk about these images:")
+        end
+      end
+
+      context 'with multiple references including conversation pattern' do
+        before do
+          reply_mail_with_references.mail['References'] = [
+            '<some-random-message-id@gmail.com>',
+            "<account/#{account.id}/conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489@test.com>",
+            '<another-random-message-id@outlook.com>'
+          ].join("\r\n ")
+        end
+
+        it 'finds conversation from any reference in the chain' do
+          described_class.receive reply_mail_with_references
+          expect(conversation_1.messages.last.content).to include("Let's talk about these images:")
+        end
+      end
+
+      context 'with message source_id in references' do
+        before do
+          conversation_1.messages.create!(
+            source_id: 'original-message-id@test.com',
+            account_id: account.id,
+            message_type: 'outgoing',
+            inbox_id: email_channel.inbox.id,
+            content: 'Original message'
+          )
+          reply_mail_with_references.mail['References'] = '<original-message-id@test.com>'
+        end
+
+        it 'finds conversation from message source_id in references' do
+          described_class.receive reply_mail_with_references
+          expect(conversation_1.messages.last.content).to include("Let's talk about these images:")
+        end
+      end
+
+      context 'with conversation from different channel in references' do
+        let(:other_email_channel) { create(:channel_email, email: 'other@example.com', account: account) }
+        let(:other_conversation) do
+          create(
+            :conversation,
+            assignee: agent,
+            inbox: other_email_channel.inbox,
+            account: account
+          )
+        end
+
+        before do
+          other_conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
+          reply_mail_with_references.mail['References'] = '<conversation/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/messages/456@test.com>'
+        end
+
+        it 'does not use conversation from different channel' do
+          described_class.receive reply_mail_with_references
+          expect(other_conversation.messages.count).to eq(0)
+        end
+      end
+    end
+  end
+
+  describe 'when a chatwoot notification email is received' do
+    let(:account) { create(:account) }
+    let!(:channel_email) { create(:channel_email, email: 'sojan@chatwoot.com', account: account) }
+    let(:notification_mail) { create_inbound_email_from_fixture('notification.eml') }
+    let(:described_subject) { described_class.receive notification_mail }
+    let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
+
+    it 'shouldnt create a conversation in the channel' do
+      described_subject
+      expect(conversation.present?).to be(false)
+    end
+  end
+
+  describe 'when bounced email with out a sender is recieved' do
+    let(:account) { create(:account) }
+    let(:bounced_email) { create_inbound_email_from_fixture('bounced_with_no_from.eml') }
+    let(:described_subject) { described_class.receive bounced_email }
+
+    it 'shouldnt throw an error' do
+      create(:channel_email, email: 'support@example.com', account: account)
+      expect { described_subject }.not_to raise_error
+    end
+  end
+
+  describe 'when an account is suspended' do
+    let(:account) { create(:account, status: :suspended) }
+    let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
+    let!(:channel_email) { create(:channel_email, account: account) }
+    let(:support_mail) { create_inbound_email_from_fixture('support.eml') }
+    let(:described_subject) { described_class.receive support_mail }
+    let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
+
+    before do
+      # this email is hardcoded in the support.eml, that's why we are updating this
+      channel_email.email = 'care@example.com'
+      channel_email.save!
+    end
+
+    it 'shouldnt create a conversation in the channel' do
+      described_subject
+      expect(conversation.present?).to be(false)
+    end
+  end
+
+  describe 'add mail as a new ticket in the email inbox' do
+    let(:account) { create(:account) }
+    let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
+    let!(:channel_email) { create(:channel_email, account: account) }
+    let(:support_mail) { create_inbound_email_from_fixture('support.eml') }
+    let(:support_in_reply_to_mail) { create_inbound_email_from_fixture('support_in_reply_to.eml') }
+    let(:described_subject) { described_class.receive support_mail }
+    let(:serialized_attributes) do
+      %w[bcc cc content_type date from html_content in_reply_to message_id multipart number_of_attachments references subject
+         text_content to auto_reply]
+    end
+    let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
+
+    before do
+      # this email is hardcoded in the support.eml, that's why we are updating this
+      channel_email.email = 'care@example.com'
+      channel_email.save!
+    end
+
+    describe 'covers email address format' do
+      before do
+        described_class.receive support_in_reply_to_mail
+      end
+
+      it 'creates contact with proper email address' do
+        expect(support_in_reply_to_mail.mail['reply_to'].try(:value)).to eq('Sony Mathew <sony@chatwoot.com>')
+        expect(conversation.contact.email).to eq('sony@chatwoot.com')
+      end
+    end
+
+    describe 'covers basic ticket creation' do
+      before do
+        described_subject
+      end
+
+      it 'create the conversation in the inbox of the email channel' do
+        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
+        expect(conversation.additional_attributes['source']).to eq('email')
+        expect(conversation.contact.email).to eq(support_mail.mail.from.first)
+      end
+
+      it 'create a new contact as the sender of the email' do
+        email_sender = Mail::Address.new(support_mail.mail[:from].value).name
+        expect(conversation.messages.last.sender.email).to eq(support_mail.mail.from.first)
+        expect(conversation.contact.name).to eq(email_sender)
+      end
+
+      it 'add the mail content as new message on the conversation' do
+        expect(conversation.messages.last.content).to eq("Let's talk about these images:")
+      end
+
+      it 'add the attachments' do
+        expect(conversation.messages.last.attachments.count).to eq(2)
+      end
+
+      it 'have proper content_attributes with details of email' do
+        expect(conversation.messages.last.content_attributes[:email].keys).to eq(serialized_attributes)
+      end
+
+      it 'set proper content_type' do
+        expect(conversation.messages.last.content_type).to eq('incoming_email')
+      end
+    end
+
+    describe 'email with references header' do
+      let(:mail_with_references) { create_inbound_email_from_fixture('mail_with_references.eml') }
+      let(:described_subject) { described_class.receive mail_with_references }
+
+      before do
+        # reuse the existing channel_email that's already set to 'care@example.com'
+        described_subject
+      end
+
+      it 'includes references in the message content_attributes' do
+        message = conversation.messages.last
+        email_attributes = message.content_attributes['email']
+
+        expect(email_attributes['references']).to be_present
+        expect(email_attributes['references']).to eq(['4e6e35f5a38b4_479f13bb90078178@small-app-01.mail', 'test-reference-id'])
+      end
+
+      it 'includes references in serialized email attributes' do
+        message = conversation.messages.last
+        expect(message.content_attributes['email'].keys).to include('references')
+      end
+    end
+
+    describe 'Sender without name' do
+      let(:support_mail_without_sender_name) { create_inbound_email_from_fixture('support_without_sender_name.eml') }
+      let(:described_subject) { described_class.receive support_mail_without_sender_name }
+
+      it 'create a new contact with the email' do
+        described_subject
+        email_sender = support_mail_without_sender_name.mail.from.first.split('@').first
+        expect(conversation.messages.last.sender.email).to eq(support_mail.mail.from.first)
+        expect(conversation.contact.name).to eq(email_sender)
+      end
+    end
+
+    describe 'Sender with upcase mail address' do
+      let(:support_mail_without_sender_name) { create_inbound_email_from_fixture('support_without_sender_name.eml') }
+      let(:described_subject) { described_class.receive support_mail_without_sender_name }
+
+      it 'create a new inbox with the email case insensitive' do
+        described_subject
+        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
+      end
+    end
+
+    describe 'handle inbox contacts' do
+      let!(:contact) { create(:contact, account: account, email: support_mail.mail.from.first) }
+      let!(:contact_inbox) { create(:contact_inbox, inbox: channel_email.inbox, contact: contact) }
+
+      it 'does not create new contact if that contact exists in the inbox' do
+        expect do
+          described_subject
+        end
+          .to(not_change { Contact.count }
+            .and(not_change { ContactInbox.count }))
+
+        expect(conversation.messages.last.sender.id).to eq(contact.id)
+        expect(conversation.contact_inbox).to eq(contact_inbox)
+      end
+
+      context 'with uppercase reply-to' do
+        let(:support_mail) { create_inbound_email_from_fixture('support_uppercase.eml') }
+        let!(:contact) { create(:contact, account: account, email: support_mail.mail.from.first) }
+        let!(:contact_inbox) { create(:contact_inbox, inbox: channel_email.inbox, contact: contact) }
+
+        it 'does not create new contact if that contact exists in the inbox' do
+          expect do
+            described_subject
+          end
+            .to(not_change { Contact.count }
+              .and(not_change { ContactInbox.count }))
+
+          expect(conversation.messages.last.sender.id).to eq(contact.id)
+          expect(conversation.contact_inbox).to eq(contact_inbox)
+        end
+      end
+    end
+
+    describe 'group email sender' do
+      let(:group_sender_support_mail) { create_inbound_email_from_fixture('group_sender_support.eml') }
+      let(:described_subject) { described_class.receive group_sender_support_mail }
+
+      before do
+        # this email is hardcoded eml fixture file that's why we are updating this
+        channel_email.email = 'support@chatwoot.com'
+        channel_email.save!
+      end
+
+      it 'create new contact with original sender' do
+        described_subject
+        email_sender = Mail::Address.new(group_sender_support_mail.mail[:from].value).name
+
+        expect(conversation.contact.email).to eq(group_sender_support_mail.mail['X-Original-Sender'].value)
+        expect(conversation.contact.name).to eq(email_sender)
+      end
+    end
+
+    describe 'when mail has in reply to email' do
+      let(:reply_mail_without_uuid) { create_inbound_email_from_fixture('reply_mail_without_uuid.eml') }
+      let(:described_subject) { described_class.receive reply_mail_without_uuid }
+      let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
+
+      before do
+        email_channel
+        reply_mail_without_uuid.mail['In-Reply-To'] = 'conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123'
+      end
+
+      it 'create channel with reply to mail' do
+        described_subject
+        conversation_1 = Conversation.last
+
+        expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
+        expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
+      end
+
+      it 'append message to email conversation with same in reply to' do
+        described_subject
+        conversation_1 = Conversation.last
+
+        expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
+        expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
+        expect(conversation_1.messages.count).to eq(1)
+
+        reply_mail_without_uuid.mail['In-Reply-To'] = 'conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123'
+        reply_mail_without_uuid.mail['Message-Id'] = '0CB459E0-0336-41DA-BC88-E6E28C697SFC@chatwoot.com'
+
+        described_class.receive reply_mail_without_uuid
+
+        expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
+        expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
+        expect(conversation_1.messages.count).to eq(2)
+      end
+    end
+
+    describe 'Sender with reply_to email address' do
+      let(:reply_to_mail) { create_inbound_email_from_fixture('reply_to.eml') }
+      let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
+
+      it 'prefer reply-to over from address' do
+        email_channel
+        described_class.receive reply_to_mail
+
+        conversation_1 = Conversation.last
+        email = conversation_1.messages.last.content_attributes['email']
+
+        expect(reply_to_mail.mail['From'].value).to be_present
+        expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
+        expect(reply_to_mail.mail['Reply-To'].value).to include(email['from'][0])
+        expect(reply_to_mail.mail['Reply-To'].value).to include(conversation_1.contact.email)
+        expect(reply_to_mail.mail['From'].value).not_to include(conversation_1.contact.email)
+      end
+    end
+
+    describe 'when mail part is not present' do
+      let(:support_mail) { create_inbound_email_from_fixture('support_1.eml') }
+      let(:only_text) { create_inbound_email_from_fixture('only_text.eml') }
+      let(:only_html) { create_inbound_email_from_fixture('only_html.eml') }
+      let(:only_attachments) { create_inbound_email_from_fixture('only_attachments.eml') }
+      let(:html_and_attachments) { create_inbound_email_from_fixture('html_and_attachments.eml') }
+      let(:described_subject) { described_class.receive support_mail }
+
+      it 'Considers raw html mail body' do
+        described_subject
+        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
+
+        expect(conversation.messages.last.content_attributes['email']['html_content']['reply']).to include(
+          <<~BODY.chomp
+            Hi,
+
+            We are providing you platform from here you can sell paid posts on your website.
+
+            Chatwoot | CS team | [C](https://d33wubrfki0l68.cloudfront.net/973467c532160fd8b940300a43fa85fa2d060307/dc9a0/static/brand-73f58cdefae282ae74cebfa74c1d7003.svg)
+
+            Skype: live:.cid.something
+
+            []
+          BODY
+        )
+        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('Get Paid to post an article')
+      end
+
+      it 'Considers only text body' do
+        described_class.receive only_text
+
+        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
+
+        expect(conversation.messages.last.content).to eq('text only mail')
+        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('test text only mail')
+      end
+
+      it 'Considers only html body' do
+        described_class.receive only_html
+
+        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
+
+        expect(conversation.messages.last.content).to eq(
+          <<~BODY.chomp
+            This is html only mail
+          BODY
+        )
+        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('test html only mail')
+      end
+
+      it 'Considers only attachments' do
+        described_class.receive only_attachments
+
+        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
+
+        expect(conversation.messages.last.content).to be_nil
+        expect(conversation.messages.last.attachments.count).to eq(1)
+        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('only attachments')
+      end
+
+      it 'Considers html and attachments' do
+        described_class.receive html_and_attachments
+
+        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
+
+        expect(conversation.messages.last.content).to eq('This is html and attachments only mail')
+        expect(conversation.messages.last.attachments.count).to eq(1)
+        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('attachment with html')
+      end
+    end
+
+    describe 'when BCC processing is disabled for account' do
+      before do
+        allow(GlobalConfigService).to receive(:load).with('SKIP_INCOMING_BCC_PROCESSING', '').and_return(account.id.to_s)
+      end
+
+      it 'does not process BCC-only emails' do
+        bcc_mail = create_inbound_email_from_fixture('support.eml')
+        bcc_mail.mail['to'] = nil
+        bcc_mail.mail['bcc'] = 'care@example.com'
+
+        described_class.receive bcc_mail
+        expect(conversation.present?).to be(false)
+      end
+    end
   end
 end
diff --git a/spec/mailboxes/support_mailbox_spec.rb b/spec/mailboxes/support_mailbox_spec.rb
deleted file mode 100644
index 0dbfbbe3b..000000000
--- a/spec/mailboxes/support_mailbox_spec.rb
+++ /dev/null
@@ -1,352 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe SupportMailbox do
-  include ActionMailbox::TestHelper
-
-  describe 'when a chatwoot notification email is received' do
-    let(:account) { create(:account) }
-    let!(:channel_email) { create(:channel_email, email: 'sojan@chatwoot.com', account: account) }
-    let(:notification_mail) { create_inbound_email_from_fixture('notification.eml') }
-    let(:described_subject) { described_class.receive notification_mail }
-    let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
-
-    it 'shouldnt create a conversation in the channel' do
-      described_subject
-      expect(conversation.present?).to be(false)
-    end
-  end
-
-  describe 'when bounced email with out a sender is recieved' do
-    let(:account) { create(:account) }
-    let(:bounced_email) { create_inbound_email_from_fixture('bounced_with_no_from.eml') }
-    let(:described_subject) { described_class.receive bounced_email }
-
-    it 'shouldnt throw an error' do
-      create(:channel_email, email: 'support@example.com', account: account)
-      expect { described_subject }.not_to raise_error
-    end
-  end
-
-  describe 'when an account is suspended' do
-    let(:account) { create(:account, status: :suspended) }
-    let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
-    let!(:channel_email) { create(:channel_email, account: account) }
-    let(:support_mail) { create_inbound_email_from_fixture('support.eml') }
-    let(:described_subject) { described_class.receive support_mail }
-    let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
-
-    before do
-      # this email is hardcoded in the support.eml, that's why we are updating this
-      channel_email.email = 'care@example.com'
-      channel_email.save!
-    end
-
-    it 'shouldnt create a conversation in the channel' do
-      described_subject
-      expect(conversation.present?).to be(false)
-    end
-  end
-
-  describe 'add mail as a new ticket in the email inbox' do
-    let(:account) { create(:account) }
-    let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
-    let!(:channel_email) { create(:channel_email, account: account) }
-    let(:support_mail) { create_inbound_email_from_fixture('support.eml') }
-    let(:support_in_reply_to_mail) { create_inbound_email_from_fixture('support_in_reply_to.eml') }
-    let(:described_subject) { described_class.receive support_mail }
-    let(:serialized_attributes) do
-      %w[bcc cc content_type date from html_content in_reply_to message_id multipart number_of_attachments references subject
-         text_content to auto_reply]
-    end
-    let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
-
-    before do
-      # this email is hardcoded in the support.eml, that's why we are updating this
-      channel_email.email = 'care@example.com'
-      channel_email.save!
-    end
-
-    describe 'covers email address format' do
-      before do
-        described_class.receive support_in_reply_to_mail
-      end
-
-      it 'creates contact with proper email address' do
-        expect(support_in_reply_to_mail.mail['reply_to'].try(:value)).to eq('Sony Mathew <sony@chatwoot.com>')
-        expect(conversation.contact.email).to eq('sony@chatwoot.com')
-      end
-    end
-
-    describe 'covers basic ticket creation' do
-      before do
-        described_subject
-      end
-
-      it 'create the conversation in the inbox of the email channel' do
-        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
-        expect(conversation.additional_attributes['source']).to eq('email')
-        expect(conversation.contact.email).to eq(support_mail.mail.from.first)
-      end
-
-      it 'create a new contact as the sender of the email' do
-        email_sender = Mail::Address.new(support_mail.mail[:from].value).name
-        expect(conversation.messages.last.sender.email).to eq(support_mail.mail.from.first)
-        expect(conversation.contact.name).to eq(email_sender)
-      end
-
-      it 'add the mail content as new message on the conversation' do
-        expect(conversation.messages.last.content).to eq("Let's talk about these images:")
-      end
-
-      it 'add the attachments' do
-        expect(conversation.messages.last.attachments.count).to eq(2)
-      end
-
-      it 'have proper content_attributes with details of email' do
-        expect(conversation.messages.last.content_attributes[:email].keys).to eq(serialized_attributes)
-      end
-
-      it 'set proper content_type' do
-        expect(conversation.messages.last.content_type).to eq('incoming_email')
-      end
-    end
-
-    describe 'email with references header' do
-      let(:mail_with_references) { create_inbound_email_from_fixture('mail_with_references.eml') }
-      let(:described_subject) { described_class.receive mail_with_references }
-
-      before do
-        # reuse the existing channel_email that's already set to 'care@example.com'
-        described_subject
-      end
-
-      it 'includes references in the message content_attributes' do
-        message = conversation.messages.last
-        email_attributes = message.content_attributes['email']
-
-        expect(email_attributes['references']).to be_present
-        expect(email_attributes['references']).to eq(['4e6e35f5a38b4_479f13bb90078178@small-app-01.mail', 'test-reference-id'])
-      end
-
-      it 'includes references in serialized email attributes' do
-        message = conversation.messages.last
-        expect(message.content_attributes['email'].keys).to include('references')
-      end
-    end
-
-    describe 'Sender without name' do
-      let(:support_mail_without_sender_name) { create_inbound_email_from_fixture('support_without_sender_name.eml') }
-      let(:described_subject) { described_class.receive support_mail_without_sender_name }
-
-      it 'create a new contact with the email' do
-        described_subject
-        email_sender = support_mail_without_sender_name.mail.from.first.split('@').first
-        expect(conversation.messages.last.sender.email).to eq(support_mail.mail.from.first)
-        expect(conversation.contact.name).to eq(email_sender)
-      end
-    end
-
-    describe 'Sender with upcase mail address' do
-      let(:support_mail_without_sender_name) { create_inbound_email_from_fixture('support_without_sender_name.eml') }
-      let(:described_subject) { described_class.receive support_mail_without_sender_name }
-
-      it 'create a new inbox with the email case insensitive' do
-        described_subject
-        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
-      end
-    end
-
-    describe 'handle inbox contacts' do
-      let!(:contact) { create(:contact, account: account, email: support_mail.mail.from.first) }
-      let!(:contact_inbox) { create(:contact_inbox, inbox: channel_email.inbox, contact: contact) }
-
-      it 'does not create new contact if that contact exists in the inbox' do
-        expect do
-          described_subject
-        end
-          .to(not_change { Contact.count }
-            .and(not_change { ContactInbox.count }))
-
-        expect(conversation.messages.last.sender.id).to eq(contact.id)
-        expect(conversation.contact_inbox).to eq(contact_inbox)
-      end
-
-      context 'with uppercase reply-to' do
-        let(:support_mail) { create_inbound_email_from_fixture('support_uppercase.eml') }
-        let!(:contact) { create(:contact, account: account, email: support_mail.mail.from.first) }
-        let!(:contact_inbox) { create(:contact_inbox, inbox: channel_email.inbox, contact: contact) }
-
-        it 'does not create new contact if that contact exists in the inbox' do
-          expect do
-            described_subject
-          end
-            .to(not_change { Contact.count }
-              .and(not_change { ContactInbox.count }))
-
-          expect(conversation.messages.last.sender.id).to eq(contact.id)
-          expect(conversation.contact_inbox).to eq(contact_inbox)
-        end
-      end
-    end
-
-    describe 'group email sender' do
-      let(:group_sender_support_mail) { create_inbound_email_from_fixture('group_sender_support.eml') }
-      let(:described_subject) { described_class.receive group_sender_support_mail }
-
-      before do
-        # this email is hardcoded eml fixture file that's why we are updating this
-        channel_email.email = 'support@chatwoot.com'
-        channel_email.save!
-      end
-
-      it 'create new contact with original sender' do
-        described_subject
-        email_sender = Mail::Address.new(group_sender_support_mail.mail[:from].value).name
-
-        expect(conversation.contact.email).to eq(group_sender_support_mail.mail['X-Original-Sender'].value)
-        expect(conversation.contact.name).to eq(email_sender)
-      end
-    end
-
-    describe 'when mail has in reply to email' do
-      let(:reply_mail_without_uuid) { create_inbound_email_from_fixture('reply_mail_without_uuid.eml') }
-      let(:described_subject) { described_class.receive reply_mail_without_uuid }
-      let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
-
-      before do
-        email_channel
-        reply_mail_without_uuid.mail['In-Reply-To'] = 'conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123'
-      end
-
-      it 'create channel with reply to mail' do
-        described_subject
-        conversation_1 = Conversation.last
-
-        expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
-        expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
-      end
-
-      it 'append message to email conversation with same in reply to' do
-        described_subject
-        conversation_1 = Conversation.last
-
-        expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
-        expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
-        expect(conversation_1.messages.count).to eq(1)
-
-        reply_mail_without_uuid.mail['In-Reply-To'] = 'conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123'
-        reply_mail_without_uuid.mail['Message-Id'] = '0CB459E0-0336-41DA-BC88-E6E28C697SFC@chatwoot.com'
-
-        described_class.receive reply_mail_without_uuid
-
-        expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
-        expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
-        expect(conversation_1.messages.count).to eq(2)
-      end
-    end
-
-    describe 'Sender with reply_to email address' do
-      let(:reply_to_mail) { create_inbound_email_from_fixture('reply_to.eml') }
-      let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
-
-      it 'prefer reply-to over from address' do
-        email_channel
-        described_class.receive reply_to_mail
-
-        conversation_1 = Conversation.last
-        email = conversation_1.messages.last.content_attributes['email']
-
-        expect(reply_to_mail.mail['From'].value).to be_present
-        expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
-        expect(reply_to_mail.mail['Reply-To'].value).to include(email['from'][0])
-        expect(reply_to_mail.mail['Reply-To'].value).to include(conversation_1.contact.email)
-        expect(reply_to_mail.mail['From'].value).not_to include(conversation_1.contact.email)
-      end
-    end
-
-    describe 'when mail part is not present' do
-      let(:support_mail) { create_inbound_email_from_fixture('support_1.eml') }
-      let(:only_text) { create_inbound_email_from_fixture('only_text.eml') }
-      let(:only_html) { create_inbound_email_from_fixture('only_html.eml') }
-      let(:only_attachments) { create_inbound_email_from_fixture('only_attachments.eml') }
-      let(:html_and_attachments) { create_inbound_email_from_fixture('html_and_attachments.eml') }
-      let(:described_subject) { described_class.receive support_mail }
-
-      it 'Considers raw html mail body' do
-        described_subject
-        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
-
-        expect(conversation.messages.last.content_attributes['email']['html_content']['reply']).to include(
-          <<~BODY.chomp
-            Hi,
-
-            We are providing you platform from here you can sell paid posts on your website.
-
-            Chatwoot | CS team | [C](https://d33wubrfki0l68.cloudfront.net/973467c532160fd8b940300a43fa85fa2d060307/dc9a0/static/brand-73f58cdefae282ae74cebfa74c1d7003.svg)
-
-            Skype: live:.cid.something
-
-            []
-          BODY
-        )
-        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('Get Paid to post an article')
-      end
-
-      it 'Considers only text body' do
-        described_class.receive only_text
-
-        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
-
-        expect(conversation.messages.last.content).to eq('text only mail')
-        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('test text only mail')
-      end
-
-      it 'Considers only html body' do
-        described_class.receive only_html
-
-        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
-
-        expect(conversation.messages.last.content).to eq(
-          <<~BODY.chomp
-            This is html only mail
-          BODY
-        )
-        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('test html only mail')
-      end
-
-      it 'Considers only attachments' do
-        described_class.receive only_attachments
-
-        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
-
-        expect(conversation.messages.last.content).to be_nil
-        expect(conversation.messages.last.attachments.count).to eq(1)
-        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('only attachments')
-      end
-
-      it 'Considers html and attachments' do
-        described_class.receive html_and_attachments
-
-        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
-
-        expect(conversation.messages.last.content).to eq('This is html and attachments only mail')
-        expect(conversation.messages.last.attachments.count).to eq(1)
-        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('attachment with html')
-      end
-    end
-
-    describe 'when BCC processing is disabled for account' do
-      before do
-        allow(GlobalConfigService).to receive(:load).with('SKIP_INCOMING_BCC_PROCESSING', '').and_return(account.id.to_s)
-      end
-
-      it 'does not process BCC-only emails' do
-        bcc_mail = create_inbound_email_from_fixture('support.eml')
-        bcc_mail.mail['to'] = nil
-        bcc_mail.mail['bcc'] = 'care@example.com'
-
-        expect { described_class.receive bcc_mail }.to raise_error('Email channel/inbox not found')
-      end
-    end
-  end
-end
diff --git a/spec/mailers/administrator_notifications/account_notification_mailer_spec.rb b/spec/mailers/administrator_notifications/account_notification_mailer_spec.rb
index dbe6ac11b..0bb33986c 100644
--- a/spec/mailers/administrator_notifications/account_notification_mailer_spec.rb
+++ b/spec/mailers/administrator_notifications/account_notification_mailer_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe AdministratorNotifications::AccountNotificationMailer do
 
   describe '#format_deletion_date' do
     it 'formats a valid date string' do
-      date_str = '2024-12-31T23:59:59Z'
+      date_str = '2024-12-31T12:00:00Z'
       formatted = described_class.new.send(:format_deletion_date, date_str)
       expect(formatted).to eq('December 31, 2024')
     end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 842aaf732..0656870c8 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -22,6 +22,12 @@ RSpec.describe Account do
   describe 'length validations' do
     let(:account) { create(:account) }
 
+    it 'validates name presence' do
+      account.name = ''
+      account.valid?
+      expect(account.errors[:name]).to include("can't be blank")
+    end
+
     it 'validates name length' do
       account.name = 'a' * 256
       account.valid?
@@ -203,12 +209,12 @@ RSpec.describe Account do
     context 'when using with_auto_resolve scope' do
       it 'finds accounts with auto_resolve_after set' do
         account.update(auto_resolve_after: 40 * 24 * 60)
-        expect(described_class.with_auto_resolve).to include(account)
+        expect(described_class.with_auto_resolve.pluck(:id)).to include(account.id)
       end
 
       it 'does not find accounts without auto_resolve_after' do
         account.update(auto_resolve_after: nil)
-        expect(described_class.with_auto_resolve).not_to include(account)
+        expect(described_class.with_auto_resolve.pluck(:id)).not_to include(account.id)
       end
     end
   end
diff --git a/spec/models/attachment_spec.rb b/spec/models/attachment_spec.rb
index cc00eab5d..f2460a30f 100644
--- a/spec/models/attachment_spec.rb
+++ b/spec/models/attachment_spec.rb
@@ -154,4 +154,39 @@ RSpec.describe Attachment do
       end
     end
   end
+
+  describe 'file size validation' do
+    let(:attachment) { message.attachments.new(account_id: message.account_id, file_type: :image) }
+
+    before do
+      allow(GlobalConfigService).to receive(:load).and_call_original
+    end
+
+    it 'respects configured limit' do
+      allow(GlobalConfigService).to receive(:load)
+        .with('MAXIMUM_FILE_UPLOAD_SIZE', 40)
+        .and_return('5')
+
+      attachment.errors.clear
+      attachment.send(:validate_file_size, 4.megabytes)
+
+      expect(attachment.errors[:file]).to be_empty
+
+      attachment.errors.clear
+      attachment.send(:validate_file_size, 6.megabytes)
+
+      expect(attachment.errors[:file]).to include('size is too big')
+    end
+
+    it 'falls back to default when configured limit is invalid' do
+      allow(GlobalConfigService).to receive(:load)
+        .with('MAXIMUM_FILE_UPLOAD_SIZE', 40)
+        .and_return('-10')
+
+      attachment.errors.clear
+      attachment.send(:validate_file_size, 41.megabytes)
+
+      expect(attachment.errors[:file]).to include('size is too big')
+    end
+  end
 end
diff --git a/spec/models/concerns/avatarable_shared.rb b/spec/models/concerns/avatarable_shared.rb
index 188868fa1..4529036ab 100644
--- a/spec/models/concerns/avatarable_shared.rb
+++ b/spec/models/concerns/avatarable_shared.rb
@@ -3,7 +3,10 @@ require 'rails_helper'
 shared_examples_for 'avatarable' do
   let(:avatarable) { create(described_class.to_s.underscore) }
 
-  it { is_expected.to have_one_attached(:avatar) }
+  it 'has avatar attachment defined' do
+    expect(avatarable).to respond_to(:avatar)
+    expect(avatarable.avatar).to respond_to(:attach)
+  end
 
   it 'add avatar_url method' do
     expect(avatarable.respond_to?(:avatar_url)).to be true
diff --git a/spec/models/concerns/switch_locale_spec.rb b/spec/models/concerns/switch_locale_spec.rb
index 421f254a0..05853cbf2 100644
--- a/spec/models/concerns/switch_locale_spec.rb
+++ b/spec/models/concerns/switch_locale_spec.rb
@@ -81,14 +81,15 @@ RSpec.describe 'SwitchLocale Concern', type: :controller do
   end
 
   describe '#switch_locale_using_account_locale' do
-    before do
-      routes.draw { get 'account_locale' => 'anonymous#account_locale' }
-    end
-
     it 'sets locale from account' do
       controller.instance_variable_set(:@current_account, account)
-      get :account_locale
-      expect(response.body).to eq('es')
+
+      result = nil
+      controller.send(:switch_locale_using_account_locale) do
+        result = I18n.locale.to_s
+      end
+
+      expect(result).to eq('es')
     end
   end
 end
diff --git a/spec/models/contact_inbox_spec.rb b/spec/models/contact_inbox_spec.rb
index 23d4b7bc7..c0a2faf9e 100644
--- a/spec/models/contact_inbox_spec.rb
+++ b/spec/models/contact_inbox_spec.rb
@@ -40,6 +40,18 @@ RSpec.describe ContactInbox do
 
   describe 'validations' do
     context 'when source_id' do
+      it 'allows source_id longer than 255 characters for channels without format restrictions' do
+        long_source_id = 'a' * 300
+        email_inbox = create(:inbox, channel: create(:channel_email))
+        contact = create(:contact, account: email_inbox.account)
+        contact_inbox = build(:contact_inbox, contact: contact, inbox: email_inbox, source_id: long_source_id)
+
+        expect(contact_inbox.valid?).to be(true)
+        expect { contact_inbox.save! }.not_to raise_error
+        expect(contact_inbox.reload.source_id).to eq(long_source_id)
+        expect(contact_inbox.source_id.length).to eq(300)
+      end
+
       it 'validates whatsapp channel source_id' do
         whatsapp_inbox = create(:channel_whatsapp, sync_templates: false, validate_provider_config: false).inbox
         contact = create(:contact)
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 72962ba54..7a5398456 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -525,8 +525,9 @@ RSpec.describe Conversation do
         additional_attributes: {},
         meta: {
           sender: conversation.contact.push_event_data,
-          assignee: conversation.assignee,
-          team: conversation.team,
+          assignee: conversation.assigned_entity&.push_event_data,
+          assignee_type: conversation.assignee_type,
+          team: conversation.team&.push_event_data,
           hmac_verified: conversation.contact_inbox.hmac_verified
         },
         id: conversation.display_id,
@@ -576,9 +577,38 @@ RSpec.describe Conversation do
       expect(conversation.status).to eq('pending')
     end
 
-    it 'returns conversation as open if campaign is present' do
-      conversation = create(:conversation, inbox: bot_inbox.inbox, campaign: create(:campaign))
-      expect(conversation.status).to eq('open')
+    context 'with campaigns' do
+      let(:user) { create(:user, account: bot_inbox.inbox.account) }
+
+      it 'returns conversation as open if campaign has a sender' do
+        campaign = create(:campaign, inbox: bot_inbox.inbox, account: bot_inbox.inbox.account, sender: user)
+        conversation = create(:conversation, inbox: bot_inbox.inbox, campaign: campaign)
+        expect(conversation.status).to eq('open')
+      end
+
+      it 'returns conversation as pending if campaign has no sender (bot-initiated) and bot is active' do
+        campaign = create(:campaign, inbox: bot_inbox.inbox, account: bot_inbox.inbox.account, sender: nil)
+        conversation = create(:conversation, inbox: bot_inbox.inbox, campaign: campaign)
+        expect(conversation.status).to eq('pending')
+      end
+    end
+
+    context 'with campaigns in inbox without bot' do
+      let(:account) { create(:account) }
+      let(:inbox) { create(:inbox, account: account) }
+      let(:user) { create(:user, account: account) }
+
+      it 'returns conversation as open if campaign has no sender but no bot is active' do
+        campaign = create(:campaign, inbox: inbox, account: account, sender: nil)
+        conversation = create(:conversation, inbox: inbox, campaign: campaign)
+        expect(conversation.status).to eq('open')
+      end
+
+      it 'returns conversation as open if campaign has a sender' do
+        campaign = create(:campaign, inbox: inbox, account: account, sender: user)
+        conversation = create(:conversation, inbox: inbox, campaign: campaign)
+        expect(conversation.status).to eq('open')
+      end
     end
   end
 
diff --git a/spec/models/integrations/hook_spec.rb b/spec/models/integrations/hook_spec.rb
index 098e8b8c3..9c2eba73f 100644
--- a/spec/models/integrations/hook_spec.rb
+++ b/spec/models/integrations/hook_spec.rb
@@ -68,13 +68,13 @@ RSpec.describe Integrations::Hook do
     end
 
     it 'returns account hooks' do
-      expect(described_class.account_hooks).to include(account_hook)
-      expect(described_class.account_hooks).not_to include(inbox_hook)
+      expect(described_class.account_hooks.pluck(:id)).to include(account_hook.id)
+      expect(described_class.account_hooks.pluck(:id)).not_to include(inbox_hook.id)
     end
 
     it 'returns inbox hooks' do
-      expect(described_class.inbox_hooks).to include(inbox_hook)
-      expect(described_class.inbox_hooks).not_to include(account_hook)
+      expect(described_class.inbox_hooks.pluck(:id)).to include(inbox_hook.id)
+      expect(described_class.inbox_hooks.pluck(:id)).not_to include(account_hook.id)
     end
   end
 
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index 9cc43d0fd..8905f5103 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -45,6 +45,48 @@ RSpec.describe Message do
         end
       end
     end
+
+    context 'when it validates source_id length' do
+      it 'valid when source_id is within text limit (20000 chars)' do
+        long_source_id = 'a' * 10_000
+        message.source_id = long_source_id
+        expect(message.valid?).to be true
+      end
+
+      it 'valid when source_id is exactly 20000 characters' do
+        long_source_id = 'a' * 20_000
+        message.source_id = long_source_id
+        expect(message.valid?).to be true
+      end
+
+      it 'invalid when source_id exceeds text limit (20000 chars)' do
+        long_source_id = 'a' * 20_001
+        message.source_id = long_source_id
+        message.valid?
+
+        expect(message.errors[:source_id]).to include('is too long (maximum is 20000 characters)')
+      end
+
+      it 'handles long email Message-ID headers correctly' do
+        # Simulate a long Message-ID like some email systems generate
+        long_message_id = "msg-#{SecureRandom.hex(240)}@verylongdomainname.example.com"[0...500]
+        message.source_id = long_message_id
+        message.content_type = 'incoming_email'
+
+        expect(message.valid?).to be true
+        expect(message.source_id.length).to eq(500)
+      end
+
+      it 'allows nil source_id' do
+        message.source_id = nil
+        expect(message.valid?).to be true
+      end
+
+      it 'allows empty string source_id' do
+        message.source_id = ''
+        expect(message.valid?).to be true
+      end
+    end
   end
 
   describe 'concerns' do
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 172389fe4..3fbf4c480 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -16,8 +16,8 @@ RSpec.describe Notification do
       create(:notification)
       notification3 = create(:notification)
 
-      expect(described_class.all.first).to eq notification1
-      expect(described_class.all.last).to eq notification3
+      expect(described_class.all.first.id).to eq notification1.id
+      expect(described_class.all.last.id).to eq notification3.id
     end
   end
 
diff --git a/spec/presenters/conversations/event_data_presenter_spec.rb b/spec/presenters/conversations/event_data_presenter_spec.rb
index a645caf1d..bf0eaf6f6 100644
--- a/spec/presenters/conversations/event_data_presenter_spec.rb
+++ b/spec/presenters/conversations/event_data_presenter_spec.rb
@@ -12,8 +12,9 @@ RSpec.describe Conversations::EventDataPresenter do
         additional_attributes: {},
         meta: {
           sender: conversation.contact.push_event_data,
-          assignee: conversation.assignee,
-          team: conversation.team,
+          assignee: conversation.assigned_entity&.push_event_data,
+          assignee_type: conversation.assignee_type,
+          team: conversation.team&.push_event_data,
           hmac_verified: conversation.contact_inbox.hmac_verified
         },
         id: conversation.display_id,
diff --git a/spec/presenters/messages/search_data_presenter_spec.rb b/spec/presenters/messages/search_data_presenter_spec.rb
new file mode 100644
index 000000000..0bbe1a812
--- /dev/null
+++ b/spec/presenters/messages/search_data_presenter_spec.rb
@@ -0,0 +1,78 @@
+require 'rails_helper'
+
+RSpec.describe Messages::SearchDataPresenter do
+  let(:presenter) { described_class.new(message) }
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:contact) { create(:contact, account: account) }
+  let(:conversation) { create(:conversation, account: account, inbox: inbox, contact: contact) }
+  let(:message) { create(:message, account: account, inbox: inbox, conversation: conversation, sender: contact) }
+
+  describe '#search_data' do
+    let(:expected_data) do
+      {
+        content: message.content,
+        account_id: message.account_id,
+        inbox_id: message.inbox_id,
+        conversation_id: message.conversation_id,
+        message_type: message.message_type,
+        private: message.private,
+        created_at: message.created_at,
+        source_id: message.source_id,
+        sender_id: message.sender_id,
+        sender_type: message.sender_type,
+        conversation: {
+          id: conversation.display_id
+        }
+      }
+    end
+
+    it 'returns search index payload with core fields' do
+      expect(presenter.search_data).to include(expected_data)
+    end
+
+    context 'with attachments' do
+      before do
+        attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
+        attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+        attachment.meta = { 'transcribed_text' => 'Hello world' }
+      end
+
+      it 'includes attachment transcriptions' do
+        attachments_data = presenter.search_data[:attachments]
+        expect(attachments_data).to be_an(Array)
+        expect(attachments_data.first).to include(transcribed_text: 'Hello world')
+      end
+    end
+
+    context 'with email content attributes' do
+      before do
+        message.update(
+          content_attributes: { email: { subject: 'Test Subject' } }
+        )
+      end
+
+      it 'includes email subject' do
+        content_attrs = presenter.search_data[:content_attributes]
+        expect(content_attrs[:email][:subject]).to eq('Test Subject')
+      end
+    end
+
+    context 'with campaign and automation data' do
+      before do
+        message.update(
+          additional_attributes: { 'campaign_id' => '123' },
+          content_attributes: { 'automation_rule_id' => '456' }
+        )
+      end
+
+      it 'includes campaign_id' do
+        expect(presenter.search_data[:additional_attributes][:campaign_id]).to eq('123')
+      end
+
+      it 'includes automation_rule_id' do
+        expect(presenter.search_data[:additional_attributes][:automation_rule_id]).to eq('456')
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/accounts/base_controller_spec.rb b/spec/requests/api/v1/accounts/base_controller_spec.rb
new file mode 100644
index 000000000..6493bc986
--- /dev/null
+++ b/spec/requests/api/v1/accounts/base_controller_spec.rb
@@ -0,0 +1,63 @@
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Accounts::BaseController', type: :request do
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account) }
+  let!(:conversation) { create(:conversation, account: account, inbox: inbox) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+
+  before do
+    create(:inbox_member, inbox: inbox, user: agent)
+  end
+
+  context 'when agent bot belongs to the account' do
+    let(:agent_bot) { create(:agent_bot, account: account) }
+
+    it 'allows assignments via API' do
+      post api_v1_account_conversation_assignments_url(account_id: account.id, conversation_id: conversation.display_id),
+           headers: { api_access_token: agent_bot.access_token.token },
+           params: { assignee_id: agent.id },
+           as: :json
+
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  context 'when agent bot belongs to another account' do
+    let(:other_account) { create(:account) }
+    let(:external_bot) { create(:agent_bot, account: other_account) }
+
+    it 'rejects assignment' do
+      post api_v1_account_conversation_assignments_url(account_id: account.id, conversation_id: conversation.display_id),
+           headers: { api_access_token: external_bot.access_token.token },
+           params: { assignee_id: agent.id },
+           as: :json
+
+      expect(response).to have_http_status(:unauthorized)
+    end
+  end
+
+  context 'when agent bot is global' do
+    let(:global_bot) { create(:agent_bot, account: nil) }
+
+    it 'rejects requests without inbox mapping' do
+      post api_v1_account_conversation_assignments_url(account_id: account.id, conversation_id: conversation.display_id),
+           headers: { api_access_token: global_bot.access_token.token },
+           params: { assignee_id: agent.id },
+           as: :json
+
+      expect(response).to have_http_status(:unauthorized)
+    end
+
+    it 'allows requests when inbox mapping exists' do
+      create(:agent_bot_inbox, agent_bot: global_bot, inbox: inbox)
+
+      post api_v1_account_conversation_assignments_url(account_id: account.id, conversation_id: conversation.display_id),
+           headers: { api_access_token: global_bot.access_token.token },
+           params: { assignee_id: agent.id },
+           as: :json
+
+      expect(response).to have_http_status(:success)
+    end
+  end
+end
diff --git a/spec/services/auto_assignment/assignment_service_spec.rb b/spec/services/auto_assignment/assignment_service_spec.rb
new file mode 100644
index 000000000..535277714
--- /dev/null
+++ b/spec/services/auto_assignment/assignment_service_spec.rb
@@ -0,0 +1,310 @@
+require 'rails_helper'
+
+RSpec.describe AutoAssignment::AssignmentService do
+  let(:account) { create(:account) }
+  let(:assignment_policy) { create(:assignment_policy, account: account, enabled: true) }
+  let(:inbox) { create(:inbox, account: account, enable_auto_assignment: true) }
+  let(:service) { described_class.new(inbox: inbox) }
+  let(:agent) { create(:user, account: account, role: :agent, availability: :online) }
+  let(:agent2) { create(:user, account: account, role: :agent, availability: :online) }
+  let(:conversation) { create(:conversation, inbox: inbox, assignee: nil) }
+
+  before do
+    # Enable assignment_v2 feature for the account
+    allow(account).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
+    # Link inbox to assignment policy
+    create(:inbox_assignment_policy, inbox: inbox, assignment_policy: assignment_policy)
+    create(:inbox_member, inbox: inbox, user: agent)
+  end
+
+  describe '#perform_bulk_assignment' do
+    context 'when auto assignment is enabled' do
+      let(:rate_limiter) { instance_double(AutoAssignment::RateLimiter) }
+
+      before do
+        allow(OnlineStatusTracker).to receive(:get_available_users).and_return({ agent.id.to_s => 'online' })
+
+        # Mock RoundRobinSelector to return the agent
+        round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
+        allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
+        allow(round_robin_selector).to receive(:select_agent).and_return(agent)
+
+        # Mock RateLimiter to allow all assignments by default
+        allow(AutoAssignment::RateLimiter).to receive(:new).and_return(rate_limiter)
+        allow(rate_limiter).to receive(:within_limit?).and_return(true)
+        allow(rate_limiter).to receive(:track_assignment)
+      end
+
+      it 'assigns conversations to available agents' do
+        # Create conversation and ensure it's unassigned
+        conv = create(:conversation, inbox: inbox, status: 'open')
+        conv.update!(assignee_id: nil)
+
+        assigned_count = service.perform_bulk_assignment(limit: 1)
+
+        expect(assigned_count).to eq(1)
+        expect(conv.reload.assignee).to eq(agent)
+      end
+
+      it 'returns 0 when no agents are online' do
+        allow(OnlineStatusTracker).to receive(:get_available_users).and_return({})
+
+        assigned_count = service.perform_bulk_assignment(limit: 1)
+
+        expect(assigned_count).to eq(0)
+        expect(conversation.reload.assignee).to be_nil
+      end
+
+      it 'respects the limit parameter' do
+        3.times do
+          conv = create(:conversation, inbox: inbox, status: 'open')
+          conv.update!(assignee_id: nil)
+        end
+
+        assigned_count = service.perform_bulk_assignment(limit: 2)
+
+        expect(assigned_count).to eq(2)
+        expect(inbox.conversations.unassigned.count).to eq(1)
+      end
+
+      it 'only assigns open conversations' do
+        conversation # ensure it exists
+        conversation.update!(assignee_id: nil)
+        resolved_conversation = create(:conversation, inbox: inbox, status: 'resolved')
+        resolved_conversation.update!(assignee_id: nil)
+
+        service.perform_bulk_assignment(limit: 10)
+
+        expect(conversation.reload.assignee).to eq(agent)
+        expect(resolved_conversation.reload.assignee).to be_nil
+      end
+
+      it 'does not reassign already assigned conversations' do
+        conversation # ensure it exists
+        conversation.update!(assignee_id: nil)
+        assigned_conversation = create(:conversation, inbox: inbox, assignee: agent)
+        unassigned_conversation = create(:conversation, inbox: inbox, status: 'open')
+        unassigned_conversation.update!(assignee_id: nil)
+
+        assigned_count = service.perform_bulk_assignment(limit: 10)
+
+        expect(assigned_count).to eq(2) # conversation + unassigned_conversation
+        expect(assigned_conversation.reload.assignee).to eq(agent)
+        expect(unassigned_conversation.reload.assignee).to eq(agent)
+      end
+
+      it 'dispatches assignee changed event' do
+        conversation # ensure it exists
+        conversation.update!(assignee_id: nil)
+
+        # The conversation model also dispatches a conversation.updated event
+        allow(Rails.configuration.dispatcher).to receive(:dispatch)
+        expect(Rails.configuration.dispatcher).to receive(:dispatch).with(
+          Events::Types::ASSIGNEE_CHANGED,
+          anything,
+          hash_including(conversation: conversation, user: agent)
+        )
+
+        service.perform_bulk_assignment(limit: 1)
+      end
+    end
+
+    context 'when auto assignment is disabled' do
+      before { assignment_policy.update!(enabled: false) }
+
+      it 'returns 0 without processing' do
+        assigned_count = service.perform_bulk_assignment(limit: 10)
+
+        expect(assigned_count).to eq(0)
+        expect(conversation.reload.assignee).to be_nil
+      end
+    end
+
+    context 'with conversation priority' do
+      let(:rate_limiter) { instance_double(AutoAssignment::RateLimiter) }
+
+      before do
+        allow(OnlineStatusTracker).to receive(:get_available_users).and_return({ agent.id.to_s => 'online' })
+
+        # Mock RoundRobinSelector to return the agent
+        round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
+        allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
+        allow(round_robin_selector).to receive(:select_agent).and_return(agent)
+
+        # Mock RateLimiter to allow all assignments by default
+        allow(AutoAssignment::RateLimiter).to receive(:new).and_return(rate_limiter)
+        allow(rate_limiter).to receive(:within_limit?).and_return(true)
+        allow(rate_limiter).to receive(:track_assignment)
+      end
+
+      context 'when priority is longest_waiting' do
+        before do
+          allow(inbox).to receive(:auto_assignment_config).and_return({ 'conversation_priority' => 'longest_waiting' })
+        end
+
+        it 'assigns conversations with oldest last_activity_at first' do
+          old_conversation = create(:conversation,
+                                    inbox: inbox,
+                                    status: 'open',
+                                    created_at: 2.hours.ago,
+                                    last_activity_at: 2.hours.ago)
+          old_conversation.update!(assignee_id: nil)
+          new_conversation = create(:conversation,
+                                    inbox: inbox,
+                                    status: 'open',
+                                    created_at: 1.hour.ago,
+                                    last_activity_at: 1.hour.ago)
+          new_conversation.update!(assignee_id: nil)
+
+          service.perform_bulk_assignment(limit: 1)
+
+          expect(old_conversation.reload.assignee).to eq(agent)
+          expect(new_conversation.reload.assignee).to be_nil
+        end
+      end
+
+      context 'when priority is default' do
+        it 'assigns conversations by created_at' do
+          old_conversation = create(:conversation, inbox: inbox, status: 'open', created_at: 2.hours.ago)
+          old_conversation.update!(assignee_id: nil)
+          new_conversation = create(:conversation, inbox: inbox, status: 'open', created_at: 1.hour.ago)
+          new_conversation.update!(assignee_id: nil)
+
+          service.perform_bulk_assignment(limit: 1)
+
+          expect(old_conversation.reload.assignee).to eq(agent)
+          expect(new_conversation.reload.assignee).to be_nil
+        end
+      end
+    end
+
+    context 'with fair distribution' do
+      before do
+        create(:inbox_member, inbox: inbox, user: agent2)
+        allow(OnlineStatusTracker).to receive(:get_available_users).and_return({
+                                                                                 agent.id.to_s => 'online',
+                                                                                 agent2.id.to_s => 'online'
+                                                                               })
+      end
+
+      context 'when fair distribution is enabled' do
+        before do
+          allow(inbox).to receive(:auto_assignment_config).and_return({
+                                                                        'fair_distribution_limit' => 2,
+                                                                        'fair_distribution_window' => 3600
+                                                                      })
+        end
+
+        it 'respects the assignment limit per agent' do
+          # Mock RoundRobinSelector to select agent2
+          round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
+          allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
+          allow(round_robin_selector).to receive(:select_agent).and_return(agent2)
+
+          # Mock agent1 at limit, agent2 not at limit
+          agent1_limiter = instance_double(AutoAssignment::RateLimiter)
+          agent2_limiter = instance_double(AutoAssignment::RateLimiter)
+
+          allow(AutoAssignment::RateLimiter).to receive(:new).with(inbox: inbox, agent: agent).and_return(agent1_limiter)
+          allow(AutoAssignment::RateLimiter).to receive(:new).with(inbox: inbox, agent: agent2).and_return(agent2_limiter)
+
+          allow(agent1_limiter).to receive(:within_limit?).and_return(false)
+          allow(agent2_limiter).to receive(:within_limit?).and_return(true)
+          allow(agent2_limiter).to receive(:track_assignment)
+
+          unassigned_conversation = create(:conversation, inbox: inbox, status: 'open')
+          unassigned_conversation.update!(assignee_id: nil)
+
+          service.perform_bulk_assignment(limit: 1)
+
+          expect(unassigned_conversation.reload.assignee).to eq(agent2)
+        end
+
+        it 'tracks assignments in Redis' do
+          conversation # ensure it exists
+          conversation.update!(assignee_id: nil)
+
+          # Mock RoundRobinSelector
+          round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
+          allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
+          allow(round_robin_selector).to receive(:select_agent).and_return(agent)
+
+          limiter = instance_double(AutoAssignment::RateLimiter)
+          allow(AutoAssignment::RateLimiter).to receive(:new).and_return(limiter)
+          allow(limiter).to receive(:within_limit?).and_return(true)
+          expect(limiter).to receive(:track_assignment)
+
+          service.perform_bulk_assignment(limit: 1)
+        end
+
+        it 'allows assignments after window expires' do
+          # Mock RoundRobinSelector
+          round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
+          allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
+          allow(round_robin_selector).to receive(:select_agent).and_return(agent, agent2)
+
+          # Mock RateLimiter to allow all
+          limiter = instance_double(AutoAssignment::RateLimiter)
+          allow(AutoAssignment::RateLimiter).to receive(:new).and_return(limiter)
+          allow(limiter).to receive(:within_limit?).and_return(true)
+          allow(limiter).to receive(:track_assignment)
+
+          # Simulate time passing for rate limit window
+          freeze_time do
+            2.times do
+              conversation_new = create(:conversation, inbox: inbox, status: 'open')
+              conversation_new.update!(assignee_id: nil)
+              service.perform_bulk_assignment(limit: 1)
+              expect(conversation_new.reload.assignee).not_to be_nil
+            end
+          end
+
+          # Move forward past the window
+          travel_to(2.hours.from_now) do
+            new_conversation = create(:conversation, inbox: inbox, status: 'open')
+            new_conversation.update!(assignee_id: nil)
+            service.perform_bulk_assignment(limit: 1)
+            expect(new_conversation.reload.assignee).not_to be_nil
+          end
+        end
+      end
+
+      context 'when fair distribution is disabled' do
+        it 'assigns without rate limiting' do
+          5.times do
+            conv = create(:conversation, inbox: inbox, status: 'open')
+            conv.update!(assignee_id: nil)
+          end
+
+          # Mock RoundRobinSelector
+          round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
+          allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
+          allow(round_robin_selector).to receive(:select_agent).and_return(agent)
+
+          # Mock RateLimiter to allow all
+          limiter = instance_double(AutoAssignment::RateLimiter)
+          allow(AutoAssignment::RateLimiter).to receive(:new).and_return(limiter)
+          allow(limiter).to receive(:within_limit?).and_return(true)
+          allow(limiter).to receive(:track_assignment)
+
+          assigned_count = service.perform_bulk_assignment(limit: 5)
+          expect(assigned_count).to eq(5)
+        end
+      end
+
+      context 'with round robin assignment' do
+        it 'distributes conversations evenly among agents' do
+          conversations = Array.new(4) { create(:conversation, inbox: inbox, assignee: nil) }
+
+          service.perform_bulk_assignment(limit: 4)
+
+          agent1_count = conversations.count { |c| c.reload.assignee == agent }
+          agent2_count = conversations.count { |c| c.reload.assignee == agent2 }
+
+          # Should be distributed evenly (2 each) or close to even (3 and 1)
+          expect([agent1_count, agent2_count].sort).to eq([2, 2]).or(eq([1, 3]))
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/auto_assignment/rate_limiter_spec.rb b/spec/services/auto_assignment/rate_limiter_spec.rb
new file mode 100644
index 000000000..48a5367e3
--- /dev/null
+++ b/spec/services/auto_assignment/rate_limiter_spec.rb
@@ -0,0 +1,167 @@
+require 'rails_helper'
+
+RSpec.describe AutoAssignment::RateLimiter do
+  # Stub Math methods for testing when assignment_policy is nil
+  # rubocop:disable RSpec/BeforeAfterAll, RSpec/InstanceVariable
+  before(:all) do
+    @math_had_positive = Math.respond_to?(:positive?)
+    Math.define_singleton_method(:positive?) { false } unless @math_had_positive
+  end
+
+  after(:all) do
+    Math.singleton_class.send(:remove_method, :positive?) unless @math_had_positive
+  end
+  # rubocop:enable RSpec/BeforeAfterAll, RSpec/InstanceVariable
+
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+  let(:conversation) { create(:conversation, inbox: inbox) }
+  let(:rate_limiter) { described_class.new(inbox: inbox, agent: agent) }
+
+  describe '#within_limit?' do
+    context 'when rate limiting is not enabled' do
+      before do
+        allow(inbox).to receive(:assignment_policy).and_return(nil)
+      end
+
+      it 'returns true' do
+        expect(rate_limiter.within_limit?).to be true
+      end
+    end
+
+    context 'when rate limiting is enabled' do
+      let(:assignment_policy) do
+        instance_double(AssignmentPolicy,
+                        fair_distribution_limit: 5,
+                        fair_distribution_window: 3600)
+      end
+
+      before do
+        allow(inbox).to receive(:assignment_policy).and_return(assignment_policy)
+      end
+
+      it 'returns true when under the limit' do
+        allow(rate_limiter).to receive(:current_count).and_return(3)
+        expect(rate_limiter.within_limit?).to be true
+      end
+
+      it 'returns false when at or over the limit' do
+        allow(rate_limiter).to receive(:current_count).and_return(5)
+        expect(rate_limiter.within_limit?).to be false
+      end
+    end
+  end
+
+  describe '#track_assignment' do
+    context 'when rate limiting is not enabled' do
+      before do
+        allow(inbox).to receive(:assignment_policy).and_return(nil)
+      end
+
+      it 'does not track the assignment' do
+        expect(Redis::Alfred).not_to receive(:set)
+        rate_limiter.track_assignment(conversation)
+      end
+    end
+
+    context 'when rate limiting is enabled' do
+      let(:assignment_policy) do
+        instance_double(AssignmentPolicy,
+                        fair_distribution_limit: 5,
+                        fair_distribution_window: 3600)
+      end
+
+      before do
+        allow(inbox).to receive(:assignment_policy).and_return(assignment_policy)
+      end
+
+      it 'creates a Redis key with correct expiry' do
+        expected_key = format(Redis::RedisKeys::ASSIGNMENT_KEY, inbox_id: inbox.id, agent_id: agent.id, conversation_id: conversation.id)
+        expect(Redis::Alfred).to receive(:set).with(
+          expected_key,
+          conversation.id.to_s,
+          ex: 3600
+        )
+        rate_limiter.track_assignment(conversation)
+      end
+    end
+  end
+
+  describe '#current_count' do
+    context 'when rate limiting is not enabled' do
+      before do
+        allow(inbox).to receive(:assignment_policy).and_return(nil)
+      end
+
+      it 'returns 0' do
+        expect(rate_limiter.current_count).to eq(0)
+      end
+    end
+
+    context 'when rate limiting is enabled' do
+      let(:assignment_policy) do
+        instance_double(AssignmentPolicy,
+                        fair_distribution_limit: 5,
+                        fair_distribution_window: 3600)
+      end
+
+      before do
+        allow(inbox).to receive(:assignment_policy).and_return(assignment_policy)
+      end
+
+      it 'counts matching Redis keys' do
+        pattern = format(Redis::RedisKeys::ASSIGNMENT_KEY_PATTERN, inbox_id: inbox.id, agent_id: agent.id)
+        allow(Redis::Alfred).to receive(:keys_count).with(pattern).and_return(3)
+
+        expect(rate_limiter.current_count).to eq(3)
+      end
+    end
+  end
+
+  describe 'configuration' do
+    context 'with custom window' do
+      let(:assignment_policy) do
+        instance_double(AssignmentPolicy,
+                        fair_distribution_limit: 10,
+                        fair_distribution_window: 7200)
+      end
+
+      before do
+        allow(inbox).to receive(:assignment_policy).and_return(assignment_policy)
+      end
+
+      it 'uses the custom window value' do
+        expected_key = format(Redis::RedisKeys::ASSIGNMENT_KEY, inbox_id: inbox.id, agent_id: agent.id, conversation_id: conversation.id)
+        expect(Redis::Alfred).to receive(:set).with(
+          expected_key,
+          conversation.id.to_s,
+          ex: 7200
+        )
+        rate_limiter.track_assignment(conversation)
+      end
+    end
+
+    context 'without custom window' do
+      let(:assignment_policy) do
+        instance_double(AssignmentPolicy,
+                        fair_distribution_limit: 10,
+                        fair_distribution_window: nil)
+      end
+
+      before do
+        allow(inbox).to receive(:assignment_policy).and_return(assignment_policy)
+      end
+
+      it 'uses the default window value of 24 hours' do
+        expected_key = format(Redis::RedisKeys::ASSIGNMENT_KEY, inbox_id: inbox.id, agent_id: agent.id, conversation_id: conversation.id)
+        expect(Redis::Alfred).to receive(:set).with(
+          expected_key,
+          conversation.id.to_s,
+          ex: 86_400
+        )
+        rate_limiter.track_assignment(conversation)
+      end
+    end
+  end
+end
diff --git a/spec/services/auto_assignment/round_robin_selector_spec.rb b/spec/services/auto_assignment/round_robin_selector_spec.rb
new file mode 100644
index 000000000..05c1dcd73
--- /dev/null
+++ b/spec/services/auto_assignment/round_robin_selector_spec.rb
@@ -0,0 +1,78 @@
+require 'rails_helper'
+
+RSpec.describe AutoAssignment::RoundRobinSelector do
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:selector) { described_class.new(inbox: inbox) }
+  let(:agent1) { create(:user, account: account, role: :agent, availability: :online) }
+  let(:agent2) { create(:user, account: account, role: :agent, availability: :online) }
+  let(:agent3) { create(:user, account: account, role: :agent, availability: :online) }
+
+  let(:round_robin_service) { instance_double(AutoAssignment::InboxRoundRobinService) }
+
+  let(:member1) do
+    allow(AutoAssignment::InboxRoundRobinService).to receive(:new).and_return(round_robin_service)
+    allow(round_robin_service).to receive(:add_agent_to_queue)
+    create(:inbox_member, inbox: inbox, user: agent1)
+  end
+
+  let(:member2) do
+    allow(AutoAssignment::InboxRoundRobinService).to receive(:new).and_return(round_robin_service)
+    allow(round_robin_service).to receive(:add_agent_to_queue)
+    create(:inbox_member, inbox: inbox, user: agent2)
+  end
+
+  let(:member3) do
+    allow(AutoAssignment::InboxRoundRobinService).to receive(:new).and_return(round_robin_service)
+    allow(round_robin_service).to receive(:add_agent_to_queue)
+    create(:inbox_member, inbox: inbox, user: agent3)
+  end
+
+  before do
+    # Mock the round robin service to avoid Redis calls
+    allow(AutoAssignment::InboxRoundRobinService).to receive(:new).and_return(round_robin_service)
+    allow(round_robin_service).to receive(:add_agent_to_queue)
+    allow(round_robin_service).to receive(:reset_queue)
+    allow(round_robin_service).to receive(:validate_queue?).and_return(true)
+  end
+
+  describe '#select_agent' do
+    context 'when agents are available' do
+      let(:available_agents) { [member1, member2, member3] }
+
+      it 'returns an agent from the available list' do
+        allow(round_robin_service).to receive(:available_agent).and_return(agent1)
+
+        selected_agent = selector.select_agent(available_agents)
+
+        expect(selected_agent).not_to be_nil
+        expect([agent1, agent2, agent3]).to include(selected_agent)
+      end
+
+      it 'uses round robin service for selection' do
+        expect(round_robin_service).to receive(:available_agent).with(
+          allowed_agent_ids: [agent1.id.to_s, agent2.id.to_s, agent3.id.to_s]
+        ).and_return(agent1)
+
+        selected_agent = selector.select_agent(available_agents)
+        expect(selected_agent).to eq(agent1)
+      end
+    end
+
+    context 'when no agents are available' do
+      it 'returns nil' do
+        selected_agent = selector.select_agent([])
+        expect(selected_agent).to be_nil
+      end
+    end
+
+    context 'when one agent is available' do
+      it 'returns that agent' do
+        allow(round_robin_service).to receive(:available_agent).and_return(agent1)
+
+        selected_agent = selector.select_agent([member1])
+        expect(selected_agent).to eq(agent1)
+      end
+    end
+  end
+end
diff --git a/spec/services/contacts/bulk_action_service_spec.rb b/spec/services/contacts/bulk_action_service_spec.rb
new file mode 100644
index 000000000..0411c8455
--- /dev/null
+++ b/spec/services/contacts/bulk_action_service_spec.rb
@@ -0,0 +1,38 @@
+require 'rails_helper'
+
+RSpec.describe Contacts::BulkActionService do
+  subject(:service) { described_class.new(account: account, user: user, params: params) }
+
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account) }
+
+  describe '#perform' do
+    context 'when delete action is requested via action_name' do
+      let(:params) { { ids: [1, 2], action_name: 'delete' } }
+
+      it 'delegates to the bulk delete service' do
+        bulk_delete_service = instance_double(Contacts::BulkDeleteService, perform: true)
+
+        expect(Contacts::BulkDeleteService).to receive(:new)
+          .with(account: account, contact_ids: [1, 2])
+          .and_return(bulk_delete_service)
+
+        service.perform
+      end
+    end
+
+    context 'when labels are provided' do
+      let(:params) { { ids: [10, 20], labels: { add: %w[vip support] }, extra: 'ignored' } }
+
+      it 'delegates to the bulk assign labels service with permitted params' do
+        bulk_assign_service = instance_double(Contacts::BulkAssignLabelsService, perform: true)
+
+        expect(Contacts::BulkAssignLabelsService).to receive(:new)
+          .with(account: account, contact_ids: [10, 20], labels: %w[vip support])
+          .and_return(bulk_assign_service)
+
+        service.perform
+      end
+    end
+  end
+end
diff --git a/spec/services/contacts/bulk_assign_labels_service_spec.rb b/spec/services/contacts/bulk_assign_labels_service_spec.rb
new file mode 100644
index 000000000..3ae27a81b
--- /dev/null
+++ b/spec/services/contacts/bulk_assign_labels_service_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+RSpec.describe Contacts::BulkAssignLabelsService do
+  subject(:service) do
+    described_class.new(
+      account: account,
+      contact_ids: [contact_one.id, contact_two.id, other_contact.id],
+      labels: labels
+    )
+  end
+
+  let(:account) { create(:account) }
+  let!(:contact_one) { create(:contact, account: account) }
+  let!(:contact_two) { create(:contact, account: account) }
+  let!(:other_contact) { create(:contact) }
+  let(:labels) { %w[vip support] }
+
+  it 'assigns labels to the contacts that belong to the account' do
+    service.perform
+
+    expect(contact_one.reload.label_list).to include(*labels)
+    expect(contact_two.reload.label_list).to include(*labels)
+  end
+
+  it 'does not assign labels to contacts outside the account' do
+    service.perform
+
+    expect(other_contact.reload.label_list).to be_empty
+  end
+
+  it 'returns ids of contacts that were updated' do
+    result = service.perform
+
+    expect(result[:success]).to be(true)
+    expect(result[:updated_contact_ids]).to contain_exactly(contact_one.id, contact_two.id)
+  end
+
+  it 'returns success with no updates when labels are blank' do
+    result = described_class.new(
+      account: account,
+      contact_ids: [contact_one.id],
+      labels: []
+    ).perform
+
+    expect(result).to eq(success: true, updated_contact_ids: [])
+    expect(contact_one.reload.label_list).to be_empty
+  end
+end
diff --git a/spec/services/contacts/bulk_delete_service_spec.rb b/spec/services/contacts/bulk_delete_service_spec.rb
new file mode 100644
index 000000000..4eaecaa0f
--- /dev/null
+++ b/spec/services/contacts/bulk_delete_service_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe Contacts::BulkDeleteService do
+  subject(:service) { described_class.new(account: account, contact_ids: contact_ids) }
+
+  let(:account) { create(:account) }
+  let!(:contact_one) { create(:contact, account: account) }
+  let!(:contact_two) { create(:contact, account: account) }
+  let(:contact_ids) { [contact_one.id, contact_two.id] }
+
+  describe '#perform' do
+    it 'deletes the provided contacts' do
+      expect { service.perform }
+        .to change { account.contacts.exists?(contact_one.id) }.from(true).to(false)
+        .and change { account.contacts.exists?(contact_two.id) }.from(true).to(false)
+    end
+
+    it 'returns when no contact ids are provided' do
+      empty_service = described_class.new(account: account, contact_ids: [])
+
+      expect { empty_service.perform }.not_to change(Contact, :count)
+    end
+  end
+end
diff --git a/spec/services/conversations/assignment_service_spec.rb b/spec/services/conversations/assignment_service_spec.rb
new file mode 100644
index 000000000..899236e1d
--- /dev/null
+++ b/spec/services/conversations/assignment_service_spec.rb
@@ -0,0 +1,60 @@
+require 'rails_helper'
+
+describe Conversations::AssignmentService do
+  let(:account) { create(:account) }
+  let(:agent) { create(:user, account: account) }
+  let(:agent_bot) { create(:agent_bot, account: account) }
+  let(:conversation) { create(:conversation, account: account) }
+
+  describe '#perform' do
+    context 'when assignee_id is blank' do
+      before do
+        conversation.update!(assignee: agent, assignee_agent_bot: agent_bot)
+      end
+
+      it 'clears both human and bot assignees' do
+        described_class.new(conversation: conversation, assignee_id: nil).perform
+
+        conversation.reload
+        expect(conversation.assignee_id).to be_nil
+        expect(conversation.assignee_agent_bot_id).to be_nil
+      end
+    end
+
+    context 'when assigning a user' do
+      before do
+        conversation.update!(assignee_agent_bot: agent_bot, assignee: nil)
+      end
+
+      it 'sets the agent and clears agent bot' do
+        result = described_class.new(conversation: conversation, assignee_id: agent.id).perform
+
+        conversation.reload
+        expect(result).to eq(agent)
+        expect(conversation.assignee_id).to eq(agent.id)
+        expect(conversation.assignee_agent_bot_id).to be_nil
+      end
+    end
+
+    context 'when assigning an agent bot' do
+      let(:service) do
+        described_class.new(
+          conversation: conversation,
+          assignee_id: agent_bot.id,
+          assignee_type: 'AgentBot'
+        )
+      end
+
+      it 'sets the agent bot and clears human assignee' do
+        conversation.update!(assignee: agent, assignee_agent_bot: nil)
+
+        result = service.perform
+
+        conversation.reload
+        expect(result).to eq(agent_bot)
+        expect(conversation.assignee_agent_bot_id).to eq(agent_bot.id)
+        expect(conversation.assignee_id).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/services/crm/leadsquared/api/base_client_spec.rb b/spec/services/crm/leadsquared/api/base_client_spec.rb
index e88fd04c5..132ca81ff 100644
--- a/spec/services/crm/leadsquared/api/base_client_spec.rb
+++ b/spec/services/crm/leadsquared/api/base_client_spec.rb
@@ -63,10 +63,10 @@ RSpec.describe Crm::Leadsquared::Api::BaseClient do
       end
 
       it 'raises ApiError with error message' do
-        expect { client.get(path, params) }.to raise_error(
-          Crm::Leadsquared::Api::BaseClient::ApiError,
-          'Invalid lead ID'
-        )
+        expect { client.get(path, params) }.to raise_error do |error|
+          expect(error.class.name).to eq(described_class::ApiError.name)
+          expect(error.message).to eq('Invalid lead ID')
+        end
       end
     end
 
@@ -82,7 +82,7 @@ RSpec.describe Crm::Leadsquared::Api::BaseClient do
 
       it 'raises ApiError with status code' do
         expect { client.get(path, params) }.to raise_error do |error|
-          expect(error).to be_a(Crm::Leadsquared::Api::BaseClient::ApiError)
+          expect(error.class.name).to eq(described_class::ApiError.name)
           expect(error.message).to include('Not Found')
           expect(error.code).to eq(404)
         end
@@ -134,10 +134,10 @@ RSpec.describe Crm::Leadsquared::Api::BaseClient do
       end
 
       it 'raises ApiError with error message' do
-        expect { client.post(path, params, body) }.to raise_error(
-          Crm::Leadsquared::Api::BaseClient::ApiError,
-          'Invalid data'
-        )
+        expect { client.post(path, params, body) }.to raise_error do |error|
+          expect(error.class.name).to eq(described_class::ApiError.name)
+          expect(error.message).to eq('Invalid data')
+        end
       end
     end
 
@@ -158,7 +158,7 @@ RSpec.describe Crm::Leadsquared::Api::BaseClient do
 
       it 'raises ApiError for invalid JSON' do
         expect { client.post(path, params, body) }.to raise_error do |error|
-          expect(error).to be_a(Crm::Leadsquared::Api::BaseClient::ApiError)
+          expect(error.class.name).to eq(described_class::ApiError.name)
           expect(error.message).to include('Failed to parse')
         end
       end
@@ -177,7 +177,7 @@ RSpec.describe Crm::Leadsquared::Api::BaseClient do
 
       it 'raises ApiError with status code' do
         expect { client.post(path, params, body) }.to raise_error do |error|
-          expect(error).to be_a(Crm::Leadsquared::Api::BaseClient::ApiError)
+          expect(error.class.name).to eq(described_class::ApiError.name)
           expect(error.message).to include('Internal Server Error')
           expect(error.code).to eq(500)
         end
diff --git a/spec/services/crm/leadsquared/api/lead_client_spec.rb b/spec/services/crm/leadsquared/api/lead_client_spec.rb
index e1007fac5..0be37adb7 100644
--- a/spec/services/crm/leadsquared/api/lead_client_spec.rb
+++ b/spec/services/crm/leadsquared/api/lead_client_spec.rb
@@ -149,7 +149,7 @@ RSpec.describe Crm::Leadsquared::Api::LeadClient do
 
       it 'raises ApiError' do
         expect { client.create_or_update_lead(lead_data) }
-          .to raise_error(Crm::Leadsquared::Api::BaseClient::ApiError)
+          .to(raise_error { |error| expect(error.class.name).to eq('Crm::Leadsquared::Api::BaseClient::ApiError') })
       end
     end
 
@@ -223,7 +223,7 @@ RSpec.describe Crm::Leadsquared::Api::LeadClient do
 
         it 'raises ApiError' do
           expect { client.update_lead(lead_data, lead_id) }
-            .to raise_error(Crm::Leadsquared::Api::BaseClient::ApiError)
+            .to(raise_error { |error| expect(error.class.name).to eq('Crm::Leadsquared::Api::BaseClient::ApiError') })
         end
       end
     end
diff --git a/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb b/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
index 0ddd4ac9f..2d4b7ed01 100644
--- a/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
+++ b/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
@@ -108,6 +108,13 @@ RSpec.describe Crm::Leadsquared::Mappers::ConversationMapper do
         system_message
       end
 
+      def formatted_line_for(msg, hook_for_tz)
+        tz = Time.find_zone(hook_for_tz.settings['timezone']) || Time.zone
+        ts = msg.created_at.in_time_zone(tz).strftime('%Y-%m-%d %H:%M')
+        sender = msg.sender&.name.presence || (msg.sender.present? ? "#{msg.sender_type} #{msg.sender_id}" : 'System')
+        "[#{ts}] #{sender}: #{msg.content.presence || I18n.t('crm.no_content')}"
+      end
+
       it 'generates transcript with messages in reverse chronological order' do
         result = described_class.map_transcript_activity(hook, conversation)
 
@@ -115,13 +122,15 @@ RSpec.describe Crm::Leadsquared::Mappers::ConversationMapper do
         expect(result).to include('Channel: Test Inbox')
 
         # Check that messages appear in reverse order (newest first)
+        newer = formatted_line_for(message2, hook)
+        older = formatted_line_for(message1, hook)
         message_positions = {
-          '[2024-01-01 10:00] John Doe: Hello' => result.index('[2024-01-01 10:00] John Doe: Hello'),
-          '[2024-01-01 10:01] Jane Smith: Hi there' => result.index('[2024-01-01 10:01] Jane Smith: Hi there')
+          newer => result.index(newer),
+          older => result.index(older)
         }
 
         # Latest message (10:01) should come before older message (10:00)
-        expect(message_positions['[2024-01-01 10:01] Jane Smith: Hi there']).to be < message_positions['[2024-01-01 10:00] John Doe: Hello']
+        expect(message_positions[newer]).to be < message_positions[older]
       end
 
       it 'formats message times according to hook timezone setting' do
@@ -210,13 +219,15 @@ RSpec.describe Crm::Leadsquared::Mappers::ConversationMapper do
                              sender: user,
                              content: "#{long_message_content} #{i}",
                              message_type: :outgoing,
-                             created_at: Time.zone.parse("2024-01-01 #{10 + i}:00:00"))
+                             created_at: Time.zone.parse('2024-01-01 10:00:00') + i.hours)
         end
 
         result = described_class.map_transcript_activity(hook, conversation)
 
         # Verify latest message is included (message 14)
-        expect(result).to include("[2024-01-02 00:00] John Doe: #{long_message_content} 14")
+        tz = Time.find_zone(hook.settings['timezone']) || Time.zone
+        latest_label = "[#{messages.last.created_at.in_time_zone(tz).strftime('%Y-%m-%d %H:%M')}] John Doe: #{long_message_content} 14"
+        expect(result).to include(latest_label)
 
         # Calculate the expected character count of the formatted messages
         messages.map do |msg|
diff --git a/spec/services/llm_formatter/conversation_llm_formatter_spec.rb b/spec/services/llm_formatter/conversation_llm_formatter_spec.rb
index 49fcc1a18..b79ee6d79 100644
--- a/spec/services/llm_formatter/conversation_llm_formatter_spec.rb
+++ b/spec/services/llm_formatter/conversation_llm_formatter_spec.rb
@@ -28,6 +28,14 @@ RSpec.describe LlmFormatter::ConversationLlmFormatter do
           content: 'Hello, I need help'
         )
 
+        create(
+          :message,
+          :bot_message,
+          conversation: conversation,
+          message_type: 'outgoing',
+          content: 'Thanks for reaching out, an agent will reach out to you soon'
+        )
+
         create(
           :message,
           conversation: conversation,
@@ -40,7 +48,8 @@ RSpec.describe LlmFormatter::ConversationLlmFormatter do
           "Channel: #{conversation.inbox.channel.name}",
           'Message History:',
           'User: Hello, I need help',
-          'Support agent: How can I assist you today?',
+          'Bot: Thanks for reaching out, an agent will reach out to you soon',
+          'Support Agent: How can I assist you today?',
           ''
         ].join("\n")
 
diff --git a/spec/services/mailbox/conversation_finder_spec.rb b/spec/services/mailbox/conversation_finder_spec.rb
new file mode 100644
index 000000000..313ca409a
--- /dev/null
+++ b/spec/services/mailbox/conversation_finder_spec.rb
@@ -0,0 +1,133 @@
+require 'rails_helper'
+
+RSpec.describe Mailbox::ConversationFinder do
+  let(:account) { create(:account) }
+  let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
+  let(:conversation) { create(:conversation, inbox: email_channel.inbox, account: account) }
+  let(:mail) { Mail.new }
+
+  describe '#find' do
+    context 'when receiver uuid strategy finds conversation' do
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+        mail.to = 'reply+12345678-1234-1234-1234-123456789012@example.com'
+      end
+
+      it 'returns the conversation' do
+        finder = described_class.new(mail)
+        expect(finder.find).to eq(conversation)
+      end
+
+      it 'logs which strategy succeeded' do
+        allow(Rails.logger).to receive(:info)
+        finder = described_class.new(mail)
+        finder.find
+
+        expect(Rails.logger).to have_received(:info).with('Conversation found via receiver_uuid_strategy strategy')
+      end
+    end
+
+    context 'when in_reply_to strategy finds conversation' do
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+        mail.in_reply_to = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
+      end
+
+      it 'returns the conversation' do
+        finder = described_class.new(mail)
+        expect(finder.find).to eq(conversation)
+      end
+
+      it 'logs which strategy succeeded' do
+        allow(Rails.logger).to receive(:info)
+        finder = described_class.new(mail)
+        finder.find
+
+        expect(Rails.logger).to have_received(:info).with('Conversation found via in_reply_to_strategy strategy')
+      end
+    end
+
+    context 'when references strategy finds conversation' do
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+        mail.to = 'test@example.com'
+        mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
+      end
+
+      it 'returns the conversation' do
+        finder = described_class.new(mail)
+        expect(finder.find).to eq(conversation)
+      end
+
+      it 'logs which strategy succeeded' do
+        allow(Rails.logger).to receive(:info)
+        finder = described_class.new(mail)
+        finder.find
+
+        expect(Rails.logger).to have_received(:info).with('Conversation found via references_strategy strategy')
+      end
+    end
+
+    context 'when no strategy finds conversation' do
+      # With NewConversationStrategy in default strategies, this scenario only happens
+      # when using custom strategies that exclude NewConversationStrategy
+      let(:finding_strategies) do
+        [
+          Mailbox::ConversationFinderStrategies::ReceiverUuidStrategy,
+          Mailbox::ConversationFinderStrategies::InReplyToStrategy,
+          Mailbox::ConversationFinderStrategies::ReferencesStrategy
+        ]
+      end
+
+      it 'returns nil' do
+        finder = described_class.new(mail, strategies: finding_strategies)
+        expect(finder.find).to be_nil
+      end
+
+      it 'logs that no conversation was found' do
+        allow(Rails.logger).to receive(:error)
+        finder = described_class.new(mail, strategies: finding_strategies)
+        finder.find
+
+        expect(Rails.logger).to have_received(:error).with('No conversation found via any strategy (NewConversationStrategy missing?)')
+      end
+    end
+
+    context 'with custom strategies' do
+      let(:custom_strategy_class) do
+        Class.new(Mailbox::ConversationFinderStrategies::BaseStrategy) do
+          def find
+            # Always return nil for testing
+            nil
+          end
+        end
+      end
+
+      it 'uses provided strategies instead of defaults' do
+        finder = described_class.new(mail, strategies: [custom_strategy_class])
+        expect(finder.find).to be_nil
+      end
+    end
+
+    context 'with strategy execution order' do
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+
+        # Set up mail so all strategies could match
+        mail.to = 'reply+12345678-1234-1234-1234-123456789012@example.com'
+        mail.in_reply_to = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
+        mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/456@example.com'
+      end
+
+      it 'returns conversation from first matching strategy' do
+        allow(Rails.logger).to receive(:info)
+        finder = described_class.new(mail)
+        result = finder.find
+
+        expect(result).to eq(conversation)
+        # Should only log the first strategy that succeeded (ReceiverUuidStrategy)
+        expect(Rails.logger).to have_received(:info).once.with('Conversation found via receiver_uuid_strategy strategy')
+      end
+    end
+  end
+end
diff --git a/spec/services/mailbox/conversation_finder_strategies/in_reply_to_strategy_spec.rb b/spec/services/mailbox/conversation_finder_strategies/in_reply_to_strategy_spec.rb
new file mode 100644
index 000000000..3fca8c3c9
--- /dev/null
+++ b/spec/services/mailbox/conversation_finder_strategies/in_reply_to_strategy_spec.rb
@@ -0,0 +1,118 @@
+require 'rails_helper'
+
+RSpec.describe Mailbox::ConversationFinderStrategies::InReplyToStrategy do
+  let(:account) { create(:account) }
+  let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
+  let(:conversation) { create(:conversation, inbox: email_channel.inbox, account: account) }
+  let(:mail) { Mail.new }
+
+  describe '#find' do
+    context 'when in_reply_to has message-specific pattern' do
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+        mail.in_reply_to = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
+      end
+
+      it 'extracts UUID and returns conversation' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+
+    context 'when in_reply_to has conversation fallback pattern' do
+      before do
+        conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
+        mail.in_reply_to = "account/#{account.id}/conversation/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee@example.com"
+      end
+
+      it 'extracts UUID and returns conversation' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+
+    context 'when in_reply_to matches message source_id' do
+      let(:message) do
+        conversation.messages.create!(
+          source_id: 'original-message-id@example.com',
+          account_id: account.id,
+          message_type: 'outgoing',
+          inbox_id: email_channel.inbox.id,
+          content: 'Original message'
+        )
+      end
+
+      before do
+        message # Create the message
+        mail.in_reply_to = 'original-message-id@example.com'
+      end
+
+      it 'finds conversation from message source_id' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+
+    context 'when in_reply_to has multiple values' do
+      let(:message) do
+        conversation.messages.create!(
+          source_id: 'message-123@example.com',
+          account_id: account.id,
+          message_type: 'outgoing',
+          inbox_id: email_channel.inbox.id,
+          content: 'Test message'
+        )
+      end
+
+      before do
+        message # Create the message
+        mail.in_reply_to = ['some-other-id@example.com', 'message-123@example.com']
+      end
+
+      it 'finds conversation from any in_reply_to value' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+
+    context 'when in_reply_to is blank' do
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+
+    context 'when in_reply_to does not match any pattern or source_id' do
+      before do
+        mail.in_reply_to = 'random-message-id@gmail.com'
+      end
+
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+
+    context 'when UUID exists but conversation does not' do
+      before do
+        mail.in_reply_to = 'conversation/99999999-9999-9999-9999-999999999999/messages/123@example.com'
+      end
+
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+
+    context 'with malformed in_reply_to pattern' do
+      before do
+        mail.in_reply_to = 'conversation/not-a-uuid/messages/123@example.com'
+      end
+
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/services/mailbox/conversation_finder_strategies/new_conversation_strategy_spec.rb b/spec/services/mailbox/conversation_finder_strategies/new_conversation_strategy_spec.rb
new file mode 100644
index 000000000..8609d0133
--- /dev/null
+++ b/spec/services/mailbox/conversation_finder_strategies/new_conversation_strategy_spec.rb
@@ -0,0 +1,161 @@
+require 'rails_helper'
+
+RSpec.describe Mailbox::ConversationFinderStrategies::NewConversationStrategy do
+  let(:account) { create(:account) }
+  let(:email_channel) { create(:channel_email, account: account) }
+  let(:mail) { Mail.new }
+
+  before do
+    mail.to = [email_channel.email]
+    mail.from = 'sender@example.com'
+    mail.subject = 'Test Subject'
+    mail.message_id = '<test@example.com>'
+  end
+
+  describe '#find' do
+    context 'when channel is found' do
+      context 'with new contact' do
+        it 'builds a new conversation with new contact' do
+          strategy = described_class.new(mail)
+
+          expect do
+            conversation = strategy.find
+            expect(conversation).to be_a(Conversation)
+            expect(conversation.new_record?).to be(true) # Not persisted yet
+            expect(conversation.inbox).to eq(email_channel.inbox)
+            expect(conversation.account).to eq(account)
+          end.to not_change(Conversation, :count) # No conversation created yet
+            .and change(Contact, :count).by(1) # Contact is created
+                                        .and change(ContactInbox, :count).by(1)
+        end
+
+        it 'sets conversation attributes correctly' do
+          strategy = described_class.new(mail)
+          conversation = strategy.find
+
+          expect(conversation.additional_attributes['source']).to eq('email')
+          expect(conversation.additional_attributes['mail_subject']).to eq('Test Subject')
+          expect(conversation.additional_attributes['initiated_at']).to have_key('timestamp')
+        end
+
+        it 'sets contact attributes correctly' do
+          strategy = described_class.new(mail)
+          conversation = strategy.find
+
+          expect(conversation.contact.email).to eq('sender@example.com')
+          expect(conversation.contact.name).to eq('sender')
+        end
+      end
+
+      context 'with existing contact' do
+        let!(:existing_contact) { create(:contact, email: 'sender@example.com', account: account) }
+
+        before do
+          create(:contact_inbox, contact: existing_contact, inbox: email_channel.inbox)
+        end
+
+        it 'builds conversation with existing contact' do
+          strategy = described_class.new(mail)
+
+          expect do
+            conversation = strategy.find
+            expect(conversation).to be_a(Conversation)
+            expect(conversation.new_record?).to be(true) # Not persisted yet
+            expect(conversation.contact).to eq(existing_contact)
+          end.to not_change(Conversation, :count) # No conversation created yet
+            .and not_change(Contact, :count)
+            .and not_change(ContactInbox, :count)
+        end
+      end
+
+      context 'when mail has In-Reply-To header' do
+        before do
+          mail['In-Reply-To'] = '<previous-message@example.com>'
+        end
+
+        it 'stores in_reply_to in additional_attributes' do
+          strategy = described_class.new(mail)
+          conversation = strategy.find
+
+          expect(conversation.additional_attributes['in_reply_to']).to eq('<previous-message@example.com>')
+        end
+      end
+
+      context 'when mail is auto reply' do
+        before do
+          mail['X-Autoreply'] = 'yes'
+        end
+
+        it 'marks conversation as auto_reply' do
+          strategy = described_class.new(mail)
+          conversation = strategy.find
+
+          expect(conversation.additional_attributes['auto_reply']).to be true
+        end
+      end
+
+      context 'when sender has name in From header' do
+        before do
+          mail.from = 'John Doe <john@example.com>'
+        end
+
+        it 'uses sender name from mail' do
+          strategy = described_class.new(mail)
+          conversation = strategy.find
+
+          expect(conversation.contact.name).to eq('John Doe')
+        end
+      end
+    end
+
+    context 'when channel is not found' do
+      before do
+        mail.to = ['nonexistent@example.com']
+      end
+
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+
+        expect do
+          result = strategy.find
+          expect(result).to be_nil
+        end.not_to change(Conversation, :count)
+      end
+    end
+
+    context 'when contact creation fails' do
+      before do
+        builder = instance_double(ContactInboxWithContactBuilder)
+        allow(ContactInboxWithContactBuilder).to receive(:new).and_return(builder)
+        allow(builder).to receive(:perform).and_raise(ActiveRecord::RecordInvalid)
+      end
+
+      it 'rolls back the transaction' do
+        strategy = described_class.new(mail)
+
+        expect do
+          strategy.find
+        end.to raise_error(ActiveRecord::RecordInvalid)
+          .and not_change(Conversation, :count)
+          .and not_change(Contact, :count)
+          .and not_change(ContactInbox, :count)
+      end
+    end
+
+    context 'when conversation creation fails' do
+      before do
+        # Make conversation build fail with invalid attributes
+        allow(Conversation).to receive(:new).and_return(Conversation.new)
+      end
+
+      it 'returns invalid conversation object' do
+        strategy = described_class.new(mail)
+
+        conversation = strategy.find
+        expect(conversation).to be_a(Conversation)
+        expect(conversation.new_record?).to be(true)
+        expect(conversation.valid?).to be(false)
+      end
+    end
+  end
+end
diff --git a/spec/services/mailbox/conversation_finder_strategies/receiver_uuid_strategy_spec.rb b/spec/services/mailbox/conversation_finder_strategies/receiver_uuid_strategy_spec.rb
new file mode 100644
index 000000000..d45f6f4fe
--- /dev/null
+++ b/spec/services/mailbox/conversation_finder_strategies/receiver_uuid_strategy_spec.rb
@@ -0,0 +1,99 @@
+require 'rails_helper'
+
+RSpec.describe Mailbox::ConversationFinderStrategies::ReceiverUuidStrategy do
+  let(:account) { create(:account) }
+  let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
+  let(:conversation) { create(:conversation, inbox: email_channel.inbox, account: account) }
+  let(:mail) { Mail.new }
+
+  describe '#find' do
+    context 'when mail has valid reply+uuid format' do
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+        mail.to = 'reply+12345678-1234-1234-1234-123456789012@example.com'
+      end
+
+      it 'returns the conversation' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+
+    context 'when mail has uppercase UUID' do
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+        mail.to = 'reply+12345678-1234-1234-1234-123456789012@EXAMPLE.COM'
+      end
+
+      it 'returns the conversation (case-insensitive matching)' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+
+    context 'when mail has multiple recipients with valid UUID' do
+      before do
+        conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
+        mail.to = ['other@example.com', 'reply+aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee@example.com']
+      end
+
+      it 'extracts UUID from any recipient' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+
+    context 'when UUID does not exist in database' do
+      before do
+        mail.to = 'reply+99999999-9999-9999-9999-999999999999@example.com'
+      end
+
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+
+    context 'when mail has no recipients' do
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+
+    context 'when mail recipient has malformed UUID' do
+      before do
+        mail.to = 'reply+not-a-valid-uuid@example.com'
+      end
+
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+
+    context 'when mail recipient has no reply+ prefix' do
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+        mail.to = 'test+12345678-1234-1234-1234-123456789012@example.com'
+      end
+
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+
+    context 'when mail recipient has additional text after UUID' do
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+        mail.to = 'reply+12345678-1234-1234-1234-123456789012-extra@example.com'
+      end
+
+      it 'returns nil (UUID must be exact)' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/services/mailbox/conversation_finder_strategies/references_strategy_spec.rb b/spec/services/mailbox/conversation_finder_strategies/references_strategy_spec.rb
new file mode 100644
index 000000000..6ef61a58f
--- /dev/null
+++ b/spec/services/mailbox/conversation_finder_strategies/references_strategy_spec.rb
@@ -0,0 +1,208 @@
+require 'rails_helper'
+
+RSpec.describe Mailbox::ConversationFinderStrategies::ReferencesStrategy do
+  let(:account) { create(:account) }
+  let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
+  let(:conversation) { create(:conversation, inbox: email_channel.inbox, account: account) }
+  let(:mail) { Mail.new }
+
+  describe '#find' do
+    context 'when references has message-specific pattern' do
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+        mail.to = 'test@example.com'
+        mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
+      end
+
+      it 'extracts UUID and returns conversation' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+
+    context 'when references has conversation fallback pattern' do
+      before do
+        conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
+        mail.to = 'test@example.com'
+        mail.references = "account/#{account.id}/conversation/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee@example.com"
+      end
+
+      it 'extracts UUID and returns conversation' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+
+    context 'when references matches message source_id' do
+      let(:message) do
+        conversation.messages.create!(
+          source_id: 'original-message-id@example.com',
+          account_id: account.id,
+          message_type: 'outgoing',
+          inbox_id: email_channel.inbox.id,
+          content: 'Original message'
+        )
+      end
+
+      before do
+        message # Create the message
+        mail.to = 'test@example.com'
+        mail.references = 'original-message-id@example.com'
+      end
+
+      it 'finds conversation from message source_id' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+
+    context 'when references has multiple values' do
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+        mail.to = 'test@example.com'
+        mail.references = [
+          'some-random-message@gmail.com',
+          'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com',
+          'another-message@outlook.com'
+        ]
+      end
+
+      it 'finds conversation from any reference' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+
+    context 'when references is blank' do
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+
+    context 'when references does not match any pattern or source_id' do
+      before do
+        mail.references = 'random-message-id@gmail.com'
+      end
+
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+
+    context 'with channel validation' do
+      context 'when conversation belongs to the correct channel' do
+        before do
+          conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+          mail.to = 'test@example.com'
+          mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
+        end
+
+        it 'returns the conversation' do
+          strategy = described_class.new(mail)
+          expect(strategy.find).to eq(conversation)
+        end
+      end
+
+      context 'when conversation belongs to a different channel' do
+        let(:other_email_channel) { create(:channel_email, email: 'other@example.com', account: account) }
+        let(:other_conversation) do
+          create(
+            :conversation,
+            inbox: other_email_channel.inbox,
+            account: account
+          )
+        end
+
+        before do
+          other_conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
+          # Mail is addressed to test@example.com but references conversation from other@example.com
+          mail.to = 'test@example.com'
+          mail.references = 'conversation/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/messages/456@example.com'
+        end
+
+        it 'returns nil (prevents cross-channel hijacking)' do
+          strategy = described_class.new(mail)
+          expect(strategy.find).to be_nil
+        end
+      end
+
+      context 'when channel cannot be determined from mail' do
+        before do
+          conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+          mail.to = 'unknown@example.com' # Email not associated with any channel
+          mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
+        end
+
+        it 'returns nil' do
+          strategy = described_class.new(mail)
+          expect(strategy.find).to be_nil
+        end
+      end
+
+      context 'when mail has multiple recipients including correct channel' do
+        before do
+          conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+          mail.to = ['other@example.com', 'test@example.com']
+          mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
+        end
+
+        it 'finds the correct channel and returns conversation' do
+          strategy = described_class.new(mail)
+          expect(strategy.find).to eq(conversation)
+        end
+      end
+    end
+
+    context 'when UUID exists but conversation does not' do
+      before do
+        mail.to = 'test@example.com'
+        mail.references = 'conversation/99999999-9999-9999-9999-999999999999/messages/123@example.com'
+      end
+
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+
+    context 'with malformed references pattern' do
+      before do
+        mail.references = 'conversation/not-a-uuid/messages/123@example.com'
+      end
+
+      it 'returns nil' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to be_nil
+      end
+    end
+
+    context 'when first reference fails channel validation but second succeeds' do
+      let(:other_email_channel) { create(:channel_email, email: 'other@example.com', account: account) }
+      let(:other_conversation) do
+        create(
+          :conversation,
+          inbox: other_email_channel.inbox,
+          account: account
+        )
+      end
+
+      before do
+        conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
+        other_conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
+
+        mail.to = 'test@example.com'
+        mail.references = [
+          'conversation/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/messages/456@example.com', # Wrong channel
+          'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'  # Correct channel
+        ]
+      end
+
+      it 'skips invalid reference and returns conversation from valid reference' do
+        strategy = described_class.new(mail)
+        expect(strategy.find).to eq(conversation)
+      end
+    end
+  end
+end
diff --git a/spec/services/whatsapp/channel_creation_service_spec.rb b/spec/services/whatsapp/channel_creation_service_spec.rb
index 403fb71b8..983af6c78 100644
--- a/spec/services/whatsapp/channel_creation_service_spec.rb
+++ b/spec/services/whatsapp/channel_creation_service_spec.rb
@@ -62,14 +62,19 @@ describe Whatsapp::ChannelCreationService do
       end
     end
 
-    context 'when channel already exists' do
+    context 'when channel already exists for the phone number' do
+      let(:different_account) { create(:account) }
+
       before do
-        create(:channel_whatsapp, account: account, phone_number: '+1234567890',
+        create(:channel_whatsapp, account: different_account, phone_number: '+1234567890',
                                   provider: 'whatsapp_cloud', sync_templates: false, validate_provider_config: false)
       end
 
-      it 'raises an error' do
-        expect { service.perform }.to raise_error(/Channel already exists/)
+      it 'raises an error even if the channel belongs to a different account' do
+        expect { service.perform }.to raise_error(
+          RuntimeError,
+          I18n.t('errors.whatsapp.phone_number_already_exists', phone_number: '+1234567890')
+        )
       end
     end
 
diff --git a/spec/services/widget/token_service_expiry_spec.rb b/spec/services/widget/token_service_expiry_spec.rb
index 051a757a5..50e104c65 100644
--- a/spec/services/widget/token_service_expiry_spec.rb
+++ b/spec/services/widget/token_service_expiry_spec.rb
@@ -15,11 +15,11 @@ RSpec.describe Widget::TokenService, type: :service do
       end
 
       it 'uses the configured value for token expiry' do
-        freeze_time do
+        travel_to '2025-01-01' do
           token = service.generate_token
           decoded = JWT.decode(token, Rails.application.secret_key_base, true, algorithm: 'HS256').first
-          expect(decoded['iat']).to eq(Time.now.to_i)
-          expect(decoded['exp']).to eq(30.days.from_now.to_i)
+          expect(decoded['iat']).to eq(Time.zone.now.to_i)
+          expect(decoded['exp']).to eq(Time.zone.now.to_i + 30.days.to_i)
         end
       end
     end
@@ -30,11 +30,11 @@ RSpec.describe Widget::TokenService, type: :service do
       end
 
       it 'uses the default expiry' do
-        freeze_time do
+        travel_to '2025-01-01' do
           token = service.generate_token
           decoded = JWT.decode(token, Rails.application.secret_key_base, true, algorithm: 'HS256').first
-          expect(decoded['iat']).to eq(Time.now.to_i)
-          expect(decoded['exp']).to eq(180.days.from_now.to_i)
+          expect(decoded['iat']).to eq(Time.zone.now.to_i)
+          expect(decoded['exp']).to eq(Time.zone.now.to_i + 180.days.to_i)
         end
       end
     end
diff --git a/spec/services/widget/token_service_spec.rb b/spec/services/widget/token_service_spec.rb
index 724728b51..f504273ab 100644
--- a/spec/services/widget/token_service_spec.rb
+++ b/spec/services/widget/token_service_spec.rb
@@ -6,7 +6,7 @@ describe Widget::TokenService do
 
   describe 'inheritance' do
     it 'inherits from BaseTokenService' do
-      expect(described_class.superclass).to eq(BaseTokenService)
+      expect(described_class.superclass.name).to eq('BaseTokenService')
     end
   end
 
diff --git a/swagger/definitions/index.yml b/swagger/definitions/index.yml
index b244deb7f..c24831f84 100644
--- a/swagger/definitions/index.yml
+++ b/swagger/definitions/index.yml
@@ -248,3 +248,9 @@ contact_conversations_response:
   $ref: ./resource/contact_conversations_response.yml
 contactable_inboxes_response:
   $ref: ./resource/contactable_inboxes_response.yml
+reporting_event:
+  $ref: ./resource/reporting_event.yml
+reporting_event_meta:
+  $ref: ./resource/reporting_event_meta.yml
+reporting_events_list_response:
+  $ref: ./resource/reporting_events_list_response.yml
diff --git a/swagger/definitions/request/webhooks/create_update_payload.yml b/swagger/definitions/request/webhooks/create_update_payload.yml
index 2f4a718e4..485d532e4 100644
--- a/swagger/definitions/request/webhooks/create_update_payload.yml
+++ b/swagger/definitions/request/webhooks/create_update_payload.yml
@@ -4,6 +4,9 @@ properties:
     type: string
     description: The url where the events should be sent
     example: https://example.com/webhook
+  name:
+    type: string
+    description: The name of the webhook
   subscriptions:
     type: array
     items:
diff --git a/swagger/definitions/resource/reporting_event.yml b/swagger/definitions/resource/reporting_event.yml
new file mode 100644
index 000000000..85cf71b8c
--- /dev/null
+++ b/swagger/definitions/resource/reporting_event.yml
@@ -0,0 +1,47 @@
+type: object
+properties:
+  id:
+    type: number
+    description: ID of the reporting event
+  name:
+    type: string
+    description: Name of the event (e.g., first_response, resolution, reply_time)
+  value:
+    type: number
+    format: double
+    description: Value of the metric in seconds
+  value_in_business_hours:
+    type: number
+    format: double
+    description: Value of the metric in seconds, calculated only for business hours
+  event_start_time:
+    type: string
+    format: date-time
+    description: The timestamp when the event started
+  event_end_time:
+    type: string
+    format: date-time
+    description: The timestamp when the event ended
+  account_id:
+    type: number
+    description: ID of the account
+  conversation_id:
+    type: number
+    nullable: true
+    description: ID of the conversation
+  inbox_id:
+    type: number
+    nullable: true
+    description: ID of the inbox
+  user_id:
+    type: number
+    nullable: true
+    description: ID of the user/agent
+  created_at:
+    type: string
+    format: date-time
+    description: The timestamp when the reporting event was created
+  updated_at:
+    type: string
+    format: date-time
+    description: The timestamp when the reporting event was last updated
diff --git a/swagger/definitions/resource/reporting_event_meta.yml b/swagger/definitions/resource/reporting_event_meta.yml
new file mode 100644
index 000000000..5d2646c51
--- /dev/null
+++ b/swagger/definitions/resource/reporting_event_meta.yml
@@ -0,0 +1,11 @@
+type: object
+properties:
+  count:
+    type: integer
+    description: Total number of reporting events
+  current_page:
+    type: integer
+    description: Current page number
+  total_pages:
+    type: integer
+    description: Total number of pages
diff --git a/swagger/definitions/resource/reporting_events_list_response.yml b/swagger/definitions/resource/reporting_events_list_response.yml
new file mode 100644
index 000000000..847c5336a
--- /dev/null
+++ b/swagger/definitions/resource/reporting_events_list_response.yml
@@ -0,0 +1,10 @@
+type: object
+properties:
+  meta:
+    $ref: '#/components/schemas/reporting_event_meta'
+    description: Metadata about the reporting events list response
+  payload:
+    type: array
+    items:
+      $ref: '#/components/schemas/reporting_event'
+    description: List of reporting events
diff --git a/swagger/definitions/resource/webhook.yml b/swagger/definitions/resource/webhook.yml
index a9881b8e4..da5cb112a 100644
--- a/swagger/definitions/resource/webhook.yml
+++ b/swagger/definitions/resource/webhook.yml
@@ -6,6 +6,9 @@ properties:
   url:
     type: string
     description: The url to which the events will be send
+  name:
+    type: string
+    description: The name of the webhook
   subscriptions:
     type: array
     items:
diff --git a/swagger/paths/application/contact_inboxes/create.yml b/swagger/paths/application/contact_inboxes/create.yml
index 64ebeb21c..80984c49f 100644
--- a/swagger/paths/application/contact_inboxes/create.yml
+++ b/swagger/paths/application/contact_inboxes/create.yml
@@ -1,6 +1,6 @@
 post:
   tags:
-    - Contact
+    - Contacts
   operationId: contactInboxCreation
   description: Create a contact inbox record for an inbox
   summary: Create contact inbox
diff --git a/swagger/paths/application/contactable_inboxes/get.yml b/swagger/paths/application/contactable_inboxes/get.yml
index 357c84597..8eea02bbf 100644
--- a/swagger/paths/application/contactable_inboxes/get.yml
+++ b/swagger/paths/application/contactable_inboxes/get.yml
@@ -1,6 +1,6 @@
 get:
   tags:
-    - Contact
+    - Contacts
   operationId: contactableInboxesGet
   description: Get List of contactable Inboxes
   summary: Get Contactable Inboxes
diff --git a/swagger/paths/application/conversation/reporting_events.yml b/swagger/paths/application/conversation/reporting_events.yml
new file mode 100644
index 000000000..f19ccbe8b
--- /dev/null
+++ b/swagger/paths/application/conversation/reporting_events.yml
@@ -0,0 +1,29 @@
+tags:
+  - Conversations
+operationId: get-conversation-reporting-events
+summary: Conversation Reporting Events
+security:
+  - userApiKey: []
+description: Get reporting events for a specific conversation. This endpoint returns events such as first response time, resolution time, and other metrics for the conversation, sorted by creation time in ascending order.
+responses:
+  '200':
+    description: Success
+    content:
+      application/json:
+        schema:
+          type: array
+          items:
+            $ref: '#/components/schemas/reporting_event'
+          description: Array of reporting events for the conversation
+  '403':
+    description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
+    description: Conversation not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/reporting_events/index.yml b/swagger/paths/application/reporting_events/index.yml
new file mode 100644
index 000000000..d55c99545
--- /dev/null
+++ b/swagger/paths/application/reporting_events/index.yml
@@ -0,0 +1,47 @@
+tags:
+  - Reports
+operationId: get-account-reporting-events
+summary: Account Reporting Events
+security:
+  - userApiKey: []
+description: Get paginated reporting events for the account. This endpoint returns reporting events such as first response time, resolution time, and other metrics. Only administrators can access this endpoint. Results are paginated with 25 items per page.
+parameters:
+  - $ref: '#/components/parameters/page'
+  - in: query
+    name: since
+    schema:
+      type: string
+    description: The timestamp from where events should start (Unix timestamp in seconds)
+  - in: query
+    name: until
+    schema:
+      type: string
+    description: The timestamp from where events should stop (Unix timestamp in seconds)
+  - in: query
+    name: inbox_id
+    schema:
+      type: number
+    description: Filter events by inbox ID
+  - in: query
+    name: user_id
+    schema:
+      type: number
+    description: Filter events by user/agent ID
+  - in: query
+    name: name
+    schema:
+      type: string
+    description: Filter events by event name (e.g., first_response, resolution, reply_time)
+responses:
+  '200':
+    description: Success
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/reporting_events_list_response'
+  '403':
+    description: Access denied - Only administrators can access this endpoint
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index b2fcb4594..d5126a8d1 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -389,6 +389,15 @@
   post:
     $ref: ./application/conversation/labels/create.yml
 
+# Conversation Reporting Events
+
+/api/v1/accounts/{account_id}/conversations/{conversation_id}/reporting_events:
+  parameters:
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/conversation_id'
+  get:
+    $ref: ./application/conversation/reporting_events.yml
+
 # Inboxes
 /api/v1/accounts/{account_id}/inboxes:
   $ref: ./application/inboxes/index.yml
@@ -535,6 +544,13 @@
 
 ### Reports
 
+# Account Reporting Events
+/api/v1/accounts/{account_id}/reporting_events:
+  parameters:
+    - $ref: '#/components/parameters/account_id'
+  get:
+    $ref: ./application/reporting_events/index.yml
+
 # List
 /api/v2/accounts/{account_id}/reports:
   parameters:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 39022bf84..8d539c259 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -3281,7 +3281,7 @@
     "/api/v1/accounts/{account_id}/contacts/{id}/contact_inboxes": {
       "post": {
         "tags": [
-          "Contact"
+          "Contacts"
         ],
         "operationId": "contactInboxCreation",
         "description": "Create a contact inbox record for an inbox",
@@ -3366,7 +3366,7 @@
     "/api/v1/accounts/{account_id}/contacts/{id}/contactable_inboxes": {
       "get": {
         "tags": [
-          "Contact"
+          "Contacts"
         ],
         "operationId": "contactableInboxesGet",
         "description": "Get List of contactable Inboxes",
@@ -5140,6 +5140,65 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/conversations/{conversation_id}/reporting_events": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/account_id"
+        },
+        {
+          "$ref": "#/components/parameters/conversation_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Conversations"
+        ],
+        "operationId": "get-conversation-reporting-events",
+        "summary": "Conversation Reporting Events",
+        "security": [
+          {
+            "userApiKey": []
+          }
+        ],
+        "description": "Get reporting events for a specific conversation. This endpoint returns events such as first response time, resolution time, and other metrics for the conversation, sorted by creation time in ascending order.",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/reporting_event"
+                  },
+                  "description": "Array of reporting events for the conversation"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/inboxes": {
       "get": {
         "tags": [
@@ -7311,6 +7370,93 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/reporting_events": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Reports"
+        ],
+        "operationId": "get-account-reporting-events",
+        "summary": "Account Reporting Events",
+        "security": [
+          {
+            "userApiKey": []
+          }
+        ],
+        "description": "Get paginated reporting events for the account. This endpoint returns reporting events such as first response time, resolution time, and other metrics. Only administrators can access this endpoint. Results are paginated with 25 items per page.",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/page"
+          },
+          {
+            "in": "query",
+            "name": "since",
+            "schema": {
+              "type": "string"
+            },
+            "description": "The timestamp from where events should start (Unix timestamp in seconds)"
+          },
+          {
+            "in": "query",
+            "name": "until",
+            "schema": {
+              "type": "string"
+            },
+            "description": "The timestamp from where events should stop (Unix timestamp in seconds)"
+          },
+          {
+            "in": "query",
+            "name": "inbox_id",
+            "schema": {
+              "type": "number"
+            },
+            "description": "Filter events by inbox ID"
+          },
+          {
+            "in": "query",
+            "name": "user_id",
+            "schema": {
+              "type": "number"
+            },
+            "description": "Filter events by user/agent ID"
+          },
+          {
+            "in": "query",
+            "name": "name",
+            "schema": {
+              "type": "string"
+            },
+            "description": "Filter events by event name (e.g., first_response, resolution, reply_time)"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/reporting_events_list_response"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied - Only administrators can access this endpoint",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v2/accounts/{account_id}/reports": {
       "parameters": [
         {
@@ -8981,6 +9127,10 @@
             "type": "string",
             "description": "The url to which the events will be send"
           },
+          "name": {
+            "type": "string",
+            "description": "The name of the webhook"
+          },
           "subscriptions": {
             "type": "array",
             "items": {
@@ -10560,6 +10710,10 @@
             "description": "The url where the events should be sent",
             "example": "https://example.com/webhook"
           },
+          "name": {
+            "type": "string",
+            "description": "The name of the webhook"
+          },
           "subscriptions": {
             "type": "array",
             "items": {
@@ -12066,6 +12220,100 @@
             "description": "List of contactable inboxes for the contact"
           }
         }
+      },
+      "reporting_event": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "ID of the reporting event"
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the event (e.g., first_response, resolution, reply_time)"
+          },
+          "value": {
+            "type": "number",
+            "format": "double",
+            "description": "Value of the metric in seconds"
+          },
+          "value_in_business_hours": {
+            "type": "number",
+            "format": "double",
+            "description": "Value of the metric in seconds, calculated only for business hours"
+          },
+          "event_start_time": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the event started"
+          },
+          "event_end_time": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the event ended"
+          },
+          "account_id": {
+            "type": "number",
+            "description": "ID of the account"
+          },
+          "conversation_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the conversation"
+          },
+          "inbox_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the inbox"
+          },
+          "user_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the user/agent"
+          },
+          "created_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the reporting event was created"
+          },
+          "updated_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the reporting event was last updated"
+          }
+        }
+      },
+      "reporting_event_meta": {
+        "type": "object",
+        "properties": {
+          "count": {
+            "type": "integer",
+            "description": "Total number of reporting events"
+          },
+          "current_page": {
+            "type": "integer",
+            "description": "Current page number"
+          },
+          "total_pages": {
+            "type": "integer",
+            "description": "Total number of pages"
+          }
+        }
+      },
+      "reporting_events_list_response": {
+        "type": "object",
+        "properties": {
+          "meta": {
+            "$ref": "#/components/schemas/reporting_event_meta"
+          },
+          "payload": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/reporting_event"
+            },
+            "description": "List of reporting events"
+          }
+        }
       }
     },
     "parameters": {
diff --git a/swagger/tag_groups/application_swagger.json b/swagger/tag_groups/application_swagger.json
index b26b913bc..2fd0cbdee 100644
--- a/swagger/tag_groups/application_swagger.json
+++ b/swagger/tag_groups/application_swagger.json
@@ -1821,6 +1821,152 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/contacts/{id}/contact_inboxes": {
+      "post": {
+        "tags": [
+          "Contacts"
+        ],
+        "operationId": "contactInboxCreation",
+        "description": "Create a contact inbox record for an inbox",
+        "summary": "Create contact inbox",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/account_id"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "schema": {
+              "type": "number"
+            },
+            "description": "ID of the contact",
+            "required": true
+          }
+        ],
+        "security": [
+          {
+            "userApiKey": []
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "inbox_id"
+                ],
+                "properties": {
+                  "inbox_id": {
+                    "type": "number",
+                    "description": "The ID of the inbox",
+                    "example": 1
+                  },
+                  "source_id": {
+                    "type": "string",
+                    "description": "Contact Inbox Source Id"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contact_inboxes"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "Incorrect payload",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/contacts/{id}/contactable_inboxes": {
+      "get": {
+        "tags": [
+          "Contacts"
+        ],
+        "operationId": "contactableInboxesGet",
+        "description": "Get List of contactable Inboxes",
+        "summary": "Get Contactable Inboxes",
+        "security": [
+          {
+            "userApiKey": []
+          }
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/account_id"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "schema": {
+              "type": "number"
+            },
+            "description": "ID of the contact",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contactable_inboxes_response"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "Incorrect payload",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/automation_rules": {
       "parameters": [
         {
@@ -3537,6 +3683,65 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/conversations/{conversation_id}/reporting_events": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/account_id"
+        },
+        {
+          "$ref": "#/components/parameters/conversation_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Conversations"
+        ],
+        "operationId": "get-conversation-reporting-events",
+        "summary": "Conversation Reporting Events",
+        "security": [
+          {
+            "userApiKey": []
+          }
+        ],
+        "description": "Get reporting events for a specific conversation. This endpoint returns events such as first response time, resolution time, and other metrics for the conversation, sorted by creation time in ascending order.",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/reporting_event"
+                  },
+                  "description": "Array of reporting events for the conversation"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/inboxes": {
       "get": {
         "tags": [
@@ -5708,6 +5913,93 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/reporting_events": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Reports"
+        ],
+        "operationId": "get-account-reporting-events",
+        "summary": "Account Reporting Events",
+        "security": [
+          {
+            "userApiKey": []
+          }
+        ],
+        "description": "Get paginated reporting events for the account. This endpoint returns reporting events such as first response time, resolution time, and other metrics. Only administrators can access this endpoint. Results are paginated with 25 items per page.",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/page"
+          },
+          {
+            "in": "query",
+            "name": "since",
+            "schema": {
+              "type": "string"
+            },
+            "description": "The timestamp from where events should start (Unix timestamp in seconds)"
+          },
+          {
+            "in": "query",
+            "name": "until",
+            "schema": {
+              "type": "string"
+            },
+            "description": "The timestamp from where events should stop (Unix timestamp in seconds)"
+          },
+          {
+            "in": "query",
+            "name": "inbox_id",
+            "schema": {
+              "type": "number"
+            },
+            "description": "Filter events by inbox ID"
+          },
+          {
+            "in": "query",
+            "name": "user_id",
+            "schema": {
+              "type": "number"
+            },
+            "description": "Filter events by user/agent ID"
+          },
+          {
+            "in": "query",
+            "name": "name",
+            "schema": {
+              "type": "string"
+            },
+            "description": "Filter events by event name (e.g., first_response, resolution, reply_time)"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/reporting_events_list_response"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied - Only administrators can access this endpoint",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v2/accounts/{account_id}/reports": {
       "parameters": [
         {
@@ -7342,6 +7634,10 @@
             "type": "string",
             "description": "The url to which the events will be send"
           },
+          "name": {
+            "type": "string",
+            "description": "The name of the webhook"
+          },
           "subscriptions": {
             "type": "array",
             "items": {
@@ -8921,6 +9217,10 @@
             "description": "The url where the events should be sent",
             "example": "https://example.com/webhook"
           },
+          "name": {
+            "type": "string",
+            "description": "The name of the webhook"
+          },
           "subscriptions": {
             "type": "array",
             "items": {
@@ -10427,6 +10727,100 @@
             "description": "List of contactable inboxes for the contact"
           }
         }
+      },
+      "reporting_event": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "ID of the reporting event"
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the event (e.g., first_response, resolution, reply_time)"
+          },
+          "value": {
+            "type": "number",
+            "format": "double",
+            "description": "Value of the metric in seconds"
+          },
+          "value_in_business_hours": {
+            "type": "number",
+            "format": "double",
+            "description": "Value of the metric in seconds, calculated only for business hours"
+          },
+          "event_start_time": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the event started"
+          },
+          "event_end_time": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the event ended"
+          },
+          "account_id": {
+            "type": "number",
+            "description": "ID of the account"
+          },
+          "conversation_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the conversation"
+          },
+          "inbox_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the inbox"
+          },
+          "user_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the user/agent"
+          },
+          "created_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the reporting event was created"
+          },
+          "updated_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the reporting event was last updated"
+          }
+        }
+      },
+      "reporting_event_meta": {
+        "type": "object",
+        "properties": {
+          "count": {
+            "type": "integer",
+            "description": "Total number of reporting events"
+          },
+          "current_page": {
+            "type": "integer",
+            "description": "Current page number"
+          },
+          "total_pages": {
+            "type": "integer",
+            "description": "Total number of pages"
+          }
+        }
+      },
+      "reporting_events_list_response": {
+        "type": "object",
+        "properties": {
+          "meta": {
+            "$ref": "#/components/schemas/reporting_event_meta"
+          },
+          "payload": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/reporting_event"
+            },
+            "description": "List of reporting events"
+          }
+        }
       }
     },
     "parameters": {
diff --git a/swagger/tag_groups/client_swagger.json b/swagger/tag_groups/client_swagger.json
index 16c1d5bc7..cf356e609 100644
--- a/swagger/tag_groups/client_swagger.json
+++ b/swagger/tag_groups/client_swagger.json
@@ -1934,6 +1934,10 @@
             "type": "string",
             "description": "The url to which the events will be send"
           },
+          "name": {
+            "type": "string",
+            "description": "The name of the webhook"
+          },
           "subscriptions": {
             "type": "array",
             "items": {
@@ -3513,6 +3517,10 @@
             "description": "The url where the events should be sent",
             "example": "https://example.com/webhook"
           },
+          "name": {
+            "type": "string",
+            "description": "The name of the webhook"
+          },
           "subscriptions": {
             "type": "array",
             "items": {
@@ -5019,6 +5027,100 @@
             "description": "List of contactable inboxes for the contact"
           }
         }
+      },
+      "reporting_event": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "ID of the reporting event"
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the event (e.g., first_response, resolution, reply_time)"
+          },
+          "value": {
+            "type": "number",
+            "format": "double",
+            "description": "Value of the metric in seconds"
+          },
+          "value_in_business_hours": {
+            "type": "number",
+            "format": "double",
+            "description": "Value of the metric in seconds, calculated only for business hours"
+          },
+          "event_start_time": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the event started"
+          },
+          "event_end_time": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the event ended"
+          },
+          "account_id": {
+            "type": "number",
+            "description": "ID of the account"
+          },
+          "conversation_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the conversation"
+          },
+          "inbox_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the inbox"
+          },
+          "user_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the user/agent"
+          },
+          "created_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the reporting event was created"
+          },
+          "updated_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the reporting event was last updated"
+          }
+        }
+      },
+      "reporting_event_meta": {
+        "type": "object",
+        "properties": {
+          "count": {
+            "type": "integer",
+            "description": "Total number of reporting events"
+          },
+          "current_page": {
+            "type": "integer",
+            "description": "Current page number"
+          },
+          "total_pages": {
+            "type": "integer",
+            "description": "Total number of pages"
+          }
+        }
+      },
+      "reporting_events_list_response": {
+        "type": "object",
+        "properties": {
+          "meta": {
+            "$ref": "#/components/schemas/reporting_event_meta"
+          },
+          "payload": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/reporting_event"
+            },
+            "description": "List of reporting events"
+          }
+        }
       }
     },
     "parameters": {
diff --git a/swagger/tag_groups/other_swagger.json b/swagger/tag_groups/other_swagger.json
index c8a5294d3..ed1073d0b 100644
--- a/swagger/tag_groups/other_swagger.json
+++ b/swagger/tag_groups/other_swagger.json
@@ -1349,6 +1349,10 @@
             "type": "string",
             "description": "The url to which the events will be send"
           },
+          "name": {
+            "type": "string",
+            "description": "The name of the webhook"
+          },
           "subscriptions": {
             "type": "array",
             "items": {
@@ -2928,6 +2932,10 @@
             "description": "The url where the events should be sent",
             "example": "https://example.com/webhook"
           },
+          "name": {
+            "type": "string",
+            "description": "The name of the webhook"
+          },
           "subscriptions": {
             "type": "array",
             "items": {
@@ -4434,6 +4442,100 @@
             "description": "List of contactable inboxes for the contact"
           }
         }
+      },
+      "reporting_event": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "ID of the reporting event"
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the event (e.g., first_response, resolution, reply_time)"
+          },
+          "value": {
+            "type": "number",
+            "format": "double",
+            "description": "Value of the metric in seconds"
+          },
+          "value_in_business_hours": {
+            "type": "number",
+            "format": "double",
+            "description": "Value of the metric in seconds, calculated only for business hours"
+          },
+          "event_start_time": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the event started"
+          },
+          "event_end_time": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the event ended"
+          },
+          "account_id": {
+            "type": "number",
+            "description": "ID of the account"
+          },
+          "conversation_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the conversation"
+          },
+          "inbox_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the inbox"
+          },
+          "user_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the user/agent"
+          },
+          "created_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the reporting event was created"
+          },
+          "updated_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the reporting event was last updated"
+          }
+        }
+      },
+      "reporting_event_meta": {
+        "type": "object",
+        "properties": {
+          "count": {
+            "type": "integer",
+            "description": "Total number of reporting events"
+          },
+          "current_page": {
+            "type": "integer",
+            "description": "Current page number"
+          },
+          "total_pages": {
+            "type": "integer",
+            "description": "Total number of pages"
+          }
+        }
+      },
+      "reporting_events_list_response": {
+        "type": "object",
+        "properties": {
+          "meta": {
+            "$ref": "#/components/schemas/reporting_event_meta"
+          },
+          "payload": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/reporting_event"
+            },
+            "description": "List of reporting events"
+          }
+        }
       }
     },
     "parameters": {
diff --git a/swagger/tag_groups/platform_swagger.json b/swagger/tag_groups/platform_swagger.json
index f816b8c94..1bf31a212 100644
--- a/swagger/tag_groups/platform_swagger.json
+++ b/swagger/tag_groups/platform_swagger.json
@@ -2110,6 +2110,10 @@
             "type": "string",
             "description": "The url to which the events will be send"
           },
+          "name": {
+            "type": "string",
+            "description": "The name of the webhook"
+          },
           "subscriptions": {
             "type": "array",
             "items": {
@@ -3689,6 +3693,10 @@
             "description": "The url where the events should be sent",
             "example": "https://example.com/webhook"
           },
+          "name": {
+            "type": "string",
+            "description": "The name of the webhook"
+          },
           "subscriptions": {
             "type": "array",
             "items": {
@@ -5195,6 +5203,100 @@
             "description": "List of contactable inboxes for the contact"
           }
         }
+      },
+      "reporting_event": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "ID of the reporting event"
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the event (e.g., first_response, resolution, reply_time)"
+          },
+          "value": {
+            "type": "number",
+            "format": "double",
+            "description": "Value of the metric in seconds"
+          },
+          "value_in_business_hours": {
+            "type": "number",
+            "format": "double",
+            "description": "Value of the metric in seconds, calculated only for business hours"
+          },
+          "event_start_time": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the event started"
+          },
+          "event_end_time": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the event ended"
+          },
+          "account_id": {
+            "type": "number",
+            "description": "ID of the account"
+          },
+          "conversation_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the conversation"
+          },
+          "inbox_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the inbox"
+          },
+          "user_id": {
+            "type": "number",
+            "nullable": true,
+            "description": "ID of the user/agent"
+          },
+          "created_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the reporting event was created"
+          },
+          "updated_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp when the reporting event was last updated"
+          }
+        }
+      },
+      "reporting_event_meta": {
+        "type": "object",
+        "properties": {
+          "count": {
+            "type": "integer",
+            "description": "Total number of reporting events"
+          },
+          "current_page": {
+            "type": "integer",
+            "description": "Current page number"
+          },
+          "total_pages": {
+            "type": "integer",
+            "description": "Total number of pages"
+          }
+        }
+      },
+      "reporting_events_list_response": {
+        "type": "object",
+        "properties": {
+          "meta": {
+            "$ref": "#/components/schemas/reporting_event_meta"
+          },
+          "payload": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/reporting_event"
+            },
+            "description": "List of reporting events"
+          }
+        }
       }
     },
     "parameters": {
diff --git a/tailwind.config.js b/tailwind.config.js
index 82a6c2cbe..18bd54948 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -31,6 +31,7 @@ const tailwindConfig = {
     './app/javascript/survey/**/*.vue',
     './app/javascript/dashboard/components-next/**/*.vue',
     './app/javascript/dashboard/helper/**/*.js',
+    './app/javascript/dashboard/composables/**/*.js',
     './app/javascript/dashboard/components-next/**/*.js',
     './app/javascript/dashboard/routes/dashboard/**/**/*.js',
     './app/views/**/*.html.erb',
diff --git a/vite.config.ts b/vite.config.ts
index 8af1a9538..e06b0f1fb 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -99,6 +99,12 @@ export default defineConfig({
     },
     globals: true,
     outputFile: 'coverage/sonar-report.xml',
+    pool: 'threads',
+    poolOptions: {
+      threads: {
+        singleThread: false,
+      },
+    },
     server: {
       deps: {
         inline: ['tinykeys', '@material/mwc-icon'],