style: remove redundant space

feat: upgrade to eslint 10
2026-03-11 13:27:28 +05:30 · 2026-03-11 13:20:31 +05:30
2565 changed files with 56115 additions and 152981 deletions
@@ -1,65 +0,0 @@
---
-:position: before
-:position_in_additional_file_patterns: before
-:position_in_class: before
-:position_in_factory: before
-:position_in_fixture: before
-:position_in_routes: before
-:position_in_serializer: before
-:position_in_test: before
-:classified_sort: true
-:exclude_controllers: true
-:exclude_factories: true
-:exclude_fixtures: true
-:exclude_helpers: true
-:exclude_scaffolds: true
-:exclude_serializers: true
-:exclude_sti_subclasses: false
-:exclude_tests: true
-:force: false
-:format_markdown: false
-:format_rdoc: false
-:format_yard: false
-:frozen: false
-:grouped_polymorphic: false
-:ignore_model_sub_dir: false
-:ignore_unknown_models: false
-:include_version: false
-:show_check_constraints: false
-:show_complete_foreign_keys: false
-:show_foreign_keys: true
-:show_indexes: true
-:show_indexes_include: false
-:simple_indexes: false
-:sort: false
-:timestamp: false
-:trace: false
-:with_comment: true
-:with_column_comments: true
-:with_table_comments: true
-:position_of_column_comment: :with_name
-:active_admin: false
-:command:
-:debug: false
-:hide_default_column_types: json,jsonb,hstore
-:hide_limit_column_types: integer,bigint,boolean
-:timestamp_columns:
- created_at
- updated_at
-:ignore_columns:
-:ignore_routes:
-:models: true
-:routes: false
-:skip_on_db_migrate: false
-:target_action: :do_annotations
-:wrapper:
-:wrapper_close:
-:wrapper_open:
-:classes_default_to_s: []
-:additional_file_patterns: []
-:model_dir:
- app/models
- enterprise/app/models
-:require: []
-:root_dir:
- ''
@@ -1,9 +1,3 @@
 ---
 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+)
-  # 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
@@ -1,256 +0,0 @@
-module.exports = {
-  extends: [
-    'airbnb-base/legacy',
-    'prettier',
-    'plugin:vue/vue3-recommended',
-    'plugin:vitest-globals/recommended',
-    // use recommended-legacy when upgrading the plugin to v4
-    'plugin:@intlify/vue-i18n/recommended',
-  ],
-  overrides: [
-    {
-      files: ['**/*.spec.{j,t}s?(x)'],
-      env: {
-        'vitest-globals/env': true,
-      },
-    },
-    {
-      files: ['**/*.story.vue'],
-      rules: {
-        'vue/no-undef-components': [
-          'error',
-          {
-            ignorePatterns: ['Variant', 'Story'],
-          },
-        ],
-        // Story files can have static strings, it doesn't need to handle i18n always.
-        'vue/no-bare-strings-in-template': 'off',
-        'no-console': 'off',
-      },
-    },
-  ],
-  plugins: ['html', 'prettier'],
-  parserOptions: {
-    ecmaVersion: 'latest',
-    sourceType: 'module',
-  },
-  rules: {
-    'prettier/prettier': ['error'],
-    camelcase: 'off',
-    'no-param-reassign': 'off',
-    'import/no-extraneous-dependencies': 'off',
-    'import/prefer-default-export': 'off',
-    'import/no-named-as-default': 'off',
-    'jsx-a11y/no-static-element-interactions': 'off',
-    'jsx-a11y/click-events-have-key-events': 'off',
-    'jsx-a11y/label-has-associated-control': 'off',
-    'jsx-a11y/label-has-for': 'off',
-    'jsx-a11y/anchor-is-valid': 'off',
-    'import/no-unresolved': 'off',
-    'vue/html-indent': 'off',
-    'vue/multi-word-component-names': 'off',
-    'vue/next-tick-style': ['error', 'callback'],
-    'vue/block-order': [
-      'error',
-      {
-        order: ['script', 'template', 'style'],
-      },
-    ],
-    'vue/component-name-in-template-casing': [
-      'error',
-      'PascalCase',
-      {
-        registeredComponentsOnly: true,
-      },
-    ],
-    'vue/component-options-name-casing': ['error', 'PascalCase'],
-    'vue/custom-event-name-casing': ['error', 'camelCase'],
-    'vue/define-emits-declaration': ['error'],
-    'vue/define-macros-order': [
-      'error',
-      {
-        order: ['defineProps', 'defineEmits'],
-        defineExposeLast: false,
-      },
-    ],
-    'vue/define-props-declaration': ['error', 'runtime'],
-    'vue/match-component-import-name': ['error'],
-    'vue/no-bare-strings-in-template': [
-      'error',
-      {
-        allowlist: [
-          '(',
-          ')',
-          ',',
-          '.',
-          '&',
-          '+',
-          '-',
-          '=',
-          '*',
-          '/',
-          '#',
-          '%',
-          '!',
-          '?',
-          ':',
-          '[',
-          ']',
-          '{',
-          '}',
-          '<',
-          '>',
-          '⌘',
-          '📄',
-          '🎉',
-          '🚀',
-          '💬',
-          '👥',
-          '📥',
-          '🔖',
-          '❌',
-          '✅',
-          '\u00b7',
-          '\u2022',
-          '\u2010',
-          '\u2013',
-          '\u2014',
-          '\u2212',
-          '|',
-        ],
-        attributes: {
-          '/.+/': [
-            'title',
-            'aria-label',
-            'aria-placeholder',
-            'aria-roledescription',
-            'aria-valuetext',
-          ],
-          input: ['placeholder'],
-        },
-        directives: ['v-text'],
-      },
-    ],
-    'vue/no-empty-component-block': 'error',
-    'vue/no-multiple-objects-in-class': 'error',
-    'vue/no-root-v-if': 'warn',
-    'vue/no-static-inline-styles': [
-      'error',
-      {
-        allowBinding: false,
-      },
-    ],
-    'vue/no-template-target-blank': [
-      'error',
-      {
-        allowReferrer: false,
-        enforceDynamicLinks: 'always',
-      },
-    ],
-    'vue/no-required-prop-with-default': [
-      'error',
-      {
-        autofix: false,
-      },
-    ],
-    'vue/no-this-in-before-route-enter': 'error',
-    'vue/no-undef-components': [
-      'error',
-      {
-        ignorePatterns: [
-          '^woot-',
-          '^fluent-',
-          '^multiselect',
-          '^router-link',
-          '^router-view',
-          '^ninja-keys',
-          '^FormulateForm',
-          '^FormulateInput',
-          '^highlightjs',
-        ],
-      },
-    ],
-    'vue/no-unused-emit-declarations': 'error',
-    'vue/no-unused-refs': 'error',
-    'vue/no-use-v-else-with-v-for': 'error',
-    'vue/prefer-true-attribute-shorthand': 'error',
-    'vue/no-useless-v-bind': [
-      'error',
-      {
-        ignoreIncludesComment: false,
-        ignoreStringEscape: false,
-      },
-    ],
-    'vue/no-v-text': 'error',
-    'vue/padding-line-between-blocks': ['error', 'always'],
-    'vue/prefer-separate-static-class': 'error',
-    'vue/require-explicit-slots': 'error',
-    'vue/require-macro-variable-name': [
-      'error',
-      {
-        defineProps: 'props',
-        defineEmits: 'emit',
-        defineSlots: 'slots',
-        useSlots: 'slots',
-        useAttrs: 'attrs',
-      },
-    ],
-    'vue/no-unused-properties': [
-      'error',
-      {
-        groups: ['props'],
-        deepData: false,
-        ignorePublicMembers: false,
-        unreferencedOptions: [],
-      },
-    ],
-    'vue/max-attributes-per-line': [
-      'error',
-      {
-        singleline: {
-          max: 20,
-        },
-        multiline: {
-          max: 1,
-        },
-      },
-    ],
-    'vue/html-self-closing': [
-      'error',
-      {
-        html: {
-          void: 'always',
-          normal: 'always',
-          component: 'always',
-        },
-        svg: 'always',
-        math: 'always',
-      },
-    ],
-    'vue/no-v-html': 'off',
-    'vue/component-definition-name-casing': 'off',
-    'vue/singleline-html-element-content-newline': 'off',
-    'import/extensions': ['off'],
-    'no-console': 'error',
-    '@intlify/vue-i18n/no-dynamic-keys': 'warn',
-    '@intlify/vue-i18n/no-unused-keys': [
-      'warn',
-      {
-        extensions: ['.js', '.vue'],
-      },
-    ],
-  },
-  settings: {
-    'vue-i18n': {
-      localeDir: './app/javascript/*/i18n/**.json',
-    },
-  },
-  env: {
-    browser: true,
-    node: true,
-  },
-  globals: {
-    bus: true,
-    vi: true,
-  },
-};
@@ -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 --##
@@ -41,8 +40,6 @@ gem 'json_refs'
 gem 'rack-attack', '>= 6.7.0'
 # a utility tool for streaming, flexible and safe downloading of remote files
 gem 'down'
-# SSRF-safe URL fetching
-gem 'ssrf_filter', '~> 1.5'
 # authentication type to fetch and send mail over oauth2.0
 gem 'gmail_xoauth'
 # Lock net-smtp to 0.3.4 to avoid issues with gmail_xoauth2
@@ -85,7 +82,6 @@ gem 'barnes'
 gem 'devise', '>= 4.9.4'
 gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
 gem 'devise_token_auth', '>= 1.2.3'
-gem 'rails-i18n', '~> 7.0'
 # two-factor authentication
 gem 'devise-two-factor', '>= 5.0.0'
 # authorization
@@ -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)
@@ -166,7 +166,7 @@ GEM
      multi_json (~> 1)
      statsd-ruby (~> 1.1)
    base64 (0.3.0)
-    bcrypt (3.1.22)
+    bcrypt (3.1.20)
    benchmark (0.4.1)
    bigdecimal (3.2.2)
    bindex (0.8.1)
@@ -349,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
@@ -466,7 +465,7 @@ GEM
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    json (2.19.2)
+    json (2.18.1)
    json_refs (0.1.8)
      hana
    json_schemer (0.2.24)
@@ -677,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)
@@ -699,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)
@@ -728,9 +727,6 @@ GEM
    rails-html-sanitizer (1.6.1)
      loofah (~> 2.21)
      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (7.0.10)
-      i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
    railties (7.1.5.2)
      actionpack (= 7.1.5.2)
      activesupport (= 7.1.5.2)
@@ -946,7 +942,6 @@ GEM
      activesupport (>= 5.2)
      sprockets (>= 3.0.0)
    squasher (0.7.2)
-    ssrf_filter (1.5.0)
    stackprof (0.2.25)
    statsd-ruby (1.5.0)
    stripe (18.0.1)
@@ -1076,7 +1071,6 @@ DEPENDENCIES
  fcm
  flag_shih_tzu
  foreman
-  gemoji
  geocoder
  gmail_xoauth
  google-cloud-dialogflow-v2 (>= 0.24.0)
@@ -1130,7 +1124,6 @@ DEPENDENCIES
  rack-mini-profiler (>= 3.2.0)
  rack-timeout
  rails (~> 7.1)
-  rails-i18n (~> 7.0)
  redis
  redis-namespace
  responders (>= 3.1.1)
@@ -1165,7 +1158,6 @@ DEPENDENCIES
  spring
  spring-watcher-listen
  squasher
-  ssrf_filter (~> 1.5)
  stackprof
  stripe (~> 18.0)
  telephone_number
@@ -1 +1 @@
-4.13.0
+4.11.2
@@ -104,7 +104,7 @@ class ContactIdentifyAction
    # blank identifier or email will throw unique index error
    # TODO: replace reject { |_k, v| v.blank? } with compact_blank when rails is upgraded
    @contact.discard_invalid_attrs if discard_invalid_attrs
-    @contact.save! if @contact.changed?
+    @contact.save!
    enqueue_avatar_job
  end

@@ -44,11 +44,7 @@ class AccountBuilder
  end

  def create_account
-    @account = Account.create!(
-      name: account_name,
-      locale: I18n.locale,
-      custom_attributes: { 'onboarding_step' => 'account_details' }
-    )
+    @account = Account.create!(name: account_name, locale: I18n.locale)
    Current.account = @account
  end

@@ -29,9 +29,8 @@ class AgentBuilder
    user = User.from_email(email)
    return user if user

-    @name = email.split('@').first if @name.blank?
    temp_password = "1!aA#{SecureRandom.alphanumeric(12)}"
-    User.create!(email: email, name: @name, password: temp_password, password_confirmation: temp_password)
+    User.create!(email: email, name: name, password: temp_password, password_confirmation: temp_password)
  end

  # Checks if the user needs confirmation.
@@ -1,6 +1,4 @@
 class Email::BaseBuilder
-  include EmailAddressParseable
-
  pattr_initialize [:inbox!]

  private
@@ -41,7 +39,7 @@ class Email::BaseBuilder
  end

  def business_name
-    inbox.sanitized_business_name
+    inbox.business_name || inbox.sanitized_name
  end

  def account_support_email
@@ -49,4 +47,8 @@ class Email::BaseBuilder
    # can save it in the format "Name <email@domain.com>"
    parse_email(account.support_email)
  end
+
+  def parse_email(email_string)
+    Mail::Address.new(email_string).address
+  end
 end
@@ -1,7 +1,6 @@
 class V2::ReportBuilder
  include DateRangeHelper
  include ReportHelper
-
  attr_reader :account, :params

  DEFAULT_GROUP_BY = 'day'.freeze
@@ -11,6 +11,10 @@ class V2::Reports::AgentSummaryBuilder < V2::Reports::BaseSummaryBuilder
  attr_reader :conversations_count, :resolved_count,
              :avg_resolution_time, :avg_first_response_time, :avg_reply_time

+  def fetch_conversations_count
+    account.conversations.where(created_at: range).group('assignee_id').count
+  end
+
  def prepare_report
    account.account_users.map do |account_user|
      build_agent_stats(account_user)
@@ -9,13 +9,37 @@ class V2::Reports::BaseSummaryBuilder
  private

  def load_data
-    results = data_source.summary
+    @conversations_count = fetch_conversations_count
+    load_reporting_events_data
+  end

-    @conversations_count = results.transform_values { |data| data[:conversations_count] }
-    @resolved_count = results.transform_values { |data| data[:resolved_conversations_count] }
-    @avg_resolution_time = results.transform_values { |data| data[:avg_resolution_time] }
-    @avg_first_response_time = results.transform_values { |data| data[:avg_first_response_time] }
-    @avg_reply_time = results.transform_values { |data| data[:avg_reply_time] }
+  def load_reporting_events_data
+    # Extract the column name for indexing (e.g., 'conversations.team_id' -> 'team_id')
+    index_key = group_by_key.to_s.split('.').last
+
+    results = reporting_events
+              .select(
+                "#{group_by_key} as #{index_key}",
+                "COUNT(CASE WHEN name = 'conversation_resolved' THEN 1 END) as resolved_count",
+                "AVG(CASE WHEN name = 'conversation_resolved' THEN #{average_value_key} END) as avg_resolution_time",
+                "AVG(CASE WHEN name = 'first_response' THEN #{average_value_key} END) as avg_first_response_time",
+                "AVG(CASE WHEN name = 'reply_time' THEN #{average_value_key} END) as avg_reply_time"
+              )
+              .group(group_by_key)
+              .index_by { |record| record.public_send(index_key) }
+
+    @resolved_count = results.transform_values(&:resolved_count)
+    @avg_resolution_time = results.transform_values(&:avg_resolution_time)
+    @avg_first_response_time = results.transform_values(&:avg_first_response_time)
+    @avg_reply_time = results.transform_values(&:avg_reply_time)
+  end
+
+  def reporting_events
+    @reporting_events ||= account.reporting_events.where(created_at: range)
+  end
+
+  def fetch_conversations_count
+    # Override this method
  end

  def group_by_key
@@ -26,26 +50,7 @@ class V2::Reports::BaseSummaryBuilder
    # Override this method
  end

-  def data_source
-    @data_source ||= Reports::DataSource.for(
-      account: account,
-      metric: nil,
-      dimension_type: summary_dimension_type,
-      dimension_id: nil,
-      scope: nil,
-      range: range,
-      group_by: 'day',
-      timezone_offset: params[:timezone_offset],
-      business_hours: params[:business_hours]
-    )
-  end
-
-  def summary_dimension_type
-    {
-      'account_id' => 'account',
-      'user_id' => 'agent',
-      'inbox_id' => 'inbox',
-      'conversations.team_id' => 'team'
-    }.fetch(group_by_key.to_s)
+  def average_value_key
+    ActiveModel::Type::Boolean.new.cast(params[:business_hours]).present? ? :value_in_business_hours : :value
  end
 end
@@ -3,10 +3,23 @@ class V2::Reports::Conversations::BaseReportBuilder

  private

-  def builder_class(metric)
-    return unless Reports::ReportMetricRegistry.supported?(metric)
+  AVG_METRICS = %w[avg_first_response_time avg_resolution_time reply_time].freeze
+  COUNT_METRICS = %w[
+    conversations_count
+    incoming_messages_count
+    outgoing_messages_count
+    resolutions_count
+    bot_resolutions_count
+    bot_handoffs_count
+  ].freeze

-    V2::Reports::Timeseries::ReportBuilder
+  def builder_class(metric)
+    case metric
+    when *AVG_METRICS
+      V2::Reports::Timeseries::AverageReportBuilder
+    when *COUNT_METRICS
+      V2::Reports::Timeseries::CountReportBuilder
+    end
  end

  def log_invalid_metric
@@ -11,6 +11,15 @@ class V2::Reports::InboxSummaryBuilder < V2::Reports::BaseSummaryBuilder
  attr_reader :conversations_count, :resolved_count,
              :avg_resolution_time, :avg_first_response_time, :avg_reply_time

+  def load_data
+    @conversations_count = fetch_conversations_count
+    load_reporting_events_data
+  end
+
+  def fetch_conversations_count
+    account.conversations.where(created_at: range).group(group_by_key).count
+  end
+
  def prepare_report
    account.inboxes.map do |inbox|
      build_inbox_stats(inbox)
@@ -31,4 +40,8 @@ class V2::Reports::InboxSummaryBuilder < V2::Reports::BaseSummaryBuilder
  def group_by_key
    :inbox_id
  end
+
+  def average_value_key
+    ActiveModel::Type::Boolean.new.cast(params[:business_hours]) ? :value_in_business_hours : :value
+  end
 end
@@ -6,6 +6,14 @@ class V2::Reports::TeamSummaryBuilder < V2::Reports::BaseSummaryBuilder
  attr_reader :conversations_count, :resolved_count,
              :avg_resolution_time, :avg_first_response_time, :avg_reply_time

+  def fetch_conversations_count
+    account.conversations.where(created_at: range).group(:team_id).count
+  end
+
+  def reporting_events
+    @reporting_events ||= account.reporting_events.where(created_at: range).joins(:conversation)
+  end
+
  def prepare_report
    account.teams.map do |team|
      build_team_stats(team)
@@ -0,0 +1,48 @@
+class V2::Reports::Timeseries::AverageReportBuilder < V2::Reports::Timeseries::BaseTimeseriesBuilder
+  def timeseries
+    grouped_average_time = reporting_events.average(average_value_key)
+    grouped_event_count = reporting_events.count
+    grouped_average_time.each_with_object([]) do |element, arr|
+      event_date, average_time = element
+      arr << {
+        value: average_time,
+        timestamp: event_date.in_time_zone(timezone).to_i,
+        count: grouped_event_count[event_date]
+      }
+    end
+  end
+
+  def aggregate_value
+    object_scope.average(average_value_key)
+  end
+
+  private
+
+  def event_name
+    metric_to_event_name = {
+      avg_first_response_time: :first_response,
+      avg_resolution_time: :conversation_resolved,
+      reply_time: :reply_time
+    }
+    metric_to_event_name[params[:metric].to_sym]
+  end
+
+  def object_scope
+    scope.reporting_events.where(name: event_name, created_at: range, account_id: account.id)
+  end
+
+  def reporting_events
+    @grouped_values = object_scope.group_by_period(
+      group_by,
+      :created_at,
+      default_value: 0,
+      range: range,
+      permit: %w[day week month year hour],
+      time_zone: timezone
+    )
+  end
+
+  def average_value_key
+    @average_value_key ||= params[:business_hours].present? ? :value_in_business_hours : :value
+  end
+end
@@ -1,13 +1,12 @@
 class V2::Reports::Timeseries::BaseTimeseriesBuilder
  include TimezoneHelper
  include DateRangeHelper
-
  DEFAULT_GROUP_BY = 'day'.freeze

  pattr_initialize :account, :params

  def scope
-    case dimension_type.to_sym
+    case params[:type].to_sym
    when :account
      account
    when :inbox
@@ -21,20 +20,6 @@ class V2::Reports::Timeseries::BaseTimeseriesBuilder
    end
  end

-  def data_source
-    @data_source ||= Reports::DataSource.for(
-      account: account,
-      metric: params[:metric],
-      dimension_type: dimension_type,
-      dimension_id: params[:id],
-      scope: scope,
-      range: range,
-      group_by: group_by,
-      timezone_offset: params[:timezone_offset],
-      business_hours: params[:business_hours]
-    )
-  end
-
  def inbox
    @inbox ||= account.inboxes.find(params[:id])
  end
@@ -58,10 +43,4 @@ class V2::Reports::Timeseries::BaseTimeseriesBuilder
  def timezone
    @timezone ||= timezone_name_from_offset(params[:timezone_offset])
  end
-
-  private
-
-  def dimension_type
-    (params[:type].presence || 'account').to_s
-  end
 end
@@ -0,0 +1,78 @@
+class V2::Reports::Timeseries::CountReportBuilder < V2::Reports::Timeseries::BaseTimeseriesBuilder
+  def timeseries
+    grouped_count.each_with_object([]) do |element, arr|
+      event_date, event_count = element
+
+      # The `event_date` is in Date format (without time), such as "Wed, 15 May 2024".
+      # We need a timestamp for the start of the day. However, we can't use `event_date.to_time.to_i`
+      # because it converts the date to 12:00 AM server timezone.
+      # The desired output should be 12:00 AM in the specified timezone.
+      arr << { value: event_count, timestamp: event_date.in_time_zone(timezone).to_i }
+    end
+  end
+
+  def aggregate_value
+    object_scope.count
+  end
+
+  private
+
+  def metric
+    @metric ||= params[:metric]
+  end
+
+  def object_scope
+    send("scope_for_#{metric}")
+  end
+
+  def scope_for_conversations_count
+    scope.conversations.where(account_id: account.id, created_at: range)
+  end
+
+  def scope_for_incoming_messages_count
+    scope.messages.where(account_id: account.id, created_at: range).incoming.unscope(:order)
+  end
+
+  def scope_for_outgoing_messages_count
+    scope.messages.where(account_id: account.id, created_at: range).outgoing.unscope(:order)
+  end
+
+  def scope_for_resolutions_count
+    scope.reporting_events.where(
+      name: :conversation_resolved,
+      account_id: account.id,
+      created_at: range
+    )
+  end
+
+  def scope_for_bot_resolutions_count
+    scope.reporting_events.where(
+      name: :conversation_bot_resolved,
+      account_id: account.id,
+      created_at: range
+    )
+  end
+
+  def scope_for_bot_handoffs_count
+    scope.reporting_events.joins(:conversation).select(:conversation_id).where(
+      name: :conversation_bot_handoff,
+      account_id: account.id,
+      created_at: range
+    ).distinct
+  end
+
+  def grouped_count
+    # IMPORTANT: time_zone parameter affects both data grouping AND output timestamps
+    # It converts timestamps to the target timezone before grouping, which means
+    # the same event can fall into different day buckets depending on timezone
+    # Example: 2024-01-15 00:00 UTC becomes 2024-01-14 16:00 PST (falls on different day)
+    @grouped_values = object_scope.group_by_period(
+      group_by,
+      :created_at,
+      default_value: 0,
+      range: range,
+      permit: %w[day week month year hour],
+      time_zone: timezone
+    ).count
+  end
+end
@@ -1,9 +0,0 @@
-class V2::Reports::Timeseries::ReportBuilder < V2::Reports::Timeseries::BaseTimeseriesBuilder
-  def timeseries
-    data_source.timeseries
-  end
-
-  def aggregate_value
-    data_source.aggregate
-  end
-end
@@ -34,10 +34,6 @@ class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
    @agent_bot.reload
  end

-  def reset_secret
-    @agent_bot.reset_secret!
-  end
-
  private

  def agent_bot
@@ -1,43 +0,0 @@
-class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::BaseController
-  before_action :portal
-  before_action :check_authorization
-  before_action :set_articles, only: [:update_status, :delete_articles]
-
-  def translate
-    head :not_implemented
-  end
-
-  def update_status
-    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.invalid_status')) unless Article.statuses.key?(params[:status])
-
-    ActiveRecord::Base.transaction do
-      @articles.find_each { |article| article.update!(status: params[:status]) }
-    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?
-
-    @articles.destroy_all
-    head :ok
-  end
-
-  private
-
-  def portal
-    @portal ||= Current.account.portals.find_by!(slug: params[:portal_id])
-  end
-
-  def check_authorization
-    authorize(Article, :create?)
-  end
-
-  def set_articles
-    @articles = @portal.articles.where(id: params[:ids])
-  end
-end
-Api::V1::Accounts::Articles::BulkActionsController.prepend_mod_with('Api::V1::Accounts::Articles::BulkActionsController')
@@ -1,55 +0,0 @@
-module Api::V1::Accounts::Concerns::WhatsappHealthManagement
-  extend ActiveSupport::Concern
-
-  included do
-    skip_before_action :check_authorization, only: [:health, :register_webhook]
-    before_action :check_admin_authorization?, only: [:register_webhook]
-    before_action :validate_whatsapp_cloud_channel, only: [:health, :register_webhook]
-  end
-
-  def sync_templates
-    return render status: :unprocessable_entity, json: { error: 'Template sync is only available for WhatsApp channels' } unless whatsapp_channel?
-
-    trigger_template_sync
-    render status: :ok, json: { message: 'Template sync initiated successfully' }
-  rescue StandardError => e
-    render status: :internal_server_error, json: { error: e.message }
-  end
-
-  def health
-    health_data = Whatsapp::HealthService.new(@inbox.channel).fetch_health_status
-    render json: health_data
-  rescue StandardError => e
-    Rails.logger.error "[INBOX HEALTH] Error fetching health data: #{e.message}"
-    render json: { error: e.message }, status: :unprocessable_entity
-  end
-
-  def register_webhook
-    Whatsapp::WebhookSetupService.new(@inbox.channel).register_callback
-
-    render json: { message: 'Webhook registered successfully' }, status: :ok
-  rescue StandardError => e
-    Rails.logger.error "[INBOX WEBHOOK] Webhook registration failed: #{e.message}"
-    render json: { error: e.message }, status: :unprocessable_entity
-  end
-
-  private
-
-  def validate_whatsapp_cloud_channel
-    return if @inbox.channel.is_a?(Channel::Whatsapp) && @inbox.channel.provider == 'whatsapp_cloud'
-
-    render json: { error: 'Health data only available for WhatsApp Cloud API channels' }, status: :bad_request
-  end
-
-  def whatsapp_channel?
-    @inbox.whatsapp? || (@inbox.twilio? && @inbox.channel.whatsapp?)
-  end
-
-  def trigger_template_sync
-    if @inbox.whatsapp?
-      Channels::Whatsapp::TemplatesSyncJob.perform_later(@inbox.channel)
-    elsif @inbox.twilio? && @inbox.channel.whatsapp?
-      Channels::Twilio::TemplatesSyncJob.perform_later(@inbox.channel)
-    end
-  end
-end
@@ -5,7 +5,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
  sort_on :phone_number, type: :string
  sort_on :last_activity_at, internal_name: :order_on_last_activity_at, type: :scope, scope_params: [:direction]
  sort_on :created_at, internal_name: :order_on_created_at, type: :scope, scope_params: [:direction]
-  sort_on :company_name, internal_name: :order_on_company_name, type: :scope, scope_params: [:direction]
+  sort_on :company, internal_name: :order_on_company_name, type: :scope, scope_params: [:direction]
  sort_on :city, internal_name: :order_on_city, type: :scope, scope_params: [:direction]
  sort_on :country, internal_name: :order_on_country_name, type: :scope, scope_params: [:direction]

@@ -116,8 +116,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    # High-traffic accounts generate excessive DB writes when agents frequently switch between conversations.
    # Throttle last_seen updates to once per hour when there are no unread messages to reduce DB load.
    # Always update immediately if there are unread messages to maintain accurate read/unread state.
-    # Visiting a conversation should clear any unread inbox notifications for this conversation.
-    Notification::MarkConversationReadService.new(user: Current.user, account: Current.account, conversation: @conversation).perform
    return update_last_seen_on_conversation(DateTime.now.utc, true) if assignee? && @conversation.assignee_unread_messages.any?
    return update_last_seen_on_conversation(DateTime.now.utc, false) if !assignee? && @conversation.unread_messages.any?

@@ -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
@@ -4,9 +4,8 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  before_action :fetch_agent_bot, only: [:set_agent_bot]
  before_action :validate_limit, only: [:create]
  # we are already handling the authorization in fetch inbox
-  before_action :check_authorization, except: [:show]
-
-  include Api::V1::Accounts::Concerns::WhatsappHealthManagement
+  before_action :check_authorization, except: [:show, :health]
+  before_action :validate_whatsapp_cloud_channel, only: [:health]

  def index
    @inboxes = policy_scope(Current.account.inboxes.order_by_name.includes(:channel, { avatar_attachment: [:blob] }))
@@ -66,17 +65,28 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
    head :ok
  end

-  def reset_secret
-    return head :not_found unless @inbox.api?
-
-    @inbox.channel.reset_secret!
-  end
-
  def destroy
    ::DeleteObjectJob.perform_later(@inbox, Current.user, request.ip) if @inbox.present?
    render status: :ok, json: { message: I18n.t('messages.inbox_deletetion_response') }
  end

+  def sync_templates
+    return render status: :unprocessable_entity, json: { error: 'Template sync is only available for WhatsApp channels' } unless whatsapp_channel?
+
+    trigger_template_sync
+    render status: :ok, json: { message: 'Template sync initiated successfully' }
+  rescue StandardError => e
+    render status: :internal_server_error, json: { error: e.message }
+  end
+
+  def health
+    health_data = Whatsapp::HealthService.new(@inbox.channel).fetch_health_status
+    render json: health_data
+  rescue StandardError => e
+    Rails.logger.error "[INBOX HEALTH] Error fetching health data: #{e.message}"
+    render json: { error: e.message }, status: :unprocessable_entity
+  end
+
  private

  def fetch_inbox
@@ -88,6 +98,12 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
    @agent_bot = AgentBot.find(params[:agent_bot]) if params[:agent_bot]
  end

+  def validate_whatsapp_cloud_channel
+    return if @inbox.channel.is_a?(Channel::Whatsapp) && @inbox.channel.provider == 'whatsapp_cloud'
+
+    render json: { error: 'Health data only available for WhatsApp Cloud API channels' }, status: :bad_request
+  end
+
  def create_channel
    return unless allowed_channel_types.include?(permitted_params[:channel][:type])

@@ -184,6 +200,18 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  def get_channel_attributes(channel_type)
    channel_type.constantize.const_defined?(:EDITABLE_ATTRS) ? channel_type.constantize::EDITABLE_ATTRS.presence : []
  end
+
+  def whatsapp_channel?
+    @inbox.whatsapp? || (@inbox.twilio? && @inbox.channel.whatsapp?)
+  end
+
+  def trigger_template_sync
+    if @inbox.whatsapp?
+      Channels::Whatsapp::TemplatesSyncJob.perform_later(@inbox.channel)
+    elsif @inbox.twilio? && @inbox.channel.whatsapp?
+      Channels::Twilio::TemplatesSyncJob.perform_later(@inbox.channel)
+    end
+  end
 end

 Api::V1::Accounts::InboxesController.prepend_mod_with('Api::V1::Accounts::InboxesController')
@@ -126,7 +126,7 @@ class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Bas
    return unless @hook&.access_token

    begin
-      linear_client = Linear.new(@hook.access_token, refresh_token: @hook.settings&.[]('refresh_token'))
+      linear_client = Linear.new(@hook.access_token)
      linear_client.revoke_token
    rescue StandardError => e
      Rails.logger.error "Failed to revoke Linear token: #{e.message}"
@@ -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

@@ -61,8 +61,9 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
  end

  def process_attached_logo
-    blob = ActiveStorage::Blob.find_signed(params[:blob_id].to_s)
-    @portal.logo.attach(blob) if blob
+    blob_id = params[:blob_id]
+    blob = ActiveStorage::Blob.find_signed(blob_id)
+    @portal.logo.attach(blob)
  end

  private
@@ -78,7 +79,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, { allowed_locales: [] }, { draft_locales: [] }] }
+      :name, :page_title, :slug, :archived, { config: [:default_locale, { allowed_locales: [] }] }
    )
  end

@@ -5,7 +5,7 @@ class Api::V1::Accounts::UploadController < Api::V1::Accounts::BaseController
             elsif params[:external_url].present?
               create_from_url
             else
-               render_error(I18n.t('errors.upload.missing_input'), :unprocessable_entity)
+               render_error('No file or URL provided', :unprocessable_entity)
             end

    render_success(result) if result.is_a?(ActiveStorage::Blob)
@@ -19,21 +19,35 @@ class Api::V1::Accounts::UploadController < Api::V1::Accounts::BaseController
  end

  def create_from_url
-    SafeFetch.fetch(params[:external_url].to_s) do |result|
-      create_and_save_blob(result.tempfile, result.filename, result.content_type)
+    uri = parse_uri(params[:external_url])
+    return if performed?
+
+    fetch_and_process_file_from_uri(uri)
+  end
+
+  def parse_uri(url)
+    uri = URI.parse(url)
+    validate_uri(uri)
+    uri
+  rescue URI::InvalidURIError, SocketError
+    render_error('Invalid URL provided', :unprocessable_entity)
+    nil
+  end
+
+  def validate_uri(uri)
+    raise URI::InvalidURIError unless uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
+  end
+
+  def fetch_and_process_file_from_uri(uri)
+    uri.open do |file|
+      create_and_save_blob(file, File.basename(uri.path), file.content_type)
    end
-  rescue SafeFetch::HttpError => e
-    render_error(I18n.t('errors.upload.fetch_failed_with_message', message: e.message), :unprocessable_entity)
-  rescue SafeFetch::FetchError
-    render_error(I18n.t('errors.upload.fetch_failed'), :unprocessable_entity)
-  rescue SafeFetch::FileTooLargeError
-    render_error(I18n.t('errors.upload.file_too_large'), :unprocessable_entity)
-  rescue SafeFetch::UnsupportedContentTypeError
-    render_error(I18n.t('errors.upload.unsupported_content_type'), :unprocessable_entity)
-  rescue SafeFetch::Error
-    render_error(I18n.t('errors.upload.invalid_url'), :unprocessable_entity)
+  rescue OpenURI::HTTPError => e
+    render_error("Failed to fetch file from URL: #{e.message}", :unprocessable_entity)
+  rescue SocketError
+    render_error('Invalid URL provided', :unprocessable_entity)
  rescue StandardError
-    render_error(I18n.t('errors.upload.unexpected'), :internal_server_error)
+    render_error('An unexpected error occurred', :internal_server_error)
  end

  def create_and_save_blob(io, filename, content_type)
@@ -30,20 +30,9 @@ class Api::V1::AccountsController < Api::BaseController
      locale: account_params[:locale],
      user: current_user
    ).perform
-    enqueue_branding_enrichment
    if @user
-      # Authenticated users (dashboard "add account") and api_only signups
-      # need the full response with account_id. API-only deployments have no
-      # frontend to handle the email confirmation flow, so they need auth
-      # tokens to proceed.
-      # Unauthenticated web signup returns only the email — no session is
-      # created until the user confirms via the email link.
-      if current_user || api_only_signup?
-        send_auth_headers(@user)
-        render 'api/v1/accounts/create', format: :json, locals: { resource: @user }
-      else
-        render json: { email: @user.email }
-      end
+      send_auth_headers(@user)
+      render 'api/v1/accounts/create', format: :json, locals: { resource: @user }
    else
      render_error_response(CustomExceptions::Account::SignupFailed.new({}))
    end
@@ -58,7 +47,6 @@ class Api::V1::AccountsController < Api::BaseController
    @account.assign_attributes(account_params.slice(:name, :locale, :domain, :support_email))
    @account.custom_attributes.merge!(custom_attributes_params)
    @account.settings.merge!(settings_params)
-    @account.custom_attributes.delete('onboarding_step') if @account.custom_attributes['onboarding_step'] == 'account_details'
    @account.custom_attributes['onboarding_step'] = 'invite_team' if @account.custom_attributes['onboarding_step'] == 'account_update'
    @account.save!
  end
@@ -71,17 +59,6 @@ class Api::V1::AccountsController < Api::BaseController

  private

-  def enqueue_branding_enrichment
-    email = account_params[:email].presence || @user&.email
-    return if email.blank?
-
-    Account::BrandingEnrichmentJob.perform_later(@account.id, email)
-    Redis::Alfred.set(format(Redis::Alfred::ACCOUNT_ONBOARDING_ENRICHMENT, account_id: @account.id), '1', ex: 30)
-  rescue StandardError => e
-    # Enrichment is optional — never let queue/Redis failures abort signup
-    ChatwootExceptionTracker.new(e).capture_exception
-  end
-
  def ensure_account_name
    # ensure that account_name and user_full_name is present
    # this is becuase the account builder and the models validations are not triggered
@@ -111,7 +88,7 @@ class Api::V1::AccountsController < Api::BaseController
  end

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

  def settings_params
@@ -126,15 +103,6 @@ class Api::V1::AccountsController < Api::BaseController
    raise ActionController::RoutingError, 'Not Found' unless GlobalConfigService.account_signup_enabled?
  end

-  def api_only_signup?
-    # CW_API_ONLY_SERVER is the canonical flag for API-only deployments.
-    # ENABLE_ACCOUNT_SIGNUP='api_only' is a legacy sentinel for the same purpose.
-    # Read ENABLE_ACCOUNT_SIGNUP raw from InstallationConfig because GlobalConfig.get
-    # typecasts it to boolean, coercing 'api_only' to true.
-    ActiveModel::Type::Boolean.new.cast(ENV.fetch('CW_API_ONLY_SERVER', false)) ||
-      InstallationConfig.find_by(name: 'ENABLE_ACCOUNT_SIGNUP')&.value.to_s == 'api_only'
-  end
-
  def validate_captcha
    raise ActionController::InvalidAuthenticityToken, 'Invalid Captcha' unless ChatwootCaptcha.new(params[:h_captcha_client_response]).valid?
  end
@@ -2,8 +2,8 @@ class Api::V1::Profile::MfaController < Api::BaseController
  before_action :check_mfa_feature_available
  before_action :check_mfa_enabled, only: [:destroy, :backup_codes]
  before_action :check_mfa_disabled, only: [:create, :verify]
-  before_action :validate_password, only: [:destroy]
  before_action :validate_otp, only: [:verify, :backup_codes, :destroy]
+  before_action :validate_password, only: [:destroy]

  def show; end

@@ -48,8 +48,7 @@ class Api::V1::Profile::MfaController < Api::BaseController
  def validate_otp
    authenticated = Mfa::AuthenticationService.new(
      user: current_user,
-      otp_code: mfa_params[:otp_code],
-      backup_code: mfa_params[:backup_code]
+      otp_code: mfa_params[:otp_code]
    ).authenticate

    return if authenticated
@@ -64,6 +63,6 @@ class Api::V1::Profile::MfaController < Api::BaseController
  end

  def mfa_params
-    params.permit(:otp_code, :backup_code, :password)
+    params.permit(:otp_code, :password)
  end
 end
@@ -19,7 +19,7 @@ class Api::V1::Widget::ContactsController < Api::V1::Widget::BaseController
      contact = @contact
    end

-    @contact_inbox.update(hmac_verified: true) if should_verify_hmac?
+    @contact_inbox.update(hmac_verified: true) if should_verify_hmac? && valid_hmac?

    identify_contact(contact)
  end
@@ -43,15 +43,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
  end

  def set_conversation
-    return unless conversation.nil?
-
-    @conversation = create_conversation
-    apply_labels if permitted_params[:labels].present?
-  end
-
-  def apply_labels
-    valid_labels = inbox.account.labels.where(title: permitted_params[:labels]).pluck(:title)
-    @conversation.update_labels(valid_labels) if valid_labels.present?
+    @conversation = create_conversation if conversation.nil?
  end

  def message_finder_params
@@ -72,14 +64,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController

  def permitted_params
    # timestamp parameter is used in create conversation method
-    # custom_attributes and labels are applied when a new conversation is created alongside the first message
-    params.permit(
-      :id, :before, :after, :website_token,
-      contact: [:name, :email],
-      message: [:content, :referer_url, :timestamp, :echo_id, :reply_to],
-      custom_attributes: {},
-      labels: []
-    )
+    params.permit(:id, :before, :after, :website_token, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id, :reply_to])
  end

  def set_message
@@ -3,15 +3,15 @@ class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseContr
  before_action :prepare_builder_params, only: [:agent, :team, :inbox, :label, :channel]

  def agent
-    render_report_with(V2::Reports::AgentSummaryBuilder, type: :agent)
+    render_report_with(V2::Reports::AgentSummaryBuilder)
  end

  def team
-    render_report_with(V2::Reports::TeamSummaryBuilder, type: :team)
+    render_report_with(V2::Reports::TeamSummaryBuilder)
  end

  def inbox
-    render_report_with(V2::Reports::InboxSummaryBuilder, type: :inbox)
+    render_report_with(V2::Reports::InboxSummaryBuilder)
  end

  def label
@@ -38,9 +38,8 @@ class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseContr
    }
  end

-  def render_report_with(builder_class, type: nil)
-    builder_params = type.present? ? @builder_params.merge(type: type) : @builder_params
-    builder = builder_class.new(account: Current.account, params: builder_params)
+  def render_report_with(builder_class)
+    builder = builder_class.new(account: Current.account, params: @builder_params)
    render json: builder.build
  end

@@ -1,18 +0,0 @@
-# Unauthenticated endpoint for resending confirmation emails during signup.
-# This is a standalone controller (not on DeviseOverrides::ConfirmationsController)
-# because OmniAuth middleware intercepts all POST /auth/* routes as provider
-# callbacks, and Devise controller filters cause 307 redirects for custom actions.
-# Inherits from ActionController::API to avoid both issues entirely.
-# Rate-limited by Rack::Attack (IP + email) and gated by hCaptcha.
-class Auth::ResendConfirmationsController < ActionController::API
-  def create
-    return head(:ok) unless ChatwootCaptcha.new(params[:h_captcha_client_response]).valid?
-
-    email = params[:email]
-    return head(:ok) unless email.is_a?(String)
-
-    user = User.from_email(email.strip.downcase)
-    user&.send_confirmation_instructions unless user&.confirmed?
-    head :ok
-  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'
@@ -10,12 +10,7 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
  private

  def sign_in_user
-    # Capture before skip_confirmation! sets confirmed_at, which would
-    # make oauth_user_needs_password_reset? return false and skip the
-    # password reset for persisted unconfirmed users.
-    needs_password_reset = oauth_user_needs_password_reset?
    @resource.skip_confirmation! if confirmable_enabled?
-    set_random_password_if_oauth_user if needs_password_reset

    # once the resource is found and verified
    # we can just send them to the login page again with the SSO params
@@ -25,10 +20,7 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
  end

  def sign_in_user_on_mobile
-    # See comment in sign_in_user for why this is captured before skip_confirmation!
-    needs_password_reset = oauth_user_needs_password_reset?
    @resource.skip_confirmation! if confirmable_enabled?
-    set_random_password_if_oauth_user if needs_password_reset

    # once the resource is found and verified
    # we can just send them to the login page again with the SSO params
@@ -45,7 +37,6 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
    return redirect_to login_page_url(error: 'business-account-only') unless validate_signup_email_is_business_domain?

    create_account_for_user
-    set_random_password_if_oauth_user
    token = @resource.send(:set_reset_password_token)
    frontend_url = ENV.fetch('FRONTEND_URL', nil)
    redirect_to "#{frontend_url}/app/auth/password/edit?config=default&reset_password_token=#{token}"
@@ -90,15 +81,6 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
    Avatar::AvatarFromUrlJob.perform_later(@resource, auth_hash['info']['image'])
  end

-  def oauth_user_needs_password_reset?
-    @resource.present? && (@resource.new_record? || !@resource.confirmed?)
-  end
-
-  def set_random_password_if_oauth_user
-    # Password must satisfy secure_password requirements (uppercase, lowercase, number, special char)
-    @resource.update(password: "#{SecureRandom.hex(16)}aA1!") if @resource.persisted?
-  end
-
  def default_devise_mapping
    'user'
  end
@@ -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?

@@ -2,8 +2,6 @@ class Linear::CallbacksController < ApplicationController
  include Linear::IntegrationHelper

  def show
-    return redirect_to(safe_linear_redirect_uri) if params[:code].blank? || account_id.blank?
-
    @response = oauth_client.auth_code.get_token(
      params[:code],
      redirect_uri: "#{base_url}/linear/callback"
@@ -12,7 +10,7 @@ class Linear::CallbacksController < ApplicationController
    handle_response
  rescue StandardError => e
    Rails.logger.error("Linear callback error: #{e.message}")
-    redirect_to safe_linear_redirect_uri
+    redirect_to linear_redirect_uri
  end

  private
@@ -33,19 +31,22 @@ class Linear::CallbacksController < ApplicationController
  end

  def handle_response
-    raise ArgumentError, 'Missing access token in Linear OAuth response' if parsed_body['access_token'].blank?
-
-    hook = account.hooks.find_or_initialize_by(app_id: 'linear')
-    hook.assign_attributes(
+    hook = account.hooks.new(
      access_token: parsed_body['access_token'],
      status: 'enabled',
-      settings: merged_integration_settings(hook.settings)
+      app_id: 'linear',
+      settings: {
+        token_type: parsed_body['token_type'],
+        expires_in: parsed_body['expires_in'],
+        scope: parsed_body['scope']
+      }
    )
+    # You may wonder why we're not handling the refresh token update, since the token will expire only after 10 years, https://github.com/linear/linear/issues/251
    hook.save!
    redirect_to linear_redirect_uri
  rescue StandardError => e
    Rails.logger.error("Linear callback error: #{e.message}")
-    redirect_to safe_linear_redirect_uri
+    redirect_to linear_redirect_uri
  end

  def account
@@ -53,47 +54,19 @@ class Linear::CallbacksController < ApplicationController
  end

  def account_id
-    return @account_id if instance_variable_defined?(:@account_id)
+    return unless params[:state]

-    @account_id = params[:state].present? ? verify_linear_token(params[:state]) : nil
+    verify_linear_token(params[:state])
  end

  def linear_redirect_uri
    "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{account.id}/settings/integrations/linear"
  end

-  def safe_linear_redirect_uri
-    return base_url if account_id.blank?
-
-    linear_redirect_uri
-  rescue StandardError
-    base_url
-  end
-
  def parsed_body
    @parsed_body ||= @response.response.parsed
  end

-  def integration_settings
-    {
-      token_type: parsed_body['token_type'],
-      expires_in: parsed_body['expires_in'],
-      expires_on: expires_on,
-      scope: parsed_body['scope'],
-      refresh_token: parsed_body['refresh_token']
-    }.compact
-  end
-
-  def merged_integration_settings(existing_settings)
-    existing_settings.to_h.with_indifferent_access.merge(integration_settings)
-  end
-
-  def expires_on
-    return if parsed_body['expires_in'].blank?
-
-    (Time.current.utc + parsed_body['expires_in'].to_i.seconds).to_s
-  end
-
  def base_url
    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
  end
@@ -3,7 +3,7 @@ class Platform::Api::V1::AgentBotsController < PlatformController
  before_action :validate_platform_app_permissible, except: [:index, :create]

  def index
-    @resources = @platform_app.platform_app_permissibles.where(permissible_type: 'AgentBot').includes(:permissible)
+    @resources = @platform_app.platform_app_permissibles.where(permissible_type: 'AgentBot').all
  end

  def show; end
@@ -1,101 +0,0 @@
-class Platform::Api::V1::EmailChannelMigrationsController < PlatformController
-  before_action :set_account
-  before_action :validate_account_permissible
-  before_action :validate_feature_flag
-  before_action :validate_params
-
-  def create
-    results = migrate_email_channels
-    render json: { results: results }, status: :ok
-  end
-
-  private
-
-  def set_account
-    @account = Account.find(params[:account_id])
-  end
-
-  def validate_account_permissible
-    return if @platform_app.platform_app_permissibles.find_by(permissible: @account)
-
-    render json: { error: 'Non permissible resource' }, status: :unauthorized
-  end
-
-  def validate_feature_flag
-    return if ActiveModel::Type::Boolean.new.cast(ENV.fetch('EMAIL_CHANNEL_MIGRATION', false))
-
-    render json: { error: 'Email channel migration is not enabled' }, status: :forbidden
-  end
-
-  def validate_params
-    return render json: { error: 'Missing migrations parameter' }, status: :unprocessable_entity if migration_params.blank?
-
-    return unless migration_params.size > MAX_MIGRATIONS
-
-    return render json: { error: "Too many migrations (max #{MAX_MIGRATIONS})" },
-                  status: :unprocessable_entity
-  end
-
-  def migrate_email_channels
-    migration_params.map { |entry| migrate_single(entry) }
-  end
-
-  MAX_MIGRATIONS = 25
-  SUPPORTED_PROVIDERS = %w[google microsoft].freeze
-
-  def migrate_single(entry)
-    validate_provider!(entry[:provider])
-
-    ActiveRecord::Base.transaction do
-      channel = create_channel(entry)
-      inbox = create_inbox(channel, entry)
-
-      { email: entry[:email], inbox_id: inbox.id, channel_id: channel.id, status: 'success' }
-    end
-  rescue StandardError => e
-    { email: entry[:email], status: 'error', message: e.message }
-  end
-
-  def create_channel(entry)
-    Channel::Email.create!(
-      account_id: @account.id,
-      email: entry[:email],
-      provider: entry[:provider],
-      provider_config: entry[:provider_config]&.to_h,
-      imap_enabled: entry.fetch(:imap_enabled, true),
-      imap_address: entry[:imap_address] || default_imap_address(entry[:provider]),
-      imap_port: entry[:imap_port] || 993,
-      imap_login: entry[:imap_login] || entry[:email],
-      imap_enable_ssl: entry.fetch(:imap_enable_ssl, true)
-    )
-  end
-
-  def create_inbox(channel, entry)
-    @account.inboxes.create!(
-      name: entry[:inbox_name] || "Migrated #{entry[:provider]&.capitalize}: #{entry[:email]}",
-      channel: channel
-    )
-  end
-
-  def validate_provider!(provider)
-    return if SUPPORTED_PROVIDERS.include?(provider)
-
-    raise ArgumentError, "Unsupported provider '#{provider}'. Must be one of: #{SUPPORTED_PROVIDERS.join(', ')}"
-  end
-
-  def default_imap_address(provider)
-    case provider
-    when 'google' then 'imap.gmail.com'
-    when 'microsoft' then 'outlook.office365.com'
-    else ''
-    end
-  end
-
-  def migration_params
-    params.permit(migrations: [
-                    :email, :provider, :inbox_name,
-                    :imap_enabled, :imap_address, :imap_port, :imap_login, :imap_enable_ssl,
-                    { provider_config: {} }
-                  ])[:migrations]
-  end
-end
@@ -1,13 +1,11 @@
 class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::BaseController
  before_action :ensure_custom_domain_request, only: [:show, :index]
  before_action :portal
-  before_action :ensure_portal_feature_enabled
  before_action :set_category, except: [:index, :show, :tracking_pixel]
  before_action :set_article, only: [:show]
  layout 'portal'

  def index
-    @search_query = list_params[:query]
    @articles = @portal.articles.published.includes(:category, :author)

    @articles = @articles.where(locale: permitted_params[:locale]) if permitted_params[:locale].present?
@@ -62,7 +60,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)
+    @parsed_content = render_article_content(@article.content)
  end

  def set_category
@@ -75,9 +73,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  end

  def list_params
-    @list_params ||= params.permit(:query, :locale, :sort, :status, :page, :per_page).tap do |permitted|
-      permitted[:query] = permitted[:query].to_s.strip.presence
-    end
+    params.permit(:query, :locale, :sort, :status, :page, :per_page)
  end

  def permitted_params
@@ -1,7 +1,6 @@
 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 :ensure_portal_feature_enabled
  before_action :set_category, only: [:show]
  layout 'portal'

@@ -1,8 +1,7 @@
 class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseController
  before_action :ensure_custom_domain_request, only: [:show]
-  before_action :redirect_to_portal_with_locale, only: [:show]
  before_action :portal
-  before_action :ensure_portal_feature_enabled
+  before_action :redirect_to_portal_with_locale, only: [:show]
  layout 'portal'

  def show
@@ -25,7 +24,6 @@ class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseControl
  def redirect_to_portal_with_locale
    return if params[:locale].present?

-    portal
    redirect_to "/hc/#{@portal.slug}/#{@portal.default_locale}"
  end
 end
@@ -18,11 +18,4 @@ class PublicController < ActionController::Base
      Please send us an email at support@chatwoot.com with the custom domain name and account API key"
    }, status: :unauthorized and return
  end
-
-  def ensure_portal_feature_enabled
-    return unless ChatwootApp.chatwoot_cloud?
-    return if @portal.account.feature_enabled?('help_center')
-
-    render 'public/api/v1/portals/not_active', status: :payment_required
-  end
 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,68 +0,0 @@
-class SuperAdmin::PushDiagnosticsController < SuperAdmin::ApplicationController
-  def show
-    @query = params[:user_query].to_s.strip
-    @user = resolve_user(@query)
-    @subscriptions = @user ? @user.notification_subscriptions.order(:id) : []
-    @results = []
-  end
-
-  def create
-    @user = User.find_by(id: params[:user_id])
-    return redirect_to super_admin_push_diagnostics_path, alert: I18n.t('super_admin.push_diagnostics.user_not_found') if @user.nil?
-
-    ids = parsed_subscription_ids
-    if ids.empty?
-      return redirect_to super_admin_push_diagnostics_path(user_query: @user.id),
-                         alert: I18n.t('super_admin.push_diagnostics.no_subscriptions_to_test')
-    end
-
-    run_test_and_render(ids)
-  end
-
-  def destroy_subscriptions
-    user = User.find_by(id: params[:user_id])
-    return redirect_to super_admin_push_diagnostics_path, alert: I18n.t('super_admin.push_diagnostics.user_not_found') if user.nil?
-
-    ids = parsed_subscription_ids
-    if ids.empty?
-      return redirect_to super_admin_push_diagnostics_path(user_query: user.id),
-                         alert: I18n.t('super_admin.push_diagnostics.no_subscriptions_to_delete')
-    end
-
-    deleted_count = user.notification_subscriptions.where(id: ids).destroy_all.size
-    log_super_admin_action("deleted #{deleted_count} subscriptions for user #{user.id}: #{ids}")
-    redirect_to super_admin_push_diagnostics_path(user_query: user.id),
-                notice: I18n.t('super_admin.push_diagnostics.subscriptions_deleted', count: deleted_count)
-  end
-
-  private
-
-  def run_test_and_render(ids)
-    @query = @user.id.to_s
-    @subscriptions = @user.notification_subscriptions.order(:id)
-    @results = Notification::PushTestService.new(
-      user: @user, subscription_ids: ids,
-      title: params[:push_title], body: params[:push_body]
-    ).perform
-
-    log_super_admin_action("test sent for user #{@user.id} subscriptions #{ids}")
-    render :show
-  end
-
-  def log_super_admin_action(message)
-    Rails.logger.info(
-      "[SuperAdmin] push diagnostics #{message} " \
-      "(actor_id=#{current_super_admin&.id}, actor_email=#{current_super_admin&.email})"
-    )
-  end
-
-  def resolve_user(query)
-    return if query.blank?
-
-    query.match?(/\A\d+\z/) ? User.find_by(id: query) : User.from_email(query)
-  end
-
-  def parsed_subscription_ids
-    Array(params[:subscription_ids]).reject(&:blank?).map(&:to_i)
-  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?
@@ -77,23 +77,13 @@ class WidgetsController < ActionController::Base
  end

  def allow_iframe_requests
-    if @web_widget.allowed_domains.blank? || embedded_from_non_web_origin?
+    if @web_widget.allowed_domains.blank?
      response.headers.delete('X-Frame-Options')
    else
      domains = @web_widget.allowed_domains.split(',').map(&:strip).join(' ')
      response.headers['Content-Security-Policy'] = "frame-ancestors #{domains}"
    end
  end
-
-  # Mobile WebViews (iOS/Android) load content from file:// or null origins,
-  # which cannot match any domain in frame-ancestors. When the per-inbox flag
-  # is enabled, skip frame-ancestors for these requests.
-  def embedded_from_non_web_origin?
-    return false unless @web_widget.allow_mobile_webview?
-
-    origin = request.headers['Origin']
-    origin.blank? || origin == 'null' || origin&.start_with?('file://')
-  end
 end

 WidgetsController.prepend_mod_with('WidgetsController')
@@ -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
@@ -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
@@ -48,5 +48,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
@@ -1,10 +1,4 @@
 module TimezoneHelper
-  def timezone_name_from_params(timezone, offset)
-    return timezone if timezone.present? && ActiveSupport::TimeZone[timezone].present?
-
-    timezone_name_from_offset(offset)
-  end
-
  # ActiveSupport TimeZone is not aware of the current time, so ActiveSupport::Timezone[offset]
  # would return the timezone without considering day light savings. To get the correct timezone,
  # this method uses zone.now.utc_offset for comparison as referenced in the issues below
@@ -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,
@@ -61,6 +59,7 @@ export default {
      isRTL: 'accounts/isRTL',
      currentUser: 'getCurrentUser',
      authUIFlags: 'getAuthUIFlags',
+      accountUIFlags: 'accounts/getUIFlags',
    }),
    hideOnOnboardingView() {
      return !isOnOnboardingView(this.$route);
@@ -99,18 +98,15 @@ export default {
      mql.onchange = e => setColorTheme(e.matches);
    },
    setLocale(locale) {
-      if (locale) {
-        this.$root.$i18n.locale = locale;
-      }
+      this.$root.$i18n.locale = locale;
    },
    async initializeAccount() {
      await this.$store.dispatch('accounts/get');
      this.$store.dispatch('setActiveAccount', {
        accountId: this.currentAccountId,
      });
-      const account = this.getAccount(this.currentAccountId);
      const { locale, latest_chatwoot_version: latestChatwootVersion } =
-        account;
+        this.getAccount(this.currentAccountId);
      const { pubsub_token: pubsubToken } = this.currentUser || {};
      // If user locale is set, use it; otherwise use account locale
      this.setLocale(this.uiSettings?.locale || locale);
@@ -133,13 +129,12 @@ export default {

 <template>
  <div
-    v-if="!authUIFlags.isFetching"
+    v-if="!authUIFlags.isFetching && !accountUIFlags.isFetchingItem"
    id="app"
    class="flex flex-col w-full h-screen min-h-0 bg-n-background"
    :dir="isRTL ? 'rtl' : 'ltr'"
  >
    <UpdateBanner :latest-chatwoot-version="latestChatwootVersion" />
-    <StatusBanner />
    <template v-if="currentAccountId">
      <PendingEmailVerificationBanner v-if="hideOnOnboardingView" />
      <PaymentPendingBanner v-if="hideOnOnboardingView" />
@@ -13,7 +13,6 @@ class ApiClient {
    return `${this.baseUrl()}/${this.resource}`;
  }

-  // eslint-disable-next-line class-methods-use-this
  get accountIdFromRoute() {
    const isInsideAccountScopedURLs =
      window.location.pathname.includes('/app/accounts');
@@ -8,7 +8,6 @@ class CacheEnabledApiClient extends ApiClient {
    this.dataManager = new DataManager(this.accountIdFromRoute);
  }

-  // eslint-disable-next-line class-methods-use-this
  get cacheModelName() {
    throw new Error('cacheModelName is not defined');
  }
@@ -25,12 +24,10 @@ class CacheEnabledApiClient extends ApiClient {
    return axios.get(this.url);
  }

-  // eslint-disable-next-line class-methods-use-this
  extractDataFromResponse(response) {
    return response.data.payload;
  }

-  // eslint-disable-next-line class-methods-use-this
  marshallData(dataToParse) {
    return { data: { payload: dataToParse } };
  }
@@ -25,10 +25,6 @@ class AgentBotsAPI extends ApiClient {
  resetAccessToken(botId) {
    return axios.post(`${this.url}/${botId}/reset_access_token`);
  }
-
-  resetSecret(botId) {
-    return axios.post(`${this.url}/${botId}/reset_secret`);
-  }
 }

 export default new AgentBotsAPI();
@@ -31,12 +31,6 @@ class CaptainCustomTools extends ApiClient {
  delete(id) {
    return axios.delete(`${this.url}/${id}`);
  }
-
-  test(data = {}) {
-    return axios.post(`${this.url}/test`, {
-      custom_tool: data,
-    });
-  }
 }

 export default new CaptainCustomTools();
@@ -7,7 +7,6 @@ class ChangelogApi extends ApiClient {
    super('changelog', { apiVersion: 'v1' });
  }

-  // eslint-disable-next-line class-methods-use-this
  fetchFromHub() {
    return axios.get(CHANGELOG_API_URL);
  }
@@ -68,7 +68,7 @@ class TwilioVoiceClient extends EventTarget {
    this.inboxId = null;
  }

-  async joinClientCall({ to, conversationId, callSid }) {
+  async joinClientCall({ to, conversationId }) {
    if (!this.device || !this.initialized || !to) return null;
    if (this.activeConnection) return this.activeConnection;

@@ -76,7 +76,6 @@ class TwilioVoiceClient extends EventTarget {
      To: to,
      is_agent: 'true',
      conversation_id: conversationId,
-      call_sid: callSid,
    };

    const connection = await this.device.connect({ params });
@@ -7,15 +7,14 @@ class VoiceAPI extends ApiClient {
    super('voice', { accountScoped: true });
  }

-  // eslint-disable-next-line class-methods-use-this
  initiateCall(contactId, inboxId) {
    return ContactsAPI.initiateCall(contactId, inboxId).then(r => r.data);
  }

-  leaveConference({ inboxId, conversationId, callSid }) {
+  leaveConference(inboxId, conversationId) {
    return axios
      .delete(`${this.baseUrl()}/inboxes/${inboxId}/conference`, {
-        params: { conversation_id: conversationId, call_sid: callSid },
+        params: { conversation_id: conversationId },
      })
      .then(r => r.data);
  }
@@ -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,41 +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 })}`);
-  }
-
-  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();
@@ -72,7 +72,6 @@ class ContactAPI extends ApiClient {
    return axios.get(requestURL);
  }

-  // eslint-disable-next-line default-param-last
  filter(page = 1, sortAttr = 'name', queryPayload) {
    let requestURL = `${this.url}/filter?${buildContactParams(page, sortAttr)}`;
    return axios.post(requestURL, queryPayload);
@@ -72,27 +72,6 @@ class ArticlesAPI extends PortalsAPI {
      category_slug: categorySlug,
    });
  }
-
-  bulkTranslate({ portalSlug, articleIds, locale, categoryId, force = false }) {
-    return axios.post(
-      `${this.url}/${portalSlug}/articles/bulk_actions/translate`,
-      { ids: articleIds, locale, category_id: categoryId, force }
-    );
-  }
-
-  bulkUpdateStatus({ portalSlug, articleIds, status }) {
-    return axios.patch(
-      `${this.url}/${portalSlug}/articles/bulk_actions/update_status`,
-      { ids: articleIds, status }
-    );
-  }
-
-  bulkDelete({ portalSlug, articleIds }) {
-    return axios.delete(
-      `${this.url}/${portalSlug}/articles/bulk_actions/delete_articles`,
-      { data: { ids: articleIds } }
-    );
-  }
 }

 export default new ArticlesAPI();
@@ -9,10 +9,6 @@ class InboxHealthAPI extends ApiClient {
  getHealthStatus(inboxId) {
    return axios.get(`${this.url}/${inboxId}/health`);
  }
-
-  registerWebhook(inboxId) {
-    return axios.post(`${this.url}/${inboxId}/register_webhook`);
-  }
 }

 export default new InboxHealthAPI();
@@ -6,7 +6,6 @@ class Inboxes extends CacheEnabledApiClient {
    super('inboxes', { accountScoped: true });
  }

-  // eslint-disable-next-line class-methods-use-this
  get cacheModelName() {
    return 'inbox';
  }
@@ -48,10 +47,6 @@ class Inboxes extends CacheEnabledApiClient {
      template,
    });
  }
-
-  resetSecret(inboxId) {
-    return axios.post(`${this.url}/${inboxId}/reset_secret`);
-  }
 }

 export default new Inboxes();
@@ -5,7 +5,6 @@ class LabelsAPI extends CacheEnabledApiClient {
    super('labels', { accountScoped: true });
  }

-  // eslint-disable-next-line class-methods-use-this
  get cacheModelName() {
    return 'label';
  }
@@ -14,9 +14,9 @@ class MfaAPI extends ApiClient {
    return axios.post(`${this.url}/verify`, { otp_code: otpCode });
  }

-  disable(password, { otpCode, backupCode } = {}) {
+  disable(password, otpCode) {
    return axios.delete(this.url, {
-      data: { password, otp_code: otpCode, backup_code: backupCode },
+      data: { password, otp_code: otpCode },
    });
  }

@@ -31,7 +31,6 @@ class ReportsAPI extends ApiClient {
    });
  }

-  // eslint-disable-next-line default-param-last
  getSummary(since, until, type = 'account', id, groupBy, businessHours) {
    return axios.get(`${this.url}/summary`, {
      params: {
@@ -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'
+    );
  });
 });
@@ -7,17 +7,14 @@ export class TeamsAPI extends CacheEnabledApiClient {
    super('teams', { accountScoped: true });
  }

-  // eslint-disable-next-line class-methods-use-this
  get cacheModelName() {
    return 'team';
  }

-  // eslint-disable-next-line class-methods-use-this
  extractDataFromResponse(response) {
    return response.data;
  }

-  // eslint-disable-next-line class-methods-use-this
  marshallData(dataToParse) {
    return { data: dataToParse };
  }
@@ -106,10 +106,6 @@ select {
  &[disabled] {
    @apply field-disabled;
  }
-
-  option:not(:disabled) {
-    @apply bg-n-solid-2 text-n-slate-12;
-  }
 }

 // Textarea
@@ -20,11 +20,11 @@ const excludedLabels = defineModel('excludedLabels', {

 const excludeOlderThanMinutes = defineModel('excludeOlderThanMinutes', {
  type: Number,
-  default: null,
+  default: 10,
 });

-// Duration limits: 1 minute to 999 days (in minutes)
-const MIN_DURATION_MINUTES = 1;
+// Duration limits: 10 minutes to 999 days (in minutes)
+const MIN_DURATION_MINUTES = 10;
 const MAX_DURATION_MINUTES = 1438560; // 999 days * 24 hours * 60 minutes

 const { t } = useI18n();
@@ -27,7 +27,7 @@ const { t } = useI18n();

 const BASE_KEY = 'ASSIGNMENT_POLICY.AGENT_CAPACITY_POLICY';
 const DEFAULT_CONVERSATION_LIMIT = 10;
-const MIN_CONVERSATION_LIMIT = 0;
+const MIN_CONVERSATION_LIMIT = 1;
 const MAX_CONVERSATION_LIMIT = 100000;

 const selectedInboxIds = computed(
@@ -42,7 +42,6 @@ const availableInboxes = computed(() =>

 const isLimitValid = limit => {
  return (
-    Number.isInteger(limit.conversationLimit) &&
    limit.conversationLimit >= MIN_CONVERSATION_LIMIT &&
    limit.conversationLimit <= MAX_CONVERSATION_LIMIT
  );
@@ -56,7 +56,6 @@ const state = reactive({ ...initialState });
 const urlValidators = {
  shouldBeAValidURLPattern: value => {
    try {
-      // eslint-disable-next-line
      new URLPattern(value);
      return true;
    } catch {
@@ -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,115 +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:block overflow-y-auto justify-end min-w-52 w-full py-6 max-w-md border-l border-n-weak bg-n-solid-2"
-    >
-      <slot name="sidebar" />
-    </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%] bg-n-solid-2 ltr:border-l rtl:border-r border-n-weak overflow-y-auto py-6 shadow-lg"
-        >
-          <slot name="sidebar" />
-        </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 pt-1">
-    <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 text-sm text-center rounded-xl border border-dashed border-n-weak 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"
-        @update:current-page="emit('update:currentPage', $event)"
-      />
-    </div>
-  </div>
-</template>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shivam Mishra	0893ff3548	style: remove redundant space	2026-03-11 13:27:28 +05:30
Shivam Mishra	17a6fa6c1d	feat: upgrade to eslint 10	2026-03-11 13:20:31 +05:30
@@ -1 +1 @@
 .13.0
 .11.2