@capillarytech/creatives-library 2.0.95 → 2.0.97

package/v2Containers/MobilePush/Create/messages.js

@@ -8,7 +8,7 @@ import { defineMessages } from 'react-intl';
 export default defineMessages({
   "imageUploadLabel": {
     id: 'app.containers.MobilePush.Create.ImageUploadLabel',
-    defaultMessage: 'Upload Image',
+    defaultMessage: 'Upload image',
   },
   "Enter template name*": {
     id: 'app.containers.MobilePush.Create.enterTemplateNameImportant',
@@ -24,7 +24,7 @@ export default defineMessages({
   },
   "Discard Changes": {
     id: 'app.containers.MobilePush.Create.discardChanges',
-    defaultMessage: 'Discard Changes',
+    defaultMessage: 'Discard changes',
   },
   "Cancel": {
     id: 'app.containers.MobilePush.Create.cancel',
@@ -36,15 +36,15 @@ export default defineMessages({
   },
   "Select Mobilepush Account": {
     id: 'app.containers.MobilePush.Create.selectMobilePushAccount',
-    defaultMessage: 'Select Mobilepush Account',
+    defaultMessage: 'Select mobilepush account',
   },
   "Account Id": {
     id: 'app.containers.MobilePush.Create.accountId',
-    defaultMessage: 'Account Id',
+    defaultMessage: 'Account id',
   },
   "Select Mobilepush Template": {
     id: 'app.containers.MobilePush.Create.selectMobilePushTemplate',
-    defaultMessage: 'Select Mobilepush Template',
+    defaultMessage: 'Select mobilepush template',
   },
   "Template": {
     id: 'app.containers.MobilePush.Create.template',
@@ -56,7 +56,7 @@ export default defineMessages({
   },
   "Copy Title and Content From IOS": {
     id: 'app.containers.MobilePush.Create.copyFromIos',
-    defaultMessage: 'Copy Title and Content From IOS',
+    defaultMessage: 'Copy title and content from IOS',
   },
   "Title*": {
     id: 'app.containers.MobilePush.Create.titleLabel',
@@ -92,11 +92,11 @@ export default defineMessages({
   },
   "Add Primary CTA": {
     id: 'app.containers.MobilePush.Create.addPrimaryCTA',
-    defaultMessage: 'Add Primary CTA',
+    defaultMessage: 'Add primary CTA',
   },
   "Add Secondary CTA": {
     id: 'app.containers.MobilePush.Create.addSecondaryCTA',
-    defaultMessage: 'Add Secondary CTA',
+    defaultMessage: 'Add secondary CTA',
   },
   "iOS": {
     id: 'app.containers.MobilePush.Create.iOS',
@@ -104,7 +104,7 @@ export default defineMessages({
   },
   "Copy Title and Content From Android": {
     id: 'app.containers.MobilePush.Create.copyFromAndroid',
-    defaultMessage: 'Copy Title and Content From Android',
+    defaultMessage: 'Copy title and content from android',
   },
   "Template title has unsupported/missing tags.": {
     id: 'app.containers.MobilePush.Create.titleHasUnsupportedTag',
@@ -128,35 +128,35 @@ export default defineMessages({
   },
   "Please upload Image": {
     id: 'app.containers.MobilePush.Create.pleaseUploadImage',
-    defaultMessage: 'Please upload Image',
+    defaultMessage: 'Please upload image',
   },
   "Upload Image": {
     id: 'app.containers.MobilePush.Create.uploadImage',
-    defaultMessage: 'Upload Image',
+    defaultMessage: 'Upload image',
   },
   "Mobile Push Template Created Successfully": {
     id: 'app.containers.MobilePush.Create.templateCreatedSuccessfully',
-    defaultMessage: 'Mobile Push Template Created Successfully',
+    defaultMessage: 'Mobile push template created successfully',
   },
   "somethingWentWrong": {
     id: 'app.containers.MobilePush.Create.somethingWentWrong',
-    defaultMessage: 'Something Went Wrong!!',
+    defaultMessage: 'Something went wrong!!',
   },
   "Select DeepLink": {
     id: 'app.containers.MobilePush.Create.selectDeepLink',
-    defaultMessage: 'Select DeepLink',
+    defaultMessage: 'Select deepLink',
   },
   "External Link": {
     id: 'app.containers.MobilePush.Create.externalLink',
-    defaultMessage: 'External Link',
+    defaultMessage: 'External link',
   },
   "External Link cannot be empty": {
     id: 'app.containers.MobilePush.Create.externalLinkCantEmpty',
-    defaultMessage: 'External Link cannot be empty',
+    defaultMessage: 'External link cannot be empty',
   },
   "invalidExternalLink": {
     id: 'app.containers.MobilePush.Create.invalidExternalLink',
-    defaultMessage: 'External Link cannot be empty / Invalid url',
+    defaultMessage: 'External link cannot be empty / invalid url',
   },
   "Do you really want to go back? All your temporary changes will be lost!": {
     id: 'app.containers.MobilePush.Create.goBackConfirmation',
@@ -168,7 +168,7 @@ export default defineMessages({
   },
   "Name and Description": {
     id: 'app.containers.MobilePush.Create.nameAndDescription',
-    defaultMessage: 'Name and Description',
+    defaultMessage: 'Name and description',
   },
   "Button 1": {
     id: 'app.containers.MobilePush.Create.button1',
@@ -180,7 +180,7 @@ export default defineMessages({
   },
   "Add Another CTA": {
     id: 'app.containers.MobilePush.Create.addAnotherCTA',
-    defaultMessage: 'Add Another CTA',
+    defaultMessage: 'Add another CTA',
   },
   "Please select link type": {
     id: 'app.containers.MobilePush.Create.selectLinkType',
@@ -192,7 +192,7 @@ export default defineMessages({
   },
   "Enter CTA Label here": {
     id: 'app.containers.MobilePush.Create.enterCTALabel',
-    defaultMessage: 'Enter CTA Label here',
+    defaultMessage: 'Enter CTA label here',
   },
   "CTA label cannot be empty.": {
     id: 'app.containers.MobilePush.Create.ctaLabelCantEmpty',
@@ -212,15 +212,15 @@ export default defineMessages({
   },
   "value cannot be empty.": {
     id: 'app.containers.MobilePush.Create.valueCantEmpty',
-    defaultMessage: 'value cannot be empty.',
+    defaultMessage: 'Value cannot be empty.',
   },
   "Please delete second Secondary cta First": {
     id: 'app.containers.MobilePush.Create.deleteSecondCTAFirst',
-    defaultMessage: 'Please delete second Secondary cta First',
+    defaultMessage: 'Please delete second secondary cta first',
   },
   "Uploading Image...": {
     id: 'app.containers.MobilePush.Create.uploadingImage',
-    defaultMessage: 'Uploading Image...',
+    defaultMessage: 'Uploading image...',
   },
   "Campaigns": {
     id: 'app.containers.MobilePush.Create.Campaigns',
@@ -256,7 +256,7 @@ export default defineMessages({
   },
   "invalidAndroidMessage": {
     id: 'app.containers.MobilePush.Create.invalidAndroidMessage',
-    defaultMessage: 'Validation failed for Android',
+    defaultMessage: 'Validation failed for android',
   },
   "invalidTags": {
     id: 'app.containers.MobilePush.Create.invalidTags',

package/v2Containers/MobilePush/Edit/index.js

@@ -1752,8 +1752,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
 
   render() {
     const schema = this.state.schema;
-    let tipText = this.props.Edit && ("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) ? 'Getting template details...' : '';
-    tipText = this.props.Edit && ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress) ? 'Saving Template...' : '';
     const loadingContentEdit = this.state.loadingContentEdit || (this.props.location.query.module === 'dvs' && _.isEmpty(this.state.schema));
     const spinning = this.props.isLoadingMetaEntities || loadingContentEdit || this.props.Edit.fetchingDefaultTemplates || this.props.Edit.assetUploading || this.state.loading || (this.props.Edit && (("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) || ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress)));
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
@@ -1762,7 +1760,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     }
     return (
       <div className="creatives-mobilepush-edit">
-        <CapSpin tip={tipText} spinning={spinning}>
+        <CapSpin spinning={spinning}>
           <CapRow>
             <CapColumn>
               {!this.props.isLoadingMetaEntities && <FormBuilder

package/v2Containers/MobilePush/Edit/messages.js

@@ -6,9 +6,9 @@
 import { defineMessages } from 'react-intl';
 
 export default defineMessages({
-  imageUploadLabel: {
+  "imageUploadLabel": {
     id: 'app.containers.MobilePush.Edit.ImageUploadLabel',
-    defaultMessage: 'Upload Image',
+    defaultMessage: 'Upload image',
   },
   "Enter template name*": {
     id: 'app.containers.MobilePush.Edit.enterTemplateNameImportant',
@@ -24,7 +24,7 @@ export default defineMessages({
   },
   "Discard Changes": {
     id: 'app.containers.MobilePush.Edit.discardChanges',
-    defaultMessage: 'Discard Changes',
+    defaultMessage: 'Discard changes',
   },
   "Cancel": {
     id: 'app.containers.MobilePush.Edit.cancel',
@@ -36,15 +36,15 @@ export default defineMessages({
   },
   "Select Mobilepush Account": {
     id: 'app.containers.MobilePush.Edit.selectMobilePushAccount',
-    defaultMessage: 'Select Mobilepush Account',
+    defaultMessage: 'Select mobilepush account',
   },
   "Account Id": {
     id: 'app.containers.MobilePush.Edit.accountId',
-    defaultMessage: 'Account Id',
+    defaultMessage: 'Account id',
   },
   "Select Mobilepush Template": {
     id: 'app.containers.MobilePush.Edit.selectMobilePushTemplate',
-    defaultMessage: 'Select Mobilepush Template',
+    defaultMessage: 'Select mobilepush template',
   },
   "Template": {
     id: 'app.containers.MobilePush.Edit.template',
@@ -56,7 +56,7 @@ export default defineMessages({
   },
   "Copy Title and Content From IOS": {
     id: 'app.containers.MobilePush.Edit.copyFromIos',
-    defaultMessage: 'Copy Title and Content From IOS',
+    defaultMessage: 'Copy title and content from IOS',
   },
   "Title*": {
     id: 'app.containers.MobilePush.Edit.titleLabel',
@@ -92,11 +92,11 @@ export default defineMessages({
   },
   "Add Primary CTA": {
     id: 'app.containers.MobilePush.Edit.addPrimaryCTA',
-    defaultMessage: 'Add Primary CTA',
+    defaultMessage: 'Add primary CTA',
   },
   "Add Secondary CTA": {
     id: 'app.containers.MobilePush.Edit.addSecondaryCTA',
-    defaultMessage: 'Add Secondary CTA',
+    defaultMessage: 'Add secondary CTA',
   },
   "iOS": {
     id: 'app.containers.MobilePush.Edit.iOS',
@@ -104,7 +104,7 @@ export default defineMessages({
   },
   "Copy Title and Content From Android": {
     id: 'app.containers.MobilePush.Edit.copyFromAndroid',
-    defaultMessage: 'Copy Title and Content From Android',
+    defaultMessage: 'Copy title and content from android',
   },
   "Template title has unsupported/missing tags.": {
     id: 'app.containers.MobilePush.Edit.titleHasUnsupportedTag',
@@ -128,35 +128,35 @@ export default defineMessages({
   },
   "Please upload Image": {
     id: 'app.containers.MobilePush.Edit.pleaseUploadImage',
-    defaultMessage: 'Please upload Image',
+    defaultMessage: 'Please upload image',
   },
   "Upload Image": {
     id: 'app.containers.MobilePush.Edit.uploadImage',
-    defaultMessage: 'Upload Image',
+    defaultMessage: 'Upload image',
   },
   "MOBILEPUSH Template Edited Successfully": {
     id: 'app.containers.MobilePush.Edit.templateEditedSuccessfully',
-    defaultMessage: 'MOBILEPUSH Template Edited Successfully',
+    defaultMessage: 'MOBILEPUSH template edited successfully',
   },
   "somethingWentWrong": {
     id: 'app.containers.MobilePush.Edit.somethingWentWrong',
-    defaultMessage: 'Something Went Wrong!!',
+    defaultMessage: 'Something went wrong!!',
   },
   "Select DeepLink": {
     id: 'app.containers.MobilePush.Edit.selectDeepLink',
-    defaultMessage: 'Select DeepLink',
+    defaultMessage: 'Select deepLink',
   },
   "External Link": {
     id: 'app.containers.MobilePush.Edit.externalLink',
-    defaultMessage: 'External Link',
+    defaultMessage: 'External link',
   },
   "External Link cannot be empty": {
     id: 'app.containers.MobilePush.Edit.externalLinkCantEmpty',
-    defaultMessage: 'External Link cannot be empty',
+    defaultMessage: 'External link cannot be empty',
   },
   "External Link cannot be empty.": {
     id: 'app.containers.MobilePush.Edit.externalLinkCantEmpty1',
-    defaultMessage: 'External Link cannot be empty.',
+    defaultMessage: 'External link cannot be empty.',
   },
   "Do you really want to go back? All your temporary changes will be lost!": {
     id: 'app.containers.MobilePush.Edit.goBackConfirmation',
@@ -168,7 +168,7 @@ export default defineMessages({
   },
   "Name and Description": {
     id: 'app.containers.MobilePush.Edit.nameAndDescription',
-    defaultMessage: 'Name and Description',
+    defaultMessage: 'Name and description',
   },
   "Button 1": {
     id: 'app.containers.MobilePush.Edit.button1',
@@ -180,7 +180,7 @@ export default defineMessages({
   },
   "Add Another CTA": {
     id: 'app.containers.MobilePush.Edit.addAnotherCTA',
-    defaultMessage: 'Add Another CTA',
+    defaultMessage: 'Add another CTA',
   },
   "Please select link type": {
     id: 'app.containers.MobilePush.Edit.selectLinkType',
@@ -192,7 +192,7 @@ export default defineMessages({
   },
   "Enter CTA Label here": {
     id: 'app.containers.MobilePush.Edit.enterCTALabel',
-    defaultMessage: 'Enter CTA Label here',
+    defaultMessage: 'Enter CTA label here',
   },
   "CTA label cannot be empty.": {
     id: 'app.containers.MobilePush.Edit.ctaLabelCantEmpty',
@@ -220,7 +220,7 @@ export default defineMessages({
   },
   "Uploading Image...": {
     id: 'app.containers.MobilePush.Edit.uploadingImage',
-    defaultMessage: 'Uploading Image...',
+    defaultMessage: 'Uploading image...',
   },
   "Campaigns": {
     id: 'app.containers.MobilePush.Edit.Campaigns',
@@ -236,15 +236,15 @@ export default defineMessages({
   },
   "template not configured,": {
     id: 'app.containers.MobilePush.Edit.templateNotConfigured',
-    defaultMessage: 'template not configured,',
+    defaultMessage: 'Template not configured,',
   },
   "Android template is not configured. Save without Android template": {
     id: 'app.containers.MobilePush.Edit.androidTemplateNotConfigured',
-    defaultMessage: 'Android template is not configured. Continue Save?',
+    defaultMessage: 'Android template is not configured. Continue save?',
   },
   "IOS template is not configured, Save without IOS template": {
     id: 'app.containers.MobilePush.Edit.iosTemplateNotConfigured',
-    defaultMessage: 'IOS template is not configured, Save without IOS template',
+    defaultMessage: 'IOS template is not configured, save without IOS template',
   },
   "selectActionButton": {
     id: 'app.containers.MobilePush.Edit.mobilePush',
@@ -260,7 +260,7 @@ export default defineMessages({
   },
   "invalidAndroidMessage": {
     id: 'app.containers.MobilePush.Edit.invalidAndroidMessage',
-    defaultMessage: 'Validation failed for Android',
+    defaultMessage: 'Validation failed for android',
   },
   "invalidTags": {
     id: 'app.containers.MobilePush.Create.invalidTags',

package/v2Containers/MobilepushWrapper/index.js

@@ -40,12 +40,12 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
 
       {
         title: <FormattedMessage {...messages.image}/>,
-        content: <WithImage height="248px" width={"248px"}/>,
+        content: <WithImage height="216px" width={"224px"}/>,
         value: 'image',
       },
       {
         title: <FormattedMessage {...messages.text}/>,
-        content: <WithNoImage height="124px" width={"248px"}/>,
+        content: <WithNoImage height="124px" width={"224px"}/>,
         value: 'text',
         // onClick: () => {
         //   this.emailUploader.current.click();
@@ -82,6 +82,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
                 onChange={this.onTemplateNameChange}
                 value={templateName}
                 labelPosition="top"
+                size="default"
                 />
               }
             <CardContainer>

package/v2Containers/Sms/Create/messages.js

@@ -6,9 +6,9 @@
 import { defineMessages } from 'react-intl';
 
 export default defineMessages({
-  saveTemplateLoader: {
+  "saveTemplateLoader": {
     id: 'app.containers.Create.saveTemplateLoader',
-    defaultMessage: 'Saving Template...',
+    defaultMessage: 'Saving template...',
   },
   "Message": {
     id: 'app.containers.Create.messageLabel',
@@ -40,7 +40,7 @@ export default defineMessages({
   },
   "Mark as Final": {
     id: 'app.containers.Create.markFinalVersionLabel',
-    defaultMessage: "Mark as Final",
+    defaultMessage: "Mark as final",
   },
   "Duplicate": {
     id: 'app.containers.Create.duplicateLabel',
@@ -60,7 +60,7 @@ export default defineMessages({
   },
   "Allow Unicode characters": {
     id: 'app.containers.Create.unicodeLabel',
-    defaultMessage: "Allow Unicode characters",
+    defaultMessage: "Allow unicode characters",
   },
   "Tags": {
     id: 'app.containers.Create.tagsLabel',
@@ -68,7 +68,7 @@ export default defineMessages({
   },
   "New Version": {
     id: 'app.containers.Create.newVersionLabel',
-    defaultMessage: "New Version",
+    defaultMessage: "New version",
   },
   "Template content has unsupported/missing tags!": {
     id: 'app.containers.Create.tagsErrorMessage',
@@ -78,9 +78,9 @@ export default defineMessages({
     id: 'app.containers.Create.smsEditorPlaceholder',
     defaultMessage: "Please enter the message content",
   },
-  somethingWentWrong: {
+  "somethingWentWrong": {
     id: 'app.containers.Create.somethingWentWrong',
-    defaultMessage: "Something Went Wrong!!",
+    defaultMessage: "Something went wrong!!",
   },
   "invalidTags": {
     id: 'app.containers.Create.invalidTags',

package/v2Containers/Sms/Edit/index.js

@@ -923,8 +923,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   }
   render() {
     const schema = this.state.schema;
-    let tipText = this.props.Edit && ("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) ? this.props.intl.formatMessage(messages.getTemplateDetailsLoader) : '';
-    tipText = this.props.Edit && ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress) ? this.props.intl.formatMessage(messages.saveTemplateLoader) : '';
     const spinning = this.isSmsLoading();
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
     if (this.props.location.query.type === 'embedded' && this.props.location.query.module === 'library' && !this.props.getDefaultTags) {
@@ -932,7 +930,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     }
     return (
       <div className="sms-email-container">
-        <CapSpin tip={tipText} spinning={spinning}>
+        <CapSpin spinning={spinning}>
           {/*<CapRow style={{marginBottom: '16px', marginLeft: '-40px'}}>
             <CapColumn offset={1}>
               <Breadcrumb>

package/v2Containers/Sms/Edit/messages.js

@@ -6,11 +6,11 @@
 import { defineMessages } from 'react-intl';
 
 export default defineMessages({
-  saveTemplateLoader: {
+  "saveTemplateLoader": {
     id: 'app.containers.Edit.saveTemplateLoader',
-    defaultMessage: 'Saving Template...',
+    defaultMessage: 'Saving template...',
   },
-  getTemplateDetailsLoader: {
+  "getTemplateDetailsLoader": {
     id: 'app.containers.Edit.getTemplateDetailsLoader',
     defaultMessage: 'Getting template details...',
   },
@@ -44,7 +44,7 @@ export default defineMessages({
   },
   "Mark as Final": {
     id: 'app.containers.Edit.markFinalVersionLabel',
-    defaultMessage: "Mark as Final",
+    defaultMessage: "Mark as final",
   },
   "Duplicate": {
     id: 'app.containers.Edit.duplicateLabel',
@@ -60,11 +60,11 @@ export default defineMessages({
   },
   "Please check if you intend to use unicode characters.": {
     id: 'app.containers.Edit.unicodeErrorMessage',
-    defaultMessage: "Please check this if you want to use Unicode characters",
+    defaultMessage: "Please check this if you want to use unicode characters",
   },
   "Allow Unicode characters": {
     id: 'app.containers.Edit.unicodeLabel',
-    defaultMessage: "Allow Unicode characters",
+    defaultMessage: "Allow unicode characters",
   },
   "Tags": {
     id: 'app.containers.Edit.tagsLabel',
@@ -72,7 +72,7 @@ export default defineMessages({
   },
   "New Version": {
     id: 'app.containers.Edit.newVersionLabel',
-    defaultMessage: "New Version",
+    defaultMessage: "New version",
   },
   "Template content has unsupported/missing tags!": {
     id: 'app.containers.Edit.tagsErrorMessage',
@@ -82,8 +82,8 @@ export default defineMessages({
     id: 'app.containers.Edit.smsEditorPlaceholder',
     defaultMessage: "Please enter the message content",
   },
-  somethingWentWrong: {
+  "somethingWentWrong": {
     id: 'app.containers.Edit.somethingWentWrong',
-    defaultMessage: "Something Went Wrong!!",
+    defaultMessage: "Something went wrong!!",
   },
 });

package/v2Containers/Sms/initialSchema.js

@@ -168,7 +168,7 @@ export const response = {
                                   order: 1,
                                   width: 18,
                                   onlyDisplay: false,
-                                  errorMessage: "Please check if you intend to use unicode characters.",
+                                  errorMessage: "Unicode characters were detected in your content.",
                                   customComponent: false,
                                 },
                               ],

package/v2Containers/Templates/index.js

@@ -531,6 +531,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       return templateData;
     }) : [];
     const accountId = _.get(this.props, 'Templates.selectedWeChatAccount.uuid');
+    const accounts = _.get(this.props, 'Templates.weCrmAccounts');
     return (<div>
       {filterContent}
       <CapSpin spinning={isLoading} tip={loadingTip}>
@@ -539,7 +540,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         </div>}
         {(this.state.selectedAccount === '' && _.isEmpty(this.props.Templates.selectedWeChatAccount)) && (this.state.channel.toLowerCase() === 'wechat' || this.state.channel.toLowerCase() === "mobilepush") &&
         <div style={{ height: '65vh', textAlign: 'center', lineHeight: '65vh'}}>
-          <CapHeading type="h6">{this.props.intl.formatMessage(messages.noAccountMessage)}</CapHeading>
+          <CapHeading type="h6">{accounts ? this.props.intl.formatMessage(messages.noAccountMessage) : this.props.intl.formatMessage(messages.noAccountsPresent)}</CapHeading>
         </div>}
         { !_.isEmpty(this.props.Templates.selectedWeChatAccount) && this.state.channel.toLowerCase() === "mobilepush" && this.state.selectedAccountError &&
           <div style={{ height: '65vh', textAlign: 'center', lineHeight: '65vh'}}>
@@ -709,13 +710,15 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
                 {data.message}
               </div>
               {data.expandableDetails && data.expandableDetails.image && <div className="body-image">
-                <img src={data.expandableDetails.image} alt={data.expandableDetails.image}/>
+                <img src={data.expandableDetails.image} alt="" />
               </div>}
-              {(data.expandableDetails && data.expandableDetails.ctas && ((data.expandableDetails.ctas[0] && data.expandableDetails.ctas[0].actionText) || (data.expandableDetails.ctas[1] && data.expandableDetails.ctas[1].actionText))) &&
-              <div className="actions">
-                {_.map(data.expandableDetails.ctas, (action) => !!action.actionText &&
+              {(data.expandableDetails && data.expandableDetails.ctas && ((data.expandableDetails.ctas[0] && data.expandableDetails.ctas[0].actionText) || (data.expandableDetails.ctas[1] && data.expandableDetails.ctas[1].actionText))) ?
+                <div className="actions">
+                  {_.map(data.expandableDetails.ctas, (action) => !!action.actionText &&
                   <span className="action">{action.actionText && action.actionText.toUpperCase()}</span>)}
-              </div>
+                </div>
+              :
+              ''
               }
             </div>
           </div>
@@ -751,7 +754,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
                 <span className="app-icon"></span>{this.props.Templates.selectedWeChatAccount && this.props.Templates.selectedWeChatAccount.name ? this.props.Templates.selectedWeChatAccount.name : "App name"} <i className="material-icons">close</i>
               </div>
               {data.expandableDetails && data.expandableDetails.image && <div className={`body-image ${iosActions.length > 0 ? 'image-half' : ''}`}>
-                <img src={data.expandableDetails.image} alt={data.image}/>
+                <img src={data.expandableDetails.image} alt=""/>
               </div>}
               <div className="title">
                 {data.title}
@@ -759,7 +762,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
               <div className="body-text" style={bodyTextStyle}>
                 {data.message}
               </div>
-              {data.expandableDetails && data.expandableDetails.ctas && data.expandableDetails.ctas[0] && data.expandableDetails.ctas[0].actionText && iosActions}
+              {data.expandableDetails && data.expandableDetails.ctas && data.expandableDetails.ctas[0] && data.expandableDetails.ctas[0].actionText ? iosActions : ''}
             </div>
           </div>
         </div>);