@capillarytech/creatives-library 7.17.15 → 7.17.17

package/package.json

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

package/v2Components/CapTagList/index.js

@@ -211,7 +211,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     window.open(TAG_TRANSLATION_DOC, '_blank');
   }
   render() {
-    const { hidePopover = false, tags = {}, intl = {}, moduleFilterEnabled, label, modalProps } = this.props;
+    const { hidePopover = false, tags = {}, intl = {}, moduleFilterEnabled, label, modalProps, channel } = this.props;
     const tg = tags;
     const {formatMessage} = intl;
     const { tagValue, expandedKeys, autoExpandParent, searchValue, visible, translationLang } = this.state;
@@ -293,7 +293,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           onVisibleChange={this.togglePopoverVisibility}
           content={contentSection}
           trigger="click"
-          placement="bottom"
+          placement={channel === 'EMAIL' ? "bottom" : "rightTop"}
           >
           <CapButton isAddBtn type="flat">{label || ''}</CapButton>
         </CapPopover>
@@ -331,6 +331,7 @@ CapTagList.propTypes = {
   modalProps: PropTypes.any,
   disableTagsDetails: PropTypes.object,
   currentOrgDetails: PropTypes.object,
+  channel: PropTypes.string,
 };
 
 CapTagList.defaultValue = {

package/v2Components/FormBuilder/index.js

@@ -96,7 +96,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
       popoverVisible: false,
       customPopoverVisible: false,
       isDrawerVisible: false,
-      translationLang: ''
+      translationLang: 'en',
     };
     this.renderForm = this.renderForm.bind(this);
     this.updateFormData = this.updateFormData.bind(this);
@@ -3066,6 +3066,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     id={val.id}
                     userLocale={this.props.userLocale}
                     selectedOfferDetails={this.props.selectedOfferDetails}
+                    channel={this.props.schema.channel}
                   />
                 </CapColumn>
               );
@@ -3437,11 +3438,11 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
   componentDidMount() {
     const user = localStorage.getItem('user');
     let locale = 'en';
-    moment.locale(locale);
     if (user) {
       locale = JSON.parse(user).lang || locale;
     }
     locale = this.getTranslationMappedLocale(locale);
+    moment.locale(locale);
     this.setState({
       translationLang: locale,
     });

package/v2Containers/TagList/index.js

@@ -250,6 +250,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
           moduleFilterEnabled={this.props.moduleFilterEnabled}
           modalProps={this.props.modalProps}
           currentOrgDetails={this.props.currentOrgDetails}
+          channel={this.props.channel}
         />
       </div>
     );
@@ -275,6 +276,7 @@ TagList.propTypes = {
   hidePopover: PropTypes.bool,
   modalProps: PropTypes.any,
   currentOrgDetails: PropTypes.object,
+  channel: PropTypes.string,
 };
 
 const mapStateToProps = createStructuredSelector({