@capillarytech/creatives-library 8.0.307 → 8.0.308

package/v2Containers/MobilePush/Edit/index.js

@@ -39,8 +39,7 @@ import { v2MobilePushEditSagas } from './sagas';
 import v2MobilePushEditReducer from './reducer';
 import * as globalActions from '../../Cap/actions';
 import { MAPP_SDK } from './constants';
-import { checkForPersonalizationTokens, isEmbeddedEditOrPreview, validateMobilePushContent } from '../../../utils/commonUtils';
-import formBuilderMessages from '../../../v2Components/FormBuilder/messages';
+import { checkForPersonalizationTokens, isEmbeddedEditOrPreview } from '../../../utils/commonUtils';
 import { EMBEDDED } from '../../Whatsapp/constants';
 import { OUTBOUND } from '../../../v2Components/FormBuilder/constants';
 import TestAndPreviewSlidebox from '../../../v2Components/TestAndPreviewSlidebox';
@@ -69,7 +68,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       schema: {},
       currentTab: 1,
       editData: {},
-      errorData: [],
       loading: false,
       isFormValid: true,
       injectedTags: {},
@@ -131,43 +129,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       this.hasFetchedInitialTagsRef = false;
       this.lastFetchedTagContextRef = null;
     }
-    // Library mode: on Done click (transition to isGetFormData), run extractTags only when no existing validation errors (braces, personalization, etc.)
-    if (nextProps.isGetFormData && !this.props.isGetFormData && !nextProps.isFullMode) {
-      // If form already has validation errors (braces, personalization tags, etc.), do not call extractTags; just fail
-      if (!this.state.isFormValid) {
-        nextProps.onValidationFail?.();
-        return;
-      }
-      if (nextProps.getLiquidTags && nextProps.showLiquidErrorInFooter) {
-        const formDataArr = [this.state.formData?.[0], this.state.formData?.[1]];
-        validateMobilePushContent(formDataArr, {
-          currentTab: this.state.currentTab,
-          getLiquidTags: nextProps.getLiquidTags,
-          formatMessage: this.props.intl.formatMessage,
-          messages: formBuilderMessages,
-          onError: (err) => {
-            const { standardErrors = [], liquidErrors = [] } = err;
-            // _validatePlatformSpecificContent passes { standardErrors: { ANDROID, IOS, generic }, liquidErrors: { ... } }; footer expects arrays
-            const toArray = (v) => (Array.isArray(v) ? v : (v && typeof v === 'object' ? [].concat(...Object.values(v)) : []));
-            const STANDARD_ERROR_MSG = toArray(standardErrors);
-            const LIQUID_ERROR_MSG = toArray(liquidErrors);
-            nextProps.showLiquidErrorInFooter(
-              { STANDARD_ERROR_MSG, LIQUID_ERROR_MSG },
-              this.state.currentTab
-            );
-            // Only treat as validation failure when there are actual errors; skip when helper called onError with empty reset payload
-            const hasErrors = STANDARD_ERROR_MSG.length > 0 || LIQUID_ERROR_MSG.length > 0;
-            if (hasErrors) {
-              nextProps.onValidationFail?.();
-            }
-          },
-          onSuccess: () => {
-            nextProps.getFormLibraryData(this.getFormData());
-          },
-        });
-      } else {
-        nextProps.getFormLibraryData(this.getFormData());
-      }
+    if (nextProps.isGetFormData && !this.props.isFullMode) {
+      nextProps.getFormLibraryData(this.getFormData());
     } else if (nextProps.isGetFormData && this.props.isGetFormData !== nextProps.isGetFormData && this.props.isFullMode && !this.props.Create.createTemplateInProgress) {
       this.startValidation();
     }
@@ -742,22 +705,32 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   // eslint-disable-next-line react/sort-comp
   showError = () => {
     const {intl} = this.props;
-    const {errorData, schema} = this.state;
+    const {errorData} = this.state;
     const errorMessage = {key: 'validation-error', message: intl.formatMessage(messages.validationError)};
+    let isTagErrorExist = false;
     if (!_.isEmpty(this.state.formData) && !this.state.isFormValid) {
       let tab = this.state.currentTab;
-      const isAndroidInvalid = Object.values(errorData?.[0] || {}).includes(true);
-      const isIosInvalid = Object.values(errorData?.[1] || {}).includes(true);
-      const isIosTabVisible = get(schema, 'containers[0].panes[1].isSupported', true) !== false;
+      const isAndroidInvalid = Object.values(errorData[0]).includes(true);
+      const isIosInvalid = Object.values(errorData[1]).includes(true);
       if (isAndroidInvalid) {
         tab = 1;
         errorMessage.description = intl.formatMessage(messages.invalidAndroidMessage);
-      } else if (isIosInvalid && isIosTabVisible) {
+        const invalidTags = errorData[0]['invalid-tags'];
+        if (!_.isEmpty(invalidTags)) {
+          isTagErrorExist = true;
+          errorMessage.description = `${intl.formatMessage(messages.invalidAndroidMessage)} ${intl.formatMessage(messages.invalidTags)}: ${invalidTags.join(',')} `;
+        }
+      } else if (isIosInvalid) {
         tab = 2;
         errorMessage.description = intl.formatMessage(messages.invalidIosMessage);
+        const invalidTags = errorData[1]['invalid-tags'];
+        if (!_.isEmpty(invalidTags)) {
+          isTagErrorExist = true;
+          errorMessage.description = `${intl.formatMessage(messages.invalidIosMessage)} ${intl.formatMessage(messages.invalidTags)}: ${invalidTags.join(',')} `;
+        }
       }
 
-      if (tab !== this.state.currentTab) {
+      if (tab !== this.state.currentTab || isTagErrorExist) {
         CapNotification.error(errorMessage);
       }
     }
@@ -2334,12 +2307,11 @@ Edit.propTypes = {
   getFormLibraryData: PropTypes.func,
   isGetFormData: PropTypes.bool,
   Create: PropTypes.object,
-  onValidationFail: PropTypes.func,
+  onValidationFail: PropTypes.bool,
   onPreviewContentClicked: PropTypes.func,
   onTestContentClicked: PropTypes.func,
   creativesMode: PropTypes.string,
   eventContextTags: PropTypes.array,
-  getLiquidTags: PropTypes.func,
   showLiquidErrorInFooter: PropTypes.func,
   showTestAndPreviewSlidebox: PropTypes.bool,
   handleTestAndPreview: PropTypes.func,

package/v2Containers/MobilePushNew/index.js

@@ -77,6 +77,7 @@ import { getContent } from "../MobilePush/commonMethods";
 import { getMessageObject } from "../../utils/messageUtils";
 import { gtmPush } from "../../utils/gtmTrackers";
 import mobilePushReducer from "./reducer";
+import { hasLiquidSupportFeature } from "../../utils/common";
 import formBuilderMessages from "../../v2Components/FormBuilder/messages";
 import { validateMobilePushContent } from "../../utils/commonUtils";
 import { getSingleTab } from "../InApp/utils";
@@ -802,9 +803,10 @@ const MobilePushNew = ({
     (value) => {
       let errorTemplateDescMessage = "";
 
-      const { isBraceError } = validateTags({
+      const { unsupportedTags, isBraceError } = validateTags({
         content: value,
         tagsParam: tags,
+        injectedTagsParams: injectedTags,
         location,
         tagModule: getDefaultTags,
         isFullMode,
@@ -814,6 +816,14 @@ const MobilePushNew = ({
           messages.emptyTemplateDescErrorMessage
         );
       }
+      if (unsupportedTags?.length > 0) {
+        errorTemplateDescMessage = formatMessage(
+          globalMessages.unsupportedTagsValidationError,
+          {
+            unsupportedTags,
+          }
+        );
+      }
       if (isBraceError) {
         errorTemplateDescMessage = formatMessage(
           globalMessages.unbalanacedCurlyBraces
@@ -2655,6 +2665,20 @@ const MobilePushNew = ({
       getLiquidTags: globalActionsProps.getLiquidTags,
       formatMessage,
       messages: formBuilderMessages,
+      tagLookupMap: metaEntities?.tagLookupMap || {},
+      eventContextTags: metaEntities?.eventContextTags || [],
+      isLiquidFlow: hasLiquidSupportFeature(),
+      forwardedTags: {},
+      skipTags: (tag) => {
+        const skipRegexes = [
+          /dynamic_expiry_date_after_\d+_days\.FORMAT_\d/,
+          /unsubscribe\(#[a-zA-Z\d]{6}\)/,
+          /Link_to_[a-zA-z]/,
+          /SURVEY.*\.TOKEN/,
+          /^[A-Za-z].*\([a-zA-Z\d]*\)/,
+        ];
+        return skipRegexes.some((regex) => regex.test(tag));
+      },
       singleTab: getSingleTab(accountData),
     });
   }, [
@@ -2663,10 +2687,13 @@ const MobilePushNew = ({
     activeTab,
     globalActionsProps,
     formatMessage,
+    metaEntities,
     accountData,
     isFullMode,
   ]);
 
+  const isLiquidFlow = hasLiquidSupportFeature();
+
   useEffect(() => {
     // Always map to { label } for both platforms
     const newButtons = Array.isArray(ctaData)
@@ -2913,22 +2940,16 @@ const MobilePushNew = ({
     setShowTestAndPreviewSlidebox(false);
   }, []);
 
-  // Add useEffect to handle isGetFormData prop changes (e.g. Done clicked in footer)
-  // In library mode: run liquid validation (extractTags) first; on success liquidMiddleWare calls handleSave
-  // In full mode: call handleSave directly
+  // Add useEffect to handle isGetFormData prop changes
   useEffect(() => {
     if (isGetFormData) {
-      if (!isFullMode) {
-        liquidMiddleWare();
-      } else {
-        handleSave();
-      }
+      handleSave();
       // Reset the flag to prevent infinite loop
       if (onValidationFail) {
         onValidationFail();
       }
     }
-  }, [isGetFormData, handleSave, onValidationFail, isFullMode, liquidMiddleWare]);
+  }, [isGetFormData, handleSave, onValidationFail]);
 
   // Add message event listener to handle parent communication (like old MobilePush components)
   useEffect(() => {
@@ -3069,8 +3090,7 @@ const MobilePushNew = ({
                     <CapButton
                       type="primary"
                       onClick={() => {
-                        // Liquid validation (extractTags) only in library mode
-                        if (!isFullMode) {
+                        if (isLiquidFlow) {
                           liquidMiddleWare();
                         } else {
                           handleSave();

package/v2Containers/MobilepushWrapper/index.js

@@ -72,7 +72,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
   }
 
   render() {
-    const {mobilePushCreateMode, step, getFormData, getLiquidTags, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail, onPreviewContentClicked, onTestContentClicked, templateData, eventContextTags = [], showTestAndPreviewSlidebox, handleTestAndPreview, handleCloseTestAndPreview, restrictPersonalization, isAnonymousType, onPersonalizationTokensChange} = this.props;
+    const {mobilePushCreateMode, step, getFormData, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail, onPreviewContentClicked, onTestContentClicked, templateData, eventContextTags = [], showTestAndPreviewSlidebox, handleTestAndPreview, handleCloseTestAndPreview, restrictPersonalization, isAnonymousType, onPersonalizationTokensChange} = this.props;
     const {templateName} = this.state;
     const isShowMobilepushCreate = !isEmpty(mobilePushCreateMode);
     return (
@@ -102,7 +102,6 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
           <div>
             {isShowMobilepushCreate && <MobilepushCreate
               getFormLibraryData={getFormData}
-              getLiquidTags={getLiquidTags}
               setIsLoadingContent={setIsLoadingContent}
               defaultData={{"template-name": templateName}}
               location={{
@@ -144,7 +143,6 @@ MobilepushWrapper.propTypes = {
   mobilePushCreateMode: PropTypes.string,
   step: PropTypes.string,
   getFormData: PropTypes.string,
-  getLiquidTags: PropTypes.func,
   setIsLoadingContent: PropTypes.func,
   onEnterTemplateName: PropTypes.func,
   onRemoveTemplateName: PropTypes.func,

package/v2Containers/Rcs/index.js

@@ -394,15 +394,23 @@ export const Rcs = (props) => {
     const validationResponse =
       validateTags({
         content: contentForValidation,
-        tagsParam: tags,
-        location,
-        tagModule: getDefaultTags,
-        isFullMode,
-      }) || {};
-    const errorMsg =
-      (validationResponse?.isBraceError &&
-        formatMessage(globalMessages.unbalanacedCurlyBraces)) ||
-      false;
+      tagsParam: tags,
+      injectedTagsParams: injectedTags,
+      location,
+      tagModule: getDefaultTags,
+      eventContextTags,
+      isFullMode,
+    }) || {};
+    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);
   };
@@ -827,9 +835,10 @@ 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,
@@ -859,10 +868,26 @@ export const Rcs = (props) => {
   };
 
   const fallbackMessageErrorHandler = (value) => {
+    let errorMessage = false;
+    const { unsupportedTags } = validateTags({
+      content: value,
+      tagsParam: tags,
+      injectedTagsParams: injectedTags,
+      location,
+      tagModule: getDefaultTags,
+      isFullMode,
+    }) || {};
     if (value?.length > FALLBACK_MESSAGE_MAX_LENGTH) {
-      return formatMessage(messages.fallbackMsgLenError);
+      errorMessage = formatMessage(messages.fallbackMsgLenError);
+    } else if (unsupportedTags?.length > 0) {
+      errorMessage = formatMessage(
+        globalMessages.unsupportedTagsValidationError,
+        {
+          unsupportedTags,
+        },
+      );
     }
-    return false;
+    return errorMessage;
   };
 
   // Check for forbidden characters: square brackets [] and single curly braces {}

package/v2Containers/Sms/Create/index.js

@@ -51,7 +51,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       modalContent: {title: "Alert", body: "Do you really want to delete this version?", type: 'confirm', id: 'sms-version-modal'},
       showTestAndPreviewSlidebox: false,
       isTestAndPreviewMode: false,
-      pendingGetFormData: false,
     };
     this.saveFormData = this.saveFormData.bind(this);
     this.onFormDataChange = this.onFormDataChange.bind(this);
@@ -141,9 +140,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
 
   componentWillReceiveProps(nextProps) {
-    // Only trigger on actual Done click (isGetFormData false -> true). Prevents auto-submit after user fixes brace error.
-    if (!nextProps.isFullMode && nextProps.isGetFormData && !this.props.isGetFormData) {
-      this.setState({ startValidation: true, pendingGetFormData: true });
+    if (nextProps.location.query.module === 'library' && nextProps.isGetFormData) {
+      nextProps.getFormSubscriptionData(this.getFormData());
     } else if (nextProps.isGetFormData && this.props.isFullMode && !this.props.Create.createTemplateInProgress) {
       this.startValidation();
     }
@@ -173,9 +171,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
 
   componentWillUnmount() {
-    if (this.pendingGetFormDataTimeout) {
-      clearTimeout(this.pendingGetFormDataTimeout);
-    }
     if (this.props.setIsLoadingContent) {
       this.props.setIsLoadingContent(true); // setting isLoading of CreativesContainer so that slidebox foot can be hidden till content is loaded
     }
@@ -204,10 +199,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     if (currentTab) {
       this.setState({currentTab});
     }
-    // Clear footer validation errors on input change so they refresh on next validation
-    if (this.props.showLiquidErrorInFooter) {
-      this.props.showLiquidErrorInFooter({ STANDARD_ERROR_MSG: [], LIQUID_ERROR_MSG: [] });
-    }
   }
 
   onTagSelect(data, currentTab) {
@@ -358,25 +349,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
 
   setFormValidity(isFormValid, errorData) {
-    this.setState({ isFormValid, errorData }, () => {
-      if (this.state.pendingGetFormData && !isFormValid) {
-        this.setState({ pendingGetFormData: false, startValidation: false });
-        // Reset parent's Done state so next Done click is a fresh attempt
-        if (this.props.onValidationFail) {
-          this.props.onValidationFail();
-        }
-        return;
-      }
-      // In library mode with SMS, submit only when FormBuilder calls onSubmit (after liquid validation).
-      if (this.state.pendingGetFormData && this.props.getFormSubscriptionData && this.props.isFullMode) {
-        if (this.pendingGetFormDataTimeout) {
-          clearTimeout(this.pendingGetFormDataTimeout);
-          this.pendingGetFormDataTimeout = null;
-        }
-        this.props.getFormSubscriptionData(this.getFormData());
-        this.setState({ pendingGetFormData: false, startValidation: false });
-      }
-    });
+    this.setState({isFormValid, errorData});
   }
 
   injectMessages(elem) {
@@ -997,15 +970,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
 
   saveFormData() {
-    // In library mode: FormBuilder calls onSubmit only after liquid validation succeeds.
-    // Submit to parent here so the slidebox can close with valid data.
-    if (!this.props.isFullMode) {
-      if (this.state.pendingGetFormData && this.props.getFormSubscriptionData) {
-        this.props.getFormSubscriptionData(this.getFormData());
-        this.setState({ pendingGetFormData: false, startValidation: false });
-      }
-      return;
-    }
     //Logic to save in db etc
     const formData = _.cloneDeep(this.state.formData);
     const obj = {};

package/v2Containers/Sms/Create/messages.js

@@ -90,10 +90,6 @@ export default defineMessages({
     id: 'creatives.containersV2.Create.validationError',
     defaultMessage: 'Validation error',
   },
-  "unbalancedCurlyBraces": {
-    id: 'creatives.containersV2.Create.unbalancedCurlyBraces',
-    defaultMessage: 'Please close all curly braces in the message.',
-  },
   "smsTemplateCreatedSuccess": {
     id: 'creatives.containersV2.Create.smsTemplateCreatedSuccess',
     defaultMessage: 'SMS Template Created Successfully',

package/v2Containers/Sms/Edit/index.js

@@ -52,7 +52,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       modalContent: {title: "Alert", body: "Do you really want to delete this version?", type: 'confirm', id: 'sms-version-modal'},
       showTestAndPreviewSlidebox: false,
       isTestAndPreviewMode: false,
-      pendingGetFormData: false,
     };
     this.saveFormData = this.saveFormData.bind(this);
     this.onFormDataChange = this.onFormDataChange.bind(this);
@@ -135,8 +134,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   }
 
   componentWillReceiveProps(nextProps) {
-    if (!nextProps.isFullMode && nextProps.isGetFormData && !this.props.isGetFormData) {
-      this.setState({ startValidation: true, pendingGetFormData: true });
+    if (nextProps.location.query.module === 'library' && nextProps.isGetFormData) {
+      nextProps.getFormSubscriptionData(this.getFormData());
     }
     if ( nextProps.location.query.module === 'library' && nextProps.subscriptionTemplateDetails && nextProps.subscriptionTemplateDetails.name && _.isEmpty(this.state.editData) && !_.isEmpty(this.state.schema)) {
       this.setEditState(nextProps.subscriptionTemplateDetails);
@@ -190,9 +189,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   }
 
   componentWillUnmount() {
-    if (this.pendingGetFormDataTimeout) {
-      clearTimeout(this.pendingGetFormDataTimeout);
-    }
     if (this.props.setIsLoadingContent) {
       this.props.setIsLoadingContent(true); // setting isLoading of CreativesContainer so that slidebox foot can be hidden till content is loaded
     }
@@ -218,10 +214,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     if (currentTab) {
       this.setState({currentTab});
     }
-    // Clear footer validation errors on input change so they refresh on next validation
-    if (this.props.showLiquidErrorInFooter) {
-      this.props.showLiquidErrorInFooter({ STANDARD_ERROR_MSG: [], LIQUID_ERROR_MSG: [] });
-    }
   }
 
   onVersionNameChange() {
@@ -325,23 +317,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   }
 
   setFormValidity(isFormValid, errorData) {
-    this.setState({ isFormValid, errorData }, () => {
-      if (this.state.pendingGetFormData && !isFormValid) {
-        this.setState({ pendingGetFormData: false, startValidation: false });
-        if (this.props.onValidationFail) {
-          this.props.onValidationFail();
-        }
-        return;
-      }
-      if (this.state.pendingGetFormData && this.props.getFormSubscriptionData && this.props.isFullMode) {
-        if (this.pendingGetFormDataTimeout) {
-          clearTimeout(this.pendingGetFormDataTimeout);
-          this.pendingGetFormDataTimeout = null;
-        }
-        this.props.getFormSubscriptionData(this.getFormData());
-        this.setState({ pendingGetFormData: false, startValidation: false });
-      }
-    });
+    this.setState({isFormValid, errorData});
   }
 
   getFormData(e, value) {
@@ -947,14 +923,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     this.setState({startValidation: false});
   }
   saveFormData() {
-    // In library mode: FormBuilder calls onSubmit only after liquid validation succeeds.
-    if (!this.props.isFullMode) {
-      if (this.state.pendingGetFormData && this.props.getFormSubscriptionData) {
-        this.props.getFormSubscriptionData(this.getFormData());
-        this.setState({ pendingGetFormData: false, startValidation: false });
-      }
-      return;
-    }
     //Logic to save in db etc
     //saveFormData gets called only when validation result is true
 

package/v2Containers/Sms/commonMethods.js

@@ -1,14 +1,17 @@
 import isEmpty from 'lodash/isEmpty';
-import CapNotification from '@capillarytech/cap-ui-library/CapNotification';
+import { CapNotification } from '@capillarytech/cap-ui-library';
 import messages from './Create/messages';
 export function showError() {
   const {intl} = this.props;
   const {errorData} = this.state;
   const errorMessage = {key: 'validation-error', message: intl.formatMessage(messages.validationError)};
   if (!isEmpty(this.state.formData) && !this.state.isFormValid) {
-    const err0 = errorData[0] || {};
-    const isSmsInvalid = Object.values(err0).includes(true);
+    const isSmsInvalid = Object.values(errorData[0]).includes(true);
     if (isSmsInvalid) {
+      const invalidTags = errorData[0]['invalid-tags'];
+      if (!isEmpty(invalidTags)) {
+        errorMessage.description = `${intl.formatMessage(messages.invalidTags)}: ${invalidTags.join(',')} `;
+      }
       CapNotification.error(errorMessage);
     }
   }

package/v2Containers/SmsTrai/Edit/index.js

@@ -39,8 +39,10 @@ import formBuilderMessages from '../../../v2Components/FormBuilder/messages';
 import UnifiedPreview from '../../../v2Components/CommonTestAndPreview/UnifiedPreview';
 import TestAndPreviewSlidebox from '../../../v2Components/TestAndPreviewSlidebox';
 import withCreatives from '../../../hoc/withCreatives';
+import { validateTags } from '../../../utils/tagValidations';
 import {
   CHARLIMIT,
+  SMS,
   SMS_TRAI_VAR,
   TAG,
   EMBEDDED,
@@ -49,15 +51,16 @@ import {
   ALL,
   LIBRARY,
 } from './constants';
-import { SMS } from '../../CreativesContainer/constants';
 import v2EditSmsReducer from '../../Sms/Edit/reducer';
 import { v2SmsEditSagas } from '../../Sms/Edit/sagas';
 import ErrorInfoNote from '../../../v2Components/ErrorInfoNote';
 import { validateLiquidTemplateContent } from '../../../utils/commonUtils';
+import { hasLiquidSupportFeature } from '../../../utils/common';
 import { ANDROID } from '../../../v2Components/CommonTestAndPreview/constants';
 
 let varMap = {};
 let traiData = {};
+let tagValidationResponse = {};
 const { TextArea } = CapInput;
 const { CapLabelInline } = CapLabel;
 
@@ -91,6 +94,7 @@ export const SmsTraiEdit = (props) => {
   const [tags, updateTags] = useState([]);
   const [textAreaId, updateTextAreaId] = useState();
   const [isValidationError, updateIsValidationError] = useState(false);
+  const [isTagValidationError, updateIsTagValidationError] = useState(false);
   const [totalMessageLength, setTotalMessageLength] = useState(0);
   const [isUnicodeAllowed, updateIsUnicodeAllowed] = useState(true);
   const [showMsgLengthNote, updateshowMsgLengthNote] = useState(false);
@@ -225,6 +229,29 @@ export const SmsTraiEdit = (props) => {
     }
   }, []);
 
+  //performs tag validation
+  useEffect(() => {
+    if (
+      !isFullMode &&
+      updatedSmsEditor?.length > 0 &&
+      !updatedSmsEditor.includes(SMS_TRAI_VAR)
+    ) {
+      tagValidationResponse =
+        validateTags({
+          content: updatedSmsEditor.join(''),
+          tagsParam: tags,
+          injectedTagsParams: injectedTags,
+          location,
+          tagModule: getDefaultTags,
+          eventContextTags,
+          isFullMode,
+        }) || {};
+      updateIsTagValidationError(
+        tagValidationResponse.unsupportedTags.length > 0,
+      );
+    }
+  }, [updatedSmsEditor, tags]);
+
   const computeUpdatedSmsEditor = () => {
     const arr = [...tempMsgArray];
     const varMapKeys = Object.keys(varMap)?.map((key) => Number(key.slice(8)))?.sort((a, b) => a - b) || [];
@@ -261,13 +288,6 @@ export const SmsTraiEdit = (props) => {
   };
 
   const onSubmitWrapper = () => {
-    setIsLiquidValidationError(false);
-    setLiquidErrorMessages({});
-    // Liquid validation (extractTags) only in library mode
-    if (isFullMode) {
-      onDoneCallback();
-      return;
-    }
     const content = updatedSmsEditor.join('');
     const onError = ({ standardErrors, liquidErrors }) => {
       setLiquidErrorMessages({
@@ -278,8 +298,6 @@ export const SmsTraiEdit = (props) => {
     };
 
     const onSuccess = () => {
-      setIsLiquidValidationError(false);
-      setLiquidErrorMessages({});
       onDoneCallback();
     };
 
@@ -295,6 +313,10 @@ export const SmsTraiEdit = (props) => {
       messages: formBuilderMessages,
       onError,
       onSuccess,
+      tagLookupMap: metaEntities?.tagLookupMap,
+      eventContextTags,
+      isLiquidFlow: true,
+      forwardedTags: {},
     });
   };
 
@@ -533,6 +555,17 @@ export const SmsTraiEdit = (props) => {
     return countVarChar;
   };
 
+  const tagValidationErrorMessage = () => {
+    const { unsupportedTags = [] } = tagValidationResponse;
+    let tagError = '';
+    if (unsupportedTags.length > 0) {
+      tagError = formatMessage(messages.unsupportedTagsValidationError, {
+        unsupportedTags,
+      });
+    }
+    return <CapError>{tagError}</CapError>;
+  };
+
   const disablehandler = () => {
     if (traiData && !isEmpty(traiData)) {
       const msg = get(traiData, `versions.base.sms-editor`, '');
@@ -582,6 +615,7 @@ export const SmsTraiEdit = (props) => {
     setShowTestAndPreviewSlidebox(false);
   };
 
+  const isLiquidSupportFeatureEnabled = hasLiquidSupportFeature();
   return (
     <>
       <CapSpin spinning={loading || fetchingLiquidTags} tip={fetchingLiquidTags && formatMessage(formBuilderMessages.liquidSpinText)}>
@@ -639,6 +673,7 @@ export const SmsTraiEdit = (props) => {
             <CapRow>
               {smsLengthForVar()}
             </CapRow>
+            {isTagValidationError && tagValidationErrorMessage()}
             <CapCheckbox onChange={unicodeHandler} checked={isUnicodeAllowed} disabled={disablehandler()}>
               {formatMessage(messages.unicodeLabel)}
             </CapCheckbox>
@@ -669,8 +704,9 @@ export const SmsTraiEdit = (props) => {
             <FormattedMessage {...messages.testAndPreviewButtonLabel} />
           </CapButton>
           <CapButton
-            onClick={onSubmitWrapper}
+            onClick={isLiquidSupportFeatureEnabled ? onSubmitWrapper : onDoneCallback}
             className="create-msg"
+            disabled={isTagValidationError || (isLiquidSupportFeatureEnabled && !isObject(metaEntities?.tagLookupMap))}
           >
             <FormattedMessage {...messages.saveButtonLabel} />
           </CapButton>