Update .gitignore

- Resolved merge conflicts in Vue components
- Updated color scheme to use new n-slate tokens
- Preserved voice channel functionality including isPrivateNoteOnly
- Removed files that were deleted in develop
- Fixed ESLint errors in App.vue
- Fixed SCSS imports in CollaboratorsPage.vue
- Fixed duplicate voice channel entries in ChannelList and ChannelItem
- Moved voice channel to end of channel list
- Integrated with new component structure

.circleci/config.yml

@@ -1,7 +1,6 @@
 version: 2.1
 orbs:
   node: circleci/node@6.1.0
-  qlty-orb: qltysh/qlty-orb@0.0
 
 defaults: &defaults
   working_directory: ~/build
@@ -90,6 +89,14 @@ jobs:
           command: |
             source ~/.rvm/scripts/rvm
             bundle install
+            # pnpm install
+
+      - run:
+          name: Download cc-test-reporter
+          command: |
+            mkdir -p ~/tmp
+            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ~/tmp/cc-test-reporter
+            chmod +x ~/tmp/cc-test-reporter
 
       # Swagger verification
       - run:
@@ -101,11 +108,10 @@ jobs:
               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
+      # we remove the FRONTED_URL from the .env before running the tests
       - run:
           name: Database Setup and Configure Environment Variables
           command: |
@@ -143,11 +149,17 @@ jobs:
           command: pnpm run eslint
 
       - run:
-          name: Run frontend tests (with coverage)
+          name: Run frontend tests
           command: |
             mkdir -p ~/build/coverage/frontend
+            ~/tmp/cc-test-reporter before-build
             pnpm run test:coverage
 
+      - run:
+          name: Code Climate Test Coverage (Frontend)
+          command: |
+            ~/tmp/cc-test-reporter format-coverage -t lcov -o "~/build/coverage/frontend/codeclimate.frontend_$CIRCLE_NODE_INDEX.json"
+
       # Run backend tests
       - run:
           name: Run backend tests
@@ -155,18 +167,18 @@ jobs:
             mkdir -p ~/tmp/test-results/rspec
             mkdir -p ~/tmp/test-artifacts
             mkdir -p ~/build/coverage/backend
+            ~/tmp/cc-test-reporter before-build
             TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-            bundle exec rspec -I ./spec --require coverage_helper --require spec_helper --format progress \
+            bundle exec rspec --format progress \
                               --format RspecJunitFormatter \
                               --out ~/tmp/test-results/rspec.xml \
                               -- ${TESTFILES}
           no_output_timeout: 30m
 
-      # Qlty coverage publish
-      - qlty-orb/coverage_publish:
-          files: |
-            coverage/coverage.json
-            coverage/lcov.info
+      - run:
+          name: Code Climate Test Coverage (Backend)
+          command: |
+            ~/tmp/cc-test-reporter format-coverage -t simplecov -o "~/build/coverage/backend/codeclimate.$CIRCLE_NODE_INDEX.json"
 
       - run:
           name: List coverage directory contents
@@ -177,7 +189,3 @@ jobs:
           root: ~/build
           paths:
             - coverage
-
-      - store_artifacts:
-          path: coverage
-          destination: coverage

.codeclimate.yml

@@ -0,0 +1,62 @@
+version: '2'
+plugins:
+  rubocop:
+    enabled: false
+    channel: rubocop-0-73
+  eslint:
+    enabled: false
+  csslint:
+    enabled: true
+  scss-lint:
+    enabled: true
+  brakeman:
+    enabled: false
+checks:
+  similar-code:
+    enabled: false
+  method-count:
+    enabled: true
+    config:
+      threshold: 32
+  file-lines:
+    enabled: true
+    config:
+      threshold: 300
+  method-lines:
+    config:
+      threshold: 50
+exclude_patterns:
+  - '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'

.env.example

@@ -6,13 +6,6 @@
 # Use `rake secret` to generate this variable
 SECRET_KEY_BASE=replace_with_lengthy_secure_hex
 
-# Active Record Encryption keys (required for MFA/2FA functionality)
-# Generate these keys by running: rails db:encryption:init
-# IMPORTANT: Use different keys for each environment (development, staging, production)
-# ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=
-# ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=
-# ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=
-
 # Replace with the URL you are planning to use for your app
 FRONTEND_URL=http://0.0.0.0:3000
 # To use a dedicated URL for help center pages

.github/workflows/auto-assign-pr.yml

@@ -1,28 +0,0 @@
-name: Auto-assign PR to Author
-
-on:
-  pull_request:
-    types: [opened]
-
-jobs:
-  auto-assign:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Auto-assign PR to author
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const { owner, repo } = context.repo;
-            const pull_number = context.payload.pull_request.number;
-            const author = context.payload.pull_request.user.login;
-            
-            await github.rest.issues.addAssignees({
-              owner,
-              repo,
-              issue_number: pull_number,
-              assignees: [author]
-            });
-            
-            console.log(`Assigned PR #${pull_number} to ${author}`);

.github/workflows/run_mfa_spec.yml

@@ -1,100 +0,0 @@
-name: Run MFA Tests
-permissions:
-  contents: read
-
-on:
-  pull_request:
-
-# If two pushes happen within a short time in the same PR, cancel the run of the oldest push
-concurrency:
-  group: pr-${{ github.workflow }}-${{ github.head_ref }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    runs-on: ubuntu-22.04
-    # Only run if MFA test keys are available
-    if: github.event_name == 'workflow_dispatch' || (github.repository == 'chatwoot/chatwoot' && github.actor != 'dependabot[bot]')
-
-    services:
-      postgres:
-        image: pgvector/pgvector:pg15
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: ''
-          POSTGRES_DB: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
-        ports:
-          - 5432:5432
-        options: >-
-          --mount type=tmpfs,destination=/var/lib/postgresql/data
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-        options: --entrypoint redis-server
-
-    env:
-      RAILS_ENV: test
-      POSTGRES_HOST: localhost
-      # Active Record encryption keys required for MFA - test keys only, not for production use
-      ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: 'test_key_a6cde8f7b9c2d3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7'
-      ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: 'test_key_b7def9a8c0d3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d8'
-      ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: 'test_salt_c8efa0b9d1e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d9'
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Create database
-        run: bundle exec rake db:create
-
-      - name: Install pgvector extension
-        run: |
-          PGPASSWORD="" psql -h localhost -U postgres -d chatwoot_test -c "CREATE EXTENSION IF NOT EXISTS vector;"
-
-      - name: Seed database
-        run: bundle exec rake db:schema:load
-
-      - name: Run MFA-related backend tests
-        run: |
-          bundle exec rspec \
-            spec/services/mfa/token_service_spec.rb \
-            spec/services/mfa/authentication_service_spec.rb \
-            spec/requests/api/v1/profile/mfa_controller_spec.rb \
-            spec/controllers/devise_overrides/sessions_controller_spec.rb \
-            spec/models/application_record_external_credentials_encryption_spec.rb \
-            --profile=10 \
-            --format documentation
-        env:
-          NODE_OPTIONS: --openssl-legacy-provider
-
-      - name: Run MFA-related tests in user_spec
-        run: |
-          # Run specific MFA-related tests from user_spec
-          bundle exec rspec spec/models/user_spec.rb \
-            -e "two factor" \
-            -e "2FA" \
-            -e "MFA" \
-            -e "otp" \
-            -e "backup code" \
-            --profile=10 \
-            --format documentation
-        env:
-          NODE_OPTIONS: --openssl-legacy-provider
-
-      - name: Upload test logs
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: mfa-test-logs
-          path: |
-            log/test.log
-            tmp/screenshots/

.gitignore

@@ -94,8 +94,3 @@ yarn-debug.log*
 .vscode
 .claude/settings.local.json
 .cursor
-CLAUDE.local.md
-
-# Histoire deployment
-.netlify
-.histoire

.qlty/.gitignore

@@ -1,7 +0,0 @@
-*
-!configs
-!configs/**
-!hooks
-!hooks/**
-!qlty.toml
-!.gitignore

.qlty/configs/.hadolint.yaml

@@ -1,2 +0,0 @@
-ignored:
-  - DL3008

.qlty/configs/.shellcheckrc

@@ -1 +0,0 @@
-source-path=SCRIPTDIR

.qlty/configs/.yamllint.yaml

@@ -1,8 +0,0 @@
-rules:
-  document-start: disable
-  quoted-strings:
-    required: only-when-needed
-    extra-allowed: ["{|}"]
-  key-duplicates: {}
-  octal-values:
-    forbid-implicit-octal: true

.qlty/qlty.toml

@@ -1,84 +0,0 @@
-# This file was automatically generated by `qlty init`.
-# You can modify it to suit your needs.
-# We recommend you to commit this file to your repository.
-#
-# This configuration is used by both Qlty CLI and Qlty Cloud.
-#
-#     Qlty CLI -- Code quality toolkit for developers
-#     Qlty Cloud -- Fully automated Code Health Platform
-#
-# Try Qlty Cloud: https://qlty.sh
-#
-# For a guide to configuration, visit https://qlty.sh/d/config
-# Or for a full reference, visit https://qlty.sh/d/qlty-toml
-config_version = "0"
-
-exclude_patterns = [
-  "*_min.*",
-  "*-min.*",
-  "*.min.*",
-  "**/.yarn/**",
-  "**/*.d.ts",
-  "**/assets/**",
-  "**/bower_components/**",
-  "**/build/**",
-  "**/cache/**",
-  "**/config/**",
-  "**/db/**",
-  "**/deps/**",
-  "**/dist/**",
-  "**/extern/**",
-  "**/external/**",
-  "**/generated/**",
-  "**/Godeps/**",
-  "**/gradlew/**",
-  "**/mvnw/**",
-  "**/node_modules/**",
-  "**/protos/**",
-  "**/seed/**",
-  "**/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",
-]
-
-test_patterns = [
-  "**/test/**",
-  "**/spec/**",
-  "**/*.test.*",
-  "**/*.spec.*",
-  "**/*_test.*",
-  "**/*_spec.*",
-  "**/test_*.*",
-  "**/spec_*.*",
-]
-
-[smells]
-mode = "comment"
-
-[smells.boolean_logic]
-threshold = 4
-
-[smells.file_complexity]
-threshold = 66
-enabled = true
-
-[smells.return_statements]
-threshold = 4
-
-[smells.nested_control_flow]
-threshold = 4
-
-[smells.function_parameters]
-threshold = 4
-
-[smells.function_complexity]
-threshold = 5
-
-[smells.duplication]
-enabled = true
-threshold = 20
-
-[[source]]
-name = "default"
-default = true

.rubocop.yml

@@ -23,7 +23,7 @@ Metrics/MethodLength:
     - 'enterprise/lib/captain/agent.rb'
 
 RSpec/ExampleLength:
-  Max: 50
+  Max: 25
 
 Style/Documentation:
   Enabled: false
@@ -283,7 +283,7 @@ Rails/RedundantActiveRecordAllMethod:
   Enabled: false
 
 Layout/TrailingEmptyLines:
-  Enabled: true
+  Enabled: false
 
 Style/SafeNavigationChainLength:
   Enabled: false
@@ -336,4 +336,4 @@ FactoryBot/RedundantFactoryOption:
   Enabled: false
 
 FactoryBot/FactoryAssociationWithStrategy:
-  Enabled: false
+  Enabled: false

AGENTS.md

@@ -55,21 +55,4 @@
 
 ## Ruby Best Practices
 
-- Use compact `module/class` definitions; avoid nested styles
-
-## Enterprise Edition Notes
-
-- Chatwoot has an Enterprise overlay under `enterprise/` that extends/overrides OSS code.
-- When you add or modify core functionality, always check for corresponding files in `enterprise/` and keep behavior compatible.
-- Follow the Enterprise development practices documented here:
-  - https://chatwoot.help/hc/handbook/articles/developing-enterprise-edition-features-38
-
-Practical checklist for any change impacting core logic or public APIs
-- Search for related files in both trees before editing (e.g., `rg -n "FooService|ControllerName|ModelName" app enterprise`).
-- If adding new endpoints, services, or models, consider whether Enterprise needs:
-  - An override (e.g., `enterprise/app/...`), or
-  - An extension point (e.g., `prepend_mod_with`, hooks, configuration) to avoid hard forks.
-- Avoid hardcoding instance- or plan-specific behavior in OSS; prefer configuration, feature flags, or extension points consumed by Enterprise.
-- Keep request/response contracts stable across OSS and Enterprise; update both sets of routes/controllers when introducing new APIs.
-- When renaming/moving shared code, mirror the change in `enterprise/` to prevent drift.
-- Tests: Add Enterprise-specific specs under `spec/enterprise`, mirroring OSS spec layout where applicable.
+- Use compact `module/class` definitions; avoid nested styles

Gemfile

@@ -21,7 +21,6 @@ gem 'telephone_number'
 gem 'time_diff'
 gem 'tzinfo-data'
 gem 'valid_email2'
-gem 'octokit'
 # compress javascript config.assets.js_compressor
 gem 'uglifier'
 ##-- used for single column multiple binary flags in notification settings/feature flagging --##
@@ -63,10 +62,6 @@ gem 'redis-namespace'
 # super fast record imports in bulk
 gem 'activerecord-import'
 
-gem 'searchkick'
-gem 'opensearch-ruby'
-gem 'faraday_middleware-aws-sigv4'
-
 ##--- gems for server & infra configuration ---##
 gem 'dotenv-rails', '>= 3.0.0'
 gem 'foreman'
@@ -79,12 +74,9 @@ gem 'barnes'
 gem 'devise', '>= 4.9.4'
 gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
 gem 'devise_token_auth', '>= 1.2.3'
-# two-factor authentication
-gem 'devise-two-factor', '>= 5.0.0'
 # authorization
 gem 'jwt'
 gem 'pundit'
-
 # super admin
 gem 'administrate', '>= 0.20.1'
 gem 'administrate-field-active_storage', '>= 1.0.3'
@@ -104,7 +96,7 @@ gem 'twitty', '~> 0.1.5'
 # facebook client
 gem 'koala'
 # slack client
-gem 'slack-ruby-client', '~> 2.7.0'
+gem 'slack-ruby-client', '~> 2.5.2'
 # for dialogflow integrations
 gem 'google-cloud-dialogflow-v2', '>= 0.24.0'
 gem 'grpc'
@@ -116,7 +108,7 @@ gem 'google-cloud-translate-v3', '>= 0.7.0'
 ##-- apm and error monitoring ---#
 # loaded only when environment variables are set.
 # ref application.rb
-gem 'datadog', '~> 2.0', require: false
+gem 'ddtrace', require: false
 gem 'elastic-apm', require: false
 gem 'newrelic_rpm', require: false
 gem 'newrelic-sidekiq-metrics', '>= 1.6.2', require: false
@@ -129,8 +121,6 @@ gem 'sentry-sidekiq', '>= 5.19.0', require: false
 gem 'sidekiq', '>= 7.3.1'
 # We want cron jobs
 gem 'sidekiq-cron', '>= 1.12.0'
-# for sidekiq healthcheck
-gem 'sidekiq_alive'
 
 ##-- Push notification service --##
 gem 'fcm'
@@ -175,7 +165,6 @@ gem 'audited', '~> 5.4', '>= 5.4.1'
 
 # need for google auth
 gem 'omniauth', '>= 2.1.2'
-gem 'omniauth-saml'
 gem 'omniauth-google-oauth2', '>= 1.1.3'
 gem 'omniauth-rails_csrf_protection', '~> 1.0', '>= 1.0.2'
 
@@ -188,10 +177,6 @@ gem 'reverse_markdown'
 
 gem 'iso-639'
 gem 'ruby-openai'
-gem 'ai-agents', '>= 0.4.3'
-
-# TODO: Move this gem as a dependency of ai-agents
-gem 'ruby_llm-schema'
 
 gem 'shopify_api'
 
@@ -221,8 +206,6 @@ group :development do
   gem 'stackprof'
   # Should install the associated chrome extension to view query logs
   gem 'meta_request', '>= 0.8.3'
-
-  gem 'tidewave'
 end
 
 group :test do
@@ -232,7 +215,6 @@ group :test do
   gem 'webmock'
   # test profiling
   gem 'test-prof'
-  gem 'simplecov_json_formatter', require: false
 end
 
 group :development, :test do
@@ -257,7 +239,7 @@ group :development, :test do
   gem 'rubocop-factory_bot', require: false
   gem 'seed_dump'
   gem 'shoulda-matchers'
-  gem 'simplecov', '>= 0.21', require: false
+  gem 'simplecov', '0.17.1', require: false
   gem 'spring'
   gem 'spring-watcher-listen'
 end

Gemfile.lock

@@ -25,35 +25,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actioncable (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actionmailbox (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      actionview (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actionmailer (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.5.2)
-      actionview (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actionpack (7.1.5.1)
+      actionview (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -61,38 +61,38 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actiontext (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actionview (7.1.5.1)
+      activesupport (= 7.1.5.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
     active_record_query_trace (1.8)
-    activejob (7.1.5.2)
-      activesupport (= 7.1.5.2)
+    activejob (7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.5.2)
-      activesupport (= 7.1.5.2)
-    activerecord (7.1.5.2)
-      activemodel (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    activemodel (7.1.5.1)
+      activesupport (= 7.1.5.1)
+    activerecord (7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       timeout (>= 0.4.0)
     activerecord-import (2.1.0)
       activerecord (>= 4.2)
-    activestorage (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    activestorage (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       marcel (~> 1.0)
-    activesupport (7.1.5.2)
+    activesupport (7.1.5.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -126,8 +126,6 @@ GEM
       jbuilder (~> 2)
       rails (>= 4.2, < 7.2)
       selectize-rails (~> 0.6)
-    ai-agents (0.4.3)
-      ruby_llm (~> 1.3)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
@@ -155,10 +153,10 @@ GEM
     barnes (0.0.9)
       multi_json (~> 1)
       statsd-ruby (~> 1.1)
-    base64 (0.3.0)
+    base64 (0.2.0)
     bcrypt (3.1.20)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
@@ -194,14 +192,10 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    datadog (2.19.0)
-      datadog-ruby_core_source (~> 3.4, >= 3.4.1)
-      libdatadog (~> 18.1.0.1.0)
-      libddwaf (~> 1.24.1.0.3)
-      logger
-      msgpack
-    datadog-ruby_core_source (3.4.1)
     date (3.4.1)
+    ddtrace (0.48.0)
+      ffi (~> 1.0)
+      msgpack
     debug (1.8.0)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
@@ -212,11 +206,6 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (6.1.0)
-      activesupport (>= 7.0, < 8.1)
-      devise (~> 4.0)
-      railties (>= 7.0, < 8.1)
-      rotp (~> 6.0)
     devise_token_auth (1.2.5)
       bcrypt (~> 3.0)
       devise (> 3.5.2, < 5)
@@ -224,7 +213,7 @@ GEM
     diff-lcs (1.5.1)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    docile (1.4.1)
+    docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (3.1.2)
@@ -235,35 +224,6 @@ GEM
       addressable (~> 2.8)
     drb (2.2.3)
     dry-cli (1.1.0)
-    dry-configurable (1.3.0)
-      dry-core (~> 1.1)
-      zeitwerk (~> 2.6)
-    dry-core (1.1.0)
-      concurrent-ruby (~> 1.0)
-      logger
-      zeitwerk (~> 2.6)
-    dry-inflector (1.2.0)
-    dry-initializer (3.2.0)
-    dry-logic (1.6.0)
-      bigdecimal
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 1.1)
-      zeitwerk (~> 2.6)
-    dry-schema (1.14.1)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 1.0, >= 1.0.1)
-      dry-core (~> 1.1)
-      dry-initializer (~> 3.2)
-      dry-logic (~> 1.5)
-      dry-types (~> 1.8)
-      zeitwerk (~> 2.6)
-    dry-types (1.8.3)
-      bigdecimal (~> 3.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0)
-      dry-inflector (~> 1.0)
-      dry-logic (~> 1.4)
-      zeitwerk (~> 2.6)
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
     elastic-apm (4.6.2)
@@ -292,7 +252,7 @@ GEM
       logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-mashify (1.0.0)
+    faraday-mashify (0.1.1)
       faraday (~> 2.0)
       hashie
     faraday-multipart (1.0.4)
@@ -304,16 +264,6 @@ GEM
       net-http-persistent (~> 4.0)
     faraday-retry (2.2.1)
       faraday (~> 2.0)
-    faraday_middleware-aws-sigv4 (1.0.1)
-      aws-sigv4 (~> 1.0)
-      faraday (>= 2.0, < 3)
-    fast-mcp (1.5.0)
-      addressable (~> 2.8)
-      base64
-      dry-schema (~> 1.14)
-      json (~> 2.0)
-      mime-types (~> 3.4)
-      rack (~> 3.1)
     fcm (1.0.8)
       faraday (>= 1.0.0, < 3.0)
       googleauth (~> 1)
@@ -409,7 +359,6 @@ GEM
     grpc (1.72.0-x86_64-linux)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
-    gserver (0.0.1)
     haikunator (1.1.1)
     hairtrigger (1.0.0)
       activerecord (>= 6.0, < 8)
@@ -452,7 +401,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.13.2)
+    json (2.12.0)
     json_refs (0.1.8)
       hana
     json_schemer (0.2.24)
@@ -494,16 +443,6 @@ GEM
       logger (~> 1.6)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
-    libdatadog (18.1.0.1.0)
-    libdatadog (18.1.0.1.0-x86_64-linux)
-    libddwaf (1.24.1.0.3)
-      ffi (~> 1.0)
-    libddwaf (1.24.1.0.3-arm64-darwin)
-      ffi (~> 1.0)
-    libddwaf (1.24.1.0.3-x86_64-darwin)
-      ffi (~> 1.0)
-    libddwaf (1.24.1.0.3-x86_64-linux)
-      ffi (~> 1.0)
     line-bot-api (1.28.0)
     lint_roller (1.1.0)
     liquid (5.4.0)
@@ -538,7 +477,7 @@ GEM
     mime-types-data (3.2023.0218.1)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.9)
+    mini_portile2 (2.8.8)
     minitest (5.25.5)
     mock_redis (0.36.0)
       ruby2_keywords
@@ -569,14 +508,14 @@ GEM
     newrelic_rpm (9.6.0)
       base64
     nio4r (2.7.3)
-    nokogiri (1.18.9)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.9-arm64-darwin)
+    nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-darwin)
+    nokogiri (1.18.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-gnu)
+    nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -591,15 +530,11 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    octokit (10.0.0)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
     oj (3.16.10)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    omniauth (2.1.3)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
-      logger
       rack (>= 2.2.3)
       rack-protection
     omniauth-google-oauth2 (1.1.3)
@@ -613,12 +548,6 @@ GEM
     omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    omniauth-saml (2.2.4)
-      omniauth (~> 2.1)
-      ruby-saml (~> 1.18)
-    opensearch-ruby (3.4.0)
-      faraday (>= 1.0, < 3)
-      multi_json (>= 1.0)
     openssl (3.2.0)
     orm_adapter (0.5.0)
     os (1.1.4)
@@ -647,7 +576,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.2.3)
+    rack (2.2.15)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-contrib (2.5.0)
@@ -656,34 +585,33 @@ GEM
       rack (>= 2.0.0)
     rack-mini-profiler (3.2.0)
       rack (>= 1.2.0)
-    rack-protection (4.1.1)
+    rack-protection (3.2.0)
       base64 (>= 0.1.0)
-      logger (>= 1.6.0)
-      rack (>= 3.0.0, < 4)
+      rack (~> 2.2, >= 2.2.4)
     rack-proxy (0.7.7)
       rack
-    rack-session (2.1.1)
-      base64 (>= 0.1.0)
-      rack (>= 3.0.0)
+    rack-session (1.0.2)
+      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rackup (2.2.1)
-      rack (>= 3)
-    rails (7.1.5.2)
-      actioncable (= 7.1.5.2)
-      actionmailbox (= 7.1.5.2)
-      actionmailer (= 7.1.5.2)
-      actionpack (= 7.1.5.2)
-      actiontext (= 7.1.5.2)
-      actionview (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activemodel (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    rackup (1.0.1)
+      rack (< 3)
+      webrick
+    rails (7.1.5.1)
+      actioncable (= 7.1.5.1)
+      actionmailbox (= 7.1.5.1)
+      actionmailer (= 7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actiontext (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       bundler (>= 1.15.0)
-      railties (= 7.1.5.2)
+      railties (= 7.1.5.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -691,9 +619,9 @@ GEM
     rails-html-sanitizer (1.6.1)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    railties (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -730,8 +658,7 @@ GEM
     retriable (3.1.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.4.4)
-    rotp (6.3.0)
+    rexml (3.4.1)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.2)
@@ -786,25 +713,12 @@ GEM
       faraday (>= 1)
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
-    ruby-saml (1.18.1)
-      nokogiri (>= 1.13.10)
-      rexml
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     ruby2ruby (2.5.0)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_llm (1.5.1)
-      base64
-      event_stream_parser (~> 1)
-      faraday (>= 1.10.0)
-      faraday-multipart (>= 1)
-      faraday-net_http (>= 1)
-      faraday-retry (>= 1)
-      marcel (~> 1.0)
-      zeitwerk (~> 2)
-    ruby_llm-schema (0.1.0)
     ruby_parser (3.20.0)
       sexp_processor (~> 4.16)
     sass (3.7.4)
@@ -820,16 +734,10 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
     scout_apm (5.3.3)
       parser
     scss_lint (0.60.0)
       sass (~> 3.5, >= 3.5.5)
-    searchkick (5.5.2)
-      activemodel (>= 7.1)
-      hashie
     securerandom (0.4.1)
     seed_dump (3.3.1)
       activerecord (>= 4)
@@ -868,22 +776,18 @@ GEM
       fugit (~> 1.8)
       globalid (>= 1.0.1)
       sidekiq (>= 6)
-    sidekiq_alive (2.5.0)
-      gserver (~> 0.0.1)
-      sidekiq (>= 5, < 9)
     signet (0.17.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simplecov (0.22.0)
+    simplecov (0.17.1)
       docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.2)
-    simplecov_json_formatter (0.1.4)
-    slack-ruby-client (2.7.0)
-      faraday (>= 2.0.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    slack-ruby-client (2.5.2)
+      faraday (>= 2.0)
       faraday-mashify
       faraday-multipart
       gli
@@ -910,11 +814,7 @@ GEM
     stripe (8.5.0)
     telephone_number (1.4.20)
     test-prof (1.2.1)
-    thor (1.4.0)
-    tidewave (0.2.0)
-      fast-mcp (~> 1.5.0)
-      rack (>= 2.0)
-      rails (>= 7.1.0)
+    thor (1.3.1)
     tilt (2.3.0)
     time_diff (0.3.0)
       activesupport
@@ -941,7 +841,7 @@ GEM
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uniform_notifier (1.17.0)
-    uri (1.0.4)
+    uri (1.0.3)
     uri_template (0.7.0)
     valid_email2 (5.2.6)
       activemodel (>= 3.2)
@@ -968,6 +868,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.1)
     websocket-driver (0.7.7)
       base64
       websocket-extensions (>= 0.1.0)
@@ -996,7 +897,6 @@ DEPENDENCIES
   administrate (>= 0.20.1)
   administrate-field-active_storage (>= 1.0.3)
   administrate-field-belongs_to_search (>= 0.9.0)
-  ai-agents (>= 0.4.3)
   annotate
   attr_extras
   audited (~> 5.4, >= 5.4.1)
@@ -1013,11 +913,10 @@ DEPENDENCIES
   commonmarker
   csv-safe
   database_cleaner
-  datadog (~> 2.0)
+  ddtrace
   debug (~> 1.8)
   devise (>= 4.9.4)
   devise-secure_password!
-  devise-two-factor (>= 5.0.0)
   devise_token_auth (>= 1.2.3)
   dotenv-rails (>= 3.0.0)
   down
@@ -1026,7 +925,6 @@ DEPENDENCIES
   facebook-messenger
   factory_bot_rails (>= 6.4.3)
   faker
-  faraday_middleware-aws-sigv4
   fcm
   flag_shih_tzu
   foreman
@@ -1063,13 +961,10 @@ DEPENDENCIES
   net-smtp (~> 0.3.4)
   newrelic-sidekiq-metrics (>= 1.6.2)
   newrelic_rpm
-  octokit
   omniauth (>= 2.1.2)
   omniauth-google-oauth2 (>= 1.1.3)
   omniauth-oauth2
   omniauth-rails_csrf_protection (~> 1.0, >= 1.0.2)
-  omniauth-saml
-  opensearch-ruby
   pg
   pg_search
   pgvector
@@ -1095,10 +990,8 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rspec
   ruby-openai
-  ruby_llm-schema
   scout_apm
   scss_lint
-  searchkick
   seed_dump
   sentry-rails (>= 5.19.0)
   sentry-ruby
@@ -1107,10 +1000,8 @@ DEPENDENCIES
   shoulda-matchers
   sidekiq (>= 7.3.1)
   sidekiq-cron (>= 1.12.0)
-  sidekiq_alive
-  simplecov (>= 0.21)
-  simplecov_json_formatter
-  slack-ruby-client (~> 2.7.0)
+  simplecov (= 0.17.1)
+  slack-ruby-client (~> 2.5.2)
   spring
   spring-watcher-listen
   squasher
@@ -1118,7 +1009,6 @@ DEPENDENCIES
   stripe
   telephone_number
   test-prof
-  tidewave
   time_diff
   twilio-ruby
   twitty (~> 0.1.5)

Rakefile

@@ -2,8 +2,5 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require_relative 'config/application'
-# Load Enterprise Edition rake tasks if they exist
-enterprise_tasks_path = Rails.root.join('enterprise/tasks_railtie.rb').to_s
-require enterprise_tasks_path if File.exist?(enterprise_tasks_path)
 
 Rails.application.load_tasks

VERSION_CW

@@ -1 +1 @@
-4.4.0
+3.13.0

VERSION_CWCTL

@@ -1 +1 @@
-3.4.3
+3.2.0

app/actions/contact_identify_action.rb

@@ -6,7 +6,6 @@
 # We don't want to update the name of the identified original contact.
 
 class ContactIdentifyAction
-  include UrlHelper
   pattr_initialize [:contact!, :params!, { retain_original_contact_name: false, discard_invalid_attrs: false }]
 
   def perform
@@ -105,14 +104,7 @@ class ContactIdentifyAction
     # TODO: replace reject { |_k, v| v.blank? } with compact_blank when rails is upgraded
     @contact.discard_invalid_attrs if discard_invalid_attrs
     @contact.save!
-    enqueue_avatar_job
-  end
-
-  def enqueue_avatar_job
-    return unless params[:avatar_url].present? && !@contact.avatar.attached?
-    return unless url_valid?(params[:avatar_url])
-
-    Avatar::AvatarFromUrlJob.perform_later(@contact, params[:avatar_url])
+    Avatar::AvatarFromUrlJob.perform_later(@contact, params[:avatar_url]) if params[:avatar_url].present? && !@contact.avatar.attached?
   end
 
   def merge_contact(base_contact, merge_contact)

app/builders/agent_builder.rb

@@ -52,5 +52,3 @@ class AgentBuilder
     }.compact))
   end
 end
-
-AgentBuilder.prepend_mod_with('AgentBuilder')

app/builders/contact_inbox_builder.rb

@@ -21,6 +21,8 @@ class ContactInboxBuilder
       email_source_id
     when 'Channel::Sms'
       phone_source_id
+    when 'Channel::Voice'
+      phone_source_id # Voice uses phone number as source ID
     when 'Channel::Api', 'Channel::WebWidget'
       SecureRandom.uuid
     else
@@ -35,7 +37,12 @@ class ContactInboxBuilder
   end
 
   def phone_source_id
-    raise ActionController::ParameterMissing, 'contact phone number' unless @contact.phone_number
+    unless @contact.phone_number.present?
+      # For voice channels, we'll create a fallback source ID if phone number is missing
+      return SecureRandom.uuid if @inbox.channel_type == 'Channel::Voice'
+
+      raise ActionController::ParameterMissing, 'contact phone number'
+    end
 
     @contact.phone_number
   end
@@ -100,6 +107,6 @@ class ContactInboxBuilder
   end
 
   def allowed_channels?
-    @inbox.email? || @inbox.sms? || @inbox.twilio? || @inbox.whatsapp?
+    @inbox.email? || @inbox.sms? || @inbox.twilio? || @inbox.whatsapp? || @inbox.channel_type == 'Channel::Voice'
   end
 end

app/builders/email/base_builder.rb

@@ -1,54 +0,0 @@
-class Email::BaseBuilder
-  pattr_initialize [:inbox!]
-
-  private
-
-  def channel
-    @channel ||= inbox.channel
-  end
-
-  def account
-    @account ||= inbox.account
-  end
-
-  def conversation
-    @conversation ||= message.conversation
-  end
-
-  def custom_sender_name
-    message&.sender&.available_name || I18n.t('conversations.reply.email.header.notifications')
-  end
-
-  def sender_name(sender_email)
-    # Friendly: <agent_name> from <business_name>
-    # Professional: <business_name>
-    if inbox.friendly?
-      I18n.t(
-        'conversations.reply.email.header.friendly_name',
-        sender_name: custom_sender_name,
-        business_name: business_name,
-        from_email: sender_email
-      )
-    else
-      I18n.t(
-        'conversations.reply.email.header.professional_name',
-        business_name: business_name,
-        from_email: sender_email
-      )
-    end
-  end
-
-  def business_name
-    inbox.business_name || inbox.sanitized_name
-  end
-
-  def account_support_email
-    # Parse the email to ensure it's in the correct format, the user
-    # can save it in the format "Name <email@domain.com>"
-    parse_email(account.support_email)
-  end
-
-  def parse_email(email_string)
-    Mail::Address.new(email_string).address
-  end
-end

app/builders/email/from_builder.rb

@@ -1,51 +0,0 @@
-class Email::FromBuilder < Email::BaseBuilder
-  pattr_initialize [:inbox!, :message!]
-
-  def build
-    return sender_name(account_support_email) unless inbox.email?
-
-    from_email = case email_channel_type
-                 when :standard_imap_smtp,
-                      :google_oauth,
-                      :microsoft_oauth,
-                      :forwarding_own_smtp
-                   channel.email
-                 when :imap_chatwoot_smtp,
-                      :forwarding_chatwoot_smtp
-                   channel.verified_for_sending ? channel.email : account_support_email
-                 else
-                   account_support_email
-                 end
-
-    sender_name(from_email)
-  end
-
-  private
-
-  def email_channel_type
-    return :google_oauth if channel.google?
-    return :microsoft_oauth if channel.microsoft?
-    return :standard_imap_smtp if imap_and_smtp_enabled?
-    return :imap_chatwoot_smtp if imap_enabled_without_smtp?
-    return :forwarding_own_smtp if forwarding_with_own_smtp?
-    return :forwarding_chatwoot_smtp if forwarding_without_smtp?
-
-    :unknown
-  end
-
-  def imap_and_smtp_enabled?
-    channel.imap_enabled && channel.smtp_enabled
-  end
-
-  def imap_enabled_without_smtp?
-    channel.imap_enabled && !channel.smtp_enabled
-  end
-
-  def forwarding_with_own_smtp?
-    !channel.imap_enabled && channel.smtp_enabled
-  end
-
-  def forwarding_without_smtp?
-    !channel.imap_enabled && !channel.smtp_enabled
-  end
-end

app/builders/email/reply_to_builder.rb

@@ -1,21 +0,0 @@
-class Email::ReplyToBuilder < Email::BaseBuilder
-  pattr_initialize [:inbox!, :message!]
-
-  def build
-    reply_to = if inbox.email?
-                 channel.email
-               elsif inbound_email_enabled?
-                 "reply+#{conversation.uuid}@#{account.inbound_email_domain}"
-               else
-                 account_support_email
-               end
-
-    sender_name(reply_to)
-  end
-
-  private
-
-  def inbound_email_enabled?
-    account.feature_enabled?('inbound_emails') && account.inbound_email_domain.present?
-  end
-end

app/builders/messages/message_builder.rb

@@ -7,8 +7,7 @@ class Messages::MessageBuilder
     @private = params[:private] || false
     @conversation = conversation
     @user = user
-    @account = conversation.account
-    @message_type = params[:message_type] || 'outgoing'
+    @message_type = params[:message_type].to_s || 'outgoing'
     @attachments = params[:attachments]
     @automation_rule = content_attributes&.dig(:automation_rule_id)
     return unless params.instance_of?(ActionController::Parameters)
@@ -21,9 +20,6 @@ class Messages::MessageBuilder
     @message = @conversation.messages.build(message_params)
     process_attachments
     process_emails
-    # When the message has no quoted content, it will just be rendered as a regular message
-    # The frontend is equipped to handle this case
-    process_email_content if @account.feature_enabled?(:quoted_email_reply)
     @message.save!
     @message
   end
@@ -37,11 +33,6 @@ class Messages::MessageBuilder
   def content_attributes
     params = convert_to_hash(@params)
     content_attributes = params.fetch(:content_attributes, {})
-
-    return parse_json(content_attributes) if content_attributes.is_a?(String)
-    return content_attributes if content_attributes.is_a?(Hash)
-
-    {}
   end
 
   # Converts the given object to a hash.
@@ -96,14 +87,6 @@ class Messages::MessageBuilder
     @message.content_attributes[:to_emails] = to_emails
   end
 
-  def process_email_content
-    return unless should_process_email_content?
-
-    @message.content_attributes ||= {}
-    email_attributes = build_email_attributes
-    @message.content_attributes[:email] = email_attributes
-  end
-
   def process_email_string(email_string)
     return [] if email_string.blank?
 
@@ -117,8 +100,9 @@ class Messages::MessageBuilder
   end
 
   def message_type
-    if @conversation.inbox.channel_type != 'Channel::Api' && @message_type == 'incoming'
-      raise StandardError, 'Incoming messages are only allowed in Api inboxes'
+    # Allow incoming messages in both API and Voice channels
+    if !['Channel::Api', 'Channel::Voice'].include?(@conversation.inbox.channel_type) && @message_type == 'incoming'
+      raise StandardError, 'Incoming messages are only allowed in Api and Voice inboxes'
     end
 
     @message_type
@@ -151,7 +135,7 @@ class Messages::MessageBuilder
   end
 
   def message_params
-    {
+    message_attrs = {
       account_id: @conversation.account_id,
       inbox_id: @conversation.inbox_id,
       message_type: message_type,
@@ -164,72 +148,12 @@ class Messages::MessageBuilder
       echo_id: @params[:echo_id],
       source_id: @params[:source_id]
     }.merge(external_created_at).merge(automation_rule_id).merge(campaign_id).merge(template_params)
+    
+    # Directly add content_attributes from params if present
+    if @params[:content_attributes].present?
+      message_attrs[:content_attributes] = content_attributes
+    end
+    
+    message_attrs
   end
-
-  def email_inbox?
-    @conversation.inbox&.inbox_type == 'Email'
-  end
-
-  def should_process_email_content?
-    email_inbox? && !@private && @message.content.present?
-  end
-
-  def build_email_attributes
-    email_attributes = ensure_indifferent_access(@message.content_attributes[:email] || {})
-    normalized_content = normalize_email_body(@message.content)
-
-    # Use custom HTML content if provided, otherwise generate from message content
-    email_attributes[:html_content] = if custom_email_content_provided?
-                                        build_custom_html_content
-                                      else
-                                        build_html_content(normalized_content)
-                                      end
-
-    email_attributes[:text_content] = build_text_content(normalized_content)
-    email_attributes
-  end
-
-  def build_html_content(normalized_content)
-    html_content = ensure_indifferent_access(@message.content_attributes.dig(:email, :html_content) || {})
-    rendered_html = render_email_html(normalized_content)
-    html_content[:full] = rendered_html
-    html_content[:reply] = rendered_html
-    html_content
-  end
-
-  def build_text_content(normalized_content)
-    text_content = ensure_indifferent_access(@message.content_attributes.dig(:email, :text_content) || {})
-    text_content[:full] = normalized_content
-    text_content[:reply] = normalized_content
-    text_content
-  end
-
-  def ensure_indifferent_access(hash)
-    return {} if hash.blank?
-
-    hash.respond_to?(:with_indifferent_access) ? hash.with_indifferent_access : hash
-  end
-
-  def normalize_email_body(content)
-    content.to_s.gsub("\r\n", "\n")
-  end
-
-  def render_email_html(content)
-    return '' if content.blank?
-
-    ChatwootMarkdownRenderer.new(content).render_message.to_s
-  end
-
-  def custom_email_content_provided?
-    @params[:email_html_content].present?
-  end
-
-  def build_custom_html_content
-    html_content = ensure_indifferent_access(@message.content_attributes.dig(:email, :html_content) || {})
-
-    html_content[:full] = @params[:email_html_content]
-    html_content[:reply] = @params[:email_html_content]
-
-    html_content
-  end
-end
+end

app/builders/v2/reports/base_summary_builder.rb

@@ -10,28 +10,10 @@ class V2::Reports::BaseSummaryBuilder
 
   def load_data
     @conversations_count = fetch_conversations_count
-    load_reporting_events_data
-  end
-
-  def load_reporting_events_data
-    # Extract the column name for indexing (e.g., 'conversations.team_id' -> 'team_id')
-    index_key = group_by_key.to_s.split('.').last
-
-    results = reporting_events
-              .select(
-                "#{group_by_key} as #{index_key}",
-                "COUNT(CASE WHEN name = 'conversation_resolved' THEN 1 END) as resolved_count",
-                "AVG(CASE WHEN name = 'conversation_resolved' THEN #{average_value_key} END) as avg_resolution_time",
-                "AVG(CASE WHEN name = 'first_response' THEN #{average_value_key} END) as avg_first_response_time",
-                "AVG(CASE WHEN name = 'reply_time' THEN #{average_value_key} END) as avg_reply_time"
-              )
-              .group(group_by_key)
-              .index_by { |record| record.public_send(index_key) }
-
-    @resolved_count = results.transform_values(&:resolved_count)
-    @avg_resolution_time = results.transform_values(&:avg_resolution_time)
-    @avg_first_response_time = results.transform_values(&:avg_first_response_time)
-    @avg_reply_time = results.transform_values(&:avg_reply_time)
+    @resolved_count = fetch_resolved_count
+    @avg_resolution_time = fetch_average_time('conversation_resolved')
+    @avg_first_response_time = fetch_average_time('first_response')
+    @avg_reply_time = fetch_average_time('reply_time')
   end
 
   def reporting_events
@@ -42,6 +24,14 @@ class V2::Reports::BaseSummaryBuilder
     # Override this method
   end
 
+  def fetch_average_time(event_name)
+    get_grouped_average(reporting_events.where(name: event_name))
+  end
+
+  def fetch_resolved_count
+    reporting_events.where(name: 'conversation_resolved').group(group_by_key).count
+  end
+
   def group_by_key
     # Override this method
   end
@@ -50,6 +40,10 @@ class V2::Reports::BaseSummaryBuilder
     # Override this method
   end
 
+  def get_grouped_average(events)
+    events.group(group_by_key).average(average_value_key)
+  end
+
   def average_value_key
     ActiveModel::Type::Boolean.new.cast(params[:business_hours]).present? ? :value_in_business_hours : :value
   end

app/builders/v2/reports/inbox_summary_builder.rb

@@ -13,7 +13,10 @@ class V2::Reports::InboxSummaryBuilder < V2::Reports::BaseSummaryBuilder
 
   def load_data
     @conversations_count = fetch_conversations_count
-    load_reporting_events_data
+    @resolved_count = fetch_resolved_count
+    @avg_resolution_time = fetch_average_time('conversation_resolved')
+    @avg_first_response_time = fetch_average_time('first_response')
+    @avg_reply_time = fetch_average_time('reply_time')
   end
 
   def fetch_conversations_count

app/builders/v2/reports/label_summary_builder.rb

@@ -28,7 +28,7 @@ class V2::Reports::LabelSummaryBuilder < V2::Reports::BaseSummaryBuilder
 
     {
       conversation_counts: fetch_conversation_counts(conversation_filter),
-      resolved_counts: fetch_resolved_counts,
+      resolved_counts: fetch_resolved_counts(conversation_filter),
       resolution_metrics: fetch_metrics(conversation_filter, 'conversation_resolved', use_business_hours),
       first_response_metrics: fetch_metrics(conversation_filter, 'first_response', use_business_hours),
       reply_metrics: fetch_metrics(conversation_filter, 'reply_time', use_business_hours)
@@ -62,21 +62,10 @@ class V2::Reports::LabelSummaryBuilder < V2::Reports::BaseSummaryBuilder
     fetch_counts(conversation_filter)
   end
 
-  def fetch_resolved_counts
-    # Count resolution events, not conversations currently in resolved status
-    # Filter by reporting_event.created_at, not conversation.created_at
-    reporting_event_filter = { name: 'conversation_resolved', account_id: account.id }
-    reporting_event_filter[:created_at] = range if range.present?
-
-    ReportingEvent
-      .joins(conversation: { taggings: :tag })
-      .where(
-        reporting_event_filter.merge(
-          taggings: { taggable_type: 'Conversation', context: 'labels' }
-        )
-      )
-      .group('tags.name')
-      .count
+  def fetch_resolved_counts(conversation_filter)
+    # since the base query is ActsAsTaggableOn,
+    # the status :resolved won't automatically be converted to integer status
+    fetch_counts(conversation_filter.merge(status: Conversation.statuses[:resolved]))
   end
 
   def fetch_counts(conversation_filter)
@@ -95,7 +84,9 @@ class V2::Reports::LabelSummaryBuilder < V2::Reports::BaseSummaryBuilder
 
   def fetch_metrics(conversation_filter, event_name, use_business_hours)
     ReportingEvent
-      .joins(conversation: { taggings: :tag })
+      .joins('INNER JOIN conversations ON reporting_events.conversation_id = conversations.id')
+      .joins('INNER JOIN taggings ON taggings.taggable_id = conversations.id')
+      .joins('INNER JOIN tags ON taggings.tag_id = tags.id')
       .where(
         conversations: conversation_filter,
         name: event_name,

app/builders/v2/reports/timeseries/count_report_builder.rb

@@ -38,34 +38,27 @@ class V2::Reports::Timeseries::CountReportBuilder < V2::Reports::Timeseries::Bas
   end
 
   def scope_for_resolutions_count
-    scope.reporting_events.where(
+    scope.reporting_events.joins(:conversation).select(:conversation_id).where(
       name: :conversation_resolved,
-      account_id: account.id,
-      created_at: range
-    )
+      conversations: { status: :resolved }, created_at: range
+    ).distinct
   end
 
   def scope_for_bot_resolutions_count
-    scope.reporting_events.where(
+    scope.reporting_events.joins(:conversation).select(:conversation_id).where(
       name: :conversation_bot_resolved,
-      account_id: account.id,
-      created_at: range
-    )
+      conversations: { status: :resolved }, created_at: range
+    ).distinct
   end
 
   def scope_for_bot_handoffs_count
     scope.reporting_events.joins(:conversation).select(:conversation_id).where(
       name: :conversation_bot_handoff,
-      account_id: account.id,
       created_at: range
     ).distinct
   end
 
   def grouped_count
-    # IMPORTANT: time_zone parameter affects both data grouping AND output timestamps
-    # It converts timestamps to the target timezone before grouping, which means
-    # the same event can fall into different day buckets depending on timezone
-    # Example: 2024-01-15 00:00 UTC becomes 2024-01-14 16:00 PST (falls on different day)
     @grouped_values = object_scope.group_by_period(
       group_by,
       :created_at,

app/controllers/api/v1/accounts/assignment_policies/inboxes_controller.rb

@@ -1,20 +0,0 @@
-class Api::V1::Accounts::AssignmentPolicies::InboxesController < Api::V1::Accounts::BaseController
-  before_action :fetch_assignment_policy
-  before_action -> { check_authorization(AssignmentPolicy) }
-
-  def index
-    @inboxes = @assignment_policy.inboxes
-  end
-
-  private
-
-  def fetch_assignment_policy
-    @assignment_policy = Current.account.assignment_policies.find(
-      params[:assignment_policy_id]
-    )
-  end
-
-  def permitted_params
-    params.permit(:assignment_policy_id)
-  end
-end

app/controllers/api/v1/accounts/assignment_policies_controller.rb

@@ -1,36 +0,0 @@
-class Api::V1::Accounts::AssignmentPoliciesController < Api::V1::Accounts::BaseController
-  before_action :fetch_assignment_policy, only: [:show, :update, :destroy]
-  before_action :check_authorization
-
-  def index
-    @assignment_policies = Current.account.assignment_policies
-  end
-
-  def show; end
-
-  def create
-    @assignment_policy = Current.account.assignment_policies.create!(assignment_policy_params)
-  end
-
-  def update
-    @assignment_policy.update!(assignment_policy_params)
-  end
-
-  def destroy
-    @assignment_policy.destroy!
-    head :ok
-  end
-
-  private
-
-  def fetch_assignment_policy
-    @assignment_policy = Current.account.assignment_policies.find(params[:id])
-  end
-
-  def assignment_policy_params
-    params.require(:assignment_policy).permit(
-      :name, :description, :assignment_order, :conversation_priority,
-      :fair_distribution_limit, :fair_distribution_window, :enabled
-    )
-  end
-end

app/controllers/api/v1/accounts/callbacks_controller.rb

@@ -30,14 +30,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
   end
 
   def facebook_pages
-    pages = []
-    fb_pages = fb_object.get_connections('me', 'accounts')
-    pages.concat(fb_pages)
-    while fb_pages.respond_to?(:next_page) && (next_page = fb_pages.next_page)
-      fb_pages = next_page
-      pages.concat(fb_pages)
-    end
-    @page_details = mark_already_existing_facebook_pages(pages)
+    @page_details = mark_already_existing_facebook_pages(fb_object.get_connections('me', 'accounts'))
   end
 
   def set_instagram_id(page_access_token, facebook_channel)

app/controllers/api/v1/accounts/campaigns_controller.rb

@@ -29,6 +29,6 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
 
   def campaign_params
     params.require(:campaign).permit(:title, :description, :message, :enabled, :trigger_only_during_business_hours, :inbox_id, :sender_id,
-                                     :scheduled_at, audience: [:type, :id], trigger_rules: {}, template_params: {})
+                                     :scheduled_at, audience: [:type, :id], trigger_rules: {})
   end
 end

app/controllers/api/v1/accounts/channels/voice/webhooks_controller.rb

@@ -0,0 +1,152 @@
+class Api::V1::Accounts::Channels::Voice::WebhooksController < Api::V1::Accounts::BaseController
+  skip_before_action :authenticate_user!, :set_current_user, only: [:incoming, :conference_status]
+  protect_from_forgery with: :null_session, only: [:incoming, :conference_status]
+  before_action :validate_twilio_signature, only: [:incoming]
+  before_action :handle_options_request, only: [:incoming, :conference_status]
+  
+  # Handle CORS preflight OPTIONS requests
+  def handle_options_request
+    if request.method == "OPTIONS"
+      set_cors_headers
+      head :ok
+      return true
+    end
+    false
+  end
+  
+  def set_cors_headers
+    headers['Access-Control-Allow-Origin'] = '*'
+    headers['Access-Control-Allow-Methods'] = 'POST, OPTIONS'
+    headers['Access-Control-Allow-Headers'] = 'Content-Type, X-Twilio-Signature'
+    headers['Access-Control-Max-Age'] = '86400' # 24 hours
+  end
+
+  # Handle incoming calls from Twilio
+  def incoming
+    # Set CORS headers first to ensure they're included
+    set_cors_headers
+    
+    # Log basic request info
+    Rails.logger.info("🔔 INCOMING CALL WEBHOOK: CallSid=#{params['CallSid']} From=#{params['From']} To=#{params['To']}")
+    
+    # Process incoming call using service
+    begin
+      # Ensure account is set properly
+      if !Current.account && params[:account_id].present?
+        Current.account = Account.find(params[:account_id])
+        Rails.logger.info("👑 Set Current.account to #{Current.account.id}")
+      end
+      
+      # Validate required parameters
+      validate_incoming_params
+      
+      # Process the call
+      service = Voice::IncomingCallService.new(
+        account: Current.account, 
+        params: params.to_unsafe_h.merge(host_with_port: request.host_with_port)
+      )
+      twiml_response = service.process
+      
+      # Return TwiML response
+      Rails.logger.info("✅ INCOMING CALL: Successfully processed")
+      render xml: twiml_response
+    rescue StandardError => e
+      # Log the error with detailed information
+      Rails.logger.error("❌ INCOMING CALL ERROR: #{e.message}")
+      Rails.logger.error("❌ BACKTRACE: #{e.backtrace[0..5].join("\n")}")
+      
+      # Return friendly error message to caller
+      render_error("We're sorry, but we're experiencing technical difficulties. Please try your call again later.")
+    end
+  end
+
+  # Handle conference status updates
+  def conference_status
+    # Set CORS headers first to ensure they're always included
+    set_cors_headers
+    
+    # Return immediately for OPTIONS requests
+    if request.method == "OPTIONS"
+      return head :ok
+    end
+    
+    # Log basic request info
+    Rails.logger.info("🎧 CONFERENCE STATUS WEBHOOK: ConferenceSid=#{params['ConferenceSid']} Event=#{params['StatusCallbackEvent']}")
+    
+    # Process conference status updates using service
+    begin
+      # Set account for local development if needed
+      if !Current.account && params[:account_id].present?
+        Current.account = Account.find(params[:account_id])
+        Rails.logger.info("👑 Set Current.account to #{Current.account.id}")
+      end
+      
+      # Validate required parameters
+      if params['ConferenceSid'].blank? && params['CallSid'].blank?
+        Rails.logger.error("❌ MISSING REQUIRED PARAMS: Need either ConferenceSid or CallSid")
+      end
+      
+      # Use service to process conference status
+      service = Voice::ConferenceStatusService.new(account: Current.account, params: params)
+      service.process
+      
+      Rails.logger.info("✅ CONFERENCE STATUS: Successfully processed")
+    rescue StandardError => e
+      # Log errors but don't affect the response
+      Rails.logger.error("❌ CONFERENCE STATUS ERROR: #{e.message}")
+      Rails.logger.error("❌ BACKTRACE: #{e.backtrace[0..5].join("\n")}")
+    end
+    
+    # Always return a successful response for Twilio
+    head :ok
+  end
+
+  private
+
+  def validate_incoming_params
+    if params['CallSid'].blank?
+      raise "Missing required parameter: CallSid"
+    end
+    
+    if params['From'].blank?
+      raise "Missing required parameter: From"
+    end
+    
+    if params['To'].blank?
+      raise "Missing required parameter: To"
+    end
+    
+    if Current.account.nil?
+      raise "Current account not set"
+    end
+  end
+
+  def validate_twilio_signature
+    begin
+      validator = Voice::TwilioValidatorService.new(
+        account: Current.account,
+        params: params,
+        request: request
+      )
+      
+      if !validator.valid?
+        Rails.logger.error("❌ INVALID TWILIO SIGNATURE")
+        render_error('Invalid Twilio signature')
+        return false
+      end
+      
+      return true
+    rescue StandardError => e
+      Rails.logger.error("❌ TWILIO VALIDATION ERROR: #{e.message}")
+      render_error('Error validating Twilio request')
+      return false
+    end
+  end
+
+  def render_error(message)
+    response = Twilio::TwiML::VoiceResponse.new
+    response.say(message: message)
+    response.hangup
+    render xml: response.to_s
+  end
+end

app/controllers/api/v1/accounts/contacts/calls_controller.rb

@@ -0,0 +1,39 @@
+class Api::V1::Accounts::Contacts::CallsController < Api::V1::Accounts::BaseController
+  before_action :fetch_contact
+
+  def create
+    # Validate that contact has a phone number
+    if @contact.phone_number.blank?
+      render json: { error: 'Contact has no phone number' }, status: :unprocessable_entity
+      return
+    end
+
+    begin
+      # Use the outgoing call service to handle the entire process
+      service = Voice::OutgoingCallService.new(
+        account: Current.account,
+        contact: @contact,
+        user: Current.user
+      )
+      
+      # Process the call - this handles all the steps
+      conversation = service.process
+      
+      # Assign to @conversation so jbuilder template can access it
+      @conversation = conversation
+
+      # Use the conversation jbuilder template to ensure consistent representation
+      # This will ensure only display_id is used as the id, not the internal database id
+      render 'api/v1/accounts/conversations/show'
+    rescue StandardError => e
+      Rails.logger.error("Error initiating call: #{e.message}")
+      render json: { error: e.message }, status: :unprocessable_entity
+    end
+  end
+
+  private
+
+  def fetch_contact
+    @contact = Current.account.contacts.find(params[:contact_id])
+  end
+end

app/controllers/api/v1/accounts/contacts_controller.rb

@@ -17,8 +17,8 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   before_action :set_include_contact_inboxes, only: [:index, :active, :search, :filter, :show, :update]
 
   def index
+    @contacts_count = resolved_contacts.count
     @contacts = fetch_contacts(resolved_contacts)
-    @contacts_count = @contacts.total_count
   end
 
   def search
@@ -29,8 +29,8 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
         OR contacts.additional_attributes->>\'company_name\' ILIKE :search',
       search: "%#{params[:q].strip}%"
     )
+    @contacts_count = contacts.count
     @contacts = fetch_contacts(contacts)
-    @contacts_count = @contacts.total_count
   end
 
   def import
@@ -55,8 +55,8 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   def active
     contacts = Current.account.contacts.where(id: ::OnlineStatusTracker
                   .get_available_contact_ids(Current.account.id))
+    @contacts_count = contacts.count
     @contacts = fetch_contacts(contacts)
-    @contacts_count = @contacts.total_count
   end
 
   def show; end
@@ -122,7 +122,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   def resolved_contacts
     return @resolved_contacts if @resolved_contacts
 
-    @resolved_contacts = Current.account.contacts.resolved_contacts(use_crm_v2: Current.account.feature_enabled?('crm_v2'))
+    @resolved_contacts = Current.account.contacts.resolved_contacts
 
     @resolved_contacts = @resolved_contacts.tagged_with(params[:labels], any: true) if params[:labels].present?
     @resolved_contacts
@@ -133,14 +133,13 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   end
 
   def fetch_contacts(contacts)
-    # Build includes hash to avoid separate query when contact_inboxes are needed
-    includes_hash = { avatar_attachment: [:blob] }
-    includes_hash[:contact_inboxes] = { inbox: :channel } if @include_contact_inboxes
+    contacts_with_avatar = filtrate(contacts)
+                           .includes([{ avatar_attachment: [:blob] }])
+                           .page(@current_page).per(RESULTS_PER_PAGE)
 
-    filtrate(contacts)
-      .includes(includes_hash)
-      .page(@current_page)
-      .per(RESULTS_PER_PAGE)
+    return contacts_with_avatar.includes([{ contact_inboxes: [:inbox] }]) if @include_contact_inboxes
+
+    contacts_with_avatar
   end
 
   def build_contact_inbox

app/controllers/api/v1/accounts/conversations/base_controller.rb

@@ -5,6 +5,6 @@ class Api::V1::Accounts::Conversations::BaseController < Api::V1::Accounts::Base
 
   def conversation
     @conversation ||= Current.account.conversations.find_by!(display_id: params[:conversation_id])
-    authorize @conversation, :show?
+    authorize @conversation.inbox, :show?
   end
 end

app/controllers/api/v1/accounts/conversations_controller.rb

@@ -160,7 +160,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
 
   def conversation
     @conversation ||= Current.account.conversations.find_by!(display_id: params[:id])
-    authorize @conversation, :show?
+    authorize @conversation.inbox, :show?
   end
 
   def inbox

app/controllers/api/v1/accounts/inboxes/assignment_policies_controller.rb

@@ -1,46 +0,0 @@
-class Api::V1::Accounts::Inboxes::AssignmentPoliciesController < Api::V1::Accounts::BaseController
-  before_action :fetch_inbox
-  before_action :fetch_assignment_policy, only: [:create]
-  before_action -> { check_authorization(AssignmentPolicy) }
-  before_action :validate_assignment_policy, only: [:show, :destroy]
-
-  def show
-    @assignment_policy = @inbox.assignment_policy
-  end
-
-  def create
-    # There should be only one assignment policy for an inbox.
-    # If there is a new request to add an assignment policy, we will
-    # delete the old one and attach the new policy
-    remove_inbox_assignment_policy
-    @inbox_assignment_policy = @inbox.create_inbox_assignment_policy!(assignment_policy: @assignment_policy)
-    @assignment_policy = @inbox.assignment_policy
-  end
-
-  def destroy
-    remove_inbox_assignment_policy
-    head :ok
-  end
-
-  private
-
-  def remove_inbox_assignment_policy
-    @inbox.inbox_assignment_policy&.destroy
-  end
-
-  def fetch_inbox
-    @inbox = Current.account.inboxes.find(permitted_params[:inbox_id])
-  end
-
-  def fetch_assignment_policy
-    @assignment_policy = Current.account.assignment_policies.find(permitted_params[:assignment_policy_id])
-  end
-
-  def permitted_params
-    params.permit(:assignment_policy_id, :inbox_id)
-  end
-
-  def validate_assignment_policy
-    return render_not_found_error(I18n.t('errors.assignment_policy.not_found')) unless @inbox.assignment_policy
-  end
-end

app/controllers/api/v1/accounts/inboxes_controller.rb

@@ -4,8 +4,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   before_action :fetch_agent_bot, only: [:set_agent_bot]
   before_action :validate_limit, only: [:create]
   # we are already handling the authorization in fetch inbox
-  before_action :check_authorization, except: [:show, :health]
-  before_action :validate_whatsapp_cloud_channel, only: [:health]
+  before_action :check_authorization, except: [:show]
 
   def index
     @inboxes = policy_scope(Current.account.inboxes.order_by_name.includes(:channel, { avatar_attachment: [:blob] }))
@@ -70,23 +69,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     render status: :ok, json: { message: I18n.t('messages.inbox_deletetion_response') }
   end
 
-  def sync_templates
-    return render status: :unprocessable_entity, json: { error: 'Template sync is only available for WhatsApp channels' } unless whatsapp_channel?
-
-    trigger_template_sync
-    render status: :ok, json: { message: 'Template sync initiated successfully' }
-  rescue StandardError => e
-    render status: :internal_server_error, json: { error: e.message }
-  end
-
-  def health
-    health_data = Whatsapp::HealthService.new(@inbox.channel).fetch_health_status
-    render json: health_data
-  rescue StandardError => e
-    Rails.logger.error "[INBOX HEALTH] Error fetching health data: #{e.message}"
-    render json: { error: e.message }, status: :unprocessable_entity
-  end
-
   private
 
   def fetch_inbox
@@ -98,12 +80,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     @agent_bot = AgentBot.find(params[:agent_bot]) if params[:agent_bot]
   end
 
-  def validate_whatsapp_cloud_channel
-    return if @inbox.channel.is_a?(Channel::Whatsapp) && @inbox.channel.provider == 'whatsapp_cloud'
-
-    render json: { error: 'Health data only available for WhatsApp Cloud API channels' }, status: :bad_request
-  end
-
   def create_channel
     return unless allowed_channel_types.include?(permitted_params[:channel][:type])
 
@@ -187,7 +163,8 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
       'line' => Channel::Line,
       'telegram' => Channel::Telegram,
       'whatsapp' => Channel::Whatsapp,
-      'sms' => Channel::Sms
+      'sms' => Channel::Sms,
+      'voice' => Channel::Voice
     }[permitted_params[:channel][:type]]
   end
 
@@ -198,18 +175,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
       []
     end
   end
-
-  def whatsapp_channel?
-    @inbox.whatsapp? || (@inbox.twilio? && @inbox.channel.whatsapp?)
-  end
-
-  def trigger_template_sync
-    if @inbox.whatsapp?
-      Channels::Whatsapp::TemplatesSyncJob.perform_later(@inbox.channel)
-    elsif @inbox.twilio? && @inbox.channel.whatsapp?
-      Channels::Twilio::TemplatesSyncJob.perform_later(@inbox.channel)
-    end
-  end
 end
 
 Api::V1::Accounts::InboxesController.prepend_mod_with('Api::V1::Accounts::InboxesController')

app/controllers/api/v1/accounts/integrations/dyte_controller.rb

@@ -22,7 +22,7 @@ class Api::V1::Accounts::Integrations::DyteController < Api::V1::Accounts::BaseC
   private
 
   def authorize_request
-    authorize @conversation, :show?
+    authorize @conversation.inbox, :show?
   end
 
   def render_response(response)

app/controllers/api/v1/accounts/integrations/github_controller.rb

@@ -1,155 +0,0 @@
-class Api::V1::Accounts::Integrations::GithubController < Api::V1::Accounts::BaseController
-  before_action :fetch_hook
-  before_action :ensure_hook_exists, except: [:destroy]
-
-  def destroy
-    @hook.destroy!
-    head :ok
-  end
-
-  def repositories
-    repositories = github_service.repositories
-    filtered_repos = repositories.map do |repo|
-      {
-        full_name: repo[:full_name] || repo.full_name,
-        private: repo[:private] || repo.private
-      }
-    end
-    render json: filtered_repos
-  end
-
-  def search_repositories
-    repositories = github_service.search_repositories(params[:q])
-    filtered_repos = repositories.map do |repo|
-      {
-        full_name: repo[:full_name] || repo.full_name,
-        private: repo[:private] || repo.private
-      }
-    end
-    render json: filtered_repos
-  end
-
-  def assignees
-    assignees = github_service.assignees(repo_full_name)
-    filtered_assignees = assignees.map do |assignee|
-      {
-        login: assignee.login,
-        avatar_url: assignee.avatar_url
-      }
-    end
-    render json: filtered_assignees
-  end
-
-  def labels
-    labels = github_service.labels(repo_full_name)
-    filtered_labels = labels.map do |label|
-      {
-        name: label.name,
-        color: label.color
-      }
-    end
-    render json: filtered_labels
-  end
-
-  def search_issues
-    issues = github_service.search_issues(repo_full_name, params[:q])
-    filtered_issues = issues.map do |issue|
-      {
-        number: issue.number,
-        title: issue.title,
-        html_url: issue.html_url
-      }
-    end
-    render json: filtered_issues
-  end
-
-  def create_issue
-    issue_data = github_service.create_issue(
-      repo_full_name,
-      params[:title],
-      params[:body],
-      issue_options
-    )
-
-    github_issue = create_linked_issue(issue_data)
-    render json: issue_response(github_issue), status: :created
-  end
-
-  def link_issue
-    issue_data = github_service.issue(repo_full_name, params[:issue_number])
-    github_issue = create_linked_issue(issue_data)
-    render json: issue_response(github_issue), status: :created
-  end
-
-  def linked_issues
-    issues = GithubIssue.where(conversation_id: params[:conversation_id])
-
-    render json: issues.map do |issue|
-      {
-        id: issue.id,
-        issue_number: issue.issue_number,
-        title: issue.issue_title,
-        html_url: issue.html_url,
-        repo_full_name: issue.repo_full_name,
-        linked_by: {
-          id: issue.linked_by.id,
-          name: issue.linked_by.name
-        },
-        created_at: issue.created_at
-      }
-    end
-  end
-
-  def unlink_issue
-    github_issue = GithubIssue.find(params[:id])
-    github_issue.destroy!
-    head :ok
-  end
-
-  private
-
-  def fetch_hook
-    @hook = Integrations::Hook.where(account: Current.account).find_by(app_id: 'github')
-  end
-
-  def ensure_hook_exists
-    render json: { error: 'GitHub integration not configured' }, status: :unauthorized unless @hook
-  end
-
-  def github_service
-    @github_service ||= Github::GithubService.new(hook: @hook)
-  end
-
-  def repo_full_name
-    params[:repo_full_name] || "#{params[:owner]}/#{params[:repo]}"
-  end
-
-  def issue_options
-    options = {}
-    options[:assignees] = params[:assignees] if params[:assignees].present?
-    options[:labels] = params[:labels] if params[:labels].present?
-    options
-  end
-
-  def create_linked_issue(issue_data)
-    GithubIssue.create!(
-      conversation_id: params[:conversation_id],
-      account: Current.account,
-      repo_full_name: repo_full_name,
-      issue_number: issue_data.number,
-      issue_title: issue_data.title,
-      html_url: issue_data.html_url,
-      linked_by: Current.user
-    )
-  end
-
-  def issue_response(github_issue)
-    {
-      id: github_issue.id,
-      issue_number: github_issue.issue_number,
-      title: github_issue.issue_title,
-      html_url: github_issue.html_url,
-      repo_full_name: github_issue.repo_full_name
-    }
-  end
-end

app/controllers/api/v1/accounts/integrations/notion_controller.rb

@@ -11,4 +11,4 @@ class Api::V1::Accounts::Integrations::NotionController < Api::V1::Accounts::Bas
   def fetch_hook
     @hook = Integrations::Hook.where(account: Current.account).find_by(app_id: 'notion')
   end
-end
+end

app/controllers/api/v1/accounts/notion/authorizations_controller.rb

@@ -18,4 +18,4 @@ class Api::V1::Accounts::Notion::AuthorizationsController < Api::V1::Accounts::O
       render json: { success: false }, status: :unprocessable_entity
     end
   end
-end
+end

app/controllers/api/v1/accounts/portals_controller.rb

@@ -26,8 +26,9 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
       @portal.update!(portal_params.merge(live_chat_widget_params)) if params[:portal].present?
       # @portal.custom_domain = parsed_custom_domain
       process_attached_logo if params[:blob_id].present?
-    rescue ActiveRecord::RecordInvalid => e
-      render_record_invalid(e)
+    rescue StandardError => e
+      Rails.logger.error e
+      render json: { error: @portal.errors.messages }.to_json, status: :unprocessable_entity
     end
   end
 
@@ -46,20 +47,6 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
     head :ok
   end
 
-  def send_instructions
-    email = permitted_params[:email]
-    return render_could_not_create_error(I18n.t('portals.send_instructions.email_required')) if email.blank?
-    return render_could_not_create_error(I18n.t('portals.send_instructions.invalid_email_format')) unless valid_email?(email)
-    return render_could_not_create_error(I18n.t('portals.send_instructions.custom_domain_not_configured')) if @portal.custom_domain.blank?
-
-    PortalInstructionsMailer.send_cname_instructions(
-      portal: @portal,
-      recipient_email: email
-    ).deliver_later
-
-    render json: { message: I18n.t('portals.send_instructions.instructions_sent_successfully') }, status: :ok
-  end
-
   def process_attached_logo
     blob_id = params[:blob_id]
     blob = ActiveStorage::Blob.find_by(id: blob_id)
@@ -73,20 +60,19 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
   end
 
   def permitted_params
-    params.permit(:id, :email)
+    params.permit(:id)
   end
 
   def portal_params
     params.require(:portal).permit(
-      :id, :account_id, :color, :custom_domain, :header_text, :homepage_link,
+      :account_id, :color, :custom_domain, :header_text, :homepage_link,
       :name, :page_title, :slug, :archived, { config: [:default_locale, { allowed_locales: [] }] }
     )
   end
 
   def live_chat_widget_params
     permitted_params = params.permit(:inbox_id)
-    return {} unless permitted_params.key?(:inbox_id)
-    return { channel_web_widget_id: nil } if permitted_params[:inbox_id].blank?
+    return {} if permitted_params[:inbox_id].blank?
 
     inbox = Inbox.find(permitted_params[:inbox_id])
     return {} unless inbox.web_widget?
@@ -102,10 +88,4 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
     domain = URI.parse(@portal.custom_domain)
     domain.is_a?(URI::HTTP) ? domain.host : @portal.custom_domain
   end
-
-  def valid_email?(email)
-    ValidEmail2::Address.new(email).valid?
-  end
 end
-
-Api::V1::Accounts::PortalsController.prepend_mod_with('Api::V1::Accounts::PortalsController')

app/controllers/api/v1/accounts/voice/tokens_controller.rb

@@ -0,0 +1,80 @@
+class Api::V1::Accounts::Voice::TokensController < Api::V1::Accounts::BaseController
+  before_action :set_voice_inbox
+
+  def create
+    render json: build_response
+  rescue StandardError => e
+    Rails.logger.error("Voice::TokensController#create: #{e.class} - #{e.message}\n#{e.backtrace.first(5).join("\n")}")
+    render json: { error: 'Failed to generate token', details: e.message }, status: :internal_server_error
+  end
+
+  private
+
+  def build_response
+    {
+      token:          twilio_token.to_jwt,
+      identity:       client_identity,
+      voice_enabled:  true,
+      account_sid:    twilio_config[:account_sid],
+      agent_id:       Current.user.id,
+      account_id:     Current.account.id,
+      inbox_id:       @voice_inbox.id,
+      phone_number:   twilio_config[:phone_number],
+      twiml_endpoint: twilio_config[:twiml_url],
+      has_twiml_app:  twilio_config[:outgoing_app_sid].present?
+    }
+  end
+
+  def twilio_token
+    Twilio::JWT::AccessToken.new(
+      *twilio_credentials,
+      identity: client_identity,
+      ttl: 1.hour.to_i
+    ).tap { |t| t.add_grant(voice_grant) }
+  end
+
+  def twilio_credentials
+    twilio_config.values_at(:account_sid, :api_key_sid, :api_key_secret)
+  end
+
+  def voice_grant
+    Twilio::JWT::AccessToken::VoiceGrant.new.tap do |grant|
+      grant.incoming_allow = true
+      grant.outgoing_application_sid    = twilio_config[:outgoing_app_sid]
+      grant.outgoing_application_params = outgoing_params
+    end
+  end
+
+  def outgoing_params
+    {
+      account_id:  Current.account.id,
+      agent_id:    Current.user.id,
+      identity:    client_identity,
+      client_name: client_identity,
+      accountSid:  twilio_config[:account_sid],
+      is_agent:    'true'
+    }
+  end
+
+  def twilio_config
+    @twilio_config ||= begin
+      cfg = @voice_inbox.channel.provider_config_hash || {}
+      {
+        account_sid:      cfg['account_sid'],
+        api_key_sid:      cfg['api_key_sid'],
+        api_key_secret:   cfg['api_key_secret'],
+        outgoing_app_sid: cfg['outgoing_application_sid'],
+        phone_number:     @voice_inbox.channel.phone_number,
+        twiml_url:        "#{ENV.fetch('FRONTEND_URL', '')}/api/v1/accounts/#{Current.account.id}/voice/twiml_for_client"
+      }.with_indifferent_access.merge(client_identity:)
+    end
+  end
+
+  def client_identity
+    @client_identity ||= "agent-#{Current.user.id}-account-#{Current.account.id}"
+  end
+
+  def set_voice_inbox
+    @voice_inbox = Current.account.inboxes.find(params[:inbox_id])
+  end
+end

app/controllers/api/v1/accounts/voice_controller.rb

@@ -0,0 +1,230 @@
+require 'twilio-ruby'
+
+class Api::V1::Accounts::VoiceController < Api::V1::Accounts::BaseController
+  before_action :fetch_conversation, only: %i[end_call join_call reject_call]
+  skip_before_action :authenticate_user!, only: :twiml_for_client
+  protect_from_forgery with: :null_session, only: :twiml_for_client
+
+  before_action :render_options, if: -> { request.options? }
+  after_action  :set_cors_headers, if: -> { action_name == 'twiml_for_client' }
+
+  # ---------- PUBLIC ACTIONS --------------------------------------------------
+
+  def end_call
+    call_sid = params[:call_sid] || convo_attr('call_sid')
+    return render_not_found('active call') unless call_sid
+
+    twilio_client.calls(call_sid).update(status: 'completed') if in_progress?(call_sid)
+
+    Voice::CallStatus::Manager.new(conversation: @conversation,
+                                   call_sid:    call_sid,
+                                   provider:    :twilio)
+                              .process_status_update('completed', nil, false, "Call ended by #{current_user.name}")
+
+    broadcast_status(call_sid, 'completed')
+    render_success('Call successfully ended')
+  rescue StandardError => e
+    render_error("Failed to end call: #{e.message}")
+  end
+
+  def join_call
+    call_sid = params[:call_sid] || convo_attr('call_sid')
+    outbound  = convo_attr('requires_agent_join') == true
+
+    return render_not_found('active call') unless call_sid || outbound
+
+    conference_sid = convo_attr('conference_sid') || create_conference_sid!
+    update_join_metadata!(call_sid)
+    broadcast_status(call_sid, 'in-progress')
+
+    render json: {
+      status:         'success',
+      message:        'Agent joining call via WebRTC',
+      conference_sid: conference_sid,
+      using_webrtc:   true,
+      conversation_id: @conversation.display_id,
+      account_id:     Current.account.id
+    }
+  rescue StandardError => e
+    render_error("Failed to join call: #{e.message}")
+  end
+
+  def reject_call
+    call_sid = params[:call_sid] || convo_attr('call_sid')
+    return render_not_found('active call') unless call_sid
+
+    @conversation.update!(additional_attributes: convo_attrs.merge(
+      'agent_rejected' => true,
+      'rejected_at'    => Time.current.to_i,
+      'rejected_by'    => user_meta
+    ))
+
+    Voice::CallStatus::Manager.new(conversation: @conversation,
+                                   call_sid:    call_sid,
+                                   provider:    :twilio)
+                              .create_activity_message("#{current_user.name} declined to answer",
+                                                       rejected_by: current_user.name,
+                                                       rejected_at: Time.current.to_i)
+
+    render_success('Call rejected by agent')
+  end
+
+  def call_status
+    call_sid = params[:call_sid]
+    return render_not_found('active call') unless call_sid
+
+    call = twilio_client.calls(call_sid).fetch
+    render json: call.slice(:status, :duration, :direction, :from, :to, :start_time, :end_time)
+  rescue StandardError => e
+    render_error("Failed to fetch call status: #{e.message}")
+  end
+
+  # TwiML for agent WebRTC dial‑in
+  def twiml_for_client
+    to          = params[:To] || params[:to]
+    return render_twiml_error('Missing conference ID parameter') if to.blank?
+
+    render xml: build_twiml(to), content_type: 'text/xml'
+  rescue StandardError => e
+    render_twiml_error(e.message)
+  end
+
+  # ---------- PRIVATE ---------------------------------------------------------
+
+  private
+
+  # ---- Helpers ---------------------------------------------------------------
+
+  def render_options
+    head :ok
+  end
+
+  def set_cors_headers
+    headers['Content-Type']                 ||= 'text/xml; charset=utf-8'
+    headers['Access-Control-Allow-Origin']   = '*'
+    headers['Access-Control-Allow-Methods']  = 'POST, GET, OPTIONS'
+    headers['Access-Control-Allow-Headers']  = 'Content-Type, X-Twilio-Signature'
+    headers['Access-Control-Max-Age']        = '86400'
+  end
+
+  def render_success(msg) = render json: { status: 'success', message: msg }
+  def render_not_found(resource) = render json: { error: "No #{resource} found" }, status: :not_found
+  def render_error(msg) = render json: { error: msg }, status: :internal_server_error
+
+  def fetch_conversation
+    @conversation = Current.account.conversations.find_by(display_id: params[:conversation_id])
+  end
+
+  def twilio_client
+    @twilio_client ||= begin
+      cfg = @conversation.inbox.channel.provider_config_hash
+      Twilio::REST::Client.new(cfg['account_sid'], cfg['auth_token'])
+    end
+  end
+
+  def in_progress?(call_sid)
+    %w[in-progress ringing].include?(twilio_client.calls(call_sid).fetch.status)
+  end
+
+  def convo_attrs
+    @conversation.additional_attributes || {}
+  end
+
+  def convo_attr(key)
+    convo_attrs[key]
+  end
+
+  def user_meta
+    { id: current_user.id, name: current_user.name }
+  end
+
+  def create_conference_sid!
+    sid = "conf_account_#{Current.account.id}_conv_#{@conversation.display_id}"
+    @conversation.update!(additional_attributes: convo_attrs.merge('conference_sid' => sid))
+    sid
+  end
+
+  def update_join_metadata!(call_sid)
+    @conversation.update!(additional_attributes: convo_attrs.merge(
+      'agent_joined' => true,
+      'joined_at'    => Time.current.to_i,
+      'joined_by'    => user_meta,
+      'call_status'  => 'in-progress'
+    ))
+
+    Voice::CallStatus::Manager.new(conversation: @conversation,
+                                   call_sid:    call_sid,
+                                   provider:    :twilio)
+                              .process_status_update('in-progress', nil, false, "#{current_user.name} joined the call")
+  end
+
+  def broadcast_status(call_sid, status)
+    ActionCable.server.broadcast "account_#{@conversation.account_id}", {
+      event_name: 'call_status_changed',
+      data: {
+        call_sid:        call_sid,
+        status:          status,
+        conversation_id: @conversation.display_id,
+        inbox_id:        @conversation.inbox_id,
+        timestamp:       Time.current.to_i
+      }
+    }
+  end
+
+  # ---- TwiML -----------------------------------------------------------------
+
+  def build_twiml(conference_name)
+    # For agent legs, we need to add transcription too
+    account_id = params[:account_id] || Current.account&.id
+    agent_id = params[:agent_id] || current_user&.id
+    transcription_url = "#{base_url}/twilio/transcription_callback?account_id=#{account_id}&conference_sid=#{conference_name}&speaker_type=agent&agent_id=#{agent_id}"
+
+    Twilio::TwiML::VoiceResponse.new do |r|
+      # Add transcription for the agent leg too
+      r.start do |start|
+        start.transcription(
+          status_callback_url: transcription_url,
+          status_callback_method: 'POST',
+          track: 'inbound_track', # Use inbound_track consistently for conference calls
+          language_code: 'en-US'
+        )
+      end
+
+      r.dial do |dial|
+        dial.conference(
+          conference_name,
+          startConferenceOnEnter: true,
+          endConferenceOnExit:    true,
+          muted:                  false,
+          beep:                   false,
+          waitUrl:                '',
+          earlyMedia:             true,
+          statusCallback:         conference_callback_url,
+          statusCallbackEvent:    'start end join leave',
+          statusCallbackMethod:   'POST',
+          participantLabel:       "agent-#{params[:agent_id] || current_user&.id}"
+        )
+      end
+    end.to_s
+  end
+
+  def conference_callback_url
+    account_id = params[:account_id] || Current.account&.id
+    "#{base_url.chomp('/')}/api/v1/accounts/#{account_id}/channels/voice/webhooks/conference_status"
+  end
+
+  def base_url
+    ENV.fetch('FRONTEND_URL', '')
+  end
+
+  # ---- TwiML Error -----------------------------------------------------------
+
+  def render_twiml_error(message)
+    response = Twilio::TwiML::VoiceResponse.new do |r|
+      r.say(message: "Error: #{message}")
+      r.hangup
+    end
+    set_cors_headers
+    render xml: response.to_s, content_type: 'text/xml'
+  end
+end

app/controllers/api/v1/accounts/whatsapp/authorizations_controller.rb

@@ -1,77 +0,0 @@
-class Api::V1::Accounts::Whatsapp::AuthorizationsController < Api::V1::Accounts::BaseController
-  before_action :fetch_and_validate_inbox, if: -> { params[:inbox_id].present? }
-
-  # POST /api/v1/accounts/:account_id/whatsapp/authorization
-  # Handles both initial authorization and reauthorization
-  # If inbox_id is present in params, it performs reauthorization
-  def create
-    validate_embedded_signup_params!
-    channel = process_embedded_signup
-    render_success_response(channel.inbox)
-  rescue StandardError => e
-    render_error_response(e)
-  end
-
-  private
-
-  def process_embedded_signup
-    service = Whatsapp::EmbeddedSignupService.new(
-      account: Current.account,
-      params: params.permit(:code, :business_id, :waba_id, :phone_number_id).to_h.symbolize_keys,
-      inbox_id: params[:inbox_id]
-    )
-    service.perform
-  end
-
-  def fetch_and_validate_inbox
-    @inbox = Current.account.inboxes.find(params[:inbox_id])
-    validate_reauthorization_required
-  end
-
-  def validate_reauthorization_required
-    return if @inbox.channel.reauthorization_required? || can_upgrade_to_embedded_signup?
-
-    render json: {
-      success: false,
-      message: I18n.t('inbox.reauthorization.not_required')
-    }, status: :unprocessable_entity
-  end
-
-  def can_upgrade_to_embedded_signup?
-    channel = @inbox.channel
-    return false unless channel.provider == 'whatsapp_cloud'
-
-    true
-  end
-
-  def render_success_response(inbox)
-    response = {
-      success: true,
-      id: inbox.id,
-      name: inbox.name,
-      channel_type: 'whatsapp'
-    }
-    response[:message] = I18n.t('inbox.reauthorization.success') if params[:inbox_id].present?
-    render json: response
-  end
-
-  def render_error_response(error)
-    Rails.logger.error "[WHATSAPP AUTHORIZATION] Embedded signup error: #{error.message}"
-    Rails.logger.error error.backtrace.join("\n")
-    render json: {
-      success: false,
-      error: error.message
-    }, status: :unprocessable_entity
-  end
-
-  def validate_embedded_signup_params!
-    missing_params = []
-    missing_params << 'code' if params[:code].blank?
-    missing_params << 'business_id' if params[:business_id].blank?
-    missing_params << 'waba_id' if params[:waba_id].blank?
-
-    return if missing_params.empty?
-
-    raise ArgumentError, "Required parameters are missing: #{missing_params.join(', ')}"
-  end
-end

app/controllers/api/v1/profile/mfa_controller.rb

@@ -1,68 +0,0 @@
-class Api::V1::Profile::MfaController < Api::BaseController
-  before_action :check_mfa_feature_available
-  before_action :check_mfa_enabled, only: [:destroy, :backup_codes]
-  before_action :check_mfa_disabled, only: [:create, :verify]
-  before_action :validate_otp, only: [:verify, :backup_codes, :destroy]
-  before_action :validate_password, only: [:destroy]
-
-  def show; end
-
-  def create
-    mfa_service.enable_two_factor!
-  end
-
-  def verify
-    @backup_codes = mfa_service.verify_and_activate!
-  end
-
-  def destroy
-    mfa_service.disable_two_factor!
-  end
-
-  def backup_codes
-    @backup_codes = mfa_service.generate_backup_codes!
-  end
-
-  private
-
-  def mfa_service
-    @mfa_service ||= Mfa::ManagementService.new(user: current_user)
-  end
-
-  def check_mfa_enabled
-    render_could_not_create_error(I18n.t('errors.mfa.not_enabled')) unless current_user.mfa_enabled?
-  end
-
-  def check_mfa_feature_available
-    return if Chatwoot.mfa_enabled?
-
-    render json: {
-      error: I18n.t('errors.mfa.feature_unavailable')
-    }, status: :forbidden
-  end
-
-  def check_mfa_disabled
-    render_could_not_create_error(I18n.t('errors.mfa.already_enabled')) if current_user.mfa_enabled?
-  end
-
-  def validate_otp
-    authenticated = Mfa::AuthenticationService.new(
-      user: current_user,
-      otp_code: mfa_params[:otp_code]
-    ).authenticate
-
-    return if authenticated
-
-    render_could_not_create_error(I18n.t('errors.mfa.invalid_code'))
-  end
-
-  def validate_password
-    return if current_user.valid_password?(mfa_params[:password])
-
-    render_could_not_create_error(I18n.t('errors.mfa.invalid_credentials'))
-  end
-
-  def mfa_params
-    params.permit(:otp_code, :password)
-  end
-end

app/controllers/api/v1/widget/configs_controller.rb

@@ -9,7 +9,7 @@ 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')
   end
 
   def set_contact

app/controllers/concerns/access_token_auth_helper.rb

@@ -14,7 +14,6 @@ module AccessTokenAuthHelper
     ensure_access_token
     render_unauthorized('Invalid Access Token') && return if @access_token.blank?
 
-    # NOTE: This ensures that current_user is set and available for the rest of the controller actions
     @resource = @access_token.owner
     Current.user = @resource if allowed_current_user_type?(@resource)
   end

app/controllers/concerns/switch_locale.rb

@@ -4,28 +4,17 @@ module SwitchLocale
   private
 
   def switch_locale(&)
-    # Priority is for locale set in query string (mostly for widget/from js sdk)
+    # priority is for locale set in query string (mostly for widget/from js sdk)
     locale ||= params[:locale]
 
-    # Use the user's locale if available
-    locale ||= locale_from_user
-
-    # Use the locale from a custom domain if applicable
     locale ||= locale_from_custom_domain
-
     # if locale is not set in account, let's use DEFAULT_LOCALE env variable
     locale ||= ENV.fetch('DEFAULT_LOCALE', nil)
-
     set_locale(locale, &)
   end
 
   def switch_locale_using_account_locale(&)
-    # Get the locale from the user first
-    locale = locale_from_user
-
-    # Fallback to the account's locale if the user's locale is not set
-    locale ||= locale_from_account(@current_account)
-
+    locale = locale_from_account(@current_account)
     set_locale(locale, &)
   end
 
@@ -43,12 +32,6 @@ module SwitchLocale
     @portal.default_locale
   end
 
-  def locale_from_user
-    return unless @user
-
-    @user.ui_settings&.dig('locale')
-  end
-
   def set_locale(locale, &)
     safe_locale = validate_and_get_locale(locale)
     # Ensure locale won't bleed into other requests

app/controllers/dashboard_controller.rb

@@ -66,9 +66,7 @@ class DashboardController < ActionController::Base
       ENABLE_ACCOUNT_SIGNUP: GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false'),
       FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
       INSTAGRAM_APP_ID: GlobalConfigService.load('INSTAGRAM_APP_ID', ''),
-      FACEBOOK_API_VERSION: GlobalConfigService.load('FACEBOOK_API_VERSION', 'v18.0'),
-      WHATSAPP_APP_ID: GlobalConfigService.load('WHATSAPP_APP_ID', ''),
-      WHATSAPP_CONFIGURATION_ID: GlobalConfigService.load('WHATSAPP_CONFIGURATION_ID', ''),
+      FACEBOOK_API_VERSION: GlobalConfigService.load('FACEBOOK_API_VERSION', 'v17.0'),
       IS_ENTERPRISE: ChatwootApp.enterprise?,
       AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),
       GIT_SHA: GIT_HASH

app/controllers/devise_overrides/omniauth_callbacks_controller.rb

@@ -19,19 +19,6 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
     redirect_to login_page_url(email: encoded_email, sso_auth_token: @resource.generate_sso_auth_token)
   end
 
-  def sign_in_user_on_mobile
-    @resource.skip_confirmation! if confirmable_enabled?
-
-    # once the resource is found and verified
-    # we can just send them to the login page again with the SSO params
-    # that will log them in
-    encoded_email = ERB::Util.url_encode(@resource.email)
-    params = { email: encoded_email, sso_auth_token: @resource.generate_sso_auth_token }.to_query
-
-    mobile_deep_link_base = GlobalConfigService.load('MOBILE_DEEP_LINK_BASE', 'chatwootapp')
-    redirect_to "#{mobile_deep_link_base}://auth/saml?#{params}", allow_other_host: true
-  end
-
   def sign_up_user
     return redirect_to login_page_url(error: 'no-account-found') unless account_signup_allowed?
     return redirect_to login_page_url(error: 'business-account-only') unless validate_signup_email_is_business_domain?
@@ -60,8 +47,10 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
   end
 
   def get_resource_from_auth_hash # rubocop:disable Naming/AccessorMethodName
-    email = auth_hash.dig('info', 'email')
-    @resource = resource_class.from_email(email)
+    # find the user with their email instead of UID and token
+    @resource = resource_class.where(
+      email: auth_hash['info']['email']
+    ).first
   end
 
   def validate_signup_email_is_business_domain?
@@ -86,5 +75,3 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
     'user'
   end
 end
-
-DeviseOverrides::OmniauthCallbacksController.prepend_mod_with('DeviseOverrides::OmniauthCallbacksController')

app/controllers/devise_overrides/passwords_controller.rb

@@ -44,5 +44,3 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
     }, status: status
   end
 end
-
-DeviseOverrides::PasswordsController.prepend_mod_with('DeviseOverrides::PasswordsController')

app/controllers/devise_overrides/sessions_controller.rb

@@ -9,14 +9,14 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
   end
 
   def create
-    return handle_mfa_verification if mfa_verification_request?
-    return handle_sso_authentication if sso_authentication_request?
-
-    user = find_user_for_authentication
-    return handle_mfa_required(user) if user&.mfa_enabled?
-
-    # Only proceed with standard authentication if no MFA is required
-    super
+    # Authenticate user via the temporary sso auth token
+    if params[:sso_auth_token].present? && @resource.present?
+      authenticate_resource_with_sso_token
+      yield @resource if block_given?
+      render_create_success
+    else
+      super
+    end
   end
 
   def render_create_success
@@ -25,31 +25,6 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
 
   private
 
-  def find_user_for_authentication
-    return nil unless params[:email].present? && params[:password].present?
-
-    normalized_email = params[:email].strip.downcase
-    user = User.from_email(normalized_email)
-    return nil unless user&.valid_password?(params[:password])
-    return nil unless user.active_for_authentication?
-
-    user
-  end
-
-  def mfa_verification_request?
-    params[:mfa_token].present?
-  end
-
-  def sso_authentication_request?
-    params[:sso_auth_token].present? && @resource.present?
-  end
-
-  def handle_sso_authentication
-    authenticate_resource_with_sso_token
-    yield @resource if block_given?
-    render_create_success
-  end
-
   def login_page_url(error: nil)
     frontend_url = ENV.fetch('FRONTEND_URL', nil)
 
@@ -71,41 +46,6 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
     user = User.from_email(params[:email])
     @resource = user if user&.valid_sso_auth_token?(params[:sso_auth_token])
   end
-
-  def handle_mfa_required(user)
-    render json: {
-      mfa_required: true,
-      mfa_token: Mfa::TokenService.new(user: user).generate_token
-    }, status: :partial_content
-  end
-
-  def handle_mfa_verification
-    user = Mfa::TokenService.new(token: params[:mfa_token]).verify_token
-    return render_mfa_error('errors.mfa.invalid_token', :unauthorized) unless user
-
-    authenticated = Mfa::AuthenticationService.new(
-      user: user,
-      otp_code: params[:otp_code],
-      backup_code: params[:backup_code]
-    ).authenticate
-
-    return render_mfa_error('errors.mfa.invalid_code') unless authenticated
-
-    sign_in_mfa_user(user)
-  end
-
-  def sign_in_mfa_user(user)
-    @resource = user
-    @token = @resource.create_token
-    @resource.save!
-
-    sign_in(:user, @resource, store: false, bypass: false)
-    render_create_success
-  end
-
-  def render_mfa_error(message_key, status = :bad_request)
-    render json: { error: I18n.t(message_key) }, status: status
-  end
 end
 
 DeviseOverrides::SessionsController.prepend_mod_with('DeviseOverrides::SessionsController')

app/controllers/github/callbacks_controller.rb

@@ -1,160 +0,0 @@
-class Github::CallbacksController < ApplicationController
-  include Github::IntegrationHelper
-
-  def show
-    # Validate account context early for all flows that require it
-    account if params[:code].present?
-
-    if params[:installation_id].present? && params[:code].present?
-      # Both installation and OAuth code present - handle both
-      handle_installation_with_oauth
-    elsif params[:installation_id].present?
-      # Only installation_id present - redirect to OAuth
-      handle_installation
-    else
-      # Only OAuth code present - handle authorization
-      handle_authorization
-    end
-  rescue StandardError => e
-    Rails.logger.error("Github callback error: #{e.message}")
-    redirect_to fallback_redirect_uri
-  end
-
-  private
-
-  def handle_installation_with_oauth
-    # Handle both installation and OAuth in one go
-    installation_id = params[:installation_id]
-
-    @response = oauth_client.auth_code.get_token(
-      params[:code],
-      redirect_uri: "#{base_url}/github/callback"
-    )
-
-    handle_response(installation_id)
-  end
-
-  def handle_installation
-    if params[:setup_action] == 'install'
-      installation_id = params[:installation_id]
-
-      redirect_to build_oauth_url(installation_id)
-    else
-      Rails.logger.error("Unknown setup_action: #{params[:setup_action]}")
-      redirect_to github_integration_settings_url
-    end
-  end
-
-  def handle_authorization
-    @response = oauth_client.auth_code.get_token(
-      params[:code],
-      redirect_uri: "#{base_url}/github/callback"
-    )
-
-    handle_response
-  end
-
-  def build_oauth_url(installation_id)
-    GlobalConfigService.load('GITHUB_CLIENT_ID', nil)
-
-    # Store installation_id in session for later use
-    session[:github_installation_id] = installation_id
-
-    # For now, redirect to a page that will initiate OAuth with proper account context
-    # This is a temporary solution until we have a proper account-agnostic setup
-    "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/1/settings/integrations/github?setup_action=install&installation_id=#{installation_id}"
-  end
-
-  def oauth_client
-    app_id = GlobalConfigService.load('GITHUB_CLIENT_ID', nil)
-    app_secret = GlobalConfigService.load('GITHUB_CLIENT_SECRET', nil)
-
-    OAuth2::Client.new(
-      app_id,
-      app_secret,
-      {
-        site: 'https://github.com',
-        token_url: '/login/oauth/access_token',
-        authorize_url: '/login/oauth/authorize'
-      }
-    )
-  end
-
-  def handle_response(installation_id = nil)
-    settings = build_hook_settings(installation_id)
-    hook = create_integration_hook(settings)
-    hook.save!
-
-    cleanup_session_data
-    redirect_to github_redirect_uri
-  rescue StandardError => e
-    Rails.logger.error("Github callback error: #{e.message}")
-    redirect_to fallback_redirect_uri
-  end
-
-  def build_hook_settings(installation_id)
-    settings = {
-      token_type: parsed_body['token_type'],
-      scope: parsed_body['scope']
-    }
-
-    settings[:installation_id] = installation_id || session[:github_installation_id]
-    settings.compact
-  end
-
-  def create_integration_hook(settings)
-    account.hooks.new(
-      access_token: parsed_body['access_token'],
-      status: 'enabled',
-      app_id: 'github',
-      settings: settings
-    )
-  end
-
-  def cleanup_session_data
-    session.delete(:github_installation_id)
-  end
-
-  def account
-    @account ||= account_from_state
-  end
-
-  def account_from_state
-    raise ActionController::BadRequest, 'Missing state variable' if params[:state].blank?
-
-    # Try signed GlobalID first (installation flow)
-    account = GlobalID::Locator.locate_signed(params[:state])
-    return account if account
-
-    # Fallback to JWT token (direct OAuth flow)
-    account_id = verify_github_token(params[:state])
-    return Account.find(account_id) if account_id
-
-    raise 'Invalid or expired state'
-  rescue StandardError
-    raise ActionController::BadRequest, 'Invalid account context'
-  end
-
-  def github_redirect_uri
-    "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{account.id}/settings/integrations/github"
-  end
-
-  def github_integration_settings_url
-    "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/1/settings/integrations/github"
-  end
-
-  def fallback_redirect_uri
-    github_redirect_uri
-  rescue StandardError
-    # Fallback if no account context available
-    "#{ENV.fetch('FRONTEND_URL', nil)}/app/settings/integrations"
-  end
-
-  def parsed_body
-    @parsed_body ||= @response.response.parsed
-  end
-
-  def base_url
-    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
-  end
-end

app/controllers/microsoft_controller.rb

@@ -2,7 +2,7 @@ class MicrosoftController < ApplicationController
   after_action :set_version_header
 
   def identity_association
-    microsoft_identity
+    microsoft_indentity
   end
 
   private
@@ -11,7 +11,7 @@ class MicrosoftController < ApplicationController
     response.headers['Content-Length'] = { associatedApplications: [{ applicationId: @identity_json }] }.to_json.length
   end
 
-  def microsoft_identity
+  def microsoft_indentity
     @identity_json = GlobalConfigService.load('AZURE_APP_ID', nil)
   end
 end

app/controllers/notion/callbacks_controller.rb

@@ -33,4 +33,4 @@ class Notion::CallbacksController < OauthCallbackController
   def notion_redirect_uri
     "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{account.id}/settings/integrations/notion"
   end
-end
+end

app/controllers/platform/api/v1/accounts_controller.rb

@@ -1,11 +1,4 @@
 class Platform::Api::V1::AccountsController < PlatformController
-  def index
-    @resources = @platform_app.platform_app_permissibles
-                              .where(permissible_type: 'Account')
-                              .includes(:permissible)
-                              .map(&:permissible)
-  end
-
   def show; end
 
   def create

app/controllers/public/api/v1/inboxes/conversations_controller.rb

@@ -3,7 +3,7 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
   before_action :set_conversation, only: [:toggle_typing, :update_last_seen, :show, :toggle_status]
 
   def index
-    @conversations = @contact_inbox.hmac_verified? ? @contact_inbox.contact.conversations : @contact_inbox.conversations
+    @conversations = @contact_inbox.hmac_verified? ? @contact.conversations : @contact_inbox.conversations
   end
 
   def show; end

app/controllers/public/api/v1/portals/base_controller.rb

@@ -58,6 +58,6 @@ class Public::Api::V1::Portals::BaseController < PublicController
   end
 
   def set_global_config
-    @global_config = GlobalConfig.get('LOGO_THUMBNAIL', 'BRAND_NAME', 'BRAND_URL', 'INSTALLATION_NAME')
+    @global_config = GlobalConfig.get('LOGO_THUMBNAIL', 'BRAND_NAME', 'BRAND_URL')
   end
 end

app/controllers/slack_uploads_controller.rb

@@ -17,12 +17,7 @@ class SlackUploadsController < ApplicationController
   end
 
   def blob_url
-    # Only generate representations for images
-    if @blob.content_type.start_with?('image/')
-      url_for(@blob.representation(resize_to_fill: [250, nil]))
-    else
-      url_for(@blob)
-    end
+    url_for(@blob.representation(resize_to_fill: [250, nil]))
   end
 
   def avatar_url

app/controllers/super_admin/app_configs_controller.rb

@@ -39,11 +39,8 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
       'email' => ['MAILER_INBOUND_EMAIL_DOMAIN'],
       'linear' => %w[LINEAR_CLIENT_ID LINEAR_CLIENT_SECRET],
       'slack' => %w[SLACK_CLIENT_ID SLACK_CLIENT_SECRET],
-      '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],
-      'github' => %w[GITHUB_CLIENT_ID GITHUB_CLIENT_SECRET]
+      'instagram' => %w[INSTAGRAM_APP_ID INSTAGRAM_APP_SECRET INSTAGRAM_VERIFY_TOKEN INSTAGRAM_API_VERSION ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT]
     }
 
     @allowed_configs = mapping.fetch(@config, %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS])

app/controllers/super_admin/application_controller.rb

@@ -7,9 +7,8 @@
 class SuperAdmin::ApplicationController < Administrate::ApplicationController
   include ActionView::Helpers::TagHelper
   include ActionView::Context
-  include SuperAdmin::NavigationHelper
 
-  helper_method :render_vue_component, :settings_open?, :settings_pages
+  helper_method :render_vue_component
   # authenticiation done via devise : SuperAdmin Model
   before_action :authenticate_super_admin!
 

app/controllers/super_admin/users_controller.rb

@@ -13,11 +13,11 @@ class SuperAdmin::UsersController < SuperAdmin::ApplicationController
       redirect_to new_super_admin_user_path, notice: notice
     end
   end
-
-  def update
-    requested_resource.skip_reconfirmation! if resource_params[:confirmed_at].present?
-    super
-  end
+  #
+  # def update
+  #   super
+  #   send_foo_updated_email(requested_resource)
+  # end
 
   # Override this method to specify custom lookup behavior.
   # This will be used to set the resource for the `show`, `edit`, and `update`

app/controllers/survey/responses_controller.rb

@@ -5,6 +5,6 @@ class Survey::ResponsesController < ActionController::Base
   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')
   end
 end

app/controllers/twilio/callback_controller.rb

@@ -30,8 +30,7 @@ class Twilio::CallbackController < ApplicationController
       :NumMedia,
       :Latitude,
       :Longitude,
-      :MessageType,
-      :ProfileName
+      :MessageType
     )
   end
 end

app/controllers/twilio/recording_controller.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+class Twilio::RecordingController < ActionController::Base
+  skip_forgery_protection
+
+  # POST /twilio/recording_callback
+  # This endpoint is called by Twilio when a call recording is available
+  def recording_callback
+    conference_sid = params['conference_sid']
+    call_sid = params['CallSid']
+    recording_url = params['RecordingUrl']
+    recording_sid = params['RecordingSid']
+    account_id = params['account_id']
+    Rails.logger.info("[Twilio::RecordingController] Incoming recording_callback with params: #{params.inspect}")
+    unless recording_url && account_id && (conference_sid || call_sid)
+      Rails.logger.warn("[Twilio::RecordingController] Missing required params. recording_url: #{recording_url}, account_id: #{account_id}, conference_sid: #{conference_sid}, call_sid: #{call_sid}")
+      return head :bad_request
+    end
+
+    # Find the account
+    account = Account.find_by(id: account_id)
+    unless account
+      Rails.logger.warn("[Twilio::RecordingController] Account not found for id: #{account_id}")
+      return head :not_found
+    end
+
+    # Prefer lookup by conference_sid (most robust for conference recordings)
+    conversation = if conference_sid
+      account.conversations.find_by("additional_attributes ->> 'conference_sid' = ?", conference_sid)
+    elsif call_sid
+      account.conversations.find_by("additional_attributes ->> 'call_sid' = ?", call_sid)
+    end
+    unless conversation
+      Rails.logger.warn("[Twilio::RecordingController] Conversation not found for conference_sid: #{conference_sid} or call_sid: #{call_sid}")
+      return head :not_found
+    end
+
+    # Find the original voice call message (should be unique per conference)
+    message = conversation.messages.voice_call.order(:created_at).first
+    unless message
+      Rails.logger.warn("[Twilio::RecordingController] No voice_call message found in conversation_id: #{conversation.id}")
+      return head :not_found
+    end
+
+    # Download the recording from Twilio
+    begin
+      Rails.logger.info("[Twilio::RecordingController] Downloading recording from: #{recording_url}.mp3")
+      file = URI.open(recording_url + '.mp3')
+    rescue => e
+      Rails.logger.error("[Twilio::RecordingController] Failed to download recording: #{e.message}")
+      return head :internal_server_error
+    end
+
+    # Attach the audio file to the message as an audio attachment
+    begin
+      att = message.attachments.create!(
+        account_id: account.id,
+        file: {
+          io: file,
+          filename: "twilio_recording_#{recording_sid}.mp3",
+          content_type: 'audio/mpeg'
+        },
+        file_type: :audio,
+        external_url: recording_url + '.mp3',
+        meta: { recording_sid: recording_sid, conference_sid: conference_sid, call_sid: call_sid }
+      )
+      Rails.logger.info("[Twilio::RecordingController] Successfully attached recording to message_id: #{message.id}, attachment_id: #{att.id}")
+    rescue => e
+      Rails.logger.error("[Twilio::RecordingController] Failed to attach recording: #{e.message}")
+      return head :internal_server_error
+    end
+
+    # Optionally, update message content_attributes to indicate recording is attached
+    content_attributes = message.content_attributes || {}
+    content_attributes['recording_attached'] = true
+    content_attributes['conference_sid'] = conference_sid if conference_sid
+    message.update!(content_attributes: content_attributes)
+
+    head :ok
+  end
+end

app/controllers/twilio/transcription_controller.rb

@@ -0,0 +1,62 @@
+class Twilio::TranscriptionController < ActionController::Base
+  skip_forgery_protection
+
+  # Receives real-time transcription updates from Twilio
+  def transcription_callback
+    # Set Current.account
+    Current.account = Account.find_by(id: params[:account_id])
+    
+    # Only process transcription content events
+    if params['TranscriptionEvent'] == 'transcription-content'
+      process_transcription_content
+    end
+
+    head :ok
+  end
+
+  private
+
+  def process_transcription_content
+    # Extract transcript content from JSON
+    data = JSON.parse(params['TranscriptionData'])
+    transcript_content = data['transcript']
+    confidence = data['confidence']
+  
+    
+    # Find conversation by conference_sid from our standard format
+    display_id = params[:conference_sid].match(/^conf_account_\d+_conv_(\d+)$/)[1]
+    conversation = Current.account.conversations.find_by(display_id: display_id)
+    
+    # Create message based on speaker_type
+    create_message(conversation, transcript_content, confidence)
+  end
+  
+  def create_message(conversation, content, confidence)
+    if params[:speaker_type] == 'contact'
+      # Contact message (incoming)
+      sender = conversation.contact
+      message_type = :incoming
+    else
+      # Agent message (outgoing)
+      sender = User.find_by(id: params[:agent_id])
+      message_type = :outgoing
+    end
+    
+    # Create the message
+    Messages::MessageBuilder.new(
+      sender,
+      conversation,
+      content: content,
+      message_type: message_type,
+      private: false,
+      additional_attributes: {
+        transcription: true,
+        call_sid: params['CallSid'],
+        conference_sid: params[:conference_sid],
+        speaker_type: params[:speaker_type],
+        confidence: confidence,
+        track: params['Track']
+      }
+    ).perform
+  end
+end

app/controllers/twilio/voice_controller.rb

@@ -0,0 +1,189 @@
+class Twilio::VoiceController < ActionController::Base
+  skip_forgery_protection
+
+  before_action :set_call_details, only: %i[status_callback simple_twiml]
+  before_action :set_inbox,        only: %i[status_callback simple_twiml]
+
+ 
+  def status_callback
+    return head :ok unless @inbox
+
+    conversation = Voice::ConversationFinderService.new(
+      account:      @inbox.account,
+      call_sid:     @call_sid,
+      phone_number: incoming_number,
+      is_outbound:  outbound?,
+      inbox:        @inbox
+    ).perform
+
+    Voice::CallStatus::Manager.new(
+      conversation: conversation,
+      call_sid:     @call_sid,
+      provider:     :twilio
+    ).process_status_update(params[:CallStatus], params[:CallDuration]&.to_i, first_status_response?)
+
+    head :ok
+  end
+
+  def simple_twiml
+    return fallback_twiml unless @inbox
+
+    conversation = Voice::ConversationFinderService.new(
+      account:      @inbox.account,
+      call_sid:     @call_sid,
+      phone_number: incoming_number,
+      is_outbound:  outbound?,
+      inbox:        @inbox
+    ).perform
+
+    Voice::CallStatus::Manager.new(
+      conversation: conversation,
+      call_sid:     @call_sid,
+      provider:     :twilio
+    ).process_status_update('in-progress', nil, true)
+
+    conference_name = ensure_conference_name(conversation, params[:conference_name])
+
+    conversation.update!(
+      additional_attributes: conversation.additional_attributes.merge(
+        'conference_sid'       => conference_name,
+        'call_direction'       => outbound? ? 'outbound' : 'inbound',
+        'requires_agent_join'  => true
+      )
+    )
+
+    render_twiml do |r|
+      r.say(message: 'Please wait while we connect you to an agent')
+
+      # Enable real-time transcription for this call leg
+      # For outbound calls, we're connecting to the contact, so this track is for the contact
+      contact_id = conversation.contact_id
+      callback_url = "#{base_url}/twilio/transcription_callback?account_id=#{@inbox.account_id}&conference_sid=#{conference_name}&speaker_type=contact&contact_id=#{contact_id}"
+      Rails.logger.info("📞 VoiceController: Setting transcription callback to: #{callback_url}")
+
+      r.start do |start|
+        start.transcription(
+          status_callback_url: callback_url,
+          status_callback_method: 'POST',
+          track: 'inbound_track',
+          language_code: 'en-US'
+        )
+      end
+
+      # Set up the conference
+      conference_callback_url = "#{base_url}/api/v1/accounts/#{@inbox.account_id}/channels/voice/webhooks/conference_status"
+      Rails.logger.info("📞 VoiceController: Setting conference callback to: #{conference_callback_url}")
+
+      r.dial do |d|
+        d.conference(
+          conference_name,
+          startConferenceOnEnter: false,
+          endConferenceOnExit:    true,
+          beep:                   false,
+          muted:                  false,
+          waitUrl:                '',
+          earlyMedia:             true,
+          statusCallback:         conference_callback_url,
+          statusCallbackMethod:   'POST',
+          statusCallbackEvent:    'start end join leave',
+          participantLabel:       "caller-#{@call_sid.last(8)}",
+          record:                 'record-from-start',
+          recording_status_callback: "#{base_url}/twilio/recording_callback?account_id=#{@inbox.account_id}&conference_sid=#{conference_name}",
+          recording_status_callback_method: 'POST'
+        )
+      end
+    end
+  rescue StandardError => e
+    Rails.logger.error("Error creating voice conversation: #{e.message}")
+    fallback_twiml
+  end
+
+  private
+
+  def set_call_details
+    @call_sid  = params[:CallSid]
+    @direction = params[:Direction]
+  end
+
+  def set_inbox
+    @inbox = find_inbox(outbound? ? params[:From] : params[:To])
+  end
+
+  def outbound?
+    @direction == 'outbound-api'
+  end
+
+  def incoming_number
+    outbound? ? params[:To] : params[:From]
+  end
+
+  def first_status_response?
+    params[:IsFirstResponseForStatus] == 'true'
+  end
+
+  def render_twiml(status: :ok)
+    response = Twilio::TwiML::VoiceResponse.new
+    yield response
+    render xml: response.to_s, status: status
+  end
+
+  def build_message(conversation, content)
+    Messages::MessageBuilder.new(
+      nil,
+      conversation,
+      content:               content,
+      message_type:          :activity,
+      additional_attributes: { call_sid: @call_sid, call_status: 'in-progress', user_input: true }
+    ).perform
+  end
+
+  def input_text
+    return "Caller pressed #{params[:Digits]}"           if params[:Digits].present?
+    return "Caller said: \"#{params[:SpeechResult]}\""   if params[:SpeechResult].present?
+
+    'Caller responded'
+  end
+
+  def ensure_conference_name(conversation, supplied)
+    name = supplied.presence ||
+           conversation.additional_attributes['conference_sid'] ||
+           conversation.additional_attributes['conference_name']
+
+    return name if name&.match?(/^conf_account_\d+_conv_\d+$/)
+
+    "conf_account_#{@inbox.account_id}_conv_#{conversation.display_id}"
+  end
+
+  def fallback_twiml
+    render_twiml do |r|
+      r.say(message: 'Hello from Chatwoot. This is a courtesy call to check on your recent signup.')
+      r.pause(length: 1)
+      r.say(message: 'We will connect you with an agent shortly.')
+      r.hangup
+    end
+  end
+
+  def base_url
+    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
+  end
+
+  def find_inbox(phone_number)
+    return nil if phone_number.blank?
+
+    Inbox.joins('INNER JOIN channel_voice ON channel_voice.account_id = inboxes.account_id AND inboxes.channel_id = channel_voice.id')
+         .find_by('channel_voice.phone_number = ?', phone_number)
+  end
+
+  def find_or_create_conversation(inbox, phone_number, call_sid)
+    Voice::ConversationFinderService.new(
+      account:      inbox.account,
+      call_sid:     call_sid,
+      phone_number: phone_number,
+      is_outbound:  false,
+      inbox:        inbox
+    ).perform
+  rescue StandardError => e
+    Rails.logger.error("find_or_create_conversation error: #{e.message}")
+    nil
+  end
+end

app/controllers/webhooks/instagram_controller.rb

@@ -4,16 +4,7 @@ class Webhooks::InstagramController < ActionController::API
   def events
     Rails.logger.info('Instagram webhook received events')
     if params['object'].casecmp('instagram').zero?
-      entry_params = params.to_unsafe_hash[:entry]
-
-      if contains_echo_event?(entry_params)
-        # Add delay to prevent race condition where echo arrives before send message API completes
-        # This avoids duplicate messages when echo comes early during API processing
-        ::Webhooks::InstagramEventsJob.set(wait: 2.seconds).perform_later(entry_params)
-      else
-        ::Webhooks::InstagramEventsJob.perform_later(entry_params)
-      end
-
+      ::Webhooks::InstagramEventsJob.perform_later(params.to_unsafe_hash[:entry])
       render json: :ok
     else
       Rails.logger.warn("Message is not received from the instagram webhook event: #{params['object']}")
@@ -23,16 +14,6 @@ class Webhooks::InstagramController < ActionController::API
 
   private
 
-  def contains_echo_event?(entry_params)
-    return false unless entry_params.is_a?(Array)
-
-    entry_params.any? do |entry|
-      # Check messaging array for echo events
-      messaging_events = entry[:messaging] || []
-      messaging_events.any? { |messaging| messaging.dig(:message, :is_echo).present? }
-    end
-  end
-
   def valid_token?(token)
     # Validates against both IG_VERIFY_TOKEN (Instagram channel via Facebook page) and
     # INSTAGRAM_VERIFY_TOKEN (Instagram channel via direct Instagram login)

app/controllers/widgets_controller.rb

@@ -14,7 +14,7 @@ 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')
   end
 
   def set_web_widget
@@ -70,12 +70,7 @@ class WidgetsController < ActionController::Base
   end
 
   def allow_iframe_requests
-    if @web_widget.allowed_domains.blank?
-      response.headers.delete('X-Frame-Options')
-    else
-      domains = @web_widget.allowed_domains.split(',').map(&:strip).join(' ')
-      response.headers['Content-Security-Policy'] = "frame-ancestors #{domains}"
-    end
+    response.headers.delete('X-Frame-Options')
   end
 end
 

app/dashboards/user_dashboard.rb

@@ -59,11 +59,11 @@ class UserDashboard < Administrate::BaseDashboard
   SHOW_PAGE_ATTRIBUTES = %i[
     id
     avatar_url
+    unconfirmed_email
     name
     type
     display_name
     email
-    unconfirmed_email
     created_at
     updated_at
     confirmed_at

app/dispatchers/async_dispatcher.rb

@@ -15,6 +15,7 @@ class AsyncDispatcher < BaseDispatcher
       CsatSurveyListener.instance,
       HookListener.instance,
       InstallationWebhookListener.instance,
+      MessageListener.instance,
       NotificationListener.instance,
       ParticipationListener.instance,
       ReportingEventListener.instance,

app/finders/email_channel_finder.rb

@@ -6,54 +6,19 @@ class EmailChannelFinder
   end
 
   def perform
-    channel_from_primary_recipients || channel_from_bcc_recipients
-  end
+    channel = nil
 
-  private
+    recipient_mails.each do |email|
+      normalized_email = normalize_email_with_plus_addressing(email)
+      channel = Channel::Email.find_by('lower(email) = ? OR lower(forward_to_email) = ?', normalized_email, normalized_email)
 
-  def channel_from_primary_recipients
-    primary_recipient_emails.each do |email|
-      channel = channel_from_email(email)
-      return channel if channel.present?
+      break if channel.present?
     end
-
-    nil
+    channel
   end
 
-  def channel_from_bcc_recipients
-    bcc_recipient_emails.each do |email|
-      channel = channel_from_email(email)
-
-      # Skip if BCC processing is disabled for this account
-      next if channel && !allow_bcc_processing?(channel.account_id)
-
-      return channel if channel.present?
-    end
-
-    nil
-  end
-
-  def primary_recipient_emails
-    (@email_object.to.to_a + @email_object.cc.to_a + [@email_object['X-Original-To'].try(:value)]).flatten.compact
-  end
-
-  def bcc_recipient_emails
-    @email_object.bcc.to_a.flatten.compact
-  end
-
-  def channel_from_email(email)
-    normalized_email = normalize_email_with_plus_addressing(email)
-    Channel::Email.find_by('lower(email) = ? OR lower(forward_to_email) = ?', normalized_email, normalized_email)
-  end
-
-  def bcc_processing_skipped_accounts
-    config_value = GlobalConfigService.load('SKIP_INCOMING_BCC_PROCESSING', '')
-    return [] if config_value.blank?
-
-    config_value.split(',').map(&:to_i)
-  end
-
-  def allow_bcc_processing?(account_id)
-    bcc_processing_skipped_accounts.exclude?(account_id)
+  def recipient_mails
+    recipient_addresses = @email_object.to.to_a + @email_object.cc.to_a + @email_object.bcc.to_a + [@email_object['X-Original-To'].try(:value)]
+    recipient_addresses.flatten.compact
   end
 end

app/finders/notification_finder.rb

@@ -15,13 +15,7 @@ class NotificationFinder
   end
 
   def unread_count
-    if type_included?('read')
-      # If we're including read notifications, filter to unread
-      @notifications.where(read_at: nil).count
-    else
-      # Already filtered to unread notifications, just count
-      @notifications.count
-    end
+    @notifications.where(read_at: nil).count
   end
 
   def count
@@ -33,7 +27,7 @@ class NotificationFinder
   def set_up
     find_all_notifications
     filter_snoozed_notifications
-    filter_read_notifications
+    fitler_read_notifications
   end
 
   def find_all_notifications
@@ -44,7 +38,7 @@ class NotificationFinder
     @notifications = @notifications.where(snoozed_until: nil) unless type_included?('snoozed')
   end
 
-  def filter_read_notifications
+  def fitler_read_notifications
     @notifications = @notifications.where(read_at: nil) unless type_included?('read')
   end
 

app/helpers/api/v1/inboxes_helper.rb

@@ -107,7 +107,8 @@ module Api::V1::InboxesHelper
       'line' => Current.account.line_channels,
       'telegram' => Current.account.telegram_channels,
       'whatsapp' => Current.account.whatsapp_channels,
-      'sms' => Current.account.sms_channels
+      'sms' => Current.account.sms_channels,
+      'voice' => Current.account.voice_channels
     }[permitted_params[:channel][:type]]
   end
 

app/helpers/github/integration_helper.rb

@@ -1,47 +0,0 @@
-module Github::IntegrationHelper
-  # Generates a signed JWT token for Github integration
-  #
-  # @param account_id [Integer] The account ID to encode in the token
-  # @return [String, nil] The encoded JWT token or nil if client secret is missing
-  def generate_github_token(account_id)
-    return if github_client_secret.blank?
-
-    JWT.encode(github_token_payload(account_id), github_client_secret, 'HS256')
-  rescue StandardError => e
-    Rails.logger.error("Failed to generate Github token: #{e.message}")
-    nil
-  end
-
-  def github_token_payload(account_id)
-    {
-      sub: account_id,
-      iat: Time.current.to_i
-    }
-  end
-
-  # Verifies and decodes a Github JWT token
-  #
-  # @param token [String] The JWT token to verify
-  # @return [Integer, nil] The account ID from the token or nil if invalid
-  def verify_github_token(token)
-    return if token.blank? || github_client_secret.blank?
-
-    github_decode_token(token, github_client_secret)
-  end
-
-  private
-
-  def github_client_secret
-    @github_client_secret ||= GlobalConfigService.load('GITHUB_CLIENT_SECRET', nil)
-  end
-
-  def github_decode_token(token, secret)
-    JWT.decode(token, secret, true, {
-                 algorithm: 'HS256',
-                 verify_expiration: true
-               }).first['sub']
-  rescue StandardError => e
-    Rails.logger.error("Unexpected error verifying Github token: #{e.message}")
-    nil
-  end
-end

app/helpers/portal_helper.rb

@@ -1,5 +1,4 @@
 module PortalHelper
-  include UrlHelper
   def set_og_image_url(portal_name, title)
     cdn_url = GlobalConfig.get('OG_IMAGE_CDN_URL')['OG_IMAGE_CDN_URL']
     return if cdn_url.blank?
@@ -75,17 +74,6 @@ module PortalHelper
     end
   end
 
-  def generate_portal_brand_url(brand_url, referer)
-    url = URI.parse(brand_url.to_s)
-    query_params = Rack::Utils.parse_query(url.query)
-    query_params['utm_medium'] = 'helpcenter'
-    query_params['utm_campaign'] = 'branding'
-    query_params['utm_source'] = URI.parse(referer).host if url_valid?(referer)
-
-    url.query = query_params.to_query
-    url.to_s
-  end
-
   def render_category_content(content)
     ChatwootMarkdownRenderer.new(content).render_markdown_to_plain_text
   end

app/helpers/report_helper.rb

@@ -53,13 +53,13 @@ module ReportHelper
   end
 
   def resolutions
-    scope.reporting_events.where(account_id: account.id, name: :conversation_resolved,
-                                 created_at: range)
+    scope.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_resolved,
+                                                                               conversations: { status: :resolved }, created_at: range).distinct
   end
 
   def bot_resolutions
-    scope.reporting_events.where(account_id: account.id, name: :conversation_bot_resolved,
-                                 created_at: range)
+    scope.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_resolved,
+                                                                               conversations: { status: :resolved }, created_at: range).distinct
   end
 
   def bot_handoffs

app/helpers/reporting_event_helper.rb

@@ -18,25 +18,12 @@ module ReportingEventHelper
   end
 
   def last_non_human_activity(conversation)
-    # Try to get either a handoff or reopened event first
-    # These will always take precedence over any other activity
-    # Also, any of these events can happen at any time in the course of a conversation lifecycle.
-    # So we pick the latest event
-    event = ReportingEvent.where(
-      conversation_id: conversation.id,
-      name: %w[conversation_bot_handoff conversation_opened]
-    ).order(event_end_time: :desc).first
+    # check if a handoff event already exists
+    handoff_event = ReportingEvent.where(conversation_id: conversation.id, name: 'conversation_bot_handoff').last
 
-    return event.event_end_time if event&.event_end_time
-
-    # Fallback to bot resolved event
-    # Because this will be closest to the most accurate activity instead of conversation.created_at
-    bot_event = ReportingEvent.where(conversation_id: conversation.id, name: 'conversation_bot_resolved').last
-
-    return bot_event.event_end_time if bot_event&.event_end_time
-
-    # If no events found, return conversation creation time
-    conversation.created_at
+    # if a handoff exists, last non human activity is when the handoff ended,
+    # otherwise it's when the conversation was created
+    handoff_event&.event_end_time || conversation.created_at
   end
 
   private

app/helpers/super_admin/navigation_helper.rb

@@ -1,16 +0,0 @@
-module SuperAdmin::NavigationHelper
-  def settings_open?
-    params[:controller].in? %w[super_admin/settings super_admin/app_configs]
-  end
-
-  def settings_pages
-    features = SuperAdmin::FeaturesHelper.available_features.select do |_feature, attrs|
-      attrs['config_key'].present? && attrs['enabled']
-    end
-
-    # Add general at the beginning
-    general_feature = [['general', { 'config_key' => 'general', 'name' => 'General' }]]
-
-    general_feature + features.to_a
-  end
-end

app/javascript/dashboard/App.vue

@@ -6,6 +6,7 @@ import NetworkNotification from './components/NetworkNotification.vue';
 import UpdateBanner from './components/app/UpdateBanner.vue';
 import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
 import PendingEmailVerificationBanner from './components/app/PendingEmailVerificationBanner.vue';
+import FloatingCallWidget from './components/widgets/FloatingCallWidget.vue';
 import vueActionCable from './helper/actionCable';
 import { useRouter } from 'vue-router';
 import { useStore } from 'dashboard/composables/store';
@@ -14,18 +15,20 @@ import { setColorTheme } from './helper/themeHelper';
 import { isOnOnboardingView } from 'v3/helpers/RouteHelper';
 import { useAccount } from 'dashboard/composables/useAccount';
 import { useFontSize } from 'dashboard/composables/useFontSize';
+import { useAlert } from 'dashboard/composables';
+import VoiceAPI from 'dashboard/api/channels/voice';
 import {
   registerSubscription,
   verifyServiceWorkerExistence,
 } from './helper/pushHelper';
 import ReconnectService from 'dashboard/helper/ReconnectService';
-import { useUISettings } from 'dashboard/composables/useUISettings';
 
 export default {
   name: 'App',
 
   components: {
     AddAccountModal,
+    FloatingCallWidget,
     LoadingState,
     NetworkNotification,
     UpdateBanner,
@@ -39,14 +42,12 @@ export default {
     const { accountId } = useAccount();
     // Use the font size composable (it automatically sets up the watcher)
     const { currentFontSize } = useFontSize();
-    const { uiSettings } = useUISettings();
 
     return {
       router,
       store,
       currentAccountId: accountId,
       currentFontSize,
-      uiSettings,
     };
   },
   data() {
@@ -54,6 +55,7 @@ export default {
       showAddAccountModal: false,
       latestChatwootVersion: null,
       reconnectService: null,
+      showCallWidget: false, // Will be set to true when calls are active
     };
   },
   computed: {
@@ -63,6 +65,10 @@ export default {
       currentUser: 'getCurrentUser',
       authUIFlags: 'getAuthUIFlags',
       accountUIFlags: 'accounts/getUIFlags',
+      activeCall: 'calls/getActiveCall',
+      hasActiveCall: 'calls/hasActiveCall',
+      incomingCall: 'calls/getIncomingCall',
+      hasIncomingCall: 'calls/hasIncomingCall',
     }),
     hasAccounts() {
       const { accounts = [] } = this.currentUser || {};
@@ -87,14 +93,34 @@ export default {
         }
       },
     },
+    hasIncomingCall: {
+      immediate: true,
+      handler(newVal) {
+        if (newVal) {
+          this.showCallWidget = true;
+        } else {
+          this.showCallWidget = false;
+        }
+      }
+    },
+    hasActiveCall: {
+      immediate: true,
+      handler(newVal) {
+        if (newVal) {
+          this.showCallWidget = true;
+        } else {
+          this.showCallWidget = false;
+        }
+      }
+    },
   },
   mounted() {
     this.initializeColorTheme();
     this.listenToThemeChanges();
-    // If user locale is set, use it; otherwise use account locale
-    this.setLocale(
-      this.uiSettings?.locale || window.chatwootConfig.selectedLocale
-    );
+    this.setLocale(window.chatwootConfig.selectedLocale);
+    
+    // Make app instance available globally for direct call widget updates
+    window.app = this;
   },
   unmounted() {
     if (this.reconnectService) {
@@ -112,6 +138,77 @@ export default {
     setLocale(locale) {
       this.$root.$i18n.locale = locale;
     },
+    handleCallEnded() {
+      this.showCallWidget = false;
+      this.$store.dispatch('calls/clearActiveCall');
+      this.$store.dispatch('calls/clearIncomingCall');
+      
+      // Clear the activeCallConversation state in all ContactInfo components
+      this.$nextTick(() => {
+        const clearContactInfoCallState = (components) => {
+          if (!components) return;
+          
+          components.forEach(component => {
+            if (component.$options && component.$options.name === 'ContactInfo') {
+              if (component.activeCallConversation) {
+                component.activeCallConversation = null;
+                component.$forceUpdate();
+              }
+            }
+            if (component.$children && component.$children.length) {
+              clearContactInfoCallState(component.$children);
+            }
+          });
+        };
+        
+        clearContactInfoCallState(this.$children);
+      });
+    },
+    handleCallJoined() {
+      this.showCallWidget = true;
+    },
+    handleCallRejected() {
+      this.showCallWidget = false;
+      this.$store.dispatch('calls/clearIncomingCall');
+    },
+    forceEndCall() {
+      this.showCallWidget = false;
+      if (window.forceEndCallHandlers) {
+        window.forceEndCallHandlers.forEach(handler => {
+          try {
+            handler();
+          } catch (e) {
+            // Optionally log error in production
+          }
+        });
+      }
+      if (this.activeCall && this.activeCall.callSid) {
+        const { callSid, conversationId } = this.activeCall;
+        const savedCallSid = callSid;
+        const savedConversationId = conversationId;
+        this.$store.dispatch('calls/clearActiveCall');
+        if (savedConversationId) {
+          VoiceAPI.endCall(savedCallSid, savedConversationId)
+            .then(() => {
+              useAlert({ message: 'Call ended successfully', type: 'success' });
+            })
+            .catch(() => {
+              setTimeout(() => {
+                VoiceAPI.endCall(savedCallSid, savedConversationId)
+                  .then(() => {
+                  })
+                  .catch(() => {
+                  });
+              }, 1000);
+              useAlert({ message: 'Call UI has been reset', type: 'info' });
+            });
+        } else {
+          useAlert({ message: 'Call ended', type: 'success' });
+        }
+      } else {
+        this.$store.dispatch('calls/clearActiveCall');
+      }
+    },
     async initializeAccount() {
       await this.$store.dispatch('accounts/get');
       this.$store.dispatch('setActiveAccount', {
@@ -120,8 +217,7 @@ export default {
       const { locale, latest_chatwoot_version: latestChatwootVersion } =
         this.getAccount(this.currentAccountId);
       const { pubsub_token: pubsubToken } = this.currentUser || {};
-      // If user locale is set, use it; otherwise use account locale
-      this.setLocale(this.uiSettings?.locale || locale);
+      this.setLocale(locale);
       this.latestChatwootVersion = latestChatwootVersion;
       vueActionCable.init(this.store, pubsubToken);
       this.reconnectService = new ReconnectService(this.store, this.router);
@@ -143,7 +239,8 @@ export default {
   <div
     v-if="!authUIFlags.isFetching && !accountUIFlags.isFetchingItem"
     id="app"
-    class="flex flex-col w-full h-screen min-h-0"
+    class="flex-grow-0 w-full h-full min-h-0 app-wrapper"
+    :class="{ 'app-rtl--wrapper': isRTL }"
     :dir="isRTL ? 'rtl' : 'ltr'"
   >
     <UpdateBanner :latest-chatwoot-version="latestChatwootVersion" />
@@ -159,6 +256,25 @@ export default {
     <AddAccountModal :show="showAddAccountModal" :has-accounts="hasAccounts" />
     <WootSnackbarBox />
     <NetworkNotification />
+    <!-- Floating call widget that appears during active calls -->
+    <FloatingCallWidget
+      v-if="showCallWidget || hasActiveCall || hasIncomingCall"
+      :key="activeCall ? activeCall.callSid : (incomingCall ? incomingCall.callSid : 'no-call')"
+      :call-sid="activeCall ? activeCall.callSid : (incomingCall ? incomingCall.callSid : '')"
+      :inbox-name="activeCall ? (activeCall.inboxName || 'Primary') : (incomingCall ? incomingCall.inboxName : 'Primary')"
+      :conversation-id="activeCall ? activeCall.conversationId : (incomingCall ? incomingCall.conversationId : null)"
+      :contact-name="activeCall ? activeCall.contactName : (incomingCall ? incomingCall.contactName : '')"
+      :contact-id="activeCall ? activeCall.contactId : (incomingCall ? incomingCall.contactId : null)"
+      :inbox-id="activeCall ? activeCall.inboxId : (incomingCall ? incomingCall.inboxId : null)"
+      :inbox-avatar-url="activeCall ? activeCall.inboxAvatarUrl : (incomingCall ? incomingCall.inboxAvatarUrl : '')"
+      :inbox-phone-number="activeCall ? activeCall.inboxPhoneNumber : (incomingCall ? incomingCall.inboxPhoneNumber : '')"
+      :avatar-url="activeCall ? activeCall.avatarUrl : (incomingCall ? incomingCall.avatarUrl : '')"
+      :phone-number="activeCall ? activeCall.phoneNumber : (incomingCall ? incomingCall.phoneNumber : '')"
+      use-web-rtc
+      @callEnded="handleCallEnded"
+      @callJoined="handleCallJoined"
+      @callRejected="handleCallRejected"
+    />
   </div>
   <LoadingState v-else />
 </template>

app/javascript/dashboard/api/agentCapacityPolicies.js

@@ -1,43 +0,0 @@
-/* global axios */
-
-import ApiClient from './ApiClient';
-
-class AgentCapacityPolicies extends ApiClient {
-  constructor() {
-    super('agent_capacity_policies', { accountScoped: true });
-  }
-
-  getUsers(policyId) {
-    return axios.get(`${this.url}/${policyId}/users`);
-  }
-
-  addUser(policyId, userData) {
-    return axios.post(`${this.url}/${policyId}/users`, {
-      user_id: userData.id,
-      capacity: userData.capacity,
-    });
-  }
-
-  removeUser(policyId, userId) {
-    return axios.delete(`${this.url}/${policyId}/users/${userId}`);
-  }
-
-  createInboxLimit(policyId, limitData) {
-    return axios.post(`${this.url}/${policyId}/inbox_limits`, {
-      inbox_id: limitData.inboxId,
-      conversation_limit: limitData.conversationLimit,
-    });
-  }
-
-  updateInboxLimit(policyId, limitId, limitData) {
-    return axios.put(`${this.url}/${policyId}/inbox_limits/${limitId}`, {
-      conversation_limit: limitData.conversationLimit,
-    });
-  }
-
-  deleteInboxLimit(policyId, limitId) {
-    return axios.delete(`${this.url}/${policyId}/inbox_limits/${limitId}`);
-  }
-}
-
-export default new AgentCapacityPolicies();

app/javascript/dashboard/api/assignmentPolicies.js

@@ -1,36 +0,0 @@
-/* global axios */
-
-import ApiClient from './ApiClient';
-
-class AssignmentPolicies extends ApiClient {
-  constructor() {
-    super('assignment_policies', { accountScoped: true });
-  }
-
-  getInboxes(policyId) {
-    return axios.get(`${this.url}/${policyId}/inboxes`);
-  }
-
-  setInboxPolicy(inboxId, policyId) {
-    return axios.post(
-      `/api/v1/accounts/${this.accountIdFromRoute}/inboxes/${inboxId}/assignment_policy`,
-      {
-        assignment_policy_id: policyId,
-      }
-    );
-  }
-
-  getInboxPolicy(inboxId) {
-    return axios.get(
-      `/api/v1/accounts/${this.accountIdFromRoute}/inboxes/${inboxId}/assignment_policy`
-    );
-  }
-
-  removeInboxPolicy(inboxId) {
-    return axios.delete(
-      `/api/v1/accounts/${this.accountIdFromRoute}/inboxes/${inboxId}/assignment_policy`
-    );
-  }
-}
-
-export default new AssignmentPolicies();

app/javascript/dashboard/api/captain/customTools.js

@@ -1,36 +0,0 @@
-/* global axios */
-import ApiClient from '../ApiClient';
-
-class CaptainCustomTools extends ApiClient {
-  constructor() {
-    super('captain/custom_tools', { accountScoped: true });
-  }
-
-  get({ page = 1, searchKey } = {}) {
-    return axios.get(this.url, {
-      params: { page, searchKey },
-    });
-  }
-
-  show(id) {
-    return axios.get(`${this.url}/${id}`);
-  }
-
-  create(data = {}) {
-    return axios.post(this.url, {
-      custom_tool: data,
-    });
-  }
-
-  update(id, data = {}) {
-    return axios.put(`${this.url}/${id}`, {
-      custom_tool: data,
-    });
-  }
-
-  delete(id) {
-    return axios.delete(`${this.url}/${id}`);
-  }
-}
-
-export default new CaptainCustomTools();

app/javascript/dashboard/api/captain/response.js

@@ -6,11 +6,11 @@ class CaptainResponses extends ApiClient {
     super('captain/assistant_responses', { accountScoped: true });
   }
 
-  get({ page = 1, search, assistantId, documentId, status } = {}) {
+  get({ page = 1, searchKey, assistantId, documentId, status } = {}) {
     return axios.get(this.url, {
       params: {
         page,
-        search,
+        searchKey,
         assistant_id: assistantId,
         document_id: documentId,
         status,

app/javascript/dashboard/api/captain/scenarios.js

@@ -1,36 +0,0 @@
-/* global axios */
-import ApiClient from '../ApiClient';
-
-class CaptainScenarios extends ApiClient {
-  constructor() {
-    super('captain/assistants', { accountScoped: true });
-  }
-
-  get({ assistantId, page = 1, searchKey } = {}) {
-    return axios.get(`${this.url}/${assistantId}/scenarios`, {
-      params: { page, searchKey },
-    });
-  }
-
-  show({ assistantId, id }) {
-    return axios.get(`${this.url}/${assistantId}/scenarios/${id}`);
-  }
-
-  create({ assistantId, ...data } = {}) {
-    return axios.post(`${this.url}/${assistantId}/scenarios`, {
-      scenario: data,
-    });
-  }
-
-  update({ assistantId, id }, data = {}) {
-    return axios.put(`${this.url}/${assistantId}/scenarios/${id}`, {
-      scenario: data,
-    });
-  }
-
-  delete({ assistantId, id }) {
-    return axios.delete(`${this.url}/${assistantId}/scenarios/${id}`);
-  }
-}
-
-export default new CaptainScenarios();

app/javascript/dashboard/api/captain/tools.js

@@ -1,16 +0,0 @@
-/* global axios */
-import ApiClient from '../ApiClient';
-
-class CaptainTools extends ApiClient {
-  constructor() {
-    super('captain/assistants/tools', { accountScoped: true });
-  }
-
-  get(params = {}) {
-    return axios.get(this.url, {
-      params,
-    });
-  }
-}
-
-export default new CaptainTools();

app/javascript/dashboard/api/changelog.js

@@ -1,16 +0,0 @@
-import axios from 'axios';
-import ApiClient from './ApiClient';
-import { CHANGELOG_API_URL } from 'shared/constants/links';
-
-class ChangelogApi extends ApiClient {
-  constructor() {
-    super('changelog', { apiVersion: 'v1' });
-  }
-
-  // eslint-disable-next-line class-methods-use-this
-  fetchFromHub() {
-    return axios.get(CHANGELOG_API_URL);
-  }
-}
-
-export default new ChangelogApi();

app/javascript/dashboard/api/channel/whatsappChannel.js

@@ -1,21 +0,0 @@
-/* global axios */
-import ApiClient from '../ApiClient';
-
-class WhatsappChannel extends ApiClient {
-  constructor() {
-    super('whatsapp', { accountScoped: true });
-  }
-
-  createEmbeddedSignup(params) {
-    return axios.post(`${this.baseUrl()}/whatsapp/authorization`, params);
-  }
-
-  reauthorizeWhatsApp({ inboxId, ...params }) {
-    return axios.post(`${this.baseUrl()}/whatsapp/authorization`, {
-      ...params,
-      inbox_id: inboxId,
-    });
-  }
-}
-
-export default new WhatsappChannel();

app/javascript/dashboard/api/channels/voice.js

@@ -0,0 +1,856 @@
+/* global axios */
+import ApiClient from '../ApiClient';
+
+class VoiceAPI extends ApiClient {
+  constructor() {
+    // Use 'voice' as the resource with accountScoped: true
+    super('voice', { accountScoped: true });
+    
+    // Client-side Twilio device
+    this.device = null;
+    this.activeConnection = null;
+    this.initialized = false;
+  }
+
+  // Initiate a call to a contact
+  initiateCall(contactId) {
+    if (!contactId) {
+      throw new Error('Contact ID is required to initiate a call');
+    }
+
+    // Based on the route definition, the correct URL path is /api/v1/accounts/{accountId}/contacts/{contactId}/call
+    // The endpoint is defined in the contacts namespace, not voice namespace
+    return axios.post(`${this.baseUrl().replace('/voice', '')}/contacts/${contactId}/call`);
+  }
+
+  // End an active call
+  endCall(callSid, conversationId) {
+    if (!conversationId) {
+      throw new Error('Conversation ID is required to end a call');
+    }
+
+    if (!callSid) {
+      throw new Error('Call SID is required to end a call');
+    }
+
+    // Validate call SID format - Twilio call SID starts with 'CA' or 'TJ'
+    if (!callSid.startsWith('CA') && !callSid.startsWith('TJ')) {
+      throw new Error(
+        'Invalid call SID format. Expected Twilio call SID starting with CA or TJ.'
+      );
+    }
+
+    return axios.post(`${this.url}/end_call`, {
+      call_sid: callSid,
+      conversation_id: conversationId,
+      id: conversationId,
+    });
+  }
+
+  // Get call status
+  getCallStatus(callSid) {
+    if (!callSid) {
+      throw new Error('Call SID is required to get call status');
+    }
+
+    return axios.get(`${this.url}/call_status`, {
+      params: { call_sid: callSid },
+    });
+  }
+
+  // Join an incoming call as an agent (join the conference)
+  // This is used for the WebRTC client-side setup, not for phone calls anymore
+  joinCall(params) {
+    // Check if we have individual parameters or a params object
+    const conversationId = params.conversation_id || params.conversationId;
+    const callSid = params.call_sid || params.callSid;
+    const accountId = params.account_id;
+
+    if (!conversationId) {
+      throw new Error('Conversation ID is required to join a call');
+    }
+
+    if (!callSid) {
+      throw new Error('Call SID is required to join a call');
+    }
+
+    // Build request payload with proper naming convention
+    const payload = {
+      call_sid: callSid,
+      conversation_id: conversationId,
+    };
+
+    // Add account_id if provided
+    if (accountId) {
+      payload.account_id = accountId;
+    }
+
+    console.log('Calling join_call API endpoint with payload:', payload);
+
+    return axios.post(`${this.url}/join_call`, payload);
+  }
+
+  // Reject an incoming call as an agent (don't join the conference)
+  rejectCall(callSid, conversationId) {
+    if (!conversationId) {
+      throw new Error('Conversation ID is required to reject a call');
+    }
+
+    if (!callSid) {
+      throw new Error('Call SID is required to reject a call');
+    }
+
+    return axios.post(`${this.url}/reject_call`, {
+      call_sid: callSid,
+      conversation_id: conversationId,
+    });
+  }
+  
+  // Client SDK methods
+  
+  // Get a capability token for the Twilio Client
+  getToken(inboxId) {
+    console.log(`Requesting token for inbox ID: ${inboxId} at URL: ${this.url}/tokens`);
+    
+    // Log the base URL for debugging
+    console.log(`Base URL: ${this.baseUrl()}`);
+    
+    // Check if inboxId is valid
+    if (!inboxId) {
+      console.error('No inbox ID provided for token request');
+      return Promise.reject(new Error('Inbox ID is required'));
+    }
+    
+    // Add more request details to help debugging
+    return axios.post(`${this.url}/tokens`, { inbox_id: inboxId }, {
+      headers: { 'Content-Type': 'application/json' },
+    }).catch(error => {
+      // Extract useful error details for debugging
+      const errorInfo = {
+        status: error.response?.status,
+        statusText: error.response?.statusText,
+        data: error.response?.data,
+        url: `${this.url}/tokens`,
+        inboxId,
+      };
+      
+      console.error('Token request error details:', errorInfo);
+      
+      // Try to extract a more useful error message from the HTML response if it's a 500 error
+      if (error.response?.status === 500 && typeof error.response.data === 'string') {
+        // Look for specific error patterns in the HTML
+        const htmlData = error.response.data;
+        
+        // Check for common Ruby/Rails error patterns
+        const nameMatchResult = htmlData.match(/<h2>(.*?)<\/h2>/);
+        const detailsMatchResult = htmlData.match(/<pre>([\s\S]*?)<\/pre>/);
+        
+        const errorName = nameMatchResult ? nameMatchResult[1] : null;
+        const errorDetails = detailsMatchResult ? detailsMatchResult[1] : null;
+        
+        if (errorName || errorDetails) {
+          const enhancedError = new Error(`Server error: ${errorName || 'Internal Server Error'}`);
+          enhancedError.details = errorDetails;
+          enhancedError.originalError = error;
+          throw enhancedError;
+        }
+      }
+      
+      throw error;
+    });
+  }
+  
+  // Initialize the Twilio Device
+  async initializeDevice(inboxId) {
+    // If already initialized, return the existing device after checking its health
+    if (this.initialized && this.device) {
+      const deviceState = this.device.state;
+      console.log('Device already initialized, current state:', deviceState);
+      
+      // If the device is in a bad state, destroy and reinitialize
+      if (deviceState === 'error' || deviceState === 'unregistered') {
+        console.log('Device is in a bad state, destroying and reinitializing...');
+        try {
+          this.device.destroy();
+        } catch (e) {
+          console.log('Error destroying device:', e);
+        }
+        this.device = null;
+        this.initialized = false;
+      } else {
+        // Device is in a good state, return it
+        return this.device;
+      }
+    }
+    
+    // Device needs to be initialized or reinitialized
+    try {
+      console.log(`Starting Twilio Device initialization for inbox: ${inboxId}`);
+      
+      // Import the Twilio Voice SDK
+      let Device;
+      try {
+        // We know the package is installed via package.json
+        const { Device: TwilioDevice } = await import('@twilio/voice-sdk');
+        Device = TwilioDevice;
+        console.log('✓ Twilio Voice SDK imported successfully');
+      } catch (importError) {
+        console.error('✗ Failed to import Twilio Voice SDK:', importError);
+        throw new Error(`Failed to load Twilio Voice SDK: ${importError.message}`);
+      }
+      
+      // Validate inbox ID
+      if (!inboxId) {
+        throw new Error('Inbox ID is required to initialize the Twilio Device');
+      }
+      
+      // Step 1: Get a token from the server
+      console.log(`Requesting Twilio token for inbox: ${inboxId}`);
+      let response;
+      try {
+        response = await this.getToken(inboxId);
+        console.log(`✓ Token response received with status: ${response.status}`);
+      } catch (tokenError) {
+        console.error('✗ Token request failed:', tokenError);
+        
+        // Enhanced error handling for token requests
+        if (tokenError.details) {
+          // If we already have extracted details from the error, include those
+          console.error('Token error details:', tokenError.details);
+          throw new Error(`Failed to get token: ${tokenError.message}`);
+        }
+        
+        // Check for specific HTTP error status codes
+        if (tokenError.response) {
+          const status = tokenError.response.status;
+          const data = tokenError.response.data;
+          
+          if (status === 401) {
+            throw new Error('Authentication error: Please check your Twilio credentials');
+          } else if (status === 403) {
+            throw new Error('Permission denied: You don\'t have access to this inbox');
+          } else if (status === 404) {
+            throw new Error('Inbox not found or does not have voice capability');
+          } else if (status === 500) {
+            throw new Error('Server error: The server encountered an error processing your request. Check your Twilio configuration.');
+          } else if (data && data.error) {
+            throw new Error(`Server error: ${data.error}`);
+          }
+        }
+        
+        throw new Error(`Failed to get token: ${tokenError.message}`);
+      }
+      
+      // Validate token response
+      if (!response.data || !response.data.token) {
+        console.error('✗ Invalid token response data:', response.data);
+        
+        // Check if we have an error message in the response
+        if (response.data && response.data.error) {
+          throw new Error(`Server did not return a valid token: ${response.data.error}`);
+        } else {
+          throw new Error('Server did not return a valid token');
+        }
+      }
+      
+      // Check for warnings about missing TwiML App SID
+      if (response.data.warning) {
+        console.warn('⚠️ Twilio Voice Warning:', response.data.warning);
+        
+        if (!response.data.has_twiml_app) {
+          console.error(
+            '🚨 IMPORTANT: Missing TwiML App SID. Browser-based calling requires a ' +
+            'TwiML App configured in Twilio Console. Set the Voice Request URL to: ' +
+            response.data.twiml_endpoint
+          );
+        }
+      }
+      
+      // Extract token data
+      const { token, identity, voice_enabled, account_sid } = response.data;
+      
+      // Log diagnostic information
+      console.log(`✓ Token data received for identity: ${identity}`);
+      console.log(`✓ Voice enabled: ${voice_enabled}`);
+      console.log(`✓ Twilio Account SID available: ${!!account_sid}`);
+      
+      // Log the TwiML endpoint that will be used
+      if (response.data.twiml_endpoint) {
+        console.log(`✓ TwiML endpoint: ${response.data.twiml_endpoint}`);
+      } else {
+        console.warn('⚠️ No TwiML endpoint found in token response');
+      }
+      
+      // Check if voice is enabled
+      if (!voice_enabled) {
+        throw new Error('Voice is not enabled for this inbox. Check your Twilio configuration.');
+      }
+      
+      // Store the TwiML endpoint URL for later use
+      this.twimlEndpoint = response.data.twiml_endpoint;
+
+      // Step 2: Create Twilio Device with better options
+      const deviceOptions = {
+        // Use absolute minimal options - less is more for audio compatibility
+        allowIncomingWhileBusy: true, // Allow incoming calls while already on a call
+        debug: true, // Enable debug logging
+        warnings: true, // Show warnings in console
+        disableAudioContextSounds: true, // Disable browser audio context for sounds
+        // Add explicit edge parameter - this helps avoid connectivity issues
+        edge: ['ashburn', 'sydney', 'roaming'],
+        // Explicitly set codec preferences
+        codecPreferences: ['opus', 'pcmu'],
+        // Add the account ID to any calls made by this device
+        appParams: {
+          account_id: response.data.account_id,
+        }
+      };
+      
+      console.log('Creating Twilio Device with options:', deviceOptions);
+      
+      try {
+        this.device = new Device(token, deviceOptions);
+        console.log('✓ Twilio Device created successfully');
+      } catch (deviceError) {
+        console.error('✗ Failed to create Twilio Device:', deviceError);
+        throw new Error(`Failed to create Twilio Device: ${deviceError.message}`);
+      }
+      
+      // Step 3: Set up event listeners with enhanced error handling
+      this._setupDeviceEventListeners(inboxId);
+      
+      // Step 4: Register the device with Twilio
+      console.log('Registering Twilio Device...');
+      try {
+        await this.device.register();
+        console.log('✓ Twilio Device registered successfully');
+        this.initialized = true;
+        return this.device;
+      } catch (registerError) {
+        console.error('✗ Failed to register Twilio Device:', registerError);
+        
+        // Handle specific registration errors
+        if (registerError.message && registerError.message.includes('token')) {
+          throw new Error('Invalid Twilio token. Check your account credentials.');
+        } else if (registerError.message && registerError.message.includes('permission')) {
+          throw new Error('Missing microphone permission. Please allow microphone access.');
+        }
+        
+        throw new Error(`Failed to register device: ${registerError.message}`);
+      }
+    } catch (error) {
+      // Clear device and initialized flag in case of error
+      this.device = null;
+      this.initialized = false;
+      
+      console.error('Failed to initialize Twilio Device:', error);
+      
+      // Create a detailed error with context for debugging
+      const enhancedError = new Error(`Twilio Device initialization failed: ${error.message}`);
+      enhancedError.originalError = error;
+      enhancedError.inboxId = inboxId;
+      enhancedError.timestamp = new Date().toISOString();
+      enhancedError.browserInfo = {
+        userAgent: navigator.userAgent,
+        hasGetUserMedia: !!(navigator.mediaDevices && navigator.mediaDevices.getUserMedia),
+      };
+      
+      // Add specific advice for known error cases
+      if (error.message.includes('permission')) {
+        enhancedError.advice = 'Please ensure your browser allows microphone access.';
+      } else if (error.message.includes('token')) {
+        enhancedError.advice = 'Check your Twilio credentials in the Voice channel settings.';
+      } else if (error.message.includes('TwiML')) {
+        enhancedError.advice = 'Set up a valid TwiML app in your Twilio console and configure it in the inbox settings.';
+      } else if (error.message.includes('configuration')) {
+        enhancedError.advice = 'Review your Voice inbox configuration to ensure all required fields are completed.';
+      }
+      
+      throw enhancedError;
+    }
+  }
+  
+  // Helper method to set up device event listeners
+  _setupDeviceEventListeners(inboxId) {
+    if (!this.device) return;
+    
+    // Remove any existing listeners to prevent duplicates
+    this.device.removeAllListeners();
+    
+    // Add standard event listeners
+    this.device.on('registered', () => {
+      console.log('✓ Twilio Device registered with Twilio servers');
+    });
+    
+    this.device.on('unregistered', () => {
+      console.log('⚠️ Twilio Device unregistered from Twilio servers');
+    });
+    
+    this.device.on('tokenWillExpire', () => {
+      console.log('⚠️ Twilio token is about to expire, refreshing...');
+      this.getToken(inboxId)
+        .then(newTokenResponse => {
+          if (newTokenResponse.data && newTokenResponse.data.token) {
+            console.log('✓ Successfully obtained new token');
+            this.device.updateToken(newTokenResponse.data.token);
+          } else {
+            console.error('✗ Failed to get a valid token for renewal');
+          }
+        })
+        .catch(tokenError => {
+          console.error('✗ Error refreshing token:', tokenError);
+        });
+    });
+    
+    this.device.on('incoming', connection => {
+      console.log('📞 Incoming call received via Twilio Device');
+      this.activeConnection = connection;
+      
+      // Set up connection-specific events
+      this._setupConnectionEventListeners(connection);
+    });
+    
+    this.device.on('error', error => {
+      // Enhanced error logging with full details
+      const errorDetails = {
+        code: error.code,
+        message: error.message,
+        description: error.description || 'No description',
+        twilioErrorObject: error,
+        connectionInfo: this.activeConnection ? {
+          parameters: this.activeConnection.parameters,
+          status: this.activeConnection.status && this.activeConnection.status(),
+          direction: this.activeConnection.direction,
+        } : 'No active connection',
+        deviceState: this.device.state,
+        browserInfo: {
+          userAgent: navigator.userAgent,
+          platform: navigator.platform
+        },
+        timestamp: new Date().toISOString()
+      };
+      
+      console.error('❌ DETAILED Twilio Device Error:', errorDetails);
+      
+      // Provide helpful troubleshooting tips based on error code
+      switch (error.code) {
+        case 31000:
+          console.error('⚠️ Error 31000: General Error. This could be an authentication, configuration, or network issue.');
+          console.error('31000 Error Details:', {
+            sdp: error.sdp || 'No SDP data',
+            callState: error.call ? error.call.state : 'No call state',
+            connectionState: error.connection ? error.connection.state : 'No connection state',
+            peerConnectionState: error.peerConnection ? error.peerConnection.iceConnectionState : 'No ICE state',
+            message: error.message,
+            twilioError: error,
+            info: error.info || 'No additional info',
+            solution: 'Check Twilio account status, SDP negotiations, and network connectivity'
+          });
+          
+          // Create a network diagnostic to check connectivity
+          fetch('https://status.twilio.com/api/v2/status.json')
+            .then(response => response.json())
+            .then(data => {
+              console.log('Twilio service status check:', data);
+            })
+            .catch(statusError => {
+              console.error('Failed to check Twilio status:', statusError);
+            });
+          break;
+        case 31002:
+          console.error('⚠️ Error 31002: Permission Denied. Your browser microphone is blocked or unavailable.');
+          break;
+        case 31003:
+          console.error('⚠️ Error 31003: TwiML App Error. Your TwiML application does not exist or is misconfigured.');
+          break;
+        case 31005:
+          console.error('⚠️ Error 31005: Error sent from gateway in HANGUP. This usually means the TwiML endpoint is not reachable or returning invalid TwiML.');
+          console.error('Additional details for 31005:', {
+            activeConnection: this.activeConnection ? 'Yes' : 'No',
+            deviceState: this.device ? this.device.state : 'No device',
+            params: this.activeConnection ? this.activeConnection.parameters : 'No params',
+            twimlEndpoint: this.activeConnection && this.activeConnection.parameters ? 
+              this.activeConnection.parameters.To : 'Unknown endpoint',
+            hangupReason: error.hangupReason || 'Unknown',  // Capture hangup reason
+            message: error.message,
+            description: error.description,
+            customMessage: error.customMessage,
+            originalError: error.originalError ? JSON.stringify(error.originalError) : 'None'
+          });
+          break;
+        case 31008:
+          console.error('⚠️ Error 31008: Connection Error. The call could not be established.');
+          break;
+        case 31204:
+          console.error('⚠️ Error 31204: ICE Connection Failed. WebRTC connection failure, check firewall settings.');
+          break;
+        default:
+          console.error(`⚠️ Unspecified error with code ${error.code}: ${error.message}`);
+      }
+    });
+    
+    this.device.on('connect', connection => {
+      console.log('📞 Call connected');
+      this.activeConnection = connection;
+      this._setupConnectionEventListeners(connection);
+    });
+    
+    this.device.on('disconnect', () => {
+      console.log('📞 Call disconnected');
+      this.activeConnection = null;
+    });
+  }
+  
+  // Set up event listeners for the active connection with enhanced audio diagnostic logging
+  _setupConnectionEventListeners(connection) {
+    if (!connection) return;
+    
+    // Add advanced audio debug data
+    const getAudioDiagnostics = () => {
+      const audioContext = window.AudioContext || window.webkitAudioContext;
+      let audioInfo = { supported: !!audioContext };
+      
+      try {
+        if (audioContext) {
+          const context = new audioContext();
+          audioInfo = {
+            ...audioInfo,
+            sampleRate: context.sampleRate,
+            state: context.state,
+            baseLatency: context.baseLatency,
+            outputLatency: context.outputLatency,
+            destination: {
+              maxChannelCount: context.destination.maxChannelCount,
+              numberOfInputs: context.destination.numberOfInputs,
+              numberOfOutputs: context.destination.numberOfOutputs
+            }
+          };
+          context.close();
+        }
+      } catch (e) {
+        audioInfo.error = e.message;
+      }
+      
+      // Check if microphone is accessible
+      let microphoneInfo = { detected: false, active: false, tracks: [] };
+      if (window.activeAudioStream) {
+        const tracks = window.activeAudioStream.getAudioTracks();
+        microphoneInfo = {
+          detected: true,
+          active: tracks.some(track => track.enabled && track.readyState === 'live'),
+          tracks: tracks.map(track => ({
+            id: track.id,
+            label: track.label,
+            enabled: track.enabled,
+            muted: track.muted,
+            readyState: track.readyState,
+            constraints: track.getConstraints()
+          }))
+        };
+      }
+      
+      return { 
+        audioContext: audioInfo, 
+        microphone: microphoneInfo,
+        speakersMuted: typeof window.speechSynthesis !== 'undefined' ? 
+          window.speechSynthesis.speaking === false : 'unknown'
+      };
+    };
+    
+    connection.on('error', error => {
+      // Significantly enhanced connection error logging with audio diagnostics
+      const diagnostics = getAudioDiagnostics();
+      
+      const connectionErrorDetails = {
+        code: error.code,
+        message: error.message,
+        description: error.description || 'No description',
+        twilioErrorObject: error,
+        connectionInfo: {
+          parameters: connection.parameters,
+          status: connection.status && connection.status(),
+          direction: connection.direction,
+        },
+        deviceState: this.device ? this.device.state : 'No device',
+        timestamp: new Date().toISOString(),
+        // Audio diagnostics for troubleshooting
+        audioDiagnostics: diagnostics,
+        // Browser media permissions
+        mediaPermissions: {
+          hasGetUserMedia: !!(navigator.mediaDevices && navigator.mediaDevices.getUserMedia),
+          activeAudioStream: !!window.activeAudioStream,
+          activeAudioTracks: window.activeAudioStream ? 
+            window.activeAudioStream.getAudioTracks().length : 0
+        }
+      };
+      
+      console.error('❌ DETAILED Connection Error with Audio Diagnostics:', connectionErrorDetails);
+    });
+    
+    connection.on('mute', isMuted => {
+      console.log(`📞 Call ${isMuted ? 'muted' : 'unmuted'}`);
+    });
+    
+    connection.on('accept', () => {
+      // Enhanced logging for accept event with audio diagnostics
+      const diagnostics = getAudioDiagnostics();
+      
+      console.log('📞 Call accepted with audio diagnostics:', {
+        connectionParameters: connection.parameters,
+        status: connection.status && connection.status(),
+        audioDiagnostics: diagnostics,
+        activeAudioStream: window.activeAudioStream ? {
+          active: window.activeAudioStream.active,
+          id: window.activeAudioStream.id,
+          trackCount: window.activeAudioStream.getTracks().length
+        } : 'No active stream'
+      });
+      
+      // AUDIO HEALTH CHECK AFTER CONNECTION
+      setTimeout(() => {
+        console.log('🔊 AUDIO HEALTH CHECK:', {
+          connectionActive: this.activeConnection === connection,
+          connectionState: connection.status && connection.status(),
+          audioTracks: window.activeAudioStream ? 
+            window.activeAudioStream.getAudioTracks().map(track => ({
+              label: track.label,
+              enabled: track.enabled,
+              readyState: track.readyState,
+              muted: track.muted
+            })) : 'No active stream',
+          // Device state after 5 seconds
+          deviceState: this.device ? this.device.state : 'No device'
+        });
+      }, 5000);
+    });
+    
+    connection.on('disconnect', () => {
+      console.log('📞 Call disconnected', {
+        disconnectCause: connection.parameters ? connection.parameters.DisconnectCause : 'Unknown',
+        finalStatus: connection.status && connection.status(),
+        audioDiagnostics: getAudioDiagnostics()
+      });
+      this.activeConnection = null;
+    });
+    
+    connection.on('reject', () => {
+      console.log('📞 Call rejected', {
+        rejectCause: connection.parameters ? connection.parameters.DisconnectCause : 'Unknown',
+        audioDiagnostics: getAudioDiagnostics()
+      });
+      this.activeConnection = null;
+    });
+    
+    // Additional event for warning messages
+    connection.on('warning', warning => {
+      console.warn('⚠️ Connection Warning:', warning);
+    });
+    
+    // Listen for TwiML processing events
+    connection.on('twiml-processing', twiml => {
+      console.log('📄 Processing TwiML:', twiml);
+    });
+    
+    // Enhanced audio events for debugging
+    if (typeof connection.on === 'function') {
+      try {
+        // Check for volume events
+        connection.on('volume', (inputVolume, outputVolume) => {
+          // Log only significant volume changes to avoid console spam
+          if (Math.abs(inputVolume) > 50 || Math.abs(outputVolume) > 50) {
+            console.log(`🔊 Volume change - Input: ${inputVolume}, Output: ${outputVolume}`);
+          }
+        });
+        
+        // Check for media stream events if supported
+        if (typeof connection.getRemoteStream === 'function') {
+          const remoteStream = connection.getRemoteStream();
+          if (remoteStream) {
+            console.log('✅ Remote audio stream available:', {
+              active: remoteStream.active,
+              id: remoteStream.id,
+              tracks: remoteStream.getTracks().map(t => ({
+                kind: t.kind,
+                enabled: t.enabled,
+                readyState: t.readyState
+              }))
+            });
+          } else {
+            console.warn('⚠️ No remote audio stream available');
+          }
+        }
+      } catch (e) {
+        console.warn('Error setting up enhanced audio events:', e);
+      }
+    }
+  }
+  
+  // Make a call using the Twilio Client
+  makeClientCall(params) {
+    if (!this.device || !this.initialized) {
+      throw new Error('Twilio Device not initialized');
+    }
+    
+    this.activeConnection = this.device.connect(params);
+    return this.activeConnection;
+  }
+  
+  // Join a conference call using the Twilio Client
+  joinClientCall(conferenceParams) {
+    if (!this.device || !this.initialized) {
+      throw new Error('Twilio Device not initialized');
+    }
+
+    try {
+      // IMPORTANT: Do NOT try to register if already registered
+      // Only check state is ready
+      if (this.device.state !== 'ready' && this.device.state !== 'registered') {
+        // Don't try to register again if already registered
+      }
+
+      // This is CRITICAL for Twilio - params must be formatted exactly right
+      // and passed directly in the format Twilio expects
+      const params = {
+        // REQUIRED: Twilio Voice JS SDK expects 'To' parameter to be a properly formatted string
+        To: `${conferenceParams.To}`,
+
+        // Additional params for our server
+        account_id: conferenceParams.account_id,
+        is_agent: 'true'
+      };
+
+      // Check To parameter exists - fail if missing
+      if (!params.To) {
+        throw new Error('Missing To parameter for conference');
+      }
+
+      // Make sure 'To' is explicitly a string
+      const stringifiedTo = String(params.To);
+      console.log('🎯 CRITICAL CONFERENCE CONNECTION: Connecting agent to conference with To=', stringifiedTo);
+
+      // Follow Twilio documentation format - params should be nested under 'params' property
+      console.log('🎯 TRYING CONNECTION: Using documented format with params property');
+
+      // Just use the minimal required parameters
+      const connection = this.device.connect({
+        params: {
+          To: stringifiedTo,  // Conference ID
+          is_agent: 'true'    // Flag to indicate agent is joining
+        }
+      });
+
+      console.log('🎯 CONFERENCE CONNECTION RESULT:', connection ? 'Success' : 'Failed');
+      this.activeConnection = connection;
+
+      if (connection && typeof connection.then === 'function') {
+        // It's a Promise - newer Twilio SDK version
+        connection.then(resolvedConnection => {
+          this.activeConnection = resolvedConnection;
+          try {
+            if (typeof resolvedConnection.on === 'function') {
+              resolvedConnection.on('accept', () => {
+                // Connection accepted
+              });
+            }
+          } catch (listenerError) {
+            // Could not add listeners to Promise connection
+          }
+        }).catch(connError => {
+          // WebRTC Promise connection error
+        });
+      } else {
+        // It's a synchronous connection - older Twilio SDK
+      }
+      return connection;
+    } catch (error) {
+      // Error joining conference
+    }
+  }
+
+  // Get the status of the device with additional diagnostic info
+  getDeviceStatus() {
+    if (!this.device) {
+      return 'not_initialized';
+    }
+    
+    const deviceState = this.device.state;
+    
+    // Append a recommended action based on the state
+    switch (deviceState) {
+      case 'registered':
+        return 'ready';
+      case 'unregistered':
+        return 'disconnected';
+      case 'destroyed':
+        return 'terminated';
+      case 'busy':
+        return 'busy';
+      case 'error':
+        return 'error';
+      default:
+        return deviceState;
+    }
+  }
+  
+  // Get comprehensive diagnostic information about the device and connection
+  getDiagnosticInfo() {
+    const browserInfo = {
+      userAgent: navigator.userAgent,
+      platform: navigator.platform,
+      vendor: navigator.vendor,
+      hasMediaDevices: !!navigator.mediaDevices,
+      hasGetUserMedia: !!(navigator.mediaDevices && navigator.mediaDevices.getUserMedia),
+    };
+    
+    const deviceInfo = this.device ? {
+      state: this.device.state,
+      isInitialized: this.initialized,
+      capabilities: this.device.capabilities || {},
+      isBusy: this.device.isBusy || false,
+      audio: {
+        isAudioSelectionSupported: this.device.isAudioSelectionSupported || false
+      }
+    } : { state: 'not_initialized' };
+    
+    const connectionInfo = this.activeConnection ? {
+      status: this.activeConnection.status(),
+      isMuted: this.activeConnection.isMuted(),
+      direction: this.activeConnection.direction,
+      parameters: this.activeConnection.parameters,
+    } : { status: 'no_connection' };
+    
+    return {
+      timestamp: new Date().toISOString(),
+      browser: browserInfo,
+      device: deviceInfo,
+      connection: connectionInfo
+    };
+  }
+  
+  // Get the status of the active connection
+  getConnectionStatus() {
+    if (!this.activeConnection) {
+      return 'no_connection';
+    }
+    
+    const status = this.activeConnection.status();
+    
+    // Translate connection statuses to more user-friendly terms
+    switch (status) {
+      case 'pending':
+        return 'connecting';
+      case 'open':
+        return 'connected';
+      case 'connecting':
+        return 'connecting';
+      case 'ringing':
+        return 'ringing';
+      case 'closed':
+        return 'ended';
+      default:
+        return status;
+    }
+  }
+}
+
+export default new VoiceAPI();

app/javascript/dashboard/api/helpCenter/portals.js

@@ -21,14 +21,6 @@ class PortalsAPI extends ApiClient {
   deleteLogo(portalSlug) {
     return axios.delete(`${this.url}/${portalSlug}/logo`);
   }
-
-  sendCnameInstructions(portalSlug, email) {
-    return axios.post(`${this.url}/${portalSlug}/send_instructions`, { email });
-  }
-
-  sslStatus(portalSlug) {
-    return axios.get(`${this.url}/${portalSlug}/ssl_status`);
-  }
 }
 
 export default PortalsAPI;

app/javascript/dashboard/api/inboxHealth.js

@@ -1,14 +0,0 @@
-/* global axios */
-import ApiClient from './ApiClient';
-
-class InboxHealthAPI extends ApiClient {
-  constructor() {
-    super('inboxes', { accountScoped: true });
-  }
-
-  getHealthStatus(inboxId) {
-    return axios.get(`${this.url}/${inboxId}/health`);
-  }
-}
-
-export default new InboxHealthAPI();

app/javascript/dashboard/api/inboxes.js

@@ -28,10 +28,6 @@ class Inboxes extends CacheEnabledApiClient {
       agent_bot: botId,
     });
   }
-
-  syncTemplates(inboxId) {
-    return axios.post(`${this.url}/${inboxId}/sync_templates`);
-  }
 }
 
 export default new Inboxes();

app/javascript/dashboard/api/mfa.js

@@ -1,28 +0,0 @@
-/* global axios */
-import ApiClient from './ApiClient';
-
-class MfaAPI extends ApiClient {
-  constructor() {
-    super('profile/mfa', { accountScoped: false });
-  }
-
-  enable() {
-    return axios.post(`${this.url}`);
-  }
-
-  verify(otpCode) {
-    return axios.post(`${this.url}/verify`, { otp_code: otpCode });
-  }
-
-  disable(password, otpCode) {
-    return axios.delete(this.url, {
-      data: { password, otp_code: otpCode },
-    });
-  }
-
-  regenerateBackupCodes(otpCode) {
-    return axios.post(`${this.url}/backup_codes`, { otp_code: otpCode });
-  }
-}
-
-export default new MfaAPI();

app/javascript/dashboard/api/samlSettings.js

@@ -1,26 +0,0 @@
-/* global axios */
-import ApiClient from './ApiClient';
-
-class SamlSettingsAPI extends ApiClient {
-  constructor() {
-    super('saml_settings', { accountScoped: true });
-  }
-
-  get() {
-    return axios.get(this.url);
-  }
-
-  create(data) {
-    return axios.post(this.url, { saml_settings: data });
-  }
-
-  update(data) {
-    return axios.put(this.url, { saml_settings: data });
-  }
-
-  delete() {
-    return axios.delete(this.url);
-  }
-}
-
-export default new SamlSettingsAPI();

app/javascript/dashboard/api/specs/agentCapacityPolicies.spec.js

@@ -1,98 +0,0 @@
-import agentCapacityPolicies from '../agentCapacityPolicies';
-import ApiClient from '../ApiClient';
-
-describe('#AgentCapacityPoliciesAPI', () => {
-  it('creates correct instance', () => {
-    expect(agentCapacityPolicies).toBeInstanceOf(ApiClient);
-    expect(agentCapacityPolicies).toHaveProperty('get');
-    expect(agentCapacityPolicies).toHaveProperty('show');
-    expect(agentCapacityPolicies).toHaveProperty('create');
-    expect(agentCapacityPolicies).toHaveProperty('update');
-    expect(agentCapacityPolicies).toHaveProperty('delete');
-    expect(agentCapacityPolicies).toHaveProperty('getUsers');
-    expect(agentCapacityPolicies).toHaveProperty('addUser');
-    expect(agentCapacityPolicies).toHaveProperty('removeUser');
-    expect(agentCapacityPolicies).toHaveProperty('createInboxLimit');
-    expect(agentCapacityPolicies).toHaveProperty('updateInboxLimit');
-    expect(agentCapacityPolicies).toHaveProperty('deleteInboxLimit');
-  });
-
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      get: vi.fn(() => Promise.resolve()),
-      post: vi.fn(() => Promise.resolve()),
-      put: vi.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-      // Mock accountIdFromRoute
-      Object.defineProperty(agentCapacityPolicies, 'accountIdFromRoute', {
-        get: () => '1',
-        configurable: true,
-      });
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('#getUsers', () => {
-      agentCapacityPolicies.getUsers(123);
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/accounts/1/agent_capacity_policies/123/users'
-      );
-    });
-
-    it('#addUser', () => {
-      const userData = { id: 456, capacity: 20 };
-      agentCapacityPolicies.addUser(123, userData);
-      expect(axiosMock.post).toHaveBeenCalledWith(
-        '/api/v1/accounts/1/agent_capacity_policies/123/users',
-        {
-          user_id: 456,
-          capacity: 20,
-        }
-      );
-    });
-
-    it('#removeUser', () => {
-      agentCapacityPolicies.removeUser(123, 456);
-      expect(axiosMock.delete).toHaveBeenCalledWith(
-        '/api/v1/accounts/1/agent_capacity_policies/123/users/456'
-      );
-    });
-
-    it('#createInboxLimit', () => {
-      const limitData = { inboxId: 1, conversationLimit: 10 };
-      agentCapacityPolicies.createInboxLimit(123, limitData);
-      expect(axiosMock.post).toHaveBeenCalledWith(
-        '/api/v1/accounts/1/agent_capacity_policies/123/inbox_limits',
-        {
-          inbox_id: 1,
-          conversation_limit: 10,
-        }
-      );
-    });
-
-    it('#updateInboxLimit', () => {
-      const limitData = { conversationLimit: 15 };
-      agentCapacityPolicies.updateInboxLimit(123, 789, limitData);
-      expect(axiosMock.put).toHaveBeenCalledWith(
-        '/api/v1/accounts/1/agent_capacity_policies/123/inbox_limits/789',
-        {
-          conversation_limit: 15,
-        }
-      );
-    });
-
-    it('#deleteInboxLimit', () => {
-      agentCapacityPolicies.deleteInboxLimit(123, 789);
-      expect(axiosMock.delete).toHaveBeenCalledWith(
-        '/api/v1/accounts/1/agent_capacity_policies/123/inbox_limits/789'
-      );
-    });
-  });
-});

app/javascript/dashboard/api/specs/assignmentPolicies.spec.js

@@ -1,70 +0,0 @@
-import assignmentPolicies from '../assignmentPolicies';
-import ApiClient from '../ApiClient';
-
-describe('#AssignmentPoliciesAPI', () => {
-  it('creates correct instance', () => {
-    expect(assignmentPolicies).toBeInstanceOf(ApiClient);
-    expect(assignmentPolicies).toHaveProperty('get');
-    expect(assignmentPolicies).toHaveProperty('show');
-    expect(assignmentPolicies).toHaveProperty('create');
-    expect(assignmentPolicies).toHaveProperty('update');
-    expect(assignmentPolicies).toHaveProperty('delete');
-    expect(assignmentPolicies).toHaveProperty('getInboxes');
-    expect(assignmentPolicies).toHaveProperty('setInboxPolicy');
-    expect(assignmentPolicies).toHaveProperty('getInboxPolicy');
-    expect(assignmentPolicies).toHaveProperty('removeInboxPolicy');
-  });
-
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      get: vi.fn(() => Promise.resolve()),
-      post: vi.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-      // Mock accountIdFromRoute
-      Object.defineProperty(assignmentPolicies, 'accountIdFromRoute', {
-        get: () => '1',
-        configurable: true,
-      });
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('#getInboxes', () => {
-      assignmentPolicies.getInboxes(123);
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/accounts/1/assignment_policies/123/inboxes'
-      );
-    });
-
-    it('#setInboxPolicy', () => {
-      assignmentPolicies.setInboxPolicy(456, 123);
-      expect(axiosMock.post).toHaveBeenCalledWith(
-        '/api/v1/accounts/1/inboxes/456/assignment_policy',
-        {
-          assignment_policy_id: 123,
-        }
-      );
-    });
-
-    it('#getInboxPolicy', () => {
-      assignmentPolicies.getInboxPolicy(456);
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/accounts/1/inboxes/456/assignment_policy'
-      );
-    });
-
-    it('#removeInboxPolicy', () => {
-      assignmentPolicies.removeInboxPolicy(456);
-      expect(axiosMock.delete).toHaveBeenCalledWith(
-        '/api/v1/accounts/1/inboxes/456/assignment_policy'
-      );
-    });
-  });
-});