@capillarytech/creatives-library 3.1.47 → 3.2.0

package/translations/zh.json

@@ -1,6 +1,4 @@
 {
-  "app.components.TemplatePreview.includesOptoutTag": "",
-  "app.components.TemplatePreview.optoutCharactersTotal": "",
   "creatives.components.BreadCrumbs.header": "",
   "creatives.components.CapTagList.Cancel": "",
   "creatives.components.CapTagList.Ok": "",
@@ -34,7 +32,6 @@
   "creatives.components.FormBuilder.unsupportedTags": "",
   "creatives.components.FormBuilder.yes": "",
   "creatives.components.Header.cancel": "",
-  "creatives.components.Header.enterTemplateName": "",
   "creatives.components.Header.header": "",
   "creatives.components.Header.preview": "",
   "creatives.components.Header.save": "",
@@ -56,7 +53,6 @@
   "creatives.components.SmsTest.header": "",
   "creatives.components.SmsTest.inputSmsTemplate": "",
   "creatives.components.SmsTest.inputTemplateName": "",
-  "creatives.components.TemplatePreview.characters": "",
   "creatives.components.TemplatePreview.charactersPerSms": "",
   "creatives.components.TemplatePreview.charactersTotal": "",
   "creatives.components.TemplatePreview.close": "",
@@ -70,8 +66,6 @@
   "creatives.components.ToastrMessage.close": "",
   "creatives.components.ToastrMessage.header": "",
   "creatives.components.TopBar.brand.dropdown": "",
-  "creatives.components.TopBar.brand.noResultText": "",
-  "creatives.components.TopBar.brand.organization": "",
   "creatives.components.WechatRichmediaTemplatePreview.edit": "",
   "creatives.components.WechatRichmediaTemplatePreview.header": "",
   "creatives.components.WechatRichmediaTemplatePreview.select": "",
@@ -192,7 +186,6 @@
   "creatives.containers.Create.Content*": "",
   "creatives.containers.Create.Cover_abstract": "",
   "creatives.containers.Create.Cover_image*": "",
-  "creatives.containers.Create.Insert_Image": "",
   "creatives.containers.Create.No_one": "",
   "creatives.containers.Create.Only_followers": "",
   "creatives.containers.Create.Please_input_author": "",
@@ -200,9 +193,7 @@
   "creatives.containers.Create.Please_input_cover_abstract": "",
   "creatives.containers.Create.Please_input_title": "",
   "creatives.containers.Create.Show_cover_picture": "",
-  "creatives.containers.Create.Source_link": "",
   "creatives.containers.Create.Title*": "",
-  "creatives.containers.Create.Upload_Image": "",
   "creatives.containers.Create.Who_can_post_comments_on_this_content": "",
   "creatives.containers.Create.addNewRichmedia": "",
   "creatives.containers.Create.alertMessage": "",
@@ -219,9 +210,7 @@
   "creatives.containers.Create.emptyTemplateName": "",
   "creatives.containers.Create.formEmpty": "",
   "creatives.containers.Create.goBackConfirmation": "",
-  "creatives.containers.Create.graphic_details_page": "",
   "creatives.containers.Create.header": "",
-  "creatives.containers.Create.http_example": "",
   "creatives.containers.Create.markFinalVersionLabel": "",
   "creatives.containers.Create.maxContentCount": "",
   "creatives.containers.Create.messageLabel": "",
@@ -245,7 +234,6 @@
   "creatives.containers.Create.titleCharacterCount": "",
   "creatives.containers.Create.titleEmpty": "",
   "creatives.containers.Create.titleNameRepeated": "",
-  "creatives.containers.Create.to_be_displayed_on_the_graphic_details_page": "",
   "creatives.containers.Create.unicodeErrorMessage": "",
   "creatives.containers.Create.unicodeLabel": "",
   "creatives.containers.Create.versionLabel": "",
@@ -302,8 +290,6 @@
   "creatives.containers.Email.Create.creatives": "",
   "creatives.containers.Email.Create.descriptionEmail": "",
   "creatives.containers.Email.Create.goBackConfirmation": "",
-  "creatives.containers.Email.Create.h3emailPreview": "",
-  "creatives.containers.Email.Create.h3imageSelection": "",
   "creatives.containers.Email.Create.invalidFileMessage": "",
   "creatives.containers.Email.Create.newVersion": "",
   "creatives.containers.Email.Create.uploadFile": "",
@@ -590,12 +576,7 @@
   "creatives.containers.MobilePush.Edit.uploadingImage": "",
   "creatives.containers.MobilePush.Edit.valueCantEmpty": "",
   "creatives.containers.TagList.header": "",
-  "creatives.containers.Templates.Ebill": "",
-  "creatives.containers.Templates.Email": "",
-  "creatives.containers.Templates.Gallery": "",
-  "creatives.containers.Templates.Line": "",
   "creatives.containers.Templates.MobilePush": "",
-  "creatives.containers.Templates.Sms": "",
   "creatives.containers.Templates.all": "",
   "creatives.containers.Templates.alphabeticallyOption": "",
   "creatives.containers.Templates.blankTemplate": "",
@@ -631,7 +612,6 @@
   "creatives.containers.Templates.mapTemplate": "",
   "creatives.containers.Templates.mobilePushChannel": "",
   "creatives.containers.Templates.mobilePushChannelTemplatesHeader": "",
-  "creatives.containers.Templates.mobilepush": "",
   "creatives.containers.Templates.mobilepushHeader": "",
   "creatives.containers.Templates.mostRecentOption": "",
   "creatives.containers.Templates.newTemplate": "",
@@ -640,6 +620,7 @@
   "creatives.containers.Templates.preview": "",
   "creatives.containers.Templates.previewButton": "",
   "creatives.containers.Templates.previewGenerateText": "",
+  "creatives.containers.Templates.search": "",
   "creatives.containers.Templates.searchText": "",
   "creatives.containers.Templates.selectAccount": "",
   "creatives.containers.Templates.selectButton": "",
@@ -684,15 +665,18 @@
   "creatives.containers.WeChat.gettingTemplateData": "",
   "creatives.containers.WeChat.goBackConfirmation": "",
   "creatives.containers.WeChat.goBackTemporaryConfirmation": "",
+  "creatives.containers.WeChat.hasInvalidContent": "",
   "creatives.containers.WeChat.header": "",
   "creatives.containers.WeChat.invalidContent": "",
   "creatives.containers.WeChat.isInternalUrl": "",
   "creatives.containers.WeChat.link": "",
   "creatives.containers.WeChat.linkCantEmpty": "",
-  "creatives.containers.WeChat.loadingEDMTemplates": "",
+  "creatives.containers.WeChat.linkErrorMessage": "",
   "creatives.containers.WeChat.mapTemplateFooter": "",
   "creatives.containers.WeChat.mapTemplateHeader": "",
+  "creatives.containers.WeChat.newWechat": "",
   "creatives.containers.WeChat.save": "",
+  "creatives.containers.WeChat.select": "",
   "creatives.containers.WeChat.selectWechatAccount": "",
   "creatives.containers.WeChat.selectWechatTemplate": "",
   "creatives.containers.WeChat.somethingWentWrong": "",
@@ -701,11 +685,6 @@
   "creatives.containers.WeChat.templateMapping": "",
   "creatives.containers.WeChat.wechatCreateSuccess": "",
   "creatives.containers.WeChat.wechatEditSuccess": "",
-  "creatives.containers.WechatWrapper.mapTemplate": "",
-  "creatives.containers.WechatWrapper.mapTemplateSubtext": "",
-  "creatives.containers.WechatWrapper.richMedia": "",
-  "creatives.containers.WechatWrapper.richMediaSubtext": "",
-  "creatives.containers.WechatWrapper.templateType": "",
   "creatives.containersV2.Assets.Gallery.addImages": "",
   "creatives.containersV2.Assets.Gallery.alphabetically": "",
   "creatives.containersV2.Assets.Gallery.assetDeleteFailed": "",
@@ -718,7 +697,6 @@
   "creatives.containersV2.Assets.Gallery.gallery": "",
   "creatives.containersV2.Assets.Gallery.imagePreview": "",
   "creatives.containersV2.Assets.Gallery.lastUpdated": "",
-  "creatives.containersV2.Assets.Gallery.loadingGallery": "",
   "creatives.containersV2.Assets.Gallery.mostRecent": "",
   "creatives.containersV2.Assets.Gallery.noAssetMessage": "",
   "creatives.containersV2.Assets.Gallery.noTemplatesFound": "",
@@ -751,36 +729,78 @@
   "creatives.containersV2.Cap.storePerformance": "",
   "creatives.containersV2.Cap.wechat": "",
   "creatives.containersV2.ChannelTemplates.header": "",
-  "creatives.containersV2.Create.addLabel": "",
+  "creatives.containersV2.Create.Anyone": "",
+  "creatives.containersV2.Create.Author": "",
+  "creatives.containersV2.Create.Content": "",
+  "creatives.containersV2.Create.Cover_abstract": "",
+  "creatives.containersV2.Create.Cover_image": "",
+  "creatives.containersV2.Create.No_one": "",
+  "creatives.containersV2.Create.Only_followers": "",
+  "creatives.containersV2.Create.Please_input_author": "",
+  "creatives.containersV2.Create.Please_input_content": "",
+  "creatives.containersV2.Create.Please_input_cover_abstract": "",
+  "creatives.containersV2.Create.Please_input_title": "",
+  "creatives.containersV2.Create.Show_cover_picture": "",
+  "creatives.containersV2.Create.Title": "",
+  "creatives.containersV2.Create.Who_can_post_comments_on_this_content": "",
+  "creatives.containersV2.Create.addNewRichmedia": "",
   "creatives.containersV2.Create.alertMessage": "",
+  "creatives.containersV2.Create.articleContent": "",
+  "creatives.containersV2.Create.authorCharacterCount": "",
+  "creatives.containersV2.Create.authorInductiveText": "",
   "creatives.containersV2.Create.cancelButton": "",
-  "creatives.containersV2.Create.characters": "",
-  "creatives.containersV2.Create.creativeName": "",
+  "creatives.containersV2.Create.contentEmpty": "",
+  "creatives.containersV2.Create.coverAbstractCharacterCount": "",
+  "creatives.containersV2.Create.coverAbstractInductive": "",
+  "creatives.containersV2.Create.coverImageTitle": "",
+  "creatives.containersV2.Create.delete": "",
+  "creatives.containersV2.Create.deleteContent": "",
   "creatives.containersV2.Create.deleteLabel": "",
   "creatives.containersV2.Create.discardChangesButton": "",
   "creatives.containersV2.Create.duplicateLabel": "",
   "creatives.containersV2.Create.emptyTemplateErrorMessage": "",
+  "creatives.containersV2.Create.emptyTemplateName": "",
+  "creatives.containersV2.Create.formEmpty": "",
   "creatives.containersV2.Create.goBackTemporaryChangesLost": "",
+  "creatives.containersV2.Create.header": "",
+  "creatives.containersV2.Create.insertImage": "",
   "creatives.containersV2.Create.invalidTags": "",
+  "creatives.containersV2.Create.linkInductiveText": "",
   "creatives.containersV2.Create.markFinalVersionLabel": "",
+  "creatives.containersV2.Create.maxContentCount": "",
   "creatives.containersV2.Create.messageLabel": "",
+  "creatives.containersV2.Create.modalBody": "",
+  "creatives.containersV2.Create.modalTitle": "",
   "creatives.containersV2.Create.newVersionLabel": "",
+  "creatives.containersV2.Create.noImage": "",
+  "creatives.containersV2.Create.readMoreLink": "",
   "creatives.containersV2.Create.renameLabel": "",
+  "creatives.containersV2.Create.requiredField": "",
+  "creatives.containersV2.Create.resolutionText": "",
   "creatives.containersV2.Create.saveButton": "",
+  "creatives.containersV2.Create.saveSuccess": "",
   "creatives.containersV2.Create.saveTemplateLoader": "",
-  "creatives.containersV2.Create.sms": "",
   "creatives.containersV2.Create.smsEditorPlaceholder": "",
   "creatives.containersV2.Create.smsTemplateCreatedSuccess": "",
   "creatives.containersV2.Create.somethingWentWrong": "",
+  "creatives.containersV2.Create.sourceLinkEmpty": "",
   "creatives.containersV2.Create.tagsErrorMessage": "",
   "creatives.containersV2.Create.tagsLabel": "",
   "creatives.containersV2.Create.templateMarkedSuccessfully": "",
   "creatives.containersV2.Create.templateNamePlaceHolder": "",
   "creatives.containersV2.Create.templateNotValid": "",
+  "creatives.containersV2.Create.titleCharacterCount": "",
+  "creatives.containersV2.Create.titleEmpty": "",
+  "creatives.containersV2.Create.titleInductiveText": "",
+  "creatives.containersV2.Create.titleNameRepeated": "",
   "creatives.containersV2.Create.unicodeErrorMessage": "",
   "creatives.containersV2.Create.unicodeLabel": "",
+  "creatives.containersV2.Create.uploadImage": "",
   "creatives.containersV2.Create.validationError": "",
   "creatives.containersV2.Create.versionLabel": "",
+  "creatives.containersV2.Create.visibility": "",
+  "creatives.containersV2.Create.wrongFormatFile": "",
+  "creatives.containersV2.Create.wrongUrl": "",
   "creatives.containersV2.Creatives.addContent": "",
   "creatives.containersV2.Creatives.alphabeticallyOption": "",
   "creatives.containersV2.Creatives.blankTemplate": "",
@@ -800,7 +820,6 @@
   "creatives.containersV2.Creatives.creativesTemplatesEditName": "",
   "creatives.containersV2.Creatives.creativesTemplatesSave": "",
   "creatives.containersV2.Creatives.creativesTemplatesSaveFullMode": "",
-  "creatives.containersV2.Creatives.creativesTemplatesUpdate": "",
   "creatives.containersV2.Creatives.deleteButton": "",
   "creatives.containersV2.Creatives.deletedSuccssfully": "",
   "creatives.containersV2.Creatives.deletionFailed": "",
@@ -873,11 +892,8 @@
   "creatives.containersV2.Ebill.tagsErrorMessage": "",
   "creatives.containersV2.Ebill.tagsLabel": "",
   "creatives.containersV2.Ebill.templateDataNotValid": "",
-  "creatives.containersV2.Edit.addLabel": "",
   "creatives.containersV2.Edit.alertMessage": "",
   "creatives.containersV2.Edit.cancelButton": "",
-  "creatives.containersV2.Edit.characters": "",
-  "creatives.containersV2.Edit.creativeName": "",
   "creatives.containersV2.Edit.deleteLabel": "",
   "creatives.containersV2.Edit.discardChangesButton": "",
   "creatives.containersV2.Edit.duplicateLabel": "",
@@ -891,7 +907,6 @@
   "creatives.containersV2.Edit.renameLabel": "",
   "creatives.containersV2.Edit.saveButton": "",
   "creatives.containersV2.Edit.saveTemplateLoader": "",
-  "creatives.containersV2.Edit.sms": "",
   "creatives.containersV2.Edit.smsEditorPlaceholder": "",
   "creatives.containersV2.Edit.somethingWentWrong": "",
   "creatives.containersV2.Edit.tagsErrorMessage": "",
@@ -910,7 +925,6 @@
   "creatives.containersV2.Email.Subject": "",
   "creatives.containersV2.Email.Tags": "",
   "creatives.containersV2.Email.alert": "",
-  "creatives.containersV2.Email.alertMessage": "",
   "creatives.containersV2.Email.alphabetically": "",
   "creatives.containersV2.Email.alphabeticallyOption": "",
   "creatives.containersV2.Email.assetUploadFailed": "",
@@ -935,8 +949,6 @@
   "creatives.containersV2.Email.emailSubjectNotEmplty": "",
   "creatives.containersV2.Email.emailText": "",
   "creatives.containersV2.Email.goBackTemporaryChangesLost": "",
-  "creatives.containersV2.Email.h3emailPreview": "",
-  "creatives.containersV2.Email.h3imageSelection": "",
   "creatives.containersV2.Email.imageSelection": "",
   "creatives.containersV2.Email.invalidFileMessage": "",
   "creatives.containersV2.Email.kmage": "",
@@ -1088,7 +1100,6 @@
   "creatives.containersV2.MobilePush.Create.button2": "",
   "creatives.containersV2.MobilePush.Create.cancel": "",
   "creatives.containersV2.MobilePush.Create.cantCopyEmptyFieldValues": "",
-  "creatives.containersV2.MobilePush.Create.change": "",
   "creatives.containersV2.MobilePush.Create.copyFromAndroid": "",
   "creatives.containersV2.MobilePush.Create.copyFromIos": "",
   "creatives.containersV2.MobilePush.Create.ctaLabelCantEmpty": "",
@@ -1160,7 +1171,6 @@
   "creatives.containersV2.MobilePush.Edit.button2": "",
   "creatives.containersV2.MobilePush.Edit.cancel": "",
   "creatives.containersV2.MobilePush.Edit.cantCopyEmptyFieldValues": "",
-  "creatives.containersV2.MobilePush.Edit.change": "",
   "creatives.containersV2.MobilePush.Edit.copyFromAndroid": "",
   "creatives.containersV2.MobilePush.Edit.copyFromIos": "",
   "creatives.containersV2.MobilePush.Edit.ctaLabelCantEmpty": "",
@@ -1266,7 +1276,6 @@
   "creatives.containersV2.Templates.newTemplate": "",
   "creatives.containersV2.Templates.noAccountMessage": "",
   "creatives.containersV2.Templates.noAccountsPresent": "",
-  "creatives.containersV2.Templates.noAccountsPresentWeChat": "",
   "creatives.containersV2.Templates.noTemplatesFound": "",
   "creatives.containersV2.Templates.noTemplatesMessage": "",
   "creatives.containersV2.Templates.preview": "",
@@ -1328,90 +1337,27 @@
   "creatives.containersV2.WeChat.discard": "",
   "creatives.containersV2.WeChat.gettingTemplateData": "",
   "creatives.containersV2.WeChat.goBackTemporaryChangesLost": "",
-  "creatives.containersV2.WeChat.hasInvalidContent": "",
   "creatives.containersV2.WeChat.hasValidContent": "",
   "creatives.containersV2.WeChat.header": "",
   "creatives.containersV2.WeChat.isInternalUrl": "",
   "creatives.containersV2.WeChat.link": "",
   "creatives.containersV2.WeChat.linkCantEmpty": "",
-  "creatives.containersV2.WeChat.linkErrorMessage": "",
-  "creatives.containersV2.WeChat.newWechat": "",
   "creatives.containersV2.WeChat.save": "",
-  "creatives.containersV2.WeChat.select": "",
   "creatives.containersV2.WeChat.selectWechatAccount": "",
   "creatives.containersV2.WeChat.selectWechatTemplate": "",
   "creatives.containersV2.WeChat.somethingWentWrong": "",
   "creatives.containersV2.WeChat.tagsLabel": "",
   "creatives.containersV2.WeChat.template": "",
   "creatives.containersV2.WeChat.templateMapping": "",
-  "creatives.containersV2.WeChat.templateName": "",
   "creatives.containersV2.WeChat.wechatCreateSuccess": "",
   "creatives.containersV2.WeChat.wechatEditSuccess": "",
   "creatives.containersV2.appName": "",
   "creatives.containersV2.audience": "",
+  "creatives.containersV2.campaigns": "",
   "creatives.containersV2.campaignsDashboard": "",
   "creatives.containersV2.campaignsHome": "",
+  "creatives.containersV2.creatives": "",
   "creatives.containersV2.incentive": "",
-  "creatives.containersV2.richMedia.Create.Anyone": "",
-  "creatives.containersV2.richMedia.Create.Author": "",
-  "creatives.containersV2.richMedia.Create.Content": "",
-  "creatives.containersV2.richMedia.Create.Cover_abstract": "",
-  "creatives.containersV2.richMedia.Create.Cover_image": "",
-  "creatives.containersV2.richMedia.Create.No_one": "",
-  "creatives.containersV2.richMedia.Create.Only_followers": "",
-  "creatives.containersV2.richMedia.Create.Please_input_author": "",
-  "creatives.containersV2.richMedia.Create.Please_input_content": "",
-  "creatives.containersV2.richMedia.Create.Please_input_cover_abstract": "",
-  "creatives.containersV2.richMedia.Create.Please_input_title": "",
-  "creatives.containersV2.richMedia.Create.Show_cover_picture": "",
-  "creatives.containersV2.richMedia.Create.Title": "",
-  "creatives.containersV2.richMedia.Create.Who_can_post_comments_on_this_content": "",
-  "creatives.containersV2.richMedia.Create.addNewRichmedia": "",
-  "creatives.containersV2.richMedia.Create.addRichMediaContent": "",
-  "creatives.containersV2.richMedia.Create.articleContent": "",
-  "creatives.containersV2.richMedia.Create.authorCharacterCount": "",
-  "creatives.containersV2.richMedia.Create.authorInductiveText": "",
-  "creatives.containersV2.richMedia.Create.contentEmpty": "",
-  "creatives.containersV2.richMedia.Create.coverAbstractCharacterCount": "",
-  "creatives.containersV2.richMedia.Create.coverAbstractInductive": "",
-  "creatives.containersV2.richMedia.Create.coverImageTitle": "",
-  "creatives.containersV2.richMedia.Create.delete": "",
-  "creatives.containersV2.richMedia.Create.deleteContent": "",
-  "creatives.containersV2.richMedia.Create.emptyTemplateName": "",
-  "creatives.containersV2.richMedia.Create.fileContentFailed": "",
-  "creatives.containersV2.richMedia.Create.formEmpty": "",
-  "creatives.containersV2.richMedia.Create.header": "",
-  "creatives.containersV2.richMedia.Create.insertImage": "",
-  "creatives.containersV2.richMedia.Create.linkInductiveText": "",
-  "creatives.containersV2.richMedia.Create.maxContentCount": "",
-  "creatives.containersV2.richMedia.Create.modalBody": "",
-  "creatives.containersV2.richMedia.Create.modalTitle": "",
-  "creatives.containersV2.richMedia.Create.nameOfTemplate": "",
-  "creatives.containersV2.richMedia.Create.newMedia": "",
-  "creatives.containersV2.richMedia.Create.noImage": "",
-  "creatives.containersV2.richMedia.Create.payloadMissing": "",
-  "creatives.containersV2.richMedia.Create.readMoreLink": "",
-  "creatives.containersV2.richMedia.Create.requiredField": "",
-  "creatives.containersV2.richMedia.Create.resolutionText": "",
-  "creatives.containersV2.richMedia.Create.sameTemplateExists": "",
-  "creatives.containersV2.richMedia.Create.saveSuccess": "",
-  "creatives.containersV2.richMedia.Create.somethingWentWrong": "",
-  "creatives.containersV2.richMedia.Create.sourceIdentMissing": "",
-  "creatives.containersV2.richMedia.Create.sourceLinkEmpty": "",
-  "creatives.containersV2.richMedia.Create.sufficientParam": "",
-  "creatives.containersV2.richMedia.Create.sufficientPayload": "",
-  "creatives.containersV2.richMedia.Create.templateNameBlank": "",
-  "creatives.containersV2.richMedia.Create.templateNameContainsWS": "",
-  "creatives.containersV2.richMedia.Create.templateNameExists": "",
-  "creatives.containersV2.richMedia.Create.titleCharacterCount": "",
-  "creatives.containersV2.richMedia.Create.titleEmpty": "",
-  "creatives.containersV2.richMedia.Create.titleInductiveText": "",
-  "creatives.containersV2.richMedia.Create.titleNameRepeated": "",
-  "creatives.containersV2.richMedia.Create.uploadFailed": "",
-  "creatives.containersV2.richMedia.Create.uploadImage": "",
-  "creatives.containersV2.richMedia.Create.visibility": "",
-  "creatives.containersV2.richMedia.Create.wrongFormatFile": "",
-  "creatives.containersV2.richMedia.Create.wrongUrl": "",
   "customdatepicker.cancel": "",
   "customdatepicker.done": "",
   "reon.components.Cap.Workbench": "",

package/utils/smsCharCountV2.js

@@ -88,7 +88,7 @@ export function updateCharCount(content, isUnicodeEnabled) {
       break;
     }
   }
-  chars_used = showOptoutCount && optoutUrl && optoutUrl.length ? (chars_used + (((optoutUrl && optoutUrl.length) || 0) * noOfOptout) - (optoutTagLength * noOfOptout)) : chars_used;
+  chars_used = showOptoutCount ? (chars_used + (((optoutUrl && optoutUrl.length) || 0) * noOfOptout) - (optoutTagLength * noOfOptout)) : chars_used;
   if (coding == '7bit') {
     if (chars_used > 160) {
       var parts = Math.ceil(chars_used / 153);

package/v2Components/CapTagList/index.js

@@ -143,12 +143,12 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
       if (_.has(val, 'subtags')) {
         const temp = this.renderTags(val.subtags);
         list.push((
-          <CapTreeNode title={val.name} tag={val} key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}>
+          <CapTreeNode title={val.name} key={key}>
             {temp}
           </CapTreeNode>
         ));
       } else if (searchString === '' || !searchString || val.name.toLowerCase().indexOf(searchString.toLowerCase()) !== -1) {
-        const tempNode = (<CapTreeNode title={val.name} tag={val} isLeaf key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}></CapTreeNode>);
+        const tempNode = (<CapTreeNode title={val.name} isLeaf key={key}></CapTreeNode>);
         list.push(tempNode);
       }
     });

package/v2Components/FormBuilder/index.js

@@ -997,7 +997,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
   }
 
   skipTags(tag) {
-    const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)","Link_to_[a-zA-z]","SURVEY.*.TOKEN","^[A-Za-z].*\\([\\d]*\\)"];
+    const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)","Link_to_[a-zA-z]","SURVEY.*.TOKEN"];
 
     //const regexGroups = [];
     let skipped = false;
@@ -1887,8 +1887,8 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
 
         for (let i = 0; i < elems.length; i += 1) {
           if (elems.item(i).classList.contains("ant-tabs-tab-active")) {
-            activeTabIndex = i + 1;
-          }
+              activeTabIndex = i + 1;
+            }
         }
         if (this.props.isNewVersionFlow) {
           const formData = _.cloneDeep(this.state.formData);
@@ -2312,7 +2312,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 className={val.className ? val.className : ''}
                 id={val.id}
                 userLocale={this.props.userLocale}
-                selectedOfferDetails={this.props.selectedOfferDetails}
               />
             </CapColumn>
           );
@@ -2797,7 +2796,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                   className={val.className ? val.className : ''}
                   id={val.id}
                   userLocale={this.props.userLocale}
-                  selectedOfferDetails={this.props.selectedOfferDetails}
                 />
               </CapColumn>
             );
@@ -3303,7 +3301,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
 
 FormBuilder.defaultProps = {
   isNewVersionFlow: false,
-  userLocale: localStorage.getItem('jlocale') || 'en',
+  userLocale: 'en',
 };
 
 FormBuilder.propTypes = {
@@ -3345,7 +3343,6 @@ FormBuilder.propTypes = {
   stopValidation: PropTypes.func,
   handleDelete: PropTypes.func,
   intl: intlShape.isRequired,
-  selectedOfferDetails: PropTypes.array,
 };
 
 export default injectIntl(FormBuilder);

package/v2Components/NavigationBar/index.js

@@ -74,7 +74,10 @@ class NavigationBar extends React.Component {
       if (!isEmpty(orgList)) {
         forEach(orgList, (item) => {
           const id = item.orgID;
-          const name = item.orgName;
+          let name = item.orgName;
+          if (id === 486) {
+            name = 'Demo Org';
+          }
           if (id !== defaultOrgId) {
             proxyOrgList.push({ label: name, value: id, key: id });
           }
@@ -103,9 +106,7 @@ class NavigationBar extends React.Component {
       //changing campaigns module name to engage+
       if ( !campaignOrgV2Status ) {
         const campaignsModule = find(productsList, ['value', 'campaigns']);
-        if (campaignsModule) {
-          campaignsModule.value = 'Engage+';
-        }
+        campaignsModule.value = 'Engage+';
       }
       //adding insights+ to module list
       productsList.push({
@@ -201,11 +202,11 @@ class NavigationBar extends React.Component {
             {...customTopBarProps}
           />
         }
-          <CapWrapper isEmbedded={type === EMBEDDED}>
-            <ComponentWrapper>
-              {React.Children.toArray(this.props.children)}
-            </ComponentWrapper>
-          </CapWrapper>
+        <CapWrapper isEmbedded={type === EMBEDDED}>
+          <ComponentWrapper>
+            {React.Children.toArray(this.props.children)}
+          </ComponentWrapper>
+        </CapWrapper>
       </div>
     );
   }

package/v2Components/NewCallTask/index.js

@@ -83,7 +83,7 @@ class NewCallTask extends React.Component { // eslint-disable-line react/prefer-
   }
 
   render() {
-    const { intl, isLoading, metaEntities, selectedOfferDetails } = this.props;
+    const { intl, isLoading, metaEntities } = this.props;
     const { formatMessage } = intl;
     const { subject, messageBody, description } = this.state;
     const tags = metaEntities && metaEntities.tags ? metaEntities.tags.standard : [];
@@ -107,7 +107,6 @@ class NewCallTask extends React.Component { // eslint-disable-line react/prefer-
                   label={formatMessage(messages.personalisationTags)}
                   tags={tags}
                   onTagSelect={this.onTagSelect}
-                  selectedOfferDetails={selectedOfferDetails}
                 />
                 <CapInput.TextArea
                   setInputRef={this.setInputRef}
@@ -149,7 +148,6 @@ NewCallTask.propTypes = {
   templateData: PropTypes.object,
   isLoading: PropTypes.bool,
   metaEntities: PropTypes.object,
-  selectedOfferDetails: PropTypes.array,
 };
 
 export default injectIntl(NewCallTask);

package/v2Components/TopBar/index.js

@@ -43,9 +43,6 @@ const TopBar = (props) => {
         selectPlaceholder: intl.formatMessage(messages.selectOrganization),
         showSearch: true,
         showHeader: true,
-        title: intl.formatMessage(messages.selectOrganization),
-        placeholder: intl.formatMessage(messages.organization),
-        noResultText: intl.formatMessage(messages.noResultText),
       }}
       menuProps={{
         items: topbarMenuData,

package/v2Components/TopBar/messages.js

@@ -34,12 +34,4 @@ export default defineMessages({
     id: 'creatives.componentsV2.TopBar.brand.selectProduct',
     defaultMessage: 'Select product',
   },
-  organization: {
-    id: 'creatives.components.TopBar.brand.organization',
-    defaultMessage: 'Organization',
-  },
-  noResultText: {
-    id: 'creatives.components.TopBar.brand.noResultText',
-    defaultMessage: 'No results found',
-  },
 });

package/v2Containers/Assets/Gallery/index.js

@@ -431,7 +431,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
       </div>
     ) : <input style={{ display: 'none'}} id="fileName" type="file" onChange={(e) => this.uploadImages(e, {files: e.target.files})} accept="image/*" multiple/>;
     const isLoading = this.props.Gallery.assetUploading || this.props.Gallery.fetchingAllAssets;
-    const loadingTip = <FormattedMessage {...messages.loadingGallery} />;
+    const loadingTip = "Loading gallery... ";
 
     return (
       <div>

package/v2Containers/Assets/Gallery/messages.js

@@ -102,8 +102,4 @@ export default defineMessages({
     id: `creatives.containersV2.Assets.Gallery.noTemplatesFound`,
     defaultMessage: 'No templates found',
   },
-  loadingGallery: {
-    id: `creatives.containersV2.Assets.Gallery.loadingGallery`,
-    defaultMessage: 'Loading gallery...',
-  },
 });

package/v2Containers/CallTask/index.js

@@ -70,7 +70,7 @@ export class CallTask extends React.Component { // eslint-disable-line react/pre
     };
   }
   render() {
-    const { intl, onCallTaskSubmit, templateData, loadingMetaEntities, metaEntities, selectedOfferDetails } = this.props;
+    const { intl, onCallTaskSubmit, templateData, loadingMetaEntities, metaEntities } = this.props;
     const { formatMessage } = intl;
     const { mode } = this.state;
     return (
@@ -82,7 +82,6 @@ export class CallTask extends React.Component { // eslint-disable-line react/pre
             mode={mode}
             templateData={templateData}
             onCallTaskSubmit={onCallTaskSubmit}
-            selectedOfferDetails={selectedOfferDetails}
           />
           :
             <div>
@@ -133,7 +132,6 @@ CallTask.propTypes = {
   showContentInSlidebox: PropTypes.bool,
   onCreateNew: PropTypes.func,
   isFullMode: PropTypes.bool,
-  selectedOfferDetails: PropTypes.array,
 };
 
 

package/v2Containers/Cap/index.js

@@ -74,6 +74,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
     //locale = 'zh';
     console.log('Setting final locale as', locale);
     moment.locale(locale);
+    this.props.locationActions.changeLocale(locale);
   }
 
   componentWillReceiveProps(nextProps) {
@@ -131,10 +132,8 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
 
   getMappedLocale(locale) {
     const map = {
-      'en': 'en-US',
+      'en': 'en',
       'zh-cn': 'zh',
-      'en-US': 'en-US',
-      'zh': 'zh',
     };
     return map[locale];
   }