fix: test switchlocale method directly instead of via http routing

fix: shopify and locale spec
2025-11-21 16:31:14 +05:30 · 2025-11-21 16:28:03 +05:30 · 2025-11-21 16:21:05 +05:30
1188 changed files with 7815 additions and 42851 deletions
@@ -76,7 +76,7 @@ jobs:
            bundle install

      - node/install:
-          node-version: '24.12'
+          node-version: '23.7'
      - node/install-pnpm
      - node/install-packages:
          pkg-manager: pnpm
@@ -117,7 +117,7 @@ jobs:
    steps:
      - checkout
      - node/install:
-          node-version: '24.12'
+          node-version: '23.7'
      - node/install-pnpm
      - node/install-packages:
          pkg-manager: pnpm
@@ -148,7 +148,7 @@ jobs:
    steps:
      - checkout
      - node/install:
-          node-version: '24.12'
+          node-version: '23.7'
      - node/install-pnpm
      - node/install-packages:
          pkg-manager: pnpm
@@ -218,49 +218,6 @@ jobs:
            source ~/.rvm/scripts/rvm
            bundle install

-      # Install and configure OpenSearch
-      - run:
-          name: Install OpenSearch
-          command: |
-            # Download and install OpenSearch 2.11.0 (compatible with Elasticsearch 7.x clients)
-            wget https://artifacts.opensearch.org/releases/bundle/opensearch/2.11.0/opensearch-2.11.0-linux-x64.tar.gz
-            tar -xzf opensearch-2.11.0-linux-x64.tar.gz
-            sudo mv opensearch-2.11.0 /opt/opensearch
-
-      - run:
-          name: Configure and Start OpenSearch
-          command: |
-            # Configure OpenSearch for single-node testing
-            cat > /opt/opensearch/config/opensearch.yml \<< EOF
-            cluster.name: chatwoot-test
-            node.name: node-1
-            network.host: 0.0.0.0
-            http.port: 9200
-            discovery.type: single-node
-            plugins.security.disabled: true
-            EOF
-
-            # Set ownership and permissions
-            sudo chown -R $USER:$USER /opt/opensearch
-
-            # Start OpenSearch in background
-            /opt/opensearch/bin/opensearch -d -p /tmp/opensearch.pid
-
-      - run:
-          name: Wait for OpenSearch to be ready
-          command: |
-            echo "Waiting for OpenSearch to start..."
-            for i in {1..30}; do
-              if curl -s http://localhost:9200/_cluster/health | grep -q '"status"'; then
-                echo "OpenSearch is ready!"
-                exit 0
-              fi
-              echo "Waiting... ($i/30)"
-              sleep 2
-            done
-            echo "OpenSearch failed to start"
-            exit 1
-
      # Configure environment and database
      - run:
          name: Database Setup and Configure Environment Variables
@@ -277,7 +234,6 @@ jobs:
            sed -i -e '/POSTGRES_USERNAME/ s/=.*/=chatwoot/' .env
            sed -i -e "/POSTGRES_PASSWORD/ s/=.*/=$pg_pass/" .env
            echo -en "\nINSTALLATION_ENV=circleci" >> ".env"
-            echo -en "\nOPENSEARCH_URL=http://localhost:9200" >> ".env"

      # Database setup
      - run:
@@ -10,7 +10,7 @@ services:
      dockerfile: .devcontainer/Dockerfile.base
      args:
        VARIANT: 'ubuntu-22.04'
-        NODE_VERSION: '24.12.0'
+        NODE_VERSION: '23.7.0'
        RUBY_VERSION: '3.4.4'
        # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
        USER_UID: '1000'
@@ -11,7 +11,7 @@ services:
      dockerfile: .devcontainer/Dockerfile
      args:
        VARIANT: 'ubuntu-22.04'
-        NODE_VERSION: '24.12.0'
+        NODE_VERSION: '23.7.0'
        RUBY_VERSION: '3.4.4'
        # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
        USER_UID: '1000'
@@ -220,7 +220,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#environment-variables
 # DD_TRACE_AGENT_URL=

-
 # MaxMindDB API key to download GeoLite2 City database
 # IP_LOOKUP_API_KEY=

@@ -274,5 +273,3 @@ AZURE_APP_SECRET=
 # Set to true if you want to remove stale contact inboxes
 # contact_inboxes with no conversation older than 90 days will be removed
 # REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
-
-# REDIS_ALFRED_SIZE=10
@@ -26,7 +26,7 @@ jobs:

      - uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: 23
          cache: 'pnpm'

      - name: Install pnpm dependencies
@@ -28,7 +28,7 @@ jobs:
      - uses: pnpm/action-setup@v4
      - uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: 23
          cache: 'pnpm'
      - name: Install pnpm dependencies
        run: pnpm i
@@ -43,7 +43,7 @@ jobs:
      - uses: pnpm/action-setup@v4
      - uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: 23
          cache: 'pnpm'
      - name: Install pnpm dependencies
        run: pnpm i
@@ -94,7 +94,7 @@ jobs:

      - uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: 23
          cache: 'pnpm'

      - name: Install pnpm dependencies
@@ -28,7 +28,7 @@ jobs:

      - uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: 23
          cache: 'pnpm'

      - name: pnpm
@@ -99,5 +99,3 @@ CLAUDE.local.md
 # Histoire deployment
 .netlify
 .histoire
-.pnpm-store/*
-local/
@@ -1 +1 @@
-24.12.0
+20.5.1
@@ -39,7 +39,7 @@ exclude_patterns = [
  "**/target/**",
  "**/templates/**",
  "**/testdata/**",
-  "**/vendor/**", "spec/", "**/specs/**/**", "**/spec/**/**", "db/*", "bin/**/*", "db/**/*", "config/**/*", "public/**/*", "vendor/**/*", "node_modules/**/*", "lib/tasks/auto_annotate_models.rake", "app/test-matchers.js", "docs/*", "**/*.md", "**/*.yml", "app/javascript/dashboard/i18n/locale", "**/*.stories.js", "stories/", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js", "app/javascript/shared/constants/countries.js", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js", "app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js", "app/javascript/dashboard/routes/dashboard/settings/automation/constants.js", "app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js", "app/javascript/dashboard/routes/dashboard/settings/reports/constants.js", "app/javascript/dashboard/store/storeFactory.js", "app/javascript/dashboard/i18n/index.js", "app/javascript/widget/i18n/index.js", "app/javascript/survey/i18n/index.js", "app/javascript/shared/constants/locales.js", "app/javascript/dashboard/helper/specs/macrosFixtures.js", "app/javascript/dashboard/routes/dashboard/settings/macros/constants.js", "**/fixtures/**", "**/*/fixtures.js",
+  "**/vendor/**", "spec/", "**/specs/**/**", "**/spec/**/**", "db/*", "bin/**/*", "db/**/*", "config/**/*", "public/**/*", "vendor/**/*", "node_modules/**/*", "lib/tasks/auto_annotate_models.rake", "app/test-matchers.js", "docs/*", "**/*.md", "**/*.yml", "app/javascript/dashboard/i18n/locale", "**/*.stories.js", "stories/", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js", "app/javascript/shared/constants/countries.js", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js", "app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js", "app/javascript/dashboard/routes/dashboard/settings/automation/constants.js", "app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js", "app/javascript/dashboard/routes/dashboard/settings/reports/constants.js", "app/javascript/dashboard/store/captain/storeFactory.js", "app/javascript/dashboard/i18n/index.js", "app/javascript/widget/i18n/index.js", "app/javascript/survey/i18n/index.js", "app/javascript/shared/constants/locales.js", "app/javascript/dashboard/helper/specs/macrosFixtures.js", "app/javascript/dashboard/routes/dashboard/settings/macros/constants.js", "**/fixtures/**", "**/*/fixtures.js",
 ]

 test_patterns = [
@@ -7,8 +7,6 @@ plugins:
 require:
  - ./rubocop/use_from_email.rb
  - ./rubocop/custom_cop_location.rb
-  - ./rubocop/attachment_download.rb
-  - ./rubocop/one_class_per_file.rb

 Layout/LineLength:
  Max: 150
@@ -42,12 +40,6 @@ Style/SymbolArray:
 Style/OpenStructUse:
  Enabled: false

-Chatwoot/AttachmentDownload:
-  Enabled: true
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-
 Style/OptionalBooleanParameter:
  Exclude:
    - 'app/services/email_templates/db_resolver_service.rb'
@@ -95,7 +87,7 @@ Metrics/ModuleLength:
 Rails/HelperInstanceVariable:
  Exclude:
    - enterprise/app/helpers/captain/chat_helper.rb
-    - enterprise/app/helpers/captain/chat_response_helper.rb
+
 Rails/ApplicationController:
  Exclude:
    - 'app/controllers/api/v1/widget/messages_controller.rb'
@@ -213,9 +205,6 @@ UseFromEmail:
 CustomCopLocation:
  Enabled: true

-Style/OneClassPerFile:
-  Enabled: true
-
 AllCops:
  NewCops: enable
  Exclude:
@@ -10,9 +10,6 @@
 - **Test Ruby**: `bundle exec rspec spec/path/to/file_spec.rb`
 - **Single Test**: `bundle exec rspec spec/path/to/file_spec.rb:LINE_NUMBER`
 - **Run Project**: `overmind start -f Procfile.dev`
- **Ruby Version**: Manage Ruby via `rbenv` and install the version listed in `.ruby-version` (e.g., `rbenv install $(cat .ruby-version)`)
- **rbenv setup**: Before running any `bundle` or `rspec` commands, init rbenv in your shell (`eval "$(rbenv init -)"`) so the correct Ruby/Bundler versions are used
- Always prefer `bundle exec` for Ruby CLI tasks (rspec, rake, rubocop, etc.)

 ## Code Style

@@ -40,20 +37,11 @@

 - MVP focus: Least code change, happy-path only
 - No unnecessary defensive programming
- Ship the happy path first: limit guards/fallbacks to what production has proven necessary, then iterate
- Prefer minimal, readable code over elaborate abstractions; clarity beats cleverness
 - Break down complex tasks into small, testable units
 - Iterate after confirmation
 - Avoid writing specs unless explicitly asked
 - Remove dead/unreachable/unused code
 - Don’t write multiple versions or backups for the same logic — pick the best approach and implement it
- Prefer `with_modified_env` (from spec helpers) over stubbing `ENV` directly in specs
- Specs in parallel/reloading environments: prefer comparing `error.class.name` over constant class equality when asserting raised errors
-
-## Commit Messages
-
- Prefer Conventional Commits: `type(scope): subject` (scope optional)
- Example: `feat(auth): add user authentication`
 - Don't reference Claude in commit messages

 ## Project-Specific
@@ -85,4 +73,3 @@ Practical checklist for any change impacting core logic or public APIs
 - Keep request/response contracts stable across OSS and Enterprise; update both sets of routes/controllers when introducing new APIs.
 - When renaming/moving shared code, mirror the change in `enterprise/` to prevent drift.
 - Tests: Add Enterprise-specific specs under `spec/enterprise`, mirroring OSS spec layout where applicable.
- When modifying existing OSS features for Enterprise-only behavior, add an Enterprise module (via `prepend_mod_with`/`include_mod_with`) instead of editing OSS files directly—especially for policies, controllers, and services. For Enterprise-exclusive features, place code directly under `enterprise/`.
@@ -162,7 +162,7 @@ gem 'working_hours'
 gem 'pg_search'

 # Subscriptions, Billing
-gem 'stripe', '~> 18.0'
+gem 'stripe'

 ## - helper gems --##
 ## to populate db with sample data
@@ -191,16 +191,11 @@ gem 'reverse_markdown'

 gem 'iso-639'
 gem 'ruby-openai'
-gem 'ai-agents', '>= 0.7.0'
+gem 'ai-agents', '>= 0.4.3'

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

-# OpenTelemetry for LLM observability
-gem 'opentelemetry-sdk'
-gem 'opentelemetry-exporter-otlp'
-
 gem 'shopify_api'

 ### Gems required only in specific deployment environments ###
@@ -215,7 +210,7 @@ group :production do
 end

 group :development do
-  gem 'annotaterb'
+  gem 'annotate'
  gem 'bullet'
  gem 'letter_opener'
  gem 'scss_lint', require: false
@@ -126,11 +126,11 @@ GEM
      jbuilder (~> 2)
      rails (>= 4.2, < 7.2)
      selectize-rails (~> 0.6)
-    ai-agents (0.7.0)
-      ruby_llm (~> 1.8.2)
-    annotaterb (4.20.0)
-      activerecord (>= 6.0.0)
-      activesupport (>= 6.0.0)
+    ai-agents (0.4.3)
+      ruby_llm (~> 1.3)
+    annotate (3.2.0)
+      activerecord (>= 3.2, < 8.0)
+      rake (>= 10.4, < 14.0)
    ast (2.4.3)
    attr_extras (7.1.0)
    audited (5.4.1)
@@ -140,27 +140,24 @@ GEM
      actionmailbox (>= 7.1.0)
      aws-sdk-s3 (~> 1, >= 1.123.0)
      aws-sdk-sns (~> 1, >= 1.61.0)
-    aws-eventstream (1.4.0)
-    aws-partitions (1.1198.0)
-    aws-sdk-core (3.240.0)
-      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
-      aws-sigv4 (~> 1.9)
-      base64
-      bigdecimal
+    aws-eventstream (1.2.0)
+    aws-partitions (1.760.0)
+    aws-sdk-core (3.188.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
      jmespath (~> 1, >= 1.6.1)
-      logger
-    aws-sdk-kms (1.118.0)
-      aws-sdk-core (~> 3, >= 3.239.1)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.208.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
+    aws-sdk-kms (1.64.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.126.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.4)
    aws-sdk-sns (1.70.0)
      aws-sdk-core (~> 3, >= 3.188.0)
      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.12.1)
+    aws-sigv4 (1.5.2)
      aws-eventstream (~> 1, >= 1.0.2)
    barnes (0.0.9)
      multi_json (~> 1)
@@ -441,8 +438,7 @@ GEM
    http-cookie (1.0.5)
      domain_name (~> 0.5)
    http-form_data (2.3.0)
-    httparty (0.24.0)
-      csv
+    httparty (0.21.0)
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
@@ -556,8 +552,7 @@ GEM
      ruby2_keywords
    msgpack (1.8.0)
    multi_json (1.15.0)
-    multi_xml (0.8.0)
-      bigdecimal (>= 3.1, < 5)
+    multi_xml (0.6.0)
    multipart-post (2.3.0)
    mutex_m (0.3.0)
    neighbor (0.2.3)
@@ -630,25 +625,6 @@ GEM
      faraday (>= 1.0, < 3)
      multi_json (>= 1.0)
    openssl (3.2.0)
-    opentelemetry-api (1.7.0)
-    opentelemetry-common (0.23.0)
-      opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.31.1)
-      google-protobuf (>= 3.18)
-      googleapis-common-protos-types (~> 1.3)
-      opentelemetry-api (~> 1.1)
-      opentelemetry-common (~> 0.20)
-      opentelemetry-sdk (~> 1.10)
-      opentelemetry-semantic_conventions
-    opentelemetry-registry (0.4.0)
-      opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.10.0)
-      opentelemetry-api (~> 1.1)
-      opentelemetry-common (~> 0.20)
-      opentelemetry-registry (~> 0.2)
-      opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.36.0)
-      opentelemetry-api (~> 1.0)
    orm_adapter (0.5.0)
    os (1.1.4)
    ostruct (0.6.1)
@@ -824,7 +800,7 @@ GEM
    ruby2ruby (2.5.0)
      ruby_parser (~> 3.1)
      sexp_processor (~> 4.6)
-    ruby_llm (1.8.2)
+    ruby_llm (1.5.1)
      base64
      event_stream_parser (~> 1)
      faraday (>= 1.10.0)
@@ -832,9 +808,8 @@ GEM
      faraday-net_http (>= 1)
      faraday-retry (>= 1)
      marcel (~> 1.0)
-      ruby_llm-schema (~> 0.2.1)
      zeitwerk (~> 2)
-    ruby_llm-schema (0.2.5)
+    ruby_llm-schema (0.1.0)
    ruby_parser (3.20.0)
      sexp_processor (~> 4.16)
    sass (3.7.4)
@@ -934,7 +909,7 @@ GEM
    squasher (0.7.2)
    stackprof (0.2.25)
    statsd-ruby (1.5.0)
-    stripe (18.0.1)
+    stripe (8.5.0)
    telephone_number (1.4.20)
    test-prof (1.2.1)
    thor (1.4.0)
@@ -1023,8 +998,8 @@ DEPENDENCIES
  administrate (>= 0.20.1)
  administrate-field-active_storage (>= 1.0.3)
  administrate-field-belongs_to_search (>= 0.9.0)
-  ai-agents (>= 0.7.0)
-  annotaterb
+  ai-agents (>= 0.4.3)
+  annotate
  attr_extras
  audited (~> 5.4, >= 5.4.1)
  aws-actionmailbox-ses (~> 0)
@@ -1098,8 +1073,6 @@ DEPENDENCIES
  omniauth-rails_csrf_protection (~> 1.0, >= 1.0.2)
  omniauth-saml
  opensearch-ruby
-  opentelemetry-exporter-otlp
-  opentelemetry-sdk
  pg
  pg_search
  pgvector
@@ -1125,7 +1098,6 @@ DEPENDENCIES
  rubocop-rails
  rubocop-rspec
  ruby-openai
-  ruby_llm (>= 1.8.2)
  ruby_llm-schema
  scout_apm
  scss_lint
@@ -1146,7 +1118,7 @@ DEPENDENCIES
  spring-watcher-listen
  squasher
  stackprof
-  stripe (~> 18.0)
+  stripe
  telephone_number
  test-prof
  tidewave
@@ -8,6 +8,7 @@ ___
 The modern customer support platform, an open-source alternative to Intercom, Zendesk, Salesforce Service Cloud etc.

 <p>
+  <a href="https://codeclimate.com/github/chatwoot/chatwoot/maintainability"><img src="https://api.codeclimate.com/v1/badges/e6e3f66332c91e5a4c0c/maintainability" alt="Maintainability"></a>
  <img src="https://img.shields.io/circleci/build/github/chatwoot/chatwoot" alt="CircleCI Badge">
    <a href="https://hub.docker.com/r/chatwoot/chatwoot/"><img src="https://img.shields.io/docker/pulls/chatwoot/chatwoot" alt="Docker Pull Badge"></a>
  <a href="https://hub.docker.com/r/chatwoot/chatwoot/"><img src="https://img.shields.io/docker/cloud/build/chatwoot/chatwoot" alt="Docker Build Badge"></a>
@@ -136,4 +137,4 @@ Thanks goes to all these [wonderful people](https://www.chatwoot.com/docs/contri
 <a href="https://github.com/chatwoot/chatwoot/graphs/contributors"><img src="https://opencollective.com/chatwoot/contributors.svg?width=890&button=false" /></a>


-*Chatwoot* &copy; 2017-2026, Chatwoot Inc - Released under the MIT License.
+*Chatwoot* &copy; 2017-2025, Chatwoot Inc - Released under the MIT License.
@@ -1 +1 @@
-4.9.2
+4.8.0
@@ -1 +1 @@
-3.5.0
+3.4.3
@@ -103,5 +103,3 @@ class ContactInboxBuilder
    @inbox.email? || @inbox.sms? || @inbox.twilio? || @inbox.whatsapp?
  end
 end
-
-ContactInboxBuilder.prepend_mod_with('ContactInboxBuilder')
@@ -138,7 +138,6 @@ class Messages::MessageBuilder
      private: @private,
      sender: sender,
      content_type: @params[:content_type],
-      content_attributes: content_attributes.presence,
      items: @items,
      in_reply_to: @in_reply_to,
      echo_id: @params[:echo_id],
@@ -223,5 +222,3 @@ class Messages::MessageBuilder
                                       })
  end
 end
-
-Messages::MessageBuilder.prepend_mod_with('Messages::MessageBuilder')
@@ -9,8 +9,6 @@ class Messages::Messenger::MessageBuilder
    attachment_obj.save!
    attach_file(attachment_obj, attachment_params(attachment)[:remote_file_url]) if attachment_params(attachment)[:remote_file_url]
    fetch_story_link(attachment_obj) if attachment_obj.file_type == 'story_mention'
-    fetch_ig_story_link(attachment_obj) if attachment_obj.file_type == 'ig_story'
-    fetch_ig_post_link(attachment_obj) if attachment_obj.file_type == 'ig_post'
    update_attachment_file_type(attachment_obj)
  end

@@ -29,7 +27,7 @@ class Messages::Messenger::MessageBuilder
    file_type = attachment['type'].to_sym
    params = { file_type: file_type, account_id: @message.account_id }

-    if [:image, :file, :audio, :video, :share, :story_mention, :ig_reel, :ig_post, :ig_story].include? file_type
+    if [:image, :file, :audio, :video, :share, :story_mention, :ig_reel].include? file_type
      params.merge!(file_type_params(attachment))
    elsif file_type == :location
      params.merge!(location_params(attachment))
@@ -41,17 +39,9 @@ class Messages::Messenger::MessageBuilder
  end

  def file_type_params(attachment)
-    # Handle different URL field names for different attachment types
-    url = case attachment['type'].to_sym
-          when :ig_story
-            attachment['payload']['story_media_url']
-          else
-            attachment['payload']['url']
-          end
-
    {
-      external_url: url,
-      remote_file_url: url
+      external_url: attachment['payload']['url'],
+      remote_file_url: attachment['payload']['url']
    }
  end

@@ -78,21 +68,6 @@ class Messages::Messenger::MessageBuilder
    message.save!
  end

-  def fetch_ig_story_link(attachment)
-    message = attachment.message
-    # For ig_story, we don't have the same API call as story_mention, so we'll set it up similarly but with generic content
-    message.content_attributes[:image_type] = 'ig_story'
-    message.content = I18n.t('conversations.messages.instagram_shared_story_content')
-    message.save!
-  end
-
-  def fetch_ig_post_link(attachment)
-    message = attachment.message
-    message.content_attributes[:image_type] = 'ig_post'
-    message.content = I18n.t('conversations.messages.instagram_shared_post_content')
-    message.save!
-  end
-
  # This is a placeholder method to be overridden by child classes
  def get_story_object_from_source_id(_source_id)
    {}
@@ -101,6 +76,6 @@ class Messages::Messenger::MessageBuilder
  private

  def unsupported_file_type?(attachment_type)
-    [:template, :unsupported_type, :ephemeral].include? attachment_type.to_sym
+    [:template, :unsupported_type].include? attachment_type.to_sym
  end
 end
@@ -1,38 +0,0 @@
-class V2::Reports::ChannelSummaryBuilder
-  include DateRangeHelper
-
-  pattr_initialize [:account!, :params!]
-
-  def build
-    conversations_by_channel_and_status.transform_values { |status_counts| build_channel_stats(status_counts) }
-  end
-
-  private
-
-  def conversations_by_channel_and_status
-    account.conversations
-           .joins(:inbox)
-           .where(created_at: range)
-           .group('inboxes.channel_type', 'conversations.status')
-           .count
-           .each_with_object({}) do |((channel_type, status), count), grouped|
-      grouped[channel_type] ||= {}
-      grouped[channel_type][status] = count
-    end
-  end
-
-  def build_channel_stats(status_counts)
-    open_count = status_counts['open'] || 0
-    resolved_count = status_counts['resolved'] || 0
-    pending_count = status_counts['pending'] || 0
-    snoozed_count = status_counts['snoozed'] || 0
-
-    {
-      open: open_count,
-      resolved: resolved_count,
-      pending: pending_count,
-      snoozed: snoozed_count,
-      total: open_count + resolved_count + pending_count + snoozed_count
-    }
-  end
-end
@@ -1,74 +0,0 @@
-class YearInReviewBuilder
-  attr_reader :account, :user_id, :year
-
-  def initialize(account:, user_id:, year:)
-    @account = account
-    @user_id = user_id
-    @year = year
-  end
-
-  def build
-    {
-      year: year,
-      total_conversations: total_conversations_count,
-      busiest_day: busiest_day_data,
-      support_personality: support_personality_data
-    }
-  end
-
-  private
-
-  def year_range
-    @year_range ||= begin
-      start_time = Time.zone.local(year, 1, 1).beginning_of_day
-      end_time = Time.zone.local(year, 12, 31).end_of_day
-      start_time..end_time
-    end
-  end
-
-  def total_conversations_count
-    account.conversations
-           .where(assignee_id: user_id, created_at: year_range)
-           .count
-  end
-
-  def busiest_day_data
-    daily_counts = account.conversations
-                          .where(assignee_id: user_id, created_at: year_range)
-                          .group_by_day(:created_at, range: year_range, time_zone: Time.zone)
-                          .count
-
-    return nil if daily_counts.empty?
-
-    busiest_date, count = daily_counts.max_by { |_date, cnt| cnt }
-
-    return nil if count.zero?
-
-    {
-      date: busiest_date.strftime('%b %d'),
-      count: count
-    }
-  end
-
-  def support_personality_data
-    response_time = average_response_time
-
-    return { avg_response_time_seconds: 0 } if response_time.nil?
-
-    {
-      avg_response_time_seconds: response_time.to_i
-    }
-  end
-
-  def average_response_time
-    avg_time = account.reporting_events
-                      .where(
-                        name: 'first_response',
-                        user_id: user_id,
-                        created_at: year_range
-                      )
-                      .average(:value)
-
-    avg_time&.to_f
-  end
-end
@@ -1,6 +1,4 @@
 class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseController
-  include AttachmentConcern
-
  before_action :check_authorization
  before_action :fetch_automation_rule, only: [:show, :update, :destroy, :clone]

@@ -11,32 +9,25 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
  def show; end

  def create
-    blobs, actions, error = validate_and_prepare_attachments(params[:actions])
-    return render_could_not_create_error(error) if error
-
    @automation_rule = Current.account.automation_rules.new(automation_rules_permit)
-    @automation_rule.actions = actions
+    @automation_rule.actions = params[:actions]
    @automation_rule.conditions = params[:conditions]

-    return render_could_not_create_error(@automation_rule.errors.messages) unless @automation_rule.valid?
+    render json: { error: @automation_rule.errors.messages }, status: :unprocessable_entity and return unless @automation_rule.valid?

    @automation_rule.save!
-    blobs.each { |blob| @automation_rule.files.attach(blob) }
+    process_attachments
+    @automation_rule
  end

  def update
-    blobs, actions, error = validate_and_prepare_attachments(params[:actions], @automation_rule)
-    return render_could_not_create_error(error) if error
-
    ActiveRecord::Base.transaction do
-      @automation_rule.assign_attributes(automation_rules_permit)
-      @automation_rule.actions = actions if params[:actions]
-      @automation_rule.conditions = params[:conditions] if params[:conditions]
-      @automation_rule.save!
-      blobs.each { |blob| @automation_rule.files.attach(blob) }
+      automation_rule_update
+      process_attachments
+
    rescue StandardError => e
      Rails.logger.error e
-      render_could_not_create_error(@automation_rule.errors.messages)
+      render json: { error: @automation_rule.errors.messages }.to_json, status: :unprocessable_entity
    end
  end

@@ -52,11 +43,29 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
    @automation_rule = new_rule
  end

+  def process_attachments
+    actions = @automation_rule.actions.filter_map { |k, _v| k if k['action_name'] == 'send_attachment' }
+    return if actions.blank?
+
+    actions.each do |action|
+      blob_id = action['action_params']
+      blob = ActiveStorage::Blob.find_by(id: blob_id)
+      @automation_rule.files.attach(blob)
+    end
+  end
+
  private

+  def automation_rule_update
+    @automation_rule.update!(automation_rules_permit)
+    @automation_rule.actions = params[:actions] if params[:actions]
+    @automation_rule.conditions = params[:conditions] if params[:conditions]
+    @automation_rule.save!
+  end
+
  def automation_rules_permit
    params.permit(
-      :name, :description, :event_name, :active,
+      :name, :description, :event_name, :account_id, :active,
      conditions: [:attribute_key, :filter_operator, :query_operator, :custom_attribute_type, { values: [] }],
      actions: [:action_name, { action_params: [] }]
    )
@@ -1,76 +0,0 @@
-class Api::V1::Accounts::Captain::PreferencesController < Api::V1::Accounts::BaseController
-  before_action :current_account
-  before_action :authorize_account_update, only: [:update]
-
-  def show
-    render json: preferences_payload
-  end
-
-  def update
-    params_to_update = captain_params
-    @current_account.captain_models = params_to_update[:captain_models] if params_to_update[:captain_models]
-    @current_account.captain_features = params_to_update[:captain_features] if params_to_update[:captain_features]
-    @current_account.save!
-
-    render json: preferences_payload
-  end
-
-  private
-
-  def preferences_payload
-    {
-      providers: Llm::Models.providers,
-      models: Llm::Models.models,
-      features: features_with_account_preferences
-    }
-  end
-
-  def authorize_account_update
-    authorize @current_account, :update?
-  end
-
-  def captain_params
-    permitted = {}
-    permitted[:captain_models] = merged_captain_models if params[:captain_models].present?
-    permitted[:captain_features] = merged_captain_features if params[:captain_features].present?
-    permitted
-  end
-
-  def merged_captain_models
-    existing_models = @current_account.captain_models || {}
-    existing_models.merge(permitted_captain_models)
-  end
-
-  def merged_captain_features
-    existing_features = @current_account.captain_features || {}
-    existing_features.merge(permitted_captain_features)
-  end
-
-  def permitted_captain_models
-    params.require(:captain_models).permit(
-      :editor, :assistant, :copilot, :label_suggestion,
-      :audio_transcription, :help_center_search
-    ).to_h.stringify_keys
-  end
-
-  def permitted_captain_features
-    params.require(:captain_features).permit(
-      :editor, :assistant, :copilot, :label_suggestion,
-      :audio_transcription, :help_center_search
-    ).to_h.stringify_keys
-  end
-
-  def features_with_account_preferences
-    preferences = Current.account.captain_preferences
-    account_features = preferences[:features] || {}
-    account_models = preferences[:models] || {}
-
-    Llm::Models.feature_keys.index_with do |feature_key|
-      config = Llm::Models.feature_config(feature_key)
-      config.merge(
-        enabled: account_features[feature_key] == true,
-        selected: account_models[feature_key] || config[:default]
-      )
-    end
-  end
-end
@@ -64,7 +64,7 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:

  def permitted_params
    params.require(:twilio_channel).permit(
-      :messaging_service_sid, :phone_number, :account_sid, :auth_token, :name, :medium, :api_key_sid
+      :account_id, :messaging_service_sid, :phone_number, :account_sid, :auth_token, :name, :medium, :api_key_sid
    )
  end
 end
@@ -1,160 +0,0 @@
-class Api::V1::Accounts::InboxCsatTemplatesController < Api::V1::Accounts::BaseController
-  DEFAULT_BUTTON_TEXT = 'Please rate us'.freeze
-  DEFAULT_LANGUAGE = 'en'.freeze
-
-  before_action :fetch_inbox
-  before_action :validate_whatsapp_channel
-
-  def show
-    template = @inbox.csat_config&.dig('template')
-    return render json: { template_exists: false } unless template
-
-    template_name = template['name'] || Whatsapp::CsatTemplateNameService.csat_template_name(@inbox.id)
-    status_result = @inbox.channel.provider_service.get_template_status(template_name)
-
-    render_template_status_response(status_result, template_name)
-  rescue StandardError => e
-    Rails.logger.error "Error fetching CSAT template status: #{e.message}"
-    render json: { error: e.message }, status: :internal_server_error
-  end
-
-  def create
-    template_params = extract_template_params
-    return render_missing_message_error if template_params[:message].blank?
-
-    # Delete existing template even though we are using a new one.
-    # We don't want too many templates in the business portfolio, but the create operation shouldn't fail if deletion fails.
-    delete_existing_template_if_needed
-
-    result = create_template_via_provider(template_params)
-    render_template_creation_result(result)
-  rescue ActionController::ParameterMissing
-    render json: { error: 'Template parameters are required' }, status: :unprocessable_entity
-  rescue StandardError => e
-    Rails.logger.error "Error creating CSAT template: #{e.message}"
-    render json: { error: 'Template creation failed' }, status: :internal_server_error
-  end
-
-  private
-
-  def fetch_inbox
-    @inbox = Current.account.inboxes.find(params[:inbox_id])
-    authorize @inbox, :show?
-  end
-
-  def validate_whatsapp_channel
-    return if @inbox.whatsapp?
-
-    render json: { error: 'CSAT template operations only available for WhatsApp channels' },
-           status: :bad_request
-  end
-
-  def extract_template_params
-    params.require(:template).permit(:message, :button_text, :language)
-  end
-
-  def render_missing_message_error
-    render json: { error: 'Message is required' }, status: :unprocessable_entity
-  end
-
-  def create_template_via_provider(template_params)
-    template_config = {
-      message: template_params[:message],
-      button_text: template_params[:button_text] || DEFAULT_BUTTON_TEXT,
-      base_url: ENV.fetch('FRONTEND_URL', 'http://localhost:3000'),
-      language: template_params[:language] || DEFAULT_LANGUAGE,
-      template_name: Whatsapp::CsatTemplateNameService.csat_template_name(@inbox.id)
-    }
-
-    @inbox.channel.provider_service.create_csat_template(template_config)
-  end
-
-  def render_template_creation_result(result)
-    if result[:success]
-      render_successful_template_creation(result)
-    else
-      render_failed_template_creation(result)
-    end
-  end
-
-  def render_successful_template_creation(result)
-    render json: {
-      template: {
-        name: result[:template_name],
-        template_id: result[:template_id],
-        status: 'PENDING',
-        language: result[:language] || DEFAULT_LANGUAGE
-      }
-    }, status: :created
-  end
-
-  def render_failed_template_creation(result)
-    whatsapp_error = parse_whatsapp_error(result[:response_body])
-    error_message = whatsapp_error[:user_message] || result[:error]
-
-    render json: {
-      error: error_message,
-      details: whatsapp_error[:technical_details]
-    }, status: :unprocessable_entity
-  end
-
-  def delete_existing_template_if_needed
-    template = @inbox.csat_config&.dig('template')
-    return true if template.blank?
-
-    template_name = template['name']
-    return true if template_name.blank?
-
-    template_status = @inbox.channel.provider_service.get_template_status(template_name)
-    return true unless template_status[:success]
-
-    deletion_result = @inbox.channel.provider_service.delete_csat_template(template_name)
-    if deletion_result[:success]
-      Rails.logger.info "Deleted existing CSAT template '#{template_name}' for inbox #{@inbox.id}"
-      true
-    else
-      Rails.logger.warn "Failed to delete existing CSAT template '#{template_name}' for inbox #{@inbox.id}: #{deletion_result[:response_body]}"
-      false
-    end
-  rescue StandardError => e
-    Rails.logger.error "Error during template deletion for inbox #{@inbox.id}: #{e.message}"
-    false
-  end
-
-  def render_template_status_response(status_result, template_name)
-    if status_result[:success]
-      render json: {
-        template_exists: true,
-        template_name: template_name,
-        status: status_result[:template][:status],
-        template_id: status_result[:template][:id]
-      }
-    else
-      render json: {
-        template_exists: false,
-        error: 'Template not found'
-      }
-    end
-  end
-
-  def parse_whatsapp_error(response_body)
-    return { user_message: nil, technical_details: nil } if response_body.blank?
-
-    begin
-      error_data = JSON.parse(response_body)
-      whatsapp_error = error_data['error'] || {}
-
-      user_message = whatsapp_error['error_user_msg'] || whatsapp_error['message']
-      technical_details = {
-        code: whatsapp_error['code'],
-        subcode: whatsapp_error['error_subcode'],
-        type: whatsapp_error['type'],
-        title: whatsapp_error['error_user_title']
-      }.compact
-
-      { user_message: user_message, technical_details: technical_details }
-    rescue JSON::ParserError
-      { user_message: nil, technical_details: response_body }
-    end
-  end
-end
@@ -152,37 +152,31 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  end

  def format_csat_config(config)
-    formatted = {
-      'display_type' => config['display_type'] || 'emoji',
-      'message' => config['message'] || '',
-      :survey_rules => {
-        'operator' => config.dig('survey_rules', 'operator') || 'contains',
-        'values' => config.dig('survey_rules', 'values') || []
-      },
-      'button_text' => config['button_text'] || 'Please rate us',
-      'language' => config['language'] || 'en'
+    {
+      display_type: config['display_type'] || 'emoji',
+      message: config['message'] || '',
+      survey_rules: {
+        operator: config.dig('survey_rules', 'operator') || 'contains',
+        values: config.dig('survey_rules', 'values') || []
+      }
    }
-    format_template_config(config, formatted)
-    formatted
-  end
-
-  def format_template_config(config, formatted)
-    formatted['template'] = config['template'] if config['template'].present?
  end

  def inbox_attributes
    [:name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled,
     :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone, :allow_messages_after_resolved,
     :lock_to_single_conversation, :portal_id, :sender_name_type, :business_name,
-     { csat_config: [:display_type, :message, :button_text, :language,
-                     { survey_rules: [:operator, { values: [] }],
-                       template: [:name, :template_id, :created_at, :language] }] }]
+     { csat_config: [:display_type, :message, { survey_rules: [:operator, { values: [] }] }] }]
  end

  def permitted_params(channel_attributes = [])
    # We will remove this line after fixing https://linear.app/chatwoot/issue/CW-1567/null-value-passed-as-null-string-to-backend
    params.each { |k, v| params[k] = params[k] == 'null' ? nil : v }
-    params.permit(*inbox_attributes, channel: [:type, *channel_attributes])
+
+    params.permit(
+      *inbox_attributes,
+      channel: [:type, *channel_attributes]
+    )
  end

  def channel_type_from_params
@@ -198,7 +192,11 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  end

  def get_channel_attributes(channel_type)
-    channel_type.constantize.const_defined?(:EDITABLE_ATTRS) ? channel_type.constantize::EDITABLE_ATTRS.presence : []
+    if channel_type.constantize.const_defined?(:EDITABLE_ATTRS)
+      channel_type.constantize::EDITABLE_ATTRS.presence
+    else
+      []
+    end
  end

  def whatsapp_channel?
@@ -1,6 +1,4 @@
 class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
-  include AttachmentConcern
-
  before_action :fetch_macro, only: [:show, :update, :destroy, :execute]
  before_action :check_authorization, only: [:show, :update, :destroy, :execute]

@@ -13,32 +11,26 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
  end

  def create
-    blobs, actions, error = validate_and_prepare_attachments(params[:actions])
-    return render_could_not_create_error(error) if error
-
    @macro = Current.account.macros.new(macros_with_user.merge(created_by_id: current_user.id))
    @macro.set_visibility(current_user, permitted_params)
-    @macro.actions = actions
+    @macro.actions = params[:actions]

-    return render_could_not_create_error(@macro.errors.messages) unless @macro.valid?
+    render json: { error: @macro.errors.messages }, status: :unprocessable_entity and return unless @macro.valid?

    @macro.save!
-    blobs.each { |blob| @macro.files.attach(blob) }
+    process_attachments
+    @macro
  end

  def update
-    blobs, actions, error = validate_and_prepare_attachments(params[:actions], @macro)
-    return render_could_not_create_error(error) if error
-
    ActiveRecord::Base.transaction do
-      @macro.assign_attributes(macros_with_user)
+      @macro.update!(macros_with_user)
      @macro.set_visibility(current_user, permitted_params)
-      @macro.actions = actions if params[:actions]
+      process_attachments
      @macro.save!
-      blobs.each { |blob| @macro.files.attach(blob) }
    rescue StandardError => e
      Rails.logger.error e
-      render_could_not_create_error(@macro.errors.messages)
+      render json: { error: @macro.errors.messages }.to_json, status: :unprocessable_entity
    end
  end

@@ -55,9 +47,20 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController

  private

+  def process_attachments
+    actions = @macro.actions.filter_map { |k, _v| k if k['action_name'] == 'send_attachment' }
+    return if actions.blank?
+
+    actions.each do |action|
+      blob_id = action['action_params']
+      blob = ActiveStorage::Blob.find_by(id: blob_id)
+      @macro.files.attach(blob)
+    end
+  end
+
  def permitted_params
    params.permit(
-      :name, :visibility,
+      :name, :account_id, :visibility,
      actions: [:action_name, { action_params: [] }]
    )
  end
@@ -62,7 +62,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController

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

@@ -78,7 +78,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController

  def portal_params
    params.require(:portal).permit(
-      :id, :color, :custom_domain, :header_text, :homepage_link,
+      :id, :account_id, :color, :custom_domain, :header_text, :homepage_link,
      :name, :page_title, :slug, :archived, { config: [:default_locale, { allowed_locales: [] }] }
    )
  end
@@ -28,7 +28,5 @@ class Api::V1::Accounts::SearchController < Api::V1::Accounts::BaseController
      search_type: search_type,
      params: params
    ).perform
-  rescue ArgumentError => e
-    render json: { error: e.message }, status: :unprocessable_entity
  end
 end
@@ -1,15 +0,0 @@
-class Api::V1::Accounts::Tiktok::AuthorizationsController < Api::V1::Accounts::OauthAuthorizationController
-  include Tiktok::IntegrationHelper
-
-  def create
-    redirect_url = Tiktok::AuthClient.authorize_url(
-      state: generate_tiktok_token(Current.account.id)
-    )
-
-    if redirect_url
-      render json: { success: true, url: redirect_url }
-    else
-      render json: { success: false }, status: :unprocessable_entity
-    end
-  end
-end
@@ -59,7 +59,7 @@ class Api::V1::Accounts::UploadController < Api::V1::Accounts::BaseController
  end

  def render_success(file_blob)
-    render json: { file_url: url_for(file_blob), blob_id: file_blob.signed_id }
+    render json: { file_url: url_for(file_blob), blob_key: file_blob.key, blob_id: file_blob.id }
  end

  def render_error(message, status)
@@ -92,8 +92,7 @@ class Api::V1::AccountsController < Api::BaseController
  end

  def settings_params
-    params.permit(:auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting, :audio_transcriptions, :auto_resolve_label,
-                  conversation_required_attributes: [])
+    params.permit(:auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting, :audio_transcriptions, :auto_resolve_label)
  end

  def check_signup_enabled
@@ -1,6 +1,6 @@
 class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseController
  before_action :check_authorization
-  before_action :prepare_builder_params, only: [:agent, :team, :inbox, :label, :channel]
+  before_action :prepare_builder_params, only: [:agent, :team, :inbox, :label]

  def agent
    render_report_with(V2::Reports::AgentSummaryBuilder)
@@ -18,12 +18,6 @@ class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseContr
    render_report_with(V2::Reports::LabelSummaryBuilder)
  end

-  def channel
-    return render_could_not_create_error(I18n.t('errors.reports.date_range_too_long')) if date_range_too_long?
-
-    render_report_with(V2::Reports::ChannelSummaryBuilder)
-  end
-
  private

  def check_authorization
@@ -46,12 +40,4 @@ class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseContr
  def permitted_params
    params.permit(:since, :until, :business_hours)
  end
-
-  def date_range_too_long?
-    return false if permitted_params[:since].blank? || permitted_params[:until].blank?
-
-    since_time = Time.zone.at(permitted_params[:since].to_i)
-    until_time = Time.zone.at(permitted_params[:until].to_i)
-    (until_time - since_time) > 6.months
-  end
 end
@@ -1,26 +0,0 @@
-class Api::V2::Accounts::YearInReviewsController < Api::V1::Accounts::BaseController
-  def show
-    year = params[:year] || 2025
-    cache_key = "year_in_review_#{Current.account.id}_#{year}"
-
-    cached_data = Current.user.ui_settings&.dig(cache_key)
-
-    if cached_data.present?
-      render json: cached_data
-    else
-      builder = YearInReviewBuilder.new(
-        account: Current.account,
-        user_id: Current.user.id,
-        year: year
-      )
-
-      data = builder.build
-
-      ui_settings = Current.user.ui_settings || {}
-      ui_settings[cache_key] = data
-      Current.user.update(ui_settings: ui_settings)
-
-      render json: data
-    end
-  end
-end
@@ -1,35 +0,0 @@
-module AttachmentConcern
-  extend ActiveSupport::Concern
-
-  def validate_and_prepare_attachments(actions, record = nil)
-    blobs = []
-    return [blobs, actions, nil] if actions.blank?
-
-    sanitized = actions.map do |action|
-      next action unless action[:action_name] == 'send_attachment'
-
-      result = process_attachment_action(action, record, blobs)
-      return [nil, nil, I18n.t('errors.attachments.invalid')] unless result
-
-      result
-    end
-
-    [blobs, sanitized, nil]
-  end
-
-  private
-
-  def process_attachment_action(action, record, blobs)
-    blob_id = action[:action_params].first
-    blob = ActiveStorage::Blob.find_signed(blob_id.to_s)
-
-    return action.merge(action_params: [blob.id]).tap { blobs << blob } if blob.present?
-    return action if blob_already_attached?(record, blob_id)
-
-    nil
-  end
-
-  def blob_already_attached?(record, blob_id)
-    record&.files&.any? { |f| f.blob_id == blob_id.to_i }
-  end
-end
@@ -16,7 +16,7 @@ class DashboardController < ActionController::Base
    CHATWOOT_INBOX_TOKEN
    API_CHANNEL_NAME
    API_CHANNEL_THUMBNAIL
-    CLOUD_ANALYTICS_TOKEN
+    ANALYTICS_TOKEN
    DIRECT_UPLOADS_ENABLED
    MAXIMUM_FILE_UPLOAD_SIZE
    HCAPTCHA_SITE_KEY
@@ -73,7 +73,6 @@ class DashboardController < ActionController::Base
      ENABLE_ACCOUNT_SIGNUP: GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false'),
      FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
      INSTAGRAM_APP_ID: GlobalConfigService.load('INSTAGRAM_APP_ID', ''),
-      TIKTOK_APP_ID: GlobalConfigService.load('TIKTOK_APP_ID', ''),
      FACEBOOK_API_VERSION: GlobalConfigService.load('FACEBOOK_API_VERSION', 'v18.0'),
      WHATSAPP_APP_ID: GlobalConfigService.load('WHATSAPP_APP_ID', ''),
      WHATSAPP_CONFIGURATION_ID: GlobalConfigService.load('WHATSAPP_CONFIGURATION_ID', ''),
@@ -46,7 +46,6 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
      'linear' => %w[LINEAR_CLIENT_ID LINEAR_CLIENT_SECRET],
      'slack' => %w[SLACK_CLIENT_ID SLACK_CLIENT_SECRET],
      'instagram' => %w[INSTAGRAM_APP_ID INSTAGRAM_APP_SECRET INSTAGRAM_VERIFY_TOKEN INSTAGRAM_API_VERSION ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT],
-      'tiktok' => %w[TIKTOK_APP_ID TIKTOK_APP_SECRET],
      'whatsapp_embedded' => %w[WHATSAPP_APP_ID WHATSAPP_APP_SECRET WHATSAPP_CONFIGURATION_ID WHATSAPP_API_VERSION],
      'notion' => %w[NOTION_CLIENT_ID NOTION_CLIENT_SECRET],
      'google' => %w[GOOGLE_OAUTH_CLIENT_ID GOOGLE_OAUTH_CLIENT_SECRET GOOGLE_OAUTH_REDIRECT_URI ENABLE_GOOGLE_OAUTH_LOGIN]
@@ -1,144 +0,0 @@
-class Tiktok::CallbacksController < ApplicationController
-  include Tiktok::IntegrationHelper
-
-  def show
-    return handle_authorization_error if params[:error].present?
-    return handle_ungranted_scopes_error unless all_scopes_granted?
-
-    process_successful_authorization
-  rescue StandardError => e
-    handle_error(e)
-  end
-
-  private
-
-  def all_scopes_granted?
-    granted_scopes = short_term_access_token[:scope].to_s.split(',')
-    (Tiktok::AuthClient::REQUIRED_SCOPES - granted_scopes).blank?
-  end
-
-  def process_successful_authorization
-    inbox, already_exists = find_or_create_inbox
-
-    if already_exists
-      redirect_to app_tiktok_inbox_settings_url(account_id: account_id, inbox_id: inbox.id)
-    else
-      redirect_to app_tiktok_inbox_agents_url(account_id: account_id, inbox_id: inbox.id)
-    end
-  end
-
-  def handle_error(error)
-    Rails.logger.error("TikTok Channel creation Error: #{error.message}")
-    ChatwootExceptionTracker.new(error).capture_exception
-
-    redirect_to_error_page(error_type: error.class.name, code: 500, error_message: error.message)
-  end
-
-  # Handles the case when a user denies permissions or cancels the authorization flow
-  def handle_authorization_error
-    redirect_to_error_page(
-      error_type: params[:error] || 'access_denied',
-      code: params[:error_code],
-      error_message: params[:error_description] || 'User cancelled the Authorization'
-    )
-  end
-
-  # Handles the case when a user partially accepted the required scopes
-  def handle_ungranted_scopes_error
-    redirect_to_error_page(
-      error_type: 'ungranted_scopes',
-      code: 400,
-      error_message: 'User did not grant all the required scopes'
-    )
-  end
-
-  # Centralized method to redirect to error page with appropriate parameters
-  # This ensures consistent error handling across different error scenarios
-  # Frontend will handle the error page based on the error_type
-  def redirect_to_error_page(error_type:, code:, error_message:)
-    redirect_to app_new_tiktok_inbox_url(
-      account_id: account_id,
-      error_type: error_type,
-      code: code,
-      error_message: error_message
-    )
-  end
-
-  def find_or_create_inbox
-    business_details = tiktok_client.business_account_details
-    channel_tiktok = find_channel
-    channel_exists = channel_tiktok.present?
-
-    if channel_tiktok
-      update_channel(channel_tiktok, business_details)
-    else
-      channel_tiktok = create_channel_with_inbox(business_details)
-    end
-
-    # reauthorized will also update cache keys for the associated inbox
-    channel_tiktok.reauthorized!
-
-    set_avatar(channel_tiktok.inbox, business_details[:profile_image]) if business_details[:profile_image].present?
-
-    [channel_tiktok.inbox, channel_exists]
-  end
-
-  def create_channel_with_inbox(business_details)
-    ActiveRecord::Base.transaction do
-      channel_tiktok = Channel::Tiktok.create!(
-        account: account,
-        business_id: short_term_access_token[:business_id],
-        access_token: short_term_access_token[:access_token],
-        refresh_token: short_term_access_token[:refresh_token],
-        expires_at: short_term_access_token[:expires_at],
-        refresh_token_expires_at: short_term_access_token[:refresh_token_expires_at]
-      )
-
-      account.inboxes.create!(
-        account: account,
-        channel: channel_tiktok,
-        name: business_details[:display_name].presence || business_details[:username]
-      )
-
-      channel_tiktok
-    end
-  end
-
-  def find_channel
-    Channel::Tiktok.find_by(business_id: short_term_access_token[:business_id], account: account)
-  end
-
-  def update_channel(channel_tiktok, business_details)
-    channel_tiktok.update!(
-      access_token: short_term_access_token[:access_token],
-      refresh_token: short_term_access_token[:refresh_token],
-      expires_at: short_term_access_token[:expires_at],
-      refresh_token_expires_at: short_term_access_token[:refresh_token_expires_at]
-    )
-
-    channel_tiktok.inbox.update!(name: business_details[:display_name].presence || business_details[:username])
-  end
-
-  def set_avatar(inbox, avatar_url)
-    Avatar::AvatarFromUrlJob.perform_later(inbox, avatar_url)
-  end
-
-  def account_id
-    @account_id ||= verify_tiktok_token(params[:state])
-  end
-
-  def account
-    @account ||= Account.find(account_id)
-  end
-
-  def short_term_access_token
-    @short_term_access_token ||= Tiktok::AuthClient.obtain_short_term_access_token(params[:code])
-  end
-
-  def tiktok_client
-    @tiktok_client ||= Tiktok::Client.new(
-      business_id: short_term_access_token[:business_id],
-      access_token: short_term_access_token[:access_token]
-    )
-  end
-end
@@ -1,53 +0,0 @@
-class Webhooks::TiktokController < ActionController::API
-  before_action :verify_signature!
-
-  def events
-    event = JSON.parse(request_payload)
-    if echo_event?
-      # Add delay to prevent race condition where echo arrives before send message API completes
-      # This avoids duplicate messages when echo comes early during API processing
-      ::Webhooks::TiktokEventsJob.set(wait: 2.seconds).perform_later(event)
-    else
-      ::Webhooks::TiktokEventsJob.perform_later(event)
-    end
-
-    head :ok
-  end
-
-  private
-
-  def request_payload
-    @request_payload ||= request.body.read
-  end
-
-  def verify_signature!
-    signature_header = request.headers['Tiktok-Signature']
-    client_secret = GlobalConfigService.load('TIKTOK_APP_SECRET', nil)
-    received_timestamp, received_signature = extract_signature_parts(signature_header)
-
-    return head :unauthorized unless client_secret && received_timestamp && received_signature
-
-    signature_payload = "#{received_timestamp}.#{request_payload}"
-    computed_signature = OpenSSL::HMAC.hexdigest('SHA256', client_secret, signature_payload)
-
-    return head :unauthorized unless ActiveSupport::SecurityUtils.secure_compare(computed_signature, received_signature)
-
-    # Check timestamp delay (acceptable delay: 5 seconds)
-    current_timestamp = Time.current.to_i
-    delay = current_timestamp - received_timestamp
-
-    return head :unauthorized if delay > 5
-  end
-
-  def extract_signature_parts(signature_header)
-    return [nil, nil] if signature_header.blank?
-
-    keys = signature_header.split(',')
-    signature_parts = keys.map { |part| part.split('=') }.to_h
-    [signature_parts['t']&.to_i, signature_parts['s']]
-  end
-
-  def echo_event?
-    params[:event] == 'im_send_msg'
-  end
-end
@@ -78,12 +78,6 @@ instagram:
  enabled: true
  icon: 'icon-instagram'
  config_key: 'instagram'
-tiktok:
-  name: 'TikTok'
-  description: 'Stay connected with your customers on TikTok'
-  enabled: true
-  icon: 'icon-tiktok'
-  config_key: 'tiktok'
 whatsapp:
  name: 'WhatsApp'
  description: 'Manage your WhatsApp business interactions from Chatwoot.'
@@ -1,47 +0,0 @@
-module Tiktok::IntegrationHelper
-  # Generates a signed JWT token for Tiktok integration
-  #
-  # @param account_id [Integer] The account ID to encode in the token
-  # @return [String, nil] The encoded JWT token or nil if client secret is missing
-  def generate_tiktok_token(account_id)
-    return if client_secret.blank?
-
-    JWT.encode(token_payload(account_id), client_secret, 'HS256')
-  rescue StandardError => e
-    Rails.logger.error("Failed to generate TikTok token: #{e.message}")
-    nil
-  end
-
-  # Verifies and decodes a Tiktok JWT token
-  #
-  # @param token [String] The JWT token to verify
-  # @return [Integer, nil] The account ID from the token or nil if invalid
-  def verify_tiktok_token(token)
-    return if token.blank? || client_secret.blank?
-
-    decode_token(token, client_secret)
-  end
-
-  private
-
-  def client_secret
-    @client_secret ||= GlobalConfigService.load('TIKTOK_APP_SECRET', nil)
-  end
-
-  def token_payload(account_id)
-    {
-      sub: account_id,
-      iat: Time.current.to_i
-    }
-  end
-
-  def decode_token(token, secret)
-    JWT.decode(token, secret, true, {
-                 algorithm: 'HS256',
-                 verify_expiration: true
-               }).first['sub']
-  rescue StandardError => e
-    Rails.logger.error("Unexpected error verifying Tiktok token: #{e.message}")
-    nil
-  end
-end
@@ -1,18 +0,0 @@
-/* global axios */
-import ApiClient from '../ApiClient';
-
-class CaptainPreferences extends ApiClient {
-  constructor() {
-    super('captain/preferences', { accountScoped: true });
-  }
-
-  get() {
-    return axios.get(this.url);
-  }
-
-  updatePreferences(data) {
-    return axios.put(this.url, data);
-  }
-}
-
-export default new CaptainPreferences();
@@ -1,14 +0,0 @@
-/* global axios */
-import ApiClient from '../ApiClient';
-
-class TiktokChannel extends ApiClient {
-  constructor() {
-    super('tiktok', { accountScoped: true });
-  }
-
-  generateAuthorization(payload) {
-    return axios.post(`${this.url}/authorization`, payload);
-  }
-}
-
-export default new TiktokChannel();
@@ -1,95 +0,0 @@
-import { Device } from '@twilio/voice-sdk';
-import VoiceAPI from './voiceAPIClient';
-
-const createCallDisconnectedEvent = () => new CustomEvent('call:disconnected');
-
-class TwilioVoiceClient extends EventTarget {
-  constructor() {
-    super();
-    this.device = null;
-    this.activeConnection = null;
-    this.initialized = false;
-    this.inboxId = null;
-  }
-
-  async initializeDevice(inboxId) {
-    this.destroyDevice();
-
-    const response = await VoiceAPI.getToken(inboxId);
-    const { token, account_id } = response || {};
-    if (!token) throw new Error('Invalid token');
-
-    this.device = new Device(token, {
-      allowIncomingWhileBusy: true,
-      disableAudioContextSounds: true,
-      appParams: { account_id },
-    });
-
-    this.device.removeAllListeners();
-    this.device.on('connect', conn => {
-      this.activeConnection = conn;
-      conn.on('disconnect', this.onDisconnect);
-    });
-
-    this.device.on('disconnect', this.onDisconnect);
-
-    this.device.on('tokenWillExpire', async () => {
-      const r = await VoiceAPI.getToken(this.inboxId);
-      if (r?.token) this.device.updateToken(r.token);
-    });
-
-    this.initialized = true;
-    this.inboxId = inboxId;
-
-    return this.device;
-  }
-
-  get hasActiveConnection() {
-    return !!this.activeConnection;
-  }
-
-  endClientCall() {
-    if (this.activeConnection) {
-      this.activeConnection.disconnect();
-    }
-    this.activeConnection = null;
-    if (this.device) {
-      this.device.disconnectAll();
-    }
-  }
-
-  destroyDevice() {
-    if (this.device) {
-      this.device.destroy();
-    }
-    this.activeConnection = null;
-    this.device = null;
-    this.initialized = false;
-    this.inboxId = null;
-  }
-
-  async joinClientCall({ to, conversationId }) {
-    if (!this.device || !this.initialized || !to) return null;
-    if (this.activeConnection) return this.activeConnection;
-
-    const params = {
-      To: to,
-      is_agent: 'true',
-      conversation_id: conversationId,
-    };
-
-    const connection = await this.device.connect({ params });
-    this.activeConnection = connection;
-
-    connection.on('disconnect', this.onDisconnect);
-
-    return connection;
-  }
-
-  onDisconnect = () => {
-    this.activeConnection = null;
-    this.dispatchEvent(createCallDisconnectedEvent());
-  };
-}
-
-export default new TwilioVoiceClient();
@@ -1,40 +0,0 @@
-/* global axios */
-import ApiClient from '../../ApiClient';
-import ContactsAPI from '../../contacts';
-
-class VoiceAPI extends ApiClient {
-  constructor() {
-    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) {
-    return axios
-      .delete(`${this.baseUrl()}/inboxes/${inboxId}/conference`, {
-        params: { conversation_id: conversationId },
-      })
-      .then(r => r.data);
-  }
-
-  joinConference({ conversationId, inboxId, callSid }) {
-    return axios
-      .post(`${this.baseUrl()}/inboxes/${inboxId}/conference`, {
-        conversation_id: conversationId,
-        call_sid: callSid,
-      })
-      .then(r => r.data);
-  }
-
-  getToken(inboxId) {
-    if (!inboxId) return Promise.reject(new Error('Inbox ID is required'));
-    return axios
-      .get(`${this.baseUrl()}/inboxes/${inboxId}/conference/token`)
-      .then(r => r.data);
-  }
-}
-
-export default new VoiceAPI();
@@ -47,12 +47,6 @@ class ContactAPI extends ApiClient {
    return axios.get(`${this.url}/${contactId}/labels`);
  }

-  initiateCall(contactId, inboxId) {
-    return axios.post(`${this.url}/${contactId}/call`, {
-      inbox_id: inboxId,
-    });
-  }
-
  updateContactLabels(contactId, labels) {
    return axios.post(`${this.url}/${contactId}/labels`, { labels });
  }
@@ -23,10 +23,6 @@ class EnterpriseAccountAPI extends ApiClient {
      action_type: action,
    });
  }
-
-  createTopupCheckout(credits) {
-    return axios.post(`${this.url}topup_checkout`, { credits });
-  }
 }

 export default new EnterpriseAccountAPI();
@@ -11,8 +11,6 @@ describe('#enterpriseAccountAPI', () => {
    expect(accountAPI).toHaveProperty('delete');
    expect(accountAPI).toHaveProperty('checkout');
    expect(accountAPI).toHaveProperty('toggleDeletion');
-    expect(accountAPI).toHaveProperty('createTopupCheckout');
-    expect(accountAPI).toHaveProperty('getLimits');
  });

  describe('API calls', () => {
@@ -61,29 +59,5 @@ describe('#enterpriseAccountAPI', () => {
        { action_type: 'undelete' }
      );
    });
-
-    it('#createTopupCheckout with credits', () => {
-      accountAPI.createTopupCheckout(1000);
-      expect(axiosMock.post).toHaveBeenCalledWith(
-        '/enterprise/api/v1/topup_checkout',
-        { credits: 1000 }
-      );
-    });
-
-    it('#createTopupCheckout with different credit amounts', () => {
-      const creditAmounts = [1000, 2500, 6000, 12000];
-      creditAmounts.forEach(credits => {
-        accountAPI.createTopupCheckout(credits);
-        expect(axiosMock.post).toHaveBeenCalledWith(
-          '/enterprise/api/v1/topup_checkout',
-          { credits }
-        );
-      });
-    });
-
-    it('#getLimits', () => {
-      accountAPI.getLimits();
-      expect(axiosMock.get).toHaveBeenCalledWith('/enterprise/api/v1/limits');
-    });
  });
 });
@@ -32,16 +32,6 @@ class Inboxes extends CacheEnabledApiClient {
  syncTemplates(inboxId) {
    return axios.post(`${this.url}/${inboxId}/sync_templates`);
  }
-
-  createCSATTemplate(inboxId, template) {
-    return axios.post(`${this.url}/${inboxId}/csat_template`, {
-      template,
-    });
-  }
-
-  getCSATTemplateStatus(inboxId) {
-    return axios.get(`${this.url}/${inboxId}/csat_template`);
-  }
 }

 export default new Inboxes();
@@ -57,12 +57,6 @@ class OpenAIAPI extends ApiClient {
      content,
    };

-    // Always include conversation_display_id when available for session tracking
-    if (conversationId) {
-      data.conversation_display_id = conversationId;
-    }
-
-    // For conversation-level events, only send conversation_display_id
    if (this.conversation_events.includes(type)) {
      data = {
        conversation_display_id: conversationId,
@@ -14,48 +14,38 @@ class SearchAPI extends ApiClient {
    });
  }

-  contacts({ q, page = 1, since, until }) {
+  contacts({ q, page = 1 }) {
    return axios.get(`${this.url}/contacts`, {
      params: {
        q,
        page: page,
-        since,
-        until,
      },
    });
  }

-  conversations({ q, page = 1, since, until }) {
+  conversations({ q, page = 1 }) {
    return axios.get(`${this.url}/conversations`, {
      params: {
        q,
        page: page,
-        since,
-        until,
      },
    });
  }

-  messages({ q, page = 1, since, until, from, inboxId }) {
+  messages({ q, page = 1 }) {
    return axios.get(`${this.url}/messages`, {
      params: {
        q,
        page: page,
-        since,
-        until,
-        from,
-        inbox_id: inboxId,
      },
    });
  }

-  articles({ q, page = 1, since, until }) {
+  articles({ q, page = 1 }) {
    return axios.get(`${this.url}/articles`, {
      params: {
        q,
        page: page,
-        since,
-        until,
      },
    });
  }
@@ -1,134 +0,0 @@
-import searchAPI from '../search';
-import ApiClient from '../ApiClient';
-
-describe('#SearchAPI', () => {
-  it('creates correct instance', () => {
-    expect(searchAPI).toBeInstanceOf(ApiClient);
-    expect(searchAPI).toHaveProperty('get');
-    expect(searchAPI).toHaveProperty('contacts');
-    expect(searchAPI).toHaveProperty('conversations');
-    expect(searchAPI).toHaveProperty('messages');
-    expect(searchAPI).toHaveProperty('articles');
-  });
-
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      get: vi.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-      vi.clearAllMocks();
-    });
-
-    it('#get', () => {
-      searchAPI.get({ q: 'test query' });
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search', {
-        params: { q: 'test query' },
-      });
-    });
-
-    it('#contacts', () => {
-      searchAPI.contacts({ q: 'test', page: 1 });
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/contacts', {
-        params: { q: 'test', page: 1, since: undefined, until: undefined },
-      });
-    });
-
-    it('#contacts with date filters', () => {
-      searchAPI.contacts({
-        q: 'test',
-        page: 2,
-        since: 1700000000,
-        until: 1732000000,
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/contacts', {
-        params: { q: 'test', page: 2, since: 1700000000, until: 1732000000 },
-      });
-    });
-
-    it('#conversations', () => {
-      searchAPI.conversations({ q: 'test', page: 1 });
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/search/conversations',
-        {
-          params: { q: 'test', page: 1, since: undefined, until: undefined },
-        }
-      );
-    });
-
-    it('#conversations with date filters', () => {
-      searchAPI.conversations({
-        q: 'test',
-        page: 1,
-        since: 1700000000,
-        until: 1732000000,
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/search/conversations',
-        {
-          params: { q: 'test', page: 1, since: 1700000000, until: 1732000000 },
-        }
-      );
-    });
-
-    it('#messages', () => {
-      searchAPI.messages({ q: 'test', page: 1 });
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/messages', {
-        params: {
-          q: 'test',
-          page: 1,
-          since: undefined,
-          until: undefined,
-          from: undefined,
-          inbox_id: undefined,
-        },
-      });
-    });
-
-    it('#messages with all filters', () => {
-      searchAPI.messages({
-        q: 'test',
-        page: 1,
-        since: 1700000000,
-        until: 1732000000,
-        from: 'contact:42',
-        inboxId: 10,
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/messages', {
-        params: {
-          q: 'test',
-          page: 1,
-          since: 1700000000,
-          until: 1732000000,
-          from: 'contact:42',
-          inbox_id: 10,
-        },
-      });
-    });
-
-    it('#articles', () => {
-      searchAPI.articles({ q: 'test', page: 1 });
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/articles', {
-        params: { q: 'test', page: 1, since: undefined, until: undefined },
-      });
-    });
-
-    it('#articles with date filters', () => {
-      searchAPI.articles({
-        q: 'test',
-        page: 2,
-        since: 1700000000,
-        until: 1732000000,
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/articles', {
-        params: { q: 'test', page: 2, since: 1700000000, until: 1732000000 },
-      });
-    });
-  });
-});
@@ -1,35 +0,0 @@
-import ApiClient from '../ApiClient';
-import tiktokClient from '../channel/tiktokClient';
-
-describe('#TiktokClient', () => {
-  it('creates correct instance', () => {
-    expect(tiktokClient).toBeInstanceOf(ApiClient);
-    expect(tiktokClient).toHaveProperty('generateAuthorization');
-  });
-
-  describe('#generateAuthorization', () => {
-    const originalAxios = window.axios;
-    const originalPathname = window.location.pathname;
-    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-      window.history.pushState({}, '', '/app/accounts/1/settings');
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-      window.history.pushState({}, '', originalPathname);
-    });
-
-    it('posts to the authorization endpoint', () => {
-      tiktokClient.generateAuthorization({ state: 'test-state' });
-      expect(axiosMock.post).toHaveBeenCalledWith(
-        '/api/v1/accounts/1/tiktok/authorization',
-        { state: 'test-state' }
-      );
-    });
-  });
-});
@@ -1,16 +0,0 @@
-/* global axios */
-import ApiClient from './ApiClient';
-
-class YearInReviewAPI extends ApiClient {
-  constructor() {
-    super('year_in_review', { accountScoped: true, apiVersion: 'v2' });
-  }
-
-  get(year) {
-    return axios.get(`${this.url}`, {
-      params: { year },
-    });
-  }
-}
-
-export default new YearInReviewAPI();
@@ -19,7 +19,7 @@ const handleClick = () => {

 <template>
  <div
-    class="flex flex-col w-full outline-1 outline outline-n-container group/cardLayout rounded-xl bg-n-solid-2"
+    class="flex flex-col w-full shadow outline-1 outline outline-n-container group/cardLayout rounded-2xl bg-n-solid-2"
  >
    <div
      class="flex w-full gap-3 py-5"
@@ -35,10 +35,6 @@ const sortMenus = [
    label: t('COMPANIES.SORT_BY.OPTIONS.CREATED_AT'),
    value: 'created_at',
  },
-  {
-    label: t('COMPANIES.SORT_BY.OPTIONS.CONTACTS_COUNT'),
-    value: 'contacts_count',
-  },
 ];

 const orderingMenus = [
@@ -102,7 +102,6 @@ const closeMobileSidebar = () => {
              />
              <VoiceCallButton
                :phone="selectedContact?.phoneNumber"
-                :contact-id="contactId"
                :label="$t('CONTACT_PANEL.CALL')"
                size="sm"
              />
@@ -44,7 +44,6 @@ const SOCIAL_CONFIG = {
  LINKEDIN: 'i-ri-linkedin-box-fill',
  FACEBOOK: 'i-ri-facebook-circle-fill',
  INSTAGRAM: 'i-ri-instagram-line',
-  TIKTOK: 'i-ri-tiktok-fill',
  TWITTER: 'i-ri-twitter-x-fill',
  GITHUB: 'i-ri-github-fill',
 };
@@ -66,7 +65,6 @@ const defaultState = {
      facebook: '',
      github: '',
      instagram: '',
-      tiktok: '',
      linkedin: '',
      twitter: '',
    },
@@ -40,12 +40,7 @@ defineExpose({ dialogRef, contactsFormRef, onSuccess });
 </script>

 <template>
-  <Dialog
-    ref="dialogRef"
-    width="3xl"
-    overflow-y-auto
-    @confirm="handleDialogConfirm"
-  >
+  <Dialog ref="dialogRef" width="3xl" @confirm="handleDialogConfirm">
    <ContactsForm
      ref="contactsFormRef"
      is-new-contact
@@ -1,19 +1,15 @@
 <script setup>
 import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
-import { useMapGetter, useStore } from 'dashboard/composables/store';
+import { useMapGetter } from 'dashboard/composables/store';
 import { INBOX_TYPES } from 'dashboard/helper/inbox';
 import { useAlert } from 'dashboard/composables';
-import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
-import { useCallsStore } from 'dashboard/stores/calls';

 import Button from 'dashboard/components-next/button/Button.vue';
 import Dialog from 'dashboard/components-next/dialog/Dialog.vue';

 const props = defineProps({
  phone: { type: String, default: '' },
-  contactId: { type: [String, Number], required: true },
  label: { type: String, default: '' },
  icon: { type: [String, Object, Function], default: '' },
  size: { type: String, default: 'sm' },
@@ -22,17 +18,10 @@ const props = defineProps({

 defineOptions({ inheritAttrs: false });
 const attrs = useAttrs();
-const route = useRoute();
-const router = useRouter();
-const store = useStore();

 const { t } = useI18n();

-const dialogRef = ref(null);
-
 const inboxesList = useMapGetter('inboxes/getInboxes');
-const contactsUiFlags = useMapGetter('contacts/getUIFlags');
-
 const voiceInboxes = computed(() =>
  (inboxesList.value || []).filter(
    inbox => inbox.channel_type === INBOX_TYPES.VOICE
@@ -43,62 +32,20 @@ const hasVoiceInboxes = computed(() => voiceInboxes.value.length > 0);
 // Unified behavior: hide when no phone
 const shouldRender = computed(() => hasVoiceInboxes.value && !!props.phone);

-const isInitiatingCall = computed(() => {
-  return contactsUiFlags.value?.isInitiatingCall || false;
-});
+const dialogRef = ref(null);

-const navigateToConversation = conversationId => {
-  const accountId = route.params.accountId;
-  if (conversationId && accountId) {
-    const path = frontendURL(
-      conversationUrl({
-        accountId,
-        id: conversationId,
-      })
-    );
-    router.push({ path });
-  }
-};
-
-const startCall = async inboxId => {
-  if (isInitiatingCall.value) return;
-
-  try {
-    const response = await store.dispatch('contacts/initiateCall', {
-      contactId: props.contactId,
-      inboxId,
-    });
-    const { call_sid: callSid, conversation_id: conversationId } = response;
-
-    // Add call to store immediately so widget shows
-    const callsStore = useCallsStore();
-    callsStore.addCall({
-      callSid,
-      conversationId,
-      inboxId,
-      callDirection: 'outbound',
-    });
-
-    useAlert(t('CONTACT_PANEL.CALL_INITIATED'));
-    navigateToConversation(response?.conversation_id);
-  } catch (error) {
-    const apiError = error?.message;
-    useAlert(apiError || t('CONTACT_PANEL.CALL_FAILED'));
-  }
-};
-
-const onClick = async () => {
+const onClick = () => {
  if (voiceInboxes.value.length > 1) {
    dialogRef.value?.open();
    return;
  }
-  const [inbox] = voiceInboxes.value;
-  await startCall(inbox.id);
+  useAlert(t('CONTACT_PANEL.CALL_UNDER_DEVELOPMENT'));
 };

-const onPickInbox = async inbox => {
+const onPickInbox = () => {
+  // Placeholder until actual call wiring happens
+  useAlert(t('CONTACT_PANEL.CALL_UNDER_DEVELOPMENT'));
  dialogRef.value?.close();
-  await startCall(inbox.id);
 };
 </script>

@@ -108,8 +55,6 @@ const onPickInbox = async inbox => {
      v-if="shouldRender"
      v-tooltip.top-end="tooltipLabel || null"
      v-bind="attrs"
-      :disabled="isInitiatingCall"
-      :is-loading="isInitiatingCall"
      :label="label"
      :icon="icon"
      :size="size"
@@ -1,88 +0,0 @@
-<script setup>
-import Button from 'dashboard/components-next/button/Button.vue';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-import AttributeBadge from 'dashboard/components-next/CustomAttributes/AttributeBadge.vue';
-import { computed } from 'vue';
-
-const props = defineProps({
-  attribute: {
-    type: Object,
-    required: true,
-  },
-  badges: {
-    type: Array,
-    default: () => [],
-  },
-});
-
-const emit = defineEmits(['edit', 'delete']);
-
-const iconByType = {
-  text: 'i-lucide-align-justify',
-  checkbox: 'i-lucide-circle-check-big',
-  list: 'i-lucide-list',
-  date: 'i-lucide-calendar',
-  link: 'i-lucide-link',
-  number: 'i-lucide-hash',
-};
-
-const attributeIcon = computed(() => {
-  const typeKey = props.attribute.type?.toLowerCase();
-  return iconByType[typeKey] || 'i-lucide-align-justify';
-});
-</script>
-
-<template>
-  <div
-    class="flex flex-col gap-2 p-4 bg-n-solid-1 rounded-2xl outline outline-1 outline-n-container"
-  >
-    <div class="flex flex-wrap gap-2 justify-between items-center">
-      <div class="flex flex-wrap gap-2 items-center min-w-0">
-        <h4 class="text-sm font-medium truncate text-n-slate-12">
-          {{ attribute.label }}
-        </h4>
-        <div class="w-px h-3 bg-n-strong" />
-        <div class="flex gap-2 items-center text-sm text-n-slate-11">
-          <div class="flex items-center gap-1.5 text-n-slate-11">
-            <Icon :icon="attributeIcon" class="size-4" />
-            <span class="text-sm">{{ attribute.type }}</span>
-          </div>
-          <div class="w-px h-3 bg-n-weak" />
-          <div class="flex items-center gap-1.5 text-n-slate-11">
-            <Icon icon="i-lucide-key-round" class="size-4" />
-            <span class="line-clamp-1 text-sm">{{ attribute.value }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="flex gap-2 items-center">
-        <AttributeBadge
-          v-for="badge in badges"
-          :key="badge.type"
-          :type="badge.type"
-        />
-        <div
-          v-if="badges.length > 0"
-          class="w-px h-3 bg-n-strong ltr:ml-1.5 rtl:mr-1.5"
-        />
-        <Button
-          icon="i-lucide-pencil-line"
-          size="sm"
-          color="slate"
-          ghost
-          @click="emit('edit', attribute)"
-        />
-        <div class="w-px h-3 bg-n-strong" />
-        <Button
-          icon="i-lucide-trash"
-          size="sm"
-          color="slate"
-          ghost
-          @click="emit('delete', attribute)"
-        />
-      </div>
-    </div>
-    <p class="mb-0 text-sm text-n-slate-11">
-      {{ attribute.attribute_description || attribute.description || '' }}
-    </p>
-  </div>
-</template>
@@ -1,42 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-
-const props = defineProps({
-  type: {
-    type: String,
-    default: 'resolution',
-    validator: value => ['pre-chat', 'resolution'].includes(value),
-  },
-});
-
-const { t } = useI18n();
-
-const attributeConfig = {
-  'pre-chat': {
-    colorClass: 'text-n-blue-11',
-    icon: 'i-lucide-message-circle',
-    labelKey: 'ATTRIBUTES_MGMT.BADGES.PRE_CHAT',
-  },
-  resolution: {
-    colorClass: 'text-n-teal-11',
-    icon: 'i-lucide-circle-check-big',
-    labelKey: 'ATTRIBUTES_MGMT.BADGES.RESOLUTION',
-  },
-};
-const config = computed(
-  () => attributeConfig[props.type] || attributeConfig.resolution
-);
-</script>
-
-<template>
-  <div
-    class="flex gap-1 justify-center items-center px-1.5 py-1 rounded-md shadow outline-1 outline outline-n-container bg-n-solid-2"
-  >
-    <Icon :icon="config.icon" class="size-4" :class="config.colorClass" />
-    <span class="text-xs" :class="config.colorClass">{{
-      t(config.labelKey)
-    }}</span>
-  </div>
-</template>
@@ -19,12 +19,12 @@ const props = defineProps({
  },
  enableVariables: { type: Boolean, default: false },
  enableCannedResponses: { type: Boolean, default: true },
+  enabledMenuOptions: { type: Array, default: () => [] },
  enableCaptainTools: { type: Boolean, default: false },
  signature: { type: String, default: '' },
  allowSignature: { type: Boolean, default: false },
  sendWithSignature: { type: Boolean, default: false },
  channelType: { type: String, default: '' },
-  medium: { type: String, default: '' },
 });

 const emit = defineEmits(['update:modelValue']);
@@ -102,12 +102,12 @@ watch(
        :disabled="disabled"
        :enable-variables="enableVariables"
        :enable-canned-responses="enableCannedResponses"
+        :enabled-menu-options="enabledMenuOptions"
        :enable-captain-tools="enableCaptainTools"
        :signature="signature"
        :allow-signature="allowSignature"
        :send-with-signature="sendWithSignature"
        :channel-type="channelType"
-        :medium="medium"
        @input="handleInput"
        @focus="handleFocus"
        @blur="handleBlur"
@@ -139,6 +139,19 @@ watch(
 .editor-wrapper {
  ::v-deep {
    .ProseMirror-menubar-wrapper {
+      @apply gap-2 !important;
+
+      .ProseMirror-menubar {
+        @apply bg-transparent dark:bg-transparent w-fit left-1 pt-0 h-5 !top-0 !relative !important;
+
+        .ProseMirror-menuitem {
+          @apply h-5 !important;
+        }
+
+        .ProseMirror-icon {
+          @apply p-1 w-3 h-3 text-n-slate-12 dark:text-n-slate-12 !important;
+        }
+      }
      .ProseMirror.ProseMirror-woot-style {
        p {
          @apply first:mt-0 !important;
@@ -172,7 +172,7 @@ const previewArticle = () => {
        @apply mr-0;

        .ProseMirror-icon {
-          @apply p-0 mt-0 !mr-0;
+          @apply p-0 mt-1 !mr-0;

          svg {
            width: 20px !important;
@@ -9,8 +9,6 @@ import { useAlert } from 'dashboard/composables';
 import { ExceptionWithMessage } from 'shared/helpers/CustomErrors';
 import { debounce } from '@chatwoot/utils';
 import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
-import { emitter } from 'shared/helpers/mitt';
-import { BUS_EVENTS } from 'shared/constants/busEvents';
 import {
  searchContacts,
  createNewContact,
@@ -228,8 +226,6 @@ const keyboardEvents = {
    action: () => {
      if (showComposeNewConversation.value) {
        showComposeNewConversation.value = false;
-        emit('close');
-        emitter.emit(BUS_EVENTS.NEW_CONVERSATION_MODAL, false);
      }
    },
  },
@@ -4,11 +4,10 @@ import { useI18n } from 'vue-i18n';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import { useFileUpload } from 'dashboard/composables/useFileUpload';
 import { vOnClickOutside } from '@vueuse/components';
-import { useEventListener } from '@vueuse/core';
 import { ALLOWED_FILE_TYPES } from 'shared/constants/messages';
 import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
 import FileUpload from 'vue-upload-component';
-import { INBOX_TYPES } from 'dashboard/helper/inbox';
+import { extractTextFromMarkdown } from 'dashboard/helper/editorHelper';

 import Button from 'dashboard/components-next/button/Button.vue';
 import WhatsAppOptions from './WhatsAppOptions.vue';
@@ -51,6 +50,12 @@ const EmojiInput = defineAsyncComponent(
  () => import('shared/components/emoji/EmojiInput.vue')
 );

+const signatureToApply = computed(() =>
+  props.isEmailOrWebWidgetInbox
+    ? props.messageSignature
+    : extractTextFromMarkdown(props.messageSignature)
+);
+
 const {
  fetchSignatureFlagFromUISettings,
  setSignatureFlagForInbox,
@@ -75,20 +80,12 @@ const isRegularMessageMode = computed(() => {
  return !props.isWhatsappInbox && !props.isTwilioWhatsAppInbox;
 });

-const isVoiceInbox = computed(() => props.channelType === INBOX_TYPES.VOICE);
-
-const shouldShowSignatureButton = computed(() => {
-  return (
-    props.hasSelectedInbox && isRegularMessageMode.value && !isVoiceInbox.value
-  );
-});
-
 const setSignature = () => {
-  if (props.messageSignature) {
+  if (signatureToApply.value) {
    if (sendWithSignature.value) {
-      emit('addSignature', props.messageSignature);
+      emit('addSignature', signatureToApply.value);
    } else {
-      emit('removeSignature', props.messageSignature);
+      emit('removeSignature', signatureToApply.value);
    }
  }
 };
@@ -104,7 +101,7 @@ watch(
  () => props.hasSelectedInbox,
  newValue => {
    nextTick(() => {
-      if (newValue && !isVoiceInbox.value) setSignature();
+      if (newValue && props.isEmailOrWebWidgetInbox) setSignature();
    });
  },
  { immediate: true }
@@ -164,23 +161,6 @@ const keyboardEvents = {
  },
 };
 useKeyboardEvents(keyboardEvents);
-
-const onPaste = e => {
-  if (!props.isEmailOrWebWidgetInbox) return;
-
-  const files = e.clipboardData?.files;
-  if (!files?.length) return;
-
-  // Filter valid files (non-zero size)
-  Array.from(files)
-    .filter(file => file.size > 0)
-    .forEach(file => {
-      const { name, type, size } = file;
-      onFileUpload({ file, name, type, size });
-    });
-};
-
-useEventListener(document, 'paste', onPaste);
 </script>

 <template>
@@ -240,7 +220,7 @@ useEventListener(document, 'paste', onPaste);
        />
      </FileUpload>
      <Button
-        v-if="shouldShowSignatureButton"
+        v-if="hasSelectedInbox && isRegularMessageMode"
        icon="i-lucide-signature"
        color="slate"
        size="sm"
@@ -39,7 +39,7 @@ const removeAttachment = id => {
 </script>

 <template>
-  <div class="flex flex-col gap-4 p-4 max-h-48 overflow-y-auto">
+  <div class="flex flex-col gap-4 p-4">
    <div
      v-if="filteredImageAttachments.length > 0"
      class="flex flex-wrap gap-3"
@@ -6,7 +6,7 @@ import { INBOX_TYPES } from 'dashboard/helper/inbox';
 import {
  appendSignature,
  removeSignature,
-  getEffectiveChannelType,
+  extractTextFromMarkdown,
 } from 'dashboard/helper/editorHelper';
 import {
  buildContactableInboxesList,
@@ -87,12 +87,6 @@ const whatsappMessageTemplates = computed(() =>

 const inboxChannelType = computed(() => props.targetInbox?.channelType || '');

-const inboxMedium = computed(() => props.targetInbox?.medium || '');
-
-const effectiveChannelType = computed(() =>
-  getEffectiveChannelType(inboxChannelType.value, inboxMedium.value)
-);
-
 const validationRules = computed(() => ({
  selectedContact: { required },
  targetInbox: { required },
@@ -200,7 +194,6 @@ const setSelectedContact = async ({ value, action, ...rest }) => {

 const handleInboxAction = ({ value, action, ...rest }) => {
  v$.value.$reset();
-  state.message = '';
  emit('updateTargetInbox', { ...rest });
  showInboxesDropdown.value = false;
  state.attachedFiles = [];
@@ -209,28 +202,25 @@ const handleInboxAction = ({ value, action, ...rest }) => {
 const removeSignatureFromMessage = () => {
  // Always remove the signature from message content when inbox/contact is removed
  // to ensure no leftover signature content remains
-  if (props.messageSignature) {
-    state.message = removeSignature(
-      state.message,
-      props.messageSignature,
-      effectiveChannelType.value
-    );
+  const signatureToRemove = inboxTypes.value.isEmailOrWebWidget
+    ? props.messageSignature
+    : extractTextFromMarkdown(props.messageSignature);
+  if (signatureToRemove) {
+    state.message = removeSignature(state.message, signatureToRemove);
  }
 };

 const removeTargetInbox = value => {
  v$.value.$reset();
  removeSignatureFromMessage();
-  state.message = '';
  emit('updateTargetInbox', value);
  state.attachedFiles = [];
 };

 const clearSelectedContact = () => {
-  removeSignatureFromMessage();
  emit('clearSelectedContact');
-  state.message = '';
  state.attachedFiles = [];
+  removeSignatureFromMessage();
 };

 const onClickInsertEmoji = emoji => {
@@ -238,19 +228,11 @@ const onClickInsertEmoji = emoji => {
 };

 const handleAddSignature = signature => {
-  state.message = appendSignature(
-    state.message,
-    signature,
-    effectiveChannelType.value
-  );
+  state.message = appendSignature(state.message, signature);
 };

 const handleRemoveSignature = signature => {
-  state.message = removeSignature(
-    state.message,
-    signature,
-    effectiveChannelType.value
-  );
+  state.message = removeSignature(state.message, signature);
 };

 const handleAttachFile = files => {
@@ -374,10 +356,10 @@ const shouldShowMessageEditor = computed(() => {
      v-model="state.message"
      :message-signature="messageSignature"
      :send-with-signature="sendWithSignature"
+      :is-email-or-web-widget-inbox="inboxTypes.isEmailOrWebWidget"
      :has-errors="validationStates.isMessageInvalid"
      :has-attachments="state.attachedFiles.length > 0"
      :channel-type="inboxChannelType"
-      :medium="targetInbox?.medium || ''"
    />

    <AttachmentPreviews
@@ -1,49 +1,127 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, watch, computed, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
+import {
+  appendSignature,
+  extractTextFromMarkdown,
+  removeSignature,
+} from 'dashboard/helper/editorHelper';

 import Editor from 'dashboard/components-next/Editor/Editor.vue';
+import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
+import CannedResponse from 'dashboard/components/widgets/conversation/CannedResponse.vue';

 const props = defineProps({
+  isEmailOrWebWidgetInbox: { type: Boolean, required: true },
  hasErrors: { type: Boolean, default: false },
  hasAttachments: { type: Boolean, default: false },
  sendWithSignature: { type: Boolean, default: false },
  messageSignature: { type: String, default: '' },
  channelType: { type: String, default: '' },
-  medium: { type: String, default: '' },
 });

-const editorKey = computed(() => `editor-${props.channelType}-${props.medium}`);
-
 const { t } = useI18n();

 const modelValue = defineModel({
  type: String,
  default: '',
 });
+
+const state = ref({
+  hasSlashCommand: false,
+  showMentions: false,
+  mentionSearchKey: '',
+});
+
+const plainTextSignature = computed(() =>
+  extractTextFromMarkdown(props.messageSignature)
+);
+
+watch(
+  modelValue,
+  newValue => {
+    if (props.isEmailOrWebWidgetInbox) return;
+
+    const bodyWithoutSignature = newValue
+      ? removeSignature(newValue, plainTextSignature.value)
+      : '';
+
+    // Check if message starts with slash
+    const startsWithSlash = bodyWithoutSignature.startsWith('/');
+
+    // Update slash command and mentions state
+    state.value = {
+      ...state.value,
+      hasSlashCommand: startsWithSlash,
+      showMentions: startsWithSlash,
+      mentionSearchKey: startsWithSlash ? bodyWithoutSignature.slice(1) : '',
+    };
+  },
+  { immediate: true }
+);
+
+const hideMention = () => {
+  state.value.showMentions = false;
+};
+
+const replaceText = async message => {
+  // Only append signature on replace if sendWithSignature is true
+  const finalMessage = props.sendWithSignature
+    ? appendSignature(message, plainTextSignature.value)
+    : message;
+
+  await nextTick();
+  modelValue.value = finalMessage;
+};
 </script>

 <template>
  <div class="flex-1 h-full" :class="[!hasAttachments && 'min-h-[200px]']">
-    <Editor
-      :key="editorKey"
-      v-model="modelValue"
-      :placeholder="
-        t('COMPOSE_NEW_CONVERSATION.FORM.MESSAGE_EDITOR.PLACEHOLDER')
-      "
-      class="[&>div]:!border-transparent [&>div]:px-4 [&>div]:py-4 [&>div]:!bg-transparent h-full [&_.ProseMirror-woot-style]:!max-h-[200px]"
-      :class="
-        hasErrors
-          ? '[&_.empty-node]:before:!text-n-ruby-9 [&_.empty-node]:dark:before:!text-n-ruby-9'
-          : ''
-      "
-      enable-variables
-      :show-character-count="false"
-      :signature="messageSignature"
-      allow-signature
-      :send-with-signature="sendWithSignature"
-      :channel-type="channelType"
-      :medium="medium"
-    />
+    <template v-if="isEmailOrWebWidgetInbox">
+      <Editor
+        v-model="modelValue"
+        :placeholder="
+          t('COMPOSE_NEW_CONVERSATION.FORM.MESSAGE_EDITOR.PLACEHOLDER')
+        "
+        class="[&>div]:!border-transparent [&>div]:px-4 [&>div]:py-4 [&>div]:!bg-transparent h-full [&_.ProseMirror-woot-style]:!max-h-[200px]"
+        :class="
+          hasErrors
+            ? '[&_.empty-node]:before:!text-n-ruby-9 [&_.empty-node]:dark:before:!text-n-ruby-9'
+            : ''
+        "
+        enable-variables
+        :show-character-count="false"
+        :signature="messageSignature"
+        allow-signature
+        :send-with-signature="sendWithSignature"
+        :channel-type="channelType"
+      />
+    </template>
+    <template v-else>
+      <TextArea
+        v-model="modelValue"
+        :placeholder="
+          t('COMPOSE_NEW_CONVERSATION.FORM.MESSAGE_EDITOR.PLACEHOLDER')
+        "
+        class="!px-0 [&>div]:!px-4 [&>div]:!border-transparent [&>div]:!bg-transparent"
+        :custom-text-area-class="
+          hasErrors
+            ? 'placeholder:!text-n-ruby-9 dark:placeholder:!text-n-ruby-9'
+            : ''
+        "
+        auto-height
+        allow-signature
+        :signature="messageSignature"
+        :send-with-signature="sendWithSignature"
+      >
+        <CannedResponse
+          v-if="state.showMentions && state.hasSlashCommand"
+          v-on-clickaway="hideMention"
+          class="normal-editor__canned-box"
+          :search-key="state.mentionSearchKey"
+          @replace="replaceText"
+        />
+      </TextArea>
+    </template>
  </div>
 </template>
@@ -146,7 +146,7 @@ const STYLE_CONFIG = {
      solid:
        'bg-n-teal-9 text-white hover:enabled:bg-n-teal-10 focus-visible:bg-n-teal-10 outline-transparent',
      faded:
-        'bg-n-teal-9/10 text-n-teal-11 hover:enabled:bg-n-teal-9/20 focus-visible:bg-n-teal-9/20 outline-transparent',
+        'bg-n-teal-9/10 text-n-slate-12 hover:enabled:bg-n-teal-9/20 focus-visible:bg-n-teal-9/20 outline-transparent',
      outline:
        'text-n-teal-11 hover:enabled:bg-n-teal-9/10 focus-visible:bg-n-teal-9/10 outline-n-teal-9',
      link: 'text-n-teal-9 hover:enabled:underline focus-visible:underline outline-transparent',
@@ -118,7 +118,6 @@ watch(
      :placeholder="t('CAPTAIN.ASSISTANTS.FORM.DESCRIPTION.PLACEHOLDER')"
      :message="formErrors.description"
      :message-type="formErrors.description ? 'error' : 'info'"
-      class="z-0"
    />

    <div class="flex flex-col gap-2">
@@ -108,7 +108,6 @@ watch(
      :placeholder="t('CAPTAIN.ASSISTANTS.FORM.HANDOFF_MESSAGE.PLACEHOLDER')"
      :message="formErrors.handoffMessage"
      :message-type="formErrors.handoffMessage ? 'error' : 'info'"
-      class="z-0"
    />

    <Editor
@@ -117,7 +116,6 @@ watch(
      :placeholder="t('CAPTAIN.ASSISTANTS.FORM.RESOLUTION_MESSAGE.PLACEHOLDER')"
      :message="formErrors.resolutionMessage"
      :message-type="formErrors.resolutionMessage ? 'error' : 'info'"
-      class="z-0"
    />

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

    <div class="flex flex-col gap-2">
@@ -1,6 +1,5 @@
 <script setup>
 import { useAccount } from 'dashboard/composables/useAccount';
-import { useBranding } from 'shared/composables/useBranding';
 import EmptyStateLayout from 'dashboard/components-next/EmptyStateLayout.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import DocumentCard from 'dashboard/components-next/captain/assistant/DocumentCard.vue';
@@ -10,8 +9,6 @@ import { documentsList } from 'dashboard/components-next/captain/pageComponents/
 const emit = defineEmits(['click']);
 const { isOnChatwootCloud } = useAccount();

-const { replaceInstallationName } = useBranding();
-
 const onClick = () => {
  emit('click');
 };
@@ -38,7 +35,7 @@ const onClick = () => {
          v-for="(document, index) in documentsList.slice(0, 5)"
          :id="document.id"
          :key="`document-${index}`"
-          :name="replaceInstallationName(document.name)"
+          :name="document.name"
          :assistant="document.assistant"
          :external-link="document.external_link"
          :created-at="document.created_at"
@@ -1,6 +1,5 @@
 <script setup>
 import { useAccount } from 'dashboard/composables/useAccount';
-import { useBranding } from 'shared/composables/useBranding';
 import EmptyStateLayout from 'dashboard/components-next/EmptyStateLayout.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import ResponseCard from 'dashboard/components-next/captain/assistant/ResponseCard.vue';
@@ -27,7 +26,6 @@ const isApproved = computed(() => props.variant === 'approved');
 const isPending = computed(() => props.variant === 'pending');

 const { isOnChatwootCloud } = useAccount();
-const { replaceInstallationName } = useBranding();

 const onClick = () => {
  emit('click');
@@ -65,8 +63,8 @@ const onClearFilters = () => {
          v-for="(response, index) in responsesList.slice(0, 5)"
          :id="response.id"
          :key="`response-${index}`"
-          :question="replaceInstallationName(response.question)"
-          :answer="replaceInstallationName(response.answer)"
+          :question="response.question"
+          :answer="response.answer"
          :status="response.status"
          :assistant="response.assistant"
          :created-at="response.created_at"
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';

 import Icon from 'dashboard/components-next/icon/Icon.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
-import Spinner from 'dashboard/components-next/spinner/Spinner.vue';

 const props = defineProps({
  menuItems: {
@@ -38,13 +37,9 @@ const props = defineProps({
    type: String,
    default: '',
  },
-  disableLocalFiltering: {
-    type: Boolean,
-    default: false,
-  },
 });

-const emit = defineEmits(['action', 'search']);
+const emit = defineEmits(['action']);

 const { t } = useI18n();

@@ -62,7 +57,6 @@ const flattenedMenuItems = computed(() => {
 });

 const filteredMenuItems = computed(() => {
-  if (props.disableLocalFiltering) return props.menuItems;
  if (!searchQuery.value) return flattenedMenuItems.value;

  return flattenedMenuItems.value.filter(item =>
@@ -75,7 +69,7 @@ const filteredMenuSections = computed(() => {
    return [];
  }

-  if (props.disableLocalFiltering || !searchQuery.value) {
+  if (!searchQuery.value) {
    return props.menuSections;
  }

@@ -95,12 +89,6 @@ const filteredMenuSections = computed(() => {
    .filter(section => section.items.length > 0);
 });

-const handleSearchInput = event => {
-  if (props.disableLocalFiltering) {
-    emit('search', event.target.value);
-  }
-};
-
 const handleAction = item => {
  const { action, value, ...rest } = item;
  emit('action', { action, value, ...rest });
@@ -130,7 +118,7 @@ onMounted(() => {
  >
    <div
      v-if="showSearch"
-      class="sticky top-0 bg-n-alpha-3 backdrop-blur-sm pt-2 z-20"
+      class="sticky top-0 bg-n-alpha-3 backdrop-blur-sm pt-2"
    >
      <div class="relative">
        <span class="absolute i-lucide-search size-3.5 top-2 left-3" />
@@ -142,7 +130,6 @@ onMounted(() => {
            searchPlaceholder || t('DROPDOWN_MENU.SEARCH_PLACEHOLDER')
          "
          class="reset-base w-full h-8 py-2 pl-10 pr-2 text-sm focus:outline-none border-none rounded-lg bg-n-alpha-black2 dark:bg-n-solid-1 text-n-slate-12"
-          @input="handleSearchInput"
        />
      </div>
    </div>
@@ -154,23 +141,10 @@ onMounted(() => {
      >
        <p
          v-if="section.title"
-          class="px-2 py-2 text-xs mb-0 font-medium text-n-slate-11 uppercase tracking-wide sticky z-10 bg-n-alpha-3 backdrop-blur-sm"
-          :class="showSearch ? 'top-10' : 'top-0'"
+          class="px-2 pt-2 text-xs font-medium text-n-slate-11 uppercase tracking-wide"
        >
          {{ section.title }}
        </p>
-        <div
-          v-if="section.isLoading"
-          class="flex items-center justify-center py-2"
-        >
-          <Spinner :size="24" />
-        </div>
-        <div
-          v-else-if="!section.items.length && section.emptyState"
-          class="text-sm text-n-slate-11 px-2 py-1.5"
-        >
-          {{ section.emptyState }}
-        </div>
        <button
          v-for="(item, itemIndex) in section.items"
          :key="item.value || itemIndex"
@@ -261,6 +235,5 @@ onMounted(() => {
          : t('DROPDOWN_MENU.EMPTY_STATE')
      }}
    </div>
-    <slot name="footer" />
  </div>
 </template>
@@ -13,7 +13,6 @@ export function useChannelIcon(inbox) {
    'Channel::WebWidget': 'i-woot-website',
    'Channel::Whatsapp': 'i-woot-whatsapp',
    'Channel::Instagram': 'i-woot-instagram',
-    'Channel::Tiktok': 'i-woot-tiktok',
    'Channel::Voice': 'i-ri-phone-fill',
  };

@@ -61,12 +61,6 @@ describe('useChannelIcon', () => {
    expect(icon).toBe('i-woot-instagram');
  });

-  it('returns correct icon for TikTok channel', () => {
-    const inbox = { channel_type: 'Channel::Tiktok' };
-    const { value: icon } = useChannelIcon(inbox);
-    expect(icon).toBe('i-woot-tiktok');
-  });
-
  describe('TwilioSms channel', () => {
    it('returns chat icon for regular Twilio SMS channel', () => {
      const inbox = { channel_type: 'Channel::TwilioSms' };
@@ -28,7 +28,6 @@ import ImageBubble from './bubbles/Image.vue';
 import FileBubble from './bubbles/File.vue';
 import AudioBubble from './bubbles/Audio.vue';
 import VideoBubble from './bubbles/Video.vue';
-import EmbedBubble from './bubbles/Embed.vue';
 import InstagramStoryBubble from './bubbles/InstagramStory.vue';
 import EmailBubble from './bubbles/Email/Index.vue';
 import UnsupportedBubble from './bubbles/Unsupported.vue';
@@ -300,12 +299,7 @@ const componentToRender = computed(() => {
    return DyteBubble;
  }

-  const instagramSharedTypes = [
-    ATTACHMENT_TYPES.STORY_MENTION,
-    ATTACHMENT_TYPES.IG_STORY,
-    ATTACHMENT_TYPES.IG_POST,
-  ];
-  if (instagramSharedTypes.includes(props.contentAttributes.imageType)) {
+  if (props.contentAttributes.imageType === 'story_mention') {
    return InstagramStoryBubble;
  }

@@ -318,7 +312,6 @@ const componentToRender = computed(() => {
      if (fileType === ATTACHMENT_TYPES.AUDIO) return AudioBubble;
      if (fileType === ATTACHMENT_TYPES.VIDEO) return VideoBubble;
      if (fileType === ATTACHMENT_TYPES.IG_REEL) return VideoBubble;
-      if (fileType === ATTACHMENT_TYPES.EMBED) return EmbedBubble;
      if (fileType === ATTACHMENT_TYPES.LOCATION) return LocationBubble;
    }
    // Attachment content is the name of the contact
@@ -483,7 +476,7 @@ provideMessageContext({
  <div
    v-if="shouldRenderMessage"
    :id="`message${props.id}`"
-    class="flex mb-2 w-full message-bubble-container"
+    class="flex w-full message-bubble-container mb-2"
    :data-message-id="props.id"
    :class="[
      flexOrientationClass,
@@ -42,10 +42,7 @@ const props = defineProps({
 const emit = defineEmits(['retry']);

 const allMessages = computed(() => {
-  return useCamelCase(props.messages, {
-    deep: true,
-    stopPaths: ['content_attributes.translations'],
-  });
+  return useCamelCase(props.messages, { deep: true });
 });

 const currentChat = useMapGetter('getSelectedChat');
@@ -20,7 +20,6 @@ const {
  isAWhatsAppChannel,
  isAnEmailChannel,
  isAnInstagramChannel,
-  isATiktokChannel,
 } = useInbox();

 const {
@@ -61,8 +60,7 @@ const isSent = computed(() => {
    isAFacebookInbox.value ||
    isASmsInbox.value ||
    isATelegramChannel.value ||
-    isAnInstagramChannel.value ||
-    isATiktokChannel.value
+    isAnInstagramChannel.value
  ) {
    return sourceId.value && status.value === MESSAGE_STATUS.SENT;
  }
@@ -80,8 +78,7 @@ const isDelivered = computed(() => {
    isAWhatsAppChannel.value ||
    isATwilioChannel.value ||
    isASmsInbox.value ||
-    isAFacebookInbox.value ||
-    isATiktokChannel.value
+    isAFacebookInbox.value
  ) {
    return sourceId.value && status.value === MESSAGE_STATUS.DELIVERED;
  }
@@ -103,8 +100,7 @@ const isRead = computed(() => {
    isAWhatsAppChannel.value ||
    isATwilioChannel.value ||
    isAFacebookInbox.value ||
-    isAnInstagramChannel.value ||
-    isATiktokChannel.value
+    isAnInstagramChannel.value
  ) {
    return sourceId.value && status.value === MESSAGE_STATUS.READ;
  }
@@ -1,30 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import BaseBubble from './Base.vue';
-import { useMessageContext } from '../provider.js';
-import { useI18n } from 'vue-i18n';
-
-const { attachments } = useMessageContext();
-const { t } = useI18n();
-
-const attachment = computed(() => {
-  return attachments.value[0];
-});
-</script>
-
-<template>
-  <BaseBubble class="overflow-hidden p-3" data-bubble-name="embed">
-    <div
-      class="w-full max-w-[360px] sm:max-w-[420px] min-h-[520px] h-[70vh] max-h-[680px]"
-    >
-      <iframe
-        class="w-full h-full border-0 rounded-lg"
-        :title="t('CHAT_LIST.ATTACHMENTS.embed.CONTENT')"
-        :src="attachment.dataUrl"
-        loading="lazy"
-        allow="autoplay; encrypted-media; picture-in-picture"
-        allowfullscreen
-      />
-    </div>
-  </BaseBubble>
-</template>
@@ -1,28 +0,0 @@
-<script setup>
-import Button from 'dashboard/components-next/button/Button.vue';
-
-defineProps({
-  message: {
-    type: Object,
-    required: true,
-  },
-  buttonText: {
-    type: String,
-    required: true,
-  },
-});
-</script>
-
-<template>
-  <div class="flex flex-col gap-2.5 text-n-slate-12 max-w-80">
-    <div class="p-3 rounded-xl bg-n-alpha-2">
-      <span
-        v-dompurify-html="message.content"
-        class="text-sm font-medium prose prose-bubble"
-      />
-    </div>
-    <div class="flex gap-2">
-      <Button :label="buttonText" slate class="!text-n-blue-text w-full" />
-    </div>
-  </div>
-</template>
@@ -1,102 +1,41 @@
 <script setup>
 import { computed } from 'vue';
-import { useMessageContext } from '../provider.js';
-import { MESSAGE_TYPES, VOICE_CALL_STATUS } from '../constants';
-
-import Icon from 'dashboard/components-next/icon/Icon.vue';
 import BaseBubble from 'next/message/bubbles/Base.vue';
+import { useMessageContext } from '../provider.js';
+import { useVoiceCallStatus } from 'dashboard/composables/useVoiceCallStatus';

-const LABEL_MAP = {
-  [VOICE_CALL_STATUS.IN_PROGRESS]: 'CONVERSATION.VOICE_CALL.CALL_IN_PROGRESS',
-  [VOICE_CALL_STATUS.COMPLETED]: 'CONVERSATION.VOICE_CALL.CALL_ENDED',
-};
-
-const SUBTEXT_MAP = {
-  [VOICE_CALL_STATUS.RINGING]: 'CONVERSATION.VOICE_CALL.NOT_ANSWERED_YET',
-  [VOICE_CALL_STATUS.COMPLETED]: 'CONVERSATION.VOICE_CALL.CALL_ENDED',
-};
-
-const ICON_MAP = {
-  [VOICE_CALL_STATUS.IN_PROGRESS]: 'i-ph-phone-call',
-  [VOICE_CALL_STATUS.NO_ANSWER]: 'i-ph-phone-x',
-  [VOICE_CALL_STATUS.FAILED]: 'i-ph-phone-x',
-};
-
-const BG_COLOR_MAP = {
-  [VOICE_CALL_STATUS.IN_PROGRESS]: 'bg-n-teal-9',
-  [VOICE_CALL_STATUS.RINGING]: 'bg-n-teal-9 animate-pulse',
-  [VOICE_CALL_STATUS.COMPLETED]: 'bg-n-slate-11',
-  [VOICE_CALL_STATUS.NO_ANSWER]: 'bg-n-ruby-9',
-  [VOICE_CALL_STATUS.FAILED]: 'bg-n-ruby-9',
-};
-
-const { contentAttributes, messageType } = useMessageContext();
+const { contentAttributes } = useMessageContext();

 const data = computed(() => contentAttributes.value?.data);
-const status = computed(() => data.value?.status?.toString());

-const isOutbound = computed(() => messageType.value === MESSAGE_TYPES.OUTGOING);
-const isFailed = computed(() =>
-  [VOICE_CALL_STATUS.NO_ANSWER, VOICE_CALL_STATUS.FAILED].includes(status.value)
-);
+const status = computed(() => data.value?.status);
+const direction = computed(() => data.value?.call_direction);

-const labelKey = computed(() => {
-  if (LABEL_MAP[status.value]) return LABEL_MAP[status.value];
-  if (status.value === VOICE_CALL_STATUS.RINGING) {
-    return isOutbound.value
-      ? 'CONVERSATION.VOICE_CALL.OUTGOING_CALL'
-      : 'CONVERSATION.VOICE_CALL.INCOMING_CALL';
-  }
-  return isFailed.value
-    ? 'CONVERSATION.VOICE_CALL.MISSED_CALL'
-    : 'CONVERSATION.VOICE_CALL.INCOMING_CALL';
+const { labelKey, subtextKey, bubbleIconBg, bubbleIconName } =
+  useVoiceCallStatus(status, direction);
+
+const containerRingClass = computed(() => {
+  return status.value === 'ringing' ? 'ring-1 ring-emerald-300' : '';
 });
-
-const subtextKey = computed(() => {
-  if (SUBTEXT_MAP[status.value]) return SUBTEXT_MAP[status.value];
-  if (status.value === VOICE_CALL_STATUS.IN_PROGRESS) {
-    return isOutbound.value
-      ? 'CONVERSATION.VOICE_CALL.THEY_ANSWERED'
-      : 'CONVERSATION.VOICE_CALL.YOU_ANSWERED';
-  }
-  return isFailed.value
-    ? 'CONVERSATION.VOICE_CALL.NO_ANSWER'
-    : 'CONVERSATION.VOICE_CALL.NOT_ANSWERED_YET';
-});
-
-const iconName = computed(() => {
-  if (ICON_MAP[status.value]) return ICON_MAP[status.value];
-  return isOutbound.value ? 'i-ph-phone-outgoing' : 'i-ph-phone-incoming';
-});
-
-const bgColor = computed(() => BG_COLOR_MAP[status.value] || 'bg-n-teal-9');
 </script>

 <template>
  <BaseBubble class="p-0 border-none" hide-meta>
-    <div class="flex overflow-hidden flex-col w-full max-w-xs">
+    <div
+      class="flex overflow-hidden flex-col w-full max-w-xs bg-white rounded-lg border border-slate-100 text-slate-900 dark:border-slate-700 dark:bg-slate-800 dark:text-slate-100"
+      :class="containerRingClass"
+    >
      <div class="flex gap-3 items-center p-3 w-full">
        <div
          class="flex justify-center items-center rounded-full size-10 shrink-0"
-          :class="bgColor"
+          :class="bubbleIconBg"
        >
-          <Icon
-            class="size-5"
-            :icon="iconName"
-            :class="{
-              'text-n-slate-1': status === VOICE_CALL_STATUS.COMPLETED,
-              'text-white': status !== VOICE_CALL_STATUS.COMPLETED,
-            }"
-          />
+          <span class="text-xl" :class="bubbleIconName" />
        </div>

        <div class="flex overflow-hidden flex-col flex-grow">
-          <span class="text-sm font-medium truncate text-n-slate-12">
-            {{ $t(labelKey) }}
-          </span>
-          <span class="text-xs text-n-slate-11">
-            {{ $t(subtextKey) }}
-          </span>
+          <span class="text-base font-medium truncate">{{ $t(labelKey) }}</span>
+          <span class="text-xs text-slate-500">{{ $t(subtextKey) }}</span>
        </div>
      </div>
    </div>
@@ -17,10 +17,6 @@ const { attachment } = defineProps({
    type: Object,
    required: true,
  },
-  showTranscribedText: {
-    type: Boolean,
-    default: true,
-  },
 });

 defineOptions({
@@ -186,7 +182,7 @@ const downloadAudio = async () => {
    </div>

    <div
-      v-if="attachment.transcribedText && showTranscribedText"
+      v-if="attachment.transcribedText"
      class="text-n-slate-12 p-3 text-sm bg-n-alpha-1 rounded-lg w-full break-words"
    >
      {{ attachment.transcribedText }}
@@ -49,9 +49,6 @@ export const ATTACHMENT_TYPES = {
  STORY_MENTION: 'story_mention',
  CONTACT: 'contact',
  IG_REEL: 'ig_reel',
-  EMBED: 'embed',
-  IG_POST: 'ig_post',
-  IG_STORY: 'ig_story',
 };

 export const CONTENT_TYPES = {
@@ -76,16 +73,3 @@ export const MEDIA_TYPES = [
  ATTACHMENT_TYPES.AUDIO,
  ATTACHMENT_TYPES.IG_REEL,
 ];
-
-export const VOICE_CALL_STATUS = {
-  IN_PROGRESS: 'in-progress',
-  RINGING: 'ringing',
-  COMPLETED: 'completed',
-  NO_ANSWER: 'no-answer',
-  FAILED: 'failed',
-};
-
-export const VOICE_CALL_DIRECTION = {
-  INBOUND: 'inbound',
-  OUTBOUND: 'outbound',
-};
@@ -1,7 +1,6 @@
 <script setup>
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useNumberFormatter } from 'shared/composables/useNumberFormatter';

 import Button from 'dashboard/components-next/button/Button.vue';

@@ -25,7 +24,6 @@ const props = defineProps({
 });
 const emit = defineEmits(['update:currentPage']);
 const { t } = useI18n();
-const { formatCompactNumber, formatFullNumber } = useNumberFormatter();

 const totalPages = computed(() =>
  Math.ceil(props.totalItems / props.itemsPerPage)
@@ -45,27 +43,21 @@ const changePage = newPage => {
 };

 const currentPageInformation = computed(() => {
-  const translationKey = props.currentPageInfo || 'PAGINATION_FOOTER.SHOWING';
  return t(
-    translationKey,
+    props.currentPageInfo ? props.currentPageInfo : 'PAGINATION_FOOTER.SHOWING',
    {
-      startItem: formatFullNumber(startItem.value),
-      endItem: formatFullNumber(endItem.value),
-      totalItems: formatCompactNumber(props.totalItems),
-    },
-    Number(props.totalItems)
+      startItem: startItem.value,
+      endItem: endItem.value,
+      totalItems: props.totalItems,
+    }
  );
 });

 const pageInfo = computed(() => {
-  return t(
-    'PAGINATION_FOOTER.CURRENT_PAGE_INFO',
-    {
-      currentPage: '',
-      totalPages: formatCompactNumber(totalPages.value),
-    },
-    Number(totalPages.value)
-  );
+  return t('PAGINATION_FOOTER.CURRENT_PAGE_INFO', {
+    currentPage: '',
+    totalPages: totalPages.value,
+  });
 });
 </script>

@@ -99,11 +91,9 @@ const pageInfo = computed(() => {
      />
      <div class="inline-flex items-center gap-2 text-sm text-n-slate-11">
        <span class="px-3 tabular-nums py-0.5 bg-n-alpha-black2 rounded-md">
-          {{ formatFullNumber(currentPage) }}
-        </span>
-        <span class="truncate">
-          {{ pageInfo }}
+          {{ currentPage }}
        </span>
+        <span class="truncate">{{ pageInfo }}</span>
      </div>
      <Button
        icon="i-lucide-chevron-right"
@@ -1,21 +1,19 @@
 <script setup>
-import { h, ref, computed, onMounted } from 'vue';
+import { h, computed, onMounted } from 'vue';
 import { provideSidebarContext } from './provider';
 import { useAccount } from 'dashboard/composables/useAccount';
 import { useKbd } from 'dashboard/composables/utils/useKbd';
 import { useMapGetter } from 'dashboard/composables/store';
 import { useStore } from 'vuex';
 import { useI18n } from 'vue-i18n';
+import { useStorage } from '@vueuse/core';
 import { useSidebarKeyboardShortcuts } from './useSidebarKeyboardShortcuts';
 import { vOnClickOutside } from '@vueuse/components';
-import { emitter } from 'shared/helpers/mitt';
-import { BUS_EVENTS } from 'shared/constants/busEvents';

 import Button from 'dashboard/components-next/button/Button.vue';
 import SidebarGroup from './SidebarGroup.vue';
 import SidebarProfileMenu from './SidebarProfileMenu.vue';
 import SidebarChangelogCard from './SidebarChangelogCard.vue';
-import YearInReviewBanner from '../year-in-review/YearInReviewBanner.vue';
 import ChannelLeaf from './ChannelLeaf.vue';
 import SidebarAccountSwitcher from './SidebarAccountSwitcher.vue';
 import Logo from 'next/icon/Logo.vue';
@@ -54,7 +52,14 @@ const toggleShortcutModalFn = show => {

 useSidebarKeyboardShortcuts(toggleShortcutModalFn);

-const expandedItem = ref(null);
+// We're using localStorage to store the expanded item in the sidebar
+// This helps preserve context when navigating between portal and dashboard layouts
+// and also when the user refreshes the page
+const expandedItem = useStorage(
+  'next-sidebar-expanded-item',
+  null,
+  sessionStorage
+);

 const setExpandedItem = name => {
  expandedItem.value = expandedItem.value === name ? null : name;
@@ -91,15 +96,6 @@ const closeMobileSidebar = () => {
  emit('closeMobileSidebar');
 };

-const onComposeOpen = toggleFn => {
-  toggleFn();
-  emitter.emit(BUS_EVENTS.NEW_CONVERSATION_MODAL, true);
-};
-
-const onComposeClose = () => {
-  emitter.emit(BUS_EVENTS.NEW_CONVERSATION_MODAL, false);
-};
-
 const newReportRoutes = () => [
  {
    name: 'Reports Agent',
@@ -485,12 +481,6 @@ const menuItems = computed(() => {
          icon: 'i-lucide-briefcase',
          to: accountScopedRoute('general_settings_index'),
        },
-        // {
-        //   name: 'Settings Captain',
-        //   label: t('SIDEBAR.CAPTAIN_AI'),
-        //   icon: 'i-woot-captain',
-        //   to: accountScopedRoute('captain_settings_index'),
-        // },
        {
          name: 'Settings Agents',
          label: t('SIDEBAR.AGENTS'),
@@ -633,14 +623,14 @@ const menuItems = computed(() => {
            {{ searchShortcut }}
          </span>
        </RouterLink>
-        <ComposeConversation align-position="right" @close="onComposeClose">
+        <ComposeConversation align-position="right">
          <template #trigger="{ toggle }">
            <Button
              icon="i-lucide-pen-line"
              color="slate"
              size="sm"
              class="!h-7 !bg-n-solid-3 dark:!bg-n-black/30 !outline-n-weak !text-n-slate-11"
-              @click="onComposeOpen(toggle)"
+              @click="toggle"
            />
          </template>
        </ComposeConversation>
@@ -661,7 +651,6 @@ const menuItems = computed(() => {
      <div
        class="pointer-events-none absolute inset-x-0 -top-[31px] h-8 bg-gradient-to-t from-n-solid-2 to-transparent"
      />
-      <YearInReviewBanner />
      <SidebarChangelogCard
        v-if="isOnChatwootCloud && !isACustomBrandedInstance"
      />
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, onMounted, watch, nextTick } from 'vue';
+import { computed, onMounted, nextTick } from 'vue';
 import { useSidebarContext } from './provider';
 import { useRoute, useRouter } from 'vue-router';
 import Policy from 'dashboard/components/policy.vue';
@@ -126,16 +126,6 @@ onMounted(async () => {
    setExpandedItem(props.name);
  }
 });
-
-watch(
-  hasActiveChild,
-  hasNewActiveChild => {
-    if (hasNewActiveChild && !isExpanded.value) {
-      setExpandedItem(props.name);
-    }
-  },
-  { once: true }
-);
 </script>

 <!-- eslint-disable-next-line vue/no-root-v-if -->
@@ -1,13 +1,11 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import Auth from 'dashboard/api/auth';
 import { useMapGetter } from 'dashboard/composables/store';
 import { useI18n } from 'vue-i18n';
-import { useUISettings } from 'dashboard/composables/useUISettings';
 import Avatar from 'next/avatar/Avatar.vue';
 import SidebarProfileMenuStatus from './SidebarProfileMenuStatus.vue';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
-import YearInReviewModal from 'dashboard/components-next/year-in-review/YearInReviewModal.vue';

 import {
  DropdownContainer,
@@ -24,7 +22,6 @@ defineOptions({
 });

 const { t } = useI18n();
-const { uiSettings } = useUISettings();

 const currentUser = useMapGetter('getCurrentUser');
 const currentUserAvailability = useMapGetter('getCurrentUserAvailability');
@@ -34,29 +31,6 @@ const isFeatureEnabledonAccount = useMapGetter(
  'accounts/isFeatureEnabledonAccount'
 );

-const showYearInReviewModal = ref(false);
-
-const bannerClosedKey = computed(() => {
-  return `yir_closed_${accountId.value}_2025`;
-});
-
-const isBannerClosed = computed(() => {
-  return uiSettings.value?.[bannerClosedKey.value] === true;
-});
-
-const showYearInReviewMenuItem = computed(() => {
-  return isBannerClosed.value;
-});
-
-const openYearInReviewModal = () => {
-  showYearInReviewModal.value = true;
-  emit('close');
-};
-
-const closeYearInReviewModal = () => {
-  showYearInReviewModal.value = false;
-};
-
 const showChatSupport = computed(() => {
  return (
    isFeatureEnabledonAccount.value(
@@ -68,13 +42,6 @@ const showChatSupport = computed(() => {

 const menuItems = computed(() => {
  return [
-    {
-      show: showYearInReviewMenuItem.value,
-      showOnCustomBrandedInstance: false,
-      label: t('SIDEBAR_ITEMS.YEAR_IN_REVIEW'),
-      icon: 'i-lucide-gift',
-      click: openYearInReviewModal,
-    },
    {
      show: showChatSupport.value,
      showOnCustomBrandedInstance: false,
@@ -190,9 +157,4 @@ const allowedMenuItems = computed(() => {
      </template>
    </DropdownBody>
  </DropdownContainer>
-
-  <YearInReviewModal
-    :show="showYearInReviewModal"
-    @close="closeYearInReviewModal"
-  />
 </template>
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, onMounted, nextTick, watch } from 'vue';
+import { computed, ref, onMounted, nextTick } from 'vue';
 import { useResizeObserver } from '@vueuse/core';

 const props = defineProps({
@@ -31,24 +31,20 @@ const enableTransition = ref(false);
 const activeElement = computed(() => tabRefs.value[activeTab.value]);

 const updateIndicator = () => {
-  nextTick(() => {
-    if (!activeElement.value) return;
+  if (!activeElement.value) return;

-    indicatorStyle.value = {
-      left: `${activeElement.value.offsetLeft}px`,
-      width: `${activeElement.value.offsetWidth}px`,
-    };
-  });
+  indicatorStyle.value = {
+    left: `${activeElement.value.offsetLeft}px`,
+    width: `${activeElement.value.offsetWidth}px`,
+  };
 };

-useResizeObserver(activeElement, updateIndicator);
-
-// Watch for prop/tabs changes to update indicator position
-watch([() => props.initialActiveTab, () => props.tabs], updateIndicator, {
-  immediate: true,
+useResizeObserver(activeElement, () => {
+  if (enableTransition.value || !activeElement.value) updateIndicator();
 });

 onMounted(() => {
+  updateIndicator();
  nextTick(() => {
    enableTransition.value = true;
  });
@@ -70,7 +66,7 @@ const showDivider = index => {

 <template>
  <div
-    class="relative flex items-center h-8 rounded-lg bg-n-alpha-1 dark:bg-n-solid-1 w-fit transition-all duration-200 ease-out has-[button:active]:scale-[1.01]"
+    class="relative flex items-center h-8 rounded-lg bg-n-alpha-1 w-fit transition-all duration-200 ease-out has-[button:active]:scale-[1.01]"
  >
    <div
      class="absolute rounded-lg bg-n-solid-active shadow-sm pointer-events-none h-8 outline-1 outline outline-n-container inset-y-0"
@@ -1,239 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { toPng } from 'html-to-image';
-
-const props = defineProps({
-  show: {
-    type: Boolean,
-    default: false,
-  },
-  slideElement: {
-    type: Object,
-    default: null,
-  },
-  slideBackground: {
-    type: String,
-    required: true,
-  },
-  year: {
-    type: [Number, String],
-    required: true,
-  },
-});
-
-const emit = defineEmits(['close']);
-
-const { t } = useI18n();
-
-const isGenerating = ref(false);
-const shareImageUrl = ref(null);
-
-const generateImage = async () => {
-  if (!props.slideElement) return;
-
-  isGenerating.value = true;
-  try {
-    let slideElement = props.slideElement;
-
-    if (slideElement && '$el' in slideElement) {
-      slideElement = slideElement.$el;
-    }
-
-    if (!slideElement) {
-      // eslint-disable-next-line no-console
-      console.error('No slide element found');
-      return;
-    }
-
-    const colorMap = {
-      'bg-[#5BD58A]': '#5BD58A',
-      'bg-[#60a5fa]': '#60a5fa',
-      'bg-[#fb923c]': '#fb923c',
-      'bg-[#f87171]': '#f87171',
-      'bg-[#fbbf24]': '#fbbf24',
-    };
-    const bgColor = colorMap[props.slideBackground] || '#ffffff';
-
-    const dataUrl = await toPng(slideElement, {
-      pixelRatio: 1.2,
-      backgroundColor: bgColor,
-      // Skip font/CSS embedding to avoid CORS issues with CDN stylesheets
-      // See: https://github.com/bubkoo/html-to-image/issues/49#issuecomment-762222100
-      fontEmbedCSS: '',
-      cacheBust: true,
-    });
-
-    const img = new Image();
-    img.src = dataUrl;
-    await new Promise((resolve, reject) => {
-      img.onload = resolve;
-      img.onerror = reject;
-    });
-
-    const finalCanvas = document.createElement('canvas');
-    const borderSize = 20;
-    const bottomPadding = 50;
-
-    finalCanvas.width = img.width + borderSize * 2;
-    finalCanvas.height = img.height + borderSize * 2 + bottomPadding;
-
-    const ctx = finalCanvas.getContext('2d');
-
-    ctx.fillStyle = 'white';
-    ctx.fillRect(0, 0, finalCanvas.width, finalCanvas.height);
-
-    ctx.drawImage(img, borderSize, borderSize);
-
-    ctx.fillStyle = '#1f2d3d';
-    ctx.font = 'normal 16px system-ui, -apple-system, sans-serif';
-    ctx.textAlign = 'left';
-    ctx.fillText(
-      t('YEAR_IN_REVIEW.SHARE_MODAL.BRANDING'),
-      borderSize,
-      img.height + borderSize + 35
-    );
-
-    const logo = new Image();
-    logo.src = '/brand-assets/logo.svg';
-    await new Promise(resolve => {
-      logo.onload = resolve;
-    });
-
-    const logoHeight = 30;
-    const logoWidth = (logo.width / logo.height) * logoHeight;
-    const logoX = finalCanvas.width - borderSize - logoWidth;
-    const logoY = img.height + borderSize + 15;
-
-    ctx.drawImage(logo, logoX, logoY, logoWidth, logoHeight);
-
-    shareImageUrl.value = finalCanvas.toDataURL('image/png');
-  } catch (err) {
-    // Handle errors silently for now
-    // eslint-disable-next-line no-console
-    console.error('Failed to generate image:', err);
-  } finally {
-    isGenerating.value = false;
-  }
-};
-
-const downloadImage = () => {
-  if (!shareImageUrl.value) return;
-
-  const link = document.createElement('a');
-  link.href = shareImageUrl.value;
-  link.download = `chatwoot-year-in-review-${props.year}.png`;
-  link.click();
-};
-
-const shareImage = async () => {
-  if (!shareImageUrl.value) return;
-
-  try {
-    const response = await fetch(shareImageUrl.value);
-    const blob = await response.blob();
-    const file = new File([blob], `chatwoot-year-in-review-${props.year}.png`, {
-      type: 'image/png',
-    });
-
-    if (
-      navigator.share &&
-      navigator.canShare &&
-      navigator.canShare({ files: [file] })
-    ) {
-      await navigator.share({
-        title: t('YEAR_IN_REVIEW.SHARE_MODAL.SHARE_TITLE', {
-          year: props.year,
-        }),
-        text: t('YEAR_IN_REVIEW.SHARE_MODAL.SHARE_TEXT', { year: props.year }),
-        files: [file],
-      });
-      return;
-    }
-
-    downloadImage();
-  } catch (err) {
-    // Fallback to download if sharing fails
-    downloadImage();
-  }
-};
-
-const close = () => {
-  shareImageUrl.value = null;
-  emit('close');
-};
-
-const handleOpen = async () => {
-  if (props.show && !shareImageUrl.value) {
-    await generateImage();
-  }
-};
-
-defineExpose({ handleOpen });
-</script>
-
-<template>
-  <Teleport to="body">
-    <div
-      v-if="show"
-      class="fixed inset-0 bg-black bg-opacity-90 flex items-center justify-center z-[10001]"
-      @click="close"
-    >
-      <div v-if="isGenerating" class="flex items-center justify-center">
-        <div class="text-center">
-          <div
-            class="inline-block w-12 h-12 border-4 rounded-full border-white border-t-transparent animate-spin"
-          />
-          <p class="mt-4 text-sm text-white">
-            {{ t('YEAR_IN_REVIEW.SHARE_MODAL.PREPARING') }}
-          </p>
-        </div>
-      </div>
-
-      <div
-        v-else-if="shareImageUrl"
-        class="max-w-2xl w-full mx-4 flex flex-col gap-6 bg-slate-800 rounded-2xl p-6"
-        @click.stop
-      >
-        <div class="flex items-center justify-between">
-          <h3 class="text-xl font-medium text-white">
-            {{ t('YEAR_IN_REVIEW.SHARE_MODAL.TITLE') }}
-          </h3>
-          <button
-            class="w-10 h-10 flex items-center justify-center rounded-full text-white hover:bg-white hover:bg-opacity-20 transition-colors"
-            @click="close"
-          >
-            <i class="i-lucide-x w-6 h-6" />
-          </button>
-        </div>
-
-        <div>
-          <img
-            :src="shareImageUrl"
-            alt="Year in Review"
-            class="w-full h-auto"
-          />
-        </div>
-
-        <div class="flex gap-3">
-          <button
-            class="flex-[2] px-4 py-3 flex items-center justify-center gap-2 rounded-full text-white bg-white bg-opacity-20 hover:bg-opacity-30 transition-colors"
-            @click="downloadImage"
-          >
-            <i class="i-lucide-download w-5 h-5" />
-            <span class="text-sm font-medium">{{
-              t('YEAR_IN_REVIEW.SHARE_MODAL.DOWNLOAD')
-            }}</span>
-          </button>
-
-          <button
-            class="w-10 h-10 flex items-center justify-center rounded-full text-white bg-white bg-opacity-20 hover:bg-opacity-30 transition-colors"
-            @click="shareImage"
-          >
-            <i class="i-lucide-share-2 w-5 h-5" />
-          </button>
-        </div>
-      </div>
-    </div>
-  </Teleport>
-</template>
@@ -1,88 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useUISettings } from 'dashboard/composables/useUISettings';
-import { useStoreGetters } from 'dashboard/composables/store';
-import YearInReviewModal from './YearInReviewModal.vue';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-
-const yearInReviewBannerImage =
-  '/assets/images/dashboard/year-in-review/year-in-review-sidebar.png';
-const { t } = useI18n();
-const { uiSettings, updateUISettings } = useUISettings();
-const getters = useStoreGetters();
-const showModal = ref(false);
-const modalRef = ref(null);
-
-const currentYear = 2025;
-
-const isACustomBrandedInstance =
-  getters['globalConfig/isACustomBrandedInstance'];
-
-const bannerClosedKey = computed(() => {
-  const accountId = getters.getCurrentAccountId.value;
-  return `yir_closed_${accountId}_${currentYear}`;
-});
-
-const isBannerClosed = computed(() => {
-  return uiSettings.value?.[bannerClosedKey.value] === true;
-});
-
-const shouldShowBanner = computed(
-  () => !isBannerClosed.value && !isACustomBrandedInstance.value
-);
-
-const openModal = () => {
-  showModal.value = true;
-};
-
-const closeModal = () => {
-  showModal.value = false;
-};
-
-const closeBanner = event => {
-  event.stopPropagation();
-  updateUISettings({ [bannerClosedKey.value]: true });
-};
-</script>
-
-<template>
-  <div v-if="shouldShowBanner" class="relative">
-    <div
-      class="mx-2 my-1 p-3 bg-n-iris-9 rounded-lg cursor-pointer hover:shadow-md transition-all"
-      @click="openModal"
-    >
-      <div class="flex items-start justify-between gap-2 mb-3">
-        <span
-          class="text-sm font-semibold text-white leading-tight tracking-tight flex-1"
-        >
-          {{ t('YEAR_IN_REVIEW.BANNER.TITLE', { year: currentYear }) }}
-        </span>
-        <button
-          class="inline-flex items-center justify-center rounded hover:bg-white hover:bg-opacity-20 transition-colors p-0"
-          @click="closeBanner"
-        >
-          <Icon
-            icon="i-lucide-x size-4 mt-0.5 text-n-slate-1 dark:text-n-slate-12"
-          />
-        </button>
-      </div>
-
-      <div class="flex flex-col gap-3">
-        <img
-          :src="yearInReviewBannerImage"
-          alt="Year in Review"
-          class="w-full h-auto rounded"
-        />
-        <button
-          class="w-full px-3 py-2 bg-white text-n-iris-9 text-xs font-medium rounded-mdtracking-tight"
-          @click.stop="openModal"
-        >
-          {{ t('YEAR_IN_REVIEW.BANNER.BUTTON') }}
-        </button>
-      </div>
-    </div>
-
-    <YearInReviewModal ref="modalRef" :show="showModal" @close="closeModal" />
-  </div>
-</template>
@@ -1,389 +0,0 @@
-<script setup>
-import { ref, computed, watch, nextTick } from 'vue';
-import { useI18n } from 'vue-i18n';
-import YearInReviewAPI from 'dashboard/api/yearInReview';
-import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
-import { useUISettings } from 'dashboard/composables/useUISettings';
-import { useStoreGetters } from 'dashboard/composables/store';
-import { useTrack } from 'dashboard/composables';
-import { YEAR_IN_REVIEW_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
-import IntroSlide from './slides/IntroSlide.vue';
-import ConversationsSlide from './slides/ConversationsSlide.vue';
-import BusiestDaySlide from './slides/BusiestDaySlide.vue';
-import PersonalitySlide from './slides/PersonalitySlide.vue';
-import ThankYouSlide from './slides/ThankYouSlide.vue';
-import ShareModal from './ShareModal.vue';
-
-const props = defineProps({
-  show: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const emit = defineEmits(['close']);
-
-const { t } = useI18n();
-const { uiSettings } = useUISettings();
-const getters = useStoreGetters();
-const isOpen = ref(false);
-const currentSlide = ref(0);
-const yearData = ref(null);
-const isLoading = ref(false);
-const error = ref(null);
-const slideRefs = ref([]);
-const showShareModal = ref(false);
-const shareModalRef = ref(null);
-const drumrollAudio = ref(null);
-
-const hasConversations = computed(() => {
-  return yearData.value?.total_conversations > 0;
-});
-
-const totalSlides = computed(() => {
-  if (!hasConversations.value) {
-    return 3;
-  }
-  return 5;
-});
-
-const slideIndexMap = computed(() => {
-  if (!hasConversations.value) {
-    return [0, 1, 4];
-  }
-  return [0, 1, 2, 3, 4];
-});
-
-const currentVisualSlide = computed(() => {
-  return slideIndexMap.value.indexOf(currentSlide.value);
-});
-
-const slideBackgrounds = [
-  'bg-[#5BD58A]',
-  'bg-[#60a5fa]',
-  'bg-[#fb923c]',
-  'bg-[#f87171]',
-  'bg-[#fbbf24]',
-];
-
-const playDrumroll = () => {
-  try {
-    if (!drumrollAudio.value) {
-      drumrollAudio.value = new Audio('/audio/dashboard/drumroll.mp3');
-      drumrollAudio.value.volume = 0.5;
-    }
-
-    drumrollAudio.value.currentTime = 0;
-    drumrollAudio.value.play().catch(err => {
-      // eslint-disable-next-line no-console
-      console.log('Could not play drumroll:', err);
-    });
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.log('Error playing drumroll:', err);
-  }
-};
-
-const fetchYearInReviewData = async () => {
-  const year = 2025;
-  const accountId = getters.getCurrentAccountId.value;
-  const cacheKey = `year_in_review_${accountId}_${year}`;
-
-  const cachedData = uiSettings.value?.[cacheKey];
-
-  if (cachedData) {
-    yearData.value = cachedData;
-    return;
-  }
-
-  isLoading.value = true;
-  error.value = null;
-  try {
-    const response = await YearInReviewAPI.get(year);
-    yearData.value = response.data;
-  } catch (err) {
-    error.value = err.message;
-  } finally {
-    isLoading.value = false;
-  }
-};
-
-const nextSlide = () => {
-  if (currentSlide.value < 4) {
-    useTrack(YEAR_IN_REVIEW_EVENTS.NEXT_CLICKED);
-    if (!hasConversations.value && currentSlide.value === 1) {
-      currentSlide.value = 4;
-    } else {
-      currentSlide.value += 1;
-    }
-  }
-};
-
-const previousSlide = () => {
-  if (currentSlide.value > 0) {
-    if (!hasConversations.value && currentSlide.value === 4) {
-      currentSlide.value = 1;
-    } else {
-      currentSlide.value -= 1;
-    }
-  }
-};
-
-const goToSlide = visualIndex => {
-  currentSlide.value = slideIndexMap.value[visualIndex];
-};
-
-const close = () => {
-  currentSlide.value = 0;
-  isOpen.value = false;
-  yearData.value = null;
-  isLoading.value = false;
-  error.value = null;
-
-  emit('close');
-};
-
-const open = () => {
-  useTrack(YEAR_IN_REVIEW_EVENTS.MODAL_OPENED);
-  isOpen.value = true;
-  fetchYearInReviewData();
-  playDrumroll();
-};
-
-const currentSlideBackground = computed(
-  () => slideBackgrounds[currentSlide.value]
-);
-
-const shareCurrentSlide = async () => {
-  useTrack(YEAR_IN_REVIEW_EVENTS.SHARE_CLICKED);
-  showShareModal.value = true;
-  nextTick(() => {
-    if (shareModalRef.value) {
-      shareModalRef.value.handleOpen();
-    }
-  });
-};
-
-const closeShareModal = () => {
-  showShareModal.value = false;
-};
-
-const keyboardEvents = {
-  Escape: { action: close },
-  ArrowLeft: { action: previousSlide },
-  ArrowRight: { action: nextSlide },
-};
-
-useKeyboardEvents(keyboardEvents);
-
-defineExpose({ open, close });
-
-watch(
-  () => props.show,
-  newValue => {
-    if (newValue) {
-      open();
-    }
-  }
-);
-</script>
-
-<template>
-  <Teleport to="body">
-    <div
-      v-if="isOpen"
-      class="fixed inset-0 z-[9999] bg-black font-interDisplay"
-    >
-      <div class="relative w-full h-full overflow-hidden">
-        <div
-          v-if="isLoading"
-          class="flex items-center justify-center w-full h-full bg-n-slate-2"
-        >
-          <div class="text-center">
-            <div
-              class="inline-block w-12 h-12 border-4 rounded-full border-n-slate-6 border-t-n-slate-11 animate-spin"
-            />
-            <p class="mt-4 text-sm text-n-slate-11">
-              {{ t('YEAR_IN_REVIEW.LOADING') }}
-            </p>
-          </div>
-        </div>
-
-        <div
-          v-else-if="error"
-          class="flex items-center justify-center w-full h-full bg-n-slate-2"
-        >
-          <div class="text-center">
-            <p class="text-lg font-semibold text-red-600">
-              {{ t('YEAR_IN_REVIEW.ERROR') }}
-            </p>
-            <p class="mt-2 text-sm text-n-slate-11">{{ error }}</p>
-            <button
-              class="mt-4 px-4 py-2 rounded-full text-n-slate-12 dark:text-n-slate-1 bg-white bg-opacity-20 hover:bg-opacity-30 transition-colors"
-              @click="close"
-            >
-              <span class="text-sm font-medium">{{
-                t('YEAR_IN_REVIEW.CLOSE')
-              }}</span>
-            </button>
-          </div>
-        </div>
-
-        <div
-          v-else-if="yearData"
-          class="relative w-full h-full"
-          :class="currentSlideBackground"
-        >
-          <Transition
-            enter-active-class="transition-all duration-300 ease-out"
-            leave-active-class="transition-all duration-300 ease-out"
-            enter-from-class="opacity-0 translate-x-[30px]"
-            leave-to-class="opacity-0 -translate-x-[30px]"
-          >
-            <IntroSlide
-              v-if="currentSlide === 0"
-              :key="0"
-              :ref="el => (slideRefs[0] = el)"
-              :year="yearData.year"
-            />
-          </Transition>
-
-          <Transition
-            enter-active-class="transition-all duration-300 ease-out"
-            leave-active-class="transition-all duration-300 ease-out"
-            enter-from-class="opacity-0 translate-x-[30px]"
-            leave-to-class="opacity-0 -translate-x-[30px]"
-          >
-            <ConversationsSlide
-              v-if="currentSlide === 1"
-              :key="1"
-              :ref="el => (slideRefs[1] = el)"
-              :total-conversations="yearData.total_conversations"
-            />
-          </Transition>
-
-          <Transition
-            enter-active-class="transition-all duration-300 ease-out"
-            leave-active-class="transition-all duration-300 ease-out"
-            enter-from-class="opacity-0 translate-x-[30px]"
-            leave-to-class="opacity-0 -translate-x-[30px]"
-          >
-            <BusiestDaySlide
-              v-if="
-                currentSlide === 2 && hasConversations && yearData.busiest_day
-              "
-              :key="2"
-              :ref="el => (slideRefs[2] = el)"
-              :busiest-day="yearData.busiest_day"
-            />
-          </Transition>
-
-          <Transition
-            enter-active-class="transition-all duration-300 ease-out"
-            leave-active-class="transition-all duration-300 ease-out"
-            enter-from-class="opacity-0 translate-x-[30px]"
-            leave-to-class="opacity-0 -translate-x-[30px]"
-          >
-            <PersonalitySlide
-              v-if="
-                currentSlide === 3 &&
-                hasConversations &&
-                yearData.support_personality
-              "
-              :key="3"
-              :ref="el => (slideRefs[3] = el)"
-              :support-personality="yearData.support_personality"
-            />
-          </Transition>
-
-          <Transition
-            enter-active-class="transition-all duration-300 ease-out"
-            leave-active-class="transition-all duration-300 ease-out"
-            enter-from-class="opacity-0 translate-x-[30px]"
-            leave-to-class="opacity-0 -translate-x-[30px]"
-          >
-            <ThankYouSlide
-              v-if="currentSlide === 4"
-              :key="4"
-              :ref="el => (slideRefs[4] = el)"
-              :year="yearData.year"
-            />
-          </Transition>
-
-          <div
-            class="absolute bottom-8 left-0 right-0 flex items-center justify-between px-8"
-          >
-            <button
-              v-if="currentSlide > 0"
-              class="px-4 py-2 flex items-center gap-2 rounded-full text-n-slate-12 dark:text-n-slate-1 bg-white bg-opacity-20 hover:bg-opacity-30 transition-colors"
-              @click="previousSlide"
-            >
-              <i class="i-lucide-chevron-left w-5 h-5" />
-              <span class="text-sm font-medium">
-                {{ t('YEAR_IN_REVIEW.NAVIGATION.PREVIOUS') }}
-              </span>
-            </button>
-            <div v-else class="w-20" />
-
-            <div class="flex gap-2">
-              <button
-                v-for="index in totalSlides"
-                :key="index"
-                class="w-2 h-2 rounded-full transition-all"
-                :class="
-                  currentVisualSlide === index - 1
-                    ? 'bg-white w-8'
-                    : 'bg-white bg-opacity-50'
-                "
-                @click="goToSlide(index - 1)"
-              />
-            </div>
-
-            <button
-              class="px-4 py-2 flex items-center gap-2 rounded-full text-n-slate-12 dark:text-n-slate-1 bg-white bg-opacity-20 hover:bg-opacity-30 transition-colors"
-              :class="{ invisible: currentVisualSlide === totalSlides - 1 }"
-              @click="nextSlide"
-            >
-              <span
-                v-if="currentVisualSlide < totalSlides - 1"
-                class="text-sm font-medium"
-              >
-                {{ t('YEAR_IN_REVIEW.NAVIGATION.NEXT') }}
-              </span>
-              <i
-                v-if="currentVisualSlide < totalSlides - 1"
-                class="i-lucide-chevron-right w-5 h-5"
-              />
-            </button>
-          </div>
-
-          <button
-            class="absolute top-4 left-4 px-4 py-2 flex items-center gap-2 rounded-full text-n-slate-12 dark:text-n-slate-1 bg-white bg-opacity-20 hover:bg-opacity-30 transition-colors"
-            @click="shareCurrentSlide"
-          >
-            <i class="i-lucide-share-2 w-5 h-5" />
-            <span class="text-sm font-medium">{{
-              t('YEAR_IN_REVIEW.NAVIGATION.SHARE')
-            }}</span>
-          </button>
-
-          <button
-            class="absolute top-4 right-4 w-10 h-10 flex items-center justify-center rounded-full text-n-slate-12 dark:text-n-slate-1 hover:bg-white hover:bg-opacity-20 transition-colors"
-            @click="close"
-          >
-            <i class="i-lucide-x w-6 h-6" />
-          </button>
-        </div>
-      </div>
-    </div>
-
-    <ShareModal
-      ref="shareModalRef"
-      :show="showShareModal"
-      :slide-element="slideRefs[currentSlide]"
-      :slide-background="currentSlideBackground"
-      :year="yearData?.year"
-      @close="closeShareModal"
-    />
-  </Teleport>
-</template>
@@ -1,76 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-const props = defineProps({
-  busiestDay: {
-    type: Object,
-    required: true,
-  },
-});
-
-const { t } = useI18n();
-
-const coffeeImage =
-  '/assets/images/dashboard/year-in-review/third-frame-coffee.png';
-const doubleQuotesImage =
-  '/assets/images/dashboard/year-in-review/double-quotes.png';
-
-const performanceHelperText = computed(() => {
-  const count = props.busiestDay.count;
-  if (count <= 5) return t('YEAR_IN_REVIEW.BUSIEST_DAY.COMPARISON.0_5');
-  if (count <= 10) return t('YEAR_IN_REVIEW.BUSIEST_DAY.COMPARISON.5_10');
-  if (count <= 25) return t('YEAR_IN_REVIEW.BUSIEST_DAY.COMPARISON.10_25');
-  if (count <= 50) return t('YEAR_IN_REVIEW.BUSIEST_DAY.COMPARISON.25_50');
-  if (count <= 100) return t('YEAR_IN_REVIEW.BUSIEST_DAY.COMPARISON.50_100');
-  if (count <= 500) return t('YEAR_IN_REVIEW.BUSIEST_DAY.COMPARISON.100_500');
-  return t('YEAR_IN_REVIEW.BUSIEST_DAY.COMPARISON.500_PLUS');
-});
-</script>
-
-<template>
-  <div class="absolute inset-0 flex items-center justify-center px-8 md:px-32">
-    <div class="flex flex-col gap-4 w-full max-w-3xl">
-      <div class="flex items-center justify-center flex-1">
-        <div class="flex items-center justify-between gap-6 flex-1 md:gap-16">
-          <div class="text-white flex gap-2 flex-col">
-            <div class="text-2xl lg:text-3xl xl:text-4xl tracking-tight">
-              {{ t('YEAR_IN_REVIEW.BUSIEST_DAY.TITLE') }}
-            </div>
-            <div class="text-6xl md:text-8xl lg:text-[140px] tracking-tighter">
-              {{ busiestDay.date }}
-            </div>
-          </div>
-
-          <img
-            :src="coffeeImage"
-            alt="Coffee"
-            class="w-auto h-32 md:h-56 lg:h-72"
-          />
-        </div>
-      </div>
-
-      <div class="flex flex-col gap-2 flex-1">
-        <div class="flex items-center justify-center gap-3 md:gap-8">
-          <img
-            :src="doubleQuotesImage"
-            alt="Quote"
-            class="w-8 h-8 md:w-12 md:h-12 lg:w-16 lg:h-16"
-          />
-          <div class="flex-1">
-            <p
-              class="text-xl md:text-3xl lg:text-4xl font-medium tracking-[-0.2px] text-n-slate-12 dark:text-n-slate-1"
-            >
-              {{
-                t('YEAR_IN_REVIEW.BUSIEST_DAY.MESSAGE', {
-                  count: busiestDay.count,
-                })
-              }}
-              {{ performanceHelperText }}
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
@@ -1,94 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-const props = defineProps({
-  totalConversations: {
-    type: Number,
-    required: true,
-  },
-});
-
-const { t } = useI18n();
-
-const cloudImage =
-  '/assets/images/dashboard/year-in-review/second-frame-cloud-icon.png';
-const doubleQuotesImage =
-  '/assets/images/dashboard/year-in-review/double-quotes.png';
-
-const hasData = computed(() => {
-  return props.totalConversations > 0;
-});
-
-const formatNumber = num => {
-  if (num >= 100000) {
-    return '100k+';
-  }
-  return new Intl.NumberFormat().format(num);
-};
-
-const performanceHelperText = computed(() => {
-  if (!hasData.value) {
-    return t('YEAR_IN_REVIEW.CONVERSATIONS.FALLBACK');
-  }
-
-  const count = props.totalConversations;
-  if (count <= 50) return t('YEAR_IN_REVIEW.CONVERSATIONS.COMPARISON.0_50');
-  if (count <= 100) return t('YEAR_IN_REVIEW.CONVERSATIONS.COMPARISON.50_100');
-  if (count <= 500) return t('YEAR_IN_REVIEW.CONVERSATIONS.COMPARISON.100_500');
-  if (count <= 2000)
-    return t('YEAR_IN_REVIEW.CONVERSATIONS.COMPARISON.500_2000');
-  if (count <= 10000)
-    return t('YEAR_IN_REVIEW.CONVERSATIONS.COMPARISON.2000_10000');
-  return t('YEAR_IN_REVIEW.CONVERSATIONS.COMPARISON.10000_PLUS');
-});
-</script>
-
-<template>
-  <div
-    class="absolute inset-0 flex items-center justify-center px-8 md:px-32 py-20"
-  >
-    <div
-      class="flex flex-col gap-16"
-      :class="totalConversations > 100 ? 'max-w-4xl' : 'max-w-3xl'"
-    >
-      <div class="flex items-center justify-center flex-1">
-        <div
-          class="flex items-center justify-between gap-6 flex-1"
-          :class="totalConversations > 100 ? 'md:gap-16' : 'md:gap-8'"
-        >
-          <div class="text-white flex gap-3 flex-col">
-            <div class="text-2xl md:text-3xl lg:text-4xl tracking-tight">
-              {{ t('YEAR_IN_REVIEW.CONVERSATIONS.TITLE') }}
-            </div>
-            <div class="text-6xl md:text-8xl lg:text-[180px] tracking-tighter">
-              {{ formatNumber(totalConversations) }}
-            </div>
-            <div class="text-2xl md:text-3xl lg:text-4xl tracking-tight -mt-2">
-              {{ t('YEAR_IN_REVIEW.CONVERSATIONS.SUBTITLE') }}
-            </div>
-          </div>
-
-          <img
-            :src="cloudImage"
-            alt="Cloud"
-            class="w-auto h-32 md:h-56 lg:h-80 -mr-2"
-          />
-        </div>
-      </div>
-
-      <div class="flex items-center justify-center gap-3 md:gap-6">
-        <img
-          :src="doubleQuotesImage"
-          alt="Quote"
-          class="w-8 h-8 md:w-12 md:h-12 lg:w-16 lg:h-16"
-        />
-        <p
-          class="text-xl md:text-3xl lg:text-4xl font-medium tracking-[-0.2px] text-n-slate-12 dark:text-n-slate-1"
-        >
-          {{ performanceHelperText }}
-        </p>
-      </div>
-    </div>
-  </div>
-</template>
@@ -1,43 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-
-defineProps({
-  year: {
-    type: Number,
-    required: true,
-  },
-});
-
-const candlesImagePath =
-  '/assets/images/dashboard/year-in-review/first-frame-candles.png';
-
-const { t } = useI18n();
-</script>
-
-<template>
-  <div
-    class="absolute inset-0 flex flex-col items-center justify-center text-black px-8 md:px-16 lg:px-24 py-10 md:py-16 lg:py-20 bg-cover bg-center min-h-[700px]"
-    :style="{
-      backgroundImage: `url('/assets/images/dashboard/year-in-review/first-frame-bg.png')`,
-    }"
-  >
-    <div class="text-center max-w-3xl">
-      <h1
-        class="text-8xl md:text-9xl lg:text-[220px] font-semibold mb-4 md:mb-6 leading-none tracking-tight text-n-slate-12 dark:text-n-slate-1"
-      >
-        {{ year }}
-      </h1>
-      <h2
-        class="text-3xl md:text-4xl lg:text-5xl font-medium mb-12 md:mb-16 lg:mb-20 text-n-slate-12 dark:text-n-slate-1"
-      >
-        {{ t('YEAR_IN_REVIEW.TITLE') }}
-      </h2>
-    </div>
-
-    <img
-      :src="candlesImagePath"
-      alt="Candles"
-      class="absolute bottom-0 left-1/2 transform -translate-x-1/2 w-auto h-32 md:h-48 lg:h-64"
-    />
-  </div>
-</template>
@@ -1,99 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-const props = defineProps({
-  supportPersonality: {
-    type: Object,
-    required: true,
-  },
-});
-
-const { t } = useI18n();
-
-const clockImage =
-  '/assets/images/dashboard/year-in-review/fourth-frame-clock.png';
-const doubleQuotesImage =
-  '/assets/images/dashboard/year-in-review/double-quotes.png';
-
-const formatResponseTime = seconds => {
-  if (seconds < 60) {
-    return 'less than a minute';
-  }
-  if (seconds < 3600) {
-    const minutes = Math.floor(seconds / 60);
-    return minutes === 1 ? '1 minute' : `${minutes} minutes`;
-  }
-  if (seconds < 86400) {
-    const hours = Math.floor(seconds / 3600);
-    return hours === 1 ? '1 hour' : `${hours} hours`;
-  }
-  return 'more than a day';
-};
-
-const personality = computed(() => {
-  const seconds = props.supportPersonality.avg_response_time_seconds;
-  const minutes = seconds / 60;
-
-  if (minutes < 2) {
-    return 'Swift Helper';
-  }
-  if (minutes < 5) {
-    return 'Quick Responder';
-  }
-  if (minutes < 15) {
-    return 'Steady Support';
-  }
-  return 'Thoughtful Advisor';
-});
-
-const personalityMessage = computed(() => {
-  const seconds = props.supportPersonality.avg_response_time_seconds;
-  const time = formatResponseTime(seconds);
-
-  const personalityKeyMap = {
-    'Swift Helper': 'SWIFT_HELPER',
-    'Quick Responder': 'QUICK_RESPONDER',
-    'Steady Support': 'STEADY_SUPPORT',
-    'Thoughtful Advisor': 'THOUGHTFUL_ADVISOR',
-  };
-
-  const key = personalityKeyMap[personality.value];
-  if (!key) return '';
-
-  return t(`YEAR_IN_REVIEW.PERSONALITY.MESSAGES.${key}`, { time });
-});
-</script>
-
-<template>
-  <div class="absolute inset-0 flex items-center justify-center px-8 md:px-32">
-    <div class="flex flex-col gap-9 max-w-3xl">
-      <div class="mb-4 md:mb-6">
-        <img :src="clockImage" alt="Clock" class="w-auto h-28" />
-        <div class="flex items-center justify-start flex-1 mt-9">
-          <div class="text-n-slate-1 dark:text-n-slate-12 flex gap-3 flex-col">
-            <div class="text-2xl md:text-4xl tracking-tight">
-              {{ t('YEAR_IN_REVIEW.PERSONALITY.TITLE') }}
-            </div>
-            <div class="text-6xl md:text-7xl lg:text-8xl tracking-tighter">
-              {{ personality }}
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="flex items-center justify-center gap-3 md:gap-6">
-        <img
-          :src="doubleQuotesImage"
-          alt="Quote"
-          class="w-8 h-8 md:w-12 md:h-12 lg:w-16 lg:h-16"
-        />
-        <p
-          class="text-xl md:text-3xl lg:text-3xl font-medium tracking-[-0.2px] text-n-slate-12 dark:text-n-slate-1"
-        >
-          {{ personalityMessage }}
-        </p>
-      </div>
-    </div>
-  </div>
-</template>
@@ -1,43 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-
-defineProps({
-  year: {
-    type: Number,
-    required: true,
-  },
-});
-
-const { t } = useI18n();
-
-const signatureImage =
-  '/assets/images/dashboard/year-in-review/fifth-frame-signature.png';
-</script>
-
-<template>
-  <div
-    class="absolute inset-0 flex items-center justify-center px-8 md:px-32 py-20"
-  >
-    <div class="flex flex-col items-start max-w-4xl">
-      <div
-        class="text-3xl md:text-5xl lg:text-6xl font-bold tracking-tight !leading-tight text-n-slate-12 dark:text-n-slate-1"
-      >
-        {{ t('YEAR_IN_REVIEW.THANK_YOU.TITLE', { year }) }}
-      </div>
-      <div
-        class="text-xl lg:text-3xl mt-8 font-medium !leading-snug text-n-slate-12 dark:text-n-slate-1"
-      >
-        {{
-          t('YEAR_IN_REVIEW.THANK_YOU.MESSAGE', { nextYear: Number(year) + 1 })
-        }}
-      </div>
-      <div class="mt-12">
-        <img
-          :src="signatureImage"
-          alt="Chatwoot Team Signature"
-          class="w-auto h-8 md:h-10"
-        />
-      </div>
-    </div>
-  </div>
-</template>
@@ -23,10 +23,6 @@ const hasInstagramConfigured = computed(() => {
  return window.chatwootConfig?.instagramAppId;
 });

-const hasTiktokConfigured = computed(() => {
-  return window.chatwootConfig?.tiktokAppId;
-});
-
 const isActive = computed(() => {
  const { key } = props.channel;
  if (Object.keys(props.enabledFeatures).length === 0) {
@@ -48,10 +44,6 @@ const isActive = computed(() => {
    );
  }

-  if (key === 'tiktok') {
-    return props.enabledFeatures.channel_tiktok && hasTiktokConfigured.value;
-  }
-
  if (key === 'voice') {
    return props.enabledFeatures.channel_voice;
  }
@@ -65,7 +57,6 @@ const isActive = computed(() => {
    'telegram',
    'line',
    'instagram',
-    'tiktok',
    'voice',
  ].includes(key);
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vishnu Narayanan	ef19fcd8c0	fix: test switchlocale method directly instead of via http routing	2025-11-21 16:31:14 +05:30
Vishnu Narayanan	d261dfd394	fix: shopify and locale spec	2025-11-21 16:28:03 +05:30
Vishnu Narayanan	1b9673b272	fix: test switchlocale method directly instead of via http routing	2025-11-21 16:21:05 +05:30
@@ -1 +1 @@
 .12.0
 .5.1
@@ -1 +1 @@
 .9.2
 .8.0
@@ -1 +1 @@
 .5.0
 .4.3