@capillarytech/creatives-library 7.7.10 → 7.7.12

package/index.js

@@ -76,8 +76,8 @@ import viberSaga from './v2Containers/Viber/sagas';
 import TemplatesV2 from './v2Containers/TemplatesV2/index';
 
 import FacebookPreview from './v2Containers/CapFacebookPreview';
-import facebookPreviewReducer from './v2Containers/CapFacebookPreview/reducer';
-import facebookPreviewSaga from './v2Containers/CapFacebookPreview/sagas';
+import FacebookPreviewReducer from './v2Containers/CapFacebookPreview/reducer';
+import FacebookPreviewSaga from './v2Containers/CapFacebookPreview/sagas';
 
 import CreativesContainer from './v2Containers/CreativesContainer';
 import CreativesContainerReducer from './v2Containers/CreativesContainer/reducer';
@@ -105,7 +105,7 @@ const LineCreateContainer = {LineCreate, lineCreateReducer, lineCreateSaga};
 const TemplatesV2Container = {TemplatesV2, templateReducer, templateSaga};
 const FacebookContainer = {Facebook, facebookReducer, facebookSaga};
 const ViberContainer = {Viber, viberReducer, viberSaga};
-const FacebookPreviewContainer = { FacebookPreview, facebookPreviewReducer, facebookPreviewSaga };
+const FacebookPreviewContainer = { FacebookPreview, FacebookPreviewReducer, FacebookPreviewSaga };
 
 const GalleryContainer = {Gallery, galleryReducer, gallerySagas};
 const FTPContainer = {FTP, FTPReducer, FTPSagas};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.7.10",
+  "version": "7.7.12",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -19,8 +19,6 @@
     "@mailupinc/bee-plugin": "^1.2.0",
     "babel-cli": "^6.26.0",
     "chalk": "1.1.3",
-    "flow": "^0.2.3",
-    "git": "^0.1.5",
     "jquery": "^3.3.1",
     "load-script": "^1.0.0",
     "normalizr": "^3.2.3",

package/v2Components/TemplatePreview/index.js

@@ -651,7 +651,6 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                     pageId: content.pageId}}
                   accountId={content.accountId}
                   accessToken={content.accessToken}
-                  defaultGeneratePreview
               />
               </div>
         )}

package/v2Containers/CapFacebookPreview/index.js

@@ -30,7 +30,7 @@ import {
   CAROUSEL,
   NO_CALL_TO_ACTION,
 } from '../../v2Containers/Facebook/Advertisement/constant';
-import './index.scss';
+
 
 export const CapFacebookPreview = (props) => {
   const {
@@ -45,8 +45,6 @@ export const CapFacebookPreview = (props) => {
     orgUnitFacebookPageSettingsMap = {},
     accessToken,
     accountId,
-    defaultGeneratePreview,
-    hideInfoText = false,
   } = props;
   const {
     formatMessage,
@@ -200,7 +198,6 @@ export const CapFacebookPreview = (props) => {
         ad_format: adPreviewFormat,
       },
     };
-    const { webSiteLink= "" } = (previewData || [] )[0] || {};
     if (selectedAd !== CAROUSEL) {
       const {
          imageData = {},
@@ -275,7 +272,6 @@ export const CapFacebookPreview = (props) => {
           message: primaryText,
           child_attachments: childData,
           multi_share_end_card: false,
-          "link":webSiteLink,
         },
       };
       facebookPreviewActions.getPreview(data);
@@ -287,19 +283,22 @@ export const CapFacebookPreview = (props) => {
     const r = random + 1;
     setRandom(r);
   };
+
   const getIframe = (iframe) => {
     const divTag = document.createElement('div');
     divTag.innerHTML = iframe;
     const src = divTag.getElementsByTagName('iframe')[0].getAttribute('src');
+    const width = divTag.getElementsByTagName('iframe')[0].getAttribute('width');
+    const height = divTag.getElementsByTagName('iframe')[0].getAttribute('height');
     return (<>
       <iframe
         src={src}
         key={random}
+        scrolling="yes"
         style={{border: "none"}}
-        width={"600px"}
-        scrolling="no"
-        height={"1000px"}
-        className="cap-facebook-ad-iframe"
+        width={width}
+        height={height}
+        loading="lazy"
       />
       </>);
   };
@@ -318,9 +317,6 @@ export const CapFacebookPreview = (props) => {
 
   useEffect(() => {
     facebookPreviewActions.clearPreview();
-    if (defaultGeneratePreview) {
-      generatePreview();
-    }
   }, []);
 
   useEffect(() => {
@@ -339,6 +335,7 @@ export const CapFacebookPreview = (props) => {
       setDisableAfterPreviewGenerate(false);
     }
   }, [previewIframeError]);
+
   return (
     <CapSpin spinning={isFetchingPreview}>
       <div style={{display: 'inline-block'}}>
@@ -352,12 +349,12 @@ export const CapFacebookPreview = (props) => {
         >
         </CapSelect>
       </div>
-      {!hideInfoText && <CapLabel
+      <CapLabel
         type="label1"
         style={{paddingBottom: 16, textAlign: 'left', width: 392}}
                 >
         {formatMessage(messages.previewAdDesc)}
-      </CapLabel>}
+      </CapLabel>
       <div style={{marginBottom: 16}}>
         {(disablePreviewButton || disableAfterPreviewGenerate) ?
           <CapTooltip title={formatMessage(messages.generatePreviewDisableToolTip)}>
@@ -423,7 +420,6 @@ CapFacebookPreview.propTypes = {
   orgUnitFacebookPageSettingsMap: PropTypes.object,
   accessToken: PropTypes.string,
   accountId: PropTypes.string,
-  hideInfoText:PropTypes.any,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/CapFacebookPreview/messages.js

@@ -73,7 +73,7 @@ export default defineMessages({
   },
   instagramStandard: {
     id: `${messagePrefix}.instagramStandard`,
-    defaultMessage: 'Instagram standard',
+    defaultMessage: 'instagram_standard',
   },
   instagramStory: {
     id: `${messagePrefix}.instagramStory`,
@@ -81,7 +81,7 @@ export default defineMessages({
   },
   instagramExploreContextual: {
     id: `${messagePrefix}.instagramExploreContextual`,
-    defaultMessage: 'Instagram explore contextual',
+    defaultMessage: 'instagram_explore_contextual',
   },
   instagramExploreImmersive: {
     id: `${messagePrefix}.instagramExploreImmersive`,

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -137,10 +137,6 @@ function SlideBoxContent(props) {
       handleClose,
       onFTPSubmit,
       campaignSettings,
-      messageStrategy,
-      fbAdManager,
-      showDisabledFBInfo,
-      orgUnitId,
     } = 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};
@@ -338,9 +334,6 @@ function SlideBoxContent(props) {
         slidBoxContent={slidBoxContent}
         FTPMode="create"
         selectedOfferDetails={selectedOfferDetails}
-        messageStrategy={messageStrategy}
-        showDisabledFBInfo={showDisabledFBInfo}
-        orgUnitId={orgUnitId}
         />
       )}
       {isPreview && (
@@ -565,10 +558,7 @@ function SlideBoxContent(props) {
             isFullMode={isFullMode}
             createNew
             getFormSubscriptionData={getFormData}
-            messageStrategy={messageStrategy}
-            fbAdManager={fbAdManager}
-            onSelectTemplate={onSelectTemplate}
-            orgUnitId={orgUnitId}
+
           />
         )
       }
@@ -585,7 +575,6 @@ function SlideBoxContent(props) {
               id: templateData._id,
             }}
             getFormSubscriptionData={getFormData}
-            fbAdManager={fbAdManager}
           />
         )
       }
@@ -698,9 +687,5 @@ SlideBoxContent.propTypes = {
   saveMessage: PropTypes.func,
   selectedAccount: PropTypes.object,
   onFTPSubmit: PropTypes.func,
-  messageStrategy: PropTypes.string,
-  fbAdManager: PropTypes.string,
-  showDisabledFBInfo: PropTypes.boolean,
-  orgUnitId: PropTypes.any,
 };
 export default SlideBoxContent;

package/v2Containers/CreativesContainer/index.js

@@ -25,9 +25,6 @@ import {isLoading as isLoadingSelector} from './selectors';
 import messages from './messages';
 import { MAP_TEMPLATE } from '../WeChat/Wrapper/constants';
 import { makeSelectFetchingCmsData } from '../Email/selectors';
-import {IMAGE, VIDEO } from '../Facebook/Advertisement/constant';
-import { CREATIVE } from '../Facebook/constants';
-
 
 const classPrefix = 'add-creatives-section';
 
@@ -54,6 +51,7 @@ class Creatives extends React.Component {
       currentChannel: this.props.channel || 'sms',
       weChatTemplateType: '',
       weChatMaptemplateStep: 0,
+
     };
     this.creativesTemplateSteps = {
       1: 'modeSelection',
@@ -76,12 +74,8 @@ class Creatives extends React.Component {
     this.setState({templateNameExists: false});
   }
 
-  onSelectTemplate = (template, fbAdManager) => {
-    const data = {slidBoxContent: 'editTemplate', templateData: template};
-    if (fbAdManager) {
-      data.fbAdManager = fbAdManager;
-    }
-    this.setState(data);
+  onSelectTemplate = (template) => {
+    this.setState({ slidBoxContent: 'editTemplate', templateData: template });
   };
   onPreviewTemplate = (template) => {
     const templateData = template;
@@ -93,12 +87,8 @@ class Creatives extends React.Component {
   onEditTemplate = () => {
     this.setState({ slidBoxContent: 'editTemplate', showSlideBox: true });
   };
-  onCreateNew = (fbAdManager) => {
-    const data = { slidBoxContent: 'createTemplate', showSlideBox: true };
-    if (fbAdManager) {
-      data.fbAdManager = fbAdManager;
-    }
-    this.setState(data);
+  onCreateNew = () => {
+    this.setState({ slidBoxContent: 'createTemplate', showSlideBox: true });
   };
 
   onShowTemplates = () => {
@@ -230,64 +220,11 @@ class Creatives extends React.Component {
           break;
         }
         case constants.FACEBOOK: {
-          if (templateData.fbContentType === CREATIVE) {
-            const {
-              creativeType = "",
-              selectedFacebookAccount = {},
-              facebookCreativeList: fbCreativeList = [],
-              fbContentType,
-            } = templateData || {};
-            const fBContent = fbCreativeList;
-            const facebookCreativeList = [];
-            fBContent.forEach((obj) => {
-              const data = cloneDeep(obj);
-              const {subType, linkDescription, imageLink, websiteLink, videoId, videoName, videoUrl} = obj || {};
-              delete data.linkDescription;
-              delete data.websiteLink;
-              data.linkDesc = linkDescription;
-              data.webSiteLink = websiteLink;
-              data.type = creativeType;
-              switch (subType) {
-                case IMAGE:
-                  data.imgSrc = imageLink;
-                  delete data.imageLink;
-                  break;
-                case VIDEO:
-                  data.video = {
-                    previewImageUrl: imageLink,
-                    videoId,
-                    videoSrc: videoUrl,
-                    videoName,
-                  };
-                  delete data.imageLink;
-                  break;
-                default:
-                  break;
-              }
-              facebookCreativeList.push(data);
-            });
-            creativesTemplateData = {
-              versions: {
-                base: {
-                  content: {
-                    FacebookAd: {...facebookCreativeList},
-                    pageOrgUnitId: this.props.orgUnitId,
-                  },
-                },
-              },
-              type: constants.FACEBOOK,
-              edit: true,
-              selectedFacebookAccount,
-              fbContentType
-            };
-          } else {
-            creativesTemplateData = {
-              selectedMarketingObjective: templateData.selectedMarketingObjective,
-              edit: true,
-              type: channel,
-              fbContentType: templateData.fbContentType
-            };
-          }
+          creativesTemplateData = {
+            selectedMarketingObjective: templateData.selectedMarketingObjective,
+            edit: true,
+            type: channel,
+          };
           break;
         }
         case constants.LINE: {
@@ -439,50 +376,6 @@ class Creatives extends React.Component {
           };
         }
         break;
-      case constants.FACEBOOK: {
-        if (template.value) {
-          const FacebookAd = template?.value?.versions?.base?.content?.FacebookAd;
-          const type = FacebookAd[0].type;
-          const {accountId} = this.props.Templates.selectedFacebookAccount || template.value || {};
-          const facebookCreativeList = [];
-          const fBContent = Object.values(FacebookAd);
-          fBContent.forEach((obj) => {
-            const data = cloneDeep(obj);
-            const {subType, linkDesc, imgSrc, webSiteLink, video} = obj;
-            delete data.type;
-            delete data.linkDesc;
-            delete data.webSiteLink;
-            data.linkDescription = linkDesc;
-            data.websiteLink = webSiteLink;
-
-            switch (subType) {
-              case IMAGE:
-                data.imageLink = imgSrc;
-                delete data.imgSrc;
-                break;
-              case VIDEO:
-                data.imageLink = video.previewImageUrl;
-                data.videoId = video.videoId;
-                data.videoUrl = video.videoSrc;
-                data.videoName = video.videoName;
-                delete data.video;
-                break;
-              default:
-                break;
-            }
-            facebookCreativeList.push(data);
-          });
-          templateData = {
-            fbContentType: CREATIVE,
-            creativeType: type,
-            facebookCreativeList,
-            channel: constants.FACEBOOK,
-            accountId,
-            selectedMarketingObjective: template.value.selectedMarketingObjective,
-          };
-        }
-      }
-        break;
       default:
         break;
     }
@@ -685,8 +578,8 @@ class Creatives extends React.Component {
     return false;
   }
   shouldShowHeader = () => {
-    const {currentChannel, slidBoxContent} = this.state;
-    if (currentChannel.toUpperCase() === constants.FACEBOOK && slidBoxContent === 'createTemplate') {
+    const {currentChannel} = this.state;
+    if (currentChannel === constants.FACEBOOK) {
       return false;
     }
     return true;
@@ -729,7 +622,6 @@ class Creatives extends React.Component {
               campaignSettings={this.props.Templates.campaignSettings}
               location={this.props.location}
               messageDetails={this.props.messageDetails}
-              showDisabledFBInfo={this.props.showDisabledFBInfo}
               getFormData={this.getFormData}
               onCallTaskSubmit={this.onCallTaskSubmit}
               onCreateNew={this.onCreateNew}
@@ -745,7 +637,6 @@ class Creatives extends React.Component {
               onEnterTemplateName={this.onEnterTemplateName}
               onRemoveTemplateName={this.onRemoveTemplateName}
               onResetStep={this.resetStep}
-              fbAdManager={this.state.fbAdManager}
               cap={cap}
               setIsLoadingContent={this.setIsLoadingContent}
               onMobilepushModeChange={this.onMobilepushModeChange}
@@ -770,8 +661,6 @@ class Creatives extends React.Component {
               handleClose={this.handleCloseSlideBox}
               onFTPSubmit={getCreativesData}
               editor={editor}
-              messageStrategy={this.props.strategy}
-              orgUnitId={this.props.orgUnitId}
           />
           }
           footer={this.shouldShowFooter() &&
@@ -824,8 +713,6 @@ Creatives.propTypes = {
   selectedWeChatAccount: PropTypes.object,
   Templates: PropTypes.object,
   selectedAccount: PropTypes.object,
-  strategy: PropTypes.string,
-  orgUnitId: PropTypes.number,
 };
 const mapStatesToProps = () => createStructuredSelector({
   isLoading: isLoadingSelector(),

package/v2Containers/Facebook/Advertisement/index.js

@@ -84,12 +84,10 @@ export const Advertisement = (props) => {
     actions,
     fbADData = {},
     onCreateComplete,
-    templateData = {},
+    templateData,
     params,
     getFormSubscriptionData,
     facebookTemplateData,
-    selectedMarketingObjective,
-    orgUnitId,
   } = props;
   const {
     formatMessage,
@@ -132,7 +130,7 @@ export const Advertisement = (props) => {
         orgUnitFacebookPageSettingsMap = {},
         employeeAccessToken: accessToken = "",
         accountId = "",
-       } = selectedFacebookAccount || {};
+       } = selectedFacebookAccount;
       const { pageAccessToken, pageId: pId } = orgUnitFacebookPageSettingsMap[pageId] || {};
       videoData = {
         accessToken,
@@ -162,7 +160,7 @@ export const Advertisement = (props) => {
   }, [paramObj.id]);
 
   useEffect(() => {
-    if (params?.id || templateData?.edit) {
+    if ((params && params.id) || (templateData || {}).edit) {
       const { FacebookAd = [], pageOrgUnitId: editPageId} = get(templateData, `versions.base.content`) || get(fbADData, `templateDetails.versions.base.content`) || {};
       const editMessageTitle = (templateData || {}).name || get(fbADData, 'templateDetails.name');
       const editFBContent = Object.values(FacebookAd);
@@ -221,7 +219,6 @@ export const Advertisement = (props) => {
     }
   }, [fbADData[`templateDetails`] || templateData]);
 
-
   const CustomToolTip = useCallback((msg) => <CapTooltipWithInfo
     infoIconProps={{svgProps: {width: 12, height: 12}, style: {marginLeft: 5}}}
     title={msg}
@@ -354,7 +351,8 @@ export const Advertisement = (props) => {
       }
       messageData.push(data);
     });
-    let finalResponse = {
+
+    return {
       versions: {
         base: {
           content: {
@@ -366,17 +364,12 @@ export const Advertisement = (props) => {
       type: "FACEBOOK",
       name: messageTitle,
     };
-    if (!isFullMode) {
-      finalResponse = {...finalResponse, selectedMarketingObjective, accountId};
-    }
-    return finalResponse;
   }, [carouselData,
     pageId,
     messageTitle,
     primaryText,
     callToAction,
-    displayLink,
-    selectedMarketingObjective]);
+    displayLink]);
 
   const onCreateFacebookAd = useCallback( () => {
     actions.createTemplate(
@@ -452,7 +445,6 @@ export const Advertisement = (props) => {
     updateMessageTitle(val);
   }, [messageTitle]);
 
-
   const isDisableDone = useCallback((isPreview) => {
     let flag = false;
     if (primaryText === "" ) {
@@ -502,7 +494,8 @@ export const Advertisement = (props) => {
     selectedAd,
   ]
 );
-  const isDisableContinue = () => isFullMode ? (messageTitle.trim() === "" || selectedAd === "") : ( selectedAd === "");
+
+  const isDisableContinue = () => messageTitle.trim() === "" || selectedAd === "";
 
   const onClickContinue = useCallback(() => { updateStep('createFacebookAd'); }, [step]);
 
@@ -811,37 +804,20 @@ export const Advertisement = (props) => {
     setPageId(value);
   }, [pageId]);
 
-  const selectedFacebookAccount = templateData?.edit ? templateData?.selectedFacebookAccount : facebookTemplateData?.selectedFacebookAccount;
-  const {orgUnitFacebookPageSettingsMap = {}, employeeAccessToken: accessToken = "", accountId = "" } = selectedFacebookAccount || {};
+  const selectedFacebookAccount = get(facebookTemplateData, 'selectedFacebookAccount', {});
+  const {orgUnitFacebookPageSettingsMap = {}, employeeAccessToken: accessToken = "", accountId = "" } = selectedFacebookAccount;
 
-  const getOrgName =()=>{
+  const getPageAccessOrgs = useCallback(() => {
+    const {status, data } = fbADData.orgOuData || {};
+    const pageAccessOrgsOptions = [];
     const { proxyOrgList } = JSON.parse(window.localStorage.getItem('user'));
     const orgId = window.localStorage.getItem('orgID');
     const orgName = (
       proxyOrgList.find(({ orgID }) => orgID === Number(orgId)) || {}
     ).orgName;
-    return orgName;
-  }
-  const getPageAccessOrgs = useCallback(() => {
-    const {status, data } = fbADData.orgOuData || {};
-    const pageAccessOrgsOptions = [];
-    const orgName = getOrgName()
-    if (!status) {
-      // !status is the case of library
-      //if org id is the parent org
-      if (orgUnitFacebookPageSettingsMap[-1] && !pageId) {
-        setPageId(-1);
-      }
-      if (orgUnitFacebookPageSettingsMap[-1]) {
-        pageAccessOrgsOptions.push({label: orgName, value: -1});
-      }
-      // if we are coming from default startegy and calling templates from facebook/index.js
-      if (!pageId && orgUnitId && orgUnitFacebookPageSettingsMap[orgUnitId]) {
-        setPageId(orgUnitId);
-      }
-    } else if (status === 'SUCCESS') {
+    if (status === 'SUCCESS') {
       Object.keys(data).forEach((obj) => {
-        if ((orgUnitFacebookPageSettingsMap[data[obj]] || {}).pageAccessToken && data[obj]!== -1) {
+        if ((orgUnitFacebookPageSettingsMap[data[obj]] || {}).pageAccessToken) {
           pageAccessOrgsOptions.push({label: obj, value: data[obj]});
         }
       });
@@ -859,12 +835,8 @@ export const Advertisement = (props) => {
 
   const options = getPageAccessOrgs() || [];
   const { data = {} } = fbADData.orgOuData || {};
-  const orgName = getOrgName()
-  let selectedPageName = Object.keys(data).find((key) => data[key] === pageId);
-  if(data[selectedPageName] === -1){
-    selectedPageName = orgName;
-  }
-  return ( (step === 'modeSelection' && (isEmpty(templateData) || templateData?.mode === "create")) ?
+  const selectedPageName = Object.keys(data).find((key) => data[key] === pageId);
+  return ( (step === 'modeSelection') ?
        ( <CapSpin spinning={adSpinLoader} className="add-facebook-ad-section">
          <div style={{ position: 'fixed', top: '25px', zIndex: 1}}>
            <CapHeader
@@ -873,27 +845,25 @@ export const Advertisement = (props) => {
              className={"cap-header-facebook-ad"}
             />
          </div>
-         {isFullMode &&  <>
-           <CapInput
-             id={`fbAd_input`}
-             onChange={onTextTitleChange}
-             className="text-template-title"
-             defaultValue={messageTitle || ''}
-             value={messageTitle || ''}
-             style={{marginBottom: 27, width: '762px'}}
-             size="default"
-             label={formatMessage(messages.creativeName)}
-              />
-           <CapSelect
-             label={formatMessage(messages.facebookPage)}
-             key={"select-facebook-page"}
-             onChange={onChangeFacebookPage}
-             options={options}
-             defaultValue={(options[0] || {} ).value}
-             value={pageId || (options[0] || {} ).value}
-             style={{marginBottom: 27, width: '372px'}}
-          ></CapSelect>
-        </>}
+         <CapInput
+           id={`fbAd_input`}
+           onChange={onTextTitleChange}
+           className="text-template-title"
+           defaultValue={messageTitle || ''}
+           value={messageTitle || ''}
+           style={{marginBottom: 27, width: '762px'}}
+           size="default"
+           label={formatMessage(messages.creativeName)}
+            />
+         {isFullMode && <CapSelect
+           label={formatMessage(messages.facebookPage)}
+           key={"select-facebook-page"}
+           onChange={onChangeFacebookPage}
+           options={options}
+           defaultValue={(options[0] || {} ).value}
+           value={pageId || (options[0] || {} ).value}
+           style={{marginBottom: 27, width: '372px'}}
+        ></CapSelect>}
          <CapHeading
            type="h4"
            style={{marginBottom: 11}}
@@ -917,17 +887,8 @@ export const Advertisement = (props) => {
          </FbAdFooter>
        </CapSpin> ) : (
          <CapSpin spinning={spinLoader}>
-           {!isFullMode && isEmpty(templateData) && <div style={{ position: 'fixed', top: '25px', zIndex: 1}}>
-             <CapHeader
-               inline
-               title={formatMessage(messages.newFacebookCreatives)}
-               className={"cap-header-facebook-ad"}
-            />
-           </div>}
-           <div className="add-facebook-ad-section">
-           <CapRow  >
-             <CapColumn span={12}>
-             {isFullMode && <>
+           <CapRow className="add-facebook-ad-section" >
+             <div className="cap-header-facebook-ad">
                <CapHeading
                  type="h2"
                  className="truncate-text"
@@ -945,7 +906,8 @@ export const Advertisement = (props) => {
                  title={<FormattedMessage {...messages.creativesTemplatesEditName}/>}
                  onClick={onClickEditName}
                   />}
-             </>}
+             </div>
+             <CapColumn span={12}>
                {isFullMode && <><CapHeading
                  type="h4"
                  style={{marginBottom: 4}}
@@ -996,7 +958,6 @@ export const Advertisement = (props) => {
                   />
              </CapColumn>
            </CapRow>
-           </div>
            <FbAdFooter>
              <CapButton
                onClick={onDoneCallback()}
@@ -1020,8 +981,8 @@ Advertisement.propTypes = {
   facebookTemplateData: PropTypes.object,
   templateData: PropTypes.object,
   params: PropTypes.object,
-  selectedMarketingObjective: PropTypes.any,
 
 };
 
 export default injectIntl(Advertisement);
+