@capillarytech/creatives-library 8.0.359-alpha.0 → 8.0.359-alpha.1

package/v2Containers/Whatsapp/index.js

@@ -119,6 +119,7 @@ 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 {
@@ -496,28 +497,10 @@ 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 = converStringToVarArr(validVarArr, msg);
+    const templateHeaderArray = splitContentByOrderedVarTokens(validVarArr, msg);
     if (templateHeaderArray?.length !== 0) {
       let clonedVarMap = {};
       if (!isEmpty(varMap)) {
@@ -571,7 +554,7 @@ export const Whatsapp = (props) => {
       setUnsubscribeRequired(true);
     }
     //converting msg string to variable arr
-    const templateMessageArray = converStringToVarArr(validVarArr, msg);
+    const templateMessageArray = splitContentByOrderedVarTokens(validVarArr, msg);
     updateTempMsgArray(templateMessageArray.filter((i) => i === 0 || i));
   };