@capillarytech/creatives-library 9.0.15-alpha.3 → 9.0.16-beta.0

package/v2Containers/Whatsapp/index.js

@@ -119,7 +119,6 @@ import { ANDROID } from '../../v2Components/CommonTestAndPreview/constants';
 import CapImageUpload from '../../v2Components/CapImageUpload';
 import TagList from '../TagList';
 import { validateTags } from '../../utils/tagValidations';
-import { splitContentByOrderedVarTokens } from '../../utils/templateVarUtils';
 import { capitalizeString } from '../../utils/Formatter';
 import CapWhatsappCTA from '../../v2Components/CapWhatsappCTA';
 import {
@@ -497,10 +496,28 @@ export const Whatsapp = (props) => {
     );
   };
 
+  const converStringToVarArr = (validVarArr, content) => {
+    const templateVarArray = [];
+    while (content?.length !== 0) {
+      //converting content string to an array split at var
+      const index = content.indexOf(validVarArr?.[0]);
+      if (index !== -1) {
+        templateVarArray.push(content.substring(0, index)); //push string before var
+        templateVarArray.push(validVarArr?.[0]); //push var
+        content = content.substring(index + validVarArr?.[0]?.length, content?.length); //remaining str
+        validVarArr?.shift(); //remove considered var
+      } else {
+        templateVarArray.push(content); //remaining str
+        break;
+      }
+    }
+    return templateVarArray;
+  }
+
   const computeTextMessage = (msg, varMap, regex) => {
     const validVarArr = msg?.match(regex) || [];
     //conerting msg string to variable arr
-    const templateHeaderArray = splitContentByOrderedVarTokens(validVarArr, msg);
+    const templateHeaderArray = converStringToVarArr(validVarArr, msg);
     if (templateHeaderArray?.length !== 0) {
       let clonedVarMap = {};
       if (!isEmpty(varMap)) {
@@ -554,7 +571,7 @@ export const Whatsapp = (props) => {
       setUnsubscribeRequired(true);
     }
     //converting msg string to variable arr
-    const templateMessageArray = splitContentByOrderedVarTokens(validVarArr, msg);
+    const templateMessageArray = converStringToVarArr(validVarArr, msg);
     updateTempMsgArray(templateMessageArray.filter((i) => i === 0 || i));
   };
 
@@ -727,7 +744,11 @@ export const Whatsapp = (props) => {
       carouselIndex,
     } = tagSelectData;
     if (mapData && updatedData) {
-      const numId = Number(areaId?.slice(areaId?.indexOf("_") + 1));
+      const underscoreIdx = areaId ? areaId.indexOf("_") : -1;
+      if (underscoreIdx < 0) {
+        return;
+      }
+      const numId = Number(areaId.slice(underscoreIdx + 1));
       if (!isNaN(numId)) {
         const arr = [...updatedData];
         //when trying to insert tag in empty textarea,{#var#} is replaced with "" and then tag is added