diff --git a/enterprise/app/controllers/api/v1/accounts/whatsapp_calls_controller.rb b/enterprise/app/controllers/api/v1/accounts/whatsapp_calls_controller.rb
index 370760052..801e2d392 100644
--- a/enterprise/app/controllers/api/v1/accounts/whatsapp_calls_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/whatsapp_calls_controller.rb
@@ -1,71 +1,60 @@
 class Api::V1::Accounts::WhatsappCallsController < Api::V1::Accounts::BaseController
-  before_action :set_call, only: %i[show accept reject terminate upload_recording]
+  PERMISSION_REQUEST_THROTTLE = 5.minutes
 
-  def show
-    render json: call_payload(@call)
-  end
+  before_action :set_call, only: %i[show accept reject terminate upload_recording]
+  before_action :set_conversation, only: :initiate
+
+  def show; end
 
   def accept
-    call = Whatsapp::CallService.new(call: @call, agent: current_user, sdp_answer: params[:sdp_answer]).accept
-    render json: call_payload(call)
+    @call = Whatsapp::CallService.new(call: @call, agent: Current.user, sdp_answer: params[:sdp_answer]).accept
   rescue Voice::CallErrors::NotRinging, Voice::CallErrors::AlreadyAccepted, Voice::CallErrors::CallFailed => e
-    render json: { error: e.message }, status: :unprocessable_entity
-  rescue StandardError => e
-    log_and_render_failure('accept', e)
+    render_could_not_create_error(e.message)
   end
 
   def reject
-    call = Whatsapp::CallService.new(call: @call, agent: current_user).reject
-    render json: { id: call.id, status: call.display_status }
-  rescue StandardError => e
-    log_and_render_failure('reject', e)
+    @call = Whatsapp::CallService.new(call: @call, agent: Current.user).reject
   end
 
   def terminate
-    call = Whatsapp::CallService.new(call: @call, agent: current_user).terminate
-    render json: { id: call.id, status: call.display_status }
-  rescue StandardError => e
-    log_and_render_failure('terminate', e)
+    @call = Whatsapp::CallService.new(call: @call, agent: Current.user).terminate
   end
 
   # Browser-supplied recording captured via MediaRecorder during the call.
-  # Idempotent: subsequent uploads no-op once the first audio attachment exists,
-  # so the hangup-vs-pagehide race can't double-attach.
+  # Idempotent: subsequent uploads no-op once the first audio attachment exists.
   def upload_recording
-    return render json: { error: 'No recording file provided' }, status: :unprocessable_entity if params[:recording].blank?
-    return render json: { id: @call.id, status: 'no_message' }, status: :unprocessable_entity if @call.message.blank?
-    return render json: { id: @call.id, status: 'already_uploaded' } if @call.message.attachments.exists?(file_type: :audio)
+    return render_could_not_create_error('No recording file provided') if params[:recording].blank?
+    return render_could_not_create_error('Call has no associated message') if @call.message.blank?
 
-    @call.message.attachments.create!(account_id: @call.account_id, file_type: :audio, file: params[:recording])
-    render json: { id: @call.id, status: 'uploaded' }
-  rescue StandardError => e
-    log_and_render_failure('upload_recording', e)
+    @upload_status = if @call.message.attachments.exists?(file_type: :audio)
+                       'already_uploaded'
+                     else
+                       @call.message.attachments.create!(account_id: @call.account_id, file_type: :audio, file: params[:recording])
+                       'uploaded'
+                     end
   end
 
   def initiate
-    conversation = current_account.conversations.find_by!(display_id: params[:conversation_id])
-    authorize conversation, :show?
+    return render_could_not_create_error('Calling is not enabled for this inbox') unless calling_enabled?(@conversation)
+    return render_could_not_create_error('sdp_offer is required') if params[:sdp_offer].blank?
 
-    initiate_outbound_call(conversation)
+    @call = create_outbound_call(@conversation, params[:sdp_offer])
+    @message = Voice::CallMessageBuilder.new(@call).perform!
+    @call.update!(message_id: @message.id)
   rescue Voice::CallErrors::NoCallPermission
-    handle_no_call_permission(conversation)
-  rescue ActiveRecord::RecordNotFound
-    render json: { error: 'Conversation not found' }, status: :not_found
-  rescue StandardError => e
-    Rails.logger.error "[WHATSAPP CALL] initiate failed: #{e.class} #{e.message}"
-    render json: { error: e.message }, status: :unprocessable_entity
+    handle_no_call_permission(@conversation)
   end
 
   private
 
-  def initiate_outbound_call(conversation)
-    return render json: { error: 'Calling is not enabled for this inbox' }, status: :unprocessable_entity unless calling_enabled?(conversation)
-    return render json: { error: 'sdp_offer is required' }, status: :unprocessable_entity if params[:sdp_offer].blank?
+  def set_call
+    @call = Current.account.calls.whatsapp.find(params[:id])
+    authorize @call.conversation, :show?
+  end
 
-    call = create_outbound_call(conversation, params[:sdp_offer])
-    message = Voice::CallMessageBuilder.new(call).perform!
-    call.update!(message_id: message.id)
-    render json: { status: 'calling', call_id: call.provider_call_id, id: call.id, message_id: message.id, provider: 'whatsapp' }
+  def set_conversation
+    @conversation = Current.account.conversations.find_by!(display_id: params[:conversation_id])
+    authorize @conversation, :show?
   end
 
   def calling_enabled?(conversation)
@@ -73,10 +62,7 @@ class Api::V1::Accounts::WhatsappCallsController < Api::V1::Accounts::BaseContro
     channel.respond_to?(:voice_enabled?) && channel.voice_enabled?
   end
 
-  # Browser → Rails → Meta. The browser already opened its mic, built an
-  # RTCPeerConnection, generated the offer, and waited for ICE gathering;
-  # we just hand that offer to Meta. On pickup the connect webhook delivers
-  # Meta's SDP answer (handled in Whatsapp::IncomingCallService).
+  # Browser-built SDP offer is forwarded to Meta; the connect webhook later delivers Meta's answer.
   def create_outbound_call(conversation, sdp_offer)
     contact_phone = conversation.contact&.phone_number
     raise ArgumentError, 'Contact phone number not available' if contact_phone.blank?
@@ -84,53 +70,27 @@ class Api::V1::Accounts::WhatsappCallsController < Api::V1::Accounts::BaseContro
     result = conversation.inbox.channel.provider_service.initiate_call(contact_phone.delete('+'), sdp_offer)
     provider_call_id = result.dig('calls', 0, 'id') || result['call_id']
 
-    current_account.calls.create!(
+    Current.account.calls.create!(
       provider: :whatsapp, inbox: conversation.inbox, conversation: conversation, contact: conversation.contact,
       provider_call_id: provider_call_id, direction: :outgoing, status: 'ringing',
-      accepted_by_agent_id: current_user.id,
+      accepted_by_agent_id: Current.user.id,
       meta: { 'sdp_offer' => sdp_offer, 'ice_servers' => Call.default_ice_servers }
     )
   end
 
-  # Meta error 138006 means the contact hasn't granted call permission yet —
-  # send the interactive permission request, throttle by 5 minutes, and
-  # surface a permission_pending/requested state to the FE.
+  # 138006 = no call permission yet; send opt-in template (throttled) and surface state to FE.
   def handle_no_call_permission(conversation)
     last_requested = conversation.additional_attributes&.dig('call_permission_requested_at')
-    return render json: { status: 'permission_pending' } if last_requested.present? && Time.zone.parse(last_requested) > 5.minutes.ago
+    if last_requested.present? && Time.zone.parse(last_requested) > PERMISSION_REQUEST_THROTTLE.ago
+      return render json: { status: 'permission_pending' }
+    end
 
     contact_phone = conversation.contact.phone_number.delete('+')
-    result = conversation.inbox.channel.provider_service.send_call_permission_request(contact_phone)
-    return render json: { error: 'Failed to send call permission request' }, status: :unprocessable_entity unless result
+    sent = conversation.inbox.channel.provider_service.send_call_permission_request(contact_phone)
+    return render_could_not_create_error('Failed to send call permission request') unless sent
 
     attrs = (conversation.additional_attributes || {}).merge('call_permission_requested_at' => Time.current.iso8601)
     conversation.update!(additional_attributes: attrs)
     render json: { status: 'permission_requested' }
   end
-
-  def call_payload(call)
-    contact = call.conversation&.contact
-    {
-      id: call.id, call_id: call.provider_call_id, provider: call.provider,
-      status: call.display_status, direction: call.direction_label,
-      conversation_id: call.conversation_id, inbox_id: call.inbox_id, message_id: call.message_id,
-      accepted_by_agent_id: call.accepted_by_agent_id,
-      elapsed_seconds: call.started_at ? (Time.current - call.started_at).to_i : 0,
-      sdp_offer: call.meta&.dig('sdp_offer'),
-      ice_servers: call.meta&.dig('ice_servers') || Call.default_ice_servers,
-      caller: contact ? { name: contact.name, phone: contact.phone_number, avatar: contact.avatar_url } : {}
-    }
-  end
-
-  def set_call
-    @call = current_account.calls.whatsapp.find(params[:id])
-    authorize @call.conversation, :show?
-  rescue ActiveRecord::RecordNotFound
-    render json: { error: 'Call not found' }, status: :not_found
-  end
-
-  def log_and_render_failure(action, error)
-    Rails.logger.error "[WHATSAPP CALL] #{action} failed: #{error.class} #{error.message}"
-    render json: { error: "Failed to #{action} call" }, status: :internal_server_error
-  end
 end
diff --git a/enterprise/app/views/api/v1/accounts/whatsapp_calls/accept.json.jbuilder b/enterprise/app/views/api/v1/accounts/whatsapp_calls/accept.json.jbuilder
new file mode 100644
index 000000000..216e225e3
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/whatsapp_calls/accept.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/whatsapp_call', call: @call
diff --git a/enterprise/app/views/api/v1/accounts/whatsapp_calls/initiate.json.jbuilder b/enterprise/app/views/api/v1/accounts/whatsapp_calls/initiate.json.jbuilder
new file mode 100644
index 000000000..bdb1fa204
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/whatsapp_calls/initiate.json.jbuilder
@@ -0,0 +1,5 @@
+json.status 'calling'
+json.call_id @call.provider_call_id
+json.id @call.id
+json.message_id @message.id
+json.provider 'whatsapp'
diff --git a/enterprise/app/views/api/v1/accounts/whatsapp_calls/reject.json.jbuilder b/enterprise/app/views/api/v1/accounts/whatsapp_calls/reject.json.jbuilder
new file mode 100644
index 000000000..db804fd57
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/whatsapp_calls/reject.json.jbuilder
@@ -0,0 +1,2 @@
+json.id @call.id
+json.status @call.display_status
diff --git a/enterprise/app/views/api/v1/accounts/whatsapp_calls/show.json.jbuilder b/enterprise/app/views/api/v1/accounts/whatsapp_calls/show.json.jbuilder
new file mode 100644
index 000000000..216e225e3
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/whatsapp_calls/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/whatsapp_call', call: @call
diff --git a/enterprise/app/views/api/v1/accounts/whatsapp_calls/terminate.json.jbuilder b/enterprise/app/views/api/v1/accounts/whatsapp_calls/terminate.json.jbuilder
new file mode 100644
index 000000000..db804fd57
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/whatsapp_calls/terminate.json.jbuilder
@@ -0,0 +1,2 @@
+json.id @call.id
+json.status @call.display_status
diff --git a/enterprise/app/views/api/v1/accounts/whatsapp_calls/upload_recording.json.jbuilder b/enterprise/app/views/api/v1/accounts/whatsapp_calls/upload_recording.json.jbuilder
new file mode 100644
index 000000000..6871426d8
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/whatsapp_calls/upload_recording.json.jbuilder
@@ -0,0 +1,2 @@
+json.id @call.id
+json.status @upload_status
diff --git a/enterprise/app/views/api/v1/models/_whatsapp_call.json.jbuilder b/enterprise/app/views/api/v1/models/_whatsapp_call.json.jbuilder
new file mode 100644
index 000000000..0d93696c1
--- /dev/null
+++ b/enterprise/app/views/api/v1/models/_whatsapp_call.json.jbuilder
@@ -0,0 +1,24 @@
+contact = call.conversation&.contact
+
+json.id call.id
+json.call_id call.provider_call_id
+json.provider call.provider
+json.status call.display_status
+json.direction call.direction_label
+json.conversation_id call.conversation_id
+json.inbox_id call.inbox_id
+json.message_id call.message_id
+json.accepted_by_agent_id call.accepted_by_agent_id
+json.elapsed_seconds(call.started_at ? (Time.current - call.started_at).to_i : 0)
+json.sdp_offer call.meta&.dig('sdp_offer')
+json.ice_servers(call.meta&.dig('ice_servers') || Call.default_ice_servers)
+
+if contact
+  json.caller do
+    json.name contact.name
+    json.phone contact.phone_number
+    json.avatar contact.avatar_url
+  end
+else
+  json.caller({})
+end