@capillarytech/creatives-library 9.0.28 → 9.0.29-alpha.2

package/v2Containers/Rcs/index.js

@@ -1,13 +1,12 @@
 /* eslint-disable no-unused-expressions */
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useState, useEffect, useCallback, useRef, useMemo } from 'react';
 import { bindActionCreators } from 'redux';
 import { createStructuredSelector } from 'reselect';
-import { injectIntl, FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 import get from 'lodash/get';
 import isEmpty from 'lodash/isEmpty';
 import cloneDeep from 'lodash/cloneDeep';
 import isNil from 'lodash/isNil';
-import styled from 'styled-components';
 import CapSpin from '@capillarytech/cap-ui-library/CapSpin';
 import CapRow from '@capillarytech/cap-ui-library/CapRow';
 import CapColumn from '@capillarytech/cap-ui-library/CapColumn';
@@ -23,8 +22,6 @@ import CapHeader from '@capillarytech/cap-ui-library/CapHeader';
 import CapDivider from '@capillarytech/cap-ui-library/CapDivider';
 import CapIcon from '@capillarytech/cap-ui-library/CapIcon';
 import CapImage from '@capillarytech/cap-ui-library/CapImage';
-import CapCard from '@capillarytech/cap-ui-library/CapCard';
-import CapSlideBox from '@capillarytech/cap-ui-library/CapSlideBox';
 import CapSelect from '@capillarytech/cap-ui-library/CapSelect';
 import CapCustomCard from '@capillarytech/cap-ui-library/CapCustomCard';
 import CapDropdown from '@capillarytech/cap-ui-library/CapDropdown';
@@ -35,6 +32,8 @@ import CapError from '@capillarytech/cap-ui-library/CapError';
 import CapCheckbox from '@capillarytech/cap-ui-library/CapCheckbox';
 import CapAskAira from '@capillarytech/cap-ui-library/CapAskAira';
 import CapLink from '@capillarytech/cap-ui-library/CapLink';
+import CapTab from '@capillarytech/cap-ui-library/CapTab';
+import { flushSync } from 'react-dom';
 
 import {
   CAP_G01,
@@ -50,17 +49,29 @@ import {
 import CapVideoUpload from '../../v2Components/CapVideoUpload';
 import * as globalActions from '../Cap/actions';
 import CapActionButton from '../../v2Components/CapActionButton';
+import TemplatePreview from '../../v2Components/TemplatePreview';
 import { makeSelectRcs, makeSelectAccount } from './selectors';
 import { DATE_DISPLAY_FORMAT, TIME_DISPLAY_FORMAT } from '../App/constants';
 import {
   isLoadingMetaEntities,
   makeSelectMetaEntities,
   setInjectedTags,
+  selectCurrentOrgDetails,
 } from '../Cap/selectors';
 import * as RcsActions from './actions';
 import { isAiContentBotDisabled } from '../../utils/common';
-import * as TemplatesActions from '../Templates/actions';
 import './index.scss';
+import {
+  normalizeLibraryLoadedTitleDesc,
+  mergeRcsSmsFallbackVarMapLayers,
+  applySmsFallbackHydration,
+  syncCardVarMappedSemanticsFromSlots,
+  hasMeaningfulSmsFallbackShape,
+  getLibrarySmsFallbackApiBaselineFromTemplateData,
+  mergeSmsFallbackForLibrary,
+  buildSmsFallBackContentForPayload,
+  pickRcsCardVarMappedEntries,
+} from './rcsLibraryHydrationUtils';
 import {
   RCS,
   SMS,
@@ -75,8 +86,8 @@ import {
   LIBRARY,
   ALLOWED_IMAGE_EXTENSIONS_REGEX,
   RCS_IMG_SIZE,
-  RCS_DLT_MODE,
   CTA,
+  AI_CONTENT_BOT_DISABLED,
   RCS_STATUSES,
   TITLE_TEXT,
   MESSAGE_TEXT,
@@ -91,9 +102,13 @@ import {
   rcsVarTestRegex,
   RCS_IMAGE_DIMENSIONS,
   RCS_TEXT_MESSAGE_MAX_LENGTH,
+  RCS_TEXT_MESSAGE_MAX_LENGTH_INFOBIP,
   RCS_RICH_CARD_MAX_LENGTH,
   RCS_VIDEO_THUMBNAIL_DIMENSIONS,
+  RCS_CAROUSEL_IMAGE_DIMENSIONS,
+  RCS_CAROUSEL_VIDEO_THUMBNAIL_DIMENSIONS,
   MAX_BUTTONS,
+  INITIAL_SUGGESTIONS,
   INITIAL_SUGGESTIONS_DATA_STOP,
   RCS_BUTTON_TYPES,
   titletype,
@@ -103,25 +118,67 @@ import {
   SMALL,
   MEDIUM,
   RICHCARD,
+  HOST_INFOBIP,
+  HOST_ICS,
+  STOP,
+  RCS_CAROUSEL_FIRST_CARD_DEFAULT_SUGGESTIONS,
+  MAX_RCS_CAROUSEL_ALLOWED,
+  RCS_CAROUSEL_INITIAL_CARD,
+  RCS_CAROUSEL_INITIAL_FIRST_CARD,
+  RCS_NUMERIC_VAR_NAME_REGEX,
+  RCS_NUMERIC_VAR_TOKEN_REGEX,
+  RCS_STRIP_MUSTACHE_DELIMITERS_REGEX,
+  RCS_TAG_AREA_FIELD_TITLE,
+  RCS_TAG_AREA_FIELD_DESC,
+  REGEX_SPECIAL_CHARS_ESCAPE_PATTERN,
+  JS_TYPES,
 } from './constants';
 import globalMessages from '../Cap/messages';
 import messages from './messages';
 import creativesMessages from '../CreativesContainer/messages';
 import withCreatives from '../../hoc/withCreatives';
 import UnifiedPreview from '../../v2Components/CommonTestAndPreview/UnifiedPreview';
-import { ANDROID } from '../../v2Components/CommonTestAndPreview/constants';
+import VarSegmentMessageEditor from '../../v2Components/VarSegmentMessageEditor';
+import { ANDROID, RCS_SMS_FALLBACK_VAR_MAPPED_PROP } from '../../v2Components/CommonTestAndPreview/constants';
 import TestAndPreviewSlidebox from '../../v2Components/TestAndPreviewSlidebox';
+import { splitTemplateVarString } from '../../utils/templateVarUtils';
 import CapImageUpload from '../../v2Components/CapImageUpload';
-import addCreativesIcon from '../Assets/images/addCreativesIllustration.svg';
-import Templates from '../Templates';
-import SmsTraiEdit from '../SmsTrai/Edit';
+import SmsFallback from '../../v2Components/SmsFallback';
+import { CHANNELS_TO_HIDE_FOR_SMS_ONLY } from '../../v2Components/SmsFallback/constants';
 import TagList from '../TagList';
 import { validateTags } from '../../utils/tagValidations';
-import { getCdnUrl } from '../../utils/cdnTransformation';
+import { isTraiDLTEnable } from '../../utils/common';
 import { isTagIncluded } from '../../utils/commonUtils';
 import injectReducer from '../../utils/injectReducer';
 import v2RcsReducer from './reducer';
-import { getTemplateStatusType } from './utils';
+import {
+  buildRcsNumericMustachePlaceholderRegex,
+  getTemplateStatusType,
+  normalizeCardVarMapped,
+  coalesceCardVarMappedToTemplate,
+  getRcsSemanticVarNamesSpanningTitleAndDesc,
+  resolveCardVarMappedSlotValue,
+  sanitizeCardVarMappedValue,
+  checkSmsFallbackBlocksDone,
+  isSmsFallbackContentTooLong,
+} from './utils';
+import {
+  getCarouselImageAssetIndex,
+  getCarouselVideoAssetIndex,
+  getCarouselThumbnailAssetIndex,
+  isThumbnailAssetIndex,
+  getCarouselDimensionKey,
+  ensureFirstCardDefaultPhoneSuggestions,
+  checkDisableAddCarouselButton,
+  getNextCarouselVarToken,
+  getCarouselTitleCharacterCount,
+  getCarouselDescriptionCharacterCount,
+  buildCarouselCardsForPreview as buildCarouselCardsForPreviewUtil,
+  buildCarouselCardContentForPayload,
+  computeCarouselVarSlotKeys,
+} from './carouselUtils';
+import CarouselDimensionSelection from './components/CarouselDimensionSelection';
+import CarouselCard from './components/CarouselCard';
 
 
 const { Group: CapCheckboxGroup } = CapCheckbox;
@@ -135,31 +192,48 @@ export const Rcs = (props) => {
     templateData = {},
     rcsData = {},
     thumbnailData = {}, // Add separate thumbnail data
-    templatesActions,
     globalActions,
     location,
-    handleClose,
     getDefaultTags,
     supportedTags,
     metaEntities,
     injectedTags,
     loadingTags,
     getFormData,
-    isDltEnabled,
     smsRegister,
+    orgUnitId,
     selectedOfferDetails,
     eventContextTags,
-    waitEventContextTags,
     accountData = {},
+    currentOrgDetails,
     // TestAndPreviewSlidebox props
     showTestAndPreviewSlidebox: propsShowTestAndPreviewSlidebox,
     handleTestAndPreview: propsHandleTestAndPreview,
     handleCloseTestAndPreview: propsHandleCloseTestAndPreview,
+    handleClose,
   } = props || {};
   const { formatMessage } = intl;
   const { TextArea } = CapInput;
   const { CapCustomCardList } = CapCustomCard;
+
+  // Defensive: React cannot render plain objects as children (crashes with
+  // "Objects are not valid as a React child"). Some campaigns (!isFullMode) flows
+  // can accidentally set an error state to an object (e.g. `{}`).
+  const normalizeErrorMessage = (err) => {
+    if (!err) return '';
+    if (React.isValidElement(err)) return err;
+    if (typeof err === JS_TYPES.STRING) return err;
+    if (typeof err === JS_TYPES.NUMBER) return String(err);
+    if (typeof err === JS_TYPES.OBJECT && typeof err.message === JS_TYPES.STRING) return err.message;
+    try {
+      return JSON.stringify(err);
+    } catch (e) {
+      return String(err);
+    }
+  };
+
   const [isEditFlow, setEditFlow] = useState(false);
+  const isEditLike = isEditFlow || !isFullMode;
   const [tags, updateTags] = useState([]);
   const [spin, setSpin] = useState(false);
   //template
@@ -168,33 +242,17 @@ export const Rcs = (props) => {
   const [templateMediaType, setTemplateMediaType] = useState(
     RCS_MEDIA_TYPES.NONE,
   );
-  const [templateRejectionReason, setTemplateRejectionReason] = useState(null);
   const [templateTitle, setTemplateTitle] = useState('');
   const [templateDesc, setTemplateDesc] = useState('');
   const [templateDescError, setTemplateDescError] = useState(false);
   const [templateStatus, setTemplateStatus] = useState('');
-  const [templateDate, setTemplateDate] = useState('');
-  //fallback
-  const [fallbackMessage, setFallbackMessage] = useState('');
-  const [fallbackMessageError, setFallbackMessageError] = useState(false);
-  //fallback dlt
-  const [showDltContainer, setShowDltContainer] = useState(false);
-  const [dltMode, setDltMode] = useState('');
-  const [dltEditData, setDltEditData] = useState({});
-  const [showDltCard, setShowDltCard] = useState(false);
-  const [fallbackPreviewmode, setFallbackPreviewmode] = useState(false);
-  const [dltPreviewData, setDltPreviewData] = useState('');
+  /** `undefined` = not hydrated yet; `null` = no fallback / user removed template; object = selected fallback */
+  const [smsFallbackData, setSmsFallbackData] = useState(undefined);
   const [suggestions, setSuggestions] = useState(INITIAL_SUGGESTIONS_DATA_STOP);
-  const [buttonType, setButtonType] = useState(RCS_BUTTON_TYPES.NONE);
+  const buttonType = RCS_BUTTON_TYPES.NONE;
   const [suggestionError, setSuggestionError] = useState(true);
+  const [isTestAndPreviewMode, setIsTestAndPreviewMode] = useState(false);
   const [templateType, setTemplateType] = useState('text_message');
-  const [templateHeader, setTemplateHeader] = useState('');
-  const [templateMessage, setTemplateMessage] = useState('');
-  const [templateHeaderError, setTemplateHeaderError] = useState('');
-  const [templateMessageError, setTemplateMessageError] = useState('');
-  const validVarRegex = /\{\{(\d+)\}\}/g;
-  const [updatedTitleData, setUpdatedTitleData] = useState([]);
-  const [updatedDescData, setUpdatedDescData] = useState([]);
   const [titleVarMappedData, setTitleVarMappedData] = useState({});
   const [descVarMappedData, setDescVarMappedData] = useState({});
   const [titleTextAreaId, setTitleTextAreaId] = useState();
@@ -205,75 +263,63 @@ export const Rcs = (props) => {
   const [rcsVideoSrc, setRcsVideoSrc] = useState({});
   const [rcsThumbnailSrc, setRcsThumbnailSrc] = useState('');
   const [selectedDimension, setSelectedDimension] = useState(RCS_IMAGE_DIMENSIONS.MEDIUM_HEIGHT.type);
-  const [imageError, setImageError] = useState(null);
+  // Carousel (UI-only) state
+  const [selectedCarousel, setSelectedCarousel] = useState('');
+  const [selectedCarouselHeight, setSelectedCarouselHeight] = useState(MEDIUM);
+  const [selectedCarouselWidth, setSelectedCarouselWidth] = useState(SMALL);
+  const [carouselData, setCarouselData] = useState([]);
+  const [carouselErrors, setCarouselErrors] = useState([]); // [{ title: string|false, description: string|false }]
+  const [activeCarouselIndex, setActiveCarouselIndex] = useState('0');
+  const [carouselResetNonce, setCarouselResetNonce] = useState(0);
+  // Title and description each track their own last-focused var slot (mirrors titleTextAreaId/
+  // descTextAreaId for the single-card flow) — a single shared id would let a click on the
+  // "Add Labels" picker next to one field silently apply to whichever field was focused last,
+  // if the user hadn't just clicked into that field's own var slot.
+  const [carouselTitleFocusedVarId, setCarouselTitleFocusedVarId] = useState('');
+  const [carouselDescFocusedVarId, setCarouselDescFocusedVarId] = useState('');
+   const [imageError, setImageError] = useState(null);
   const [templateTitleError, setTemplateTitleError] = useState(false);
   const [cardVarMapped, setCardVarMapped] = useState({});
+  /** Bump when hydrated cardVarMapped payload changes so VarSegment TextAreas remount with fresh valueMap (controlled-input sync). */
+  const [rcsVarSegmentEditorRemountKey, setRcsVarSegmentEditorRemountKey] = useState(0);
+  const lastHydratedRcsCardVarSignatureRef = useRef(null);
+
+  /**
+   * Hydrate only from template payload — not from full `rcsData`. Uploads/asset updates change `rcsData`
+   * without changing `templateDetails`; re-running hydration then cleared `smsFallbackData`, so the SMS
+   * fallback card / content stopped appearing until re-selected.
+   */
+  const rcsHydrationDetails = useMemo(
+    () => (isFullMode ? rcsData?.templateDetails : templateData),
+    [isFullMode, rcsData?.templateDetails, templateData],
+  );
 
-  // TestAndPreviewSlidebox state
-  const [showTestAndPreviewSlidebox, setShowTestAndPreviewSlidebox] = useState(false);
-  const [isTestAndPreviewMode, setIsTestAndPreviewMode] = useState(false);
-
-  const tempMsg = dltPreviewData === '' ? fallbackMessage : dltPreviewData;
-
-  // Get template content for TestAndPreviewSlidebox
-  // Reference: Based on getRcsPreview() function (lines 2087-2111) which prepares content for TemplatePreview
-  // getRcsPreview ALWAYS uses templateTitle and templateDesc for ALL template types (text_message, rich_card, carousel)
-  // renderTextComponent (lines 1317-1485) also uses templateTitle and templateDesc
-  // Note: templateHeader and templateMessage are defined but NOT used in the component
-  const getTemplateContent = useCallback(() => {
-    const isMediaTypeImage = templateMediaType === RCS_MEDIA_TYPES.IMAGE;
-    const isMediaTypeVideo = templateMediaType === RCS_MEDIA_TYPES.VIDEO;
-    const isMediaTypeText = templateMediaType === RCS_MEDIA_TYPES.NONE;
-
-    // Build media preview object (same pattern as getRcsPreview)
-    const mediaPreview = {};
-    if (isMediaTypeImage && rcsImageSrc) {
-      mediaPreview.rcsImageSrc = rcsImageSrc;
-    }
-    if (isMediaTypeVideo && !isMediaTypeText) {
-      // For video, use thumbnailSrc as rcsVideoSrc (same as getRcsPreview line 2104)
-      if (rcsThumbnailSrc) {
-        mediaPreview.rcsVideoSrc = rcsThumbnailSrc;
-      } else if (rcsVideoSrc?.videoSrc) {
-        mediaPreview.rcsVideoSrc = rcsVideoSrc.videoSrc;
-      }
-      // Also include thumbnailSrc separately if available
-      if (rcsThumbnailSrc) {
-        mediaPreview.rcsThumbnailSrc = rcsThumbnailSrc;
+  /** Skip duplicate /meta/TAG fetches: same query is triggered from (1) useEffect below, (2) title TagList mount, (3) description TagList mount — each calls getTagsforContext('Outbound'). */
+  const lastTagSchemaQueryKeyRef = useRef(null);
+  /**
+   * Library: parent often passes a new `templateData` object reference every render. Re-applying the same
+   * SMS fallback snapshot was resetting `smsFallbackData` and caused VarSegment inputs to flicker old/new.
+   */
+  const lastSmsFallbackHydrationKeyRef = useRef(null);
+
+  const fetchTagSchemaIfNewQuery = useCallback(
+    (query) => {
+      const key = JSON.stringify(query);
+      if (lastTagSchemaQueryKeyRef.current === key) {
+        return;
       }
-    }
-
-    // Build content object
-    // Reference: getRcsPreview (line 2091-2092) uses templateTitle and templateDesc for ALL cases
-    // templateTitle is used for rich_card/carousel title, empty for text_message
-    // templateDesc is used for ALL types (text message body or rich card description)
-    // For UnifiedPreview, we map templateTitle -> templateHeader and templateDesc -> templateMessage
-    const contentObj = {
-      // Map templateTitle to templateHeader and templateDesc to templateMessage
-      templateHeader: templateTitle,
-      templateMessage: templateDesc,
-      ...mediaPreview,
-      ...(suggestions.length > 0 && {
-        suggestions: suggestions,
-      }),
-    };
+      lastTagSchemaQueryKeyRef.current = key;
+      globalActions.fetchSchemaForEntity(query);
+    },
+    [globalActions],
+  );
 
-    return contentObj;
-  }, [
-    templateMediaType,
-    templateTitle,
-    templateDesc,
-    rcsImageSrc,
-    rcsVideoSrc,
-    rcsThumbnailSrc,
-    suggestions,
-    selectedDimension,
-  ]);
+  // TestAndPreviewSlidebox state
+  const [showTestAndPreviewSlidebox, setShowTestAndPreviewSlidebox] = useState(false);
 
   // Handle Test and Preview button click
   const handleTestAndPreview = useCallback(() => {
     setShowTestAndPreviewSlidebox(true);
-    setIsTestAndPreviewMode(true);
     if (propsHandleTestAndPreview) {
       propsHandleTestAndPreview();
     }
@@ -297,31 +343,334 @@ export const Rcs = (props) => {
     // For video
     return RCS_VIDEO_THUMBNAIL_DIMENSIONS[selectedDimension]?.orientation || VERTICAL;
   };
+  /** Merge editor slot map into `smsFallbackData` (like `cardVarMapped` for title/desc). */
+  const handleSmsFallbackEditorStateChange = useCallback((patch) => {
+    setSmsFallbackData((prev) => {
+      if (!patch || typeof patch !== 'object') return prev;
+      // Bail out when no template has been selected yet — SmsTraiEdit fires
+      // onRcsFallbackEditorStateChange on mount (unicodeValidity, varMapped),
+      // which would create a non-null smsFallbackData from nothing and cause
+      // the card to appear as "Untitled creative" before any save.
+      if (!prev) return prev;
+      return { ...prev, ...patch };
+    });
+  }, []);
 
+  /** RCS template save / edit API: `rcsContent.accountId` must stay `sourceAccountIdentifier` (pairs with accessToken). */
   const [accountId, setAccountId] = useState('');
+  /** WeCRM list row `id` — only for CommonTestAndPreview → createMessageMeta payload, not for template save. */
+  const [wecrmAccountId, setWecrmAccountId] = useState('');
   const [accessToken, setAccessToken] = useState('');
   const [hostName, setHostName] = useState('');
   const [accountName, setAccountName] = useState('');
+  const isHostInfoBip = hostName === HOST_INFOBIP;
+  const isHostIcs = hostName === HOST_ICS;
+
+  useEffect(() => {
+    setSuggestions(isHostIcs ? INITIAL_SUGGESTIONS_DATA_STOP : []);
+  }, [isHostIcs]);
   const [rcsAccount, setRcsAccount] = useState('');
   useEffect(() => {
     const accountObj = accountData.selectedRcsAccount || {};
     if (!isEmpty(accountObj)) {
       const {
+        id: wecrmId,
         sourceAccountIdentifier = '',
         configs = {},
       } = accountObj;
-      
       setAccountId(sourceAccountIdentifier);
+      setWecrmAccountId(
+        wecrmId != null && String(wecrmId).trim() !== '' ? String(wecrmId) : '',
+      );
       setAccessToken(configs.accessToken || '');
       setHostName(accountObj.hostName || '');
       setAccountName(accountObj.name || '');
       setRcsAccount(accountObj.id || '');
+    } else {
+      setAccountId('');
+      setWecrmAccountId('');
+      setAccessToken('');
+      setHostName('');
+      setAccountName('');
     }
   }, [accountData.selectedRcsAccount]);
 
   const isMediaTypeText = templateMediaType === RCS_MEDIA_TYPES.NONE;
   const isMediaTypeImage = templateMediaType === RCS_MEDIA_TYPES.IMAGE;
   const isMediaTypeVideo = templateMediaType === RCS_MEDIA_TYPES.VIDEO;
+  const isCarouselType = templateType === contentType.carousel;
+
+  const clearCarouselCardMedia = (cardIndex, { clearImage = true, clearVideo = true, clearThumb = true } = {}) => {
+    setCarouselData((prev = []) => {
+      const updated = cloneDeep(prev);
+      if (!updated?.[cardIndex]) return updated;
+      if (clearImage) updated[cardIndex].imageSrc = '';
+      if (clearVideo) updated[cardIndex].videoAsset = {};
+      if (clearThumb) updated[cardIndex].thumbnailSrc = '';
+      return updated;
+    });
+
+    if (clearImage) actions.clearRcsMediaAsset(getCarouselImageAssetIndex(cardIndex));
+    if (clearVideo) actions.clearRcsMediaAsset(getCarouselVideoAssetIndex(cardIndex));
+    if (clearThumb) actions.clearRcsMediaAsset(getCarouselThumbnailAssetIndex(cardIndex));
+  };
+
+  const resetCarouselMediaForAllCards = () => {
+    setCarouselData((prev = []) => {
+      const updated = cloneDeep(prev);
+      updated.forEach((card) => {
+        if (!card) return;
+        card.imageSrc = '';
+        card.videoAsset = {};
+        card.thumbnailSrc = '';
+      });
+      return updated;
+    });
+    (carouselData || []).forEach((_, idx) => {
+      actions.clearRcsMediaAsset(getCarouselImageAssetIndex(idx));
+      actions.clearRcsMediaAsset(getCarouselVideoAssetIndex(idx));
+      actions.clearRcsMediaAsset(getCarouselThumbnailAssetIndex(idx));
+    });
+    // Force tab panes to remount after global reset (some tab implementations cache inactive panes)
+    setCarouselResetNonce((count) => count + 1);
+  };
+
+  // Always use functional updates: image upload completes in CapImageUpload's useEffect and calls
+  // updateImageSrc → this handler. If we cloned carouselData from render, we'd overwrite title/body/
+  // suggestions typed since the last commit (stale closure).
+  const handleCarouselValueChange = (carouselIndex, fields) => {
+    setCarouselData((prev = []) => {
+      const updated = cloneDeep(prev);
+      if (!updated[carouselIndex]) return prev;
+      fields.forEach(({ fieldName, value }) => {
+        updated[carouselIndex][fieldName] = value;
+      });
+      return updated;
+    });
+  };
+
+  const updateCarouselErrors = (carouselIndex, patch) => {
+    setCarouselErrors((prev = []) => {
+      const next = Array.isArray(prev) ? [...prev] : [];
+      next[carouselIndex] = { ...(next[carouselIndex] || {}), ...patch };
+      return next;
+    });
+  };
+
+  const deleteCarouselCard = (index) => {
+    let nextIdx = 0;
+    flushSync(() => {
+      setCarouselData((prev = []) => {
+        const updated = cloneDeep(prev);
+        if (index < 0 || index >= updated.length) return updated;
+        updated.splice(index, 1);
+        nextIdx = Math.max(0, Math.min(index - 1, updated.length - 1));
+        return ensureFirstCardDefaultPhoneSuggestions(updated);
+      });
+    });
+    setCarouselErrors((prev = []) => {
+      const next = Array.isArray(prev) ? [...prev] : [];
+      next.splice(index, 1);
+      return next;
+    });
+    setActiveCarouselIndex(`${nextIdx}`);
+  };
+
+
+  const addCarouselCard = () => {
+    let newIndex = 0;
+    flushSync(() => {
+      setCarouselData((prev = []) => {
+        const updated = cloneDeep(prev);
+        updated.push(cloneDeep(RCS_CAROUSEL_INITIAL_CARD));
+        newIndex = updated.length - 1;
+        return updated;
+      });
+    });
+    setCarouselErrors((prev = []) => ([...(Array.isArray(prev) ? prev : []), {}]));
+    setActiveCarouselIndex(`${newIndex}`);
+  };
+
+  // Initialize carousel data when switching to carousel type
+  useEffect(() => {
+    if (!isCarouselType) return;
+    if (!carouselData || carouselData.length === 0) {
+      setCarouselData([cloneDeep(RCS_CAROUSEL_INITIAL_FIRST_CARD)]);
+      setCarouselErrors([{}]);
+      setActiveCarouselIndex('0');
+    }
+  }, [isCarouselType]);
+
+  // keep derived carousel key in sync
+  useEffect(() => {
+    if (!isCarouselType) return;
+    if (!selectedCarouselHeight || !selectedCarouselWidth) return;
+    // Required format: HEIGHT_WIDTH
+    setSelectedCarousel(`${selectedCarouselHeight}_${selectedCarouselWidth}`);
+  }, [isCarouselType, selectedCarouselHeight, selectedCarouselWidth]);
+
+  const renderCarouselDimensionSelection = () => {
+    if (!isCarouselType) return null;
+    return (
+      <CarouselDimensionSelection
+        isEditFlow={isEditFlow}
+        isFullMode={isFullMode}
+        selectedCarouselHeight={selectedCarouselHeight}
+        selectedCarouselWidth={selectedCarouselWidth}
+        selectedCarousel={selectedCarousel}
+        onHeightChange={(val) => {
+          // Like rich-card dimension changes: clear media so user re-uploads matching new dimensions.
+          resetCarouselMediaForAllCards();
+          setSelectedCarouselHeight(val);
+        }}
+        onWidthChange={(val) => {
+          // Like rich-card dimension changes: clear media so user re-uploads matching new dimensions.
+          resetCarouselMediaForAllCards();
+          setSelectedCarouselWidth(val);
+        }}
+      />
+    );
+  };
+
+  const getCarouselTabPanes = () => {
+    const tagsForPicker = getRcsTags();
+    return (carouselData || []).map((card, index) => ({
+      key: String(index),
+      tab: index + 1,
+      content: (
+        <CarouselCard
+          cardIndex={index}
+          card={card}
+          carouselLength={carouselData.length}
+          isEditFlow={isEditFlow}
+          isFullMode={isFullMode}
+          mediaRadioOptions={mediaRadioOptions}
+          cardError={carouselErrors?.[index]}
+          location={location}
+          tagsForPicker={tagsForPicker}
+          injectedTags={injectedTags}
+          selectedOfferDetails={selectedOfferDetails}
+          formatMessage={formatMessage}
+          titleMaxLength={getTitleMaxLength()}
+          descriptionMaxLength={getDescriptionMaxLength()}
+          titleCharCount={getCarouselTitleCharacterCount(carouselData, index)}
+          descriptionCharCount={getCarouselDescriptionCharacterCount(carouselData, index)}
+          dimKey={getCarouselDimensionKey(selectedCarouselHeight, selectedCarouselWidth)}
+          rcsData={rcsData}
+          uploadRcsImage={uploadRcsImage}
+          uploadRcsVideo={uploadRcsVideo}
+          hostName={hostName}
+          onDelete={() => deleteCarouselCard(index)}
+          onMediaTypeChange={(value) => {
+            // Reset media fields when switching type
+            if (value === RCS_MEDIA_TYPES.IMAGE) {
+              // Switching to IMAGE: clear video + thumbnail uploads so they don't auto-restore.
+              clearCarouselCardMedia(index, { clearImage: false, clearVideo: true, clearThumb: true });
+              handleCarouselValueChange(index, [
+                { fieldName: 'mediaType', value },
+                { fieldName: 'videoAsset', value: {} },
+                { fieldName: 'thumbnailSrc', value: '' },
+              ]);
+            } else {
+              // Switching to VIDEO: clear image upload so it doesn't auto-restore.
+              clearCarouselCardMedia(index, { clearImage: true, clearVideo: false, clearThumb: false });
+              handleCarouselValueChange(index, [
+                { fieldName: 'mediaType', value },
+                { fieldName: 'imageSrc', value: '' },
+              ]);
+            }
+          }}
+          onTitleChange={({ target: { value } }) => {
+            let error = false;
+            if (value?.length > TEMPLATE_TITLE_MAX_LENGTH) {
+              error = formatMessage(messages.templateHeaderLengthError);
+            } else {
+              error = variableErrorHandling(value);
+            }
+            updateCarouselErrors(index, { title: error });
+            handleCarouselValueChange(index, [{ fieldName: 'title', value }]);
+          }}
+          onDescriptionChange={({ target: { value } }) => {
+            let error = false;
+            if (value?.length > RCS_RICH_CARD_MAX_LENGTH) {
+              error = formatMessage(messages.templateMessageLengthError);
+            } else {
+              error = variableErrorHandling(value);
+            }
+            updateCarouselErrors(index, { description: error });
+            handleCarouselValueChange(index, [{ fieldName: 'description', value }]);
+          }}
+          onTitleAddVar={() => appendVarToCarouselField(index, 'title')}
+          onDescriptionAddVar={() => appendVarToCarouselField(index, 'description')}
+          onTitleTagSelect={onCarouselTitleTagSelect}
+          onDescTagSelect={onCarouselDescTagSelect}
+          onContextChange={handleOnTagsContextChange}
+          renderEditMessage={renderCarouselEditMessage}
+          onFieldChange={(fieldName, value) => handleCarouselValueChange(index, [{ fieldName, value }])}
+          onSuggestionsChange={(nextSuggestions) =>
+            handleCarouselValueChange(index, [{ fieldName: 'suggestions', value: nextSuggestions }])}
+        />
+      ),
+    }));
+  };
+
+  const renderCarouselSection = () => {
+    if (!isCarouselType) return null;
+
+    const isMaxCarouselCardsReached = MAX_RCS_CAROUSEL_ALLOWED === (carouselData?.length || 0);
+    const addCardTooltipTitle = isMaxCarouselCardsReached
+      ? formatMessage(messages.rcsCarouselMaxCardTooltip, { max: MAX_RCS_CAROUSEL_ALLOWED })
+      // "Set up the first card" only makes sense while creating a new template —
+      // in edit flow the cards already exist, so don't show it there.
+      : (!isEditFlow && checkDisableAddCarouselButton(carouselData, activeCarouselIndex) ? formatMessage(messages.rcsCarouselAddCardDisabledTooltip) : '');
+
+    // No "+" in edit flow (cards can't be added there) — and with no "+", the
+    // divider before it has nothing to separate, so skip both together instead
+    // of rendering a dangling divider.
+    const operations = isEditFlow ? null : (
+      <>
+        <CapDivider type="vertical" />
+        <CapTooltip title={addCardTooltipTitle}>
+          <span className="button-disabled-tooltip-wrapper">
+            <CapButton
+              onClick={addCarouselCard}
+              type="flat"
+              className="add-carousel-content-button"
+              disabled={
+                isEditFlow ||
+                !isFullMode ||
+                isMaxCarouselCardsReached ||
+                checkDisableAddCarouselButton(carouselData, activeCarouselIndex)
+              }
+            >
+              <CapIcon type="plus" />
+            </CapButton>
+          </span>
+        </CapTooltip>
+      </>
+    );
+
+    return (
+      <CapRow className={`rcs-carousel-section ${isEditFlow ? 'rcs-carousel-section--readonly-above' : ''}`}>
+        {renderCarouselDimensionSelection()}
+        <CapRow className="rcs-carousel-tab">
+          <CapTab
+            key={`rcs-carousel-tab-${carouselResetNonce}`}
+            defaultActiveKey="0"
+            activeKey={activeCarouselIndex}
+            tabBarExtraContent={operations}
+            onChange={(key) => {
+              setActiveCarouselIndex(`${key}`);
+              // reset focused var when switching cards (as per requirement)
+              setCarouselTitleFocusedVarId('');
+              setCarouselDescFocusedVarId('');
+            }}
+            panes={getCarouselTabPanes()}
+          />
+        </CapRow>
+      </CapRow>
+    );
+  };
 
   const mediaRadioOptions = [
     {
@@ -330,11 +679,16 @@ export const Rcs = (props) => {
     },
     {
       value: RCS_MEDIA_TYPES.VIDEO,
-      label: formatMessage(messages.mediaVideo),
+      label: formatMessage(
+        templateType === contentType.carousel
+          ? messages.carouselMediaVideoOption
+          : messages.mediaVideo,
+      ),
     },
   ];
   const aiContentBotDisabled = isAiContentBotDisabled();
 
+
   const updateButtonChange = (data, index) => {
     if (data && data.text) {
       const forbiddenError = forbiddenCharactersValidation(data.text);
@@ -371,7 +725,9 @@ export const Rcs = (props) => {
     if (isFullMode) return;
     if (loadingTags || !tags || tags.length === 0) return;
     const templateStr = type === TITLE_TEXT ? templateTitle : templateDesc;
-    const resolved = resolveTemplateWithMap(templateStr); // placeholders -> mapped value (or '')
+    const slotOffset =
+      type === TITLE_TEXT ? 0 : (templateTitle ? templateTitle.match(rcsVarRegex) || [] : []).length;
+    const resolved = resolveTemplateWithMap(templateStr, slotOffset); // placeholders -> mapped value (or '')
     if (!resolved) {
       if (type === TITLE_TEXT) setTemplateTitleError(false);
       if (type === MESSAGE_TEXT) setTemplateDescError(false);
@@ -380,8 +736,8 @@ export const Rcs = (props) => {
 
     let contentForValidation = resolved;
     const placeholderTokens = templateStr.match(rcsVarRegex) || [];
-    placeholderTokens.forEach((t) => {
-      const escaped = t.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+    placeholderTokens.forEach((token) => {
+      const escaped = token.replace(REGEX_SPECIAL_CHARS_ESCAPE_PATTERN, '\\$&');
       contentForValidation = contentForValidation.replace(new RegExp(escaped, 'g'), '');
     });
     if (!contentForValidation.trim()) {
@@ -398,10 +754,16 @@ export const Rcs = (props) => {
         tagModule: getDefaultTags,
         isFullMode,
       }) || {};
-    const errorMsg =
-      (validationResponse?.isBraceError &&
-        formatMessage(globalMessages.unbalanacedCurlyBraces)) ||
-      false;
+      const unsupportedTagsLengthCheck =
+      validationResponse?.unsupportedTags?.length > 0;
+      const errorMsg =
+        (unsupportedTagsLengthCheck &&
+          formatMessage(globalMessages.unsupportedTagsValidationError, {
+            unsupportedTags: validationResponse.unsupportedTags,
+          })) ||
+        (validationResponse.isBraceError &&
+          formatMessage(globalMessages.unbalanacedCurlyBraces)) ||
+        false;
     if (type === TITLE_TEXT) setTemplateTitleError(errorMsg);
     if (type === MESSAGE_TEXT) setTemplateDescError(errorMsg);
   };
@@ -414,55 +776,238 @@ export const Rcs = (props) => {
     validateResolvedTagsForType(MESSAGE_TEXT);
   }, [cardVarMapped, templateDesc, tags, injectedTags, loadingTags]);
 
+  useEffect(() => {
+    if (isFullMode || !isCarouselType) return;
+    if (loadingTags || !tags || tags.length === 0) return;
+    (carouselData || []).forEach((card, idx) => {
+      ['title', 'description'].forEach((field) => {
+        const templateStr = card?.[field] || '';
+        if (!templateStr) return;
+        const resolved = resolveCarouselTemplateWithMap(templateStr, idx, field === 'description');
+        if (!resolved) {
+          updateCarouselErrors(idx, { [field]: false });
+          return;
+        }
+        let contentForValidation = resolved;
+        const placeholderTokens = templateStr.match(rcsVarRegex) || [];
+        placeholderTokens.forEach((token) => {
+          const escaped = token.replace(REGEX_SPECIAL_CHARS_ESCAPE_PATTERN, '\\$&');
+          contentForValidation = contentForValidation.replace(new RegExp(escaped, 'g'), '');
+        });
+        if (!contentForValidation.trim()) {
+          updateCarouselErrors(idx, { [field]: false });
+          return;
+        }
+        const validationResponse = validateTags({
+          content: contentForValidation,
+          tagsParam: tags,
+          injectedTagsParams: injectedTags,
+          location,
+          tagModule: getDefaultTags,
+          eventContextTags,
+          isFullMode,
+        }) || {};
+        const errorMsg =
+          (validationResponse?.unsupportedTags?.length > 0 &&
+            formatMessage(globalMessages.unsupportedTagsValidationError, {
+              unsupportedTags: validationResponse.unsupportedTags,
+            })) ||
+          (validationResponse.isBraceError &&
+            formatMessage(globalMessages.unbalanacedCurlyBraces)) ||
+          false;
+        updateCarouselErrors(idx, { [field]: errorMsg });
+      });
+    });
+  }, [cardVarMapped, carouselData, tags, injectedTags, loadingTags, isCarouselType]);
+
   const getVarNameFromToken = (token = '') => token.replace(/^\{\{|\}\}$/g, '');
 
-  const resolveTemplateWithMap = (str = '') => {
+  const splitTemplateVarStringRcs = (str) => splitTemplateVarString(str, rcsVarRegex);
+
+  /** Same `{{tag}}` in both title and description must not share one semantic map entry. */
+  const rcsSpanningSemanticVarNames = useMemo(
+    () => getRcsSemanticVarNamesSpanningTitleAndDesc(templateTitle, templateDesc, rcsVarRegex),
+    [templateTitle, templateDesc],
+  );
+
+  /** Global slot index (0-based, title vars then desc) for a VarSegmentMessageEditor `id` (`{{tok}}_segIdx`), or null if not found. */
+  const getGlobalSlotIndexForRcsFieldId = (varSegmentCompositeId, fieldTemplateStr, fieldType) => {
+    const titleVarTokenMatches = templateTitle?.match(rcsVarRegex) ?? [];
+    const offset = fieldType === TITLE_TEXT ? 0 : titleVarTokenMatches.length;
+    const templateSegments = splitTemplateVarStringRcs(fieldTemplateStr ?? '');
+    let varOrdinal = 0;
+    for (let segmentIndexInField = 0; segmentIndexInField < templateSegments.length; segmentIndexInField += 1) {
+      const segmentToken = templateSegments[segmentIndexInField];
+      if (rcsVarTestRegex.test(segmentToken)) {
+        if (`${segmentToken}_${segmentIndexInField}` === varSegmentCompositeId) {
+          return offset + varOrdinal;
+        }
+        varOrdinal += 1;
+      }
+    }
+    return null;
+  };
+
+  /**
+   * Master-branch resolve: uses numeric slot keys + semantic spanning detection for correct
+   * multi-field variable resolution.
+   */
+  const resolveTemplateWithMap = (str = '', slotOffset = 0) => {
     if (!str) return '';
-    const arr = splitTemplateVarString(str);
+    const arr = splitTemplateVarStringRcs(str);
+    let varOrdinal = 0;
     return arr.map((elem) => {
       if (rcsVarTestRegex.test(elem)) {
         const key = getVarNameFromToken(elem);
-        const v = cardVarMapped?.[key];
-        if (isNil(v) || String(v)?.trim?.() === '') return elem;
-        return String(v);
+        const globalSlot = slotOffset + varOrdinal;
+        varOrdinal += 1;
+        const slotValue = resolveCardVarMappedSlotValue(
+          cardVarMapped,
+          key,
+          globalSlot,
+          isEditLike,
+          rcsSpanningSemanticVarNames.has(key),
+        );
+        if (isNil(slotValue) || String(slotValue)?.trim?.() === '') return elem;
+        return String(slotValue);
       }
       return elem;
     }).join('');
   };
 
+  /**
+   * Carousel resolve: each variable slot's key comes from `computeCarouselVarSlotKeys` (title,
+   * then description, per card; same name within a card shares one key; different cards never
+   * collide). A slot's key never depends on which tag currently fills it.
+   */
+  const resolveCarouselTemplateWithMap = (str = '', cardIndex, isDescField = false) => {
+    if (!str) return '';
+    const arr = splitTemplateVarStringRcs(str);
+    const fieldKeys = (isDescField
+      ? computeCarouselVarSlotKeys(carouselData, rcsVarRegex)[cardIndex]?.description
+      : computeCarouselVarSlotKeys(carouselData, rcsVarRegex)[cardIndex]?.title) ?? [];
+    let varOrdinal = 0;
+    return arr.map((elem) => {
+      if (rcsVarTestRegex.test(elem)) {
+        const slotKey = fieldKeys[varOrdinal];
+        varOrdinal += 1;
+        const slotValue = cardVarMapped?.[slotKey];
+        if (isNil(slotValue) || String(slotValue)?.trim?.() === '') return elem;
+        return String(slotValue);
+      }
+      return elem;
+    }).join('');
+  };
 
-  useEffect(() => {
-    if (isFullMode || isEditFlow) return;
-    const tokens = [
-      ...(templateTitle ? (templateTitle.match(rcsVarRegex) || []) : []),
-      ...(templateDesc ? (templateDesc.match(rcsVarRegex) || []) : []),
-    ];
-    if (!tokens.length) return;
-    setCardVarMapped((prev) => {
-      const next = { ...(prev || {}) };
-      let changed = false;
-      tokens.forEach((t) => {
-        const name = getVarNameFromToken(t);
-        if (name && !Object.prototype.hasOwnProperty.call(next, name)) {
-          next[name] = '';
-          changed = true;
-        }
-      });
-      return changed ? next : prev;
-    });
-  }, [isFullMode, templateTitle, templateDesc]);
+  const buildCarouselCardsForPreview = (cards = []) =>
+    buildCarouselCardsForPreviewUtil(cards, { isFullMode, rcsVarRegex, resolveTemplateWithMap });
 
+  /**
+   * Content for TestAndPreviewSlidebox — apply cardVarMapped whenever the slot editor is shown
+   * (VarSegmentMessageEditor: isEditFlow || !isFullMode). Full-mode create without edit uses plain
+   * TextArea only — no mapping. Full-mode + edit uses slots; !isFullMode alone is not enough.
+   */
+  const getTemplateContent = useCallback(() => {
+    if (templateType === contentType.carousel) {
+      const carouselDimKey = getCarouselDimensionKey(selectedCarouselHeight, selectedCarouselWidth);
+      const carouselImgDims =
+        RCS_CAROUSEL_IMAGE_DIMENSIONS[carouselDimKey] || RCS_CAROUSEL_IMAGE_DIMENSIONS.MEDIUM_MEDIUM;
+      const carouselVidDims =
+        RCS_CAROUSEL_VIDEO_THUMBNAIL_DIMENSIONS[carouselDimKey]
+        || RCS_CAROUSEL_VIDEO_THUMBNAIL_DIMENSIONS.MEDIUM_MEDIUM;
+      return {
+        carouselData: buildCarouselCardsForPreview(carouselData),
+        carouselPreviewDimensions: {
+          imageWidth: carouselImgDims.width,
+          imageHeight: carouselImgDims.height,
+          videoThumbWidth: carouselVidDims.width,
+          videoThumbHeight: carouselVidDims.height,
+        },
+      };
+    }
+    const isMediaTypeImage = templateMediaType === RCS_MEDIA_TYPES.IMAGE;
+    const isMediaTypeVideo = templateMediaType === RCS_MEDIA_TYPES.VIDEO;
+    const isMediaTypeText = templateMediaType === RCS_MEDIA_TYPES.NONE;
+
+    const isSlotMappingMode = isEditFlow || !isFullMode;
+    const titleVarCountForResolve = isMediaTypeText
+      ? 0
+      : ((templateTitle ? (templateTitle.match(rcsVarRegex) || []) : []).length);
+    const resolvedTitle = isMediaTypeText
+      ? ''
+      : (isSlotMappingMode ? resolveTemplateWithMap(templateTitle, 0) : templateTitle);
+    const resolvedDesc = isSlotMappingMode
+      ? resolveTemplateWithMap(templateDesc, titleVarCountForResolve)
+      : templateDesc;
+
+    const mediaPreview = {};
+    if (isMediaTypeImage && rcsImageSrc) {
+      mediaPreview.rcsImageSrc = rcsImageSrc;
+    }
+    if (isMediaTypeVideo && !isMediaTypeText) {
+      if (rcsThumbnailSrc) {
+        mediaPreview.rcsVideoSrc = rcsThumbnailSrc;
+      } else if (rcsVideoSrc?.videoSrc) {
+        mediaPreview.rcsVideoSrc = rcsVideoSrc.videoSrc;
+      }
+      if (rcsThumbnailSrc) {
+        mediaPreview.rcsThumbnailSrc = rcsThumbnailSrc;
+      }
+    }
+
+    const contentObj = {
+      templateHeader: resolvedTitle,
+      templateMessage: resolvedDesc,
+      ...mediaPreview,
+      ...(suggestions.length > 0 && {
+        suggestions: suggestions,
+      }),
+    };
+
+    return contentObj;
+  }, [
+    templateMediaType,
+    templateTitle,
+    templateDesc,
+    rcsImageSrc,
+    rcsVideoSrc,
+    rcsThumbnailSrc,
+    suggestions,
+    selectedDimension,
+    isFullMode,
+    isEditFlow,
+    cardVarMapped,
+    rcsSpanningSemanticVarNames,
+    carouselData,
+    selectedCarouselHeight,
+    selectedCarouselWidth,
+  ]);
+
+  const testAndPreviewContent = useMemo(() => getTemplateContent(), [getTemplateContent]);
 
-  const RcsLabel = styled.div`
-    display: flex;
-    margin-top: 20px;
-  `;
   const paramObj = params || {};
   useEffect(() => {
   const { id } = paramObj;
   if (id && isFullMode) {
     setSpin(true);
     actions.getTemplateDetails(id, setSpin);
+  } else if (!id && isFullMode) {
+    // Create New: clear standalone media and ALL possible carousel card Redux slots.
+    // Redux persists across mounts so we must clear unconditionally (carouselData may be [] on fresh mount).
+    updateRcsImageSrc('');
+    setRcsVideoSrc({});
+    setRcsThumbnailSrc('');
+    setAssetList({});
+    setEditFlow(false);
+    actions.clearRcsMediaAsset(0);
+    actions.clearRcsMediaAsset(1);
+    for (let cardIdx = 0; cardIdx < MAX_RCS_CAROUSEL_ALLOWED; cardIdx += 1) {
+      actions.clearRcsMediaAsset(getCarouselImageAssetIndex(cardIdx));
+      actions.clearRcsMediaAsset(getCarouselVideoAssetIndex(cardIdx));
+      actions.clearRcsMediaAsset(getCarouselThumbnailAssetIndex(cardIdx));
+    }
+    setCarouselData([]);
+    setCarouselErrors([]);
   }
   return () => {
     actions.clearEditResponse();
@@ -470,59 +1015,68 @@ export const Rcs = (props) => {
   }, [paramObj.id]);
 
   useEffect(() => {
-      if (!(isEditFlow || !isFullMode)) return;
+    if (!(isEditFlow || !isFullMode)) return;
 
-      const initField = (targetString, currentVarMap, setVarMap, setUpdated) => {
-        const arr = splitTemplateVarString(targetString);
-        if (!arr?.length) {
-          setVarMap({});
-          setUpdated([]);
-          return;
+    const titleTokenCount = (templateTitle ? (templateTitle.match(rcsVarRegex) || []) : []).length;
+
+    const initField = (targetString, setVarMap, slotOffset) => {
+      const arr = splitTemplateVarStringRcs(targetString);
+      if (!arr?.length) {
+        setVarMap({});
+        return;
+      }
+      const nextVarMap = {};
+      let varOrdinal = 0;
+      arr.forEach((elem, idx) => {
+        // Mustache tokens: {{1}}, {{user_name}}, {{tag.FORMAT_1}}, etc.
+        if (rcsVarTestRegex.test(elem)) {
+          const id = `${elem}_${idx}`;
+          const varName = getVarNameFromToken(elem);
+          const globalSlot = slotOffset + varOrdinal;
+          varOrdinal += 1;
+          const mappedValue = resolveCardVarMappedSlotValue(
+            cardVarMapped,
+            varName,
+            globalSlot,
+            isEditLike,
+            rcsSpanningSemanticVarNames.has(varName),
+          );
+          nextVarMap[id] = mappedValue;
         }
-        const nextVarMap = {};
-        const nextUpdated = [...arr];
-        arr.forEach((elem, idx) => {
-          // RCS placeholders are alphanumeric/underscore (e.g. {{user_name}}), not numeric-only
-          if (rcsVarTestRegex.test(elem)) {
-            const id = `${elem}_${idx}`;
-            const varName = getVarNameFromToken(elem);
-            const mappedValue = (cardVarMapped?.[varName] ?? '').toString();
-            nextVarMap[id] = mappedValue;
-            if (mappedValue !== '') {
-              nextUpdated[idx] = mappedValue;
-            } else {
-              nextUpdated[idx] = elem;
-            }
-          }
-        });
-        setVarMap(nextVarMap);
-        setUpdated(nextUpdated);
-      };
+      });
+      setVarMap(nextVarMap);
+    };
 
-      initField(templateTitle, titleVarMappedData, setTitleVarMappedData, setUpdatedTitleData);
-      initField(templateDesc, descVarMappedData, setDescVarMappedData, setUpdatedDescData);
-    }, [templateTitle, templateDesc, cardVarMapped, isEditFlow, isFullMode]);
-    
-    useEffect(() => {
-      if(!isEditFlow && isFullMode){
+    initField(templateTitle, setTitleVarMappedData, 0);
+    initField(templateDesc, setDescVarMappedData, titleTokenCount);
+  }, [templateTitle, templateDesc, cardVarMapped, isEditFlow, isFullMode, rcsSpanningSemanticVarNames]);
+
+  useEffect(() => {
+    if (!isEditFlow && isFullMode) {
       setRcsVideoSrc({});
       updateRcsImageSrc('');
-      setUpdateRcsImageSrc('');
-      updateRcsThumbnailSrc('');
+      setRcsThumbnailSrc('');
       setAssetList({});
-      }
-     }, [templateMediaType]);
+    }
+  }, [templateMediaType]);
   
-    const templateStatusHelper = (details) => {
-      const status = get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].Status', '');
-      switch (status) {
+    /** Status on first card — same merged card as title/description/cardVarMapped (library may only set rcsContent at root). */
+    const templateStatusHelper = (cardContentFirst) => {
+      const raw =
+        cardContentFirst?.Status
+        ?? cardContentFirst?.status
+        ?? cardContentFirst?.approvalStatus
+        ?? '';
+      const status = typeof raw === 'string' ? raw.trim() : String(raw);
+      const normalizedStatus = status.toLowerCase();
+      switch (normalizedStatus) {
         case RCS_STATUSES.approved:
           setTemplateStatus(RCS_STATUSES.approved);
           break;
         case RCS_STATUSES.pending:
           setTemplateStatus(RCS_STATUSES.pending);
           break;
-        case RCS_STATUSES.awaitingApproval:
+        case RCS_STATUSES.awaitingApproval.toLowerCase():
           setTemplateStatus(RCS_STATUSES.awaitingApproval);
           break;
         case RCS_STATUSES.unavailable:
@@ -531,6 +1085,9 @@ export const Rcs = (props) => {
         case RCS_STATUSES.rejected:
           setTemplateStatus(RCS_STATUSES.rejected);
           break;
+        case RCS_STATUSES.created:
+          setTemplateStatus(RCS_STATUSES.created);
+          break;
         default:
           setTemplateStatus(status);
           break;
@@ -584,48 +1141,261 @@ export const Rcs = (props) => {
   };
   
   useEffect(() => {
-    const details = isFullMode ? rcsData?.templateDetails : templateData;
+    const details = rcsHydrationDetails;
     if (details && Object.keys(details).length > 0) {
-      if (!isFullMode) {
-        const tempCardVarMapped = get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].cardVarMapped', {});
-        setCardVarMapped(tempCardVarMapped);
+      // Library/campaign: match SMS fallback — read from versions… and from top-level rcsContent (getCreativesData / parent shape).
+      const cardFromVersions = get(
+        details,
+        'versions.base.content.RCS.rcsContent.cardContent[0]',
+      );
+      const rcsContent = get(details, 'versions.base.content.RCS.rcsContent', {});
+      const cardType = (rcsContent?.cardType || '').toString();
+      
+      setEditFlow(true);
+      setTemplateName(details?.name || details?.creativeName || '');
+   
+      const cardFromTop = get(details, 'rcsContent.cardContent[0]');
+      const card0 = { ...(cardFromTop || {}), ...(cardFromVersions || {}) };
+      const cardVarMappedFromCardContent =
+        card0?.cardVarMapped != null && typeof card0.cardVarMapped === 'object'
+          ? card0.cardVarMapped
+          : {};
+      const cardVarMappedFromRootMirror =
+        details?.rcsCardVarMapped != null && typeof details.rcsCardVarMapped === 'object'
+          ? details.rcsCardVarMapped
+          : {};
+      // Root mirror from getCreativesData / getFormData — campaigns often preserve flat fields when
+      // nested versions.cardContent[0].cardVarMapped is dropped on reload.
+      const mergedCardVarMappedFromPayload = {
+        ...cardVarMappedFromRootMirror,
+        ...cardVarMappedFromCardContent,
+      };
+      const loadedTitleForMap = card0?.title != null ? String(card0.title) : '';
+      const loadedDescForMap = card0?.description != null ? String(card0.description) : '';
+      const hydratedCardVarPayloadSignature = `${loadedTitleForMap}\u0000${loadedDescForMap}\u0000${JSON.stringify(
+        Object.keys(mergedCardVarMappedFromPayload)
+          .sort()
+          .reduce((accumulator, mapKey) => {
+            accumulator[mapKey] = mergedCardVarMappedFromPayload[mapKey];
+            return accumulator;
+          }, {}),
+      )}`;
+      if (lastHydratedRcsCardVarSignatureRef.current !== hydratedCardVarPayloadSignature) {
+        lastHydratedRcsCardVarSignatureRef.current = hydratedCardVarPayloadSignature;
+        setRcsVarSegmentEditorRemountKey((previousKey) => previousKey + 1);
+      }
+      const tokenListForMap = [
+        ...(loadedTitleForMap ? loadedTitleForMap.match(rcsVarRegex) ?? [] : []),
+        ...(loadedDescForMap ? loadedDescForMap.match(rcsVarRegex) ?? [] : []),
+      ];
+      const orderedTagNamesForMap = tokenListForMap.map((token) => getVarNameFromToken(token)).filter(Boolean);
+      // Full-mode library/API payloads need normalize for legacy slot shapes. Campaign round-trip from
+      // getFormData already stores TagList values as {{TagName}}; normalize can strip or remap them.
+      const cardVarMappedBeforeCoalesce = isFullMode
+        ? normalizeCardVarMapped(mergedCardVarMappedFromPayload, orderedTagNamesForMap)
+        : { ...mergedCardVarMappedFromPayload };
+      const cardVarMappedAfterCoalesce = coalesceCardVarMappedToTemplate(
+        cardVarMappedBeforeCoalesce,
+        loadedTitleForMap,
+        loadedDescForMap,
+        rcsVarRegex,
+      );
+      const cardVarMappedAfterNumericSlotSync = !isFullMode
+        ? syncCardVarMappedSemanticsFromSlots(
+          cardVarMappedAfterCoalesce,
+          loadedTitleForMap,
+          loadedDescForMap,
+          rcsVarRegex,
+        )
+        : cardVarMappedAfterCoalesce;
+      const hydratedCardVarMappedResult = { ...cardVarMappedAfterNumericSlotSync };
+      // Pre-populate variable/tag mappings while opening an existing template in edit flows
+      setCardVarMapped((previousVarMapState) => {
+        const previousVarMap = previousVarMapState ?? {};
+        if (previousVarMap === hydratedCardVarMappedResult) return previousVarMapState;
+        const previousVarMapKeys = Object.keys(previousVarMap);
+        const nextVarMapKeys = Object.keys(hydratedCardVarMappedResult);
+        if (previousVarMapKeys.length === nextVarMapKeys.length) {
+          const allSlotValuesMatchPrevious = previousVarMapKeys.every(
+            (key) => previousVarMap[key] === hydratedCardVarMappedResult[key],
+          );
+          if (allSlotValuesMatchPrevious) return previousVarMapState;
+        }
+        return hydratedCardVarMappedResult;
+      });
+
+      if (cardType.toUpperCase() === contentType.carousel) {
+
+        setTemplateType(contentType.carousel);
+        setTemplateMediaType(RCS_MEDIA_TYPES.NONE);
+        // Library/campaign payloads can store cardSettings/cardContent at the flat top-level
+        // `rcsContent` instead of nested under versions.base.content.RCS (same fallback already
+        // used for the rich_card media lookup below, line ~1793). Without it, cardWidth/height
+        // silently fall back to SMALL/MEDIUM, mismatching the dimensions the thumbnail was
+        // actually uploaded at and causing object-fit:cover to crop the preview image.
+        const cardSettings = rcsContent?.cardSettings
+          || get(details, 'rcsContent.cardSettings', {});
+        const cardWidth = cardSettings?.cardWidth || SMALL;
+        setSelectedCarouselWidth(cardWidth);
+
+        const cards = Array.isArray(rcsContent?.cardContent)
+          ? rcsContent.cardContent
+          : get(details, 'rcsContent.cardContent', []);
+        const firstHeight = cards?.[0]?.media?.height || MEDIUM;
+        setSelectedCarouselHeight(firstHeight);
+        setSelectedCarousel(`${firstHeight}_${cardWidth}`);
+        setActiveCarouselIndex('0');
+
+        if (cards.length > 1) {
+          // Each card's own `cardVarMapped` is already keyed by global var position (see
+          // computeCarouselVarSlotKeys) — a slot's key is assigned once, from where its token
+          // sits in the template text, and never depends on which tag fills it. So merging every
+          // card's own map directly is correct and collision-free: no per-card coalescing,
+          // normalizing, or re-scoping needed (unlike the old name-based scoped-key scheme).
+          setCardVarMapped((previousVarMap) => cards.reduce((merged, c = {}) => {
+            const rawCardMap = c?.cardVarMapped;
+            if (rawCardMap == null || typeof rawCardMap !== 'object') return merged;
+            return { ...merged, ...rawCardMap };
+          }, { ...(previousVarMap || {}) }));
+        }
+
+        const hydratedCards = cards.map((c = {}, idx) => {
+          const mediaType = c.mediaType;
+          const media = c.media || {};
+          const mediaUrl = media.mediaUrl || '';
+          const thumbUrl = media.thumbnailUrl || '';
+          const rawSuggestions = Array.isArray(c.suggestions) ? c.suggestions : [];
+          const suggestions = idx === 0 && rawSuggestions.length === 0
+            ? cloneDeep(RCS_CAROUSEL_FIRST_CARD_DEFAULT_SUGGESTIONS)
+            : rawSuggestions;
+          return {
+            title: c.title || '',
+            description: c.description || '',
+            mediaType,
+            imageSrc: mediaType === RCS_MEDIA_TYPES.IMAGE ? mediaUrl : '',
+            videoAsset: mediaType === RCS_MEDIA_TYPES.VIDEO ? {
+              videoSrc: mediaUrl,
+              previewUrl: thumbUrl,
+              videoThumbnail: thumbUrl,
+              videoName: c?.media?.videoName || '',
+            } : {},
+            thumbnailSrc: mediaType === RCS_MEDIA_TYPES.VIDEO ? thumbUrl : '',
+            suggestions,
+          };
+        });
+        setCarouselData(
+          hydratedCards.length > 0
+            ? ensureFirstCardDefaultPhoneSuggestions(hydratedCards)
+            : [cloneDeep(RCS_CAROUSEL_INITIAL_FIRST_CARD)],
+        );
+        setCarouselErrors(new Array(hydratedCards.length > 0 ? hydratedCards.length : 1).fill({}));
+
+        // Status bar uses first card's Status, keep existing behavior.
+       if (isHostInfoBip) {
+          setTemplateStatus('');
+        } else {
+          const firstCard = cards?.[0] || {};
+          const cardForCarouselStatus = {
+            ...firstCard,
+            Status:
+              firstCard.Status
+              ?? firstCard.status
+              ?? firstCard.approvalStatus
+              ?? get(details, 'templateStatus')
+              ?? get(details, 'approvalStatus')
+              ?? get(details, 'creativeStatus')
+              ?? get(details, 'versions.base.content.RCS.templateApprovalStatus')
+              ?? '',
+          };
+          templateStatusHelper(cardForCarouselStatus);
+        }
+
+        // Hydrate SMS fallback for carousel — same logic as for non-carousel types below.
+        // Without this the early `return` skips fallback hydration entirely, so reopening
+        // a carousel template never restores the saved SMS fallback data.
+        applySmsFallbackHydration({
+          details,
+          isFullMode,
+          lastSmsFallbackHydrationKeyRef,
+          setSmsFallbackData,
+        });
+
+        return;
       }
-      const mediaType = get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].mediaType', '');
-      if (mediaType === RCS_MEDIA_TYPES.NONE) {
+
+      const mediaType =
+        card0.mediaType
+        || get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].mediaType', '');
+      if (cardType.toUpperCase() !== contentType.carousel && mediaType === RCS_MEDIA_TYPES.NONE) {
         setTemplateType(contentType.text_message);
-      } else {
+      } else if (cardType.toUpperCase() !== contentType.carousel && mediaType !== RCS_MEDIA_TYPES.NONE) {
         setTemplateType(contentType.rich_card);
       }
-      setEditFlow(true);
-      setTemplateName(details.name || '');
-      const loadedTitle = get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].title', '');
-      const loadedDesc = get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].description', '');
-      const loadedMap = get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].cardVarMapped', {});
-      const normalizedTitle = (!isFullMode && !isEmpty(loadedMap)) ? getUnmappedDesc(loadedTitle, loadedMap) : loadedTitle;
-      const normalizedDesc = (!isFullMode && !isEmpty(loadedMap)) ? getUnmappedDesc(loadedDesc, loadedMap) : loadedDesc;
+     
+      const loadedTitle = loadedTitleForMap;
+      const loadedDesc = loadedDescForMap;
+      const { normalizedTitle, normalizedDesc } = normalizeLibraryLoadedTitleDesc({
+        loadedTitle,
+        loadedDesc,
+        isFullMode,
+        cardVarMappedAfterHydration: hydratedCardVarMappedResult,
+        rcsVarRegex,
+      });
       setTemplateTitle(normalizedTitle);
       setTemplateDesc(normalizedDesc);
-      setSuggestions(get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].suggestions', []));
-      templateStatusHelper(details);
-      const mediaData = get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].media', '');
-      const cardSettings = get(details, 'versions.base.content.RCS.rcsContent.cardSettings', '');
+      setSuggestions(
+        Array.isArray(card0.suggestions)
+          ? card0.suggestions
+          : get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].suggestions', []),
+      );
+      const cardForStatus = {
+        ...card0,
+        Status:
+          card0.Status
+          ?? card0.status
+          ?? card0.approvalStatus
+          ?? get(details, 'templateStatus')
+          ?? get(details, 'approvalStatus')
+          ?? get(details, 'creativeStatus')
+          ?? get(details, 'versions.base.content.RCS.templateApprovalStatus')
+          ?? '',
+      };
+      if (isHostInfoBip) {
+        setTemplateStatus('');
+      } else {
+        templateStatusHelper(cardForStatus);
+      }
+      const mediaData =
+        card0.media != null && card0.media !== ''
+          ? card0.media
+          : get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].media', '');
+      const cardSettings =
+        get(details, 'versions.base.content.RCS.rcsContent.cardSettings', '')
+        || get(details, 'rcsContent.cardSettings', '');
       setMediaData(mediaData, mediaType, cardSettings);
       if (details?.edit) {
         const rcsAccountId = get(details, 'versions.base.content.RCS.rcsContent.accountId', '');
         setRcsAccount(rcsAccountId);
       }
+
+      applySmsFallbackHydration({
+        details,
+        isFullMode,
+        lastSmsFallbackHydrationKeyRef,
+        setSmsFallbackData,
+      });
     }
-  }, [rcsData, templateData, isFullMode, isEditFlow]);
-  
+  }, [rcsHydrationDetails, isFullMode, isHostInfoBip]);
 
   useEffect(() => {
     if (templateType === contentType.text_message) {
       setTemplateMediaType(RCS_MEDIA_TYPES.NONE);
-      setTemplateTitle('');
-      setTemplateTitleError('');
+      // Full-mode create only: switching to plain text clears draft title/media. Never clear when
+      // hydrating library/edit (would wipe templateData after load) — regression seen after SMS fallback work.
       if (!isEditFlow && isFullMode) {
+        setTemplateTitle('');
+        setTemplateTitleError('');
         setUpdateRcsImageSrc('');
-        setUpdateRcsVideoSrc({});
         setRcsVideoSrc({});
         setSelectedDimension(RCS_IMAGE_DIMENSIONS.MEDIUM_HEIGHT.type);
       }
@@ -649,23 +1419,22 @@ export const Rcs = (props) => {
   }, [templateType, isEditFlow, isFullMode]);
   
   useEffect(() => {
-    if (!showDltContainer) {
-      const { type, module } = location.query || {};
-      const isEmbedded = type === EMBEDDED;
-      const context = isEmbedded ? module : DEFAULT;
-      const embedded = isEmbedded ? type : FULL;
-      const query = {
-        layout: SMS,
-        type: TAG,
-        context,
-        embedded,
-      };
-      if (getDefaultTags) {
-        query.context = getDefaultTags;
-      }
-      globalActions.fetchSchemaForEntity(query);
+    const { type, module } = location.query || {};
+    const isEmbedded = type === EMBEDDED;
+    // Match TagList initial fetch (getTagsforContext('Outbound') → context "outbound") so we do not request a different context than the two TagList headers.
+    const context = isEmbedded ? module : 'outbound';
+    const embedded = isEmbedded ? type : FULL;
+    const query = {
+      layout: SMS,
+      type: TAG,
+      context,
+      embedded,
+    };
+    if (getDefaultTags) {
+      query.context = getDefaultTags;
     }
-  }, [showDltContainer]);
+    fetchTagSchemaIfNewQuery(query);
+  }, [fetchTagSchemaIfNewQuery]);
 
   useEffect(() => {
     let tag = get(metaEntities, `tags.standard`, []);
@@ -688,39 +1457,167 @@ export const Rcs = (props) => {
       context,
       embedded,
     };
+    if (getDefaultTags) {
+      query.context = getDefaultTags;
+    }
+    fetchTagSchemaIfNewQuery(query);
     globalActions.fetchSchemaForEntity(query);
   };
 
-  const onTagSelect = (data, areaId) => {
-    if (!areaId) return;
-    const sep = areaId.lastIndexOf('_');
-    if (sep === -1) return;
-    const numId = Number(areaId.slice(sep + 1));
-    if (isNaN(numId)) return;
-    const token = areaId.slice(0, sep);
-    const variableName = getVarNameFromToken(token);
-    if (!variableName) return;
-    setCardVarMapped((prev) => {
-      const base = (prev?.[variableName] ?? '').toString();
-      const nextVal = `${base}{{${data}}}`;
-      return {
-        ...(prev || {}),
-        [variableName]: nextVal,
-      };
+  const replaceNumericPlaceholderWithTagInTemplate = (templateStr, numericVarName, tagName) => {
+    if (!templateStr || !numericVarName || !tagName) return templateStr;
+    const placeholderRegex = buildRcsNumericMustachePlaceholderRegex(numericVarName);
+    return templateStr.replace(placeholderRegex, `{{${tagName}}}`);
+  };
+
+  const onTagSelect = (selectedTagNameFromPicker, varSegmentCompositeDomId, tagAreaField) => {
+    if (!varSegmentCompositeDomId) return;
+    const underscoreIndexInCompositeId = varSegmentCompositeDomId.lastIndexOf('_');
+    if (underscoreIndexInCompositeId === -1) return;
+    const segmentIndexSuffix = varSegmentCompositeDomId.slice(underscoreIndexInCompositeId + 1);
+    if (segmentIndexSuffix === '' || isNaN(Number(segmentIndexSuffix))) return;
+    const mustacheTokenFromCompositeId = varSegmentCompositeDomId.slice(0, underscoreIndexInCompositeId);
+    const semanticOrNumericVarName = getVarNameFromToken(mustacheTokenFromCompositeId);
+    if (!semanticOrNumericVarName) return;
+    const isNumericPlaceholderSlot = RCS_NUMERIC_VAR_NAME_REGEX.test(String(semanticOrNumericVarName));
+    const templateStringForField =
+      tagAreaField === RCS_TAG_AREA_FIELD_TITLE ? templateTitle : templateDesc;
+    const titleOrMessageFieldType =
+      tagAreaField === RCS_TAG_AREA_FIELD_TITLE ? TITLE_TEXT : MESSAGE_TEXT;
+    const globalVarSlotIndexZeroBased = getGlobalSlotIndexForRcsFieldId(
+      varSegmentCompositeDomId,
+      templateStringForField,
+      titleOrMessageFieldType,
+    );
+    const cardVarMappedNumericSlotKey =
+      globalVarSlotIndexZeroBased !== null && globalVarSlotIndexZeroBased !== undefined
+        ? String(globalVarSlotIndexZeroBased + 1)
+        : null;
+
+    setCardVarMapped((previousCardVarMapped) => {
+      const updatedCardVarMapped = { ...(previousCardVarMapped || {}) };
+      if (isNumericPlaceholderSlot) {
+        const existingValueBeforeAppend = (
+          previousCardVarMapped?.[semanticOrNumericVarName] ?? ''
+        ).toString();
+        const mappedValueAfterAppendingTag = `${existingValueBeforeAppend}{{${selectedTagNameFromPicker}}}`;
+        delete updatedCardVarMapped[semanticOrNumericVarName];
+        updatedCardVarMapped[selectedTagNameFromPicker] = mappedValueAfterAppendingTag;
+      } else {
+        // Same semantic token (e.g. {{adv}}) in title and body must not share one map key for
+        // "existing value" — that appends the new tag onto the other field. Match handleRcsVarChange:
+        // read/write the global numeric slot only and drop the shared semantic key.
+        const existingValueBeforeAppend = cardVarMappedNumericSlotKey
+          ? String(previousCardVarMapped?.[cardVarMappedNumericSlotKey] ?? '')
+          : String(previousCardVarMapped?.[semanticOrNumericVarName] ?? '');
+        const mappedValueAfterAppendingTag = `${existingValueBeforeAppend}{{${selectedTagNameFromPicker}}}`;
+        delete updatedCardVarMapped[semanticOrNumericVarName];
+        if (cardVarMappedNumericSlotKey) {
+          updatedCardVarMapped[cardVarMappedNumericSlotKey] = mappedValueAfterAppendingTag;
+          // Sync all other intra-field occurrences of the same variable (cross-field slots stay independent)
+          const fieldOffset = titleOrMessageFieldType === TITLE_TEXT ? 0 : (templateTitle?.match(rcsVarRegex) ?? []).length;
+          const fieldSegments = splitTemplateVarStringRcs(templateStringForField ?? '');
+          let varOrdinal = 0;
+          for (let i = 0; i < fieldSegments.length; i++) {
+            if (rcsVarTestRegex.test(fieldSegments[i])) {
+              const slotVarName = getVarNameFromToken(fieldSegments[i]);
+              const globalSlot = fieldOffset + varOrdinal;
+              varOrdinal += 1;
+              if (slotVarName === semanticOrNumericVarName && globalSlot !== globalVarSlotIndexZeroBased) {
+                updatedCardVarMapped[String(globalSlot + 1)] = mappedValueAfterAppendingTag;
+              }
+            }
+          }
+        } else {
+          updatedCardVarMapped[semanticOrNumericVarName] = mappedValueAfterAppendingTag;
+        }
+      }
+      return updatedCardVarMapped;
     });
+
+    if (
+      isNumericPlaceholderSlot
+      && (tagAreaField === RCS_TAG_AREA_FIELD_TITLE || tagAreaField === RCS_TAG_AREA_FIELD_DESC)
+    ) {
+      if (tagAreaField === RCS_TAG_AREA_FIELD_TITLE) {
+        setTemplateTitle((previousTitle) => {
+          const titleAfterReplacingNumericPlaceholder = replaceNumericPlaceholderWithTagInTemplate(
+            previousTitle || '',
+            semanticOrNumericVarName,
+            selectedTagNameFromPicker,
+          );
+          if (titleAfterReplacingNumericPlaceholder === previousTitle) return previousTitle;
+          setTemplateTitleError(variableErrorHandling(titleAfterReplacingNumericPlaceholder));
+          // Remount segment editor: tag insert replaces {{n}} with e.g. {{tag.FORMAT_1}} — slot ids change; avoids stale UI vs manual typing in full-mode TextArea
+          setRcsVarSegmentEditorRemountKey((remountKey) => remountKey + 1);
+          return titleAfterReplacingNumericPlaceholder;
+        });
+      } else {
+        setTemplateDesc((previousDescription) => {
+          const descriptionAfterReplacingNumericPlaceholder = replaceNumericPlaceholderWithTagInTemplate(
+            previousDescription || '',
+            semanticOrNumericVarName,
+            selectedTagNameFromPicker,
+          );
+          if (descriptionAfterReplacingNumericPlaceholder === previousDescription) {
+            return previousDescription;
+          }
+          setTemplateDescError(variableErrorHandling(descriptionAfterReplacingNumericPlaceholder));
+          setRcsVarSegmentEditorRemountKey((remountKey) => remountKey + 1);
+          return descriptionAfterReplacingNumericPlaceholder;
+        });
+      }
+    }
   };
 
-  const onTitleTagSelect = (data) => onTagSelect(data, titleTextAreaId);
+  const onTitleTagSelect = (tagName) => onTagSelect(tagName, titleTextAreaId, RCS_TAG_AREA_FIELD_TITLE);
+
+  const onDescTagSelect = (tagName) => onTagSelect(tagName, descTextAreaId, RCS_TAG_AREA_FIELD_DESC);
 
-  const onDescTagSelect = (data) => onTagSelect(data, descTextAreaId);
+  /** Field-local var ordinal (0-based, vars only) for a `{{tok}}_segIdx` composite id — scoped to
+   * a single field's own template string (title and description are tracked independently). */
+  const getCarouselFieldLocalVarOrdinal = (compositeId, fieldTemplateStr) => {
+    const segments = splitTemplateVarStringRcs(fieldTemplateStr ?? '');
+    let varOrdinal = 0;
+    for (let segmentIndex = 0; segmentIndex < segments.length; segmentIndex += 1) {
+      if (rcsVarTestRegex.test(segments[segmentIndex])) {
+        if (`${segments[segmentIndex]}_${segmentIndex}` === compositeId) return varOrdinal;
+        varOrdinal += 1;
+      }
+    }
+    return null;
+  };
 
-  const onTagSelectFallback = (data) => {
-    const tempMsg = `${fallbackMessage}{{${data}}}`;
-    const error = fallbackMessageErrorHandler(tempMsg);
-    setFallbackMessage(tempMsg);
-    setFallbackMessageError(error);
+  // The card's placeholder (numeric {{N}} or a bare semantic token like {{first_name}}) is locked
+  // here — picking a tag only supplies/replaces the *value* behind that slot in cardVarMapped, it
+  // never rewrites the card's title/description text. `focusedVarId` is passed in by the caller
+  // (title vs description each track their own last-focused slot, like titleTextAreaId/
+  // descTextAreaId) so a click on one field's "Add Labels" can never apply to the other field's
+  // last-focused slot. The slot's key is its global position across the whole carousel — assigned
+  // once from where its token sits in the template text, never from whatever tag currently fills
+  // it — so swapping tags never changes the key and never collides with another card's slot.
+  const onCarouselTagSelect = (data, focusedVarId, isDescField) => {
+    if (!focusedVarId) return;
+    const activeIdx = parseInt(activeCarouselIndex, 10);
+    const cardIndex = isNaN(activeIdx) ? 0 : activeIdx;
+    const fieldTemplateStr = (isDescField
+      ? carouselData?.[cardIndex]?.description
+      : carouselData?.[cardIndex]?.title) || '';
+    const localVarOrdinal = getCarouselFieldLocalVarOrdinal(focusedVarId, fieldTemplateStr);
+    if (localVarOrdinal == null) return;
+    const slotKeys = computeCarouselVarSlotKeys(carouselData, rcsVarRegex)[cardIndex];
+    const slotKey = (isDescField ? slotKeys?.description : slotKeys?.title)?.[localVarOrdinal];
+    if (!slotKey) return;
+
+    setCardVarMapped((prev) => ({
+      ...(prev || {}),
+      [slotKey]: `{{${data}}}`,
+    }));
   };
 
+  const onCarouselTitleTagSelect = (data) => onCarouselTagSelect(data, carouselTitleFocusedVarId, false);
+
+  const onCarouselDescTagSelect = (data) => onCarouselTagSelect(data, carouselDescFocusedVarId, true);
 
   //removing optout tag for rcs
   const getRcsTags = () => {
@@ -733,15 +1630,14 @@ export const Rcs = (props) => {
   };
   // tag Code end
 
-  const renderLabel = (value, showLabel, desc) => {
-    const isTemplateApproved = (templateStatus === RCS_STATUSES.approved);
+  const renderLabel = (value, desc) => {
     return (
       <>
-        <RcsLabel>
+        <div className="rcs-form-section-heading">
           <CapHeading type="h4">{formatMessage(messages[value])}</CapHeading>
-        </RcsLabel>
+        </div>
         {desc && (
-          <CapLabel type="label3" style={{ marginBottom: '17px' }}>
+          <CapLabel type="label3" className="rcs-form-field-caption">
             {formatMessage(messages[desc])}
           </CapLabel>
         )}
@@ -760,13 +1656,8 @@ export const Rcs = (props) => {
     },
     {
       value: contentType.carousel,
-      label: (
-        <CapTooltip title={formatMessage(messages.disabledCarouselTooltip)}>
-          {formatMessage(messages.carousel)}
-        </CapTooltip>
-      ),
-      disabled: true,
-    },
+      label: formatMessage(messages.carousel),
+    }
   ];
 
   const onTemplateNameChange = ({ target: { value } }) => {
@@ -777,6 +1668,10 @@ export const Rcs = (props) => {
 
   const onTemplateTypeChange = ({ target: { value } }) => {
     setTemplateType(value);
+    // Carousel has per-card media; keep template-level media type neutral.
+    if (value === contentType.carousel) {
+      setTemplateMediaType(RCS_MEDIA_TYPES.NONE);
+    }
   };
 
 
@@ -797,8 +1692,39 @@ export const Rcs = (props) => {
   const onTemplateMediaTypeChange = ({ target: { value } }) => {
     setTemplateMediaType(value);
   };
-
-
+  const renderedRCSEditMessage = (descArray, type) => {
+    const renderArray = [];
+    if (descArray?.length) {
+      descArray.forEach((elem, index) => {
+        if (rcsVarTestRegex.test(elem)) {
+          // Variable input
+          renderArray.push(
+            <TextArea
+              id={`${elem}_${index}`}
+              key={`${elem}_${index}`}
+              placeholder={`enter the value for ${elem}`}
+              autosize={{ minRows: 1, maxRows: 3 }}
+              onChange={e => textAreaValueChange(e)}
+              value={textAreaValue(index, type)}
+              onFocus={(e) => setTextAreaId(e, type)}
+            />
+          );
+        } else if (elem) {
+          // Static text
+          renderArray.push(
+            <TextArea
+              key={`static_${index}`}
+              value={elem}
+              autosize={{ minRows: 1, maxRows: 3 }}
+              disabled
+              className="rcs-edit-template-message-static-textarea"
+            />
+          );
+        }
+      });
+    }
+    return renderArray;
+  };
   const onTemplateTitleChange = ({ target: { value } }) => {
     let errorMessage = false;
     if (templateType === contentType.rich_card && !value.trim()) {
@@ -814,7 +1740,7 @@ export const Rcs = (props) => {
 
   const onTemplateDescChange = ({ target: { value } }) => {
     let errorMessage = false;
-    if(templateType === contentType.text_message && value?.length > RCS_TEXT_MESSAGE_MAX_LENGTH){
+    if(templateType === contentType.text_message && value?.length > (isHostInfoBip ? RCS_TEXT_MESSAGE_MAX_LENGTH_INFOBIP : RCS_TEXT_MESSAGE_MAX_LENGTH)){
       errorMessage = formatMessage(messages.templateMessageLengthError);
      } else if(templateType === contentType.rich_card && value?.length > RCS_RICH_CARD_MAX_LENGTH){
       errorMessage = formatMessage(messages.templateMessageLengthError);
@@ -830,16 +1756,16 @@ export const Rcs = (props) => {
 
   const templateDescErrorHandler = (value) => {
     let errorMessage = false;
-    const { isBraceError } = validateTags({
+    const { unsupportedTags, isBraceError } = validateTags({
       content: value,
       tagsParam: tags,
+      injectedTagsParams: injectedTags,
       location,
       tagModule: getDefaultTags,
-      isFullMode,
     }) || {};
     
     const maxLength = templateType === contentType.text_message 
-      ? RCS_TEXT_MESSAGE_MAX_LENGTH 
+      ? (isHostInfoBip ? RCS_TEXT_MESSAGE_MAX_LENGTH_INFOBIP : RCS_TEXT_MESSAGE_MAX_LENGTH) 
       : RCS_RICH_CARD_MAX_LENGTH;
   
     if (value === '' && isMediaTypeText) {
@@ -855,19 +1781,6 @@ export const Rcs = (props) => {
   };
 
 
-  const onFallbackMessageChange = ({ target: { value } }) => {
-    const error = fallbackMessageErrorHandler(value);
-    setFallbackMessage(value);
-    setFallbackMessageError(error);
-  };
-
-  const fallbackMessageErrorHandler = (value) => {
-    if (value?.length > FALLBACK_MESSAGE_MAX_LENGTH) {
-      return formatMessage(messages.fallbackMsgLenError);
-    }
-    return false;
-  };
-
   // Check for forbidden characters: square brackets [] and single curly braces {}
   const forbiddenCharactersValidation = (value) => {
     if (!value) return false;
@@ -912,53 +1825,43 @@ export const Rcs = (props) => {
       if(!isFullMode){
         return false;
       }
-      if (!/^\w+$/.test(paramName)) {
+      // Allow Liquid-style param names: letters, digits, underscore, dots (e.g. dynamic_expiry_date_after_3_days.FORMAT_1)
+      if (!/^[\w.]+$/.test(paramName)) {
         return formatMessage(messages.unknownCharactersError);
       }
     }
     return false;
   };
-  
-  const templateHeaderErrorHandler = (value) => {
-    let errorMessage = false;
-    if (value?.length > TEMPLATE_HEADER_MAX_LENGTH) {
-      errorMessage = formatMessage(messages.templateHeaderLengthError);
-    } else {
-      errorMessage = variableErrorHandling(value);
-    }
-    return errorMessage;
-  };
-
-
-  const templateMessageErrorHandler = (value) => {
-    let errorMessage = false;
-    if (value === '') {
-      errorMessage = formatMessage(messages.emptyTemplateMessageErrorMessage);
-    } else if (
-      value?.length
-      > TEMPLATE_MESSAGE_MAX_LENGTH
-    ) {
-      errorMessage = formatMessage(messages.templateMessageLengthError);
-    } else {
-      errorMessage = variableErrorHandling(value);
-    }
-    return errorMessage;
-  };
-
 
   const onMessageAddVar = () => {
-  onAddVar(MESSAGE_TEXT, templateDesc, rcsVarRegex);
+  onAddVar(templateDesc);
 };
 
-const onAddVar = (type, messageContent, regex) => {
-  // Always append the next variable at the end, like WhatsApp
-  const existingVars = messageContent.match(/\{\{(\d+)\}\}/g) || [];
-  const existingNumbers = existingVars.map(v => parseInt(v.match(/\d+/)[0], 10));
+/**
+ * Returns the smallest positive integer not already used as a `{{N}}` variable
+ * in either the title or description fields, or null if the limit (19) is reached.
+ * Scans both fields so title and description vars never share the same number
+ * (duplicate numbers would share a cardVarMapped key and bleed values across fields).
+ */
+const getNextRcsNumericVarNumber = (titleStr, descStr) => {
+  const allExistingVars = [
+    ...(titleStr.match(RCS_NUMERIC_VAR_TOKEN_REGEX) || []),
+    ...(descStr.match(RCS_NUMERIC_VAR_TOKEN_REGEX) || []),
+  ];
+  const existingNumbers = allExistingVars.flatMap(varToken => {
+    const numericMatch = varToken.match(/\d+/);
+    return numericMatch ? [parseInt(numericMatch[0], 10)] : [];
+  });
   let nextNumber = 1;
   while (existingNumbers.includes(nextNumber)) {
     nextNumber++;
   }
-  if (nextNumber > 19) {
+  return nextNumber > 19 ? null : nextNumber;
+};
+
+const onAddVar = (messageContent) => {
+  const nextNumber = getNextRcsNumericVarNumber(templateTitle, messageContent);
+  if (nextNumber === null) {
     return;
   }
   const nextVar = `{{${nextNumber}}}`;
@@ -970,15 +1873,13 @@ const onAddVar = (type, messageContent, regex) => {
 };
 
 const onTitleAddVar = () => {
-  // Always append the next variable at the end, like WhatsApp
+  // Scan both title AND description so the new title var number doesn't
+  // duplicate a number already used in the description. Duplicate numeric
+  // names would share the same cardVarMapped semantic key, causing the
+  // description slot to reflect the title slot value and vice-versa.
   const messageContent = templateTitle;
-  const existingVars = messageContent.match(/\{\{(\d+)\}\}/g) || [];
-  const existingNumbers = existingVars.map(v => parseInt(v.match(/\d+/)[0], 10));
-  let nextNumber = 1;
-  while (existingNumbers.includes(nextNumber)) {
-    nextNumber++;
-  }
-  if (nextNumber > 19) {
+  const nextNumber = getNextRcsNumericVarNumber(templateTitle, templateDesc);
+  if (nextNumber === null) {
     return;
   }
   const nextVar = `{{${nextNumber}}}`;
@@ -990,26 +1891,17 @@ const onTitleAddVar = () => {
   setTemplateTitleError(error);
 };
 
-  
-const splitTemplateVarString = (str) => {
-  if (!str) return [];
-  const validVarArr = str.match(rcsVarRegex) || [];
-  const templateVarArray = [];
-  let content = str;
-  while (content?.length !== 0) {
-    const index = content.indexOf(validVarArr?.[0]);
-    if (index !== -1) {
-      templateVarArray.push(content.substring(0, index));
-      templateVarArray.push(validVarArr?.[0]);
-      content = content.substring(index + validVarArr?.[0]?.length, content?.length);
-      validVarArr?.shift();
-    } else {
-      templateVarArray.push(content);
-      break;
-    }
-  }
-  return templateVarArray.filter(Boolean);
-};
+  const appendVarToCarouselField = (cardIndex, fieldName) => {
+    const token = getNextCarouselVarToken(carouselData);
+    if (!token) return;
+    setCarouselData((prev = []) => {
+      const updated = cloneDeep(prev);
+      if (!updated[cardIndex]) return prev;
+      const current = (updated[cardIndex][fieldName] || '').toString();
+      updated[cardIndex][fieldName] = `${current}${token}`;
+      return updated;
+    });
+  };
 
   const textAreaValue = (idValue, type) => {
     if (idValue >= 0) {
@@ -1025,7 +1917,60 @@ const splitTemplateVarString = (str) => {
     return "";
   };
 
-  const textAreaValueChange = (e, type) => {
+  // Carousel: render variable-value editor for a given template string (title/description) belonging
+  // to `cardIndex`. This matches rich-card/text edit behavior: static pieces are read-only, variable
+  // tokens are editable. Each slot's key comes from `computeCarouselVarSlotKeys` — stable regardless
+  // of which tag fills it, and independent even from another occurrence of the same tag name.
+  const renderCarouselEditMessage = (templateStr, cardIndex, fieldType) => {
+    const renderArray = [];
+    const templateArr = splitTemplateVarString(templateStr);
+    const isDescField = fieldType === RCS_TAG_AREA_FIELD_DESC;
+    const slotKeysForCard = computeCarouselVarSlotKeys(carouselData, rcsVarRegex)[cardIndex];
+    const fieldKeys = (isDescField ? slotKeysForCard?.description : slotKeysForCard?.title) ?? [];
+    let varOrdinal = 0;
+    if (templateArr?.length) {
+      templateArr.forEach((elem, index) => {
+        if (rcsVarTestRegex.test(elem)) {
+          const varName = getVarNameFromToken(elem);
+          const mapKey = fieldKeys[varOrdinal];
+          varOrdinal += 1;
+          const computedValue = varName ? ((cardVarMapped?.[mapKey] ?? '').toString()) : '';
+          renderArray.push(
+            <div key={`${elem}_${index}`} className="var-segment-message-editor__var-slot">
+              <TextArea
+                id={`${elem}_${index}`}
+                placeholder={`enter the value for ${elem}`}
+                autosize={{ minRows: 1, maxRows: 3 }}
+                onChange={(e) => carouselTextAreaValueChange(e, cardIndex, fieldType)}
+                value={computedValue}
+                onFocus={(e) => {
+                  const id = e?.target?.id || e?.currentTarget?.id || '';
+                  if (fieldType === RCS_TAG_AREA_FIELD_DESC) {
+                    setCarouselDescFocusedVarId(id);
+                  } else {
+                    setCarouselTitleFocusedVarId(id);
+                  }
+                }}
+              />
+            </div>
+          );
+        } else if (elem) {
+          renderArray.push(
+            <CapHeading
+              key={`static_${index}`}
+              type="h4"
+              className="rcs-edit-template-message-split"
+            >
+              {elem}
+            </CapHeading>
+          );
+        }
+      });
+    }
+    return <CapRow className="rcs-edit-template-message-input">{renderArray}</CapRow>;
+  };
+
+  const textAreaValueChange = (e) => {
     const value = e?.target?.value ?? '';
     const id = e?.target?.id || e?.currentTarget?.id || '';
     if (!id) return;
@@ -1036,16 +1981,43 @@ const splitTemplateVarString = (str) => {
     const variableName = getVarNameFromToken(token);
 
     if (variableName) {
+      const nextVal = isInvalidValue ? "" : value;
       setCardVarMapped((prev) => ({
         ...prev,
-        [variableName]: isInvalidValue ? "" : value,
+        [variableName]: nextVal,
       }));
     }
   };
 
-  const setTextAreaId = (e, type) => {
+  // Carousel: typing directly into a slot's value box (as opposed to picking a tag) — same global
+  // positional key as onCarouselTagSelect/renderCarouselEditMessage, so both ways of filling a
+  // slot land on the identical key.
+  const carouselTextAreaValueChange = (e, cardIndex, fieldType) => {
+    const value = e?.target?.value ?? '';
     const id = e?.target?.id || e?.currentTarget?.id || '';
     if (!id) return;
+    const isDescField = fieldType === RCS_TAG_AREA_FIELD_DESC;
+    const fieldTemplateStr = (isDescField
+      ? carouselData?.[cardIndex]?.description
+      : carouselData?.[cardIndex]?.title) || '';
+    const localVarOrdinal = getCarouselFieldLocalVarOrdinal(id, fieldTemplateStr);
+    if (localVarOrdinal == null) return;
+    const slotKeys = computeCarouselVarSlotKeys(carouselData, rcsVarRegex)[cardIndex];
+    const mapKey = (isDescField ? slotKeys?.description : slotKeys?.title)?.[localVarOrdinal];
+    if (!mapKey) return;
+    const isInvalidValue = value?.trim() === "";
+    const nextVal = isInvalidValue ? "" : value;
+    setCardVarMapped((prev) => ({
+      ...prev,
+      [mapKey]: nextVal,
+    }));
+  };
+
+  const setTextAreaId = (e, type) => {
+    // VarSegmentMessageEditor calls onFocus(id) with a plain string; DOM events
+    // have an `.target.id` shape. Support both.
+    const id = typeof e === 'string' ? e : (e?.target?.id || e?.currentTarget?.id || '');
+    if (!id) return;
     if (type === TITLE_TEXT) setTitleTextAreaId(id);
     else setDescTextAreaId(id);
   };
@@ -1063,10 +2035,12 @@ const splitTemplateVarString = (str) => {
             </CapRow>
           }
           description={
-            <CapLabel type="label3">{formatMessage(messages.btnDesc)}</CapLabel>
+            !isEditFlow && (
+              <CapLabel type="label3">{formatMessage(messages.btnDesc)}</CapLabel>
+            )
           }
         />
-        
+
         <CapActionButton
                         buttonType={buttonType}
                         updateButtonChange={updateButtonChange}
@@ -1074,45 +2048,86 @@ const splitTemplateVarString = (str) => {
                         suggestions={suggestions}
                         isEditFlow={isEditFlow}
                         isFullMode={isFullMode}
-                        maxButtons={MAX_BUTTONS}
-            />
-      </>
-    );
-  };
-  
-  const renderedRCSEditMessage = (descArray, type) => {
-    const renderArray = [];
-    if (descArray?.length) {
-      descArray.forEach((elem, index) => {
-        if (rcsVarTestRegex.test(elem)) {
-          // Variable input
-          renderArray.push(
-            <TextArea
-              id={`${elem}_${index}`}
-              key={`${elem}_${index}`}
-              placeholder={`enter the value for ${elem}`}
-              autosize={{ minRows: 1, maxRows: 3 }}
-              onChange={e => textAreaValueChange(e, type)}
-              value={textAreaValue(index, type)}
-              onFocus={(e) => setTextAreaId(e, type)}
-            />
-          );
-        } else if (elem) {
-          // Static text
-          renderArray.push(
-            <TextArea
-              key={`static_${index}`}
-              value={elem}
-              autosize={{ minRows: 1, maxRows: 3 }}
-              disabled
-              className="rcs-edit-template-message-static-textarea"
-              style={{ background: '#fafafa', color: '#888' }}
-            />
-          );
+                        maxButtons={MAX_BUTTONS}
+                        host={hostName}
+          />
+      </>
+    );
+  };
+  
+  const getRcsValueMap = (fieldTemplateString, fieldType) => {
+    if (!fieldTemplateString) return {};
+    const titleVarTokenMatches = templateTitle?.match(rcsVarRegex) ?? [];
+    const slotOffset = fieldType === TITLE_TEXT ? 0 : titleVarTokenMatches.length;
+    const templateSegments = splitTemplateVarStringRcs(fieldTemplateString);
+    const segmentIdToResolvedValue = {};
+    let varOrdinal = 0;
+    templateSegments.forEach((segmentToken, segmentIndexInField) => {
+      if (rcsVarTestRegex.test(segmentToken)) {
+        const varSegmentCompositeId = `${segmentToken}_${segmentIndexInField}`;
+        const varName = getVarNameFromToken(segmentToken);
+        const globalSlot = slotOffset + varOrdinal;
+        varOrdinal += 1;
+        segmentIdToResolvedValue[varSegmentCompositeId] = resolveCardVarMappedSlotValue(
+          cardVarMapped,
+          varName,
+          globalSlot,
+          isEditLike,
+          rcsSpanningSemanticVarNames.has(varName),
+        );
+      }
+    });
+    return segmentIdToResolvedValue;
+  };
+
+  const titleVarSegmentValueMapById = useMemo(
+    () => getRcsValueMap(templateTitle, TITLE_TEXT),
+    [templateTitle, cardVarMapped, isEditFlow, isFullMode, rcsSpanningSemanticVarNames],
+  );
+  const descriptionVarSegmentValueMapById = useMemo(
+    () => getRcsValueMap(templateDesc, MESSAGE_TEXT),
+    [templateDesc, templateTitle, cardVarMapped, isEditFlow, isFullMode, rcsSpanningSemanticVarNames],
+  );
+
+  const handleRcsVarChange = (varSegmentCompositeDomId, value, type) => {
+    const underscoreIndexInCompositeId = varSegmentCompositeDomId.lastIndexOf('_');
+    if (underscoreIndexInCompositeId === -1) return;
+    const mustacheTokenFromCompositeId = varSegmentCompositeDomId.slice(0, underscoreIndexInCompositeId);
+    const variableName = getVarNameFromToken(mustacheTokenFromCompositeId);
+    if (variableName === undefined || variableName === null || variableName === '') return;
+    const isInvalidValue = value?.trim() === '';
+    const coercedSlotValue = isInvalidValue ? '' : value;
+    const templateStringForField = type === TITLE_TEXT ? templateTitle : templateDesc;
+    const globalVarSlotIndexZeroBased = getGlobalSlotIndexForRcsFieldId(
+      varSegmentCompositeDomId,
+      templateStringForField,
+      type,
+    );
+    const fieldOffset = type === TITLE_TEXT ? 0 : (templateTitle?.match(rcsVarRegex) ?? []).length;
+    setCardVarMapped((previousCardVarMapped) => {
+      const updatedCardVarMapped = { ...previousCardVarMapped };
+      // Remove stale semantic key: keeping it causes every other slot sharing the same
+      // variable name (e.g. {{adv}} in both title and description) to read the same value
+      // via the semantic-key fallback in resolveCardVarMappedSlotValue.
+      delete updatedCardVarMapped[variableName];
+      if (globalVarSlotIndexZeroBased !== null && globalVarSlotIndexZeroBased !== undefined) {
+        updatedCardVarMapped[String(globalVarSlotIndexZeroBased + 1)] = coercedSlotValue;
+        // Sync all other intra-field occurrences of the same variable (cross-field slots stay independent)
+        const fieldSegments = splitTemplateVarStringRcs(templateStringForField ?? '');
+        let varOrdinal = 0;
+        for (let i = 0; i < fieldSegments.length; i++) {
+          if (rcsVarTestRegex.test(fieldSegments[i])) {
+            const slotVarName = getVarNameFromToken(fieldSegments[i]);
+            const globalSlot = fieldOffset + varOrdinal;
+            varOrdinal += 1;
+            if (slotVarName === variableName && globalSlot !== globalVarSlotIndexZeroBased) {
+              updatedCardVarMapped[String(globalSlot + 1)] = coercedSlotValue;
+            }
+          }
         }
-      });
-    }
-    return renderArray;
+      }
+      return updatedCardVarMapped;
+    });
   };
 
   const renderTextComponent = () => {
@@ -1132,6 +2147,7 @@ const splitTemplateVarString = (str) => {
         }
         suffix={
           <>
+        
             {(isEditFlow || !isFullMode) ? (
               <TagList
                 label={formatMessage(globalMessages.addLabels)}
@@ -1148,18 +2164,28 @@ const splitTemplateVarString = (str) => {
                 type="flat"
                 isAddBtn
                 onClick={onTitleAddVar}
-                disabled={!!templateTitleError}
+                disabled={templateTitleError}
               >
                 {formatMessage(messages.addVar)}
               </CapButton>
-            )}
+           )}
           </>
-        }
+        }  
+      />
+      
+    {(isEditFlow || !isFullMode) ? (
+      <VarSegmentMessageEditor
+        key={`rcs-title-vars-${rcsVarSegmentEditorRemountKey}`}
+        templateString={templateTitle}
+        valueMap={titleVarSegmentValueMapById}
+        onChange={(id, value) => handleRcsVarChange(id, value, TITLE_TEXT)}
+        onFocus={(id) => setTitleTextAreaId(id)}
+        varRegex={rcsVarRegex}
+        placeholderPrefix=""
+        getPlaceholder={() => formatMessage(messages.rcsVarSlotPlaceholder)}
       />
-   <div className="rcs_text_area_wrapper">
-  {(isEditFlow || !isFullMode) ? (
-      renderedRCSEditMessage(splitTemplateVarString(templateTitle), TITLE_TEXT)
   ) : (
+    <div className="rcs_text_area_wrapper">
     <CapInput
       className={`rcs-template-title-input ${
         !isTemplateApproved ? "rcs-edit-disabled" : ""
@@ -1172,8 +2198,8 @@ const splitTemplateVarString = (str) => {
       errorMessage={templateTitleError}
       disabled={isEditFlow || !isFullMode}
     />
+    </div>
   )}
-</div>
 {(isEditFlow || !isFullMode) && templateTitleError && (
   <CapError className="rcs-template-title-error">
     {templateTitleError}
@@ -1181,7 +2207,7 @@ const splitTemplateVarString = (str) => {
 )}
 {!isEditFlow && isFullMode && renderTitleCharacterCount()}
     </>
-  )}
+      )}
 
 {/* Template Message */}
        <CapRow useLegacy id="rcs-template-message-label">
@@ -1219,9 +2245,21 @@ const splitTemplateVarString = (str) => {
           />
         </CapRow>
         <CapRow useLegacy className="rcs-create-template-message-input">
-          <div className="rcs_text_area_wrapper">
-            {(isEditFlow || !isFullMode)
-              ? renderedRCSEditMessage(splitTemplateVarString(templateDesc), MESSAGE_TEXT)
+            {/* Edit/library: segmented inputs (split on {{…}}). Full-mode create: single TextArea below — manual entry there never hits segment split. TagList replaces {{n}} in template string here. */}
+          <CapRow className="rcs_text_area_wrapper">
+            {(isEditFlow || !isFullMode)?
+              (
+                <VarSegmentMessageEditor
+                  key={`rcs-desc-vars-${rcsVarSegmentEditorRemountKey}`}
+                  templateString={templateDesc}
+                  valueMap={descriptionVarSegmentValueMapById}
+                  onChange={(id, value) => handleRcsVarChange(id, value, MESSAGE_TEXT)}
+                  onFocus={(id) => setDescTextAreaId(id)}
+                  varRegex={rcsVarRegex}
+                  placeholderPrefix=""
+                  getPlaceholder={() => formatMessage(messages.rcsVarSlotPlaceholder)}
+                />
+              )
               : (
                 <>
                   <TextArea
@@ -1259,13 +2297,15 @@ const splitTemplateVarString = (str) => {
                 </>
               )
             }
-          </div>
+          </CapRow>
           {(isEditFlow || !isFullMode) && templateDescError && (
             <CapError className="rcs-template-message-error">
               {templateDescError}
             </CapError>
           )}
-          {!isEditFlow && isFullMode && renderDescriptionCharacterCount()}
+          {(isEditFlow || !isFullMode)
+            ? renderDescriptionCharacterCount('rcs-character-count rcs-character-count--compact')
+            : (!isEditFlow && isFullMode && renderDescriptionCharacterCount())}
           {!isFullMode && hasTag() && (
             <CapAlert
               message={
@@ -1279,24 +2319,13 @@ const splitTemplateVarString = (str) => {
             />
           )}
         </CapRow>
-        {renderButtonComponent()}
+        {((!isEditFlow && isFullMode) || (isEditFlow && (suggestions?.length ?? 0) > 0)) &&
+          renderButtonComponent()}
       </>
 
     );
   };
 
- 
-  const fallbackSmsLength = () => (
-    <CapLabel type="label1" className="fallback-sms-length">
-      {formatMessage(messages.totalCharacters, {
-        smsCount: Math.ceil(
-          fallbackMessage?.length / FALLBACK_MESSAGE_MAX_LENGTH,
-        ),
-        number: fallbackMessage?.length,
-      })}
-    </CapLabel>
-  );
-
   // Get character count for title (rich card only)
   const getTitleCharacterCount = () => {
     if (templateType === contentType.text_message) return 0;
@@ -1311,7 +2340,7 @@ const splitTemplateVarString = (str) => {
   // Get max length for description based on template type
   const getDescriptionMaxLength = () => {
     return templateType === contentType.text_message 
-      ? RCS_TEXT_MESSAGE_MAX_LENGTH  // 160 for text message
+      ? (isHostInfoBip ? RCS_TEXT_MESSAGE_MAX_LENGTH_INFOBIP : RCS_TEXT_MESSAGE_MAX_LENGTH)  // 160 for text message
       : RCS_RICH_CARD_MAX_LENGTH;    // 2000 for rich card description
   };
 
@@ -1374,287 +2403,34 @@ const splitTemplateVarString = (str) => {
     return false;
   };
 
-  //adding creative dlt fallback sms handlers
-  const addDltMsgHandler = () => {
-    setShowDltContainer(true);
-    setDltMode(RCS_DLT_MODE.TEMPLATES);
-    setDltEditData({});
-    setFallbackMessage('');
-  };
-
-  const closeDltContainerHandler = () => {
-    setShowDltContainer(false);
-    setDltMode('');
-    templatesActions.getAllTemplates('Rcs', { page: 1, perPage: 25 });
-  };
-
-  const rcsDltEditSelectHandler = (data) => {
-    setShowDltContainer(true);
-    setDltMode(RCS_DLT_MODE.EDIT);
-    setDltEditData(data);
-  };
-
-  const rcsDltEditCompletionHandler = (data) => {
-    const tempData = {
-      versions: {
-        // eslint-disable-next-line no-undef
-        base: data?.value?.base || {},
-      },
-    };
-    const fallMsg = get(tempData, `versions.base.updated-sms-editor`, []).join(
-      '',
-    );
-    closeDltContainerHandler();
-    setDltEditData(tempData);
-    setFallbackMessage(fallMsg);
-    setFallbackMessageError(fallMsg?.length > FALLBACK_MESSAGE_MAX_LENGTH);
-    setShowDltCard(true);
-  };
-
-  const rcsDltCardDeleteHandler = () => {
-    closeDltContainerHandler();
-    setDltEditData({});
-    setFallbackMessage('');
-    setFallbackMessageError(false);
-    setShowDltCard(false);
-  };
-
-  const dltFallbackListingPreviewhandler = (data) => {
-    const {
-      'updated-sms-editor': updatedSmsEditor = [],
-      'sms-editor': smsEditor = '',
-    } = data.versions.base || {};
-    setFallbackPreviewmode(true);
-    setDltPreviewData(
-      updatedSmsEditor === '' ? smsEditor : updatedSmsEditor.join(''),
-    );
-  };
-
-  const getDltContentCardList = (content, channel) => {
-    const extra = [
-      <CapIcon
-        type="edit"
-        style={{ marginRight: '8px' }}
-        onClick={() => rcsDltEditSelectHandler(dltEditData)}
-      />,
-      <CapDropdown
-        overlay={(
-          <CapMenu>
-            <>
-              <CapMenu.Item
-                className="ant-dropdown-menu-item"
-                onClick={() => setFallbackPreviewmode(true)}
-              >
-                {formatMessage(globalMessages.preview)}
-              </CapMenu.Item>
-              <CapMenu.Item
-                className="ant-dropdown-menu-item"
-                onClick={rcsDltCardDeleteHandler}
-              >
-                {formatMessage(globalMessages.delete)}
-              </CapMenu.Item>
-            </>
-          </CapMenu>
-        )}
-      >
-        <CapIcon type="more" />
-      </CapDropdown>,
-    ];
-    return {
-      title: channel,
-      content,
-      cardType: channel,
-      extra,
-    };
-  };
-
-  const getDltSlideBoxContent = () => {
-    const loc = {
-      pathname: `/sms/edit`,
-      query: { type: EMBEDDED, module: LIBRARY },
-      search: '',
-    };
-    const route = { name: SMS.toLowerCase() };
-    let dltHeader = '';
-    let dltContent = '';
-    if (dltMode === RCS_DLT_MODE.TEMPLATES) {
-      dltHeader = (
-        <CapHeader
-          title={formatMessage(messages.rcsDltTitle)}
-          description={formatMessage(messages.rcsDltDesc)}
-        />
-      );
-      dltContent = (
-        <Templates
-          location={loc}
-          route={route}
-          smsRegister={smsRegister}
-          isFullMode={isFullMode}
-          isDltFromRcs
-          onSelectTemplate={rcsDltEditSelectHandler}
-          handlePeviewTemplate={dltFallbackListingPreviewhandler}
-        />
-      );
-    } else if (dltMode === RCS_DLT_MODE.EDIT) {
-      dltHeader = formatMessage(messages.dltEditHeader);
-      dltContent = (
-        <SmsTraiEdit
-          location={loc}
-          route={route}
-          getDefaultTags="outbound"
-          handleClose={closeDltContainerHandler}
-          templateData={dltEditData}
-          getFormSubscriptionData={rcsDltEditCompletionHandler}
-          isFullMode={false}
-          selectedOfferDetails={selectedOfferDetails}
-        />
-      );
-    }
-    return { dltHeader, dltContent };
-  };
-
-  const renderFallBackSmsComponent = () => {
-    // Completely disable fallback functionality when DLT is disabled
-   return null;
-    
-    // const contentArr = [];
-    // const showAddCreativeBtnForDlt = isDltEnabled && !showDltCard;
-    // const showCardForDlt = isDltEnabled && showDltCard;
-    // const showNonDltFallbackComp = !showAddCreativeBtnForDlt && !showCardForDlt;
-    // //pushing common fallback sms headings
-    // contentArr.push(
-    //   <CapRow
-    //     style={{
-    //       marginBottom: isDltEnabled ? '20px' : '10px',
-    //     }}
-    //   >
-    //     <CapHeader
-    //       title={(
-    //         <CapRow type="flex">
-    //           <CapHeading type="h4">
-    //             {formatMessage(messages.fallbackLabel)}
-    //           </CapHeading>
-    //           <CapTooltipWithInfo
-    //             placement="right"
-    //             infoIconProps={{
-    //               style: { marginLeft: '4px', marginTop: '3px' },
-    //             }}
-    //             title={formatMessage(messages.fallbackToolTip)}
-    //           />
-    //         </CapRow>
-    //       )}
-    //       description={formatMessage(messages.fallbackDesc)}
-    //       suffix={
-    //         isDltEnabled ? null : (
-    //           <CapButton
-    //             type="flat"
-    //             className="fallback-preview-btn"
-    //             prefix={<CapIcon type="eye" />}
-    //             style={{ color: CAP_SECONDARY.base }}
-    //             onClick={() => setFallbackPreviewmode(true)}
-    //             disabled={fallbackMessage === '' || fallbackMessageError}
-    //           >
-    //             {formatMessage(globalMessages.preview)}
-    //           </CapButton>
-    //         )
-    //       }
-    //     />
-    //   </CapRow>,
-    // );
-
-    //dlt is enabled, and dlt content is not yet added, show button to add dlt creative
-    // showAddCreativeBtnForDlt
-    //   && contentArr.push(
-    //     <CapCard className="rcs-dlt-fallback-card">
-    //       <CapRow type="flex" justify="center" align="middle">
-    //         <CapColumn span={10}>
-    //           <CapImage src={addCreativesIcon} />
-    //         </CapColumn>
-    //         <CapColumn span={14}>
-    //           <CapButton
-    //             className="add-dlt-btn"
-    //             type="secondary"
-    //             onClick={addDltMsgHandler}
-    //           >
-    //             {formatMessage(messages.addSmsCreative)}
-    //           </CapButton>
-    //         </CapColumn>
-    //       </CapRow>
-    //     </CapCard>,
-    //   );
-
-    // //dlt is enabled and dlt content is added, show it in a card
-    // showCardForDlt
-    //   && contentArr.push(
-    //     <CapCustomCardList
-    //       cardList={[getDltContentCardList(fallbackMessage, SMS)]}
-    //       className="rcs-dlt-card"
-    //     />,
-    //     fallbackMessageError && (
-    //       <CapError className="rcs-fallback-len-error">
-    //         {formatMessage(messages.fallbackMsgLenError)}
-    //       </CapError>
-    //     ),
-    //   );
-
-    // //dlt is not enabled, show non dlt text area
-    // showNonDltFallbackComp
-    //   && contentArr.push(
-    //     <>
-    //       <CapRow>
-    //         <CapHeader
-    //           title={(
-    //             <CapHeading type="h4">
-    //               {formatMessage(messages.fallbackTextAreaLabel)}
-    //             </CapHeading>
-    //           )}
-    //           suffix={(
-    //             <TagList
-    //               label={formatMessage(globalMessages.addLabels)}
-    //               onTagSelect={onTagSelectFallback}
-    //               location={location}
-    //               tags={tags || []}
-    //               onContextChange={handleOnTagsContextChange}
-    //               injectedTags={injectedTags || {}}
-    //               selectedOfferDetails={selectedOfferDetails}
-    //             />
-    //           )}
-    //         />
-    //       </CapRow>
-    //       <div className="rcs_fallback_msg_textarea_wrapper">
-    //         <TextArea
-    //           id="rcs_fallback_message_textarea"
-    //           autosize={{ minRows: 3, maxRows: 5 }}
-    //           placeholder={formatMessage(messages.fallbackMsgPlaceholder)}
-    //           onChange={onFallbackMessageChange}
-    //           errorMessage={fallbackMessageError}
-    //           value={fallbackMessage || ""}
-    //         />
-    //         {!aiContentBotDisabled && (
-    //           <CapAskAira.ContentGenerationBot
-    //             text={fallbackMessage || ""}
-    //             setText={(text) => {
-    //               onFallbackMessageChange({ target: { value: text } });
-    //             }}
-    //             iconPlacement="float-br"
-    //             rootStyle={{
-    //               bottom: "0.5rem",
-    //               right: "0.5rem",
-    //               position: "absolute",
-    //             }}
-    //           />
-    //         )}
-    //       </div>
-    //       <CapRow>{fallbackSmsLength()}</CapRow>
-    //     </>
-    //   );
-
-    // return <>{contentArr}</>;
-  };
+  const renderFallBackSmsComponent = () => (
+    <SmsFallback
+      value={smsFallbackData}
+      onChange={setSmsFallbackData}
+      parentLocation={location}
+      smsRegister={smsRegister}
+      isFullMode={isFullMode}
+      selectedOfferDetails={selectedOfferDetails}
+      channelsToHide={CHANNELS_TO_HIDE_FOR_SMS_ONLY}
+      sectionTitle={
+        smsFallbackData
+          ? formatMessage(messages.fallbackLabel)
+          : formatMessage(messages.smsFallbackOptional)
+      }
+      templateListTitle={formatMessage(creativesMessages.creativeTemplates)}
+      templateListDescription={formatMessage(creativesMessages.creativeTemplatesDesc)}
+      /* Full-mode: card layout only while drafting a new template; after send for approval or when a template is loaded, use inline layout. */
+      showAsCard={isFullMode && !isEditFlow && templateStatus === ''}
+      disableSelectTemplate={isEditFlow}
+      eventContextTags={eventContextTags}
+      onRcsFallbackEditorStateChange={handleSmsFallbackEditorStateChange}
+      isRcsEditFlow={isEditFlow}
+    />
+  );
 
   const uploadRcsImage = useCallback((file, type, fileParams, index) => {
     setImageError(null);
-    const isRcsThumbnail = index === 1;
+    const isRcsThumbnail = isThumbnailAssetIndex(index);
     actions.uploadRcsAsset(file, type, {
       isRcsThumbnail,
       ...fileParams,
@@ -1692,21 +2468,15 @@ const splitTemplateVarString = (str) => {
   const updateOnRcsImageReUpload = useCallback(() => {
     setUpdateRcsImageSrc('');
   }, []);
-
-
-  const uploadRcsVideo = (file, type, fileParams) => { 
-    setImageError(null);
+  const uploadRcsVideo = (file, type, fileParams, index) => {
     actions.uploadRcsAsset(file, type, {
       ...fileParams,
       type: 'video',
       channel: RCS,
       isGenerateVideoThumbnail: false,
-    });  
+    }, index);
   };
 
-  const updateRcsVideoSrc = (val) => {
-    setRcsVideoSrc(val);
-  };
   const setUpdateRcsVideoSrc = useCallback((index, val) => {
     setRcsVideoSrc(val);
     setAssetList(val); 
@@ -1729,13 +2499,13 @@ const splitTemplateVarString = (str) => {
     updateRcsThumbnailSrc('');
   };
 
-  const renderThumbnailComponent = () => {
+   const renderThumbnailComponent = () => {
     const currentDimension = selectedDimension || Object.keys(RCS_VIDEO_THUMBNAIL_DIMENSIONS)[0];
     return !isEditFlow && (
     <>
        <CapHeading type="h4" className="rcs-image-dimensions-label">Upload Thumbnail</CapHeading>
        <CapImageUpload
-         style={{ paddingTop: '20px' }}
+         className="rcs-image-upload-with-top-padding"
          allowedExtensionsRegex={ALLOWED_IMAGE_EXTENSIONS_REGEX}
          imgWidth={RCS_VIDEO_THUMBNAIL_DIMENSIONS[currentDimension].width}
          imgHeight={RCS_VIDEO_THUMBNAIL_DIMENSIONS[currentDimension].height}
@@ -1753,6 +2523,7 @@ const splitTemplateVarString = (str) => {
          channel={RCS}
          channelSpecificStyle={!isFullMode}
          skipDimensionValidation={true}
+         showReUploadButton={!isEditFlow && isFullMode}
        />
     </>
     )
@@ -1778,7 +2549,7 @@ const splitTemplateVarString = (str) => {
                       value: dim.type,
                       label: `${dim.label}`
                     }))}
-                    style={{ marginBottom: '20px' }}
+                    className="rcs-dimension-select--bottom-spacing"
                   />
                 </>
               )}
@@ -1792,7 +2563,7 @@ const splitTemplateVarString = (str) => {
                     </div>
                   ) : (
                 <CapImageUpload
-                  style={{ paddingTop: '20px' }}
+         className="rcs-image-upload-with-top-padding"
                   allowedExtensionsRegex={ALLOWED_IMAGE_EXTENSIONS_REGEX}
                   imgWidth={RCS_IMAGE_DIMENSIONS[selectedDimension].width}
                   imgHeight={RCS_IMAGE_DIMENSIONS[selectedDimension].height}
@@ -1803,7 +2574,7 @@ const splitTemplateVarString = (str) => {
                   updateImageSrc={setUpdateRcsImageSrc}
                   updateOnReUpload={updateOnRcsImageReUpload}
                   index={0}
-                  className="cap-custom-image-upload"
+                  className="cap-custom-image-upload rcs-image-upload--top-spacing"
                   key={`rcs-uploaded-image-${selectedDimension}`}
                   imageData={rcsData}
                   channel={RCS}
@@ -1814,7 +2585,7 @@ const splitTemplateVarString = (str) => {
               
             </>
           );
-        }
+  }
   
   const renderVideoComponent = () => {
     const currentDimension =selectedDimension || Object.keys(RCS_VIDEO_THUMBNAIL_DIMENSIONS)[0];
@@ -1833,7 +2604,7 @@ const splitTemplateVarString = (str) => {
                 value: dim.type,
                 label: `${dim.label}`
               }))}
-              style={{ marginBottom: '20px' }}
+              className="rcs-dimension-select--bottom-spacing"
             />
             )}
               {(isEditFlow || !isFullMode) ? (
@@ -1891,10 +2662,48 @@ const splitTemplateVarString = (str) => {
   };
 
   const getRcsPreview = () => {
+
+    if (templateType === contentType.carousel) {
+      const cardsForPreview = buildCarouselCardsForPreview(carouselData);
+      const carouselDimKey = getCarouselDimensionKey(selectedCarouselHeight, selectedCarouselWidth);
+      const carouselImgDims =
+        RCS_CAROUSEL_IMAGE_DIMENSIONS[carouselDimKey] || RCS_CAROUSEL_IMAGE_DIMENSIONS.MEDIUM_MEDIUM;
+      const carouselVidDims =
+        RCS_CAROUSEL_VIDEO_THUMBNAIL_DIMENSIONS[carouselDimKey]
+        || RCS_CAROUSEL_VIDEO_THUMBNAIL_DIMENSIONS.MEDIUM_MEDIUM;
+      // Debug log for embedded/library mode preview payload (carousel)
+      // eslint-disable-next-line no-console
+      return (
+        <UnifiedPreview
+          channel={RCS}
+          content={{
+            carouselData: cardsForPreview,
+            carouselPreviewDimensions: {
+              imageWidth: carouselImgDims.width,
+              imageHeight: carouselImgDims.height,
+              videoThumbWidth: carouselVidDims.width,
+              videoThumbHeight: carouselVidDims.height,
+            },
+          }}
+          device={ANDROID}
+          showDeviceToggle={false}
+          showHeader={false}
+          formatMessage={formatMessage}
+        />
+      );
+    }
     
     const dimensionObj = RCS_IMAGE_DIMENSIONS[selectedDimension];
-    const resolvedTitle = !isFullMode ? resolveTemplateWithMap(templateTitle) : templateTitle;
-    const resolvedDesc = !isFullMode ? resolveTemplateWithMap(templateDesc) : templateDesc;
+    const isSlotMappingMode = isEditFlow || !isFullMode;
+    const titleVarCountForResolve = isMediaTypeText
+      ? 0
+      : ((templateTitle ? (templateTitle.match(rcsVarRegex) || []) : []).length);
+    const resolvedTitle = isMediaTypeText
+      ? ''
+      : (isSlotMappingMode ? resolveTemplateWithMap(templateTitle, 0) : templateTitle);
+    const resolvedDesc = isSlotMappingMode
+      ? resolveTemplateWithMap(templateDesc, titleVarCountForResolve)
+      : templateDesc;
     return (
       <UnifiedPreview
         channel={RCS}
@@ -1917,51 +2726,39 @@ const splitTemplateVarString = (str) => {
     );
   };
   
-  const getUnmappedDesc = (str, mapping) => {
-    if (!str) return '';
-    if (!mapping || Object.keys(mapping).length === 0) return str;
-    let result = str;
-    const replacements = [];
-    Object.entries(mapping).forEach(([key, value]) => {
-      const raw = (value ?? '').toString();
-      if (!raw || raw?.trim?.() === '') return;
-      const braced = /^\{\{[\s\S]*\}\}$/.test(raw) ? raw : `{{${raw}}}`;
-      replacements.push({ key, needle: raw });
-      if (braced !== raw) replacements.push({ key, needle: braced });
-    });
-    const seen = new Set();
-    const uniq = replacements
-      .filter(({ key, needle }) => {
-        const id = `${key}::${needle}`;
-        if (seen.has(id)) return false;
-        seen.add(id);
-        return true;
-      })
-      .sort((a, b) => (b.needle.length - a.needle.length));
-
-    uniq.forEach(({ key, needle }) => {
-      if (!needle) return;
-      const escaped = needle.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-      const regex = new RegExp(escaped, 'g');
-      result = result.replace(regex, `{{${key}}}`);
-    });
-    return result;
-  };
-
   const createPayload = () => {
-    const base = get(dltEditData, `versions.base`, {});
-    const {
-      template_id: templateId = '',
-      template_name = '',
-      'sms-editor': template = '',
-      header: registeredSenderIds = [],
-    } = base;
-    const resolvedTitle = !isFullMode ? resolveTemplateWithMap(templateTitle) : templateTitle;
-    const resolvedDesc = !isFullMode ? resolveTemplateWithMap(templateDesc) : templateDesc;
+    const isSlotMappingMode = isEditFlow || !isFullMode;
     const alignment = isMediaTypeImage
       ? RCS_IMAGE_DIMENSIONS[selectedDimension]?.alignment
       : RCS_VIDEO_THUMBNAIL_DIMENSIONS[selectedDimension]?.alignment;
 
+    const heightTypeForCardWidth = isMediaTypeText
+      ? undefined
+      : isMediaTypeImage
+        ? RCS_IMAGE_DIMENSIONS[selectedDimension]?.heightType
+        : isMediaTypeVideo
+          ? RCS_VIDEO_THUMBNAIL_DIMENSIONS[selectedDimension]?.heightType
+          : undefined;
+    const cardWidthFromSelection =
+      heightTypeForCardWidth === MEDIUM ? MEDIUM : SMALL;
+
+    /** Library: merge props + state so SMS fallback is not dropped when local state is empty but templateData has consumer data. */
+    const smsFallbackPayloadContent = buildSmsFallBackContentForPayload({
+      smsFallbackData,
+      templateData,
+      isFullMode,
+      smsRegister,
+    });
+
+    const carouselCardContent = isCarouselType
+      ? buildCarouselCardContentForPayload(carouselData, {
+        isSlotMappingMode,
+        cardVarMapped,
+        selectedCarouselHeight,
+        rcsVarRegex,
+      })
+      : null;
+
     const payload = {
       name: templateName,
       versions: {
@@ -1970,16 +2767,22 @@ const splitTemplateVarString = (str) => {
             RCS: {
               rcsContent: {
                 ...(rcsAccount && !isFullMode && { accountId: rcsAccount }),
-                cardType: STANDALONE,
-                cardSettings: {
-                  cardOrientation: isMediaTypeImage ? RCS_IMAGE_DIMENSIONS[selectedDimension]?.orientation || VERTICAL : RCS_VIDEO_THUMBNAIL_DIMENSIONS[selectedDimension]?.orientation || VERTICAL,
-                  ...(alignment && { mediaAlignment: alignment }),
-                  cardWidth: SMALL,
-                },
-                cardContent: [
+                cardType: isCarouselType ? contentType.carousel : STANDALONE,
+                cardSettings: isCarouselType
+                  ? { cardOrientation: VERTICAL, cardWidth: selectedCarouselWidth || SMALL }
+                  : {
+                      cardOrientation: isMediaTypeImage ? RCS_IMAGE_DIMENSIONS[selectedDimension]?.orientation || VERTICAL : RCS_VIDEO_THUMBNAIL_DIMENSIONS[selectedDimension]?.orientation || VERTICAL,
+                      ...(alignment && { mediaAlignment: alignment }),
+                      cardWidth: SMALL,
+                    },
+                cardContent: isCarouselType
+                  ? carouselCardContent
+                  : [
                   {
-                    title: resolvedTitle,
-                    description: resolvedDesc,
+                    // Persist raw template copy + cardVarMapped — not resolveTemplateWithMap output — so library
+                    // / getFormData round-trip keeps {{…}} and slot values (resolved strings broke reopen hydration).
+                    title: templateTitle,
+                    description: templateDesc,
                     mediaType: templateMediaType,
                     ...(!isMediaTypeText && {media: {
                       mediaUrl: rcsImageSrc || rcsVideoSrc.videoSrc || '',
@@ -1988,23 +2791,32 @@ const splitTemplateVarString = (str) => {
                         ? RCS_IMAGE_DIMENSIONS[selectedDimension]?.heightType || MEDIUM
                         : RCS_VIDEO_THUMBNAIL_DIMENSIONS[selectedDimension]?.heightType || MEDIUM,
                     }}),
-                    ...(!isFullMode && (() => {
-                      const tokens = [
-                        ...(templateTitle ? (templateTitle.match(rcsVarRegex) || []) : []),
-                        ...(templateDesc ? (templateDesc.match(rcsVarRegex) || []) : []),
+                    ...(isSlotMappingMode && (() => {
+                      const templateVarTokens = [
+                        ...(templateTitle?.match(rcsVarRegex) ?? []),
+                        ...(templateDesc?.match(rcsVarRegex) ?? []),
                       ];
-                      const allowedKeys = tokens
-                        .map((t) => getVarNameFromToken(t))
-                        .filter(Boolean);
-                      const nextMap = {};
-                      allowedKeys.forEach((k) => {
-                        if (Object.prototype.hasOwnProperty.call(cardVarMapped || {}, k)) {
-                          nextMap[k] = cardVarMapped[k];
-                        } else {
-                          nextMap[k] = '';
-                        }
+                      const cardVarMappedForRcsCardOnly = pickRcsCardVarMappedEntries(
+                        cardVarMapped,
+                      );
+                      // Persist numeric slot keys only ("1","2",…) — avoids duplicating the same value under
+                      // semantic names (e.g. both "1" and dynamic_expiry_date_after_3_days.FORMAT_1). Hydration
+                      // and coalesceCardVarMappedToTemplate still resolve from numeric keys + template tokens.
+                      const persistedSlotVarMap = {};
+                      templateVarTokens.forEach((token, slotIndexZeroBased) => {
+                        const varName = getVarNameFromToken(token);
+                        if (!varName) return;
+                        const resolvedRawValue = resolveCardVarMappedSlotValue(
+                          cardVarMappedForRcsCardOnly,
+                          varName,
+                          slotIndexZeroBased,
+                          isSlotMappingMode,
+                          rcsSpanningSemanticVarNames.has(varName),
+                        );
+                        const sanitizedSlotValue = sanitizeCardVarMappedValue(resolvedRawValue);
+                        persistedSlotVarMap[String(slotIndexZeroBased + 1)] = sanitizedSlotValue;
                       });
-                      return { cardVarMapped: nextMap };
+                      return { cardVarMapped: persistedSlotVarMap };
                     })()),
                     ...(suggestions.length > 0 && { suggestions }),
                   }
@@ -2012,17 +2824,7 @@ const splitTemplateVarString = (str) => {
                 contentType: isFullMode ? templateType : RICHCARD,
                 ...(isFullMode && {accountId:accountId, accessToken: accessToken, accountName: accountName, hostName: hostName}),
               },
-              smsFallBackContent: {
-                message: fallbackMessage,
-                ...(isDltEnabled && {
-                  templateConfigs: {
-                    templateId,
-                    templateName: template_name,
-                    template,
-                    registeredSenderIds,
-                  },
-                }),
-              },
+              ...smsFallbackPayloadContent,
             },
           },
         },
@@ -2032,6 +2834,126 @@ const splitTemplateVarString = (str) => {
     return payload;
   };
 
+  /** Shape expected by CommonTestAndPreview buildRcsTestMessagePayload (versions.base.content.RCS). */
+  const testPreviewFormData = useMemo(() => {
+    const payload = createPayload();
+    const rcs = payload?.versions?.base?.content?.RCS;
+    if (!rcs) return null;
+    // createMessageMeta uses WeCRM `id` when present; else template API account id (sourceAccountIdentifier).
+    const accountIdForCreateMessageMeta =
+      (wecrmAccountId != null && String(wecrmAccountId).trim() !== '')
+        ? String(wecrmAccountId)
+        : accountId;
+    const isSlotMappingModeForPreview = isEditFlow || !isFullMode;
+    let rcsForTest = {
+      ...rcs,
+      rcsContent: {
+        ...rcs.rcsContent,
+        ...(accountIdForCreateMessageMeta ? { accountId: accountIdForCreateMessageMeta } : {}),
+      },
+    };
+    /** Approval payload keeps numeric-only `cardVarMapped`; preview APIs still need semantic keys. */
+    const cardContent = rcsForTest.rcsContent?.cardContent;
+    if (Array.isArray(cardContent) && cardContent[0]) {
+      if (isCarouselType) {
+        // Carousel: resolve {{N}} slot tokens to the actual tag expressions / static values the
+        // user mapped via cardVarMapped. Run this for ALL modes (create, edit, consumer) so that:
+        //  - buildRcsTestMessagePayload sends real Capillary tag names to the test API, and
+        //  - prepareTagExtractionPayload can extract tag metadata from the card content.
+        // Each variable slot's key comes from computeCarouselVarSlotKeys, so two cards' variables
+        // never share a key even when they pick the same tag name for their own slot.
+        rcsForTest = {
+          ...rcsForTest,
+          rcsContent: {
+            ...rcsForTest.rcsContent,
+            cardContent: cardContent.map((card) => {
+              const rawTitle = card.title || '';
+              const rawDesc = card.description || '';
+              const resolvedTitle = resolveCarouselTemplateWithMap(rawTitle, cardIndex, false);
+              const resolvedDesc = resolveCarouselTemplateWithMap(rawDesc, cardIndex, true);
+              return { ...card, title: resolvedTitle, description: resolvedDesc };
+            }),
+          },
+        };
+      } else if (isSlotMappingModeForPreview) {
+        // Standalone card: coalesce cardVarMapped with the template's slot names so the preview
+        // API receives a correctly-keyed var map for non-carousel templates.
+        const fullCardVarMapped = coalesceCardVarMappedToTemplate(
+          pickRcsCardVarMappedEntries(cardVarMapped),
+          templateTitle,
+          templateDesc,
+          rcsVarRegex,
+        );
+        rcsForTest = {
+          ...rcsForTest,
+          rcsContent: {
+            ...rcsForTest.rcsContent,
+            cardContent: [
+              { ...cardContent[0], cardVarMapped: fullCardVarMapped },
+              ...cardContent.slice(1),
+            ],
+          },
+        };
+      }
+    }
+    const out = {
+      versions: {
+        base: {
+          content: {
+            RCS: rcsForTest,
+          },
+        },
+      },
+    };
+    // Use the smsFallbackTemplateConfigs already built by createPayload() / buildSmsFallBackContentForPayload —
+    // it merges the API baseline (templateId, registeredSenderIds, templateName, etc.) with local
+    // smsFallbackData state. Reading raw smsFallbackData here would miss the API-sourced smsTemplateId
+    // in campaign mode. This also keeps templateName (and all other fields) in sync with the approval
+    // payload automatically.
+    const smsFallbackTcFromPayload = rcs?.rcsContent?.smsFallBackContent?.templateConfigs;
+    if (smsFallbackTcFromPayload && typeof smsFallbackTcFromPayload === 'object') {
+      out.templateConfigs = {
+        ...smsFallbackTcFromPayload,
+        traiDltEnabled: isTraiDLTEnable(isFullMode, smsRegister),
+      };
+    }
+    return out;
+  }, [
+    templateName,
+    templateTitle,
+    templateDesc,
+    templateMediaType,
+    cardVarMapped,
+    carouselData,
+    suggestions,
+    rcsImageSrc,
+    rcsVideoSrc,
+    rcsThumbnailSrc,
+    selectedDimension,
+    smsFallbackData,
+    isFullMode,
+    isEditFlow,
+    templateType,
+    accountId,
+    wecrmAccountId,
+    accessToken,
+    accountName,
+    hostName,
+    smsRegister,
+  ]);
+
+  /**
+   * Library/campaign: `createPayload` merges root + nested `smsFallBackContent` from `templateData`
+   * with `smsFallbackData`. Done/slot validation must use the same merge — otherwise local state can
+   * miss `templateContent` / var map while the parent payload still has them (DLT campaigns).
+   */
+ const librarySmsFallbackMergedForValidation = useMemo(
+    () => mergeSmsFallbackForLibrary(templateData, smsFallbackData, isFullMode),
+    [isFullMode, templateData, smsFallbackData],
+  );
+
+    
+
   const actionCallback = ({ errorMessage, resp }, isEdit) => {
     // eslint-disable-next-line no-undef
     const error = errorMessage?.message || errorMessage;
@@ -2061,6 +2983,9 @@ const splitTemplateVarString = (str) => {
       _id: params?.id,
       validity: true,
       type: RCS,
+      // CreativesContainer closes the slide box *after* getCreativesData runs so the parent receives
+      // the RCS payload first (closing immediately used to skip getCreativesData → empty "Add creative").
+      closeSlideBoxAfterSubmit: !isFullMode,
     };
     getFormData(formDataParams);
   };
@@ -2074,6 +2999,7 @@ const splitTemplateVarString = (str) => {
       actionCallback({ resp, errorMessage });
       setSpin(false); // Always turn off spinner
       if (!errorMessage) {
+        setTemplateStatus(RCS_STATUSES.pending);
         onCreateComplete();
       }
     });
@@ -2085,6 +3011,72 @@ const splitTemplateVarString = (str) => {
     }
   };
 
+  const smsFallbackBlocksDone = () => checkSmsFallbackBlocksDone({
+    isFullMode,
+    smsRegister,
+    smsFallbackData,
+    templateData,
+    smsFallbackMergedForValidation: librarySmsFallbackMergedForValidation,
+  });
+
+  /**
+   * Library / campaigns (`!isFullMode`): card slots are often stored on numeric keys (`1`,`2`,…) while
+   * semantic keys stay `""` from API round-trip. `resolveCardVarMappedSlotValue` matches createPayload
+   * / preview — naive `cardVarMapped[name]` wrongly kept Done disabled for DLT.
+   */
+  const isLibraryCampaignCardVarMappingIncomplete = () => {
+    if (isFullMode) return false;
+    const titleTokens = splitTemplateVarStringRcs(templateTitle).filter((elem) =>
+      rcsVarTestRegex.test(elem),
+    );
+    const descTokens = splitTemplateVarStringRcs(templateDesc).filter((elem) =>
+      rcsVarTestRegex.test(elem),
+    );
+    const orderedVarNames = [
+      ...titleTokens.map((token) => token.replace(RCS_STRIP_MUSTACHE_DELIMITERS_REGEX, '')),
+      ...descTokens.map((token) => token.replace(RCS_STRIP_MUSTACHE_DELIMITERS_REGEX, '')),
+    ];
+    if (orderedVarNames.length > 0 && isEmpty(cardVarMapped)) {
+      return true;
+    }
+    return orderedVarNames.some((name, globalIdx) => {
+      const slotValue = resolveCardVarMappedSlotValue(
+        cardVarMapped,
+        name,
+        globalIdx,
+        true,
+        rcsSpanningSemanticVarNames.has(name),
+      );
+      const stringValue = slotValue == null ? '' : String(slotValue);
+      return stringValue.trim() === '';
+    });
+  };
+
+  const isCarouselLibraryIncomplete = () => {
+    if (!isCarouselType || isFullMode) return false;
+    if ((carouselErrors || []).some((err) => err?.title || err?.description)) return true;
+    // Block if any card's title or description has no content at all (no static text and no variable tokens).
+    const hasEmptyField = (carouselData || []).some((card) =>
+      ['title', 'description'].some((field) => !(card?.[field] || '').trim())
+    );
+    if (hasEmptyField) return true;
+    const slotKeysByCard = computeCarouselVarSlotKeys(carouselData, rcsVarRegex);
+    const unfilledVar = (carouselData || []).some((card, cardIndex) =>
+      ['title', 'description'].some((field) => {
+        const isDescField = field === 'description';
+        const tokens = splitTemplateVarStringRcs(card?.[field] || '').filter((token) => rcsVarTestRegex.test(token));
+        if (tokens.length === 0) return false;
+        const fieldKeys = (isDescField ? slotKeysByCard[cardIndex]?.description : slotKeysByCard[cardIndex]?.title) ?? [];
+        return tokens.some((token, localVarOrdinal) => {
+          const slotKey = fieldKeys[localVarOrdinal];
+          const slotValue = cardVarMapped?.[slotKey];
+          return slotValue == null || String(slotValue).trim() === '';
+        });
+      })
+    );
+    return unfilledVar;
+  };
+
   const isDisableDone = () => {
     if(isEditFlow){
       return false;
@@ -2095,46 +3087,26 @@ const splitTemplateVarString = (str) => {
       }
     }
 
-    if(!isFullMode){
-      const titleVars = splitTemplateVarString(templateTitle).filter(elem => rcsVarTestRegex.test(elem)).map(v => v.replace(/^\{\{|\}\}$/g, ''));
-      const descVars = splitTemplateVarString(templateDesc).filter(elem => rcsVarTestRegex.test(elem)).map(v => v.replace(/^\{\{|\}\}$/g, ''));
-      const allVars = Array.from(new Set([ ...titleVars, ...descVars ]));
-
-      if (allVars.length > 0 && isEmpty(cardVarMapped)) {
-        return true;
-      }
-
-      const hasEmptyMapping =
-        cardVarMapped &&
-        Object.keys(cardVarMapped).length > 0 &&
-        Object.entries(cardVarMapped).some(([_, v]) => {
-          if (typeof v !== 'string') return !v; // null/undefined
-          return v.trim() === ''; // empty string
-        });
-
-      if (hasEmptyMapping) {
-        return true;
-      }
+    if (isCarouselLibraryIncomplete()) {
+      return true;
+    }
 
-      const anyMissing = allVars.some(name => {
-        const v = cardVarMapped?.[name];
-        if (typeof v !== 'string') return !v;
-        return v.trim() === '';
-      });
-      if (anyMissing) {
-        return true;
-      }
+    if (isLibraryCampaignCardVarMappingIncomplete()) {
+      return true;
     }
 
-      if (isMediaTypeText && templateDesc.trim() === '') {
+    if (smsFallbackBlocksDone()) {
       return true;
+    }
 
+    if (!isCarouselType && isMediaTypeText && templateDesc.trim() === '') {
+      return true;
     }
-    if (isMediaTypeImage && (rcsImageSrc === '' || templateTitle === '' || templateDesc === '' )) {
+    if (!isCarouselType && isMediaTypeImage && (rcsImageSrc === '' || templateTitle === '' || templateDesc === '' )) {
       return true;
     }
 
-    if (isMediaTypeVideo && (rcsVideoSrc.videoSrc === '' || rcsThumbnailSrc === '' || templateTitle === '' || templateDesc === '' )) {
+    if (!isCarouselType && isMediaTypeVideo && (!rcsVideoSrc.videoSrc || rcsThumbnailSrc === '' || templateTitle === '' || templateDesc === '' )) {
      return true;
     }
     if (buttonType.includes(CTA)) {
@@ -2146,72 +3118,54 @@ const splitTemplateVarString = (str) => {
         return true;
       }
     }
-    if (templateDescError || templateTitleError || fallbackMessageError) {
+    if (templateDescError || templateTitleError) {
+      return true;
+    }
+    if (isSmsFallbackContentTooLong(smsFallbackData, FALLBACK_MESSAGE_MAX_LENGTH)) {
       return true;
     }
     return false;
   };
 
   const isEditDisableDone = () => {
-    
-    if (templateStatus !== RCS_STATUSES.approved) {
+    if (isFullMode && !isHostInfoBip && templateStatus !== RCS_STATUSES.approved) {
       return true;
     }
 
-    if (!isFullMode) {
-      if (templateName.trim() === '' || templateNameError) {
-        return true;
-      }
+    if (isCarouselLibraryIncomplete()) {
+      return true;
     }
-    if(!isFullMode){
-      const titleVars = splitTemplateVarString(templateTitle).filter(elem => rcsVarTestRegex.test(elem)).map(v => v.replace(/^\{\{|\}\}$/g, ''));
-      const descVars = splitTemplateVarString(templateDesc).filter(elem => rcsVarTestRegex.test(elem)).map(v => v.replace(/^\{\{|\}\}$/g, ''));
-      const allVars = Array.from(new Set([ ...titleVars, ...descVars ]));
-
-      if (allVars.length > 0 && isEmpty(cardVarMapped)) {
-        return true;
-      }
-
-      const hasEmptyMapping =
-        cardVarMapped &&
-        Object.keys(cardVarMapped).length > 0 &&
-        Object.entries(cardVarMapped).some(([_, v]) => {
-          if (typeof v !== 'string') return !v; // null/undefined
-          return v.trim() === ''; // empty string
-        });
 
-      if (hasEmptyMapping) {
-        return true;
-      }
+    if (isLibraryCampaignCardVarMappingIncomplete()) {
+      return true;
+    }
 
-      const anyMissing = allVars.some(name => {
-        const v = cardVarMapped?.[name];
-        if (typeof v !== 'string') return !v;
-        return v.trim() === '';
-      });
-      if (anyMissing) {
-        return true;
-      }
+    if (smsFallbackBlocksDone()) {
+      return true;
     }
-    if (isMediaTypeText && templateDesc.trim() === '') {
+
+    if (!isCarouselType && isMediaTypeText && templateDesc.trim() === '') {
       return true;
     }
-    if (isMediaTypeImage && rcsImageSrc === '') {
+    if (!isCarouselType && isMediaTypeImage && rcsImageSrc === '') {
       return true;
     }
-    if(isMediaTypeVideo && (rcsThumbnailSrc === '' || rcsVideoSrc.videoSrc === '')) {
+    if (!isCarouselType && isMediaTypeVideo && (rcsThumbnailSrc === '' || rcsVideoSrc.videoSrc === '')) {
       return true;
     }
 
     if (buttonType.includes(CTA)) {
-      const hasValidButtons = suggestions.every(suggestion => 
+      const hasValidButtons = suggestions.every(suggestion =>
         suggestion.text && suggestion.url && !suggestionError && !forbiddenCharactersValidation(suggestion.text)
       );
       if (!hasValidButtons) {
         return true;
       }
     }
-    if (templateTitleError || templateDescError || fallbackMessageError) {
+    if (templateTitleError || templateDescError) {
+      return true;
+    }
+    if (isSmsFallbackContentTooLong(smsFallbackData, FALLBACK_MESSAGE_MAX_LENGTH)) {
       return true;
     }
     return false;
@@ -2261,85 +3215,108 @@ const splitTemplateVarString = (str) => {
   };
 
   const getMainContent = () => {
-    if (showDltContainer && !fallbackPreviewmode) {
-      const dltSlideBoxContent = showDltContainer && getDltSlideBoxContent();
-      const { dltHeader = '', dltContent = '' } = dltSlideBoxContent;
-      return (
-        <CapSlideBox
-          show={showDltContainer}
-          header={dltHeader}
-          content={dltContent}
-          handleClose={closeDltContainerHandler}
-          size="size-xl"
-        />
-      );
-    }
-
     return (
       <>
-        {templateStatus !== '' && (<CapRow useLegacy className="template-status-container">
-          <CapLabel type="label2">
-            {formatMessage(messages.templateStatusLabel)}
-          </CapLabel>
-
-          {templateStatus && (
-            <CapAlert
-              message={getTemplateStatusMessage()}
-              type={getTemplateStatusType(templateStatus)}
-            />
-          )}
-        </CapRow>
+        {templateStatus !== '' && (
+          <CapRow useLegacy className="template-status-container">
+            <CapColumn span={14}>
+              <CapLabel type="label2">
+                {formatMessage(messages.templateStatusLabel)}
+              </CapLabel>
+
+              {!isHostInfoBip && templateStatus && (
+                <CapAlert
+                  message={getTemplateStatusMessage()}
+                  type={getTemplateStatusType(templateStatus)}
+                />
+              )}
+            </CapColumn>
+          </CapRow>
         )}
-        <CapRow className="cap-rcs-creatives">
+        <CapRow className={`cap-rcs-creatives ${isEditLike ? 'rcs-edit-mode' : ''}`}>
           <CapColumn span={14}>
             {/* template name */}
             {isFullMode && (
-              <CapInput
-                id="rcs_template_name_input"
-                data-testid="template_name"
-                onChange={onTemplateNameChange}
-                errorMessage={templateNameError}
-                placeholder={formatMessage(
-                  globalMessages.templateNamePlaceholder,
-                )}
-                value={templateName || ''}
-                size="default"
-                label={formatMessage(globalMessages.creativeNameLabel)}
-                disabled={(isEditFlow || !isFullMode)}
-              />
+              isEditFlow ? (
+                <div className="rcs-creative-name-readonly">
+                  <CapHeading type="h4">
+                    {formatMessage(globalMessages.creativeNameLabel)}
+                  </CapHeading>
+                  <CapHeading type="h5" className="rcs-creative-name-value">
+                    {templateName || '-'}
+                  </CapHeading>
+                </div>
+              ) : (
+                <CapInput
+                  id="rcs_template_name_input"
+                  data-testid="template_name"
+                  onChange={onTemplateNameChange}
+                  errorMessage={templateNameError}
+                  placeholder={formatMessage(
+                    globalMessages.templateNamePlaceholder,
+                  )}
+                  value={templateName || ''}
+                  size="default"
+                  label={formatMessage(globalMessages.creativeNameLabel)}
+                  disabled={(isEditFlow || !isFullMode)}
+                />
+              )
+            )}
+            {isEditFlow ? (
+              <div className="rcs-creative-name-readonly">
+                <CapHeading type="h4">
+                  {formatMessage(messages.templateTypeLabel)}
+                </CapHeading>
+                <CapHeading type="h5" className="rcs-creative-name-value">
+                  {TEMPLATE_TYPE_OPTIONS.find((option) => option.value === templateType)?.label || '-'}
+                </CapHeading>
+              </div>
+            ) : (
+              <>
+                {renderLabel('templateTypeLabel')}
+                <ConfigProvider theme={{ components: { Radio: { radioSize: 20, dotSize: 8 } } }}>
+                <CapRadioGroup
+                    id="select-rcs-template-type"
+                    options={TEMPLATE_TYPE_OPTIONS}
+                    onChange={onTemplateTypeChange}
+                    value={templateType}
+                    disabled={!isFullMode}
+                  />
+                </ConfigProvider>
+              </>
             )}
-            {renderLabel('templateTypeLabel')}
-            <ConfigProvider theme={{ components: { Radio: { radioSize: 20, dotSize: 8 } } }}>
-              <CapRadioGroup
-                id="select-rcs-template-type"
-                options={TEMPLATE_TYPE_OPTIONS}
-                onChange={onTemplateTypeChange}
-                value={templateType}
-                disabled={(isEditFlow || !isFullMode)}
-              />
-            </ConfigProvider>
 
-            {/* Show media only for rich_card or carousel */}
-            {(templateType === contentType.rich_card || templateType === contentType.carousel) && (
+            {templateType === contentType.carousel ? (
+              renderCarouselSection()
+            ) : (
               <>
-                {renderLabel('mediaLabel')}
-                  <ConfigProvider theme={{ components: { Radio: { radioSize: 20, dotSize: 8 } } }}>
+                {/* Show media only for rich_card */}
+                {templateType === contentType.rich_card && (
+                  <>
+                    {renderLabel('mediaLabel')}
+                    <ConfigProvider theme={{ components: { Radio: { radioSize: 20, dotSize: 8 } } }}>
                     <CapRadioGroup
-                      options={mediaRadioOptions || []}
-                      value={templateMediaType}
-                      onChange={onTemplateMediaTypeChange}
-                      disabled={(isEditFlow || !isFullMode)}
-                      className="rcs-radio"
-                    />
-                  </ConfigProvider>
+                        options={mediaRadioOptions || []}
+                        value={templateMediaType}
+                        onChange={onTemplateMediaTypeChange}
+                        disabled={(isEditFlow || !isFullMode)}
+                        className="rcs-radio"
+                      />
+                      </ConfigProvider>
                 <div className="rcs-container-image">
-                  {getMediaBasedComponent()}
-                </div>
+                      {getMediaBasedComponent()}
+                    </div>
+                  </>
+                )}
+                {renderTextComponent()}
+              </>
+            )}
+            {(!isEditFlow || hasMeaningfulSmsFallbackShape(smsFallbackData)) && (
+              <>
+                <CapDivider className="rcs-fallback-section-divider" />
+                {renderFallBackSmsComponent()}
               </>
             )}
-            {renderTextComponent()}
-            <CapDivider style={{ margin: `${CAP_SPACE_28} 0` }} />
-            {renderFallBackSmsComponent()}
             <div className="rcs-scroll-div" />
           </CapColumn>
           <CapColumn span={8} offset={2}>
@@ -2350,7 +3327,8 @@ const splitTemplateVarString = (str) => {
 
        
         <div className="rcs-footer">
-          {!isEditFlow && (
+          {/* Full-mode create only: send-for-approval + disabled test/preview. Library mode uses Done below — onDoneCallback() is undefined when !isFullMode, so do not render this row (avoids a no-op primary button). */}
+          {!isEditFlow && isFullMode && (
           <>
               <div className="button-disabled-tooltip-wrapper">
                 <CapButton
@@ -2358,7 +3336,9 @@ const splitTemplateVarString = (str) => {
                   disabled={isDisableDone()}
                   className="rcs-done-btn"
                 >
-                  <FormattedMessage {...messages.sendForApprovalButtonLabel} />
+                  <FormattedMessage 
+                  {...(isHostInfoBip ? messages.doneButtonLabel : messages.sendForApprovalButtonLabel)} 
+                  />
                 </CapButton>
               </div>
               <CapTooltip
@@ -2371,7 +3351,6 @@ const splitTemplateVarString = (str) => {
                     className="rcs-test-preview-btn"
                     type="secondary"
                     disabled={true}
-                    style={{ marginLeft: "8px" }}
                   >
                     <FormattedMessage {...creativesMessages.testAndPreview} />
                   </CapButton>
@@ -2392,7 +3371,7 @@ const splitTemplateVarString = (str) => {
               </div>
           </>
           )}
-          {isEditFlow && templateStatus === RCS_STATUSES.approved && (
+          {isEditFlow && (isHostInfoBip || templateStatus === RCS_STATUSES.approved) && (
             <>
               <CapButton
                 onClick={handleTestAndPreview}
@@ -2404,51 +3383,6 @@ const splitTemplateVarString = (str) => {
             </>
           )}
         </div>
-
-
-        {fallbackPreviewmode && (
-          <CapSlideBox
-            className="rcs-fallback-preview"
-            show={fallbackPreviewmode}
-            header={(
-              <CapHeading type="h7" style={{ color: CAP_G01 }}>
-                {formatMessage(messages.fallbackPreviewtitle)}
-              </CapHeading>
-            )}
-            content={(
-              <>
-                <UnifiedPreview
-                  channel={RCS}
-                  content={{
-                    rcsPreviewContent: {
-                      rcsDesc: tempMsg,
-                    },
-                  }}
-                  device={ANDROID}
-                  showDeviceToggle={false}
-                  showHeader={false}
-                  formatMessage={formatMessage}
-                />
-                <CapHeading
-                  type="h3"
-                  style={{ textAlign: 'center', width: '100%' }}
-                  className="margin-t-16"
-                >
-                  {formatMessage(messages.totalCharacters, {
-                    smsCount: Math.ceil(
-                      tempMsg?.length / FALLBACK_MESSAGE_MAX_LENGTH,
-                    ),
-                    number: tempMsg.length,
-                  })}
-                </CapHeading>
-              </>
-            )}
-            handleClose={() => {
-              setFallbackPreviewmode(false);
-              setDltPreviewData('');
-            }}
-          />
-        )}
       </>
     );
   };
@@ -2457,29 +3391,49 @@ const splitTemplateVarString = (str) => {
       <CapSpin spinning={loadingTags || spin}>
         {getMainContent()}
       </CapSpin>
+
       <TestAndPreviewSlidebox
         show={propsShowTestAndPreviewSlidebox || showTestAndPreviewSlidebox}
         onClose={handleCloseTestAndPreview}
-        formData={null} // RCS doesn't use formData structure like SMS
-        content={getTemplateContent()}
+        formData={testPreviewFormData}
+        content={testAndPreviewContent}
         currentChannel={RCS}
+        orgUnitId={orgUnitId}
+        rcsTestPreviewOptions={{ isLibraryMode: !isFullMode }}
+        smsFallbackContent={
+          smsFallbackData && (smsFallbackData.templateContent || smsFallbackData.content)
+            ? {
+              templateContent:
+                smsFallbackData.templateContent || smsFallbackData.content || '',
+              templateName: smsFallbackData.templateName || '',
+              [RCS_SMS_FALLBACK_VAR_MAPPED_PROP]: !isFullMode
+                ? mergeRcsSmsFallbackVarMapLayers(
+                  getLibrarySmsFallbackApiBaselineFromTemplateData(templateData),
+                  smsFallbackData,
+                )
+                : mergeRcsSmsFallbackVarMapLayers({}, smsFallbackData),
+            }
+            : null
+        }
+        smsRegister={smsRegister}
       />
     </>
   );
 };
 
+
 const mapStateToProps = createStructuredSelector({
   rcsData: makeSelectRcs(),
   accountData: makeSelectAccount(),
   metaEntities: makeSelectMetaEntities(),
   loadingTags: isLoadingMetaEntities(),
   injectedTags: setInjectedTags(),
+  currentOrgDetails: selectCurrentOrgDetails(),
 });
 
 const mapDispatchToProps = (dispatch) => ({
   actions: bindActionCreators(RcsActions, dispatch),
   globalActions: bindActionCreators(globalActions, dispatch),
-  templatesActions: bindActionCreators(TemplatesActions, dispatch),
 });
 
 const withReducer = injectReducer({ key: 'rcs', reducer: v2RcsReducer });