@capillarytech/creatives-library 7.18.0-beta.0 → 8.0.0

package/app.js

@@ -1,43 +1,41 @@
 import 'babel-polyfill';
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import { Provider } from 'react-redux';
-import createHistory from 'history/lib/createBrowserHistory';
-import { applyRouterMiddleware, Router, useRouterHistory } from 'react-router';
-import { syncHistoryWithStore } from 'react-router-redux';
-import { useScroll } from 'react-router-scroll';
+// import createHistory from 'history/lib/createBrowserHistory';
+// import { applyRouterMiddleware, Router, useRouterHistory } from 'react-router';
+// import { useScroll } from 'react-router-scroll';
+import history from 'utils/history';
 import CapSomethingWentWrong from '@capillarytech/cap-ui-library/CapSomethingWentWrong';
 import Bugsnag from '@bugsnag/js';
 import BugsnagPluginReact from '@bugsnag/plugin-react';
-import CapV2 from 'v2Containers/Cap';
-import Cap from 'containers/Cap';
-import { LocaleProvider } from 'antd';
-import { makeSelectLocationState } from 'containers/Cap/selectors';
+// import { makeSelectLocationState } from 'containers/Cap/selectors';
 import LanguageProvider from 'v2Containers/LanguageProvider';
 import FontFaceObserver from 'fontfaceobserver';
 /* eslint-disable import/no-unresolved, import/extensions */
 import '!file-loader?name=[name].[ext]!./favicon.ico';
 /* eslint-enable import/no-unresolved, import/extensions */
-import configureStore from './store';
+import { configureStore }  from '@capillarytech/vulcan-react-sdk/utils';
+import { initialReducer } from './initialReducer';
 import { translationMessages } from './i18n';
 import './global-styles';
-import createRoutes from './routes';
 import initialState from './initialState';
 import './styles/vendor/semantic/dist/semantic.min.css';
 import './styles/main.scss';
 import pathConfig from './config/path';
 import ignoredErrorMessages from './utils/ignoredErrorMessages';
-// addLocaleData([...en, ...es, ...fr, ...it, ...zh]);
+import App from './containers/App';
 
-const browserHistory = useRouterHistory(createHistory)({
-  basename: pathConfig.publicPath,
-});
+// const browserHistory = useRouterHistory(createHistory)({
+//   basename: pathConfig.publicPath,
+// });
 
-const store = configureStore(initialState, browserHistory);
+const store = configureStore(initialState, initialReducer, history);
+const MOUNT_NODE = document.getElementById('app');
 
-const history = syncHistoryWithStore(browserHistory, store, {
-  selectLocationState: makeSelectLocationState(),
-});
+// const history = syncHistoryWithStore(browserHistory, store, {
+//   selectLocationState: makeSelectLocationState(),
+// });
 const BUGSNAG_APP_VERSION = `creatives-ui__${new Date().getTime()}`;
 const BUGSNAG_API_KEY = 'c4d96446438ff7dc7c08da08ef94c5b2';
 
@@ -68,7 +66,7 @@ const bugSnagErrorCallback = (event) => {
     userId = id;
     userName = `${firstName} ${lastName}`;
     userEmail = loginName;
-    orgName = proxyOrgList.find(({orgID}) => orgID === Number(orgId)).orgName;
+    orgName = proxyOrgList.find(({ orgID }) => orgID === Number(orgId)).orgName;
   } catch (error) {
     userId = '';
     userName = '';
@@ -100,43 +98,18 @@ const ErrorBoundary = Bugsnag.getPlugin('react').createErrorBoundary(React);
 
 export const BugsnagClient = Bugsnag;
 
-const rootRoute = {
-  component: (props) => {
-    // eslint-disable-next-line react/prop-types
-    if (
-      props.location.pathname === 'v2' ||
-      props.location.pathname === 'v2/' ||
-      props.location.pathname === 'v2/loyalty' ||
-      props.location.pathname === 'v2/somethingwentwrong'
-    ) {
-      return <CapV2 {...props} />;
-    }
-    return <Cap {...props} />;
-  },
-  childRoutes: createRoutes(store),
-};
-
-const ErrorScreen = () => <CapSomethingWentWrong url={`${pathConfig.publicPath}v2`} />
-
+const ErrorScreen = () => <CapSomethingWentWrong url={`${pathConfig.publicPath}/v2`} />
+const root = createRoot(MOUNT_NODE);
 const render = (messages) => {
-  ReactDOM.render(
+  root.render(
     <Provider store={store}>
-      <LocaleProvider>
-        <ErrorBoundary FallbackComponent={ErrorScreen}>
-          <LanguageProvider messages={messages}>
-            <div>
-              <Router
-                history={(history)}
-                routes={rootRoute}
-                render={applyRouterMiddleware(useScroll())
-                }
-              />
-            </div>
-          </LanguageProvider>
-        </ErrorBoundary>
-      </LocaleProvider>
+        <LanguageProvider messages={messages}>
+          <ErrorBoundary FallbackComponent={ErrorScreen}>
+            <App />
+          </ErrorBoundary>
+        </LanguageProvider>
     </Provider>,
-    document.getElementById('app')
+    MOUNT_NODE
   );
 };
 

package/assets/Line_Preview_English.svg

@@ -0,0 +1,24 @@
+<svg width="220" height="472" viewBox="0 0 220 472" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_77_525)">
+<path d="M194 0H26C11.6406 0 0 11.6406 0 26V446C0 460.359 11.6406 472 26 472H194C208.359 472 220 460.359 220 446V26C220 11.6406 208.359 0 194 0Z" fill="#101211"/>
+<path d="M202 36H18C13.0294 36 9 40.0294 9 45V431C9 435.971 13.0294 440 18 440H202C206.971 440 211 435.971 211 431V45C211 40.0294 206.971 36 202 36Z" fill="#DFE2E7"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18 36H202C206.97 36 211 40.03 211 45V51H9V45C9 40.03 13.03 36 18 36Z" fill="#202D48"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 82H211V51H9V82Z" fill="#202D48"/>
+<path d="M133.5 14H86.5C85.1193 14 84 15.1193 84 16.5C84 17.8807 85.1193 19 86.5 19H133.5C134.881 19 136 17.8807 136 16.5C136 15.1193 134.881 14 133.5 14Z" fill="#2E2E2E"/>
+<path d="M133.5 455H86.5C85.1193 455 84 456.119 84 457.5C84 458.881 85.1193 460 86.5 460H133.5C134.881 460 136 458.881 136 457.5C136 456.119 134.881 455 133.5 455Z" fill="#2E2E2E"/>
+<path d="M45.5 25C48.5376 25 51 22.5376 51 19.5C51 16.4624 48.5376 14 45.5 14C42.4624 14 40 16.4624 40 19.5C40 22.5376 42.4624 25 45.5 25Z" fill="#2E2E2E"/>
+<path d="M65.5 23C67.433 23 69 21.433 69 19.5C69 17.567 67.433 16 65.5 16C63.567 16 62 17.567 62 19.5C62 21.433 63.567 23 65.5 23Z" fill="#2E2E2E"/>
+<path d="M55.0371 67.8438C55.0371 67.6445 55.0059 67.4688 54.9434 67.3164C54.8848 67.1602 54.7793 67.0195 54.627 66.8945C54.4785 66.7695 54.2715 66.6504 54.0059 66.5371C53.7441 66.4238 53.4121 66.3086 53.0098 66.1914C52.5879 66.0664 52.207 65.9277 51.8672 65.7754C51.5273 65.6191 51.2363 65.4414 50.9941 65.2422C50.752 65.043 50.5664 64.8145 50.4375 64.5566C50.3086 64.2988 50.2441 64.0039 50.2441 63.6719C50.2441 63.3398 50.3125 63.0332 50.4492 62.752C50.5859 62.4707 50.7812 62.2266 51.0352 62.0195C51.293 61.8086 51.5996 61.6445 51.9551 61.5273C52.3105 61.4102 52.707 61.3516 53.1445 61.3516C53.7852 61.3516 54.3281 61.4746 54.7734 61.7207C55.2227 61.9629 55.5645 62.2812 55.7988 62.6758C56.0332 63.0664 56.1504 63.4844 56.1504 63.9297H55.0254C55.0254 63.6094 54.957 63.3262 54.8203 63.0801C54.6836 62.8301 54.4766 62.6348 54.1992 62.4941C53.9219 62.3496 53.5703 62.2773 53.1445 62.2773C52.7422 62.2773 52.4102 62.3379 52.1484 62.459C51.8867 62.5801 51.6914 62.7441 51.5625 62.9512C51.4375 63.1582 51.375 63.3945 51.375 63.6602C51.375 63.8398 51.4121 64.0039 51.4863 64.1523C51.5645 64.2969 51.6836 64.4316 51.8438 64.5566C52.0078 64.6816 52.2148 64.7969 52.4648 64.9023C52.7188 65.0078 53.0215 65.1094 53.373 65.207C53.8574 65.3438 54.2754 65.4961 54.627 65.6641C54.9785 65.832 55.2676 66.0215 55.4941 66.2324C55.7246 66.4395 55.8945 66.6758 56.0039 66.9414C56.1172 67.2031 56.1738 67.5 56.1738 67.832C56.1738 68.1797 56.1035 68.4941 55.9629 68.7754C55.8223 69.0566 55.6211 69.2969 55.3594 69.4961C55.0977 69.6953 54.7832 69.8496 54.416 69.959C54.0527 70.0645 53.6465 70.1172 53.1973 70.1172C52.8027 70.1172 52.4141 70.0625 52.0312 69.9531C51.6523 69.8438 51.3066 69.6797 50.9941 69.4609C50.6855 69.2422 50.4375 68.9727 50.25 68.6523C50.0664 68.3281 49.9746 67.9531 49.9746 67.5273H51.0996C51.0996 67.8203 51.1562 68.0723 51.2695 68.2832C51.3828 68.4902 51.5371 68.6621 51.7324 68.7988C51.9316 68.9355 52.1562 69.0371 52.4062 69.1035C52.6602 69.166 52.9238 69.1973 53.1973 69.1973C53.5918 69.1973 53.9258 69.1426 54.1992 69.0332C54.4727 68.9238 54.6797 68.7676 54.8203 68.5645C54.9648 68.3613 55.0371 68.1211 55.0371 67.8438ZM60.082 70.1172C59.6406 70.1172 59.2402 70.043 58.8809 69.8945C58.5254 69.7422 58.2188 69.5293 57.9609 69.2559C57.707 68.9824 57.5117 68.6582 57.375 68.2832C57.2383 67.9082 57.1699 67.498 57.1699 67.0527V66.8066C57.1699 66.291 57.2461 65.832 57.3984 65.4297C57.5508 65.0234 57.7578 64.6797 58.0195 64.3984C58.2812 64.1172 58.5781 63.9043 58.9102 63.7598C59.2422 63.6152 59.5859 63.543 59.9414 63.543C60.3945 63.543 60.7852 63.6211 61.1133 63.7773C61.4453 63.9336 61.7168 64.1523 61.9277 64.4336C62.1387 64.7109 62.2949 65.0391 62.3965 65.418C62.498 65.793 62.5488 66.2031 62.5488 66.6484V67.1348H57.8145V66.25H61.4648V66.168C61.4492 65.8867 61.3906 65.6133 61.2891 65.3477C61.1914 65.082 61.0352 64.8633 60.8203 64.6914C60.6055 64.5195 60.3125 64.4336 59.9414 64.4336C59.6953 64.4336 59.4688 64.4863 59.2617 64.5918C59.0547 64.6934 58.877 64.8457 58.7285 65.0488C58.5801 65.252 58.4648 65.5 58.3828 65.793C58.3008 66.0859 58.2598 66.4238 58.2598 66.8066V67.0527C58.2598 67.3535 58.3008 67.6367 58.3828 67.9023C58.4688 68.1641 58.5918 68.3945 58.752 68.5938C58.916 68.793 59.1133 68.9492 59.3438 69.0625C59.5781 69.1758 59.8438 69.2324 60.1406 69.2324C60.5234 69.2324 60.8477 69.1543 61.1133 68.998C61.3789 68.8418 61.6113 68.6328 61.8105 68.3711L62.4668 68.8926C62.3301 69.0996 62.1562 69.2969 61.9453 69.4844C61.7344 69.6719 61.4746 69.8242 61.166 69.9414C60.8613 70.0586 60.5 70.1172 60.082 70.1172ZM64.8984 65.0137V70H63.8145V63.6602H64.8398L64.8984 65.0137ZM64.6406 66.5898L64.1895 66.5723C64.1934 66.1387 64.2578 65.7383 64.3828 65.3711C64.5078 65 64.6836 64.6777 64.9102 64.4043C65.1367 64.1309 65.4062 63.9199 65.7188 63.7715C66.0352 63.6191 66.3848 63.543 66.7676 63.543C67.0801 63.543 67.3613 63.5859 67.6113 63.6719C67.8613 63.7539 68.0742 63.8867 68.25 64.0703C68.4297 64.2539 68.5664 64.4922 68.6602 64.7852C68.7539 65.0742 68.8008 65.4277 68.8008 65.8457V70H67.7109V65.834C67.7109 65.502 67.6621 65.2363 67.5645 65.0371C67.4668 64.834 67.3242 64.6875 67.1367 64.5977C66.9492 64.5039 66.7188 64.457 66.4453 64.457C66.1758 64.457 65.9297 64.5137 65.707 64.627C65.4883 64.7402 65.2988 64.8965 65.1387 65.0957C64.9824 65.2949 64.8594 65.5234 64.7695 65.7812C64.6836 66.0352 64.6406 66.3047 64.6406 66.5898ZM74.4434 68.7695V61H75.5332V70H74.5371L74.4434 68.7695ZM70.1777 66.9004V66.7773C70.1777 66.293 70.2363 65.8535 70.3535 65.459C70.4746 65.0605 70.6445 64.7188 70.8633 64.4336C71.0859 64.1484 71.3496 63.9297 71.6543 63.7773C71.9629 63.6211 72.3066 63.543 72.6855 63.543C73.084 63.543 73.4316 63.6133 73.7285 63.7539C74.0293 63.8906 74.2832 64.0918 74.4902 64.3574C74.7012 64.6191 74.8672 64.9355 74.9883 65.3066C75.1094 65.6777 75.1934 66.0977 75.2402 66.5664V67.1055C75.1973 67.5703 75.1133 67.9883 74.9883 68.3594C74.8672 68.7305 74.7012 69.0469 74.4902 69.3086C74.2832 69.5703 74.0293 69.7715 73.7285 69.9121C73.4277 70.0488 73.0762 70.1172 72.6738 70.1172C72.3027 70.1172 71.9629 70.0371 71.6543 69.877C71.3496 69.7168 71.0859 69.4922 70.8633 69.2031C70.6445 68.9141 70.4746 68.5742 70.3535 68.1836C70.2363 67.7891 70.1777 67.3613 70.1777 66.9004ZM71.2676 66.7773V66.9004C71.2676 67.2168 71.2988 67.5137 71.3613 67.791C71.4277 68.0684 71.5293 68.3125 71.666 68.5234C71.8027 68.7344 71.9766 68.9004 72.1875 69.0215C72.3984 69.1387 72.6504 69.1973 72.9434 69.1973C73.3027 69.1973 73.5977 69.1211 73.8281 68.9688C74.0625 68.8164 74.25 68.6152 74.3906 68.3652C74.5312 68.1152 74.6406 67.8438 74.7188 67.5508V66.1387C74.6719 65.9238 74.6035 65.7168 74.5137 65.5176C74.4277 65.3145 74.3145 65.1348 74.1738 64.9785C74.0371 64.8184 73.8672 64.6914 73.6641 64.5977C73.4648 64.5039 73.2285 64.457 72.9551 64.457C72.6582 64.457 72.4023 64.5195 72.1875 64.6445C71.9766 64.7656 71.8027 64.9336 71.666 65.1484C71.5293 65.3594 71.4277 65.6055 71.3613 65.8867C71.2988 66.1641 71.2676 66.4609 71.2676 66.7773ZM79.8516 70.1172C79.4102 70.1172 79.0098 70.043 78.6504 69.8945C78.2949 69.7422 77.9883 69.5293 77.7305 69.2559C77.4766 68.9824 77.2812 68.6582 77.1445 68.2832C77.0078 67.9082 76.9395 67.498 76.9395 67.0527V66.8066C76.9395 66.291 77.0156 65.832 77.168 65.4297C77.3203 65.0234 77.5273 64.6797 77.7891 64.3984C78.0508 64.1172 78.3477 63.9043 78.6797 63.7598C79.0117 63.6152 79.3555 63.543 79.7109 63.543C80.1641 63.543 80.5547 63.6211 80.8828 63.7773C81.2148 63.9336 81.4863 64.1523 81.6973 64.4336C81.9082 64.7109 82.0645 65.0391 82.166 65.418C82.2676 65.793 82.3184 66.2031 82.3184 66.6484V67.1348H77.584V66.25H81.2344V66.168C81.2188 65.8867 81.1602 65.6133 81.0586 65.3477C80.9609 65.082 80.8047 64.8633 80.5898 64.6914C80.375 64.5195 80.082 64.4336 79.7109 64.4336C79.4648 64.4336 79.2383 64.4863 79.0312 64.5918C78.8242 64.6934 78.6465 64.8457 78.498 65.0488C78.3496 65.252 78.2344 65.5 78.1523 65.793C78.0703 66.0859 78.0293 66.4238 78.0293 66.8066V67.0527C78.0293 67.3535 78.0703 67.6367 78.1523 67.9023C78.2383 68.1641 78.3613 68.3945 78.5215 68.5938C78.6855 68.793 78.8828 68.9492 79.1133 69.0625C79.3477 69.1758 79.6133 69.2324 79.9102 69.2324C80.293 69.2324 80.6172 69.1543 80.8828 68.998C81.1484 68.8418 81.3809 68.6328 81.5801 68.3711L82.2363 68.8926C82.0996 69.0996 81.9258 69.2969 81.7148 69.4844C81.5039 69.6719 81.2441 69.8242 80.9355 69.9414C80.6309 70.0586 80.2695 70.1172 79.8516 70.1172ZM84.668 64.6562V70H83.584V63.6602H84.6387L84.668 64.6562ZM86.6484 63.625L86.6426 64.6328C86.5527 64.6133 86.4668 64.6016 86.3848 64.5977C86.3066 64.5898 86.2168 64.5859 86.1152 64.5859C85.8652 64.5859 85.6445 64.625 85.4531 64.7031C85.2617 64.7812 85.0996 64.8906 84.9668 65.0312C84.834 65.1719 84.7285 65.3398 84.6504 65.5352C84.5762 65.7266 84.5273 65.9375 84.5039 66.168L84.1992 66.3438C84.1992 65.9609 84.2363 65.6016 84.3105 65.2656C84.3887 64.9297 84.5078 64.6328 84.668 64.375C84.8281 64.1133 85.0312 63.9102 85.2773 63.7656C85.5273 63.6172 85.8242 63.543 86.168 63.543C86.2461 63.543 86.3359 63.5527 86.4375 63.5723C86.5391 63.5879 86.6094 63.6055 86.6484 63.625ZM91.7109 65.0137V70H90.627V63.6602H91.6523L91.7109 65.0137ZM91.4531 66.5898L91.002 66.5723C91.0059 66.1387 91.0703 65.7383 91.1953 65.3711C91.3203 65 91.4961 64.6777 91.7227 64.4043C91.9492 64.1309 92.2188 63.9199 92.5312 63.7715C92.8477 63.6191 93.1973 63.543 93.5801 63.543C93.8926 63.543 94.1738 63.5859 94.4238 63.6719C94.6738 63.7539 94.8867 63.8867 95.0625 64.0703C95.2422 64.2539 95.3789 64.4922 95.4727 64.7852C95.5664 65.0742 95.6133 65.4277 95.6133 65.8457V70H94.5234V65.834C94.5234 65.502 94.4746 65.2363 94.377 65.0371C94.2793 64.834 94.1367 64.6875 93.9492 64.5977C93.7617 64.5039 93.5312 64.457 93.2578 64.457C92.9883 64.457 92.7422 64.5137 92.5195 64.627C92.3008 64.7402 92.1113 64.8965 91.9512 65.0957C91.7949 65.2949 91.6719 65.5234 91.582 65.7812C91.4961 66.0352 91.4531 66.3047 91.4531 66.5898ZM100.998 68.916V65.6523C100.998 65.4023 100.947 65.1855 100.846 65.002C100.748 64.8145 100.6 64.6699 100.4 64.5684C100.201 64.4668 99.9551 64.416 99.6621 64.416C99.3887 64.416 99.1484 64.4629 98.9414 64.5566C98.7383 64.6504 98.5781 64.7734 98.4609 64.9258C98.3477 65.0781 98.291 65.2422 98.291 65.418H97.207C97.207 65.1914 97.2656 64.9668 97.3828 64.7441C97.5 64.5215 97.668 64.3203 97.8867 64.1406C98.1094 63.957 98.375 63.8125 98.6836 63.707C98.9961 63.5977 99.3438 63.543 99.7266 63.543C100.188 63.543 100.594 63.6211 100.945 63.7773C101.301 63.9336 101.578 64.1699 101.777 64.4863C101.98 64.7988 102.082 65.1914 102.082 65.6641V68.6172C102.082 68.8281 102.1 69.0527 102.135 69.291C102.174 69.5293 102.23 69.7344 102.305 69.9062V70H101.174C101.119 69.875 101.076 69.709 101.045 69.502C101.014 69.291 100.998 69.0957 100.998 68.916ZM101.186 66.1562L101.197 66.918H100.102C99.793 66.918 99.5176 66.9434 99.2754 66.9941C99.0332 67.041 98.8301 67.1133 98.666 67.2109C98.502 67.3086 98.377 67.4316 98.291 67.5801C98.2051 67.7246 98.1621 67.8945 98.1621 68.0898C98.1621 68.2891 98.207 68.4707 98.2969 68.6348C98.3867 68.7988 98.5215 68.9297 98.7012 69.0273C98.8848 69.1211 99.1094 69.168 99.375 69.168C99.707 69.168 100 69.0977 100.254 68.957C100.508 68.8164 100.709 68.6445 100.857 68.4414C101.01 68.2383 101.092 68.041 101.104 67.8496L101.566 68.3711C101.539 68.5352 101.465 68.7168 101.344 68.916C101.223 69.1152 101.061 69.3066 100.857 69.4902C100.658 69.6699 100.42 69.8203 100.143 69.9414C99.8691 70.0586 99.5605 70.1172 99.2168 70.1172C98.7871 70.1172 98.4102 70.0332 98.0859 69.8652C97.7656 69.6973 97.5156 69.4727 97.3359 69.1914C97.1602 68.9062 97.0723 68.5879 97.0723 68.2363C97.0723 67.8965 97.1387 67.5977 97.2715 67.3398C97.4043 67.0781 97.5957 66.8613 97.8457 66.6895C98.0957 66.5137 98.3965 66.3809 98.748 66.291C99.0996 66.2012 99.4922 66.1562 99.9258 66.1562H101.186ZM104.865 64.9199V70H103.775V63.6602H104.807L104.865 64.9199ZM104.643 66.5898L104.139 66.5723C104.143 66.1387 104.199 65.7383 104.309 65.3711C104.418 65 104.58 64.6777 104.795 64.4043C105.01 64.1309 105.277 63.9199 105.598 63.7715C105.918 63.6191 106.289 63.543 106.711 63.543C107.008 63.543 107.281 63.5859 107.531 63.6719C107.781 63.7539 107.998 63.8848 108.182 64.0645C108.365 64.2441 108.508 64.4746 108.609 64.7559C108.711 65.0371 108.762 65.377 108.762 65.7754V70H107.678V65.8281C107.678 65.4961 107.621 65.2305 107.508 65.0312C107.398 64.832 107.242 64.6875 107.039 64.5977C106.836 64.5039 106.598 64.457 106.324 64.457C106.004 64.457 105.736 64.5137 105.521 64.627C105.307 64.7402 105.135 64.8965 105.006 65.0957C104.877 65.2949 104.783 65.5234 104.725 65.7812C104.67 66.0352 104.643 66.3047 104.643 66.5898ZM108.75 65.9922L108.023 66.2148C108.027 65.8672 108.084 65.5332 108.193 65.2129C108.307 64.8926 108.469 64.6074 108.68 64.3574C108.895 64.1074 109.158 63.9102 109.471 63.7656C109.783 63.6172 110.141 63.543 110.543 63.543C110.883 63.543 111.184 63.5879 111.445 63.6777C111.711 63.7676 111.934 63.9062 112.113 64.0938C112.297 64.2773 112.436 64.5137 112.529 64.8027C112.623 65.0918 112.67 65.4355 112.67 65.834V70H111.58V65.8223C111.58 65.4668 111.523 65.1914 111.41 64.9961C111.301 64.7969 111.145 64.6582 110.941 64.5801C110.742 64.498 110.504 64.457 110.227 64.457C109.988 64.457 109.777 64.498 109.594 64.5801C109.41 64.6621 109.256 64.7754 109.131 64.9199C109.006 65.0605 108.91 65.2227 108.844 65.4062C108.781 65.5898 108.75 65.7852 108.75 65.9922ZM116.941 70.1172C116.5 70.1172 116.1 70.043 115.74 69.8945C115.385 69.7422 115.078 69.5293 114.82 69.2559C114.566 68.9824 114.371 68.6582 114.234 68.2832C114.098 67.9082 114.029 67.498 114.029 67.0527V66.8066C114.029 66.291 114.105 65.832 114.258 65.4297C114.41 65.0234 114.617 64.6797 114.879 64.3984C115.141 64.1172 115.438 63.9043 115.77 63.7598C116.102 63.6152 116.445 63.543 116.801 63.543C117.254 63.543 117.645 63.6211 117.973 63.7773C118.305 63.9336 118.576 64.1523 118.787 64.4336C118.998 64.7109 119.154 65.0391 119.256 65.418C119.357 65.793 119.408 66.2031 119.408 66.6484V67.1348H114.674V66.25H118.324V66.168C118.309 65.8867 118.25 65.6133 118.148 65.3477C118.051 65.082 117.895 64.8633 117.68 64.6914C117.465 64.5195 117.172 64.4336 116.801 64.4336C116.555 64.4336 116.328 64.4863 116.121 64.5918C115.914 64.6934 115.736 64.8457 115.588 65.0488C115.439 65.252 115.324 65.5 115.242 65.793C115.16 66.0859 115.119 66.4238 115.119 66.8066V67.0527C115.119 67.3535 115.16 67.6367 115.242 67.9023C115.328 68.1641 115.451 68.3945 115.611 68.5938C115.775 68.793 115.973 68.9492 116.203 69.0625C116.438 69.1758 116.703 69.2324 117 69.2324C117.383 69.2324 117.707 69.1543 117.973 68.998C118.238 68.8418 118.471 68.6328 118.67 68.3711L119.326 68.8926C119.189 69.0996 119.016 69.2969 118.805 69.4844C118.594 69.6719 118.334 69.8242 118.025 69.9414C117.721 70.0586 117.359 70.1172 116.941 70.1172Z" fill="white"/>
+<path d="M199 64C199.552 64 200 63.5523 200 63C200 62.4477 199.552 62 199 62C198.448 62 198 62.4477 198 63C198 63.5523 198.448 64 199 64Z" fill="white"/>
+<path d="M199 71C199.552 71 200 70.5523 200 70C200 69.4477 199.552 69 199 69C198.448 69 198 69.4477 198 70C198 70.5523 198.448 71 199 71Z" fill="white"/>
+<path d="M199 67.5C199.552 67.5 200 67.0523 200 66.5C200 65.9477 199.552 65.5 199 65.5C198.448 65.5 198 65.9477 198 66.5C198 67.0523 198.448 67.5 199 67.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.0001 65.9999C28.0001 66.2789 27.7741 66.5049 27.4951 66.5049H21.939L24.359 68.925C24.557 69.122 24.557 69.4429 24.359 69.6409C24.161 69.8389 23.8391 69.8389 23.6411 69.6409L20.7071 66.7069C20.3171 66.3169 20.3171 65.6829 20.7071 65.2929L23.6411 62.3589C23.8391 62.1609 24.161 62.1609 24.359 62.3589C24.557 62.5569 24.557 62.8779 24.359 63.0759L21.939 65.495H27.4951C27.7741 65.495 28.0001 65.7209 28.0001 65.9999Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 404H211V432.5C211 436.642 207.642 440 203.5 440H16.5C12.358 440 9 436.642 9 432.5V404Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M189.006 427.286L201 422.143L189.006 417L189 421L197.571 422.143L189 423.286L189.006 427.286Z" fill="#B3BAC5"/>
+</g>
+<defs>
+<clipPath id="clip0_77_525">
+<rect width="220" height="472" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/assets/Line_Preview_Japanese.svg

@@ -0,0 +1,24 @@
+<svg width="220" height="472" viewBox="0 0 220 472" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_77_543)">
+<path d="M194 0H26C11.6406 0 0 11.6406 0 26V446C0 460.359 11.6406 472 26 472H194C208.359 472 220 460.359 220 446V26C220 11.6406 208.359 0 194 0Z" fill="#101211"/>
+<path d="M202 36H18C13.0294 36 9 40.0294 9 45V431C9 435.971 13.0294 440 18 440H202C206.971 440 211 435.971 211 431V45C211 40.0294 206.971 36 202 36Z" fill="#DFE2E7"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18 36H202C206.97 36 211 40.03 211 45V51H9V45C9 40.03 13.03 36 18 36Z" fill="#202D48"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 82H211V51H9V82Z" fill="#202D48"/>
+<path d="M133.5 14H86.5C85.1193 14 84 15.1193 84 16.5C84 17.8807 85.1193 19 86.5 19H133.5C134.881 19 136 17.8807 136 16.5C136 15.1193 134.881 14 133.5 14Z" fill="#2E2E2E"/>
+<path d="M133.5 455H86.5C85.1193 455 84 456.119 84 457.5C84 458.881 85.1193 460 86.5 460H133.5C134.881 460 136 458.881 136 457.5C136 456.119 134.881 455 133.5 455Z" fill="#2E2E2E"/>
+<path d="M45.5 25C48.5376 25 51 22.5376 51 19.5C51 16.4624 48.5376 14 45.5 14C42.4624 14 40 16.4624 40 19.5C40 22.5376 42.4624 25 45.5 25Z" fill="#2E2E2E"/>
+<path d="M65.5 23C67.433 23 69 21.433 69 19.5C69 17.567 67.433 16 65.5 16C63.567 16 62 17.567 62 19.5C62 21.433 63.567 23 65.5 23Z" fill="#2E2E2E"/>
+<path d="M53.316 64.684H60.888V65.512H53.316V64.684ZM53.7 62.212H60.528V63.016H53.7V62.212ZM56.532 62.584H57.432V64.384C57.432 65.884 57.024 67.852 54 69.208C53.88 69.016 53.604 68.704 53.4 68.548C56.316 67.372 56.532 65.608 56.532 64.372V62.584ZM57.684 65.212C58.14 66.892 59.196 68.008 60.912 68.5C60.708 68.68 60.456 69.028 60.336 69.268C58.524 68.632 57.432 67.336 56.904 65.38L57.684 65.212ZM52.632 64.66V68.908H51.756V65.5H50.076V64.66H52.632ZM52.632 68.512C53.196 69.4 54.264 69.808 55.644 69.868C56.952 69.916 59.652 69.88 61.068 69.784C60.972 70 60.816 70.432 60.78 70.708C59.46 70.756 56.976 70.78 55.644 70.732C54.084 70.672 53.004 70.252 52.236 69.304C51.66 69.82 51.048 70.336 50.4 70.864L49.92 69.94C50.496 69.556 51.204 69.028 51.816 68.512H52.632ZM50.208 60.76L50.868 60.22C51.66 60.724 52.572 61.504 52.98 62.092L52.272 62.68C51.888 62.104 50.988 61.288 50.208 60.76ZM58.956 59.92L59.868 60.232C59.46 60.916 58.968 61.708 58.572 62.212L57.84 61.936C58.212 61.396 58.704 60.532 58.956 59.92ZM54.168 60.28L54.936 59.968C55.416 60.544 55.884 61.336 56.052 61.888L55.236 62.248C55.08 61.708 54.636 60.88 54.168 60.28ZM66.348 60.496H71.904V61.228H66.348V60.496ZM66.204 63.82H72.12V64.564H66.204V63.82ZM66.204 65.488H72.096V66.232H66.204V65.488ZM66.552 69.652H71.76V70.396H66.552V69.652ZM65.22 62.152H73.032V62.908H65.22V62.152ZM66.084 67.156H72.228V70.924H71.328V67.888H66.948V70.96H66.084V67.156ZM64.812 59.956L65.664 60.22C64.848 62.248 63.564 64.264 62.232 65.596C62.148 65.392 61.896 64.924 61.728 64.708C62.94 63.568 64.116 61.78 64.812 59.956ZM63.564 63.052L64.416 62.2L64.428 62.212V70.936H63.564V63.052ZM74.148 63.784H84.84V64.588H74.148V63.784ZM75.204 61.432H82.152V62.236H75.204V61.432ZM77.148 67.804H82.8V68.524H77.148V67.804ZM77.148 69.796H82.8V70.576H77.148V69.796ZM78.288 59.92H79.164V64.216H78.288V59.92ZM83.544 60.34L84.312 60.748C81.9 63.904 78.288 66.268 74.448 67.744C74.34 67.54 74.052 67.168 73.872 66.988C77.748 65.644 81.324 63.316 83.544 60.34ZM76.656 65.86H83.376V70.924H82.44V66.616H77.556V70.972H76.656V65.86ZM92.256 61.816C92.1 63.064 91.86 64.468 91.488 65.752C90.756 68.212 89.796 69.484 88.692 69.484C87.612 69.484 86.544 68.26 86.544 66.268C86.544 63.664 88.86 61.396 91.8 61.396C94.608 61.396 96.396 63.376 96.396 65.812C96.396 68.32 94.74 70 91.884 70.372L91.332 69.484C91.716 69.448 92.076 69.4 92.364 69.34C93.9 68.992 95.412 67.84 95.412 65.764C95.412 63.844 94.08 62.26 91.776 62.26C89.136 62.26 87.492 64.432 87.492 66.196C87.492 67.708 88.176 68.38 88.716 68.38C89.28 68.38 89.928 67.564 90.54 65.536C90.888 64.396 91.14 63.04 91.26 61.792L92.256 61.816ZM101.868 69.652H107.664V70.48H101.868V69.652ZM101.46 61.132H105.864V61.936H101.46V61.132ZM102 59.884L103.008 60.088C102.108 61.648 100.668 63.28 98.58 64.516C98.448 64.288 98.148 63.976 97.944 63.82C99.924 62.74 101.304 61.192 102 59.884ZM105.564 61.132H105.732L105.9 61.084L106.5 61.408C105.06 65.032 101.676 67.444 98.412 68.5C98.304 68.26 98.076 67.888 97.884 67.696C100.992 66.796 104.316 64.444 105.564 61.288V61.132ZM99.96 63.268L100.632 62.692C101.58 63.34 102.732 64.3 103.284 64.984L102.552 65.632C102.048 64.948 100.908 63.94 99.96 63.268ZM107.22 65.86H108.144V70.984H107.22V65.86ZM102.276 65.86H107.676V66.688H102.276V70.96H101.376V66.568L102.096 65.86H102.276ZM110.136 61.816H120.864V62.656H110.136V61.816ZM111.372 65.68H114.732V66.388H111.372V65.68ZM111.372 67.6H114.732V68.308H111.372V67.6ZM116.736 63.832H117.588V68.764H116.736V63.832ZM114.408 63.724H115.284V69.928C115.284 70.384 115.176 70.624 114.84 70.768C114.516 70.912 113.988 70.912 113.172 70.912C113.124 70.684 112.992 70.348 112.872 70.12C113.472 70.144 114.024 70.144 114.192 70.132C114.36 70.12 114.408 70.072 114.408 69.916V63.724ZM119.172 63.472H120.06V69.844C120.06 70.372 119.94 70.624 119.568 70.768C119.196 70.9 118.596 70.924 117.66 70.924C117.612 70.684 117.468 70.3 117.336 70.06C118.068 70.084 118.716 70.084 118.92 70.072C119.112 70.06 119.172 70.012 119.172 69.844V63.472ZM111.996 60.22L112.824 59.908C113.292 60.424 113.796 61.132 114.024 61.6L113.136 61.924C112.944 61.468 112.452 60.736 111.996 60.22ZM118.164 59.872L119.124 60.184C118.668 60.928 118.128 61.756 117.684 62.32L116.892 62.02C117.324 61.444 117.864 60.52 118.164 59.872ZM110.892 63.724H114.696V64.504H111.744V70.9H110.892V63.724Z" fill="white"/>
+<path d="M199 64C199.552 64 200 63.5523 200 63C200 62.4477 199.552 62 199 62C198.448 62 198 62.4477 198 63C198 63.5523 198.448 64 199 64Z" fill="white"/>
+<path d="M199 71C199.552 71 200 70.5523 200 70C200 69.4477 199.552 69 199 69C198.448 69 198 69.4477 198 70C198 70.5523 198.448 71 199 71Z" fill="white"/>
+<path d="M199 67.5C199.552 67.5 200 67.0523 200 66.5C200 65.9477 199.552 65.5 199 65.5C198.448 65.5 198 65.9477 198 66.5C198 67.0523 198.448 67.5 199 67.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.0001 65.9999C28.0001 66.2789 27.7741 66.5049 27.4951 66.5049H21.939L24.359 68.925C24.557 69.122 24.557 69.4429 24.359 69.6409C24.161 69.8389 23.8391 69.8389 23.6411 69.6409L20.7071 66.7069C20.3171 66.3169 20.3171 65.6829 20.7071 65.2929L23.6411 62.3589C23.8391 62.1609 24.161 62.1609 24.359 62.3589C24.557 62.5569 24.557 62.8779 24.359 63.0759L21.939 65.495H27.4951C27.7741 65.495 28.0001 65.7209 28.0001 65.9999Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 404H211V432.5C211 436.642 207.642 440 203.5 440H16.5C12.358 440 9 436.642 9 432.5V404Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M189.006 427.286L201 422.143L189.006 417L189 421L197.571 422.143L189 423.286L189.006 427.286Z" fill="#B3BAC5"/>
+</g>
+<defs>
+<clipPath id="clip0_77_543">
+<rect width="220" height="472" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/components/CapTagList/index.js

@@ -182,8 +182,8 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           visible={this.state.visible}
           onVisibleChange={this.togglePopoverVisibility}
           content={<div>
-            <Spin tip="Getting tags..." spinning={this.props.loading}>
-              <Search style={{ marginBottom: 8, width: '250px'}} placeholder="Search" onChange={this.onChange} />
+            <Spin tip={this.props?.intl?.formatMessage(messages.gettingTags)} spinning={this.props.loading}>
+              <Search style={{ marginBottom: 8, width: '250px'}} placeholder={this.props?.intl?.formatMessage(messages.searchText)} onChange={this.onChange} />
               {this.props.moduleFilterEnabled ? <CapSelect getPopupContainer={(triggerNode) => triggerNode.parentNode} style={{width: '250px', marginBottom: '16px', minWidth: 'initial', display: 'inherit'}} onChange={this.props.onContextChange} defaultValue="All" options={options}>
               </CapSelect> : ''}
               <Tree

package/components/CapTagList/messages.js

@@ -34,4 +34,12 @@ export default defineMessages({
     id: 'creatives.components.CapTagList.loyalty',
     defaultMessage: 'Loyalty',
   },
+  "searchText": {
+    id: 'creatives.components.CapTagList.searchText',
+    defaultMessage: 'Search',
+  },
+  "gettingTags": {
+    id: 'creatives.components.CapTagList.gettingTags',
+    defaultMessage: "Getting tags...",
+  },
 });

package/components/Ckeditor/index.js

@@ -12,15 +12,17 @@ import React from 'react';
 // import { FormattedMessage } from 'react-intl';
 import _ from 'lodash';
 // import messages from './messages';
+import './style.scss';
 const loadScript = require('load-script');
-const defaultScriptUrl = "https://storage.crm.n.content-cdn.io/ckeditor_test/ckeditor4/ckeditor.js";
+// fetching ckeditor from s3 by rerouting through arya whitelisted services
+const defaultScriptUrl = `${window.location.origin}/arya/ui/library/ckeditor/ckeditor.js`;
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {
   locale = JSON.parse(user).lang;
 }
 const CKEditorConfig = {
-  skin: 'moono',
+  skin: 'moono-lisa',
   toolbar: [
     { name: 'document', items: ['Source', '-'] },
     { name: 'clipboard', items: ['Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'] },

package/components/Ckeditor/style.scss

@@ -0,0 +1,3 @@
+.cke_notification_warning {
+    display: none;
+}

package/components/FormBuilder/_formBuilder.scss

@@ -1,13 +1,3 @@
-.ant-tabs-nav{
-  text-align: center;
-  color: #333333;
-  line-height: 24px;
-  font-size: 16px;
-  font-family: open-sans, sans-serif;
-  font-style: normal;
-  font-weight: 600;
-}
-
 .form-tab-header{
   display: flex;
   align-items: center;
@@ -16,17 +6,15 @@
   font-weight: 600;
 }
 
-.ant-tabs-tab{
-  // border: 1px solid #1D5B96;
-  // border-bottom: 2px solid #1D5B96;
-  padding: 0 16px 0 8px !important;
-}
-
 .textarea-error-message {
   top: initial !important;
   bottom: 4px !important;
 }
 
+input.ant-input {
+  border: 1px solid #b3bac5 !important;
+  border-radius: 4px !important;
+}
 .cap-input {
   .error-message {
     margin-left: initial !important;

package/components/FormBuilder/index.js

@@ -24,6 +24,7 @@ import EDMEditor from "../../components/Edmeditor";
 import CustomPopOver from '../../components/CustomPopOver';
 import './_formBuilder.scss';
 import {updateCharCount, checkUnicode} from "../../utils/smsCharCountV2";
+import globalMessages from '../../v2Containers/Cap/messages';
 import messages from './messages';
 const TabPane = Tabs.TabPane;
 const {Column} = Table;
@@ -1516,8 +1517,8 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
       this.setState({errorData: formData});
     } else {
       const tempTab = ifError ? currentTab : this.state.currentTab;
-      const version = `Version ${this.state.currentTab}`;
-      formData[tabCount].name = `Copy of ${formData[tempTab - 1].name ? formData[tempTab - 1].name : version}`;
+      const version = `${this.props.intl.formatMessage(messages.version)} ${this.state.currentTab}`;
+      formData[tabCount].name = `${this.props?.intl?.formatMessage(globalMessages.copyOf)} ${formData[tempTab - 1].name ? formData[tempTab - 1].name : version}`;
       formData[tabCount].base = false;
       const initialTab = this.state.currentTab;
       this.setState({formData, tabCount: tabCount + 1, currentTab: tabCount + 1, tabKey: formData[tabCount].tabKey}, () => {
@@ -2043,7 +2044,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     const _URL = window.URL || window.webkitURL;
     const file = files[0];
     if (val.supportedExtensions) {
-      const allowedExtensions = /(\.bmp|\.jpeg|\.png|\.gif|\.jpg)$/i;
+      const allowedExtensions = /(\.bmp|\.jpeg|\.png|\.gif|\.avif|\.jpg)$/i;
       if (!allowedExtensions.exec(file.name)) {
         this.callChildEvent({file, type: 'wrong file'}, val, val.submitAction);
       }

package/components/FormBuilder/messages.js

@@ -54,4 +54,8 @@ export default defineMessages({
     id: 'creatives.components.FormBuilder.ok',
     defaultMessage: 'Ok',
   },
+  Version: {
+    id: 'creatives.components.FormBuilder.version',
+    defaultMessage: 'Version',
+  },
 });

package/components/Sidebar/index.js

@@ -4,9 +4,10 @@ import React from 'react';
 import { Accordion, Icon, Input, Button } from 'semantic-ui-react';
 import { FormattedMessage } from 'react-intl';
 import _ from 'lodash';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import messages from './messages';
 import './_sidebar.scss';
+import { withRouter } from 'react-router-dom';
 
 class Sidebar extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
@@ -68,8 +69,7 @@ class Sidebar extends React.Component { // eslint-disable-line react/prefer-stat
   }
 
   selectActiveLinkFromUrl(props) {
-    const activeRoute = props.router.routes[props.router.routes.length - 1] || {};
-    const activeRouteName = (activeRoute.name && activeRoute.name.trim().toLowerCase()) || '';
+    const activeRouteName = this.props.history.location.pathname?.split('/')[1];
     let selectedItem = '';
     let selectedIndex = -1;
     _.forEach(props.menuData, (menuItem, menuIndex) => {
@@ -205,4 +205,4 @@ Sidebar.propTypes = {
   actionComponents: PropTypes.oneOfType([PropTypes.element, PropTypes.string]),
 };
 
-export default Sidebar;
+export default withRouter(Sidebar);

package/config/path.js

@@ -1,4 +1,4 @@
 module.exports = {
-  publicPath: '/creatives/ui/',
+  publicPath: '/creatives/ui',
   engagePlusPublicPath: '/campaigns/ui',
 };

package/containers/App/constants.js

@@ -5,6 +5,18 @@ export const GET_SIDEBAR_FAILURE = 'app/App/GET_SIDEBAR_FAILURE';
 export const STORE2DOOR_PLUS_ENABLED = 'STORE2DOOR_PLUS_ENABLED';
 export const TRAI_DLT = 'TRAI_DLT';
 export const CARD_BASED_SCOPE = 'CARD_BASED_SCOPE';
+export const HOSPITALITY_BASED_SCOPE = 'HOSPITALITY_BASED_SCOPE';
+export const REGISTRATION_CUSTOM_FIELD = 'Registration custom fields';
+export const GIFT_CARDS = 'GIFT_CARDS';
+export const PROMO_ENGINE = 'PROMO_ENGINE';
+export const CUSTOM_TAG = 'CustomTagMessage';
+export const CUSTOMER_EXTENDED_FIELD = 'Customer extended fields';
+export const EXTENDED_TAG = 'ExtendedTagMessage';
+export const BADGES_UI_ENABLED = 'BADGES_UI_ENABLED';
+export const JP_LOCALE_HIDE_FEATURE = 'JP_LOCALE_HIDE_FEATURE';
+export const ENABLE_WECHAT = 'ENABLE_WECHAT';
+export const ENABLE_CUSTOMER_BARCODE_TAG = "ENABLE_CUSTOMER_BARCODE_TAG";
+export const EMAIL_UNSUBSCRIBE_TAG_MANDATORY = "EMAIL_UNSUBSCRIBE_TAG_MANDATORY";
 
 export const CARD_RELATED_TAGS = [
   'card_series',
@@ -14,3 +26,86 @@ export const CARD_RELATED_TAGS = [
   'card_series_name',
   'card_name',
 ];
+
+export const HOSPITALITY_RELATED_TAGS = [
+  "hospitality_series",
+  "tax_Code",
+  "roomTypeCode",
+  "bookingChannel",
+  "hotelReservationID_ResID_Type",
+  "lastModifyDateTime",
+  "guestCounts_IsPerRoom",
+  "ratePlan_RatePlanCode",
+  "resID_Value",
+  "numberOfUnits",
+  "rateTimeUnit",
+  "resStatus",
+  "timeSpan_End",
+  "roomStay_MarketCode",
+  "createDateTime",
+  "amount",
+  "timeSpan_Start",
+  "email",
+  "resID_Source",
+];
+export const GIFT_VOUCHER_RELATED_TAGS = [
+  "gift_voucher",
+  "gift_voucher_expiry_date.FORMAT_1",
+  "gift_voucher_expiry_date.FORMAT_2",
+  "gift_voucher_expiry_date.FORMAT_3",
+  "gift_voucher_expiry_date.FORMAT_4",
+  "gift_voucher_expiry_date.FORMAT_5",
+  "gift_voucher_expiry_date.FORMAT_6",
+  "gift_voucher_expiry_date.FORMAT_7",
+  "gift_voucher_expiry_date.FORMAT_8",
+  "gift_voucher_expiry_date",
+];
+export const PROMO_ENGINE_RELATED_TAGS = [
+  "promotion",
+  "promotion_expiry_date.FORMAT_1",
+  "promotion_expiry_date.FORMAT_2",
+  "promotion_expiry_date.FORMAT_3",
+  "promotion_expiry_date.FORMAT_4",
+  "promotion_expiry_date.FORMAT_5",
+  "promotion_expiry_date.FORMAT_6",
+  "promotion_expiry_date.FORMAT_7",
+  "promotion_expiry_date.FORMAT_8",
+  "promotion_expiry_date",
+];
+
+export const BADGES_RELATED_TAGS = [
+  "Badge_expiry_date",
+  "badges_issue_expiry_date",
+  "badge_expiry_mm_slash_dd_slash_yyyy",
+  "badge_expiry_dd_slash_mm_slash_yyyy",
+  "badge_expiry_yyyy_hyphen_mm_hyphen_dd",
+  "badge_expiry_mm_slash_dd_slash_yy",
+  "badge_expiry_dd_space_Mon_space_yyyy",
+  "badge_expiry_Day_comma_space_Mon_space_dd_comma_space_yy",
+  "badge_expiry_Dd_dot_mm_dot_yy",
+  "badge_expiry_dd_space_Mon",
+  "Days_until_expiry",
+  "badges_enroll_expiry_date.FORMAT_1",
+  "badges_enroll_expiry_date.FORMAT_2",
+  "badges_enroll_expiry_date.FORMAT_3",
+  "badges_enroll_expiry_date.FORMAT_4",
+  "badges_enroll_expiry_date.FORMAT_5",
+  "badges_enroll_expiry_date.FORMAT_6",
+  "badges_enroll_expiry_date.FORMAT_7",
+  "badges_enroll_expiry_date.FORMAT_8",
+  "badges_enroll_expiring_in_days",
+  "badges_issue_expiry_date.FORMAT_1",
+  "badges_issue_expiry_date.FORMAT_2",
+  "badges_issue_expiry_date.FORMAT_3",
+  "badges_issue_expiry_date.FORMAT_4",
+  "badges_issue_expiry_date.FORMAT_5",
+  "badges_issue_expiry_date.FORMAT_6",
+  "badges_issue_expiry_date.FORMAT_7",
+  "badges_issue_expiry_date.FORMAT_8",
+  "badges_issue_expiring_in_days",
+];
+export const BADGES_ENROLL = 'BADGES_ENROLL';
+export const BADGES_ISSUE = 'BADGES_ISSUE';
+
+export const CUSTOMER_BARCODE_TAG = "customer_barcode";
+export const COPY_OF = "Copy of";

package/containers/App/index.js

@@ -0,0 +1,52 @@
+/**
+ *
+ * App.js
+ *
+ * This component is the skeleton around the actual pages, and should only
+ * contain code that should be seen on all pages. (e.g. navigation bar)
+ *
+ */
+
+import React, { useEffect } from 'react'; // eslint-disable-line no-unused-vars
+import { Switch } from 'react-router';
+import { ConnectedRouter } from 'connected-react-router/immutable';
+import history from 'utils/history';
+
+import Cap from '../Cap';
+import CapV2 from '../../v2Containers/Cap';
+import Login from '../Login';
+import NotFoundPage from '../NotFoundPage';
+
+import GlobalStyle from '../../global-styles';
+import config from '../../config/app';
+import withReactRouterV3Compatibility from '../../hoc/withReactRouterV3Compatibility';
+import RenderRoute from '../../v2Components/RenderRoute';
+import { updateCharCount } from '../../utils/smsCharCountV2';
+
+const loginUrl =
+  process.env.NODE_ENV === 'production'
+    ? `${config.production.login_url}`
+    : `${config.development.login_url}`;
+
+// const Protected = userIsAuthenticatedRedir(Cap);
+const v3CompatibleCap = withReactRouterV3Compatibility(Cap);
+const v3CompatibleCapV2 = withReactRouterV3Compatibility(CapV2);
+
+export default function App() {
+  useEffect(() => {
+    updateCharCount("", false);
+  });
+  return (
+    <div>
+      <ConnectedRouter history={history}>
+        <Switch>
+          <RenderRoute exact path={loginUrl} component={Login} />
+          <RenderRoute path="/v2" component={v3CompatibleCapV2} key="/v2" />
+          <RenderRoute path="/" component={v3CompatibleCap} key="/" />
+          <RenderRoute component={NotFoundPage} />
+        </Switch>
+      </ConnectedRouter>
+      <GlobalStyle />
+    </div>
+  );
+}

package/containers/App/sagas.js

@@ -1,5 +1,4 @@
-import { call, put, takeLatest } from 'redux-saga/effects';
-// import { LOCATION_CHANGE } from 'react-router-redux';
+import { call, put, takeLatest, all } from 'redux-saga/effects';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../services/api';
 import * as types from './constants';
@@ -8,7 +7,7 @@ import * as types from './constants';
 export function* getSidebar() {
   try {
     const result = yield call(Api.getSidebar);
-    const sidebar = result.response.sidebar;
+    const { sidebar } = result.response;
     yield put({ type: types.GET_SIDEBAR_SUCCESS, sidebar });
   } catch (error) {
     yield put({ type: types.GET_SIDEBAR_FAILURE, error });
@@ -24,3 +23,9 @@ function* watchgetSidebar() {
 export default [
   watchgetSidebar,
 ];
+
+export function* appSaga() {
+  yield all([
+    watchgetSidebar(),
+  ]);
+}

package/containers/Assets/Gallery/index.js

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 
 import React from 'react';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
+import { bindActionCreators, compose } from 'redux';
 import Helmet from 'react-helmet';
 import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
@@ -28,6 +28,11 @@ import PageHeader from '../../../components/PageHeader';
 import Pagination from '../../../components/Pagination';
 import * as commonUtil from '../../../utils/common';
 import './_gallery.scss';
+import injectSaga from '../../../utils/injectSaga';
+import injectReducer from '../../../utils/injectReducer';
+import reducer from './reducer';
+import { gallerySaga } from './sagas';
+
 const Option = Select.Option;
 
 export class Gallery extends React.Component { // eslint-disable-line react/prefer-stateless-function
@@ -336,7 +341,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
           <CapInput
             className="search-text"
             style={{width: '210px'}}
-            placeholder="Search"
+            placeholder={this.props.intl.formatMessage(messages.searchText)}
             prefix={<i className="material-icons" style={{color: '#707070', fontSize: '16px'}}>search</i>}
             value={this.state.searchText}
             onChange={(e) => this.searchAsset(e.target.value)}
@@ -456,4 +461,13 @@ function mapDispatchToProps(dispatch) {
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(Gallery)));
+const withConnect = connect(mapStateToProps, mapDispatchToProps);
+const withSaga = injectSaga({ key: 'gallery', saga: gallerySaga });
+const withReducer = injectReducer({ key: 'gallery', reducer });
+
+export default compose(
+  UserIsAuthenticated,
+  withSaga,
+  withReducer,
+  withConnect,
+)(injectIntl(Gallery));

package/containers/Assets/Gallery/messages.js

@@ -86,4 +86,8 @@ export default defineMessages({
     id: 'creatives.containers.Assets.Gallery.assetDeleteFailed',
     defaultMessage: 'Image deletion failed.',
   },
+  searchText: {
+    id: 'creatives.components.CapTagList.searchText',
+    defaultMessage: 'Search',
+  },
 });