remove renew on if plan is hacker

Merge remote-tracking branch 'origin/stripe_v2/nitpicks' into stripe_v2/final
Merge remote-tracking branch 'origin/stripe_v2/frontend' into stripe_v2/final
2025-12-01 21:31:21 +05:30 · 2025-12-01 21:09:35 +05:30 · 2025-12-01 20:03:14 +05:30 · 2025-12-01 20:01:59 +05:30 · 2025-12-01 19:55:20 +05:30 · 2025-12-01 13:36:34 +05:30
330 changed files with 11219 additions and 2113 deletions
@@ -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
@@ -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=

@@ -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
@@ -99,3 +99,5 @@ CLAUDE.local.md
 # Histoire deployment
 .netlify
 .histoire
+.pnpm-store/*
+local/
@@ -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 = [
@@ -7,6 +7,7 @@ plugins:
 require:
  - ./rubocop/use_from_email.rb
  - ./rubocop/custom_cop_location.rb
+  - ./rubocop/one_class_per_file.rb

 Layout/LineLength:
  Max: 150
@@ -87,7 +88,7 @@ Metrics/ModuleLength:
 Rails/HelperInstanceVariable:
  Exclude:
    - enterprise/app/helpers/captain/chat_helper.rb
-
+    - 'enterprise/app/helpers/captain/tool_execution_helper.rb'
 Rails/ApplicationController:
  Exclude:
    - 'app/controllers/api/v1/widget/messages_controller.rb'
@@ -205,6 +206,9 @@ UseFromEmail:
 CustomCopLocation:
  Enabled: true

+Style/OneClassPerFile:
+  Enabled: true
+
 AllCops:
  NewCops: enable
  Exclude:
@@ -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
@@ -55,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'
@@ -159,7 +162,7 @@ gem 'working_hours'
 gem 'pg_search'

 # Subscriptions, Billing
-gem 'stripe'
+gem 'stripe', '17.2.0.pre.alpha.2'

 ## - helper gems --##
 ## to populate db with sample data
@@ -193,6 +196,10 @@ gem 'ai-agents', '>= 0.4.3'
 # TODO: Move this gem as a dependency of ai-agents
 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 ###
@@ -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)
@@ -618,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)
@@ -902,7 +928,7 @@ GEM
    squasher (0.7.2)
    stackprof (0.2.25)
    statsd-ruby (1.5.0)
-    stripe (8.5.0)
+    stripe (17.2.0.pre.alpha.2)
    telephone_number (1.4.20)
    test-prof (1.2.1)
    thor (1.4.0)
@@ -995,6 +1021,7 @@ DEPENDENCIES
  annotate
  attr_extras
  audited (~> 5.4, >= 5.4.1)
+  aws-actionmailbox-ses (~> 0)
  aws-sdk-s3
  azure-storage-blob!
  barnes
@@ -1065,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
@@ -1110,7 +1139,7 @@ DEPENDENCIES
  spring-watcher-listen
  squasher
  stackprof
-  stripe
+  stripe (= 17.2.0.pre.alpha.2)
  telephone_number
  test-prof
  tidewave
@@ -1 +1 @@
-4.4.0
+4.8.0
@@ -103,3 +103,5 @@ class ContactInboxBuilder
    @inbox.email? || @inbox.sms? || @inbox.twilio? || @inbox.whatsapp?
  end
 end
+
+ContactInboxBuilder.prepend_mod_with('ContactInboxBuilder')
@@ -138,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],
@@ -222,3 +223,5 @@ class Messages::MessageBuilder
                                       })
  end
 end
+
+Messages::MessageBuilder.prepend_mod_with('Messages::MessageBuilder')
@@ -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

@@ -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
@@ -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
@@ -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
@@ -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'
@@ -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

@@ -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
@@ -8,7 +8,10 @@ module BillingHelper
    # Return false if not plans are configured, so that no checks are enforced
    return false if default_plan.blank?

-    account.custom_attributes['plan_name'].nil? || account.custom_attributes['plan_name'] == default_plan['name']
+    # Handle both string and hash formats for default_plan
+    default_plan_name = default_plan.is_a?(Hash) ? default_plan['name'] : default_plan
+
+    account.custom_attributes['plan_name'].nil? || account.custom_attributes['plan_name'] == default_plan_name
  end

  def conversations_this_month(account)
@@ -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.'
@@ -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();
@@ -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 });
  }
@@ -6,6 +6,7 @@ class EnterpriseAccountAPI extends ApiClient {
    super('', { accountScoped: true, enterprise: true });
  }

+  // V1 endpoints
  checkout() {
    return axios.post(`${this.url}checkout`);
  }
@@ -23,6 +24,49 @@ class EnterpriseAccountAPI extends ApiClient {
      action_type: action,
    });
  }
+
+  // V2 Billing endpoints
+  get v2BillingUrl() {
+    const accountId = this.accountIdFromRoute;
+    return `/enterprise/api/v2/accounts/${accountId}/billing`;
+  }
+
+  getCreditGrants() {
+    return axios.get(`${this.v2BillingUrl}/credit_grants`);
+  }
+
+  getPricingPlans() {
+    return axios.get(`${this.v2BillingUrl}/pricing_plans`);
+  }
+
+  getTopupOptions() {
+    return axios.get(`${this.v2BillingUrl}/topup_options`);
+  }
+
+  topupCredits(credits) {
+    return axios.post(`${this.v2BillingUrl}/topup`, { credits });
+  }
+
+  subscribeToPlan(pricingPlanId, quantity) {
+    return axios.post(`${this.v2BillingUrl}/subscribe`, {
+      pricing_plan_id: pricingPlanId,
+      quantity,
+    });
+  }
+
+  cancelSubscription(reason = null, feedback = null) {
+    return axios.post(`${this.v2BillingUrl}/cancel_subscription`, {
+      reason,
+      feedback,
+    });
+  }
+
+  changePricingPlan(pricingPlanId, quantity) {
+    return axios.post(`${this.v2BillingUrl}/change_pricing_plan`, {
+      pricing_plan_id: pricingPlanId,
+      quantity,
+    });
+  }
 }

 export default new EnterpriseAccountAPI();
@@ -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 }) {
@@ -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,
@@ -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'
+    );
+  });
+});
@@ -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,
+        }
      );
    });

@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -102,6 +102,7 @@ const closeMobileSidebar = () => {
              />
              <VoiceCallButton
                :phone="selectedContact?.phoneNumber"
+                :contact-id="contactId"
                :label="$t('CONTACT_PANEL.CALL')"
                size="sm"
              />
@@ -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"
@@ -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">
@@ -108,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
@@ -116,6 +117,7 @@ watch(
      :placeholder="t('CAPTAIN.ASSISTANTS.FORM.RESOLUTION_MESSAGE.PLACEHOLDER')"
      :message="formErrors.resolutionMessage"
      :message-type="formErrors.resolutionMessage ? 'error' : 'info'"
+      class="z-0"
    />

    <Editor
@@ -126,6 +128,7 @@ watch(
      :message="formErrors.instructions"
      :max-length="20000"
      :message-type="formErrors.instructions ? 'error' : 'info'"
+      class="z-0"
    />

    <div class="flex flex-col gap-2">
@@ -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>
@@ -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>
@@ -73,3 +73,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',
+};
@@ -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"
@@ -351,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'),
@@ -249,7 +249,7 @@ const activeAssigneeTabCount = computed(() => {
 });

 const conversationListPagination = computed(() => {
-  const conversationsPerPage = wootConstants.CONVERSATIONS_PER_PAGE;
+  const conversationsPerPage = 25;
  const hasChatsOnView =
    chatsOnView.value &&
    Array.isArray(chatsOnView.value) &&
@@ -339,10 +339,7 @@ const conversationList = computed(() => {
    });
  }

-  // Clip to current page size to fix pagination order bug
-  const maxItems =
-    currentFiltersPage.value * wootConstants.CONVERSATIONS_PER_PAGE;
-  return localConversationList.slice(0, maxItems);
+  return localConversationList;
 });

 const showEndOfListMessage = computed(() => {
@@ -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"
@@ -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();

@@ -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();
@@ -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,
@@ -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>
@@ -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,
+  };
+};
@@ -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];
    });
@@ -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 =>
@@ -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,
-  };
-}
@@ -1,6 +1,5 @@
 export default {
  GRAVATAR_URL: 'https://www.gravatar.com/avatar/',
-  CONVERSATIONS_PER_PAGE: 25,
  ASSIGNEE_TYPE: {
    ME: 'me',
    UNASSIGNED: 'unassigned',
@@ -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 = [
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -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"
+    }
+  }
+}
@@ -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...",
@@ -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",
@@ -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.",
@@ -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,
@@ -306,6 +306,8 @@
    "SETTINGS": "Settings",
    "CONTACTS": "Contacts",
    "ACTIVE": "Active",
+    "COMPANIES": "Companies",
+    "ALL_COMPANIES": "All Companies",
    "CAPTAIN": "Captain",
    "CAPTAIN_ASSISTANTS": "Assistants",
    "CAPTAIN_DOCUMENTS": "Documents",
@@ -380,6 +382,8 @@
  "BILLING_SETTINGS": {
    "TITLE": "Billing",
    "DESCRIPTION": "Manage your subscription here, upgrade your plan and get more for your team.",
+    "BILLING_PORTAL": "Billing Portal",
+    "VIEW_ALL_PLANS": "View all plans",
    "CURRENT_PLAN": {
      "TITLE": "Current Plan",
      "PLAN_NOTE": "You are currently subscribed to the **{plan}** plan with **{quantity}** licenses",
@@ -392,6 +396,25 @@
      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
      "BUTTON_TXT": "Go to the billing portal"
    },
+    "SUBSCRIPTION": {
+      "TITLE": "Subscription",
+      "DESCRIPTION": "Manage your current plan, seats, and billing cycle.",
+      "CURRENT_PLAN": "Current plan",
+      "NUMBER_OF_SEATS": "Number of seats",
+      "RENEWS_ON": "Renews on",
+      "ENDS_ON": "Ends on",
+      "CANCELLED_ON": "Cancelled on",
+      "CHANGE_PLAN": "Change",
+      "CHANGE_SEATS": "Change",
+      "CANCEL_SUBSCRIPTION": "Cancel"
+    },
+    "CAPTAIN_AI": {
+      "TITLE": "Captain AI",
+      "DESCRIPTION": "Purchase and manage credits for Captain AI features.",
+      "AI_CREDITS": "AI credits",
+      "PURCHASE_CREDITS": "Purchase credits",
+      "VIEW_HISTORY": "View credit history"
+    },
    "CAPTAIN": {
      "TITLE": "Captain",
      "DESCRIPTION": "Manage usage and credits for Captain AI.",
@@ -400,6 +423,78 @@
      "RESPONSES": "Responses",
      "UPGRADE": "Captain is not available on the free plan, upgrade now to get access to assistants, copilot and more."
    },
+    "CHANGE_PLAN_MODAL": {
+      "TITLE": "Change plan",
+      "DESCRIPTION": "Select a plan that best fits your needs.",
+      "SUBSCRIBE_TITLE": "Choose a plan",
+      "SUBSCRIBE_DESCRIPTION": "Select a plan to subscribe and unlock all features.",
+      "CURRENT_PLAN": "Current plan",
+      "CREDITS_MONTH": "{credits} credits/month",
+      "PER_USER_MONTH": "/user/month",
+      "AI_CREDITS_MONTH": "AI credits/month",
+      "CANCEL": "Cancel",
+      "SELECT_PLAN": "Select plan",
+      "CHANGE_PLAN": "Change plan",
+      "SUBSCRIBE": "Subscribe"
+    },
+    "CANCEL_MODAL": {
+      "TITLE": "Cancel subscription",
+      "WARNING_TITLE": "You're about to cancel your {plan} plan",
+      "WARNING_DESCRIPTION": "Your subscription will remain active until {date}. After that, you'll lose access to:",
+      "FEATURE_AI_CREDITS": "AI credits for Captain features",
+      "FEATURE_TEAM_COLLABORATION": "Team collaboration tools",
+      "FEATURE_PRIORITY_SUPPORT": "Priority customer support",
+      "KEEP_SUBSCRIPTION": "Keep subscription",
+      "CANCEL_SUBSCRIPTION": "Cancel subscription"
+    },
+    "FEEDBACK_MODAL": {
+      "TITLE": "Help us improve",
+      "DESCRIPTION": "We're sorry to see you go. Please help us improve by sharing your reason for cancelling.",
+      "REASON_LABEL": "Why are you cancelling?",
+      "REASONS": {
+        "TOO_EXPENSIVE": "It's too expensive",
+        "NOT_USING": "I'm not using it enough",
+        "MISSING_FEATURES": "Missing features I need",
+        "BETTER_ALTERNATIVE": "Found a better alternative",
+        "TECHNICAL_ISSUES": "Technical issues",
+        "OTHER": "Other reason"
+      },
+      "FEEDBACK_LABEL": "Additional feedback (optional)",
+      "FEEDBACK_PLACEHOLDER": "Tell us more about your experience...",
+      "GO_BACK": "Go back",
+      "SUBMIT_CANCEL": "Submit and cancel"
+    },
+    "PURCHASE_MODAL": {
+      "TITLE": "Purchase AI credits",
+      "DESCRIPTION": "Choose a credit package that suits your needs.",
+      "MOST_POPULAR": "Most popular",
+      "CREDITS": "credits",
+      "NOTE": "Credits will be added to your account immediately and are non-refundable. Unused credits expire after 12 months.",
+      "CANCEL": "Cancel",
+      "PURCHASE": "Purchase"
+    },
+    "CREDIT_HISTORY": {
+      "TITLE": "Credit history",
+      "DESCRIPTION": "View your credit purchases and allocations.",
+      "NAME": "Name",
+      "CREDITS": "Credits",
+      "SOURCE": "Source",
+      "EFFECTIVE_AT": "Effective at",
+      "EXPIRES_AT": "Expires at",
+      "NO_RECORDS": "No credit history found.",
+      "CLOSE": "Close"
+    },
+    "HELP": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "CHAT": "Chat with us"
+    },
+    "ALERTS": {
+      "PLAN_CHANGED": "Your plan has been changed successfully.",
+      "SEATS_UPDATED": "Number of seats updated successfully.",
+      "SUBSCRIPTION_CANCELLED": "Your subscription has been scheduled for cancellation.",
+      "CREDITS_PURCHASED": "Credits purchased successfully."
+    },
    "CHAT_WITH_US": {
      "TITLE": "Need help?",
      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
@@ -411,6 +506,7 @@
    "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.",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -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,27 +568,27 @@
      "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": "Failed to assign labels",
-    "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
-    "NO_LABELS_FOUND": "No labels available yet.",
+    "ASSIGN_LABELS_FAILED": "שיוך תווית נכשל",
+    "DESCRIPTION": "בחר תווית שאתה רוצה והוסף אותה לאיש קשר.",
+    "NO_LABELS_FOUND": "אין תוויות כרגע.",
    "SELECTED_COUNT": "{count} selected",
-    "CLEAR_SELECTION": "Clear selection",
-    "SELECT_ALL": "Select all ({count})",
+    "CLEAR_SELECTION": "נקה בחירה",
+    "SELECT_ALL": "בחר הכל ({count})",
    "DELETE_CONTACTS": "מחק",
-    "DELETE_SUCCESS": "Contacts deleted successfully.",
-    "DELETE_FAILED": "Failed to delete contacts.",
+    "DELETE_SUCCESS": "איש הקשר נמחק בהצלחה.",
+    "DELETE_FAILED": "מחיקת איש קשר נכשלה.",
    "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",
+      "TITLE": "מחק אנשי קשר שנבחרו",
+      "SINGULAR_TITLE": "מחק איש קשר שנבחר",
+      "DESCRIPTION": "פעולה זו תמחק לצמיתות {count} אנשי קשר שנבחרו. לא ניתן לשחזר פעולה זו.",
+      "SINGULAR_DESCRIPTION": "פעולה זו תמחק לצמיתות  אנשי קשר שנבחרו. לא ניתן לשחזר פעולה זו.",
+      "CONFIRM_MULTIPLE": "מחק אנשי קשר",
      "CONFIRM_SINGLE": "מחק איש קשר"
    }
  },
@@ -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": {
@@ -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": {
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "טייס משנה",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -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})"
    },
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistenti",
      "SWITCH_ASSISTANT": "Cambia assistenti",
-      "NEW_ASSISTANT": "Crea Assistente"
+      "NEW_ASSISTANT": "Crea Assistente",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -422,7 +423,7 @@
      "NO_ASSISTANTS_AVAILABLE": "Non ci sono assistenti disponibili nel tuo account.",
      "ADD_NEW": "Crea un nuovo assistente",
      "DELETE": {
-        "TITLE": "Are you sure to delete the assistant?",
+        "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",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "アシスタント",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "コパイロット",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Asistenti",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Kopilots",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistentes",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copiloto",
@@ -351,7 +351,8 @@
    "ASSISTANT_SWITCHER": {
      "ASSISTANTS": "Assistants",
      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant"
+      "NEW_ASSISTANT": "Create Assistant",
+      "EMPTY_LIST": "No assistants found, please create one to get started"
    },
    "COPILOT": {
      "TITLE": "Copilot",
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .4.0
 .8.0