From 85438cf58a84ada2f5d4d25ba11467407f3df8e0 Mon Sep 17 00:00:00 2001
From: Muhsin <muhsinkeramam@gmail.com>
Date: Thu, 26 Mar 2026 16:40:33 +0400
Subject: [PATCH] chore: add Twilio voice support to TwilioSms channel

---
 .../Contacts/VoiceCallButton.vue              |   6 +-
 .../components/ActionButtons.vue              |  11 +-
 .../components/ComposeNewConversationForm.vue |   5 +-
 .../components-next/icon/provider.js          |   7 +-
 .../dashboard/composables/useInbox.js         |  15 ++-
 app/javascript/dashboard/constants/editor.js  |   5 -
 app/javascript/dashboard/helper/inbox.js      |  27 ++--
 .../dashboard/settings/inbox/Settings.vue     |   6 +-
 .../settings/inbox/components/ChannelName.vue |   8 +-
 .../inbox/settingsPage/ConfigurationPage.vue  |  39 +++---
 app/javascript/shared/mixins/inboxMixin.js    |   6 +-
 app/models/campaign.rb                        |   2 +-
 app/models/channel/twilio_sms.rb              |   5 +
 app/models/contact.rb                         |   2 +-
 app/models/data_import.rb                     |  19 +--
 app/models/inbox.rb                           |   1 +
 app/models/super_admin.rb                     |   2 +-
 app/models/user.rb                            |   2 +-
 app/views/api/v1/models/_inbox.json.jbuilder  |   5 +-
 ...6120000_add_voice_to_channel_twilio_sms.rb |   7 +
 .../20260326120001_drop_channel_voice.rb      |  20 +++
 db/schema.rb                                  |  17 +--
 .../enterprise/contact_inbox_builder.rb       |  10 +-
 .../enterprise/messages/message_builder.rb    |   7 +-
 .../v1/accounts/contacts/calls_controller.rb  |  13 +-
 .../api/v1/accounts/inboxes_controller.rb     |  42 ++++--
 .../controllers/twilio/voice_controller.rb    |   4 +-
 enterprise/app/models/captain/document.rb     |   5 +
 enterprise/app/models/channel/voice.rb        | 122 ------------------
 enterprise/app/models/company.rb              |   2 +-
 .../models/enterprise/channel/twilio_sms.rb   |  68 ++++++++++
 .../app/models/enterprise/concerns/account.rb |   1 -
 .../contacts/contactable_inboxes_service.rb   |   4 +-
 .../twilio/voice_webhook_setup_service.rb     |  13 +-
 .../services/voice/provider/twilio/adapter.rb |   6 +-
 .../provider/twilio/conference_service.rb     |  13 +-
 .../voice/provider/twilio/token_service.rb    |  22 ++--
 spec/factories/channel/channel_voice.rb       |  21 ---
 spec/factories/channel/twilio_sms.rb          |   8 ++
 39 files changed, 290 insertions(+), 288 deletions(-)
 create mode 100644 db/migrate/20260326120000_add_voice_to_channel_twilio_sms.rb
 create mode 100644 db/migrate/20260326120001_drop_channel_voice.rb
 delete mode 100644 enterprise/app/models/channel/voice.rb
 create mode 100644 enterprise/app/models/enterprise/channel/twilio_sms.rb
 delete mode 100644 spec/factories/channel/channel_voice.rb

diff --git a/app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue b/app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue
index e9183ce9b..b258dc763 100644
--- a/app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue
+++ b/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 { INBOX_TYPES } from 'dashboard/helper/inbox';
+import { isVoiceCallEnabled } from 'dashboard/helper/inbox';
 import { useAlert } from 'dashboard/composables';
 import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
 import { useCallsStore } from 'dashboard/stores/calls';
@@ -34,9 +34,7 @@ const inboxesList = useMapGetter('inboxes/getInboxes');
 const contactsUiFlags = useMapGetter('contacts/getUIFlags');
 
 const voiceInboxes = computed(() =>
-  (inboxesList.value || []).filter(
-    inbox => inbox.channel_type === INBOX_TYPES.VOICE
-  )
+  (inboxesList.value || []).filter(isVoiceCallEnabled)
 );
 const hasVoiceInboxes = computed(() => voiceInboxes.value.length > 0);
 
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
index 686c7af14..f867fc3fe 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
@@ -8,8 +8,6 @@ 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';
@@ -29,6 +27,7 @@ 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,11 +80,13 @@ const isRegularMessageMode = computed(() => {
   return !props.isWhatsappInbox && !props.isTwilioWhatsAppInbox;
 });
 
-const isVoiceInbox = computed(() => props.channelType === INBOX_TYPES.VOICE);
+const voiceCallEnabled = computed(() => props.voiceEnabled);
 
 const shouldShowSignatureButton = computed(() => {
   return (
-    props.hasSelectedInbox && isRegularMessageMode.value && !isVoiceInbox.value
+    props.hasSelectedInbox &&
+    isRegularMessageMode.value &&
+    !voiceCallEnabled.value
   );
 });
 
@@ -110,7 +111,7 @@ watch(
   () => props.hasSelectedInbox,
   newValue => {
     nextTick(() => {
-      if (newValue && !isVoiceInbox.value) setSignature();
+      if (newValue && !voiceCallEnabled.value) setSignature();
     });
   },
   { immediate: true }
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue b/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
index 455abf996..4483bd97d 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
+++ b/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 } from 'dashboard/helper/inbox';
+import { INBOX_TYPES, isVoiceCallEnabled } from 'dashboard/helper/inbox';
 import {
   appendSignature,
   removeSignature,
@@ -100,6 +100,8 @@ 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)
 );
@@ -442,6 +444,7 @@ 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"
diff --git a/app/javascript/dashboard/components-next/icon/provider.js b/app/javascript/dashboard/components-next/icon/provider.js
index a5b99f84f..d7a9c93ad 100644
--- a/app/javascript/dashboard/components-next/icon/provider.js
+++ b/app/javascript/dashboard/components-next/icon/provider.js
@@ -1,4 +1,5 @@
 import { computed } from 'vue';
+import { isVoiceCallEnabled } from 'dashboard/helper/inbox';
 
 export function useChannelIcon(inbox) {
   const channelTypeIconMap = {
@@ -14,7 +15,6 @@ 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,6 +38,11 @@ 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';
   });
 
diff --git a/app/javascript/dashboard/composables/useInbox.js b/app/javascript/dashboard/composables/useInbox.js
index 632d3556b..6e8d0a52a 100644
--- a/app/javascript/dashboard/composables/useInbox.js
+++ b/app/javascript/dashboard/composables/useInbox.js
@@ -1,7 +1,11 @@
 import { computed } from 'vue';
 import { useMapGetter } from 'dashboard/composables/store';
 import { useCamelCase } from 'dashboard/composables/useTransformKeys';
-import { INBOX_TYPES } from 'dashboard/helper/inbox';
+import {
+  INBOX_TYPES,
+  isVoiceCallEnabled,
+  getVoiceCallProvider,
+} from 'dashboard/helper/inbox';
 
 export const INBOX_FEATURES = {
   REPLY_TO: 'replyTo',
@@ -134,9 +138,9 @@ export const useInbox = (inboxId = null) => {
     return channelType.value === INBOX_TYPES.TIKTOK;
   });
 
-  const isAVoiceChannel = computed(() => {
-    return channelType.value === INBOX_TYPES.VOICE;
-  });
+  const voiceCallEnabled = computed(() => isVoiceCallEnabled(inbox.value));
+
+  const voiceCallProvider = computed(() => getVoiceCallProvider(inbox.value));
 
   return {
     inbox,
@@ -156,6 +160,7 @@ export const useInbox = (inboxId = null) => {
     isAnEmailChannel,
     isAnInstagramChannel,
     isATiktokChannel,
-    isAVoiceChannel,
+    voiceCallEnabled,
+    voiceCallProvider,
   };
 };
diff --git a/app/javascript/dashboard/constants/editor.js b/app/javascript/dashboard/constants/editor.js
index d33af1a11..08fcc45d9 100644
--- a/app/javascript/dashboard/constants/editor.js
+++ b/app/javascript/dashboard/constants/editor.js
@@ -109,11 +109,6 @@ export const FORMATTING = {
       'redo',
     ],
   },
-  'Channel::Voice': {
-    marks: [],
-    nodes: [],
-    menu: [],
-  },
   'Channel::Tiktok': {
     marks: [],
     nodes: [],
diff --git a/app/javascript/dashboard/helper/inbox.js b/app/javascript/dashboard/helper/inbox.js
index 401739706..4bb2d5a00 100644
--- a/app/javascript/dashboard/helper/inbox.js
+++ b/app/javascript/dashboard/helper/inbox.js
@@ -11,9 +11,25 @@ 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;
+
+  if (inbox.channel_type === INBOX_TYPES.TWILIO && inbox.voice_enabled) {
+    return VOICE_CALL_PROVIDERS.TWILIO;
+  }
+
+  return null;
+};
+
+export const isVoiceCallEnabled = inbox => getVoiceCallProvider(inbox) !== null;
+
 export const TWILIO_CHANNEL_MEDIUM = {
   WHATSAPP: 'whatsapp',
   SMS: 'sms',
@@ -30,7 +46,6 @@ 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';
@@ -45,7 +60,6 @@ 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',
 };
 
@@ -58,7 +72,6 @@ export const getInboxSource = (type, phoneNumber, inbox) => {
 
     case INBOX_TYPES.TWILIO:
     case INBOX_TYPES.WHATSAPP:
-    case INBOX_TYPES.VOICE:
       return phoneNumber || '';
 
     case INBOX_TYPES.EMAIL:
@@ -97,9 +110,6 @@ export const getReadableInboxByType = (type, phoneNumber) => {
     case INBOX_TYPES.LINE:
       return 'line';
 
-    case INBOX_TYPES.VOICE:
-      return 'voice';
-
     default:
       return 'chat';
   }
@@ -142,9 +152,6 @@ export const getInboxClassByType = (type, phoneNumber) => {
     case INBOX_TYPES.TIKTOK:
       return 'brand-tiktok';
 
-    case INBOX_TYPES.VOICE:
-      return 'phone';
-
     default:
       return 'chat';
   }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 247bb30d8..c36852c8c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -142,7 +142,7 @@ export default {
         },
       ];
 
-      if (!this.isAVoiceChannel) {
+      if (!this.voiceCallEnabled) {
         visibleToAllChannelTabs = [
           ...visibleToAllChannelTabs,
           {
@@ -170,7 +170,7 @@ export default {
         this.isATwilioChannel ||
         this.isALineChannel ||
         this.isAPIInbox ||
-        this.isAVoiceChannel ||
+        this.voiceCallEnabled ||
         (this.isAnEmailChannel && !this.inbox.provider) ||
         this.shouldShowWhatsAppConfiguration ||
         this.isAWebWidgetInbox
@@ -742,7 +742,7 @@ export default {
             </SettingsFieldSection>
 
             <SettingsFieldSection
-              v-if="!isAVoiceChannel"
+              v-if="!voiceCallEnabled"
               :label="$t('INBOX_MGMT.HELP_CENTER.LABEL')"
               :help-text="$t('INBOX_MGMT.HELP_CENTER.SUB_TEXT')"
             >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/ChannelName.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/ChannelName.vue
index 1804e1224..5963d7c35 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/ChannelName.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/ChannelName.vue
@@ -12,6 +12,10 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  voiceCallEnabled: {
+    type: Boolean,
+    default: false,
+  },
 });
 const getters = useStoreGetters();
 const { t } = useI18n();
@@ -30,7 +34,6 @@ const i18nMap = {
   'Channel::Api': 'API',
   'Channel::Instagram': 'INSTAGRAM',
   'Channel::Tiktok': 'TIKTOK',
-  'Channel::Voice': 'VOICE',
 };
 
 const twilioChannelName = () => {
@@ -45,6 +48,9 @@ const readableChannelName = computed(() => {
     return globalConfig.value.apiChannelName || t('INBOX_MGMT.CHANNELS.API');
   }
   if (props.channelType === 'Channel::TwilioSms') {
+    if (props.voiceCallEnabled) {
+      return t('INBOX_MGMT.CHANNELS.VOICE');
+    }
     return twilioChannelName();
   }
   return t(`INBOX_MGMT.CHANNELS.${i18nMap[props.channelType]}`);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
index 0bfabb7b6..a174c947d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -189,7 +189,26 @@ export default {
 </script>
 
 <template>
-  <div v-if="isATwilioChannel">
+  <div v-if="voiceCallEnabled">
+    <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="isATwilioChannel">
     <SettingsFieldSection
       :label="$t('INBOX_MGMT.ADD.TWILIO.API_CALLBACK.TITLE')"
       :help-text="$t('INBOX_MGMT.ADD.TWILIO.API_CALLBACK.SUBTITLE')"
@@ -208,24 +227,6 @@ 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
diff --git a/app/javascript/shared/mixins/inboxMixin.js b/app/javascript/shared/mixins/inboxMixin.js
index 3fe04dc11..40579125b 100644
--- a/app/javascript/shared/mixins/inboxMixin.js
+++ b/app/javascript/shared/mixins/inboxMixin.js
@@ -1,4 +1,4 @@
-import { INBOX_TYPES } from 'dashboard/helper/inbox';
+import { INBOX_TYPES, isVoiceCallEnabled } from 'dashboard/helper/inbox';
 
 export const INBOX_FEATURES = {
   REPLY_TO: 'replyTo',
@@ -59,8 +59,8 @@ export default {
     isALineChannel() {
       return this.channelType === INBOX_TYPES.LINE;
     },
-    isAVoiceChannel() {
-      return this.channelType === INBOX_TYPES.VOICE;
+    voiceCallEnabled() {
+      return isVoiceCallEnabled(this.inbox);
     },
     isAnEmailChannel() {
       return this.channelType === INBOX_TYPES.EMAIL;
diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index 2927181c6..0f297762a 100644
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -10,7 +10,7 @@
 #  enabled                            :boolean          default(TRUE)
 #  message                            :text             not null
 #  scheduled_at                       :datetime
-#  template_params                    :jsonb
+#  template_params                    :jsonb            not null
 #  title                              :string           not null
 #  trigger_only_during_business_hours :boolean          default(FALSE)
 #  trigger_rules                      :jsonb
diff --git a/app/models/channel/twilio_sms.rb b/app/models/channel/twilio_sms.rb
index 2f9130cbb..326cb4f06 100644
--- a/app/models/channel/twilio_sms.rb
+++ b/app/models/channel/twilio_sms.rb
@@ -4,6 +4,7 @@
 #
 #  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
@@ -11,6 +12,8 @@
 #  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
@@ -76,3 +79,5 @@ class Channel::TwilioSms < ApplicationRecord
     end
   end
 end
+
+Channel::TwilioSms.prepend_mod_with('Channel::TwilioSms')
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 3badf478d..c876a564c 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -7,7 +7,7 @@
 #  id                    :integer          not null, primary key
 #  additional_attributes :jsonb
 #  blocked               :boolean          default(FALSE), not null
-#  contact_type          :integer          default("visitor")
+#  contact_type          :integer          default("lead")
 #  country_code          :string           default("")
 #  custom_attributes     :jsonb
 #  email                 :string
diff --git a/app/models/data_import.rb b/app/models/data_import.rb
index a44650a22..4df150464 100644
--- a/app/models/data_import.rb
+++ b/app/models/data_import.rb
@@ -2,15 +2,16 @@
 #
 # Table name: data_imports
 #
-#  id                :bigint           not null, primary key
-#  data_type         :string           not null
-#  processed_records :integer
-#  processing_errors :text
-#  status            :integer          default("pending"), not null
-#  total_records     :integer
-#  created_at        :datetime         not null
-#  updated_at        :datetime         not null
-#  account_id        :bigint           not null
+#  id                       :bigint           not null, primary key
+#  data_type                :string           not null
+#  non_identifiable_records :integer          default(0), not null
+#  processed_records        :integer
+#  processing_errors        :text
+#  status                   :integer          default("pending"), not null
+#  total_records            :integer
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  account_id               :bigint           not null
 #
 # Indexes
 #
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 0a26462ad..073e110fe 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -8,6 +8,7 @@
 #  allow_messages_after_resolved :boolean          default(TRUE)
 #  auto_assignment_config        :jsonb
 #  business_name                 :string
+#  channel_attributes            :jsonb
 #  channel_type                  :string
 #  csat_config                   :jsonb            not null
 #  csat_survey_enabled           :boolean          default(FALSE)
diff --git a/app/models/super_admin.rb b/app/models/super_admin.rb
index 9bcee9b8a..316d60c7b 100644
--- a/app/models/super_admin.rb
+++ b/app/models/super_admin.rb
@@ -19,7 +19,7 @@
 #  message_signature      :text
 #  name                   :string           not null
 #  otp_backup_codes       :text
-#  otp_required_for_login :boolean          default(FALSE)
+#  otp_required_for_login :boolean          default(FALSE), not null
 #  otp_secret             :string
 #  provider               :string           default("email"), not null
 #  pubsub_token           :string
diff --git a/app/models/user.rb b/app/models/user.rb
index 443df1ef6..19dd5af2a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -19,7 +19,7 @@
 #  message_signature      :text
 #  name                   :string           not null
 #  otp_backup_codes       :text
-#  otp_required_for_login :boolean          default(FALSE)
+#  otp_required_for_login :boolean          default(FALSE), not null
 #  otp_secret             :string
 #  provider               :string           default("email"), not null
 #  pubsub_token           :string
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index f0b5b1ea8..cd45471cb 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -130,8 +130,9 @@ if resource.whatsapp?
   json.reauthorization_required resource.channel.try(:reauthorization_required?)
 end
 
-## Voice Channel Attributes
-if resource.channel_type == 'Channel::Voice'
+## Voice attributes for TwilioSms
+if resource.twilio? && resource.channel.respond_to?(:voice_enabled?) && resource.channel.voice_enabled?
+  json.voice_enabled true
   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
diff --git a/db/migrate/20260326120000_add_voice_to_channel_twilio_sms.rb b/db/migrate/20260326120000_add_voice_to_channel_twilio_sms.rb
new file mode 100644
index 000000000..0051f7614
--- /dev/null
+++ b/db/migrate/20260326120000_add_voice_to_channel_twilio_sms.rb
@@ -0,0 +1,7 @@
+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
diff --git a/db/migrate/20260326120001_drop_channel_voice.rb b/db/migrate/20260326120001_drop_channel_voice.rb
new file mode 100644
index 000000000..6da514226
--- /dev/null
+++ b/db/migrate/20260326120001_drop_channel_voice.rb
@@ -0,0 +1,20 @@
+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
diff --git a/db/schema.rb b/db/schema.rb
index 81f1dfbdd..04ffd0f80 100644
--- a/db/schema.rb
+++ b/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_03_20_074636) do
+ActiveRecord::Schema[7.1].define(version: 2026_03_26_120001) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -521,6 +521,9 @@ ActiveRecord::Schema[7.1].define(version: 2026_03_20_074636) 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
@@ -537,18 +540,6 @@ ActiveRecord::Schema[7.1].define(version: 2026_03_20_074636) 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"
diff --git a/enterprise/app/builders/enterprise/contact_inbox_builder.rb b/enterprise/app/builders/enterprise/contact_inbox_builder.rb
index 043505f7f..e7ab48fd5 100644
--- a/enterprise/app/builders/enterprise/contact_inbox_builder.rb
+++ b/enterprise/app/builders/enterprise/contact_inbox_builder.rb
@@ -2,13 +2,13 @@ module Enterprise::ContactInboxBuilder
   private
 
   def generate_source_id
-    return super unless @inbox.channel_type == 'Channel::Voice'
+    return super unless twilio_voice_inbox?
 
     phone_source_id
   end
 
   def phone_source_id
-    return super unless @inbox.channel_type == 'Channel::Voice'
+    return super unless twilio_voice_inbox?
 
     return SecureRandom.uuid if @contact.phone_number.blank?
 
@@ -16,6 +16,10 @@ module Enterprise::ContactInboxBuilder
   end
 
   def allowed_channels?
-    super || @inbox.channel_type == 'Channel::Voice'
+    super || twilio_voice_inbox?
+  end
+
+  def twilio_voice_inbox?
+    @inbox.channel_type == 'Channel::TwilioSms' && @inbox.channel.voice_enabled?
   end
 end
diff --git a/enterprise/app/builders/enterprise/messages/message_builder.rb b/enterprise/app/builders/enterprise/messages/message_builder.rb
index 727248956..628b7ab0e 100644
--- a/enterprise/app/builders/enterprise/messages/message_builder.rb
+++ b/enterprise/app/builders/enterprise/messages/message_builder.rb
@@ -2,8 +2,13 @@ module Enterprise::Messages::MessageBuilder
   private
 
   def message_type
-    return @message_type if @message_type == 'incoming' && @conversation.inbox.channel_type == 'Channel::Voice'
+    return @message_type if @message_type == 'incoming' && twilio_voice_inbox?
 
     super
   end
+
+  def twilio_voice_inbox?
+    inbox = @conversation.inbox
+    inbox.channel_type == 'Channel::TwilioSms' && inbox.channel.voice_enabled?
+  end
 end
diff --git a/enterprise/app/controllers/api/v1/accounts/contacts/calls_controller.rb b/enterprise/app/controllers/api/v1/accounts/contacts/calls_controller.rb
index bcdd178fe..11a352325 100644
--- a/enterprise/app/controllers/api/v1/accounts/contacts/calls_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/contacts/calls_controller.rb
@@ -30,9 +30,14 @@ class Api::V1::Accounts::Contacts::CallsController < Api::V1::Accounts::BaseCont
   end
 
   def voice_inbox
-    @voice_inbox ||= Current.user.assigned_inboxes.where(
-      account_id: Current.account.id,
-      channel_type: 'Channel::Voice'
-    ).find(params.require(:inbox_id))
+    @voice_inbox ||= begin
+      inbox = Current.user.assigned_inboxes.where(
+        account_id: Current.account.id,
+        channel_type: 'Channel::TwilioSms'
+      ).find(params.require(:inbox_id))
+      raise ActiveRecord::RecordNotFound, 'Voice not enabled' unless inbox.channel.voice_enabled?
+
+      inbox
+    end
   end
 end
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
index 396c3a91d..7c51b2f66 100644
--- a/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
@@ -14,20 +14,38 @@ module Enterprise::Api::V1::Accounts::InboxesController
   end
 
   def channel_type_from_params
-    case permitted_params[:channel][:type]
-    when 'voice'
-      Channel::Voice
-    else
-      super
-    end
+    return Channel::TwilioSms if permitted_params[:channel][:type] == 'voice'
+
+    super
   end
 
   def account_channels_method
-    case permitted_params[:channel][:type]
-    when 'voice'
-      Current.account.voice_channels
-    else
-      super
-    end
+    return Current.account.twilio_sms if permitted_params[:channel][:type] == 'voice'
+
+    super
+  end
+
+  def create_channel
+    return create_voice_channel if permitted_params[:channel][:type] == 'voice'
+
+    super
+  end
+
+  def create_voice_channel
+    voice_params = params.require(:channel).permit(
+      :phone_number, :provider,
+      provider_config: [:account_sid, :auth_token, :api_key_sid, :api_key_secret]
+    )
+    config = voice_params[:provider_config] || {}
+
+    Current.account.twilio_sms.create!(
+      phone_number: voice_params[:phone_number],
+      account_sid: config[:account_sid],
+      auth_token: config[:auth_token],
+      api_key_sid: config[:api_key_sid],
+      api_key_secret: config[:api_key_secret],
+      medium: :sms,
+      voice_enabled: true
+    )
   end
 end
diff --git a/enterprise/app/controllers/twilio/voice_controller.rb b/enterprise/app/controllers/twilio/voice_controller.rb
index aa2696b31..fdadd334c 100644
--- a/enterprise/app/controllers/twilio/voice_controller.rb
+++ b/enterprise/app/controllers/twilio/voice_controller.rb
@@ -170,7 +170,9 @@ class Twilio::VoiceController < ApplicationController
   def set_inbox!
     digits = params[:phone].to_s.gsub(/\D/, '')
     e164 = "+#{digits}"
-    channel = Channel::Voice.find_by!(phone_number: e164)
+    channel = Channel::TwilioSms.find_by!(phone_number: e164)
+    raise ActiveRecord::RecordNotFound, "Voice not enabled for #{e164}" unless channel.voice_enabled?
+
     @inbox = channel.inbox
   end
 
diff --git a/enterprise/app/models/captain/document.rb b/enterprise/app/models/captain/document.rb
index 751162b28..bde735ac3 100644
--- a/enterprise/app/models/captain/document.rb
+++ b/enterprise/app/models/captain/document.rb
@@ -4,9 +4,12 @@
 #
 #  id            :bigint           not null, primary key
 #  content       :text
+#  content_type  :string
 #  external_link :string           not null
+#  file_size     :bigint
 #  metadata      :jsonb
 #  name          :string
+#  source_type   :string           default("url")
 #  status        :integer          default("in_progress"), not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
@@ -18,6 +21,8 @@
 #  index_captain_documents_on_account_id                      (account_id)
 #  index_captain_documents_on_assistant_id                    (assistant_id)
 #  index_captain_documents_on_assistant_id_and_external_link  (assistant_id,external_link) UNIQUE
+#  index_captain_documents_on_content_type                    (content_type)
+#  index_captain_documents_on_source_type                     (source_type)
 #  index_captain_documents_on_status                          (status)
 #
 class Captain::Document < ApplicationRecord
diff --git a/enterprise/app/models/channel/voice.rb b/enterprise/app/models/channel/voice.rb
deleted file mode 100644
index dbb9931df..000000000
--- a/enterprise/app/models/channel/voice.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-# == Schema Information
-#
-# Table name: channel_voice
-#
-#  id                    :bigint           not null, primary key
-#  additional_attributes :jsonb
-#  phone_number          :string           not null
-#  provider              :string           default("twilio"), not null
-#  provider_config       :jsonb            not null
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  account_id            :integer          not null
-#
-# Indexes
-#
-#  index_channel_voice_on_account_id    (account_id)
-#  index_channel_voice_on_phone_number  (phone_number) UNIQUE
-#
-class Channel::Voice < ApplicationRecord
-  include Channelable
-
-  self.table_name = 'channel_voice'
-
-  validates :phone_number, presence: true, uniqueness: true
-  validates :provider, presence: true
-  validates :provider_config, presence: true
-
-  # Validate phone number format (E.164 format)
-  validates :phone_number, format: { with: /\A\+[1-9]\d{1,14}\z/ }
-
-  # Provider-specific configs stored in JSON
-  validate :validate_provider_config
-  before_validation :provision_twilio_on_create, on: :create, if: :twilio?
-
-  EDITABLE_ATTRS = [:phone_number, :provider, { provider_config: {} }].freeze
-
-  def name
-    "Voice (#{phone_number})"
-  end
-
-  def messaging_window_enabled?
-    false
-  end
-
-  def initiate_call(to:, conference_sid: nil, agent_id: nil)
-    case provider
-    when 'twilio'
-      Voice::Provider::Twilio::Adapter.new(self).initiate_call(
-        to: to,
-        conference_sid: conference_sid,
-        agent_id: agent_id
-      )
-    else
-      raise "Unsupported voice provider: #{provider}"
-    end
-  end
-
-  # Public URLs used to configure Twilio webhooks
-  def voice_call_webhook_url
-    digits = phone_number.delete_prefix('+')
-    Rails.application.routes.url_helpers.twilio_voice_call_url(phone: digits)
-  end
-
-  def voice_status_webhook_url
-    digits = phone_number.delete_prefix('+')
-    Rails.application.routes.url_helpers.twilio_voice_status_url(phone: digits)
-  end
-
-  private
-
-  def twilio?
-    provider == 'twilio'
-  end
-
-  def validate_provider_config
-    return if provider_config.blank?
-
-    case provider
-    when 'twilio'
-      validate_twilio_config
-    end
-  end
-
-  def validate_twilio_config
-    config = provider_config.with_indifferent_access
-    # Require credentials and provisioned TwiML App SID
-    required_keys = %w[account_sid auth_token api_key_sid api_key_secret twiml_app_sid]
-    required_keys.each do |key|
-      errors.add(:provider_config, "#{key} is required for Twilio provider") if config[key].blank?
-    end
-  end
-
-  def provider_config_hash
-    if provider_config.is_a?(Hash)
-      provider_config
-    else
-      JSON.parse(provider_config.to_s)
-    end
-  end
-
-  def provision_twilio_on_create
-    service = ::Twilio::VoiceWebhookSetupService.new(channel: self)
-    app_sid = service.perform
-    return if app_sid.blank?
-
-    cfg = provider_config.with_indifferent_access
-    cfg[:twiml_app_sid] = app_sid
-    self.provider_config = cfg
-  rescue StandardError => e
-    error_details = {
-      error_class: e.class.to_s,
-      message: e.message,
-      phone_number: phone_number,
-      account_id: account_id,
-      backtrace: e.backtrace&.first(5)
-    }
-    Rails.logger.error("TWILIO_VOICE_SETUP_ON_CREATE_ERROR: #{error_details}")
-    errors.add(:base, "Twilio setup failed: #{e.message}")
-  end
-
-  public :provider_config_hash
-end
diff --git a/enterprise/app/models/company.rb b/enterprise/app/models/company.rb
index 8581675bd..5649f2545 100644
--- a/enterprise/app/models/company.rb
+++ b/enterprise/app/models/company.rb
@@ -3,7 +3,7 @@
 # Table name: companies
 #
 #  id             :bigint           not null, primary key
-#  contacts_count :integer
+#  contacts_count :integer          default(0), not null
 #  description    :text
 #  domain         :string
 #  name           :string           not null
diff --git a/enterprise/app/models/enterprise/channel/twilio_sms.rb b/enterprise/app/models/enterprise/channel/twilio_sms.rb
new file mode 100644
index 000000000..d58a87bf9
--- /dev/null
+++ b/enterprise/app/models/enterprise/channel/twilio_sms.rb
@@ -0,0 +1,68 @@
+module Enterprise::Channel::TwilioSms
+  extend ActiveSupport::Concern
+
+  def self.prepended(base)
+    base.class_eval do
+      encrypts :api_key_secret if Chatwoot.encryption_configured?
+
+      validate :voice_requires_phone_number, if: :voice_enabled?
+      before_validation :provision_twiml_app, on: :create, if: :voice_enabled?
+      before_validation :provision_twiml_app_on_update, on: :update, if: :voice_enabled_changed_to_true?
+    end
+  end
+
+  def voice_enabled?
+    voice_enabled
+  end
+
+  def initiate_call(to:, conference_sid: nil, agent_id: nil)
+    Voice::Provider::Twilio::Adapter.new(self).initiate_call(
+      to: to,
+      conference_sid: conference_sid,
+      agent_id: agent_id
+    )
+  end
+
+  def voice_call_webhook_url
+    digits = phone_number.delete_prefix('+')
+    Rails.application.routes.url_helpers.twilio_voice_call_url(phone: digits)
+  end
+
+  def voice_status_webhook_url
+    digits = phone_number.delete_prefix('+')
+    Rails.application.routes.url_helpers.twilio_voice_status_url(phone: digits)
+  end
+
+  private
+
+  # Override: when api_key_secret is stored separately (voice channels),
+  # use it instead of auth_token for API key authentication.
+  # Existing SMS channels store the secret in auth_token — that path is unchanged via super.
+  def client
+    if api_key_sid.present? && api_key_secret.present?
+      Twilio::REST::Client.new(api_key_sid, api_key_secret, account_sid)
+    else
+      super
+    end
+  end
+
+  def voice_requires_phone_number
+    return if phone_number.present?
+
+    errors.add(:base, 'Voice calling requires a phone number and cannot be used with messaging service SID')
+  end
+
+  def voice_enabled_changed_to_true?
+    voice_enabled? && voice_enabled_changed?
+  end
+
+  def provision_twiml_app
+    service = ::Twilio::VoiceWebhookSetupService.new(channel: self)
+    self.twiml_app_sid = service.perform
+  rescue StandardError => e
+    Rails.logger.error("TWILIO_VOICE_SETUP_ERROR: #{e.class} #{e.message} phone=#{phone_number} account=#{account_id}")
+    errors.add(:base, "Twilio voice setup failed: #{e.message}")
+  end
+
+  alias provision_twiml_app_on_update provision_twiml_app
+end
diff --git a/enterprise/app/models/enterprise/concerns/account.rb b/enterprise/app/models/enterprise/concerns/account.rb
index 01693ac79..feb22043d 100644
--- a/enterprise/app/models/enterprise/concerns/account.rb
+++ b/enterprise/app/models/enterprise/concerns/account.rb
@@ -16,7 +16,6 @@ module Enterprise::Concerns::Account
 
     has_many :copilot_threads, dependent: :destroy_async
     has_many :companies, dependent: :destroy_async
-    has_many :voice_channels, dependent: :destroy_async, class_name: '::Channel::Voice'
 
     has_one :saml_settings, dependent: :destroy_async, class_name: 'AccountSamlSettings'
   end
diff --git a/enterprise/app/services/enterprise/contacts/contactable_inboxes_service.rb b/enterprise/app/services/enterprise/contacts/contactable_inboxes_service.rb
index 546d5f4bc..ce6e2a64b 100644
--- a/enterprise/app/services/enterprise/contacts/contactable_inboxes_service.rb
+++ b/enterprise/app/services/enterprise/contacts/contactable_inboxes_service.rb
@@ -1,9 +1,9 @@
 module Enterprise::Contacts::ContactableInboxesService
   private
 
-  # Extend base selection to include Voice inboxes
+  # Extend base selection to include voice-enabled TwilioSms inboxes
   def get_contactable_inbox(inbox)
-    return voice_contactable_inbox(inbox) if inbox.channel_type == 'Channel::Voice'
+    return voice_contactable_inbox(inbox) if inbox.channel_type == 'Channel::TwilioSms' && inbox.channel.voice_enabled?
 
     super
   end
diff --git a/enterprise/app/services/twilio/voice_webhook_setup_service.rb b/enterprise/app/services/twilio/voice_webhook_setup_service.rb
index c1da2f24a..8040bc70e 100644
--- a/enterprise/app/services/twilio/voice_webhook_setup_service.rb
+++ b/enterprise/app/services/twilio/voice_webhook_setup_service.rb
@@ -58,17 +58,11 @@ class Twilio::VoiceWebhookSetupService
   end
 
   def api_key_client
-    @api_key_client ||= begin
-      cfg = channel.provider_config.with_indifferent_access
-      ::Twilio::REST::Client.new(cfg[:api_key_sid], cfg[:api_key_secret], cfg[:account_sid])
-    end
+    @api_key_client ||= ::Twilio::REST::Client.new(channel.api_key_sid, channel.api_key_secret, channel.account_sid)
   end
 
   def token_client
-    @token_client ||= begin
-      cfg = channel.provider_config.with_indifferent_access
-      ::Twilio::REST::Client.new(cfg[:account_sid], cfg[:auth_token])
-    end
+    @token_client ||= ::Twilio::REST::Client.new(channel.account_sid, channel.auth_token)
   end
 
   def log_twilio_error(context, error)
@@ -80,11 +74,10 @@ class Twilio::VoiceWebhookSetupService
   end
 
   def build_error_details(context, error)
-    cfg = channel.provider_config.with_indifferent_access
     {
       context: context,
       phone_number: channel.phone_number,
-      account_sid: cfg[:account_sid],
+      account_sid: channel.account_sid,
       error_class: error.class.to_s,
       message: error.message
     }
diff --git a/enterprise/app/services/voice/provider/twilio/adapter.rb b/enterprise/app/services/voice/provider/twilio/adapter.rb
index 061143f03..b72ed3369 100644
--- a/enterprise/app/services/voice/provider/twilio/adapter.rb
+++ b/enterprise/app/services/voice/provider/twilio/adapter.rb
@@ -43,10 +43,6 @@ class Voice::Provider::Twilio::Adapter
   end
 
   def twilio_client
-    Twilio::REST::Client.new(config['account_sid'], config['auth_token'])
-  end
-
-  def config
-    @config ||= @channel.provider_config_hash
+    Twilio::REST::Client.new(@channel.account_sid, @channel.auth_token)
   end
 end
diff --git a/enterprise/app/services/voice/provider/twilio/conference_service.rb b/enterprise/app/services/voice/provider/twilio/conference_service.rb
index 5daea8733..9f87fd354 100644
--- a/enterprise/app/services/voice/provider/twilio/conference_service.rb
+++ b/enterprise/app/services/voice/provider/twilio/conference_service.rb
@@ -33,14 +33,9 @@ class Voice::Provider::Twilio::ConferenceService
   end
 
   def twilio_client
-    @twilio_client ||= ::Twilio::REST::Client.new(account_sid, auth_token)
-  end
-
-  def account_sid
-    @account_sid ||= conversation.inbox.channel.provider_config_hash['account_sid']
-  end
-
-  def auth_token
-    @auth_token ||= conversation.inbox.channel.provider_config_hash['auth_token']
+    @twilio_client ||= begin
+      channel = conversation.inbox.channel
+      ::Twilio::REST::Client.new(channel.account_sid, channel.auth_token)
+    end
   end
 end
diff --git a/enterprise/app/services/voice/provider/twilio/token_service.rb b/enterprise/app/services/voice/provider/twilio/token_service.rb
index cee4c1887..a2769b587 100644
--- a/enterprise/app/services/voice/provider/twilio/token_service.rb
+++ b/enterprise/app/services/voice/provider/twilio/token_service.rb
@@ -6,20 +6,20 @@ class Voice::Provider::Twilio::TokenService
       token: access_token.to_jwt,
       identity: identity,
       voice_enabled: true,
-      account_sid: config['account_sid'],
+      account_sid: channel.account_sid,
       agent_id: user.id,
       account_id: account.id,
       inbox_id: inbox.id,
-      phone_number: inbox.channel.phone_number,
+      phone_number: channel.phone_number,
       twiml_endpoint: twiml_url,
-      has_twiml_app: config['twiml_app_sid'].present?
+      has_twiml_app: channel.twiml_app_sid.present?
     }
   end
 
   private
 
-  def config
-    @config ||= inbox.channel.provider_config_hash || {}
+  def channel
+    @channel ||= inbox.channel
   end
 
   def identity
@@ -28,9 +28,9 @@ class Voice::Provider::Twilio::TokenService
 
   def access_token
     Twilio::JWT::AccessToken.new(
-      config['account_sid'],
-      config['api_key_sid'],
-      config['api_key_secret'],
+      channel.account_sid,
+      channel.api_key_sid,
+      channel.api_key_secret,
       identity: identity,
       ttl: 1.hour.to_i
     ).tap { |token| token.add_grant(voice_grant) }
@@ -39,7 +39,7 @@ class Voice::Provider::Twilio::TokenService
   def voice_grant
     Twilio::JWT::AccessToken::VoiceGrant.new.tap do |grant|
       grant.incoming_allow = true
-      grant.outgoing_application_sid = config['twiml_app_sid']
+      grant.outgoing_application_sid = channel.twiml_app_sid
       grant.outgoing_application_params = outgoing_params
     end
   end
@@ -50,13 +50,13 @@ class Voice::Provider::Twilio::TokenService
       agent_id: user.id,
       identity: identity,
       client_name: identity,
-      accountSid: config['account_sid'],
+      accountSid: channel.account_sid,
       is_agent: 'true'
     }
   end
 
   def twiml_url
-    digits = inbox.channel.phone_number.delete_prefix('+')
+    digits = channel.phone_number.delete_prefix('+')
     Rails.application.routes.url_helpers.twilio_voice_call_url(phone: digits)
   end
 end
diff --git a/spec/factories/channel/channel_voice.rb b/spec/factories/channel/channel_voice.rb
deleted file mode 100644
index 81ad8caaa..000000000
--- a/spec/factories/channel/channel_voice.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-FactoryBot.define do
-  factory :channel_voice, class: 'Channel::Voice' do
-    sequence(:phone_number) { |n| "+155512345#{n.to_s.rjust(2, '0')}" }
-    provider_config do
-      {
-        account_sid: "AC#{SecureRandom.hex(16)}",
-        auth_token: SecureRandom.hex(16),
-        api_key_sid: SecureRandom.hex(8),
-        api_key_secret: SecureRandom.hex(16),
-        twiml_app_sid: "AP#{SecureRandom.hex(16)}"
-      }
-    end
-    account
-
-    after(:create) do |channel_voice|
-      create(:inbox, channel: channel_voice, account: channel_voice.account)
-    end
-  end
-end
diff --git a/spec/factories/channel/twilio_sms.rb b/spec/factories/channel/twilio_sms.rb
index 1963a4f28..68ac5a5d1 100644
--- a/spec/factories/channel/twilio_sms.rb
+++ b/spec/factories/channel/twilio_sms.rb
@@ -17,5 +17,13 @@ FactoryBot.define do
     trait :whatsapp do
       medium { :whatsapp }
     end
+
+    trait :with_voice do
+      with_phone_number
+      voice_enabled { true }
+      api_key_sid { "SK#{SecureRandom.hex(16)}" }
+      api_key_secret { SecureRandom.hex(16) }
+      twiml_app_sid { "AP#{SecureRandom.hex(16)}" }
+    end
   end
 end