@capillarytech/creatives-library 9.0.15-alpha.1 → 9.0.16

package/v2Containers/Templates/tests/sagas.test.js

@@ -1,22 +1,20 @@
 import { expectSaga } from 'redux-saga-test-plan';
-import {
-  take, call, takeLatest, takeEvery, put,
-} from 'redux-saga/effects';
 import * as matchers from 'redux-saga-test-plan/matchers';
 import { throwError } from 'redux-saga-test-plan/providers';
+import { call, takeLatest, put } from 'redux-saga/effects';
 import * as api from '../../../services/api';
 import * as types from '../constants';
 import * as cdnUtils from '../../../utils/cdnTransformation';
 import {
   getCdnTransformationConfig,
   getAllTemplates,
-  getLocalSmsTemplates,
   watchGetCdnTransformationConfig,
   watchGetAllTemplates,
   getSenderDetails,
   fetchWeCrmAccounts,
   sendZippedFile,
   fetchUserList,
+  watchGetUserList,
   deleteRcsTemplate,
   watchDeleteRcsTemplate,
   watchForGetTemplateInfoById,
@@ -41,14 +39,10 @@ import {
   watchUnarchiveTemplate,
   watchBulkArchive,
   watchBulkUnarchive,
-  watchGetUserList,
 } from '../sagas';
-
-import * as mockData from './mockData';
-import { fetchSmsTemplatesFromQuery } from '../utils/smsTemplatesListApi';
-import { ZALO } from '../../CreativesContainer/constants';
-import { VIET_GUYS, ZALO_TEMPLATE_INFO_REQUEST } from '../../Zalo/constants';
 import { getTemplateInfoById } from '../../Zalo/saga';
+import { ZALO_TEMPLATE_INFO_REQUEST } from '../../Zalo/constants';
+import * as mockData from './mockData';
 
 jest.mock('@capillarytech/cap-ui-library', () => ({
   CapNotification: {
@@ -173,8 +167,8 @@ describe('templateList saga', () => {
       ],
     ]).put({
         type: types.GET_ALL_TEMPLATES_SUCCESS,
-        data: mockData.getAllTemplatesListSuccess.response,
-        weCRMTemplate: mockData.getAllTemplatesListSuccess.response?.unMapped,
+        data: mockData.getAllTemplatesListSuccess,
+        weCRMTemplate: mockData.getAllTemplatesListSuccess,
         isReset: mockData.getAllTemplatesListSuccess?.queryParams?.page === 1,
       })
       .run();
@@ -190,8 +184,8 @@ describe('templateList saga', () => {
       ],
     ]).put({
         type: types.GET_ALL_TEMPLATES_SUCCESS,
-        data: mockData.getAllTemplatesListSuccess.response,
-        weCRMTemplate: mockData.getAllTemplatesListSuccess.response?.unMapped,
+        data: mockData.getAllTemplatesListSuccess,
+        weCRMTemplate: mockData.getAllTemplatesListSuccess,
         isReset: mockData.getAllTemplatesListSuccess?.queryParams?.page === 1,
       })
       .run();
@@ -210,163 +204,6 @@ describe('templateList saga', () => {
       })
       .run();
   });
-
-  it('SMS channel uses fetchSmsTemplatesFromQuery', () => {
-    const smsAction = {
-      type: types.GET_ALL_TEMPLATES_REQUEST,
-      channel: 'Sms',
-      queryParams: { page: 1, perPage: 25, name: '', sortBy: 'Most Recent' },
-      intlCopyOf: 'Kopie',
-    };
-    const fetched = {
-      channelTemplates: { templates: [{ name: 'Kopie Foo' }], totalCount: 1 },
-      weCRMTemplate: undefined,
-      raw: {},
-    };
-    return expectSaga(getAllTemplates, smsAction)
-      .provide([
-        [call(fetchSmsTemplatesFromQuery, smsAction.queryParams, smsAction.intlCopyOf), fetched],
-      ])
-      .put({
-        type: types.GET_ALL_TEMPLATES_SUCCESS,
-        data: fetched.channelTemplates,
-        weCRMTemplate: fetched.weCRMTemplate,
-        isReset: true,
-      })
-      .run();
-  });
-
-  it('SMS channel propagates fetchSmsTemplatesFromQuery errors', () => {
-    const smsAction = {
-      type: types.GET_ALL_TEMPLATES_REQUEST,
-      channel: 'SMS',
-      queryParams: { page: 2, perPage: 25 },
-      intlCopyOf: '',
-    };
-    const error = new Error('sms list fail');
-    return expectSaga(getAllTemplates, smsAction)
-      .provide([
-        [call(fetchSmsTemplatesFromQuery, smsAction.queryParams, smsAction.intlCopyOf), throwError(error)],
-      ])
-      .put({
-        type: types.GET_ALL_TEMPLATES_FAILURE,
-        error,
-      })
-      .run();
-  });
-
-  it('wechat channel merges mapped and richmedia and applies Most Recent sort', () => {
-    const wechatApiResponse = {
-      response: {
-        mapped: [
-          { name: 'B', updatedAt: '2024-01-02T00:00:00Z' },
-          { name: 'A', updatedAt: '2024-01-01T00:00:00Z' },
-        ],
-        richmedia: [{ name: 'C', updatedAt: '2024-01-03T00:00:00Z' }],
-        unMapped: [],
-      },
-    };
-    const action = {
-      channel: 'wechat',
-      queryParams: { sortBy: 'Most Recent', page: 1 },
-      intlCopyOf: '',
-    };
-    return expectSaga(getAllTemplates, action)
-      .provide([[matchers.call.fn(api.getAllTemplates), wechatApiResponse]])
-      .put.actionType(types.GET_ALL_TEMPLATES_SUCCESS)
-      .run();
-  });
-
-  it('wechat channel applies Alphabetically sort', () => {
-    const wechatApiResponse = {
-      response: {
-        mapped: [{ name: 'Zebra', updatedAt: '2024-01-02T00:00:00Z' }],
-        richmedia: [{ name: 'Apple', updatedAt: '2024-01-01T00:00:00Z' }],
-        unMapped: [],
-      },
-    };
-    const action = {
-      channel: 'wechat',
-      queryParams: { sortBy: 'Alphabetically', page: 1 },
-      intlCopyOf: '',
-    };
-    return expectSaga(getAllTemplates, action)
-      .provide([[matchers.call.fn(api.getAllTemplates), wechatApiResponse]])
-      .put.actionType(types.GET_ALL_TEMPLATES_SUCCESS)
-      .run();
-  });
-
-  it('wechat channel replaces Copy-of prefix when intlCopyOf is set', () => {
-    const wechatApiResponse = {
-      response: {
-        mapped: [{ name: 'Copy of Promo', updatedAt: '2024-01-01T00:00:00Z' }],
-        richmedia: [],
-        unMapped: [],
-      },
-    };
-    const action = {
-      channel: 'wechat',
-      queryParams: { page: 1 },
-      intlCopyOf: 'Kopia av ',
-    };
-    return expectSaga(getAllTemplates, action)
-      .provide([[matchers.call.fn(api.getAllTemplates), wechatApiResponse]])
-      .put.actionType(types.GET_ALL_TEMPLATES_SUCCESS)
-      .run();
-  });
-});
-
-describe('getLocalSmsTemplates saga', () => {
-  it('invokes onSuccess with fetched data', () => {
-    const onSuccess = jest.fn();
-    const action = {
-      queryParams: { page: 1 },
-      intlCopyOf: '',
-      onSuccess,
-    };
-    const fetched = { channelTemplates: { templates: [] }, raw: {} };
-    return expectSaga(getLocalSmsTemplates, action)
-      .provide([[call(fetchSmsTemplatesFromQuery, action.queryParams, action.intlCopyOf), fetched]])
-      .call(onSuccess, fetched)
-      .run();
-  });
-
-  it('invokes onFailure when fetch throws', () => {
-    const onFailure = jest.fn();
-    const error = new Error('local list fail');
-    const action = {
-      queryParams: { page: 1 },
-      intlCopyOf: 'Kopie',
-      onFailure,
-    };
-    return expectSaga(getLocalSmsTemplates, action)
-      .provide([
-        [call(fetchSmsTemplatesFromQuery, action.queryParams, action.intlCopyOf), throwError(error)],
-      ])
-      .call(onFailure, error)
-      .run();
-  });
-
-  it('does not throw when callbacks are omitted', () => {
-    const action = { queryParams: { page: 1 }, intlCopyOf: '' };
-    return expectSaga(getLocalSmsTemplates, action)
-      .provide([
-        [call(fetchSmsTemplatesFromQuery, action.queryParams, action.intlCopyOf), throwError(new Error('x'))],
-      ])
-      .run();
-  });
-
-  it('does not call onSuccess when it is not a function', () => {
-    const action = {
-      queryParams: { page: 1 },
-      intlCopyOf: '',
-      onSuccess: 'not-a-fn',
-    };
-    const fetched = { channelTemplates: { templates: [] } };
-    return expectSaga(getLocalSmsTemplates, action)
-      .provide([[call(fetchSmsTemplatesFromQuery, action.queryParams, action.intlCopyOf), fetched]])
-      .run();
-  });
 });
 
 describe('watchForTemplates saga', () => {
@@ -560,7 +397,7 @@ describe('getSenderDetails Saga', () => {
 
 describe('fetchWeCrmAccounts Saga', () => {
   const action = { source: 'CRM' };
-  it('handles successful fetching of WeCRM accounts', () => {
+  test.concurrent('handles successful fetching of WeCRM accounts', () => {
     const fakeResponse = {
       response: [{ id: 1, name: 'Account One' }]
     };
@@ -573,11 +410,14 @@ describe('fetchWeCrmAccounts Saga', () => {
       })
     );
   });
-  it('handles error thrown from api', () => {
+  test.concurrent('handles error thrown from api', () => {
     const error = new Error('Fetch failed');
-    expectSaga(fetchWeCrmAccounts, action)
+    expectSaga(fetchWeCrmAccounts, action.source)
       .provide([
-        [call(api.fetchWeCrmAccounts, action.source), throwError(error)],
+        [
+          call(api.fetchWeCrmAccounts),
+          throwError(error)
+        ],
       ])
       .put({
         type: types.GET_WECRM_ACCOUNTS_FAILURE,
@@ -619,29 +459,6 @@ describe('sendZippedFile Saga', () => {
     expect(generator.next().value).toEqual(call(api.sendZippedFile, action.selectedFile));
   });
 
-  it('calls errorHandler with message and returns early when isError is true', () => {
-    const errorHandler = jest.fn();
-    const successHandler = jest.fn();
-    const errorAction = {
-      selectedFile: 'upload.zip',
-      errorHandler,
-      successHandler,
-    };
-    const fakeErrorResponse = {
-      status: { isError: true },
-      message: 'Upload failed',
-    };
-    const generator = sendZippedFile(errorAction);
-    expect(generator.next().value).toEqual(call(api.sendZippedFile, errorAction.selectedFile));
-    // Advancing with isError response causes the saga to call errorHandler and yield
-    const yieldStep = generator.next(fakeErrorResponse);
-    expect(errorHandler).toHaveBeenCalledWith('Upload failed');
-    expect(yieldStep.done).toBe(false);
-    // After resuming from the yield, the return statement completes the generator
-    expect(generator.next().done).toBe(true);
-    expect(successHandler).not.toHaveBeenCalled();
-  });
-
   it('handles error thrown from api', () => {
     const error = new Error('Fetch failed');
     expectSaga(sendZippedFile, action)
@@ -1407,7 +1224,7 @@ describe('v2TemplateSaga', () => {
     // all() returns an IO object with an ALL key containing the array of effects
     expect(step.value).toHaveProperty('@@redux-saga/IO', true);
     expect(step.value).toHaveProperty('ALL');
-    expect(step.value.ALL).toHaveLength(15);
+    expect(step.value.ALL).toHaveLength(14);
     expect(step.done).toBe(false);
   });
 });

package/v2Containers/TemplatesV2/TemplatesV2.style.js

@@ -10,7 +10,7 @@ export default css`
 
   .component-wrapper {
     ${(props) => props.isFullMode ? `
-      max-width: 71.25rem;
+      max-width: 1140px;
       margin: 0 auto;
       width: 100%;
       padding: 0.714rem 0;
@@ -23,77 +23,6 @@ export default css`
       height: calc(100vh - 11.25rem);
     } `}
   }
-
-  /* SMS fallback / local list: single pane skips .cap-tab-v2, so flex-fill the grid instead of viewport-fixed pagination height */
-  .creatives-templates-container--local-sms.library-mode {
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-    min-height: 0;
-    height: 100%;
-
-    .component-wrapper {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      min-height: 0;
-      height: 100%;
-    }
-
-    .templates-v2-local-sms-pane {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      min-height: 0;
-      overflow: hidden;
-      height: 100%;
-    }
-
-    .templates-v2-local-sms-pane .creatives-templates-list.library-mode {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      min-height: 0;
-      overflow: hidden;
-      height: 100%;
-    }
-
-    .templates-v2-local-sms-pane .creatives-templates-list.library-mode > .cap-row:first-of-type {
-      flex: 1;
-      min-height: 0;
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
-    }
-
-    .templates-v2-local-sms-pane .creatives-templates-list.library-mode > .cap-row:first-of-type > div {
-      flex: 1;
-      min-height: 0;
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
-    }
-
-    .templates-v2-local-sms-pane .creatives-templates-list.library-mode > .cap-row:first-of-type > div > div:first-child {
-      flex: 1;
-      min-height: 0;
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
-    }
-
-    .templates-v2-local-sms-pane .v2-pagination-container,
-    .templates-v2-local-sms-pane .v2-pagination-container-half {
-      /* Match _templates local-SMS: bounded height so overflow-y scroll works (flex+100% alone often doesn’t) */
-      flex: 0 1 auto;
-      min-height: 0;
-      height: calc(100vh - 12rem);
-      max-height: calc(100vh - 12rem);
-      overflow-y: auto;
-      overflow-x: hidden;
-      -webkit-overflow-scrolling: touch;
-    }
-  }
 `;
 
 export const CapTabStyle = css`

package/v2Containers/TemplatesV2/index.js

@@ -10,8 +10,8 @@ import { connect } from 'react-redux';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import { bindActionCreators, compose } from 'redux';
-import { CapTab, CapCustomCard, CapButton, CapHeader, CapIcon, CapSpin, CapTooltip } from '@capillarytech/cap-ui-library';
-import { find, get, pick } from 'lodash';
+import { CapTab, CapCustomCard, CapButton, CapHeader, CapSpin, CapIcon, CapTooltip } from '@capillarytech/cap-ui-library';
+import { find, get } from 'lodash';
 import Helmet from 'react-helmet';
 
 import { UserIsAuthenticated } from '../../utils/authWrapper';
@@ -41,14 +41,13 @@ import { makeSelectAuthenticated, selectCurrentOrgDetails } from "../../v2Contai
 import {
   CALL_TASK,
   COMMON_CHANNELS,
-  LOCAL_TEMPLATE_CONFIG_KEYS_FOR_PICK,
   LOYALTY_SUPPORTED_ACTION,
   MOBILE_PUSH,
   NORMALIZED_CHANNEL_ALIASES,
   SMS,
 } from "../CreativesContainer/constants";
 
-const { CapCustomCardList } = CapCustomCard;
+const {CapCustomCardList} = CapCustomCard;
 
 const StyledCapTab = withStyles(CapTab, CapTabStyle);
 export class TemplatesV2 extends React.Component { // eslint-disable-line react/prefer-stateless-function
@@ -125,9 +124,9 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       return !normalizedChannelsToHideSet.has(paneKey);
     });
 
-    if (isFullMode && !normalizedChannelsToHideSet.has(normalizeChannel(ASSETS))) {
-      filteredPanes.push({ content: <div></div>, tab: intl.formatMessage(messages.gallery), key: ASSETS });
-    } else if (!isFullMode) {
+    if (isFullMode) {
+      filteredPanes.push({ content: <div></div>, tab: intl.formatMessage(messages.gallery), key: 'assets' });
+    } else {
       // Add special-mode panes only when not hidden (use normalized checks)
       if (!normalizedChannelsToHideSet.has(CALL_TASK.toLowerCase())) {
         filteredPanes.push({ content: <div></div>, tab: intl.formatMessage(messages.callTask), key: CALL_TASK.toLowerCase() });
@@ -228,8 +227,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       this.setState({selectedChannel: nextProps.channel, panes });
     }
   }
-
-  getTemplateDataForGrid = ({ templates, handlers, filterContent, channel, isLoading, loadingTip }) => {
+  getTemplateDataForGrid = ({templates, handlers, filterContent, channel, isLoading, loadingTip}) => {
     const currentChannel = channel.toUpperCase();
     const cardDataList = templates.map((template) => {
       const templateData =
@@ -255,8 +253,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       </CapSpin>
 
     </div>);
-  };
-
+  }
   getGalleryComponent = (location) => <Gallery location={location} isFullMode={this.props.isFullMode}/>
   getCallTaskComponent = () => (
     <CallTask
@@ -320,29 +317,6 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
     if (messageStrategy !== "X_ENGAGE" && channel === 'facebook' && !isFullMode) {
       return this.getFacebookComponent();
     }
-    const localConfig = this.props.localTemplatesConfig || pick(this.props, LOCAL_TEMPLATE_CONFIG_KEYS_FOR_PICK);
-    const useLocalTemplates = localConfig.useLocalTemplates;
-    if (useLocalTemplates && channel === (this.props.channel || 'sms')) {
-      // Reuse full Templates component (same UI as Redux flow) with local data only
-      const location = { pathname: `/${channel}`, search: '', query: !this.props.isFullMode ? { type: 'embedded', module: 'library' } : {} };
-      return (
-        <Templates
-          key={`${channel}-local`}
-          location={location}
-          route={{ name: channel }}
-          router={this.props.router}
-          isFullMode={this.props.isFullMode}
-          createNew={this.props.createNew}
-          onSelectTemplate={this.props.onSelectTemplate}
-          handlePeviewTemplate={this.props.handlePeviewTemplate}
-          messageStrategy={this.props.messageStrategy}
-          smsRegister={this.props.smsRegister}
-          hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
-          localTemplatesConfig={localConfig}
-        />
-      );
-    }
-
     const location = {pathname: `/${channel}`, search: '', query};
     switch (channel) {
       case 'call_task':
@@ -392,55 +366,29 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
   }
   render() {
     const { isFullMode, className, cap = {}, Global = {}} = this.props;
-    const useLocalTemplates = get(this.props, 'localTemplatesConfig.useLocalTemplates', false);
     const { accessiblePermissions = []} = cap.user || Global.user || {};
     let isCreativeAccessible = true;
     if (!accessiblePermissions.includes(CREATIVES_UI_VIEW)) {
       isCreativeAccessible = false;
     }
-    // Recompute active pane content every render so local-list mode updates
-    // (templates/loading/search UI) are not stuck with the initial cached pane.
-    const panes = this.setChannelContent(this.state.selectedChannel, this.state.panes);
-    const hideChannelTabsForLocalSms = useLocalTemplates && panes.length === 1;
-    const activeLocalPane = hideChannelTabsForLocalSms
-      ? (panes.find(
-        (p) => String(p.key).toLowerCase() === String(this.state.selectedChannel).toLowerCase(),
-      ) || panes[0])
-      : null;
     return (
       !isCreativeAccessible ? <AccessForbidden /> : (
-        <div
-          className={`${className} creatives-templates-container ${isFullMode ? 'fullmode' : 'library-mode'}${useLocalTemplates ? ' creatives-templates-container--local-sms' : ''}`}
-          data-testid="cap-wrapper"
-        >
-          {isFullMode && !useLocalTemplates && (
-            <Helmet
-              title={this.props.intl.formatMessage(messages.creatives)}
-              meta={[
-                { name: 'description', content: this.props.intl.formatMessage(messages.creativesDesc) },
-              ]}
-            />
-          )}
+        <div className={`${className} creatives-templates-container ${isFullMode ? 'fullmode' : 'library-mode'}`} data-testid="cap-wrapper">
+          {isFullMode && <Helmet
+            title={this.props.intl.formatMessage(messages.creatives)}
+            meta={[
+              { name: 'description', content: this.props.intl.formatMessage(messages.creativesDesc) },
+            ]}
+          />}
           <div className="component-wrapper">
-            {isFullMode && (
-              <CapHeader
-                title={<FormattedMessage {...messages.creatives} />}
-                {...(!useLocalTemplates && {
-                  description: <FormattedMessage {...messages.creativesDesc} />,
-                })}
-              />
-            )}
-            {hideChannelTabsForLocalSms ? (
-              <div className="templates-v2-local-sms-pane">{activeLocalPane?.content}</div>
-            ) : (
-              <StyledCapTab
-                panes={panes}
-                onChange={this.channelChange}
-                activeKey={this.state.selectedChannel}
-                defaultActiveKey={this.state.selectedChannel}
-                isFullMode={isFullMode}
-              />
-            )}
+            {isFullMode && <CapHeader title={<FormattedMessage {...messages.creatives}/>} description={<FormattedMessage {...messages.creativesDesc}/>}/>}
+            <StyledCapTab
+              panes={this.state.panes}
+              onChange={this.channelChange}
+              activeKey={this.state.selectedChannel}
+              defaultActiveKey={this.state.selectedChannel}
+              isFullMode={isFullMode}
+            />
           </div>
         </div>
       )
@@ -472,17 +420,6 @@ TemplatesV2.propTypes = {
   currentOrgDetails: PropTypes.object,
   restrictPersonalization: PropTypes.bool,
   isAnonymousType: PropTypes.bool,
-  // Optional: reuse grid UI with local template list (e.g. SMS fallback). Pass object or same keys as individual props.
-  localTemplatesConfig: PropTypes.shape({
-    useLocalTemplates: PropTypes.bool,
-    localTemplates: PropTypes.arrayOf(PropTypes.object),
-    localTemplatesLoading: PropTypes.bool,
-    localTemplatesLoadingTip: PropTypes.string,
-    localTemplatesFilterContent: PropTypes.node,
-    localTemplatesFooterContent: PropTypes.node,
-    localTemplatesOnPageChange: PropTypes.func,
-    localTemplatesUseSkeleton: PropTypes.bool,
-  }),
 };
 
 TemplatesV2.defaultProps = {

package/v2Containers/WeChat/MapTemplates/test/saga.test.js

@@ -11,7 +11,7 @@ describe('WeChat Template Management Sagas', () => {
   describe('getDefaultWeChatTemplates Saga', () => {
     const params = { channel: 'WeChat', queryParams: { type: 'default' } };
 
-    it('handles fetching default WeChat templates successfully', () => {
+    it.concurrent('handles fetching default WeChat templates successfully', () => {
       const fakeResponse = {
         response: {
           unMapped: [{ id: 1, name: 'Template One' }],
@@ -31,7 +31,7 @@ describe('WeChat Template Management Sagas', () => {
         .run();
     });
 
-    it('handles failure in fetching default WeChat templates', () => {
+    it.concurrent('handles failure in fetching default WeChat templates', () => {
       const error = new Error('Fetch failed');
 
       return expectSaga(sagas.getDefaultWeChatTemplates, params)
@@ -48,7 +48,7 @@ describe('WeChat Template Management Sagas', () => {
 
   describe('createTemplate Saga', () => {
     const template = { name: 'New WeChat Template' };
-    test('handles creating a WeChat template successfully', () => {
+    test.concurrent('handles creating a WeChat template successfully', () => {
       const fakeResponse = {
         response: template,
         status: { code: 200 }
@@ -64,7 +64,7 @@ describe('WeChat Template Management Sagas', () => {
         })
         .run();
     });
-    test('handles failure when creating a WeChat template', () => {
+    test.concurrent('handles failure when creating a WeChat template', () => {
       const error = new Error('Creation failed');
       return expectSaga(sagas.createTemplate, template)
         .provide([
@@ -79,7 +79,7 @@ describe('WeChat Template Management Sagas', () => {
   });
 
   describe('fetchWeCrmAccounts Saga', () => {
-    it('handles fetching WeCrm accounts successfully', () => {
+    it.concurrent('handles fetching WeCrm accounts successfully', () => {
       const fakeResponse = {
         response: [{ id: 1, name: 'Account One' }]
       };
@@ -95,7 +95,7 @@ describe('WeChat Template Management Sagas', () => {
         .run();
     });
 
-    it('handles failure in fetching WeCrm accounts', () => {
+    it.concurrent('handles failure in fetching WeCrm accounts', () => {
       const error = new Error('Fetch failed');
 
       return expectSaga(sagas.fetchWeCrmAccounts)
@@ -113,7 +113,7 @@ describe('WeChat Template Management Sagas', () => {
   describe('getTemplateDetails Saga', () => {
     const id = '123';
 
-    it('handles fetching template details successfully', () => {
+    it.concurrent('handles fetching template details successfully', () => {
       const fakeResponse = {
         response: { id: 123, name: 'Detailed Template' }
       };
@@ -129,7 +129,7 @@ describe('WeChat Template Management Sagas', () => {
         .run();
     });
 
-    it('handles failure in fetching template details', () => {
+    it.concurrent('handles failure in fetching template details', () => {
       const error = new Error('Fetch failed');
 
       return expectSaga(sagas.getTemplateDetails, id)
@@ -148,7 +148,7 @@ describe('WeChat Template Management Sagas', () => {
 
   // Test combined saga
   describe('Combined v2WechatMapTemplatesSagas', () => {
-    it('should initialize all WeChat-related watcher sagas without error', () => {
+    it.concurrent('should initialize all WeChat-related watcher sagas without error', () => {
       return expectSaga(v2WechatMapTemplatesSagas)
         .run();
     });

package/v2Containers/Whatsapp/index.js

@@ -119,7 +119,6 @@ import { ANDROID } from '../../v2Components/CommonTestAndPreview/constants';
 import CapImageUpload from '../../v2Components/CapImageUpload';
 import TagList from '../TagList';
 import { validateTags } from '../../utils/tagValidations';
-import { splitContentByOrderedVarTokens } from '../../utils/templateVarUtils';
 import { capitalizeString } from '../../utils/Formatter';
 import CapWhatsappCTA from '../../v2Components/CapWhatsappCTA';
 import {
@@ -497,10 +496,28 @@ export const Whatsapp = (props) => {
     );
   };
 
+  const converStringToVarArr = (validVarArr, content) => {
+    const templateVarArray = [];
+    while (content?.length !== 0) {
+      //converting content string to an array split at var
+      const index = content.indexOf(validVarArr?.[0]);
+      if (index !== -1) {
+        templateVarArray.push(content.substring(0, index)); //push string before var
+        templateVarArray.push(validVarArr?.[0]); //push var
+        content = content.substring(index + validVarArr?.[0]?.length, content?.length); //remaining str
+        validVarArr?.shift(); //remove considered var
+      } else {
+        templateVarArray.push(content); //remaining str
+        break;
+      }
+    }
+    return templateVarArray;
+  }
+
   const computeTextMessage = (msg, varMap, regex) => {
     const validVarArr = msg?.match(regex) || [];
     //conerting msg string to variable arr
-    const templateHeaderArray = splitContentByOrderedVarTokens(validVarArr, msg);
+    const templateHeaderArray = converStringToVarArr(validVarArr, msg);
     if (templateHeaderArray?.length !== 0) {
       let clonedVarMap = {};
       if (!isEmpty(varMap)) {
@@ -554,7 +571,7 @@ export const Whatsapp = (props) => {
       setUnsubscribeRequired(true);
     }
     //converting msg string to variable arr
-    const templateMessageArray = splitContentByOrderedVarTokens(validVarArr, msg);
+    const templateMessageArray = converStringToVarArr(validVarArr, msg);
     updateTempMsgArray(templateMessageArray.filter((i) => i === 0 || i));
   };