Merge branch 'develop' into fix/CW-6859

app/builders/account_builder.rb

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

app/builders/agent_builder.rb

@@ -29,9 +29,8 @@ class AgentBuilder
     user = User.from_email(email)
     return user if user
 
-    @name = email.split('@').first if @name.blank?
     temp_password = "1!aA#{SecureRandom.alphanumeric(12)}"
-    User.create!(email: email, name: @name, password: temp_password, password_confirmation: temp_password)
+    User.create!(email: email, name: name, password: temp_password, password_confirmation: temp_password)
   end
 
   # Checks if the user needs confirmation.

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

@@ -5,7 +5,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   sort_on :phone_number, type: :string
   sort_on :last_activity_at, internal_name: :order_on_last_activity_at, type: :scope, scope_params: [:direction]
   sort_on :created_at, internal_name: :order_on_created_at, type: :scope, scope_params: [:direction]
-  sort_on :company_name, internal_name: :order_on_company_name, type: :scope, scope_params: [:direction]
+  sort_on :company, internal_name: :order_on_company_name, type: :scope, scope_params: [:direction]
   sort_on :city, internal_name: :order_on_city, type: :scope, scope_params: [:direction]
   sort_on :country, internal_name: :order_on_country_name, type: :scope, scope_params: [:direction]
 

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

@@ -61,8 +61,9 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
   end
 
   def process_attached_logo
-    blob = ActiveStorage::Blob.find_signed(params[:blob_id].to_s)
-    @portal.logo.attach(blob) if blob
+    blob_id = params[:blob_id]
+    blob = ActiveStorage::Blob.find_signed(blob_id)
+    @portal.logo.attach(blob)
   end
 
   private

app/controllers/api/v1/accounts_controller.rb

@@ -58,7 +58,6 @@ class Api::V1::AccountsController < Api::BaseController
     @account.assign_attributes(account_params.slice(:name, :locale, :domain, :support_email))
     @account.custom_attributes.merge!(custom_attributes_params)
     @account.settings.merge!(settings_params)
-    @account.custom_attributes.delete('onboarding_step') if @account.custom_attributes['onboarding_step'] == 'account_details'
     @account.custom_attributes['onboarding_step'] = 'invite_team' if @account.custom_attributes['onboarding_step'] == 'account_update'
     @account.save!
   end
@@ -72,10 +71,9 @@ class Api::V1::AccountsController < Api::BaseController
   private
 
   def enqueue_branding_enrichment
-    email = account_params[:email].presence || @user&.email
-    return if email.blank?
+    return if account_params[:email].blank?
 
-    Account::BrandingEnrichmentJob.perform_later(@account.id, email)
+    Account::BrandingEnrichmentJob.perform_later(@account.id, account_params[:email])
     Redis::Alfred.set(format(Redis::Alfred::ACCOUNT_ONBOARDING_ENRICHMENT, account_id: @account.id), '1', ex: 30)
   rescue StandardError => e
     # Enrichment is optional — never let queue/Redis failures abort signup
@@ -111,7 +109,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def custom_attributes_params
-    params.permit(:industry, :company_size, :timezone, :referral_source, :user_role)
+    params.permit(:industry, :company_size, :timezone)
   end
 
   def settings_params

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

@@ -2,8 +2,8 @@ class Api::V1::Profile::MfaController < Api::BaseController
   before_action :check_mfa_feature_available
   before_action :check_mfa_enabled, only: [:destroy, :backup_codes]
   before_action :check_mfa_disabled, only: [:create, :verify]
-  before_action :validate_password, only: [:destroy]
   before_action :validate_otp, only: [:verify, :backup_codes, :destroy]
+  before_action :validate_password, only: [:destroy]
 
   def show; end
 
@@ -48,8 +48,7 @@ class Api::V1::Profile::MfaController < Api::BaseController
   def validate_otp
     authenticated = Mfa::AuthenticationService.new(
       user: current_user,
-      otp_code: mfa_params[:otp_code],
-      backup_code: mfa_params[:backup_code]
+      otp_code: mfa_params[:otp_code]
     ).authenticate
 
     return if authenticated
@@ -64,6 +63,6 @@ class Api::V1::Profile::MfaController < Api::BaseController
   end
 
   def mfa_params
-    params.permit(:otp_code, :backup_code, :password)
+    params.permit(:otp_code, :password)
   end
 end

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

@@ -3,7 +3,7 @@ class Platform::Api::V1::AgentBotsController < PlatformController
   before_action :validate_platform_app_permissible, except: [:index, :create]
 
   def index
-    @resources = @platform_app.platform_app_permissibles.where(permissible_type: 'AgentBot').includes(:permissible)
+    @resources = @platform_app.platform_app_permissibles.where(permissible_type: 'AgentBot').all
   end
 
   def show; end

app/helpers/email_helper.rb

@@ -7,7 +7,7 @@ module EmailHelper
   def render_email_html(content)
     return '' if content.blank?
 
-    ChatwootMarkdownRenderer.new(content).render_message(hardbreaks: true).to_s
+    ChatwootMarkdownRenderer.new(content).render_message.to_s
   end
 
   # Raise a standard error if any email address is invalid

app/javascript/dashboard/App.vue

@@ -59,6 +59,7 @@ export default {
       isRTL: 'accounts/isRTL',
       currentUser: 'getCurrentUser',
       authUIFlags: 'getAuthUIFlags',
+      accountUIFlags: 'accounts/getUIFlags',
     }),
     hideOnOnboardingView() {
       return !isOnOnboardingView(this.$route);
@@ -106,9 +107,8 @@ export default {
       this.$store.dispatch('setActiveAccount', {
         accountId: this.currentAccountId,
       });
-      const account = this.getAccount(this.currentAccountId);
       const { locale, latest_chatwoot_version: latestChatwootVersion } =
-        account;
+        this.getAccount(this.currentAccountId);
       const { pubsub_token: pubsubToken } = this.currentUser || {};
       // If user locale is set, use it; otherwise use account locale
       this.setLocale(this.uiSettings?.locale || locale);
@@ -131,7 +131,7 @@ export default {
 
 <template>
   <div
-    v-if="!authUIFlags.isFetching"
+    v-if="!authUIFlags.isFetching && !accountUIFlags.isFetchingItem"
     id="app"
     class="flex flex-col w-full h-screen min-h-0 bg-n-background"
     :dir="isRTL ? 'rtl' : 'ltr'"

app/javascript/dashboard/api/mfa.js

@@ -14,9 +14,9 @@ class MfaAPI extends ApiClient {
     return axios.post(`${this.url}/verify`, { otp_code: otpCode });
   }
 
-  disable(password, { otpCode, backupCode } = {}) {
+  disable(password, otpCode) {
     return axios.delete(this.url, {
-      data: { password, otp_code: otpCode, backup_code: backupCode },
+      data: { password, otp_code: otpCode },
     });
   }
 

app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue

@@ -51,6 +51,7 @@ const isFormInvalid = computed(() => contactsFormRef.value?.isFormInvalid);
 
 const countriesMap = computed(() => {
   return countries.reduce((acc, country) => {
+    acc[country.code] = country;
     acc[country.id] = country;
     return acc;
   }, {});

app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue

@@ -3,7 +3,7 @@ import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useMapGetter, useStore } from 'dashboard/composables/store';
-import { isVoiceCallEnabled } from 'dashboard/helper/inbox';
+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';
@@ -34,7 +34,9 @@ const inboxesList = useMapGetter('inboxes/getInboxes');
 const contactsUiFlags = useMapGetter('contacts/getUIFlags');
 
 const voiceInboxes = computed(() =>
-  (inboxesList.value || []).filter(isVoiceCallEnabled)
+  (inboxesList.value || []).filter(
+    inbox => inbox.channel_type === INBOX_TYPES.VOICE
+  )
 );
 const hasVoiceInboxes = computed(() => voiceInboxes.value.length > 0);
 

app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditor.vue

@@ -23,6 +23,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  refreshTick: {
+    type: Number,
+    default: 0,
+  },
 });
 
 const emit = defineEmits([
@@ -41,14 +45,27 @@ const isNewArticle = computed(() => !props.article?.id);
 const localTitle = ref(props.article?.title ?? '');
 const localContent = ref(props.article?.content ?? '');
 
+const syncLocalState = () => {
+  localTitle.value = props.article?.title ?? '';
+  localContent.value = props.article?.content ?? '';
+};
+
 // Sync local state when navigating to a different article or on initial fetch
 watch(
   () => props.article?.id,
   newId => {
-    if (newId) {
-      localTitle.value = props.article?.title ?? '';
-      localContent.value = props.article?.content ?? '';
-    }
+    if (newId) syncLocalState();
+  }
+);
+
+// Parent bumps refreshTick after re-fetching on tab visibility. Skip
+// the sync while a save is in flight so we don't overwrite edits the
+// user just made.
+watch(
+  () => props.refreshTick,
+  () => {
+    if (props.isUpdating) return;
+    syncLocalState();
   }
 );
 

app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue

@@ -8,6 +8,8 @@ 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 Button from 'dashboard/components-next/button/Button.vue';
 import WhatsAppOptions from './WhatsAppOptions.vue';
 import ContentTemplateSelector from './ContentTemplateSelector.vue';
@@ -28,7 +30,6 @@ const props = defineProps({
   isDropdownActive: { type: Boolean, default: false },
   messageSignature: { type: String, default: '' },
   inboxId: { type: Number, default: null },
-  voiceEnabled: { type: Boolean, default: false },
 });
 
 const emit = defineEmits([
@@ -81,9 +82,11 @@ const isRegularMessageMode = computed(() => {
   return !props.isWhatsappInbox && !props.isTwilioWhatsAppInbox;
 });
 
+const isVoiceInbox = computed(() => props.channelType === INBOX_TYPES.VOICE);
+
 const shouldShowSignatureButton = computed(() => {
   return (
-    props.hasSelectedInbox && isRegularMessageMode.value && !props.voiceEnabled
+    props.hasSelectedInbox && isRegularMessageMode.value && !isVoiceInbox.value
   );
 });
 
@@ -108,7 +111,7 @@ watch(
   () => props.hasSelectedInbox,
   newValue => {
     nextTick(() => {
-      if (newValue && !props.voiceEnabled) setSignature();
+      if (newValue && !isVoiceInbox.value) setSignature();
     });
   },
   { immediate: true }

app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue

@@ -2,7 +2,7 @@
 import { ref, computed } from 'vue';
 import { useVuelidate } from '@vuelidate/core';
 import { required, requiredIf } from '@vuelidate/validators';
-import { INBOX_TYPES, isVoiceCallEnabled } from 'dashboard/helper/inbox';
+import { INBOX_TYPES } from 'dashboard/helper/inbox';
 import {
   appendSignature,
   removeSignature,
@@ -100,8 +100,6 @@ const inboxChannelType = computed(() => props.targetInbox?.channelType || '');
 
 const inboxMedium = computed(() => props.targetInbox?.medium || '');
 
-const voiceCallEnabled = computed(() => isVoiceCallEnabled(props.targetInbox));
-
 const effectiveChannelType = computed(() =>
   getEffectiveChannelType(inboxChannelType.value, inboxMedium.value)
 );
@@ -444,7 +442,6 @@ useKeyboardEvents({
       :is-twilio-whats-app-inbox="inboxTypes.isTwilioWhatsapp"
       :message-templates="whatsappMessageTemplates"
       :channel-type="inboxChannelType"
-      :voice-enabled="voiceCallEnabled"
       :is-loading="isCreating"
       :disable-send-button="isCreating"
       :has-selected-inbox="!!targetInbox"

app/javascript/dashboard/components-next/filter/contactProvider.js

@@ -135,16 +135,6 @@ export function useContactFilterContext() {
       filterOperators: containmentOperators.value,
       attributeModel: 'standard',
     },
-    {
-      attributeKey: CONTACT_ATTRIBUTES.COMPANY_NAME,
-      value: CONTACT_ATTRIBUTES.COMPANY_NAME,
-      attributeName: t('CONTACTS_LAYOUT.FILTER.COMPANY'),
-      label: t('CONTACTS_LAYOUT.FILTER.COMPANY'),
-      inputType: 'plainText',
-      dataType: 'text',
-      filterOperators: containmentOperators.value,
-      attributeModel: 'standard',
-    },
     {
       attributeKey: CONTACT_ATTRIBUTES.CREATED_AT,
       value: CONTACT_ATTRIBUTES.CREATED_AT,

app/javascript/dashboard/components-next/filter/helper/filterHelper.js

@@ -23,7 +23,6 @@ export const CONTACT_ATTRIBUTES = {
   IDENTIFIER: 'identifier',
   COUNTRY_CODE: 'country_code',
   CITY: 'city',
-  COMPANY_NAME: 'company_name',
   CREATED_AT: 'created_at',
   LAST_ACTIVITY_AT: 'last_activity_at',
   REFERER: 'referer',

app/javascript/dashboard/components-next/icon/provider.js

@@ -1,5 +1,4 @@
 import { computed } from 'vue';
-import { isVoiceCallEnabled } from 'dashboard/helper/inbox';
 
 export function useChannelIcon(inbox) {
   const channelTypeIconMap = {
@@ -15,6 +14,7 @@ export function useChannelIcon(inbox) {
     'Channel::Whatsapp': 'i-woot-whatsapp',
     'Channel::Instagram': 'i-woot-instagram',
     'Channel::Tiktok': 'i-woot-tiktok',
+    'Channel::Voice': 'i-woot-voice',
   };
 
   const providerIconMap = {
@@ -38,11 +38,6 @@ export function useChannelIcon(inbox) {
       icon = 'i-woot-whatsapp';
     }
 
-    // Special case for voice-enabled inboxes (Twilio, WhatsApp, etc.)
-    if (isVoiceCallEnabled(inboxDetails)) {
-      icon = 'i-woot-voice';
-    }
-
     return icon ?? 'i-ri-global-fill';
   });
 

app/javascript/dashboard/components-next/icon/specs/provider.spec.js

@@ -19,11 +19,8 @@ describe('useChannelIcon', () => {
     expect(icon).toBe('i-woot-whatsapp');
   });
 
-  it('returns correct icon for voice-enabled Twilio channel', () => {
-    const inbox = {
-      channel_type: 'Channel::TwilioSms',
-      voice_enabled: true,
-    };
+  it('returns correct icon for Voice channel', () => {
+    const inbox = { channel_type: 'Channel::Voice' };
     const { value: icon } = useChannelIcon(inbox);
     expect(icon).toBe('i-woot-voice');
   });

app/javascript/dashboard/components-next/inline-input/InlineInput.vue

@@ -30,10 +30,6 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  readonly: {
-    type: Boolean,
-    default: false,
-  },
   focusOnMount: {
     type: Boolean,
     default: false,
@@ -86,7 +82,6 @@ onMounted(() => {
 
 defineExpose({
   focus: () => inlineInputRef.value?.focus(),
-  blur: () => inlineInputRef.value?.blur(),
 });
 </script>
 
@@ -111,7 +106,6 @@ defineExpose({
       :type="type"
       :placeholder="placeholder"
       :disabled="disabled"
-      :readonly="readonly"
       :class="customInputClass"
       class="flex w-full reset-base text-sm h-6 !mb-0 border-0 rounded-none outline-none outline-0 bg-transparent dark:bg-transparent placeholder:text-n-slate-10 dark:placeholder:text-n-slate-10 disabled:cursor-not-allowed disabled:opacity-50 text-n-slate-12 dark:text-n-slate-12 transition-all duration-500 ease-in-out"
       @input="handleInput"

app/javascript/dashboard/components/widgets/WootWriter/Editor.vue

@@ -51,7 +51,6 @@ import {
 
 import {
   appendSignature,
-  collapseSelection,
   findNodeToInsertImage,
   getContentNode,
   insertAtCursor,
@@ -67,7 +66,6 @@ import {
 import {
   hasPressedEnterAndNotCmdOrShift,
   hasPressedCommandAndEnter,
-  isEscape,
 } from 'shared/helpers/KeyboardHelpers';
 import { createTypingIndicator } from '@chatwoot/utils';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
@@ -517,9 +515,7 @@ function setMenubarPosition({ selection } = {}) {
 
 function checkSelection(editorState) {
   showSelectionMenu.value = false;
-  const { selection } = editorState;
-  // Skip NodeSelection (from Esc -> selectParentNode); only text ranges count.
-  const hasSelection = !selection.empty && !selection.node;
+  const hasSelection = editorState.selection.from !== editorState.selection.to;
   if (hasSelection === isTextSelected.value) return;
 
   isTextSelected.value = hasSelection;
@@ -715,17 +711,12 @@ function handleLineBreakWhenCmdAndEnterToSendEnabled(event) {
 }
 
 function onKeydown(event) {
-  if (isEscape(event)) {
-    collapseSelection(editorView);
-    return true;
-  }
   if (isEnterToSendEnabled()) {
     handleLineBreakWhenEnterToSendEnabled(event);
   }
   if (isCmdPlusEnterToSendEnabled()) {
     handleLineBreakWhenCmdAndEnterToSendEnabled(event);
   }
-  return false;
 }
 
 function createEditorView() {
@@ -753,9 +744,6 @@ function createEditorView() {
       blur: () => {
         if (props.disabled) return;
         typingIndicator.stop();
-        // PM keeps its selection on blur — clear the menu flags manually.
-        isTextSelected.value = false;
-        editorRoot.value?.classList.remove('has-selection');
         emit('blur');
       },
       paste: (view, event) => {

app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue

@@ -17,8 +17,6 @@ import { toggleMark } from 'prosemirror-commands';
 import { wrapInList } from 'prosemirror-schema-list';
 import { toggleBlockType } from '@chatwoot/prosemirror-schema/src/menu/common';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
-import { isEscape } from 'shared/helpers/KeyboardHelpers';
-import { collapseSelection } from 'dashboard/helper/editorHelper';
 import { useAlert } from 'dashboard/composables';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
@@ -364,33 +362,19 @@ export default {
     onKeyup() {
       this.$emit('keyup');
     },
-    onKeydown(view, event) {
+    onKeydown() {
       this.$emit('keydown');
-      if (isEscape(event)) {
-        if (this.showSlashMenu) {
-          this.showSlashMenu = false;
-          this.slashSearchTerm = '';
-          this.slashMenuPosition = null;
-          return true;
-        }
-        collapseSelection(editorView);
-        return true;
-      }
-      return false;
     },
     onBlur() {
-      // ProseMirror keeps its selection on blur — clear the menu flag manually.
-      this.isTextSelected = false;
-      this.$refs.editor?.classList.remove('has-selection');
       this.$emit('blur');
     },
     onFocus() {
       this.$emit('focus');
     },
     checkSelection(editorState) {
-      const { selection } = editorState;
-      // Skip NodeSelection (from Esc -> selectParentNode); only text ranges count.
-      const hasSelection = !selection.empty && !selection.node;
+      const { from, to } = editorState.selection;
+      // Check if there's a selection (from and to are different)
+      const hasSelection = from !== to;
       // If the selection state is the same as the previous state, do nothing
       if (hasSelection === this.isTextSelected) return;
       // Update the selection state

app/javascript/dashboard/composables/spec/useInbox.spec.js

@@ -47,11 +47,7 @@ const mockStore = createStore({
             11: { id: 11, channel_type: INBOX_TYPES.API },
             12: { id: 12, channel_type: INBOX_TYPES.SMS },
             13: { id: 13, channel_type: INBOX_TYPES.INSTAGRAM },
-            14: {
-              id: 14,
-              channel_type: INBOX_TYPES.TWILIO,
-              voice_enabled: true,
-            },
+            14: { id: 14, channel_type: INBOX_TYPES.VOICE },
             15: { id: 15, channel_type: INBOX_TYPES.TIKTOK },
           };
           return inboxes[id] || null;
@@ -215,11 +211,11 @@ describe('useInbox', () => {
       });
       expect(wrapper.vm.isAnInstagramChannel).toBe(true);
 
-      // Test Voice (Twilio with voice_enabled)
+      // Test Voice
       wrapper = mount(createTestComponent(14), {
         global: { plugins: [mockStore] },
       });
-      expect(wrapper.vm.voiceCallEnabled).toBe(true);
+      expect(wrapper.vm.isAVoiceChannel).toBe(true);
 
       // Test Tiktok
       wrapper = mount(createTestComponent(15), {
@@ -278,8 +274,7 @@ describe('useInbox', () => {
         'isAnEmailChannel',
         'isAnInstagramChannel',
         'isATiktokChannel',
-        'voiceCallEnabled',
-        'voiceCallProvider',
+        'isAVoiceChannel',
       ];
 
       expectedProperties.forEach(prop => {

app/javascript/dashboard/composables/useInbox.js

@@ -1,11 +1,7 @@
 import { computed } from 'vue';
 import { useMapGetter } from 'dashboard/composables/store';
 import { useCamelCase } from 'dashboard/composables/useTransformKeys';
-import {
-  INBOX_TYPES,
-  isVoiceCallEnabled,
-  getVoiceCallProvider,
-} from 'dashboard/helper/inbox';
+import { INBOX_TYPES } from 'dashboard/helper/inbox';
 
 export const INBOX_FEATURES = {
   REPLY_TO: 'replyTo',
@@ -138,9 +134,9 @@ export const useInbox = (inboxId = null) => {
     return channelType.value === INBOX_TYPES.TIKTOK;
   });
 
-  const voiceCallEnabled = computed(() => isVoiceCallEnabled(inbox.value));
-
-  const voiceCallProvider = computed(() => getVoiceCallProvider(inbox.value));
+  const isAVoiceChannel = computed(() => {
+    return channelType.value === INBOX_TYPES.VOICE;
+  });
 
   return {
     inbox,
@@ -160,7 +156,6 @@ export const useInbox = (inboxId = null) => {
     isAnEmailChannel,
     isAnInstagramChannel,
     isATiktokChannel,
-    voiceCallEnabled,
-    voiceCallProvider,
+    isAVoiceChannel,
   };
 };

app/javascript/dashboard/constants/editor.js

@@ -109,6 +109,11 @@ export const FORMATTING = {
       'redo',
     ],
   },
+  'Channel::Voice': {
+    marks: [],
+    nodes: [],
+    menu: [],
+  },
   'Channel::Tiktok': {
     marks: [],
     nodes: [],

app/javascript/dashboard/featureFlags.js

@@ -36,7 +36,6 @@ export const FEATURE_FLAGS = {
   CHATWOOT_V4: 'chatwoot_v4',
   CHANNEL_INSTAGRAM: 'channel_instagram',
   CHANNEL_TIKTOK: 'channel_tiktok',
-  CHANNEL_VOICE: 'channel_voice',
   CONTACT_CHATWOOT_SUPPORT_TEAM: 'contact_chatwoot_support_team',
   CAPTAIN_CUSTOM_TOOLS: 'custom_tools',
   CAPTAIN_V2: 'captain_integration_v2',

app/javascript/dashboard/helper/AnalyticsHelper/events.js

@@ -153,8 +153,3 @@ export const YEAR_IN_REVIEW_EVENTS = Object.freeze({
   NEXT_CLICKED: 'Year in Review: Next clicked',
   SHARE_CLICKED: 'Year in Review: Share clicked',
 });
-
-export const ONBOARDING_EVENTS = Object.freeze({
-  ACCOUNT_DETAILS_VISITED: 'Onboarding: Account details visited',
-  ACCOUNT_DETAILS_COMPLETED: 'Onboarding: Account details completed',
-});

app/javascript/dashboard/helper/actionCable.js

@@ -33,7 +33,6 @@ class ActionCableConnector extends BaseActionCableConnector {
       'conversation.read': this.onConversationRead,
       'conversation.updated': this.onConversationUpdated,
       'account.cache_invalidated': this.onCacheInvalidate,
-      'account.enrichment_completed': this.onEnrichmentCompleted,
       'copilot.message.created': this.onCopilotMessageCreated,
     };
   }
@@ -195,10 +194,6 @@ class ActionCableConnector extends BaseActionCableConnector {
     this.app.$store.dispatch('copilotMessages/upsert', data);
   };
 
-  onEnrichmentCompleted = () => {
-    this.app.$store.dispatch('accounts/get', { silent: true });
-  };
-
   onCacheInvalidate = data => {
     const keys = data.cache_keys;
     this.app.$store.dispatch('labels/revalidate', { newKey: keys.label });

app/javascript/dashboard/helper/editorHelper.js

@@ -2,7 +2,6 @@ import {
   messageSchema,
   MessageMarkdownTransformer,
   MessageMarkdownSerializer,
-  Selection,
 } from '@chatwoot/prosemirror-schema';
 import { replaceVariablesInMessage } from '@chatwoot/utils';
 import * as Sentry from '@sentry/vue';
@@ -274,18 +273,6 @@ export const scrollCursorIntoView = view => {
   }
 };
 
-/**
- * Collapse the current selection to a cursor near its head. Used to override
- * the default Escape -> selectParentNode behavior which would otherwise keep
- * the text highlight visible.
- *
- * @param {EditorView} view - The ProseMirror EditorView
- */
-export const collapseSelection = view => {
-  const { tr, selection } = view.state;
-  view.dispatch(tr.setSelection(Selection.near(selection.$head)));
-};
-
 /**
  * Returns a transaction that inserts a node into editor at the given position
  * Has an optional param 'content' to check if the

app/javascript/dashboard/helper/inbox.js

@@ -11,29 +11,9 @@ export const INBOX_TYPES = {
   SMS: 'Channel::Sms',
   INSTAGRAM: 'Channel::Instagram',
   TIKTOK: 'Channel::Tiktok',
+  VOICE: 'Channel::Voice',
 };
 
-// Add providers here as they gain voice capability (e.g., WhatsApp Cloud, Twilio WhatsApp)
-export const VOICE_CALL_PROVIDERS = {
-  TWILIO: 'twilio',
-};
-
-export const getVoiceCallProvider = inbox => {
-  if (!inbox) return null;
-
-  // Callers pass either snake_case (raw API) or camelCase (after camelcaseKeys) shapes.
-  const channelType = inbox.channel_type || inbox.channelType;
-  const voiceEnabled = inbox.voice_enabled || inbox.voiceEnabled;
-
-  if (channelType === INBOX_TYPES.TWILIO && voiceEnabled) {
-    return VOICE_CALL_PROVIDERS.TWILIO;
-  }
-
-  return null;
-};
-
-export const isVoiceCallEnabled = inbox => getVoiceCallProvider(inbox) !== null;
-
 export const TWILIO_CHANNEL_MEDIUM = {
   WHATSAPP: 'whatsapp',
   SMS: 'sms',
@@ -50,6 +30,7 @@ const INBOX_ICON_MAP_FILL = {
   [INBOX_TYPES.LINE]: 'i-ri-line-fill',
   [INBOX_TYPES.INSTAGRAM]: 'i-ri-instagram-fill',
   [INBOX_TYPES.TIKTOK]: 'i-ri-tiktok-fill',
+  [INBOX_TYPES.VOICE]: 'i-ri-phone-fill',
 };
 
 const DEFAULT_ICON_FILL = 'i-ri-chat-1-fill';
@@ -64,6 +45,7 @@ const INBOX_ICON_MAP_LINE = {
   [INBOX_TYPES.TELEGRAM]: 'i-woot-telegram',
   [INBOX_TYPES.LINE]: 'i-woot-line',
   [INBOX_TYPES.INSTAGRAM]: 'i-woot-instagram',
+  [INBOX_TYPES.VOICE]: 'i-woot-voice',
   [INBOX_TYPES.TIKTOK]: 'i-woot-tiktok',
 };
 
@@ -76,6 +58,7 @@ export const getInboxSource = (type, phoneNumber, inbox) => {
 
     case INBOX_TYPES.TWILIO:
     case INBOX_TYPES.WHATSAPP:
+    case INBOX_TYPES.VOICE:
       return phoneNumber || '';
 
     case INBOX_TYPES.EMAIL:
@@ -114,6 +97,9 @@ export const getReadableInboxByType = (type, phoneNumber) => {
     case INBOX_TYPES.LINE:
       return 'line';
 
+    case INBOX_TYPES.VOICE:
+      return 'voice';
+
     default:
       return 'chat';
   }
@@ -156,6 +142,9 @@ export const getInboxClassByType = (type, phoneNumber) => {
     case INBOX_TYPES.TIKTOK:
       return 'brand-tiktok';
 
+    case INBOX_TYPES.VOICE:
+      return 'phone';
+
     default:
       return 'chat';
   }

app/javascript/dashboard/helper/specs/editorHelper.spec.js

@@ -16,7 +16,6 @@ import {
   calculateMenuPosition,
   stripUnsupportedFormatting,
   stripInlineBase64Images,
-  collapseSelection,
 } from '../editorHelper';
 import { FORMATTING } from 'dashboard/constants/editor';
 import { EditorState } from '@chatwoot/prosemirror-schema';
@@ -455,37 +454,6 @@ describe('stripInlineBase64Images', () => {
   });
 });
 
-describe('collapseSelection', () => {
-  it('collapses a text range to a cursor at its head', () => {
-    const editorView = new EditorView(document.body, {
-      state: createEditorState('Hello world'),
-    });
-
-    // Build a TextSelection via the initial selection's constructor (avoids
-    // importing prosemirror-state, which isn't a direct dep).
-    const { doc, selection } = editorView.state;
-    editorView.dispatch(
-      editorView.state.tr.setSelection(selection.constructor.create(doc, 1, 6))
-    );
-    expect(editorView.state.selection.empty).toBe(false);
-
-    collapseSelection(editorView);
-
-    expect(editorView.state.selection.empty).toBe(true);
-    expect(editorView.state.selection.head).toBe(6);
-  });
-
-  it('leaves an already-collapsed selection as a cursor', () => {
-    const editorView = new EditorView(document.body, {
-      state: createEditorState('Hi'),
-    });
-
-    collapseSelection(editorView);
-
-    expect(editorView.state.selection.empty).toBe(true);
-  });
-});
-
 describe('insertAtCursor', () => {
   it('should return undefined if editorView is not provided', () => {
     const result = insertAtCursor(undefined, schema.text('Hello'), 0);

app/javascript/dashboard/i18n/locale/en/automation.json

@@ -182,7 +182,6 @@
       "BROWSER_LANGUAGE": "Browser Language",
       "MAIL_SUBJECT": "Email Subject",
       "COUNTRY_NAME": "Country",
-      "COMPANY_NAME": "Company",
       "REFERER_LINK": "Referrer Link",
       "ASSIGNEE_NAME": "Assignee",
       "TEAM_NAME": "Team",

app/javascript/dashboard/i18n/locale/en/contact.json

@@ -387,7 +387,6 @@
       "IDENTIFIER": "Identifier",
       "COUNTRY": "Country",
       "CITY": "City",
-      "COMPANY": "Company",
       "CREATED_AT": "Created at",
       "LAST_ACTIVITY": "Last activity",
       "REFERER_LINK": "Referer link",

app/javascript/dashboard/i18n/locale/en/inboxMgmt.json

@@ -636,17 +636,7 @@
       "WIDGET_BUILDER": "Widget Builder",
       "BOT_CONFIGURATION": "Bot Configuration",
       "ACCOUNT_HEALTH": "Account Health",
-      "CSAT": "CSAT",
-      "VOICE": "Voice"
-    },
-    "VOICE_CONFIGURATION": {
-      "ENABLE_VOICE": {
-        "LABEL": "Enable Voice Calling",
-        "DESCRIPTION": "Enable voice calling on this inbox. Agents will be able to make and receive phone calls."
-      },
-      "CREDENTIALS": {
-        "DESCRIPTION": "Voice calling requires Twilio API Key credentials. These are used to generate tokens for agent voice connections."
-      }
+      "CSAT": "CSAT"
     },
     "CHANNEL_PREFERENCES": "Channel Preferences",
     "WIDGET_FEATURES": "Widget features",

app/javascript/dashboard/i18n/locale/en/index.js

@@ -39,7 +39,6 @@ import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 import contentTemplates from './contentTemplates.json';
 import mfa from './mfa.json';
-import onboarding from './onboarding.json';
 import yearInReview from './yearInReview.json';
 
 export default {
@@ -84,6 +83,5 @@ export default {
   ...whatsappTemplates,
   ...contentTemplates,
   ...mfa,
-  ...onboarding,
   ...yearInReview,
 };

app/javascript/dashboard/i18n/locale/en/mfa.json

@@ -51,14 +51,10 @@
     },
     "DISABLE": {
       "TITLE": "Disable Two-Factor Authentication",
-      "DESCRIPTION": "You'll need to enter your password and either a verification code from your authenticator app or a backup code to disable two-factor authentication.",
+      "DESCRIPTION": "You'll need to enter your password and a verification code to disable two-factor authentication.",
       "PASSWORD": "Password",
       "OTP_CODE": "Verification Code",
       "OTP_CODE_PLACEHOLDER": "000000",
-      "BACKUP_CODE": "Backup Code",
-      "BACKUP_CODE_PLACEHOLDER": "Enter one of your backup codes",
-      "USE_BACKUP_CODE": "Lost access to your authenticator? Use a backup code instead",
-      "USE_OTP_CODE": "Use a verification code from your authenticator app",
       "CONFIRM": "Disable 2FA",
       "CANCEL": "Cancel",
       "SUCCESS": "Two-factor authentication has been disabled",

app/javascript/dashboard/i18n/locale/en/onboarding.json

@@ -1,34 +0,0 @@
-{
-  "ONBOARDING_NEXT": {
-    "GREETING": "Hello {name}!",
-    "SUBTITLE": "Please review the following details",
-    "YOUR_DETAILS": "Your details",
-    "COMPANY_DETAILS": "Company details",
-    "FIELDS": {
-      "EMAIL": "Email",
-      "YOUR_ROLE": "Your Role",
-      "WEBSITE": "Website",
-      "LANGUAGE": "Language",
-      "TIMEZONE": "Timezone",
-      "COMPANY_SIZE": "Company Size",
-      "INDUSTRY": "Industry",
-      "REFERRAL_SOURCE": "Where did you find us?"
-    },
-    "PLACEHOLDERS": {
-      "SELECT_ROLE": "Select your role",
-      "ENTER_WEBSITE": "www.example.com",
-      "SELECT_LANGUAGE": "Select language",
-      "SELECT_TIMEZONE": "Select timezone",
-      "SELECT_COMPANY_SIZE": "Select company size",
-      "SELECT_INDUSTRY": "Select industry",
-      "SELECT_REFERRAL_SOURCE": "Select source"
-    },
-    "EMAIL_VERIFIED": "Email verified",
-    "SETTING_UP": "Setting up your account...",
-    "CONTINUE": "Continue",
-    "SAVING": "Saving...",
-    "VALIDATION_ERROR": "Please fill in all required fields",
-    "SUCCESS": "Details saved successfully",
-    "ERROR": "Could not save details. Please try again."
-  }
-}

app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue

@@ -49,6 +49,7 @@ const navigateTo = computed(() => {
 
 const countriesMap = computed(() => {
   return countries.reduce((acc, country) => {
+    acc[country.code] = country;
     acc[country.id] = country;
     return acc;
   }, {});

app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js

@@ -53,14 +53,6 @@ const filterTypes = [
     filterOperators: OPERATOR_TYPES_3,
     attribute_type: 'standard',
   },
-  {
-    attributeKey: 'company_name',
-    attributeI18nKey: 'COMPANY',
-    inputType: 'plain_text',
-    dataType: 'text',
-    filterOperators: OPERATOR_TYPES_3,
-    attributeModel: 'standard',
-  },
   {
     attributeKey: 'created_at',
     attributeI18nKey: 'CREATED_AT',
@@ -132,10 +124,6 @@ export const filterAttributeGroups = [
         key: 'city',
         i18nKey: 'CITY',
       },
-      {
-        key: 'company_name',
-        i18nKey: 'COMPANY',
-      },
       {
         key: 'created_at',
         i18nKey: 'CREATED_AT',

app/javascript/dashboard/routes/dashboard/dashboard.routes.js

@@ -12,7 +12,6 @@ import { routes as captainRoutes } from './captain/captain.routes';
 import AppContainer from './Dashboard.vue';
 import Suspended from './suspended/Index.vue';
 import NoAccounts from './noAccounts/Index.vue';
-import OnboardingAccountDetails from './onboarding/Index.vue';
 
 export default {
   routes: [
@@ -32,14 +31,6 @@ export default {
         ...campaignsRoutes.routes,
       ],
     },
-    {
-      path: frontendURL('accounts/:accountId/onboarding'),
-      name: 'onboarding_account_details',
-      meta: {
-        permissions: ['administrator', 'agent', 'custom_role'],
-      },
-      component: OnboardingAccountDetails,
-    },
     {
       path: frontendURL('accounts/:accountId/suspended'),
       name: 'account_suspended',

app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesEditPage.vue

@@ -1,5 +1,6 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed, onMounted, watch } from 'vue';
+import { useDocumentVisibility } from '@vueuse/core';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useAlert, useTrack } from 'dashboard/composables';
@@ -13,6 +14,7 @@ const route = useRoute();
 const router = useRouter();
 const store = useStore();
 const { t } = useI18n();
+const visibility = useDocumentVisibility();
 
 const { articleSlug, portalSlug } = route.params;
 
@@ -26,6 +28,7 @@ const portal = computed(() => portalBySlug.value(portalSlug));
 
 const isUpdating = ref(false);
 const isSaved = ref(false);
+const refreshTick = ref(0);
 
 const articleLink = computed(() => {
   const { slug: categorySlug, locale: categoryLocale } = article.value.category;
@@ -84,11 +87,12 @@ const goBackToArticles = () => {
   }
 };
 
-const fetchArticleDetails = () => {
-  store.dispatch('articles/show', {
+const fetchArticleDetails = async () => {
+  await store.dispatch('articles/show', {
     id: articleSlug,
     portalSlug,
   });
+  refreshTick.value += 1;
 };
 
 const previewArticle = () => {
@@ -98,6 +102,11 @@ const previewArticle = () => {
   });
 };
 
+// Re-fetch article when user returns to this tab
+watch(visibility, state => {
+  if (state === 'visible') fetchArticleDetails();
+});
+
 onMounted(fetchArticleDetails);
 </script>
 
@@ -106,6 +115,7 @@ onMounted(fetchArticleDetails);
     :article="article"
     :is-updating="isUpdating"
     :is-saved="isSaved"
+    :refresh-tick="refreshTick"
     @save-article="saveArticle"
     @preview-article="previewArticle"
     @go-back="goBackToArticles"

app/javascript/dashboard/routes/dashboard/onboarding/Index.vue

@@ -1,417 +0,0 @@
-<script setup>
-import { ref, computed, nextTick, onMounted, onUnmounted, watch } from 'vue';
-import { useVuelidate } from '@vuelidate/core';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useAlert, useTrack } from 'dashboard/composables';
-import { ONBOARDING_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
-import { useAccount } from 'dashboard/composables/useAccount';
-import { useConfig } from 'dashboard/composables/useConfig';
-import { useMapGetter, useStore } from 'dashboard/composables/store';
-import { frontendURL } from 'dashboard/helper/URLHelper';
-import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-import NextButton from 'dashboard/components-next/button/Button.vue';
-import OnboardingLayout from './OnboardingLayout.vue';
-import OnboardingSection from './OnboardingSection.vue';
-import OnboardingFormRow from './OnboardingFormRow.vue';
-import OnboardingFormSelect from './OnboardingFormSelect.vue';
-import InlineInput from 'dashboard/components-next/inline-input/InlineInput.vue';
-import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
-import {
-  COMPANY_SIZE_OPTIONS,
-  INDUSTRY_OPTIONS,
-  REFERRAL_SOURCE_OPTIONS,
-  USER_ROLE_OPTIONS,
-} from './constants';
-
-const { t } = useI18n();
-const router = useRouter();
-const store = useStore();
-const { accountId, currentAccount, updateAccount } = useAccount();
-const { enabledLanguages } = useConfig();
-const currentUser = useMapGetter('getCurrentUser');
-
-const userRole = ref('');
-const website = ref('');
-const locale = ref('');
-const timezone = ref('');
-const companySize = ref('');
-const industry = ref('');
-const referralSource = ref('');
-const isSubmitting = ref(false);
-const isEditingWebsite = ref(false);
-const websiteInput = ref(null);
-const showErrorOnFields = ref(false);
-
-const validationRules = {
-  userRole: {},
-  website: {},
-  locale: {},
-  timezone: {},
-  companySize: {},
-  industry: {},
-  referralSource: {},
-};
-
-const v$ = useVuelidate(validationRules, {
-  userRole,
-  website,
-  locale,
-  timezone,
-  companySize,
-  industry,
-  referralSource,
-});
-
-const userName = computed(() => currentUser.value?.name || '');
-const userEmail = computed(() => currentUser.value?.email || '');
-const accountName = computed(() => currentAccount.value?.name || '');
-const enrichmentTimedOut = ref(false);
-const isEnriching = computed(
-  () =>
-    !enrichmentTimedOut.value &&
-    currentAccount.value?.custom_attributes?.onboarding_step === 'enrichment'
-);
-const companyLogo = computed(() => {
-  const logos = currentAccount.value?.custom_attributes?.brand_info?.logos;
-  if (!logos?.length) return '';
-  const square = logos.find(l => l.resolution?.aspect_ratio === 1);
-  return (square || logos[0])?.url || '';
-});
-
-const languageOptions = computed(() => {
-  const langs = [...(enabledLanguages || [])];
-  return langs
-    .sort((a, b) => a.iso_639_1_code.localeCompare(b.iso_639_1_code))
-    .map(l => ({ value: l.iso_639_1_code, label: l.name }));
-});
-
-const timezoneOptions = computed(() => {
-  try {
-    return Intl.supportedValuesOf('timeZone').map(tz => ({
-      value: tz,
-      label: tz.replace(/_/g, ' '),
-    }));
-  } catch {
-    return [];
-  }
-});
-
-// Best-effort match browser language to enabled Chatwoot locales.
-// Tries exact match first (e.g. 'pt_BR'), then base language (e.g. 'pt'),
-// falls back to account locale or 'en'.
-const detectBestLocale = () => {
-  const codes = (enabledLanguages || []).map(l => l.iso_639_1_code);
-  const browserLang = navigator.language?.replace('-', '_');
-  const accountLocale = currentAccount.value?.locale || 'en';
-  if (!browserLang) return accountLocale;
-
-  if (codes.includes(browserLang)) return browserLang;
-  const base = browserLang.split('_')[0];
-  if (codes.includes(base)) return base;
-
-  return accountLocale;
-};
-
-// Snapshot of auto-populated values to detect user edits at submit time
-const initialValues = ref({});
-
-const snapshotInitialValues = () => {
-  initialValues.value = {
-    website: website.value,
-    company_size: companySize.value,
-    industry: industry.value,
-  };
-};
-
-// Idempotent: only fills empty fields, so late-arriving enrichment data
-// populates untouched fields without clobbering user edits.
-const populateFormFields = () => {
-  const account = currentAccount.value;
-  const attrs = account?.custom_attributes || {};
-  const brandInfo = attrs.brand_info;
-
-  if (!locale.value) locale.value = detectBestLocale();
-  if (!website.value) {
-    website.value = account?.domain || brandInfo?.domain || '';
-  }
-  if (!timezone.value) {
-    timezone.value =
-      attrs.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone || '';
-  }
-  if (!companySize.value) companySize.value = attrs.company_size || '';
-  if (!industry.value) {
-    industry.value =
-      attrs.industry || brandInfo?.industries?.[0]?.industry || '';
-  }
-  if (!referralSource.value) referralSource.value = attrs.referral_source || '';
-
-  snapshotInitialValues();
-};
-
-let enrichmentTimer = null;
-
-const startEnrichmentTimer = () => {
-  if (enrichmentTimer) clearTimeout(enrichmentTimer);
-  enrichmentTimer = setTimeout(() => {
-    enrichmentTimedOut.value = true;
-    populateFormFields();
-  }, 30000);
-};
-
-onMounted(() => {
-  populateFormFields();
-  useTrack(ONBOARDING_EVENTS.ACCOUNT_DETAILS_VISITED);
-  if (isEnriching.value) startEnrichmentTimer();
-});
-
-onUnmounted(() => {
-  if (enrichmentTimer) clearTimeout(enrichmentTimer);
-});
-
-watch(isEnriching, newVal => {
-  if (newVal) {
-    startEnrichmentTimer();
-  } else {
-    if (enrichmentTimer) clearTimeout(enrichmentTimer);
-    populateFormFields();
-  }
-});
-
-// Re-populate when account data arrives after mount, or when brand_info
-// appears after enrichment. populateFormFields is idempotent so this is safe.
-watch(
-  () => currentAccount.value?.custom_attributes,
-  () => populateFormFields()
-);
-
-const enableWebsiteEditing = () => {
-  isEditingWebsite.value = true;
-  nextTick(() => websiteInput.value?.focus());
-};
-
-const handleWebsiteEnter = () => {
-  websiteInput.value?.blur();
-};
-
-const handleSubmit = async () => {
-  // Block submit while enrichment is still running so users can't bypass
-  // the form with empty values — the controller would otherwise clear
-  // onboarding_step and persist incomplete data.
-  if (isEnriching.value) return;
-
-  v$.value.$touch();
-  if (v$.value.$invalid) {
-    useAlert(t('ONBOARDING_NEXT.VALIDATION_ERROR'));
-    showErrorOnFields.value = true;
-    setTimeout(() => {
-      showErrorOnFields.value = false;
-    }, 600);
-    return;
-  }
-
-  isSubmitting.value = true;
-  try {
-    await updateAccount({
-      name: accountName.value,
-      locale: locale.value,
-      domain: website.value,
-      industry: industry.value,
-      company_size: companySize.value,
-      timezone: timezone.value,
-      referral_source: referralSource.value,
-      user_role: userRole.value,
-    });
-
-    const init = initialValues.value;
-    const enrichableFields = {
-      website: website.value,
-      company_size: companySize.value,
-      industry: industry.value,
-    };
-
-    useTrack(ONBOARDING_EVENTS.ACCOUNT_DETAILS_COMPLETED, {
-      has_enriched_data: Boolean(
-        currentAccount.value?.custom_attributes?.brand_info
-      ),
-      fields_changed: Object.entries(enrichableFields)
-        .filter(([key, val]) => val !== init[key])
-        .map(([key]) => key),
-      user_role: userRole.value,
-      company_size: companySize.value,
-      industry: industry.value,
-      referral_source: referralSource.value,
-    });
-
-    useAlert(t('ONBOARDING_NEXT.SUCCESS'));
-    store.commit('RESET_ONBOARDING', accountId.value);
-    router.push(frontendURL(`accounts/${accountId.value}/dashboard`));
-  } catch {
-    useAlert(t('ONBOARDING_NEXT.ERROR'));
-  } finally {
-    isSubmitting.value = false;
-  }
-};
-</script>
-
-<template>
-  <form @submit.prevent="handleSubmit">
-    <OnboardingLayout
-      :greeting="t('ONBOARDING_NEXT.GREETING', { name: userName })"
-      :subtitle="t('ONBOARDING_NEXT.SUBTITLE')"
-      :continue-label="t('ONBOARDING_NEXT.CONTINUE')"
-      :is-loading="isSubmitting"
-      :disabled="isEnriching"
-    >
-      <OnboardingSection
-        :title="t('ONBOARDING_NEXT.YOUR_DETAILS')"
-        icon="i-lucide-user"
-      >
-        <div class="flex items-center gap-2 px-3 py-3">
-          <Avatar :name="userName" :size="16" rounded-full />
-          <span class="text-sm font-medium text-n-slate-12">
-            {{ userName }}
-          </span>
-        </div>
-        <OnboardingFormRow
-          :title="t('ONBOARDING_NEXT.FIELDS.EMAIL')"
-          icon="i-lucide-mail"
-        >
-          <div class="flex items-center justify-end gap-1.5">
-            <span class="text-sm text-n-slate-12">{{ userEmail }}</span>
-            <Icon
-              v-tooltip="t('ONBOARDING_NEXT.EMAIL_VERIFIED')"
-              icon="i-lucide-circle-check"
-              class="size-4 text-n-teal-11 flex-shrink-0"
-            />
-          </div>
-        </OnboardingFormRow>
-        <OnboardingFormRow
-          :title="t('ONBOARDING_NEXT.FIELDS.YOUR_ROLE')"
-          icon="i-lucide-user"
-        >
-          <OnboardingFormSelect
-            v-model="userRole"
-            :has-error="showErrorOnFields && v$.userRole.$error"
-            :options="USER_ROLE_OPTIONS"
-            :placeholder="t('ONBOARDING_NEXT.PLACEHOLDERS.SELECT_ROLE')"
-          />
-        </OnboardingFormRow>
-      </OnboardingSection>
-
-      <OnboardingSection
-        :title="t('ONBOARDING_NEXT.COMPANY_DETAILS')"
-        icon="i-lucide-briefcase-business"
-      >
-        <div
-          v-if="isEnriching"
-          class="flex items-center justify-center gap-3 py-8"
-        >
-          <Spinner :size="16" class="text-n-blue-10" />
-          <span class="text-sm text-n-slate-11">
-            {{ t('ONBOARDING_NEXT.SETTING_UP') }}
-          </span>
-        </div>
-        <template v-else>
-          <div class="flex items-center gap-2 px-3 py-3">
-            <img
-              v-if="companyLogo"
-              :src="companyLogo"
-              :alt="accountName"
-              class="size-4 object-contain"
-            />
-            <span class="text-sm font-medium text-n-slate-12">
-              {{ accountName }}
-            </span>
-          </div>
-          <OnboardingFormRow
-            :title="t('ONBOARDING_NEXT.FIELDS.WEBSITE')"
-            icon="i-lucide-globe"
-          >
-            <div class="flex items-center justify-end gap-2">
-              <InlineInput
-                ref="websiteInput"
-                v-model="website"
-                :readonly="!isEditingWebsite"
-                :placeholder="t('ONBOARDING_NEXT.PLACEHOLDERS.ENTER_WEBSITE')"
-                :custom-input-class="[
-                  'w-auto text-end px-1 py-0.5 -my-0.5 mx-0 placeholder:text-n-slate-9 rounded',
-                  { 'animate-shake': showErrorOnFields && v$.website.$error },
-                ]"
-                @enter-press="handleWebsiteEnter"
-                @blur="isEditingWebsite = false"
-              />
-              <NextButton
-                type="button"
-                icon="i-lucide-pencil"
-                slate
-                xs
-                ghost
-                @click="enableWebsiteEditing"
-              />
-            </div>
-          </OnboardingFormRow>
-          <OnboardingFormRow
-            :title="t('ONBOARDING_NEXT.FIELDS.LANGUAGE')"
-            icon="i-lucide-languages"
-          >
-            <OnboardingFormSelect
-              v-model="locale"
-              :has-error="showErrorOnFields && v$.locale.$error"
-              :options="languageOptions"
-            />
-          </OnboardingFormRow>
-          <OnboardingFormRow
-            :title="t('ONBOARDING_NEXT.FIELDS.TIMEZONE')"
-            icon="i-lucide-clock"
-          >
-            <OnboardingFormSelect
-              v-model="timezone"
-              :has-error="showErrorOnFields && v$.timezone.$error"
-              :options="timezoneOptions"
-              :placeholder="t('ONBOARDING_NEXT.PLACEHOLDERS.SELECT_TIMEZONE')"
-            />
-          </OnboardingFormRow>
-          <OnboardingFormRow
-            :title="t('ONBOARDING_NEXT.FIELDS.INDUSTRY')"
-            icon="i-lucide-factory"
-          >
-            <OnboardingFormSelect
-              v-model="industry"
-              :has-error="showErrorOnFields && v$.industry.$error"
-              :options="INDUSTRY_OPTIONS"
-              :placeholder="t('ONBOARDING_NEXT.PLACEHOLDERS.SELECT_INDUSTRY')"
-            />
-          </OnboardingFormRow>
-          <OnboardingFormRow
-            :title="t('ONBOARDING_NEXT.FIELDS.COMPANY_SIZE')"
-            icon="i-lucide-users"
-          >
-            <OnboardingFormSelect
-              v-model="companySize"
-              :has-error="showErrorOnFields && v$.companySize.$error"
-              :options="COMPANY_SIZE_OPTIONS"
-              :placeholder="
-                t('ONBOARDING_NEXT.PLACEHOLDERS.SELECT_COMPANY_SIZE')
-              "
-            />
-          </OnboardingFormRow>
-          <OnboardingFormRow
-            :title="t('ONBOARDING_NEXT.FIELDS.REFERRAL_SOURCE')"
-            icon="i-lucide-megaphone"
-          >
-            <OnboardingFormSelect
-              v-model="referralSource"
-              :has-error="showErrorOnFields && v$.referralSource.$error"
-              :options="REFERRAL_SOURCE_OPTIONS"
-              :placeholder="
-                t('ONBOARDING_NEXT.PLACEHOLDERS.SELECT_REFERRAL_SOURCE')
-              "
-            />
-          </OnboardingFormRow>
-        </template>
-      </OnboardingSection>
-    </OnboardingLayout>
-  </form>
-</template>

app/javascript/dashboard/routes/dashboard/onboarding/OnboardingFormRow.vue

@@ -1,18 +0,0 @@
-<script setup>
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-
-defineProps({
-  title: { type: String, required: true },
-  icon: { type: String, required: true },
-});
-</script>
-
-<template>
-  <div class="grid grid-cols-2 items-center px-3 py-3 border-t border-n-weak">
-    <div class="flex items-center gap-2">
-      <Icon :icon="icon" class="size-4 text-n-slate-9 flex-shrink-0" />
-      <span class="text-n-slate-11">{{ title }}</span>
-    </div>
-    <slot />
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/onboarding/OnboardingFormSelect.vue

@@ -1,37 +0,0 @@
-<script setup>
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-
-defineProps({
-  modelValue: { type: String, default: '' },
-  options: { type: Array, default: () => [] },
-  placeholder: { type: String, default: '' },
-  hasError: { type: Boolean, default: false },
-});
-
-defineEmits(['update:modelValue']);
-</script>
-
-<template>
-  <div class="relative flex items-center justify-end">
-    <select
-      :value="modelValue"
-      class="!h-auto !w-auto !py-0 !ps-0 !pe-[17px] !m-0 !rounded-none !bg-transparent !bg-none !outline-none text-sm text-end border-0 cursor-pointer appearance-none focus:outline-none focus:ring-0"
-      :class="[
-        modelValue ? 'text-n-slate-12' : 'text-n-slate-9',
-        { 'animate-shake': hasError },
-      ]"
-      @change="$emit('update:modelValue', $event.target.value)"
-    >
-      <option v-if="placeholder" value="" disabled>
-        {{ placeholder }}
-      </option>
-      <option v-for="opt in options" :key="opt.value" :value="opt.value">
-        {{ opt.label }}
-      </option>
-    </select>
-    <Icon
-      icon="i-lucide-chevron-down"
-      class="pointer-events-none absolute end-0 top-1/2 -translate-y-1/2 text-n-slate-9"
-    />
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/onboarding/OnboardingLayout.vue

@@ -1,120 +0,0 @@
-<script setup>
-import NextButton from 'dashboard/components-next/button/Button.vue';
-
-defineProps({
-  greeting: { type: String, required: true },
-  subtitle: { type: String, default: '' },
-  continueLabel: { type: String, default: 'Continue' },
-  isLoading: { type: Boolean, default: false },
-  disabled: { type: Boolean, default: false },
-});
-
-defineEmits(['continue']);
-</script>
-
-<template>
-  <div
-    class="relative flex text-body-main items-start justify-center w-full min-h-screen bg-n-surface-2 py-12 px-4 overflow-hidden"
-  >
-    <!-- Grid background with corner fade -->
-    <div
-      class="absolute inset-0 bg-[size:96px_96px] bg-[image:linear-gradient(to_right,rgb(var(--border-weak))_1px,transparent_1px),linear-gradient(to_bottom,rgb(var(--border-weak))_1px,transparent_1px)] [mask-image:radial-gradient(ellipse_80%_80%_at_100%_0%,black_5%,transparent_50%),radial-gradient(ellipse_80%_80%_at_0%_100%,black_5%,transparent_50%)] [mask-composite:add] [-webkit-mask-composite:source-over]"
-    />
-    <div class="relative w-full max-w-[580px]">
-      <div class="relative ps-12">
-        <!-- Timeline dotted line -->
-        <svg
-          class="absolute start-[16px] top-10 bottom-20 overflow-visible text-n-slate-5"
-          width="1"
-          height="100%"
-          preserveAspectRatio="none"
-        >
-          <line
-            x1="0"
-            y1="0"
-            x2="0"
-            y2="97%"
-            stroke="currentColor"
-            stroke-width="1"
-            stroke-dasharray="3 3"
-          />
-        </svg>
-
-        <!-- Greeting -->
-        <div class="mb-6 -ms-12 flex items-start gap-4">
-          <div
-            class="flex items-center justify-center w-8 h-8 z-10 flex-shrink-0"
-          >
-            <slot name="greeting-icon">
-              <span class="i-woot-onboarding-greeting size-4 text-n-slate-7" />
-            </slot>
-          </div>
-          <div>
-            <h1 class="text-heading-1 text-n-slate-12">
-              {{ greeting }}
-            </h1>
-            <p v-if="subtitle" class="text-sm text-n-slate-11">
-              {{ subtitle }}
-            </p>
-          </div>
-        </div>
-
-        <!-- Sections -->
-        <slot />
-      </div>
-
-      <!-- Continue button with curved connector -->
-      <div class="relative ps-12 overflow-visible">
-        <!-- Curved line (absolutely positioned, doesn't affect layout) -->
-        <svg
-          width="48"
-          height="40"
-          viewBox="0 0 47 40"
-          fill="none"
-          class="absolute start-0 top-0 overflow-visible rtl:-scale-x-100"
-        >
-          <defs>
-            <linearGradient
-              id="line-gradient"
-              x1="15"
-              y1="0"
-              x2="48"
-              y2="20"
-              gradientUnits="userSpaceOnUse"
-            >
-              <stop offset="0%" stop-color="rgb(var(--slate-5))" />
-              <stop offset="100%" stop-color="rgb(var(--blue-9))" />
-            </linearGradient>
-          </defs>
-          <path
-            d="M15.5 0 C15.5 24, 15.5 20, 48 20"
-            stroke="url(#line-gradient)"
-            stroke-width="1"
-            stroke-dasharray="3 3"
-            fill="none"
-          />
-        </svg>
-        <!-- Triangle pointer (positioned at button's leading edge, pointing inward) -->
-        <svg
-          width="6"
-          height="6"
-          viewBox="0 0 6 6"
-          fill="none"
-          class="absolute start-[42px] top-1/2 -translate-y-1/2 z-10 rtl:-scale-x-100"
-        >
-          <path d="M6 0L0 3L6 6Z" fill="rgb(var(--blue-9))" />
-        </svg>
-        <NextButton
-          type="submit"
-          blue
-          :is-loading="isLoading"
-          :disabled="disabled"
-          class="w-full justify-center"
-          @click="$emit('continue')"
-        >
-          {{ continueLabel }}
-        </NextButton>
-      </div>
-    </div>
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/onboarding/OnboardingSection.vue

@@ -1,49 +0,0 @@
-<script setup>
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-
-defineProps({
-  title: { type: String, required: true },
-  icon: { type: String, required: true },
-});
-</script>
-
-<template>
-  <div class="mb-5">
-    <!-- Section header with icon + triangles -->
-    <div class="flex items-center gap-4 mb-3 -ms-12">
-      <div class="flex flex-col items-center z-10 flex-shrink-0">
-        <svg
-          width="6"
-          height="5"
-          viewBox="0 0 6 5"
-          fill="none"
-          class="text-n-slate-5"
-        >
-          <path d="M3 0L6 5H0L3 0Z" fill="currentColor" />
-        </svg>
-        <div
-          class="flex items-center justify-center w-8 h-8 rounded-lg bg-n-solid-1 border border-n-weak"
-        >
-          <Icon :icon="icon" class="size-4 text-n-slate-11" />
-        </div>
-        <svg
-          width="6"
-          height="5"
-          viewBox="0 0 6 5"
-          fill="none"
-          class="text-n-slate-5"
-        >
-          <path d="M3 5L0 0H6L3 5Z" fill="currentColor" />
-        </svg>
-      </div>
-      <span class="text-heading-3 text-n-slate-12">
-        {{ title }}
-      </span>
-    </div>
-
-    <!-- Card -->
-    <div class="border border-n-weak rounded-xl overflow-hidden bg-n-surface-1">
-      <slot />
-    </div>
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/onboarding/constants.js

@@ -1,68 +0,0 @@
-export const COMPANY_SIZE_OPTIONS = [
-  { value: '1-10', label: '1 - 10' },
-  { value: '11-50', label: '11 - 50' },
-  { value: '51-200', label: '51 - 200' },
-  { value: '201-500', label: '201 - 500' },
-  { value: '500+', label: '500+' },
-];
-
-export const INDUSTRY_OPTIONS = [
-  { value: 'Aerospace & Defense', label: 'Aerospace & Defense' },
-  { value: 'Agriculture & Food', label: 'Agriculture & Food' },
-  {
-    value: 'Automotive & Transportation',
-    label: 'Automotive & Transportation',
-  },
-  { value: 'Chemicals & Materials', label: 'Chemicals & Materials' },
-  {
-    value: 'Construction & Built Environment',
-    label: 'Construction & Built Environment',
-  },
-  {
-    value: 'Consumer Packaged Goods (CPG)',
-    label: 'Consumer Packaged Goods (CPG)',
-  },
-  { value: 'Education', label: 'Education' },
-  { value: 'Entertainment', label: 'Entertainment' },
-  { value: 'Finance', label: 'Finance' },
-  { value: 'Government & Nonprofit', label: 'Government & Nonprofit' },
-  { value: 'Healthcare', label: 'Healthcare' },
-  { value: 'Hospitality & Tourism', label: 'Hospitality & Tourism' },
-  { value: 'Industrial & Energy', label: 'Industrial & Energy' },
-  { value: 'Legal & Compliance', label: 'Legal & Compliance' },
-  { value: 'Lifestyle & Leisure', label: 'Lifestyle & Leisure' },
-  { value: 'Logistics & Supply Chain', label: 'Logistics & Supply Chain' },
-  { value: 'Luxury & Fashion', label: 'Luxury & Fashion' },
-  { value: 'News & Media', label: 'News & Media' },
-  {
-    value: 'Professional Services & Agencies',
-    label: 'Professional Services & Agencies',
-  },
-  { value: 'Real Estate & PropTech', label: 'Real Estate & PropTech' },
-  { value: 'Retail & E-commerce', label: 'Retail & E-commerce' },
-  { value: 'Sports', label: 'Sports' },
-  { value: 'Technology', label: 'Technology' },
-  { value: 'Telecommunications', label: 'Telecommunications' },
-  { value: 'Other', label: 'Other' },
-];
-
-export const REFERRAL_SOURCE_OPTIONS = [
-  { value: 'google', label: 'Google' },
-  { value: 'reddit', label: 'Reddit' },
-  { value: 'twitter', label: 'Twitter/X' },
-  { value: 'linkedin', label: 'LinkedIn' },
-  { value: 'friend', label: 'Friend/Colleague' },
-  { value: 'blog', label: 'Blog/Article' },
-  { value: 'github', label: 'GitHub' },
-  { value: 'other', label: 'Other' },
-];
-
-export const USER_ROLE_OPTIONS = [
-  { value: 'founder', label: 'Founder/CEO' },
-  { value: 'product_manager', label: 'Product Manager' },
-  { value: 'engineering', label: 'Engineering' },
-  { value: 'support_lead', label: 'Support Lead' },
-  { value: 'marketing', label: 'Marketing' },
-  { value: 'sales', label: 'Sales' },
-  { value: 'other', label: 'Other' },
-];

app/javascript/dashboard/routes/dashboard/settings/automation/constants.js

@@ -74,12 +74,6 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_6,
       },
-      {
-        key: 'company_name',
-        name: 'COMPANY_NAME',
-        inputType: 'plain_text',
-        filterOperators: OPERATOR_TYPES_2,
-      },
       {
         key: 'labels',
         name: 'LABELS',
@@ -186,12 +180,6 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_6,
       },
-      {
-        key: 'company_name',
-        name: 'COMPANY_NAME',
-        inputType: 'plain_text',
-        filterOperators: OPERATOR_TYPES_2,
-      },
       {
         key: 'referer',
         name: 'REFERER_LINK',
@@ -326,12 +314,6 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_6,
       },
-      {
-        key: 'company_name',
-        name: 'COMPANY_NAME',
-        inputType: 'plain_text',
-        filterOperators: OPERATOR_TYPES_2,
-      },
       {
         key: 'assignee_id',
         name: 'ASSIGNEE_NAME',
@@ -478,12 +460,6 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_6,
       },
-      {
-        key: 'company_name',
-        name: 'COMPANY_NAME',
-        inputType: 'plain_text',
-        filterOperators: OPERATOR_TYPES_2,
-      },
       {
         key: 'team_id',
         name: 'TEAM_NAME',
@@ -614,12 +590,6 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_6,
       },
-      {
-        key: 'company_name',
-        name: 'COMPANY_NAME',
-        inputType: 'plain_text',
-        filterOperators: OPERATOR_TYPES_2,
-      },
       {
         key: 'team_id',
         name: 'TEAM_NAME',

app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue

@@ -145,7 +145,6 @@ const openDelete = inbox => {
               <ChannelName
                 :channel-type="inbox.channel_type"
                 :medium="inbox.medium"
-                :voice-enabled="inbox.voice_enabled"
                 class="text-body-main text-n-slate-11"
               />
             </div>

app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue

@@ -21,7 +21,6 @@ import PreChatFormSettings from './PreChatForm/Settings.vue';
 import WeeklyAvailability from './components/WeeklyAvailability.vue';
 import GreetingsEditor from 'shared/components/GreetingsEditor.vue';
 import ConfigurationPage from './settingsPage/ConfigurationPage.vue';
-import VoiceConfigurationPage from './settingsPage/VoiceConfigurationPage.vue';
 import CustomerSatisfactionPage from './settingsPage/CustomerSatisfactionPage.vue';
 import CollaboratorsPage from './settingsPage/CollaboratorsPage.vue';
 import BotConfiguration from './components/BotConfiguration.vue';
@@ -47,7 +46,6 @@ export default {
     BotConfiguration,
     CollaboratorsPage,
     ConfigurationPage,
-    VoiceConfigurationPage,
     CustomerSatisfactionPage,
     FacebookReauthorize,
     GreetingsEditor,
@@ -171,17 +169,19 @@ export default {
         },
       ];
 
-      visibleToAllChannelTabs = [
-        ...visibleToAllChannelTabs,
-        {
-          key: 'business-hours',
-          name: this.$t('INBOX_MGMT.TABS.BUSINESS_HOURS'),
-        },
-        {
-          key: 'csat',
-          name: this.$t('INBOX_MGMT.TABS.CSAT'),
-        },
-      ];
+      if (!this.isAVoiceChannel) {
+        visibleToAllChannelTabs = [
+          ...visibleToAllChannelTabs,
+          {
+            key: 'business-hours',
+            name: this.$t('INBOX_MGMT.TABS.BUSINESS_HOURS'),
+          },
+          {
+            key: 'csat',
+            name: this.$t('INBOX_MGMT.TABS.CSAT'),
+          },
+        ];
+      }
 
       if (this.isAWebWidgetInbox) {
         visibleToAllChannelTabs = [
@@ -197,6 +197,7 @@ export default {
         this.isATwilioChannel ||
         this.isALineChannel ||
         this.isAPIInbox ||
+        this.isAVoiceChannel ||
         (this.isAnEmailChannel && !this.inbox.provider) ||
         this.shouldShowWhatsAppConfiguration ||
         this.isAWebWidgetInbox
@@ -231,24 +232,6 @@ export default {
         ];
       }
 
-      if (
-        this.isATwilioChannel &&
-        this.inbox.phone_number &&
-        this.inbox.medium === 'sms' &&
-        this.isFeatureEnabledonAccount(
-          this.accountId,
-          FEATURE_FLAGS.CHANNEL_VOICE
-        )
-      ) {
-        visibleToAllChannelTabs = [
-          ...visibleToAllChannelTabs,
-          {
-            key: 'voice-configuration',
-            name: this.$t('INBOX_MGMT.TABS.VOICE'),
-          },
-        ];
-      }
-
       return visibleToAllChannelTabs;
     },
     currentInboxId() {
@@ -829,6 +812,7 @@ export default {
             </SettingsFieldSection>
 
             <SettingsFieldSection
+              v-if="!isAVoiceChannel"
               :label="$t('INBOX_MGMT.HELP_CENTER.LABEL')"
               :help-text="$t('INBOX_MGMT.HELP_CENTER.SUB_TEXT')"
             >
@@ -1256,12 +1240,6 @@ export default {
         >
           <ConfigurationPage :inbox="inbox" />
         </div>
-        <div
-          v-if="selectedTabKey === 'voice-configuration'"
-          class="mx-6 max-w-4xl"
-        >
-          <VoiceConfigurationPage :inbox="inbox" />
-        </div>
         <div v-if="selectedTabKey === 'csat'">
           <CustomerSatisfactionPage :inbox="inbox" />
         </div>

app/javascript/dashboard/routes/dashboard/settings/inbox/components/ChannelName.vue

@@ -12,10 +12,6 @@ const props = defineProps({
     type: String,
     default: '',
   },
-  voiceEnabled: {
-    type: Boolean,
-    default: false,
-  },
 });
 const getters = useStoreGetters();
 const { t } = useI18n();
@@ -34,6 +30,7 @@ const i18nMap = {
   'Channel::Api': 'API',
   'Channel::Instagram': 'INSTAGRAM',
   'Channel::Tiktok': 'TIKTOK',
+  'Channel::Voice': 'VOICE',
 };
 
 const twilioChannelName = () => {
@@ -48,9 +45,6 @@ const readableChannelName = computed(() => {
     return globalConfig.value.apiChannelName || t('INBOX_MGMT.CHANNELS.API');
   }
   if (props.channelType === 'Channel::TwilioSms') {
-    if (props.voiceEnabled) {
-      return t('INBOX_MGMT.CHANNELS.VOICE');
-    }
     return twilioChannelName();
   }
   return t(`INBOX_MGMT.CHANNELS.${i18nMap[props.channelType]}`);

app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue

@@ -208,6 +208,24 @@ export default {
       </NextButton>
     </SettingsFieldSection>
   </div>
+  <div v-else-if="isAVoiceChannel">
+    <SettingsFieldSection
+      :label="$t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_VOICE_URL_TITLE')"
+      :help-text="
+        $t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_VOICE_URL_SUBTITLE')
+      "
+    >
+      <woot-code :script="inbox.voice_call_webhook_url" lang="html" />
+    </SettingsFieldSection>
+    <SettingsFieldSection
+      :label="$t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_STATUS_URL_TITLE')"
+      :help-text="
+        $t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_STATUS_URL_SUBTITLE')
+      "
+    >
+      <woot-code :script="inbox.voice_status_webhook_url" lang="html" />
+    </SettingsFieldSection>
+  </div>
 
   <div v-else-if="isALineChannel">
     <SettingsFieldSection

app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/VoiceConfigurationPage.vue

@@ -1,156 +0,0 @@
-<script>
-import { useAlert } from 'dashboard/composables';
-import SettingsFieldSection from 'dashboard/components-next/Settings/SettingsFieldSection.vue';
-import SettingsToggleSection from 'dashboard/components-next/Settings/SettingsToggleSection.vue';
-import NextInput from 'dashboard/components-next/input/Input.vue';
-import NextButton from 'dashboard/components-next/button/Button.vue';
-
-export default {
-  components: {
-    SettingsFieldSection,
-    SettingsToggleSection,
-    NextInput,
-    NextButton,
-  },
-  props: {
-    inbox: {
-      type: Object,
-      default: () => ({}),
-    },
-  },
-  data() {
-    return {
-      voiceEnabled: this.inbox.voice_enabled || false,
-      apiKeySid: this.inbox.api_key_sid || '',
-      apiKeySecret: '',
-      isUpdating: false,
-    };
-  },
-  computed: {
-    isVoiceConfigured() {
-      return !!this.inbox.voice_configured;
-    },
-    hasApiKeySid() {
-      return !!this.inbox.api_key_sid;
-    },
-    hasExistingCredentials() {
-      return this.hasApiKeySid && !!this.inbox.has_api_key_secret;
-    },
-    needsCredentials() {
-      return (
-        this.voiceEnabled &&
-        !this.isVoiceConfigured &&
-        !this.hasExistingCredentials
-      );
-    },
-    needsApiKeySid() {
-      return this.needsCredentials && !this.hasApiKeySid;
-    },
-    isSubmitDisabled() {
-      if (!this.voiceEnabled) return false;
-      if (this.needsCredentials) {
-        if (this.needsApiKeySid && !this.apiKeySid) return true;
-        return !this.apiKeySecret;
-      }
-      return false;
-    },
-  },
-  watch: {
-    'inbox.voice_enabled'(val) {
-      this.voiceEnabled = val || false;
-    },
-    'inbox.api_key_sid'(val) {
-      this.apiKeySid = val || '';
-    },
-  },
-  methods: {
-    async updateVoiceSettings() {
-      this.isUpdating = true;
-      try {
-        const channelPayload = { voice_enabled: this.voiceEnabled };
-
-        if (this.needsCredentials) {
-          if (this.needsApiKeySid) {
-            channelPayload.api_key_sid = this.apiKeySid;
-          }
-          channelPayload.api_key_secret = this.apiKeySecret;
-        }
-
-        await this.$store.dispatch('inboxes/updateInbox', {
-          id: this.inbox.id,
-          formData: false,
-          channel: channelPayload,
-        });
-        this.apiKeySecret = '';
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-      } catch (error) {
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
-      } finally {
-        this.isUpdating = false;
-      }
-    },
-  },
-};
-</script>
-
-<template>
-  <div class="flex flex-col gap-6">
-    <SettingsToggleSection
-      v-model="voiceEnabled"
-      :header="$t('INBOX_MGMT.VOICE_CONFIGURATION.ENABLE_VOICE.LABEL')"
-      :description="
-        $t('INBOX_MGMT.VOICE_CONFIGURATION.ENABLE_VOICE.DESCRIPTION')
-      "
-    />
-
-    <div v-if="voiceEnabled && needsCredentials" class="flex flex-col gap-4">
-      <p class="text-sm text-n-slate-11">
-        {{ $t('INBOX_MGMT.VOICE_CONFIGURATION.CREDENTIALS.DESCRIPTION') }}
-      </p>
-      <NextInput
-        v-if="needsApiKeySid"
-        v-model="apiKeySid"
-        :label="$t('INBOX_MGMT.ADD.VOICE.TWILIO.API_KEY_SID.LABEL')"
-        :placeholder="$t('INBOX_MGMT.ADD.VOICE.TWILIO.API_KEY_SID.PLACEHOLDER')"
-      />
-      <NextInput
-        v-model="apiKeySecret"
-        type="password"
-        :label="$t('INBOX_MGMT.ADD.VOICE.TWILIO.API_KEY_SECRET.LABEL')"
-        :placeholder="
-          $t('INBOX_MGMT.ADD.VOICE.TWILIO.API_KEY_SECRET.PLACEHOLDER')
-        "
-      />
-    </div>
-
-    <div v-if="inbox.voice_enabled && inbox.voice_call_webhook_url">
-      <SettingsFieldSection
-        :label="$t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_VOICE_URL_TITLE')"
-        :help-text="
-          $t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_VOICE_URL_SUBTITLE')
-        "
-      >
-        <woot-code :script="inbox.voice_call_webhook_url" lang="html" />
-      </SettingsFieldSection>
-      <SettingsFieldSection
-        :label="
-          $t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_STATUS_URL_TITLE')
-        "
-        :help-text="
-          $t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_STATUS_URL_SUBTITLE')
-        "
-      >
-        <woot-code :script="inbox.voice_status_webhook_url" lang="html" />
-      </SettingsFieldSection>
-    </div>
-
-    <div>
-      <NextButton
-        :disabled="isSubmitDisabled"
-        :is-loading="isUpdating"
-        :label="$t('INBOX_MGMT.SETTINGS_POPUP.UPDATE')"
-        @click="updateVoiceSettings"
-      />
-    </div>
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/settings/profile/MfaManagementActions.vue

@@ -31,8 +31,6 @@ const backupCodesDialogRef = ref(null);
 // Form values
 const disablePassword = ref('');
 const disableOtpCode = ref('');
-const disableBackupCode = ref('');
-const useBackupCodeToDisable = ref(false);
 const regenerateOtpCode = ref('');
 
 // Utility functions
@@ -56,17 +54,10 @@ const downloadBackupCodes = () => {
 const handleDisableMfa = async () => {
   emit('disableMfa', {
     password: disablePassword.value,
-    otpCode: useBackupCodeToDisable.value ? '' : disableOtpCode.value,
-    backupCode: useBackupCodeToDisable.value ? disableBackupCode.value : '',
+    otpCode: disableOtpCode.value,
   });
 };
 
-const toggleDisableMethod = () => {
-  useBackupCodeToDisable.value = !useBackupCodeToDisable.value;
-  disableOtpCode.value = '';
-  disableBackupCode.value = '';
-};
-
 const handleRegenerateBackupCodes = async () => {
   emit('regenerateBackupCodes', {
     otpCode: regenerateOtpCode.value,
@@ -77,8 +68,6 @@ const handleRegenerateBackupCodes = async () => {
 const resetDisableForm = () => {
   disablePassword.value = '';
   disableOtpCode.value = '';
-  disableBackupCode.value = '';
-  useBackupCodeToDisable.value = false;
   disableDialogRef.value?.close();
 };
 
@@ -168,32 +157,12 @@ defineExpose({
           :label="$t('MFA_SETTINGS.DISABLE.PASSWORD')"
         />
         <Input
-          v-if="!useBackupCodeToDisable"
           v-model="disableOtpCode"
           type="text"
           maxlength="6"
           :label="$t('MFA_SETTINGS.DISABLE.OTP_CODE')"
           :placeholder="$t('MFA_SETTINGS.DISABLE.OTP_CODE_PLACEHOLDER')"
         />
-        <Input
-          v-else
-          v-model="disableBackupCode"
-          type="text"
-          maxlength="8"
-          :label="$t('MFA_SETTINGS.DISABLE.BACKUP_CODE')"
-          :placeholder="$t('MFA_SETTINGS.DISABLE.BACKUP_CODE_PLACEHOLDER')"
-        />
-        <Button
-          link
-          sm
-          type="button"
-          :label="
-            useBackupCodeToDisable
-              ? $t('MFA_SETTINGS.DISABLE.USE_OTP_CODE')
-              : $t('MFA_SETTINGS.DISABLE.USE_BACKUP_CODE')
-          "
-          @click="toggleDisableMethod"
-        />
       </div>
     </Dialog>
 

app/javascript/dashboard/routes/dashboard/settings/profile/MfaSettings.vue

@@ -104,9 +104,9 @@ const cancelSetup = () => {
 };
 
 // Disable MFA
-const disableMfa = async ({ password, otpCode, backupCode }) => {
+const disableMfa = async ({ password, otpCode }) => {
   try {
-    await mfaAPI.disable(password, { otpCode, backupCode });
+    await mfaAPI.disable(password, otpCode);
     mfaEnabled.value = false;
     backupCodesGenerated.value = false;
     managementActionsRef.value?.resetDisableForm();

app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue

@@ -132,10 +132,8 @@ const headers = computed(() => [
     </template>
   </BaseTable>
 
-  <div
-    class="sticky bottom-0 py-4 px-8 -mx-8 z-20 flex items-center justify-between bg-n-surface-1 border-t border-n-weak"
-  >
-    <p class="text-body-main text-n-slate-11 mb-0">
+  <div class="flex items-center justify-between mt-4">
+    <p class="text-body-main text-n-slate-11">
       {{
         $t('TEAMS_SETTINGS.AGENTS.SELECTED_COUNT', {
           selected: selectedAgents.length,

app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue

@@ -88,7 +88,7 @@ export default {
 </script>
 
 <template>
-  <div class="h-full w-full px-8 pt-8 col-span-6 overflow-auto">
+  <div class="h-full w-full p-8 col-span-6 overflow-auto">
     <form class="flex flex-col gap-4 mx-0" @submit.prevent="addAgents">
       <PageHeader
         :header-title="headerTitle"

app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue

@@ -103,7 +103,7 @@ export default {
 </script>
 
 <template>
-  <div class="h-full w-full px-8 pt-8 col-span-6 overflow-auto">
+  <div class="h-full w-full p-8 col-span-6 overflow-auto">
     <form class="flex flex-col gap-4 mx-0" @submit.prevent="addAgents">
       <PageHeader
         :header-title="headerTitle"

app/javascript/dashboard/routes/index.js

@@ -4,15 +4,13 @@ import { frontendURL } from '../helper/URLHelper';
 import dashboard from './dashboard/dashboard.routes';
 import store from 'dashboard/store';
 import { validateLoggedInRoutes } from '../helper/routeHelpers';
-import { isOnOnboardingView } from 'v3/helpers/RouteHelper';
 import AnalyticsHelper from '../helper/AnalyticsHelper';
 
-const ONBOARDING_STEPS = ['account_details', 'enrichment'];
 const routes = [...dashboard.routes];
 
 export const router = createRouter({ history: createWebHistory(), routes });
 
-export const validateAuthenticateRoutePermission = async (to, next) => {
+export const validateAuthenticateRoutePermission = (to, next) => {
   const { isLoggedIn, getCurrentUser: user } = store.getters;
 
   if (!isLoggedIn) {
@@ -29,25 +27,8 @@ export const validateAuthenticateRoutePermission = async (to, next) => {
     return next(frontendURL('no-accounts'));
   }
 
-  const routeAccountId = Number(to.params?.accountId || accountId);
-  const userAccount = accounts.find(a => a.id === routeAccountId);
-  const isAdmin = userAccount?.role === 'administrator';
-  const isActive = userAccount?.status === 'active';
-  const needsOnboarding =
-    ONBOARDING_STEPS.includes(userAccount?.onboarding_step) &&
-    isAdmin &&
-    isActive;
-
   if (to.name === 'no_accounts' || !to.name) {
-    const target = needsOnboarding ? 'onboarding' : 'dashboard';
-    return next(frontendURL(`accounts/${routeAccountId}/${target}`));
-  }
-
-  if (needsOnboarding && !isOnOnboardingView(to)) {
-    return next(frontendURL(`accounts/${routeAccountId}/onboarding`));
-  }
-  if (!needsOnboarding && isOnOnboardingView(to)) {
-    return next(frontendURL(`accounts/${routeAccountId}/dashboard`));
+    return next(frontendURL(`accounts/${accountId}/dashboard`));
   }
 
   const nextRoute = validateLoggedInRoutes(to, store.getters.getCurrentUser);
@@ -57,14 +38,15 @@ export const validateAuthenticateRoutePermission = async (to, next) => {
 export const initalizeRouter = () => {
   const userAuthentication = store.dispatch('setUser');
 
-  router.beforeEach(async (to, _from, next) => {
+  router.beforeEach((to, _from, next) => {
     AnalyticsHelper.page(to.name || '', {
       path: to.path,
       name: to.name,
     });
 
-    await userAuthentication;
-    await validateAuthenticateRoutePermission(to, next, store);
+    userAuthentication.then(() => {
+      return validateAuthenticateRoutePermission(to, next, store);
+    });
   });
 };
 

app/javascript/dashboard/routes/index.spec.js

@@ -12,9 +12,7 @@ vi.mock('../store', () => ({
         id: null,
         accounts: [],
       },
-      'accounts/getAccount': () => ({}),
     },
-    dispatch: vi.fn(() => Promise.resolve()),
   },
 }));
 
@@ -62,14 +60,14 @@ describe('#validateAuthenticateRoutePermission', () => {
     });
 
     describe('when route is not accessible to current user', () => {
-      it('should redirect to dashboard', async () => {
+      it('should redirect to dashboard', () => {
         const to = {
           name: 'general_settings_index',
           params: { accountId: 1 },
           meta: { permissions: ['administrator'] },
         };
 
-        await validateAuthenticateRoutePermission(to, next);
+        validateAuthenticateRoutePermission(to, next);
 
         expect(next).toHaveBeenCalledWith('/app/accounts/1/dashboard');
       });
@@ -92,14 +90,14 @@ describe('#validateAuthenticateRoutePermission', () => {
         };
       });
 
-      it('should go to the intended route', async () => {
+      it('should go to the intended route', () => {
         const to = {
           name: 'general_settings_index',
           params: { accountId: 1 },
           meta: { permissions: ['administrator'] },
         };
 
-        await validateAuthenticateRoutePermission(to, next);
+        validateAuthenticateRoutePermission(to, next);
 
         expect(next).toHaveBeenCalledWith();
       });

app/javascript/dashboard/store/modules/accounts.js

@@ -54,19 +54,18 @@ export const getters = {
 };
 
 export const actions = {
-  get: async ({ commit }, { silent } = {}) => {
-    if (!silent) {
-      commit(types.default.SET_ACCOUNT_UI_FLAG, { isFetchingItem: true });
-    }
+  get: async ({ commit }) => {
+    commit(types.default.SET_ACCOUNT_UI_FLAG, { isFetchingItem: true });
     try {
       const response = await AccountAPI.get();
       commit(types.default.ADD_ACCOUNT, response.data);
-    } catch {
-      // silent failure
-    } finally {
-      if (!silent) {
-        commit(types.default.SET_ACCOUNT_UI_FLAG, { isFetchingItem: false });
-      }
+      commit(types.default.SET_ACCOUNT_UI_FLAG, {
+        isFetchingItem: false,
+      });
+    } catch (error) {
+      commit(types.default.SET_ACCOUNT_UI_FLAG, {
+        isFetchingItem: false,
+      });
     }
   },
   update: async ({ commit }, { options, ...updateObj }) => {

app/javascript/dashboard/store/modules/auth.js

@@ -269,20 +269,6 @@ export const mutations = {
       accounts,
     };
   },
-  [types.RESET_ONBOARDING](_state, accountId) {
-    const accounts = _state.currentUser.accounts.map(account => {
-      if (account.id === accountId) {
-        const { onboarding_step, ...rest } = account;
-        return rest;
-      }
-      return account;
-    });
-
-    _state.currentUser = {
-      ..._state.currentUser,
-      accounts,
-    };
-  },
   [types.CLEAR_USER](_state) {
     _state.currentUser = initialState.currentUser;
   },

app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js

@@ -46,8 +46,8 @@
  * 2. Nested properties in additional_attributes (browser_language, referer, etc.)
  * 3. Nested properties in custom_attributes (conversation_type, etc.)
  */
-import { coerceToDate } from '@chatwoot/utils';
 import jsonLogic from 'json-logic-js';
+import { coerceToDate } from '@chatwoot/utils';
 
 /**
  * Gets a value from a conversation based on the attribute key
@@ -121,8 +121,7 @@ const resolveValue = candidate => {
  * @returns {Boolean} - Returns true if the values are considered equal according to filtering rules
  *
  * This function handles various equality scenarios:
- * 1. When both values are arrays (e.g. labels): matches if any filter value exists in the conversation array
- *    (mirrors the backend SQL `tag_id IN (...)` OR semantics)
+ * 1. When both values are arrays: checks if all items in filterValue exist in conversationValue
  * 2. When filterValue is an array but conversationValue is not: checks if conversationValue is included in filterValue
  * 3. Otherwise: performs strict equality comparison
  */
@@ -132,9 +131,8 @@ const equalTo = (filterValue, conversationValue) => {
     if (filterValue === 'all') return true;
 
     if (Array.isArray(conversationValue)) {
-      // For array values like labels, match if any filter value is present.
-      // Mirrors the backend SQL `tag_id IN (...)` (OR semantics).
-      return filterValue.some(val => conversationValue.includes(val));
+      // For array values like labels, check if any of the filter values exist in the array
+      return filterValue.every(val => conversationValue.includes(val));
     }
 
     if (!Array.isArray(conversationValue)) {

app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js

@@ -416,40 +416,6 @@ describe('filterHelpers', () => {
       expect(matchesFilters(conversation, filters)).toBe(true);
     });
 
-    // Multi-label equal_to uses OR semantics to mirror the backend SQL `tag_id IN (...)`:
-    // a conversation matches if ANY of the filter labels is on it.
-    it('should match conversation with equal_to operator when any of multiple filter labels is present', () => {
-      const conversation = { labels: ['support'] };
-      const filters = [
-        {
-          attribute_key: 'labels',
-          filter_operator: 'equal_to',
-          values: [
-            { id: 'support', name: 'Support' },
-            { id: 'urgent', name: 'Urgent' },
-          ],
-          query_operator: 'and',
-        },
-      ];
-      expect(matchesFilters(conversation, filters)).toBe(true);
-    });
-
-    it('should not match conversation with equal_to operator when none of multiple filter labels is present', () => {
-      const conversation = { labels: ['new'] };
-      const filters = [
-        {
-          attribute_key: 'labels',
-          filter_operator: 'equal_to',
-          values: [
-            { id: 'support', name: 'Support' },
-            { id: 'urgent', name: 'Urgent' },
-          ],
-          query_operator: 'and',
-        },
-      ];
-      expect(matchesFilters(conversation, filters)).toBe(false);
-    });
-
     it('should match conversation with is_present operator for labels', () => {
       const conversation = { labels: ['support', 'urgent', 'new'] };
       const filters = [

app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js

@@ -57,46 +57,4 @@ describe('#mutations', () => {
       );
     });
   });
-  describe('#RESET_ONBOARDING', () => {
-    it('removes onboarding_step from the targeted account', () => {
-      const state = {
-        currentUser: {
-          id: 1,
-          account_id: 1,
-          accounts: [
-            {
-              id: 1,
-              onboarding_step: 'account_details',
-              role: 'administrator',
-            },
-          ],
-        },
-      };
-      mutations[types.RESET_ONBOARDING](state, 1);
-      expect(state.currentUser.accounts[0]).not.toHaveProperty(
-        'onboarding_step'
-      );
-      expect(state.currentUser.accounts[0].role).toEqual('administrator');
-    });
-
-    it('targets the route account, not currentUser.account_id', () => {
-      const state = {
-        currentUser: {
-          id: 1,
-          account_id: 1,
-          accounts: [
-            { id: 1, onboarding_step: 'account_details' },
-            { id: 2, onboarding_step: 'account_details' },
-          ],
-        },
-      };
-      mutations[types.RESET_ONBOARDING](state, 2);
-      expect(state.currentUser.accounts[0].onboarding_step).toEqual(
-        'account_details'
-      );
-      expect(state.currentUser.accounts[1]).not.toHaveProperty(
-        'onboarding_step'
-      );
-    });
-  });
 });

app/javascript/dashboard/store/mutation-types.js

@@ -4,7 +4,6 @@ export default {
   SET_CURRENT_USER: 'SET_CURRENT_USER',
   SET_CURRENT_USER_AVAILABILITY: 'SET_CURRENT_USER_AVAILABILITY',
   SET_CURRENT_USER_AUTO_OFFLINE: 'SET_CURRENT_USER_AUTO_OFFLINE',
-  RESET_ONBOARDING: 'RESET_ONBOARDING',
   SET_CURRENT_USER_UI_SETTINGS: 'SET_CURRENT_USER_UI_SETTINGS',
   SET_CURRENT_USER_UI_FLAGS: 'SET_CURRENT_USER_UI_FLAGS',
 

app/javascript/sdk/IFrameHelper.js

@@ -42,19 +42,6 @@ const updateAuthCookie = (cookieContent, baseDomain = '') =>
     baseDomain,
   });
 
-const getTargetOrigin = () => {
-  const { baseUrl } = window.$chatwoot || {};
-  if (!baseUrl) {
-    return window.location.origin;
-  }
-  try {
-    const url = new URL(baseUrl);
-    return url.origin;
-  } catch {
-    return window.location.origin;
-  }
-};
-
 const updateCampaignReadStatus = baseDomain => {
   const expireBy = addHours(new Date(), 1);
   setCookieWithDomain('cw_snooze_campaigns_till', Number(expireBy), {
@@ -106,19 +93,13 @@ export const IFrameHelper = {
   getBubbleHolder: () => document.getElementsByClassName('woot--bubble-holder'),
   sendMessage: (key, value) => {
     const element = IFrameHelper.getAppFrame();
-    const targetOrigin = getTargetOrigin();
-    if (!targetOrigin) return;
     element.contentWindow.postMessage(
       `chatwoot-widget:${JSON.stringify({ event: key, ...value })}`,
-      targetOrigin
+      '*'
     );
   },
   initPostMessageCommunication: () => {
     window.onmessage = e => {
-      const expectedOrigin = getTargetOrigin();
-      if (!expectedOrigin || e.origin !== expectedOrigin) {
-        return;
-      }
       if (
         typeof e.data !== 'string' ||
         e.data.indexOf('chatwoot-widget:') !== 0

app/javascript/shared/mixins/inboxMixin.js

@@ -1,4 +1,4 @@
-import { INBOX_TYPES, isVoiceCallEnabled } from 'dashboard/helper/inbox';
+import { INBOX_TYPES } from 'dashboard/helper/inbox';
 
 export const INBOX_FEATURES = {
   REPLY_TO: 'replyTo',
@@ -59,8 +59,8 @@ export default {
     isALineChannel() {
       return this.channelType === INBOX_TYPES.LINE;
     },
-    voiceCallEnabled() {
-      return isVoiceCallEnabled(this.inbox);
+    isAVoiceChannel() {
+      return this.channelType === INBOX_TYPES.VOICE;
     },
     isAnEmailChannel() {
       return this.channelType === INBOX_TYPES.EMAIL;

app/jobs/agent_bots/webhook_job.rb

@@ -1,6 +1,6 @@
 class AgentBots::WebhookJob < WebhookJob
   queue_as :high
-  retry_on Webhooks::Trigger::RetryableError, wait: 3.seconds, attempts: 3 do |job, error|
+  retry_on RestClient::TooManyRequests, RestClient::InternalServerError, wait: 3.seconds, attempts: 3 do |job, error|
     url, payload, webhook_type = job.arguments
     kwargs = job.arguments.last.is_a?(Hash) ? job.arguments.last : {}
     Webhooks::Trigger.new(url, payload, webhook_type || :agent_bot_webhook, secret: kwargs[:secret],
@@ -9,7 +9,7 @@ class AgentBots::WebhookJob < WebhookJob
 
   def perform(url, payload, webhook_type = :agent_bot_webhook, secret: nil, delivery_id: nil)
     super(url, payload, webhook_type, secret: secret, delivery_id: delivery_id)
-  rescue Webhooks::Trigger::RetryableError => e
+  rescue RestClient::TooManyRequests, RestClient::InternalServerError => e
     Rails.logger.warn("[AgentBots::WebhookJob] attempt #{executions} failed #{e.class.name} payload=#{payload.to_json}")
     raise
   end

app/jobs/hook_job.rb

@@ -23,24 +23,13 @@ class HookJob < MutexApplicationJob
   private
 
   def process_slack_integration(hook, event_name, event_data)
+    return unless ['message.created'].include?(event_name)
+
     message = event_data[:message]
-
-    case event_name
-    when 'message.created'
-      if message.attachments.blank?
-        ::SendOnSlackJob.perform_later(message, hook)
-      else
-        ::SendOnSlackJob.set(wait: 2.seconds).perform_later(message, hook)
-      end
-    when 'message.updated'
-      # Only interactive bot messages store responses via content_attributes (submitted_values / submitted_email).
-      # Skip other content types to avoid unnecessary job enqueues on every message update.
-      return unless message.content_type.in?(Integrations::Slack::UpdateSlackMessageService::SUPPORTED_CONTENT_TYPES)
-      # Guard against redundant Slack updates when unrelated attributes change (e.g. status)
-      # while submitted_values is already present on the message.
-      return unless event_data[:previous_changes]&.key?('content_attributes')
-
-      ::UpdateSlackMessageJob.perform_later(message, hook)
+    if message.attachments.blank?
+      ::SendOnSlackJob.perform_later(message, hook)
+    else
+      ::SendOnSlackJob.set(wait: 2.seconds).perform_later(message, hook)
     end
   end
 

app/jobs/update_slack_message_job.rb

@@ -1,11 +0,0 @@
-class UpdateSlackMessageJob < MutexApplicationJob
-  queue_as :medium
-  retry_on LockAcquisitionError, wait: 1.second, attempts: 8
-
-  def perform(message, hook)
-    key = format(::Redis::Alfred::SLACK_MESSAGE_MUTEX, conversation_id: message.conversation_id, reference_id: hook.reference_id)
-    with_lock(key) do
-      Integrations::Slack::UpdateSlackMessageService.new(message: message, hook: hook).perform
-    end
-  end
-end

app/jobs/webhooks/whatsapp_events_job.rb

@@ -1,9 +1,5 @@
-class Webhooks::WhatsappEventsJob < MutexApplicationJob
+class Webhooks::WhatsappEventsJob < ApplicationJob
   queue_as :low
-  # Retry budget (19 × 2s = 38s) must exceed the 30s lock TTL set in `perform`, otherwise
-  # a webhook that arrives just after the lock is acquired can exhaust retries before the
-  # holder finishes and silently drop its message.
-  retry_on LockAcquisitionError, wait: 2.seconds, attempts: 20
 
   def perform(params = {})
     channel = find_channel_from_whatsapp_business_payload(params)
@@ -13,20 +9,6 @@ class Webhooks::WhatsappEventsJob < MutexApplicationJob
       return
     end
 
-    sender_id = contact_sender_id(params)
-    return process_events(channel, params) if sender_id.blank?
-
-    # Album uploads arrive as separate concurrent webhooks. Serialize per (inbox, contact)
-    # so the first webhook creates the conversation and the rest append to it.
-    # 30s TTL covers the attachment download + transaction — the default 1s expires
-    # mid-processing and lets a concurrent webhook re-acquire before the first commit.
-    key = format(::Redis::Alfred::WHATSAPP_MESSAGE_MUTEX, inbox_id: channel.inbox.id, sender_id: sender_id)
-    with_lock(key, 30.seconds) do
-      process_events(channel, params)
-    end
-  end
-
-  def process_events(channel, params)
     if message_echo_event?(params)
       handle_message_echo(channel, params)
     else
@@ -87,16 +69,6 @@ class Webhooks::WhatsappEventsJob < MutexApplicationJob
 
   private
 
-  # Echo payloads reverse the fields — `from` is the business number and `to` is the contact.
-  # Returns nil for status-only webhooks so they bypass the lock.
-  def contact_sender_id(params)
-    value = params.dig(:entry, 0, :changes, 0, :value) || params
-    message = (value[:messages] || value[:message_echoes])&.first
-    return if message.blank?
-
-    message[:to] || message[:from]
-  end
-
   def channel_is_inactive?(channel)
     return true if channel.blank?
     return true if channel.reauthorization_required?

app/listeners/hook_listener.rb

@@ -43,7 +43,7 @@ class HookListener < BaseListener
       next if hook.inbox.present? && hook.inbox != message.inbox
       next unless supported_hook_event?(hook, event.name)
 
-      HookJob.perform_later(hook, event.name, message: message, previous_changes: event.data[:previous_changes])
+      HookJob.perform_later(hook, event.name, message: message)
     end
   end
 
@@ -59,7 +59,7 @@ class HookListener < BaseListener
     return false if hook.disabled?
 
     supported_events_map = {
-      'slack' => ['message.created', 'message.updated'],
+      'slack' => ['message.created'],
       'dialogflow' => ['message.created', 'message.updated'],
       'google_translate' => ['message.created'],
       'leadsquared' => ['contact.updated', 'conversation.created', 'conversation.resolved']

app/models/account.rb

@@ -157,14 +157,6 @@ class Account < ApplicationRecord
     ISO_639.find(account_locale)&.english_name&.downcase || 'english'
   end
 
-  def onboarding_step
-    step = custom_attributes['onboarding_step']
-    return nil if step.blank?
-
-    enrichment_key = format(Redis::Alfred::ACCOUNT_ONBOARDING_ENRICHMENT, account_id: id)
-    Redis::Alfred.exists?(enrichment_key) ? 'enrichment' : step
-  end
-
   private
 
   def notify_creation

app/models/agent_bot.rb

@@ -32,7 +32,6 @@ class AgentBot < ApplicationRecord
   has_many :agent_bot_inboxes, dependent: :destroy_async
   has_many :inboxes, through: :agent_bot_inboxes
   has_many :messages, as: :sender, dependent: :nullify
-  has_many :platform_app_permissibles, as: :permissible, dependent: :destroy
   has_many :assigned_conversations, class_name: 'Conversation',
                                     foreign_key: :assignee_agent_bot_id,
                                     dependent: :nullify,

app/models/automation_rule.rb

@@ -35,7 +35,7 @@ class AutomationRule < ApplicationRecord
   scope :active, -> { where(active: true) }
 
   def conditions_attributes
-    %w[content email country_code status message_type browser_language assignee_id team_id referer city company_name inbox_id
+    %w[content email country_code status message_type browser_language assignee_id team_id referer city company inbox_id
        mail_subject phone_number priority conversation_language labels private_note]
   end
 

app/models/channel/twilio_sms.rb

@@ -4,7 +4,6 @@
 #
 #  id                             :bigint           not null, primary key
 #  account_sid                    :string           not null
-#  api_key_secret                 :string
 #  api_key_sid                    :string
 #  auth_token                     :string           not null
 #  content_templates              :jsonb
@@ -12,8 +11,6 @@
 #  medium                         :integer          default("sms")
 #  messaging_service_sid          :string
 #  phone_number                   :string
-#  twiml_app_sid                  :string
-#  voice_enabled                  :boolean          default(FALSE), not null
 #  created_at                     :datetime         not null
 #  updated_at                     :datetime         not null
 #  account_id                     :integer          not null
@@ -61,6 +58,8 @@ class Channel::TwilioSms < ApplicationRecord
     client.messages.create(**params)
   end
 
+  private
+
   def client
     if api_key_sid.present?
       Twilio::REST::Client.new(api_key_sid, auth_token, account_sid)
@@ -69,8 +68,6 @@ class Channel::TwilioSms < ApplicationRecord
     end
   end
 
-  private
-
   def send_message_from
     if messaging_service_sid?
       { messaging_service_sid: messaging_service_sid }
@@ -79,5 +76,3 @@ class Channel::TwilioSms < ApplicationRecord
     end
   end
 end
-
-Channel::TwilioSms.prepend_mod_with('Channel::TwilioSms')

app/models/concerns/sort_handler.rb

@@ -19,7 +19,7 @@ module SortHandler
     end
 
     def sort_on_waiting_since(sort_direction = :asc)
-      order(generate_sql_query("(waiting_since IS NULL), waiting_since #{sort_direction.to_s.upcase}, created_at ASC"))
+      order(generate_sql_query("waiting_since #{sort_direction.to_s.upcase} NULLS LAST, created_at ASC"))
     end
 
     def last_messaged_conversations

app/models/custom_attribute_definition.rb

@@ -25,7 +25,7 @@ class CustomAttributeDefinition < ApplicationRecord
   STANDARD_ATTRIBUTES = {
     :conversation => %w[status priority assignee_id inbox_id team_id display_id campaign_id labels browser_language country_code referer created_at
                         last_activity_at],
-    :contact => %w[name email phone_number identifier country_code city company_name created_at last_activity_at referer blocked]
+    :contact => %w[name email phone_number identifier country_code city created_at last_activity_at referer blocked]
   }.freeze
 
   scope :with_attribute_model, ->(attribute_model) { attribute_model.presence && where(attribute_model: attribute_model) }

app/models/user.rb

@@ -75,7 +75,6 @@ class User < ApplicationRecord
   # work because :validatable in devise overrides this.
   # validates_uniqueness_of :email, scope: :account_id
 
-  validates :name, presence: true
   validates :email, presence: true
 
   serialize :otp_backup_codes, type: Array

app/services/data_import/contact_manager.rb

@@ -61,7 +61,7 @@ class DataImport::ContactManager
   def update_contact_attributes(params, contact)
     contact.name = params[:name] if params[:name].present?
     contact.additional_attributes ||= {}
-    contact.additional_attributes[:company_name] = params[:company_name] if params[:company_name].present?
+    contact.additional_attributes[:company] = params[:company] if params[:company].present?
     contact.additional_attributes[:city] = params[:city] if params[:city].present?
     contact.assign_attributes(custom_attributes: contact.custom_attributes.merge(params.except(:identifier, :email, :name, :phone_number)))
   end

app/services/whatsapp/liquid_template_processor_service.rb

@@ -1,66 +0,0 @@
-class Whatsapp::LiquidTemplateProcessorService
-  LIQUID_EXPRESSION = /\{\{\s*(.+?)\s*\}\}/
-
-  module JsonEscapeFilter
-    def json_escape(input)
-      input.to_s.to_json[1..-2]
-    end
-  end
-
-  pattr_initialize [:campaign!, :contact!]
-
-  def process_template_params(template_params)
-    return template_params if template_params.blank?
-
-    template_params_copy = template_params.deep_dup
-    processed_params = template_params_copy['processed_params']
-
-    return template_params_copy if processed_params.blank?
-
-    rendered_params = render_liquid(processed_params)
-    return nil if blank_render?(processed_params, rendered_params)
-
-    template_params_copy.merge('processed_params' => rendered_params)
-  end
-
-  private
-
-  def render_liquid(processed_params)
-    raw = processed_params.to_json
-    rewritten = raw.gsub(LIQUID_EXPRESSION) { "{{ #{Regexp.last_match(1)} | json_escape }}" }
-    rendered = Liquid::Template.parse(rewritten).render!(drops, filters: [JsonEscapeFilter])
-    JSON.parse(rendered)
-  rescue Liquid::Error, JSON::ParserError
-    processed_params
-  end
-
-  def drops
-    {
-      'contact' => ContactDrop.new(contact),
-      'agent' => UserDrop.new(campaign.sender),
-      'inbox' => InboxDrop.new(campaign.inbox),
-      'account' => AccountDrop.new(campaign.account)
-    }
-  end
-
-  def blank_render?(original, rendered)
-    case original
-    when Hash then blank_render_in_hash?(original, rendered)
-    when Array then blank_render_in_array?(original, rendered)
-    when String then original.match?(LIQUID_EXPRESSION) && rendered.to_s.blank?
-    else false
-    end
-  end
-
-  def blank_render_in_hash?(original, rendered)
-    return false unless rendered.is_a?(Hash)
-
-    original.any? { |key, value| blank_render?(value, rendered[key]) }
-  end
-
-  def blank_render_in_array?(original, rendered)
-    return false unless rendered.is_a?(Array)
-
-    original.each_with_index.any? { |value, index| blank_render?(value, rendered[index]) }
-  end
-end

app/services/whatsapp/oneoff_campaign_service.rb

@@ -58,10 +58,7 @@ class Whatsapp::OneoffCampaignService
       return
     end
 
-    processed_template_params = process_liquid_template_params(contact)
-    return if processed_template_params.nil?
-
-    send_whatsapp_template_message(to: contact.phone_number, template_params: processed_template_params)
+    send_whatsapp_template_message(to: contact.phone_number)
   end
 
   def process_audience(audience_labels)
@@ -73,22 +70,10 @@ class Whatsapp::OneoffCampaignService
     Rails.logger.info "Campaign #{campaign.id} processing completed"
   end
 
-  def process_liquid_template_params(contact)
-    liquid_processor = Whatsapp::LiquidTemplateProcessorService.new(campaign: campaign, contact: contact)
-    processed_template_params = liquid_processor.process_template_params(campaign.template_params)
-
-    Rails.logger.info "Skipping contact #{contact.name} - liquid variables resolved to blank values" if processed_template_params.nil?
-
-    processed_template_params
-  rescue StandardError => e
-    Rails.logger.error "Failed to process liquid template params for contact #{contact.name}: #{e.message}"
-    nil
-  end
-
-  def send_whatsapp_template_message(to:, template_params:)
+  def send_whatsapp_template_message(to:)
     processor = Whatsapp::TemplateProcessorService.new(
       channel: channel,
-      template_params: template_params
+      template_params: campaign.template_params
     )
 
     name, namespace, lang_code, processed_parameters = processor.call

app/views/api/v1/models/_account.json.jbuilder

@@ -10,9 +10,7 @@ if resource.custom_attributes.present?
     json.company_size resource.custom_attributes['company_size'] if resource.custom_attributes['company_size'].present?
     json.timezone resource.custom_attributes['timezone'] if resource.custom_attributes['timezone'].present?
     json.logo resource.custom_attributes['logo'] if resource.custom_attributes['logo'].present?
-    json.referral_source resource.custom_attributes['referral_source'] if resource.custom_attributes['referral_source'].present?
-    json.brand_info resource.custom_attributes['brand_info'] if resource.custom_attributes['brand_info'].present?
-    json.onboarding_step resource.onboarding_step if resource.onboarding_step.present?
+    json.onboarding_step resource.custom_attributes['onboarding_step'] if resource.custom_attributes['onboarding_step'].present?
     json.marked_for_deletion_at resource.custom_attributes['marked_for_deletion_at'] if resource.custom_attributes['marked_for_deletion_at'].present?
     if resource.custom_attributes['marked_for_deletion_reason'].present?
       json.marked_for_deletion_reason resource.custom_attributes['marked_for_deletion_reason']

app/views/api/v1/models/_inbox.json.jbuilder

@@ -72,7 +72,6 @@ if resource.twilio?
   if Current.account_user&.administrator?
     json.auth_token resource.channel.try(:auth_token)
     json.account_sid resource.channel.try(:account_sid)
-    json.api_key_sid resource.channel.try(:api_key_sid)
   end
 end
 
@@ -132,13 +131,8 @@ if resource.whatsapp?
   json.reauthorization_required resource.channel.try(:reauthorization_required?)
 end
 
-## Voice attributes for TwilioSms
-if resource.twilio? && resource.channel.respond_to?(:voice_enabled?)
-  json.voice_enabled resource.channel.voice_enabled?
-  json.voice_configured resource.channel.try(:twiml_app_sid).present?
-  json.has_api_key_secret resource.channel.try(:api_key_secret).present?
-  if resource.channel.try(:twiml_app_sid).present?
-    json.voice_call_webhook_url resource.channel.try(:voice_call_webhook_url)
-    json.voice_status_webhook_url resource.channel.try(:voice_status_webhook_url)
-  end
+## Voice Channel Attributes
+if resource.channel_type == 'Channel::Voice'
+  json.voice_call_webhook_url resource.channel.try(:voice_call_webhook_url)
+  json.voice_status_webhook_url resource.channel.try(:voice_status_webhook_url)
 end

app/views/api/v1/models/_user.json.jbuilder

@@ -22,7 +22,6 @@ json.accounts do
     json.id account_user.account_id
     json.name account_user.account.name
     json.status account_user.account.status
-    json.onboarding_step account_user.account.onboarding_step
     json.active_at account_user.active_at
     json.role account_user.role
     json.permissions account_user.permissions

app/views/platform/api/v1/agent_bots/index.json.jbuilder

@@ -1,6 +1,3 @@
 json.array! @resources do |resource|
-  bot = resource.permissible
-  next if bot.nil?
-
-  json.partial! 'platform/api/v1/models/agent_bot', formats: [:json], resource: bot
+  json.partial! 'platform/api/v1/models/agent_bot', formats: [:json], resource: resource.permissible
 end

config/features.yml

@@ -191,10 +191,10 @@
 - name: assignment_v2
   display_name: Assignment V2
   enabled: true
-- name: captain_document_auto_sync
-  display_name: Captain Document Auto Sync
+- name: twilio_content_templates
+  display_name: Twilio Content Templates
   enabled: false
-  premium: true
+  deprecated: true
 - name: advanced_search
   display_name: Advanced Search
   enabled: false

config/initializers/sidekiq.rb

@@ -40,11 +40,6 @@ Rails.application.reloader.to_prepare do
   if File.exist?(schedule_file) && Sidekiq.server?
     schedule = YAML.load_file(schedule_file)
 
-    # Merge enterprise-only cron entries when running an enterprise build.
-    # Mirrors the conditional-load pattern already used for enterprise initializers.
-    enterprise_schedule_file = Rails.root.join('enterprise/config/schedule.yml')
-    schedule.merge!(YAML.load_file(enterprise_schedule_file)) if ChatwootApp.enterprise? && enterprise_schedule_file.exist?
-
     # Cron entries removed from schedule.yml but possibly still in Redis
     # with source:'dynamic' (predating the source tag). load_from_hash!
     # only cleans up source:'schedule' entries, so these need explicit removal.

config/locales/en.yml

@@ -379,9 +379,6 @@ en:
       limit_exceeded: 'Document limit exceeded'
       pdf_format_error: 'must be a PDF file'
       pdf_size_error: 'must be less than 10MB'
-      sync_not_supported_for_pdf: 'Sync is not supported for PDF documents'
-      sync_only_available_documents: 'Sync is only available for processed documents'
-      sync_already_in_progress: 'Document sync is already in progress'
       pdf_upload_failed: 'Failed to upload PDF to OpenAI'
       pdf_upload_success: 'PDF uploaded successfully with file_id: %{file_id}'
       pdf_processing_failed: 'Failed to process PDF document %{document_id}: %{error}'

config/routes.rb

@@ -77,9 +77,7 @@ Rails.application.routes.draw do
             resources :custom_tools do
               post :test, on: :collection
             end
-            resources :documents, only: [:index, :show, :create, :destroy] do
-              post :sync, on: :member
-            end
+            resources :documents, only: [:index, :show, :create, :destroy]
             resource :tasks, only: [], controller: 'tasks' do
               post :rewrite
               post :summarize

db/migrate/20260326120000_add_voice_to_channel_twilio_sms.rb

@@ -1,7 +0,0 @@
-class AddVoiceToChannelTwilioSms < ActiveRecord::Migration[7.0]
-  def change
-    add_column :channel_twilio_sms, :voice_enabled, :boolean, default: false, null: false
-    add_column :channel_twilio_sms, :twiml_app_sid, :string
-    add_column :channel_twilio_sms, :api_key_secret, :string
-  end
-end

db/migrate/20260326120001_drop_channel_voice.rb

@@ -1,20 +0,0 @@
-class DropChannelVoice < ActiveRecord::Migration[7.0]
-  def up
-    drop_table :channel_voice, if_exists: true
-  end
-
-  def down
-    create_table :channel_voice do |t|
-      t.string :phone_number, null: false
-      t.string :provider, null: false, default: 'twilio'
-      t.jsonb :provider_config, null: false
-      t.integer :account_id, null: false
-      t.jsonb :additional_attributes, default: {}
-
-      t.timestamps
-    end
-
-    add_index :channel_voice, :phone_number, unique: true
-    add_index :channel_voice, :account_id
-  end
-end

db/migrate/20260426011444_repurpose_twilio_content_templates_flag_for_captain_document_auto_sync.rb

@@ -1,22 +0,0 @@
-class RepurposeTwilioContentTemplatesFlagForCaptainDocumentAutoSync < ActiveRecord::Migration[7.1]
-  def up
-    # The twilio_content_templates flag (deprecated) has been renamed to captain_document_auto_sync.
-    # Disable it on any accounts that had twilio_content_templates enabled so the repurposed
-    # flag starts in its intended default-off state.
-    Account.feature_captain_document_auto_sync.find_each(batch_size: 100) do |account|
-      account.disable_features(:captain_document_auto_sync)
-      account.save!(validate: false)
-    end
-
-    # Remove the stale twilio_content_templates entry from ACCOUNT_LEVEL_FEATURE_DEFAULTS.
-    # ConfigLoader only adds new flags; it never removes renamed ones.
-    # Leaving it would cause NoMethodError in enable_default_features when
-    # creating new accounts (feature_twilio_content_templates= no longer exists).
-    config = InstallationConfig.find_by(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS')
-    return if config&.value.blank?
-
-    config.value = config.value.reject { |f| f['name'] == 'twilio_content_templates' }
-    config.save!
-    GlobalConfig.clear_cache
-  end
-end

db/migrate/20260427094500_rename_company_condition_key_in_automation_rules.rb

@@ -1,47 +0,0 @@
-class RenameCompanyConditionKeyInAutomationRules < ActiveRecord::Migration[7.1]
-  def up
-    migrate_automation_rule_conditions
-    migrate_contact_custom_filter_queries
-  end
-
-  def down; end
-
-  private
-
-  def migrate_automation_rule_conditions
-    AutomationRule.find_each do |rule|
-      conditions = rename_company_attribute_key(rule.conditions)
-
-      next if conditions == rule.conditions
-
-      rule.update_column(:conditions, conditions) # rubocop:disable Rails/SkipsModelValidations
-    end
-  end
-
-  def migrate_contact_custom_filter_queries
-    CustomFilter.contact.find_each do |filter|
-      query = filter.query.deep_dup
-      payload = rename_company_attribute_key(query['payload'])
-      next if payload == query['payload']
-
-      query['payload'] = payload
-      filter.update_column(:query, query) # rubocop:disable Rails/SkipsModelValidations
-    end
-  end
-
-  def rename_company_attribute_key(conditions)
-    return conditions unless conditions.is_a?(Array)
-
-    conditions.map do |condition|
-      next condition unless standard_company_condition?(condition)
-
-      condition.merge('attribute_key' => 'company_name')
-    end
-  end
-
-  def standard_company_condition?(condition)
-    condition['attribute_key'] == 'company' &&
-      condition['custom_attribute_type'].blank? &&
-      condition['attribute_model'].in?([nil, '', 'standard'])
-  end
-end

db/migrate/20260428120000_backfill_captain_document_sync_metadata.rb

@@ -1,18 +0,0 @@
-class BackfillCaptainDocumentSyncMetadata < ActiveRecord::Migration[7.0]
-  def up
-    return unless ChatwootApp.enterprise?
-
-    # rubocop:disable Rails/SkipsModelValidations
-    Captain::Document
-      .syncable
-      .where(status: :available, sync_status: nil, last_synced_at: nil)
-      .in_batches(of: 1000) do |batch|
-        batch.update_all('sync_status = 1, last_synced_at = updated_at')
-      end
-    # rubocop:enable Rails/SkipsModelValidations
-  end
-
-  def down
-    # No-op. This is a one-time baseline for existing available web documents.
-  end
-end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2026_04_28_120000) do
+ActiveRecord::Schema[7.1].define(version: 2026_04_10_092753) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -552,9 +552,6 @@ ActiveRecord::Schema[7.1].define(version: 2026_04_28_120000) do
     t.string "api_key_sid"
     t.jsonb "content_templates", default: {}
     t.datetime "content_templates_last_updated"
-    t.boolean "voice_enabled", default: false, null: false
-    t.string "twiml_app_sid"
-    t.string "api_key_secret"
     t.index ["account_sid", "phone_number"], name: "index_channel_twilio_sms_on_account_sid_and_phone_number", unique: true
     t.index ["messaging_service_sid"], name: "index_channel_twilio_sms_on_messaging_service_sid", unique: true
     t.index ["phone_number"], name: "index_channel_twilio_sms_on_phone_number", unique: true
@@ -571,6 +568,18 @@ ActiveRecord::Schema[7.1].define(version: 2026_04_28_120000) do
     t.index ["account_id", "profile_id"], name: "index_channel_twitter_profiles_on_account_id_and_profile_id", unique: true
   end
 
+  create_table "channel_voice", force: :cascade do |t|
+    t.string "phone_number", null: false
+    t.string "provider", default: "twilio", null: false
+    t.jsonb "provider_config", null: false
+    t.integer "account_id", null: false
+    t.jsonb "additional_attributes", default: {}
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_channel_voice_on_account_id"
+    t.index ["phone_number"], name: "index_channel_voice_on_phone_number", unique: true
+  end
+
   create_table "channel_web_widgets", id: :serial, force: :cascade do |t|
     t.string "website_url"
     t.integer "account_id"

enterprise/app/builders/enterprise/contact_inbox_builder.rb

@@ -2,13 +2,13 @@ module Enterprise::ContactInboxBuilder
   private
 
   def generate_source_id
-    return super unless twilio_voice_inbox?
+    return super unless @inbox.channel_type == 'Channel::Voice'
 
     phone_source_id
   end
 
   def phone_source_id
-    return super unless twilio_voice_inbox?
+    return super unless @inbox.channel_type == 'Channel::Voice'
 
     return SecureRandom.uuid if @contact.phone_number.blank?
 
@@ -16,10 +16,6 @@ module Enterprise::ContactInboxBuilder
   end
 
   def allowed_channels?
-    super || twilio_voice_inbox?
-  end
-
-  def twilio_voice_inbox?
-    @inbox.channel_type == 'Channel::TwilioSms' && @inbox.channel.voice_enabled?
+    super || @inbox.channel_type == 'Channel::Voice'
   end
 end

enterprise/app/builders/enterprise/messages/message_builder.rb

@@ -2,13 +2,8 @@ module Enterprise::Messages::MessageBuilder
   private
 
   def message_type
-    return @message_type if @message_type == 'incoming' && twilio_voice_inbox? && @params[:content_type] == 'voice_call'
+    return @message_type if @message_type == 'incoming' && @conversation.inbox.channel_type == 'Channel::Voice'
 
     super
   end
-
-  def twilio_voice_inbox?
-    inbox = @conversation.inbox
-    inbox.channel_type == 'Channel::TwilioSms' && inbox.channel.voice_enabled?
-  end
 end

enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb

@@ -7,10 +7,7 @@ class Api::V1::Accounts::Captain::BulkActionsController < Api::V1::Accounts::Bas
   MODEL_TYPE = %w[AssistantResponse AssistantDocument].freeze
 
   def create
-    result = process_bulk_action
-    return if performed?
-
-    @responses = result
+    @responses = process_bulk_action
   end
 
   private
@@ -18,13 +15,13 @@ class Api::V1::Accounts::Captain::BulkActionsController < Api::V1::Accounts::Bas
   def validate_params
     return if params[:type].present? && params[:ids].present? && params[:fields].present?
 
-    render json: { success: false }, status: :unprocessable_content
+    render json: { success: false }, status: :unprocessable_entity
   end
 
   def type_matches?
     return if MODEL_TYPE.include?(params[:type])
 
-    render json: { success: false }, status: :unprocessable_content
+    render json: { success: false }, status: :unprocessable_entity
   end
 
   def process_bulk_action
@@ -51,38 +48,13 @@ class Api::V1::Accounts::Captain::BulkActionsController < Api::V1::Accounts::Bas
   end
 
   def handle_documents
-    case params[:fields][:status]
-    when 'delete'
-      delete_documents
-    when 'sync'
-      sync_documents
-    else
-      []
-    end
-  end
+    return [] unless params[:fields][:status] == 'delete'
 
-  def delete_documents
     documents = Current.account.captain_documents.where(id: params[:ids])
-    return render json: { count: 0 } unless documents.exists?
+    return [] unless documents.exists?
 
-    destroyed_documents = documents.destroy_all
-    render json: { count: destroyed_documents.size }
-  end
-
-  def sync_documents
-    synced_document_ids = []
-
-    Current.account.captain_documents.where(id: params[:ids]).find_each(batch_size: 100) do |document|
-      next unless document.syncable?
-      next unless document.available?
-      next if document.sync_in_progress?
-
-      document.update!(sync_status: :syncing, last_sync_attempted_at: Time.current)
-      Captain::Documents::PerformSyncJob.perform_later(document)
-      synced_document_ids << document.id
-    end
-
-    render json: { ids: synced_document_ids, count: synced_document_ids.size }
+    documents.destroy_all
+    []
   end
 
   def permitted_params