feat(whatsapp-call): direct browser-Meta WebRTC, no media server

Merge branch 'feat/voice-as-twilio-capability' into feat/voice-call-model-wiring
Merge branch 'develop' into feat/voice-as-twilio-capability
2026-04-29 15:23:32 +07:00 · 2026-04-28 11:00:45 +04:00 · 2026-04-28 09:43:04 +04:00 · 2026-04-23 11:32:13 +04:00 · 2026-04-21 13:23:15 +04:00 · 2026-04-21 13:23:06 +04:00
1676 changed files with 9624 additions and 89044 deletions
@@ -2,22 +2,8 @@
 ignore:
  - CVE-2021-41098 # https://github.com/chatwoot/chatwoot/issues/3097 (update once azure blob storage is updated)
  - GHSA-57hq-95w6-v4fc # Devise confirmable race condition — patched locally in User model (remove once on Devise 5+)
-  # Devise 5 is currently blocked by devise-secure_password/devise_token_auth/devise-two-factor.
-  # Chatwoot does not enable Timeoutable, so the timeout redirect path is not reachable.
-  - GHSA-jp94-3292-c3xv
-  # Rails 7.1 has no patched release for the Active Storage proxy range
-  # advisories. Chatwoot limits proxy range requests locally.
+  # Chatwoot defaults to Active Storage redirect-style URLs, and its recommended
+  # storage setup uses local/cloud storage with optional direct uploads to the
+  # storage provider rather than Rails proxy mode. Revisit if we enable
+  # rails_storage_proxy or other app-served Active Storage proxy routes.
  - CVE-2026-33658
-  # Rails 7.1 has no patched release for this Active Storage direct-upload
-  # advisory. Chatwoot filters internal metadata keys locally.
-  - CVE-2026-33173
-  - CVE-2026-33174
-  # Rails 7.1 has no patched release for these Rails advisories. These are not
-  # reachable through Chatwoot's current usage patterns and should be removed
-  # once we upgrade to Rails 7.2.3.1+.
-  - CVE-2026-33168
-  - CVE-2026-33169
-  - CVE-2026-33170
-  - CVE-2026-33176
-  - CVE-2026-33195
-  - CVE-2026-33202
@@ -144,7 +144,7 @@ jobs:
  # Backend tests with parallelization
  backend-tests:
    <<: *defaults
-    parallelism: 20
+    parallelism: 18
    steps:
      - checkout
      - node/install:
@@ -98,8 +98,6 @@ SMTP_OPENSSL_VERIFY_MODE=peer
 # Mail Incoming
 # This is the domain set for the reply emails when conversation continuity is enabled
 MAILER_INBOUND_EMAIL_DOMAIN=
-# Maximum time in seconds to process a single IMAP email
-# EMAIL_PROCESSING_TIMEOUT_SECONDS=60
 # Set this to the appropriate ingress channel with regards to incoming emails
 # Possible values are :
 # relay for Exim, Postfix, Qmail
@@ -234,10 +232,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 # Comma-separated list of trusted IPs that bypass Rack Attack throttling rules
 # RACK_ATTACK_ALLOWED_IPS=127.0.0.1,::1,192.168.0.10

-## SafeFetch private network access
-## Keep disabled by default. Self-hosted installations can enable this to allow SafeFetch requests to private network URLs.
-# SAFE_FETCH_ALLOW_PRIVATE_NETWORK=false
-
 ## Running chatwoot as an API only server
 ## setting this value to true will disable the frontend dashboard endpoints
 # CW_API_ONLY_SERVER=false
@@ -1,195 +0,0 @@
-#!/usr/bin/env python3
-"""Sync triage GitHub security advisories to Linear issues."""
-
-from __future__ import annotations
-
-import os
-import sys
-from typing import Any
-
-import requests
-
-GITHUB_API = "https://api.github.com"
-LINEAR_API = "https://api.linear.app/graphql"
-
-SEVERITY_PRIORITY = {"critical": 1, "high": 2, "medium": 3, "low": 4}
-SEVERITY_COLOR = {
-    "critical": 15548997,
-    "high": 15105570,
-    "medium": 15844367,
-    "low": 3066993,
-}
-DEFAULT_COLOR = 9807270
-
-
-def required_env(name: str) -> str:
-    value = os.environ.get(name)
-    if not value:
-        sys.exit(f"Missing required env var: {name}")
-    return value
-
-
-def fetch_triage_advisories(repo: str, token: str) -> list[dict[str, Any]]:
-    url: str | None = f"{GITHUB_API}/repos/{repo}/security-advisories"
-    params: dict[str, Any] | None = {"state": "triage", "per_page": 100}
-    headers = {
-        "Accept": "application/vnd.github+json",
-        "Authorization": f"Bearer {token}",
-        "X-GitHub-Api-Version": "2022-11-28",
-    }
-    advisories: list[dict[str, Any]] = []
-    while url:
-        r = requests.get(url, headers=headers, params=params, timeout=30)
-        r.raise_for_status()
-        advisories.extend(r.json())
-        next_link = r.links.get("next")
-        url = next_link["url"] if next_link else None
-        params = None
-    return advisories
-
-
-def linear_call(query: str, variables: dict[str, Any], api_key: str) -> dict[str, Any]:
-    r = requests.post(
-        LINEAR_API,
-        headers={"Authorization": api_key},
-        json={"query": query, "variables": variables},
-        timeout=30,
-    )
-    r.raise_for_status()
-    return r.json()
-
-
-def linear_issue_exists(ghsa_id: str, api_key: str) -> bool:
-    query = (
-        "query($q: String!) { issues(filter: {title: {contains: $q}}, first: 1) "
-        "{ nodes { id } } }"
-    )
-    resp = linear_call(query, {"q": ghsa_id}, api_key)
-    return len(resp.get("data", {}).get("issues", {}).get("nodes", [])) > 0
-
-
-def linear_create_issue(input_data: dict[str, Any], api_key: str) -> dict[str, str] | None:
-    query = (
-        "mutation($input: IssueCreateInput!) { issueCreate(input: $input) "
-        "{ success issue { identifier url } } }"
-    )
-    resp = linear_call(query, {"input": input_data}, api_key)
-    create = resp.get("data", {}).get("issueCreate") or {}
-    if not create.get("success"):
-        return None
-    return create.get("issue")
-
-
-def reporter_login(advisory: dict[str, Any]) -> str:
-    for credit in advisory.get("credits") or []:
-        user = (credit or {}).get("user") or {}
-        if user.get("login"):
-            return user["login"]
-    return "unknown"
-
-
-def cvss_score(advisory: dict[str, Any]) -> str:
-    score = (advisory.get("cvss") or {}).get("score")
-    return str(score) if score is not None else "n/a"
-
-
-def build_description(adv: dict[str, Any]) -> str:
-    return (
-        f"**GHSA:** {adv['ghsa_id']}\n"
-        f"**CVE:** {adv.get('cve_id') or 'n/a'}\n"
-        f"**Severity:** {adv.get('severity') or 'unknown'} (CVSS {cvss_score(adv)})\n"
-        f"**Reporter:** {reporter_login(adv)}\n"
-        f"**Reported:** {(adv.get('created_at') or '').split('T')[0]}\n"
-        f"**Advisory:** {adv['html_url']}\n\n"
-        f"---\n\n"
-        f"{adv.get('description') or 'No description provided.'}"
-    )
-
-
-def post_discord(adv: dict[str, Any], issue: dict[str, str], webhook_url: str) -> None:
-    severity = adv.get("severity") or "unknown"
-    title = f"[{adv['ghsa_id']}] {adv['summary']}"[:250]
-    payload = {
-        "username": "GHSA Sync",
-        "embeds": [
-            {
-                "title": title,
-                "url": issue["url"],
-                "color": SEVERITY_COLOR.get(severity, DEFAULT_COLOR),
-                "fields": [
-                    {"name": "Linear", "value": issue["identifier"], "inline": True},
-                    {
-                        "name": "Severity",
-                        "value": f"{severity} (CVSS {cvss_score(adv)})",
-                        "inline": True,
-                    },
-                    {
-                        "name": "Advisory",
-                        "value": f"[GitHub]({adv['html_url']})",
-                        "inline": True,
-                    },
-                ],
-            }
-        ],
-    }
-    try:
-        requests.post(webhook_url, json=payload, timeout=10)
-    except requests.RequestException:
-        pass
-
-
-def main() -> int:
-    repo = required_env("GITHUB_REPOSITORY")
-    gh_token = required_env("GHSA_READ_TOKEN")
-    linear_api_key = required_env("LINEAR_API_KEY")
-    team_id = required_env("LINEAR_TEAM_ID")
-    project_id = required_env("LINEAR_PROJECT_ID")
-    label_id = required_env("LINEAR_LABEL_ID")
-    discord_webhook = os.environ.get("DISCORD_WEBHOOK_URL") or None
-
-    advisories = fetch_triage_advisories(repo, gh_token)
-    print(f"Fetched {len(advisories)} triage advisories")
-
-    created = skipped = failed = 0
-
-    for adv in advisories:
-        ghsa_id = adv.get("ghsa_id")
-        if not ghsa_id:
-            failed += 1
-            continue
-
-        try:
-            if linear_issue_exists(ghsa_id, linear_api_key):
-                skipped += 1
-                continue
-
-            severity = adv.get("severity") or "unknown"
-            issue = linear_create_issue(
-                {
-                    "title": f"[{ghsa_id}] {adv.get('summary', '')}",
-                    "description": build_description(adv),
-                    "teamId": team_id,
-                    "projectId": project_id,
-                    "labelIds": [label_id],
-                    "priority": SEVERITY_PRIORITY.get(severity, 3),
-                },
-                linear_api_key,
-            )
-        except requests.RequestException:
-            failed += 1
-            continue
-
-        if not issue:
-            failed += 1
-            continue
-
-        created += 1
-        if discord_webhook:
-            post_discord(adv, issue, discord_webhook)
-
-    print(f"Created {created}, skipped {skipped}, failed {failed}")
-    return 1 if failed > 0 else 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())
@@ -11,9 +11,6 @@ concurrency:
  group: pr-${{ github.workflow }}-${{ github.head_ref }}
  cancel-in-progress: true

-permissions:
-  contents: read
-
 jobs:
  deployment_check:
    name: Check Deployment
@@ -8,9 +8,6 @@ on:
    branches:
      - develop

-permissions:
-  contents: read
-
 jobs:
  test:
    runs-on: ubuntu-22.04
@@ -1,29 +0,0 @@
-name: Sync GHSA advisories to Linear
-
-on:
-  schedule:
-    - cron: '0 4 * * *'  # daily at 09:30 IST
-  workflow_dispatch: {}
-
-permissions:
-  contents: read
-
-jobs:
-  sync:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-      - name: Install dependencies
-        run: pip install requests==2.32.3
-      - name: Sync advisories
-        env:
-          GHSA_READ_TOKEN: ${{ secrets.GHSA_READ_TOKEN }}
-          LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
-          LINEAR_TEAM_ID: ${{ secrets.LINEAR_TEAM_ID }}
-          LINEAR_PROJECT_ID: ${{ secrets.LINEAR_PROJECT_ID }}
-          LINEAR_LABEL_ID: ${{ secrets.LINEAR_LABEL_ID }}
-          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
-        run: python3 .github/scripts/ghsa_linear_sync.py
@@ -10,9 +10,6 @@ concurrency:
  group: pr-${{ github.workflow }}-${{ github.head_ref }}
  cancel-in-progress: true

-permissions:
-  contents: read
-
 jobs:
  log_lines_check:
    runs-on: ubuntu-latest
@@ -14,9 +14,6 @@ on:
    - cron: "0 0 * * *"
  workflow_dispatch:

-permissions:
-  contents: read
-
 jobs:
  nightly:
    runs-on: ubuntu-24.04
@@ -3,10 +3,6 @@ name: Publish Codespace Base Image
 on:
  workflow_dispatch:

-permissions:
-  contents: read
-  packages: write
-
 jobs:
  publish-code-space-image:
    runs-on: ubuntu-latest
@@ -18,9 +18,6 @@ on:
 env:
  DOCKER_REPO: chatwoot/chatwoot

-permissions:
-  contents: read
-
 jobs:
  build:
    strategy:
@@ -18,9 +18,6 @@ on:
 env:
  DOCKER_REPO: chatwoot/chatwoot

-permissions:
-  contents: read
-
 jobs:
  build:
    strategy:
@@ -10,9 +10,6 @@ concurrency:
  group: pr-${{ github.workflow }}-${{ github.head_ref }}
  cancel-in-progress: true

-permissions:
-  contents: read
-
 jobs:
  test:
    runs-on: ubuntu-22.04
@@ -7,9 +7,6 @@ on:
      - master
  workflow_dispatch:

-permissions:
-  contents: read
-
 jobs:
  test-build:
    strategy:
@@ -22,7 +22,6 @@ gem 'time_diff'
 gem 'tzinfo-data'
 gem 'valid_email2'
 gem 'email-provider-info'
-gem 'gemoji'
 # compress javascript config.assets.js_compressor
 gem 'uglifier'
 ##-- used for single column multiple binary flags in notification settings/feature flagging --##
@@ -89,7 +88,7 @@ gem 'rails-i18n', '~> 7.0'
 # two-factor authentication
 gem 'devise-two-factor', '>= 5.0.0'
 # authorization
-gem 'jwt', '~> 2.10', '>= 2.10.3'
+gem 'jwt'
 gem 'pundit'

 # super admin
@@ -133,9 +132,9 @@ gem 'sentry-ruby', require: false
 gem 'sentry-sidekiq', '>= 5.19.0', require: false

 ##-- background job processing --##
-gem 'sidekiq', '~> 7.3', '>= 7.3.1'
+gem 'sidekiq', '>= 7.3.1'
 # We want cron jobs
-gem 'sidekiq-cron', '>= 2.4.0'
+gem 'sidekiq-cron', '>= 1.12.0'
 # for sidekiq healthcheck
 gem 'sidekiq_alive'

@@ -195,10 +194,10 @@ gem 'reverse_markdown'

 gem 'iso-639'
 gem 'ruby-openai'
-gem 'ai-agents', '>= 0.10.0'
+gem 'ai-agents', '>= 0.9.1'

 # TODO: Move this gem as a dependency of ai-agents
-gem 'ruby_llm', '>= 1.14.1'
+gem 'ruby_llm', '>= 1.8.2'
 gem 'ruby_llm-schema'

 gem 'cld3', '~> 3.7'
@@ -209,8 +208,6 @@ gem 'opentelemetry-exporter-otlp'

 gem 'shopify_api'

-gem 'firecrawl-sdk', '~> 1.0', require: 'firecrawl'
-
 ### Gems required only in specific deployment environments ###
 ##############################################################

@@ -108,8 +108,8 @@ GEM
    acts-as-taggable-on (12.0.0)
      activerecord (>= 7.1, < 8.1)
      zeitwerk (>= 2.4, < 3.0)
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
    administrate (0.20.1)
      actionpack (>= 6.0, < 8.0)
      actionview (>= 6.0, < 8.0)
@@ -126,8 +126,8 @@ GEM
      jbuilder (~> 2)
      rails (>= 4.2, < 7.2)
      selectize-rails (~> 0.6)
-    ai-agents (0.10.0)
-      ruby_llm (~> 1.14)
+    ai-agents (0.9.1)
+      ruby_llm (~> 1.9.1)
    annotaterb (4.20.0)
      activerecord (>= 6.0.0)
      activesupport (>= 6.0.0)
@@ -196,9 +196,6 @@ GEM
      bigdecimal
      rexml
    crass (1.0.6)
-    cronex (0.15.0)
-      tzinfo
-      unicode (>= 0.4.4.5)
    csv (3.3.0)
    csv-safe (3.3.1)
      csv (~> 3.0)
@@ -215,7 +212,7 @@ GEM
      logger
      msgpack
    datadog-ruby_core_source (3.4.1)
-    date (3.5.1)
+    date (3.4.1)
    debug (1.8.0)
      irb (>= 1.5.0)
      reline (>= 0.3.1)
@@ -301,7 +298,7 @@ GEM
      railties (>= 5.0.0)
    faker (3.2.0)
      i18n (>= 1.8.11, < 2)
-    faraday (2.14.2)
+    faraday (2.14.1)
      faraday-net_http (>= 2.0, < 3.5)
      json
      logger
@@ -310,8 +307,8 @@ GEM
    faraday-mashify (1.0.0)
      faraday (~> 2.0)
      hashie
-    faraday-multipart (1.2.0)
-      multipart-post (~> 2.0)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
    faraday-net_http (3.4.2)
      net-http (~> 0.5)
    faraday-net_http_persistent (2.1.0)
@@ -339,7 +336,6 @@ GEM
    ffi-compiler (1.0.1)
      ffi (>= 1.0.0)
      rake
-    firecrawl-sdk (1.4.1)
    flag_shih_tzu (0.3.23)
    foreman (0.87.2)
    fugit (1.11.1)
@@ -353,7 +349,6 @@ GEM
      googleapis-common-protos-types (>= 1.3.1, < 2.a)
      googleauth (~> 1.0)
      grpc (~> 1.36)
-    gemoji (4.1.0)
    geocoder (1.8.1)
    gli (2.22.2)
      ostruct
@@ -470,7 +465,7 @@ GEM
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    json (2.19.5)
+    json (2.19.2)
    json_refs (0.1.8)
      hana
    json_schemer (0.2.24)
@@ -491,7 +486,7 @@ GEM
    judoscale-sidekiq (1.8.2)
      judoscale-ruby (= 1.8.2)
      sidekiq (>= 5.0)
-    jwt (2.10.3)
+    jwt (2.10.1)
      base64
    kaminari (1.2.2)
      activesupport (>= 4.1.0)
@@ -578,7 +573,7 @@ GEM
      uri (>= 0.11.1)
    net-http-persistent (4.0.2)
      connection_pool (~> 2.2)
-    net-imap (0.4.24)
+    net-imap (0.4.20)
      date
      net-protocol
    net-pop (0.1.2)
@@ -594,14 +589,14 @@ GEM
    newrelic_rpm (9.6.0)
      base64
    nio4r (2.7.3)
-    nokogiri (1.19.3)
+    nokogiri (1.19.1)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.19.3-arm64-darwin)
+    nokogiri (1.19.1-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-darwin)
+    nokogiri (1.19.1-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-linux-gnu)
      racc (~> 1.4)
    oauth (1.1.0)
      oauth-tty (~> 1.0, >= 1.0.1)
@@ -681,14 +676,14 @@ GEM
      method_source (~> 1.0)
    pry-rails (0.3.9)
      pry (>= 0.10.4)
-    public_suffix (7.0.5)
+    public_suffix (6.0.2)
    puma (6.4.3)
      nio4r (~> 2.0)
    pundit (2.3.0)
      activesupport (>= 3.0.0)
    raabro (1.4.0)
    racc (1.8.1)
-    rack (3.2.6)
+    rack (3.2.5)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
    rack-contrib (2.5.0)
@@ -703,7 +698,7 @@ GEM
      rack (>= 3.0.0, < 4)
    rack-proxy (0.7.7)
      rack
-    rack-session (2.1.2)
+    rack-session (2.1.1)
      base64 (>= 0.1.0)
      rack (>= 3.0.0)
    rack-test (2.1.0)
@@ -839,17 +834,17 @@ GEM
    ruby2ruby (2.5.0)
      ruby_parser (~> 3.1)
      sexp_processor (~> 4.6)
-    ruby_llm (1.15.0)
+    ruby_llm (1.9.2)
      base64
      event_stream_parser (~> 1)
      faraday (>= 1.10.0)
      faraday-multipart (>= 1)
      faraday-net_http (>= 1)
      faraday-retry (>= 1)
-      marcel (~> 1)
-      ruby_llm-schema (~> 0)
+      marcel (~> 1.0)
+      ruby_llm-schema (~> 0.2.1)
      zeitwerk (~> 2)
-    ruby_llm-schema (0.3.0)
+    ruby_llm-schema (0.2.5)
    ruby_parser (3.20.0)
      sexp_processor (~> 4.16)
    sass (3.7.4)
@@ -906,11 +901,10 @@ GEM
      logger
      rack (>= 2.2.4)
      redis-client (>= 0.22.2)
-    sidekiq-cron (2.4.0)
-      cronex (>= 0.13.0)
-      fugit (~> 1.8, >= 1.11.1)
+    sidekiq-cron (1.12.0)
+      fugit (~> 1.8)
      globalid (>= 1.0.1)
-      sidekiq (>= 6.5.0)
+      sidekiq (>= 6)
    sidekiq_alive (2.5.0)
      gserver (~> 0.0.1)
      sidekiq (>= 5, < 9)
@@ -966,7 +960,7 @@ GEM
    time_diff (0.3.0)
      activesupport
      i18n
-    timeout (0.6.1)
+    timeout (0.4.3)
    trailblazer-option (0.1.2)
    twilio-ruby (7.6.0)
      faraday (>= 0.9, < 3.0)
@@ -984,7 +978,6 @@ GEM
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.8.2)
-    unicode (0.4.4.5)
    unicode-display_width (3.1.4)
      unicode-emoji (~> 4.0, >= 4.0.4)
    unicode-emoji (4.0.4)
@@ -1025,7 +1018,7 @@ GEM
    working_hours (1.4.1)
      activesupport (>= 3.2)
      tzinfo
-    zeitwerk (2.7.5)
+    zeitwerk (2.7.4)

 PLATFORMS
  arm64-darwin-20
@@ -1045,7 +1038,7 @@ DEPENDENCIES
  administrate (>= 0.20.1)
  administrate-field-active_storage (>= 1.0.3)
  administrate-field-belongs_to_search (>= 0.9.0)
-  ai-agents (>= 0.10.0)
+  ai-agents (>= 0.9.1)
  annotaterb
  attr_extras
  audited (~> 5.4, >= 5.4.1)
@@ -1080,10 +1073,8 @@ DEPENDENCIES
  faker
  faraday_middleware-aws-sigv4
  fcm
-  firecrawl-sdk (~> 1.0)
  flag_shih_tzu
  foreman
-  gemoji
  geocoder
  gmail_xoauth
  google-cloud-dialogflow-v2 (>= 0.24.0)
@@ -1102,7 +1093,7 @@ DEPENDENCIES
  json_schemer
  judoscale-rails
  judoscale-sidekiq
-  jwt (~> 2.10, >= 2.10.3)
+  jwt
  kaminari
  koala
  letter_opener
@@ -1151,7 +1142,7 @@ DEPENDENCIES
  rubocop-rails
  rubocop-rspec
  ruby-openai
-  ruby_llm (>= 1.14.1)
+  ruby_llm (>= 1.8.2)
  ruby_llm-schema
  scout_apm
  scss_lint
@@ -1162,8 +1153,8 @@ DEPENDENCIES
  sentry-sidekiq (>= 5.19.0)
  shopify_api
  shoulda-matchers
-  sidekiq (~> 7.3, >= 7.3.1)
-  sidekiq-cron (>= 2.4.0)
+  sidekiq (>= 7.3.1)
+  sidekiq-cron (>= 1.12.0)
  sidekiq_alive
  simplecov (>= 0.21)
  simplecov_json_formatter
@@ -1 +1 @@
-4.14.0
+4.13.0
@@ -28,10 +28,6 @@ class Messages::Messenger::MessageBuilder
      filename: attachment_file.original_filename,
      content_type: attachment_file.content_type
    )
-    # The Attachment row is saved before the blob is attached, so the
-    # after_create_commit broadcast bails on `file.attached?`. Re-fire here
-    # for audio so the bubble updates without waiting on transcription.
-    attachment.message&.reload&.send_update_event if attachment.file_type.to_sym == :audio
  end

  def attachment_params(attachment)
@@ -27,8 +27,6 @@ class NotificationBuilder
    return if notification_type == 'conversation_creation' && !user_subscribed_to_notification?
    # skip notifications for blocked conversations except for user mentions
    return if primary_actor.contact.blocked? && notification_type != 'conversation_mention'
-    # respect conversation access (inbox/team membership and custom-role permissions)
-    return unless user_can_access_conversation?

    user.notifications.create!(
      notification_type: notification_type,
@@ -38,17 +36,4 @@ class NotificationBuilder
      secondary_actor: secondary_actor || current_user
    )
  end
-
-  def user_can_access_conversation?
-    conversation = primary_actor.is_a?(Conversation) ? primary_actor : primary_actor.try(:conversation)
-    return true if conversation.blank?
-
-    account_user = AccountUser.find_by(account_id: account.id, user_id: user.id)
-    return false if account_user.blank?
-
-    ConversationPolicy.new(
-      { user: user, account: account, account_user: account_user },
-      conversation
-    ).show?
-  end
 end
@@ -31,24 +31,13 @@ class V2::Reports::BotMetricsBuilder
  end

  def bot_resolutions_count
-    # Exclude conversations that also had a handoff in the same range — handoff wins
-    account.reporting_events.joins(:conversation).select(:conversation_id)
-           .where(account_id: account.id, name: :conversation_bot_resolved, created_at: range)
-           .where.not(conversation_id: bot_handoff_conversation_ids_subquery)
-           .distinct.count
+    account.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_resolved,
+                                                                                 created_at: range).distinct.count
  end

  def bot_handoffs_count
-    account.reporting_events.joins(:conversation).select(:conversation_id)
-           .where(account_id: account.id, name: :conversation_bot_handoff, created_at: range)
-           .distinct.count
-  end
-
-  def bot_handoff_conversation_ids_subquery
-    account.reporting_events
-           .where(name: :conversation_bot_handoff, created_at: range)
-           .where.not(conversation_id: nil)
-           .select(:conversation_id)
+    account.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_handoff,
+                                                                                 created_at: range).distinct.count
  end

  def bot_resolution_rate
@@ -1,7 +1,7 @@
 class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::BaseController
  before_action :portal
  before_action :check_authorization
-  before_action :set_articles, only: [:update_status, :update_category, :delete_articles]
+  before_action :set_articles, only: [:update_status, :delete_articles]

  def translate
    head :not_implemented
@@ -19,18 +19,6 @@ class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::Ba
    render_could_not_create_error(e.message)
  end

-  def update_category
-    return render_could_not_create_error(I18n.t('portals.articles.no_articles_found')) if @articles.none?
-    return render_could_not_create_error(I18n.t('portals.articles.category_not_found')) unless category_valid?
-
-    ActiveRecord::Base.transaction do
-      @articles.find_each { |article| article.update!(category_id: params[:category_id]) }
-    end
-    head :ok
-  rescue ActiveRecord::RecordInvalid => e
-    render_could_not_create_error(e.message)
-  end
-
  def delete_articles
    return render_could_not_create_error(I18n.t('portals.articles.no_articles_found')) if @articles.none?

@@ -51,9 +39,5 @@ class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::Ba
  def set_articles
    @articles = @portal.articles.where(id: params[:ids])
  end
-
-  def category_valid?
-    @portal.categories.exists?(id: params[:category_id])
-  end
 end
 Api::V1::Accounts::Articles::BulkActionsController.prepend_mod_with('Api::V1::Accounts::Articles::BulkActionsController')
@@ -1,18 +0,0 @@
-class Api::V1::Accounts::Contacts::AttachmentsController < Api::V1::Accounts::Contacts::BaseController
-  RESULTS_PER_PAGE = 100
-
-  def index
-    conversations = Conversations::PermissionFilterService.new(
-      Current.account.conversations.where(contact_id: @contact.id),
-      Current.user,
-      Current.account
-    ).perform
-
-    @attachments = Attachment.where(message_id: Message.where(conversation_id: conversations).select(:id))
-                             .includes({ file_attachment: :blob }, message: [:conversation, :inbox, { sender: { avatar_attachment: :blob } }])
-                             .order(created_at: :desc)
-                             .page(params[:page])
-                             .per(RESULTS_PER_PAGE)
-    @attachments_count = @attachments.total_count
-  end
-end
@@ -1,16 +0,0 @@
-class Api::V1::Accounts::Conversations::UnreadCountsController < Api::V1::Accounts::BaseController
-  before_action :ensure_unread_counts_enabled
-
-  def index
-    counts = ::Conversations::UnreadCounts::Counter.new(account: Current.account, user: Current.user).perform
-    render json: { payload: counts }
-  end
-
-  private
-
-  def ensure_unread_counts_enabled
-    return if Current.account.feature_enabled?('conversation_unread_counts')
-
-    render json: { error: I18n.t('errors.conversations.unread_counts.feature_not_enabled') }, status: :forbidden
-  end
-end
@@ -28,7 +28,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
  def attachments
    @attachments_count = @conversation.attachments.count
    @attachments = @conversation.attachments
-                                .includes({ file_attachment: :blob }, message: [:inbox, { sender: { avatar_attachment: :blob } }])
+                                .includes(:message)
                                .order(created_at: :desc)
                                .page(attachment_params[:page])
                                .per(ATTACHMENT_RESULTS_PER_PAGE)
@@ -162,8 +162,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    # rubocop:disable Rails/SkipsModelValidations
    @conversation.update_columns(updates)
    # rubocop:enable Rails/SkipsModelValidations
-
-    ::Conversations::UnreadCounts::Notifier.new(@conversation).perform
  end

  def should_update_last_seen?
@@ -1,7 +1,6 @@
 class Api::V1::Accounts::CustomAttributeDefinitionsController < Api::V1::Accounts::BaseController
  before_action :fetch_custom_attributes_definitions, except: [:create]
  before_action :fetch_custom_attribute_definition, only: [:show, :update, :destroy]
-  before_action :check_authorization
  DEFAULT_ATTRIBUTE_MODEL = 'conversation_attribute'.freeze

  def index; end
@@ -9,9 +9,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  include Api::V1::Accounts::Concerns::WhatsappHealthManagement

  def index
-    @inboxes = policy_scope(Current.account.inboxes)
-               .includes(:channel, :portal, :working_hours, { avatar_attachment: :blob })
-               .order_by_name
+    @inboxes = policy_scope(Current.account.inboxes.order_by_name.includes(:channel, { avatar_attachment: [:blob] }))
  end

  def show; end
@@ -87,7 +85,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  end

  def fetch_agent_bot
-    @agent_bot = AgentBot.accessible_to(Current.account).find(params[:agent_bot]) if params[:agent_bot]
+    @agent_bot = AgentBot.find(params[:agent_bot]) if params[:agent_bot]
  end

  def create_channel
@@ -18,16 +18,7 @@ class Api::V1::Accounts::LabelsController < Api::V1::Accounts::BaseController
  end

  def destroy
-    label_title = @label.title
-    account_id = Current.account.id
-    label_deleted_at = Time.current
-
    @label.destroy!
-    Labels::RemoveAssociationsJob.perform_later(
-      label_title: label_title,
-      account_id: account_id,
-      label_deleted_at: label_deleted_at
-    )
    head :ok
  end

@@ -41,9 +41,9 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro

  def destroy_all
    if params[:type] == 'read'
-      ::Notification::DeleteNotificationJob.perform_later(Current.user, Current.account, type: :read)
+      ::Notification::DeleteNotificationJob.perform_later(Current.user, type: :read)
    else
-      ::Notification::DeleteNotificationJob.perform_later(Current.user, Current.account, type: :all)
+      ::Notification::DeleteNotificationJob.perform_later(Current.user, type: :all)
    end
    head :ok
  end
@@ -69,7 +69,7 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
  end

  def fetch_notification
-    @notification = current_user.notifications.where(account_id: Current.account.id).find(params[:id])
+    @notification = current_user.notifications.find(params[:id])
  end

  def set_current_page
@@ -18,7 +18,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    @portal = Current.account.portals.build(portal_params.merge(live_chat_widget_params))
    @portal.custom_domain = parsed_custom_domain
    @portal.save!
-    process_attached_logo if params[:blob_id].present?
+    process_attached_logo
  end

  def update
@@ -78,9 +78,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
  def portal_params
    params.require(:portal).permit(
      :id, :color, :custom_domain, :header_text, :homepage_link,
-      :name, :page_title, :slug, :archived,
-      { config: [:default_locale, :layout, { allowed_locales: [] }, { draft_locales: [] },
-                 { social_profiles: %i[facebook x instagram linkedin youtube tiktok github whatsapp] }] }
+      :name, :page_title, :slug, :archived, { config: [:default_locale, { allowed_locales: [] }, { draft_locales: [] }] }
    )
  end

@@ -89,7 +87,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    return {} unless permitted_params.key?(:inbox_id)
    return { channel_web_widget_id: nil } if permitted_params[:inbox_id].blank?

-    inbox = Current.account.inboxes.find(permitted_params[:inbox_id])
+    inbox = Inbox.find(permitted_params[:inbox_id])
    return {} unless inbox.web_widget?

    { channel_web_widget_id: inbox.channel.id }
@@ -100,8 +98,6 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
  end

  def parsed_custom_domain
-    return @portal.custom_domain if @portal.custom_domain.blank?
-
    domain = URI.parse(@portal.custom_domain)
    domain.is_a?(URI::HTTP) ? domain.host : @portal.custom_domain
  end
@@ -0,0 +1,18 @@
+class Api::V1::Accounts::WorkingHoursController < Api::V1::Accounts::BaseController
+  before_action :check_authorization
+  before_action :fetch_webhook, only: [:update]
+
+  def update
+    @working_hour.update!(working_hour_params)
+  end
+
+  private
+
+  def working_hour_params
+    params.require(:working_hour).permit(:inbox_id, :open_hour, :open_minutes, :close_hour, :close_minutes, :closed_all_day)
+  end
+
+  def fetch_working_hour
+    @working_hour = Current.account.working_hours.find(params[:id])
+  end
+end
@@ -111,7 +111,7 @@ class Api::V1::AccountsController < Api::BaseController
  end

  def custom_attributes_params
-    params.permit(:industry, :company_size, :timezone, :referral_source, :user_role, :website)
+    params.permit(:industry, :company_size, :timezone, :referral_source, :user_role)
  end

  def settings_params
@@ -8,8 +8,7 @@ class Api::V1::NotificationSubscriptionsController < Api::BaseController
  end

  def destroy
-    notification_subscription = current_user.notification_subscriptions
-                                            .where(["subscription_attributes->>'push_token' = ?", params[:push_token]]).first
+    notification_subscription = NotificationSubscription.where(["subscription_attributes->>'push_token' = ?", params[:push_token]]).first
    notification_subscription.destroy! if notification_subscription.present?
    head :ok
  end
@@ -83,10 +83,6 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
  end

  def set_message
-    # `conversation.messages.find` would be simpler, but `conversation` is `conversations.last`,
-    # which means a visitor with more than one open thread could not edit a message in any
-    # but their most recent one. Scoping across all of the visitor's conversations keeps the
-    # happy path correct for that future multi-conversation widget flow.
-    @message = Message.where(conversation_id: conversations.select(:id)).find(permitted_params[:id])
+    @message = @web_widget.inbox.messages.find(permitted_params[:id])
  end
 end
@@ -2,10 +2,6 @@
 # This concern handles the token verification step.

 module MetaTokenVerifyConcern
-  CHANNEL_APP_SECRET_KEYS = %w[app_secret app_secret_key client_secret api_secret].freeze
-  META_SIGNATURE_HEADER = 'X-Hub-Signature-256'.freeze
-  META_SIGNATURE_PREFIX = 'sha256='.freeze
-
  def verify
    service = is_a?(Webhooks::WhatsappController) ? 'whatsapp' : 'instagram'
    if valid_token?(params['hub.verify_token'])
@@ -18,53 +14,6 @@ module MetaTokenVerifyConcern

  private

-  def verify_meta_signature!
-    return unless meta_signature_verification_required?
-    return if valid_meta_signature?
-
-    head :unauthorized
-  end
-
-  def valid_meta_signature?
-    signature = request.headers[META_SIGNATURE_HEADER]
-    return false unless signature&.start_with?(META_SIGNATURE_PREFIX)
-
-    meta_app_secrets.any? do |secret|
-      next false if secret.blank?
-
-      expected_signature = "#{META_SIGNATURE_PREFIX}#{OpenSSL::HMAC.hexdigest('SHA256', secret, meta_request_body)}"
-      ActiveSupport::SecurityUtils.secure_compare(expected_signature, signature)
-    end
-  end
-
-  def meta_request_body
-    @meta_request_body ||= request.raw_post
-  end
-
-  def meta_app_secrets
-    raise 'Overwrite this method in your controller'
-  end
-
-  def meta_signature_verification_required?
-    true
-  end
-
-  def channel_meta_app_secrets(channel)
-    return [] if channel.blank?
-
-    secrets = []
-    secrets << channel.app_secret if channel.respond_to?(:app_secret)
-    secrets.concat(provider_config_meta_app_secrets(channel))
-    secrets.compact_blank.uniq
-  end
-
-  def provider_config_meta_app_secrets(channel)
-    return [] unless channel.respond_to?(:provider_config)
-
-    provider_config = channel.provider_config.to_h.with_indifferent_access
-    CHANNEL_APP_SECRET_KEYS.filter_map { |key| provider_config[key].presence }
-  end
-
  def valid_token?(_token)
    raise 'Overwrite this method your controller'
  end
@@ -80,17 +80,10 @@ class DashboardController < ActionController::Base
      IS_ENTERPRISE: ChatwootApp.enterprise?,
      AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),
      GIT_SHA: GIT_HASH,
-      ALLOWED_LOGIN_METHODS: allowed_login_methods,
-      ACTIVE_PLATFORM_BANNERS: active_platform_banners
+      ALLOWED_LOGIN_METHODS: allowed_login_methods
    }
  end

-  def active_platform_banners
-    return [] unless ChatwootApp.chatwoot_cloud?
-
-    PlatformBanner.active.order(created_at: :desc).as_json(only: %i[id banner_message banner_type updated_at])
-  end
-
  def allowed_login_methods
    methods = ['email']
    methods << 'google_oauth' if GlobalConfigService.load('ENABLE_GOOGLE_OAUTH_LOGIN', 'true').to_s != 'false'
@@ -25,14 +25,6 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController

  private

-  def render_create_error_not_confirmed
-    render_error(
-      :unauthorized,
-      I18n.t('devise_token_auth.sessions.not_confirmed', email: @resource.email),
-      error_code: 'user_not_confirmed'
-    )
-  end
-
  def find_user_for_authentication
    return nil unless params[:email].present? && params[:password].present?

@@ -24,10 +24,6 @@ class Public::Api::V1::InboxesController < PublicController
  def set_conversation
    return if params[:conversation_id].blank?

-    @conversation = if @contact_inbox.hmac_verified?
-                      @contact_inbox.contact.conversations.find_by!(display_id: params[:conversation_id])
-                    else
-                      @contact_inbox.conversations.find_by!(display_id: params[:conversation_id])
-                    end
+    @conversation = @contact_inbox.contact.conversations.find_by!(display_id: params[:conversation_id])
  end
 end
@@ -1,11 +1,9 @@
 class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::BaseController
-  before_action :ensure_custom_domain_request, only: [:show, :index, :show_markdown]
+  before_action :ensure_custom_domain_request, only: [:show, :index]
  before_action :portal
-  before_action :set_portal_layout
-  before_action :set_view_variant
  before_action :ensure_portal_feature_enabled
  before_action :set_category, except: [:index, :show, :tracking_pixel]
-  before_action :set_article, only: [:show, :show_markdown]
+  before_action :set_article, only: [:show]
  layout 'portal'

  def index
@@ -23,13 +21,6 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B

  def show
    @og_image_url = helpers.set_og_image_url(@portal.name, @article.title)
-    @parsed_content = render_article_content(@article.content.to_s)
-  end
-
-  def show_markdown
-    return head :not_found unless @article&.published?
-
-    render plain: @article.content.to_s, content_type: 'text/markdown; charset=utf-8'
  end

  def tracking_pixel
@@ -71,6 +62,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B

  def set_article
    @article = @portal.articles.find_by(slug: permitted_params[:article_slug])
+    @parsed_content = render_article_content(@article.content.to_s)
  end

  def set_category
@@ -7,8 +7,6 @@ class Public::Api::V1::Portals::BaseController < PublicController
  around_action :set_locale
  after_action :allow_iframe_requests

-  PORTAL_LAYOUTS = %w[classic documentation].freeze
-
  private

  def show_plain_layout
@@ -19,14 +17,6 @@ class Public::Api::V1::Portals::BaseController < PublicController
    @theme_from_params = params[:theme] if %w[dark light].include?(params[:theme])
  end

-  def set_portal_layout
-    @portal_layout = PORTAL_LAYOUTS.include?(@portal&.layout) ? @portal.layout : 'classic'
-  end
-
-  def set_view_variant
-    request.variant = :documentation if @portal_layout == 'documentation' && !@is_plain_layout_enabled
-  end
-
  def portal
    @portal ||= Portal.find_by!(slug: params[:slug], archived: false)
  end
@@ -52,7 +42,7 @@ class Public::Api::V1::Portals::BaseController < PublicController
    article_locale = if article.category.present?
                       article.category.locale
                     else
-                       article.locale
+                       article.portal.default_locale
                     end
    @locale = validate_and_get_locale(article_locale)
    I18n.with_locale(@locale, &)
@@ -1,18 +1,12 @@
 class Public::Api::V1::Portals::CategoriesController < Public::Api::V1::Portals::BaseController
  before_action :ensure_custom_domain_request, only: [:show, :index]
  before_action :portal
-  before_action :set_portal_layout
-  before_action :set_view_variant
  before_action :ensure_portal_feature_enabled
  before_action :set_category, only: [:show]
-  before_action :load_category_articles, only: [:show], if: -> { @portal_layout == 'documentation' }
  layout 'portal'

  def index
-    respond_to do |format|
-      format.html { redirect_to public_portal_locale_path(@portal.slug, params[:locale]), status: :moved_permanently }
-      format.json { @categories = @portal.categories.order(position: :asc) }
-    end
+    @categories = @portal.categories.order(position: :asc)
  end

  def show
@@ -27,9 +21,4 @@ class Public::Api::V1::Portals::CategoriesController < Public::Api::V1::Portals:
    Rails.logger.info "Category: not found for slug: #{params[:category_slug]}"
    render_404 && return if @category.blank?
  end
-
-  def load_category_articles
-    @articles = @category.articles.published.order(:position).includes(:author)
-    @category_authors = @articles.filter_map(&:author).uniq
-  end
 end
@@ -2,10 +2,7 @@ class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseControl
  before_action :ensure_custom_domain_request, only: [:show]
  before_action :redirect_to_portal_with_locale, only: [:show]
  before_action :portal
-  before_action :set_portal_layout
-  before_action :set_view_variant
  before_action :ensure_portal_feature_enabled
-  before_action :load_home_data, only: [:show], if: -> { @portal_layout == 'documentation' }
  layout 'portal'

  def show
@@ -31,28 +28,4 @@ class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseControl
    portal
    redirect_to "/hc/#{@portal.slug}/#{@portal.default_locale}"
  end
-
-  def load_home_data
-    base_articles = @portal.articles.published.where(locale: @locale).includes(:author, :category)
-    @visible_categories = @portal.categories
-                                 .where(locale: @locale)
-                                 .joins(:articles).where(articles: { status: :published })
-                                 .order(position: :asc)
-                                 .group('categories.id')
-    @popular_topics = @visible_categories.first(3)
-    @featured = base_articles.order_by_views.limit(6)
-    @category_contributors = build_category_contributors(@visible_categories)
-  end
-
-  def build_category_contributors(categories)
-    category_ids = categories.map(&:id)
-    return {} if category_ids.empty?
-
-    @portal.articles
-           .published
-           .where(locale: @locale, category_id: category_ids)
-           .includes(:author)
-           .group_by(&:category_id)
-           .transform_values { |articles| articles.filter_map(&:author).uniq.first(3) }
-  end
 end
@@ -27,7 +27,7 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
    if errors.any?
      redirect_to super_admin_app_config_path(config: @config), alert: errors.join(', ')
    else
-      redirect_to super_admin_settings_path, flash: success_flash
+      redirect_to super_admin_settings_path, notice: "App Configs - #{@config.titleize} updated successfully"
    end
  end

@@ -58,21 +58,6 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
      %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS WEBHOOK_TIMEOUT MAXIMUM_FILE_UPLOAD_SIZE WIDGET_TOKEN_EXPIRY]
    )
  end
-
-  def success_notice
-    message = "#{@config.titleize} settings updated successfully"
-    return message unless restart_required_config_saved?
-
-    "#{message.delete_suffix('.')}. Restart Chatwoot web and worker processes to apply this change everywhere."
-  end
-
-  def success_flash
-    restart_required_config_saved? ? { success: success_notice } : { notice: success_notice }
-  end
-
-  def restart_required_config_saved?
-    params.fetch('app_config', {}).keys.intersect?(InstallationConfig::RESTART_REQUIRED_CONFIG_KEYS)
-  end
 end

 SuperAdmin::AppConfigsController.prepend_mod_with('SuperAdmin::AppConfigsController')
@@ -25,29 +25,6 @@ class SuperAdmin::InstallationConfigsController < SuperAdmin::ApplicationControl
    resource_class.editable
  end

-  def create
-    resource = new_resource(resource_params)
-    authorize_resource(resource)
-
-    if resource.save
-      redirect_to after_resource_created_path(resource), flash: success_flash(resource)
-    else
-      render :new, locals: {
-        page: Administrate::Page::Form.new(dashboard, resource)
-      }, status: :unprocessable_entity
-    end
-  end
-
-  def update
-    if requested_resource.update(resource_params)
-      redirect_to after_resource_updated_path(requested_resource), flash: success_flash(requested_resource)
-    else
-      render :edit, locals: {
-        page: Administrate::Page::Form.new(dashboard, requested_resource)
-      }, status: :unprocessable_entity
-    end
-  end
-
  # Override `resource_params` if you want to transform the submitted
  # data before it's persisted. For example, the following would turn all
  # empty values into nil values. It uses other APIs such as `resource_class`
@@ -65,20 +42,6 @@ class SuperAdmin::InstallationConfigsController < SuperAdmin::ApplicationControl
          .transform_values { |value| value == '' ? nil : value }.merge(locked: false)
  end

-  private
-
-  def success_flash(resource)
-    message = translate_with_resource('update.success')
-    message = translate_with_resource('create.success') if action_name == 'create'
-    return { notice: message } unless restart_required_config?(resource)
-
-    { success: "#{message.delete_suffix('.')}. Restart Chatwoot web and worker processes to apply this change everywhere." }
-  end
-
-  def restart_required_config?(resource)
-    resource.name.in?(InstallationConfig::RESTART_REQUIRED_CONFIG_KEYS)
-  end
-
  # See https://administrate-prototype.herokuapp.com/customizing_controller_actions
  # for more information
 end
@@ -1,9 +0,0 @@
-class SuperAdmin::PlatformBannersController < SuperAdmin::ApplicationController
-  before_action :ensure_chatwoot_cloud
-
-  private
-
-  def ensure_chatwoot_cloud
-    raise ActionController::RoutingError, 'Not Found' unless ChatwootApp.chatwoot_cloud?
-  end
-end
@@ -1,12 +1,7 @@
 class SwaggerController < ApplicationController
  def respond
    if Rails.env.development? || Rails.env.test?
-      swagger_root = Rails.root.join('swagger')
-      file_path = swagger_root.join(derived_path).cleanpath
-
-      return head :not_found unless file_path.to_s.start_with?("#{swagger_root}/") && file_path.file?
-
-      render inline: file_path.read
+      render inline: Rails.root.join('swagger', derived_path).read
    else
      head :not_found
    end
@@ -16,8 +11,8 @@ class SwaggerController < ApplicationController

  def derived_path
    params[:path] ||= 'index.html'
-    path = Rack::Utils.clean_path_info(params[:path]).delete_prefix('/')
-    path << ".#{Rack::Utils.clean_path_info(params[:format]).delete_prefix('/')}" unless path.ends_with?(params[:format].to_s)
+    path = Rack::Utils.clean_path_info(params[:path])
+    path << ".#{Rack::Utils.clean_path_info(params[:format])}" unless path.ends_with?(params[:format].to_s)
    path
  end
 end
@@ -31,11 +31,7 @@ class Twilio::CallbackController < ApplicationController
      :Latitude,
      :Longitude,
      :MessageType,
-      :ProfileName,
-      :ExternalUserId,
-      :ParentExternalUserId,
-      :ProfileUsername,
-      :Username
+      :ProfileName
    )
  end
 end
@@ -1,8 +1,6 @@
 class Webhooks::InstagramController < ActionController::API
  include MetaTokenVerifyConcern

-  before_action :verify_meta_signature!, only: :events
-
  def events
    Rails.logger.info('Instagram webhook received events')
    if params['object'].casecmp('instagram').zero?
@@ -41,38 +39,4 @@ class Webhooks::InstagramController < ActionController::API
    token == GlobalConfigService.load('IG_VERIFY_TOKEN', '') ||
      token == GlobalConfigService.load('INSTAGRAM_VERIFY_TOKEN', '')
  end
-
-  def meta_app_secrets
-    [
-      *instagram_channel_meta_app_secrets,
-      GlobalConfigService.load('INSTAGRAM_APP_SECRET', nil),
-      GlobalConfigService.load('FB_APP_SECRET', nil)
-    ]
-  end
-
-  def instagram_channel_meta_app_secrets
-    instagram_channels_from_payload.flat_map { |channel| channel_meta_app_secrets(channel) }
-  end
-
-  def instagram_channels_from_payload
-    Array(params.to_unsafe_hash[:entry]).flat_map do |entry|
-      instagram_ids_from_entry(entry.with_indifferent_access).flat_map do |instagram_id|
-        [
-          Channel::Instagram.find_by(instagram_id: instagram_id),
-          Channel::FacebookPage.find_by(instagram_id: instagram_id)
-        ]
-      end
-    end.compact.uniq
-  end
-
-  def instagram_ids_from_entry(entry)
-    messages = entry[:messaging].presence || entry[:standby] || []
-    messages.filter_map { |messaging| instagram_id_from_messaging(messaging.with_indifferent_access) }
-  end
-
-  def instagram_id_from_messaging(messaging)
-    return messaging.dig(:sender, :id) if messaging.dig(:message, :is_echo).present?
-
-    messaging.dig(:recipient, :id)
-  end
 end
@@ -1,8 +1,6 @@
 class Webhooks::WhatsappController < ActionController::API
  include MetaTokenVerifyConcern

-  before_action :verify_meta_signature!, only: :process_payload
-
  def process_payload
    if inactive_whatsapp_number?
      Rails.logger.warn("Rejected webhook for inactive WhatsApp number: #{params[:phone_number]}")
@@ -22,45 +20,6 @@ class Webhooks::WhatsappController < ActionController::API
    token == whatsapp_webhook_verify_token if whatsapp_webhook_verify_token.present?
  end

-  def meta_app_secrets
-    [
-      *channel_meta_app_secrets(whatsapp_channel),
-      GlobalConfigService.load('WHATSAPP_APP_SECRET', nil)
-    ]
-  end
-
-  def whatsapp_channel
-    @whatsapp_channel ||= whatsapp_business_payload_channel || Channel::Whatsapp.find_by(phone_number: params[:phone_number])
-  end
-
-  def meta_signature_verification_required?
-    return true if whatsapp_channel.blank?
-    return false unless whatsapp_channel.provider == 'whatsapp_cloud'
-    return true if channel_meta_app_secrets(whatsapp_channel).present?
-
-    whatsapp_channel.provider_config['source'] == 'embedded_signup'
-  end
-
-  def whatsapp_business_payload_channel
-    return unless params[:object] == 'whatsapp_business_account'
-
-    metadata = params.dig(:entry, 0, :changes, 0, :value, :metadata)
-    return if metadata.blank?
-
-    phone_number = normalized_phone_number(metadata[:display_phone_number])
-    phone_number_id = metadata[:phone_number_id]
-    channel = Channel::Whatsapp.find_by(phone_number: phone_number)
-
-    return channel if channel && channel.provider_config['phone_number_id'] == phone_number_id
-  end
-
-  def normalized_phone_number(phone_number)
-    return if phone_number.blank?
-
-    phone_number = phone_number.to_s
-    phone_number.start_with?('+') ? phone_number : "+#{phone_number}"
-  end
-
  def inactive_whatsapp_number?
    phone_number = params[:phone_number]
    return false if phone_number.blank?
@@ -1,20 +0,0 @@
-require 'administrate/base_dashboard'
-
-class PlatformBannerDashboard < Administrate::BaseDashboard
-  ATTRIBUTE_TYPES = {
-    id: Field::Number,
-    banner_message: Field::Text.with_options(truncate: 200),
-    banner_type: Field::Select.with_options(collection: %w[info warning error]),
-    active: Field::Boolean,
-    created_at: Field::DateTime,
-    updated_at: Field::DateTime
-  }.freeze
-
-  COLLECTION_ATTRIBUTES = %i[id banner_message banner_type active created_at].freeze
-  SHOW_PAGE_ATTRIBUTES = %i[id banner_message banner_type active created_at updated_at].freeze
-  FORM_ATTRIBUTES = %i[banner_message banner_type active].freeze
-
-  def display_resource(platform_banner)
-    "Banner ##{platform_banner.id} (#{platform_banner.banner_type})"
-  end
-end
@@ -17,7 +17,6 @@ class AsyncDispatcher < BaseDispatcher
      InstallationWebhookListener.instance,
      NotificationListener.instance,
      ParticipationListener.instance,
-      Conversations::UnreadCounts::Listener.instance,
      ReportingEventListener.instance,
      WebhookListener.instance
    ]
@@ -7,15 +7,11 @@ class UserDrop < BaseDrop
    @obj.try(:available_name)
  end

-  def email
-    @obj.try(:email)
-  end
-
  def first_name
-    @obj.try(:name).try(:split).try(:first).try(:capitalize) if @obj.try(:name).try(:split).try(:size).to_i > 1
+    @obj.try(:name).try(:split).try(:first).try(:capitalize) if @obj.try(:name).try(:split).try(:size) > 1
  end

  def last_name
-    @obj.try(:name).try(:split).try(:last).try(:capitalize) if @obj.try(:name).try(:split).try(:size).to_i > 1
+    @obj.try(:name).try(:split).try(:last).try(:capitalize) if @obj.try(:name).try(:split).try(:size) > 1
  end
 end
@@ -11,7 +11,9 @@ class MessageFinder
  private

  def conversation_messages
-    @conversation.messages.includes(:attachments, :sender, sender: { avatar_attachment: [:blob] })
+    scope = @conversation.messages.includes(:attachments, :sender, sender: { avatar_attachment: [:blob] })
+    scope = scope.includes(call: [:contact, { inbox: :channel }]) if Message.reflect_on_association(:call)
+    scope
  end

  def messages
@@ -48,5 +50,3 @@ class MessageFinder
    messages.reorder('created_at desc').limit(20).reverse
  end
 end
-
-MessageFinder.prepend_mod_with('MessageFinder')
@@ -17,12 +17,15 @@ module Api::V1::InboxesHelper
  def validate_imap(channel_data)
    return unless channel_data.key?('imap_enabled') && channel_data[:imap_enabled]

-    # Validate the user-selected auth mechanism before opening the connection.
-    authentication = Imap::Authentication.validate_user_configurable!(channel_data[:imap_authentication])
+    Mail.defaults do
+      retriever_method :imap, { address: channel_data[:imap_address],
+                                port: channel_data[:imap_port],
+                                user_name: channel_data[:imap_login],
+                                password: channel_data[:imap_password],
+                                enable_ssl: channel_data[:imap_enable_ssl] }
+    end

-    # Use the same auth adapter as the fetch service so LOGIN uses the IMAP LOGIN command,
-    # not SASL AUTH=LOGIN.
-    check_imap_connection(channel_data, authentication)
+    check_imap_connection(channel_data)
  end

  def validate_smtp(channel_data)
@@ -34,8 +37,8 @@ module Api::V1::InboxesHelper
    check_smtp_connection(channel_data, smtp)
  end

-  def check_imap_connection(channel_data, authentication)
-    imap = open_imap_connection(channel_data, authentication)
+  def check_imap_connection(channel_data)
+    Mail.connection {} # rubocop:disable:block
  rescue SocketError => e
    raise StandardError, I18n.t('errors.inboxes.imap.socket_error')
  rescue Net::IMAP::NoResponseError => e
@@ -50,20 +53,9 @@ module Api::V1::InboxesHelper
  rescue StandardError => e
    raise StandardError, e.message
  ensure
-    imap.disconnect if imap.present? && !imap.disconnected?
    Rails.logger.error "[Api::V1::InboxesHelper] check_imap_connection failed with #{e.message}" if e.present?
  end

-  def open_imap_connection(channel_data, authentication)
-    imap = build_imap_connection(channel_data)
-    Imap::Authentication.authenticate!(imap, authentication, channel_data[:imap_login], channel_data[:imap_password])
-    imap
-  end
-
-  def build_imap_connection(channel_data)
-    Net::IMAP.new(channel_data[:imap_address], port: channel_data[:imap_port], ssl: channel_data[:imap_enable_ssl])
-  end
-
  def check_smtp_connection(channel_data, smtp)
    smtp.open_timeout = 10
    smtp.start(channel_data[:smtp_domain], channel_data[:smtp_login], channel_data[:smtp_password],
@@ -7,7 +7,7 @@ module EmailHelper
  def render_email_html(content)
    return '' if content.blank?

-    ChatwootMarkdownRenderer.new(content).render_message(hardbreaks: true).to_s
+    ChatwootMarkdownRenderer.new(content).render_message.to_s
  end

  # Raise a standard error if any email address is invalid
@@ -17,7 +17,6 @@ module FileTypeHelper
  def image_file?(content_type)
    [
      'image/jpeg',
-      'image/jpg',
      'image/png',
      'image/gif',
      'image/bmp',
@@ -96,15 +96,4 @@ module PortalHelper

    colors[username.length % colors.size]
  end
-
-  def format_authors_label(authors)
-    return if authors.blank?
-
-    names = authors.map(&:available_name)
-    return names.to_sentence if names.size <= 3
-
-    I18n.t('public_portal.sidebar.authors_others',
-           names: names.first(2).join(', '),
-           count: authors.size - 2)
-  end
 end
@@ -53,12 +53,13 @@ module ReportHelper
  end

  def resolutions
-    scope.reporting_events.where(account_id: account.id, name: :conversation_resolved, created_at: range)
+    scope.reporting_events.where(account_id: account.id, name: :conversation_resolved,
+                                 created_at: range)
  end

  def bot_resolutions
-    scope.reporting_events.where(account_id: account.id, name: :conversation_bot_resolved, created_at: range)
-         .where.not(conversation_id: bot_handoff_conversation_ids_subquery)
+    scope.reporting_events.where(account_id: account.id, name: :conversation_bot_resolved,
+                                 created_at: range)
  end

  def bot_handoffs
@@ -66,10 +67,6 @@ module ReportHelper
                                                                               created_at: range).distinct
  end

-  def bot_handoff_conversation_ids_subquery
-    bot_handoffs
-  end
-
  def avg_first_response_time
    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'first_response', account_id: account.id))
    return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
@@ -3,7 +3,6 @@ import { mapGetters } from 'vuex';
 import LoadingState from './components/widgets/LoadingState.vue';
 import NetworkNotification from './components/NetworkNotification.vue';
 import UpdateBanner from './components/app/UpdateBanner.vue';
-import StatusBanner from './components/app/StatusBanner.vue';
 import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
 import PendingEmailVerificationBanner from './components/app/PendingEmailVerificationBanner.vue';
 import vueActionCable from './helper/actionCable';
@@ -28,7 +27,6 @@ export default {
    LoadingState,
    NetworkNotification,
    UpdateBanner,
-    StatusBanner,
    PaymentPendingBanner,
    WootSnackbarBox,
    PendingEmailVerificationBanner,
@@ -139,7 +137,6 @@ export default {
    :dir="isRTL ? 'rtl' : 'ltr'"
  >
    <UpdateBanner :latest-chatwoot-version="latestChatwootVersion" />
-    <StatusBanner />
    <template v-if="currentAccountId">
      <PendingEmailVerificationBanner v-if="hideOnOnboardingView" />
      <PaymentPendingBanner v-if="hideOnOnboardingView" />
@@ -6,22 +6,15 @@ class CaptainDocument extends ApiClient {
    super('captain/documents', { accountScoped: true });
  }

-  get({ page = 1, searchKey, assistantId, filter, source, sort } = {}) {
+  get({ page = 1, searchKey, assistantId } = {}) {
    return axios.get(this.url, {
      params: {
        page,
-        search_key: searchKey,
+        searchKey,
        assistant_id: assistantId,
-        filter,
-        source,
-        sort,
      },
    });
  }
-
-  sync(id) {
-    return axios.post(`${this.url}/${id}/sync`);
-  }
 }

 export default new CaptainDocument();
@@ -1,45 +0,0 @@
-/* global axios */
-import ApiClient from '../../ApiClient';
-
-class WhatsappCallsAPI extends ApiClient {
-  constructor() {
-    super('whatsapp_calls', { accountScoped: true });
-  }
-
-  show(callId) {
-    return axios.get(`${this.url}/${callId}`).then(r => r.data);
-  }
-
-  initiate(conversationId, sdpOffer) {
-    return axios
-      .post(`${this.url}/initiate`, {
-        conversation_id: conversationId,
-        sdp_offer: sdpOffer,
-      })
-      .then(r => r.data);
-  }
-
-  accept(callId, sdpAnswer) {
-    return axios
-      .post(`${this.url}/${callId}/accept`, { sdp_answer: sdpAnswer })
-      .then(r => r.data);
-  }
-
-  reject(callId) {
-    return axios.post(`${this.url}/${callId}/reject`).then(r => r.data);
-  }
-
-  terminate(callId) {
-    return axios.post(`${this.url}/${callId}/terminate`).then(r => r.data);
-  }
-
-  uploadRecording(callId, blob, filename = 'call-recording.webm') {
-    const formData = new FormData();
-    formData.append('recording', blob, filename);
-    return axios
-      .post(`${this.url}/${callId}/upload_recording`, formData)
-      .then(r => r.data);
-  }
-}
-
-export default new WhatsappCallsAPI();
@@ -1,12 +1,21 @@
 /* global axios */
 import ApiClient from './ApiClient';

-const buildParams = params =>
-  new URLSearchParams(
-    Object.entries(params).filter(
-      ([key, value]) => value !== undefined && (value !== '' || key === 'q')
-    )
-  ).toString();
+export const buildCompanyParams = (page, sort) => {
+  let params = `page=${page}`;
+  if (sort) {
+    params = `${params}&sort=${sort}`;
+  }
+  return params;
+};
+
+export const buildSearchParams = (query, page, sort) => {
+  let params = `q=${encodeURIComponent(query)}&page=${page}`;
+  if (sort) {
+    params = `${params}&sort=${sort}`;
+  }
+  return params;
+};

 class CompanyAPI extends ApiClient {
  constructor() {
@@ -15,49 +24,14 @@ class CompanyAPI extends ApiClient {

  get(params = {}) {
    const { page = 1, sort = 'name' } = params;
-    const requestURL = `${this.url}?${buildParams({ page, sort })}`;
+    const requestURL = `${this.url}?${buildCompanyParams(page, sort)}`;
    return axios.get(requestURL);
  }

  search(query = '', page = 1, sort = 'name') {
-    const requestURL = `${this.url}/search?${buildParams({ q: query, page, sort })}`;
+    const requestURL = `${this.url}/search?${buildSearchParams(query, page, sort)}`;
    return axios.get(requestURL);
  }
-
-  listContacts(id, page = 1) {
-    return axios.get(`${this.url}/${id}/contacts?${buildParams({ page })}`);
-  }
-
-  listNotes(id) {
-    return axios.get(`${this.url}/${id}/notes`);
-  }
-
-  listConversations(id) {
-    return axios.get(`${this.url}/${id}/conversations`);
-  }
-
-  searchContacts(id, query = '', page = 1) {
-    const requestURL = `${this.url}/${id}/contacts/search?${buildParams({ q: query, page })}`;
-    return axios.get(requestURL);
-  }
-
-  createContact(id, payload) {
-    return axios.post(`${this.url}/${id}/contacts`, payload);
-  }
-
-  removeContact(id, contactId) {
-    return axios.delete(`${this.url}/${id}/contacts/${contactId}`);
-  }
-
-  destroyCustomAttributes(id, customAttributes) {
-    return axios.post(`${this.url}/${id}/destroy_custom_attributes`, {
-      custom_attributes: customAttributes,
-    });
-  }
-
-  destroyAvatar(id) {
-    return axios.delete(`${this.url}/${id}/avatar`);
-  }
 }

 export default new CompanyAPI();
@@ -35,9 +35,8 @@ class ContactAPI extends ApiClient {
    return axios.patch(`${this.url}/${id}?include_contact_inboxes=false`, data);
  }

-  getConversations(contactId, { inboxId } = {}) {
-    const params = inboxId ? { inbox_id: inboxId } : {};
-    return axios.get(`${this.url}/${contactId}/conversations`, { params });
+  getConversations(contactId) {
+    return axios.get(`${this.url}/${contactId}/conversations`);
  }

  getContactableInboxes(contactId) {
@@ -48,10 +47,9 @@ class ContactAPI extends ApiClient {
    return axios.get(`${this.url}/${contactId}/labels`);
  }

-  initiateCall(contactId, inboxId, conversationId = null) {
+  initiateCall(contactId, inboxId) {
    return axios.post(`${this.url}/${contactId}/call`, {
      inbox_id: inboxId,
-      conversation_id: conversationId,
    });
  }

@@ -13,10 +13,6 @@ class ConversationApi extends ApiClient {
  updateLabels(conversationID, labels) {
    return axios.post(`${this.url}/${conversationID}/labels`, { labels });
  }
-
-  getUnreadCounts() {
-    return axios.get(`${this.url}/unread_counts`);
-  }
 }

 export default new ConversationApi();
@@ -87,13 +87,6 @@ class ArticlesAPI extends PortalsAPI {
    );
  }

-  bulkUpdateCategory({ portalSlug, articleIds, categoryId }) {
-    return axios.patch(
-      `${this.url}/${portalSlug}/articles/bulk_actions/update_category`,
-      { ids: articleIds, category_id: categoryId }
-    );
-  }
-
  bulkDelete({ portalSlug, articleIds }) {
    return axios.delete(
      `${this.url}/${portalSlug}/articles/bulk_actions/delete_articles`,
@@ -52,14 +52,6 @@ class Inboxes extends CacheEnabledApiClient {
  resetSecret(inboxId) {
    return axios.post(`${this.url}/${inboxId}/reset_secret`);
  }
-
-  enableWhatsappCalling(inboxId) {
-    return axios.post(`${this.url}/${inboxId}/enable_whatsapp_calling`);
-  }
-
-  disableWhatsappCalling(inboxId) {
-    return axios.post(`${this.url}/${inboxId}/disable_whatsapp_calling`);
-  }
 }

 export default new Inboxes();
@@ -153,33 +153,4 @@ describe('#PortalAPI', () => {
      );
    });
  });
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('#bulkUpdateCategory', () => {
-      articlesAPI.bulkUpdateCategory({
-        portalSlug: 'room-rental',
-        articleIds: [1, 2, 3],
-        categoryId: 7,
-      });
-      expect(axiosMock.patch).toHaveBeenCalledWith(
-        '/api/v1/portals/room-rental/articles/bulk_actions/update_category',
-        { ids: [1, 2, 3], category_id: 7 }
-      );
-    });
-  });
 });
@@ -1,4 +1,7 @@
-import companyAPI from '../companies';
+import companyAPI, {
+  buildCompanyParams,
+  buildSearchParams,
+} from '../companies';
 import ApiClient from '../ApiClient';

 describe('#CompanyAPI', () => {
@@ -6,6 +9,7 @@ describe('#CompanyAPI', () => {
    expect(companyAPI).toBeInstanceOf(ApiClient);
    expect(companyAPI).toHaveProperty('get');
    expect(companyAPI).toHaveProperty('show');
+    expect(companyAPI).toHaveProperty('create');
    expect(companyAPI).toHaveProperty('update');
    expect(companyAPI).toHaveProperty('delete');
    expect(companyAPI).toHaveProperty('search');
@@ -28,69 +32,111 @@ describe('#CompanyAPI', () => {
      window.axios = originalAxios;
    });

-    it('#get includes pagination and sorting params', () => {
+    it('#get with default params', () => {
      companyAPI.get({});
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/companies?page=1&sort=name'
      );
    });

-    it('#search encodes query params', () => {
-      companyAPI.search('acme & co', 2, 'domain');
+    it('#get with page and sort params', () => {
+      companyAPI.get({ page: 2, sort: 'domain' });
      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/companies/search?q=acme+%26+co&page=2&sort=domain'
+        '/api/v1/companies?page=2&sort=domain'
      );
    });

-    it('#search keeps empty query param for backend validation', () => {
+    it('#get with descending sort', () => {
+      companyAPI.get({ page: 1, sort: '-created_at' });
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/companies?page=1&sort=-created_at'
+      );
+    });
+
+    it('#search with query', () => {
+      companyAPI.search('acme', 1, 'name');
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/companies/search?q=acme&page=1&sort=name'
+      );
+    });
+
+    it('#search with special characters in query', () => {
+      companyAPI.search('acme & co', 2, 'domain');
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/companies/search?q=acme%20%26%20co&page=2&sort=domain'
+      );
+    });
+
+    it('#search with descending sort', () => {
+      companyAPI.search('test', 1, '-created_at');
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/companies/search?q=test&page=1&sort=-created_at'
+      );
+    });
+
+    it('#search with empty query', () => {
      companyAPI.search('', 1, 'name');
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/companies/search?q=&page=1&sort=name'
      );
    });
+  });
+});

-    it('#destroyAvatar deletes the company avatar endpoint', () => {
-      companyAPI.destroyAvatar(1);
-      expect(axiosMock.delete).toHaveBeenCalledWith(
-        '/api/v1/companies/1/avatar'
-      );
-    });
-
-    it('#listContacts fetches company contacts', () => {
-      companyAPI.listContacts(1, 2);
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/companies/1/contacts?page=2'
-      );
-    });
-
-    it('#searchContacts encodes contact search params', () => {
-      companyAPI.searchContacts(1, 'jane & co', 3);
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/companies/1/contacts/search?q=jane+%26+co&page=3'
-      );
-    });
-
-    it('#createContact links a contact to the company', () => {
-      companyAPI.createContact(1, { contact_id: 2 });
-      expect(axiosMock.post).toHaveBeenCalledWith(
-        '/api/v1/companies/1/contacts',
-        { contact_id: 2 }
-      );
-    });
-
-    it('#removeContact unlinks a contact from the company', () => {
-      companyAPI.removeContact(1, 2);
-      expect(axiosMock.delete).toHaveBeenCalledWith(
-        '/api/v1/companies/1/contacts/2'
-      );
-    });
-
-    it('#destroyCustomAttributes removes company custom attributes', () => {
-      companyAPI.destroyCustomAttributes(1, ['plan']);
-      expect(axiosMock.post).toHaveBeenCalledWith(
-        '/api/v1/companies/1/destroy_custom_attributes',
-        { custom_attributes: ['plan'] }
-      );
-    });
+describe('#buildCompanyParams', () => {
+  it('returns correct string with page only', () => {
+    expect(buildCompanyParams(1)).toBe('page=1');
+  });
+
+  it('returns correct string with page and sort', () => {
+    expect(buildCompanyParams(1, 'name')).toBe('page=1&sort=name');
+  });
+
+  it('returns correct string with different page', () => {
+    expect(buildCompanyParams(3, 'domain')).toBe('page=3&sort=domain');
+  });
+
+  it('returns correct string with descending sort', () => {
+    expect(buildCompanyParams(1, '-created_at')).toBe(
+      'page=1&sort=-created_at'
+    );
+  });
+
+  it('returns correct string without sort parameter', () => {
+    expect(buildCompanyParams(2, '')).toBe('page=2');
+  });
+});
+
+describe('#buildSearchParams', () => {
+  it('returns correct string with all parameters', () => {
+    expect(buildSearchParams('acme', 1, 'name')).toBe(
+      'q=acme&page=1&sort=name'
+    );
+  });
+
+  it('returns correct string with special characters', () => {
+    expect(buildSearchParams('acme & co', 2, 'domain')).toBe(
+      'q=acme%20%26%20co&page=2&sort=domain'
+    );
+  });
+
+  it('returns correct string with empty query', () => {
+    expect(buildSearchParams('', 1, 'name')).toBe('q=&page=1&sort=name');
+  });
+
+  it('returns correct string without sort parameter', () => {
+    expect(buildSearchParams('test', 1, '')).toBe('q=test&page=1');
+  });
+
+  it('returns correct string with descending sort', () => {
+    expect(buildSearchParams('company', 3, '-created_at')).toBe(
+      'q=company&page=3&sort=-created_at'
+    );
+  });
+
+  it('encodes special characters correctly', () => {
+    expect(buildSearchParams('test@example.com', 1, 'name')).toBe(
+      'q=test%40example.com&page=1&sort=name'
+    );
  });
 });
@@ -41,8 +41,7 @@ describe('#ContactsAPI', () => {
    it('#getConversations', () => {
      contactAPI.getConversations(1);
      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/contacts/1/conversations',
-        { params: {} }
+        '/api/v1/contacts/1/conversations'
      );
    });

@@ -11,7 +11,6 @@ describe('#ConversationApi', () => {
    expect(conversationsAPI).toHaveProperty('delete');
    expect(conversationsAPI).toHaveProperty('getLabels');
    expect(conversationsAPI).toHaveProperty('updateLabels');
-    expect(conversationsAPI).toHaveProperty('getUnreadCounts');
  });

  describe('API calls', () => {
@@ -48,12 +47,5 @@ describe('#ConversationApi', () => {
        }
      );
    });
-
-    it('#getUnreadCounts', () => {
-      conversationsAPI.getUnreadCounts();
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/conversations/unread_counts'
-      );
-    });
  });
 });
@@ -0,0 +1,68 @@
+/* global axios */
+import ApiClient from './ApiClient';
+
+class VoiceCallsAPI extends ApiClient {
+  constructor() {
+    super('voice_calls', { accountScoped: true });
+  }
+
+  show(callId) {
+    return axios.get(`${this.url}/${callId}`);
+  }
+
+  // The browser does WebRTC locally and ships the SDP answer up. Rails forwards
+  // it to Meta via pre_accept_call+accept_call.
+  accept(callId, { sdpAnswer } = {}) {
+    return axios.post(`${this.url}/${callId}/accept`, {
+      sdp_answer: sdpAnswer,
+    });
+  }
+
+  reject(callId) {
+    return axios.post(`${this.url}/${callId}/reject`);
+  }
+
+  terminate(callId) {
+    return axios.post(`${this.url}/${callId}/terminate`);
+  }
+
+  // Outbound: browser builds the offer first; Rails ships it to Meta and
+  // creates the Call record. Meta delivers its SDP answer later via the
+  // connect webhook (broadcast over ActionCable as voice_call.outbound_connected).
+  initiate(conversationId, provider, { sdpOffer } = {}) {
+    return axios.post(`${this.url}/initiate`, {
+      conversation_id: conversationId,
+      provider,
+      sdp_offer: sdpOffer,
+    });
+  }
+
+  // Get the current agent's active call (if any). Used on page load to detect
+  // a stale active session so we can terminate it cleanly.
+  active() {
+    return axios.get(`${this.url}/active`);
+  }
+
+  // Multipart upload of the in-browser MediaRecorder Blob to Rails. The
+  // controller attaches it to the call's voice_call message; the after-create
+  // hook on Attachment fires Messages::AudioTranscriptionJob automatically.
+  uploadRecording(callId, blob, filename) {
+    const fd = new FormData();
+    fd.append('recording', blob, filename);
+    return axios.post(`${this.url}/${callId}/upload_recording`, fd, {
+      headers: { 'Content-Type': 'multipart/form-data' },
+    });
+  }
+
+  // URL helpers for navigator.sendBeacon (which can't carry custom headers and
+  // needs the absolute account-scoped path).
+  uploadRecordingUrl(callId) {
+    return `${this.url}/${callId}/upload_recording`;
+  }
+
+  terminateUrl(callId) {
+    return `${this.url}/${callId}/terminate`;
+  }
+}
+
+export default new VoiceCallsAPI();
@@ -1,7 +1,7 @@
 <script setup>
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { dynamicTime } from 'shared/helpers/timeHelper';
+import { formatDistanceToNow } from 'date-fns';

 import CardLayout from 'dashboard/components-next/CardLayout.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
@@ -12,8 +12,9 @@ const props = defineProps({
  name: { type: String, default: '' },
  domain: { type: String, default: '' },
  contactsCount: { type: Number, default: 0 },
+  description: { type: String, default: '' },
  avatarUrl: { type: String, default: '' },
-  lastActivityAt: { type: [String, Number], default: null },
+  updatedAt: { type: [String, Number], default: null },
 });

 const emit = defineEmits(['showCompany']);
@@ -26,21 +27,15 @@ const displayName = computed(() => props.name || t('COMPANIES.UNNAMED'));

 const avatarSource = computed(() => props.avatarUrl || null);

-const hasContacts = computed(() => Number(props.contactsCount || 0) > 0);
-
-const contactsCountLabel = computed(() =>
-  t('COMPANIES.CONTACTS_COUNT', { n: Number(props.contactsCount || 0) })
-);
-
-const formattedLastActivityAt = computed(() => {
-  if (!props.lastActivityAt) return '';
-  return dynamicTime(props.lastActivityAt);
+const formattedUpdatedAt = computed(() => {
+  if (!props.updatedAt) return '';
+  return formatDistanceToNow(new Date(props.updatedAt), { addSuffix: true });
 });
 </script>

 <template>
  <CardLayout layout="row" @click="onClickViewDetails">
-    <div class="flex items-center justify-start flex-1 gap-4 cursor-pointer">
+    <div class="flex items-center justify-start flex-1 gap-4">
      <Avatar
        :username="displayName"
        :src="avatarSource"
@@ -56,29 +51,42 @@ const formattedLastActivityAt = computed(() => {
            {{ displayName }}
          </span>
          <span
-            v-if="hasContacts"
+            v-if="domain && description"
            class="inline-flex items-center gap-1.5 text-sm text-n-slate-11 truncate"
          >
-            <Icon icon="i-lucide-contact" size="size-3.5 text-n-slate-11" />
-            {{ contactsCountLabel }}
+            <Icon icon="i-lucide-globe" size="size-3.5 text-n-slate-11" />
+            <span class="truncate">{{ domain }}</span>
          </span>
        </div>
-        <div class="flex items-center justify-between gap-3">
-          <div class="flex items-center min-w-0">
+        <div class="flex items-center justify-between">
+          <div class="flex flex-wrap items-center gap-x-3 gap-y-1 min-w-0">
            <span
-              v-if="domain"
-              class="inline-flex items-center gap-1.5 text-sm text-n-slate-11 truncate cursor-text"
-              @click.stop
+              v-if="domain && !description"
+              class="inline-flex items-center gap-1.5 text-sm text-n-slate-11 truncate"
            >
              <Icon icon="i-lucide-globe" size="size-3.5 text-n-slate-11" />
              <span class="truncate">{{ domain }}</span>
            </span>
+            <span v-if="description" class="text-sm text-n-slate-11 truncate">
+              {{ description }}
+            </span>
+            <div
+              v-if="(description || domain) && contactsCount"
+              class="w-px h-3 bg-n-slate-6"
+            />
+            <span
+              v-if="contactsCount"
+              class="inline-flex items-center gap-1.5 text-sm text-n-slate-11 truncate"
+            >
+              <Icon icon="i-lucide-contact" size="size-3.5 text-n-slate-11" />
+              {{ t('COMPANIES.CONTACTS_COUNT', { n: contactsCount }) }}
+            </span>
          </div>
          <span
-            v-if="lastActivityAt"
+            v-if="updatedAt"
            class="inline-flex items-center gap-1.5 text-sm text-n-slate-11 flex-shrink-0"
          >
-            {{ formattedLastActivityAt }}
+            {{ formattedUpdatedAt }}
          </span>
        </div>
      </div>
@@ -1,125 +0,0 @@
-<script setup>
-import { ref, useSlots } from 'vue';
-import { vOnClickOutside } from '@vueuse/components';
-
-import Breadcrumb from 'dashboard/components-next/breadcrumb/Breadcrumb.vue';
-import Button from 'dashboard/components-next/button/Button.vue';
-
-defineProps({
-  breadcrumbItems: {
-    type: Array,
-    default: () => [],
-  },
-});
-
-const emit = defineEmits(['back']);
-
-const slots = useSlots();
-const isSidebarOpen = ref(false);
-
-const toggleSidebar = () => {
-  isSidebarOpen.value = !isSidebarOpen.value;
-};
-
-const closeMobileSidebar = () => {
-  if (!isSidebarOpen.value) {
-    return;
-  }
-
-  isSidebarOpen.value = false;
-};
-</script>
-
-<template>
-  <section
-    class="flex w-full h-full overflow-hidden justify-evenly bg-n-surface-1"
-  >
-    <div
-      class="flex flex-col w-full h-full transition-all duration-300 ltr:2xl:ml-56 rtl:2xl:mr-56"
-    >
-      <header class="sticky top-0 z-10 px-6 3xl:px-0">
-        <div class="w-full mx-auto max-w-[40.625rem]">
-          <div
-            class="flex flex-col xs:flex-row items-start xs:items-center justify-between w-full py-7 gap-2"
-          >
-            <Breadcrumb :items="breadcrumbItems" @click="emit('back')" />
-          </div>
-        </div>
-      </header>
-
-      <main class="flex-1 px-6 overflow-y-auto 3xl:px-px">
-        <div class="w-full py-4 mx-auto max-w-[40.625rem]">
-          <slot />
-        </div>
-      </main>
-    </div>
-
-    <div
-      v-if="slots.sidebar"
-      class="hidden lg:flex flex-col min-w-52 w-full max-w-md border-l border-n-weak bg-n-solid-2"
-    >
-      <div class="shrink-0">
-        <slot name="sidebarHeader" />
-      </div>
-      <div class="flex-1 overflow-y-auto pb-6 pt-3">
-        <slot name="sidebar" />
-      </div>
-    </div>
-
-    <div
-      v-if="slots.sidebar"
-      class="lg:hidden fixed top-0 ltr:right-0 rtl:left-0 h-full z-50 flex justify-end transition-all duration-200 ease-in-out"
-      :class="isSidebarOpen ? 'w-full' : 'w-16'"
-    >
-      <div
-        v-on-click-outside="[
-          closeMobileSidebar,
-          { ignore: ['#details-sidebar-content'] },
-        ]"
-        class="flex items-start p-1 w-fit h-fit relative order-1 xs:top-24 top-28 transition-all bg-n-solid-2 border border-n-weak duration-500 ease-in-out"
-        :class="[
-          isSidebarOpen
-            ? 'justify-end ltr:rounded-l-full rtl:rounded-r-full ltr:rounded-r-none rtl:rounded-l-none'
-            : 'justify-center rounded-full ltr:mr-6 rtl:ml-6',
-        ]"
-      >
-        <Button
-          ghost
-          slate
-          sm
-          class="!rounded-full rtl:rotate-180"
-          :class="{ 'bg-n-alpha-2': isSidebarOpen }"
-          :icon="
-            isSidebarOpen
-              ? 'i-lucide-panel-right-close'
-              : 'i-lucide-panel-right-open'
-          "
-          data-details-sidebar-toggle
-          @click="toggleSidebar"
-        />
-      </div>
-
-      <Transition
-        enter-active-class="transition-transform duration-200 ease-in-out"
-        leave-active-class="transition-transform duration-200 ease-in-out"
-        enter-from-class="ltr:translate-x-full rtl:-translate-x-full"
-        enter-to-class="ltr:translate-x-0 rtl:-translate-x-0"
-        leave-from-class="ltr:translate-x-0 rtl:-translate-x-0"
-        leave-to-class="ltr:translate-x-full rtl:-translate-x-full"
-      >
-        <div
-          v-if="isSidebarOpen"
-          id="details-sidebar-content"
-          class="order-2 w-[85%] sm:w-[50%] flex flex-col bg-n-solid-2 ltr:border-l rtl:border-r border-n-weak shadow-lg"
-        >
-          <div class="shrink-0">
-            <slot name="sidebarHeader" />
-          </div>
-          <div class="flex-1 overflow-y-auto pb-6 pt-3">
-            <slot name="sidebar" />
-          </div>
-        </div>
-      </Transition>
-    </div>
-  </section>
-</template>
@@ -2,7 +2,6 @@
 import Input from 'dashboard/components-next/input/Input.vue';
 import Icon from 'dashboard/components-next/icon/Icon.vue';
 import CompanySortMenu from './components/CompanySortMenu.vue';
-import CompanyMoreActions from './components/CompanyMoreActions.vue';

 defineProps({
  showSearch: { type: Boolean, default: true },
@@ -12,7 +11,7 @@ defineProps({
  activeOrdering: { type: String, default: '' },
 });

-const emit = defineEmits(['search', 'update:sort', 'create']);
+const emit = defineEmits(['search', 'update:sort']);
 </script>

 <template>
@@ -20,15 +19,22 @@ const emit = defineEmits(['search', 'update:sort', 'create']);
    <div
      class="flex items-start sm:items-center justify-between w-full py-6 gap-2 mx-auto max-w-5xl"
    >
-      <span class="text-xl font-medium truncate text-n-slate-12">
+      <span class="text-heading-1 truncate text-n-slate-12">
        {{ headerTitle }}
      </span>
-      <div class="flex items-center flex-col sm:flex-row flex-shrink-0 gap-4">
+      <div class="flex items-center flex-row flex-shrink-0 gap-2">
+        <div class="flex items-center">
+          <CompanySortMenu
+            :active-sort="activeSort"
+            :active-ordering="activeOrdering"
+            @update:sort="emit('update:sort', $event)"
+          />
+        </div>
        <div v-if="showSearch" class="flex items-center gap-2 w-full">
          <Input
            :model-value="searchValue"
            type="search"
-            :placeholder="$t('COMPANIES.SEARCH_PLACEHOLDER')"
+            :placeholder="$t('CONTACTS_LAYOUT.HEADER.SEARCH_PLACEHOLDER')"
            :custom-input-class="[
              'h-8 [&:not(.focus)]:!border-transparent bg-n-alpha-2 dark:bg-n-solid-1 ltr:!pl-8 !py-1 rtl:!pr-8',
            ]"
@@ -43,14 +49,6 @@ const emit = defineEmits(['search', 'update:sort', 'create']);
            </template>
          </Input>
        </div>
-        <div class="flex items-center flex-shrink-0 gap-2">
-          <CompanySortMenu
-            :active-sort="activeSort"
-            :active-ordering="activeOrdering"
-            @update:sort="emit('update:sort', $event)"
-          />
-          <CompanyMoreActions @create="emit('create')" />
-        </div>
      </div>
    </div>
  </header>
@@ -1,45 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import Button from 'dashboard/components-next/button/Button.vue';
-import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
-
-const emit = defineEmits(['create']);
-
-const { t } = useI18n();
-const showActionsDropdown = ref(false);
-
-const menuItems = [
-  {
-    label: t('COMPANIES.ACTIONS.CREATE'),
-    action: 'create',
-    value: 'create',
-    icon: 'i-lucide-plus',
-  },
-];
-
-const handleAction = ({ action }) => {
-  if (action === 'create') emit('create');
-  showActionsDropdown.value = false;
-};
-</script>
-
-<template>
-  <div v-on-clickaway="() => (showActionsDropdown = false)" class="relative">
-    <Button
-      icon="i-lucide-ellipsis-vertical"
-      color="slate"
-      variant="ghost"
-      size="sm"
-      :class="showActionsDropdown ? 'bg-n-alpha-2' : ''"
-      @click="showActionsDropdown = !showActionsDropdown"
-    />
-    <DropdownMenu
-      v-if="showActionsDropdown"
-      :menu-items="menuItems"
-      class="ltr:right-0 rtl:left-0 mt-1 w-52 top-full"
-      @action="handleAction($event)"
-    />
-  </div>
-</template>
@@ -35,10 +35,6 @@ const sortMenus = [
    label: t('COMPANIES.SORT_BY.OPTIONS.CREATED_AT'),
    value: 'created_at',
  },
-  {
-    label: t('COMPANIES.SORT_BY.OPTIONS.LAST_ACTIVITY_AT'),
-    value: 'last_activity_at',
-  },
  {
    label: t('COMPANIES.SORT_BY.OPTIONS.CONTACTS_COUNT'),
    value: 'contacts_count',
@@ -105,7 +101,6 @@ const handleOrderChange = value => {
          :model-value="activeSort"
          :options="sortMenus"
          :label="activeSortLabel"
-          sub-menu-position="left"
          @update:model-value="handleSortChange"
        />
      </div>
@@ -117,7 +112,6 @@ const handleOrderChange = value => {
          :model-value="activeOrdering"
          :options="orderingMenus"
          :label="activeOrderingLabel"
-          sub-menu-position="left"
          @update:model-value="handleOrderChange"
        />
      </div>
@@ -12,12 +12,7 @@ defineProps({
  showPaginationFooter: { type: Boolean, default: true },
 });

-const emit = defineEmits([
-  'update:currentPage',
-  'update:sort',
-  'search',
-  'create',
-]);
+const emit = defineEmits(['update:currentPage', 'update:sort', 'search']);

 const updateCurrentPage = page => {
  emit('update:currentPage', page);
@@ -36,7 +31,6 @@ const updateCurrentPage = page => {
        :active-ordering="activeOrdering"
        @search="emit('search', $event)"
        @update:sort="emit('update:sort', $event)"
-        @create="emit('create')"
      />
      <main class="flex-1 px-6 overflow-y-auto">
        <div class="w-full mx-auto max-w-5xl py-4">
@@ -1,110 +0,0 @@
-<script setup>
-import { computed, reactive, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import Button from 'dashboard/components-next/button/Button.vue';
-import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
-import Input from 'dashboard/components-next/input/Input.vue';
-import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
-
-defineProps({
-  isLoading: { type: Boolean, default: false },
-});
-
-const emit = defineEmits(['create']);
-
-const { t } = useI18n();
-const dialogRef = ref(null);
-
-const form = reactive({ name: '', domain: '', description: '' });
-
-const isFormInvalid = computed(() => !form.name.trim());
-
-const resetForm = () => {
-  form.name = '';
-  form.domain = '';
-  form.description = '';
-};
-
-const handleConfirm = () => {
-  if (isFormInvalid.value) return;
-
-  emit('create', {
-    name: form.name.trim(),
-    domain: form.domain.trim() || null,
-    description: form.description.trim() || null,
-  });
-};
-
-const closeDialog = () => {
-  dialogRef.value?.close();
-};
-
-const onSuccess = () => {
-  resetForm();
-  closeDialog();
-};
-
-defineExpose({ dialogRef, onSuccess });
-</script>
-
-<template>
-  <Dialog
-    ref="dialogRef"
-    width="3xl"
-    overflow-y-auto
-    @confirm="handleConfirm"
-    @close="resetForm"
-  >
-    <div class="flex flex-col gap-6">
-      <div class="flex flex-col items-start gap-2">
-        <span class="py-1 text-sm font-medium text-n-slate-12">
-          {{ t('COMPANIES.CREATE.TITLE') }}
-        </span>
-        <div class="grid w-full grid-cols-1 gap-4 sm:grid-cols-2">
-          <Input
-            v-model="form.name"
-            :placeholder="t('COMPANIES.DETAIL.PROFILE.FIELDS.NAME')"
-            :disabled="isLoading"
-            custom-input-class="h-8 !pt-1 !pb-1 [&:not(.error,.focus)]:!outline-transparent"
-            autofocus
-          />
-          <Input
-            v-model="form.domain"
-            :placeholder="t('COMPANIES.DETAIL.PROFILE.FIELDS.DOMAIN')"
-            :disabled="isLoading"
-            custom-input-class="h-8 !pt-1 !pb-1 [&:not(.error,.focus)]:!outline-transparent"
-          />
-        </div>
-      </div>
-      <TextArea
-        v-model="form.description"
-        :placeholder="t('COMPANIES.DETAIL.PROFILE.DESCRIPTION_PLACEHOLDER')"
-        :disabled="isLoading"
-        :max-length="280"
-        class="w-full"
-        show-character-count
-        auto-height
-      />
-    </div>
-
-    <template #footer>
-      <div class="flex items-center justify-between w-full gap-3">
-        <Button
-          :label="t('DIALOG.BUTTONS.CANCEL')"
-          variant="link"
-          type="reset"
-          class="h-10 hover:!no-underline hover:text-n-brand"
-          @click="closeDialog"
-        />
-        <Button
-          :label="t('COMPANIES.CREATE.ACTIONS.SAVE')"
-          color="blue"
-          type="submit"
-          :disabled="isFormInvalid || isLoading"
-          :is-loading="isLoading"
-        />
-      </div>
-    </template>
-  </Dialog>
-</template>
@@ -1,354 +0,0 @@
-<script setup>
-import { computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
-import { debounce } from '@chatwoot/utils';
-
-import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
-import Button from 'dashboard/components-next/button/Button.vue';
-import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
-import PaginationFooter from 'dashboard/components-next/pagination/PaginationFooter.vue';
-
-const props = defineProps({
-  company: {
-    type: Object,
-    default: () => ({}),
-  },
-  contacts: {
-    type: Array,
-    default: () => [],
-  },
-  meta: {
-    type: Object,
-    default: () => ({}),
-  },
-  isLoading: {
-    type: Boolean,
-    default: false,
-  },
-  isBusy: {
-    type: Boolean,
-    default: false,
-  },
-  searchResults: {
-    type: Array,
-    default: () => [],
-  },
-  isSearching: {
-    type: Boolean,
-    default: false,
-  },
-  selectedContact: {
-    type: Object,
-    default: null,
-  },
-});
-
-const emit = defineEmits([
-  'cancelContactSelection',
-  'confirmContactSelection',
-  'removeContact',
-  'search',
-  'selectContact',
-  'update:currentPage',
-]);
-
-const route = useRoute();
-const router = useRouter();
-const { t } = useI18n();
-
-const selectedContactId = ref(null);
-const searchQuery = ref('');
-
-const hasContacts = computed(() => props.contacts.length > 0);
-const currentPage = computed(() => Number(props.meta?.page || 1));
-const totalContacts = computed(() => Number(props.meta?.totalCount || 0));
-const linkedContactIds = computed(
-  () => new Set(props.contacts.map(contact => Number(contact.id)))
-);
-const showPaginationFooter = computed(
-  () => hasContacts.value && totalContacts.value > props.contacts.length
-);
-
-const openContact = contactId => {
-  router.push({
-    name: 'contacts_edit',
-    params: {
-      accountId: route.params.accountId,
-      contactId,
-    },
-  });
-};
-
-const contactMeta = contact =>
-  [contact.email, contact.phoneNumber].filter(Boolean).join(' • ');
-
-const contactName = contact =>
-  contact.name || t('COMPANIES.DETAIL.CONTACTS.UNNAMED_CONTACT');
-
-const contactOptions = computed(() =>
-  props.searchResults
-    .filter(
-      contact =>
-        !contact.linkedToCurrentCompany &&
-        !linkedContactIds.value.has(Number(contact.id))
-    )
-    .map(contact => ({
-      value: contact.id,
-      label: [contactName(contact), contact.email, contact.phoneNumber]
-        .filter(Boolean)
-        .join(' · '),
-    }))
-);
-
-const emptyState = computed(() => {
-  if (props.isSearching) {
-    return t('COMPANIES.DETAIL.CONTACTS.LOADING');
-  }
-
-  return searchQuery.value.trim()
-    ? t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.EMPTY')
-    : t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.INITIAL');
-});
-
-const selectedContactName = computed(() =>
-  props.selectedContact ? contactName(props.selectedContact) : ''
-);
-
-const selectedContactMeta = computed(() =>
-  props.selectedContact ? contactMeta(props.selectedContact) : ''
-);
-
-const selectedContactCompanyName = computed(
-  () => props.selectedContact?.company?.name || ''
-);
-
-const summaryRows = computed(() => [
-  {
-    key: 'company',
-    label: t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.COMPANY_LABEL'),
-    avatarName: props.company.name || t('COMPANIES.UNNAMED'),
-    avatarSrc: props.company.avatarUrl,
-    primary: props.company.name || t('COMPANIES.UNNAMED'),
-    secondary: props.company.domain,
-  },
-  {
-    key: 'contact',
-    label: t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.CONTACT_LABEL'),
-    badge: selectedContactCompanyName.value
-      ? t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.CURRENT_COMPANY', {
-          companyName: selectedContactCompanyName.value,
-        })
-      : '',
-    avatarName: selectedContactName.value,
-    avatarSrc: props.selectedContact?.thumbnail,
-    primary: selectedContactName.value,
-    secondary: selectedContactMeta.value,
-  },
-]);
-
-const debouncedSearch = debounce(query => {
-  emit('search', query);
-}, 300);
-
-const handleSearch = query => {
-  searchQuery.value = query;
-  debouncedSearch(query.trim());
-};
-
-const handleContactSelect = contactId => {
-  const selectedContact = props.searchResults.find(
-    contact => contact.id === Number(contactId)
-  );
-
-  selectedContactId.value = null;
-  if (selectedContact) {
-    emit('selectContact', selectedContact);
-  }
-};
-</script>
-
-<template>
-  <div class="flex flex-col gap-6 px-6 pb-8">
-    <div v-if="!selectedContact" class="flex flex-col gap-4">
-      <div class="flex flex-col gap-2">
-        <label class="text-base text-n-slate-12">
-          {{ t('COMPANIES.DETAIL.CONTACTS.ACTIONS.ADD') }}
-        </label>
-        <span class="text-sm text-n-slate-11">
-          {{ t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.DESCRIPTION') }}
-        </span>
-      </div>
-      <ComboBox
-        use-api-results
-        :model-value="selectedContactId"
-        :options="contactOptions"
-        :disabled="isBusy"
-        :empty-state="emptyState"
-        :search-placeholder="
-          t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.SEARCH_PLACEHOLDER')
-        "
-        :placeholder="t('COMPANIES.DETAIL.CONTACTS.ACTIONS.ADD')"
-        class="[&>div>button]:bg-n-alpha-black2"
-        @search="handleSearch"
-        @update:model-value="handleContactSelect"
-      />
-    </div>
-
-    <div v-else class="flex flex-col gap-4">
-      <div class="flex flex-col gap-2">
-        <label class="text-base text-n-slate-12">
-          {{ t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.CONFIRM_TITLE') }}
-        </label>
-        <span class="text-sm text-n-slate-11">
-          {{ t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.CONFIRM_DESCRIPTION') }}
-        </span>
-      </div>
-
-      <div class="flex flex-col gap-4">
-        <div
-          v-for="row in summaryRows"
-          :key="row.key"
-          class="flex flex-col gap-2"
-        >
-          <div class="flex items-center justify-between h-5 gap-2">
-            <label class="text-sm text-n-slate-12">
-              {{ row.label }}
-            </label>
-            <span
-              v-if="row.badge"
-              class="px-2 py-0.5 text-xs rounded-md text-n-amber-11 bg-n-alpha-2"
-            >
-              {{ row.badge }}
-            </span>
-          </div>
-
-          <div
-            class="border border-n-strong h-[60px] gap-2 flex items-center rounded-xl p-3"
-          >
-            <Avatar
-              :name="row.avatarName"
-              :src="row.avatarSrc"
-              :size="32"
-              rounded-full
-              hide-offline-status
-            />
-            <div class="flex flex-col w-full min-w-0 gap-1">
-              <span
-                class="text-sm leading-4 font-medium truncate text-n-slate-12"
-              >
-                {{ row.primary }}
-              </span>
-              <span
-                v-if="row.secondary"
-                class="text-sm leading-4 truncate text-n-slate-11"
-              >
-                {{ row.secondary }}
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="flex items-center justify-between gap-3 mt-2">
-        <Button
-          variant="faded"
-          color="slate"
-          :label="t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.CANCEL')"
-          class="w-full bg-n-alpha-2 text-n-blue-11 hover:bg-n-alpha-3"
-          :disabled="isBusy"
-          @click="emit('cancelContactSelection')"
-        />
-        <Button
-          :label="t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.ADD')"
-          class="w-full"
-          :is-loading="isBusy"
-          :disabled="isBusy"
-          @click="emit('confirmContactSelection')"
-        />
-      </div>
-    </div>
-
-    <div class="flex flex-col gap-3">
-      <div class="flex items-center justify-between gap-3">
-        <h4 class="text-sm font-medium text-n-slate-12">
-          {{ t('COMPANIES.DETAIL.SIDEBAR.TABS.CONTACTS') }}
-        </h4>
-        <span v-if="hasContacts" class="text-xs tabular-nums text-n-slate-11">
-          {{ t('COMPANIES.CONTACTS_COUNT', { n: totalContacts }) }}
-        </span>
-      </div>
-
-      <div
-        v-if="isLoading && !hasContacts"
-        class="py-8 text-sm text-center rounded-xl border border-dashed border-n-weak text-n-slate-11"
-      >
-        {{ t('COMPANIES.DETAIL.CONTACTS.LOADING') }}
-      </div>
-
-      <div
-        v-else-if="!hasContacts"
-        class="py-8 px-4 text-sm text-center rounded-xl border border-dashed border-n-strong text-n-slate-11"
-      >
-        {{ t('COMPANIES.DETAIL.CONTACTS.EMPTY') }}
-      </div>
-
-      <div v-else class="flex flex-col divide-y divide-n-weak">
-        <div
-          v-for="contact in contacts"
-          :key="contact.id"
-          class="flex items-center gap-2 py-3 group/contact"
-        >
-          <button
-            type="button"
-            class="flex items-center flex-1 min-w-0 !p-0 gap-3 text-start rounded-lg transition-colors text-n-slate-12 hover:text-n-blue-11 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-n-brand focus-visible:ring-offset-2 focus-visible:ring-offset-n-background"
-            @click="openContact(contact.id)"
-          >
-            <Avatar
-              :name="contactName(contact)"
-              :src="contact.thumbnail"
-              :size="32"
-              rounded-full
-              hide-offline-status
-            />
-            <div class="min-w-0 space-y-0.5">
-              <span
-                class="text-sm font-medium leading-5 truncate text-n-slate-12"
-              >
-                {{ contactName(contact) }}
-              </span>
-              <p
-                v-if="contactMeta(contact)"
-                class="text-sm leading-5 truncate text-n-slate-11"
-              >
-                {{ contactMeta(contact) }}
-              </p>
-            </div>
-          </button>
-
-          <Button
-            icon="i-lucide-unlink"
-            color="slate"
-            variant="ghost"
-            size="xs"
-            class="shrink-0 opacity-70 transition-opacity sm:opacity-0 sm:group-hover/contact:opacity-100 sm:focus-visible:opacity-100"
-            :disabled="isBusy"
-            :title="t('COMPANIES.DETAIL.CONTACTS.ACTIONS.REMOVE')"
-            :aria-label="t('COMPANIES.DETAIL.CONTACTS.ACTIONS.REMOVE')"
-            @click.stop="emit('removeContact', contact.id)"
-          />
-        </div>
-      </div>
-
-      <PaginationFooter
-        v-if="showPaginationFooter"
-        current-page-info="CONTACTS_LAYOUT.PAGINATION_FOOTER.SHOWING"
-        :current-page="currentPage"
-        :total-items="totalContacts"
-        :items-per-page="15"
-        class="!px-0 before:hidden bg-transparent"
-        @update:current-page="emit('update:currentPage', $event)"
-      />
-    </div>
-  </div>
-</template>
@@ -1,94 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useAlert } from 'dashboard/composables';
-import { useCompaniesStore } from 'dashboard/stores/companies';
-
-import ListAttribute from 'dashboard/components-next/CustomAttributes/ListAttribute.vue';
-import CheckboxAttribute from 'dashboard/components-next/CustomAttributes/CheckboxAttribute.vue';
-import DateAttribute from 'dashboard/components-next/CustomAttributes/DateAttribute.vue';
-import OtherAttribute from 'dashboard/components-next/CustomAttributes/OtherAttribute.vue';
-
-const props = defineProps({
-  companyId: {
-    type: Number,
-    required: true,
-  },
-  attribute: {
-    type: Object,
-    required: true,
-  },
-  isEditingView: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const companiesStore = useCompaniesStore();
-const { t } = useI18n();
-
-const handleDelete = async () => {
-  try {
-    await companiesStore.deleteCustomAttributes({
-      id: props.companyId,
-      customAttributes: [props.attribute.attributeKey],
-    });
-    useAlert(t('COMPANIES.DETAIL.ATTRIBUTES.MESSAGES.DELETE_SUCCESS'));
-  } catch (error) {
-    useAlert(
-      error?.response?.message ||
-        t('COMPANIES.DETAIL.ATTRIBUTES.MESSAGES.DELETE_ERROR')
-    );
-  }
-};
-
-const handleUpdate = async value => {
-  try {
-    await companiesStore.update({
-      id: props.companyId,
-      customAttributes: {
-        [props.attribute.attributeKey]: value,
-      },
-    });
-    useAlert(t('COMPANIES.DETAIL.ATTRIBUTES.MESSAGES.UPDATE_SUCCESS'));
-  } catch (error) {
-    useAlert(
-      error?.response?.message ||
-        t('COMPANIES.DETAIL.ATTRIBUTES.MESSAGES.UPDATE_ERROR')
-    );
-  }
-};
-
-const componentMap = {
-  list: ListAttribute,
-  checkbox: CheckboxAttribute,
-  date: DateAttribute,
-  default: OtherAttribute,
-};
-
-const CurrentAttributeComponent = computed(
-  () =>
-    componentMap[props.attribute.attributeDisplayType] || componentMap.default
-);
-</script>
-
-<template>
-  <div
-    class="grid grid-cols-[140px,1fr] group/attribute items-center w-full gap-2"
-    :class="isEditingView ? 'min-h-10' : 'min-h-11'"
-  >
-    <div class="flex items-center justify-between truncate">
-      <span class="text-sm font-medium truncate text-n-slate-12">
-        {{ attribute.attributeDisplayName }}
-      </span>
-    </div>
-
-    <component
-      :is="CurrentAttributeComponent"
-      :attribute="attribute"
-      :is-editing-view="isEditingView"
-      @update="handleUpdate"
-      @delete="handleDelete"
-    />
-  </div>
-</template>
@@ -1,142 +0,0 @@
-<script setup>
-import { computed, onMounted, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useMapGetter, useStore } from 'dashboard/composables/store';
-
-import CompanyCustomAttributeItem from 'dashboard/components-next/Companies/CompanyDetail/CompanyCustomAttributeItem.vue';
-
-const props = defineProps({
-  company: {
-    type: Object,
-    default: () => ({}),
-  },
-});
-
-const { t } = useI18n();
-const store = useStore();
-
-const searchQuery = ref('');
-const companyAttributes = useMapGetter('attributes/getCompanyAttributes');
-
-const customAttributes = computed(() => props.company?.customAttributes || {});
-const hasCompanyAttributes = computed(
-  () => companyAttributes.value?.length > 0
-);
-
-const processCompanyAttributes = (
-  attributes,
-  attributeValues,
-  filterCondition
-) => {
-  if (!attributes.length) {
-    return [];
-  }
-
-  return attributes.reduce((result, attribute) => {
-    const { attributeKey } = attribute;
-
-    if (filterCondition(attributeKey, attributeValues)) {
-      result.push({
-        ...attribute,
-        value: attributeValues[attributeKey] ?? '',
-      });
-    }
-
-    return result;
-  }, []);
-};
-
-const usedAttributes = computed(() =>
-  processCompanyAttributes(
-    companyAttributes.value,
-    customAttributes.value,
-    (key, values) => key in values
-  )
-);
-
-const unusedAttributes = computed(() =>
-  processCompanyAttributes(
-    companyAttributes.value,
-    customAttributes.value,
-    (key, values) => !(key in values)
-  )
-);
-
-const filteredUnusedAttributes = computed(() =>
-  unusedAttributes.value.filter(attribute =>
-    attribute.attributeDisplayName
-      .toLowerCase()
-      .includes(searchQuery.value.toLowerCase())
-  )
-);
-
-const unusedAttributesCount = computed(() => unusedAttributes.value.length);
-const hasNoUnusedAttributes = computed(() => unusedAttributesCount.value === 0);
-const hasNoUsedAttributes = computed(() => usedAttributes.value.length === 0);
-
-onMounted(() => {
-  store.dispatch('attributes/get');
-});
-</script>
-
-<template>
-  <div v-if="hasCompanyAttributes" class="flex flex-col gap-6 px-6 py-6">
-    <div v-if="!hasNoUsedAttributes" class="flex flex-col gap-2">
-      <CompanyCustomAttributeItem
-        v-for="attribute in usedAttributes"
-        :key="`${company.id}-${attribute.id}`"
-        is-editing-view
-        :company-id="company.id"
-        :attribute="attribute"
-      />
-    </div>
-
-    <div v-if="!hasNoUnusedAttributes" class="flex items-center gap-3">
-      <div class="flex-1 h-px bg-n-slate-5" />
-      <span class="text-sm font-medium text-n-slate-10">
-        {{
-          t('COMPANIES.DETAIL.ATTRIBUTES.UNUSED_ATTRIBUTES', {
-            count: unusedAttributesCount,
-          })
-        }}
-      </span>
-      <div class="flex-1 h-px bg-n-slate-5" />
-    </div>
-
-    <div class="flex flex-col gap-3">
-      <div v-if="!hasNoUnusedAttributes" class="relative">
-        <span
-          class="absolute i-lucide-search size-3.5 top-2 ltr:left-3 rtl:right-3"
-        />
-        <input
-          v-model="searchQuery"
-          type="search"
-          :placeholder="t('COMPANIES.DETAIL.ATTRIBUTES.SEARCH_PLACEHOLDER')"
-          class="w-full h-8 py-2 pl-10 pr-2 text-sm reset-base outline-none border-none rounded-lg bg-n-alpha-black2 dark:bg-n-solid-1 text-n-slate-12"
-        />
-      </div>
-
-      <div
-        v-if="filteredUnusedAttributes.length === 0 && !hasNoUnusedAttributes"
-        class="flex items-center justify-start h-11"
-      >
-        <p class="text-sm text-n-slate-11">
-          {{ t('COMPANIES.DETAIL.ATTRIBUTES.NO_ATTRIBUTES') }}
-        </p>
-      </div>
-
-      <div v-if="!hasNoUnusedAttributes" class="flex flex-col gap-2">
-        <CompanyCustomAttributeItem
-          v-for="attribute in filteredUnusedAttributes"
-          :key="`${company.id}-${attribute.id}`"
-          :company-id="company.id"
-          :attribute="attribute"
-        />
-      </div>
-    </div>
-  </div>
-
-  <p v-else class="px-6 py-10 text-sm leading-6 text-center text-n-slate-11">
-    {{ t('COMPANIES.DETAIL.ATTRIBUTES.EMPTY_STATE') }}
-  </p>
-</template>
@@ -1,67 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useMapGetter } from 'dashboard/composables/store';
-
-import ConversationCard from 'dashboard/components-next/Conversation/ConversationCard/ConversationCard.vue';
-import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
-
-defineProps({
-  conversations: {
-    type: Array,
-    default: () => [],
-  },
-  isLoading: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const { t } = useI18n();
-const contactsById = useMapGetter('contacts/getContactById');
-const stateInbox = useMapGetter('inboxes/getInboxById');
-const accountLabels = useMapGetter('labels/getLabels');
-
-const accountLabelsValue = computed(() => accountLabels.value);
-const conversationContact = conversation => {
-  const sender = conversation.meta?.sender || {};
-  const contact = contactsById.value(sender.id);
-  return contact.id ? contact : sender;
-};
-const conversationInbox = conversation =>
-  stateInbox.value(conversation.inboxId) || {
-    name: '',
-    channelType: conversation.meta?.channel,
-  };
-</script>
-
-<template>
-  <div
-    v-if="isLoading"
-    class="flex items-center justify-center py-10 text-n-slate-11"
-  >
-    <Spinner />
-  </div>
-
-  <div
-    v-else-if="conversations.length > 0"
-    class="px-6 divide-y divide-n-strong [&>*:hover]:!border-y-transparent [&>*:hover+*]:!border-t-transparent"
-  >
-    <ConversationCard
-      v-for="conversation in conversations"
-      :key="conversation.id"
-      :conversation="conversation"
-      :contact="conversationContact(conversation)"
-      :state-inbox="conversationInbox(conversation)"
-      :account-labels="accountLabelsValue"
-      class="rounded-none hover:rounded-xl hover:bg-n-alpha-1 dark:hover:bg-n-alpha-3"
-    />
-  </div>
-
-  <p
-    v-else
-    class="py-8 px-4 mx-6 text-sm text-center rounded-xl border border-dashed border-n-strong text-n-slate-11"
-  >
-    {{ t('COMPANIES.DETAIL.HISTORY.EMPTY') }}
-  </p>
-</template>
@@ -1,114 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
-import { useMapGetter } from 'dashboard/composables/store';
-import { dynamicTime } from 'shared/helpers/timeHelper';
-import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
-
-import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
-import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
-
-const props = defineProps({
-  notes: {
-    type: Array,
-    default: () => [],
-  },
-  isLoading: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const route = useRoute();
-const router = useRouter();
-const { t } = useI18n();
-const { formatMessage } = useMessageFormatter();
-const currentUser = useMapGetter('getCurrentUser');
-
-const hasNotes = computed(() => props.notes.length > 0);
-
-const contactName = contact =>
-  contact?.name || t('COMPANIES.DETAIL.CONTACTS.UNNAMED_CONTACT');
-
-const getWrittenBy = note => {
-  const isCurrentUser = note?.user?.id === currentUser.value.id;
-  return isCurrentUser
-    ? t('CONTACTS_LAYOUT.SIDEBAR.NOTES.YOU')
-    : note?.user?.name || 'Bot';
-};
-
-const openContact = contactId => {
-  router.push({
-    name: 'contacts_edit',
-    params: {
-      accountId: route.params.accountId,
-      contactId,
-    },
-  });
-};
-</script>
-
-<template>
-  <div v-if="hasNotes" class="flex flex-col px-6">
-    <div class="flex flex-col divide-y divide-n-strong">
-      <div
-        v-for="note in notes"
-        :key="note.id"
-        class="flex flex-col gap-2 py-4 group/note"
-      >
-        <div class="flex items-center gap-1.5 min-w-0">
-          <Avatar
-            :name="contactName(note.contact)"
-            :src="note.contact?.thumbnail"
-            :size="16"
-            rounded-full
-            hide-offline-status
-          />
-          <div
-            class="flex items-center justify-between min-w-0 gap-1 w-full text-sm text-n-slate-11"
-          >
-            <button
-              type="button"
-              class="min-w-0 font-medium truncate text-start text-n-slate-12 hover:text-n-blue-11 p-0"
-              @click="openContact(note.contact.id)"
-            >
-              {{ contactName(note.contact) }}
-            </button>
-            <div class="min-w-0 truncate">
-              <span
-                class="inline-flex items-center gap-1 text-sm text-n-slate-10"
-              >
-                <span class="font-medium text-n-slate-11">
-                  {{ getWrittenBy(note) }}
-                </span>
-                {{ t('CONTACTS_LAYOUT.SIDEBAR.NOTES.WROTE') }}
-                <span class="font-medium text-n-slate-11">
-                  {{ dynamicTime(note.createdAt) }}
-                </span>
-              </span>
-            </div>
-          </div>
-        </div>
-        <p
-          v-dompurify-html="formatMessage(note.content || '')"
-          class="mb-0 prose-sm prose-p:text-sm prose-p:leading-relaxed prose-p:mb-1 prose-p:mt-0 prose-ul:mb-1 prose-ul:mt-0 text-n-slate-12"
-        />
-      </div>
-    </div>
-  </div>
-
-  <div
-    v-else-if="isLoading"
-    class="flex items-center justify-center py-10 text-n-slate-11"
-  >
-    <Spinner />
-  </div>
-
-  <p
-    v-else
-    class="py-8 mx-6 px-4 text-sm text-center rounded-xl border border-dashed border-n-strong text-n-slate-11"
-  >
-    {{ t('COMPANIES.DETAIL.NOTES.EMPTY') }}
-  </p>
-</template>
@@ -1,203 +0,0 @@
-<script setup>
-import { computed, reactive, ref, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useAlert } from 'dashboard/composables';
-import { dynamicTime } from 'shared/helpers/timeHelper';
-
-import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
-import Button from 'dashboard/components-next/button/Button.vue';
-import Input from 'dashboard/components-next/input/Input.vue';
-import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
-import { useCompaniesStore } from 'dashboard/stores/companies';
-
-const props = defineProps({
-  company: { type: Object, default: () => ({}) },
-  isLoading: { type: Boolean, default: false },
-});
-
-const { t } = useI18n();
-const companiesStore = useCompaniesStore();
-
-const form = reactive({ name: '', domain: '', description: '' });
-const avatarPreviewUrl = ref('');
-const isUploadingAvatar = ref(false);
-
-const uiFlags = computed(() => companiesStore.getUIFlags);
-const isUpdating = computed(() => uiFlags.value.updatingItem);
-const isAvatarBusy = computed(
-  () =>
-    isUploadingAvatar.value || uiFlags.value.deletingAvatar || isUpdating.value
-);
-
-const displayName = computed(
-  () => props.company?.name || t('COMPANIES.UNNAMED')
-);
-const avatarSource = computed(
-  () => avatarPreviewUrl.value || props.company?.avatarUrl || ''
-);
-const isFormInvalid = computed(() => !form.name.trim());
-const hasChanges = computed(
-  () =>
-    form.name.trim() !== (props.company?.name || '').trim() ||
-    form.domain.trim() !== (props.company?.domain || '').trim() ||
-    form.description.trim() !== (props.company?.description || '').trim()
-);
-
-const summary = computed(() => {
-  const { createdAt, lastActivityAt } = props.company || {};
-  return [
-    createdAt &&
-      t('COMPANIES.DETAIL.PROFILE.CREATED_AT', {
-        date: dynamicTime(createdAt),
-      }),
-    lastActivityAt &&
-      t('COMPANIES.DETAIL.PROFILE.LAST_ACTIVE', {
-        date: dynamicTime(lastActivityAt),
-      }),
-  ]
-    .filter(Boolean)
-    .join(' • ');
-});
-
-const syncForm = company => {
-  form.name = company?.name || '';
-  form.domain = company?.domain || '';
-  form.description = company?.description || '';
-};
-
-const isCurrentCompany = companyId => Number(props.company?.id) === companyId;
-
-watch(
-  () => [
-    props.company?.id,
-    props.company?.name,
-    props.company?.domain,
-    props.company?.description,
-    props.company?.avatarUrl,
-  ],
-  () => {
-    avatarPreviewUrl.value = '';
-    syncForm(props.company);
-  },
-  { immediate: true }
-);
-
-const handleAvatarUpload = async ({ file, url }) => {
-  avatarPreviewUrl.value = url;
-  isUploadingAvatar.value = true;
-  try {
-    await companiesStore.update({ id: props.company.id, avatar: file });
-    useAlert(t('COMPANIES.DETAIL.AVATAR.UPLOAD_SUCCESS'));
-  } catch {
-    avatarPreviewUrl.value = '';
-    useAlert(t('COMPANIES.DETAIL.AVATAR.UPLOAD_ERROR'));
-  } finally {
-    isUploadingAvatar.value = false;
-  }
-};
-
-const handleAvatarDelete = async () => {
-  try {
-    await companiesStore.deleteCompanyAvatar(props.company.id);
-    avatarPreviewUrl.value = '';
-    useAlert(t('COMPANIES.DETAIL.AVATAR.DELETE_SUCCESS'));
-  } catch {
-    useAlert(t('COMPANIES.DETAIL.AVATAR.DELETE_ERROR'));
-  }
-};
-
-const handleUpdateCompany = async () => {
-  const companyId = Number(props.company.id);
-
-  try {
-    const updated = await companiesStore.update({
-      id: companyId,
-      name: form.name.trim(),
-      domain: form.domain.trim() || null,
-      description: form.description.trim() || null,
-    });
-    if (!isCurrentCompany(companyId)) return;
-
-    syncForm(updated);
-    useAlert(t('COMPANIES.DETAIL.PROFILE.MESSAGES.UPDATE_SUCCESS'));
-  } catch {
-    if (!isCurrentCompany(companyId)) return;
-
-    syncForm(props.company);
-    useAlert(t('COMPANIES.DETAIL.PROFILE.MESSAGES.UPDATE_ERROR'));
-  }
-};
-</script>
-
-<template>
-  <div v-if="isLoading && !company?.id" class="text-sm text-n-slate-11">
-    {{ t('COMPANIES.DETAIL.LOADING') }}
-  </div>
-
-  <div v-else-if="company?.id" class="flex flex-col items-start gap-8 pb-6">
-    <div class="flex flex-col items-start gap-3">
-      <Avatar
-        :name="displayName"
-        :src="avatarSource"
-        :size="72"
-        :allow-upload="!isAvatarBusy"
-        rounded-full
-        hide-offline-status
-        @upload="handleAvatarUpload"
-        @delete="handleAvatarDelete"
-      />
-
-      <div class="flex flex-col gap-1">
-        <h3 class="text-base font-medium text-n-slate-12">
-          {{ displayName }}
-        </h3>
-        <span class="text-sm leading-6 text-n-slate-11">{{ summary }}</span>
-        <p
-          v-if="isUploadingAvatar || uiFlags.deletingAvatar"
-          class="text-sm text-n-slate-11"
-        >
-          {{ t('COMPANIES.DETAIL.AVATAR.UPDATING') }}
-        </p>
-      </div>
-    </div>
-
-    <div class="flex flex-col items-start w-full gap-6">
-      <span class="py-1 text-sm font-medium text-n-slate-12">
-        {{ t('COMPANIES.DETAIL.PROFILE.TITLE') }}
-      </span>
-
-      <div class="grid w-full gap-4 sm:grid-cols-2">
-        <Input
-          v-model="form.name"
-          :placeholder="t('COMPANIES.DETAIL.PROFILE.FIELDS.NAME')"
-          :disabled="isUpdating"
-          custom-input-class="h-8 !pt-1 !pb-1"
-        />
-        <Input
-          v-model="form.domain"
-          :placeholder="t('COMPANIES.DETAIL.PROFILE.FIELDS.DOMAIN')"
-          :disabled="isUpdating"
-          custom-input-class="h-8 !pt-1 !pb-1"
-        />
-      </div>
-
-      <TextArea
-        v-model="form.description"
-        :placeholder="t('COMPANIES.DETAIL.PROFILE.DESCRIPTION_PLACEHOLDER')"
-        :disabled="isUpdating"
-        :max-length="280"
-        class="w-full"
-        show-character-count
-        auto-height
-      />
-
-      <Button
-        :label="t('COMPANIES.DETAIL.PROFILE.ACTIONS.SAVE')"
-        size="sm"
-        :is-loading="isUpdating"
-        :disabled="isUpdating || isFormInvalid || !hasChanges"
-        @click="handleUpdateCompany"
-      />
-    </div>
-  </div>
-</template>
@@ -1,45 +0,0 @@
-<script setup>
-import { computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
-
-const props = defineProps({
-  company: {
-    type: Object,
-    default: () => ({}),
-  },
-  isLoading: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const emit = defineEmits(['confirm']);
-
-const { t } = useI18n();
-
-const dialogRef = ref(null);
-
-const description = computed(() =>
-  props.company?.name
-    ? t('COMPANIES.DETAIL.DELETE.DESCRIPTION_WITH_NAME', {
-        companyName: props.company.name,
-      })
-    : t('COMPANIES.DETAIL.DELETE.DESCRIPTION')
-);
-
-defineExpose({ dialogRef });
-</script>
-
-<template>
-  <Dialog
-    ref="dialogRef"
-    type="alert"
-    :title="t('COMPANIES.DETAIL.DELETE.TITLE')"
-    :description="description"
-    :confirm-button-label="t('COMPANIES.DETAIL.DELETE.CONFIRM')"
-    :is-loading="isLoading"
-    @confirm="emit('confirm')"
-  />
-</template>
@@ -51,6 +51,7 @@ const isFormInvalid = computed(() => contactsFormRef.value?.isFormInvalid);

 const countriesMap = computed(() => {
  return countries.reduce((acc, country) => {
+    acc[country.code] = country;
    acc[country.id] = country;
    return acc;
  }, {});
@@ -32,7 +32,7 @@ const emit = defineEmits([
 </script>

 <template>
-  <header class="sticky top-0 z-20 px-6">
+  <header class="sticky top-0 z-10 px-6">
    <div
      class="flex items-start sm:items-center justify-between w-full py-6 gap-2 mx-auto max-w-5xl"
    >
@@ -105,7 +105,7 @@ const handleOrderChange = value => {
    <div
      v-if="isMenuOpen"
      v-on-clickaway="() => (isMenuOpen = false)"
-      class="absolute top-full mt-1 ltr:-right-32 rtl:-left-32 sm:ltr:right-0 sm:rtl:left-0 flex flex-col gap-4 bg-n-alpha-3 backdrop-blur-[100px] border border-n-weak w-72 rounded-xl p-4 z-50"
+      class="absolute top-full mt-1 ltr:-right-32 rtl:-left-32 sm:ltr:right-0 sm:rtl:left-0 flex flex-col gap-4 bg-n-alpha-3 backdrop-blur-[100px] border border-n-weak w-72 rounded-xl p-4"
    >
      <div class="flex items-center justify-between gap-2">
        <span class="text-sm text-n-slate-12">
@@ -3,20 +3,10 @@ import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useMapGetter, useStore } from 'dashboard/composables/store';
-import {
-  isVoiceCallEnabled,
-  getVoiceCallProvider,
-  VOICE_CALL_PROVIDERS,
-} from 'dashboard/helper/inbox';
-import {
-  VOICE_CALL_DIRECTION,
-  VOICE_CALL_OUTBOUND_INIT_STATUS,
-} from 'dashboard/components-next/message/constants';
+import { INBOX_TYPES } from 'dashboard/helper/inbox';
 import { useAlert } from 'dashboard/composables';
 import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
-import { useCallsStore } from 'dashboard/stores/calls';
-import { useWhatsappCallSession } from 'dashboard/composables/useWhatsappCallSession';
-import ContactAPI from 'dashboard/api/contacts';
+import { useVoiceCallsStore } from 'dashboard/stores/voiceCalls';

 import Button from 'dashboard/components-next/button/Button.vue';
 import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
@@ -24,9 +14,6 @@ import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
 const props = defineProps({
  phone: { type: String, default: '' },
  contactId: { type: [String, Number], required: true },
-  // When set, the WhatsApp call continues in this conversation (matching the
-  // header button) instead of looking up the contact's most recent one.
-  conversationId: { type: [String, Number], default: null },
  label: { type: String, default: '' },
  icon: { type: [String, Object, Function], default: '' },
  size: { type: String, default: 'sm' },
@@ -43,12 +30,13 @@ const { t } = useI18n();

 const dialogRef = ref(null);

-const callsStore = useCallsStore();
 const inboxesList = useMapGetter('inboxes/getInboxes');
 const contactsUiFlags = useMapGetter('contacts/getUIFlags');

 const voiceInboxes = computed(() =>
-  (inboxesList.value || []).filter(isVoiceCallEnabled)
+  (inboxesList.value || []).filter(
+    inbox => inbox.channel_type === INBOX_TYPES.VOICE
+  )
 );
 const hasVoiceInboxes = computed(() => voiceInboxes.value.length > 0);

@@ -58,16 +46,6 @@ const isInitiatingCall = computed(() => {
  return contactsUiFlags.value?.isInitiatingCall || false;
 });

-// Mirror the conversation-header button: block a new call whenever any provider
-// call is already active or ringing, otherwise starting a WhatsApp call here
-// would leave a still-live Twilio (or other) session with no visible control.
-const isCallButtonDisabled = computed(
-  () =>
-    callsStore.hasActiveCall ||
-    callsStore.hasIncomingCall ||
-    isInitiatingCall.value
-);
-
 const navigateToConversation = conversationId => {
  const accountId = route.params.accountId;
  if (conversationId && accountId) {
@@ -81,96 +59,24 @@ const navigateToConversation = conversationId => {
  }
 };

-const whatsappCallSession = useWhatsappCallSession();
-
-// Find the most recent open conversation for this contact in the picked inbox.
-// WhatsApp /initiate is conversation-scoped (unlike Twilio's contact-scoped path).
-// Pass inboxId so the BE applies the filter before the 20-row cap — without it,
-// contacts whose latest WhatsApp conversation falls outside the 20 most recent
-// across all inboxes would be treated as having no conversation.
-const findWhatsappConversationId = async inboxId => {
-  const { data } = await ContactAPI.getConversations(props.contactId, {
-    inboxId,
-  });
-  const conversations = data?.payload || [];
-  const match = [...conversations].sort(
-    (a, b) => (b.last_activity_at || 0) - (a.last_activity_at || 0)
-  )[0];
-  return match?.id || null;
-};
-
-const startWhatsappCall = async (inboxId, conversationIdHint) => {
-  // WhatsApp /initiate is conversation-scoped, so we must hand it a
-  // conversation. Use the caller's hint when given (in-conversation flow);
-  // otherwise pick the most recent one in the inbox.
-  const conversationId =
-    conversationIdHint || (await findWhatsappConversationId(inboxId));
-  if (!conversationId) {
-    useAlert(t('CONTACT_PANEL.CALL_FAILED'));
-    return;
-  }
-
-  const response =
-    await whatsappCallSession.initiateOutboundCall(conversationId);
-  // The composable returns { status: 'locked' } when an init is already in
-  // flight or a call is already active; treat that as a soft no-op rather than
-  // claiming success.
-  if (response?.status === VOICE_CALL_OUTBOUND_INIT_STATUS.LOCKED) return;
-  if (!response?.id) {
-    // Permission template path returns no call id. Mirror the header button and
-    // surface whether the request was just sent or is already pending instead of
-    // claiming the call started. The permission message lands in the
-    // conversation, so still navigate there.
-    const messageKey =
-      response?.status === VOICE_CALL_OUTBOUND_INIT_STATUS.PERMISSION_PENDING
-        ? 'CONTACT_PANEL.WHATSAPP_CALL_PERMISSION_PENDING'
-        : 'CONTACT_PANEL.WHATSAPP_CALL_PERMISSION_REQUESTED';
-    useAlert(t(messageKey));
-    navigateToConversation(conversationId);
-    return;
-  }
-
-  // Stay non-active until the connect cable event arrives — flipping to active
-  // here would start the duration timer before the contact picks up.
-  callsStore.addCall({
-    callSid: response.call_id,
-    callId: response.id,
-    conversationId,
-    inboxId,
-    callDirection: VOICE_CALL_DIRECTION.OUTBOUND,
-    provider: VOICE_CALL_PROVIDERS.WHATSAPP,
-  });
-
-  useAlert(t('CONTACT_PANEL.CALL_INITIATED'));
-  navigateToConversation(conversationId);
-};
-
-const startCall = async (inboxId, conversationIdHint = null) => {
-  if (isCallButtonDisabled.value) return;
-
-  const inbox = (inboxesList.value || []).find(i => i.id === inboxId);
-  if (getVoiceCallProvider(inbox) === VOICE_CALL_PROVIDERS.WHATSAPP) {
-    try {
-      await startWhatsappCall(inboxId, conversationIdHint);
-    } catch (error) {
-      useAlert(error?.message || t('CONTACT_PANEL.CALL_FAILED'));
-    }
-    return;
-  }
+const startCall = async inboxId => {
+  if (isInitiatingCall.value) return;

  try {
    const response = await store.dispatch('contacts/initiateCall', {
      contactId: props.contactId,
      inboxId,
-      conversationId: conversationIdHint,
    });
-    const { call_sid: callSid, conversation_id: conversationId } = response;

-    callsStore.addCall({
-      callSid,
-      conversationId,
-      inboxId,
-      callDirection: VOICE_CALL_DIRECTION.OUTBOUND,
+    const voiceCallsStore = useVoiceCallsStore();
+    voiceCallsStore.setActiveCall({
+      id: response.call_id,
+      callId: response.call_sid,
+      provider: response.provider || 'twilio',
+      direction: 'outbound',
+      status: 'ringing',
+      conversationId: response.conversation_id,
+      caller: null,
    });

    useAlert(t('CONTACT_PANEL.CALL_INITIATED'));
@@ -182,22 +88,6 @@ const startCall = async (inboxId, conversationIdHint = null) => {
 };

 const onClick = async () => {
-  // In conversation context, only stay in this conversation if its inbox is
-  // itself voice-capable (works the same for Twilio and WhatsApp). For
-  // non-voice channels (email, web, …) fall back to the picker so the call
-  // goes out via a voice inbox.
-  if (props.conversationId) {
-    const conversation = store.getters.getConversationById(
-      props.conversationId
-    );
-    const conversationInbox = (inboxesList.value || []).find(
-      i => i.id === conversation?.inbox_id
-    );
-    if (conversationInbox && isVoiceCallEnabled(conversationInbox)) {
-      await startCall(conversationInbox.id, props.conversationId);
-      return;
-    }
-  }
  if (voiceInboxes.value.length > 1) {
    dialogRef.value?.open();
    return;
@@ -218,7 +108,7 @@ const onPickInbox = async inbox => {
      v-if="shouldRender"
      v-tooltip.top-end="tooltipLabel || null"
      v-bind="attrs"
-      :disabled="isCallButtonDisabled"
+      :disabled="isInitiatingCall"
      :is-loading="isInitiatingCall"
      :label="label"
      :icon="icon"
@@ -35,16 +35,10 @@ const emit = defineEmits([
 const lastMessageInChat = computed(() => getLastMessage(props.chat));
 const showLabelsSection = computed(() => props.chat.labels?.length > 0);

-const voiceCallData = computed(() => {
-  const last = lastMessageInChat.value;
-  if (last?.content_type !== 'voice_call' || !last.call) {
-    return { status: null, direction: null };
-  }
-  return {
-    status: last.call.status,
-    direction: last.call.direction === 'outgoing' ? 'outbound' : 'inbound',
-  };
-});
+const voiceCallData = computed(() => ({
+  status: props.chat.additional_attributes?.call_status,
+  direction: props.chat.additional_attributes?.call_direction,
+}));

 const unreadCount = computed(() => props.chat.unread_count);

@@ -134,7 +134,7 @@ const handleInputUpdate = async () => {
        :message-type="hasError ? 'error' : 'info'"
        autofocus
        custom-input-class="h-8 ltr:rounded-r-none rtl:rounded-l-none"
-        @enter="handleInputUpdate"
+        @keyup.enter="handleInputUpdate"
      />
      <Button
        icon="i-lucide-check"
@@ -49,11 +49,7 @@ const rules = computed(() => ({
      props.attribute.regexPattern && {
        regexValidation: value => {
          if (!value) return true;
-          try {
-            return getRegexp(props.attribute.regexPattern).test(value);
-          } catch {
-            return false;
-          }
+          return getRegexp(props.attribute.regexPattern).test(value);
        },
      }),
  },
@@ -191,7 +187,7 @@ const handleInputUpdate = async () => {
        :message="attributeErrorMessage"
        :message-type="hasError ? 'error' : 'info'"
        custom-input-class="h-8 ltr:rounded-r-none rtl:rounded-l-none"
-        @enter="handleInputUpdate"
+        @keyup.enter="handleInputUpdate"
      />
      <Button
        icon="i-lucide-check"
@@ -142,26 +142,28 @@ watch(

 <style lang="scss" scoped>
 .editor-wrapper {
-  :deep(.ProseMirror-menubar-wrapper) {
-    .ProseMirror.ProseMirror-woot-style {
-      p {
-        @apply first:mt-0 !important;
-      }
+  ::v-deep {
+    .ProseMirror-menubar-wrapper {
+      .ProseMirror.ProseMirror-woot-style {
+        p {
+          @apply first:mt-0 !important;
+        }

-      .empty-node {
-        @apply m-0 !important;
+        .empty-node {
+          @apply m-0 !important;

-        &::before {
-          @apply text-n-slate-11 dark:text-n-slate-11;
+          &::before {
+            @apply text-n-slate-11 dark:text-n-slate-11;
+          }
        }
      }
-    }

-    .ProseMirror-menubar {
-      width: fit-content !important;
-      position: relative !important;
-      top: unset !important;
-      @apply ltr:left-[-0.188rem] rtl:right-[-0.188rem] !important;
+      .ProseMirror-menubar {
+        width: fit-content !important;
+        position: relative !important;
+        top: unset !important;
+        @apply ltr:left-[-0.188rem] rtl:right-[-0.188rem] !important;
+      }
    }
  }
 }
@@ -145,43 +145,45 @@ const handleCreateArticle = event => {
 </template>

 <style lang="scss" scoped>
-:deep(.ProseMirror .empty-node::before) {
-  @apply text-n-slate-10 text-base;
-}
-
-:deep(.ProseMirror-menubar-wrapper) {
-  .ProseMirror-woot-style {
-    @apply min-h-[15rem] max-h-full;
+::v-deep {
+  .ProseMirror .empty-node::before {
+    @apply text-n-slate-10 text-base;
  }
-}

-:deep(.ProseMirror-menubar) {
-  display: none; // Hide by default
-}
-
-:deep(.editor-root .has-selection) {
-  .ProseMirror-menubar:not(:has(*)) {
-    display: none !important;
+  .ProseMirror-menubar-wrapper {
+    .ProseMirror-woot-style {
+      @apply min-h-[15rem] max-h-full;
+    }
  }

  .ProseMirror-menubar {
-    @apply rounded-lg !px-3 !py-1.5 z-50 bg-n-background items-center gap-4 ml-0 mb-0 shadow-md outline outline-1 outline-n-weak;
-    display: flex;
-    top: var(--selection-top, auto) !important;
-    left: var(--selection-left, 0) !important;
-    width: fit-content !important;
-    position: absolute !important;
+    display: none; // Hide by default
+  }

-    .ProseMirror-menuitem {
-      @apply ltr:mr-0 rtl:ml-0 size-4 flex items-center;
-
-      .ProseMirror-icon {
-        @apply p-0.5 flex-shrink-0 ltr:mr-2 rtl:ml-2;
-      }
+  .editor-root .has-selection {
+    .ProseMirror-menubar:not(:has(*)) {
+      display: none !important;
    }

-    .ProseMirror-menu-active {
-      @apply bg-n-slate-3;
+    .ProseMirror-menubar {
+      @apply rounded-lg !px-3 !py-1.5 z-50 bg-n-background items-center gap-4 ml-0 mb-0 shadow-md outline outline-1 outline-n-weak;
+      display: flex;
+      top: var(--selection-top, auto) !important;
+      left: var(--selection-left, 0) !important;
+      width: fit-content !important;
+      position: absolute !important;
+
+      .ProseMirror-menuitem {
+        @apply ltr:mr-0 rtl:ml-0 size-4 flex items-center;
+
+        .ProseMirror-icon {
+          @apply p-0.5 flex-shrink-0 ltr:mr-2 rtl:ml-2;
+        }
+      }
+
+      .ProseMirror-menu-active {
+        @apply bg-n-slate-3;
+      }
    }
  }
 }
@@ -84,20 +84,28 @@ const findCategoryFromSlug = slug => {
  return categories.value?.find(category => category.slug === slug);
 };

+const assignCategoryFromSlug = slug => {
+  const categoryFromSlug = findCategoryFromSlug(slug);
+  if (categoryFromSlug) {
+    selectedCategoryId.value = categoryFromSlug.id;
+    return categoryFromSlug;
+  }
+  return null;
+};
+
 const selectedCategory = computed(() => {
  if (isNewArticle.value) {
-    if (selectedCategoryId.value) {
-      return (
-        categories.value?.find(c => c.id === selectedCategoryId.value) || null
-      );
-    }
    if (categorySlugFromRoute.value) {
-      const categoryFromSlug = findCategoryFromSlug(
+      const categoryFromSlug = assignCategoryFromSlug(
        categorySlugFromRoute.value
      );
      if (categoryFromSlug) return categoryFromSlug;
    }
-    return categories.value?.[0] || null;
+    return selectedCategoryId.value
+      ? categories.value.find(
+          category => category.id === selectedCategoryId.value
+        )
+      : categories.value[0] || null;
  }
  return categories.value.find(
    category => category.id === props.article?.category?.id
@@ -193,7 +201,7 @@ onMounted(() => {
          v-if="openAgentsList && hasAgentList"
          :menu-items="agentList"
          show-search
-          class="z-[100] w-48 mt-2 ltr:left-0 rtl:right-0 top-full max-h-60"
+          class="z-[100] w-48 mt-2 overflow-y-auto ltr:left-0 rtl:right-0 top-full max-h-60"
          @action="handleArticleAction"
        />
      </OnClickOutside>
@@ -225,7 +233,7 @@ onMounted(() => {
          v-if="openCategoryList && hasCategoryMenuItems"
          :menu-items="categoryList"
          show-search
-          class="w-48 mt-2 z-[100] left-0 top-full max-h-60"
+          class="w-48 mt-2 z-[100] overflow-y-auto left-0 top-full max-h-60"
          @action="handleArticleAction"
        />
      </OnClickOutside>
@@ -159,7 +159,7 @@ const handleTabChange = value => {
              v-if="isLocaleMenuOpen"
              :menu-items="localeMenuItems"
              show-search
-              class="left-0 w-40 max-w-[300px] mt-2 xl:right-0 top-full max-h-60"
+              class="left-0 w-40 max-w-[300px] mt-2 overflow-y-auto xl:right-0 top-full max-h-60"
              @action="handleLocaleAction"
            />
          </OnClickOutside>
@@ -180,7 +180,7 @@ const handleTabChange = value => {
              v-if="isCategoryMenuOpen"
              :menu-items="categoryMenuItems"
              show-search
-              class="left-0 w-48 mt-2 xl:right-0 top-full max-h-60"
+              class="left-0 w-48 mt-2 overflow-y-auto xl:right-0 top-full max-h-60"
              @action="handleCategoryAction"
            />
          </OnClickOutside>
@@ -2,7 +2,6 @@
 import { ref, computed, watch } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { OnClickOutside } from '@vueuse/components';
 import { useMapGetter } from 'dashboard/composables/store.js';
 import { useConfig } from 'dashboard/composables/useConfig';
 import { ARTICLE_TABS, CATEGORY_ALL } from 'dashboard/helper/portalHelper';
@@ -19,7 +18,6 @@ import ArticleEmptyState from 'dashboard/components-next/HelpCenter/EmptyState/A
 import BulkSelectBar from 'dashboard/components-next/captain/assistant/BulkSelectBar.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
-import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
 import BulkTranslateDialog from './BulkTranslateDialog.vue';

 const props = defineProps({
@@ -64,7 +62,6 @@ const isFeatureEnabledonAccount = useMapGetter(

 const selectedArticleIds = ref(new Set());
 const deleteConfirmDialogRef = ref(null);
-const isCategoryMenuOpen = ref(false);

 const { isEnterprise } = useConfig();

@@ -171,9 +168,7 @@ const handlePageChange = page => emit('pageChange', page);
 const navigateToNewArticlePage = () => {
  const { categorySlug, locale } = route.params;
  router.push({
-    name: props.isCategoryArticles
-      ? 'portals_categories_articles_new'
-      : 'portals_articles_new',
+    name: 'portals_articles_new',
    params: { categorySlug, locale },
  });
 };
@@ -224,34 +219,6 @@ const bulkUpdateStatus = async status => {
  }
 };

-const categoryMenuItems = computed(() =>
-  props.categories.map(category => ({
-    label: category.name,
-    value: category.id,
-    action: 'move',
-    emoji: category.icon,
-  }))
-);
-
-const handleBulkUpdateCategory = async ({ value }) => {
-  isCategoryMenuOpen.value = false;
-  try {
-    await articlesAPI.bulkUpdateCategory({
-      portalSlug: route.params.portalSlug,
-      articleIds: [...selectedArticleIds.value],
-      categoryId: value,
-    });
-    onBulkActionSuccess(
-      t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.CATEGORY_SUCCESS')
-    );
-  } catch (error) {
-    useAlert(
-      error?.message ||
-        t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.CATEGORY_ERROR')
-    );
-  }
-};
-
 const confirmBulkDelete = () => {
  deleteConfirmDialogRef.value?.open();
 };
@@ -307,7 +274,6 @@ watch(
          :categories="categories"
          :allowed-locales="allowedLocales"
          :has-selected-category="isCategoryArticles"
-          @new-article="navigateToNewArticlePage"
        />
      </div>
    </template>
@@ -330,7 +296,7 @@ watch(
            :selected-count-label="selectedCountLabel"
            class="py-2 ltr:!pr-3 rtl:!pl-3 justify-between"
          >
-            <template #secondaryActions>
+            <template #secondary-actions>
              <Button
                sm
                ghost
@@ -371,30 +337,6 @@ watch(
                  class="[&>span:nth-child(2)]:hidden sm:[&>span:nth-child(2)]:inline w-fit"
                  @click="bulkUpdateStatus('archived')"
                />
-                <div v-if="categoryMenuItems.length" class="relative group">
-                  <OnClickOutside @trigger="isCategoryMenuOpen = false">
-                    <Button
-                      sm
-                      faded
-                      slate
-                      icon="i-lucide-folder-input"
-                      :label="
-                        t(
-                          'HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.MOVE_TO_CATEGORY'
-                        )
-                      "
-                      class="[&>span:nth-child(2)]:hidden sm:[&>span:nth-child(2)]:inline w-fit"
-                      @click="isCategoryMenuOpen = !isCategoryMenuOpen"
-                    />
-                    <DropdownMenu
-                      v-if="isCategoryMenuOpen"
-                      :menu-items="categoryMenuItems"
-                      show-search
-                      class="right-0 w-48 mt-2 top-full max-h-60"
-                      @action="handleBulkUpdateCategory"
-                    />
-                  </OnClickOutside>
-                </div>
                <Button
                  v-if="isTranslationAvailable"
                  sm
@@ -202,7 +202,7 @@ defineExpose({ state, isSubmitDisabled });
                size="sm"
                type="button"
                :icon="!state.icon ? 'i-lucide-smile-plus' : ''"
-                class="!h-[2.38rem] !w-[2.375rem] absolute top-[2rem] !outline-none !rounded-[0.438rem] border-0 ltr:left-px rtl:right-px ltr:!rounded-r-none rtl:!rounded-l-none"
+                class="!h-[2.4rem] !w-[2.375rem] absolute top-[1.94rem] !outline-none !rounded-[0.438rem] border-0 ltr:left-px rtl:right-px ltr:!rounded-r-none rtl:!rounded-l-none"
                @click="isEmojiPickerOpen = !isEmojiPickerOpen"
              />
              <EmojiInput
@@ -25,7 +25,7 @@ const props = defineProps({
  },
 });

-const emit = defineEmits(['localeChange', 'newArticle']);
+const emit = defineEmits(['localeChange']);

 const route = useRoute();
 const router = useRouter();
@@ -142,7 +142,7 @@ const handleBreadcrumbClick = () => {
            v-if="isLocaleMenuOpen"
            :menu-items="localeMenuItems"
            show-search
-            class="left-0 w-40 mt-2 xl:right-0 top-full max-h-60"
+            class="left-0 w-40 mt-2 overflow-y-auto xl:right-0 top-full max-h-60"
            @action="handleLocaleAction"
          />
        </OnClickOutside>
@@ -179,7 +179,7 @@ const handleBreadcrumbClick = () => {
        />
      </OnClickOutside>
    </div>
-    <div v-else class="relative flex items-center gap-2">
+    <div v-else class="relative">
      <OnClickOutside @trigger="isEditCategoryDialogOpen = false">
        <Button
          :label="t('HELP_CENTER.CATEGORY_PAGE.CATEGORY_HEADER.EDIT_CATEGORY')"
@@ -196,12 +196,6 @@ const handleBreadcrumbClick = () => {
          @close="isEditCategoryDialogOpen = false"
        />
      </OnClickOutside>
-      <Button
-        :label="t('HELP_CENTER.ARTICLES_PAGE.ARTICLES_HEADER.NEW_ARTICLE')"
-        icon="i-lucide-plus"
-        size="sm"
-        @click="emit('newArticle')"
-      />
    </div>
  </div>
 </template>
@@ -1,290 +0,0 @@
-<script setup>
-import { computed, reactive, ref, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import classicLayoutPreview from './classic-layout-preview.svg?raw';
-import documentationLayoutPreview from './documentation-layout-preview.svg?raw';
-import Button from 'dashboard/components-next/button/Button.vue';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
-import RadioCard from 'dashboard/components-next/radioCard/RadioCard.vue';
-
-const props = defineProps({
-  activePortal: { type: Object, required: true },
-  isFetching: { type: Boolean, default: false },
-});
-
-const emit = defineEmits(['updatePortalConfiguration']);
-
-const { t } = useI18n();
-
-const PORTAL_LAYOUTS = {
-  CLASSIC: 'classic',
-  DOCUMENTATION: 'documentation',
-};
-
-// `prefix` is the link the help center auto-fills; the DB only stores the handle.
-const SOCIAL_PLATFORMS = [
-  {
-    key: 'facebook',
-    label: 'Facebook',
-    icon: 'i-ri-facebook-circle-fill',
-    prefix: 'facebook.com/',
-  },
-  { key: 'x', label: 'X', icon: 'i-ri-twitter-x-fill', prefix: 'x.com/' },
-  {
-    key: 'instagram',
-    label: 'Instagram',
-    icon: 'i-ri-instagram-fill',
-    prefix: 'instagram.com/',
-  },
-  {
-    key: 'linkedin',
-    label: 'LinkedIn',
-    icon: 'i-ri-linkedin-box-fill',
-    prefix: 'linkedin.com/',
-  },
-  {
-    key: 'youtube',
-    label: 'YouTube',
-    icon: 'i-ri-youtube-fill',
-    prefix: 'youtube.com/',
-  },
-  {
-    key: 'tiktok',
-    label: 'TikTok',
-    icon: 'i-ri-tiktok-fill',
-    prefix: 'tiktok.com/',
-  },
-  {
-    key: 'github',
-    label: 'GitHub',
-    icon: 'i-ri-github-fill',
-    prefix: 'github.com/',
-  },
-  {
-    key: 'whatsapp',
-    label: 'WhatsApp',
-    icon: 'i-ri-whatsapp-fill',
-    prefix: 'wa.me/',
-  },
-];
-
-const portalConfig = computed(() => props.activePortal?.config || {});
-
-const state = reactive({
-  layout: PORTAL_LAYOUTS.CLASSIC,
-  socialProfiles: {},
-});
-const visiblePlatforms = ref([]);
-const showAddMenu = ref(false);
-
-let originalSnapshot = '';
-
-const platformByKey = key => SOCIAL_PLATFORMS.find(p => p.key === key);
-
-const trimmedHandle = key => (state.socialProfiles[key] || '').trim();
-
-const buildSocialProfiles = () =>
-  visiblePlatforms.value.reduce((acc, key) => {
-    const handle = trimmedHandle(key);
-    if (handle) acc[key] = handle;
-    return acc;
-  }, {});
-
-const snapshot = () =>
-  JSON.stringify({ layout: state.layout, social: buildSocialProfiles() });
-
-const resetFromPortal = () => {
-  const savedProfiles = portalConfig.value.social_profiles || {};
-  state.layout = portalConfig.value.layout || PORTAL_LAYOUTS.CLASSIC;
-  state.socialProfiles = SOCIAL_PLATFORMS.reduce((acc, { key }) => {
-    acc[key] = savedProfiles[key] || '';
-    return acc;
-  }, {});
-  visiblePlatforms.value = SOCIAL_PLATFORMS.map(p => p.key).filter(key =>
-    (savedProfiles[key] || '').trim()
-  );
-  originalSnapshot = snapshot();
-};
-
-watch(() => props.activePortal, resetFromPortal, {
-  immediate: true,
-  deep: true,
-});
-
-const hasChanges = computed(() => snapshot() !== originalSnapshot);
-
-const visiblePlatformDetails = computed(() =>
-  visiblePlatforms.value.map(platformByKey)
-);
-
-const addablePlatforms = computed(() =>
-  SOCIAL_PLATFORMS.filter(p => !visiblePlatforms.value.includes(p.key)).map(
-    p => ({ label: p.label, value: p.key, action: p.key, icon: p.icon })
-  )
-);
-
-const addPlatform = ({ value }) => {
-  if (!visiblePlatforms.value.includes(value)) {
-    visiblePlatforms.value.push(value);
-  }
-  showAddMenu.value = false;
-};
-
-const removePlatform = key => {
-  visiblePlatforms.value = visiblePlatforms.value.filter(k => k !== key);
-  state.socialProfiles[key] = '';
-};
-
-const handleSave = () => {
-  emit('updatePortalConfiguration', {
-    id: props.activePortal.id,
-    slug: props.activePortal.slug,
-    config: {
-      layout: state.layout,
-      social_profiles: buildSocialProfiles(),
-    },
-  });
-};
-</script>
-
-<template>
-  <div class="flex flex-col w-full gap-6">
-    <div class="flex flex-col gap-2">
-      <h6 class="text-base font-medium text-n-slate-12">
-        {{ t('HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.HEADER') }}
-      </h6>
-      <span class="text-sm text-n-slate-11">
-        {{ t('HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.DESCRIPTION') }}
-      </span>
-    </div>
-
-    <section class="flex flex-col gap-3">
-      <div class="grid grid-cols-1 sm:grid-cols-2 gap-3 text-n-slate-11">
-        <RadioCard
-          :id="PORTAL_LAYOUTS.CLASSIC"
-          :is-active="state.layout === PORTAL_LAYOUTS.CLASSIC"
-          :label="
-            t('HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.LAYOUT.CLASSIC.TITLE')
-          "
-          :description="
-            t(
-              'HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.LAYOUT.CLASSIC.DESCRIPTION'
-            )
-          "
-          @select="value => (state.layout = value)"
-        >
-          <div
-            class="w-full mt-2 rounded-md overflow-hidden border border-solid border-n-weak bg-n-slate-2 dark:bg-n-slate-1"
-          >
-            <span v-dompurify-html="classicLayoutPreview" />
-          </div>
-        </RadioCard>
-
-        <RadioCard
-          :id="PORTAL_LAYOUTS.DOCUMENTATION"
-          beta
-          :is-active="state.layout === PORTAL_LAYOUTS.DOCUMENTATION"
-          :label="
-            t('HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.LAYOUT.SIDEBAR.TITLE')
-          "
-          :description="
-            t(
-              'HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.LAYOUT.SIDEBAR.DESCRIPTION'
-            )
-          "
-          @select="value => (state.layout = value)"
-        >
-          <div
-            class="w-full mt-2 rounded-md overflow-hidden border border-solid border-n-weak bg-n-slate-2 dark:bg-n-slate-1"
-          >
-            <span v-dompurify-html="documentationLayoutPreview" />
-          </div>
-        </RadioCard>
-      </div>
-    </section>
-
-    <section
-      v-if="state.layout === PORTAL_LAYOUTS.DOCUMENTATION"
-      class="flex flex-col gap-3"
-    >
-      <div class="flex flex-col gap-1">
-        <h6 class="text-sm font-medium text-n-slate-12">
-          {{
-            t('HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.SOCIAL_LINKS.HEADER')
-          }}
-        </h6>
-        <span class="text-sm text-n-slate-11">
-          {{
-            t(
-              'HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.SOCIAL_LINKS.DESCRIPTION'
-            )
-          }}
-        </span>
-      </div>
-
-      <div
-        v-for="platform in visiblePlatformDetails"
-        :key="platform.key"
-        class="flex items-center h-10 gap-1.5 px-3 rounded-lg outline outline-1 outline-n-weak focus-within:outline-n-brand"
-      >
-        <Icon :icon="platform.icon" class="size-4 shrink-0 text-n-slate-11" />
-        <span class="text-sm shrink-0 text-n-slate-10">{{
-          platform.prefix
-        }}</span>
-        <input
-          v-model="state.socialProfiles[platform.key]"
-          type="text"
-          class="flex-1 min-w-0 text-sm bg-transparent outline-none reset-base text-n-slate-12 placeholder:text-n-slate-10"
-          :placeholder="
-            t(
-              'HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.SOCIAL_LINKS.PLACEHOLDER'
-            )
-          "
-        />
-        <Button
-          icon="i-lucide-x"
-          color="slate"
-          variant="ghost"
-          size="xs"
-          :aria-label="
-            t('HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.SOCIAL_LINKS.REMOVE')
-          "
-          @click="removePlatform(platform.key)"
-        />
-      </div>
-
-      <div
-        v-if="addablePlatforms.length"
-        v-on-clickaway="() => (showAddMenu = false)"
-        class="relative"
-      >
-        <Button
-          :label="
-            t('HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.SOCIAL_LINKS.ADD')
-          "
-          icon="i-lucide-plus"
-          color="slate"
-          variant="faded"
-          size="sm"
-          @click="showAddMenu = !showAddMenu"
-        />
-        <DropdownMenu
-          v-if="showAddMenu"
-          :menu-items="addablePlatforms"
-          class="mt-1 w-52 top-full ltr:left-0 rtl:right-0"
-          @action="addPlatform"
-        />
-      </div>
-    </section>
-
-    <div class="flex justify-end">
-      <Button
-        :label="t('HELP_CENTER.PORTAL_SETTINGS.LAYOUT_CONTENT.SAVE')"
-        :disabled="!hasChanges || isFetching"
-        @click="handleSave"
-      />
-    </div>
-  </div>
-</template>
@@ -7,7 +7,6 @@ import { useMapGetter } from 'dashboard/composables/store.js';
 import HelpCenterLayout from 'dashboard/components-next/HelpCenter/HelpCenterLayout.vue';
 import PortalBaseSettings from 'dashboard/components-next/HelpCenter/Pages/PortalSettingsPage/PortalBaseSettings.vue';
 import PortalConfigurationSettings from './PortalConfigurationSettings.vue';
-import PortalLayoutContentSettings from './PortalLayoutContentSettings.vue';
 import ConfirmDeletePortalDialog from 'dashboard/components-next/HelpCenter/Pages/PortalSettingsPage/ConfirmDeletePortalDialog.vue';
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
@@ -103,12 +102,6 @@ const handleDeletePortal = () => {
          @send-cname-instructions="handleSendCnameInstructions"
        />
        <div class="w-full h-px bg-n-weak" />
-        <PortalLayoutContentSettings
-          :active-portal="activePortal"
-          :is-fetching="isFetching"
-          @update-portal-configuration="handleUpdatePortalConfiguration"
-        />
-        <div class="w-full h-px bg-n-weak" />
        <div class="flex items-end justify-between w-full gap-4">
          <div class="flex flex-col gap-2">
            <h6 class="text-base font-medium text-n-slate-12">
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tanmay Deep Sharma	22fd5a872b	feat(whatsapp-call): direct browser-Meta WebRTC, no media server	2026-04-29 15:23:32 +07:00
Muhsin KelothandGitHub	fa582b31fe	Merge branch 'feat/voice-as-twilio-capability' into feat/voice-call-model-wiring	2026-04-28 11:00:45 +04:00
Muhsin KelothandGitHub	8aa71f4a9d	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-28 09:43:04 +04:00
Muhsin KelothandGitHub	223e6402d8	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-23 11:32:13 +04:00
Muhsin KelothandGitHub	e6138739ad	Merge branch 'feat/voice-as-twilio-capability' into feat/voice-call-model-wiring	2026-04-21 13:23:15 +04:00
Muhsin KelothandGitHub	6d6133d5c9	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-21 13:23:06 +04:00
Muhsin KelothandGitHub	6cf5f323fe	Merge branch 'feat/voice-as-twilio-capability' into feat/voice-call-model-wiring	2026-04-20 20:28:13 +04:00
Muhsin KelothandGitHub	85f522c693	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-20 20:28:02 +04:00
Muhsin KelothandGitHub	17a17ad00c	Merge branch 'feat/voice-as-twilio-capability' into feat/voice-call-model-wiring	2026-04-20 15:26:25 +04:00
Muhsin KelothandGitHub	d365a5fe15	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-20 15:26:12 +04:00
Muhsin	98ba6e5200	refactor(voice): drop content_attributes.data from voice_call messages Nothing reads it anymore — frontend uses message.call, CallMessageBuilder uses call.message (the FK), and the jsonb fallback finder was dead code (call.message_id is always linked immediately after message creation, in the same transaction). New voice_call messages are now created with blank content_attributes. Existing rows keep their legacy payload; nothing reads it, so it's inert. Safe to backfill with `Message.voice_calls.update_all(content_attributes: {})` if you want a tidy table.	2026-04-20 14:38:57 +04:00
Muhsin	02f1fdf3b6	fix(voice): avoid Jbuilder's reserved `call` keyword in message serializer Jbuilder defines Jbuilder#call(object, *attributes) as its core API for extracting attributes. Using `json.call do ... end` collided with that signature and raised "wrong number of arguments (given 0, expected 1+)". Use `json.set! :call, message.call.push_event_data` instead — also deduplicates the field list between the jbuilder and Message#push_event_data (both now go through Call#push_event_data).	2026-04-20 14:30:42 +04:00
Muhsin	c7b2a6f12c	refactor(voice): stop duplicating call state in message.content_attributes Now that the frontend reads from message.call (previous commit), the message row is just a display anchor — all call state lives on the Call record and is surfaced via the serializer / push_event_data. - CallMessageBuilder shrinks to creating the bare voice_call message. content_attributes.data keeps only { call_sid } as a breadcrumb and a finder fallback for the edge case where message_id isn't linked yet. - CallStatus::Manager stops re-writing the message on status transitions. call.message.touch triggers the standard message.updated dispatcher so sockets re-broadcast with the fresh Call embedded. - Spec assertions switch from content_attributes.data.* to call.* + message.call object identity; status update spec asserts message is touched.	2026-04-20 13:42:11 +04:00
Muhsin	c2a851c756	refactor(voice): read call state from message.call on the frontend - VoiceCall bubble, voice.js helper, ConversationCard, and the store mutation all switch from message.content_attributes.data to message.call. - Message.vue gains a `call` prop that's provided through useMessageContext for the bubble. - UPDATE_MESSAGE_CALL_STATUS mutation now updates message.call.status, matched by provider_call_id. - content_attributes.data is still emitted by the backend for this commit; backend-side trim lands in a follow-up.	2026-04-20 13:36:26 +04:00
Muhsin	5ce77eedbe	feat(voice): embed Call in voice_call message payload Adds a nested `call` object to the voice_call message JSON / push payload so the frontend can read call state directly from message.call instead of duplicating it in content_attributes.data. - Message gains has_one :call (inverse of existing Call#belongs_to :message) via enterprise module prepend. - Message serializer (_message.json.jbuilder) emits a call block for voice_call messages when the Call is linked. - Message#push_event_data mirrors the payload into socket broadcasts. - MessageFinder eager-loads the call (+ contact + inbox.channel) to avoid N+1 when listing conversation messages. - Call gains helper methods: display_status, from_number, to_number, recording_url, push_event_data. These centralize the direction- and status-aware derivations so jbuilder and push_event_data stay in sync. Frontend continues to read content_attributes.data — this commit only adds the new shape; a follow-up swaps readers to message.call.	2026-04-20 13:33:43 +04:00
Muhsin KelothandGitHub	811d50043c	Merge branch 'feat/voice-as-twilio-capability' into feat/voice-call-model-wiring	2026-04-20 12:27:32 +04:00
Muhsin KelothandGitHub	1a2e518341	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-20 12:25:00 +04:00
Muhsin	117742a779	fix(voice): guarantee conference_sid at TwiML render, consistent Call factory - conference_twiml now ensures call.conference_sid is present before rendering; backfills via Voice::Conference::Name.for(call) if missing. Prevents invalid TwiML on Call rows created without the sid set. - Call factory derives account/inbox/contact from the associated conversation so create(:call) is always internally consistent (no more mismatched account_id across associations).	2026-04-18 10:37:47 +04:00
Muhsin	081e578a57	fix(voice): validate conversation_id when resolving Call in ConferenceController Require the resolved Call to belong to the passed conversation_id so a request with mismatched (conversation_id, call_sid) fails instead of silently operating on the call from call_sid. Restores the implicit authorization the previous conversation-based lookup provided.	2026-04-17 23:38:40 +04:00
Muhsin	7635a538af	fix(voice): harden agent-label parsing and prevent started_at drift - Conference::Manager.extract_user_id now requires the account id in the participant label to match call.account_id, so a spoofed label can't attach a user from another account to the call. - CallStatus::Manager keeps the earliest started_at across multiple in-progress webhooks (Twilio can emit answered + in-progress, plus retries) so duration_seconds isn't undercounted.	2026-04-17 23:02:28 +04:00
Muhsin	d6d6f87145	fix(voice): O(1) voice_call message lookup and nil-safe content_attributes - find_message prefers call.message (via the already-linked message_id) instead of scanning every voice_call message in the conversation. Falls back to a jsonb-indexed query by call_sid when message_id isn't set yet. - update_message! tolerates a nil content_attributes column (nullable in the schema).	2026-04-17 22:52:13 +04:00
Muhsin	d62037676c	fix(voice): scope all VoiceController Call lookups to the inbox Every Call lookup in the Twilio webhook controller is now constrained to the inbox resolved from the URL phone number. Prevents tampered params from attaching the agent leg or outbound leg to a Call belonging to another inbox/account. Factored out the common `inbox_calls` scope used by find_call_for_agent, sync_outbound_leg, and find_call_for_conference!.	2026-04-17 22:49:46 +04:00
Muhsin	91da28a329	fix(voice): scope inbound Call lookup and handle create races - Scope the existing-call pre-check to the inbound account + inbox. - Rescue ActiveRecord::RecordNotUnique so a concurrent Twilio retry doesn't 500 when two webhooks race to create the same Call.	2026-04-17 22:45:39 +04:00
Muhsin	4282dec7d6	fix(voice): thread callSid through agent leg + conference API clients Required by the stricter server-side call_sid requirements from the previous commit. Without this, agents would fail to join or leave calls because the client side still sent only conversation_id. - TwilioVoiceClient.joinClientCall now forwards callSid as a Device.connect param, which becomes params[:call_sid] on the TwiML webhook. - VoiceAPI.leaveConference takes callSid and passes it as a query param so the DELETE /conference endpoint can resolve the exact call. - useCallSession and FloatingCallWidget pass callSid through.	2026-04-17 22:41:20 +04:00
Muhsin	12dc22b693	fix(voice): address codex review feedback on Call-model PR - Guard against delayed conference-start retries rolling a progressed call back to ringing (Conference::Manager#mark_ringing!). - Scope conference-status webhook Call lookup to the resolved inbox (VoiceController#find_call_for_conference!). - Require explicit call_sid on the agent TwiML leg and on ConferenceController#create/destroy so multi-call conversations can't attach the wrong call (no more most-recent-active fallback). - Scope StatusUpdateService Call lookup to the webhook's account for defense-in-depth. - Update UPDATE_MESSAGE_CALL_STATUS mutation to match the voice_call message by call_sid; helper/voice.js now passes callSid. Prevents an older call's status update from clobbering the newest bubble.	2026-04-17 22:28:10 +04:00
Muhsin	07de9ae1f1	test(voice): update specs to match Call-model-backed voice flow - Add calls factory. - voice_controller_spec, conference_controller_spec, and the voice service specs now assert against Call records instead of conversation.identifier / additional_attributes. - Scope Call lookup in ConferenceController to the authorized inbox so call_sid alone can't cross-inbox escalate.	2026-04-17 20:24:37 +04:00
Muhsin	47788f4d9c	Delete voice_call_wiring.md	2026-04-17 19:47:38 +04:00
Muhsin	bb4feec53e	feat(voice): wire Twilio voice flow through unified Call model Moves call state off conversation.additional_attributes and conversation.identifier onto first-class Call records, one per call. - Call is the source of truth for status, direction, duration, started_at, accepted_by_agent, and conference_sid (in meta). - Conference names key off Call.id (conf_account_{aid}_call_{cid}), so multiple calls on one conversation no longer collide. lock_to_single_conversation inboxes append each call as a new voice_call bubble in the existing thread. - Agent identity on conference join webhooks is parsed from the Twilio ParticipantLabel (agent-{user_id}-account-{account_id}); stateless and independent of the /conference#create API call order. - ConversationCard.vue derives the call badge from the latest voice_call message, not a denormalized cache on the conversation. Removes the stale "Call ended" state that lingered after subsequent text messages.	2026-04-17 19:44:11 +04:00
Muhsin KelothandGitHub	3b89787c7f	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-17 12:16:55 +04:00
Muhsin	94766e1200	chore: rescue errors only in delete_twiml_app	2026-04-14 15:29:16 +04:00
Muhsin	5a16a5a0ee	test: stub incoming_phone_numbers in voice teardown spec Teardown now also clears number-level voice_url/status_callback, so the Twilio client double needs incoming_phone_numbers.list stubbed.	2026-04-14 15:24:44 +04:00
Muhsin	b8df28c8a3	chore: restrict TwilioSms attrs to SMS medium	2026-04-14 14:36:44 +04:00
Muhsin	a77a1c8ab4	chore: skip TwiML provisioning if no phone number	2026-04-14 14:31:04 +04:00
Muhsin	57821ab6f9	chore: clear Twilio number webhooks during teardown	2026-04-14 14:30:23 +04:00
Muhsin KelothandGitHub	b4e27ed4cb	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-14 14:10:12 +04:00
Muhsin KelothandGitHub	726193e3ac	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-13 20:45:18 +04:00
Muhsin KelothandGitHub	55fd3c62cc	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-13 20:16:05 +04:00
Muhsin KelothandGitHub	1a63c4089a	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-11 10:51:31 +04:00
Muhsin KelothandGitHub	b98ce4b18c	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-08 20:06:48 +04:00
Muhsin	ddbd81b85e	Update voice_teardown_service.rb	2026-04-08 13:32:14 +04:00
Muhsin	986f3ebc3a	chore: support Twilio API Key auth in ConferenceService	2026-04-08 13:22:16 +04:00
Muhsin	a6a612568a	chore: support Twilio API Key auth in ConferenceService	2026-04-08 13:21:00 +04:00
Muhsin KelothandGitHub	7ebe9db77c	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-08 12:18:34 +04:00
Muhsin KelothandGitHub	fdf22a034f	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-08 12:09:59 +04:00
Muhsin KelothandGitHub	14100580fb	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-06 16:46:02 +04:00
Muhsin KelothandGitHub	453fcecfb4	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-06 15:45:18 +04:00
Muhsin KelothandGitHub	401ec4cd81	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-06 14:04:33 +04:00
Muhsin	38867ba75f	chore: use API key client for token validation	2026-04-06 13:27:52 +04:00
Muhsin	d3b7d7e79a	chore: show voice config only if inbox webhook set	2026-04-06 12:29:51 +04:00
Muhsin	cb275ce1d9	chore: remove voiceCall gating for tabs and settings	2026-04-06 11:29:48 +04:00
Muhsin	e96fa6f561	Merge branch 'feat/voice-as-twilio-capability' of github.com:chatwoot/chatwoot into feat/voice-as-twilio-capability	2026-04-06 11:27:24 +04:00
Muhsin	78296b9ce3	chore: require voice_call content for Twilio incoming	2026-04-06 11:27:16 +04:00
Muhsin KelothandGitHub	9c85a92e86	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-06 11:14:24 +04:00
Muhsin KelothandGitHub	f7d4d2d58c	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-04 17:48:37 +04:00
Muhsin KelothandGitHub	fdce5910e0	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-01 16:10:34 +04:00
Muhsin	aa15ddfef8	chore: enable channel_voice in inboxes spec	2026-04-01 15:38:58 +04:00
Muhsin	d80a7454ce	chore: run teardown_voice callback only on update	2026-04-01 15:28:08 +04:00
Muhsin	b684f75631	Update twilio_sms_voice_spec.rb	2026-04-01 15:04:53 +04:00
Muhsin	6e0b10cb42	chore: expose API key secret and require it in UI	2026-04-01 15:01:54 +04:00
Muhsin	020bf6af93	chore: don't provision Twiml app if sid present	2026-04-01 14:58:50 +04:00
Muhsin	a51af8ca68	chore: fix review comments	2026-04-01 14:28:11 +04:00
Muhsin	dfdfc669ea	chore: reserve api_key_secret and update voice UI	2026-04-01 14:22:50 +04:00
Muhsin	987d4d4a01	chore: revert unrelated changes	2026-04-01 13:04:49 +04:00
Muhsin	3471296394	Merge branch 'feat/voice-as-twilio-capability' of github.com:chatwoot/chatwoot into feat/voice-as-twilio-capability	2026-04-01 13:01:57 +04:00
Muhsin	465b70ce27	chore: revert unrelated changes	2026-04-01 13:01:46 +04:00
Muhsin KelothandGitHub	c90fdd6594	Merge branch 'develop' into feat/voice-as-twilio-capability	2026-04-01 12:41:07 +04:00
Muhsin	6890293e60	chore: extract Twilio voice teardown into service	2026-03-28 12:39:02 +04:00
Muhsin	5c704691d7	chore: validate Twilio number voice capability	2026-03-27 15:01:45 +04:00
Muhsin	1946c373d7	chore: teardown Twilio voice resources when disabled	2026-03-27 14:16:17 +04:00
Muhsin	797d7790db	chore: add feature flags	2026-03-27 13:43:30 +04:00
Muhsin	1d555cebfc	chore: handle Twilio API Key SID conditionally	2026-03-27 13:37:04 +04:00
Muhsin	2b5d3300f3	chore: add Voice configuration UI and API fields	2026-03-26 18:28:29 +04:00
Muhsin	ddfa6cea32	chore: fix the specs	2026-03-26 17:15:52 +04:00
Muhsin	85438cf58a	chore: add Twilio voice support to TwilioSms channel	2026-03-26 16:40:33 +04:00
@@ -1 +1 @@
 .14.0
 .13.0