Update ChannelItem.vue

# Conflicts:
#	app/controllers/api/v1/accounts/inboxes_controller.rb
#	app/helpers/api/v1/inboxes_helper.rb
#	app/javascript/dashboard/components-next/icon/provider.js
#	app/javascript/dashboard/components-next/message/MessageMeta.vue
#	app/javascript/dashboard/composables/useInbox.js
#	app/javascript/dashboard/constants/editor.js
#	app/javascript/dashboard/helper/inbox.js
#	app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
#	app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelFactory.vue
#	app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
#	app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
#	app/javascript/dashboard/routes/dashboard/settings/inbox/components/ChannelName.vue
#	app/javascript/shared/mixins/inboxMixin.js
#	app/views/api/v1/models/_inbox.json.jbuilder
#	config/schedule.yml
#	db/schema.rb

.env.example

@@ -98,8 +98,6 @@ SMTP_OPENSSL_VERIFY_MODE=peer
 # Mail Incoming
 # This is the domain set for the reply emails when conversation continuity is enabled
 MAILER_INBOUND_EMAIL_DOMAIN=
-# Maximum time in seconds to process a single IMAP email
-# EMAIL_PROCESSING_TIMEOUT_SECONDS=60
 # Set this to the appropriate ingress channel with regards to incoming emails
 # Possible values are :
 # relay for Exim, Postfix, Qmail
@@ -234,10 +232,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 # Comma-separated list of trusted IPs that bypass Rack Attack throttling rules
 # RACK_ATTACK_ALLOWED_IPS=127.0.0.1,::1,192.168.0.10
 
-## SafeFetch private network access
-## Keep disabled by default. Self-hosted installations can enable this to allow SafeFetch requests to private network URLs.
-# SAFE_FETCH_ALLOW_PRIVATE_NETWORK=false
-
 ## Running chatwoot as an API only server
 ## setting this value to true will disable the frontend dashboard endpoints
 # CW_API_ONLY_SERVER=false

Gemfile

@@ -89,7 +89,7 @@ gem 'rails-i18n', '~> 7.0'
 # two-factor authentication
 gem 'devise-two-factor', '>= 5.0.0'
 # authorization
-gem 'jwt', '~> 2.10', '>= 2.10.3'
+gem 'jwt'
 gem 'pundit'
 
 # super admin

Gemfile.lock

@@ -301,7 +301,7 @@ GEM
       railties (>= 5.0.0)
     faker (3.2.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.2)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -491,7 +491,7 @@ GEM
     judoscale-sidekiq (1.8.2)
       judoscale-ruby (= 1.8.2)
       sidekiq (>= 5.0)
-    jwt (2.10.3)
+    jwt (2.10.1)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -1102,7 +1102,7 @@ DEPENDENCIES
   json_schemer
   judoscale-rails
   judoscale-sidekiq
-  jwt (~> 2.10, >= 2.10.3)
+  jwt
   kaminari
   koala
   letter_opener

VERSION_CW

@@ -1 +1 @@
-4.14.1
+4.14.0

app/controllers/api/v1/accounts/articles/bulk_actions_controller.rb

@@ -1,7 +1,7 @@
 class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::BaseController
   before_action :portal
   before_action :check_authorization
-  before_action :set_articles, only: [:update_status, :update_category, :delete_articles]
+  before_action :set_articles, only: [:update_status, :delete_articles]
 
   def translate
     head :not_implemented
@@ -19,18 +19,6 @@ class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::Ba
     render_could_not_create_error(e.message)
   end
 
-  def update_category
-    return render_could_not_create_error(I18n.t('portals.articles.no_articles_found')) if @articles.none?
-    return render_could_not_create_error(I18n.t('portals.articles.category_not_found')) unless category_valid?
-
-    ActiveRecord::Base.transaction do
-      @articles.find_each { |article| article.update!(category_id: params[:category_id]) }
-    end
-    head :ok
-  rescue ActiveRecord::RecordInvalid => e
-    render_could_not_create_error(e.message)
-  end
-
   def delete_articles
     return render_could_not_create_error(I18n.t('portals.articles.no_articles_found')) if @articles.none?
 
@@ -51,9 +39,5 @@ class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::Ba
   def set_articles
     @articles = @portal.articles.where(id: params[:ids])
   end
-
-  def category_valid?
-    @portal.categories.exists?(id: params[:category_id])
-  end
 end
 Api::V1::Accounts::Articles::BulkActionsController.prepend_mod_with('Api::V1::Accounts::Articles::BulkActionsController')

app/controllers/api/v1/accounts/google_play/authorizations_controller.rb

@@ -0,0 +1,34 @@
+class Api::V1::Accounts::GooglePlay::AuthorizationsController < Api::V1::Accounts::OauthAuthorizationController
+  include GooglePlayOauthConcern
+
+  def create
+    redirect_url = google_client.auth_code.authorize_url(
+      redirect_uri: google_play_callback_url,
+      scope: scope,
+      response_type: 'code',
+      prompt: 'consent', # forces Google to return a refresh token
+      access_type: 'offline',
+      state: google_play_oauth_state,
+      client_id: GlobalConfigService.load('GOOGLE_OAUTH_CLIENT_ID', nil)
+    )
+
+    if redirect_url
+      render json: { success: true, url: redirect_url }
+    else
+      render json: { success: false }, status: :unprocessable_entity
+    end
+  end
+
+  private
+
+  def google_play_oauth_state
+    google_play_verifier.generate(
+      {
+        account_id: Current.account.id,
+        app_id: params[:app_id],
+        inbox_name: params[:inbox_name]
+      },
+      expires_in: 15.minutes
+    )
+  end
+end

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

@@ -31,6 +31,8 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   end
 
   def create
+    return render_app_store_feature_disabled if app_store_channel_requested? && !Current.account.feature_enabled?(:channel_app_store)
+
     ActiveRecord::Base.transaction do
       channel = create_channel
       @inbox = Current.account.inboxes.build(
@@ -97,7 +99,15 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   end
 
   def allowed_channel_types
-    %w[web_widget api email line telegram whatsapp sms]
+    %w[web_widget api email line telegram whatsapp sms app_store google_play]
+  end
+
+  def app_store_channel_requested?
+    permitted_params.dig(:channel, :type) == 'app_store'
+  end
+
+  def render_app_store_feature_disabled
+    render json: { message: 'App Store Reviews channel is not enabled for this account' }, status: :forbidden
   end
 
   def update_inbox_working_hours
@@ -179,7 +189,9 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
       'line' => Channel::Line,
       'telegram' => Channel::Telegram,
       'whatsapp' => Channel::Whatsapp,
-      'sms' => Channel::Sms
+      'sms' => Channel::Sms,
+      'app_store' => Channel::AppStore,
+      'google_play' => Channel::GooglePlay
     }[permitted_params[:channel][:type]]
   end
 

app/controllers/concerns/google_play_oauth_concern.rb

@@ -0,0 +1,26 @@
+module GooglePlayOauthConcern
+  extend ActiveSupport::Concern
+  include GoogleConcern
+
+  GOOGLE_PLAY_SCOPE = 'https://www.googleapis.com/auth/androidpublisher'.freeze
+
+  private
+
+  # Overrides the Gmail scope from GoogleConcern with the Play Developer API scope
+  def scope
+    GOOGLE_PLAY_SCOPE
+  end
+
+  # Carries the account and channel details through the OAuth round trip
+  def google_play_verifier
+    Rails.application.message_verifier('google_play_oauth')
+  end
+
+  def google_play_callback_url
+    "#{base_url}/google_play/callback"
+  end
+
+  def base_url
+    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
+  end
+end

app/controllers/google_play/callbacks_controller.rb

@@ -0,0 +1,58 @@
+class GooglePlay::CallbacksController < ApplicationController
+  include GooglePlayOauthConcern
+
+  def show
+    return redirect_with_error(params[:error]) if params[:error].present?
+
+    account
+    token = google_client.auth_code.get_token(params[:code], redirect_uri: google_play_callback_url)
+    inbox = create_channel_with_inbox(token)
+
+    redirect_to app_google_play_inbox_agents_url(account_id: account.id, inbox_id: inbox.id)
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e).capture_exception
+    redirect_with_error(e.message)
+  end
+
+  private
+
+  # Sends the user back to the inbox setup form with the error surfaced as a query param.
+  # Falls back to '/' only when we can't determine the account (e.g. tampered/missing state).
+  def redirect_with_error(error_message)
+    acc = safe_account
+    return redirect_to '/' unless acc
+
+    redirect_to app_new_google_play_inbox_url(account_id: acc.id, error: error_message.to_s.truncate(300))
+  end
+
+  def safe_account
+    Account.find_by(id: state_payload[:account_id])
+  rescue StandardError
+    nil
+  end
+
+  def state_payload
+    @state_payload ||= google_play_verifier.verify(params[:state]).with_indifferent_access
+  end
+
+  def account
+    @account ||= Account.find(state_payload[:account_id])
+  end
+
+  def create_channel_with_inbox(token)
+    ActiveRecord::Base.transaction do
+      channel = Channel::GooglePlay.create!(
+        account: account,
+        app_id: state_payload[:app_id],
+        provider_config: {
+          access_token: token.token,
+          refresh_token: token.refresh_token,
+          expires_on: (Time.current.utc + 1.hour).to_s
+        }
+      )
+      # Return the newly created inbox directly — `channel.inbox` is unreliable here because the polymorphic
+      # has_one cache is not always populated by `account.inboxes.create!`.
+      account.inboxes.create!(account: account, channel: channel, name: state_payload[:inbox_name])
+    end
+  end
+end

app/helpers/api/v1/inboxes_helper.rb

@@ -111,7 +111,9 @@ module Api::V1::InboxesHelper
       'line' => Current.account.line_channels,
       'telegram' => Current.account.telegram_channels,
       'whatsapp' => Current.account.whatsapp_channels,
-      'sms' => Current.account.sms_channels
+      'sms' => Current.account.sms_channels,
+      'app_store' => Current.account.app_store_channels,
+      'google_play' => Current.account.google_play_channels
     }[permitted_params[:channel][:type]]
   end
 

app/javascript/dashboard/api/channel/googlePlayClient.js

@@ -0,0 +1,14 @@
+/* global axios */
+import ApiClient from '../ApiClient';
+
+class GooglePlayClient extends ApiClient {
+  constructor() {
+    super('google_play', { accountScoped: true });
+  }
+
+  generateAuthorization(payload) {
+    return axios.post(`${this.url}/authorization`, payload);
+  }
+}
+
+export default new GooglePlayClient();

app/javascript/dashboard/api/channel/whatsapp/whatsappCallsAPI.js

@@ -1,45 +0,0 @@
-/* global axios */
-import ApiClient from '../../ApiClient';
-
-class WhatsappCallsAPI extends ApiClient {
-  constructor() {
-    super('whatsapp_calls', { accountScoped: true });
-  }
-
-  show(callId) {
-    return axios.get(`${this.url}/${callId}`).then(r => r.data);
-  }
-
-  initiate(conversationId, sdpOffer) {
-    return axios
-      .post(`${this.url}/initiate`, {
-        conversation_id: conversationId,
-        sdp_offer: sdpOffer,
-      })
-      .then(r => r.data);
-  }
-
-  accept(callId, sdpAnswer) {
-    return axios
-      .post(`${this.url}/${callId}/accept`, { sdp_answer: sdpAnswer })
-      .then(r => r.data);
-  }
-
-  reject(callId) {
-    return axios.post(`${this.url}/${callId}/reject`).then(r => r.data);
-  }
-
-  terminate(callId) {
-    return axios.post(`${this.url}/${callId}/terminate`).then(r => r.data);
-  }
-
-  uploadRecording(callId, blob, filename = 'call-recording.webm') {
-    const formData = new FormData();
-    formData.append('recording', blob, filename);
-    return axios
-      .post(`${this.url}/${callId}/upload_recording`, formData)
-      .then(r => r.data);
-  }
-}
-
-export default new WhatsappCallsAPI();

app/javascript/dashboard/api/contacts.js

@@ -35,9 +35,8 @@ class ContactAPI extends ApiClient {
     return axios.patch(`${this.url}/${id}?include_contact_inboxes=false`, data);
   }
 
-  getConversations(contactId, { inboxId } = {}) {
-    const params = inboxId ? { inbox_id: inboxId } : {};
-    return axios.get(`${this.url}/${contactId}/conversations`, { params });
+  getConversations(contactId) {
+    return axios.get(`${this.url}/${contactId}/conversations`);
   }
 
   getContactableInboxes(contactId) {
@@ -48,10 +47,9 @@ class ContactAPI extends ApiClient {
     return axios.get(`${this.url}/${contactId}/labels`);
   }
 
-  initiateCall(contactId, inboxId, conversationId = null) {
+  initiateCall(contactId, inboxId) {
     return axios.post(`${this.url}/${contactId}/call`, {
       inbox_id: inboxId,
-      conversation_id: conversationId,
     });
   }
 

app/javascript/dashboard/api/helpCenter/articles.js

@@ -87,13 +87,6 @@ class ArticlesAPI extends PortalsAPI {
     );
   }
 
-  bulkUpdateCategory({ portalSlug, articleIds, categoryId }) {
-    return axios.patch(
-      `${this.url}/${portalSlug}/articles/bulk_actions/update_category`,
-      { ids: articleIds, category_id: categoryId }
-    );
-  }
-
   bulkDelete({ portalSlug, articleIds }) {
     return axios.delete(
       `${this.url}/${portalSlug}/articles/bulk_actions/delete_articles`,

app/javascript/dashboard/api/inboxes.js

@@ -52,14 +52,6 @@ class Inboxes extends CacheEnabledApiClient {
   resetSecret(inboxId) {
     return axios.post(`${this.url}/${inboxId}/reset_secret`);
   }
-
-  enableWhatsappCalling(inboxId) {
-    return axios.post(`${this.url}/${inboxId}/enable_whatsapp_calling`);
-  }
-
-  disableWhatsappCalling(inboxId) {
-    return axios.post(`${this.url}/${inboxId}/disable_whatsapp_calling`);
-  }
 }
 
 export default new Inboxes();

app/javascript/dashboard/api/specs/article.spec.js

@@ -153,33 +153,4 @@ describe('#PortalAPI', () => {
       );
     });
   });
-  describe('API calls', () => {
-    const originalAxios = window.axios;
-    const axiosMock = {
-      post: vi.fn(() => Promise.resolve()),
-      get: vi.fn(() => Promise.resolve()),
-      patch: vi.fn(() => Promise.resolve()),
-      delete: vi.fn(() => Promise.resolve()),
-    };
-
-    beforeEach(() => {
-      window.axios = axiosMock;
-    });
-
-    afterEach(() => {
-      window.axios = originalAxios;
-    });
-
-    it('#bulkUpdateCategory', () => {
-      articlesAPI.bulkUpdateCategory({
-        portalSlug: 'room-rental',
-        articleIds: [1, 2, 3],
-        categoryId: 7,
-      });
-      expect(axiosMock.patch).toHaveBeenCalledWith(
-        '/api/v1/portals/room-rental/articles/bulk_actions/update_category',
-        { ids: [1, 2, 3], category_id: 7 }
-      );
-    });
-  });
 });

app/javascript/dashboard/api/specs/contacts.spec.js

@@ -41,8 +41,7 @@ describe('#ContactsAPI', () => {
     it('#getConversations', () => {
       contactAPI.getConversations(1);
       expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/contacts/1/conversations',
-        { params: {} }
+        '/api/v1/contacts/1/conversations'
       );
     });
 

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

@@ -3,20 +3,10 @@ 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,
-  getVoiceCallProvider,
-  VOICE_CALL_PROVIDERS,
-} from 'dashboard/helper/inbox';
-import {
-  VOICE_CALL_DIRECTION,
-  VOICE_CALL_OUTBOUND_INIT_STATUS,
-} from 'dashboard/components-next/message/constants';
+import { isVoiceCallEnabled } from 'dashboard/helper/inbox';
 import { useAlert } from 'dashboard/composables';
 import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
 import { useCallsStore } from 'dashboard/stores/calls';
-import { useWhatsappCallSession } from 'dashboard/composables/useWhatsappCallSession';
-import ContactAPI from 'dashboard/api/contacts';
 
 import Button from 'dashboard/components-next/button/Button.vue';
 import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
@@ -24,9 +14,6 @@ import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
 const props = defineProps({
   phone: { type: String, default: '' },
   contactId: { type: [String, Number], required: true },
-  // When set, the WhatsApp call continues in this conversation (matching the
-  // header button) instead of looking up the contact's most recent one.
-  conversationId: { type: [String, Number], default: null },
   label: { type: String, default: '' },
   icon: { type: [String, Object, Function], default: '' },
   size: { type: String, default: 'sm' },
@@ -43,7 +30,6 @@ const { t } = useI18n();
 
 const dialogRef = ref(null);
 
-const callsStore = useCallsStore();
 const inboxesList = useMapGetter('inboxes/getInboxes');
 const contactsUiFlags = useMapGetter('contacts/getUIFlags');
 
@@ -52,22 +38,13 @@ const voiceInboxes = computed(() =>
 );
 const hasVoiceInboxes = computed(() => voiceInboxes.value.length > 0);
 
+// Unified behavior: hide when no phone
 const shouldRender = computed(() => hasVoiceInboxes.value && !!props.phone);
 
 const isInitiatingCall = computed(() => {
   return contactsUiFlags.value?.isInitiatingCall || false;
 });
 
-// Mirror the conversation-header button: block a new call whenever any provider
-// call is already active or ringing, otherwise starting a WhatsApp call here
-// would leave a still-live Twilio (or other) session with no visible control.
-const isCallButtonDisabled = computed(
-  () =>
-    callsStore.hasActiveCall ||
-    callsStore.hasIncomingCall ||
-    isInitiatingCall.value
-);
-
 const navigateToConversation = conversationId => {
   const accountId = route.params.accountId;
   if (conversationId && accountId) {
@@ -81,96 +58,23 @@ const navigateToConversation = conversationId => {
   }
 };
 
-const whatsappCallSession = useWhatsappCallSession();
-
-// Find the most recent open conversation for this contact in the picked inbox.
-// WhatsApp /initiate is conversation-scoped (unlike Twilio's contact-scoped path).
-// Pass inboxId so the BE applies the filter before the 20-row cap — without it,
-// contacts whose latest WhatsApp conversation falls outside the 20 most recent
-// across all inboxes would be treated as having no conversation.
-const findWhatsappConversationId = async inboxId => {
-  const { data } = await ContactAPI.getConversations(props.contactId, {
-    inboxId,
-  });
-  const conversations = data?.payload || [];
-  const match = [...conversations].sort(
-    (a, b) => (b.last_activity_at || 0) - (a.last_activity_at || 0)
-  )[0];
-  return match?.id || null;
-};
-
-const startWhatsappCall = async (inboxId, conversationIdHint) => {
-  // WhatsApp /initiate is conversation-scoped, so we must hand it a
-  // conversation. Use the caller's hint when given (in-conversation flow);
-  // otherwise pick the most recent one in the inbox.
-  const conversationId =
-    conversationIdHint || (await findWhatsappConversationId(inboxId));
-  if (!conversationId) {
-    useAlert(t('CONTACT_PANEL.CALL_FAILED'));
-    return;
-  }
-
-  const response =
-    await whatsappCallSession.initiateOutboundCall(conversationId);
-  // The composable returns { status: 'locked' } when an init is already in
-  // flight or a call is already active; treat that as a soft no-op rather than
-  // claiming success.
-  if (response?.status === VOICE_CALL_OUTBOUND_INIT_STATUS.LOCKED) return;
-  if (!response?.id) {
-    // Permission template path returns no call id. Mirror the header button and
-    // surface whether the request was just sent or is already pending instead of
-    // claiming the call started. The permission message lands in the
-    // conversation, so still navigate there.
-    const messageKey =
-      response?.status === VOICE_CALL_OUTBOUND_INIT_STATUS.PERMISSION_PENDING
-        ? 'CONTACT_PANEL.WHATSAPP_CALL_PERMISSION_PENDING'
-        : 'CONTACT_PANEL.WHATSAPP_CALL_PERMISSION_REQUESTED';
-    useAlert(t(messageKey));
-    navigateToConversation(conversationId);
-    return;
-  }
-
-  // Stay non-active until the connect cable event arrives — flipping to active
-  // here would start the duration timer before the contact picks up.
-  callsStore.addCall({
-    callSid: response.call_id,
-    callId: response.id,
-    conversationId,
-    inboxId,
-    callDirection: VOICE_CALL_DIRECTION.OUTBOUND,
-    provider: VOICE_CALL_PROVIDERS.WHATSAPP,
-  });
-
-  useAlert(t('CONTACT_PANEL.CALL_INITIATED'));
-  navigateToConversation(conversationId);
-};
-
-const startCall = async (inboxId, conversationIdHint = null) => {
-  if (isCallButtonDisabled.value) return;
-
-  const inbox = (inboxesList.value || []).find(i => i.id === inboxId);
-  if (getVoiceCallProvider(inbox) === VOICE_CALL_PROVIDERS.WHATSAPP) {
-    try {
-      await startWhatsappCall(inboxId, conversationIdHint);
-    } catch (error) {
-      useAlert(error?.message || t('CONTACT_PANEL.CALL_FAILED'));
-    }
-    return;
-  }
+const startCall = async inboxId => {
+  if (isInitiatingCall.value) return;
 
   try {
     const response = await store.dispatch('contacts/initiateCall', {
       contactId: props.contactId,
       inboxId,
-      conversationId: conversationIdHint,
     });
     const { call_sid: callSid, conversation_id: conversationId } = response;
 
+    // Add call to store immediately so widget shows
+    const callsStore = useCallsStore();
     callsStore.addCall({
       callSid,
       conversationId,
       inboxId,
-      callDirection: VOICE_CALL_DIRECTION.OUTBOUND,
+      callDirection: 'outbound',
     });
 
     useAlert(t('CONTACT_PANEL.CALL_INITIATED'));
@@ -182,22 +86,6 @@ const startCall = async (inboxId, conversationIdHint = null) => {
 };
 
 const onClick = async () => {
-  // In conversation context, only stay in this conversation if its inbox is
-  // itself voice-capable (works the same for Twilio and WhatsApp). For
-  // non-voice channels (email, web, …) fall back to the picker so the call
-  // goes out via a voice inbox.
-  if (props.conversationId) {
-    const conversation = store.getters.getConversationById(
-      props.conversationId
-    );
-    const conversationInbox = (inboxesList.value || []).find(
-      i => i.id === conversation?.inbox_id
-    );
-    if (conversationInbox && isVoiceCallEnabled(conversationInbox)) {
-      await startCall(conversationInbox.id, props.conversationId);
-      return;
-    }
-  }
   if (voiceInboxes.value.length > 1) {
     dialogRef.value?.open();
     return;
@@ -218,7 +106,7 @@ const onPickInbox = async inbox => {
       v-if="shouldRender"
       v-tooltip.top-end="tooltipLabel || null"
       v-bind="attrs"
-      :disabled="isCallButtonDisabled"
+      :disabled="isInitiatingCall"
       :is-loading="isInitiatingCall"
       :label="label"
       :icon="icon"

app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue

@@ -2,7 +2,6 @@
 import { ref, computed, watch } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { OnClickOutside } from '@vueuse/components';
 import { useMapGetter } from 'dashboard/composables/store.js';
 import { useConfig } from 'dashboard/composables/useConfig';
 import { ARTICLE_TABS, CATEGORY_ALL } from 'dashboard/helper/portalHelper';
@@ -19,7 +18,6 @@ import ArticleEmptyState from 'dashboard/components-next/HelpCenter/EmptyState/A
 import BulkSelectBar from 'dashboard/components-next/captain/assistant/BulkSelectBar.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
-import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
 import BulkTranslateDialog from './BulkTranslateDialog.vue';
 
 const props = defineProps({
@@ -64,7 +62,6 @@ const isFeatureEnabledonAccount = useMapGetter(
 
 const selectedArticleIds = ref(new Set());
 const deleteConfirmDialogRef = ref(null);
-const isCategoryMenuOpen = ref(false);
 
 const { isEnterprise } = useConfig();
 
@@ -224,34 +221,6 @@ const bulkUpdateStatus = async status => {
   }
 };
 
-const categoryMenuItems = computed(() =>
-  props.categories.map(category => ({
-    label: category.name,
-    value: category.id,
-    action: 'move',
-    emoji: category.icon,
-  }))
-);
-
-const handleBulkUpdateCategory = async ({ value }) => {
-  isCategoryMenuOpen.value = false;
-  try {
-    await articlesAPI.bulkUpdateCategory({
-      portalSlug: route.params.portalSlug,
-      articleIds: [...selectedArticleIds.value],
-      categoryId: value,
-    });
-    onBulkActionSuccess(
-      t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.CATEGORY_SUCCESS')
-    );
-  } catch (error) {
-    useAlert(
-      error?.message ||
-        t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.CATEGORY_ERROR')
-    );
-  }
-};
-
 const confirmBulkDelete = () => {
   deleteConfirmDialogRef.value?.open();
 };
@@ -371,30 +340,6 @@ watch(
                   class="[&>span:nth-child(2)]:hidden sm:[&>span:nth-child(2)]:inline w-fit"
                   @click="bulkUpdateStatus('archived')"
                 />
-                <div v-if="categoryMenuItems.length" class="relative group">
-                  <OnClickOutside @trigger="isCategoryMenuOpen = false">
-                    <Button
-                      sm
-                      faded
-                      slate
-                      icon="i-lucide-folder-input"
-                      :label="
-                        t(
-                          'HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.MOVE_TO_CATEGORY'
-                        )
-                      "
-                      class="[&>span:nth-child(2)]:hidden sm:[&>span:nth-child(2)]:inline w-fit"
-                      @click="isCategoryMenuOpen = !isCategoryMenuOpen"
-                    />
-                    <DropdownMenu
-                      v-if="isCategoryMenuOpen"
-                      :menu-items="categoryMenuItems"
-                      show-search
-                      class="right-0 w-48 mt-2 top-full max-h-60"
-                      @action="handleBulkUpdateCategory"
-                    />
-                  </OnClickOutside>
-                </div>
                 <Button
                   v-if="isTranslationAvailable"
                   sm

app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue

@@ -202,7 +202,7 @@ defineExpose({ state, isSubmitDisabled });
                 size="sm"
                 type="button"
                 :icon="!state.icon ? 'i-lucide-smile-plus' : ''"
-                class="!h-[2.38rem] !w-[2.375rem] absolute top-[2rem] !outline-none !rounded-[0.438rem] border-0 ltr:left-px rtl:right-px ltr:!rounded-r-none rtl:!rounded-l-none"
+                class="!h-[2.4rem] !w-[2.375rem] absolute top-[1.94rem] !outline-none !rounded-[0.438rem] border-0 ltr:left-px rtl:right-px ltr:!rounded-r-none rtl:!rounded-l-none"
                 @click="isEmojiPickerOpen = !isEmojiPickerOpen"
               />
               <EmojiInput

app/javascript/dashboard/components-next/Settings/SettingsToggleSection.vue

@@ -32,11 +32,7 @@ const modelValue = defineModel({ type: Boolean, default: false });
         <span class="text-heading-3 text-n-slate-12">
           {{ header }}
         </span>
-        <template v-if="hideToggle">
-          <slot name="hiddenToggle">
-            <div class="size-2" />
-          </slot>
-        </template>
+        <div v-if="hideToggle" class="size-2" />
         <ToggleSwitch v-else v-model="modelValue" />
       </div>
       <span v-if="description" class="text-body-main text-n-slate-11">

app/javascript/dashboard/components-next/call/CallCard.story.vue

@@ -1,179 +0,0 @@
-<script setup>
-import CallCard from './CallCard.vue';
-import { VOICE_CALL_DIRECTION } from 'dashboard/components-next/message/constants';
-import { VOICE_CALL_PROVIDERS } from 'dashboard/helper/inbox';
-
-const whatsappCall = {
-  callSid: 'wamid.HBgM',
-  conversationId: 1234,
-  provider: VOICE_CALL_PROVIDERS.WHATSAPP,
-};
-
-const twilioCall = {
-  callSid: 'CA1234567890',
-  conversationId: 1234,
-};
-
-const richCallInfo = {
-  contactName: 'John Does',
-  phoneNumber: '+1 412 245 0242',
-  inboxName: 'Customer support',
-  location: 'San Francisco, United States',
-  countryFlag: '\u{1F1FA}\u{1F1F8}',
-  hasLocation: true,
-  avatar:
-    'https://app.chatwoot.com/rails/active_storage/representations/redirect/eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBBd3FodGc9PSIsImV4cCI6bnVsbCwicHVyIjoiYmxvYl9pZCJ9fQ==--d218a325af0ef45061eefd352f8efb9ac84275e8/eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaDdCem9MWm05eWJXRjBTU0lKYW5CbFp3WTZCa1ZVT2hOeVpYTnBlbVZmZEc5ZlptbHNiRnNIYVFINk1BPT0iLCJleHAiOm51bGwsInB1ciI6InZhcmlhdGlvbiJ9fQ==--533c3ad7218e24c4b0e8f8959dc1953ce1d279b9/1707423736896.jpeg',
-};
-
-// Falls back to inbox name when neither city nor country is on the contact.
-const noLocationCallInfo = {
-  contactName: 'Anonymous Lead',
-  phoneNumber: '+44 20 7916 0428',
-  inboxName: 'Sales',
-  location: 'Sales',
-  countryFlag: '',
-  hasLocation: false,
-  avatar: '',
-};
-
-// Truncation regression check — both contact name and location should ellipsize.
-const longCallInfo = {
-  contactName: 'Aleksandra Konstantinopolskaya',
-  phoneNumber: '+49 30 911890',
-  inboxName: 'Customer support',
-  location:
-    'Friedrichshain-Kreuzberg, Federal Republic of Germany (Deutschland)',
-  countryFlag: '\u{1F1E9}\u{1F1EA}',
-  hasLocation: true,
-  avatar: '',
-};
-
-const unknownCallerInfo = {
-  contactName: 'Unknown caller',
-  phoneNumber: '',
-  inboxName: 'Customer support',
-  location: 'Customer support',
-  countryFlag: '',
-  hasLocation: false,
-  avatar: '',
-};
-
-const log =
-  (label, ...args) =>
-  () => {
-    // eslint-disable-next-line no-console
-    console.log(`[CallCard.story] ${label}`, ...args);
-  };
-</script>
-
-<template>
-  <Story
-    title="Components/Call/CallCard"
-    :layout="{ type: 'grid', width: '400px' }"
-  >
-    <Variant title="Incoming · WhatsApp">
-      <CallCard
-        :call="whatsappCall"
-        :call-info="richCallInfo"
-        :state="VOICE_CALL_DIRECTION.INCOMING"
-        @accept="log('accept')"
-        @reject="log('reject')"
-        @go-to-conversation="log('goToConversation')"
-      />
-    </Variant>
-
-    <Variant title="Incoming · Twilio (no flag)">
-      <CallCard
-        :call="twilioCall"
-        :call-info="noLocationCallInfo"
-        :state="VOICE_CALL_DIRECTION.INCOMING"
-        @accept="log('accept')"
-        @reject="log('reject')"
-        @go-to-conversation="log('goToConversation')"
-      />
-    </Variant>
-
-    <Variant title="Outgoing · WhatsApp ringing">
-      <CallCard
-        :call="whatsappCall"
-        :call-info="richCallInfo"
-        :state="VOICE_CALL_DIRECTION.OUTGOING"
-        @reject="log('reject')"
-        @go-to-conversation="log('goToConversation')"
-      />
-    </Variant>
-
-    <Variant title="Ongoing · WhatsApp (mute visible, unmuted)">
-      <CallCard
-        :call="whatsappCall"
-        :call-info="richCallInfo"
-        :state="VOICE_CALL_DIRECTION.ONGOING"
-        duration="01:23"
-        :is-muted="false"
-        show-mute
-        @end="log('end')"
-        @toggle-mute="log('toggleMute')"
-        @go-to-conversation="log('goToConversation')"
-      />
-    </Variant>
-
-    <Variant title="Ongoing · WhatsApp muted">
-      <CallCard
-        :call="whatsappCall"
-        :call-info="richCallInfo"
-        :state="VOICE_CALL_DIRECTION.ONGOING"
-        duration="03:47"
-        is-muted
-        show-mute
-        @end="log('end')"
-        @toggle-mute="log('toggleMute')"
-        @go-to-conversation="log('goToConversation')"
-      />
-    </Variant>
-
-    <Variant title="Ongoing · Twilio (no mute control)">
-      <CallCard
-        :call="twilioCall"
-        :call-info="richCallInfo"
-        :state="VOICE_CALL_DIRECTION.ONGOING"
-        duration="00:42"
-        @end="log('end')"
-        @go-to-conversation="log('goToConversation')"
-      />
-    </Variant>
-
-    <Variant title="Incoming · Unknown caller">
-      <CallCard
-        :call="whatsappCall"
-        :call-info="unknownCallerInfo"
-        :state="VOICE_CALL_DIRECTION.INCOMING"
-        @accept="log('accept')"
-        @reject="log('reject')"
-        @go-to-conversation="log('goToConversation')"
-      />
-    </Variant>
-
-    <Variant title="Truncation · long name and location">
-      <CallCard
-        :call="whatsappCall"
-        :call-info="longCallInfo"
-        :state="VOICE_CALL_DIRECTION.INCOMING"
-        @accept="log('accept')"
-        @reject="log('reject')"
-        @go-to-conversation="log('goToConversation')"
-      />
-    </Variant>
-
-    <Variant title="Ongoing · no conversation link in footer">
-      <CallCard
-        :call="{ ...whatsappCall, conversationId: null }"
-        :call-info="richCallInfo"
-        :state="VOICE_CALL_DIRECTION.ONGOING"
-        duration="02:10"
-        show-mute
-        @end="log('end')"
-        @toggle-mute="log('toggleMute')"
-      />
-    </Variant>
-  </Story>
-</template>

app/javascript/dashboard/components-next/call/CallCard.vue

@@ -1,242 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { VOICE_CALL_DIRECTION } from 'dashboard/components-next/message/constants';
-import { VOICE_CALL_PROVIDERS } from 'dashboard/helper/inbox';
-import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
-import NextButton from 'dashboard/components-next/button/Button.vue';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-
-const props = defineProps({
-  call: {
-    type: Object,
-    required: true,
-  },
-  callInfo: {
-    type: Object,
-    required: true,
-  },
-  // 'incoming' | 'outgoing' | 'ongoing'
-  state: {
-    type: String,
-    required: true,
-  },
-  duration: {
-    type: String,
-    default: '',
-  },
-  isMuted: {
-    type: Boolean,
-    default: false,
-  },
-  showMute: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-defineEmits([
-  'accept',
-  'reject',
-  'end',
-  'toggleMute',
-  'goToConversation',
-  'dismiss',
-]);
-
-const { t } = useI18n();
-
-const isOngoing = computed(() => props.state === VOICE_CALL_DIRECTION.ONGOING);
-const isIncoming = computed(
-  () => props.state === VOICE_CALL_DIRECTION.INCOMING
-);
-const isOutgoing = computed(
-  () => props.state === VOICE_CALL_DIRECTION.OUTGOING
-);
-
-const statusIcon = computed(() => {
-  if (isOngoing.value) return 'i-ph-phone-call-bold';
-  if (isOutgoing.value) return 'i-ph-phone-outgoing-bold';
-  return 'i-ph-phone-incoming-bold';
-});
-
-const statusLabel = computed(() => {
-  if (isOngoing.value) return t('CONVERSATION.VOICE_WIDGET.CALL_IN_PROGRESS');
-  if (isOutgoing.value) return t('CONVERSATION.VOICE_WIDGET.OUTGOING_CALL');
-  return t('CONVERSATION.VOICE_WIDGET.INCOMING_CALL');
-});
-
-const channelIcon = computed(() => {
-  if (props.call?.provider === VOICE_CALL_PROVIDERS.WHATSAPP)
-    return 'i-ri-whatsapp-fill';
-  return 'i-ph-phone-bold';
-});
-</script>
-
-<template>
-  <div
-    class="flex flex-col gap-2 pt-4 bg-n-solid-2/95 rounded-2xl shadow-xl outline outline-1 outline-n-strong backdrop-blur-md"
-    :class="call?.conversationId ? 'pb-2' : 'pb-4'"
-  >
-    <!-- Top section: status badge + location/inbox + duration -->
-    <div class="flex flex-col gap-3">
-      <div class="flex items-center gap-2 px-4">
-        <!-- Ongoing: status badge on left -->
-        <div v-if="isOngoing" class="flex items-center gap-1.5 shrink-0">
-          <Icon :icon="statusIcon" class="size-3.5 text-n-teal-9 shrink-0" />
-          <span class="text-xs font-medium text-n-teal-9 tracking-tight">
-            {{ statusLabel }}
-          </span>
-        </div>
-
-        <!-- Caller location (city, country) or fallback to channel + inbox name -->
-        <div class="flex items-center gap-1.5 min-w-0 flex-1">
-          <span
-            v-if="callInfo.hasLocation && callInfo.countryFlag"
-            class="text-sm leading-none shrink-0"
-          >
-            {{ callInfo.countryFlag }}
-          </span>
-          <Icon
-            v-else-if="!isOngoing"
-            :icon="channelIcon"
-            class="size-3.5 text-n-slate-10 shrink-0"
-          />
-          <span
-            class="text-xs font-medium text-n-slate-11 tracking-tight truncate"
-          >
-            {{ callInfo.location }}
-          </span>
-        </div>
-
-        <!-- Ongoing: duration on right -->
-        <p
-          v-if="isOngoing"
-          class="font-display text-base font-medium text-n-slate-11 shrink-0 mb-0 tabular-nums tracking-tight"
-        >
-          {{ duration }}
-        </p>
-        <!-- Incoming/Outgoing: status badge on right -->
-        <div v-else class="flex items-center gap-1.5 shrink-0">
-          <Icon :icon="statusIcon" class="size-3.5 text-n-teal-9 shrink-0" />
-          <span class="text-xs font-medium text-n-teal-9 tracking-tight">
-            {{ statusLabel }}
-          </span>
-          <!-- Dismiss: removes the notification from the UI without declining.
-               Incoming only — outgoing/ongoing calls are ended via the call
-               controls, not silently dismissed. -->
-          <NextButton
-            v-if="isIncoming"
-            v-tooltip.top="$t('CONVERSATION.VOICE_WIDGET.DISMISS_CALL')"
-            icon="i-ph-x-bold"
-            slate
-            ghost
-            xs
-            class="!rounded-full -my-1"
-            @click="$emit('dismiss')"
-          />
-        </div>
-      </div>
-
-      <!-- Main row: avatar + name/phone + actions -->
-      <div class="flex items-center gap-3 px-4">
-        <div class="shrink-0">
-          <Avatar
-            :src="callInfo.avatar"
-            :name="callInfo.contactName"
-            :size="40"
-          />
-        </div>
-        <div class="flex-1 min-w-0">
-          <p
-            class="font-display text-sm font-medium text-n-slate-12 truncate mb-0.5 tracking-tight leading-tight"
-          >
-            {{ callInfo.contactName }}
-          </p>
-          <p
-            v-if="callInfo.phoneNumber"
-            class="text-sm text-n-slate-11 truncate mb-0 tracking-tight leading-tight"
-          >
-            {{ callInfo.phoneNumber }}
-          </p>
-        </div>
-
-        <!-- Actions -->
-        <div class="flex items-center gap-2 shrink-0">
-          <!-- Mute toggle (WhatsApp ongoing only) -->
-          <NextButton
-            v-if="isOngoing && showMute"
-            v-tooltip.top="
-              isMuted
-                ? $t('CONVERSATION.VOICE_WIDGET.UNMUTE')
-                : $t('CONVERSATION.VOICE_WIDGET.MUTE')
-            "
-            :icon="
-              isMuted ? 'i-ph-microphone-slash-bold' : 'i-ph-microphone-bold'
-            "
-            :variant="isMuted ? 'solid' : 'faded'"
-            :color="isMuted ? 'amber' : 'teal'"
-            class="!rounded-full"
-            @click="$emit('toggleMute')"
-          />
-
-          <!-- Accept call (incoming only) -->
-          <NextButton
-            v-if="isIncoming"
-            v-tooltip.top="$t('CONVERSATION.VOICE_WIDGET.JOIN_CALL')"
-            icon="i-ph-phone-bold"
-            teal
-            class="!rounded-full"
-            @click="$emit('accept')"
-          />
-
-          <!-- Reject / end call (all states) -->
-          <NextButton
-            v-tooltip.top="
-              isOngoing
-                ? $t('CONVERSATION.VOICE_WIDGET.END_CALL')
-                : $t('CONVERSATION.VOICE_WIDGET.REJECT_CALL')
-            "
-            icon="i-ph-phone-x-bold"
-            ruby
-            class="!rounded-full rotate-[134deg]"
-            @click="isOngoing ? $emit('end') : $emit('reject')"
-          />
-        </div>
-      </div>
-    </div>
-
-    <!-- Footer: go to conversation thread -->
-    <NextButton
-      v-if="call?.conversationId"
-      slate
-      ghost
-      trailing-icon
-      class="!justify-between !px-2 !mx-2"
-      @click="$emit('goToConversation')"
-    >
-      <template #icon>
-        <span
-          class="flex items-center gap-1 text-n-slate-11 group-hover:text-n-slate-12"
-        >
-          <Icon
-            icon="i-ph-chat-circle-text-bold"
-            class="size-3.5 text-n-slate-11 shrink-0"
-          />
-          <span class="text-sm tracking-tight tabular-nums">
-            #{{ call.conversationId }}
-          </span>
-          <Icon
-            icon="i-ph-caret-right-bold"
-            class="size-3 text-n-slate-11 shrink-0"
-          />
-        </span>
-      </template>
-      <span
-        class="text-sm text-n-slate-11 tracking-tight group-hover:text-n-slate-12"
-      >
-        {{ $t('CONVERSATION.VOICE_WIDGET.GO_TO_CONVERSATION') }}
-      </span>
-    </NextButton>
-  </div>
-</template>

app/javascript/dashboard/components-next/call/FloatingCallWidget.vue

@@ -1,268 +0,0 @@
-<script setup>
-import { computed, onBeforeUnmount, ref, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import { useStore } from 'vuex';
-import { useCallSession } from 'dashboard/composables/useCallSession';
-import { setWhatsappCallMuted } from 'dashboard/composables/useWhatsappCallSession';
-import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
-import { VOICE_CALL_PROVIDERS } from 'dashboard/helper/inbox';
-import { VOICE_CALL_DIRECTION } from 'dashboard/components-next/message/constants';
-import WindowVisibilityHelper from 'dashboard/helper/AudioAlerts/WindowVisibilityHelper';
-import CallCard from 'dashboard/components-next/call/CallCard.vue';
-import countriesList from 'shared/constants/countries.js';
-
-const RINGTONE_URL = '/audio/dashboard/bell.mp3';
-
-const route = useRoute();
-const router = useRouter();
-const store = useStore();
-
-const {
-  activeCall,
-  incomingCalls,
-  hasActiveCall,
-  isJoining,
-  joinCall,
-  endCall: endCallSession,
-  rejectIncomingCall,
-  dismissCall,
-  formattedCallDuration,
-} = useCallSession();
-
-// Mute is currently WhatsApp-only — Twilio calls are mediated server-side and
-// don't expose a mic track on the browser side.
-const isMuted = ref(false);
-const isWhatsappActive = computed(
-  () => activeCall.value?.provider === VOICE_CALL_PROVIDERS.WHATSAPP
-);
-
-const primaryIncomingCall = computed(() =>
-  hasActiveCall.value ? null : incomingCalls.value[0] || null
-);
-
-const stackedIncomingCalls = computed(() =>
-  hasActiveCall.value ? incomingCalls.value : incomingCalls.value.slice(1)
-);
-
-const mainCardState = computed(() => {
-  if (hasActiveCall.value) return VOICE_CALL_DIRECTION.ONGOING;
-  const direction = primaryIncomingCall.value?.callDirection;
-  return direction === VOICE_CALL_DIRECTION.OUTBOUND
-    ? VOICE_CALL_DIRECTION.OUTGOING
-    : VOICE_CALL_DIRECTION.INCOMING;
-});
-
-// Stacked cards are always non-active (ringing) calls, so reflect each call's
-// real direction. An outbound call must render as OUTGOING — otherwise it shows
-// the incoming-only dismiss (✕) control and the agent could drop it locally
-// without terminating, leaving the customer ringing with no widget to end it.
-const stackedCardState = call =>
-  call?.callDirection === VOICE_CALL_DIRECTION.OUTBOUND
-    ? VOICE_CALL_DIRECTION.OUTGOING
-    : VOICE_CALL_DIRECTION.INCOMING;
-
-const toggleMute = () => {
-  isMuted.value = !isMuted.value;
-  setWhatsappCallMuted(isMuted.value);
-};
-
-watch(hasActiveCall, active => {
-  if (!active) isMuted.value = false;
-});
-
-// Convert ISO 3166-1 alpha-2 country code (e.g. "US") to its regional indicator
-// flag emoji. Returns empty string if the code is missing or malformed.
-const countryCodeToFlag = code => {
-  if (!code || code.length !== 2) return '';
-  const base = 0x1f1e6;
-  const offset = 'A'.charCodeAt(0);
-  return String.fromCodePoint(
-    ...code
-      .toUpperCase()
-      .split('')
-      .map(c => base + (c.charCodeAt(0) - offset))
-  );
-};
-
-const getCallInfo = call => {
-  const conversation = store.getters.getConversationById(call?.conversationId);
-  // Look up inbox from the call's own inboxId — the conversation can drop out
-  // of the Vuex store when the user navigates between inbox views, so going
-  // through `conversation.inbox_id` would lose the inbox name (and fall back
-  // to the literal "Customer support" string).
-  const inbox = store.getters['inboxes/getInbox'](call?.inboxId);
-  const sender = conversation?.meta?.sender;
-  // `caller` is the snapshot captured when the call first landed (from the
-  // message sender or the WhatsApp cable payload). It outlives the
-  // conversation being in the store, so prefer it for display.
-  const caller = call?.caller;
-  const additional =
-    sender?.additional_attributes || caller?.additionalAttributes || {};
-  const city = additional.city || '';
-  const countryCode = additional.country_code || '';
-  const country =
-    additional.country ||
-    countriesList.find(c => c.id === countryCode.toUpperCase())?.name ||
-    '';
-  // Prefer the richest available location string ("City, Country"); fall back to
-  // whichever single field is present; finally fall back to the inbox name so
-  // there's always something to show.
-  const locationParts = [city, country].filter(Boolean);
-  const location =
-    locationParts.join(', ') || inbox?.name || 'Customer support';
-  return {
-    conversation,
-    inbox,
-    contactName:
-      caller?.name ||
-      sender?.name ||
-      caller?.phone ||
-      sender?.phone_number ||
-      'Unknown caller',
-    phoneNumber: caller?.phone || sender?.phone_number || '',
-    inboxName: inbox?.name || 'Customer support',
-    location,
-    countryFlag: countryCodeToFlag(countryCode),
-    hasLocation: locationParts.length > 0,
-    avatar: caller?.avatar || sender?.avatar || sender?.thumbnail,
-  };
-};
-
-const goToConversation = call => {
-  const conversationId = call?.conversationId;
-  const accountId = route.params.accountId;
-  if (!conversationId || !accountId) return;
-  router.push({
-    path: frontendURL(conversationUrl({ accountId, id: conversationId })),
-  });
-};
-
-const handleEndCall = async () => {
-  const call = activeCall.value;
-  if (!call) return;
-
-  const inboxId = call.inboxId || getCallInfo(call).conversation?.inbox_id;
-  if (!inboxId) return;
-
-  await endCallSession({
-    conversationId: call.conversationId,
-    inboxId,
-    callSid: call.callSid,
-  });
-};
-
-const handleJoinCall = async call => {
-  if (!call || isJoining.value) return;
-  const { conversation } = getCallInfo(call);
-
-  if (hasActiveCall.value) {
-    await handleEndCall();
-  }
-
-  // The conversation may not be hydrated yet (post-refresh seeding path);
-  // call.inboxId already carries what joinCall needs.
-  const result = await joinCall({
-    conversationId: call.conversationId,
-    inboxId: call.inboxId || conversation?.inbox_id,
-    callSid: call.callSid,
-  });
-
-  if (result && conversation) {
-    router.push({
-      name: 'inbox_conversation',
-      params: { conversation_id: call.conversationId },
-    });
-  }
-};
-
-// Auto-join outbound calls when window is visible. WhatsApp outbound has no
-// separate join step (the offer was sent at initiate time and the answer is
-// applied directly by the cable handler), so this only covers Twilio.
-watch(
-  () => incomingCalls.value[0],
-  call => {
-    if (
-      call?.callDirection === VOICE_CALL_DIRECTION.OUTBOUND &&
-      call?.provider !== VOICE_CALL_PROVIDERS.WHATSAPP &&
-      !hasActiveCall.value &&
-      WindowVisibilityHelper.isWindowVisible()
-    ) {
-      handleJoinCall(call);
-    }
-  },
-  { immediate: true }
-);
-
-// Loop the ringtone while an inbound call is unanswered. Stop the moment any
-// call is active (we joined), every inbound call cleared, or the widget tears
-// down. The watcher only fires on the boolean transitioning, so additional
-// ringing calls arriving while one is already ringing don't restart the audio
-// — they silently stack into the UI without producing a fresh ring.
-// Browser autoplay may reject the first play() if the tab has no prior
-// user gesture; that's fine — the visual widget still surfaces the call.
-const ringtone = new Audio(RINGTONE_URL);
-ringtone.loop = true;
-ringtone.volume = 1;
-
-const stopRingtone = () => {
-  ringtone.pause();
-  ringtone.currentTime = 0;
-};
-
-const ringingInbound = computed(() =>
-  incomingCalls.value.some(
-    call => call.callDirection !== VOICE_CALL_DIRECTION.OUTBOUND
-  )
-);
-
-watch(
-  () => ringingInbound.value && !hasActiveCall.value,
-  shouldRing => {
-    if (shouldRing) {
-      ringtone.play().catch(() => {});
-    } else {
-      stopRingtone();
-    }
-  },
-  { immediate: true }
-);
-
-onBeforeUnmount(stopRingtone);
-</script>
-
-<template>
-  <div
-    v-if="incomingCalls.length || hasActiveCall"
-    class="fixed ltr:right-4 rtl:left-4 bottom-4 z-50 flex flex-col gap-3 w-[400px]"
-  >
-    <!-- Stacked incoming calls (shown above the primary card) -->
-    <CallCard
-      v-for="call in stackedIncomingCalls"
-      :key="call.callSid"
-      :call="call"
-      :state="stackedCardState(call)"
-      :call-info="getCallInfo(call)"
-      @accept="handleJoinCall(call)"
-      @reject="rejectIncomingCall(call.callSid)"
-      @dismiss="dismissCall(call.callSid)"
-      @go-to-conversation="goToConversation(call)"
-    />
-
-    <!-- Main Call Widget -->
-    <CallCard
-      v-if="hasActiveCall || primaryIncomingCall"
-      :call="activeCall || primaryIncomingCall"
-      :state="mainCardState"
-      :call-info="getCallInfo(activeCall || primaryIncomingCall)"
-      :duration="hasActiveCall ? formattedCallDuration : ''"
-      :is-muted="isMuted"
-      :show-mute="hasActiveCall && isWhatsappActive"
-      @accept="handleJoinCall(primaryIncomingCall)"
-      @reject="rejectIncomingCall(primaryIncomingCall?.callSid)"
-      @dismiss="dismissCall(primaryIncomingCall?.callSid)"
-      @end="handleEndCall"
-      @toggle-mute="toggleMute"
-      @go-to-conversation="goToConversation(activeCall || primaryIncomingCall)"
-    />
-  </div>
-</template>

app/javascript/dashboard/components-next/captain/assistant/DocumentBulkActions.vue

@@ -25,7 +25,7 @@ const store = useStore();
 const bulkDeleteDialog = ref(null);
 
 const isSyncableDocument = doc =>
-  !doc.pdf_document && doc.status === 'available';
+  !doc.pdf_document && doc.status === 'available' && !doc.sync_in_progress;
 
 const syncableSelectedIds = computed(() => {
   if (!props.selectedIds.size) return [];

app/javascript/dashboard/components-next/captain/assistant/DocumentCard.vue

@@ -127,6 +127,7 @@ const menuItems = computed(() => {
       value: 'sync',
       action: 'sync',
       icon: 'i-lucide-refresh-cw',
+      disabled: props.syncInProgress,
     });
   }
 

app/javascript/dashboard/components-next/icon/ChannelIcon.story.vue

@@ -1,65 +0,0 @@
-<script setup>
-import ChannelIcon from './ChannelIcon.vue';
-import { useChannelBrandIcon } from './provider';
-
-const inboxes = [
-  { name: 'API', channel_type: 'Channel::Api' },
-  { name: 'Email', channel_type: 'Channel::Email' },
-  { name: 'Gmail', channel_type: 'Channel::Email', provider: 'google' },
-  { name: 'Outlook', channel_type: 'Channel::Email', provider: 'microsoft' },
-  { name: 'Messenger', channel_type: 'Channel::FacebookPage' },
-  { name: 'Instagram', channel_type: 'Channel::Instagram' },
-  { name: 'Line', channel_type: 'Channel::Line' },
-  { name: 'Telegram', channel_type: 'Channel::Telegram' },
-  { name: 'WhatsApp', channel_type: 'Channel::Whatsapp' },
-  { name: 'TikTok', channel_type: 'Channel::Tiktok' },
-  { name: 'SMS', channel_type: 'Channel::Sms' },
-  { name: 'Twilio SMS', channel_type: 'Channel::TwilioSms' },
-  {
-    name: 'Twilio WhatsApp',
-    channel_type: 'Channel::TwilioSms',
-    medium: 'whatsapp',
-  },
-  {
-    name: 'Voice',
-    channel_type: 'Channel::TwilioSms',
-    voice_enabled: true,
-  },
-  { name: 'Website', channel_type: 'Channel::WebWidget' },
-];
-
-const brandInboxes = inboxes.filter(inbox => useChannelBrandIcon(inbox).value);
-</script>
-
-<template>
-  <Story title="Components/Icons/ChannelIcon">
-    <Variant title="Glyph (default)">
-      <div class="grid grid-cols-4 gap-5">
-        <div
-          v-for="inbox in inboxes"
-          :key="inbox.name"
-          class="flex items-center gap-2"
-        >
-          <ChannelIcon :inbox="inbox" class="size-6 text-n-slate-11" />
-          <span>{{ inbox.name }}</span>
-        </div>
-      </div>
-    </Variant>
-    <Variant title="Brand icon">
-      <div class="grid grid-cols-4 gap-5">
-        <div
-          v-for="inbox in brandInboxes"
-          :key="inbox.name"
-          class="flex items-center gap-2"
-        >
-          <ChannelIcon
-            :inbox="inbox"
-            use-brand-icon
-            class="size-6 text-n-slate-11"
-          />
-          <span>{{ inbox.name }}</span>
-        </div>
-      </div>
-    </Variant>
-  </Story>
-</template>

app/javascript/dashboard/components-next/icon/ChannelIcon.vue

@@ -1,7 +1,6 @@
 <script setup>
-import { computed, toRef } from 'vue';
-import { isVoiceCallEnabled } from 'dashboard/helper/inbox';
-import { useChannelIcon, useChannelBrandIcon } from './provider';
+import { toRef } from 'vue';
+import { useChannelIcon } from './provider';
 import Icon from 'next/icon/Icon.vue';
 
 const props = defineProps({
@@ -9,35 +8,11 @@ const props = defineProps({
     type: Object,
     required: true,
   },
-  // When true, render the full-color brand icon (when one exists for the
-  // channel type) and fall back to the monochrome glyph otherwise.
-  useBrandIcon: {
-    type: Boolean,
-    default: false,
-  },
 });
 
-defineOptions({ inheritAttrs: false });
-
-const inboxRef = toRef(props, 'inbox');
-
-const hasVoiceBadge = computed(() => isVoiceCallEnabled(props.inbox));
-const channelIcon = useChannelIcon(inboxRef);
-const brandIcon = useChannelBrandIcon(inboxRef);
-
-const icon = computed(() =>
-  props.useBrandIcon && brandIcon.value ? brandIcon.value : channelIcon.value
-);
+const channelIcon = useChannelIcon(toRef(props, 'inbox'));
 </script>
 
 <template>
-  <span class="relative inline-flex" v-bind="$attrs">
-    <Icon :icon="icon" class="size-full" />
-    <span
-      v-if="hasVoiceBadge"
-      class="absolute top-0 ltr:right-0 rtl:left-0 inline-flex items-center justify-center size-2 rounded-full bg-n-surface-1"
-    >
-      <Icon icon="i-lucide-audio-lines" class="size-1.5 text-n-slate-12" />
-    </span>
-  </span>
+  <Icon :icon="channelIcon" />
 </template>

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

@@ -1,75 +1,47 @@
-import { INBOX_TYPES, TWILIO_CHANNEL_MEDIUM } from 'dashboard/helper/inbox';
 import { computed } from 'vue';
-
-const channelTypeIconMap = {
-  'Channel::Api': 'i-woot-api',
-  'Channel::Email': 'i-woot-mail',
-  'Channel::FacebookPage': 'i-woot-messenger',
-  'Channel::Line': 'i-woot-line',
-  'Channel::Sms': 'i-woot-sms',
-  'Channel::Telegram': 'i-woot-telegram',
-  'Channel::TwilioSms': 'i-woot-sms',
-  'Channel::TwitterProfile': 'i-woot-x',
-  'Channel::WebWidget': 'i-woot-website',
-  'Channel::Whatsapp': 'i-woot-whatsapp',
-  'Channel::Instagram': 'i-woot-instagram',
-  'Channel::Tiktok': 'i-woot-tiktok',
-};
-
-const providerIconMap = {
-  microsoft: 'i-woot-outlook',
-  google: 'i-woot-gmail',
-};
-
-// Full-color brand icons. Most come from the `logos` Iconify set; Instagram,
-// Outlook and Line use custom `woot` glyphs since the `logos` versions are
-// monochrome or missing. Channels not listed here have no brand variant and
-// callers should fall back to the monochrome glyph via useChannelIcon.
-const channelTypeBrandIconMap = {
-  'Channel::FacebookPage': 'i-logos-messenger',
-  'Channel::Line': 'i-woot-line-color',
-  'Channel::Telegram': 'i-logos-telegram',
-  'Channel::Whatsapp': 'i-logos-whatsapp-icon',
-  'Channel::Instagram': 'i-woot-instagram-color',
-  'Channel::Tiktok': 'i-logos-tiktok-icon',
-};
-
-const providerBrandIconMap = {
-  microsoft: 'i-woot-outlook-color',
-  google: 'i-logos-google-gmail',
-};
-
-const resolveInbox = inbox => inbox?.value ?? inbox;
+import { isVoiceCallEnabled } from 'dashboard/helper/inbox';
 
 export function useChannelIcon(inbox) {
+  const channelTypeIconMap = {
+    'Channel::Api': 'i-woot-api',
+    'Channel::Email': 'i-woot-mail',
+    'Channel::FacebookPage': 'i-woot-messenger',
+    'Channel::Line': 'i-woot-line',
+    'Channel::Sms': 'i-woot-sms',
+    'Channel::Telegram': 'i-woot-telegram',
+    'Channel::TwilioSms': 'i-woot-sms',
+    'Channel::TwitterProfile': 'i-woot-x',
+    'Channel::WebWidget': 'i-woot-website',
+    'Channel::Whatsapp': 'i-woot-whatsapp',
+    'Channel::Instagram': 'i-woot-instagram',
+    'Channel::Tiktok': 'i-woot-tiktok',
+    'Channel::AppStore': 'i-ri-app-store-fill',
+    'Channel::GooglePlay': 'i-ri-google-play-line',
+  };
+
+  const providerIconMap = {
+    microsoft: 'i-woot-outlook',
+    google: 'i-woot-gmail',
+  };
+
   const channelIcon = computed(() => {
-    const inboxDetails = resolveInbox(inbox);
+    const inboxDetails = inbox.value || inbox;
     const type = inboxDetails.channel_type;
     let icon = channelTypeIconMap[type];
 
-    if (type === INBOX_TYPES.EMAIL && inboxDetails.provider) {
+    if (type === 'Channel::Email' && inboxDetails.provider) {
       if (Object.keys(providerIconMap).includes(inboxDetails.provider)) {
         icon = providerIconMap[inboxDetails.provider];
       }
     }
 
     // Special case for Twilio whatsapp
-    if (
-      type === INBOX_TYPES.TWILIO &&
-      inboxDetails.medium === TWILIO_CHANNEL_MEDIUM.WHATSAPP
-    ) {
+    if (type === 'Channel::TwilioSms' && inboxDetails.medium === 'whatsapp') {
       icon = 'i-woot-whatsapp';
     }
 
-    // Native Twilio voice inbox: a TwilioSms with voice enabled (and no WhatsApp medium)
-    // is presented as a Voice channel, so show the phone icon.
-    const voiceEnabled =
-      inboxDetails.voice_enabled || inboxDetails.voiceEnabled;
-    if (
-      type === INBOX_TYPES.TWILIO &&
-      voiceEnabled &&
-      inboxDetails.medium !== TWILIO_CHANNEL_MEDIUM.WHATSAPP
-    ) {
+    // Special case for voice-enabled inboxes (Twilio, WhatsApp, etc.)
+    if (isVoiceCallEnabled(inboxDetails)) {
       icon = 'i-woot-voice';
     }
 
@@ -78,26 +50,3 @@ export function useChannelIcon(inbox) {
 
   return channelIcon;
 }
-
-export function useChannelBrandIcon(inbox) {
-  return computed(() => {
-    const inboxDetails = resolveInbox(inbox);
-    const type = inboxDetails.channel_type;
-    let icon = channelTypeBrandIconMap[type];
-
-    if (type === INBOX_TYPES.EMAIL && inboxDetails.provider) {
-      if (Object.keys(providerBrandIconMap).includes(inboxDetails.provider)) {
-        icon = providerBrandIconMap[inboxDetails.provider];
-      }
-    }
-
-    if (
-      type === INBOX_TYPES.TWILIO &&
-      inboxDetails.medium === TWILIO_CHANNEL_MEDIUM.WHATSAPP
-    ) {
-      icon = channelTypeBrandIconMap['Channel::Whatsapp'];
-    }
-
-    return icon ?? null;
-  });
-}

app/javascript/dashboard/components-next/message/Message.vue

@@ -554,10 +554,11 @@ provideMessageContext({
         <Avatar v-bind="avatarInfo" :size="24" />
       </div>
       <div
-        class="[grid-area:bubble] flex min-w-0"
+        class="[grid-area:bubble] flex"
         :class="{
           'ltr:ml-8 rtl:mr-8 justify-end': orientation === ORIENTATION.RIGHT,
           'ltr:mr-8 rtl:ml-8': orientation === ORIENTATION.LEFT,
+          'min-w-0': variant === MESSAGE_VARIANTS.EMAIL,
         }"
         @contextmenu="openContextMenu($event)"
       >

app/javascript/dashboard/components-next/message/MessageMeta.vue

@@ -20,7 +20,9 @@ const {
   isAWhatsAppChannel,
   isAnEmailChannel,
   isAnInstagramChannel,
+  isAnAppStoreChannel,
   isATiktokChannel,
+  isAGooglePlayChannel,
 } = useInbox();
 
 const {
@@ -62,7 +64,9 @@ const isSent = computed(() => {
     isASmsInbox.value ||
     isATelegramChannel.value ||
     isAnInstagramChannel.value ||
-    isATiktokChannel.value
+    isATiktokChannel.value ||
+    isAnAppStoreChannel.value ||
+    isAGooglePlayChannel.value
   ) {
     return sourceId.value && status.value === MESSAGE_STATUS.SENT;
   }
@@ -85,7 +89,8 @@ const isDelivered = computed(() => {
     isASmsInbox.value ||
     isAFacebookInbox.value ||
     isAnInstagramChannel.value ||
-    isATiktokChannel.value
+    isATiktokChannel.value ||
+    isAnAppStoreChannel.value
   ) {
     return sourceId.value && status.value === MESSAGE_STATUS.DELIVERED;
   }
@@ -110,7 +115,8 @@ const isRead = computed(() => {
     isATwilioChannel.value ||
     isAFacebookInbox.value ||
     isAnInstagramChannel.value ||
-    isATiktokChannel.value
+    isATiktokChannel.value ||
+    isAnAppStoreChannel.value
   ) {
     return sourceId.value && status.value === MESSAGE_STATUS.READ;
   }

app/javascript/dashboard/components-next/message/bubbles/Base.vue

@@ -95,7 +95,7 @@ const replyToPreview = computed(() => {
 
 <template>
   <div
-    class="text-sm min-w-0"
+    class="text-sm"
     :class="[
       messageClass,
       {

app/javascript/dashboard/components-next/message/bubbles/Unsupported.vue

@@ -6,12 +6,9 @@ import BaseBubble from './Base.vue';
 
 const { inboxId } = useMessageContext();
 
-const {
-  isAFacebookInbox,
-  isAnInstagramChannel,
-  isATiktokChannel,
-  isAWhatsAppChannel,
-} = useInbox(inboxId.value);
+const { isAFacebookInbox, isAnInstagramChannel, isATiktokChannel } = useInbox(
+  inboxId.value
+);
 
 const unsupportedMessageKey = computed(() => {
   if (isAFacebookInbox.value)
@@ -19,8 +16,6 @@ const unsupportedMessageKey = computed(() => {
   if (isAnInstagramChannel.value)
     return 'CONVERSATION.UNSUPPORTED_MESSAGE_INSTAGRAM';
   if (isATiktokChannel.value) return 'CONVERSATION.UNSUPPORTED_MESSAGE_TIKTOK';
-  if (isAWhatsAppChannel.value)
-    return 'CONVERSATION.UNSUPPORTED_MESSAGE_WHATSAPP';
   return 'CONVERSATION.UNSUPPORTED_MESSAGE';
 });
 </script>

app/javascript/dashboard/components-next/message/bubbles/VoiceCall.vue

@@ -2,27 +2,14 @@
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStore } from 'vuex';
-import { useMapGetter } from 'dashboard/composables/store';
 import { useMessageContext } from '../provider.js';
-import {
-  VOICE_CALL_STATUS,
-  VOICE_CALL_DIRECTION,
-  VOICE_CALL_OUTBOUND_INIT_STATUS,
-  VOICE_CALL_END_REASON,
-  MESSAGE_TYPES,
-  ATTACHMENT_TYPES,
-} from '../constants';
-import { useCallActions } from 'dashboard/composables/useCallSession';
-import { useWhatsappCallSession } from 'dashboard/composables/useWhatsappCallSession';
-import { useCallsStore } from 'dashboard/stores/calls';
-import { VOICE_CALL_PROVIDERS } from 'dashboard/helper/inbox';
+import { VOICE_CALL_STATUS } from '../constants';
+import { useCallSession } from 'dashboard/composables/useCallSession';
 import { formatDuration } from 'shared/helpers/timeHelper';
-import { useAlert } from 'dashboard/composables';
 
 import Icon from 'dashboard/components-next/icon/Icon.vue';
 import BaseBubble from 'next/message/bubbles/Base.vue';
 import AudioChip from 'next/message/chips/Audio.vue';
-import NextButton from 'dashboard/components-next/button/Button.vue';
 
 const LABEL_MAP = {
   [VOICE_CALL_STATUS.IN_PROGRESS]: 'CONVERSATION.VOICE_CALL.CALL_IN_PROGRESS',
@@ -30,67 +17,39 @@ const LABEL_MAP = {
 };
 
 const ICON_MAP = {
-  [VOICE_CALL_STATUS.IN_PROGRESS]: 'i-ph-phone-call-bold',
-  [VOICE_CALL_STATUS.COMPLETED]: 'i-ph-phone-bold',
-  [VOICE_CALL_STATUS.NO_ANSWER]: 'i-ph-phone-x-bold',
-  [VOICE_CALL_STATUS.FAILED]: 'i-ph-phone-x-bold',
+  [VOICE_CALL_STATUS.IN_PROGRESS]: 'i-ph-phone-call',
+  [VOICE_CALL_STATUS.NO_ANSWER]: 'i-ph-phone-x',
+  [VOICE_CALL_STATUS.FAILED]: 'i-ph-phone-x',
+};
+
+const BG_COLOR_MAP = {
+  [VOICE_CALL_STATUS.IN_PROGRESS]: 'bg-n-teal-9',
+  [VOICE_CALL_STATUS.RINGING]: 'bg-n-teal-9 animate-pulse',
+  [VOICE_CALL_STATUS.COMPLETED]: 'bg-n-slate-11',
+  [VOICE_CALL_STATUS.NO_ANSWER]: 'bg-n-ruby-9',
+  [VOICE_CALL_STATUS.FAILED]: 'bg-n-ruby-9',
 };
 
 const { t } = useI18n();
 const store = useStore();
-const {
-  call,
-  attachments,
-  contentAttributes,
-  conversationId,
-  currentUserId,
-  inboxId,
-  sender,
-  messageType,
-} = useMessageContext();
+const { call, conversationId, currentUserId, inboxId } = useMessageContext();
 const { joinCall, endCall, activeCall, hasActiveCall, isJoining } =
-  useCallActions();
-const whatsappCallSession = useWhatsappCallSession();
-const callsStore = useCallsStore();
-const contactsUiFlags = useMapGetter('contacts/getUIFlags');
-const isInitiatingCall = computed(
-  () => contactsUiFlags.value?.isInitiatingCall || false
-);
+  useCallSession();
 
 const status = computed(() => call.value?.status);
-// Server-side call records use `outgoing`/`incoming`, while the Pinia store
-// and a few API hops normalise to `outbound`/`inbound`. Accept either so the
-// bubble label matches the message orientation no matter the source.
-const isOutbound = computed(() => {
-  const dir = call.value?.direction;
-  if (
-    dir === VOICE_CALL_DIRECTION.OUTGOING ||
-    dir === VOICE_CALL_DIRECTION.OUTBOUND
-  )
-    return true;
-  if (
-    dir === VOICE_CALL_DIRECTION.INCOMING ||
-    dir === VOICE_CALL_DIRECTION.INBOUND
-  )
-    return false;
-  // Fall back to the message orientation: agent-authored messages sit on the
-  // right (outbound) and contact-authored ones on the left.
-  return messageType.value === MESSAGE_TYPES.OUTGOING;
-});
-const isWhatsapp = computed(
-  () => call.value?.provider === VOICE_CALL_PROVIDERS.WHATSAPP
-);
+const isOutbound = computed(() => call.value?.direction === 'outgoing');
 const isFailed = computed(() =>
   [VOICE_CALL_STATUS.NO_ANSWER, VOICE_CALL_STATUS.FAILED].includes(status.value)
 );
-const isMissedInbound = computed(() => isFailed.value && !isOutbound.value);
-const endReason = computed(() => call.value?.endReason);
-const wasDeclinedByAgent = computed(
-  () =>
-    isMissedInbound.value &&
-    endReason.value === VOICE_CALL_END_REASON.AGENT_REJECTED
-);
 const acceptedByAgentId = computed(() => call.value?.acceptedByAgentId);
+const didCurrentUserAnswer = computed(
+  () =>
+    !!acceptedByAgentId.value && acceptedByAgentId.value === currentUserId.value
+);
+// Pickup auto-assigns the conversation, so the assignee is a safe display proxy
+// for the answerer when the Call payload lacks accepted_by_agent_id (e.g.,
+// Twilio's call-status webhook flipped the call to in-progress before the
+// participant-join webhook claimed it).
 const conversationAssignee = computed(() => {
   const conversation = store.getters.getConversationById?.(
     conversationId?.value
@@ -107,107 +66,67 @@ const displayAgentName = computed(() => {
   return conversationAssignee.value?.name || null;
 });
 
-const audioAttachment = computed(() =>
-  (attachments?.value || []).find(a => a.fileType === ATTACHMENT_TYPES.AUDIO)
-);
-
-const durationSeconds = computed(() => {
-  const fromCall = call.value?.durationSeconds || call.value?.duration_seconds;
-  if (fromCall != null) return fromCall;
-  const data = contentAttributes?.value?.data;
-  return data?.durationSeconds || data?.duration_seconds;
-});
-
-const formattedDuration = computed(() => formatDuration(durationSeconds.value));
-
-// Agent who handled the call (initiator on outbound, answerer on inbound), taken
-// strictly from the persisted accept fields — never the conversation's current
-// assignee, which would mis-attribute a historical call after a reassignment.
-const handlerName = computed(() => {
-  if (call.value?.acceptedByAgentName) return call.value.acceptedByAgentName;
-  if (!acceptedByAgentId.value) return null;
-  const agent = store.getters['agents/getAgentById'](acceptedByAgentId.value);
-  return agent?.available_name || agent?.name || null;
-});
-
-const handledBy = computed(() =>
-  handlerName.value
-    ? t('CONVERSATION.VOICE_CALL.HANDLED_BY', { agentName: handlerName.value })
-    : null
-);
-
 const labelKey = computed(() => {
   if (LABEL_MAP[status.value]) return LABEL_MAP[status.value];
-  if (isFailed.value) {
+  if (status.value === VOICE_CALL_STATUS.RINGING) {
     return isOutbound.value
-      ? 'CONVERSATION.VOICE_CALL.NO_ANSWER_OUTBOUND_LABEL'
-      : 'CONVERSATION.VOICE_CALL.MISSED_CALL';
+      ? 'CONVERSATION.VOICE_CALL.OUTGOING_CALL'
+      : 'CONVERSATION.VOICE_CALL.INCOMING_CALL';
   }
-  // RINGING or an as-yet-unknown/initial status: orient purely by direction so an
-  // outbound call never falls through to the "Incoming call" label.
-  return isOutbound.value
-    ? 'CONVERSATION.VOICE_CALL.OUTGOING_CALL'
+  return isFailed.value
+    ? 'CONVERSATION.VOICE_CALL.MISSED_CALL'
     : 'CONVERSATION.VOICE_CALL.INCOMING_CALL';
 });
 
+const formattedDuration = computed(() =>
+  formatDuration(call.value?.durationSeconds)
+);
+
 const subtext = computed(() => {
-  // Completed: "Handled by {agent} · 0:42" (drops either part when absent).
+  if (status.value === VOICE_CALL_STATUS.RINGING) {
+    return t('CONVERSATION.VOICE_CALL.NOT_ANSWERED_YET');
+  }
   if (status.value === VOICE_CALL_STATUS.COMPLETED) {
-    return [handledBy.value, formattedDuration.value]
-      .filter(Boolean)
-      .join(' · ');
+    return formattedDuration.value;
   }
   if (status.value === VOICE_CALL_STATUS.IN_PROGRESS) {
-    return handledBy.value;
-  }
-  if (isFailed.value) {
-    // Missed/failed calls have no handler, so keep the reason rather than "Handled by".
-    if (isOutbound.value) {
-      return t('CONVERSATION.VOICE_CALL.NO_ANSWER_OUTBOUND_SUBTEXT');
+    if (isOutbound.value) return t('CONVERSATION.VOICE_CALL.THEY_ANSWERED');
+    if (didCurrentUserAnswer.value) {
+      return t('CONVERSATION.VOICE_CALL.YOU_ANSWERED');
     }
-    if (wasDeclinedByAgent.value && displayAgentName.value) {
-      return t('CONVERSATION.VOICE_CALL.MISSED_CALL_DECLINED_BY', {
+    if (displayAgentName.value) {
+      return t('CONVERSATION.VOICE_CALL.AGENT_ANSWERED', {
         agentName: displayAgentName.value,
       });
     }
-    return t('CONVERSATION.VOICE_CALL.MISSED_CALL_INBOUND_SUBTEXT');
+    return t('CONVERSATION.VOICE_CALL.THEY_ANSWERED');
   }
-  // RINGING or an as-yet-unknown/initial status.
-  if (isOutbound.value) {
-    return handledBy.value || t('CONVERSATION.VOICE_CALL.CALLING');
-  }
-  return t('CONVERSATION.VOICE_CALL.NOT_ANSWERED_YET');
+  return isFailed.value
+    ? t('CONVERSATION.VOICE_CALL.NO_ANSWER')
+    : t('CONVERSATION.VOICE_CALL.NOT_ANSWERED_YET');
 });
 
 const iconName = computed(() => {
   if (ICON_MAP[status.value]) return ICON_MAP[status.value];
-  return isOutbound.value
-    ? 'i-ph-phone-outgoing-bold'
-    : 'i-ph-phone-incoming-bold';
+  return isOutbound.value ? 'i-ph-phone-outgoing' : 'i-ph-phone-incoming';
 });
 
-// Subtle icon container — matches the design's tonal swatch over the bubble bg.
-// Status drives the accent: teal for live, ruby for missed, neutral otherwise.
-const iconContainerClass = computed(() => {
-  if (status.value === VOICE_CALL_STATUS.IN_PROGRESS) {
-    return 'bg-n-teal-3 text-n-teal-11';
-  }
-  if (status.value === VOICE_CALL_STATUS.RINGING) {
-    return 'bg-n-teal-3 text-n-teal-11';
-  }
-  if (isMissedInbound.value) {
-    return 'bg-n-alpha-2 text-n-ruby-9';
-  }
-  return 'bg-n-alpha-2 text-n-slate-12';
-});
+const bgColor = computed(() => BG_COLOR_MAP[status.value] || 'bg-n-teal-9');
 
 const callSid = computed(() => call.value?.providerCallId);
 
+// Show "Join call" when the call is still ringing, no agent has claimed it,
+// and the conversation is unassigned or assigned to the current user. Mirrors
+// the eligibility used by FloatingCallWidget so the bubble can act as a
+// recovery affordance after a refresh or missed widget.
 const canJoinCall = computed(() => {
   if (status.value !== VOICE_CALL_STATUS.RINGING) return false;
   if (isOutbound.value) return false;
   if (acceptedByAgentId.value) return false;
   if (!callSid.value || !inboxId.value || !conversationId.value) return false;
+  // Suppress the button once this call is the local active session — the
+  // message status webhook may lag behind, so we can't rely on `status` alone
+  // to hide it after a successful join from this client.
   if (hasActiveCall.value && activeCall.value?.callSid === callSid.value)
     return false;
   const assignee = conversationAssignee.value;
@@ -216,12 +135,11 @@ const canJoinCall = computed(() => {
 });
 
 const recordingAttachment = computed(() => {
-  if (audioAttachment.value) return audioAttachment.value;
   const url = call.value?.recordingUrl;
   if (!url) return null;
   return {
     dataUrl: url,
-    fileType: ATTACHMENT_TYPES.AUDIO,
+    fileType: 'audio',
     extension: 'wav',
     transcribedText: call.value?.transcript || '',
   };
@@ -244,117 +162,48 @@ const handleJoinCall = async () => {
     callSid: callSid.value,
   });
 };
-
-const canCallBack = computed(
-  () =>
-    isMissedInbound.value &&
-    !!inboxId.value &&
-    !!conversationId.value &&
-    !hasActiveCall.value &&
-    !callsStore.hasIncomingCall
-);
-
-const handleCallBack = async () => {
-  if (!canCallBack.value || isInitiatingCall.value) return;
-  try {
-    if (isWhatsapp.value) {
-      const response = await whatsappCallSession.initiateOutboundCall(
-        conversationId.value
-      );
-      if (response?.status === VOICE_CALL_OUTBOUND_INIT_STATUS.LOCKED) return;
-      // Permission template path returns no call id — show banner, no widget yet.
-      if (!response?.id) {
-        useAlert(
-          response?.status ===
-            VOICE_CALL_OUTBOUND_INIT_STATUS.PERMISSION_PENDING
-            ? t('CONVERSATION.HEADER.WHATSAPP_CALL_PERMISSION_PENDING')
-            : t('CONVERSATION.HEADER.WHATSAPP_CALL_PERMISSION_REQUESTED')
-        );
-        return;
-      }
-      callsStore.addCall({
-        callSid: response.call_id,
-        callId: response.id,
-        conversationId: conversationId.value,
-        inboxId: inboxId.value,
-        callDirection: VOICE_CALL_DIRECTION.OUTBOUND,
-        provider: VOICE_CALL_PROVIDERS.WHATSAPP,
-      });
-      return;
-    }
-    const response = await store.dispatch('contacts/initiateCall', {
-      contactId: sender.value?.id,
-      inboxId: inboxId.value,
-      conversationId: conversationId.value,
-    });
-    callsStore.addCall({
-      callSid: response?.call_sid,
-      conversationId: response?.conversation_id ?? conversationId.value,
-      inboxId: inboxId.value,
-      callDirection: VOICE_CALL_DIRECTION.OUTBOUND,
-    });
-  } catch (error) {
-    useAlert(error?.message || t('CONTACT_PANEL.CALL_FAILED'));
-  }
-};
 </script>
 
 <template>
-  <BaseBubble class="!p-3 !max-w-md min-w-[240px]" hide-meta>
-    <div class="flex flex-col gap-3 w-full">
-      <!-- Header row: icon + title + duration/subtext -->
-      <div class="flex gap-2.5 items-start">
+  <BaseBubble class="p-0 border-none" hide-meta>
+    <div class="flex overflow-hidden flex-col w-full max-w-sm">
+      <div class="flex gap-3 items-center p-3 w-full">
         <div
-          class="flex justify-center items-center rounded-xl size-11 shrink-0"
-          :class="iconContainerClass"
+          class="flex justify-center items-center rounded-full size-10 shrink-0"
+          :class="bgColor"
         >
-          <Icon class="size-4" :icon="iconName" />
+          <Icon
+            class="size-5"
+            :icon="iconName"
+            :class="{
+              'text-n-slate-1': status === VOICE_CALL_STATUS.COMPLETED,
+              'text-white': status !== VOICE_CALL_STATUS.COMPLETED,
+            }"
+          />
         </div>
-        <div class="flex flex-col flex-1 min-w-0 self-center">
-          <span
-            class="font-display text-sm font-medium leading-tight truncate tracking-tight"
-          >
+
+        <div class="flex overflow-hidden flex-col flex-grow">
+          <span class="text-sm font-medium truncate text-n-slate-12">
             {{ $t(labelKey) }}
           </span>
-          <span
-            v-if="subtext"
-            class="text-sm leading-tight truncate tracking-tight opacity-75"
-          >
+          <span v-if="subtext" class="text-xs text-n-slate-11">
             {{ subtext }}
           </span>
+          <button
+            v-if="canJoinCall"
+            type="button"
+            class="p-0 mt-1 text-xs font-medium text-start text-n-teal-10 hover:text-n-teal-11 disabled:opacity-50"
+            :disabled="isJoining"
+            @click="handleJoinCall"
+          >
+            {{ $t('CONVERSATION.VOICE_CALL.JOIN_CALL') }}
+          </button>
         </div>
       </div>
 
-      <!-- Audio player (when there's a recording) -->
-      <AudioChip
-        v-if="recordingAttachment"
-        :attachment="recordingAttachment"
-        show-transcribed-text
-      />
-
-      <!-- Call back button (missed inbound) -->
-      <NextButton
-        v-if="canCallBack"
-        type="button"
-        :label="$t('CONVERSATION.VOICE_CALL.CALL_BACK')"
-        icon="i-ph-phone-bold"
-        teal
-        class="!rounded-full"
-        :disabled="isInitiatingCall"
-        @click="handleCallBack"
-      />
-
-      <!-- Join call button (ringing inbound) -->
-      <NextButton
-        v-if="canJoinCall"
-        type="button"
-        :label="$t('CONVERSATION.VOICE_CALL.JOIN_CALL')"
-        icon="i-ph-phone-bold"
-        teal
-        class="!rounded-full"
-        :disabled="isJoining"
-        @click="handleJoinCall"
-      />
+      <div v-if="recordingAttachment" class="px-3 pb-3">
+        <AudioChip :attachment="recordingAttachment" />
+      </div>
     </div>
   </BaseBubble>
 </template>

app/javascript/dashboard/components-next/message/chips/Audio.vue

@@ -31,17 +31,6 @@ const timeStampURL = computed(() => {
   return timeStampAppendedURL(attachment.dataUrl);
 });
 
-const TRANSCRIPT_PREVIEW_LENGTH = 200;
-const isTranscriptExpanded = ref(false);
-const isTranscriptLong = computed(
-  () => (attachment.transcribedText?.length || 0) > TRANSCRIPT_PREVIEW_LENGTH
-);
-const displayedTranscript = computed(() => {
-  const text = attachment.transcribedText || '';
-  if (!isTranscriptLong.value || isTranscriptExpanded.value) return text;
-  return `${text.slice(0, TRANSCRIPT_PREVIEW_LENGTH).trimEnd()}…`;
-});
-
 const audioPlayer = useTemplateRef('audioPlayer');
 
 const isPlaying = ref(false);
@@ -52,33 +41,8 @@ const playbackSpeed = ref(1);
 
 const { uid } = getCurrentInstance();
 
-// MediaRecorder-produced WebM/Opus blobs lack a Duration header → <audio>.duration
-// resolves to Infinity until we seek past the end, which forces the engine to
-// scan the file and compute the real length. Safe no-op for files with a real
-// duration already (mp3/m4a/etc).
-const resolveStreamingDuration = () => {
-  const el = audioPlayer.value;
-  if (!el) return;
-  const onTimeUpdate = () => {
-    el.removeEventListener('timeupdate', onTimeUpdate);
-    el.currentTime = 0;
-    duration.value = el.duration;
-  };
-  el.addEventListener('timeupdate', onTimeUpdate);
-  try {
-    el.currentTime = Number.MAX_SAFE_INTEGER;
-  } catch {
-    el.removeEventListener('timeupdate', onTimeUpdate);
-  }
-};
-
 const onLoadedMetadata = () => {
-  const d = audioPlayer.value?.duration;
-  if (!Number.isFinite(d)) {
-    resolveStreamingDuration();
-    return;
-  }
-  duration.value = d;
+  duration.value = audioPlayer.value?.duration;
 };
 
 const playbackSpeedLabel = computed(() => {
@@ -89,8 +53,7 @@ const playbackSpeedLabel = computed(() => {
 // When the onLoadMetadata is called, so we need to set the duration
 // value when the component is mounted
 onMounted(() => {
-  const d = audioPlayer.value?.duration;
-  if (Number.isFinite(d)) duration.value = d;
+  duration.value = audioPlayer.value?.duration;
   audioPlayer.value.playbackRate = playbackSpeed.value;
 });
 
@@ -226,18 +189,7 @@ const downloadAudio = async () => {
       v-if="attachment.transcribedText && showTranscribedText"
       class="text-n-slate-12 p-3 text-sm bg-n-alpha-1 rounded-lg w-full break-words"
     >
-      {{ displayedTranscript }}
-      <button
-        v-if="isTranscriptLong"
-        class="block mt-1 p-0 border-0 bg-transparent text-n-slate-11 hover:text-n-slate-12 font-medium"
-        @click="isTranscriptExpanded = !isTranscriptExpanded"
-      >
-        {{
-          isTranscriptExpanded
-            ? $t('CONVERSATION.VOICE_CALL.TRANSCRIPT_SHOW_LESS')
-            : $t('CONVERSATION.VOICE_CALL.TRANSCRIPT_SHOW_MORE')
-        }}
-      </button>
+      {{ attachment.transcribedText }}
     </div>
   </div>
 </template>

app/javascript/dashboard/components-next/message/constants.js

@@ -88,18 +88,5 @@ export const VOICE_CALL_STATUS = {
 
 export const VOICE_CALL_DIRECTION = {
   INBOUND: 'inbound',
-  INCOMING: 'incoming',
-  OUTGOING: 'outgoing',
-  ONGOING: 'ongoing',
   OUTBOUND: 'outbound',
 };
-
-export const VOICE_CALL_OUTBOUND_INIT_STATUS = {
-  LOCKED: 'locked',
-  PERMISSION_REQUESTED: 'permission_requested',
-  PERMISSION_PENDING: 'permission_pending',
-};
-
-export const VOICE_CALL_END_REASON = {
-  AGENT_REJECTED: 'agent_rejected',
-};

app/javascript/dashboard/components-next/sidebar/SidebarProfileMenuStatus.vue

@@ -78,27 +78,26 @@ function changeAvailabilityStatus(availability) {
 <template>
   <DropdownSection class="[&>ul]:overflow-visible">
     <div class="grid gap-0">
-      <DropdownItem preserve-open class="gap-1">
-        <div class="flex-grow flex items-center gap-1 min-w-0">
+      <DropdownItem preserve-open>
+        <div class="flex-grow flex items-center gap-1">
           {{ $t('SIDEBAR.SET_YOUR_AVAILABILITY') }}
         </div>
-        <DropdownContainer class="shrink-0">
+        <DropdownContainer>
           <template #trigger="{ toggle }">
             <Button
               size="sm"
               color="slate"
               variant="faded"
+              class="min-w-[96px]"
               icon="i-lucide-chevron-down"
               trailing-icon
               @click="toggle"
             >
-              <div class="flex gap-1 items-center min-w-0 text-sm">
+              <div class="flex gap-1 items-center flex-grow text-sm">
                 <div class="p-1 flex-shrink-0">
                   <div class="size-2 rounded-sm" :class="activeStatus.color" />
                 </div>
-                <span class="truncate max-w-[7rem]">
-                  {{ activeStatus.label }}
-                </span>
+                <span>{{ activeStatus.label }}</span>
               </div>
             </Button>
           </template>
@@ -115,12 +114,12 @@ function changeAvailabilityStatus(availability) {
         </DropdownContainer>
       </DropdownItem>
       <DropdownItem>
-        <div class="flex-grow min-w-0">
+        <div class="flex-grow flex items-center gap-1">
           {{ $t('SIDEBAR.SET_AUTO_OFFLINE.TEXT') }}
           <Icon
             v-tooltip.top="$t('SIDEBAR.SET_AUTO_OFFLINE.INFO_SHORT')"
             icon="i-lucide-info"
-            class="inline-block align-middle ms-1 size-4 text-n-slate-10"
+            class="size-4 text-n-slate-10"
           />
         </div>
         <ToggleSwitch v-model="autoOfflineToggle" />

app/javascript/dashboard/components/ChannelSelector.vue

@@ -24,10 +24,6 @@ defineProps({
     type: Boolean,
     default: false,
   },
-  hasVoiceBadge: {
-    type: Boolean,
-    default: false,
-  },
 });
 
 const { t } = useI18n();
@@ -42,18 +38,10 @@ const { t } = useI18n();
       'cursor-not-allowed disabled:opacity-80': isComingSoon,
     }"
   >
-    <div class="relative">
-      <div
-        class="flex size-10 items-center justify-center rounded-full bg-n-alpha-2"
-      >
-        <Icon :icon="icon" class="text-n-slate-10 size-6" />
-      </div>
-      <div
-        v-if="hasVoiceBadge"
-        class="absolute -top-1 ltr:-right-1 rtl:-left-1 flex size-4 items-center justify-center rounded-full bg-n-alpha-2 ring-2 ring-n-solid-1"
-      >
-        <Icon icon="i-lucide-audio-lines" class="text-n-slate-10 size-2.5" />
-      </div>
+    <div
+      class="flex size-10 items-center justify-center rounded-full bg-n-alpha-2"
+    >
+      <Icon :icon="icon" class="text-n-slate-10 size-6" />
     </div>
 
     <div class="flex flex-col items-start gap-1.5">

app/javascript/dashboard/components/widgets/ChannelItem.vue

@@ -52,16 +52,12 @@ const isActive = computed(() => {
     return props.enabledFeatures.channel_tiktok && hasTiktokConfigured.value;
   }
 
-  if (key === 'voice') {
-    return props.enabledFeatures.channel_voice;
+  if (key === 'app_store') {
+    return props.enabledFeatures.channel_app_store;
   }
 
-  if (key === 'whatsapp_call') {
-    return (
-      props.enabledFeatures.channel_voice &&
-      !!window.chatwootConfig?.whatsappAppId &&
-      window.chatwootConfig.whatsappAppId !== 'none'
-    );
+  if (key === 'voice') {
+    return props.enabledFeatures.channel_voice;
   }
 
   return [
@@ -75,6 +71,7 @@ const isActive = computed(() => {
     'instagram',
     'tiktok',
     'voice',
+    'google_play',
   ].includes(key);
 });
 
@@ -86,13 +83,8 @@ const isComingSoon = computed(() => {
 });
 
 const isBeta = computed(() => {
-  return ['tiktok', 'voice', 'whatsapp_call'].includes(props.channel.key);
-});
-
-const hasVoiceBadge = computed(() => {
-  return (
-    ['voice', 'whatsapp_call'].includes(props.channel.key) &&
-    !!props.enabledFeatures.channel_voice
+  return ['tiktok', 'app_store', 'voice', 'google_play'].includes(
+    props.channel.key
   );
 });
 
@@ -110,7 +102,6 @@ const onItemClick = () => {
     :icon="channel.icon"
     :is-coming-soon="isComingSoon"
     :is-beta="isBeta"
-    :has-voice-badge="hasVoiceBadge"
     :disabled="!isActive"
     @click="onItemClick"
   />

app/javascript/dashboard/components/widgets/FloatingCallWidget.vue

@@ -0,0 +1,185 @@
+<script setup>
+import { watch } from 'vue';
+import { useRouter } from 'vue-router';
+import { useStore } from 'vuex';
+import { useCallSession } from 'dashboard/composables/useCallSession';
+import WindowVisibilityHelper from 'dashboard/helper/AudioAlerts/WindowVisibilityHelper';
+import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
+
+const router = useRouter();
+const store = useStore();
+
+const {
+  activeCall,
+  incomingCalls,
+  hasActiveCall,
+  isJoining,
+  joinCall,
+  endCall: endCallSession,
+  rejectIncomingCall,
+  dismissCall,
+  formattedCallDuration,
+} = useCallSession();
+
+const getCallInfo = call => {
+  const conversation = store.getters.getConversationById(call?.conversationId);
+  const inbox = store.getters['inboxes/getInbox'](conversation?.inbox_id);
+  const sender = conversation?.meta?.sender;
+  return {
+    conversation,
+    inbox,
+    contactName: sender?.name || sender?.phone_number || 'Unknown caller',
+    inboxName: inbox?.name || 'Customer support',
+    avatar: sender?.avatar || sender?.thumbnail,
+  };
+};
+
+const handleEndCall = async () => {
+  const call = activeCall.value;
+  if (!call) return;
+
+  const inboxId = call.inboxId || getCallInfo(call).conversation?.inbox_id;
+  if (!inboxId) return;
+
+  await endCallSession({
+    conversationId: call.conversationId,
+    inboxId,
+    callSid: call.callSid,
+  });
+};
+
+const handleJoinCall = async call => {
+  const { conversation } = getCallInfo(call);
+  if (!call || !conversation || isJoining.value) return;
+
+  // End current active call before joining new one
+  if (hasActiveCall.value) {
+    await handleEndCall();
+  }
+
+  const result = await joinCall({
+    conversationId: call.conversationId,
+    inboxId: conversation.inbox_id,
+    callSid: call.callSid,
+  });
+
+  if (result) {
+    router.push({
+      name: 'inbox_conversation',
+      params: { conversation_id: call.conversationId },
+    });
+  }
+};
+
+// Auto-join outbound calls when window is visible
+watch(
+  () => incomingCalls.value[0],
+  call => {
+    if (
+      call?.callDirection === 'outbound' &&
+      !hasActiveCall.value &&
+      WindowVisibilityHelper.isWindowVisible()
+    ) {
+      handleJoinCall(call);
+    }
+  },
+  { immediate: true }
+);
+</script>
+
+<template>
+  <div
+    v-if="incomingCalls.length || hasActiveCall"
+    class="fixed ltr:right-4 rtl:left-4 bottom-4 z-50 flex flex-col gap-2 w-72"
+  >
+    <!-- Incoming Calls (shown above active call) -->
+    <div
+      v-for="call in hasActiveCall ? incomingCalls : []"
+      :key="call.callSid"
+      class="flex items-center gap-3 p-4 bg-n-solid-2 rounded-xl shadow-xl outline outline-1 outline-n-strong"
+    >
+      <div class="animate-pulse ring-2 ring-n-teal-9 rounded-full inline-flex">
+        <Avatar
+          :src="getCallInfo(call).avatar"
+          :name="getCallInfo(call).contactName"
+          :size="40"
+          rounded-full
+        />
+      </div>
+      <div class="flex-1 min-w-0">
+        <p class="text-sm font-medium text-n-slate-12 truncate mb-0">
+          {{ getCallInfo(call).contactName }}
+        </p>
+        <p class="text-xs text-n-slate-11 truncate">
+          {{ getCallInfo(call).inboxName }}
+        </p>
+      </div>
+      <div class="flex shrink-0 gap-2">
+        <button
+          class="flex justify-center items-center w-10 h-10 bg-n-ruby-9 hover:bg-n-ruby-10 rounded-full transition-colors"
+          @click="dismissCall(call.callSid)"
+        >
+          <i class="text-lg text-white i-ph-phone-x-bold" />
+        </button>
+        <button
+          class="flex justify-center items-center w-10 h-10 bg-n-teal-9 hover:bg-n-teal-10 rounded-full transition-colors"
+          @click="handleJoinCall(call)"
+        >
+          <i class="text-lg text-white i-ph-phone-bold" />
+        </button>
+      </div>
+    </div>
+
+    <!-- Main Call Widget -->
+    <div
+      v-if="hasActiveCall || incomingCalls.length"
+      class="flex items-center gap-3 p-4 bg-n-solid-2 rounded-xl shadow-xl outline outline-1 outline-n-strong"
+    >
+      <div
+        class="ring-2 ring-n-teal-9 rounded-full inline-flex"
+        :class="{ 'animate-pulse': !hasActiveCall }"
+      >
+        <Avatar
+          :src="getCallInfo(activeCall || incomingCalls[0]).avatar"
+          :name="getCallInfo(activeCall || incomingCalls[0]).contactName"
+          :size="40"
+          rounded-full
+        />
+      </div>
+      <div class="flex-1 min-w-0">
+        <p class="text-sm font-medium text-n-slate-12 truncate mb-0">
+          {{ getCallInfo(activeCall || incomingCalls[0]).contactName }}
+        </p>
+        <p v-if="hasActiveCall" class="font-mono text-sm text-n-teal-9">
+          {{ formattedCallDuration }}
+        </p>
+        <p v-else class="text-xs text-n-slate-11">
+          {{
+            incomingCalls[0]?.callDirection === 'outbound'
+              ? $t('CONVERSATION.VOICE_WIDGET.OUTGOING_CALL')
+              : $t('CONVERSATION.VOICE_WIDGET.INCOMING_CALL')
+          }}
+        </p>
+      </div>
+      <div class="flex shrink-0 gap-2">
+        <button
+          class="flex justify-center items-center w-10 h-10 bg-n-ruby-9 hover:bg-n-ruby-10 rounded-full transition-colors"
+          @click="
+            hasActiveCall
+              ? handleEndCall()
+              : rejectIncomingCall(incomingCalls[0]?.callSid)
+          "
+        >
+          <i class="text-lg text-white i-ph-phone-x-bold" />
+        </button>
+        <button
+          v-if="!hasActiveCall"
+          class="flex justify-center items-center w-10 h-10 bg-n-teal-9 hover:bg-n-teal-10 rounded-full transition-colors"
+          @click="handleJoinCall(incomingCalls[0])"
+        >
+          <i class="text-lg text-white i-ph-phone-bold" />
+        </button>
+      </div>
+    </div>
+  </div>
+</template>

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

@@ -589,11 +589,11 @@ function isCmdPlusEnterToSendEnabled() {
 useKeyboardEvents({
   'Alt+KeyP': {
     action: focusEditorInputField,
-    allowOnFocusedInput: false,
+    allowOnFocusedInput: true,
   },
   'Alt+KeyL': {
     action: focusEditorInputField,
-    allowOnFocusedInput: false,
+    allowOnFocusedInput: true,
   },
 });
 

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

@@ -105,11 +105,11 @@ export default {
     const keyboardEvents = {
       'Alt+KeyP': {
         action: () => handleNoteClick(),
-        allowOnFocusedInput: false,
+        allowOnFocusedInput: true,
       },
       'Alt+KeyL': {
         action: () => handleReplyClick(),
-        allowOnFocusedInput: false,
+        allowOnFocusedInput: true,
       },
     };
     useKeyboardEvents(keyboardEvents);

app/javascript/dashboard/components/widgets/conversation/ConversationCallButton.vue

@@ -1,144 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useStore } from 'dashboard/composables/store';
-import { useI18n } from 'vue-i18n';
-import {
-  getVoiceCallProvider,
-  VOICE_CALL_PROVIDERS,
-} from 'dashboard/helper/inbox';
-import {
-  VOICE_CALL_DIRECTION,
-  VOICE_CALL_OUTBOUND_INIT_STATUS,
-} from 'dashboard/components-next/message/constants';
-import { useWhatsappCallSession } from 'dashboard/composables/useWhatsappCallSession';
-import { useCallsStore } from 'dashboard/stores/calls';
-import { useMapGetter } from 'dashboard/composables/store';
-import { useAccount } from 'dashboard/composables/useAccount';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
-import { useAlert } from 'dashboard/composables';
-import NextButton from 'dashboard/components-next/button/Button.vue';
-
-const props = defineProps({
-  inbox: {
-    type: Object,
-    default: () => ({}),
-  },
-  chat: {
-    type: Object,
-    default: () => ({}),
-  },
-});
-
-const { t } = useI18n();
-const store = useStore();
-const callsStore = useCallsStore();
-const whatsappCallSession = useWhatsappCallSession();
-const contactsUiFlags = useMapGetter('contacts/getUIFlags');
-const { isCloudFeatureEnabled } = useAccount();
-
-const voiceCallProvider = computed(() => getVoiceCallProvider(props.inbox));
-const isVoiceCallInbox = computed(
-  () =>
-    voiceCallProvider.value !== null &&
-    isCloudFeatureEnabled(FEATURE_FLAGS.CHANNEL_VOICE)
-);
-const isWhatsappVoiceInbox = computed(
-  () => voiceCallProvider.value === VOICE_CALL_PROVIDERS.WHATSAPP
-);
-
-const isCallButtonDisabled = computed(() => {
-  if (callsStore.hasActiveCall || callsStore.hasIncomingCall) return true;
-  if (isWhatsappVoiceInbox.value) {
-    return whatsappCallSession.isInitiating.value;
-  }
-  return contactsUiFlags.value?.isInitiatingCall || false;
-});
-
-const isCallButtonLoading = computed(() =>
-  isWhatsappVoiceInbox.value
-    ? whatsappCallSession.isInitiating.value
-    : !!contactsUiFlags.value?.isInitiatingCall
-);
-
-const callButtonTooltip = computed(() =>
-  isWhatsappVoiceInbox.value
-    ? t('CONVERSATION.HEADER.WHATSAPP_CALL')
-    : t('CONVERSATION.HEADER.VOICE_CALL')
-);
-
-const startWhatsappCall = async () => {
-  if (whatsappCallSession.isInitiating.value) return;
-  try {
-    const response = await whatsappCallSession.initiateOutboundCall(
-      props.chat.id
-    );
-
-    // Composable returns LOCKED when init is already in flight or a call is
-    // active; soft no-op so a parallel click doesn't trigger a banner.
-    if (response?.status === VOICE_CALL_OUTBOUND_INIT_STATUS.LOCKED) return;
-    // Permission template path returns no call id — show banner, no widget yet.
-    if (!response?.id) {
-      const status = response?.status;
-      const messageKey =
-        status === VOICE_CALL_OUTBOUND_INIT_STATUS.PERMISSION_PENDING
-          ? 'CONVERSATION.HEADER.WHATSAPP_CALL_PERMISSION_PENDING'
-          : 'CONVERSATION.HEADER.WHATSAPP_CALL_PERMISSION_REQUESTED';
-      useAlert(t(messageKey));
-      return;
-    }
-
-    // Stay non-active until Meta delivers the connect webhook (sdp_answer);
-    // flipping to active here would start the duration timer before pickup.
-    callsStore.addCall({
-      callSid: response.call_id,
-      callId: response.id,
-      conversationId: props.chat.id,
-      inboxId: props.inbox?.id,
-      callDirection: VOICE_CALL_DIRECTION.OUTBOUND,
-      provider: VOICE_CALL_PROVIDERS.WHATSAPP,
-    });
-  } catch (error) {
-    useAlert(error?.message || t('CONVERSATION.HEADER.WHATSAPP_CALL_FAILED'));
-  }
-};
-
-const startTwilioCall = async () => {
-  if (contactsUiFlags.value?.isInitiatingCall) return;
-  try {
-    const response = await store.dispatch('contacts/initiateCall', {
-      contactId: props.chat?.meta?.sender?.id,
-      inboxId: props.inbox?.id,
-      conversationId: props.chat.id,
-    });
-
-    callsStore.addCall({
-      callSid: response?.call_sid,
-      conversationId: response?.conversation_id ?? props.chat.id,
-      inboxId: props.inbox?.id,
-      callDirection: VOICE_CALL_DIRECTION.OUTBOUND,
-    });
-  } catch (error) {
-    useAlert(error?.message || t('CONVERSATION.HEADER.VOICE_CALL_FAILED'));
-  }
-};
-
-const startCall = () => {
-  if (isWhatsappVoiceInbox.value) return startWhatsappCall();
-  return startTwilioCall();
-};
-</script>
-
-<template>
-  <NextButton
-    v-if="isVoiceCallInbox"
-    v-tooltip.bottom="callButtonTooltip"
-    sm
-    ghost
-    slate
-    icon="i-lucide-phone"
-    :is-loading="isCallButtonLoading"
-    :disabled="isCallButtonDisabled"
-    @click="startCall"
-  />
-  <template v-else />
-</template>

app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue

@@ -8,14 +8,13 @@ import InboxName from '../InboxName.vue';
 import MoreActions from './MoreActions.vue';
 import Avatar from 'next/avatar/Avatar.vue';
 import SLACardLabel from './components/SLACardLabel.vue';
-import ConversationCallButton from './ConversationCallButton.vue';
 import wootConstants from 'dashboard/constants/globals';
 import { conversationListPageURL } from 'dashboard/helper/URLHelper';
 import { snoozedReopenTime } from 'dashboard/helper/snoozeHelpers';
 import { useInbox } from 'dashboard/composables/useInbox';
-import { useAlert } from 'dashboard/composables';
 import { useI18n } from 'vue-i18n';
 import { copyTextToClipboard } from 'shared/helpers/clipboard';
+import { useAlert } from 'dashboard/composables';
 
 const props = defineProps({
   chat: {
@@ -173,7 +172,6 @@ const copyConversationId = async () => {
         :parent-width="width"
         class="hidden md:flex"
       />
-      <ConversationCallButton :inbox="inbox" :chat="currentChat" />
       <MoreActions :conversation-id="currentChat.id" />
     </div>
   </div>

app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue

@@ -264,6 +264,9 @@ export default {
       if (this.isATiktokChannel) {
         return MESSAGE_MAX_LENGTH.TIKTOK;
       }
+      if (this.isAGooglePlayChannel) {
+        return MESSAGE_MAX_LENGTH.GOOGLE_PLAY;
+      }
       if (this.isATwilioWhatsAppChannel) {
         return MESSAGE_MAX_LENGTH.TWILIO_WHATSAPP;
       }

app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkLabelActions.vue

@@ -14,11 +14,6 @@ const props = defineProps({
     type: String,
     default: 'conversation',
   },
-  action: {
-    type: String,
-    default: 'assign',
-    validator: value => ['assign', 'remove'].includes(value),
-  },
   isLoading: {
     type: Boolean,
     default: false,
@@ -27,13 +22,9 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  appliedLabels: {
-    type: Array,
-    default: null,
-  },
 });
 
-const emit = defineEmits(['assign', 'remove']);
+const emit = defineEmits(['assign']);
 
 const { t } = useI18n();
 
@@ -44,43 +35,17 @@ const [showDropdown, toggleDropdown] = useToggle(false);
 const selectedLabels = ref([]);
 
 const isTypeContact = computed(() => props.type === 'contact');
-const isRemoveAction = computed(() => props.action === 'remove');
 
-const buttonLabel = computed(() => {
-  if (!isTypeContact.value) return '';
-
-  return isRemoveAction.value
-    ? t('CONTACTS_BULK_ACTIONS.REMOVE_LABELS')
-    : t('CONTACTS_BULK_ACTIONS.ASSIGN_LABELS');
-});
-
-const tooltipLabel = computed(() =>
-  isRemoveAction.value
-    ? t('BULK_ACTION.LABELS.REMOVE_LABELS')
-    : t('BULK_ACTION.LABELS.ASSIGN_LABELS')
-);
-
-const confirmLabel = computed(() =>
-  isRemoveAction.value
-    ? t('BULK_ACTION.LABELS.REMOVE_SELECTED_LABELS')
-    : t('BULK_ACTION.LABELS.ASSIGN_SELECTED_LABELS')
+const buttonLabel = computed(() =>
+  props.type === 'contact' ? t('CONTACTS_BULK_ACTIONS.ASSIGN_LABELS') : ''
 );
 
 const isLabelSelected = labelTitle => {
   return selectedLabels.value.includes(labelTitle);
 };
 
-const visibleLabels = computed(() => {
-  if (!isRemoveAction.value || props.appliedLabels === null) {
-    return labels.value;
-  }
-
-  const applied = new Set(props.appliedLabels);
-  return labels.value.filter(label => applied.has(label.title));
-});
-
 const labelMenuItems = computed(() => {
-  return visibleLabels.value.map(label => ({
+  return labels.value.map(label => ({
     action: 'select',
     value: label.title,
     label: label.title,
@@ -99,13 +64,9 @@ const toggleLabelSelection = labelTitle => {
   }
 };
 
-const handleApply = () => {
+const handleAssign = () => {
   if (selectedLabels.value.length > 0) {
-    if (isRemoveAction.value) {
-      emit('remove', selectedLabels.value);
-    } else {
-      emit('assign', selectedLabels.value);
-    }
+    emit('assign', selectedLabels.value);
     toggleDropdown(false);
     selectedLabels.value = [];
   }
@@ -120,9 +81,9 @@ const handleDismiss = () => {
 <template>
   <div ref="containerRef" class="relative">
     <NextButton
-      v-tooltip="tooltipLabel"
+      v-tooltip="isTypeContact ? '' : $t('BULK_ACTION.LABELS.ASSIGN_LABELS')"
       :label="buttonLabel"
-      :icon="isRemoveAction ? 'i-woot-tag-remove' : 'i-lucide-tag'"
+      icon="i-lucide-tag"
       slate
       :size="isTypeContact ? 'sm' : 'xs'"
       ghost
@@ -187,9 +148,9 @@ const handleDismiss = () => {
             <NextButton
               sm
               class="w-full [&>span:nth-child(2)]:hidden md:[&>span:nth-child(2)]:inline-flex"
-              :label="confirmLabel"
+              :label="t('BULK_ACTION.LABELS.ASSIGN_SELECTED_LABELS')"
               :disabled="!selectedLabels.length"
-              @click="handleApply"
+              @click="handleAssign"
             />
           </div>
         </template>

app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue

@@ -1,6 +1,5 @@
 <script setup>
 import { ref, computed, onMounted, onUnmounted, useAttrs } from 'vue';
-import { useMapGetter } from 'dashboard/composables/store.js';
 import { getUnixTime } from 'date-fns';
 import { findSnoozeTime } from 'dashboard/helper/snoozeHelpers';
 import { emitter } from 'shared/helpers/mitt';
@@ -56,25 +55,12 @@ defineOptions({
 const attrs = useAttrs();
 
 const {
-  selectedConversations,
   onAssignAgent,
   onAssignLabels,
-  onRemoveLabels,
   onAssignTeamsForBulk: onAssignTeam,
   onUpdateConversations,
 } = useBulkActions();
 
-const getConversationById = useMapGetter('getConversationById');
-
-const appliedLabelsForSelection = computed(() => {
-  const applied = new Set();
-  selectedConversations.value.forEach(id => {
-    const conversation = getConversationById.value(id);
-    (conversation?.labels || []).forEach(label => applied.add(label));
-  });
-  return Array.from(applied);
-});
-
 const showCustomTimeSnoozeModal = ref(false);
 
 function onCmdSnoozeConversation(snoozeType) {
@@ -175,11 +161,6 @@ onUnmounted(() => {
         </div>
         <div class="flex items-center gap-2">
           <BulkLabelActions @assign="onAssignLabels" />
-          <BulkLabelActions
-            action="remove"
-            :applied-labels="appliedLabelsForSelection"
-            @remove="onRemoveLabels"
-          />
           <BulkUpdateActions
             :show-resolve="!showResolvedAction"
             :show-reopen="!showOpenAction"

app/javascript/dashboard/composables/chatlist/useBulkActions.js

@@ -108,7 +108,7 @@ export function useBulkActions() {
     }
   }
 
-  // Used by both context menu and bulk action bar.
+  // Only used in context menu
   async function onRemoveLabels(labelsToRemove, conversationId = null) {
     try {
       await store.dispatch('bulkActions/process', {
@@ -119,24 +119,14 @@ export function useBulkActions() {
         },
       });
 
-      // Context-menu remove should not disturb an existing bulk selection.
-      if (conversationId) {
-        useAlert(
-          t('CONVERSATION.CARD_CONTEXT_MENU.API.LABEL_REMOVAL.SUCCESFUL', {
-            labelName: labelsToRemove[0],
-            conversationId,
-          })
-        );
-      } else {
-        store.dispatch('bulkActions/clearSelectedConversationIds');
-        useAlert(t('BULK_ACTION.LABELS.REMOVE_SUCCESFUL'));
-      }
-    } catch (err) {
       useAlert(
-        conversationId
-          ? t('CONVERSATION.CARD_CONTEXT_MENU.API.LABEL_REMOVAL.FAILED')
-          : t('BULK_ACTION.LABELS.REMOVE_FAILED')
+        t('CONVERSATION.CARD_CONTEXT_MENU.API.LABEL_REMOVAL.SUCCESFUL', {
+          labelName: labelsToRemove[0],
+          conversationId,
+        })
       );
+    } catch (err) {
+      useAlert(t('CONVERSATION.CARD_CONTEXT_MENU.API.LABEL_REMOVAL.FAILED'));
     }
   }
 

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

@@ -53,6 +53,7 @@ const mockStore = createStore({
               voice_enabled: true,
             },
             15: { id: 15, channel_type: INBOX_TYPES.TIKTOK },
+            16: { id: 16, channel_type: INBOX_TYPES.GOOGLE_PLAY },
           };
           return inboxes[id] || null;
         },
@@ -226,6 +227,12 @@ describe('useInbox', () => {
         global: { plugins: [mockStore] },
       });
       expect(wrapper.vm.isATiktokChannel).toBe(true);
+
+      // Test Google Play
+      wrapper = mount(createTestComponent(16), {
+        global: { plugins: [mockStore] },
+      });
+      expect(wrapper.vm.isAGooglePlayChannel).toBe(true);
     });
   });
 
@@ -278,6 +285,7 @@ describe('useInbox', () => {
         'isAnEmailChannel',
         'isAnInstagramChannel',
         'isATiktokChannel',
+        'isAGooglePlayChannel',
         'voiceCallEnabled',
         'voiceCallProvider',
       ];

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

@@ -1,47 +1,6 @@
-const keyboardEventsMock = vi.hoisted(() => ({
-  mountedCallbacks: [],
-  unmountedCallbacks: [],
-  registeredKeybindings: {},
-}));
-
-vi.mock('vue', async importOriginal => ({
-  ...(await importOriginal()),
-  onMounted: vi.fn(callback =>
-    keyboardEventsMock.mountedCallbacks.push(callback)
-  ),
-  onUnmounted: vi.fn(callback =>
-    keyboardEventsMock.unmountedCallbacks.push(callback)
-  ),
-}));
-
-vi.mock('dashboard/composables/useDetectKeyboardLayout', () => ({
-  useDetectKeyboardLayout: vi.fn(() => Promise.resolve('QWERTY')),
-}));
-
-vi.mock('tinykeys', () => ({
-  createKeybindingsHandler: vi.fn(keybindings => {
-    keyboardEventsMock.registeredKeybindings = keybindings;
-    return event => keybindings[event.shortcut]?.(event);
-  }),
-}));
-
-import { useDetectKeyboardLayout } from 'dashboard/composables/useDetectKeyboardLayout';
 import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
-import { LAYOUT_QWERTZ } from 'shared/helpers/KeyboardHelpers';
-
-const mount = async events => {
-  useKeyboardEvents(events);
-  await keyboardEventsMock.mountedCallbacks[0]();
-  return keyboardEventsMock.registeredKeybindings;
-};
 
 describe('useKeyboardEvents', () => {
-  beforeEach(() => {
-    keyboardEventsMock.mountedCallbacks = [];
-    keyboardEventsMock.unmountedCallbacks = [];
-    keyboardEventsMock.registeredKeybindings = {};
-  });
-
   it('should be defined', () => {
     expect(useKeyboardEvents).toBeDefined();
   });
@@ -50,46 +9,18 @@ describe('useKeyboardEvents', () => {
     expect(useKeyboardEvents).toBeInstanceOf(Function);
   });
 
-  it('registers keybindings on mount and removes the listener on unmount', async () => {
-    const addEventListener = vi.spyOn(document, 'addEventListener');
+  it('should set up listeners on mount and remove them on unmount', async () => {
+    const events = {
+      'ALT+KeyL': () => {},
+    };
 
-    const keybindings = await mount({ 'ALT+KeyL': () => {} });
-    expect(Object.keys(keybindings)).toEqual(['ALT+KeyL']);
+    const mountedMock = vi.fn();
+    const unmountedMock = vi.fn();
+    useKeyboardEvents(events);
+    mountedMock();
+    unmountedMock();
 
-    const { signal } = addEventListener.mock.calls[0][2];
-    expect(signal.aborted).toBe(false);
-
-    keyboardEventsMock.unmountedCallbacks[0]();
-    expect(signal.aborted).toBe(true);
-  });
-
-  it('prefixes Shift on QWERTZ layouts for the affected keys', async () => {
-    useDetectKeyboardLayout.mockResolvedValueOnce(LAYOUT_QWERTZ);
-
-    const keybindings = await mount({ 'Alt+KeyL': () => {} });
-
-    expect(Object.keys(keybindings)).toEqual(['Shift+Alt+KeyL']);
-  });
-
-  it('ignores shortcuts on focused typeable elements by default', async () => {
-    const action = vi.fn();
-    const keybindings = await mount({
-      'Alt+KeyL': { action, allowOnFocusedInput: false },
-    });
-
-    keybindings['Alt+KeyL']({ target: document.createElement('textarea') });
-
-    expect(action).not.toHaveBeenCalled();
-  });
-
-  it('runs shortcuts on focused typeable elements when allowed', async () => {
-    const action = vi.fn();
-    const keybindings = await mount({
-      'Alt+KeyL': { action, allowOnFocusedInput: true },
-    });
-
-    keybindings['Alt+KeyL']({ target: document.createElement('textarea') });
-
-    expect(action).toHaveBeenCalledTimes(1);
+    expect(mountedMock).toHaveBeenCalled();
+    expect(unmountedMock).toHaveBeenCalled();
   });
 });

app/javascript/dashboard/composables/useCallSession.js

@@ -1,145 +1,62 @@
-import { computed, readonly, ref, watch, onUnmounted, onMounted } from 'vue';
-import { useStore } from 'vuex';
+import { computed, ref, watch, onUnmounted, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VoiceAPI from 'dashboard/api/channel/voice/voiceAPIClient';
 import TwilioVoiceClient from 'dashboard/api/channel/voice/twilioVoiceClient';
 import { useCallsStore } from 'dashboard/stores/calls';
 import { useAlert } from 'dashboard/composables';
-import {
-  useWhatsappCallSession,
-  sendWhatsappTerminateBeacon,
-  cleanupWhatsappSession,
-} from 'dashboard/composables/useWhatsappCallSession';
-import { handleVoiceCallCreated } from 'dashboard/helper/voice';
-import { VOICE_CALL_PROVIDERS } from 'dashboard/helper/inbox';
-import {
-  CONTENT_TYPES,
-  VOICE_CALL_DIRECTION,
-  VOICE_CALL_STATUS,
-} from 'dashboard/components-next/message/constants';
 import Timer from 'dashboard/helper/Timer';
 
-const isWhatsappCall = call => call?.provider === VOICE_CALL_PROVIDERS.WHATSAPP;
-
-// Dismissed call sids must not be re-seeded by the conversation-load watcher.
-// Lives at module scope so all consumers share the same set.
-const dismissedCallSids = new Set();
-const markDismissed = callSid => {
-  if (callSid) dismissedCallSids.add(callSid);
-};
-
-// Globals attached once across all useCallSession() consumers — bubbles in a
-// long thread call this composable many times, and a per-instance Timer +
-// window listener stack would multiply work.
-let globalsAttachedCount = 0;
-let globalDurationTimer = null;
-const globalCallDuration = ref(0);
-let storedCallsStoreRef = null;
-// Shared join lock so two surfaces (bubble + widget) clicking concurrently
-// see one in-flight join, not two unrelated isJoining refs.
-const globalIsJoining = ref(false);
-const globalIsJoiningReadonly = readonly(globalIsJoining);
-
-const handleBeforeUnloadGlobal = event => {
-  const store = storedCallsStoreRef;
-  if (!store) return;
-  if (!store.hasActiveCall && !store.hasIncomingCall) return;
-  event.preventDefault();
-  event.returnValue = '';
-};
-const handlePageHideGlobal = () => sendWhatsappTerminateBeacon();
-const handleTwilioDisconnectedGlobal = () =>
-  storedCallsStoreRef?.clearActiveCall();
-
-const attachGlobalsOnFirstMount = callsStore => {
-  globalsAttachedCount += 1;
-  if (globalsAttachedCount > 1) return;
-  storedCallsStoreRef = callsStore;
-  globalDurationTimer = new Timer(elapsed => {
-    globalCallDuration.value = elapsed;
+export function useCallSession() {
+  const callsStore = useCallsStore();
+  const { t } = useI18n();
+  const isJoining = ref(false);
+  const callDuration = ref(0);
+  const durationTimer = new Timer(elapsed => {
+    callDuration.value = elapsed;
   });
-  TwilioVoiceClient.addEventListener(
-    'call:disconnected',
-    handleTwilioDisconnectedGlobal
-  );
-  window.addEventListener('beforeunload', handleBeforeUnloadGlobal);
-  window.addEventListener('pagehide', handlePageHideGlobal);
-};
 
-const detachGlobalsOnLastUnmount = () => {
-  globalsAttachedCount -= 1;
-  if (globalsAttachedCount > 0) return;
-  globalDurationTimer?.stop();
-  globalDurationTimer = null;
-  globalCallDuration.value = 0;
-  storedCallsStoreRef = null;
-  TwilioVoiceClient.removeEventListener(
-    'call:disconnected',
-    handleTwilioDisconnectedGlobal
-  );
-  window.removeEventListener('beforeunload', handleBeforeUnloadGlobal);
-  window.removeEventListener('pagehide', handlePageHideGlobal);
-};
+  const activeCall = computed(() => callsStore.activeCall);
+  const incomingCalls = computed(() => callsStore.incomingCalls);
+  const hasActiveCall = computed(() => callsStore.hasActiveCall);
 
-// Build the action surface used by both the root session composable and the
-// lighter useCallActions consumer. All state is module-scoped — the actions
-// don't depend on per-instance refs, so they're cheap to call from anywhere.
-const buildCallActions = ({ callsStore, whatsappSession, t }) => {
-  const findCall = callSid => callsStore.calls.find(c => c.callSid === callSid);
+  watch(
+    hasActiveCall,
+    active => {
+      if (active) {
+        durationTimer.start();
+      } else {
+        durationTimer.stop();
+        callDuration.value = 0;
+      }
+    },
+    { immediate: true }
+  );
+
+  onMounted(() => {
+    TwilioVoiceClient.addEventListener('call:disconnected', () =>
+      callsStore.clearActiveCall()
+    );
+  });
+
+  onUnmounted(() => {
+    durationTimer.stop();
+    TwilioVoiceClient.removeEventListener('call:disconnected', () =>
+      callsStore.clearActiveCall()
+    );
+  });
 
   const endCall = async ({ conversationId, inboxId, callSid }) => {
-    const call = findCall(callSid);
-    if (isWhatsappCall(call)) {
-      // Pass call.callId so a wiped module state (e.g. a prior accept attempt
-      // tore down the WebRTC session) doesn't stop us hitting /terminate.
-      await whatsappSession.endActiveCall(call?.callId);
-      globalDurationTimer?.stop();
-      callsStore.clearActiveCall();
-      return;
-    }
-
-    // try/finally so a failed leaveConference (e.g. backend 5xx) still
-    // tears down the local Device and UI state — otherwise the call stays
-    // visually active with the mic open.
-    try {
-      await VoiceAPI.leaveConference({ inboxId, conversationId, callSid });
-    } finally {
-      TwilioVoiceClient.endClientCall();
-      globalDurationTimer?.stop();
-      callsStore.clearActiveCall();
-    }
+    await VoiceAPI.leaveConference({ inboxId, conversationId, callSid });
+    TwilioVoiceClient.endClientCall();
+    durationTimer.stop();
+    callsStore.clearActiveCall();
   };
 
   const joinCall = async ({ conversationId, inboxId, callSid }) => {
-    if (globalIsJoining.value) return null;
+    if (isJoining.value) return null;
 
-    const call = findCall(callSid);
-    // Outbound *WhatsApp* calls have no separate join step — the offer was
-    // sent at initiate time and the answer is applied by the cable handler.
-    // Routing through acceptIncomingCall here would call prepareInboundAnswer →
-    // cleanup() and destroy the live outbound session. Outbound *Twilio*
-    // calls still need joinConference + joinClientCall (FloatingCallWidget
-    // auto-joins them), so don't short-circuit those.
-    if (
-      call?.callDirection === VOICE_CALL_DIRECTION.OUTBOUND &&
-      isWhatsappCall(call)
-    ) {
-      return null;
-    }
-
-    globalIsJoining.value = true;
+    isJoining.value = true;
     try {
-      if (isWhatsappCall(call)) {
-        await whatsappSession.acceptIncomingCall({
-          callId: call.callId,
-          sdpOffer: call.sdpOffer,
-          iceServers: call.iceServers,
-        });
-        callsStore.setCallActive(callSid);
-        globalDurationTimer?.start();
-        return { callId: call.callId };
-      }
-
       const device = await TwilioVoiceClient.initializeDevice(inboxId);
       if (!device) return null;
 
@@ -156,165 +73,47 @@ const buildCallActions = ({ callsStore, whatsappSession, t }) => {
       });
 
       callsStore.setCallActive(callSid);
-      globalDurationTimer?.start();
+      durationTimer.start();
 
       return { conferenceSid: joinResponse?.conference_sid };
     } catch (error) {
       useAlert(error?.response?.data?.error || t('CONTACT_PANEL.CALL_FAILED'));
       if (error?.response?.status === 409) {
         TwilioVoiceClient.endClientCall();
-        markDismissed(callSid);
         callsStore.dismissCall(callSid);
-      } else if (!isWhatsappCall(call)) {
-        // Tear down the Twilio Device on any other join error so a retry
-        // starts from a clean state — joinClientCall can leave the device
-        // half-initialized after a network blip.
-        TwilioVoiceClient.endClientCall();
       }
       // eslint-disable-next-line no-console
       console.error('Failed to join call:', error);
-      // Drop any half-built WebRTC state so the next click starts fresh.
-      cleanupWhatsappSession();
       return null;
     } finally {
-      globalIsJoining.value = false;
+      isJoining.value = false;
     }
   };
 
-  // Await provider-side reject before dismissing the local entry; if the API
-  // call fails the call should stay surfaced so the agent can retry instead of
-  // disappearing while the backend still rings.
-  const rejectIncomingCall = async callSid => {
-    const call = findCall(callSid);
-    try {
-      if (isWhatsappCall(call) && call?.callId) {
-        if (call.callDirection === VOICE_CALL_DIRECTION.OUTBOUND) {
-          // Outbound calls that are still ringing must be terminated, not
-          // rejected (reject is the inbound-side verb on Meta's API).
-          await whatsappSession.endActiveCall(call.callId);
-        } else {
-          await whatsappSession.rejectIncomingCall(call.callId);
-        }
-      } else if (call?.inboxId && call?.conversationId) {
-        // Twilio incoming reject: agent hasn't joined the Device yet, so
-        // endClientCall is a no-op. End the conference server-side instead
-        // so Twilio hangs up the inbound leg.
-        await VoiceAPI.leaveConference({
-          inboxId: call.inboxId,
-          conversationId: call.conversationId,
-          callSid,
-        });
-      } else {
-        TwilioVoiceClient.endClientCall();
-      }
-    } finally {
-      markDismissed(callSid);
-      callsStore.dismissCall(callSid);
-    }
-  };
-
-  const dismissCall = callSid => {
-    markDismissed(callSid);
+  const rejectIncomingCall = callSid => {
+    TwilioVoiceClient.endClientCall();
     callsStore.dismissCall(callSid);
   };
 
-  return { endCall, joinCall, rejectIncomingCall, dismissCall };
-};
+  const dismissCall = callSid => {
+    callsStore.dismissCall(callSid);
+  };
 
-const buildReactiveSurface = callsStore => {
-  const activeCall = computed(() => callsStore.activeCall);
-  const incomingCalls = computed(() => callsStore.incomingCalls);
-  const hasActiveCall = computed(() => callsStore.hasActiveCall);
   const formattedCallDuration = computed(() => {
-    const total = globalCallDuration.value;
-    const minutes = Math.floor(total / 60);
-    const seconds = total % 60;
+    const minutes = Math.floor(callDuration.value / 60);
+    const seconds = callDuration.value % 60;
     return `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
   });
+
   return {
     activeCall,
     incomingCalls,
     hasActiveCall,
-    isJoining: globalIsJoiningReadonly,
+    isJoining,
     formattedCallDuration,
+    joinCall,
+    endCall,
+    rejectIncomingCall,
+    dismissCall,
   };
-};
-
-// Root-mount composable. Call once at the dashboard root (FloatingCallWidget
-// is the natural anchor — always mounted, lifetime spans the whole session).
-// This is the only path that registers global window/Twilio listeners and
-// owns the duration Timer.
-export function useCallSession() {
-  const store = useStore();
-  const callsStore = useCallsStore();
-  const whatsappSession = useWhatsappCallSession();
-  const { t } = useI18n();
-
-  const reactive = buildReactiveSurface(callsStore);
-
-  // Cable broadcasts (voice_call.incoming / message.created) are one-shot, so
-  // on a hard refresh they leave the calls store empty. Seed it from any
-  // ringing voice_call message in the conversation cache. Skip calls the
-  // agent has already dismissed locally so they don't re-pop on the next
-  // conversation update.
-  const seedCallsFromHydratedMessages = () => {
-    const conversations = store.getters.getAllConversations || [];
-    const currentUserId = store.getters.getCurrentUserID;
-    const currentUserAvailability = store.getters.getCurrentUserAvailability;
-    conversations.forEach(conv => {
-      (conv.messages || []).forEach(msg => {
-        if (msg.content_type !== CONTENT_TYPES.VOICE_CALL) return;
-        if (msg.call?.status !== VOICE_CALL_STATUS.RINGING) return;
-        const callSid = msg.call?.provider_call_id;
-        if (callSid && dismissedCallSids.has(callSid)) return;
-        handleVoiceCallCreated(msg, currentUserId, currentUserAvailability);
-      });
-    });
-  };
-
-  watch(
-    reactive.hasActiveCall,
-    active => {
-      if (active) {
-        globalDurationTimer?.start();
-      } else {
-        globalDurationTimer?.stop();
-        globalCallDuration.value = 0;
-      }
-    },
-    { immediate: true }
-  );
-
-  onMounted(() => {
-    attachGlobalsOnFirstMount(callsStore);
-    seedCallsFromHydratedMessages();
-  });
-
-  // Re-seed when conversations stream in after mount; addCall merges by callSid
-  // and dismissed sids are filtered, so this is idempotent.
-  watch(
-    () => store.getters.getAllConversations?.length,
-    () => seedCallsFromHydratedMessages()
-  );
-
-  onUnmounted(() => detachGlobalsOnLastUnmount());
-
-  const actions = buildCallActions({ callsStore, whatsappSession, t });
-
-  return { ...reactive, ...actions };
-}
-
-// Lightweight consumer for components that need to read state and trigger
-// actions but should NOT mount global listeners (e.g., per-message bubbles
-// rendered in a thread). Reads from the same module-level state that
-// useCallSession owns, so the duration timer and dismissed set stay coherent.
-export function useCallActions() {
-  const callsStore = useCallsStore();
-  const whatsappSession = useWhatsappCallSession();
-  const { t } = useI18n();
-
-  const reactive = buildReactiveSurface(callsStore);
-  const actions = buildCallActions({ callsStore, whatsappSession, t });
-
-  return { ...reactive, ...actions };
 }

app/javascript/dashboard/composables/useInbox.js

@@ -22,6 +22,7 @@ export const INBOX_FEATURE_MAP = {
     INBOX_TYPES.WHATSAPP,
     INBOX_TYPES.TELEGRAM,
     INBOX_TYPES.TIKTOK,
+    INBOX_TYPES.APP_STORE,
     INBOX_TYPES.API,
   ],
   [INBOX_FEATURES.REPLY_TO_OUTGOING]: [
@@ -30,6 +31,7 @@ export const INBOX_FEATURE_MAP = {
     INBOX_TYPES.WHATSAPP,
     INBOX_TYPES.TELEGRAM,
     INBOX_TYPES.TIKTOK,
+    INBOX_TYPES.APP_STORE,
     INBOX_TYPES.API,
   ],
 };
@@ -138,6 +140,14 @@ export const useInbox = (inboxId = null) => {
     return channelType.value === INBOX_TYPES.TIKTOK;
   });
 
+  const isAnAppStoreChannel = computed(() => {
+    return channelType.value === INBOX_TYPES.APP_STORE;
+  });
+
+  const isAGooglePlayChannel = computed(() => {
+    return channelType.value === INBOX_TYPES.GOOGLE_PLAY;
+  });
+
   const voiceCallEnabled = computed(() => isVoiceCallEnabled(inbox.value));
 
   const voiceCallProvider = computed(() => getVoiceCallProvider(inbox.value));
@@ -160,6 +170,8 @@ export const useInbox = (inboxId = null) => {
     isAnEmailChannel,
     isAnInstagramChannel,
     isATiktokChannel,
+    isAnAppStoreChannel,
+    isAGooglePlayChannel,
     voiceCallEnabled,
     voiceCallProvider,
   };

app/javascript/dashboard/composables/useWhatsappCallSession.js

@@ -1,455 +0,0 @@
-import { readonly, ref } from 'vue';
-import Cookies from 'js-cookie';
-import WhatsappCallsAPI from 'dashboard/api/channel/whatsapp/whatsappCallsAPI';
-import { VOICE_CALL_OUTBOUND_INIT_STATUS } from 'dashboard/components-next/message/constants';
-
-// Module-level state lets the cable handlers and unload listeners reach the
-// live PeerConnection without prop-drilling refs through every composable.
-let pc = null;
-let localStream = null;
-let remoteStream = null;
-let remoteAudioEl = null;
-let mediaRecorder = null;
-let recorderChunks = [];
-let audioContext = null;
-let activeCallId = null;
-// voice_call.outbound_connected (the sole source of the outbound SDP answer) is
-// broadcast account-wide and can arrive before the /initiate response sets
-// activeCallId in this tab. Until we know our own call id we can't tell our
-// answer from a concurrent agent's, so the cable handler buffers them here keyed
-// by call id (a single slot would let a concurrent agent's event clobber ours)
-// and initiateOutboundCall flushes the matching one by id.
-const pendingOutboundAnswers = new Map();
-// Module-scoped so multiple composable callers (header button + contact-panel
-// button) share the same lock. A per-instance ref let two parallel callers
-// both pass the guard and tear down each other's WebRTC state in cleanup().
-// ref() so consumers can reactively gate buttons on it (the composable
-// re-exports this as `isInitiating`).
-const isInitiatingOutbound = ref(false);
-const isInitiatingOutboundReadonly = readonly(isInitiatingOutbound);
-// Inbound calls record from the moment the agent clicks accept (their click =
-// pickup). Outbound calls must wait — Meta's `connect` webhook (which lands
-// during ringing) negotiates remote tracks ~20s before the contact actually
-// answers, and we don't want pre-pickup audio in the recording. This flag is
-// flipped to true by armOutboundRecorder() when the ACCEPTED status arrives.
-let recorderArmed = false;
-
-const ensureRemoteAudioElement = () => {
-  if (remoteAudioEl) return remoteAudioEl;
-  remoteAudioEl = document.createElement('audio');
-  remoteAudioEl.id = 'whatsapp-call-remote-audio';
-  remoteAudioEl.autoplay = true;
-  remoteAudioEl.playsInline = true;
-  remoteAudioEl.style.display = 'none';
-  document.body.appendChild(remoteAudioEl);
-  return remoteAudioEl;
-};
-
-const playRemoteStream = stream => {
-  const el = ensureRemoteAudioElement();
-  el.srcObject = stream;
-  el.play().catch(err => {
-    // eslint-disable-next-line no-console
-    console.warn('[WhatsApp Call] remote audio play() failed:', err);
-  });
-};
-
-// 1s timeslice keeps a recent recording chunk in memory so a remote hangup
-// that races cleanup still has data to upload.
-const RECORDING_TIMESLICE_MS = 1000;
-const ICE_GATHER_TIMEOUT_MS = 10000;
-
-const RECORDER_MIME_CANDIDATES = [
-  'audio/webm;codecs=opus',
-  'audio/webm',
-  'audio/ogg;codecs=opus',
-];
-
-// Outbound calls have no backend-supplied ice_servers (the call doesn't exist
-// at offer time). Without STUN the browser only sends host candidates and
-// browser→Meta media silently drops through any non-trivial NAT.
-const DEFAULT_OUTBOUND_ICE_SERVERS = [{ urls: 'stun:stun.l.google.com:19302' }];
-
-const waitForIceGatheringComplete = peer =>
-  new Promise(resolve => {
-    if (peer.iceGatheringState === 'complete') {
-      resolve();
-      return;
-    }
-    const timer = setTimeout(resolve, ICE_GATHER_TIMEOUT_MS);
-    peer.addEventListener('icegatheringstatechange', () => {
-      if (peer.iceGatheringState === 'complete') {
-        clearTimeout(timer);
-        resolve();
-      }
-    });
-  });
-
-const setupRecorder = () => {
-  if (!localStream || !remoteStream || mediaRecorder) return;
-  // createMediaStreamSource on a stream with no audio tracks wires up to
-  // nothing — the recorded mix would be silence. Wait until ontrack fires.
-  if (remoteStream.getAudioTracks().length === 0) return;
-
-  audioContext = new AudioContext({ sampleRate: 48000 });
-  // AudioContext starts suspended under most autoplay policies; without
-  // resume() the destination stream produces silence.
-  audioContext.resume().catch(() => {});
-
-  const destination = audioContext.createMediaStreamDestination();
-  audioContext.createMediaStreamSource(localStream).connect(destination);
-  audioContext.createMediaStreamSource(remoteStream).connect(destination);
-
-  const mimeType = RECORDER_MIME_CANDIDATES.find(t =>
-    MediaRecorder.isTypeSupported(t)
-  );
-  if (!mimeType) return;
-
-  recorderChunks = [];
-  mediaRecorder = new MediaRecorder(destination.stream, { mimeType });
-  mediaRecorder.ondataavailable = event => {
-    if (event.data && event.data.size > 0) recorderChunks.push(event.data);
-  };
-  mediaRecorder.start(RECORDING_TIMESLICE_MS);
-};
-
-const cleanup = () => {
-  if (mediaRecorder && mediaRecorder.state !== 'inactive') {
-    try {
-      mediaRecorder.stop();
-    } catch (_) {
-      /* noop */
-    }
-  }
-  if (audioContext && audioContext.state !== 'closed') {
-    audioContext.close().catch(() => {});
-  }
-  if (localStream) localStream.getTracks().forEach(t => t.stop());
-  if (remoteStream) remoteStream.getTracks().forEach(t => t.stop());
-  if (pc) pc.close();
-  if (remoteAudioEl) remoteAudioEl.srcObject = null;
-
-  pc = null;
-  localStream = null;
-  remoteStream = null;
-  mediaRecorder = null;
-  recorderChunks = [];
-  audioContext = null;
-  activeCallId = null;
-  pendingOutboundAnswers.clear();
-  recorderArmed = false;
-};
-
-const buildPeerConnection = iceServers => {
-  const config = iceServers && iceServers.length ? { iceServers } : {};
-  pc = new RTCPeerConnection(config);
-  remoteStream = new MediaStream();
-  pc.ontrack = event => {
-    // Reuse the same MediaStream object — the recorder's audioContext source
-    // taps it once, so reassigning would orphan the recorder.
-    const tracks =
-      event.streams && event.streams[0]
-        ? event.streams[0].getTracks()
-        : [event.track];
-    tracks.forEach(track => {
-      if (!remoteStream.getTracks().includes(track))
-        remoteStream.addTrack(track);
-    });
-    playRemoteStream(remoteStream);
-    // Only arm the recorder when the call is actually accepted. For outbound
-    // this is the ACCEPTED status webhook; for inbound this is the agent's
-    // own click (acceptIncomingCall flips recorderArmed before returning).
-    if (recorderArmed) setupRecorder();
-  };
-  return pc;
-};
-
-const stopRecorderAndUpload = async callId => {
-  if (mediaRecorder && mediaRecorder.state !== 'inactive') {
-    await new Promise(resolve => {
-      mediaRecorder.addEventListener('stop', resolve, { once: true });
-      try {
-        mediaRecorder.stop();
-      } catch (_) {
-        resolve();
-      }
-    });
-  }
-  if (!recorderChunks.length || !callId) return;
-
-  const blob = new Blob(recorderChunks, { type: recorderChunks[0].type });
-  // Best-effort — the controller's idempotency guard handles a retry.
-  try {
-    await WhatsappCallsAPI.uploadRecording(callId, blob);
-  } catch (_) {
-    /* noop */
-  }
-};
-
-// devise-token-auth requires access-token / client / uid headers on every
-// request — navigator.sendBeacon can't set custom headers, so we rehydrate
-// the auth payload from the cw_d_session_info cookie that the dashboard sets
-// at login. Used by the page-close terminate path below.
-const getDeviseAuthHeaders = () => {
-  try {
-    const raw = Cookies.get('cw_d_session_info');
-    if (!raw) return null;
-    const session = JSON.parse(raw);
-    return {
-      'access-token': session['access-token'] || '',
-      client: session.client || '',
-      uid: session.uid || '',
-      expiry: session.expiry || '',
-      'token-type': session['token-type'] || 'Bearer',
-    };
-  } catch (_) {
-    return null;
-  }
-};
-
-const beaconTerminate = callId => {
-  if (!callId) return;
-  const accountId = window.location.pathname.split('/')[3];
-  if (!accountId) return;
-  const headers = getDeviseAuthHeaders();
-  if (!headers) return;
-  const url = `/api/v1/accounts/${accountId}/whatsapp_calls/${callId}/terminate`;
-  // fetch+keepalive (instead of navigator.sendBeacon) so we can attach auth
-  // headers — without them devise-token-auth 401s and the call stays open on
-  // Meta until its carrier-side timeout (~60s).
-  try {
-    fetch(url, {
-      method: 'POST',
-      keepalive: true,
-      credentials: 'same-origin',
-      headers: { 'Content-Type': 'application/json', ...headers },
-      body: '{}',
-    }).catch(() => {});
-  } catch (_) {
-    /* noop */
-  }
-};
-
-export const hasActiveWhatsappCall = () => !!(activeCallId || pc);
-
-export const isLocalWhatsappCall = callId =>
-  !!callId && activeCallId != null && callId === activeCallId;
-
-export function useWhatsappCallSession() {
-  const prepareInboundAnswer = async (sdpOffer, iceServers) => {
-    cleanup();
-    localStream = await navigator.mediaDevices.getUserMedia({ audio: true });
-    buildPeerConnection(iceServers);
-    localStream.getTracks().forEach(t => pc.addTrack(t, localStream));
-    await pc.setRemoteDescription({ type: 'offer', sdp: sdpOffer });
-    const answer = await pc.createAnswer();
-    await pc.setLocalDescription(answer);
-    await waitForIceGatheringComplete(pc);
-    return pc.localDescription.sdp;
-  };
-
-  const prepareOutboundOffer = async () => {
-    cleanup();
-    localStream = await navigator.mediaDevices.getUserMedia({ audio: true });
-    buildPeerConnection(DEFAULT_OUTBOUND_ICE_SERVERS);
-    localStream.getTracks().forEach(t => pc.addTrack(t, localStream));
-    const offer = await pc.createOffer();
-    await pc.setLocalDescription(offer);
-    await waitForIceGatheringComplete(pc);
-    return pc.localDescription.sdp;
-  };
-
-  const acceptIncomingCall = async ({ callId, sdpOffer, iceServers }) => {
-    // The store may not have sdpOffer yet (the cable broadcast can race the
-    // click). Fall back to GET /whatsapp_calls/:id which exposes it.
-    let offer = sdpOffer;
-    let ice = iceServers;
-    if (!offer && callId) {
-      try {
-        const fresh = await WhatsappCallsAPI.show(callId);
-        offer = fresh?.sdp_offer || fresh?.sdpOffer;
-        ice = ice || fresh?.ice_servers || fresh?.iceServers;
-      } catch (e) {
-        // eslint-disable-next-line no-console
-        console.error(
-          '[WhatsApp Call] failed to fetch call data for accept:',
-          e
-        );
-      }
-    }
-    if (!offer) {
-      throw new Error('Missing sdp_offer for accept — call may have ended.');
-    }
-
-    // Release the mic + peer connection if anything between here and the accept
-    // round-trip fails — otherwise a rejected accept leaves the mic live and
-    // activeCallId set. Mirrors rejectIncomingCall's self-cleanup; rethrow so
-    // the caller can surface the failure and skip marking the call active.
-    try {
-      const sdpAnswer = await prepareInboundAnswer(offer, ice);
-      activeCallId = callId;
-      // Inbound: agent's click is the pickup. Arm the recorder before the API
-      // round-trip so when ontrack fires (triggered by setRemoteDescription
-      // back in prepareInboundAnswer) the recorder is already authorized.
-      recorderArmed = true;
-      setupRecorder();
-      await WhatsappCallsAPI.accept(callId, sdpAnswer);
-    } catch (e) {
-      cleanup();
-      throw e;
-    }
-  };
-
-  const rejectIncomingCall = async callId => {
-    try {
-      await WhatsappCallsAPI.reject(callId);
-    } finally {
-      cleanup();
-    }
-  };
-
-  const initiateOutboundCall = async conversationId => {
-    // Module-scoped lock + active-session guard so a second click — from the
-    // same composable instance OR a different one (header vs contact panel)
-    // OR while a call is already live — can't tear down the in-flight setup
-    // via prepareOutboundOffer's cleanup().
-    if (isInitiatingOutbound.value)
-      return { status: VOICE_CALL_OUTBOUND_INIT_STATUS.LOCKED };
-    if (hasActiveWhatsappCall())
-      return { status: VOICE_CALL_OUTBOUND_INIT_STATUS.LOCKED };
-    isInitiatingOutbound.value = true;
-    try {
-      const sdpOffer = await prepareOutboundOffer();
-      const response = await WhatsappCallsAPI.initiate(
-        conversationId,
-        sdpOffer
-      );
-      if (response?.id) {
-        activeCallId = response.id;
-        // A connect webhook that raced ahead of this response was buffered;
-        // apply our own by id now that we know it, then drop every buffered
-        // answer (concurrent agents' calls aren't ours to apply).
-        const buffered = pendingOutboundAnswers.get(activeCallId);
-        pendingOutboundAnswers.clear();
-        if (buffered) {
-          await pc.setRemoteDescription({
-            type: 'answer',
-            sdp: buffered,
-          });
-        }
-        return response;
-      }
-      // No call id back: this is the permission-request branch. The mic +
-      // PeerConnection allocated by prepareOutboundOffer aren't useful until
-      // the contact opts in and the agent retries — release them.
-      cleanup();
-      return response;
-    } catch (e) {
-      cleanup();
-      // BE returns 422 when the contact hasn't opted in (permission template
-      // sent or already pending). Surface it to the caller as a normal
-      // response shape so it can render the banner instead of an error toast.
-      const data = e?.response?.data;
-      if (
-        data?.status === VOICE_CALL_OUTBOUND_INIT_STATUS.PERMISSION_REQUESTED ||
-        data?.status === VOICE_CALL_OUTBOUND_INIT_STATUS.PERMISSION_PENDING
-      ) {
-        return { status: data.status };
-      }
-      throw e;
-    } finally {
-      isInitiatingOutbound.value = false;
-    }
-  };
-
-  // callIdOverride is the call.id from the dashboard's calls store. Module
-  // `activeCallId` may be null after a prior accept attempt's cleanup() — but
-  // the call still exists on Meta and must still be terminated. Falling back
-  // to the override means hangup is robust to a wiped local session.
-  const endActiveCall = async (callIdOverride = null) => {
-    const callId = activeCallId || callIdOverride;
-    if (!callId) {
-      cleanup();
-      return;
-    }
-    try {
-      // Terminate on Meta first so the contact is disconnected immediately. The
-      // recording upload below can be slow on long calls or poor networks, and
-      // the peer connection / mic must not stay live for the contact during it.
-      await WhatsappCallsAPI.terminate(callId).catch(() => {});
-      await stopRecorderAndUpload(callId);
-    } finally {
-      cleanup();
-    }
-  };
-
-  return {
-    isInitiating: isInitiatingOutboundReadonly,
-    prepareInboundAnswer,
-    prepareOutboundOffer,
-    acceptIncomingCall,
-    rejectIncomingCall,
-    initiateOutboundCall,
-    endActiveCall,
-  };
-}
-
-// Cable handlers fire outside any composable instance, so the shared session
-// surface is exposed as module-level functions for them.
-
-export const applyOutboundAnswer = async (callId, sdpAnswer) => {
-  // No in-flight peer connection in this tab → not our call.
-  if (!pc) return;
-  // /initiate hasn't returned our call id yet (the connect webhook raced
-  // ahead). Buffer the answer; initiateOutboundCall flushes it by id once it
-  // knows which call is ours, so a concurrent agent's answer is never applied.
-  if (activeCallId == null) {
-    pendingOutboundAnswers.set(callId, sdpAnswer);
-    return;
-  }
-  // activeCallId known → only apply the answer for this tab's call.
-  if (callId !== activeCallId) return;
-  await pc.setRemoteDescription({ type: 'answer', sdp: sdpAnswer });
-};
-
-// Called by the cable handler when Meta delivers status=ACCEPTED for the
-// outbound call (real pickup). Flips the recorder gate and starts the
-// MediaRecorder. Idempotent — safe if ontrack hasn't fired yet (setupRecorder
-// bails until the remote stream has audio tracks; ontrack will retry).
-export const armOutboundRecorder = () => {
-  recorderArmed = true;
-  setupRecorder();
-};
-
-export const cleanupWhatsappSession = () => cleanup();
-
-export const handleWhatsappRemoteEnd = async callId => {
-  // Snapshot before cleanup nulls activeCallId.
-  const id = callId || activeCallId;
-  if (!id) {
-    cleanup();
-    return;
-  }
-  try {
-    await stopRecorderAndUpload(id);
-  } finally {
-    cleanup();
-  }
-};
-
-export const setWhatsappCallMuted = muted => {
-  if (!localStream) return false;
-  localStream.getAudioTracks().forEach(track => {
-    track.enabled = !muted;
-  });
-  return muted;
-};
-
-export const sendWhatsappTerminateBeacon = () => {
-  // Always fire when there's a live callId. The beacon endpoint is idempotent,
-  // so racing it with an in-flight Axios terminate (which unload may abort) is
-  // fine — Meta gets exactly one terminate either way, and we avoid leaving
-  // the call ringing on Meta until its carrier-side timeout.
-  if (!activeCallId) return;
-  beaconTerminate(activeCallId);
-};

app/javascript/dashboard/constants/editor.js

@@ -114,6 +114,16 @@ export const FORMATTING = {
     nodes: [],
     menu: [],
   },
+  'Channel::AppStore': {
+    marks: [],
+    nodes: [],
+    menu: [],
+  },
+  'Channel::GooglePlay': {
+    marks: [],
+    nodes: [],
+    menu: [],
+  },
   // Special contexts (not actual channels)
   'Context::PrivateNote': {
     marks: ['strong', 'em', 'code', 'link', 'strike'],

app/javascript/dashboard/helper/actionCable.js

@@ -4,15 +4,6 @@ import DashboardAudioNotificationHelper from './AudioAlerts/DashboardAudioNotifi
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import { emitter } from 'shared/helpers/mitt';
 import { useImpersonation } from 'dashboard/composables/useImpersonation';
-import { useCallsStore } from 'dashboard/stores/calls';
-import {
-  applyOutboundAnswer,
-  armOutboundRecorder,
-  handleWhatsappRemoteEnd,
-  isLocalWhatsappCall,
-} from 'dashboard/composables/useWhatsappCallSession';
-import { VOICE_CALL_PROVIDERS } from 'dashboard/helper/inbox';
-import { VOICE_CALL_DIRECTION } from 'dashboard/components-next/message/constants';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 const { isImpersonating } = useImpersonation();
@@ -50,10 +41,6 @@ class ActionCableConnector extends BaseActionCableConnector {
       'account.cache_invalidated': this.onCacheInvalidate,
       'account.enrichment_completed': this.onEnrichmentCompleted,
       'copilot.message.created': this.onCopilotMessageCreated,
-      'voice_call.incoming': this.onVoiceCallIncoming,
-      'voice_call.outbound_connected': this.onVoiceCallOutboundConnected,
-      'voice_call.outbound_accepted': this.onVoiceCallOutboundAccepted,
-      'voice_call.ended': this.onVoiceCallEnded,
     };
   }
 
@@ -274,74 +261,6 @@ class ActionCableConnector extends BaseActionCableConnector {
     this.app.$store.dispatch('inboxes/revalidate', { newKey: keys.inbox });
     this.app.$store.dispatch('teams/revalidate', { newKey: keys.team });
   };
-
-  onVoiceCallIncoming = data => {
-    if (data?.provider !== VOICE_CALL_PROVIDERS.WHATSAPP) return;
-    // Defense in depth: the server already filters to online agent streams,
-    // but if anything ever broadcasts to a broader stream (e.g. account-wide),
-    // an agent who's set availability=offline/busy shouldn't ring.
-    const availability = this.app.$store.getters.getCurrentUserAvailability;
-    if (availability !== 'online') return;
-
-    useCallsStore().addCall({
-      callSid: data.call_id,
-      callId: data.id,
-      conversationId: data.conversation_id,
-      inboxId: data.inbox_id,
-      callDirection: VOICE_CALL_DIRECTION.INBOUND,
-      provider: VOICE_CALL_PROVIDERS.WHATSAPP,
-      sdpOffer: data.sdp_offer,
-      iceServers: data.ice_servers,
-      caller: data.caller,
-    });
-  };
-
-  // `connect` is the WebRTC tunnel-ready signal (fires ~20s before pickup
-  // for outbound). Apply the SDP answer so the handshake completes during
-  // ringing, but stay non-active until `outbound_accepted` arrives.
-  // eslint-disable-next-line class-methods-use-this
-  onVoiceCallOutboundConnected = async data => {
-    if (data?.provider !== VOICE_CALL_PROVIDERS.WHATSAPP || !data.sdp_answer)
-      return;
-    // Account-wide broadcast that can arrive before /initiate sets this tab's
-    // call id. applyOutboundAnswer filters foreign calls and buffers the answer
-    // until the id is known, so we must not drop it here on a null activeCallId.
-    try {
-      await applyOutboundAnswer(data.id, data.sdp_answer);
-    } catch (_) {
-      /* noop */
-    }
-  };
-
-  // Real pickup signal — Meta sends status=ACCEPTED on the call when the
-  // contact answers. Flip active (timer starts) and arm the recorder.
-  // eslint-disable-next-line class-methods-use-this
-  onVoiceCallOutboundAccepted = data => {
-    if (data?.provider !== VOICE_CALL_PROVIDERS.WHATSAPP) return;
-    const store = useCallsStore();
-    if (!store.calls.some(c => c.callSid === data.call_id)) return;
-    store.setCallActive(data.call_id);
-    armOutboundRecorder();
-  };
-
-  // eslint-disable-next-line class-methods-use-this
-  onVoiceCallEnded = async data => {
-    if (data?.provider !== VOICE_CALL_PROVIDERS.WHATSAPP) return;
-    // The store entry should always be removed for this account-wide broadcast,
-    // but the WebRTC/recorder teardown must only run for the call this tab owns
-    // — otherwise an unrelated agent's call ending would stop this tab's
-    // recorder and upload its chunks against the wrong call id.
-    if (isLocalWhatsappCall(data.id)) {
-      // Await upload before removeCall — the store's sync teardown would otherwise
-      // wipe the recorder chunks before they reach the server.
-      try {
-        await handleWhatsappRemoteEnd(data.id);
-      } catch (_) {
-        /* noop */
-      }
-    }
-    useCallsStore().removeCall(data.call_id);
-  };
 }
 
 export default {

app/javascript/dashboard/helper/inbox.js

@@ -11,12 +11,13 @@ export const INBOX_TYPES = {
   SMS: 'Channel::Sms',
   INSTAGRAM: 'Channel::Instagram',
   TIKTOK: 'Channel::Tiktok',
+  APP_STORE: 'Channel::AppStore',
+  GOOGLE_PLAY: 'Channel::GooglePlay',
 };
 
 // Add providers here as they gain voice capability (e.g., WhatsApp Cloud, Twilio WhatsApp)
 export const VOICE_CALL_PROVIDERS = {
   TWILIO: 'twilio',
-  WHATSAPP: 'whatsapp',
 };
 
 export const getVoiceCallProvider = inbox => {
@@ -26,11 +27,9 @@ export const getVoiceCallProvider = inbox => {
   const channelType = inbox.channel_type || inbox.channelType;
   const voiceEnabled = inbox.voice_enabled || inbox.voiceEnabled;
 
-  if (!voiceEnabled) return null;
-
-  if (channelType === INBOX_TYPES.TWILIO) return VOICE_CALL_PROVIDERS.TWILIO;
-  if (channelType === INBOX_TYPES.WHATSAPP)
-    return VOICE_CALL_PROVIDERS.WHATSAPP;
+  if (channelType === INBOX_TYPES.TWILIO && voiceEnabled) {
+    return VOICE_CALL_PROVIDERS.TWILIO;
+  }
 
   return null;
 };
@@ -53,6 +52,8 @@ 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.APP_STORE]: 'i-ri-app-store-fill',
+  [INBOX_TYPES.GOOGLE_PLAY]: 'i-ri-google-play-fill',
 };
 
 const DEFAULT_ICON_FILL = 'i-ri-chat-1-fill';
@@ -68,6 +69,8 @@ const INBOX_ICON_MAP_LINE = {
   [INBOX_TYPES.LINE]: 'i-woot-line',
   [INBOX_TYPES.INSTAGRAM]: 'i-woot-instagram',
   [INBOX_TYPES.TIKTOK]: 'i-woot-tiktok',
+  [INBOX_TYPES.APP_STORE]: 'i-ri-app-store-line',
+  [INBOX_TYPES.GOOGLE_PLAY]: 'i-ri-google-play-line',
 };
 
 const DEFAULT_ICON_LINE = 'i-ri-chat-1-line';
@@ -117,6 +120,12 @@ export const getReadableInboxByType = (type, phoneNumber) => {
     case INBOX_TYPES.LINE:
       return 'line';
 
+    case INBOX_TYPES.APP_STORE:
+      return 'app_store';
+
+    case INBOX_TYPES.GOOGLE_PLAY:
+      return 'google_play';
+
     default:
       return 'chat';
   }

app/javascript/dashboard/helper/voice.js

@@ -1,5 +1,4 @@
 import { CONTENT_TYPES } from 'dashboard/components-next/message/constants';
-import { MESSAGE_TYPE } from 'shared/constants/messages';
 import { useCallsStore } from 'dashboard/stores/calls';
 import types from 'dashboard/store/mutation-types';
 
@@ -46,66 +45,23 @@ const shouldShowCall = ({
   return !isAssignedToAnotherAgent(assigneeId, currentUserId);
 };
 
-// Offline/busy agents shouldn't get a ringing popup for inbound calls, but
-// outbound calls always belong to the initiator regardless of their status,
-// and existing (already-surfaced) calls keep going so a status change
-// mid-call doesn't yank away an active widget.
-const shouldRingInbound = (callDirection, currentUserAvailability) => {
-  if (callDirection === 'outbound') return true;
-  return currentUserAvailability === 'online';
-};
-
-function extractCallerSnapshot(message) {
-  // Snapshot caller info from the message at add-time so the widget can keep
-  // rendering it after the user navigates away from a conversation list that
-  // had the conversation hydrated (and Vuex evicts it from the store).
-  // Only incoming messages carry the contact as the sender; on outbound calls
-  // the sender is the initiating agent, so skip the snapshot and let the widget
-  // fall back to the conversation's contact (conversation.meta.sender).
-  if (message?.message_type !== MESSAGE_TYPE.INCOMING) return null;
-  const sender = message?.sender;
-  if (!sender) return null;
-  return {
-    name: sender.name,
-    phone: sender.phone_number,
-    avatar: sender.avatar || sender.thumbnail,
-    additionalAttributes: sender.additional_attributes || {},
-  };
-}
-
 function extractCallData(message) {
   const call = message?.call || {};
   return {
     callSid: call.provider_call_id,
-    callId: call.id,
-    provider: call.provider,
     status: call.status,
     callDirection: call.direction === 'outgoing' ? 'outbound' : 'inbound',
     conversationId: message?.conversation_id,
-    inboxId: message?.inbox_id ?? message?.conversation?.inbox_id,
     assigneeId: extractAssigneeId(message?.conversation),
     senderId: message?.sender?.id,
-    caller: extractCallerSnapshot(message),
   };
 }
 
-export function handleVoiceCallCreated(
-  message,
-  currentUserId,
-  currentUserAvailability
-) {
+export function handleVoiceCallCreated(message, currentUserId) {
   if (!isVoiceCallMessage(message)) return;
 
-  const {
-    callSid,
-    callId,
-    provider,
-    callDirection,
-    conversationId,
-    inboxId,
-    assigneeId,
-    senderId,
-  } = extractCallData(message);
+  const { callSid, callDirection, conversationId, assigneeId, senderId } =
+    extractCallData(message);
 
   if (
     !shouldShowCall({
@@ -118,37 +74,23 @@ export function handleVoiceCallCreated(
     return;
   }
 
-  if (!shouldRingInbound(callDirection, currentUserAvailability)) return;
-
   const callsStore = useCallsStore();
   callsStore.addCall({
     callSid,
-    callId,
-    provider,
     conversationId,
-    inboxId,
     callDirection,
     senderId,
-    caller: extractCallerSnapshot(message),
   });
 }
 
-export function handleVoiceCallUpdated(
-  commit,
-  message,
-  currentUserId,
-  currentUserAvailability
-) {
+export function handleVoiceCallUpdated(commit, message, currentUserId) {
   if (!isVoiceCallMessage(message)) return;
 
   const {
     callSid,
-    callId,
-    provider,
     status,
     callDirection,
     conversationId,
-    inboxId,
     assigneeId,
     senderId,
   } = extractCallData(message);
@@ -176,17 +118,11 @@ export function handleVoiceCallUpdated(
   }
 
   if (status === 'ringing') {
-    if (!shouldRingInbound(callDirection, currentUserAvailability)) return;
-
     callsStore.addCall({
       callSid,
-      callId,
-      provider,
       conversationId,
-      inboxId,
       callDirection,
       senderId,
-      caller: extractCallerSnapshot(message),
     });
   }
 }
@@ -195,20 +131,6 @@ export function syncConversationCallVisibility(conversation, currentUserId) {
   const assigneeId = extractAssigneeId(conversation);
   if (!isAssignedToAnotherAgent(assigneeId, currentUserId)) return;
 
-  // Outbound calls belong to the initiator regardless of who the conversation
-  // is currently assigned to (auto-assignment may flip mid-call). Mirror
-  // shouldShowCall's outbound exception so an in-progress outbound call isn't
-  // ripped out from under the caller when the conversation reassigns.
   const callsStore = useCallsStore();
-  const callsToRemove = callsStore.calls.filter(
-    call =>
-      call.conversationId === conversation.id &&
-      !shouldShowCall({
-        callDirection: call.callDirection,
-        senderId: call.senderId,
-        assigneeId,
-        currentUserId,
-      })
-  );
-  callsToRemove.forEach(call => callsStore.removeCall(call.callSid));
+  callsStore.removeCallsForConversation(conversation.id);
 }

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

@@ -27,13 +27,9 @@
     },
     "LABELS": {
       "ASSIGN_LABELS": "Assign labels",
-      "REMOVE_LABELS": "Remove labels",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
-      "REMOVE_SELECTED_LABELS": "Remove selected labels",
       "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
-      "ASSIGN_FAILED": "Failed to assign labels. Please try again.",
-      "REMOVE_SUCCESFUL": "Labels removed successfully.",
-      "REMOVE_FAILED": "Failed to remove labels. Please try again."
+      "ASSIGN_FAILED": "Failed to assign labels. Please try again."
     },
     "TEAMS": {
       "NONE": "None",

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

@@ -20,8 +20,6 @@
     "CALL": "Call",
     "CALL_INITIATED": "Calling the contact…",
     "CALL_FAILED": "Unable to start the call. Please try again.",
-    "WHATSAPP_CALL_PERMISSION_REQUESTED": "Sent a call permission request to the contact. Try again once they accept.",
-    "WHATSAPP_CALL_PERMISSION_PENDING": "Call permission request already sent recently. Try again once the contact accepts.",
     "CLICK_TO_EDIT": "Click to edit",
     "VOICE_INBOX_PICKER": {
       "TITLE": "Choose a voice inbox"
@@ -586,11 +584,8 @@
   },
   "CONTACTS_BULK_ACTIONS": {
     "ASSIGN_LABELS": "Assign Labels",
-    "REMOVE_LABELS": "Remove Labels",
     "ASSIGN_LABELS_SUCCESS": "Labels assigned successfully.",
     "ASSIGN_LABELS_FAILED": "Failed to assign labels",
-    "REMOVE_LABELS_SUCCESS": "Labels removed successfully.",
-    "REMOVE_LABELS_FAILED": "Failed to remove labels",
     "DESCRIPTION": "Select the labels you want to add to the selected contacts.",
     "NO_LABELS_FOUND": "No labels available yet.",
     "SELECTED_COUNT": "{count} selected",

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

@@ -62,7 +62,6 @@
     "UNSUPPORTED_MESSAGE_FACEBOOK": "This message is unsupported. You can view this message on the Facebook Messenger app.",
     "UNSUPPORTED_MESSAGE_INSTAGRAM": "This message is unsupported. You can view this message on the Instagram app.",
     "UNSUPPORTED_MESSAGE_TIKTOK": "This message is unsupported. You can view this message on the TikTok app.",
-    "UNSUPPORTED_MESSAGE_WHATSAPP": "This message is unsupported. You can view this message on the WhatsApp app.",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -80,22 +79,13 @@
       "OUTGOING_CALL": "Outgoing call",
       "CALL_IN_PROGRESS": "Call in progress",
       "NO_ANSWER": "No answer",
-      "NO_ANSWER_OUTBOUND_LABEL": "No answer",
-      "NO_ANSWER_OUTBOUND_SUBTEXT": "Contact didn't pick up",
       "MISSED_CALL": "Missed call",
-      "MISSED_CALL_INBOUND_SUBTEXT": "No agent picked up",
-      "MISSED_CALL_DECLINED_BY": "Declined by {agentName}",
       "CALL_ENDED": "Call ended",
-      "HANDLED_BY": "Handled by {agentName}",
       "NOT_ANSWERED_YET": "Not answered yet",
-      "CALLING": "Calling…",
       "THEY_ANSWERED": "They answered",
       "YOU_ANSWERED": "You answered",
       "AGENT_ANSWERED": "{agentName} answered",
-      "JOIN_CALL": "Join call",
-      "CALL_BACK": "Call back",
-      "TRANSCRIPT_SHOW_MORE": "Show more",
-      "TRANSCRIPT_SHOW_LESS": "Show less"
+      "JOIN_CALL": "Join call"
     },
     "HEADER": {
       "RESOLVE_ACTION": "Resolve",
@@ -110,12 +100,6 @@
       "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
       "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
       "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply",
-      "WHATSAPP_CALL": "Start WhatsApp call",
-      "WHATSAPP_CALL_FAILED": "Could not start the WhatsApp call.",
-      "VOICE_CALL": "Start call",
-      "VOICE_CALL_FAILED": "Could not start the call.",
-      "WHATSAPP_CALL_PERMISSION_REQUESTED": "Sent a call permission request to the contact. Try again once they accept.",
-      "WHATSAPP_CALL_PERMISSION_PENDING": "Call permission request already sent recently. Try again once the contact accepts.",
       "SLA_STATUS": {
         "FRT": "FRT {status}",
         "NRT": "NRT {status}",
@@ -315,13 +299,8 @@
       "NOT_ANSWERED_YET": "Not answered yet",
       "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
       "REJECT_CALL": "Reject",
-      "DISMISS_CALL": "Dismiss",
       "JOIN_CALL": "Join call",
-      "END_CALL": "End call",
-      "MUTE": "Mute mic",
-      "UNMUTE": "Unmute mic",
-      "VIEW_CHAT_HISTORY": "View chat history",
-      "GO_TO_CONVERSATION": "Go to conversation thread"
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {

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

@@ -607,12 +607,9 @@
         "DRAFT": "Draft",
         "ARCHIVE": "Archive",
         "TRANSLATE": "Translate",
-        "MOVE_TO_CATEGORY": "Category",
         "DELETE": "Delete",
         "STATUS_SUCCESS": "Articles updated successfully",
         "STATUS_ERROR": "Failed to update articles",
-        "CATEGORY_SUCCESS": "Articles moved successfully",
-        "CATEGORY_ERROR": "Failed to move articles",
         "DELETE_CONFIRM_TITLE": "Delete article | Delete {count} articles",
         "DELETE_CONFIRM_DESCRIPTION": "This will permanently delete the selected article. This action cannot be undone. | This will permanently delete {count} selected articles. This action cannot be undone.",
         "DELETE_CONFIRM": "Delete",

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

@@ -308,7 +308,6 @@
           "AUTH_PROCESSING": "Authenticating with Meta",
           "WAITING_FOR_BUSINESS_INFO": "Please complete business setup in the Meta window...",
           "PROCESSING": "Setting up your WhatsApp Business Account",
-          "ENABLING_CALLING": "Enabling WhatsApp Calling on your number…",
           "LOADING_SDK": "Loading Facebook SDK...",
           "CANCELLED": "WhatsApp Signup was cancelled",
           "SUCCESS_TITLE": "WhatsApp Business Account Connected!",
@@ -318,8 +317,7 @@
           "AUTH_NOT_COMPLETED": "Authentication not completed. Please restart the process.",
           "SUCCESS_FALLBACK": "WhatsApp Business Account has been successfully configured",
           "MANUAL_FALLBACK": "If your number is already connected to the WhatsApp Business Platform (API), or if you’re a tech provider onboarding your own number, please use the {link} flow",
-          "MANUAL_LINK_TEXT": "manual setup flow",
-          "CALLING_ENABLE_FAILED": "Your WhatsApp inbox is ready, but voice calling couldn't be turned on — this number isn't enrolled in the WhatsApp Business Calling API yet. Reach out to Meta or your WhatsApp Business Solution Provider to onboard it, then turn calling on from the inbox's Calls settings."
+          "MANUAL_LINK_TEXT": "manual setup flow"
         },
         "API": {
           "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
@@ -384,6 +382,39 @@
           "ERROR_MESSAGE": "We were not able to save the api channel"
         }
       },
+      "APP_STORE": {
+        "TITLE": "App Store Reviews",
+        "DESC": "Manage and reply to your App Store reviews from Chatwoot.",
+        "CHANNEL_NAME": {
+          "LABEL": "Inbox Name",
+          "PLACEHOLDER": "Please enter an inbox name",
+          "ERROR": "This field is required"
+        },
+        "APP_ID": {
+          "LABEL": "App Store Connect app ID",
+          "PLACEHOLDER": "Enter your App Store Connect app ID",
+          "ERROR": "This field is required"
+        },
+        "ISSUER_ID": {
+          "LABEL": "Issuer ID",
+          "PLACEHOLDER": "Enter your App Store Connect issuer ID",
+          "ERROR": "This field is required"
+        },
+        "KEY_ID": {
+          "LABEL": "Key ID",
+          "PLACEHOLDER": "Enter your App Store Connect key ID",
+          "ERROR": "This field is required"
+        },
+        "PRIVATE_KEY": {
+          "LABEL": "Private key",
+          "PLACEHOLDER": "Paste the contents of your .p8 private key",
+          "ERROR": "This field is required"
+        },
+        "SUBMIT_BUTTON": "Create App Store Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the App Store channel"
+        }
+      },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
         "DESC": "Integrate your email inbox.",
@@ -449,6 +480,24 @@
           "ERROR_MESSAGE": "We were not able to save the telegram channel"
         }
       },
+      "GOOGLE_PLAY": {
+        "TITLE": "Google Play Reviews",
+        "DESC": "Manage and reply to your Google Play Store app reviews from Chatwoot.",
+        "INBOX_NAME": {
+          "LABEL": "Inbox Name",
+          "PLACEHOLDER": "Please enter an inbox name",
+          "ERROR": "This field is required"
+        },
+        "APP_ID": {
+          "LABEL": "App package name",
+          "PLACEHOLDER": "Please enter your app package name (eg: com.example.app)",
+          "ERROR": "Please enter a valid app package name"
+        },
+        "CONNECT_BUTTON": "Connect with Google",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to connect your Google Play Reviews channel"
+        }
+      },
       "AUTH": {
         "TITLE": "Choose a channel",
         "DESC": "Chatwoot supports live-chat widgets, Facebook Messenger, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below.",
@@ -467,10 +516,6 @@
             "TITLE": "WhatsApp",
             "DESCRIPTION": "Support your customers on WhatsApp"
           },
-          "WHATSAPP_CALL": {
-            "TITLE": "WhatsApp Call",
-            "DESCRIPTION": "Take voice calls on your WhatsApp number"
-          },
           "EMAIL": {
             "TITLE": "Email",
             "DESCRIPTION": "Connect with Gmail, Outlook, or other providers"
@@ -499,9 +544,17 @@
             "TITLE": "TikTok",
             "DESCRIPTION": "Connect your TikTok account"
           },
+          "APP_STORE": {
+            "TITLE": "App Store Reviews",
+            "DESCRIPTION": "Manage your App Store app reviews"
+          },
           "VOICE": {
             "TITLE": "Voice",
             "DESCRIPTION": "Integrate with Twilio Voice"
+          },
+          "GOOGLE_PLAY": {
+            "TITLE": "Google Play Reviews",
+            "DESCRIPTION": "Manage your Google Play Store app reviews"
           }
         }
       },
@@ -643,8 +696,7 @@
       "BOT_CONFIGURATION": "Bot Configuration",
       "ACCOUNT_HEALTH": "Account Health",
       "CSAT": "CSAT",
-      "VOICE": "Voice",
-      "CALLS": "Calls"
+      "VOICE": "Voice"
     },
     "VOICE_CONFIGURATION": {
       "ENABLE_VOICE": {
@@ -655,26 +707,6 @@
         "DESCRIPTION": "Voice calling requires Twilio API Key credentials. These are used to generate tokens for agent voice connections."
       }
     },
-    "WHATSAPP_CALLING": {
-      "ENABLE": {
-        "LABEL": "Enable WhatsApp Calling",
-        "DESCRIPTION": "Allow agents to receive and place WhatsApp Cloud calls on this inbox. Customers can call this business number directly from WhatsApp."
-      },
-      "ENABLE_FAILED": "Voice calling couldn't be turned on for this number — it isn't enrolled in the WhatsApp Business Calling API yet. Reach out to Meta or your WhatsApp Business Solution Provider to onboard it, then try again.",
-      "PHONE_NUMBER": {
-        "LABEL": "Business phone number",
-        "HELP_TEXT": "WhatsApp number that customers will call."
-      },
-      "HOW_IT_WORKS": {
-        "LABEL": "How it works",
-        "DESCRIPTION": "Calls are placed peer-to-peer between the agent's browser and Meta — no extra credentials are required. Make sure the agent's browser has microphone permission for this site."
-      },
-      "PERMISSION_REQUEST_BODY": {
-        "LABEL": "Call permission request message",
-        "HELP_TEXT": "Shown to the contact when they haven't yet consented to receive calls. Leave blank to use the default.",
-        "PLACEHOLDER": "We would like to call you regarding your conversation."
-      }
-    },
     "CHANNEL_PREFERENCES": "Channel Preferences",
     "WIDGET_FEATURES": "Widget features",
     "ACCOUNT_HEALTH": {
@@ -827,10 +859,6 @@
       "WHATSAPP_TEMPLATES_SYNC_SUBHEADER": "Manually sync message templates from WhatsApp to update your available templates.",
       "WHATSAPP_TEMPLATES_SYNC_BUTTON": "Sync Templates",
       "WHATSAPP_TEMPLATES_SYNC_SUCCESS": "Templates sync initiated successfully. It may take a couple of minutes to update.",
-      "WHATSAPP_CALLING_ENABLED": {
-        "LABEL": "Enable voice calling",
-        "DESCRIPTION": "Allow agents to start and receive WhatsApp voice calls on this inbox. Available only on embedded-signup WhatsApp Cloud channels with calling permission granted by Meta."
-      },
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "HELP_CENTER": {
@@ -1196,6 +1224,8 @@
       "API": "API Channel",
       "INSTAGRAM": "Instagram",
       "TIKTOK": "TikTok",
+      "APP_STORE": "App Store Reviews",
+      "GOOGLE_PLAY": "Google Play Reviews",
       "VOICE": "Voice"
     }
   }

app/javascript/dashboard/routes/dashboard/Dashboard.vue

@@ -17,7 +17,7 @@ const CommandBar = defineAsyncComponent(
 );
 
 const FloatingCallWidget = defineAsyncComponent(
-  () => import('dashboard/components-next/call/FloatingCallWidget.vue')
+  () => import('dashboard/components/widgets/FloatingCallWidget.vue')
 );
 
 import CopilotLauncher from 'dashboard/components-next/copilot/CopilotLauncher.vue';

app/javascript/dashboard/routes/dashboard/contacts/components/ContactsBulkActionBar.vue

@@ -25,7 +25,6 @@ const props = defineProps({
 const emit = defineEmits([
   'clearSelection',
   'assignLabels',
-  'removeLabels',
   'toggleAll',
   'deleteSelected',
 ]);
@@ -73,10 +72,6 @@ const selectionModel = computed({
 const handleAssignLabels = labels => {
   emit('assignLabels', labels);
 };
-
-const handleRemoveLabels = labels => {
-  emit('removeLabels', labels);
-};
 </script>
 
 <template>
@@ -108,13 +103,6 @@ const handleRemoveLabels = labels => {
             :disabled="!selectedCount"
             @assign="handleAssignLabels"
           />
-          <BulkLabelActions
-            type="contact"
-            action="remove"
-            :is-loading="isLoading"
-            :disabled="!selectedCount"
-            @remove="handleRemoveLabels"
-          />
           <div class="w-px h-3 bg-n-weak rounded-lg" />
           <Policy :permissions="['administrator']">
             <Button

app/javascript/dashboard/routes/dashboard/contacts/pages/ContactsIndex.vue

@@ -351,28 +351,6 @@ const assignLabels = async labels => {
   }
 };
 
-const removeLabels = async labels => {
-  if (!labels.length || !selectedContactIds.value.length) {
-    return;
-  }
-
-  isBulkActionLoading.value = true;
-  try {
-    await BulkActionsAPI.create({
-      type: 'Contact',
-      ids: selectedContactIds.value,
-      labels: { remove: labels },
-    });
-    useAlert(t('CONTACTS_BULK_ACTIONS.REMOVE_LABELS_SUCCESS'));
-    clearSelection();
-    await fetchContactsBasedOnContext(pageNumber.value);
-  } catch (error) {
-    useAlert(t('CONTACTS_BULK_ACTIONS.REMOVE_LABELS_FAILED'));
-  } finally {
-    isBulkActionLoading.value = false;
-  }
-};
-
 const deleteContacts = async () => {
   if (!selectedContactIds.value.length) {
     return;
@@ -536,7 +514,6 @@ onMounted(async () => {
           @toggle-all="toggleSelectAll"
           @clear-selection="clearSelection"
           @assign-labels="assignLabels"
-          @remove-labels="removeLabels"
           @delete-selected="openBulkDeleteDialog"
         />
         <ContactEmptyState

app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue

@@ -56,10 +56,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({
-      uiFlags: 'contacts/getUIFlags',
-      currentChat: 'getSelectedChat',
-    }),
+    ...mapGetters({ uiFlags: 'contacts/getUIFlags' }),
     contactProfileLink() {
       return `/app/accounts/${this.$route.params.accountId}/contacts/${this.contact.id}`;
     },
@@ -308,12 +305,11 @@ export default {
         <VoiceCallButton
           :phone="contact.phone_number"
           :contact-id="contact.id"
-          :conversation-id="currentChat?.id"
-          icon="i-lucide-phone"
-          sm
-          faded
-          slate
+          icon="i-ri-phone-fill"
+          size="sm"
           :tooltip-label="$t('CONTACT_PANEL.CALL')"
+          slate
+          faded
         />
         <NextButton
           v-tooltip.top-end="$t('EDIT_CONTACT.BUTTON_LABEL')"

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

@@ -7,12 +7,13 @@ import Api from './channels/Api.vue';
 import Email from './channels/Email.vue';
 import Sms from './channels/Sms.vue';
 import Whatsapp from './channels/Whatsapp.vue';
-import WhatsappCall from './channels/WhatsappCall.vue';
 import Line from './channels/Line.vue';
 import Telegram from './channels/Telegram.vue';
 import Instagram from './channels/Instagram.vue';
 import Tiktok from './channels/Tiktok.vue';
 import Voice from './channels/Voice.vue';
+import AppStore from './channels/AppStore.vue';
+import GooglePlay from './channels/GooglePlay.vue';
 
 const channelViewList = {
   facebook: Facebook,
@@ -22,12 +23,13 @@ const channelViewList = {
   email: Email,
   sms: Sms,
   whatsapp: Whatsapp,
-  whatsapp_call: WhatsappCall,
   line: Line,
   telegram: Telegram,
   instagram: Instagram,
   tiktok: Tiktok,
+  app_store: AppStore,
   voice: Voice,
+  google_play: GooglePlay,
 };
 
 export default defineComponent({

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

@@ -77,6 +77,18 @@ const channelList = computed(() => {
       description: t('INBOX_MGMT.ADD.AUTH.CHANNEL.INSTAGRAM.DESCRIPTION'),
       icon: 'i-woot-instagram',
     },
+    {
+      key: 'app_store',
+      title: t('INBOX_MGMT.ADD.AUTH.CHANNEL.APP_STORE.TITLE'),
+      description: t('INBOX_MGMT.ADD.AUTH.CHANNEL.APP_STORE.DESCRIPTION'),
+      icon: 'i-ri-app-store-line',
+    },
+    {
+      key: 'google_play',
+      title: t('INBOX_MGMT.ADD.AUTH.CHANNEL.GOOGLE_PLAY.TITLE'),
+      description: t('INBOX_MGMT.ADD.AUTH.CHANNEL.GOOGLE_PLAY.DESCRIPTION'),
+      icon: 'i-ri-google-play-line',
+    },
   ];
 
   if (hasTiktokConfigured.value) {
@@ -95,13 +107,6 @@ const channelList = computed(() => {
     icon: 'i-woot-voice',
   });
 
-  channels.push({
-    key: 'whatsapp_call',
-    title: t('INBOX_MGMT.ADD.AUTH.CHANNEL.WHATSAPP_CALL.TITLE'),
-    description: t('INBOX_MGMT.ADD.AUTH.CHANNEL.WHATSAPP_CALL.DESCRIPTION'),
-    icon: 'i-woot-whatsapp',
-  });
-
   return channels;
 });
 

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

@@ -22,7 +22,6 @@ 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 WhatsappCallingPage from './settingsPage/WhatsappCallingPage.vue';
 import CustomerSatisfactionPage from './settingsPage/CustomerSatisfactionPage.vue';
 import CollaboratorsPage from './settingsPage/CollaboratorsPage.vue';
 import BotConfiguration from './components/BotConfiguration.vue';
@@ -49,7 +48,6 @@ export default {
     CollaboratorsPage,
     ConfigurationPage,
     VoiceConfigurationPage,
-    WhatsappCallingPage,
     CustomerSatisfactionPage,
     FacebookReauthorize,
     GreetingsEditor,
@@ -251,20 +249,11 @@ export default {
         ];
       }
 
-      if (
-        this.isAWhatsAppCloudChannel &&
-        this.isFeatureEnabledonAccount(
-          this.accountId,
-          FEATURE_FLAGS.CHANNEL_VOICE
-        )
-      ) {
-        visibleToAllChannelTabs = [
-          ...visibleToAllChannelTabs,
-          {
-            key: 'calls-configuration',
-            name: this.$t('INBOX_MGMT.TABS.CALLS'),
-          },
-        ];
+      if (this.isAnAppStoreChannel || this.isAGooglePlayChannel) {
+        const unsupportedKeys = ['business-hours', 'csat', 'bot-configuration'];
+        visibleToAllChannelTabs = visibleToAllChannelTabs.filter(
+          tab => !unsupportedKeys.includes(tab.key)
+        );
       }
 
       return visibleToAllChannelTabs;
@@ -300,6 +289,12 @@ export default {
       if (this.isAnEmailChannel) {
         return `${this.inbox.name} (${this.inbox.email})`;
       }
+      if (
+        (this.isAnAppStoreChannel || this.isAGooglePlayChannel) &&
+        this.inbox.app_id
+      ) {
+        return `${this.inbox.name} (${this.inbox.app_id})`;
+      }
       return this.inbox.name;
     },
     canLocktoSingleConversation() {
@@ -311,6 +306,7 @@ export default {
         this.isAnInstagramChannel ||
         this.isALineChannel ||
         this.isATiktokChannel ||
+        this.isAnAppStoreChannel ||
         this.isATelegramChannel
       );
     },
@@ -847,6 +843,7 @@ export default {
             </SettingsFieldSection>
 
             <SettingsFieldSection
+              v-if="!isAnAppStoreChannel && !isAGooglePlayChannel"
               :label="$t('INBOX_MGMT.HELP_CENTER.LABEL')"
               :help-text="$t('INBOX_MGMT.HELP_CENTER.SUB_TEXT')"
             >
@@ -1146,6 +1143,7 @@ export default {
             </SettingsAccordion>
 
             <SettingsAccordion
+              v-if="!isAnAppStoreChannel && !isAGooglePlayChannel"
               :title="$t('INBOX_MGMT.CHANNEL_PREFERENCES')"
               class="mt-6"
             >
@@ -1280,12 +1278,6 @@ export default {
         >
           <VoiceConfigurationPage :inbox="inbox" />
         </div>
-        <div
-          v-if="selectedTabKey === 'calls-configuration'"
-          class="mx-6 max-w-4xl"
-        >
-          <WhatsappCallingPage :inbox="inbox" />
-        </div>
         <div v-if="selectedTabKey === 'csat'">
           <CustomerSatisfactionPage :inbox="inbox" />
         </div>

app/javascript/dashboard/routes/dashboard/settings/inbox/channels/AppStore.vue

@@ -0,0 +1,176 @@
+<script>
+import { mapGetters } from 'vuex';
+import { useVuelidate } from '@vuelidate/core';
+import { required } from '@vuelidate/validators';
+import { useAlert } from 'dashboard/composables';
+import router from '../../../../index';
+import PageHeader from '../../SettingsSubPageHeader.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+export default {
+  components: {
+    PageHeader,
+    NextButton,
+  },
+  setup() {
+    return { v$: useVuelidate() };
+  },
+  data() {
+    return {
+      channelName: '',
+      appId: '',
+      issuerId: '',
+      keyId: '',
+      privateKey: '',
+    };
+  },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'inboxes/getUIFlags',
+    }),
+  },
+  validations: {
+    channelName: { required },
+    appId: { required },
+    issuerId: { required },
+    keyId: { required },
+    privateKey: { required },
+  },
+  methods: {
+    async createChannel() {
+      this.v$.$touch();
+      if (this.v$.$invalid) return;
+
+      try {
+        const appStoreChannel = await this.$store.dispatch(
+          'inboxes/createChannel',
+          {
+            name: this.channelName?.trim(),
+            channel: {
+              type: 'app_store',
+              app_id: this.appId.trim(),
+              issuer_id: this.issuerId.trim(),
+              key_id: this.keyId.trim(),
+              private_key: this.privateKey.trim(),
+            },
+          }
+        );
+
+        router.replace({
+          name: 'settings_inboxes_add_agents',
+          params: {
+            page: 'new',
+            inbox_id: appStoreChannel.id,
+          },
+        });
+      } catch (error) {
+        useAlert(
+          error.message || this.$t('INBOX_MGMT.ADD.APP_STORE.API.ERROR_MESSAGE')
+        );
+      }
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="h-full w-full p-6 col-span-6">
+    <PageHeader
+      :header-title="$t('INBOX_MGMT.ADD.APP_STORE.TITLE')"
+      :header-content="$t('INBOX_MGMT.ADD.APP_STORE.DESC')"
+    />
+    <form
+      class="flex flex-wrap flex-col mx-0"
+      @submit.prevent="createChannel()"
+    >
+      <div class="flex-shrink-0 flex-grow-0">
+        <label :class="{ error: v$.channelName.$error }">
+          {{ $t('INBOX_MGMT.ADD.APP_STORE.CHANNEL_NAME.LABEL') }}
+          <input
+            v-model="channelName"
+            type="text"
+            :placeholder="
+              $t('INBOX_MGMT.ADD.APP_STORE.CHANNEL_NAME.PLACEHOLDER')
+            "
+            @blur="v$.channelName.$touch"
+          />
+          <span v-if="v$.channelName.$error" class="message">
+            {{ $t('INBOX_MGMT.ADD.APP_STORE.CHANNEL_NAME.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="flex-shrink-0 flex-grow-0">
+        <label :class="{ error: v$.appId.$error }">
+          {{ $t('INBOX_MGMT.ADD.APP_STORE.APP_ID.LABEL') }}
+          <input
+            v-model="appId"
+            type="text"
+            :placeholder="$t('INBOX_MGMT.ADD.APP_STORE.APP_ID.PLACEHOLDER')"
+            @blur="v$.appId.$touch"
+          />
+          <span v-if="v$.appId.$error" class="message">
+            {{ $t('INBOX_MGMT.ADD.APP_STORE.APP_ID.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="flex-shrink-0 flex-grow-0">
+        <label :class="{ error: v$.issuerId.$error }">
+          {{ $t('INBOX_MGMT.ADD.APP_STORE.ISSUER_ID.LABEL') }}
+          <input
+            v-model="issuerId"
+            type="text"
+            :placeholder="$t('INBOX_MGMT.ADD.APP_STORE.ISSUER_ID.PLACEHOLDER')"
+            @blur="v$.issuerId.$touch"
+          />
+          <span v-if="v$.issuerId.$error" class="message">
+            {{ $t('INBOX_MGMT.ADD.APP_STORE.ISSUER_ID.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="flex-shrink-0 flex-grow-0">
+        <label :class="{ error: v$.keyId.$error }">
+          {{ $t('INBOX_MGMT.ADD.APP_STORE.KEY_ID.LABEL') }}
+          <input
+            v-model="keyId"
+            type="text"
+            :placeholder="$t('INBOX_MGMT.ADD.APP_STORE.KEY_ID.PLACEHOLDER')"
+            @blur="v$.keyId.$touch"
+          />
+          <span v-if="v$.keyId.$error" class="message">
+            {{ $t('INBOX_MGMT.ADD.APP_STORE.KEY_ID.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="flex-shrink-0 flex-grow-0">
+        <label :class="{ error: v$.privateKey.$error }">
+          {{ $t('INBOX_MGMT.ADD.APP_STORE.PRIVATE_KEY.LABEL') }}
+          <textarea
+            v-model="privateKey"
+            rows="8"
+            :placeholder="
+              $t('INBOX_MGMT.ADD.APP_STORE.PRIVATE_KEY.PLACEHOLDER')
+            "
+            @blur="v$.privateKey.$touch"
+          />
+          <span v-if="v$.privateKey.$error" class="message">
+            {{ $t('INBOX_MGMT.ADD.APP_STORE.PRIVATE_KEY.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="w-full mt-4">
+        <NextButton
+          :is-loading="uiFlags.isCreating"
+          type="submit"
+          solid
+          blue
+          :label="$t('INBOX_MGMT.ADD.APP_STORE.SUBMIT_BUTTON')"
+        />
+      </div>
+    </form>
+  </div>
+</template>

app/javascript/dashboard/routes/dashboard/settings/inbox/channels/GooglePlay.vue

@@ -0,0 +1,109 @@
+<script setup>
+import { onMounted, reactive, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useVuelidate } from '@vuelidate/core';
+import { required } from '@vuelidate/validators';
+import { useAlert } from 'dashboard/composables';
+import googlePlayClient from 'dashboard/api/channel/googlePlayClient';
+import PageHeader from '../../SettingsSubPageHeader.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+// Surface any error the OAuth callback redirected back with
+onMounted(() => {
+  if (route.query.error) {
+    useAlert(String(route.query.error));
+  }
+});
+
+const state = reactive({
+  inboxName: '',
+  appId: '',
+});
+
+const isConnecting = ref(false);
+
+const rules = {
+  inboxName: { required },
+  appId: { required },
+};
+
+const v$ = useVuelidate(rules, state);
+
+const connectWithGoogle = async () => {
+  v$.value.$touch();
+  if (v$.value.$invalid) return;
+
+  try {
+    isConnecting.value = true;
+    const {
+      data: { url },
+    } = await googlePlayClient.generateAuthorization({
+      app_id: state.appId.trim(),
+      inbox_name: state.inboxName.trim(),
+    });
+    window.location.href = url;
+  } catch (error) {
+    isConnecting.value = false;
+    useAlert(t('INBOX_MGMT.ADD.GOOGLE_PLAY.API.ERROR_MESSAGE'));
+  }
+};
+</script>
+
+<template>
+  <div class="h-full w-full p-6 col-span-6">
+    <PageHeader
+      :header-title="$t('INBOX_MGMT.ADD.GOOGLE_PLAY.TITLE')"
+      :header-content="$t('INBOX_MGMT.ADD.GOOGLE_PLAY.DESC')"
+    />
+    <form
+      class="flex flex-wrap flex-col mx-0"
+      @submit.prevent="connectWithGoogle"
+    >
+      <div class="flex-shrink-0 flex-grow-0">
+        <label :class="{ error: v$.inboxName.$error }">
+          {{ $t('INBOX_MGMT.ADD.GOOGLE_PLAY.INBOX_NAME.LABEL') }}
+          <input
+            v-model="state.inboxName"
+            type="text"
+            :placeholder="
+              $t('INBOX_MGMT.ADD.GOOGLE_PLAY.INBOX_NAME.PLACEHOLDER')
+            "
+            @blur="v$.inboxName.$touch"
+          />
+          <span v-if="v$.inboxName.$error" class="message">
+            {{ $t('INBOX_MGMT.ADD.GOOGLE_PLAY.INBOX_NAME.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="flex-shrink-0 flex-grow-0">
+        <label :class="{ error: v$.appId.$error }">
+          {{ $t('INBOX_MGMT.ADD.GOOGLE_PLAY.APP_ID.LABEL') }}
+          <input
+            v-model="state.appId"
+            type="text"
+            :placeholder="$t('INBOX_MGMT.ADD.GOOGLE_PLAY.APP_ID.PLACEHOLDER')"
+            @blur="v$.appId.$touch"
+          />
+          <span v-if="v$.appId.$error" class="message">
+            {{ $t('INBOX_MGMT.ADD.GOOGLE_PLAY.APP_ID.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="w-full mt-4">
+        <NextButton
+          :is-loading="isConnecting"
+          type="submit"
+          solid
+          blue
+          :label="$t('INBOX_MGMT.ADD.GOOGLE_PLAY.CONNECT_BUTTON')"
+        />
+      </div>
+    </form>
+  </div>
+</template>

app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappCall.vue

@@ -1,11 +0,0 @@
-<script setup>
-import WhatsappEmbeddedSignup from './WhatsappEmbeddedSignup.vue';
-</script>
-
-<template>
-  <div class="overflow-auto col-span-6 p-6 w-full h-full">
-    <div class="px-6 py-5 rounded-2xl border border-n-weak">
-      <WhatsappEmbeddedSignup enable-calling-on-complete />
-    </div>
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappEmbeddedSignup.vue

@@ -7,7 +7,6 @@ import { useAlert } from 'dashboard/composables';
 import Icon from 'next/icon/Icon.vue';
 import NextButton from 'next/button/Button.vue';
 import LoadingState from 'dashboard/components/widgets/LoadingState.vue';
-import InboxesAPI from 'dashboard/api/inboxes';
 import { parseAPIErrorResponse } from 'dashboard/store/utils/api';
 import globalConstants from 'dashboard/constants/globals.js';
 import {
@@ -17,13 +16,6 @@ import {
   isValidBusinessData,
 } from './whatsapp/utils';
 
-const props = defineProps({
-  enableCallingOnComplete: {
-    type: Boolean,
-    default: false,
-  },
-});
-
 const store = useStore();
 const router = useRouter();
 const { t } = useI18n();
@@ -73,27 +65,11 @@ const handleSignupCancellation = () => {
   isAuthenticating.value = false;
 };
 
-const enableCallingForInbox = async inboxId => {
-  try {
-    await InboxesAPI.enableWhatsappCalling(inboxId);
-  } catch (_) {
-    useAlert(
-      t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.CALLING_ENABLE_FAILED')
-    );
-  }
-};
+const handleSignupSuccess = inboxData => {
+  isProcessing.value = false;
+  isAuthenticating.value = false;
 
-const handleSignupSuccess = async inboxData => {
   if (inboxData && inboxData.id) {
-    if (props.enableCallingOnComplete) {
-      isProcessing.value = true;
-      processingMessage.value = t(
-        'INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.ENABLING_CALLING'
-      );
-      await enableCallingForInbox(inboxData.id);
-    }
-    isProcessing.value = false;
-    isAuthenticating.value = false;
     useAlert(t('INBOX_MGMT.FINISH.MESSAGE'));
     router.replace({
       name: 'settings_inboxes_add_agents',
@@ -103,8 +79,6 @@ const handleSignupSuccess = async inboxData => {
       },
     });
   } else {
-    isProcessing.value = false;
-    isAuthenticating.value = false;
     useAlert(t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.SUCCESS_FALLBACK'));
     router.replace({
       name: 'settings_inbox_list',

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

@@ -34,6 +34,8 @@ const i18nMap = {
   'Channel::Api': 'API',
   'Channel::Instagram': 'INSTAGRAM',
   'Channel::Tiktok': 'TIKTOK',
+  'Channel::AppStore': 'APP_STORE',
+  'Channel::GooglePlay': 'GOOGLE_PLAY',
 };
 
 const twilioChannelName = () => {

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

@@ -1,160 +0,0 @@
-<script>
-import { useAlert } from 'dashboard/composables';
-import InboxesAPI from 'dashboard/api/inboxes';
-import SettingsFieldSection from 'dashboard/components-next/Settings/SettingsFieldSection.vue';
-import SettingsToggleSection from 'dashboard/components-next/Settings/SettingsToggleSection.vue';
-import NextButton from 'dashboard/components-next/button/Button.vue';
-import TextArea from 'next/textarea/TextArea.vue';
-import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
-
-export default {
-  components: {
-    SettingsFieldSection,
-    SettingsToggleSection,
-    NextButton,
-    TextArea,
-    Spinner,
-  },
-  props: {
-    inbox: {
-      type: Object,
-      default: () => ({}),
-    },
-  },
-  data() {
-    return {
-      callingEnabled: this.inbox.provider_config?.calling_enabled || false,
-      permissionRequestBody:
-        this.inbox.provider_config?.call_permission_request_body || '',
-      isUpdating: false,
-      isTogglingCalling: false,
-    };
-  },
-  computed: {
-    phoneNumber() {
-      return (
-        this.inbox.provider_config?.phone_number || this.inbox.phone_number
-      );
-    },
-  },
-  watch: {
-    'inbox.provider_config.calling_enabled'(val) {
-      this.callingEnabled = val || false;
-    },
-    'inbox.provider_config.call_permission_request_body'(val) {
-      this.permissionRequestBody = val || '';
-    },
-  },
-  methods: {
-    async handleCallingToggle(newValue) {
-      if (this.isTogglingCalling) return;
-      const previousValue = this.callingEnabled;
-      this.callingEnabled = newValue;
-      this.isTogglingCalling = true;
-      try {
-        if (newValue) {
-          await InboxesAPI.enableWhatsappCalling(this.inbox.id);
-        } else {
-          await InboxesAPI.disableWhatsappCalling(this.inbox.id);
-        }
-        await this.$store.dispatch('inboxes/get', this.inbox.id);
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-      } catch (_) {
-        this.callingEnabled = previousValue;
-        const fallbackKey = newValue
-          ? 'INBOX_MGMT.WHATSAPP_CALLING.ENABLE_FAILED'
-          : 'INBOX_MGMT.EDIT.API.ERROR_MESSAGE';
-        useAlert(this.$t(fallbackKey));
-      } finally {
-        this.isTogglingCalling = false;
-      }
-    },
-    async updateCallingSettings() {
-      this.isUpdating = true;
-      try {
-        await this.$store.dispatch('inboxes/updateInbox', {
-          id: this.inbox.id,
-          formData: false,
-          channel: {
-            provider_config: {
-              ...this.inbox.provider_config,
-              call_permission_request_body:
-                this.permissionRequestBody.trim() || null,
-            },
-          },
-        });
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-      } catch (error) {
-        const message =
-          error?.response?.data?.message ||
-          this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE');
-        useAlert(message);
-      } finally {
-        this.isUpdating = false;
-      }
-    },
-  },
-};
-</script>
-
-<template>
-  <div class="flex flex-col gap-6">
-    <div
-      class="relative"
-      :class="{ 'pointer-events-none opacity-60': isTogglingCalling }"
-    >
-      <SettingsToggleSection
-        :model-value="callingEnabled"
-        :header="$t('INBOX_MGMT.WHATSAPP_CALLING.ENABLE.LABEL')"
-        :description="$t('INBOX_MGMT.WHATSAPP_CALLING.ENABLE.DESCRIPTION')"
-        :hide-toggle="isTogglingCalling"
-        @update:model-value="handleCallingToggle"
-      >
-        <template v-if="isTogglingCalling" #hiddenToggle>
-          <Spinner class="size-4 text-n-slate-11" />
-        </template>
-      </SettingsToggleSection>
-    </div>
-
-    <template v-if="callingEnabled">
-      <SettingsFieldSection
-        v-if="phoneNumber"
-        :label="$t('INBOX_MGMT.WHATSAPP_CALLING.PHONE_NUMBER.LABEL')"
-        :help-text="$t('INBOX_MGMT.WHATSAPP_CALLING.PHONE_NUMBER.HELP_TEXT')"
-      >
-        <woot-code :script="phoneNumber" lang="html" />
-      </SettingsFieldSection>
-
-      <SettingsFieldSection
-        :label="$t('INBOX_MGMT.WHATSAPP_CALLING.PERMISSION_REQUEST_BODY.LABEL')"
-        :help-text="
-          $t('INBOX_MGMT.WHATSAPP_CALLING.PERMISSION_REQUEST_BODY.HELP_TEXT')
-        "
-      >
-        <TextArea
-          v-model="permissionRequestBody"
-          :placeholder="
-            $t(
-              'INBOX_MGMT.WHATSAPP_CALLING.PERMISSION_REQUEST_BODY.PLACEHOLDER'
-            )
-          "
-          auto-height
-          resize
-        />
-      </SettingsFieldSection>
-
-      <SettingsFieldSection
-        :label="$t('INBOX_MGMT.WHATSAPP_CALLING.HOW_IT_WORKS.LABEL')"
-        :help-text="$t('INBOX_MGMT.WHATSAPP_CALLING.HOW_IT_WORKS.DESCRIPTION')"
-      />
-
-      <div>
-        <NextButton
-          :is-loading="isUpdating"
-          :label="$t('INBOX_MGMT.SETTINGS_POPUP.UPDATE')"
-          @click="updateCallingSettings"
-        />
-      </div>
-    </template>
-  </div>
-</template>

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

@@ -7,7 +7,7 @@ const state = {
   records: [],
   meta: {
     currentPage: 1,
-    perPage: 25,
+    perPage: 15,
     totalEntries: 0,
   },
   uiFlags: {

app/javascript/dashboard/store/modules/contacts/actions.js

@@ -312,14 +312,10 @@ export const actions = {
     commit(types.CLEAR_CONTACT_FILTERS);
   },
 
-  initiateCall: async ({ commit }, { contactId, inboxId, conversationId }) => {
+  initiateCall: async ({ commit }, { contactId, inboxId }) => {
     commit(types.SET_CONTACT_UI_FLAG, { isInitiatingCall: true });
     try {
-      const response = await ContactAPI.initiateCall(
-        contactId,
-        inboxId,
-        conversationId
-      );
+      const response = await ContactAPI.initiateCall(contactId, inboxId);
       commit(types.SET_CONTACT_UI_FLAG, { isInitiatingCall: false });
       return response.data;
     } catch (error) {

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

@@ -25,7 +25,7 @@ const fetchMetaData = async (commit, params) => {
   }
 };
 
-const debouncedFetchMetaData = debounce(fetchMetaData, 500, false, 2000);
+const debouncedFetchMetaData = debounce(fetchMetaData, 500, false, 1500);
 const longDebouncedFetchMetaData = debounce(fetchMetaData, 5000, false, 10000);
 const superLongDebouncedFetchMetaData = debounce(
   fetchMetaData,
@@ -36,7 +36,7 @@ const superLongDebouncedFetchMetaData = debounce(
 
 export const actions = {
   get: async ({ commit, state: $state }, params) => {
-    if ($state.allCount > 2000) {
+    if ($state.allCount > 5000) {
       superLongDebouncedFetchMetaData(commit, params);
     } else if ($state.allCount > 100) {
       longDebouncedFetchMetaData(commit, params);

app/javascript/dashboard/store/modules/conversations/actions.js

@@ -329,21 +329,12 @@ const actions = {
       });
       commit(types.ADD_CONVERSATION_ATTACHMENTS, message);
     }
-    handleVoiceCallCreated(
-      message,
-      rootGetters?.getCurrentUserID,
-      rootGetters?.getCurrentUserAvailability
-    );
+    handleVoiceCallCreated(message, rootGetters?.getCurrentUserID);
   },
 
   updateMessage({ commit, rootGetters }, message) {
     commit(types.ADD_MESSAGE, message);
-    handleVoiceCallUpdated(
-      commit,
-      message,
-      rootGetters?.getCurrentUserID,
-      rootGetters?.getCurrentUserAvailability
-    );
+    handleVoiceCallUpdated(commit, message, rootGetters?.getCurrentUserID);
   },
 
   deleteMessage: async function deleteLabels(

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

@@ -156,7 +156,8 @@ export const getters = {
   },
   dialogFlowEnabledInboxes($state) {
     return $state.records.filter(
-      item => item.channel_type !== INBOX_TYPES.EMAIL
+      item =>
+        ![INBOX_TYPES.EMAIL, INBOX_TYPES.APP_STORE].includes(item.channel_type)
     );
   },
   getFacebookInboxByInstagramId: $state => instagramId => {

app/javascript/dashboard/stores/calls.js

@@ -1,16 +1,6 @@
-import TwilioVoiceClient from 'dashboard/api/channel/voice/twilioVoiceClient';
-import { cleanupWhatsappSession } from 'dashboard/composables/useWhatsappCallSession';
-import { VOICE_CALL_PROVIDERS } from 'dashboard/helper/inbox';
-import { TERMINAL_STATUSES } from 'dashboard/helper/voice';
 import { defineStore } from 'pinia';
-
-const teardownByProvider = call => {
-  if (call?.provider === VOICE_CALL_PROVIDERS.WHATSAPP) {
-    cleanupWhatsappSession();
-  } else {
-    TwilioVoiceClient.endClientCall();
-  }
-};
+import TwilioVoiceClient from 'dashboard/api/channel/voice/twilioVoiceClient';
+import { TERMINAL_STATUSES } from 'dashboard/helper/voice';
 
 export const useCallsStore = defineStore('calls', {
   state: () => ({
@@ -26,37 +16,17 @@ export const useCallsStore = defineStore('calls', {
 
   actions: {
     handleCallStatusChanged({ callSid, status }) {
-      if (!TERMINAL_STATUSES.includes(status)) return;
-
-      const call = this.calls.find(c => c.callSid === callSid);
-      // WhatsApp recordings live in the in-memory recorder until voice_call.ended
-      // uploads them; tearing down here would race-wipe those chunks.
-      if (call?.provider === 'whatsapp') {
-        this.calls = this.calls.filter(c => c.callSid !== callSid);
-        return;
+      if (TERMINAL_STATUSES.includes(status)) {
+        this.removeCall(callSid);
       }
-
-      this.removeCall(callSid);
     },
 
     addCall(callData) {
       if (!callData?.callSid) return;
-      const existing = this.calls.find(c => c.callSid === callData.callSid);
-      if (existing) {
-        // Merge so a later cable event with sdp_offer/provider/caller fills in
-        // gaps left by the earlier message.created path (and vice versa).
-        // Preserve a previously-captured caller snapshot when the incoming
-        // event has no sender info, otherwise the widget would flip to
-        // "Unknown caller" on the next status update.
-        const next = { ...callData };
-        if (existing.caller && !next.caller) delete next.caller;
-        Object.assign(existing, next, { isActive: existing.isActive });
-        return;
-      }
+      const exists = this.calls.some(call => call.callSid === callData.callSid);
+      if (exists) return;
 
-      // Prepend so the newest call surfaces as the primary card (incomingCalls[0])
-      // and older calls drop into the stack below it.
-      this.calls.unshift({
+      this.calls.push({
         ...callData,
         isActive: false,
       });
@@ -65,7 +35,7 @@ export const useCallsStore = defineStore('calls', {
     removeCall(callSid) {
       const callToRemove = this.calls.find(c => c.callSid === callSid);
       if (callToRemove?.isActive) {
-        teardownByProvider(callToRemove);
+        TwilioVoiceClient.endClientCall();
       }
       this.calls = this.calls.filter(c => c.callSid !== callSid);
     },
@@ -78,8 +48,7 @@ export const useCallsStore = defineStore('calls', {
     },
 
     clearActiveCall() {
-      const active = this.calls.find(c => c.isActive);
-      teardownByProvider(active);
+      TwilioVoiceClient.endClientCall();
       this.calls = this.calls.filter(call => !call.isActive);
     },
 
@@ -92,10 +61,9 @@ export const useCallsStore = defineStore('calls', {
         call => call.conversationId === conversationId
       );
 
-      // Tear down each active call via its own provider so a WhatsApp call
-      // gets cleanupWhatsappSession() (closes pc, stops recorder/mic) instead
-      // of the Twilio-only endClientCall() — otherwise mic stays open.
-      callsToRemove.filter(call => call.isActive).forEach(teardownByProvider);
+      if (callsToRemove.some(call => call.isActive)) {
+        TwilioVoiceClient.endClientCall();
+      }
 
       this.calls = this.calls.filter(
         call => call.conversationId !== conversationId

app/javascript/shared/helpers/MessageTypeHelper.js

@@ -22,4 +22,6 @@ export const MESSAGE_MAX_LENGTH = {
   TELEGRAM: 4096,
   LINE: 2000,
   EMAIL: 25000,
+  // https://developers.google.com/android-publisher/reviews — developer replies are capped at 350 characters
+  GOOGLE_PLAY: 350,
 };

app/javascript/shared/mixins/inboxMixin.js

@@ -15,6 +15,7 @@ export const INBOX_FEATURE_MAP = {
     INBOX_TYPES.WHATSAPP,
     INBOX_TYPES.TELEGRAM,
     INBOX_TYPES.TIKTOK,
+    INBOX_TYPES.APP_STORE,
     INBOX_TYPES.API,
   ],
   [INBOX_FEATURES.REPLY_TO_OUTGOING]: [
@@ -23,6 +24,7 @@ export const INBOX_FEATURE_MAP = {
     INBOX_TYPES.WHATSAPP,
     INBOX_TYPES.TELEGRAM,
     INBOX_TYPES.TIKTOK,
+    INBOX_TYPES.APP_STORE,
     INBOX_TYPES.API,
   ],
 };
@@ -119,6 +121,8 @@ export default {
         badgeKey = 'whatsapp';
       } else if (this.isATiktokChannel) {
         badgeKey = 'tiktok';
+      } else if (this.isAnAppStoreChannel) {
+        badgeKey = 'app_store';
       }
       return badgeKey || this.channelType;
     },
@@ -134,6 +138,12 @@ export default {
     isATiktokChannel() {
       return this.channelType === INBOX_TYPES.TIKTOK;
     },
+    isAnAppStoreChannel() {
+      return this.channelType === INBOX_TYPES.APP_STORE;
+    },
+    isAGooglePlayChannel() {
+      return this.channelType === INBOX_TYPES.GOOGLE_PLAY;
+    },
   },
   methods: {
     inboxHasFeature(feature) {

app/jobs/inboxes/fetch_app_store_review_inboxes_job.rb

@@ -0,0 +1,13 @@
+class Inboxes::FetchAppStoreReviewInboxesJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  def perform
+    Inbox.where(channel_type: 'Channel::AppStore').find_each(batch_size: 100) do |inbox|
+      next if inbox.account.suspended?
+      next unless inbox.account.feature_enabled?(:channel_app_store)
+      next unless inbox.channel.sync_due?
+
+      ::Inboxes::FetchAppStoreReviewsJob.perform_later(inbox.channel)
+    end
+  end
+end

app/jobs/inboxes/fetch_app_store_reviews_job.rb

@@ -0,0 +1,17 @@
+class Inboxes::FetchAppStoreReviewsJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  def perform(channel)
+    return unless channel.account.feature_enabled?(:channel_app_store)
+
+    channel.fetch_reviews.each do |review_payload|
+      ::AppStore::ReviewBuilder.new(review_payload: review_payload, channel: channel).perform
+    rescue StandardError => e
+      ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
+    end
+
+    channel.update!(last_synced_at: Time.current)
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
+  end
+end

app/jobs/inboxes/fetch_google_play_review_inboxes_job.rb

@@ -0,0 +1,14 @@
+class Inboxes::FetchGooglePlayReviewInboxesJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  # Runs every 15 minutes via cron. Each inbox syncs at most once per Channel::GooglePlay::SYNC_INTERVAL
+  # (one hour) — the extra cron ticks act as quick retries when a sync window is missed.
+  def perform
+    Inbox.where(channel_type: 'Channel::GooglePlay').find_each(batch_size: 100) do |inbox|
+      next if inbox.account.suspended?
+      next unless inbox.channel.sync_due?
+
+      ::Inboxes::FetchGooglePlayReviewsJob.perform_later(inbox.channel)
+    end
+  end
+end

app/jobs/inboxes/fetch_google_play_reviews_job.rb

@@ -0,0 +1,16 @@
+class Inboxes::FetchGooglePlayReviewsJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  def perform(channel)
+    channel.fetch_reviews.each do |review|
+      ::GooglePlay::ReviewBuilder.new(review: review, channel: channel).perform
+    rescue StandardError => e
+      ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
+    end
+
+    # Stamp the channel so the orchestrator skips it until the sync interval elapses.
+    channel.update!(last_synced_at: Time.current)
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
+  end
+end

app/jobs/inboxes/fetch_imap_emails_job.rb

@@ -36,8 +36,7 @@ class Inboxes::FetchImapEmailsJob < MutexApplicationJob
                      else
                        Imap::FetchEmailService.new(channel: channel, interval: interval).perform
                      end
-
-    inbound_emails.each do |inbound_mail|
+    inbound_emails.map do |inbound_mail|
       process_mail(inbound_mail, channel)
     end
   rescue OAuth2::Error => e
@@ -45,38 +44,11 @@ class Inboxes::FetchImapEmailsJob < MutexApplicationJob
     channel.authorization_error!
   end
 
-  def should_skip_email?(message_id)
-    failure_count = Rails.cache.read("email_failures:#{message_id}") || 0
-    failure_count >= 3
-  end
-
-  def mark_email_as_failed(message_id)
-    failure_count = Rails.cache.read("email_failures:#{message_id}") || 0
-    Rails.cache.write("email_failures:#{message_id}", failure_count + 1, expires_in: 6.hours)
-  end
-
   def process_mail(inbound_mail, channel)
-    # Skip if this email has failed multiple times recently
-    if should_skip_email?(inbound_mail.message_id)
-      Rails.logger.warn "[IMAP] Skipping problematic email: #{inbound_mail.message_id}"
-      return
-    end
-
-    begin
-      Timeout.timeout(email_processing_timeout) do
-        Imap::ImapMailbox.new.process(inbound_mail, channel)
-      end
-    rescue Timeout::Error
-      mark_email_as_failed(inbound_mail.message_id)
-      Rails.logger.error "[IMAP] Email processing timeout (#{email_processing_timeout}s): #{inbound_mail.message_id}"
-    rescue StandardError => e
-      mark_email_as_failed(inbound_mail.message_id)
-      Rails.logger.error "[IMAP] Failed to process email #{inbound_mail.message_id}: #{e.message}"
-      ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
-    end
-  end
-
-  def email_processing_timeout
-    GlobalConfigService.load('EMAIL_PROCESSING_TIMEOUT_SECONDS', 60).to_i
+    Imap::ImapMailbox.new.process(inbound_mail, channel)
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
+    Rails.logger.error("
+      #{channel.provider} Email dropped: #{inbound_mail.from} and message_source_id: #{inbound_mail.message_id}")
   end
 end

app/jobs/internal/trigger_daily_scheduled_items_job.rb

@@ -23,5 +23,3 @@ class Internal::TriggerDailyScheduledItemsJob < ApplicationJob
     @designated_minute ||= Digest::MD5.hexdigest(ChatwootHub.installation_identifier).hex % 1440
   end
 end
-
-Internal::TriggerDailyScheduledItemsJob.prepend_mod_with('Internal::TriggerDailyScheduledItemsJob')

app/jobs/send_reply_job.rb

@@ -10,7 +10,9 @@ class SendReplyJob < ApplicationJob
     'Channel::Sms' => ::Sms::SendOnSmsService,
     'Channel::Instagram' => ::Instagram::SendOnInstagramService,
     'Channel::Tiktok' => ::Tiktok::SendOnTiktokService,
+    'Channel::AppStore' => ::AppStore::SendOnAppStoreService,
     'Channel::Email' => ::Email::SendOnEmailService,
+    'Channel::GooglePlay' => ::GooglePlay::SendOnGooglePlayService,
     'Channel::WebWidget' => ::Messages::SendEmailNotificationService,
     'Channel::Api' => ::Messages::SendEmailNotificationService
   }.freeze

app/models/account.rb

@@ -61,6 +61,7 @@ class Account < ApplicationRecord
   has_many :agent_bot_inboxes, dependent: :destroy_async
   has_many :agent_bots, dependent: :destroy_async
   has_many :api_channels, dependent: :destroy_async, class_name: '::Channel::Api'
+  has_many :app_store_channels, dependent: :destroy_async, class_name: '::Channel::AppStore'
   has_many :articles, dependent: :destroy_async, class_name: '::Article'
   has_many :assignment_policies, dependent: :destroy_async
   has_many :automation_rules, dependent: :destroy_async
@@ -77,6 +78,7 @@ class Account < ApplicationRecord
   has_many :data_imports, dependent: :destroy_async
   has_many :email_channels, dependent: :destroy_async, class_name: '::Channel::Email'
   has_many :facebook_pages, dependent: :destroy_async, class_name: '::Channel::FacebookPage'
+  has_many :google_play_channels, dependent: :destroy_async, class_name: '::Channel::GooglePlay'
   has_many :instagram_channels, dependent: :destroy_async, class_name: '::Channel::Instagram'
   has_many :tiktok_channels, dependent: :destroy_async, class_name: '::Channel::Tiktok'
   has_many :hooks, dependent: :destroy_async, class_name: 'Integrations::Hook'

app/models/channel/app_store.rb

@@ -0,0 +1,72 @@
+class Channel::AppStore < ApplicationRecord
+  include Channelable
+
+  self.table_name = 'channel_app_store'
+
+  EDITABLE_ATTRS = [:app_id, :bundle_id, :app_name, :issuer_id, :key_id, :private_key, { provider_config: {} }].freeze
+
+  API_BASE_URL = 'https://api.appstoreconnect.apple.com'.freeze
+  REVIEWS_PAGE_SIZE = 200
+  SYNC_INTERVAL = 1.hour
+
+  if Chatwoot.encryption_configured?
+    encrypts :issuer_id
+    encrypts :key_id
+    encrypts :private_key
+  end
+
+  validates :app_id, presence: true, uniqueness: { scope: :account_id }
+  validates :issuer_id, :key_id, :private_key, presence: true
+  validate :validate_app_access, on: :create
+
+  before_validation :normalize_auth_fields
+
+  after_create_commit :enqueue_initial_review_fetch
+
+  def name
+    'App Store'
+  end
+
+  def sync_due?
+    last_synced_at.nil? || last_synced_at < SYNC_INTERVAL.ago
+  end
+
+  def fetch_reviews
+    app_store_client.fetch_reviews
+  end
+
+  def reply_to_review(review_id, response_body, response_id: nil)
+    response = if response_id.present?
+                 app_store_client.update_review_response(response_id, response_body)
+               else
+                 app_store_client.create_review_response(review_id, response_body)
+               end
+
+    response['id']
+  end
+
+  def app_store_client
+    @app_store_client ||= AppStoreConnect::Client.new(channel: self)
+  end
+
+  private
+
+  def normalize_auth_fields
+    self.app_id = app_id.to_s.strip
+    self.issuer_id = issuer_id.to_s.strip
+    self.key_id = key_id.to_s.strip
+    self.private_key = private_key.to_s.gsub('\n', "\n").gsub("\r\n", "\n").strip
+  end
+
+  def validate_app_access
+    app = app_store_client.fetch_app
+    self.app_name = app.dig('attributes', 'name') if app_name.blank?
+    self.bundle_id = app.dig('attributes', 'bundleId') if bundle_id.blank?
+  rescue StandardError => e
+    errors.add(:base, e.message)
+  end
+
+  def enqueue_initial_review_fetch
+    ::Inboxes::FetchAppStoreReviewsJob.perform_later(self)
+  end
+end

app/models/channel/google_play.rb

@@ -0,0 +1,110 @@
+# == Schema Information
+#
+# Table name: channel_google_play
+#
+#  id              :bigint           not null, primary key
+#  app_id          :string           not null
+#  provider_config :jsonb            not null
+#  last_synced_at  :datetime
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  account_id      :bigint           not null
+#
+# Indexes
+#
+#  index_channel_google_play_on_account_id_and_app_id  (account_id,app_id) UNIQUE
+#
+
+class Channel::GooglePlay < ApplicationRecord
+  include Channelable
+
+  self.table_name = 'channel_google_play'
+  EDITABLE_ATTRS = [:app_id, { provider_config: {} }].freeze
+
+  API_BASE_URL = 'https://androidpublisher.googleapis.com/androidpublisher/v3'.freeze
+  # Google Play caps a developer reply at 350 characters
+  MAX_REPLY_LENGTH = 350
+  REVIEWS_PAGE_SIZE = 100
+  # Safety bound — at 100 per page this covers 5,000 reviews. The API only retains the last 7
+  # days, so this is far above any realistic volume and just prevents runaway loops.
+  MAX_REVIEW_PAGES = 50
+  # Each inbox is synced at most once per this window. The cron runs more frequently
+  # so a missed window retries on the next tick.
+  SYNC_INTERVAL = 1.hour
+
+  validates :app_id, presence: true, uniqueness: { scope: :account_id }
+
+  # Pull reviews on the agent's behalf the moment the inbox is wired up so they're not waiting
+  # for the next 15-minute poll. Runs after the surrounding transaction commits so the
+  # associated inbox is guaranteed to be visible.
+  after_create_commit :enqueue_initial_review_fetch
+
+  def name
+    'Google PlayStore'
+  end
+
+  def sync_due?
+    last_synced_at.nil? || last_synced_at < SYNC_INTERVAL.ago
+  end
+
+  # Google Play only retains reviews from the last 7 days, hence the channel is polled frequently.
+  # Pages through tokenPagination.nextPageToken until the API stops returning a cursor.
+  def fetch_reviews
+    reviews = []
+    page_token = nil
+
+    MAX_REVIEW_PAGES.times do
+      parsed = fetch_reviews_page(page_token)
+      reviews.concat(parsed['reviews'] || [])
+
+      page_token = parsed.dig('tokenPagination', 'nextPageToken')
+      break if page_token.blank?
+    end
+
+    reviews
+  end
+
+  # Returns a stable source_id for the reply so the outgoing message can be marked as sent.
+  # Google Play has no separate reply id, so we combine the review id with the developer comment's
+  # lastEdited timestamp from the response.
+  def reply_to_review(review_id, reply_text)
+    response = HTTParty.post(
+      "#{API_BASE_URL}/applications/#{app_id}/reviews/#{review_id}:reply",
+      headers: authorization_headers.merge('Content-Type' => 'application/json'),
+      body: { replyText: reply_text.to_s.truncate(MAX_REPLY_LENGTH) }.to_json
+    )
+    raise "Google Play reply failed (#{response.code}): #{response.body}" unless response.success?
+
+    last_edited = response.parsed_response.dig('result', 'lastEdited', 'seconds')
+    "#{review_id}::reply::#{last_edited}"
+  end
+
+  private
+
+  def fetch_reviews_page(page_token)
+    query = { maxResults: REVIEWS_PAGE_SIZE }
+    query[:token] = page_token if page_token.present?
+
+    response = HTTParty.get(
+      "#{API_BASE_URL}/applications/#{app_id}/reviews",
+      headers: authorization_headers,
+      query: query
+    )
+    raise "Google Play reviews fetch failed (#{response.code}): #{response.body}" unless response.success?
+
+    response.parsed_response
+  end
+
+  def authorization_headers
+    { 'Authorization' => "Bearer #{access_token}" }
+  end
+
+  # Channels are connected through the Google OAuth flow; tokens are refreshed on demand
+  def access_token
+    Google::RefreshOauthTokenService.new(channel: self).access_token
+  end
+
+  def enqueue_initial_review_fetch
+    ::Inboxes::FetchGooglePlayReviewsJob.perform_later(self)
+  end
+end

app/models/channel/whatsapp.rb

@@ -41,21 +41,15 @@ class Channel::Whatsapp < ApplicationRecord
   end
 
   # Mirrors Channel::TwilioSms#voice_enabled? so the call subsystem can duck-type across providers.
-  # Meta's Calling API is available to any whatsapp_cloud inbox (embedded-signup or manual keys);
-  # only 360dialog (default provider) can't reach the call APIs.
+  # Meta's Calling API is only available via the embedded-signup whatsapp_cloud flow —
+  # 360dialog (default provider) and manual whatsapp_cloud setups can't reach the call APIs.
   def voice_enabled?
-    voice_calling_supported? &&
+    provider == 'whatsapp_cloud' &&
+      provider_config['source'] == 'embedded_signup' &&
       provider_config['calling_enabled'].present? &&
       account.feature_enabled?('channel_voice')
   end
 
-  # Whether this inbox can do WhatsApp calling at all. Meta's Calling API is
-  # reachable by any whatsapp_cloud inbox, so 360dialog inboxes can't be toggled
-  # on even though calling_enabled would persist.
-  def voice_calling_supported?
-    provider == 'whatsapp_cloud'
-  end
-
   def provider_service
     if provider == 'whatsapp_cloud'
       Whatsapp::Providers::WhatsappCloudService.new(whatsapp_channel: self)
@@ -64,35 +58,6 @@ class Channel::Whatsapp < ApplicationRecord
     end
   end
 
-  # Enables voice: turns calling on at Meta (idempotent), subscribes the `calls`
-  # webhook field, and sets calling_enabled. Raises on Meta failure.
-  # Saved with validate: false to skip validate_provider_config's remote credential
-  # re-check, which could spuriously fail and desync the flag from Meta.
-  def enable_voice_calling!
-    raise 'WhatsApp calling requires a whatsapp_cloud inbox' unless voice_calling_supported?
-    raise 'WhatsApp calling requires the channel_voice feature' unless account.feature_enabled?('channel_voice')
-
-    provider_service.update_calling_status('ENABLED')
-    webhook_setup_service.register_callback
-    self.provider_config = provider_config.merge('calling_enabled' => true)
-    save!(validate: false)
-  end
-
-  # Disables voice: unsets calling_enabled (gates the call subsystem) and drops
-  # `calls` from the webhook subscription (best-effort, so a Meta outage can't
-  # trap admins). Leaves Meta's WABA calling.status untouched.
-  def disable_voice_calling!
-    raise 'WhatsApp calling requires a whatsapp_cloud inbox' unless voice_calling_supported?
-
-    self.provider_config = provider_config.merge('calling_enabled' => false)
-    save!(validate: false)
-    begin
-      webhook_setup_service.register_callback(subscribed_fields: %w[messages smb_message_echoes])
-    rescue StandardError => e
-      Rails.logger.warn "[WHATSAPP CALL] disable webhook re-subscribe failed: #{e.message}"
-    end
-  end
-
   def mark_message_templates_updated
     # rubocop:disable Rails/SkipsModelValidations
     update_column(:message_templates_last_updated, Time.zone.now)
@@ -123,11 +88,10 @@ class Channel::Whatsapp < ApplicationRecord
   end
 
   def perform_webhook_setup
-    webhook_setup_service.perform
-  end
+    business_account_id = provider_config['business_account_id']
+    api_key = provider_config['api_key']
 
-  def webhook_setup_service
-    Whatsapp::WebhookSetupService.new(self, provider_config['business_account_id'], provider_config['api_key'])
+    Whatsapp::WebhookSetupService.new(self, business_account_id, api_key).perform
   end
 
   def teardown_webhooks

app/models/inbox.rb

@@ -134,6 +134,10 @@ class Inbox < ApplicationRecord
     channel_type == 'Channel::Tiktok'
   end
 
+  def app_store?
+    channel_type == 'Channel::AppStore'
+  end
+
   def web_widget?
     channel_type == 'Channel::WebWidget'
   end
@@ -146,6 +150,10 @@ class Inbox < ApplicationRecord
     channel_type == 'Channel::Email'
   end
 
+  def google_play?
+    channel_type == 'Channel::GooglePlay'
+  end
+
   def twilio?
     channel_type == 'Channel::TwilioSms'
   end

app/policies/inbox_policy.rb

@@ -69,12 +69,4 @@ class InboxPolicy < ApplicationPolicy
   def reset_secret?
     @account_user.administrator?
   end
-
-  def enable_whatsapp_calling?
-    @account_user.administrator?
-  end
-
-  def disable_whatsapp_calling?
-    @account_user.administrator?
-  end
 end

app/services/app_store/review_builder.rb

@@ -0,0 +1,173 @@
+class AppStore::ReviewBuilder
+  pattr_initialize [:review_payload!, :channel!]
+
+  def perform
+    return if review_id.blank? || review_body.blank?
+
+    ActiveRecord::Base.transaction do
+      build_contact_inbox
+      build_conversation
+      upsert_review_message
+      build_response_message if response_body.present?
+    end
+  end
+
+  private
+
+  def inbox
+    @inbox ||= channel.inbox
+  end
+
+  def review
+    @review ||= review_payload['review'] || {}
+  end
+
+  def response
+    @response ||= review_payload['response'] || {}
+  end
+
+  def attributes
+    @attributes ||= review['attributes'] || {}
+  end
+
+  def response_attributes
+    @response_attributes ||= response['attributes'] || {}
+  end
+
+  def review_id
+    review['id']
+  end
+
+  def review_body
+    attributes['body'].to_s.strip
+  end
+
+  def review_title
+    attributes['title'].to_s.strip
+  end
+
+  def rating
+    attributes['rating'].to_i
+  end
+
+  def created_at
+    Time.zone.parse(attributes['createdDate'].to_s)
+  rescue StandardError
+    Time.current
+  end
+
+  def response_id
+    response['id']
+  end
+
+  def response_body
+    response_attributes['responseBody'].to_s.strip
+  end
+
+  def response_created_at
+    Time.zone.parse(response_attributes['lastModifiedDate'].to_s)
+  rescue StandardError
+    Time.current
+  end
+
+  def build_contact_inbox
+    @contact_inbox = ::ContactInboxWithContactBuilder.new(
+      source_id: review_id,
+      inbox: inbox,
+      contact_attributes: {
+        name: attributes['reviewerNickname'].presence || 'App Store User',
+        additional_attributes: { source_id: "app_store:#{review_id}" }
+      }
+    ).perform
+  end
+
+  def build_conversation
+    @conversation = @contact_inbox.conversations.last || ::Conversation.create!(
+      account_id: inbox.account_id,
+      inbox_id: inbox.id,
+      contact_id: @contact_inbox.contact_id,
+      contact_inbox_id: @contact_inbox.id,
+      additional_attributes: { source: 'app_store', app_id: channel.app_id }
+    )
+  end
+
+  def upsert_review_message
+    message = @conversation.messages.find_by(source_id: review_id)
+    if message
+      message.update!(content: message_content, content_attributes: review_metadata)
+      return
+    end
+
+    @conversation.messages.create!(
+      account_id: inbox.account_id,
+      inbox_id: inbox.id,
+      sender: @conversation.contact,
+      message_type: :incoming,
+      source_id: review_id,
+      content: message_content,
+      content_attributes: review_metadata,
+      created_at: created_at,
+      updated_at: created_at
+    )
+  end
+
+  def build_response_message
+    return if response_id.blank?
+    return if @conversation.messages.exists?(source_id: response_id)
+
+    @conversation.messages.create!(
+      account_id: inbox.account_id,
+      inbox_id: inbox.id,
+      message_type: :outgoing,
+      source_id: response_id,
+      content: response_body,
+      status: :delivered,
+      content_attributes: response_metadata,
+      created_at: response_created_at,
+      updated_at: response_created_at
+    )
+  end
+
+  def message_content
+    [
+      rating_line,
+      review_title.presence,
+      review_body,
+      review_footer
+    ].compact_blank.join("\n\n")
+  end
+
+  def rating_line
+    stars = ('★' * rating) + ('☆' * (5 - rating))
+    "#{stars} (#{rating}/5)"
+  end
+
+  def review_footer
+    parts = [attributes['territory'], attributes['reviewerNickname']].compact_blank
+    return nil if parts.empty?
+
+    parts.join(' • ')
+  end
+
+  def review_metadata
+    {
+      app_store: {
+        rating: rating,
+        title: review_title,
+        territory: attributes['territory'],
+        reviewer_nickname: attributes['reviewerNickname'],
+        created_date: attributes['createdDate']
+      }
+    }
+  end
+
+  def response_metadata
+    {
+      app_store: {
+        response_id: response_id,
+        response_state: response_attributes['state'],
+        response_last_modified_date: response_attributes['lastModifiedDate']
+      }
+    }
+  end
+end

app/services/app_store/send_on_app_store_service.rb

@@ -0,0 +1,45 @@
+class AppStore::SendOnAppStoreService < Base::SendOnChannelService
+  private
+
+  def channel_class
+    Channel::AppStore
+  end
+
+  def perform_reply
+    validate_feature_enabled!
+    validate_message_support!
+    source_id = channel.reply_to_review(review_id, reply_content, response_id: existing_response_id)
+    message.update!(source_id: source_id) if source_id.present?
+    Messages::StatusUpdateService.new(message, 'delivered').perform
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: message.account).capture_exception
+    Messages::StatusUpdateService.new(message, 'failed', e.message).perform
+  end
+
+  def validate_message_support!
+    raise 'Sending attachments is not supported for App Store reviews.' if message.attachments.any?
+  end
+
+  def validate_feature_enabled!
+    return if message.account.feature_enabled?(:channel_app_store)
+
+    raise 'App Store Reviews channel is not enabled for this account.'
+  end
+
+  def review_id
+    message.conversation.contact_inbox.source_id
+  end
+
+  def reply_content
+    message.outgoing_content.presence || message.content
+  end
+
+  def existing_response_id
+    message.conversation.messages
+           .outgoing
+           .where.not(id: message.id)
+           .where.not(source_id: [nil, ''])
+           .order(created_at: :desc)
+           .pick(:source_id)
+  end
+end

app/services/app_store_connect/client.rb

@@ -0,0 +1,143 @@
+class AppStoreConnect::Client
+  class Error < StandardError; end
+
+  pattr_initialize [:channel!]
+
+  def fetch_app
+    get("/v1/apps/#{channel.app_id}")['data']
+  end
+
+  def fetch_reviews
+    reviews = []
+    next_url = nil
+
+    loop do
+      payload = next_url ? get_url(next_url) : get(reviews_path, reviews_query)
+      included = Array(payload['included'])
+      reviews.concat(Array(payload['data']).map { |review| normalize_review(review, included) })
+
+      next_url = payload.dig('links', 'next')
+      break if next_url.blank?
+    end
+
+    reviews
+  end
+
+  def create_review_response(review_id, response_body)
+    post('/v1/customerReviewResponses', review_response_payload(review_id, response_body))['data']
+  end
+
+  def update_review_response(response_id, response_body)
+    patch("/v1/customerReviewResponses/#{response_id}", review_response_update_payload(response_id, response_body))['data']
+  end
+
+  private
+
+  def reviews_path
+    "/v1/apps/#{channel.app_id}/customerReviews"
+  end
+
+  def reviews_query
+    {
+      include: 'response',
+      limit: Channel::AppStore::REVIEWS_PAGE_SIZE,
+      sort: '-createdDate'
+    }
+  end
+
+  def normalize_review(review, included)
+    response_id = review.dig('relationships', 'response', 'data', 'id')
+    response = included.find { |item| item['type'] == 'customerReviewResponses' && item['id'] == response_id }
+
+    {
+      'review' => review,
+      'response' => response
+    }
+  end
+
+  def get(path, query = {})
+    request(:get, "#{Channel::AppStore::API_BASE_URL}#{path}", query: query)
+  end
+
+  def get_url(url)
+    request(:get, url)
+  end
+
+  def post(path, body)
+    request(:post, "#{Channel::AppStore::API_BASE_URL}#{path}", body: body)
+  end
+
+  def patch(path, body)
+    request(:patch, "#{Channel::AppStore::API_BASE_URL}#{path}", body: body)
+  end
+
+  def request(method, url, query: {}, body: nil)
+    response = HTTParty.public_send(
+      method,
+      url,
+      headers: headers,
+      query: query,
+      body: body&.to_json
+    )
+
+    log_rate_limit(response)
+    return response.parsed_response if response.success?
+
+    raise Error, error_message(response)
+  end
+
+  def headers
+    {
+      'Authorization' => "Bearer #{token}",
+      'Content-Type' => 'application/json'
+    }
+  end
+
+  def token
+    @token ||= AppStoreConnect::TokenService.new(channel: channel).token
+  end
+
+  def review_response_payload(review_id, response_body)
+    {
+      data: {
+        type: 'customerReviewResponses',
+        attributes: {
+          responseBody: response_body.to_s
+        },
+        relationships: {
+          review: {
+            data: {
+              type: 'customerReviews',
+              id: review_id
+            }
+          }
+        }
+      }
+    }
+  end
+
+  def review_response_update_payload(response_id, response_body)
+    {
+      data: {
+        type: 'customerReviewResponses',
+        id: response_id,
+        attributes: {
+          responseBody: response_body.to_s
+        }
+      }
+    }
+  end
+
+  def log_rate_limit(response)
+    rate_limit = response.headers['x-rate-limit']
+    Rails.logger.info("[APP_STORE_CONNECT] rate_limit=#{rate_limit}") if rate_limit.present?
+  end
+
+  def error_message(response)
+    parsed_response = response.parsed_response
+    errors = parsed_response.is_a?(Hash) ? parsed_response['errors'] : []
+    details = Array(errors).filter_map { |error| error['detail'] || error['title'] }.join(', ')
+    details = response.body if details.blank?
+    "App Store Connect API failed (#{response.code}): #{details}"
+  end
+end

app/services/app_store_connect/token_service.rb

@@ -0,0 +1,47 @@
+class AppStoreConnect::TokenService
+  TOKEN_TTL = 19.minutes
+  EXPIRY_BUFFER = 1.minute
+
+  pattr_initialize [:channel!]
+
+  def token
+    cached_token || generate_token
+  end
+
+  private
+
+  def cached_token
+    Rails.cache.read(cache_key)
+  end
+
+  def generate_token
+    token = JWT.encode(payload, private_key, 'ES256', headers)
+    Rails.cache.write(cache_key, token, expires_in: TOKEN_TTL - EXPIRY_BUFFER)
+    token
+  end
+
+  def payload
+    now = Time.current.to_i
+    {
+      iss: channel.issuer_id,
+      iat: now,
+      exp: now + TOKEN_TTL.to_i,
+      aud: 'appstoreconnect-v1'
+    }
+  end
+
+  def headers
+    {
+      kid: channel.key_id,
+      typ: 'JWT'
+    }
+  end
+
+  def private_key
+    OpenSSL::PKey.read(channel.private_key.to_s.gsub('\\n', "\n"))
+  end
+
+  def cache_key
+    "app_store_connect_token:#{channel.id}:#{channel.updated_at.to_i}"
+  end
+end