@capillarytech/creatives-library 7.7.25 → 7.8.0

package/components/FormBuilder/index.js

@@ -214,7 +214,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
         if (nextProps.isNewVersionFlow && !this.state.formData[this.state.currentTab - 1][this.state.formData[this.state.currentTab - 1].activeTab].tabKey) {
           this.resetTabKeys(nextProps.formData, nextProps.tabCount, false, true);
         }
-        if (type === 'embedded' || (this.props?.schema?.channel || "").toUpperCase() === 'EMAIL') {
+        if (type === 'embedded' || this.props.schema.channel.toUpperCase() === 'EMAIL') {
           this.validateForm();
         }
         if ((this.props.schema && this.props.schema.channel && this.props.schema.channel.toUpperCase() === 'MOBILEPUSH')) {
@@ -2917,7 +2917,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               }
 
               const currentLang = ((!_.isEmpty(this.state.formData) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`]) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages) && this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex]) ? this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex] : this.props.baseLanguage) || 'en';
-              const content = this.state?.formData?.[`${this.state.currentTab - 1}`]?.[currentLang]?.['template-content'] || "";
+              const content = (!_.isEmpty(this.state.formData) && this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] ? this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] : '');
 
               if (this.state.formData[`${this.state.currentTab - 1}`][currentLang].is_drag_drop) {
                 // content = "";

package/containers/Email/index.js

@@ -872,15 +872,10 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         const langIndex = formData[this.state.currentTab - 1].selectedLanguages.indexOf(langId);
         
         const temp = (schema.containers || {})[this.state.currentTab - 1];
-        const isStyleExists= temp?.tabBarExtraContent?.sections?.[0]?.inputFields?.[0]?.cols?.[4]?.content?.sections?.[0]?.inputFields?.[2]?.cols?.[0]?.style;
         if (baseLanguage === langId && (apiLangId === "undefined" || apiLangId === formData[this.state.currentTab - 1].activeTab)) {
-          if(isStyleExists){
-            temp.tabBarExtraContent.sections[0].inputFields[0].cols[4].content.sections[0].inputFields[2].cols[0].style = {display: "none"};
-          }
+          temp.tabBarExtraContent.sections[0].inputFields[0].cols[4].content.sections[0].inputFields[2].cols[0].style = {display: "none"};
         } else if (apiLangId === "undefined" || apiLangId === formData[this.state.currentTab - 1].activeTab) {
-          if(isStyleExists){
-            temp.tabBarExtraContent.sections[0].inputFields[0].cols[4].content.sections[0].inputFields[2].cols[0].style = {display: ""};
-          }
+          temp.tabBarExtraContent.sections[0].inputFields[0].cols[4].content.sections[0].inputFields[2].cols[0].style = {display: ""};
         }
 
         if (nextProps.Email.CmsSettings.isDragDrop) {
@@ -2722,7 +2717,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       }
       formData.base = _.cloneDeep(formData[0]);
       
-      this.setState({formData, loading: false, injectedTags: data.tags, tabKey, isDragDrop: (data?.base?.is_drag_drop !== 0 )}, () => {
+      this.setState({formData, loading: false, injectedTags: data.tags, tabKey, isDragDrop: (data.base.is_drag_drop !== 0 )}, () => {
         // this.setState({tabKey: ''});
         _.forEach(formData[0].selectedLanguages, (language) => {
           if (formData[0][language].is_drag_drop) {

package/containers/MobilePush/Create/index.js

@@ -517,13 +517,13 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       mode: this.props.params.mode,
     };
     const android = {};
-    Object.keys((formData[0] || {})).forEach((data) => {
+    Object.keys(formData[0]).forEach((data) => {
       if (!!formData[0][data] && data !== "tabKey") {
         android[data] = formData[0][data];
       }
     });
     const ios = {};
-    Object.keys((formData[1] || {})).forEach((data) => {
+    Object.keys(formData[1]).forEach((data) => {
       if (!!formData[1][data] && data !== "tabKey") {
         ios[data] = formData[1][data];
       }

package/containers/MobilePush/Edit/index.js

@@ -558,7 +558,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       });
     } else {
       selectedAccount = accounts[0];
-      formData['mobilepush-accounts'] = selectedAccount?.id;
+      formData['mobilepush-accounts'] = accounts[0].id;
     }
     this.props.actions.setWeChatAccount(selectedAccount);
     this.setState({formData, accountsOptions: accounts.map((acc) => ({key: acc.id, label: acc.name, value: acc.id}))});
@@ -573,7 +573,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     obj.type = 'MOBILEPUSH';
     obj.name = formData['template-name'];
     obj.definition = {
-      accountId: selectedWeChatAccount?.id,
+      accountId: selectedWeChatAccount.id,
       licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
     };
     if (this.props.location.query && this.props.location.query.module !== 'dvs') {

package/containers/WeChat/MapTemplates/index.js

@@ -611,9 +611,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
   setSelectedTemplateData(weChatData) {
     let schema = _.cloneDeep(this.state.baseSchema);
     const { intl: {formatMessage}} = this.props;
-    if(schema?.standalone?.sections?.[0]?.childSections?.[1]?.childSections?.[0]?.childSections?.[1]?.inputFields){
-      schema.standalone.sections[0].childSections[1].childSections[0].childSections[1].inputFields = []
-    };
+    schema.standalone.sections[0].childSections[1].childSections[0].childSections[1].inputFields = [];
     if (_.isEmpty(weChatData)) {
       // schema.standalone.sections[0].childSections[1].childSections[0].childSections[1].inputFields = [];
       const formData=_.cloneDeep(this.state.formData);
@@ -780,16 +778,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
               type: "radioGroup",
               metaType: "text",
               datatype: "string",
-              options: [
-                {
-                  value: URL,
-                  label: formatMessage(messages.redirectOptionURL)
-                }, 
-                {
-                  value: MINI_PROGRAM,
-                  label: formatMessage(messages.redirectOptionMiniProgram)
-                }
-              ],
+              options: [formatMessage(messages.redirectOptionURL), formatMessage(messages.redirectOptionMiniProgram)],
               errorMessage: formatMessage(messages.redirectionOptionError),
               required: true,
               fluid: true,
@@ -880,8 +869,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
     if (!_.isEmpty(weCrmAccounts)) {
       _.forEach(weCrmAccounts, (account) => {
         if (account.configs && account.configs.is_wecrm_enabled) {
-          const options = schema?.standalone?.sections[0]?.childSections[1]?.childSections[0]?.childSections[0]?.inputFields[0]?.options;
-          options && options.push({
+          schema.standalone.sections[0].childSections[1].childSections[0].childSections[0].inputFields[0].options.push({
             key: account.uuid,
             label: account.name,
             value: account.name,

package/package.json

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

package/services/api.js

@@ -32,16 +32,6 @@ function parseJSON(response) {
   return response.json();
 }
 
-function getUrlWithQueryParams({url, queryParams}) {
-  let updatedUrl = url;
-  Object.entries(queryParams).forEach(([key, value]) => {
-    if (value !== undefined) {
-      updatedUrl += `${key}=${key === 'name' ? encodeURIComponent(value) : value}&`;
-    }
-  });
-  return updatedUrl;
-};
-
 // const loginUrl = (process.env.NODE_ENV === 'production') ?
 //   config.production.login_url : config.development.login_url;
 
@@ -260,25 +250,20 @@ export const getTemplateDetails = ({id, channel}) => {
   return request(url, getAPICallObject('GET'));
 };
 
-export const getAllTemplates = ({channel, queryParams = {}}) => {
-  const url = getUrlWithQueryParams({
-    url: `${API_ENDPOINT}/templates/${channel}?`,
-    queryParams,
-  });
+export const getAllTemplates = ({channel, queryParams}) => {
+  const url = `${API_ENDPOINT}/templates/${channel}?query=${encodeURIComponent(JSON.stringify(queryParams))}`;
   return request(url, getAPICallObject('GET'));
 };
 
 export const deleteTemplate = ({channel, id}) => {
+  
   const url = `${API_ENDPOINT}/templates/${id}/${channel}`;
   return request(url, getAPICallObject('DELETE'));
   //return API.deleteResource(url);
 };
 
-export const getAllAssets = ({assetType, queryParams = {}}) => {
-  const url = getUrlWithQueryParams({
-    url: `${API_ENDPOINT}/assets/${assetType}?`,
-    queryParams,
-  });
+export const getAllAssets = ({assetType, queryParams}) => {
+  const url = `${API_ENDPOINT}/assets/${assetType}?query=${JSON.stringify(queryParams)}`;
   // const url = `https://nightly.capillary.in/arya/api/v1/creatives/assets/${assetType}?query=${JSON.stringify(queryParams)}`;
   return API.get(url);
 }

package/translations/en.json

@@ -1,16 +1,4 @@
 {
-  "app.components.CapVideoUpload.dragAndDrop": "Drag and drop video here",
-  "app.components.CapVideoUpload.fileFormat": "Format: MP4",
-  "app.components.CapVideoUpload.imageReUpload": "Re upload",
-  "app.components.CapVideoUpload.or": "OR",
-  "app.components.CapVideoUpload.textMessageAddLabel": "How do you want to upload the image?",
-  "app.components.CapVideoUpload.textMessageCreateNew": "Create new",
-  "app.components.CapVideoUpload.textMessageORLabel": "OR",
-  "app.components.CapVideoUpload.textMessageSelectTemplate": "Select template",
-  "app.components.CapVideoUpload.uploadComputer": "Your computer",
-  "app.components.CapVideoUpload.videoIncorrectSize": "This file format/size is not supported.",
-  "app.components.CapVideoUpload.videoRatioDescription": "Video ratio: 9:16 to 16:9",
-  "app.components.CapVideoUpload.videoSizeDescription": "File size: Up to {size}",
   "app.components.TemplatePreview.includesOptoutTag": "Includes optout tag",
   "app.components.TemplatePreview.optoutCharactersTotal": "Includes optout tag ({optoutUrlLength} characters)",
   "creatives.components.AccessForbidden.forbiddenDesc": "This page access has not been provided to you.",
@@ -102,17 +90,6 @@
   "creatives.components.WechatRichmediaTemplatePreview.select": "Select",
   "creatives.componentsV2.BreadCrumbs.header": "This is the BreadCrumbs component !",
   "creatives.componentsV2.CallTaskPreview.header": "This is the CallTaskPreview component !",
-  "creatives.componentsV2.CapImageUpload.aspectRatio": "Aspect ratio: 1:1",
-  "creatives.componentsV2.CapImageUpload.dragAndDrop": "Drag and drop image here",
-  "creatives.componentsV2.CapImageUpload.format": "Format: JPG, PNG",
-  "creatives.componentsV2.CapImageUpload.imageDimenstionDescription": "Dimensions: {width}px x {height}px",
-  "creatives.componentsV2.CapImageUpload.imageGallery": "Gallery",
-  "creatives.componentsV2.CapImageUpload.imageIncorrectSize": "Please upload the image with correct type, size and dimension",
-  "creatives.componentsV2.CapImageUpload.imageReUpload": "Re upload",
-  "creatives.componentsV2.CapImageUpload.or": "OR",
-  "creatives.componentsV2.CapImageUpload.uploadComputer": "Your computer",
-  "creatives.componentsV2.CapImageUpload.uploadGallery": "Gallery",
-  "creatives.componentsV2.CapImageUpload.uploadImageDescription": "The relevant image that complements the message context.",
   "creatives.componentsV2.CapTagList.Cancel": "Cancel",
   "creatives.componentsV2.CapTagList.Ok": "Ok",
   "creatives.componentsV2.CapTagList.all": "All",
@@ -830,40 +807,6 @@
   "creatives.containersV2.Cap.storeCare": "Store Care",
   "creatives.containersV2.Cap.storePerformance": "Store Performance",
   "creatives.containersV2.Cap.wechat": "WeChat",
-  "creatives.containersV2.CapFacebookPreview.audienceNetworkInstreamVideo": "Audience network instream video",
-  "creatives.containersV2.CapFacebookPreview.audienceNetworkInstreamVideoMobile": "Audience network instream video mobile",
-  "creatives.containersV2.CapFacebookPreview.audienceNetworkOutstreamVideo": "Audience network outstream video",
-  "creatives.containersV2.CapFacebookPreview.audienceNetworkRewardedVideo": "Audience network rewarded video",
-  "creatives.containersV2.CapFacebookPreview.desktopFeedStandard": "Desktop feed standard",
-  "creatives.containersV2.CapFacebookPreview.facebookStoryMobile": "Facebook story mobile",
-  "creatives.containersV2.CapFacebookPreview.generatePreview": "Generate preview",
-  "creatives.containersV2.CapFacebookPreview.generatePreviewDisableToolTip": "Looks like either all the mandatory fields are not filled or there is no new change",
-  "creatives.containersV2.CapFacebookPreview.generatePreviewError": "Error in generating preview",
-  "creatives.containersV2.CapFacebookPreview.instagramExploreContextual": "Instagram explore contextual",
-  "creatives.containersV2.CapFacebookPreview.instagramExploreImmersive": "Instagram explore immersive",
-  "creatives.containersV2.CapFacebookPreview.instagramStandard": "Instagram standard",
-  "creatives.containersV2.CapFacebookPreview.instagramStory": "Instagram story",
-  "creatives.containersV2.CapFacebookPreview.instantArticleStandard": "Instant article standard",
-  "creatives.containersV2.CapFacebookPreview.instreamVideoDesktop": "Instream video desktop",
-  "creatives.containersV2.CapFacebookPreview.instreamVideoMobile": "Instream video mobile",
-  "creatives.containersV2.CapFacebookPreview.marketplaceDesktop": "Marketplace desktop",
-  "creatives.containersV2.CapFacebookPreview.marketplaceMobile": "Marketplace mobile",
-  "creatives.containersV2.CapFacebookPreview.messengerMobileInboxMedia": "Messenger mobile inbox media",
-  "creatives.containersV2.CapFacebookPreview.mobileBanner": "Mobile banner",
-  "creatives.containersV2.CapFacebookPreview.mobileFeedBasic": "Mobile feed basic",
-  "creatives.containersV2.CapFacebookPreview.mobileFeedStandard": "Mobile feed standard",
-  "creatives.containersV2.CapFacebookPreview.mobileFullwidth": "Mobile fullwidth",
-  "creatives.containersV2.CapFacebookPreview.mobileInterstitial": "Mobile interstitial",
-  "creatives.containersV2.CapFacebookPreview.mobileMediumRectangle": "Mobile medium rectangle",
-  "creatives.containersV2.CapFacebookPreview.mobileNative": "Mobile native",
-  "creatives.containersV2.CapFacebookPreview.previewAdDesc": "Please add Media, Primary text & Website link & click on “Generate preview” to view preview.",
-  "creatives.containersV2.CapFacebookPreview.previewBasedonAdPlacement": "Preview based on ad placement",
-  "creatives.containersV2.CapFacebookPreview.refreshPreview": "Refresh preview",
-  "creatives.containersV2.CapFacebookPreview.rightColumnStandard": "Right column standard",
-  "creatives.containersV2.CapFacebookPreview.suggestedVideoDesktop": "Suggested video desktop",
-  "creatives.containersV2.CapFacebookPreview.suggestedVideoMobile": "Suggested video mobile",
-  "creatives.containersV2.CapFacebookPreview.videoNotePreview": "Facebook may take time to upload the video. Please try Refreshing.",
-  "creatives.containersV2.CapFacebookPreview.watchFeedMobile": "Watch feed mobile",
   "creatives.containersV2.ChannelTemplates.header": "This is ChannelTemplates container !",
   "creatives.containersV2.Create.addLabel": "Add label",
   "creatives.containersV2.Create.alertMessage": "Alert",
@@ -1116,53 +1059,11 @@
   "creatives.containersV2.FTP.selectFtpServerDesc": "FTP not configured for this org. Please add FTP server",
   "creatives.containersV2.FTP.selectTag": "Select tag",
   "creatives.containersV2.FTP.unsupportedTagsValidationError": "Unsupported tags: {unsupportedTags}. Please remove them from this message.",
-  "creatives.containersV2.Facebook.Advertisement.AdvertisementType": "How you would like your ad to look?",
-  "creatives.containersV2.Facebook.Advertisement.addCard": "Add card",
-  "creatives.containersV2.Facebook.Advertisement.callToAction": "Call to action",
-  "creatives.containersV2.Facebook.Advertisement.callToActionMandatoryError": "call to action is mandatory for Video Media. Please select call to action",
-  "creatives.containersV2.Facebook.Advertisement.carouselDesc": "Create an Ad with 2 or more scrollable images or videos",
-  "creatives.containersV2.Facebook.Advertisement.carouselTitle": "Carousel",
-  "creatives.containersV2.Facebook.Advertisement.clickButtonLabel": "Continue",
-  "creatives.containersV2.Facebook.Advertisement.createNotification": "Facebook template created successfully",
-  "creatives.containersV2.Facebook.Advertisement.creativeName": "Creative name",
-  "creatives.containersV2.Facebook.Advertisement.creativesTemplatesEditName": "Edit name",
-  "creatives.containersV2.Facebook.Advertisement.deleteTooltipLabel": "Delete",
-  "creatives.containersV2.Facebook.Advertisement.displayLink": "Display link",
-  "creatives.containersV2.Facebook.Advertisement.displayLinkPlaceHolder": "Enter the link that you want to show on your ad",
-  "creatives.containersV2.Facebook.Advertisement.doneButtonLabel": "Done",
-  "creatives.containersV2.Facebook.Advertisement.duplicateTooltipLabel": "Duplicate",
-  "creatives.containersV2.Facebook.Advertisement.editNotification": "Facebook template updated successfully",
-  "creatives.containersV2.Facebook.Advertisement.facebookPage": "Facebook page",
-  "creatives.containersV2.Facebook.Advertisement.image": "Image",
-  "creatives.containersV2.Facebook.Advertisement.imageVideoDesc": "Create an Ad with one image or video",
-  "creatives.containersV2.Facebook.Advertisement.imageVideoTitle": "Single image or video",
-  "creatives.containersV2.Facebook.Advertisement.inValidUrliErrorMessage": "Website link is not valid",
-  "creatives.containersV2.Facebook.Advertisement.linkDesc": "Link description",
-  "creatives.containersV2.Facebook.Advertisement.linkDescPlaceHolder": "Enter the additional details",
-  "creatives.containersV2.Facebook.Advertisement.linkDescToolTip": "Description over 40 characters may be cut off.",
-  "creatives.containersV2.Facebook.Advertisement.linkHeadline": "Link headline",
-  "creatives.containersV2.Facebook.Advertisement.linkHeadlinePlaceHolder": "Enter the short headline",
-  "creatives.containersV2.Facebook.Advertisement.linkHeadlineToolTip": "Headlines over 40 characters may be cut off.",
-  "creatives.containersV2.Facebook.Advertisement.newFacebookCreatives": "New Facebook creative",
-  "creatives.containersV2.Facebook.Advertisement.optional": "(Optional)",
-  "creatives.containersV2.Facebook.Advertisement.primaryText": "Primary text",
-  "creatives.containersV2.Facebook.Advertisement.primaryTextPlaceholder": "Enter text that clearly tells people about what you are promoting",
-  "creatives.containersV2.Facebook.Advertisement.primaryTextToolTip": "Facebook recommends 125 characters or fewer.",
-  "creatives.containersV2.Facebook.Advertisement.shiftLeftTooltipLabel": "Shift Left",
-  "creatives.containersV2.Facebook.Advertisement.shiftRightTooltipLabel": "Shift Right",
-  "creatives.containersV2.Facebook.Advertisement.video_slideshow": "Video",
-  "creatives.containersV2.Facebook.Advertisement.webSiteLink": "Website link",
-  "creatives.containersV2.Facebook.Advertisement.websiteLinkPlaceHolder": "Enter the URL for the web page that you want people to visit",
-  "creatives.containersV2.Facebook.adManagerHeading": "Where do you want to create your Facebook ad creative?",
-  "creatives.containersV2.Facebook.capAdManagerHeading": "You can create Facebook ads creative in Engage+ Facebook ad Manager.",
-  "creatives.containersV2.Facebook.capFbAdManager": "Capillary Facebook ad manager",
-  "creatives.containersV2.Facebook.facebookDisableinfo": "Please integrate Facebook page ID & page name to enable this option.",
   "creatives.containersV2.Facebook.fbAccount": "Facebook Account",
   "creatives.containersV2.Facebook.fbAdCampaignSetDetailsDescription": "Once this message is approved, a campaign and an ad set will be created on Facebook Ad Manager with the same name as the current campaign and message name.",
   "creatives.containersV2.Facebook.fbAdCampaignSetDetailsTitle": "Ad campaign & ad set details",
-  "creatives.containersV2.Facebook.fbAdManager": "Facebook ad manager",
   "creatives.containersV2.Facebook.fbAdSetName": "Ad set name",
-  "creatives.containersV2.Facebook.fbAdsDescription": "Proceed with empty content block & you can create ads in Facebook Ad Manager under the  mentioned ad set.",
+  "creatives.containersV2.Facebook.fbAdsDescription": "You may create ads in Facebook Ad Manager under the below mentioned ad set. The performance of these ads will be reported here in Engage+.",
   "creatives.containersV2.Facebook.fbAdsDetailOne": "Only FB campaign & ad set creation is supported in Engage+",
   "creatives.containersV2.Facebook.fbAdsDetailThree": "You can create ads later in Facebook ad manager.",
   "creatives.containersV2.Facebook.fbAdsDetailTwo": "You can proceed with an empty content block",
@@ -1170,7 +1071,7 @@
   "creatives.containersV2.Facebook.fbAudience": "Audience",
   "creatives.containersV2.Facebook.fbCampaignName": "FB Campaign name",
   "creatives.containersV2.Facebook.fbChange": "Change",
-  "creatives.containersV2.Facebook.fbContinue": "Continue",
+  "creatives.containersV2.Facebook.fbConfirm": "Confirm",
   "creatives.containersV2.Facebook.fbMarketingObjective": "FB Marketing objective",
   "creatives.containersV2.Facebook.fbMarketingObjectiveAppInstallTitle": "App Installs",
   "creatives.containersV2.Facebook.fbMarketingObjectiveAppInstallsDescription": "Get more people to install your app.",
@@ -1579,7 +1480,6 @@
   "creatives.containersV2.Templates.newTemplate": "New template",
   "creatives.containersV2.Templates.noAccountMessage": "Please select an account to proceed",
   "creatives.containersV2.Templates.noAccountsPresent": "Push notifications are not setup for your brand",
-  "creatives.containersV2.Templates.noAccountsPresentFacebook": "Please setup the Facebook account & Facebook page to start creating content in Capillary's FB content creator.",
   "creatives.containersV2.Templates.noAccountsPresentLine": "Line accounts are not setup for your brand",
   "creatives.containersV2.Templates.noAccountsPresentViber": "Viber accounts are not setup for your brand",
   "creatives.containersV2.Templates.noAccountsPresentWeChat": "Wechat accounts are not setup for your brand",
@@ -1627,7 +1527,6 @@
   "creatives.containersV2.TemplatesV2.edit": "Edit",
   "creatives.containersV2.TemplatesV2.email": "Email",
   "creatives.containersV2.TemplatesV2.facebook": "Facebook",
-  "creatives.containersV2.TemplatesV2.facebookDisableinfo": "Please integrate Facebook page ID & page name to enable this option.",
   "creatives.containersV2.TemplatesV2.gallery": "Gallery",
   "creatives.containersV2.TemplatesV2.header": "This is TemplatesV2 container !",
   "creatives.containersV2.TemplatesV2.line": "Line",
@@ -1684,7 +1583,6 @@
   "creatives.containersV2.WeChat.wechatCreateSuccess": "WeChat template mapped successfully",
   "creatives.containersV2.WeChat.wechatEditSuccess": "WeChat template edited successfully",
   "creatives.containersV2.appName": "App Name",
-  "creatives.containersV2.applyNow": "Apply now",
   "creatives.containersV2.areYouSureText": "Are you sure?",
   "creatives.containersV2.audience": "Audience",
   "creatives.containersV2.campaignsDashboard": "Campaigns",
@@ -1692,9 +1590,7 @@
   "creatives.containersV2.cancel": "Cancel",
   "creatives.containersV2.changeOk": "Ok, change",
   "creatives.containersV2.incentive": "Incentive",
-  "creatives.containersV2.learnMore": "Learn More",
   "creatives.containersV2.newOrgName": "{newOrgName}",
-  "creatives.containersV2.noCallToAction": "No call to action",
   "creatives.containersV2.orgChangeText": "Changing from <b>{oldOrgName}</b> to <b>{newOrgName}</b> will change the organisation for applications open in other tabs as well.<br/>Do you want to make the change to <b>{newOrgName}</b>?",
   "creatives.containersV2.orgChangedText": "Organization changed to",
   "creatives.containersV2.orgRefreshHeading": "Org refresh",
@@ -1766,9 +1662,6 @@
   "creatives.containersV2.richMedia.Create.wechatTitle": "Title",
   "creatives.containersV2.richMedia.Create.wrongFormatFile": "Wrong file upoaded. Please upload image file",
   "creatives.containersV2.richMedia.Create.wrongUrl": "Enter correct URL",
-  "creatives.containersV2.shopNow": "Shop Now",
-  "creatives.containersV2.signUp": "Sign Up",
-  "creatives.containersV2.subscribe": "Subscribe",
   "creatives.containersV2.viber.addLabels": "Add labels",
   "creatives.containersV2.viber.button": "Button",
   "creatives.containersV2.viber.buttonText": "Button text",
@@ -1804,7 +1697,6 @@
   "creatives.containersV2.viber.viberCreativeTitle": "Viber creative",
   "creatives.containersV2.viber.viberEditNotification": "Viber template updated successfully",
   "creatives.containersV2.viber.viberImageIncorrectSize": "Please upload the image with correct type, size and dimension",
-  "creatives.containersV2.watchMore": "Watch More",
   "customdatepicker.cancel": "Cancel",
   "customdatepicker.done": "Done",
   "reon.components.Cap.Workbench": "WorkBench",

package/translations/zh.json

@@ -1,16 +1,4 @@
 {
-  "app.components.CapVideoUpload.dragAndDrop": "",
-  "app.components.CapVideoUpload.fileFormat": "",
-  "app.components.CapVideoUpload.imageReUpload": "",
-  "app.components.CapVideoUpload.or": "",
-  "app.components.CapVideoUpload.textMessageAddLabel": "",
-  "app.components.CapVideoUpload.textMessageCreateNew": "",
-  "app.components.CapVideoUpload.textMessageORLabel": "",
-  "app.components.CapVideoUpload.textMessageSelectTemplate": "",
-  "app.components.CapVideoUpload.uploadComputer": "",
-  "app.components.CapVideoUpload.videoIncorrectSize": "",
-  "app.components.CapVideoUpload.videoRatioDescription": "",
-  "app.components.CapVideoUpload.videoSizeDescription": "",
   "app.components.TemplatePreview.includesOptoutTag": "",
   "app.components.TemplatePreview.optoutCharactersTotal": "",
   "creatives.components.AccessForbidden.forbiddenDesc": "",
@@ -102,17 +90,6 @@
   "creatives.components.WechatRichmediaTemplatePreview.select": "",
   "creatives.componentsV2.BreadCrumbs.header": "",
   "creatives.componentsV2.CallTaskPreview.header": "",
-  "creatives.componentsV2.CapImageUpload.aspectRatio": "",
-  "creatives.componentsV2.CapImageUpload.dragAndDrop": "",
-  "creatives.componentsV2.CapImageUpload.format": "",
-  "creatives.componentsV2.CapImageUpload.imageDimenstionDescription": "",
-  "creatives.componentsV2.CapImageUpload.imageGallery": "",
-  "creatives.componentsV2.CapImageUpload.imageIncorrectSize": "",
-  "creatives.componentsV2.CapImageUpload.imageReUpload": "",
-  "creatives.componentsV2.CapImageUpload.or": "",
-  "creatives.componentsV2.CapImageUpload.uploadComputer": "",
-  "creatives.componentsV2.CapImageUpload.uploadGallery": "",
-  "creatives.componentsV2.CapImageUpload.uploadImageDescription": "",
   "creatives.componentsV2.CapTagList.Cancel": "",
   "creatives.componentsV2.CapTagList.Ok": "",
   "creatives.componentsV2.CapTagList.all": "",
@@ -830,40 +807,6 @@
   "creatives.containersV2.Cap.storeCare": "",
   "creatives.containersV2.Cap.storePerformance": "",
   "creatives.containersV2.Cap.wechat": "",
-  "creatives.containersV2.CapFacebookPreview.audienceNetworkInstreamVideo": "",
-  "creatives.containersV2.CapFacebookPreview.audienceNetworkInstreamVideoMobile": "",
-  "creatives.containersV2.CapFacebookPreview.audienceNetworkOutstreamVideo": "",
-  "creatives.containersV2.CapFacebookPreview.audienceNetworkRewardedVideo": "",
-  "creatives.containersV2.CapFacebookPreview.desktopFeedStandard": "",
-  "creatives.containersV2.CapFacebookPreview.facebookStoryMobile": "",
-  "creatives.containersV2.CapFacebookPreview.generatePreview": "",
-  "creatives.containersV2.CapFacebookPreview.generatePreviewDisableToolTip": "",
-  "creatives.containersV2.CapFacebookPreview.generatePreviewError": "",
-  "creatives.containersV2.CapFacebookPreview.instagramExploreContextual": "",
-  "creatives.containersV2.CapFacebookPreview.instagramExploreImmersive": "",
-  "creatives.containersV2.CapFacebookPreview.instagramStandard": "",
-  "creatives.containersV2.CapFacebookPreview.instagramStory": "",
-  "creatives.containersV2.CapFacebookPreview.instantArticleStandard": "",
-  "creatives.containersV2.CapFacebookPreview.instreamVideoDesktop": "",
-  "creatives.containersV2.CapFacebookPreview.instreamVideoMobile": "",
-  "creatives.containersV2.CapFacebookPreview.marketplaceDesktop": "",
-  "creatives.containersV2.CapFacebookPreview.marketplaceMobile": "",
-  "creatives.containersV2.CapFacebookPreview.messengerMobileInboxMedia": "",
-  "creatives.containersV2.CapFacebookPreview.mobileBanner": "",
-  "creatives.containersV2.CapFacebookPreview.mobileFeedBasic": "",
-  "creatives.containersV2.CapFacebookPreview.mobileFeedStandard": "",
-  "creatives.containersV2.CapFacebookPreview.mobileFullwidth": "",
-  "creatives.containersV2.CapFacebookPreview.mobileInterstitial": "",
-  "creatives.containersV2.CapFacebookPreview.mobileMediumRectangle": "",
-  "creatives.containersV2.CapFacebookPreview.mobileNative": "",
-  "creatives.containersV2.CapFacebookPreview.previewAdDesc": "",
-  "creatives.containersV2.CapFacebookPreview.previewBasedonAdPlacement": "",
-  "creatives.containersV2.CapFacebookPreview.refreshPreview": "",
-  "creatives.containersV2.CapFacebookPreview.rightColumnStandard": "",
-  "creatives.containersV2.CapFacebookPreview.suggestedVideoDesktop": "",
-  "creatives.containersV2.CapFacebookPreview.suggestedVideoMobile": "",
-  "creatives.containersV2.CapFacebookPreview.videoNotePreview": "",
-  "creatives.containersV2.CapFacebookPreview.watchFeedMobile": "",
   "creatives.containersV2.ChannelTemplates.header": "",
   "creatives.containersV2.Create.addLabel": "",
   "creatives.containersV2.Create.alertMessage": "",
@@ -1116,51 +1059,9 @@
   "creatives.containersV2.FTP.selectFtpServerDesc": "",
   "creatives.containersV2.FTP.selectTag": "",
   "creatives.containersV2.FTP.unsupportedTagsValidationError": "",
-  "creatives.containersV2.Facebook.Advertisement.AdvertisementType": "",
-  "creatives.containersV2.Facebook.Advertisement.addCard": "",
-  "creatives.containersV2.Facebook.Advertisement.callToAction": "",
-  "creatives.containersV2.Facebook.Advertisement.callToActionMandatoryError": "",
-  "creatives.containersV2.Facebook.Advertisement.carouselDesc": "",
-  "creatives.containersV2.Facebook.Advertisement.carouselTitle": "",
-  "creatives.containersV2.Facebook.Advertisement.clickButtonLabel": "",
-  "creatives.containersV2.Facebook.Advertisement.createNotification": "",
-  "creatives.containersV2.Facebook.Advertisement.creativeName": "",
-  "creatives.containersV2.Facebook.Advertisement.creativesTemplatesEditName": "",
-  "creatives.containersV2.Facebook.Advertisement.deleteTooltipLabel": "",
-  "creatives.containersV2.Facebook.Advertisement.displayLink": "",
-  "creatives.containersV2.Facebook.Advertisement.displayLinkPlaceHolder": "",
-  "creatives.containersV2.Facebook.Advertisement.doneButtonLabel": "",
-  "creatives.containersV2.Facebook.Advertisement.duplicateTooltipLabel": "",
-  "creatives.containersV2.Facebook.Advertisement.editNotification": "",
-  "creatives.containersV2.Facebook.Advertisement.facebookPage": "",
-  "creatives.containersV2.Facebook.Advertisement.image": "",
-  "creatives.containersV2.Facebook.Advertisement.imageVideoDesc": "",
-  "creatives.containersV2.Facebook.Advertisement.imageVideoTitle": "",
-  "creatives.containersV2.Facebook.Advertisement.inValidUrliErrorMessage": "",
-  "creatives.containersV2.Facebook.Advertisement.linkDesc": "",
-  "creatives.containersV2.Facebook.Advertisement.linkDescPlaceHolder": "",
-  "creatives.containersV2.Facebook.Advertisement.linkDescToolTip": "",
-  "creatives.containersV2.Facebook.Advertisement.linkHeadline": "",
-  "creatives.containersV2.Facebook.Advertisement.linkHeadlinePlaceHolder": "",
-  "creatives.containersV2.Facebook.Advertisement.linkHeadlineToolTip": "",
-  "creatives.containersV2.Facebook.Advertisement.newFacebookCreatives": "",
-  "creatives.containersV2.Facebook.Advertisement.optional": "",
-  "creatives.containersV2.Facebook.Advertisement.primaryText": "",
-  "creatives.containersV2.Facebook.Advertisement.primaryTextPlaceholder": "",
-  "creatives.containersV2.Facebook.Advertisement.primaryTextToolTip": "",
-  "creatives.containersV2.Facebook.Advertisement.shiftLeftTooltipLabel": "",
-  "creatives.containersV2.Facebook.Advertisement.shiftRightTooltipLabel": "",
-  "creatives.containersV2.Facebook.Advertisement.video_slideshow": "",
-  "creatives.containersV2.Facebook.Advertisement.webSiteLink": "",
-  "creatives.containersV2.Facebook.Advertisement.websiteLinkPlaceHolder": "",
-  "creatives.containersV2.Facebook.adManagerHeading": "",
-  "creatives.containersV2.Facebook.capAdManagerHeading": "",
-  "creatives.containersV2.Facebook.capFbAdManager": "",
-  "creatives.containersV2.Facebook.facebookDisableinfo": "",
   "creatives.containersV2.Facebook.fbAccount": "",
   "creatives.containersV2.Facebook.fbAdCampaignSetDetailsDescription": "",
   "creatives.containersV2.Facebook.fbAdCampaignSetDetailsTitle": "",
-  "creatives.containersV2.Facebook.fbAdManager": "",
   "creatives.containersV2.Facebook.fbAdSetName": "",
   "creatives.containersV2.Facebook.fbAdsDescription": "",
   "creatives.containersV2.Facebook.fbAdsDetailOne": "",
@@ -1170,7 +1071,7 @@
   "creatives.containersV2.Facebook.fbAudience": "",
   "creatives.containersV2.Facebook.fbCampaignName": "",
   "creatives.containersV2.Facebook.fbChange": "",
-  "creatives.containersV2.Facebook.fbContinue": "",
+  "creatives.containersV2.Facebook.fbConfirm": "",
   "creatives.containersV2.Facebook.fbMarketingObjective": "",
   "creatives.containersV2.Facebook.fbMarketingObjectiveAppInstallTitle": "",
   "creatives.containersV2.Facebook.fbMarketingObjectiveAppInstallsDescription": "",
@@ -1579,7 +1480,6 @@
   "creatives.containersV2.Templates.newTemplate": "",
   "creatives.containersV2.Templates.noAccountMessage": "",
   "creatives.containersV2.Templates.noAccountsPresent": "",
-  "creatives.containersV2.Templates.noAccountsPresentFacebook": "",
   "creatives.containersV2.Templates.noAccountsPresentLine": "",
   "creatives.containersV2.Templates.noAccountsPresentViber": "",
   "creatives.containersV2.Templates.noAccountsPresentWeChat": "",
@@ -1627,7 +1527,6 @@
   "creatives.containersV2.TemplatesV2.edit": "",
   "creatives.containersV2.TemplatesV2.email": "",
   "creatives.containersV2.TemplatesV2.facebook": "",
-  "creatives.containersV2.TemplatesV2.facebookDisableinfo": "",
   "creatives.containersV2.TemplatesV2.gallery": "",
   "creatives.containersV2.TemplatesV2.header": "",
   "creatives.containersV2.TemplatesV2.line": "",
@@ -1684,7 +1583,6 @@
   "creatives.containersV2.WeChat.wechatCreateSuccess": "",
   "creatives.containersV2.WeChat.wechatEditSuccess": "",
   "creatives.containersV2.appName": "",
-  "creatives.containersV2.applyNow": "",
   "creatives.containersV2.areYouSureText": "",
   "creatives.containersV2.audience": "",
   "creatives.containersV2.campaignsDashboard": "",
@@ -1692,9 +1590,7 @@
   "creatives.containersV2.cancel": "",
   "creatives.containersV2.changeOk": "",
   "creatives.containersV2.incentive": "",
-  "creatives.containersV2.learnMore": "",
   "creatives.containersV2.newOrgName": "",
-  "creatives.containersV2.noCallToAction": "",
   "creatives.containersV2.orgChangeText": "",
   "creatives.containersV2.orgChangedText": "",
   "creatives.containersV2.orgRefreshHeading": "",
@@ -1766,9 +1662,6 @@
   "creatives.containersV2.richMedia.Create.wechatTitle": "",
   "creatives.containersV2.richMedia.Create.wrongFormatFile": "",
   "creatives.containersV2.richMedia.Create.wrongUrl": "",
-  "creatives.containersV2.shopNow": "",
-  "creatives.containersV2.signUp": "",
-  "creatives.containersV2.subscribe": "",
   "creatives.containersV2.viber.addLabels": "",
   "creatives.containersV2.viber.button": "",
   "creatives.containersV2.viber.buttonText": "",
@@ -1804,7 +1697,6 @@
   "creatives.containersV2.viber.viberCreativeTitle": "",
   "creatives.containersV2.viber.viberEditNotification": "",
   "creatives.containersV2.viber.viberImageIncorrectSize": "",
-  "creatives.containersV2.watchMore": "",
   "customdatepicker.cancel": "",
   "customdatepicker.done": "",
   "reon.components.Cap.Workbench": "",

package/utils/gtmTrackers/gtmEvents/creativeDetails.js

@@ -31,12 +31,8 @@ const creativeDetails = ({
 
 const isLabelsUsed = (content = '') => {
   const tagRegex = /{{[(A-Z\w+(\s\w+)*$\(\)@!#$%^&*~.,/\\]+}}/g; // eslint-disable-line no-useless-escape
-  const isContentString= typeof content === "string";
-  if(isContentString){
-    content = content.replaceAll('{{optout}}', '');
-    content = content.replaceAll('{{unsubscribe}}', '');
-  }
-  
+  content = content.replaceAll('{{optout}}', '');
+  content = content.replaceAll('{{unsubscribe}}', '');
   const tags = [...content.matchAll(tagRegex)];
   return !!tags.length;
 };

package/utils/gtmTrackers/index.js

@@ -5,17 +5,13 @@ const gtmEvents = require.context('./gtmEvents', true, /\.js$/, 'lazy');
 export const gtmPush = (eventType, eventObject) => {
   try {
     gtmEvents(`./${eventType}.js`)
-      .then((event) => {
+      .then(event => {
         event.default(eventObject);
       })
-      .catch((err) => {
-        if (err) {
-          Bugsnag.notify(err);
-        }
+      .catch(err => {
+        Bugsnag.notify(err);
       });
   } catch (e) {
-    if (e) {
-      Bugsnag.notify(e);
-    }
+    Bugsnag.notify(e);
   }
 };

package/v2Components/CapImageUpload/index.js

@@ -85,12 +85,6 @@ function CapImageUpload(props) {
       };
       submitAction({file, type: 'image', fileParams}, incorrectFile);
     };
-    img.onerror = () => {
-      const fileParams = {
-        error: true,
-      };
-      submitAction({fileParams}, incorrectFile);
-    }
     if (e) {
       const event = e;
       event.target.value = null;
@@ -99,12 +93,13 @@ function CapImageUpload(props) {
 
   const submitAction = useCallback((data, incorrectFile) => {
     const {
-      file,
-      fileParams
-    } = data || {};
-    const { size } = file || {};
-    const { height, width, error } = fileParams || {}; 
-    if (incorrectFile || size > imgSize || height > imgHeight || width > imgWidth || error) {
+      file: {size},
+      fileParams: {
+          height,
+          width,
+      },
+    } = data;
+    if (incorrectFile || size > imgSize || height > imgHeight || width > imgWidth) {
       updateImageErrorMessage(formatMessage(messages.imageIncorrectSize));
     } else {
       updateImageErrorMessage('');
@@ -171,7 +166,6 @@ function CapImageUpload(props) {
         <CapUploader.CapDragger
           customRequest={capUploaderCustomRequest}
           className="form-builder-dragger"
-          showUploadList={!isImageError}
         >
           <CapHeading className="dragger-title" type="h7">
             <FormattedMessage {...messages.dragAndDrop} />
@@ -204,7 +198,7 @@ function CapImageUpload(props) {
         <FormattedMessage {...messages.imageReUpload} />
       </CapButton>
     );
-  }, [isImageError]);
+  }, []);
 
   return (
     <div style={style} className="cap-custom-image-upload">

package/v2Components/FormBuilder/index.js

@@ -2854,16 +2854,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     name={val.name ? val.name : `${val.id}-name`}
                     disabled={val.disabled}
                   >
-                    {val.options.map((option, index) => {
-                      const isMappedTemplateWechat = val.id === "template-redirect-options-radio";
-                      return (
-                        <CapRadio
-                          value={ isMappedTemplateWechat ? option.value : option } 
-                          inductiveText={val.inductiveText && val.inductiveText[index]}>{ isMappedTemplateWechat ? option.label : option } 
-                        </CapRadio>
-                      )
-                    }
-                    )}
+                    {val.options.map((option, index) => <CapRadio value={option} inductiveText={val.inductiveText && val.inductiveText[index]}>{option}</CapRadio>) }
 
                   </CapRadioGroup>
                   {/*{ifError ?*/}

package/v2Containers/CapFacebookPreview/constants.js

@@ -11,7 +11,3 @@ export const GENERATE_PREVIEW_FAILURE = 'app/CapFacebookPreview/GET_PREVIEW_FAIL
 
 export const CLEAR_PREVIEW = 'app/CapFacebookPreview/CLEAR_PREVIEW';
 
-export const PREVIEW_NOT_REQUESTED = "PreviewNotRequested";
-export const FETCH_PREVIEW_REQUESTED = "PreviewRequested";
-export const FETCH_PREVIEW_SUCCESS = "PreviewRequestSuccess";
-export const FETCH_PREVIEW_FAILURE = "PreviewRequestFailure";

package/v2Containers/CapFacebookPreview/index.js

@@ -30,11 +30,6 @@ import {
   CAROUSEL,
   NO_CALL_TO_ACTION,
 } from '../../v2Containers/Facebook/Advertisement/constant';
-import {
-  FETCH_PREVIEW_REQUESTED,
-  FETCH_PREVIEW_SUCCESS,
-  PREVIEW_NOT_REQUESTED,
-} from './constants';
 import './index.scss';
 
 export const CapFacebookPreview = (props) => {
@@ -60,10 +55,7 @@ export const CapFacebookPreview = (props) => {
   const [disableAfterPreviewGenerate, setDisableAfterPreviewGenerate] = useState(false);
   const [random, setRandom] = useState(0);
   const {pageAccessToken, pageId} = orgUnitFacebookPageSettingsMap;
-  const {previewIframe = "", fetchPreviewStatus = PREVIEW_NOT_REQUESTED, previewIframeError = ""} = facebookPreviewData;
-  const [previewLoaded, setPreviewLoaded] = useState(false);
-  const [isRefreshing, setIsRefreshing] = useState(false);
-  let isSpinning = false;
+  const {previewIframe = "", isFetchingPreview = false, previewIframeError = ""} = facebookPreviewData;
   const facebookAdOptions = [
     {
       value: "DESKTOP_FEED_STANDARD",
@@ -292,17 +284,9 @@ export const CapFacebookPreview = (props) => {
   };
 
   const resetIframe = () => {
-    previewLoaded && setPreviewLoaded(false);
-    !isRefreshing && setIsRefreshing(true);
     const r = random + 1;
     setRandom(r);
   };
-  const unsetLoader = () => {
-    setTimeout(function() { 
-      !previewLoaded && setPreviewLoaded(true);
-      isRefreshing && setIsRefreshing(false);
-    }.bind(this), 5000);
-  }
   const getIframe = (iframe) => {
     const divTag = document.createElement('div');
     divTag.innerHTML = iframe;
@@ -311,16 +295,13 @@ export const CapFacebookPreview = (props) => {
       <iframe
         src={src}
         key={random}
-        style={{ border: "none" }}
+        style={{border: "none"}}
         width={"600px"}
         scrolling="no"
         height={"1000px"}
         className="cap-facebook-ad-iframe"
-        onLoad={
-          unsetLoader()
-        }
       />
-    </>);
+      </>);
   };
 
   const showRefreshButton = () => {
@@ -359,80 +340,74 @@ export const CapFacebookPreview = (props) => {
     }
   }, [previewIframeError]);
   return (
-    <>
-      {isSpinning = (fetchPreviewStatus === FETCH_PREVIEW_REQUESTED) ||
-        ((fetchPreviewStatus === FETCH_PREVIEW_SUCCESS) && !previewLoaded) ||
-        isRefreshing}
-      <CapSpin
-        spinning={isSpinning}>
-        <div style={{ display: 'inline-block' }}>
-          <CapSelect
-            label={formatMessage(messages.previewBasedonAdPlacement)}
-            key={"select-previewBasedonAdPlacement"}
-            onChange={onChangeAdPreviewFormat}
-            style={{ width: '328px', paddingBottom: 16 }}
-            options={adOptions}
-            value={adPreviewFormat}
-          >
-          </CapSelect>
-        </div>
-        {!hideInfoText && <CapLabel
-          type="label1"
-          style={{ paddingBottom: 16, textAlign: 'left', width: 392 }}
+    <CapSpin spinning={isFetchingPreview}>
+      <div style={{display: 'inline-block'}}>
+        <CapSelect
+          label={formatMessage(messages.previewBasedonAdPlacement)}
+          key={"select-previewBasedonAdPlacement"}
+          onChange={onChangeAdPreviewFormat}
+          style={{width: '328px', paddingBottom: 16 }}
+          options={adOptions}
+          value={adPreviewFormat}
         >
-          {formatMessage(messages.previewAdDesc)}
-        </CapLabel>}
-        <div style={{ marginBottom: 16 }}>
-          {(disablePreviewButton || disableAfterPreviewGenerate) ?
-            <CapTooltip title={formatMessage(messages.generatePreviewDisableToolTip)}>
-              <div className="button-disabled-tooltip-wrapper">
-                <CapButton
-                  type="secondary"
-                  disabled
+        </CapSelect>
+      </div>
+      {!hideInfoText && <CapLabel
+        type="label1"
+        style={{paddingBottom: 16, textAlign: 'left', width: 392}}
                 >
-                  <FormattedMessage {...messages.generatePreview} />
-                </CapButton>
-              </div>
-            </CapTooltip> :
-            <CapButton
-              type="secondary"
-              onClick={generatePreview}
-            >
-              <FormattedMessage {...messages.generatePreview} />
-            </CapButton>}
-          {isRefreshButton && (<CapButton
-            onClick={resetIframe}
+        {formatMessage(messages.previewAdDesc)}
+      </CapLabel>}
+      <div style={{marginBottom: 16}}>
+        {(disablePreviewButton || disableAfterPreviewGenerate) ?
+          <CapTooltip title={formatMessage(messages.generatePreviewDisableToolTip)}>
+            <div className="button-disabled-tooltip-wrapper">
+              <CapButton
+                type="secondary"
+                disabled
+              >
+                <FormattedMessage {...messages.generatePreview} />
+              </CapButton>
+            </div>
+          </CapTooltip> :
+          <CapButton
             type="secondary"
-            style={{ marginLeft: 16 }}
-          >
-            {formatMessage(messages.refreshPreview)}
-          </CapButton>)}
-        </div>
-        {isRefreshButton && <div style={{ marginBottom: 16 }}>
-          <CapIcon
-            type="info"
-            svgProps={{
-              width: 16,
-              height: 16,
-            }}
+            onClick={generatePreview}
           >
-          </CapIcon>
-          <CapLabel.CapLabelInline
-            type="label1"
-            size="s"
-            style={{ marginBottom: 16, width: 392 }}
-          >
-            {formatMessage(messages.videoNotePreview)}
-          </CapLabel.CapLabelInline>
-        </div>}
-        {previewIframe === "" ? <CapImage
-          src={facebookEmptyPlaceholder}
-          alt="default"
-          width="316px"
-          height="392px"
-        /> : getIframe(previewIframe)}
-      </CapSpin>
-    </>
+            <FormattedMessage {...messages.generatePreview} />
+          </CapButton>}
+        {isRefreshButton && (<CapButton
+          onClick={resetIframe}
+          type="secondary"
+          style={{marginLeft: 16}}
+        >
+          {formatMessage(messages.refreshPreview)}
+        </CapButton>)}
+      </div>
+      {isRefreshButton && <div style={{marginBottom: 16}}>
+        <CapIcon
+          type="info"
+          svgProps={{
+            width: 16,
+            height: 16,
+          }}
+            >
+        </CapIcon>
+        <CapLabel.CapLabelInline
+          type="label1"
+          size="s"
+          style={{marginBottom: 16, width: 392}}
+                >
+          {formatMessage(messages.videoNotePreview)}
+        </CapLabel.CapLabelInline>
+      </div>}
+      {previewIframe === "" ? <CapImage
+        src={facebookEmptyPlaceholder}
+        alt="default"
+        width="316px"
+        height="392px"
+            /> : getIframe(previewIframe)}
+    </CapSpin>
   );
 };
 

package/v2Containers/CapFacebookPreview/reducer.js

@@ -6,38 +6,29 @@
 
 import { fromJS } from 'immutable';
 import get from 'lodash/get';
-import {
-  GENERATE_PREVIEW_REQUEST,
-  GENERATE_PREVIEW_SUCCESS,
-  GENERATE_PREVIEW_FAILURE,
-  CLEAR_PREVIEW,
-  FETCH_PREVIEW_REQUESTED,
-  FETCH_PREVIEW_SUCCESS,
-  FETCH_PREVIEW_FAILURE,
-  PREVIEW_NOT_REQUESTED,
-} from './constants';
+import * as types from './constants';
 
 const initialState = fromJS({
-  fetchPreviewStatus: PREVIEW_NOT_REQUESTED,
+  isFetchingPreview: false,
   previewIframe: "",
   previewIframeError: "",
 });
 
 function capFacebookPreviewReducer(state = initialState, action) {
   switch (action.type) {
-    case GENERATE_PREVIEW_REQUEST:
-      return state.set('fetchPreviewStatus', FETCH_PREVIEW_REQUESTED)
+    case types.GENERATE_PREVIEW_REQUEST:
+      return state.set('isFetchingPreview', true)
       .set('previewIframe', "")
       .set("previewIframeError", "");
-    case GENERATE_PREVIEW_SUCCESS:
-      return state.set('fetchPreviewStatus', FETCH_PREVIEW_SUCCESS)
+    case types.GENERATE_PREVIEW_SUCCESS:
+      return state.set('isFetchingPreview', false)
       .set('previewIframe', get(action, 'payload.fbPreview[0].body', ""));
-    case GENERATE_PREVIEW_FAILURE:
-      return state.set('fetchPreviewStatus', FETCH_PREVIEW_FAILURE)
+    case types.GENERATE_PREVIEW_FAILURE:
+      return state.set('isFetchingPreview', false)
       .set('previewIframe', "")
       .set("previewIframeError", get(action, 'payload.message', ""));
-    case CLEAR_PREVIEW:
-      return state.set('fetchPreviewStatus', PREVIEW_NOT_REQUESTED)
+    case types.CLEAR_PREVIEW:
+      return state.set('isFetchingPreview', false)
       .set('previewIframe', "")
       .set("previewIframeError", "");
     default:

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -578,7 +578,6 @@ function SlideBoxContent(props) {
             templateData={templateData}
             messageDetails={messageDetails}
             cap={cap}
-            createNew={onCreateNew}
             onFacebookSubmit={onFacebookSubmit}
             onCreateComplete={onCreateComplete}
             isFullMode={isFullMode}
@@ -587,7 +586,6 @@ function SlideBoxContent(props) {
             }}
             getFormSubscriptionData={getFormData}
             fbAdManager={fbAdManager}
-            onSelectTemplate={onSelectTemplate}
           />
         )
       }

package/v2Containers/CreativesContainer/index.js

@@ -91,7 +91,7 @@ class Creatives extends React.Component {
     this.setState({ slidBoxContent: 'preview', templateData });
   };
   onEditTemplate = () => {
-    this.setState({ slidBoxContent: 'editTemplate', showSlideBox: true, templateNameExists: true });
+    this.setState({ slidBoxContent: 'editTemplate', showSlideBox: true });
   };
   onCreateNew = (fbAdManager) => {
     const data = { slidBoxContent: 'createTemplate', showSlideBox: true };

package/v2Containers/Facebook/Advertisement/index.js

@@ -474,9 +474,9 @@ export const Advertisement = (props) => {
       if (webSiteLink === "" || errorMsg.websiteLinkErrorMsg ) {
         flag = true;
       }
-      if (!imageData?.imageSrc && subType === IMAGE) {
+      if (Object.keys(imageData).length === 0 && subType === IMAGE) {
         flag = true;
-      } else if (!videoData?.videoSrc && subType === VIDEO) {
+      } else if (Object.keys(videoData).length === 0 && subType === VIDEO) {
         flag = true;
       }
       subTypes.push(subType);

package/v2Containers/Facebook/Advertisement/index.scss

@@ -21,7 +21,7 @@ $classPrefix: add-facebook-ad-section;
         display: inline-block;
     }
     .cap-input-edit-name{
-        width: 319px;
+        width: 500px;
     }
     .cap-link-edit-name{
         display: inline-block;

package/v2Containers/Facebook/index.js

@@ -269,11 +269,7 @@ const Facebook = (props) => {
   ]);
   const query = {type: 'embedded', module: 'library'};
   const location = {pathname: `/FACEBOOK`, search: '', query};
-   
-  // fbAdManager ==cretaives only the case for default startegy and user selected "capillary ad manager"
-  // below condition (fbAdManager !==CREATIVE) is for edit fb ad manager from campaign
-  //-> select capillary ad manager-> select template
-  return ((showTemplateList && fbAdManager !==CREATIVE) ? (
+  return (showTemplateList ? (
     <Templates
       key={"FACEBOOK"}
       location={location}
@@ -284,18 +280,11 @@ const Facebook = (props) => {
       onSelectTemplate={onSelectTemplate}
       renderNewCardGrid={renderNewCardGrid}
       handlePeviewTemplate={handlePeviewTemplate}
-      fbAdManager={CREATIVE} // it means we are selecting capillary ad manager from campaign
+      fbAdManager={CREATIVE}
     />
   ) :
-    (!isFullMode && ((fbAdManager !== CREATIVE && messageStrategy === "DEFAULT") 
-    || (templateData?.edit && templateData?.fbContentType !==CREATIVE && fbAdManager !== CREATIVE )) ) ?
-
-    // not fullmode + 
-    // default strtaegy and not selected "capillary ad manager" from campaign message + 
-    //edit template && not coming from campaign message where user selected "capillary ad manager" (means  edit "fb ad manager" from campaign) &&
-    // & also we are not selecting capillary ad manager from campaign
-
-    (<div className={className}>
+    (!isFullMode && (fbAdManager !== CREATIVE && messageStrategy === "DEFAULT" || (templateData?.edit && templateData?.fbContentType !==CREATIVE)) ) ?
+      (<div className={className}>
 
         <div className="is-scrollable-section" >
           <div className="account-details-wrapper">

package/v2Containers/MobilePush/Edit/index.js

@@ -346,7 +346,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       });
     } else {
       selectedAccount = accounts[0];
-      formData['mobilepush-accounts'] = selectedAccount?.id;
+      formData['mobilepush-accounts'] = accounts[0].id;
     }
     this.props.actions.setWeChatAccount(selectedAccount);
     this.setState({formData, accountsOptions: accounts.map((acc) => ({key: acc.id, label: acc.name, value: acc.id}))});
@@ -361,7 +361,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     obj.type = 'MOBILEPUSH';
     obj.name = formData['template-name'];
     obj.definition = {
-      accountId: selectedWeChatAccount?.id,
+      accountId: selectedWeChatAccount.id,
       licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
     };
     if (this.props.location.query && this.props.location.query.module !== 'dvs') {

package/v2Containers/MobilepushWrapper/index.js

@@ -45,7 +45,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
       },
       {
         title: <FormattedMessage {...messages.text}/>,
-        content: <WithNoImage height="216px" width={"224px"}/>,
+        content: <WithNoImage height="124px" width={"224px"}/>,
         value: 'text',
         // onClick: () => {
         //   this.emailUploader.current.click();

package/v2Containers/Templates/_templates.scss

@@ -32,7 +32,8 @@
         padding: $CAP_SPACE_16 $CAP_SPACE_12;
     
         .ant-card-meta-description {
-          height: 222px;
+          height: 250px;
+          word-wrap: break-word;
         }
       }
 
@@ -40,9 +41,6 @@
         .ant-card-body {
           padding: $CAP_SPACE_24 0;
         }
-        .ant-card-meta-description {
-          height: 250px;
-        }
         .ant-card-meta {
           padding: 0;
         }

package/v2Containers/Templates/index.js

@@ -1418,11 +1418,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       }
     }
     if (this.isEnabledInLibraryModule("callSelectFromProps")) {
-      let data =id;
-      if(this.props.fbAdManager){
-        data = this.selectTemplate(id) 
-      }
-      this.props.onSelectTemplate(data, this.props.fbAdManager);
+      this.props.onSelectTemplate(this.selectTemplate(id), this.props.fbAdManager);
     } else {
       timeTracker.startTimer(CHANNEL_EDIT_TRACK_MAPPING[this.state.channel.toLowerCase()]);
       if (this.state.channel.toLowerCase() === 'ebill') {
@@ -1437,6 +1433,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
 
   selectTemplate = (id) => find(this.props.TemplatesList, {_id: id})
 
+
   handlePreviewClick(template, modeType) {
     this.togglePreview();
     const templateInfo = cloneDeep(template);

package/v2Containers/TemplatesV2/index.js

@@ -158,11 +158,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
   );
 
   getFacebookComponent = () => {
-    const { messageDetails, cap, onFacebookSubmit, 
-      messageStrategy,
-      showDisabledFBInfo, 
-      orgUnitId,
-      onSelectTemplate } = this.props;
+    const { messageDetails, cap, onFacebookSubmit, messageStrategy, showDisabledFBInfo, orgUnitId } = this.props;
     return (
       <Facebook
         {...this.props}
@@ -172,7 +168,6 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
         messageStrategy={messageStrategy}
         showDisabledFBInfo={showDisabledFBInfo}
         orgUnitId={orgUnitId}
-        onSelectTemplate={onSelectTemplate}
       />
     );
   }
@@ -225,7 +220,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
           router={this.props.router}
           isFullMode={this.props.isFullMode}
           createNew={this.props.createNew}
-          onSelectTemplate={(id) => this.props.onSelectTemplate(this.selectTemplate(id))}
+          onSelectTemplate={this.props.onSelectTemplate}
           renderNewCardGrid={this.getTemplateDataForGrid}
           handlePeviewTemplate={this.props.handlePeviewTemplate}
           messageStrategy={this.props.messageStrategy}

package/v2Containers/WeChat/MapTemplates/index.js

@@ -666,16 +666,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
               type: "radioGroup",
               metaType: "text",
               datatype: "string",
-              options: [
-                {
-                  value: URL,
-                  label: intl.formatMessage(messages.redirectOptionURL)
-                }, 
-                {
-                  value: MINI_PROGRAM,
-                  label: intl.formatMessage(messages.redirectOptionMiniProgram)
-                }
-              ],
+              options: [intl.formatMessage(messages.redirectOptionURL), intl.formatMessage(messages.redirectOptionMiniProgram)],
               errorMessage: intl.formatMessage(messages.redirectionOptionError),
               required: true,
               fluid: true,
@@ -773,8 +764,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       if (!isEmpty(weCrmAccounts)) {
         forEach(weCrmAccounts, (account) => {
           if (account.configs && account.configs.is_wecrm_enabled) {
-            const options = schema?.standalone?.sections[0]?.childSections[1]?.childSections[0]?.childSections[0]?.inputFields[0]?.options;
-            options && options.push({
+            schema.standalone.sections[0].childSections[1].childSections[0].childSections[0].inputFields[0].options.push({
               key: account.uuid,
               label: account.name,
               value: account.name,