@capillarytech/creatives-library 8.0.353-alpha.5 → 8.0.353-alpha.6

package/v2Components/CommonTestAndPreview/DeliverySettings/ModifyDeliverySettings.js

@@ -32,16 +32,37 @@ import {
   DELIVERY_SETTING_KEY_SENDER_REPLY_TO,
   DELIVERY_SETTING_KEY_SOURCE_ACCOUNT_IDENTIFIER,
   DELIVERY_SETTING_KEY_SENDER_MOB_NUM,
+  DELIVERY_SETTING_KEY_SMS_FALLBACK_DOMAIN_ID,
 } from './constants';
 import './ModifyDeliverySettings.scss';
 
 const findDefault = (array) => find(array, { default: true }) || (array && array[0]) || {};
 
+/**
+ * Drop empty GSM rows. Optionally drop rows whose value equals domain name — some APIs duplicate
+ * domain label as a bogus sender row; RCS/DLT often legitimately use the same string (e.g. DetailsForGW1).
+ */
+const filterUsableGsmSendersForDomain = (domain, gsmSenders, { skipDomainNameEchoFilter = false } = {}) => {
+  const normalizedDomainName =
+    domain?.domainName != null ? String(domain.domainName).trim().toLowerCase() : '';
+  return (gsmSenders || []).filter((gsmSenderRow) => {
+    const rawValue = gsmSenderRow?.value;
+    if (rawValue == null) return false;
+    const trimmedSenderValue = String(rawValue).trim();
+    if (!trimmedSenderValue) return false;
+    const senderMatchesDomainLabel =
+      normalizedDomainName && trimmedSenderValue.toLowerCase() === normalizedDomainName;
+    if (!skipDomainNameEchoFilter && senderMatchesDomainLabel) return false;
+    return true;
+  });
+};
+
 const ModifyDeliverySettings = (props) => {
   const {
     channel,
     deliverySettings: initialSettings = {},
     senderDetailsOptions = [],
+    smsFallbackSenderDetailsOptions = [],
     wecrmAccounts = [],
     onSaveDeliverySettings,
     onClose,
@@ -102,17 +123,21 @@ const ModifyDeliverySettings = (props) => {
     if (!(channel === CHANNELS.SMS && smsTraiDltEnabled)) {
       return allDomainOptions;
     }
+    // Without template registered sender IDs, strict DLT filter removes every domain — keep full list.
+    if (!registeredSenderIds?.length) {
+      return allDomainOptions;
+    }
 
-    return allDomainOptions.filter((domain) => (domain.gsmSenders || []).some(
-      (gsmId) => registeredSenderIds.includes(gsmId.value),
+    return allDomainOptions.filter((domain) => (domain?.gsmSenders || []).some(
+      (gsmSenderOption) => registeredSenderIds?.includes(gsmSenderOption?.value),
     ));
   }, [allDomainOptions, channel, registeredSenderIds, smsTraiDltEnabled]);
 
   const selectedDomain = useMemo(
     () => (senderDetailsOptions || []).find(
-      (d) => d.domainId === get(localSettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
+      (senderDomain) => senderDomain.domainId === get(localSettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
     ) || {},
-    [senderDetailsOptions, localSettings.domainId],
+    [senderDetailsOptions, get(localSettings, DELIVERY_SETTING_KEY_DOMAIN_ID)],
   );
   const {
     gsmSenders: selectedDomainGsmSenders = [],
@@ -120,25 +145,103 @@ const ModifyDeliverySettings = (props) => {
     emailRepliers: selectedDomainEmailRepliers = [],
   } = selectedDomain;
 
+  const rcsSenderOptions = useMemo(
+    () => {
+      if (channel !== CHANNELS.RCS) return [];
+      const rcsDomainRows = senderDetailsOptions || [];
+      const selectedRcsDomainId = get(localSettings, DELIVERY_SETTING_KEY_DOMAIN_ID);
+      const rcsDomainsForDropdown =
+        selectedRcsDomainId != null && selectedRcsDomainId !== ''
+          ? rcsDomainRows.filter((senderDomain) => senderDomain?.domainId === selectedRcsDomainId)
+          : rcsDomainRows;
+      return rcsDomainsForDropdown.flatMap((senderDomain) =>
+        filterUsableGsmSendersForDomain(senderDomain, senderDomain?.gsmSenders, {
+          skipDomainNameEchoFilter: true,
+        }).map((gsmSenderRow) => ({
+          value: senderDomain?.domainId != null && gsmSenderRow?.value != null
+            ? `${senderDomain.domainId}|${gsmSenderRow.value}`
+            : gsmSenderRow?.value,
+          label: String(gsmSenderRow?.value ?? ''),
+        })));
+    },
+    [channel, senderDetailsOptions, localSettings],
+  );
+
+  const rcsGsmSenderIdForSelect = useMemo(() => {
+    const raw = get(localSettings, DELIVERY_SETTING_KEY_GSM_SENDER_ID);
+    if (raw == null || raw === '') return undefined;
+    const allowed = new Set((rcsSenderOptions || []).map((senderOption) => senderOption.value));
+    return allowed.has(raw) ? raw : undefined;
+  }, [localSettings, rcsSenderOptions]);
+
+  const smsFallbackDomainOptions = useMemo(
+    () => {
+      const raw = (smsFallbackSenderDetailsOptions || []).map((senderDetails) => ({
+        label: senderDetails.domainName || senderDetails.domainId,
+        value: senderDetails.domainId,
+        ...senderDetails,
+      }));
+      if (!(channel === CHANNELS.RCS && smsTraiDltEnabled && registeredSenderIds?.length)) {
+        return raw;
+      }
+      return raw.filter((domain) => (domain?.gsmSenders || []).some(
+        (gsmSenderOption) => registeredSenderIds?.includes(gsmSenderOption?.value),
+      ));
+    },
+    [channel, smsFallbackSenderDetailsOptions, smsTraiDltEnabled, registeredSenderIds],
+  );
+
+  const smsSenderOptions = useMemo(
+    () => {
+      if (channel !== CHANNELS.RCS) return [];
+      const smsFallbackDomainRows = smsFallbackSenderDetailsOptions || [];
+      const selectedSmsFallbackDomainId = get(localSettings, DELIVERY_SETTING_KEY_SMS_FALLBACK_DOMAIN_ID);
+      const smsFallbackDomainsForDropdown =
+        selectedSmsFallbackDomainId != null && selectedSmsFallbackDomainId !== ''
+          ? smsFallbackDomainRows.filter((senderDomain) => senderDomain?.domainId === selectedSmsFallbackDomainId)
+          : smsFallbackDomainRows;
+      const shouldFilterSmsSendersByDltRegistration = smsTraiDltEnabled && registeredSenderIds?.length;
+      return smsFallbackDomainsForDropdown.flatMap((senderDomain) =>
+        filterUsableGsmSendersForDomain(senderDomain, senderDomain?.gsmSenders)
+          .filter((smsGsmSenderRow) =>
+            !shouldFilterSmsSendersByDltRegistration || registeredSenderIds?.includes(smsGsmSenderRow?.value))
+          .map((gsmSenderRow) => ({
+            value: senderDomain?.domainId != null && gsmSenderRow?.value != null
+              ? `${senderDomain.domainId}|${gsmSenderRow.value}`
+              : gsmSenderRow?.value,
+            label: String(gsmSenderRow?.value ?? ''),
+          })));
+    },
+    [channel, smsFallbackSenderDetailsOptions, localSettings, smsTraiDltEnabled, registeredSenderIds],
+  );
+
+  const smsFallbackGsmIdForSelect = useMemo(() => {
+    const raw = get(localSettings, DELIVERY_SETTING_KEY_CDMA_SENDER_ID);
+    if (raw == null || raw === '') return undefined;
+    const allowed = new Set((smsSenderOptions || []).map((senderOption) => senderOption.value));
+    return allowed.has(raw) ? raw : undefined;
+  }, [localSettings, smsSenderOptions]);
+
   const gsmOptions = useMemo(
     () => {
-      const smsGsmSenders = channel === CHANNELS.SMS && smsTraiDltEnabled
-        ? selectedDomainGsmSenders.filter((gsmId) => registeredSenderIds.includes(gsmId.value))
+      const smsGsmSendersForSelect = channel === CHANNELS.SMS && smsTraiDltEnabled && registeredSenderIds?.length
+        ? selectedDomainGsmSenders.filter((gsmSenderOption) =>
+          registeredSenderIds?.includes(gsmSenderOption?.value))
         : selectedDomainGsmSenders;
 
-      return smsGsmSenders.map((o) => ({
-        label: o.value || o.label,
-        value: o.value,
+      return smsGsmSendersForSelect.map((gsmSenderRow) => ({
+        label: gsmSenderRow?.value || gsmSenderRow?.label,
+        value: gsmSenderRow?.value,
       }));
     },
     [channel, registeredSenderIds, selectedDomainGsmSenders, smsTraiDltEnabled],
   );
 
   const emailSenderOptions = useMemo(
-    () => selectedDomainEmailSenders.map((o) => ({
-      label: o.value || o.label,
-      value: o.value,
-      senderLabel: o.label,
+    () => selectedDomainEmailSenders.map((emailSenderRow) => ({
+      label: emailSenderRow.value || emailSenderRow.label,
+      value: emailSenderRow.value,
+      senderLabel: emailSenderRow.label,
     })),
     [selectedDomainEmailSenders],
   );
@@ -204,13 +307,53 @@ const ModifyDeliverySettings = (props) => {
     });
   }, []);
 
+  const onSmsFallbackDomainChange = useCallback(
+    (value) => {
+      setLocalSettings((prev) => {
+        const next = cloneDeep(prev);
+        next[DELIVERY_SETTING_KEY_SMS_FALLBACK_DOMAIN_ID] = value;
+        const selectedSmsFallbackDomain = (smsFallbackSenderDetailsOptions || []).find(
+          (senderDomain) => senderDomain?.domainId === value,
+        );
+        const usableSmsFallbackGsmSenders = filterUsableGsmSendersForDomain(
+          selectedSmsFallbackDomain,
+          selectedSmsFallbackDomain?.gsmSenders,
+        );
+        const shouldFilterSmsFallbackSendersByDltRegistration =
+          channel === CHANNELS.RCS && smsTraiDltEnabled && registeredSenderIds?.length;
+        const smsFallbackGsmSenders = shouldFilterSmsFallbackSendersByDltRegistration
+          ? usableSmsFallbackGsmSenders.filter((smsGsmSenderRow) =>
+            registeredSenderIds?.includes(smsGsmSenderRow?.value))
+          : usableSmsFallbackGsmSenders;
+        const firstSmsFallbackGsmSender = smsFallbackGsmSenders[0];
+        const composite = selectedSmsFallbackDomain?.domainId != null && firstSmsFallbackGsmSender?.value != null
+          ? `${selectedSmsFallbackDomain.domainId}|${firstSmsFallbackGsmSender.value}`
+          : (firstSmsFallbackGsmSender?.value || '');
+        next[DELIVERY_SETTING_KEY_CDMA_SENDER_ID] = composite;
+        return next;
+      });
+    },
+    [channel, smsFallbackSenderDetailsOptions, smsTraiDltEnabled, registeredSenderIds],
+  );
+
   const onDomainChange = useCallback(
     (value) => {
-      const domain = domainOptions.find((d) => d.value === value);
+      const domain = domainOptions.find((domainOption) => domainOption.value === value);
       updateSetting(DELIVERY_SETTING_KEY_DOMAIN_ID, value);
       if (domain?.dgmId != null) updateSetting(DELIVERY_SETTING_KEY_DOMAIN_GATEWAY_MAP_ID, domain.dgmId);
+      if (channel === CHANNELS.RCS && domain) {
+        const usableRcsGsmSenders = filterUsableGsmSendersForDomain(domain, domain?.gsmSenders, {
+          skipDomainNameEchoFilter: true,
+        });
+        const firstRcsGsmSender = usableRcsGsmSenders[0];
+        const composite = domain?.domainId != null && firstRcsGsmSender?.value != null
+          ? `${domain.domainId}|${firstRcsGsmSender.value}`
+          : (firstRcsGsmSender?.value || '');
+        updateSetting(DELIVERY_SETTING_KEY_GSM_SENDER_ID, composite);
+        return;
+      }
       if (channel === CHANNELS.SMS && domain) {
-        const smsGsmSenders = smsTraiDltEnabled
+        const smsGsmSenders = smsTraiDltEnabled && registeredSenderIds?.length
           ? (domain.gsmSenders || []).filter((gsmId) => registeredSenderIds.includes(gsmId.value))
           : domain.gsmSenders;
         const def = findDefault(smsGsmSenders);
@@ -230,9 +373,20 @@ const ModifyDeliverySettings = (props) => {
   );
 
   const handleDone = useCallback(() => {
-    onSaveDeliverySettings(localSettings);
+    const next = cloneDeep(localSettings);
+    if (channel === CHANNELS.RCS) {
+      const rawRcs = get(next, DELIVERY_SETTING_KEY_GSM_SENDER_ID);
+      if (rawRcs && !(rcsSenderOptions || []).some((senderOption) => senderOption.value === rawRcs)) {
+        next[DELIVERY_SETTING_KEY_GSM_SENDER_ID] = '';
+      }
+      const rawSms = get(next, DELIVERY_SETTING_KEY_CDMA_SENDER_ID);
+      if (rawSms && !(smsSenderOptions || []).some((senderOption) => senderOption.value === rawSms)) {
+        next[DELIVERY_SETTING_KEY_CDMA_SENDER_ID] = '';
+      }
+    }
+    onSaveDeliverySettings(next);
     if (onClose) onClose();
-  }, [localSettings, onSaveDeliverySettings, onClose]);
+  }, [channel, localSettings, onSaveDeliverySettings, onClose, rcsSenderOptions, smsSenderOptions]);
 
   const renderSelectRow = useCallback(
     ({
@@ -286,7 +440,7 @@ const ModifyDeliverySettings = (props) => {
         value: get(localSettings, DELIVERY_SETTING_KEY_SENDER_EMAIL),
         onChange: (val) => {
           const sender = selectedDomainEmailSenders.find(
-            (s) => s.value === val,
+            (emailSenderRow) => emailSenderRow.value === val,
           );
           updateSetting(DELIVERY_SETTING_KEY_SENDER_EMAIL, val);
           updateSetting(DELIVERY_SETTING_KEY_SENDER_LABEL, sender?.label || val);
@@ -298,7 +452,7 @@ const ModifyDeliverySettings = (props) => {
         value: get(localSettings, DELIVERY_SETTING_KEY_SENDER_LABEL) || '',
         onChange: (val) => {
           const sender = selectedDomainEmailSenders.find(
-            (s) => (s.label || s.value) === val,
+            (emailSenderRow) => (emailSenderRow.label || emailSenderRow.value) === val,
           );
           if (sender) {
             updateSetting(DELIVERY_SETTING_KEY_SENDER_EMAIL, sender.value);
@@ -326,7 +480,7 @@ const ModifyDeliverySettings = (props) => {
         onChange: (val) => {
           updateSetting(DELIVERY_SETTING_KEY_SOURCE_ACCOUNT_IDENTIFIER, val);
           const domain = (senderDetailsOptions || []).find(
-            (d) => d.sourceAccountIdentifier === val,
+            (whatsappAccountRow) => whatsappAccountRow.sourceAccountIdentifier === val,
           );
           const first = domain?.gsmSenders?.[0];
           updateSetting(DELIVERY_SETTING_KEY_SENDER_MOB_NUM, first?.value || '');
@@ -340,10 +494,39 @@ const ModifyDeliverySettings = (props) => {
         onChange: (val) => updateSetting(DELIVERY_SETTING_KEY_SENDER_MOB_NUM, val),
       },
     ];
+    const rcsFields = [
+      {
+        titleMessage: messages.rcsDomainLabel,
+        options: domainOptions,
+        value: get(localSettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
+        onChange: (val) => onDomainChange(val),
+      },
+      {
+        titleMessage: messages.rcsSenderIdLabel,
+        options: rcsSenderOptions,
+        value: rcsGsmSenderIdForSelect,
+        onChange: (val) => updateSetting(DELIVERY_SETTING_KEY_GSM_SENDER_ID, val),
+      },
+      ...((smsFallbackSenderDetailsOptions || []).length > 0 ? [
+        {
+          titleMessage: messages.fallbackSmsDomainLabel,
+          options: smsFallbackDomainOptions,
+          value: get(localSettings, DELIVERY_SETTING_KEY_SMS_FALLBACK_DOMAIN_ID),
+          onChange: onSmsFallbackDomainChange,
+        },
+        {
+          titleMessage: messages.fallbackSmsSenderIdLabel,
+          options: smsSenderOptions,
+          value: smsFallbackGsmIdForSelect,
+          onChange: (val) => updateSetting(DELIVERY_SETTING_KEY_CDMA_SENDER_ID, val),
+        },
+      ] : []),
+    ];
     const byChannel = {
       [CHANNELS.SMS]: smsFields,
       [CHANNELS.EMAIL]: emailFields,
       [CHANNELS.WHATSAPP]: whatsappFields,
+      [CHANNELS.RCS]: rcsFields,
     };
     return byChannel[channel] || [];
   }, [
@@ -356,6 +539,13 @@ const ModifyDeliverySettings = (props) => {
     wecrmAccountOptions,
     whatsappAccountOptionsForDisplay,
     whatsappSenderOptions,
+    rcsSenderOptions,
+    rcsGsmSenderIdForSelect,
+    smsSenderOptions,
+    smsFallbackGsmIdForSelect,
+    smsFallbackDomainOptions,
+    smsFallbackSenderDetailsOptions,
+    onSmsFallbackDomainChange,
     localSettings,
     selectedDomainEmailSenders,
     senderDetailsOptions,
@@ -390,9 +580,10 @@ const ModifyDeliverySettings = (props) => {
 };
 
 ModifyDeliverySettings.propTypes = {
-  channel: PropTypes.oneOf([CHANNELS.SMS, CHANNELS.EMAIL, CHANNELS.WHATSAPP]).isRequired,
+  channel: PropTypes.oneOf([CHANNELS.SMS, CHANNELS.EMAIL, CHANNELS.WHATSAPP, CHANNELS.RCS]).isRequired,
   deliverySettings: PropTypes.object,
   senderDetailsOptions: PropTypes.array,
+  smsFallbackSenderDetailsOptions: PropTypes.array,
   wecrmAccounts: PropTypes.array,
   onSaveDeliverySettings: PropTypes.func.isRequired,
   onClose: PropTypes.func,
@@ -408,6 +599,7 @@ ModifyDeliverySettings.propTypes = {
 ModifyDeliverySettings.defaultProps = {
   deliverySettings: {},
   senderDetailsOptions: [],
+  smsFallbackSenderDetailsOptions: [],
   wecrmAccounts: [],
   onClose: undefined,
   isLoading: false,

package/v2Components/CommonTestAndPreview/DeliverySettings/constants.js

@@ -21,6 +21,8 @@ export const DELIVERY_SETTING_KEY_SENDER_LABEL = 'senderLabel';
 export const DELIVERY_SETTING_KEY_SENDER_REPLY_TO = 'senderReplyTo';
 export const DELIVERY_SETTING_KEY_SOURCE_ACCOUNT_IDENTIFIER = 'sourceAccountIdentifier';
 export const DELIVERY_SETTING_KEY_SENDER_MOB_NUM = 'senderMobNum';
+/** RCS: SMS fallback domain (separate from primary RCS domainId) */
+export const DELIVERY_SETTING_KEY_SMS_FALLBACK_DOMAIN_ID = 'smsFallbackDomainId';
 
 /** data-testid for delivery settings edit icon */
 export const TEST_ID_DELIVERY_SETTINGS_EDIT = 'delivery-settings-edit';
@@ -32,6 +34,7 @@ export const CHANNELS_WITH_DELIVERY_SETTINGS = [
   CHANNELS.SMS,
   CHANNELS.EMAIL,
   CHANNELS.WHATSAPP,
+  CHANNELS.RCS,
 ];
 
 /** Default empty delivery setting per channel (campaigns-style shape) */
@@ -56,8 +59,21 @@ export const DEFAULT_DELIVERY_SETTING_WHATSAPP = {
   sourceAccountIdentifier: '',
 };
 
+/** RCS: gsmSenderId = RCS sender, cdmaSenderId = SMS fallback sender (reuse same keys) */
+export const DEFAULT_DELIVERY_SETTING_RCS = {
+  domainId: null,
+  domainGatewayMapId: null,
+  gsmSenderId: '',
+  smsFallbackDomainId: null,
+  cdmaSenderId: '',
+};
+
 export const DEFAULT_DELIVERY_SETTINGS_BY_CHANNEL = {
   [CHANNELS.SMS]: DEFAULT_DELIVERY_SETTING_SMS,
   [CHANNELS.EMAIL]: DEFAULT_DELIVERY_SETTING_EMAIL,
   [CHANNELS.WHATSAPP]: DEFAULT_DELIVERY_SETTING_WHATSAPP,
+  [CHANNELS.RCS]: DEFAULT_DELIVERY_SETTING_RCS,
 };
+
+/** API `contactInfo.type` keys that map to RCS-style GSM sender rows (env-specific naming). */
+export const RCS_CONTACT_INFO_GSM_TYPE_KEYS = ['gsm_sender_id', 'rcs_sender_id', 'rcs_sender'];

package/v2Components/CommonTestAndPreview/DeliverySettings/index.js

@@ -1,11 +1,11 @@
 /**
  * DeliverySettings — summary row + CapSlideBox trigger for Test and Preview.
- * Rendered only for SMS, Email, WhatsApp. Uses cap-ui-library only.
+ * Rendered for SMS, Email, WhatsApp, RCS (ModifyDeliverySettings). RCS uses gsmSenderId + cdmaSenderId (SMS fallback).
  *
  * Reference: cap-campaigns-v2 DeliverySettingsV2 (summary + modify panel).
  */
 
-import React, { useState, useCallback } from "react";
+import React, { useState, useCallback, useMemo } from "react";
 import PropTypes from "prop-types";
 import CapRow from "@capillarytech/cap-ui-library/CapRow";
 import CapHeading from "@capillarytech/cap-ui-library/CapHeading";
@@ -22,6 +22,7 @@ import {
   SUMMARY_EMPTY_PLACEHOLDER,
   DELIVERY_SETTING_KEY_DOMAIN_ID,
   DELIVERY_SETTING_KEY_GSM_SENDER_ID,
+  DELIVERY_SETTING_KEY_CDMA_SENDER_ID,
   DELIVERY_SETTING_KEY_SENDER_EMAIL,
   DELIVERY_SETTING_KEY_SENDER_LABEL,
   DELIVERY_SETTING_KEY_SENDER_REPLY_TO,
@@ -35,7 +36,7 @@ const DeliverySettings = (props) => {
   const {
     channel,
     deliverySettings = {},
-    senderDetailsOptions = [],
+    senderDetailsByChannel = {},
     wecrmAccounts = [],
     onSaveDeliverySettings,
     isLoadingSenderDetails,
@@ -43,6 +44,7 @@ const DeliverySettings = (props) => {
     smsTraiDltEnabled,
     registeredSenderIds,
     whatsappAccountFromForm,
+    isChannelSmsFallbackPreviewEnabled,
   } = props;
 
   const [isSlideBoxOpen, setSlideBoxOpen] = useState(false);
@@ -58,17 +60,68 @@ const DeliverySettings = (props) => {
     [onSaveDeliverySettings, closeSlideBox]
   );
 
+  const senderDetailsOptions = useMemo(
+    () => (senderDetailsByChannel[channel] || []),
+    [senderDetailsByChannel, channel],
+  );
+  const smsDomainsForRcs = useMemo(
+    () => (channel === CHANNELS.RCS ? (senderDetailsByChannel[CHANNELS.SMS] || []) : []),
+    [channel, senderDetailsByChannel],
+  );
+
   if (!CHANNELS_WITH_DELIVERY_SETTINGS.includes(channel)) {
     return null;
   }
 
   const notConfiguredLabel = formatMessage(messages.notConfigured);
 
+  const getDisplayFromDomains = (domains, compositeValue) => {
+    if (!compositeValue || !domains?.length) return compositeValue || SUMMARY_EMPTY_PLACEHOLDER;
+    for (const senderDomain of domains) {
+      for (const gsmSenderRow of senderDomain.gsmSenders || []) {
+        const value = senderDomain.domainId != null && gsmSenderRow.value != null
+          ? `${senderDomain.domainId}|${gsmSenderRow.value}`
+          : gsmSenderRow.value;
+        if (value === compositeValue && (senderDomain.domainName || gsmSenderRow.value)) {
+          return [senderDomain.domainName, gsmSenderRow.value].filter(Boolean).join(' · ');
+        }
+      }
+    }
+    return compositeValue || SUMMARY_EMPTY_PLACEHOLDER;
+  };
+
+  /** RCS summary: show sender ID only (no "domain · sender"). */
+  const getSenderIdOnlyFromComposite = (domains, compositeValue) => {
+    if (!compositeValue || !domains?.length) return compositeValue || SUMMARY_EMPTY_PLACEHOLDER;
+    for (const senderDomain of domains) {
+      for (const gsmSenderRow of senderDomain.gsmSenders || []) {
+        const value = senderDomain.domainId != null && gsmSenderRow.value != null
+          ? `${senderDomain.domainId}|${gsmSenderRow.value}`
+          : gsmSenderRow.value;
+        if (value === compositeValue && gsmSenderRow.value != null) {
+          return String(gsmSenderRow.value);
+        }
+      }
+    }
+    return compositeValue || SUMMARY_EMPTY_PLACEHOLDER;
+  };
+
   const getSummaryText = () => {
     const empty = SUMMARY_EMPTY_PLACEHOLDER;
+    if (channel === CHANNELS.RCS) {
+      const rcsVal = get(deliverySettings, DELIVERY_SETTING_KEY_GSM_SENDER_ID) || '';
+      const smsVal = get(deliverySettings, DELIVERY_SETTING_KEY_CDMA_SENDER_ID) || '';
+      const summaryRcs = {
+        rcsSenderId: getSenderIdOnlyFromComposite(senderDetailsOptions, rcsVal),
+      };
+      if (isChannelSmsFallbackPreviewEnabled) {
+        summaryRcs.smsFallbackSenderId = getSenderIdOnlyFromComposite(smsDomainsForRcs, smsVal);
+      }
+      return summaryRcs;
+    }
     if (channel === CHANNELS.SMS) {
       const domain = (senderDetailsOptions || []).find(
-        (d) => d.domainId === get(deliverySettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
+        (senderDomain) => senderDomain.domainId === get(deliverySettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
       );
       const domainName = domain?.domainName || empty;
       const senderId = get(deliverySettings, DELIVERY_SETTING_KEY_GSM_SENDER_ID) || empty;
@@ -76,7 +129,7 @@ const DeliverySettings = (props) => {
     }
     if (channel === CHANNELS.EMAIL) {
       const domain = (senderDetailsOptions || []).find(
-        (d) => d.domainId === get(deliverySettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
+        (senderDomain) => senderDomain.domainId === get(deliverySettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
       );
       const emailDomain = domain?.domainName || empty;
       const senderEmail = get(deliverySettings, DELIVERY_SETTING_KEY_SENDER_EMAIL) || empty;
@@ -103,7 +156,12 @@ const DeliverySettings = (props) => {
 
   const summary = getSummaryText();
   let hasValues = false;
-  if (channel === CHANNELS.SMS) {
+  if (channel === CHANNELS.RCS) {
+    hasValues = (summary.rcsSenderId && summary.rcsSenderId !== SUMMARY_EMPTY_PLACEHOLDER)
+      || (isChannelSmsFallbackPreviewEnabled
+        && summary.smsFallbackSenderId
+        && summary.smsFallbackSenderId !== SUMMARY_EMPTY_PLACEHOLDER);
+  } else if (channel === CHANNELS.SMS) {
     hasValues = summary.senderDomain !== SUMMARY_EMPTY_PLACEHOLDER
       || summary.senderId !== SUMMARY_EMPTY_PLACEHOLDER;
   } else if (channel === CHANNELS.EMAIL) {
@@ -122,6 +180,15 @@ const DeliverySettings = (props) => {
   const getSummaryObject = () => {
     if (!hasValues) return null;
     const label = (msg) => formatMessage(msg);
+    if (channel === CHANNELS.RCS) {
+      const rcsSummary = {
+        [label(messages.rcsSenderIdLabel)]: summary.rcsSenderId,
+      };
+      if (isChannelSmsFallbackPreviewEnabled) {
+        rcsSummary[label(messages.fallbackSmsSenderIdLabel)] = summary.smsFallbackSenderId;
+      }
+      return rcsSummary;
+    }
     if (channel === CHANNELS.SMS) {
       return {
         [label(messages.senderDomainSummary)]: summary.senderDomain,
@@ -165,7 +232,7 @@ const DeliverySettings = (props) => {
             Object.entries(summaryObject).map(([key, value]) => (
               <CapRow type="flex" key={key} className="delivery-settings__summary-entry">
                 <CapLabel type="label1" className="delivery-settings__summary-key">{key}</CapLabel>
-                <CapLabel type="label9">
+                <CapLabel type="label9" className="delivery-settings__summary-value">
                   :
                   {' '}
                   {value}
@@ -194,6 +261,11 @@ const DeliverySettings = (props) => {
               channel={channel}
               deliverySettings={deliverySettings}
               senderDetailsOptions={senderDetailsOptions}
+              smsFallbackSenderDetailsOptions={
+                channel === CHANNELS.RCS && isChannelSmsFallbackPreviewEnabled
+                  ? smsDomainsForRcs
+                  : undefined
+              }
               wecrmAccounts={wecrmAccounts}
               onSaveDeliverySettings={handleSave}
               onClose={closeSlideBox}
@@ -213,9 +285,9 @@ const DeliverySettings = (props) => {
 DeliverySettings.propTypes = {
   channel: PropTypes.string.isRequired,
   deliverySettings: PropTypes.object,
-  senderDetailsOptions: PropTypes.array,
+  senderDetailsByChannel: PropTypes.object,
   wecrmAccounts: PropTypes.array,
-  onSaveDeliverySettings: PropTypes.func.isRequired,
+  onSaveDeliverySettings: PropTypes.func,
   isLoadingSenderDetails: PropTypes.bool,
   formatMessage: PropTypes.func,
   smsTraiDltEnabled: PropTypes.bool,
@@ -223,17 +295,20 @@ DeliverySettings.propTypes = {
   whatsappAccountFromForm: PropTypes.shape({
     accountName: PropTypes.string,
   }),
+  isChannelSmsFallbackPreviewEnabled: PropTypes.bool,
 };
 
 DeliverySettings.defaultProps = {
   deliverySettings: {},
-  senderDetailsOptions: [],
+  senderDetailsByChannel: {},
   wecrmAccounts: [],
+  onSaveDeliverySettings: () => {},
   isLoadingSenderDetails: false,
   formatMessage: undefined,
   smsTraiDltEnabled: false,
   registeredSenderIds: [],
   whatsappAccountFromForm: undefined,
+  isChannelSmsFallbackPreviewEnabled: false,
 };
 
 export default DeliverySettings;

package/v2Components/CommonTestAndPreview/DeliverySettings/messages.js

@@ -108,4 +108,34 @@ export default defineMessages({
     id: `${prefix}.disabledMessage`,
     defaultMessage: 'Message template selected belongs to this account',
   },
+  /** RCS: primary domain (slidebox) */
+  rcsDomainLabel: {
+    id: `${prefix}.rcsDomainLabel`,
+    defaultMessage: 'RCS domain:',
+  },
+  /** RCS: SMS fallback domain (slidebox) */
+  fallbackSmsDomainLabel: {
+    id: `${prefix}.fallbackSmsDomainLabel`,
+    defaultMessage: 'Fallback SMS domain:',
+  },
+  /** RCS: "RCS sender ID" */
+  rcsSenderIdLabel: {
+    id: `${prefix}.rcsSenderIdLabel`,
+    defaultMessage: 'RCS sender ID',
+  },
+  /** RCS: "Fallback SMS sender ID" */
+  fallbackSmsSenderIdLabel: {
+    id: `${prefix}.fallbackSmsSenderIdLabel`,
+    defaultMessage: 'Fallback SMS sender ID',
+  },
+  /** RCS: "Domain" (for domain · sender ID display) */
+  domainLabel: {
+    id: `${prefix}.domainLabel`,
+    defaultMessage: 'Domain',
+  },
+  /** RCS: placeholder for sender ID dropdown */
+  selectSenderId: {
+    id: `${prefix}.selectSenderId`,
+    defaultMessage: 'Select sender ID',
+  },
 });