@capillarytech/creatives-library 8.0.125-alpha.6 → 8.0.126

package/config/app.js

@@ -7,6 +7,9 @@ const config = {
     campaigns_api_endpoint: '/iris/v2/campaigns',
     campaigns_api_org_endpoint: '/iris/v2/org/campaign',
     liquid_endpoint:'/iris/v2/template',
+    membercare_api_endpoint: '/member-care/api/v1',
+    iris_api_endpoint: '/iris/v2',
+    adiona_api_endpoint: '/adiona/api/v1',
     auth_endpoint: '/arya/api/v1/auth',
     arya_endpoint: '/arya/api/v1',
     login_url: '/auth/login',
@@ -27,6 +30,9 @@ const config = {
     login_url: '/auth/login',
     dashboard_url: '/sms',
     liquid_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/template',
+    membercare_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/member-care/api/v1',
+    iris_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2',
+    adiona_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/adiona/api/v1',
     dashboard_url_v2: '/v2',
   },
   testing: {

package/containers/App/constants.js

@@ -18,7 +18,6 @@ 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 ENABLE_NEW_MPUSH = "ENABLE_NEW_MPUSH";
 
 export const CARD_RELATED_TAGS = [
   'card_series',

package/containers/Email/index.js

@@ -1049,7 +1049,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           }
           this.edmEvent = undefined;
         } else if (this.state.editorInstanse) {
-          this.state.editorInstanse.insertHtml(`<img src='${nextProps.Email.uploadedAssetData.metaInfo.secure_file_path}' alt='Capillary Image'>`);
+          this.state.editorInstanse.insertHtml(`<img src='${nextProps.Email.uploadedAssetData.metaInfo.secure_file_path}' alt='Image'>`);
           //this.resetCkEditorInstance(this.state.currentTab, this.state.formData, true, nextProps.Email.uploadedAssetData, true);
         }
         this.setState({showImageSelectionBox: false});
@@ -1620,7 +1620,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         if (onInsert && !isImage) {
           this.state.editorInstanse.insertHtml(`{{${value}}}`);
         } else if (onInsert) {
-          this.state.editorInstanse.insertHtml(`<img src='${value.metaInfo.secure_file_path}' alt='Capillary Image'>`);
+          this.state.editorInstanse.insertHtml(`<img src='${value.metaInfo.secure_file_path}' alt='Image'>`);
         }
       }
     });
@@ -1979,7 +1979,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       //   if (this.state.isDragDrop) {
       //     
       //   } else {
-      //     this.state.editorInstanse.insertHtml(`<img src='${data.metaInfo.public_url}' alt='Capillary Image'>`);
+      //     this.state.editorInstanse.insertHtml(`<img src='${data.metaInfo.public_url}' alt='Image'>`);
       //   }
       // }
     }
@@ -2070,7 +2070,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           }
           this.edmEvent = undefined;
         } else if (this.state.editorInstanse) {
-          this.state.editorInstanse.insertHtml(`<img src='${data.metaInfo.secure_file_path}' alt='Capillary Image'>`);
+          this.state.editorInstanse.insertHtml(`<img src='${data.metaInfo.secure_file_path}' alt='Image'>`);
           //this.resetCkEditorInstance(this.state.currentTab, this.state.formData, true, data, true);
         }
       }
@@ -2446,7 +2446,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
   selectAsset = (asset) => {
     if (this.state.editorInstanse) {
-      this.state.editorInstanse.insertHtml(`<img src='${asset}' alt='Capillary Image'>`);
+      this.state.editorInstanse.insertHtml(`<img src='${asset}' alt='Image'>`);
     }
   }
 

package/containers/WeChat/RichmediaTemplates/Create/index.js

@@ -903,7 +903,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
   updateContentData = () => {
     if (this.state.editorInstanse) {
-      this.state.editorInstanse.insertHtml(`<img src='${this.props.ContentImageData.metaInfo.wechatUrl}' alt='Capillary Image'>`);
+      this.state.editorInstanse.insertHtml(`<img src='${this.props.ContentImageData.metaInfo.wechatUrl}' alt='Image'>`);
     }
     this.props.actions.clearContentImageStore();
     this.setState({loading: false});

package/initialReducer.js

@@ -14,6 +14,7 @@ import ftpReducer from 'v2Containers/FTP/reducer';
 import galleryReducer from './v2Containers/Assets/Gallery/reducer';
 import CapCollapsibleLeftNavigationReducer from '@capillarytech/cap-ui-library/CapCollapsibleLeftNavigation/reducer';
 import { AIRA_REDUCER_DOMAIN, askAiraReducer } from '@capillarytech/cap-ui-library/CapAskAira';
+import previewAndTestReducer from './v2Components/TestAndPreviewSlidebox/reducer';
 
 export const initialReducer = {
   language: languageProviderReducer,
@@ -31,4 +32,5 @@ export const initialReducer = {
   [AIRA_REDUCER_DOMAIN]: askAiraReducer,
   gallery: galleryReducer,
   navigationConfig: CapCollapsibleLeftNavigationReducer,
+  previewAndTest: previewAndTestReducer,
 };

package/package.json

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

package/services/api.js

@@ -16,6 +16,9 @@ let EXPORT_API_ENDPOINT = config.development.exports_api_endpoint;
 let CAMPAIGNS_API_ENDPOINT = config.development.campaigns_api_endpoint;
 let CAMPAIGNS_API_ORG_ENDPOINT = config.development.campaigns_api_org_endpoint;
 let LIQUID_API_ENDPOINT = config.development.liquid_endpoint;
+let MEMBERCARE_API_ENDPOINT = config.development.membercare_api_endpoint;
+let IRIS_API_ENDPOINT = config.development.iris_api_endpoint;
+let ADIONA_API_ENDPOINT = config.development.adiona_api_endpoint;
 
 let API_AUTH_ENDPOINT = config.development.auth_endpoint;
 let ARYA_ENDPOINT = config.development.arya_endpoint;
@@ -29,6 +32,9 @@ if (process.env.NODE_ENV === 'production') {
   SUBSCRIPTION_API_ENDPOINT = config.production.subscription_api_endpoint;
   EXPORT_API_ENDPOINT = config.production.exports_api_endpoint;
   LIQUID_API_ENDPOINT = config.production.liquid_endpoint;
+  MEMBERCARE_API_ENDPOINT = config.production.membercare_api_endpoint;
+  IRIS_API_ENDPOINT = config.production.iris_api_endpoint;
+  ADIONA_API_ENDPOINT = config.production.adiona_api_endpoint;
 }
 let requestCallerName = '';
 const isProd = process.env.NODE_ENV === 'production';
@@ -172,6 +178,46 @@ function getAPICallObject(method, body, isFileUpload = false, loadCampaignHeader
   return requestObj;
 }
 
+function get_LOYALTY_API_CallObject(method, body, notStringify) {
+  const token = loadItem('token');
+  const orgID = loadItem('orgID');
+  const user = loadItem('user');
+  const headers = {};
+
+  if (!notStringify) {
+    headers['Content-Type'] = 'application/json';
+  }
+
+  if (user && user.refID) {
+    headers['X-CAP-REMOTE-USER'] = user.refID;
+  }
+
+  if (process.env.NODE_ENV !== 'production' && orgID !== undefined) {
+    headers['X-CAP-API-AUTH-ORG-ID'] = orgID;
+  }
+
+  if (token !== undefined) {
+    headers.Authorization = `Bearer ${token}`;
+  }
+  const requestObj = {
+    method,
+    mode: 'cors',
+    headers: new Headers(headers),
+  };
+
+  if (process.env.NODE_ENV === 'production') {
+    requestObj.credentials = 'same-origin';
+  }
+
+  if (body && !notStringify) {
+    requestObj.body = JSON.stringify(body);
+  } else {
+    requestObj.body = body;
+  }
+
+  return requestObj;
+}
+
 // Authentication
 export const authorize = (user) => {
   const body = {
@@ -231,7 +277,7 @@ export const createWeChatTemplate = ({template}) => {
   return request(url, getAPICallObject('POST', template));
 };
 
-export const createMobilePushTemplate = (template) => {
+export const createMobilePushTemplate = ({template}) => {
   const url = `${API_ENDPOINT}/templates/MOBILEPUSH`;
   return request(url, getAPICallObject('POST', template));
 };
@@ -584,4 +630,51 @@ export const createCentralCommsMetaId = (payload, metaType = TRANSACTION) => {
   return request(url, getAPICallObject('POST', payload, false, false, false, true));
 };
 
+// Customer Search APIs for Email Test & Preview Feature
+export const searchCustomers = ({ query }) => {
+  const url = `${MEMBERCARE_API_ENDPOINT}/customers/search?q=${encodeURIComponent(query)}&limit=10`;
+  return request(url, get_LOYALTY_API_CallObject('GET'));
+};
+
+export const extractTagsWithMetaData = (payload) => {
+  const url = `${LIQUID_API_ENDPOINT}/extractTagsWithMetaData`;
+  return request(url, getAPICallObject('POST', payload, false, true));
+};
+
+export const updateEmailPreview = (payload) => {
+  const url = `${LIQUID_API_ENDPOINT}/preview`;
+  return request(url, getAPICallObject('POST', payload, false, true));
+};
+
+export const sendTestMessage = (payload) => {
+  const url = `${LIQUID_API_ENDPOINT}/sendTestMessage`;
+  return request(url, getAPICallObject('POST', payload, false, true));
+};
+
+export const fetchTestCustomers = () => {
+  const url = `${IRIS_API_ENDPOINT}/userGroup/default`;
+  return request(url, getAPICallObject('GET', null, false, true));
+};
+
+export const fetchTestGroups = () => {
+  const url = `${IRIS_API_ENDPOINT}/userGroup?isDefault=false`;
+  return request(url, getAPICallObject('GET', null, false, true));
+};
+
+export const getBulkCustomerDetails = (userIds) => {
+  const user = loadItem('user');
+  const url = `${ADIONA_API_ENDPOINT}/journeys/getBulkCustomer?source=ALL&userValue=${user?.loginName}`;
+  return request(url, get_LOYALTY_API_CallObject('POST', userIds));
+};
+
+export const createTestMessageMeta = (payload) => {
+  const url = `${LIQUID_API_ENDPOINT}/TEST/createMessageMeta`;
+  return request(url, getAPICallObject('POST', payload, false, true));
+};
+
+export const updateTestMessageMeta = (payload) => {
+  const url = `${LIQUID_API_ENDPOINT}/TEST/${payload.messageMetaConfigId}/updateMessageMeta`;
+  return request(url, getAPICallObject('POST', payload?.data, false, true));
+};
+
 export {request, getAPICallObject};

package/services/tests/api.test.js

@@ -14,6 +14,15 @@ import {
   fetchSchemaForEntity,
   getDefaultBeeTemplates,
   getEdmTemplates,
+  searchCustomers,
+  extractTagsWithMetaData,
+  updateEmailPreview,
+  sendTestMessage,
+  fetchTestCustomers,
+  fetchTestGroups,
+  getBulkCustomerDetails,
+  createTestMessageMeta,
+  updateTestMessageMeta,
 } from '../api';
 import { mockData } from './mockData';
 import getSchema from '../getSchema';
@@ -613,3 +622,185 @@ describe('Email Template APIs', () => {
     sharedTests(getDefaultBeeTemplates, 'getDefaultBeeTemplates');
   });
 });
+
+describe('searchCustomers', () => {
+  it('should return correct response', async () => {
+    global.fetch.mockReturnValue(Promise.resolve({
+      status: 200,
+      json: () => Promise.resolve({
+        status: 200,
+        response: 'test',
+      }),
+    }));
+    const result = await searchCustomers({ query: 'test' });
+    expect(result).toEqual({
+      status: 200,
+      response: 'test',
+    });
+  });
+  it('should handle fetch failure', async () => {
+    global.fetch.mockRejectedValue({ error: 'Network error' });
+    const result = await searchCustomers({ query: 'test' });
+    expect(result).toEqual({
+      error: 'Network error',
+    });
+  });
+});
+describe('extractTagsWithMetaData', () => {
+  it('should return correct response', async () => {
+    global.fetch.mockReturnValue(Promise.resolve({
+      status: 200,
+      json: () => Promise.resolve({
+        status: 200,
+        response: 'test',
+      }),
+    }));
+    const result = await extractTagsWithMetaData({ query: 'test' });
+    expect(result).toEqual({
+      status: 200,
+      response: 'test',
+    });
+  });
+  it('should handle fetch failure', async () => {
+    global.fetch.mockRejectedValue({ error: 'Network error' });
+    const result = await extractTagsWithMetaData({ query: 'test' });
+    expect(result).toEqual({
+      error: 'Network error',
+    });
+  });
+});
+
+describe('updateEmailPreview', () => {
+  it('should return correct response', async () => {
+    global.fetch.mockReturnValue(Promise.resolve({
+      status: 200,
+      json: () => Promise.resolve({
+        status: 200,
+        response: 'test',
+      }),
+    }));
+    const result = await updateEmailPreview({ query: 'test' });
+    expect(result).toEqual({
+      status: 200,
+      response: 'test',
+    });
+  });
+  it('should handle fetch failure', async () => {
+    global.fetch.mockRejectedValue({ error: 'Network error' });
+    const result = await updateEmailPreview({ query: 'test' });
+    expect(result).toEqual({
+      error: 'Network error',
+    });
+  });
+});
+
+describe('sendTestMessage', () => {
+  it('should return correct response', async () => {
+    global.fetch.mockReturnValue(Promise.resolve({
+      status: 200,
+      json: () => Promise.resolve({
+        status: 200,
+        response: 'test',
+      }),
+    }));
+    const result = await sendTestMessage({ query: 'test' });
+    expect(result).toEqual({
+      status: 200,
+      response: 'test',
+    });
+  });
+});
+describe('fetchTestCustomers', () => {
+  it('should return correct response', async () => {
+    global.fetch.mockReturnValue(Promise.resolve({
+      status: 200,
+      json: () => Promise.resolve({
+        status: 200,
+        response: 'test',
+      }),
+    }));
+    const result = await fetchTestCustomers({ query: 'test' });
+    expect(result).toEqual({
+      status: 200,
+      response: 'test',
+    });
+  });
+  it('should handle fetch failure', async () => {
+    global.fetch.mockRejectedValue({ error: 'Network error' });
+    const result = await fetchTestCustomers({ query: 'test' });
+    expect(result).toEqual({
+      error: 'Network error',
+    });
+  });
+});
+describe('fetchTestGroups', () => {
+  it('should return correct response', async () => {
+    global.fetch.mockReturnValue(Promise.resolve({
+      status: 200,
+      json: () => Promise.resolve({
+        status: 200,
+        response: 'test',
+      }),
+    }));
+    const result = await fetchTestGroups({ query: 'test' });
+    expect(result).toEqual({
+      status: 200,
+      response: 'test',
+    });
+  });
+});
+describe('getBulkCustomerDetails', () => {
+  it('should return correct response', async () => {
+    global.fetch.mockReturnValue(Promise.resolve({
+      status: 200,
+      json: () => Promise.resolve({
+        status: 200,
+        response: 'test',
+      }),
+    }));
+    const result = await getBulkCustomerDetails({ query: 'test' });
+    expect(result).toEqual({
+      status: 200,
+      response: 'test',
+    });
+  });
+  it('should handle fetch failure', async () => {
+    global.fetch.mockRejectedValue({ error: 'Network error' });
+    const result = await getBulkCustomerDetails({ query: 'test' });
+    expect(result).toEqual({
+      error: 'Network error',
+    });
+  });
+});
+describe('createTestMessageMeta', () => {
+  it('should return correct response', async () => {
+    global.fetch.mockReturnValue(Promise.resolve({
+      status: 200,
+      json: () => Promise.resolve({
+        status: 200,
+        response: 'test',
+      }),
+    }));
+    const result = await createTestMessageMeta({ query: 'test' });
+    expect(result).toEqual({
+      status: 200,
+      response: 'test',
+    });
+  });
+});
+describe('updateTestMessageMeta', () => {
+  it('should return correct response', async () => {
+    global.fetch.mockReturnValue(Promise.resolve({
+      status: 200,
+      json: () => Promise.resolve({
+        status: 200,
+        response: 'test',
+      }),
+    }));
+    const result = await updateTestMessageMeta({ query: 'test' });
+    expect(result).toEqual({
+      status: 200,
+      response: 'test',
+    });
+  });
+});

package/tests/integration/TemplateCreation/TemplateCreation.integration.test.js

@@ -32,7 +32,7 @@ jest.mock('@capillarytech/cap-ui-utils', () => ({
   },
 }));
 
-jest.setTimeout(60000);
+jest.setTimeout(30000);
 
 const initializeCreatives = () => { 
   const store = configureStore(mockInitialState, initialReducer, history);
@@ -51,12 +51,6 @@ beforeEach(() => {
   server.listen();
   localStorage.clear();
   localStorage.setItem('token', true);
-  
-  // Mock cap auth
-  window.capAuth = {
-    hasFeatureAccess: jest.fn().mockReturnValue(false),
-    isInitialized: jest.fn().mockReturnValue(true),
-  };
 });
 
 // clean up once the tests are done
@@ -68,6 +62,7 @@ afterAll(() => {
 });
 
 describe("Creatives testing template creation", () => {
+  jest.useFakeTimers();
   it("Should navigate from creatives home page and create template in RCS channel", async () => {
     initializeCreatives();
     const creativesScreen = await helper.getCreativesScreen();
@@ -98,7 +93,7 @@ describe("Creatives testing template creation", () => {
       name: globalMessages.email.defaultMessage,
     });
     await userEvent.click(whatsapp);
-    await waitFor(() => {
+    waitFor(() => {
       expect(
         creativesScreen.getByText(
           /Whatsapp accounts are not setup for your brand/i

package/tests/integration/TemplateCreation/api-response.js

@@ -20418,8 +20418,3 @@ export const tag = {
   }
 };
 
-export const cdnTransformationConfig = {
-  enabled: false,
-  transformations: [],
-};
-

package/tests/integration/TemplateCreation/msw-handler.js

@@ -4,52 +4,73 @@ import 'whatwg-fetch';
 import * as apiResponse from './api-response';
 
 import config from '../../../config/app';
-import { MOBILE_PUSH } from '../../../v2Containers/CreativesContainer/constants';
 const API_ENDPOINT = config.development.api_endpoint;
 const AUTH_ENDPOINT = config.development.auth_endpoint;
 const CAMPAIGNS_API_ENDPOINT = config.development.campaigns_api_org_endpoint;
 
 export const server = setupServer(
-  rest.options('*', (req, res, ctx) => res(
-    ctx.status(200),
-    ctx.set('access-control-allow-origin', '*'),
-    ctx.set('Access-Control-Allow-Headers', 'x-cap-org'),
-    ctx.set('Access-Control-Allow-Headers', 'x-cap-remote-user'),
-    ctx.set('Access-Control-Allow-Headers', 'x-cap-api-data-context-org-id'),
-    ctx.set('Access-Control-Allow-Headers', 'x-cap-api-auth-org-id'),
-  )),
-  rest.get(`${AUTH_ENDPOINT}/auth/org/:orgId/users`, (req, res, ctx) => {
-    const { orgId } = req.params;
-    switch (orgId) {
-      case '50146':
-        return res(ctx.status(200), ctx.json(apiResponse.authOrgUsersReonData));
-    }
-  }),
+    rest.options('*', (req, res, ctx) =>
+      res(
+        ctx.status(200),
+        ctx.set('access-control-allow-origin', '*'),
+        ctx.set('Access-Control-Allow-Headers', 'x-cap-org'),
+        ctx.set('Access-Control-Allow-Headers', 'x-cap-remote-user'),
+        ctx.set('Access-Control-Allow-Headers', 'x-cap-api-data-context-org-id'),
+        ctx.set('Access-Control-Allow-Headers', 'x-cap-api-auth-org-id'),
+      ),
+    ),
+    rest.get(`${AUTH_ENDPOINT}/auth/org/:orgId/users`, (req, res, ctx) => {
+      const { orgId } = req.params;
+      switch (orgId) {
+        case '50146':
+          return res(ctx.status(200), ctx.json(apiResponse.authOrgUsersReonData));
+      }
+    }),
 
-  rest.get(`${AUTH_ENDPOINT}/user`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.authUserReonData))),
+    rest.get(`${AUTH_ENDPOINT}/user`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.authUserReonData)),
+    ),
 
-  rest.get(`${AUTH_ENDPOINT}/org/users`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.authOrgUsersReonData))),
-  rest.get(`${API_ENDPOINT}/templates/Sms`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.smsTemplates))),
-  rest.get(`${API_ENDPOINT}/templates/v1/Sms`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.smsTemplates))),
-  rest.get(`${API_ENDPOINT}/templates/Rcs`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.rcsTemplates))),
-  rest.get(`${API_ENDPOINT}/templates/v1/Rcs`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.rcsTemplates))),
-  rest.get(`${API_ENDPOINT}/meta/wecrm`, (req, res, ctx) => {
-    const sourceName = req.url.searchParams.get('source_name');
-    switch (sourceName) {
-      case 'WHATSAPP':
-        return res(ctx.status(200), ctx.json(apiResponse.whatsappAccount));
-      case 'VIBER':
-        return res(ctx.status(200), ctx.json(apiResponse.viberAccount));
-      case MOBILE_PUSH:
-        return res(ctx.status(200), ctx.json(apiResponse.mpushAccount));
-      default:
-        return res(ctx.status(200), ctx.json(apiResponse.whatsappAccount));
-    }
-  }),
-  rest.get(`${API_ENDPOINT}/assets/image`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.gallery))),
-  rest.get(`${API_ENDPOINT}/templates/v1/Line`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.lineTemplates))),
-  rest.get(`${API_ENDPOINT}/templates/v1/Viber`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.viberTemplates))),
-  rest.get(`${API_ENDPOINT}/templates/v1/Email`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.emailTemplates))),
-  rest.get(`${API_ENDPOINT}/meta/TAG`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.tag))),
-  rest.get(`${CAMPAIGNS_API_ENDPOINT}/meta/domainProperties`, (req, res, ctx) => res(ctx.status(200), ctx.json(apiResponse.domainProperties))),
-);
+    rest.get(`${AUTH_ENDPOINT}/org/users`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.authOrgUsersReonData)),
+    ),
+    rest.get(`${API_ENDPOINT}/templates/Sms`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.smsTemplates)),
+    ),
+    rest.get(`${API_ENDPOINT}/templates/v1/Sms`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.smsTemplates)),
+    ),
+    rest.get(`${API_ENDPOINT}/templates/Rcs`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.rcsTemplates)),
+    ),
+    rest.get(`${API_ENDPOINT}/templates/v1/Rcs`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.rcsTemplates)),
+    ),
+    rest.get(`${API_ENDPOINT}/meta/wecrm`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.viberAccount)),
+    ),
+    rest.get(`${API_ENDPOINT}/meta/wecrm`, (req, res, ctx) => 
+      res(ctx.status(200), ctx.json(apiResponse.whatsappAccount)),
+    ),
+    rest.get(`${API_ENDPOINT}/meta/wecrm`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.mpushAccount)),
+    ),
+    rest.get(`${API_ENDPOINT}/assets/image`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.gallery)),
+    ),
+    rest.get(`${API_ENDPOINT}/templates/v1/Line`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.lineTemplates)),
+    ),
+    rest.get(`${API_ENDPOINT}/templates/v1/Viber`, (req, res, ctx) =>
+    res(ctx.status(200), ctx.json(apiResponse.viberTemplates)),
+  ),
+    rest.get(`${API_ENDPOINT}/templates/v1/Email`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.emailTemplates)),
+    ),
+    rest.get(`${API_ENDPOINT}/meta/TAG`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.tag)),
+    ),
+    rest.get(`${CAMPAIGNS_API_ENDPOINT}/meta/domainProperties`, (req, res, ctx) =>
+      res(ctx.status(200), ctx.json(apiResponse.domainProperties)),
+    ),
+  );

package/utils/common.js

@@ -22,7 +22,6 @@ import {
   BADGES_ISSUE,
   ENABLE_WECHAT,
   LIQUID_SUPPORT,
-  ENABLE_NEW_MPUSH,
 } from '../containers/App/constants';
 import { apiMessageFormatHandler } from './commonUtils';
 
@@ -125,12 +124,6 @@ export const isEmailUnsubscribeTagMandatory = Auth.hasFeatureAccess.bind(
   null,
   EMAIL_UNSUBSCRIBE_TAG_MANDATORY,
 );
-
-export const hasNewMobilePushFeatureEnabled = Auth.hasFeatureAccess.bind(
-  null,
-  ENABLE_NEW_MPUSH,
-);
-
 //filtering tags based on scope
 export const filterTags = (tagsToFilter, tagsList) => tagsList?.filter(
     (tag) => !tagsToFilter?.includes(tag?.definition?.value)

package/utils/commonUtils.js

@@ -35,7 +35,7 @@ export const addBaseToTemplate = (template) => {
         ...template.versions,
         base: {
           ...history[0],
-          ...( get(template, 'versions.base.subject') ? {subject: get(template, 'versions.base.subject')} : { subject: history?.[0]?.subject }),
+          ...( get(template, 'versions.base.subject') ? {subject : get(template, 'versions.base.subject')} :{ subject:history?.[0]?.subject }),
         },
       },
     });
@@ -151,7 +151,7 @@ export const validateLiquidTemplateContent = async (
   const emptyBodyError = formatMessage(messages?.emailBodyEmptyError);
   const somethingWrongMsg = formatMessage(messages?.somethingWentWrong);
   // Empty content check
-
+  
   if (!content || content.trim() === "") {
     onError({
       standardErrors: [emptyBodyError],
@@ -170,6 +170,7 @@ export const validateLiquidTemplateContent = async (
 
   const {askAiraResponse: result, isError} = await getLiquidTagsAsync(content);
   const validString = /\S/.test(content);
+
   // Handle API errors or empty content
   if (result?.errors?.length > 0 || !validString || isError) {
     let standardErrors = [];
@@ -301,6 +302,7 @@ export const _validatePlatformSpecificContent = async (
   if (singleTab === IOS) {
     isAndroidValid = true;
   }
+
   return isAndroidValid && isIosValid; // Overall success
 };
 
@@ -338,6 +340,7 @@ export const validateMobilePushContent = async (formData, options) => {
     if (iosContent) return [iosContent, IOS?.toLowerCase()];
     return ["", ""];
   };
+
   if (overallSuccess) {
     const [contentToSubmit, tabTypeToSubmit] = getContentToSubmit();
     // Call the FINAL onSuccess only ONCE here
@@ -370,6 +373,7 @@ export const validateInAppContent = async (formData, options) => {
     onSuccess, // FINAL success callback
     ...restOptions // Options for validateLiquidTemplateContent
   } = options;
+
   // Clear previous errors with new structure
   onError({
     standardErrors: {