@capillarytech/creatives-library 8.0.9 → 8.0.11

package/v2Containers/Cap/tests/reducer.test.js

@@ -6,9 +6,20 @@ import {
     REQUEST,
     SUCCESS,
     FAILURE,
+    GET_LIQUID_TAGS_SUCCESS,
+    GET_LIQUID_TAGS_FAILURE,
+    GET_LIQUID_TAGS_REQUEST,
+    GET_SCHEMA_FOR_ENTITY_SUCCESS,
 } from '../constants';
 import reducer from '../reducer';
 import initialState from '../../../initialState';
+import {
+  expectedStateGetLiquidTagsRequest,
+  expectedStateGetLiquidTagsFailure,
+  expectedStateGetLiquidTagsSuccess,
+  expectedStateGetSchemaForEntitySuccessTAG,
+  expectedStateGetSchemaForEntitySuccess
+} from '../mockData';
 
 const mockedInitialState = fromJS(initialState.cap);
 
@@ -56,4 +67,43 @@ describe('should handle GET_SUPPORT_VIDEOS_CONFIG', () => {
       demoVideoAndLinkJSONStatus: FAILURE,
     });
   });
+  it('handles the GET_LIQUID_TAGS_REQUEST action', () => {
+    const action = {
+      type: GET_LIQUID_TAGS_REQUEST,
+    };
+    expect(reducer(mockedInitialState, action).toJS()).toEqual(expectedStateGetLiquidTagsRequest);
+  });
+
+  it('handles the GET_LIQUID_TAGS_FAILURE action', () => {
+    const action = {
+      type: GET_LIQUID_TAGS_FAILURE,
+    };
+    expect(reducer(mockedInitialState, action).toJS()).toEqual(expectedStateGetLiquidTagsFailure);
+  });
+
+  it('handles the GET_LIQUID_TAGS_SUCCESS action', () => {
+    const action = {
+      type: GET_LIQUID_TAGS_SUCCESS,
+    };
+    expect(reducer(mockedInitialState, action).toJS()).toEqual(expectedStateGetLiquidTagsSuccess);
+  });
+
+  it('handles the GET_SCHEMA_FOR_ENTITY_SUCCESS action with action type as TAG', () => {
+    const action = {
+      type: GET_SCHEMA_FOR_ENTITY_SUCCESS,
+      data: {metaEntities:{standard:{"random": "32"}}},
+      entityType: "TAG"
+    };
+
+    expect(reducer(mockedInitialState, action).toJS()).toEqual(expectedStateGetSchemaForEntitySuccessTAG);
+  });
+
+  it('handles the GET_SCHEMA_FOR_ENTITY_SUCCESS action', () => {
+    const action = {
+      type: GET_SCHEMA_FOR_ENTITY_SUCCESS,
+      data: {metaEntities:{standard:{"random": "32"}}},
+    };
+
+    expect(reducer(mockedInitialState, action).toJS()).toEqual(expectedStateGetSchemaForEntitySuccess);
+  });
 });

package/v2Containers/Cap/tests/saga.test.js

@@ -1,7 +1,7 @@
 import { take, fork, cancel, takeLatest } from 'redux-saga/effects';
 import { expectSaga } from 'redux-saga-test-plan';
 import * as matchers from 'redux-saga-test-plan/matchers';
-import { authorize, loginFlow, fetchSchemaForEntity, getSupportVideosConfig, watchForGetVideosConfig, watchFetchSchemaForEntity } from '../sagas';
+import { authorize, loginFlow, fetchSchemaForEntity, getSupportVideosConfig, watchForGetVideosConfig, watchFetchSchemaForEntity,watchLiquidEntity, getLiquidTags } from '../sagas';
 import { throwError } from 'redux-saga-test-plan/providers';
 import * as api from '../../../services/api';
 import {
@@ -14,6 +14,9 @@ import {
   GET_SUPPORT_VIDEOS_CONFIG_SUCCESS,
   GET_SUPPORT_VIDEOS_CONFIG_FAILURE,
   GET_SCHEMA_FOR_ENTITY_REQUEST,
+  GET_LIQUID_TAGS_SUCCESS,
+  GET_LIQUID_TAGS_FAILURE,
+  GET_LIQUID_TAGS_REQUEST,
 } from '../constants';
 import { callback, error, error2, videoConfigData } from '../../mockdata';
 
@@ -207,4 +210,81 @@ describe('watchFetchSchemaForEntity saga', () => {
       takeLatest(GET_SCHEMA_FOR_ENTITY_REQUEST, fetchSchemaForEntity),
     );
   });
+});
+
+
+describe('getLiquidTags saga', () => {
+  it('handles successful API response', () => {
+    const action = { data: 'templateContent', callback: () =>{}};
+    const result = { result :{errors: [{message: "error in content"}]} };
+
+    expectSaga(getLiquidTags, action)
+      .provide([
+        [matchers.call.fn(api.getLiquidTags, 'templateContent'), result],
+        [matchers.call.fn(api.askAiraForLiquid, { templateContent: 'templateContent', errorMessage: result?.result?.errors[0]?.message }), { result: { errors: [] } }],
+      ])
+      .call.fn(action.callback, result)
+      .put({ type: GET_LIQUID_TAGS_SUCCESS })
+      .run();
+  });
+
+  it('handles successful API response for askAira', () => {
+    const action = { data: 'templateContent', callback: () =>{}};
+    const result = { result :{errors: [{message: "error in content"}]} };
+
+    expectSaga(getLiquidTags, action)
+      .provide([
+        [matchers.call.fn(api.getLiquidTags, 'templateContent'), result],
+        [matchers.call.fn(api.askAiraForLiquid, { templateContent: 'templateContent', errorMessage: result?.result?.errors[0]?.message }), {result: { errors: [{message: "Something went wrong"}]}  }],
+      ])
+      .call.fn(action.callback, result)
+      .put({ type: GET_LIQUID_TAGS_SUCCESS })
+      .run();
+  });
+
+  it('handles API response with errors', () => {
+    const action = { data: 'templateContent' };
+    const result = { errors: [{ message: 'Error message' }] };
+
+    expectSaga(getLiquidTags, action)
+      .provide([
+        [matchers.call.fn(api.getLiquidTags, 'templateContent'), result],
+        [matchers.call.fn(api.askAiraForLiquid, { templateContent: 'templateContent', errorMessage: result.errors[0].message }), {result: { errors: [{message: "Something went wrong"}]}  }],
+      ])
+      .not.call.fn(action.callback, result)
+      .put({ type: GET_LIQUID_TAGS_FAILURE, error: true })
+      .run();
+  });
+  it('handles API response with undefined', () => {
+    const action = { data: 'templateContent' };
+    const result = undefined;
+
+    expectSaga(getLiquidTags, action)
+      .provide([
+        [matchers.call.fn(api.getLiquidTags, 'templateContent'), result],
+      ])
+      .not.call.fn(action.callback, result)
+      .put({ type: GET_LIQUID_TAGS_FAILURE, error: true })
+      .run();
+  });
+  it('handles error thrown during API call', () => {
+    const action = { data: 'templateContent' };
+    const error = new Error('API error');
+
+    expectSaga(getLiquidTags, action)
+      .provide([
+        [matchers.call.fn(api.getLiquidTags, 'templateContent'), throwError(error)],
+      ])
+      .put({ type: GET_LIQUID_TAGS_FAILURE, error })
+      .run();
+  });
+});
+
+describe('watchForGetLiquidTags saga', () => {
+  const generator = watchLiquidEntity();
+  it('should call watchers functions', () => {
+    expect(generator.next().value).toEqual(
+      takeLatest(GET_LIQUID_TAGS_REQUEST, getLiquidTags),
+    );
+  });
 });

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -153,6 +153,8 @@ export function SlideBoxContent(props) {
       hideTestAndPreviewBtn,
       getCmsTemplatesInProgress = false,
       moduleType,
+      showLiquidErrorInFooter,
+      creativesMode,
     } = props;
   const type = (messageDetails.type || '').toLowerCase(); // type is context in get tags values : outbound | dvs | referral | loyalty | coupons
   const query = { type: !isFullMode && 'embedded', module: isFullMode ? 'default' : 'library', isEditFromCampaigns: (templateData || {}).isEditFromCampaigns};
@@ -601,6 +603,7 @@ export function SlideBoxContent(props) {
         onTestContentClicked={onTestContentClicked}
         getCmsTemplatesInProgress={getCmsTemplatesInProgress}
         moduleType={moduleType}
+        showLiquidErrorInFooter={showLiquidErrorInFooter}
       />
         )}
       {(isEditEmailWithId || isEmailEditWithContent) && (
@@ -628,6 +631,7 @@ export function SlideBoxContent(props) {
         onPreviewContentClicked={onPreviewContentClicked}
         onTestContentClicked={onTestContentClicked}
         moduleType={moduleType}
+        showLiquidErrorInFooter={showLiquidErrorInFooter}
       />
         )}
       {isEditMPush &&
@@ -652,6 +656,7 @@ export function SlideBoxContent(props) {
           onTestContentClicked={onTestContentClicked}
           type={type}
           hideTestAndPreviewBtn={hideTestAndPreviewBtn}
+          creativesMode={creativesMode}
         />
         }
       {isCreateMPush &&
@@ -917,5 +922,7 @@ SlideBoxContent.propTypes = {
   smsRegister: PropTypes.any,
   getCmsTemplatesInProgress: PropTypes.bool,
   moduleType: PropTypes.string,
+  showLiquidErrorInFooter: PropTypes.bool,
+  creativesMode: PropTypes.string,
 };
 export default SlideBoxContent;

package/v2Containers/CreativesContainer/SlideBoxFooter.js

@@ -1,8 +1,13 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import { CapButton, CapError } from '@capillarytech/cap-ui-library';
+import CapRow from '@capillarytech/cap-ui-library/CapRow';
+import CapButton from '@capillarytech/cap-ui-library/CapButton';
+import CapError from '@capillarytech/cap-ui-library/CapError';
 import PropTypes from 'prop-types';
 import messages from './messages';
+import ErrorInfoNote from '../../v2Components/ErrorInfoNote';
+import { PREVIEW } from './constants';
+
 function getFullModeSaveBtn(slidBoxContent) {
   return slidBoxContent === "editTemplate" ?
     <FormattedMessage {...messages.creativesTemplatesUpdate}/>
@@ -10,36 +15,53 @@ function getFullModeSaveBtn(slidBoxContent) {
     <FormattedMessage {...messages.creativesTemplatesSaveFullMode}/>;
 }
 function SlideBoxFooter(props) {
-  const { slidBoxContent, onSave, onEditTemplate, onCreateNextStep, isFullMode, fetchingCmsData, isTemplateNameEmpty} = props;
+  const {
+    slidBoxContent,
+    onSave,
+    onEditTemplate,
+    onCreateNextStep,
+    isFullMode,
+    fetchingCmsData,
+    isTemplateNameEmpty,
+    errorMessages,
+    isLiquidValidationError,
+  } = props;
   return (
-    <div>
+    <div className='template-footer-width'>
+      {isLiquidValidationError && (<ErrorInfoNote  errorMessages={errorMessages} />)}
       <div>
         {props.shouldShowDoneFooter() && (
           <div>
-            { isFullMode && isTemplateNameEmpty &&
+            {isFullMode && isTemplateNameEmpty && (
               <CapError type="error">
                 <FormattedMessage {...messages.templateNameEmpty} />
               </CapError>
-            }
-            <CapButton onClick={onSave} disabled={isTemplateNameEmpty || fetchingCmsData || false}>
-              {isFullMode ?
-                getFullModeSaveBtn(slidBoxContent)
-              :
-                <FormattedMessage {...messages.creativesTemplatesSave} />
-              }
-            </CapButton>
+            )}
+            <CapRow>
+              <CapButton
+                onClick={onSave}
+                disabled={isTemplateNameEmpty || fetchingCmsData || false}
+              >
+                {isFullMode ? (
+                  getFullModeSaveBtn(slidBoxContent)
+                ) : (
+                  <FormattedMessage {...messages.creativesTemplatesSave} />
+                )}
+              </CapButton>
+            </CapRow>
             {/* {isFullMode && <CapButton type="secondary" onClick={onDiscard}><FormattedMessage {...messages.creativesTemplatesDiscard}/></CapButton>} */}
-          </div>)}
-        {props.shouldShowContinueFooter() &&
+          </div>
+        )}
+        {props.shouldShowContinueFooter() && (
           <CapButton onClick={onCreateNextStep}>
             <FormattedMessage {...messages.continue} />
           </CapButton>
-          }
-        {slidBoxContent === 'preview' && (
+        )}
+        {slidBoxContent === PREVIEW && (
           <CapButton onClick={onEditTemplate} type="secondary">
             <FormattedMessage {...messages.creativesTemplatesEdit} />
           </CapButton>
-          )}
+        )}
       </div>
     </div>
   );
@@ -53,5 +75,6 @@ SlideBoxFooter.propTypes = {
   shouldShowDoneFooter: PropTypes.func,
   isFullMode: PropTypes.bool,
   isTemplateNameEmpty: PropTypes.bool,
+  isLiquidValidationError: PropTypes.bool,
 };
 export default SlideBoxFooter;

package/v2Containers/CreativesContainer/constants.js

@@ -30,3 +30,4 @@ 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];

package/v2Containers/CreativesContainer/index.js

@@ -47,6 +47,7 @@ import creativesContainerReducer from './reducer';
 import { compose } from 'redux';
 import { capSagaForFetchSchemaForEntity } from '../Cap/sagas';
 import { v2TemplateSagaWatchGetDefaultBeeTemplates } from '../Templates/sagas';
+import { CAP_SPACE_28, CAP_SPACE_32, CAP_SPACE_56, CAP_SPACE_64, CAP_SPACE_72, CAP_SPACE_80 } from '@capillarytech/cap-ui-library/styled/variables';
 
 const classPrefix = 'add-creatives-section';
 const CREATIVES_CONTAINER = 'creativesContainer';
@@ -54,7 +55,8 @@ const CREATIVES_CONTAINER = 'creativesContainer';
 const SlideBoxWrapper = styled.div`
   .cap-slide-box-v2-container{
     .slidebox-header, .slidebox-content-container, .slidebox-footer{
-      padding: 0 3rem;
+      margin-bottom: ${({ slideBoxWrapperMargin }) => `${slideBoxWrapperMargin}`};
+      padding: 0 rem;
       &.has-footer{
         overflow-x: hidden;
       }
@@ -74,6 +76,8 @@ export class Creatives extends React.Component {
       currentChannel: this.props.channel || 'sms',
       weChatTemplateType: '',
       weChatMaptemplateStep: 0,
+      isLiquidValidationError: false,
+      errorMessages: [],
     };
     this.creativesTemplateSteps = {
       1: 'modeSelection',
@@ -1135,6 +1139,12 @@ export class Creatives extends React.Component {
       }
     }
   }
+
+  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;
     let isShowContinueFooter = false;
@@ -1175,7 +1185,23 @@ export class Creatives extends React.Component {
     return true;
   }
   render() {
-    const {slidBoxContent, isGetFormData, showSlideBox, templateData, currentChannel, emailCreateMode, templateStep, isLoadingContent, mobilePushCreateMode, isDiscardMessage, weChatTemplateType, weChatMaptemplateStep, isTemplateNameEmpty} = this.state;
+    const {
+      slidBoxContent,
+      isGetFormData,
+      showSlideBox,
+      templateData,
+      currentChannel,
+      emailCreateMode,
+      templateStep,
+      isLoadingContent,
+      mobilePushCreateMode,
+      isDiscardMessage,
+      weChatTemplateType,
+      weChatMaptemplateStep,
+      isTemplateNameEmpty,
+      isLiquidValidationError,
+      errorMessages,
+    } = this.state;
     const {
       isFullMode,
       creativesMode,
@@ -1194,10 +1220,21 @@ export class Creatives extends React.Component {
       smsRegister,
       enableNewChannels,
     } = this.props;
-    const mapTemplateCreate = slidBoxContent === 'createTemplate' && weChatTemplateType === MAP_TEMPLATE && templateStep !== 'modeSelection';
+    const mapTemplateCreate =
+      slidBoxContent === "createTemplate" &&
+      weChatTemplateType === MAP_TEMPLATE &&
+      templateStep !== "modeSelection";
+    const slideBoxWrapperMargin =
+      errorMessages?.STANDARD_ERROR_MSG?.length > 0 && errorMessages?.LIQUID_ERROR_MSG?.length > 0
+        ? CAP_SPACE_64
+        : errorMessages?.LIQUID_ERROR_MSG?.length > 0
+        ? CAP_SPACE_56
+        : 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 */
     return (
-      <SlideBoxWrapper className={classnames(`${classPrefix} ${isFullMode ? 'creatives-full-mode' : 'creatives-library-mode'} ${mapTemplateCreate ? 'map-template-create' : ''}`)}>
+      <SlideBoxWrapper slideBoxWrapperMargin={slideBoxWrapperMargin} className={classnames(`${classPrefix} ${isFullMode ? 'creatives-full-mode' : 'creatives-library-mode'} ${mapTemplateCreate ? 'map-template-create' : ''}`)}>
         <CapSlideBox
           header={
             this.shouldShowHeader() && <SlideBoxHeader
@@ -1280,6 +1317,8 @@ export class Creatives extends React.Component {
               hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
               getCmsTemplatesInProgress={this.props.Templates?.getCmsTemplatesInProgress}
               moduleType={this.props.messageDetails?.type}
+              showLiquidErrorInFooter={this.showLiquidErrorInFooter}
+              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.
           />
           }
           footer={this.shouldShowFooter() &&
@@ -1298,6 +1337,8 @@ export class Creatives extends React.Component {
               shouldShowDoneFooter={this.shouldShowDoneFooter}
               fetchingCmsData={fetchingCmsData}
               isTemplateNameEmpty={isTemplateNameEmpty}
+              isLiquidValidationError ={isLiquidValidationError}
+              errorMessages={errorMessages}
             />
           }
           handleClose={this.handleCloseSlideBox}

package/v2Containers/CreativesContainer/index.scss

@@ -69,4 +69,16 @@ $classPrefix: add-creatives-section;
     i {
         height: $ICON_SIZE_M;
     }
-}
+}
+.liquid-error {
+    display: flex;
+    gap: $CAP_SPACE_04;
+    color: $CAP_COLOR_03;
+    vertical-align: text-top;
+    align-items: center;
+    margin-left: $CAP_SPACE_24;
+}
+
+.template-footer-width {
+    width: 100%;;
+}

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

@@ -3,6 +3,7 @@
 exports[`Test SlideBoxContent container campaign message, add creative click rcs 1`] = `
 <CreativesContainer__SlideBoxWrapper
   className="add-creatives-section creatives-library-mode "
+  slideBoxWrapperMargin={0}
 >
   <CapSlideBox
     closeIconPosition="right"
@@ -33,6 +34,7 @@ exports[`Test SlideBoxContent container campaign message, add creative click rcs
         onWechatTemplateChange={[Function]}
         saveMessage={[Function]}
         setIsLoadingContent={[Function]}
+        showLiquidErrorInFooter={[Function]}
         showTemplateName={[Function]}
         slidBoxContent="templates"
         templateData={
@@ -77,6 +79,7 @@ exports[`Test SlideBoxContent container campaign message, add creative click rcs
 exports[`Test SlideBoxContent container campaign message, add creative click whatsapp 1`] = `
 <CreativesContainer__SlideBoxWrapper
   className="add-creatives-section creatives-library-mode "
+  slideBoxWrapperMargin={0}
 >
   <CapSlideBox
     closeIconPosition="right"
@@ -107,6 +110,7 @@ exports[`Test SlideBoxContent container campaign message, add creative click wha
         onWechatTemplateChange={[Function]}
         saveMessage={[Function]}
         setIsLoadingContent={[Function]}
+        showLiquidErrorInFooter={[Function]}
         showTemplateName={[Function]}
         slidBoxContent="templates"
         templateData={
@@ -151,6 +155,7 @@ exports[`Test SlideBoxContent container campaign message, add creative click wha
 exports[`Test SlideBoxContent container campaign message, whatsapp edit all data 1`] = `
 <CreativesContainer__SlideBoxWrapper
   className="add-creatives-section creatives-library-mode "
+  slideBoxWrapperMargin={0}
 >
   <CapSlideBox
     closeIconPosition="right"
@@ -181,6 +186,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
         onWechatTemplateChange={[Function]}
         saveMessage={[Function]}
         setIsLoadingContent={[Function]}
+        showLiquidErrorInFooter={[Function]}
         showTemplateName={[Function]}
         slidBoxContent="editTemplate"
         templateStep="modeSelection"
@@ -191,6 +197,8 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
     footer={
       <SlideBoxFooter
         currentChannel="WHATSAPP"
+        errorMessages={Array []}
+        isLiquidValidationError={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}
         onEditTemplate={[Function]}
@@ -227,6 +235,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
 exports[`Test SlideBoxContent container campaign message, whatsapp edit min data 1`] = `
 <CreativesContainer__SlideBoxWrapper
   className="add-creatives-section creatives-library-mode "
+  slideBoxWrapperMargin={0}
 >
   <CapSlideBox
     closeIconPosition="right"
@@ -257,6 +266,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
         onWechatTemplateChange={[Function]}
         saveMessage={[Function]}
         setIsLoadingContent={[Function]}
+        showLiquidErrorInFooter={[Function]}
         showTemplateName={[Function]}
         slidBoxContent="editTemplate"
         templateStep="modeSelection"
@@ -267,6 +277,8 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
     footer={
       <SlideBoxFooter
         currentChannel="WHATSAPP"
+        errorMessages={Array []}
+        isLiquidValidationError={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}
         onEditTemplate={[Function]}
@@ -303,6 +315,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
 exports[`Test SlideBoxContent container it should clear the url, on channel change from new whatsapp to another 1`] = `
 <CreativesContainer__SlideBoxWrapper
   className="add-creatives-section creatives-library-mode "
+  slideBoxWrapperMargin={0}
 >
   <CapSlideBox
     closeIconPosition="right"
@@ -333,6 +346,7 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
         onWechatTemplateChange={[Function]}
         saveMessage={[Function]}
         setIsLoadingContent={[Function]}
+        showLiquidErrorInFooter={[Function]}
         showTemplateName={[Function]}
         slidBoxContent="editTemplate"
         templateStep="modeSelection"
@@ -343,6 +357,8 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
     footer={
       <SlideBoxFooter
         currentChannel="WHATSAPP"
+        errorMessages={Array []}
+        isLiquidValidationError={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}
         onEditTemplate={[Function]}

package/v2Containers/Email/_email.scss

@@ -1,4 +1,7 @@
+@import '~@capillarytech/cap-ui-library/styles/_variables.scss';
+
 .email-container {
+  padding-bottom: $CAP_SPACE_80;
   .email-text{
     height: 100%;
     overflow: hidden;

package/v2Containers/Email/index.js

@@ -2740,6 +2740,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
                   type={CmsSettings.type}
                   isEmailLoading={isLoading}
                   moduleType={moduleType}
+                  showLiquidErrorInFooter={this.props.showLiquidErrorInFooter}
               /> : ''}
             </Col>
           </Row>
@@ -2796,6 +2797,7 @@ Email.propTypes = {
   onPreviewContentClicked: PropTypes.func,
   onTestContentClicked: PropTypes.func,
   moduleType: PropTypes.string,
+  showLiquidErrorInFooter: PropTypes.func,
 };
 
 const mapStateToProps = (state, props) => createStructuredSelector({

package/v2Containers/EmailWrapper/index.js

@@ -214,6 +214,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
       editor,
       currentOrgDetails,
       moduleType,
+      showLiquidErrorInFooter,
     } = this.props;
     const {
       templateName,
@@ -278,6 +279,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
                 defaultData={{ 'template-name': templateName }}
                 cap={cap}
                 showTemplateName={showTemplateName}
+                showLiquidErrorInFooter = {showLiquidErrorInFooter}
                 onValidationFail={onValidationFail}
                 forwardedTags={forwardedTags}
                 selectedOfferDetails={selectedOfferDetails}
@@ -321,6 +323,7 @@ EmailWrapper.propTypes = {
   isUploading: PropTypes.bool,
   setIsLoadingContent: PropTypes.func,
   showTemplateName: PropTypes.func,
+  showLiquidErrorInFooter: PropTypes.func,
   onValidationFail: PropTypes.func,
   forwardedTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,

package/v2Containers/Line/Container/Wrapper/tests/__snapshots__/index.test.js.snap

@@ -23084,11 +23084,14 @@ new message content.",
                                       Object {
                                         "app": Object {},
                                         "cap": Object {
+                                          "fetchingLiquidTags": false,
                                           "fetchingSchema": true,
                                           "fetchingSchemaError": "",
+                                          "liquidTags": Array [],
                                           "messages": Array [],
                                           "metaEntities": Object {
                                             "layouts": Array [],
+                                            "tagLookupMap": Object {},
                                             "tags": Array [],
                                           },
                                           "orgID": "",

package/v2Containers/Line/Container/sagas.js

@@ -50,7 +50,7 @@ function* watchUploadAsset() {
 export function* editTemplate({ template, callback }) {
   let errorMsg;
   try {
-    const result = yield call(Api.createLineTemplate, {template});
+    const result = yield call(Api.createLineTemplate, template);
     if (result.status.code >= 400) {
       errorMsg = result.message;
       throw errorMsg;

package/v2Containers/MobilePush/Edit/constants.js

@@ -33,3 +33,5 @@ export const GET_WECRM_ACCOUNTS_FAILURE = "app/v2Containers/MobilePush/GET_WECRM
 export const GET_MOBILEPUSH_TEMPLATES_LIST_REQUEST = 'app/v2Containers/WeChat/GET_MOBILEPUSH_TEMPLATES_LIST_REQUEST';
 export const GET_MOBILEPUSH_TEMPLATES_LIST_SUCCESS = 'app/v2Containers/WeChat/GET_MOBILEPUSH_TEMPLATES_LIST_SUCCESS';
 export const GET_MOBILEPUSH_TEMPLATES_LIST_FAILURE = 'app/v2Containers/WeChat/GET_MOBILEPUSH_TEMPLATES_LIST_FAILURE';
+
+export const MAPP_SDK = 'MAPP_SDK';