@capillarytech/creatives-library 8.0.291 → 8.0.292-alpha.0

package/v2Containers/MobilePushNew/index.js

@@ -77,7 +77,6 @@ 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";
@@ -803,10 +802,9 @@ const MobilePushNew = ({
     (value) => {
       let errorTemplateDescMessage = "";
 
-      const { unsupportedTags, isBraceError } = validateTags({
+      const { isBraceError } = validateTags({
         content: value,
         tagsParam: tags,
-        injectedTagsParams: injectedTags,
         location,
         tagModule: getDefaultTags,
         isFullMode,
@@ -816,14 +814,6 @@ const MobilePushNew = ({
           messages.emptyTemplateDescErrorMessage
         );
       }
-      if (unsupportedTags?.length > 0) {
-        errorTemplateDescMessage = formatMessage(
-          globalMessages.unsupportedTagsValidationError,
-          {
-            unsupportedTags,
-          }
-        );
-      }
       if (isBraceError) {
         errorTemplateDescMessage = formatMessage(
           globalMessages.unbalanacedCurlyBraces
@@ -2659,20 +2649,6 @@ 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),
     });
   }, [
@@ -2681,12 +2657,9 @@ const MobilePushNew = ({
     activeTab,
     globalActionsProps,
     formatMessage,
-    metaEntities,
     accountData,
   ]);
 
-  const isLiquidFlow = hasLiquidSupportFeature();
-
   useEffect(() => {
     // Always map to { label } for both platforms
     const newButtons = Array.isArray(ctaData)
@@ -2933,16 +2906,22 @@ const MobilePushNew = ({
     setShowTestAndPreviewSlidebox(false);
   }, []);
 
-  // Add useEffect to handle isGetFormData prop changes
+  // 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
   useEffect(() => {
     if (isGetFormData) {
-      handleSave();
+      if (!isFullMode) {
+        liquidMiddleWare();
+      } else {
+        handleSave();
+      }
       // Reset the flag to prevent infinite loop
       if (onValidationFail) {
         onValidationFail();
       }
     }
-  }, [isGetFormData, handleSave, onValidationFail]);
+  }, [isGetFormData, handleSave, onValidationFail, isFullMode, liquidMiddleWare]);
 
   // Add message event listener to handle parent communication (like old MobilePush components)
   useEffect(() => {
@@ -3083,7 +3062,8 @@ const MobilePushNew = ({
                     <CapButton
                       type="primary"
                       onClick={() => {
-                        if (isLiquidFlow) {
+                        // Liquid validation (extractTags) only in library mode
+                        if (!isFullMode) {
                           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, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail, onPreviewContentClicked, onTestContentClicked, templateData, eventContextTags = [], showTestAndPreviewSlidebox, handleTestAndPreview, handleCloseTestAndPreview, restrictPersonalization, isAnonymousType, onPersonalizationTokensChange} = this.props;
+    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 {templateName} = this.state;
     const isShowMobilepushCreate = !isEmpty(mobilePushCreateMode);
     return (
@@ -102,6 +102,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
           <div>
             {isShowMobilepushCreate && <MobilepushCreate
               getFormLibraryData={getFormData}
+              getLiquidTags={getLiquidTags}
               setIsLoadingContent={setIsLoadingContent}
               defaultData={{"template-name": templateName}}
               location={{
@@ -143,6 +144,7 @@ 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,23 +394,15 @@ export const Rcs = (props) => {
     const validationResponse =
       validateTags({
         content: contentForValidation,
-      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;
+        tagsParam: tags,
+        location,
+        tagModule: getDefaultTags,
+        isFullMode,
+      }) || {};
+    const errorMsg =
+      (validationResponse?.isBraceError &&
+        formatMessage(globalMessages.unbalanacedCurlyBraces)) ||
+      false;
     if (type === TITLE_TEXT) setTemplateTitleError(errorMsg);
     if (type === MESSAGE_TEXT) setTemplateDescError(errorMsg);
   };
@@ -835,10 +827,9 @@ export const Rcs = (props) => {
 
   const templateDescErrorHandler = (value) => {
     let errorMessage = false;
-    const { unsupportedTags, isBraceError } = validateTags({
+    const { isBraceError } = validateTags({
       content: value,
       tagsParam: tags,
-      injectedTagsParams: injectedTags,
       location,
       tagModule: getDefaultTags,
       isFullMode,
@@ -868,26 +859,10 @@ 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) {
-      errorMessage = formatMessage(messages.fallbackMsgLenError);
-    } else if (unsupportedTags?.length > 0) {
-      errorMessage = formatMessage(
-        globalMessages.unsupportedTagsValidationError,
-        {
-          unsupportedTags,
-        },
-      );
+      return formatMessage(messages.fallbackMsgLenError);
     }
-    return errorMessage;
+    return false;
   };
 
   // Check for forbidden characters: square brackets [] and single curly braces {}

package/v2Containers/Sms/Create/index.js

@@ -51,6 +51,7 @@ 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);
@@ -140,8 +141,9 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
 
   componentWillReceiveProps(nextProps) {
-    if (nextProps.location.query.module === 'library' && nextProps.isGetFormData) {
-      nextProps.getFormSubscriptionData(this.getFormData());
+    // 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 });
     } else if (nextProps.isGetFormData && this.props.isFullMode && !this.props.Create.createTemplateInProgress) {
       this.startValidation();
     }
@@ -171,6 +173,9 @@ 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
     }
@@ -199,6 +204,10 @@ 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) {
@@ -349,7 +358,25 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
 
   setFormValidity(isFormValid, errorData) {
-    this.setState({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 });
+      }
+    });
   }
 
   injectMessages(elem) {
@@ -970,6 +997,15 @@ 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,6 +90,10 @@ 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,6 +52,7 @@ 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);
@@ -134,8 +135,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   }
 
   componentWillReceiveProps(nextProps) {
-    if (nextProps.location.query.module === 'library' && nextProps.isGetFormData) {
-      nextProps.getFormSubscriptionData(this.getFormData());
+    if (!nextProps.isFullMode && nextProps.isGetFormData && !this.props.isGetFormData) {
+      this.setState({ startValidation: true, pendingGetFormData: true });
     }
     if ( nextProps.location.query.module === 'library' && nextProps.subscriptionTemplateDetails && nextProps.subscriptionTemplateDetails.name && _.isEmpty(this.state.editData) && !_.isEmpty(this.state.schema)) {
       this.setEditState(nextProps.subscriptionTemplateDetails);
@@ -189,6 +190,9 @@ 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
     }
@@ -214,6 +218,10 @@ 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() {
@@ -317,7 +325,23 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   }
 
   setFormValidity(isFormValid, errorData) {
-    this.setState({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 });
+      }
+    });
   }
 
   getFormData(e, value) {
@@ -923,6 +947,14 @@ 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,17 +1,14 @@
 import isEmpty from 'lodash/isEmpty';
-import { CapNotification } from '@capillarytech/cap-ui-library';
+import CapNotification from '@capillarytech/cap-ui-library/CapNotification';
 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 isSmsInvalid = Object.values(errorData[0]).includes(true);
+    const err0 = errorData[0] || {};
+    const isSmsInvalid = Object.values(err0).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/Sms/tests/commonMethods.test.js

@@ -0,0 +1,122 @@
+import CapNotification from '@capillarytech/cap-ui-library/CapNotification';
+import { showError } from '../commonMethods';
+
+jest.mock('@capillarytech/cap-ui-library/CapNotification', () => ({
+  error: jest.fn(),
+}));
+
+jest.mock('../Create/messages', () => ({
+  __esModule: true,
+  default: {
+    validationError: { defaultMessage: 'Validation error' },
+  },
+}));
+
+describe('Sms commonMethods', () => {
+  describe('showError', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should call CapNotification.error when formData is not empty, isFormValid is false, and errorData has at least one true value', () => {
+      const context = {
+        props: {
+          intl: { formatMessage: jest.fn((msg) => msg.defaultMessage || 'Validation error') },
+        },
+        state: {
+          formData: { message: 'test' },
+          isFormValid: false,
+          errorData: [{ message: true }],
+        },
+      };
+      showError.call(context);
+      expect(CapNotification.error).toHaveBeenCalledWith({
+        key: 'validation-error',
+        message: 'Validation error',
+      });
+    });
+
+    it('should not call CapNotification.error when formData is empty', () => {
+      const context = {
+        props: { intl: { formatMessage: jest.fn() } },
+        state: {
+          formData: {},
+          isFormValid: false,
+          errorData: [{ message: true }],
+        },
+      };
+      showError.call(context);
+      expect(CapNotification.error).not.toHaveBeenCalled();
+    });
+
+    it('should not call CapNotification.error when isFormValid is true', () => {
+      const context = {
+        props: { intl: { formatMessage: jest.fn() } },
+        state: {
+          formData: { message: 'test' },
+          isFormValid: true,
+          errorData: [{ message: true }],
+        },
+      };
+      showError.call(context);
+      expect(CapNotification.error).not.toHaveBeenCalled();
+    });
+
+    it('should not call CapNotification.error when no errorData entry has a true value', () => {
+      const context = {
+        props: { intl: { formatMessage: jest.fn() } },
+        state: {
+          formData: { message: 'test' },
+          isFormValid: false,
+          errorData: [{ message: false, title: false }],
+        },
+      };
+      showError.call(context);
+      expect(CapNotification.error).not.toHaveBeenCalled();
+    });
+
+    it('should not call CapNotification.error when errorData is empty', () => {
+      const context = {
+        props: { intl: { formatMessage: jest.fn() } },
+        state: {
+          formData: { message: 'test' },
+          isFormValid: false,
+          errorData: [],
+        },
+      };
+      showError.call(context);
+      expect(CapNotification.error).not.toHaveBeenCalled();
+    });
+
+    it('should not call CapNotification.error when errorData[0] is undefined', () => {
+      const context = {
+        props: { intl: { formatMessage: jest.fn() } },
+        state: {
+          formData: { message: 'test' },
+          isFormValid: false,
+          errorData: [],
+        },
+      };
+      showError.call(context);
+      expect(CapNotification.error).not.toHaveBeenCalled();
+    });
+
+    it('should call CapNotification.error when errorData[0] has multiple keys and one is true', () => {
+      const context = {
+        props: {
+          intl: { formatMessage: jest.fn((msg) => msg.defaultMessage || 'Validation error') },
+        },
+        state: {
+          formData: { message: 'hello' },
+          isFormValid: false,
+          errorData: [{ message: false, title: true }],
+        },
+      };
+      showError.call(context);
+      expect(CapNotification.error).toHaveBeenCalledWith({
+        key: 'validation-error',
+        message: 'Validation error',
+      });
+    });
+  });
+});

package/v2Containers/SmsTrai/Edit/index.js

@@ -39,10 +39,8 @@ 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,
@@ -51,16 +49,15 @@ 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;
 
@@ -94,7 +91,6 @@ 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);
@@ -229,29 +225,6 @@ 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) || [];
@@ -288,6 +261,13 @@ 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({
@@ -298,6 +278,8 @@ export const SmsTraiEdit = (props) => {
     };
 
     const onSuccess = () => {
+      setIsLiquidValidationError(false);
+      setLiquidErrorMessages({});
       onDoneCallback();
     };
     validateLiquidTemplateContent(content, {
@@ -306,10 +288,6 @@ export const SmsTraiEdit = (props) => {
       messages: formBuilderMessages,
       onError,
       onSuccess,
-      tagLookupMap: metaEntities?.tagLookupMap,
-      eventContextTags,
-      isLiquidFlow: true,
-      forwardedTags: {},
     });
   };
 
@@ -548,17 +526,6 @@ 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`, '');
@@ -604,7 +571,6 @@ export const SmsTraiEdit = (props) => {
     setShowTestAndPreviewSlidebox(false);
   };
 
-  const isLiquidSupportFeatureEnabled = hasLiquidSupportFeature();
   return (
     <>
       <CapSpin spinning={loading || fetchingLiquidTags} tip={fetchingLiquidTags && formatMessage(formBuilderMessages.liquidSpinText)}>
@@ -662,7 +628,6 @@ export const SmsTraiEdit = (props) => {
             <CapRow>
               {smsLengthForVar()}
             </CapRow>
-            {isTagValidationError && tagValidationErrorMessage()}
             <CapCheckbox onChange={unicodeHandler} checked={isUnicodeAllowed} disabled={disablehandler()}>
               {formatMessage(messages.unicodeLabel)}
             </CapCheckbox>
@@ -693,9 +658,8 @@ export const SmsTraiEdit = (props) => {
             <FormattedMessage {...messages.testAndPreviewButtonLabel} />
           </CapButton>
           <CapButton
-            onClick={isLiquidSupportFeatureEnabled ? onSubmitWrapper : onDoneCallback}
+            onClick={onSubmitWrapper}
             className="create-msg"
-            disabled={isTagValidationError || (isLiquidSupportFeatureEnabled && !isObject(metaEntities?.tagLookupMap))}
           >
             <FormattedMessage {...messages.saveButtonLabel} />
           </CapButton>