@capillarytech/creatives-library 8.0.306 → 8.0.307-alpha.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.306",
+  "version": "8.0.307-alpha.5",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/utils/commonUtils.js

@@ -145,6 +145,7 @@ export const validateLiquidTemplateContent = async (
     onSuccess = () => {},
     tagLookupMap,
     eventContextTags,
+    waitEventContextTags = {},
     isLiquidFlow,
     forwardedTags = {},
     tabType,
@@ -214,7 +215,8 @@ export const validateLiquidTemplateContent = async (
     tagLookupMap,
     eventContextTags,
     isLiquidFlow,
-    forwardedTags
+    forwardedTags,
+    waitEventContextTags
   );
   // Helper function to check if a tag appears only inside {% %} blocks
   const isTagOnlyInsideLiquidBlocks = (tagName) => {

package/utils/tagValidations.js

@@ -18,20 +18,21 @@ const SUBTAGS = 'subtags';
  * @param {Object} response - The response object to check.
  * @param {Object} tagObject - The tagLookupMap.
  */
-export const checkSupport = (response = {}, tagObject = {}, eventContextTags = [], isLiquidFlow = false, forwardedTags = {}) => {
+export const checkSupport = (response = {}, tagObject = {}, eventContextTags = [], isLiquidFlow = false, forwardedTags = {}, waitEventContextTags = {}) => {
   const supportedList = [];
   // Verifies the presence of the tag in the 'Add Labels' section.
   // Incase of journey event context the tags won't be available in the tagObject(tagLookupMap).
   //Here forwardedTags only use in case of loyalty module
   const mappedForwardedTags = handleForwardedTags(forwardedTags);
-  const checkNameInTagObjectOrEventContext = (name) => !!tagObject[name] || eventContextTags?.some((tag) => tag?.tagName === name) || mappedForwardedTags.includes(name);
+  const allTags = [...eventContextTags, ...Object.values(waitEventContextTags).flatMap(block => block.tags)];
+  const checkNameInTagObjectOrEventContext = (name) => !!tagObject[name] || allTags?.some((tag) => tag?.tagName === name) || mappedForwardedTags.includes(name);
 
   // Verify if childTag is a valid sub-tag of parentTag from the 'Add Labels' section or if it's unsupported.
   const checkSubtags = (parentTag, childName) => {
     // For event context tags the parentTag will be the event context tag name and subtags will be the child attributes for leaderboards
-    if (checkNameInTagObjectOrEventContext(parentTag) && isLiquidFlow && eventContextTags?.length) {
+    if (checkNameInTagObjectOrEventContext(parentTag) && isLiquidFlow && allTags?.length) {
       const childNameAfterDot = childName?.split(".")?.[1];
-      if (eventContextTags?.some((tag) => tag?.subTags?.includes(childNameAfterDot))) {
+      if (allTags?.some((tag) => tag?.subTags?.includes(childNameAfterDot))) {
         supportedList.push(childName);
       }
     }
@@ -187,6 +188,7 @@ export const validateTags = ({
   location,
   tagModule,
   eventContextTags,
+  waitEventContextTags = {},
   isFullMode,
 }) => {
   const tags = tagsParam;
@@ -250,6 +252,12 @@ export const validateTags = ({
           ifSupported = true;
         }
       });
+      // Wait Event Context Tags support
+      Object.values(waitEventContextTags).flatMap(block => block.tags)?.forEach((tag) => {
+        if (tagValue === tag?.tagName) {
+          ifSupported = true;
+        }
+      });
       ifSupported = ifSupported || checkIfSupportedTag(tagValue, injectedTags);
       // Only add to unsupportedTags if not inside a {% ... %} block and does not contain a dot
       if (!ifSupported && !isInsideLiquidBlock(content, tagIndex) && tagValue?.indexOf('.') === -1) {

package/utils/tests/tagValidations.test.js

@@ -75,6 +75,7 @@ describe("validateTags", () => {
       location,
       tagModule,
       eventContextTags,
+      waitEventContextTags: {},
     });
 
     expect(result.valid).toEqual(true);
@@ -101,6 +102,7 @@ describe("validateTags", () => {
       injectedTagsParams,
       location,
       tagModule,
+      waitEventContextTags: {},
     });
 
     expect(result.valid).toEqual(true);
@@ -134,6 +136,7 @@ describe("validateTags", () => {
       injectedTagsParams,
       location,
       tagModule,
+      waitEventContextTags: {},
     });
 
     expect(result.valid).toEqual(true);
@@ -174,6 +177,7 @@ describe("validateTags", () => {
       injectedTagsParams,
       location,
       tagModule,
+      waitEventContextTags: {},
     });
 
     expect(result.valid).toEqual(false);
@@ -204,6 +208,7 @@ describe("validateTags", () => {
       injectedTagsParams,
       location,
       tagModule,
+      waitEventContextTags: {},
     });
     expect(resultMissing.missingTags).toContain("unsubscribe");
 
@@ -216,10 +221,39 @@ describe("validateTags", () => {
       injectedTagsParams,
       location,
       tagModule,
+      waitEventContextTags: {},
     });
     expect(resultSkipped.missingTags).not.toContain("unsubscribe");
     expect(resultSkipped.valid).toBe(true);
   });
+
+  it('should treat tags from waitEventContextTags as supported', () => {
+    const content = 'Hello {{waitEvent.orderId}}';
+    const tagsParam = [];
+    const injectedTagsParams = [];
+    const location = { query: { module: 'DEFAULT' } };
+    const tagModule = null;
+    const waitEventContextTags = {
+      block1: {
+        eventName: 'Order Placed',
+        blockName: 'Wait Block',
+        tags: [{ tagName: 'waitEvent.orderId', label: 'Order ID' }],
+      },
+    };
+
+    const result = validateTags({
+      content,
+      tagsParam,
+      injectedTagsParams,
+      location,
+      tagModule,
+      eventContextTags: [],
+      waitEventContextTags,
+    });
+
+    expect(result.valid).toEqual(true);
+    expect(result.unsupportedTags).toEqual([]);
+  });
 });
 
 describe("extractNames", () => {

package/v2Components/CapTagListWithInput/index.js

@@ -27,6 +27,7 @@ export const CapTagListWithInput = (props) => {
     userLocale = 'en',
     eventContextTags = [],
     restrictPersonalization = false,
+    waitEventContextTags = {},
     // CapInput props
     inputId,
     inputValue = '',
@@ -77,6 +78,7 @@ export const CapTagListWithInput = (props) => {
             userLocale={userLocale}
             selectedOfferDetails={selectedOfferDetails}
             eventContextTags={eventContextTags}
+            waitEventContextTags={waitEventContextTags}
             style={tagListStyle}
             popoverPlacement={popoverPlacement}
             restrictPersonalization={restrictPersonalization}
@@ -116,6 +118,7 @@ CapTagListWithInput.propTypes = {
   userLocale: PropTypes.string,
   eventContextTags: PropTypes.array,
   restrictPersonalization: PropTypes.bool,
+  waitEventContextTags: PropTypes.object,
 
   // CapInput props
   inputId: PropTypes.string.isRequired,
@@ -154,6 +157,7 @@ CapTagListWithInput.defaultProps = {
   userLocale: 'en',
   eventContextTags: [],
   restrictPersonalization: false,
+  waitEventContextTags: {},
   inputValue: '',
   inputSize: 'default',
   inputRequired: false,

package/v2Components/CapWhatsappCTA/index.js

@@ -52,6 +52,7 @@ export const CapWhatsappCTA = (props) => {
     injectedTags = {},
     selectedOfferDetails = [],
     eventContextTags = [],
+    waitEventContextTags = [],
   } = props;
   const { formatMessage } = intl;
   const invalidVarRegex = /{{(.*?)}}/g;
@@ -283,6 +284,7 @@ export const CapWhatsappCTA = (props) => {
                   injectedTags={injectedTags}
                   selectedOfferDetails={selectedOfferDetails}
                   eventContextTags={eventContextTags}
+                  waitEventContextTags={waitEventContextTags}
                 />
               </CapColumn>
             )}

package/v2Components/FormBuilder/index.js

@@ -1377,6 +1377,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
         onSuccess,
         tagLookupMap: this.props?.metaEntities?.tagLookupMap,
         eventContextTags: this.props?.eventContextTags,
+        waitEventContextTags: this.props?.waitEventContextTags,
         isLiquidFlow: this.liquidFlow(),
         forwardedTags: this.props?.isLoyaltyModule ? this.props?.forwardedTags : {},
         skipTags: this.skipTags.bind(this)
@@ -1449,6 +1450,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
       messages: messages,
       tagLookupMap: this.props?.metaEntities?.tagLookupMap,
       eventContextTags: this.props?.eventContextTags,
+      waitEventContextTags: this.props?.waitEventContextTags,
       isLiquidFlow: this.liquidFlow(), // Use the method instead of props
       forwardedTags: this.props?.isLoyaltyModule ? this.props?.forwardedTags : {},
       skipTags: this.skipTags.bind(this),
@@ -1601,6 +1603,12 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             ifSupported = true;
           }
         });
+        // Wait Event Context Tags support
+        Object.values(this.props?.waitEventContextTags || {}).flatMap(block => block?.tags || [])?.forEach((tag) => {
+          if (tagValue === tag?.tagName) {
+            ifSupported = true;
+          }
+        });
 
         ifSupported = ifSupported || this.checkIfSupportedTag(tagValue, injectedTags);
         // Only add to unsupportedTags if not inside a {% ... %} block (scenario 3: liquid orgs also get unsupported-tag errors)
@@ -3059,6 +3067,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 selectedOfferDetails={this.props.selectedOfferDetails}
                 eventContextTags={this.props?.eventContextTags}
                 restrictPersonalization={this.props.restrictPersonalization}
+                waitEventContextTags={this.props?.waitEventContextTags}
               />
             </CapColumn>
           );
@@ -3088,6 +3097,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 userLocale={this.props.userLocale}
                 selectedOfferDetails={this.props.selectedOfferDetails}
                 eventContextTags={this.props?.eventContextTags}
+                waitEventContextTags={this.props?.waitEventContextTags}
                 moduleFilterEnabled={this.props.location && this.props.location.query && this.props.location.query.type !== 'embedded'}
                 containerStyle={val.style || {}}
                 inputProps={val.inputProps || {}}
@@ -3730,6 +3740,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     channel={channel}
                     eventContextTags={this.props?.eventContextTags}
                     restrictPersonalization={this.props.restrictPersonalization}
+                    waitEventContextTags={this.props?.waitEventContextTags}
                   />
                 </CapColumn>
               );
@@ -3776,6 +3787,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     userLocale={this.state.translationLang}
                     selectedOfferDetails={this.props.selectedOfferDetails}
                     eventContextTags={this.props?.eventContextTags}
+                    waitEventContextTags={this.props?.waitEventContextTags}
                     moduleFilterEnabled={moduleFilterEnabledForCapTagList}
                     containerStyle={val.style || {}}
                     inputProps={val.inputProps || {}}
@@ -4070,6 +4082,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                   onContextChange={this.props.onContextChange}
                   moduleFilterEnabled={isModuleFilterEnabled}
                   eventContextTags={this.props?.eventContextTags}
+                  waitEventContextTags={this.props?.waitEventContextTags}
                 />
               </CapColumn>
             );
@@ -4372,6 +4385,7 @@ FormBuilder.defaultProps = {
   userLocale: localStorage.getItem('jlocale') || 'en',
   showLiquidErrorInFooter: () => {},
   metaDataStatus: "",
+  waitEventContextTags: {},
   isTestAndPreviewMode: false, // Default to false to maintain existing behavior
 };
 
@@ -4422,6 +4436,7 @@ FormBuilder.propTypes = {
   moduleType: PropTypes.string.isRequired,
   showLiquidErrorInFooter: PropTypes.bool.isRequired,
   eventContextTags: PropTypes.array.isRequired,
+  waitEventContextTags: PropTypes.object,
   forwardedTags: PropTypes.object.isRequired,
   isLoyaltyModule: PropTypes.bool.isRequired,
   isTestAndPreviewMode: PropTypes.bool, // Add new prop type

package/v2Components/HtmlEditor/HTMLEditor.js

@@ -94,6 +94,7 @@ const HTMLEditor = forwardRef(({
   injectedTags = {},
   location,
   eventContextTags = [],
+  waitEventContextTags = {},
   selectedOfferDetails = [],
   channel,
   userLocale = 'en',
@@ -666,6 +667,7 @@ const HTMLEditor = forwardRef(({
               injectedTags={injectedTags}
               location={location}
               eventContextTags={eventContextTags}
+              waitEventContextTags={waitEventContextTags}
               selectedOfferDetails={selectedOfferDetails}
               channel={channel}
               userLocale={userLocale}
@@ -737,6 +739,7 @@ const HTMLEditor = forwardRef(({
                   injectedTags={injectedTags}
                   location={location}
                   eventContextTags={eventContextTags}
+                  waitEventContextTags={waitEventContextTags}
                   selectedOfferDetails={selectedOfferDetails}
                   channel={channel}
                   userLocale={userLocale}
@@ -775,6 +778,7 @@ HTMLEditor.propTypes = {
   injectedTags: PropTypes.object,
   location: PropTypes.object,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
   channel: PropTypes.string,
   userLocale: PropTypes.string,
@@ -809,6 +813,7 @@ HTMLEditor.defaultProps = {
   injectedTags: {},
   location: null,
   eventContextTags: [],
+  waitEventContextTags: {},
   selectedOfferDetails: [],
   channel: null,
   userLocale: 'en',

package/v2Components/HtmlEditor/components/CodeEditorPane/index.js

@@ -59,6 +59,7 @@ const CodeEditorPaneComponent = ({
   injectedTags = {},
   location,
   eventContextTags = [],
+  waitEventContextTags = {},
   selectedOfferDetails = [],
   channel,
   userLocale = 'en',
@@ -289,6 +290,7 @@ const CodeEditorPaneComponent = ({
               location={location}
               selectedOfferDetails={selectedOfferDetails}
               eventContextTags={eventContextTags}
+              waitEventContextTags={waitEventContextTags}
               popoverPlacement="rightTop"
             />
           </CapRow>
@@ -328,6 +330,7 @@ CodeEditorPane.propTypes = {
   injectedTags: PropTypes.object,
   location: PropTypes.object,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
   channel: PropTypes.string,
   userLocale: PropTypes.string,

package/v2Containers/BeeEditor/index.js

@@ -53,6 +53,7 @@ function BeeEditor(props) {
     BEESelect,
     currentOrgDetails,
     eventContextTags,
+    waitEventContextTags,
   } = props;
   const { saveRowRequest } = BEESelect;
   const {formatMessage} = intl;
@@ -368,6 +369,7 @@ function BeeEditor(props) {
         }}
         onContextChange={onContextChange}
         eventContextTags={eventContextTags}
+        waitEventContextTags={waitEventContextTags}
       />
       <CapModal
         className="custom-row-modal"
@@ -414,6 +416,7 @@ BeeEditor.propTypes = {
   onContextChange: PropTypes.func,
   userLocale: PropTypes.string,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
 };
 
 const mapStateToProps = () => createStructuredSelector({

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -168,6 +168,7 @@ export function SlideBoxContent(props) {
       creativesMode,
       hostName = '',
       eventContextTags,
+      waitEventContextTags,
       isLoyaltyModule,
       loyaltyMetaData = {},
       showTestAndPreviewSlidebox,
@@ -424,6 +425,7 @@ export function SlideBoxContent(props) {
     selectedOfferDetails,
     getFormData,
     eventContextTags,
+    waitEventContextTags,
   };
 
   return (
@@ -458,6 +460,7 @@ export function SlideBoxContent(props) {
         enableNewChannels={enableNewChannels}
         hideTestAndPreviewBtn={hideTestAndPreviewBtn}
         eventContextTags={eventContextTags}
+        waitEventContextTags={waitEventContextTags}
         loyaltyMetaData={loyaltyMetaData}
         isLoyaltyModule={isLoyaltyModule}
         />
@@ -561,6 +564,7 @@ export function SlideBoxContent(props) {
           onCreateComplete={onCreateComplete}
           smsRegister={smsRegister}
           eventContextTags={eventContextTags}
+          waitEventContextTags={waitEventContextTags}
           getLiquidTags={getLiquidTags}
           showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
           handleTestAndPreview={handleTestAndPreview}
@@ -603,6 +607,7 @@ export function SlideBoxContent(props) {
           }}
           hostName={hostName}
           eventContextTags={eventContextTags}
+          waitEventContextTags={waitEventContextTags}
           showLiquidErrorInFooter={showLiquidErrorInFooter}
           showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
           handleTestAndPreview={handleTestAndPreview}
@@ -642,6 +647,7 @@ export function SlideBoxContent(props) {
         eventContextTags={eventContextTags}
         restrictPersonalization={restrictPersonalization}
         isAnonymousType={isAnonymousType}
+        waitEventContextTags={waitEventContextTags}
       />
         )}
 
@@ -675,6 +681,7 @@ export function SlideBoxContent(props) {
         moduleType={moduleType}
         showLiquidErrorInFooter={showLiquidErrorInFooter}
         eventContextTags={eventContextTags}
+        waitEventContextTags={waitEventContextTags}
         isLoyaltyModule={isLoyaltyModule}
         showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
         handleTestAndPreview={handleTestAndPreview}
@@ -719,6 +726,7 @@ export function SlideBoxContent(props) {
                 moduleType={moduleType}
                 showLiquidErrorInFooter={showLiquidErrorInFooter}
                 eventContextTags={eventContextTags}
+                waitEventContextTags={waitEventContextTags}
               isLoyaltyModule={isLoyaltyModule}
               showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
               handleTestAndPreview={handleTestAndPreview}
@@ -758,6 +766,7 @@ export function SlideBoxContent(props) {
               moduleType={moduleType}
               showLiquidErrorInFooter={showLiquidErrorInFooter}
               eventContextTags={eventContextTags}
+              waitEventContextTags={waitEventContextTags}
               isLoyaltyModule={isLoyaltyModule}
               showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
               handleTestAndPreview={handleTestAndPreview}
@@ -800,6 +809,7 @@ export function SlideBoxContent(props) {
             hideTestAndPreviewBtn={hideTestAndPreviewBtn}
             creativesMode={creativesMode}
             eventContextTags={eventContextTags}
+            waitEventContextTags={waitEventContextTags}
             showLiquidErrorInFooter={showLiquidErrorInFooter}
             showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
             handleTestAndPreview={handleTestAndPreview}
@@ -832,6 +842,7 @@ export function SlideBoxContent(props) {
             hideTestAndPreviewBtn={hideTestAndPreviewBtn}
             creativesMode={creativesMode}
             eventContextTags={eventContextTags}
+            waitEventContextTags={waitEventContextTags}
             showLiquidErrorInFooter={showLiquidErrorInFooter}
             handleClose={handleClose}
             restrictPersonalization={restrictPersonalization}
@@ -870,6 +881,7 @@ export function SlideBoxContent(props) {
             hideTestAndPreviewBtn={hideTestAndPreviewBtn}
             onTestContentClicked={onTestContentClicked}
             eventContextTags={eventContextTags}
+            waitEventContextTags={waitEventContextTags}
             showLiquidErrorInFooter={showLiquidErrorInFooter}
             showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
             handleTestAndPreview={handleTestAndPreview}
@@ -908,6 +920,7 @@ export function SlideBoxContent(props) {
             hideTestAndPreviewBtn={hideTestAndPreviewBtn}
             onTestContentClicked={onTestContentClicked}
             eventContextTags={eventContextTags}
+            waitEventContextTags={waitEventContextTags}
             showLiquidErrorInFooter={showLiquidErrorInFooter}
             onCreateComplete={onCreateComplete}
             creativesMode={creativesMode}
@@ -933,6 +946,7 @@ export function SlideBoxContent(props) {
             onSelectTemplate={onSelectTemplate}
             orgUnitId={orgUnitId}
             eventContextTags={eventContextTags}
+            waitEventContextTags={waitEventContextTags}
             showLiquidErrorInFooter={showLiquidErrorInFooter}
           />
         )
@@ -954,6 +968,7 @@ export function SlideBoxContent(props) {
             fbAdManager={fbAdManager}
             onSelectTemplate={onSelectTemplate}
             eventContextTags={eventContextTags}
+            waitEventContextTags={waitEventContextTags}
             showLiquidErrorInFooter={showLiquidErrorInFooter}
           />
         )
@@ -977,6 +992,7 @@ export function SlideBoxContent(props) {
             handleClose={handleClose}
             selectedOfferDetails={selectedOfferDetails}
             eventContextTags={eventContextTags}
+            waitEventContextTags={waitEventContextTags}
             showLiquidErrorInFooter={showLiquidErrorInFooter}
           />
         )
@@ -997,6 +1013,7 @@ export function SlideBoxContent(props) {
             handleClose={handleClose}
             selectedOfferDetails={selectedOfferDetails}
             eventContextTags={eventContextTags}
+            waitEventContextTags={waitEventContextTags}
             showLiquidErrorInFooter={showLiquidErrorInFooter}
           />
         )
@@ -1013,6 +1030,7 @@ export function SlideBoxContent(props) {
           templateData={templateData}
           selectedOfferDetails={selectedOfferDetails}
           eventContextTags={eventContextTags}
+          waitEventContextTags={waitEventContextTags}
           showLiquidErrorInFooter={showLiquidErrorInFooter}
           showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
           handleTestAndPreview={handleTestAndPreview}
@@ -1037,6 +1055,7 @@ export function SlideBoxContent(props) {
         handleTestAndPreview={handleTestAndPreview}
         handleCloseTestAndPreview={handleCloseTestAndPreview}
         eventContextTags={eventContextTags}
+        waitEventContextTags={waitEventContextTags}
         showLiquidErrorInFooter={showLiquidErrorInFooter}
         createNew/> }
 
@@ -1044,6 +1063,7 @@ export function SlideBoxContent(props) {
         isFullMode={isFullMode}
         onCreateComplete={onCreateComplete}
         eventContextTags={eventContextTags}
+        waitEventContextTags={waitEventContextTags}
         handleClose={handleClose}
         showLiquidErrorInFooter={showLiquidErrorInFooter}
         showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
@@ -1061,6 +1081,7 @@ export function SlideBoxContent(props) {
         forwardedTags={forwardedTags}
         selectedOfferDetails={selectedOfferDetails}
         eventContextTags={eventContextTags}
+        waitEventContextTags={waitEventContextTags}
         showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
         handleTestAndPreview={handleTestAndPreview}
         handleCloseTestAndPreview={handleCloseTestAndPreview}
@@ -1099,6 +1120,7 @@ export function SlideBoxContent(props) {
       onPreviewContentClicked={onPreviewContentClicked}
       onTestContentClicked={onTestContentClicked}
       eventContextTags={eventContextTags}
+      waitEventContextTags={waitEventContextTags}
       onCreateComplete={onCreateComplete}
       handleClose={handleClose}
       moduleType={moduleType}
@@ -1134,6 +1156,7 @@ export function SlideBoxContent(props) {
           moduleType={moduleType}
           showLiquidErrorInFooter={showLiquidErrorInFooter}
           eventContextTags={eventContextTags}
+          waitEventContextTags={waitEventContextTags}
           onCreateComplete={onCreateComplete}
           handleClose={handleClose}
           getDefaultTags={type}
@@ -1157,6 +1180,7 @@ export function SlideBoxContent(props) {
         onCreateComplete={onCreateComplete}
         selectedOfferDetails={selectedOfferDetails}
         eventContextTags={eventContextTags}
+        waitEventContextTags={waitEventContextTags}
         params={{
           id: templateData._id,
         }}
@@ -1195,6 +1219,7 @@ export function SlideBoxContent(props) {
           eventContextTags={eventContextTags}
           restrictPersonalization={restrictPersonalization}
           isAnonymousType={isAnonymousType}
+          waitEventContextTags={waitEventContextTags}
         />
       )}
       {isCreateRcs && (<Rcs

package/v2Containers/CreativesContainer/index.js

@@ -1909,6 +1909,7 @@ export class Creatives extends React.Component {
       smsRegister,
       enableNewChannels,
       eventContextTags,
+      waitEventContextTags,
       isLoyaltyModule,
       loyaltyMetaData = {},
     } = this.props;
@@ -2076,6 +2077,7 @@ export class Creatives extends React.Component {
               creativesMode={creativesMode} // An existing prop that we're using here. Required to ensure correct account details in Edit or Preview in case of Embedded mode.
               hostName={this.props?.hostName || ''}
               eventContextTags={eventContextTags}
+              waitEventContextTags={waitEventContextTags}
               isLoyaltyModule={isLoyaltyModule}
               loyaltyMetaData={loyaltyMetaData}
               showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
@@ -2168,6 +2170,7 @@ Creatives.propTypes = {
   orgUnitId: PropTypes.number,
   hostName: PropTypes.string,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   loyaltyTagFetchingDependencies: PropTypes.object,
   customerType: PropTypes.string,
   intl: PropTypes.shape({

package/v2Containers/Email/index.js

@@ -3138,6 +3138,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
                   moduleType={moduleType}
                   showLiquidErrorInFooter={this.props.showLiquidErrorInFooter}
                   eventContextTags={this.props?.eventContextTags}
+                  waitEventContextTags={this.props?.waitEventContextTags}
                   forwardedTags={this.props?.forwardedTags}
                   isLoyaltyModule={this.props?.isLoyaltyModule}
                   isTestAndPreviewMode={this.state.isTestAndPreviewMode} // Add flag to prevent validation

package/v2Containers/EmailWrapper/components/EmailHTMLEditor.js

@@ -54,6 +54,7 @@ const EmailHTMLEditor = (props) => {
     globalActions,
     loadingTags,
     eventContextTags,
+    waitEventContextTags,
     forwardedTags,
     selectedOfferDetails,
     currentOrgDetails,
@@ -498,6 +499,7 @@ const EmailHTMLEditor = (props) => {
         tagModule: getDefaultTags,
         eventContextTags,
         isFullMode,
+        waitEventContextTags,
       });
 
       if (!validationResult.valid) {
@@ -506,7 +508,7 @@ const EmailHTMLEditor = (props) => {
         setTagValidationError(null);
       }
     }
-  }, [tags, injectedTags, location, getDefaultTags, eventContextTags]);
+  }, [tags, injectedTags, location, getDefaultTags, eventContextTags, waitEventContextTags]);
 
   // Store the last validation state received from HTMLEditor
   const lastValidationStateRef = useRef(null);
@@ -749,6 +751,7 @@ const EmailHTMLEditor = (props) => {
         tagModule: getDefaultTags,
         eventContextTags,
         isFullMode,
+        waitEventContextTags,
       });
 
       const hasUnsupportedTags = validationResult?.unsupportedTags?.length > 0;
@@ -1000,6 +1003,7 @@ const EmailHTMLEditor = (props) => {
         onSuccess,
         tagLookupMap: metaEntities?.tagLookupMap,
         eventContextTags,
+        waitEventContextTags,
         isLiquidFlow: true,
         forwardedTags: forwardedTags || {},
       });
@@ -1014,6 +1018,7 @@ const EmailHTMLEditor = (props) => {
     location,
     getDefaultTags,
     eventContextTags,
+    waitEventContextTags,
     formatMessage,
     subjectError,
     isFullMode,
@@ -1146,6 +1151,7 @@ const EmailHTMLEditor = (props) => {
               injectedTags={injectedTags || {}}
               selectedOfferDetails={selectedOfferDetails}
               eventContextTags={eventContextTags}
+              waitEventContextTags={waitEventContextTags}
               showHeading
               showTagList
               showInput
@@ -1170,6 +1176,7 @@ const EmailHTMLEditor = (props) => {
             injectedTags={injectedTags}
             location={location}
             eventContextTags={eventContextTags}
+            waitEventContextTags={waitEventContextTags}
             selectedOfferDetails={selectedOfferDetails}
             channel={EMAIL}
             userLocale={intl.locale || 'en'}
@@ -1198,6 +1205,7 @@ EmailHTMLEditor.propTypes = {
   globalActions: PropTypes.object,
   loadingTags: PropTypes.bool,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   forwardedTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
   currentOrgDetails: PropTypes.object,
@@ -1244,6 +1252,7 @@ EmailHTMLEditor.defaultProps = {
   globalActions: {},
   loadingTags: false,
   eventContextTags: [],
+  waitEventContextTags: {},
   forwardedTags: {},
   selectedOfferDetails: [],
   currentOrgDetails: {},