@capillarytech/creatives-library 8.0.330-alpha.0 → 8.0.331-alpha.0

package/constants/unified.js

@@ -159,24 +159,6 @@ export const TAG_CONTENT_REGEX = /{{([^}]+)}}/g;
 export const ENTRY_TRIGGER_TAG_REGEX = /\bentryTrigger\.\w+(?:\.\w+)?(?:\(\w+\))?/g;
 export const SKIP_TAGS_REGEX_GROUPS = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)", "Link_to_[a-zA-Z]", "SURVEY.*.TOKEN", "^[A-Za-z].*\\([a-zA-Z\\d]*\\)", "referral_unique_(code|url).*userid"];
 
-// --- Template variable tokens (`{{var}}`, DLT `{#var#}`) ---
-/** Global: all `{{…}}` placeholders in a string. */
-export const DEFAULT_MUSTACHE_VAR_REGEX = /\{\{[^}]+\}\}/g;
-/** Global: `{{…}}` or DLT `{#…#}` tokens (SMS combined mode). */
-export const COMBINED_SMS_TEMPLATE_VAR_REGEX = /\{\{[^}]+\}\}|\{\#[^#]*\#\}/g;
-/** Full-string check: one mustache token. */
-export const MUSTACHE_VAR_TOKEN_FULL_STRING_REGEX = /^\{\{[^}]+\}\}$/;
-/** Full-string check: one DLT hash token. */
-export const DLT_HASH_VAR_TOKEN_FULL_STRING_REGEX = /^\{\#[^#]*\#\}$/;
-/** Full-string with capture group: inner name for `{{ name }}`-style tokens (whitespace-tolerant). */
-export const MUSTACHE_TOKEN_INNER_NAME_REGEX = /^\{\{\s*([^}]+?)\s*\}\}$/;
-/** Full-string with capture group: inner name/body for `{# name #}` DLT tokens (whitespace-tolerant). */
-export const DLT_HASH_TOKEN_INNER_NAME_REGEX = /^\{#\s*(.*?)\s*#\}$/;
-/** Global with capture group: inner name inside `{{name}}`. */
-export const MUSTACHE_VAR_NAME_CAPTURE_REGEX = /\{\{([^}]+)\}\}/g;
-/** Global with capture group: inner body inside `{#body#}`. */
-export const DLT_VAR_BODY_CAPTURE_REGEX = /\{\#([^#]*)\#\}/g;
-
 export const GET_TRANSLATION_MAPPED = {
   'en': 'en-US',
   'zh-cn': 'zh',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.330-alpha.0",
+  "version": "8.0.331-alpha.0",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/services/tests/api.test.js

@@ -1042,19 +1042,6 @@ describe('getMembersLookup', () => {
     getMembersLookup('email', 'user+test@example.com');
     expect(global.fetch).toHaveBeenCalled();
     const calls = global.fetch.mock.calls;
-    const withEncoding = calls.find(
-      (c) =>
-        c[0] &&
-        String(c[0]).includes('members') &&
-        String(c[0]).includes('identifierType=email') &&
-        String(c[0]).includes('user%2Btest%40example.com')
-    );
-    if (withEncoding) {
-      const [url, options] = withEncoding;
-      expect(url).toContain('identifierType=email');
-      expect(url).toContain('identifierValue=user%2Btest%40example.com');
-      expect(options?.method || 'GET').toBe('GET');
-    }
     const anyMembersCall = calls.find((c) => c[0] && String(c[0]).includes('members'));
     expect(anyMembersCall).toBeDefined();
     expect(anyMembersCall[0]).toContain('identifierType=');

package/utils/commonUtils.js

@@ -539,22 +539,4 @@ export const isValidMobile = (mobile) => PHONE_REGEX.test(mobile);
 export const formatPhoneNumber = (phone) => {
   if (!phone) return '';
   return String(phone).replace(/[^\d]/g, '');
-};
-
-/**
- * TRAI sender IDs on persisted RCS SMS fallback: may live on the merged object, under
- * `templateConfigs`, or (legacy) `templateConfigs.header`. Same resolution order as
- * `createPayload` in `Rcs/index.js`.
- */
-export function extractRegisteredSenderIdsFromSmsFallbackRecord(record) {
-  if (!record || typeof record !== 'object') return null;
-  const tc = record.templateConfigs && typeof record.templateConfigs === 'object'
-    ? record.templateConfigs
-    : {};
-  const candidates = [record.registeredSenderIds, tc.registeredSenderIds, tc.header];
-  for (let i = 0; i < candidates.length; i += 1) {
-    const a = candidates[i];
-    if (Array.isArray(a) && a.length > 0) return a;
-  }
-  return null;
-}
+};

package/v2Components/CapTagList/index.js

@@ -382,9 +382,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
   render() {
     const {
       hidePopover = false, intl = {}, moduleFilterEnabled, label, modalProps, channel, fetchingSchemaError = false,
-      overlayStyle,
-      overlayClassName,
-      getPopupContainer,
     } = this.props;
     const {formatMessage} = intl;
     const {
@@ -477,9 +474,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             content={contentSection}
             trigger="click"
             placement={this.props.popoverPlacement || (channel === EMAIL.toUpperCase() ? "leftTop" : "rightTop")}
-            overlayStyle={overlayStyle}
-            overlayClassName={overlayClassName}
-            getPopupContainer={getPopupContainer}
           >
             <CapTooltip
               title={
@@ -551,10 +545,6 @@ CapTagList.propTypes = {
   disableTooltipMsg: PropTypes.string,
   fetchingSchemaError: PropTypes.bool,
   popoverPlacement: PropTypes.string,
-  overlayStyle: PropTypes.object,
-  overlayClassName: PropTypes.string,
-  /** e.g. () => document.body — avoids overflow/stacking issues inside slideboxes */
-  getPopupContainer: PropTypes.func,
 };
 
 CapTagList.defaultValue = {

package/v2Components/CommonTestAndPreview/CustomValuesEditor.js

@@ -8,7 +8,6 @@ import CapButton from '@capillarytech/cap-ui-library/CapButton';
 import CapInput from '@capillarytech/cap-ui-library/CapInput';
 import CapLabel from '@capillarytech/cap-ui-library/CapLabel';
 import messages from './messages';
-import { CUSTOM_VALUES_EDITOR_SECTION_FALLBACK_KEY } from './constants';
 
 const CustomValuesEditor = ({
   isExtractingTags,
@@ -17,16 +16,15 @@ const CustomValuesEditor = ({
   setShowJSON,
   customValues,
   handleJSONTextChange,
-  sections,
+  extractedTags,
+  requiredTags,
+  optionalTags,
   handleCustomValueChange,
   handleDiscardCustomValues,
   handleUpdatePreview,
   isUpdatingPreview,
   formatMessage,
 }) => {
-  /** Same as SMS Test & Preview: show token path from extract-tags (fullPath or name). */
-  const getPersonalizationTagColumnLabel = (tagNode) => tagNode?.fullPath ?? tagNode?.name ?? '';
-
   if (isExtractingTags) {
     return (
       <CapRow className="loading-container">
@@ -79,68 +77,52 @@ const CustomValuesEditor = ({
         </CapRow>
       ) : (
         <>
-          {(sections || []).filter((tagsSection) =>
-            (tagsSection?.requiredTags?.length || 0) + (tagsSection?.optionalTags?.length || 0) > 0).map((section) => (
-            <React.Fragment key={section.key || section.title?.id || section.title || CUSTOM_VALUES_EDITOR_SECTION_FALLBACK_KEY}>
-              {section.title ? (
-                <CapLabel type="label2" className="tags-section-title">
-                  {typeof section.title === 'string' ? section.title : <FormattedMessage {...section.title} />}
+          {extractedTags?.length > 0 && (
+            <CapRow className="values-table">
+              <CapRow className="table-header">
+                <CapLabel type="label31" className="header-cell">
+                  <FormattedMessage {...messages.personalizationTags} />
                 </CapLabel>
-              ) : null}
-              <CapRow className="values-table">
-                <CapRow className="table-header">
-                  <CapLabel type="label31" className="header-cell">
-                    <FormattedMessage {...messages.personalizationTags} />
-                  </CapLabel>
-                  <CapLabel type="label31" className="header-cell">
-                    <FormattedMessage {...messages.customValues} />
-                  </CapLabel>
-                </CapRow>
-                {(section?.requiredTags || []).map((tag, tagIndex) => {
-                  const personalizationTagColumnText = getPersonalizationTagColumnLabel(tag);
-                  return (
-                  <CapRow key={tag?.fullPath ?? `required-${tagIndex}`} className="value-row">
-                    <CapRow className="tag-name">
-                      {personalizationTagColumnText}
-                      <span className="required-tag-indicator">*</span>
-                    </CapRow>
-                    <CapRow className="tag-input">
-                      <CapInput
-                        type="text"
-                        isRequired
-                        className="tag-input-field"
-                        value={customValues?.[tag?.fullPath] ?? ''}
-                        onChange={(e) => handleCustomValueChange(tag?.fullPath, e.target.value)}
-                        placeholder={formatMessage(messages.enterValue)}
-                        size="small"
-                      />
-                    </CapRow>
+                <CapLabel type="label31" className="header-cell">
+                  <FormattedMessage {...messages.customValues} />
+                </CapLabel>
+              </CapRow>
+              {requiredTags.map((tag) => (
+                <CapRow key={tag.fullPath} className="value-row">
+                  <CapRow className="tag-name">
+                    {tag.fullPath}
+                    <span className="required-tag-indicator">*</span>
                   </CapRow>
-                  );
-                })}
-                {(section?.optionalTags || []).map((tag, tagIndex) => {
-                  const personalizationTagColumnText = getPersonalizationTagColumnLabel(tag);
-                  return (
-                  <CapRow key={tag?.fullPath ?? `optional-${tagIndex}`} className="value-row">
-                    <CapRow className="tag-name">
-                      {personalizationTagColumnText}
-                    </CapRow>
-                    <CapRow className="tag-input">
-                      <CapInput
-                        type="text"
-                        className="tag-input-field"
-                        value={customValues?.[tag?.fullPath] ?? ''}
-                        onChange={(e) => handleCustomValueChange(tag?.fullPath, e.target.value)}
-                        placeholder={formatMessage(messages.enterValue)}
-                        size="small"
-                      />
-                    </CapRow>
+                  <CapRow className="tag-input">
+                    <CapInput
+                      type="text"
+                      isRequired
+                      className="tag-input-field"
+                      value={customValues[tag.fullPath] || ''}
+                      onChange={(e) => handleCustomValueChange(tag.fullPath, e.target.value)}
+                      placeholder={formatMessage(messages.enterValue)}
+                      size="small"
+                    />
                   </CapRow>
-                  );
-                })}
-              </CapRow>
-            </React.Fragment>
-          ))}
+                </CapRow>
+              ))}
+              {optionalTags?.map((tag) => (
+                <CapRow key={tag.fullPath} className="value-row">
+                  <CapRow className="tag-name">{tag.fullPath}</CapRow>
+                  <CapRow className="tag-input">
+                    <CapInput
+                      type="text"
+                      className="tag-input-field"
+                      value={customValues[tag.fullPath] || ''}
+                      onChange={(e) => handleCustomValueChange(tag.fullPath, e.target.value)}
+                      placeholder={formatMessage(messages.enterValue)}
+                      size="small"
+                    />
+                  </CapRow>
+                </CapRow>
+              ))}
+            </CapRow>
+          )}
         </>
       )}
       <CapRow className="editor-actions">
@@ -174,12 +156,9 @@ CustomValuesEditor.propTypes = {
   setShowJSON: PropTypes.func.isRequired,
   customValues: PropTypes.object.isRequired,
   handleJSONTextChange: PropTypes.func.isRequired,
-  sections: PropTypes.arrayOf(PropTypes.shape({
-    key: PropTypes.string,
-    title: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-    requiredTags: PropTypes.array,
-    optionalTags: PropTypes.array,
-  })).isRequired,
+  extractedTags: PropTypes.array.isRequired,
+  requiredTags: PropTypes.array.isRequired,
+  optionalTags: PropTypes.array.isRequired,
   handleCustomValueChange: PropTypes.func.isRequired,
   handleDiscardCustomValues: PropTypes.func.isRequired,
   handleUpdatePreview: PropTypes.func.isRequired,

package/v2Components/CommonTestAndPreview/DeliverySettings/DeliverySettings.scss

@@ -18,17 +18,11 @@
   }
 
   &__summary-entry {
-    display: flex;
-    align-items: baseline;
-    gap: 0;
     margin-right: $CAP_SPACE_18;
   }
 
-  &__summary-key,
-  &__summary-value {
-    line-height: 1.4;
-    margin-top: 0;
-    margin-bottom: 0;
+  &__summary-key {
+    line-height: $CAP_SPACE_16;
   }
 
   &__edit-icon {

package/v2Components/CommonTestAndPreview/DeliverySettings/ModifyDeliverySettings.js

@@ -32,37 +32,16 @@ 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,
@@ -123,21 +102,17 @@ 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(
-      (gsmSenderOption) => registeredSenderIds?.includes(gsmSenderOption?.value),
+    return allDomainOptions.filter((domain) => (domain.gsmSenders || []).some(
+      (gsmId) => registeredSenderIds.includes(gsmId.value),
     ));
   }, [allDomainOptions, channel, registeredSenderIds, smsTraiDltEnabled]);
 
   const selectedDomain = useMemo(
     () => (senderDetailsOptions || []).find(
-      (senderDomain) => senderDomain.domainId === get(localSettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
+      (d) => d.domainId === get(localSettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
     ) || {},
-    [senderDetailsOptions, get(localSettings, DELIVERY_SETTING_KEY_DOMAIN_ID)],
+    [senderDetailsOptions, localSettings.domainId],
   );
   const {
     gsmSenders: selectedDomainGsmSenders = [],
@@ -145,103 +120,25 @@ 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 smsGsmSendersForSelect = channel === CHANNELS.SMS && smsTraiDltEnabled && registeredSenderIds?.length
-        ? selectedDomainGsmSenders.filter((gsmSenderOption) =>
-          registeredSenderIds?.includes(gsmSenderOption?.value))
+      const smsGsmSenders = channel === CHANNELS.SMS && smsTraiDltEnabled
+        ? selectedDomainGsmSenders.filter((gsmId) => registeredSenderIds.includes(gsmId.value))
         : selectedDomainGsmSenders;
 
-      return smsGsmSendersForSelect.map((gsmSenderRow) => ({
-        label: gsmSenderRow?.value || gsmSenderRow?.label,
-        value: gsmSenderRow?.value,
+      return smsGsmSenders.map((o) => ({
+        label: o.value || o.label,
+        value: o.value,
       }));
     },
     [channel, registeredSenderIds, selectedDomainGsmSenders, smsTraiDltEnabled],
   );
 
   const emailSenderOptions = useMemo(
-    () => selectedDomainEmailSenders.map((emailSenderRow) => ({
-      label: emailSenderRow.value || emailSenderRow.label,
-      value: emailSenderRow.value,
-      senderLabel: emailSenderRow.label,
+    () => selectedDomainEmailSenders.map((o) => ({
+      label: o.value || o.label,
+      value: o.value,
+      senderLabel: o.label,
     })),
     [selectedDomainEmailSenders],
   );
@@ -307,47 +204,13 @@ 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 firstSmsFallbackGsmSender = usableSmsFallbackGsmSenders[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;
-      });
-    },
-    [smsFallbackSenderDetailsOptions],
-  );
-
   const onDomainChange = useCallback(
     (value) => {
-      const domain = domainOptions.find((domainOption) => domainOption.value === value);
+      const domain = domainOptions.find((d) => d.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 && registeredSenderIds?.length
+        const smsGsmSenders = smsTraiDltEnabled
           ? (domain.gsmSenders || []).filter((gsmId) => registeredSenderIds.includes(gsmId.value))
           : domain.gsmSenders;
         const def = findDefault(smsGsmSenders);
@@ -367,20 +230,9 @@ const ModifyDeliverySettings = (props) => {
   );
 
   const handleDone = useCallback(() => {
-    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);
+    onSaveDeliverySettings(localSettings);
     if (onClose) onClose();
-  }, [channel, localSettings, onSaveDeliverySettings, onClose, rcsSenderOptions, smsSenderOptions]);
+  }, [localSettings, onSaveDeliverySettings, onClose]);
 
   const renderSelectRow = useCallback(
     ({
@@ -434,7 +286,7 @@ const ModifyDeliverySettings = (props) => {
         value: get(localSettings, DELIVERY_SETTING_KEY_SENDER_EMAIL),
         onChange: (val) => {
           const sender = selectedDomainEmailSenders.find(
-            (emailSenderRow) => emailSenderRow.value === val,
+            (s) => s.value === val,
           );
           updateSetting(DELIVERY_SETTING_KEY_SENDER_EMAIL, val);
           updateSetting(DELIVERY_SETTING_KEY_SENDER_LABEL, sender?.label || val);
@@ -446,7 +298,7 @@ const ModifyDeliverySettings = (props) => {
         value: get(localSettings, DELIVERY_SETTING_KEY_SENDER_LABEL) || '',
         onChange: (val) => {
           const sender = selectedDomainEmailSenders.find(
-            (emailSenderRow) => (emailSenderRow.label || emailSenderRow.value) === val,
+            (s) => (s.label || s.value) === val,
           );
           if (sender) {
             updateSetting(DELIVERY_SETTING_KEY_SENDER_EMAIL, sender.value);
@@ -474,7 +326,7 @@ const ModifyDeliverySettings = (props) => {
         onChange: (val) => {
           updateSetting(DELIVERY_SETTING_KEY_SOURCE_ACCOUNT_IDENTIFIER, val);
           const domain = (senderDetailsOptions || []).find(
-            (whatsappAccountRow) => whatsappAccountRow.sourceAccountIdentifier === val,
+            (d) => d.sourceAccountIdentifier === val,
           );
           const first = domain?.gsmSenders?.[0];
           updateSetting(DELIVERY_SETTING_KEY_SENDER_MOB_NUM, first?.value || '');
@@ -488,39 +340,10 @@ 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] || [];
   }, [
@@ -533,13 +356,6 @@ const ModifyDeliverySettings = (props) => {
     wecrmAccountOptions,
     whatsappAccountOptionsForDisplay,
     whatsappSenderOptions,
-    rcsSenderOptions,
-    rcsGsmSenderIdForSelect,
-    smsSenderOptions,
-    smsFallbackGsmIdForSelect,
-    smsFallbackDomainOptions,
-    smsFallbackSenderDetailsOptions,
-    onSmsFallbackDomainChange,
     localSettings,
     selectedDomainEmailSenders,
     senderDetailsOptions,
@@ -574,10 +390,9 @@ const ModifyDeliverySettings = (props) => {
 };
 
 ModifyDeliverySettings.propTypes = {
-  channel: PropTypes.oneOf([CHANNELS.SMS, CHANNELS.EMAIL, CHANNELS.WHATSAPP, CHANNELS.RCS]).isRequired,
+  channel: PropTypes.oneOf([CHANNELS.SMS, CHANNELS.EMAIL, CHANNELS.WHATSAPP]).isRequired,
   deliverySettings: PropTypes.object,
   senderDetailsOptions: PropTypes.array,
-  smsFallbackSenderDetailsOptions: PropTypes.array,
   wecrmAccounts: PropTypes.array,
   onSaveDeliverySettings: PropTypes.func.isRequired,
   onClose: PropTypes.func,
@@ -593,7 +408,6 @@ ModifyDeliverySettings.propTypes = {
 ModifyDeliverySettings.defaultProps = {
   deliverySettings: {},
   senderDetailsOptions: [],
-  smsFallbackSenderDetailsOptions: [],
   wecrmAccounts: [],
   onClose: undefined,
   isLoading: false,