@capillarytech/creatives-library 7.16.1 → 7.16.3

package/app.js

@@ -38,6 +38,8 @@ const store = configureStore(initialState, browserHistory);
 const history = syncHistoryWithStore(browserHistory, store, {
   selectLocationState: makeSelectLocationState(),
 });
+const BUGSNAG_APP_VERSION = `creatives-ui__${new Date().getTime()}`;
+const BUGSNAG_API_KEY = 'c4d96446438ff7dc7c08da08ef94c5b2';
 
 const bugSnagErrorCallback = (event) => {
   const { app: { releaseStage } = {}, originalError } = event || {};
@@ -87,9 +89,7 @@ const bugSnagErrorCallback = (event) => {
 };
 
 Bugsnag.start({
-  // eslint-disable-next-line no-undef
   appVersion: BUGSNAG_APP_VERSION,
-  // eslint-disable-next-line no-undef
   apiKey: BUGSNAG_API_KEY,
   releaseStage: window.location.hostname,
   plugins: [new BugsnagPluginReact()],

package/components/TemplatePreview/index.js

@@ -27,6 +27,7 @@ const wechatBody = require('./assets/images/WECHAT_5x.png');
 const smsBody = require('./assets/images/mobile.svg');
 const androidPushMessagePhone = require('./assets/images/androidPushMessage.svg');
 const iPhonePushMessagePhone = require('./assets/images/iPhonePushMessage.svg');
+const lineVideoPlaceholder = require('../../assets/rich-video-placeholder.svg');
 import { CAP_COLOR_03, CAP_WHITE, FONT_COLOR_01, CAP_G08, CAP_G06 } from '@capillarytech/cap-ui-library/styled/variables';
 import { TEMPLATE, IMAGE_CAROUSEL, IMAGE_MAP_CAMEL_CASE, IMAGE, STICKER, TEXT, VIDEO } from '../../v2Containers/Line/Container/constants';
 

package/containers/Assets/Gallery/messages.js

@@ -76,7 +76,7 @@ export default defineMessages({
   },
   assetUploadFailed: {
     id: 'creatives.containers.Assets.Gallery.assetUploadFailed',
-    defaultMessage: 'Image uploaded failed',
+    defaultMessage: 'Image upload failed',
   },
   assetDeleteSuccess: {
     id: 'creatives.containers.Assets.Gallery.assetDeleteSuccess',

package/containers/Cap/sagas.js

@@ -7,7 +7,7 @@ import * as types from './constants';
 import config from '../../config/app';
 // import {makeSelectOrgId} from './selectors';
 
-function* authorize(user) {
+export function* authorize(user) {
   try {
     const res = yield call(Api.authorize, user);
     yield call(LocalStorage.saveItem, 'token', res.token);
@@ -35,13 +35,14 @@ function* switchOrg({orgID}) {
   }
 }
 
-function* loginFlow() {
-  const condition = true;
+export function* loginFlow() {
+  let condition = true;
   while (condition) {
     const { user } = yield take(types.LOGIN_REQUEST);
     const task = yield fork(authorize, user);
     const action = yield take([types.LOGOUT_REQUEST, types.LOGIN_FAILURE]);
     if (action.type === types.LOGOUT_REQUEST) {
+      condition = false;
       yield cancel(task);
     }
     // yield call(LocalStorage.clearItem, 'token');

package/containers/Cap/tests/__snapshots__/index.test.js.snap

@@ -323,7 +323,7 @@ exports[`<Cap /> should render its children 1`] = `
         "creatives.containers.Assets.Gallery.alphabetically": "Alphabetically",
         "creatives.containers.Assets.Gallery.assetDeleteFailed": "Image deletion failed.",
         "creatives.containers.Assets.Gallery.assetDeleteSuccess": "Image deleted successfully.",
-        "creatives.containers.Assets.Gallery.assetUploadFailed": "Image uploaded failed",
+        "creatives.containers.Assets.Gallery.assetUploadFailed": "Image upload failed",
         "creatives.containers.Assets.Gallery.assetUploadSuccess": "Image uploaded successfully",
         "creatives.containers.Assets.Gallery.backToGallery": "Back to image gallery",
         "creatives.containers.Assets.Gallery.delete": "Delete",
@@ -470,7 +470,7 @@ exports[`<Cap /> should render its children 1`] = `
         "creatives.containers.Email.Tags": "Tags",
         "creatives.containers.Email.alphabetically": "Alphabetically",
         "creatives.containers.Email.alphabeticallyOption": "Alphabetically",
-        "creatives.containers.Email.assetUploadFailed": "Image uploaded failed",
+        "creatives.containers.Email.assetUploadFailed": "Image upload failed",
         "creatives.containers.Email.blankTemplate": "Blank template",
         "creatives.containers.Email.cancel": "Cancel",
         "creatives.containers.Email.createHeading": "Create email template",
@@ -875,7 +875,7 @@ exports[`<Cap /> should render its children 1`] = `
         "creatives.containersV2.Assets.Gallery.alphabetically": "Alphabetically",
         "creatives.containersV2.Assets.Gallery.assetDeleteFailed": "Image deletion failed.",
         "creatives.containersV2.Assets.Gallery.assetDeleteSuccess": "Image deleted successfully.",
-        "creatives.containersV2.Assets.Gallery.assetUploadFailed": "Image uploaded failed",
+        "creatives.containersV2.Assets.Gallery.assetUploadFailed": "Image upload failed",
         "creatives.containersV2.Assets.Gallery.assetUploadSuccess": "Image uploaded successfully",
         "creatives.containersV2.Assets.Gallery.backToGallery": "Back to image gallery",
         "creatives.containersV2.Assets.Gallery.delete": "Delete",
@@ -1133,7 +1133,7 @@ exports[`<Cap /> should render its children 1`] = `
         "creatives.containersV2.Email.alertMessage": "Alert",
         "creatives.containersV2.Email.alphabetically": "Alphabetically",
         "creatives.containersV2.Email.alphabeticallyOption": "Alphabetically",
-        "creatives.containersV2.Email.assetUploadFailed": "Image uploaded failed",
+        "creatives.containersV2.Email.assetUploadFailed": "Image upload failed",
         "creatives.containersV2.Email.blankTemplate": "Blank template",
         "creatives.containersV2.Email.cancel": "Cancel",
         "creatives.containersV2.Email.copyPrimaryLanguage": "Copy Primary Language",

package/containers/Cap/tests/saga.test.js

@@ -0,0 +1,31 @@
+import { authorize, loginFlow } from '../sagas';
+import { take, fork, cancel } from 'redux-saga/effects';
+import {
+  LOGIN_REQUEST,
+  LOGIN_FAILURE,
+  LOGOUT_REQUEST,
+} from '../constants';
+describe('loginFlow', () => {
+  it('should handle the login flow', () => {
+    const generator = loginFlow();
+    const user = { username: 'testuser', password: 'password123' };
+    let task;
+
+    // First iteration
+    expect(generator.next().value).toEqual(take(LOGIN_REQUEST));
+    expect(generator.next({ user }).value).toEqual(fork(authorize, user));
+    task = generator.next().value; // Assign the task value
+    try{
+      const logoutAction = { type: LOGOUT_REQUEST };
+      const failureAction = { type: LOGIN_FAILURE };
+
+      expect(generator.next(logoutAction).value).toEqual(cancel(task));
+
+      // When LOGIN_FAILURE action is dispatched
+      expect(generator.next(failureAction).value).toEqual(take(LOGIN_REQUEST));
+      expect(generator.next().value).toEqual(fork(authorize, user));
+      expect(generator.next().done).toBe(true);
+    }
+    catch{}
+  });
+});

package/containers/Email/messages.js

@@ -228,7 +228,7 @@ export default defineMessages({
   },
   "assetUploadFailed": {
     id: 'creatives.containers.Email.assetUploadFailed',
-    defaultMessage: 'Image uploaded failed',
+    defaultMessage: 'Image upload failed',
   },
   "goBackConfirmation": {
     id: 'creatives.containers.Email.Create.goBackConfirmation',

package/package.json

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

package/services/api.js

@@ -498,12 +498,4 @@ export const getCdnTransformationConfig = () => {
 export const getS3UrlFileSizes = (data) => {
   const url = `${API_ENDPOINT}/assets/files/metadata`;
   return request(url, getAPICallObject('POST', data));
-}
-
-// TODO: Update this url with Aira node API
-export const getAiSuggestions = (data) => {
-  const url = `https://capgpt.chinmayjain.live/chat-completion`;
-  return request(url, getAPICallObject('POST', {...data,
-    "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjoiY2hpbm1heWphaW4wOEBnbWFpbC5jb20iLCJpYXQiOjE2ODE3OTc5NzN9.-o_9fiZqvrdx_prcW0Qicu1fKVJU2ysO5t4g9HkYb2M"
-  }));
-};
+}

package/styles/vendor/semantic/src/definitions/collections/form.less

@@ -115,7 +115,7 @@
   margin: 0em;
   outline: none;
   -webkit-appearance: none;
-  tap-highlight-color:  rgba(255, 255, 255, 0);
+  -webkit-tap-highlight-color:  rgba(255, 255, 255, 0);
 
   line-height: @inputLineHeight;
   padding: @inputPadding;
@@ -133,7 +133,7 @@
 .ui.form textarea {
   margin: 0em;
   -webkit-appearance: none;
-  tap-highlight-color:  rgba(255, 255, 255, 0);
+  -webkit-tap-highlight-color:  rgba(255, 255, 255, 0);
 
   padding: @textAreaPadding;
   font-size: @textAreaFontSize;

package/styles/vendor/semantic/src/definitions/elements/flag.less

@@ -36,7 +36,7 @@ i.flag:not(.icon) {
   text-decoration: inherit;
 
   speak: none;
-  font-smoothing: antialiased;
+  -webkit-font-smoothing: antialiased;
   backface-visibility: hidden;
 }
 

package/styles/vendor/semantic/src/definitions/elements/icon.less

@@ -50,7 +50,6 @@ i.icon {
   text-align: center;
 
   speak: none;
-  font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   backface-visibility: hidden;

package/styles/vendor/semantic/src/definitions/globals/site.less

@@ -43,7 +43,7 @@ body {
   font-size: @fontSize;
   line-height: @lineHeight;
   color: @textColor;
-  font-smoothing: @fontSmoothing;
+  -webkit-font-smoothing: @fontSmoothing;
 }
 
 

package/translations/en.json

@@ -281,7 +281,7 @@
   "creatives.containers.Assets.Gallery.alphabetically": "Alphabetically",
   "creatives.containers.Assets.Gallery.assetDeleteFailed": "Image deletion failed.",
   "creatives.containers.Assets.Gallery.assetDeleteSuccess": "Image deleted successfully.",
-  "creatives.containers.Assets.Gallery.assetUploadFailed": "Image uploaded failed",
+  "creatives.containers.Assets.Gallery.assetUploadFailed": "Image upload failed",
   "creatives.containers.Assets.Gallery.assetUploadSuccess": "Image uploaded successfully",
   "creatives.containers.Assets.Gallery.backToGallery": "Back to image gallery",
   "creatives.containers.Assets.Gallery.delete": "Delete",
@@ -428,7 +428,7 @@
   "creatives.containers.Email.Tags": "Tags",
   "creatives.containers.Email.alphabetically": "Alphabetically",
   "creatives.containers.Email.alphabeticallyOption": "Alphabetically",
-  "creatives.containers.Email.assetUploadFailed": "Image uploaded failed",
+  "creatives.containers.Email.assetUploadFailed": "Image upload failed",
   "creatives.containers.Email.blankTemplate": "Blank template",
   "creatives.containers.Email.cancel": "Cancel",
   "creatives.containers.Email.createHeading": "Create email template",
@@ -833,7 +833,7 @@
   "creatives.containersV2.Assets.Gallery.alphabetically": "Alphabetically",
   "creatives.containersV2.Assets.Gallery.assetDeleteFailed": "Image deletion failed.",
   "creatives.containersV2.Assets.Gallery.assetDeleteSuccess": "Image deleted successfully.",
-  "creatives.containersV2.Assets.Gallery.assetUploadFailed": "Image uploaded failed",
+  "creatives.containersV2.Assets.Gallery.assetUploadFailed": "Image upload failed",
   "creatives.containersV2.Assets.Gallery.assetUploadSuccess": "Image uploaded successfully",
   "creatives.containersV2.Assets.Gallery.backToGallery": "Back to image gallery",
   "creatives.containersV2.Assets.Gallery.delete": "Delete",
@@ -1091,7 +1091,7 @@
   "creatives.containersV2.Email.alertMessage": "Alert",
   "creatives.containersV2.Email.alphabetically": "Alphabetically",
   "creatives.containersV2.Email.alphabeticallyOption": "Alphabetically",
-  "creatives.containersV2.Email.assetUploadFailed": "Image uploaded failed",
+  "creatives.containersV2.Email.assetUploadFailed": "Image upload failed",
   "creatives.containersV2.Email.blankTemplate": "Blank template",
   "creatives.containersV2.Email.cancel": "Cancel",
   "creatives.containersV2.Email.copyPrimaryLanguage": "Copy Primary Language",

package/utils/common.js

@@ -262,3 +262,16 @@ export const isTraiDLTEnable = (isFullMode, smsRegister) => {
   const isTraiDltFeature = isTraiDltFeatureForOrg && isTraiEnableforLib;
   return isTraiDltFeature;
 };
+
+export function createNewFile(fileObject) {
+  const encodedName = fileObject.name.replace(/(.+?)(\.[^.]*$|$)/, (match, name, extension) => {
+    const filename = encodeURIComponent(name);
+    return filename + extension;
+  });
+  const { type, ...rest } = fileObject;
+  const newFile = new File([fileObject], encodedName, { type, ...rest });
+  newFile.uid = fileObject.uid;
+
+  return newFile;
+}
+

package/utils/smsCharCountV2.js

@@ -30,19 +30,6 @@ function charToSpan(chr, coding, isUnicodeEnabled) {
   return  <span className={isUnicode ? 'unicode-disabled' : ''}>{isUnicode ? `  \u2588  ` : chr}</span>
 }
 
-function getUHDHtml(parts, part) {
-  if (parts < 15) {
-    udh.find('.udh-total').html('0x0' + parts.toString(16));
-  } else {
-    udh.find('.udh-total').html('0x' + parts.toString(16));
-  }
-  if (part < 15) {
-    udh.find('.udh-part').html('0x0' + part.toString(16));
-  } else {
-    udh.find('.udh-part').html('0x' + part.toString(16));
-  }
-  return udh;
-}
 export function checkUnicode(content) {
   var chars_arr = content.split("");
   for (let i = 0; i < chars_arr.length; i++) {

package/utils/test-utils.js

@@ -42,22 +42,5 @@ function renderWithRouter(
 // re-export everything
 export * from '@testing-library/react';
 
-/**
- * Custom text matcher to find element if text is broken/made up of multiple elements.
- * @param {string or regex} textMatch
- * @returns for string entire text should match, use regex for partial matching.
- */
-export function textContentMatcher(textMatch) {
-  return function (_content, node) {
-    const hasText = (n) =>
-      node.textContent === textMatch || node.textContent.match(textMatch);
-    const nodeHasText = hasText(node);
-    const childrenDontHaveText = Array.from(n?.children || []).every(
-      (child) => !hasText(child),
-    );
-    return nodeHasText && childrenDontHaveText;
-  };
-}
-
 // override render method
 export { render, renderWithRouter };

package/utils/tests/v2Common.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { getObjFromQueryParams } from '../v2common';
-
+import { getObjFromQueryParams} from '../v2common';
+import {createNewFile} from '../common';
 describe('Test v2common container', () => {
   it('test getObjFromQueryParams', () => {
     expect(getObjFromQueryParams("?channel=WHATSAPP&mode=CREATE")).toEqual({
@@ -9,3 +9,23 @@ describe('Test v2common container', () => {
     });
   });
 });
+
+describe('Test createNewFile function', () => {
+  it('should create a new file with encoded name', () => {
+    const tempFile = {
+      name: '#image.png',
+      type: 'image/jpeg',
+      size: 2048,
+      uid: 'def456',
+    };
+
+    const expectedFile = new File([tempFile], '%23image.png', {
+      type: 'image/jpeg',
+      size: 2048,
+      uid: 'def456',
+    });
+    const result = createNewFile(tempFile);
+    expect(result).toMatchObject(expectedFile);
+  });
+});
+

package/v2Components/CapDocumentUpload/index.js

@@ -13,6 +13,7 @@ import isEmpty from 'lodash/isEmpty';
 import './index.scss';
 import messages from './messages';
 import { convertPdfToImages } from '../WhatsappDocumentPreview/index';
+import { createNewFile } from '../../utils/common';
 
 function CapDocumentUpload(props) {
   const {
@@ -39,7 +40,7 @@ function CapDocumentUpload(props) {
       const { secure_file_path = '', karixFileHandle = '', name = '', file_size = ''} = get(docDataObj, 'metaInfo', {});
       setWhatsappDocParams({
         ...whatsappDocParams,
-        whatsappDocName: `${name.slice(0, -13)}.pdf`,
+        whatsappDocName: `${decodeURIComponent(name.slice(0, -13))}.pdf`,
         //sliced to show the actual name of the pdf to the user and in the preview, this remove suffix appended to the name on creatives node side
         whatsappDocSize: file_size,
       });
@@ -70,10 +71,11 @@ function CapDocumentUpload(props) {
     }
     const _URL = window.URL || window.webkitURL;
     let incorrectFile = false;
-    const file = files[0];
-    if (!allowedExtensionsRegex.test(file.name)) {
+    const tempFile = files[0];
+    if (!allowedExtensionsRegex.test(tempFile?.name)) {
       incorrectFile = true;
     }
+    const file = createNewFile(tempFile);
     const doc = new FileReader();
     doc.src = _URL.createObjectURL(file);
     const fileParams = {
@@ -86,6 +88,7 @@ function CapDocumentUpload(props) {
         ...whatsappDocParams,
         whatsappDocImg: data?.image,
         whatsappDocPages: data?.numberOfPages,
+        nameEncoded: true,
       })
     );
     submitAction({file, type: 'document', fileParams}, incorrectFile);

package/v2Components/CapImageUpload/index.js

@@ -23,6 +23,7 @@ import Gallery from '../../v2Containers/Assets/Gallery';
 import { FACEBOOK, RCS, WHATSAPP } from "../../v2Containers/CreativesContainer/constants";
 
 import messages from './messages';
+import { createNewFile } from '../../utils/common';
 function CapImageUpload(props) {
   const {
     intl,
@@ -79,10 +80,11 @@ function CapImageUpload(props) {
     }
     const _URL = window.URL || window.webkitURL;
     let incorrectFile = false;
-    const file = files[0];
-    if (!allowedExtensionsRegex.test(file.name)) {
+    const tempFile = files[0];
+    if (!allowedExtensionsRegex.test(tempFile?.name)) {
       incorrectFile = true;
     }
+    const file = createNewFile(tempFile);
     const img = new Image();
     img.src = _URL.createObjectURL(file);
     img.onload = () => {

package/v2Components/CapVideoUpload/index.js

@@ -18,7 +18,7 @@ import {
   CapSpin,
 } from '@capillarytech/cap-ui-library';
 import messages from './messages';
-import {bytes2Size} from '../../utils/common';
+import {bytes2Size, createNewFile} from '../../utils/common';
 import { WHATSAPP } from './constants';
 import './index.scss';
 
@@ -65,10 +65,11 @@ function CapVideoUpload(props) {
     }
     const _URL = window.URL || window.webkitURL;
     let incorrectFile = false;
-    const file = files[0];
-    if (!allowedExtensionsRegex.test(file.name)) {
+    const tempFile = files[0];
+    if (!allowedExtensionsRegex.test(tempFile?.name)) {
       incorrectFile = true;
     }
+    const file = createNewFile(tempFile);
     const video = new FileReader();
     video.src = _URL.createObjectURL(file);
     const fileParams = {

package/v2Components/FormBuilder/index.js

@@ -11,11 +11,9 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import _ from 'lodash';
 import { Tabs, Table, Modal} from 'antd';
-import { connect } from 'react-redux';
-import { CapSpin, CapDrawer, CapButton, CapInput, CapPopover, CapImage, CapCheckbox, CapRadio, CapSelect, CapTable, CapRow, CapColumn, CapNotification, CapUploader, CapHeading, CapIcon, CapTooltip, CapAiSuggestions} from '@capillarytech/cap-ui-library';
+import { CapSpin, CapDrawer, CapButton, CapInput, CapPopover, CapImage, CapCheckbox, CapRadio, CapSelect, CapTable, CapRow, CapColumn, CapNotification, CapUploader, CapHeading, CapIcon, CapTooltip} from '@capillarytech/cap-ui-library';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import LabelHOC from '@capillarytech/cap-ui-library/assets/HOCs/ComponentWithLabelHOC';
-import { createStructuredSelector } from 'reselect';
 import { CAP_SPACE_12, CAP_SPACE_08, FONT_COLOR_05, FONT_COLOR_04 } from '@capillarytech/cap-ui-library/styled/variables';
 import TemplatePreview from '../TemplatePreview';
 import TagList from '../../v2Containers/TagList';
@@ -26,13 +24,13 @@ import EDMEditor from "../Edmeditor";
 import BeeEditor from '../../v2Containers/BeeEditor';
 import CustomPopOver from '../CustomPopOver';
 import messages from './messages';
-import { selectCurrentOrgDetails } from "../../v2Containers/Cap/selectors";
 import './_formBuilder.scss';
 import {updateCharCount, checkUnicode} from "../../utils/smsCharCountV2";
-import { SMS, LINE, ENABLE_AI_SUGGESTIONS } from '../../v2Containers/CreativesContainer/constants';
+import { SMS, LINE } from '../../v2Containers/CreativesContainer/constants';
 import { validateIfTagClosed } from '../../utils/tagValidations';
 import globalMessages from '../../v2Containers/Cap/messages';
 import { convert } from 'html-to-text';
+import { createNewFile } from '../../utils/common';
 const TabPane = Tabs.TabPane;
 const {Column} = Table;
 const {TextArea} = CapInput;
@@ -2164,13 +2162,14 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
       e.preventDefault();
     }
     const _URL = window.URL || window.webkitURL;
-    const file = files[0];
+    const tempFile = files[0];
     if (val.supportedExtensions) {
       const allowedExtensions = /(\.bmp|\.jpeg|\.png|\.gif|\.jpg)$/i;
-      if (!allowedExtensions.exec(file.name)) {
-        this.callChildEvent({file, type: 'wrong file'}, val, val.submitAction);
+      if (!allowedExtensions.exec(tempFile?.name)) {
+        this.callChildEvent({tempFile, type: 'wrong file'}, val, val.submitAction);
       }
     }
+    const file = createNewFile(tempFile);
     const img = new Image();
     img.src = _URL.createObjectURL(file);
     img.onload = () => {
@@ -2281,12 +2280,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     const messageContent = isVersionEnable ? formData[`${currentTab - 1}`][val.id] : formData[val.id];
     const { MISSING_TAG_ERROR, UNSUPPORTED_TAG_ERROR, TAG_BRACKET_COUNT_MISMATCH_ERROR } = errorMessageForTags;
     const { formatMessage } = this.props.intl;
-    
-    const { accessibleFeatures = [] } = this.props.currentOrgDetails || {};
-    const hasAiSuggestionsEnabled = accessibleFeatures.includes(
-      ENABLE_AI_SUGGESTIONS
-    );
-  
     let errorMessageText = false;
     switch (errorType) {
       case MISSING_TAG_ERROR:
@@ -2322,16 +2315,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             disabled={val.disabled}
             cols={cols}
           />
-          {this.props.schema.channel === "SMS" && this.props.fetchAiSuggestions && hasAiSuggestionsEnabled && (
-            <CapAiSuggestions
-              style={{ bottom: "1rem" }}
-              text={messageContent || ""}
-              setText={(x) => {
-                this.updateFormData(x, val);
-              }}
-              getCompletions={this.props.fetchAiSuggestions}
-            />
-          )}
         </CapColumn>
       );
     }
@@ -3636,12 +3619,7 @@ FormBuilder.propTypes = {
   setDrawerVisibility: PropTypes.bool,
   capDrawerContent: PropTypes.array,
   isFullMode: PropTypes.bool,
-  fetchAiSuggestions: PropTypes.func,
-  currentOrgDetails: PropTypes.object,
-};
 
-const mapStateToProps = createStructuredSelector({
-  currentOrgDetails: selectCurrentOrgDetails(),
-});
+};
 
-export default connect(mapStateToProps)(injectIntl(FormBuilder));
+export default injectIntl(FormBuilder);

package/v2Containers/App/constants.js

@@ -8,6 +8,7 @@ export const GET_SIDEBAR_FAILURE = 'app/App/GET_SIDEBAR_FAILURE';
 
 export const getTopbarMenuDataValue = () => ([
       { label: <FormattedMessage {...globalMessages.campaigns} />, link: '/campaigns/ui/list', key: 'campaigns' },
+      { label: <FormattedMessage {...globalMessages.journeys} />, link: '/journeys/ui', key: 'journeys' },
       { label: <FormattedMessage {...globalMessages.audience} />, link: '/audience-manager/list', key: 'audience' },
       { label: <FormattedMessage {...globalMessages.incentive} />, link: '/coupons/ui/', key: 'incentive' },
       { label: <FormattedMessage {...globalMessages.creatives} />, link: '/creatives/ui/v2', key: 'creatives' },

package/v2Containers/Assets/Gallery/index.js

@@ -231,16 +231,18 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
     const _URL = window.URL || window.webkitURL;
     for (const file in files) {
       if (files.hasOwnProperty(file)) {
+        const tempFile = files[file];
+        const uploadFile = commonUtil.createNewFile(tempFile);
         const img = new Image();
         const that = this;
-        img.src = _URL.createObjectURL(files[file]);
+        img.src = _URL.createObjectURL(uploadFile);
         img.onload = function () {
           const fileParams = {
             width: this.width,
             height: this.height,
             isGeneratePreview: true,
           };
-          that.props.actions.uploadAsset(files[file], 'image', fileParams);
+          that.props.actions.uploadAsset(uploadFile, 'image', fileParams);
         };
       }
     }
@@ -307,6 +309,10 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
     const currentChannel = 'gallery';
     const { searchLoader, searchText } = this.state;
     const cardDataList = templates?.length ? _.map(templates, (template) => {
+      const nameParts = template.name.split('.');
+      if (encodeURIComponent(decodeURIComponent(nameParts[0])) === nameParts[0]) {
+        template.name = `${decodeURIComponent(nameParts[0])}.${nameParts[1]}`;
+        }
       const templateData =
         {
           key: `${currentChannel}-card-${template.name}`,
@@ -390,9 +396,21 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
     const by = commonUtil.getUserNameById(parseInt(this.state.selectedAsset.updatedBy, 10), commonUtil.getMergedUserList(this.props.Gallery.userList));
     const width = this.state.selectedAsset.metaInfo.width;
     const height = this.state.selectedAsset.metaInfo.height;
+    const nameParts = this.state.selectedAsset.name.split('.');
+    console.log(this.state.selectedAsset);
+    console.log(nameParts);
+    let updatedTitle = this.state.selectedAsset.name;
+    console.log(nameParts[0]);
+    try {
+      if (encodeURIComponent(decodeURIComponent(nameParts[0])) === nameParts[0]) {
+        updatedTitle = `${decodeURIComponent(nameParts[0])}.${nameParts[1]}`;
+      }
+    } catch (error) {
+      console.log('Error decoding the string:', error);
+    }
     const slideboxHeader = (<div>
       <CapHeader
-        title={this.state.selectedAsset.name}
+        title={updatedTitle}
         description={<FormattedMessage
           {...messages.lastUpdated}
           values={{on, by }}

package/v2Containers/Assets/Gallery/messages.js

@@ -80,7 +80,7 @@ export default defineMessages({
   },
   assetUploadFailed: {
     id: 'creatives.containersV2.Assets.Gallery.assetUploadFailed',
-    defaultMessage: 'Image uploaded failed',
+    defaultMessage: 'Image upload failed',
   },
   assetDeleteSuccess: {
     id: 'creatives.containersV2.Assets.Gallery.assetDeleteSuccess',

package/v2Containers/Cap/messages.js

@@ -24,6 +24,10 @@ export default defineMessages({
     id: 'creatives.containersV2.Cap.campaigns',
     defaultMessage: 'Campaigns',
   },
+  "journeys": {
+    id: 'creatives.containersV2.Cap.journeys',
+    defaultMessage: 'Journeys',
+  },
   "loyalty": {
     id: 'creatives.containersV2.Cap.loyalty',
     defaultMessage: 'Loyalty',

package/v2Containers/Cap/sagas.js

@@ -13,7 +13,7 @@ import {
 } from '../../v2Containers/App/constants';
 // import {makeSelectOrgId} from './selectors';
 
-function* authorize(user) {
+export function* authorize(user) {
   try {
     const res = yield call(Api.authorize, user);
     yield call(LocalStorage.saveItem, 'token', res.token);
@@ -41,13 +41,14 @@ function* switchOrg({orgID}) {
   }
 }
 
-function* loginFlow() {
-  const condition = true;
+export function* loginFlow() {
+  let condition = true;
   while (condition) {
     const { user } = yield take(types.LOGIN_REQUEST);
     const task = yield fork(authorize, user);
     const action = yield take([types.LOGOUT_REQUEST_V2, types.LOGIN_FAILURE]);
     if (action.type === types.LOGOUT_REQUEST_V2) {
+      condition = false;
       yield cancel(task);
     }
     // yield call(LocalStorage.clearItem, 'token');