@capillarytech/creatives-library 8.0.114-alpha.1 → 8.0.114

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -499,7 +499,6 @@ export function SlideBoxContent(props) {
       }
       {isEditSms && (
         <SmsWrapper
-          showLiquidErrorInFooter={showLiquidErrorInFooter}
           setIsLoadingContent={setIsLoadingContent}
           isEditSms={isEditSms}
           location={creativesLocationProps}
@@ -555,7 +554,6 @@ export function SlideBoxContent(props) {
           }}
           hostName={hostName}
           eventContextTags={eventContextTags}
-          showLiquidErrorInFooter={showLiquidErrorInFooter}
         />
       }
       {
@@ -570,7 +568,6 @@ export function SlideBoxContent(props) {
        }
       {isCreateSms && (
       <SmsWrapper
-        showLiquidErrorInFooter={showLiquidErrorInFooter}
         setIsLoadingContent={setIsLoadingContent}
         location={creativesLocationProps}
         route={{ name: 'sms' }}
@@ -677,7 +674,6 @@ export function SlideBoxContent(props) {
           hideTestAndPreviewBtn={hideTestAndPreviewBtn}
           creativesMode={creativesMode}
           eventContextTags={eventContextTags}
-          showLiquidErrorInFooter={showLiquidErrorInFooter}
         />
         }
       {isCreateMPush &&
@@ -707,7 +703,6 @@ export function SlideBoxContent(props) {
           hideTestAndPreviewBtn={hideTestAndPreviewBtn}
           onTestContentClicked={onTestContentClicked}
           eventContextTags={eventContextTags}
-          showLiquidErrorInFooter={showLiquidErrorInFooter}
         />
       }
       {
@@ -727,7 +722,6 @@ export function SlideBoxContent(props) {
             onSelectTemplate={onSelectTemplate}
             orgUnitId={orgUnitId}
             eventContextTags={eventContextTags}
-            showLiquidErrorInFooter={showLiquidErrorInFooter}
           />
         )
       }
@@ -748,7 +742,6 @@ export function SlideBoxContent(props) {
             fbAdManager={fbAdManager}
             onSelectTemplate={onSelectTemplate}
             eventContextTags={eventContextTags}
-            showLiquidErrorInFooter={showLiquidErrorInFooter}
           />
         )
       }
@@ -771,7 +764,6 @@ export function SlideBoxContent(props) {
             handleClose={handleClose}
             selectedOfferDetails={selectedOfferDetails}
             eventContextTags={eventContextTags}
-            showLiquidErrorInFooter={showLiquidErrorInFooter}
           />
         )
       }
@@ -791,7 +783,6 @@ export function SlideBoxContent(props) {
             handleClose={handleClose}
             selectedOfferDetails={selectedOfferDetails}
             eventContextTags={eventContextTags}
-            showLiquidErrorInFooter={showLiquidErrorInFooter}
           />
         )
       }
@@ -807,7 +798,6 @@ export function SlideBoxContent(props) {
           templateData={templateData}
           selectedOfferDetails={selectedOfferDetails}
           eventContextTags={eventContextTags}
-          showLiquidErrorInFooter={showLiquidErrorInFooter}
           createNew/>
       )}
 
@@ -825,16 +815,13 @@ export function SlideBoxContent(props) {
         templateData={templateData}
         selectedOfferDetails={selectedOfferDetails}
         eventContextTags={eventContextTags}
-        showLiquidErrorInFooter={showLiquidErrorInFooter}
         createNew/> }
 
       {isCreateWhatsapp && (<Whatsapp
         isFullMode={isFullMode}
         onCreateComplete={onCreateComplete}
         eventContextTags={eventContextTags}
-        handleClose={handleClose}
-        showLiquidErrorInFooter={showLiquidErrorInFooter}
-        />
+        handleClose={handleClose}/>
       )}
 
       {isEditWhatsapp && (<Whatsapp
@@ -852,9 +839,7 @@ export function SlideBoxContent(props) {
           pathname: `/whatsapp/edit`,
           query,
           search: '',
-        }}
-        showLiquidErrorInFooter={showLiquidErrorInFooter}
-        />
+        }}/>
       )}
 
       {isCreateInApp && (<InApp
@@ -871,7 +856,6 @@ export function SlideBoxContent(props) {
         templateData={templateData}
         getDefaultTags={type}
         eventContextTags={eventContextTags}
-        showLiquidErrorInFooter={showLiquidErrorInFooter}
       />
       )}
 
@@ -891,14 +875,11 @@ export function SlideBoxContent(props) {
           pathname: `/inapp/edit`,
           query,
           search: '',
-        }}
-        showLiquidErrorInFooter={showLiquidErrorInFooter}
-        />
+        }} />
       )}
 
       {isCreateRcs && (<Rcs
         {...rcsCommonProps}
-        showLiquidErrorInFooter={showLiquidErrorInFooter}
         location={{
           pathname: `/rcs/create`,
           query,
@@ -907,7 +888,6 @@ export function SlideBoxContent(props) {
       )}
       {isEditRcs && (<Rcs
         {...rcsCommonProps}
-        showLiquidErrorInFooter={showLiquidErrorInFooter}
         templateData={templateData}
         params={{
           id: templateData._id,

package/v2Containers/CreativesContainer/SlideBoxFooter.js

@@ -25,12 +25,10 @@ function SlideBoxFooter(props) {
     isTemplateNameEmpty,
     errorMessages,
     isLiquidValidationError,
-    currentTab,
   } = props;
-
   return (
     <div className='template-footer-width'>
-      {isLiquidValidationError && (<ErrorInfoNote errorMessages={errorMessages} currentTab={currentTab?.toUpperCase()} />)}
+      {isLiquidValidationError && (<ErrorInfoNote  errorMessages={errorMessages} />)}
       <div>
         {props.shouldShowDoneFooter() && (
           <div>

package/v2Containers/CreativesContainer/constants.js

@@ -33,7 +33,7 @@ export const HIDE_CONTAINER_LOADER = "app/CreativesContainer/HIDE_CONTAINER_LOAD
 export const WHATSAPP_HELP_DOC_LINK = "https://docs.capillarytech.com/docs/create-whatsapp-template";
 
 export const ENABLE_AI_SUGGESTIONS = "ENABLE_AI_SUGGESTIONS";
-export const LIQUID_SUPPORTED_CHANNELS = [EMAIL, SMS, MOBILE_PUSH, INAPP];
+export const LIQUID_SUPPORTED_CHANNELS = [EMAIL];
 
 export const EMF = "EMF";
 export const VENENO = "VENENO";
@@ -44,6 +44,3 @@ export const EXTERNAL_URL = "EXTERNAL_URL";
 
 export const TRANSACTION = "TRANSACTION";
 export const BIG_TEXT = "BIG_TEXT";
-export const GENERIC = "GENERIC";
-export const LIQUID_ERROR_MSG = "LIQUID_ERROR_MSG";
-export const STANDARD_ERROR_MSG = "STANDARD_ERROR_MSG";

package/v2Containers/CreativesContainer/index.js

@@ -1,11 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Bugsnag from "@bugsnag/js";
-import CapSlideBox from '@capillarytech/cap-ui-library/CapSlideBox';
-import CapHeader from '@capillarytech/cap-ui-library/CapHeader';
-import CapLink from '@capillarytech/cap-ui-library/CapLink';
-import CapInput from '@capillarytech/cap-ui-library/CapInput';
-import CapNotification from '@capillarytech/cap-ui-library/CapNotification';
+import {
+  CapSlideBox,
+  CapHeader,
+  CapLink,
+  CapInput,
+  CapNotification,
+} from "@capillarytech/cap-ui-library";
 import { injectIntl, FormattedMessage } from 'react-intl';
 import classnames from 'classnames';
 import {
@@ -57,7 +59,6 @@ import {
 } from '@capillarytech/cap-ui-library/styled/variables';
 import { DAEMON } from '@capillarytech/vulcan-react-sdk/utils/sagaInjectorTypes';
 import { DYNAMIC_URL } from '../../v2Components/CapWhatsappCTA/constants';
-import ErrorInfoNote from '../../v2Components/ErrorInfoNote';
 
 import {
   transformChannelPayload,
@@ -93,13 +94,7 @@ export class Creatives extends React.Component {
       weChatMaptemplateStep: 0,
       isLiquidValidationError: false,
       errorMessages: [],
-      liquidErrorMessage: {
-        STANDARD_ERROR_MSG: [],
-        LIQUID_ERROR_MSG: [],
-      },
-      activeFormBuilderTab: constants.ANDROID,
     };
-    this.liquidFlow = Boolean(commonUtil.hasLiquidSupportFeature());
     this.creativesTemplateSteps = {
       1: 'modeSelection',
       2: 'templateSelection', // only for email in current flows wil be used for mpush, line and wechat as well.
@@ -757,7 +752,7 @@ export class Creatives extends React.Component {
             }
             templateData.androidContent = androidContent;
             templateData.androidContent.type = get(channelTemplate, 'definition.mode', '').toUpperCase();
-            templateData.androidContent.deviceType = constants.ANDROID;
+            templateData.androidContent.deviceType = 'ANDROID';
           }
           const iosContent = channel === constants.INAPP ? get(channelTemplate, 'versions.base.content.IOS') : get(channelTemplate, 'versions.base.IOS');
           if (!isEmpty(iosContent)) {
@@ -776,7 +771,7 @@ export class Creatives extends React.Component {
             }
             templateData.iosContent = iosContent;
             templateData.iosContent.type = get(channelTemplate, 'definition.mode').toUpperCase();
-            templateData.iosContent.deviceType = constants.IOS;
+            templateData.iosContent.deviceType = IOS.toUpperCase();
           }
           templateData.messageSubject = channelTemplate?.name ? channelTemplate?.name : "messageSubject";
         }
@@ -1109,7 +1104,6 @@ export class Creatives extends React.Component {
   }
 
   getFormData = (template) => {
-
     if (template.validity) {
       this.setState(
         {
@@ -1332,14 +1326,10 @@ export class Creatives extends React.Component {
     }
   }
 
-  showLiquidErrorInFooter = (errorMessagesFromFormBuilder, currentFormBuilderTab) => {
-
-    this.setState({
-      isLiquidValidationError: !isEmpty(get(errorMessagesFromFormBuilder, constants.LIQUID_ERROR_MSG, [])) || !isEmpty(get(errorMessagesFromFormBuilder, constants.STANDARD_ERROR_MSG, [])),
-      liquidErrorMessage: errorMessagesFromFormBuilder,
-      activeFormBuilderTab: currentFormBuilderTab === 1 ? constants.ANDROID : (currentFormBuilderTab === 2 ? constants.IOS : null), // Update activeFormBuilderTab, default to 1 if undefined
-    });
-  }
+  showLiquidErrorInFooter = (errorMessages) => {
+    const isError = (errorMessages?.STANDARD_ERROR_MSG?.length > 0 || errorMessages?.LIQUID_ERROR_MSG?.length > 0);
+    this.setState({ isLiquidValidationError: isError, errorMessages });
+  };
 
   shouldShowContinueFooter = () => { // only for email for now, has to be modified according to channel
     const { slidBoxContent, templateStep, currentChannel, emailCreateMode, mobilePushCreateMode, inAppCreateMode, weChatTemplateType } = this.state;
@@ -1399,8 +1389,7 @@ export class Creatives extends React.Component {
       weChatMaptemplateStep,
       isTemplateNameEmpty,
       isLiquidValidationError,
-      liquidErrorMessage,
-      activeFormBuilderTab,
+      errorMessages,
     } = this.state;
     const {
       isFullMode,
@@ -1428,11 +1417,11 @@ export class Creatives extends React.Component {
       weChatTemplateType === MAP_TEMPLATE &&
       templateStep !== "modeSelection";
     const slideBoxWrapperMargin =
-      (get(liquidErrorMessage, 'STANDARD_ERROR_MSG.length', 0) > 0 && get(liquidErrorMessage, 'LIQUID_ERROR_MSG.length', 0) > 0)
+      errorMessages?.STANDARD_ERROR_MSG?.length > 0 && errorMessages?.LIQUID_ERROR_MSG?.length > 0
         ? CAP_SPACE_64
-        : get(liquidErrorMessage, 'LIQUID_ERROR_MSG.length', 0) > 0
+        : errorMessages?.LIQUID_ERROR_MSG?.length > 0
           ? CAP_SPACE_56
-          : get(liquidErrorMessage, 'STANDARD_ERROR_MSG.length', 0) > 0
+          : errorMessages?.STANDARD_ERROR_MSG?.length > 0
             ? CAP_SPACE_32
             : 0;
     /* TODO: Instead of passing down same props separately to each component down, write common function to these props and pass it accordingly */
@@ -1530,7 +1519,7 @@ export class Creatives extends React.Component {
               loyaltyMetaData={loyaltyMetaData}
             />
           )}
-          footer={this.shouldShowFooter() ? (
+          footer={this.shouldShowFooter() && (
             <SlideBoxFooter
               isFullMode={isFullMode}
               messages={this.props.messages}
@@ -1547,24 +1536,13 @@ export class Creatives extends React.Component {
               fetchingCmsData={fetchingCmsData}
               isTemplateNameEmpty={isTemplateNameEmpty}
               isLiquidValidationError={isLiquidValidationError}
-              errorMessages={liquidErrorMessage}
-              currentTab={activeFormBuilderTab}
+              errorMessages={errorMessages}
             />
-          ) : isLiquidValidationError && (
-            <CapRow className="template-footer-width">
-              {(() => {
-
-                const errorsToShow = get(liquidErrorMessage, constants.LIQUID_ERROR_MSG, []);
-                const standardErrorsToShow = get(liquidErrorMessage, constants.STANDARD_ERROR_MSG, []);
-                return <ErrorInfoNote currentTab={activeFormBuilderTab?.toUpperCase()} errorMessages={{LIQUID_ERROR_MSG: errorsToShow, STANDARD_ERROR_MSG: standardErrorsToShow}} />;
-              })()}
-            </CapRow>
           )}
           handleClose={this.handleCloseSlideBox}
           show={showSlideBox}
           size="size-xl"
         />
-        
       </SlideBoxWrapper>
     );
   }
@@ -1599,9 +1577,6 @@ Creatives.propTypes = {
   orgUnitId: PropTypes.number,
   hostName: PropTypes.string,
   eventContextTags: PropTypes.array,
-  intl: PropTypes.shape({
-    formatMessage: PropTypes.func,
-  }),
   stopValidation: PropTypes.func,
 };
 const mapStatesToProps = () => createStructuredSelector({

package/v2Containers/CreativesContainer/messages.js

@@ -14,10 +14,6 @@ export default defineMessages({
     id: 'creatives.containersV2.Creatives.continue',
     defaultMessage: 'Continue',
   },
-  "emailBodyEmptyError": {
-    id: 'creatives.componentsV2.FormBuilder.emailBodyEmptyError',
-    defaultMessage: 'Mobile push body cannot be empty',
-  },
   "lastUpdated": {
     id: 'creatives.containersV2.Creatives.lastUpdated',
     defaultMessage: 'Last updated: {date} by {user}',

package/v2Containers/CreativesContainer/tests/__snapshots__/index.test.js.snap

@@ -215,13 +215,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
     footer={
       <SlideBoxFooter
         currentChannel="WHATSAPP"
-        currentTab="ANDROID"
-        errorMessages={
-          Object {
-            "LIQUID_ERROR_MSG": Array [],
-            "STANDARD_ERROR_MSG": Array [],
-          }
-        }
+        errorMessages={Array []}
         isLiquidValidationError={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}
@@ -307,13 +301,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
     footer={
       <SlideBoxFooter
         currentChannel="WHATSAPP"
-        currentTab="ANDROID"
-        errorMessages={
-          Object {
-            "LIQUID_ERROR_MSG": Array [],
-            "STANDARD_ERROR_MSG": Array [],
-          }
-        }
+        errorMessages={Array []}
         isLiquidValidationError={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}
@@ -399,13 +387,7 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
     footer={
       <SlideBoxFooter
         currentChannel="WHATSAPP"
-        currentTab="ANDROID"
-        errorMessages={
-          Object {
-            "LIQUID_ERROR_MSG": Array [],
-            "STANDARD_ERROR_MSG": Array [],
-          }
-        }
+        errorMessages={Array []}
         isLiquidValidationError={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}

package/v2Containers/Ebill/index.js

@@ -955,7 +955,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
         }
         temp.injectedEvents = {};
         _.forEach(col.supportedEvents, (event) => {
-
+          console.log('injected event for ', col, event, this.getMappedEvent(col.id, event));
           temp.injectedEvents[event] = this.getMappedEvent(col.id, event);
         });
         
@@ -1135,7 +1135,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
   }
 
   cloneParent(section, tabIndex) {
-
+    console.log('trying to clone', JSON.stringify(section), tabIndex);
     const parentsect = section;
     const childSectionsBeforeCloning = parentsect.childSections.slice();
     const childSections = [];
@@ -1152,7 +1152,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       childSections.push(sect);
       return true;
     });
-
+    console.log('returning cloned parent section final 1', JSON.stringify(childSections));
     parentsect.childSections = childSections;
     
     return _.cloneDeep(parentsect);

package/v2Containers/EmailWrapper/components/EmailWrapperView.js

@@ -138,7 +138,7 @@ const EmailWrapperView = ({
   emailProps,
   cmsTemplatesProps,
 }) => {
-
+  console.log("EmailLayout", step, emailCreateMode);
   const isShowTemplateSelection = step === STEPS.MODE_SELECTION || (step === STEPS.TEMPLATE_SELECTION && emailCreateMode === EMAIL_CREATE_MODES.UPLOAD);
 
   return (

package/v2Containers/InApp/index.js

@@ -20,8 +20,7 @@ import {
   isLoadingMetaEntities,
   makeSelectMetaEntities,
   setInjectedTags,
-  selectCurrentOrgDetails,
-  selectLiquidStateDetails
+  selectCurrentOrgDetails
 } from "../Cap/selectors";
 import * as inAppActions from "./actions";
 import './index.scss';
@@ -52,11 +51,7 @@ import { INAPP, SMS } from "../CreativesContainer/constants";
 import { ALL, TAG, EMBEDDED, DEFAULT, FULL, LIBRARY } from "../Whatsapp/constants";
 import CapDeviceContent from "../../v2Components/CapDeviceContent";
 import { getCdnUrl } from "../../utils/cdnTransformation";
-import { getCtaObject, hasAnyErrors } from "./utils";
-import { validateInAppContent } from "../../utils/commonUtils";
-import ErrorInfoNote from "../../v2Components/ErrorInfoNote";
-import { hasLiquidSupportFeature } from "../../utils/common";
-import formBuilderMessages from "../../v2Components/FormBuilder/messages";
+import { getCtaObject } from "./utils";
 let editContent = {};
 
 export const InApp = (props) => {
@@ -77,10 +72,8 @@ export const InApp = (props) => {
     injectedTags,
     getFormData,
     selectedOfferDetails,
-    currentOrgDetails,
-    fetchingLiquidValidation,
+    currentOrgDetails
   } = props || {};
-  const isLiquidFlow = hasLiquidSupportFeature();
   const { formatMessage } = intl;
   const [titleAndroid, setTitleAndroid] = useState("");
   const [titleIos, setTitleIos] = useState("");
@@ -128,18 +121,6 @@ export const InApp = (props) => {
   const isAiContentBotDisabled = accessibleFeatures?.includes(
     AI_CONTENT_BOT_DISABLED
   );
-  const [errorMessage, setErrorMessage] = useState({
-    STANDARD_ERROR_MSG: {
-      ANDROID: [],
-      IOS: [],
-      GENERIC: [],
-    },
-    LIQUID_ERROR_MSG: {
-      ANDROID: [],
-      IOS: [],
-      GENERIC: [],
-    },
-  });
 
   //gets account details
   useEffect(() => {
@@ -618,54 +599,47 @@ export const InApp = (props) => {
       sourceAccountIdentifier = "",
       id,
     } = accountObj;
-    
-    // Construct Android content if not disabled
-    const androidContent = !isDisableDone(ANDROID) ? {
-      ...commonDevicePayload,
-      title: titleAndroid,
-      message: templateMessageAndroid,
-      bodyType: templateLayoutType,
-      expandableDetails: {
-        style: BIG_TEXT,
-        message: templateMessageAndroid,
-        ...androidMediaParams,
-        ...(isBtnTypeCtaAndroid && {
-          ctas: getCtaPayload(ANDROID),
-        }),
-      },
-      custom: [],
-      ...(deepLinkValueAndroid && {
-        ctas: [{type: DEEP_LINK, actionLink: deepLinkValueAndroid}],
-      }),
-    } : {};
-    
-    // Construct iOS content if not disabled
-    const iosContent = !isDisableDone(IOS) ? {
-      ...commonDevicePayload,
-      title: titleIos,
-      message: templateMessageIos,
-      bodyType: templateLayoutType,
-      expandableDetails: {
-        style: BIG_TEXT,
-        message: templateMessageIos,
-        ...iosMediaParams,
-        ...(isBtnTypeCTaIos && {
-          ctas: getCtaPayload(IOS),
-        }),
-      },
-      custom: [],
-      ...(deepLinkValueIos && {
-        ctas: [{type: DEEP_LINK, actionLink: deepLinkValueIos}],
-      }),
-    } : {};
-    
     const data = {
       name: templateName,
       versions: {
         base: {
           content: {
-            ANDROID: androidContent,
-            IOS: iosContent,
+            ANDROID: !isDisableDone(ANDROID) ? {
+              ...commonDevicePayload,
+              title: titleAndroid,
+              message: templateMessageAndroid,
+              bodyType: templateLayoutType,
+              expandableDetails: {
+                style: BIG_TEXT,
+                message: templateMessageAndroid,
+                ...androidMediaParams,
+                ...(isBtnTypeCtaAndroid && {
+                  ctas: getCtaPayload(ANDROID),
+                }),
+              },
+              custom: [],
+              ...(deepLinkValueAndroid && {
+                ctas: [{type: DEEP_LINK, actionLink: deepLinkValueAndroid}],
+              }),
+            } : {},
+            IOS: !isDisableDone(IOS) ? {
+              ...commonDevicePayload,
+              title: titleIos,
+              message: templateMessageIos,
+              bodyType: templateLayoutType,
+              expandableDetails: {
+                style: BIG_TEXT,
+                message: templateMessageIos,
+                ...iosMediaParams,
+                ...(isBtnTypeCTaIos && {
+                  ctas: getCtaPayload(IOS),
+                }),
+              },
+              custom: [],
+              ...(deepLinkValueIos && {
+                ctas: [{type: DEEP_LINK, actionLink: deepLinkValueIos}],
+              }),
+            } : {},
           },
         },
       },
@@ -729,61 +703,21 @@ export const InApp = (props) => {
   const onDoneCallback = () => {
     if (isFullMode) {
       if (isEditFlow) {
-        return onEditInApp();
+        return onEditInApp;
       }
-      return onCreateInApp();
+      return onCreateInApp;
     }
-    return getFormData({
-      value: createPayload(),
-      _id: params && params.id,
-      validity: true,
-      type: INAPP,
-    });
-  };
-
-  const liquidMiddleWare = () => {
-    // Set up callbacks for validation results
-    const onError = ({ standardErrors, liquidErrors }) => {
-      setErrorMessage((prev) => ({
-        STANDARD_ERROR_MSG: { ...prev.STANDARD_ERROR_MSG, ...standardErrors },
-        LIQUID_ERROR_MSG: { ...prev.LIQUID_ERROR_MSG, ...liquidErrors },
-      }));
-    };
-    const onSuccess = () => {
-      // Proceed with submission when validation is successful
-      onDoneCallback();
-    };
-
-    // Validate the INAPP content
-    const payload = createPayload();
-    validateInAppContent(payload, {
-      currentTab: panes === ANDROID ? 1 : 2, // Convert ANDROID/IOS to tab numbers
-      onError,
-      onSuccess,
-      getLiquidTags: (content, callback) => globalActions.getLiquidTags(content, callback),
-      formatMessage,
-      messages: globalMessages,
-      tagLookupMap: metaEntities?.tagLookupMap || {},
-      eventContextTags: metaEntities?.eventContextTags || [],
-      isLiquidFlow,
-      forwardedTags: {},
-      skipTags: (tag) => {
-        // Skip certain tags if needed
-        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));
-      },
-    });
+    return () =>
+      getFormData({
+        value: createPayload(),
+        _id: params && params.id,
+        validity: true,
+        type: INAPP,
+      });
   };
 
   return (
-    <CapSpin spinning={spin || fetchingLiquidValidation} tip={fetchingLiquidValidation ? <FormattedMessage {...formBuilderMessages.liquidSpinText} /> : ""}>
+    <CapSpin spinning={spin}>
       <CapRow className="cap-inapp-creatives">
         <CapColumn span={14}>
           {isFullMode && createModeContent}
@@ -828,14 +762,8 @@ export const InApp = (props) => {
       <div className={`inapp-footer ${!isFullMode && `inapp-footer-lib`}`}>
         {
           <>
-            {hasAnyErrors(errorMessage) && (
-              <ErrorInfoNote
-                errorMessages={errorMessage}
-                currentTab={panes}
-              />
-            )}
             <CapButton
-              onClick={isLiquidFlow ? liquidMiddleWare : onDoneCallback}
+              onClick={onDoneCallback()}
               disabled={isDisableDone(panes)}
               className="inapp-create-btn"
             >
@@ -865,7 +793,6 @@ const mapStateToProps = createStructuredSelector({
   loadingTags: isLoadingMetaEntities(),
   injectedTags: setInjectedTags(),
   currentOrgDetails: selectCurrentOrgDetails(),
-  fetchingLiquidValidation: selectLiquidStateDetails()
 });
 
 const mapDispatchToProps = (dispatch) => ({

package/v2Containers/InApp/tests/index.test.js

@@ -85,7 +85,7 @@ describe('Test activity inApp container', () => {
     });
     expect(updateBtn).toBeEnabled();
     fireEvent.click(updateBtn);
-    expect(mockActions.editTemplate).toHaveBeenCalled();
+    expect(mockActions.editTemplate).toBeCalled();
   });
   it('test case for inApp template configuration', async () => {
     renderComponent({

package/v2Containers/InApp/tests/sagas.test.js

@@ -387,7 +387,7 @@ describe('test for getTemplateDetails', () => {
     expect(gen.next().value).toEqual(
       takeLatest(types.GET_INAPP_TEMPLATE_DETAILS_REQUEST, sagas.getTemplateDetails),
     );
-
+    console.log('gen.next().value', gen.next());
     // Pass the mock task to the takeLatest effect
     expect(gen.next(mockTask).done).toBe(true);