@capillarytech/creatives-library 8.0.345 → 8.0.347

package/v2Containers/Templates/sagas.js

@@ -1,6 +1,5 @@
-import React from 'react';
 import {
-  call, put, select, takeLatest, all,
+  call, put, takeLatest, all,
 } from 'redux-saga/effects';
 import get from 'lodash/get';
 import { CapNotification } from '@capillarytech/cap-ui-library';
@@ -12,17 +11,6 @@ import { COPY_OF } from '../../constants/unified';
 import { ZALO_TEMPLATE_INFO_REQUEST } from '../Zalo/constants';
 import { getTemplateInfoById } from '../Zalo/saga';
 
-const templateNameDescription = (templateName) => (
-  templateName
-    ? (
-      <span>
-        <span className="notification-template-label">Template name </span>
-        <span className="notification-template-name">{templateName}</span>
-      </span>
-    )
-    : undefined
-);
-
 // Individual exports for testing
 export function* getAllTemplates(channel, queryParams) {
   try {
@@ -215,57 +203,45 @@ export function* getSenderDetails({
   }
 }
 
-export function* archiveTemplateSaga({ channel, id, templateName }) {
+export function* archiveTemplateSaga({ channel, id, successMessage, description }) {
   try {
     yield call(Api.archiveTemplate, { channel, id });
-    yield put({ type: types.ARCHIVE_TEMPLATE_SUCCESS, id });
-    const archiveFilter = yield select((state) => state.get('templates') ? state.get('templates').get('archiveFilter', 'active') : 'active');
-    yield call(getAllTemplates, { channel, queryParams: { page: 1, archiveStatus: archiveFilter } });
-    CapNotification.success({ message: 'Template archived successfully', description: templateNameDescription(templateName) });
+    yield put({ type: types.ARCHIVE_TEMPLATE_SUCCESS, id, successMessage, description });
   } catch (error) {
     yield put({ type: types.ARCHIVE_TEMPLATE_FAILURE, error });
-    CapNotification.error({ message: 'Failed to archive template' });
+    CapNotification.error({ message: error.message || 'Failed to archive template' });
   }
 }
 
-export function* unarchiveTemplateSaga({ channel, id, templateName }) {
+export function* unarchiveTemplateSaga({ channel, id, successMessage, description }) {
   try {
     yield call(Api.unarchiveTemplate, { channel, id });
-    yield put({ type: types.UNARCHIVE_TEMPLATE_SUCCESS, id });
-    const archiveFilter = yield select((state) => state.get('templates') ? state.get('templates').get('archiveFilter', 'active') : 'active');
-    yield call(getAllTemplates, { channel, queryParams: { page: 1, archiveStatus: archiveFilter } });
-    CapNotification.success({ message: 'Template unarchived successfully', description: templateNameDescription(templateName) });
+    yield put({ type: types.UNARCHIVE_TEMPLATE_SUCCESS, id, successMessage, description });
   } catch (error) {
     yield put({ type: types.UNARCHIVE_TEMPLATE_FAILURE, error });
-    CapNotification.error({ message: 'Failed to unarchive template' });
+    CapNotification.error({ message: error.message || 'Failed to unarchive template' });
   }
 }
 
-export function* bulkArchiveTemplatesSaga({ channel, ids }) {
+export function* bulkArchiveTemplatesSaga({ channel, ids, successMessage }) {
   try {
     const result = yield call(Api.bulkArchiveTemplates, { channel, ids });
-    yield put({ type: types.BULK_ARCHIVE_SUCCESS });
     const count = get(result, 'response.modifiedCount', ids.length);
-    const archiveFilter = yield select((state) => state.get('templates') ? state.get('templates').get('archiveFilter', 'active') : 'active');
-    yield call(getAllTemplates, { channel, queryParams: { page: 1, archiveStatus: archiveFilter } });
-    CapNotification.success({ message: `${count} templates archived successfully` });
+    yield put({ type: types.BULK_ARCHIVE_SUCCESS, successMessage, count });
   } catch (error) {
     yield put({ type: types.BULK_ARCHIVE_FAILURE, error });
-    CapNotification.error({ message: 'Failed to archive templates' });
+    CapNotification.error({ message: error.message || 'Failed to archive templates' });
   }
 }
 
-export function* bulkUnarchiveTemplatesSaga({ channel, ids }) {
+export function* bulkUnarchiveTemplatesSaga({ channel, ids, successMessage }) {
   try {
     const result = yield call(Api.bulkUnarchiveTemplates, { channel, ids });
-    yield put({ type: types.BULK_UNARCHIVE_SUCCESS });
     const count = get(result, 'response.modifiedCount', ids.length);
-    const archiveFilter = yield select((state) => state.get('templates') ? state.get('templates').get('archiveFilter', 'active') : 'active');
-    yield call(getAllTemplates, { channel, queryParams: { page: 1, archiveStatus: archiveFilter } });
-    CapNotification.success({ message: `${count} templates unarchived successfully` });
+    yield put({ type: types.BULK_UNARCHIVE_SUCCESS, successMessage, count });
   } catch (error) {
     yield put({ type: types.BULK_UNARCHIVE_FAILURE, error });
-    CapNotification.error({ message: 'Failed to unarchive templates' });
+    CapNotification.error({ message: error.message || 'Failed to unarchive templates' });
   }
 }
 

package/v2Containers/Templates/tests/__snapshots__/index.test.js.snap

@@ -192,6 +192,11 @@ exports[`Test Templates container Should render sms illustration when no templat
 <Fragment>
   <div
     className="creatives-templates-list library-mode"
+    style={
+      Object {
+        "position": "relative",
+      }
+    }
   >
     <input
       accept=".zip, .html, .htm"
@@ -376,6 +381,11 @@ exports[`Test Templates container Should render temlates when whatsapp templates
 <Fragment>
   <div
     className="creatives-templates-list library-mode"
+    style={
+      Object {
+        "position": "relative",
+      }
+    }
   >
     <input
       accept=".zip, .html, .htm"
@@ -628,6 +638,11 @@ exports[`Test Templates container Should render temlates when whatsapp templates
 <Fragment>
   <div
     className="creatives-templates-list full-mode"
+    style={
+      Object {
+        "position": "relative",
+      }
+    }
   >
     <input
       accept=".zip, .html, .htm"
@@ -1079,6 +1094,11 @@ exports[`Test Templates container Test max templates exceeded 1`] = `
 <Fragment>
   <div
     className="creatives-templates-list full-mode"
+    style={
+      Object {
+        "position": "relative",
+      }
+    }
   >
     <input
       accept=".zip, .html, .htm"
@@ -1583,6 +1603,11 @@ exports[`Test Templates container Test max templates not exceeded 1`] = `
 <Fragment>
   <div
     className="creatives-templates-list full-mode"
+    style={
+      Object {
+        "position": "relative",
+      }
+    }
   >
     <input
       accept=".zip, .html, .htm"
@@ -2087,6 +2112,11 @@ exports[`Test Templates container Test max templates warning 1`] = `
 <Fragment>
   <div
     className="creatives-templates-list full-mode"
+    style={
+      Object {
+        "position": "relative",
+      }
+    }
   >
     <input
       accept=".zip, .html, .htm"
@@ -2591,6 +2621,11 @@ exports[`Test Templates container Test removing all whatsapp filterss 1`] = `
 <Fragment>
   <div
     className="creatives-templates-list library-mode"
+    style={
+      Object {
+        "position": "relative",
+      }
+    }
   >
     <input
       accept=".zip, .html, .htm"
@@ -2869,6 +2904,11 @@ exports[`Test Templates container Test removing all whatsapp filterss 2`] = `
 <Fragment>
   <div
     className="creatives-templates-list library-mode"
+    style={
+      Object {
+        "position": "relative",
+      }
+    }
   >
     <input
       accept=".zip, .html, .htm"
@@ -3121,6 +3161,11 @@ exports[`Test Templates container Test removing single filter 1`] = `
 <Fragment>
   <div
     className="creatives-templates-list library-mode"
+    style={
+      Object {
+        "position": "relative",
+      }
+    }
   >
     <input
       accept=".zip, .html, .htm"

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

@@ -858,91 +858,80 @@ describe('getAllTemplates wechat channel', () => {
   });
 });
 describe('archiveTemplateSaga', () => {
-  it('should dispatch ARCHIVE_TEMPLATE_SUCCESS, refresh listing, then show success notification', () => {
-    const { CapNotification } = require('@capillarytech/cap-ui-library');
-    const action = { channel: 'EMAIL', id: 'id1', templateName: 'Test' };
+  it('should call archiveTemplate API then dispatch ARCHIVE_TEMPLATE_SUCCESS with payload', () => {
+    const successMessage = 'Template archived successfully';
+    const description = 'Template name Test';
+    const action = { channel: 'EMAIL', id: 'id1', successMessage, description };
     const gen = archiveTemplateSaga(action);
-    // call archiveTemplate
+    // first yield: call archiveTemplate
     gen.next();
-    // put ARCHIVE_TEMPLATE_SUCCESS with id
-    expect(gen.next().value).toEqual(put({ type: types.ARCHIVE_TEMPLATE_SUCCESS, id: 'id1' }));
-    // yield select archiveFilter
-    const selectStep = gen.next();
-    expect(selectStep.value).toBeDefined();
-    // call getAllTemplates (listing refresh) — notification fires AFTER this resolves
-    const callStep = gen.next('active');
-    expect(callStep.value).toHaveProperty('@@redux-saga/IO');
-    // CapNotification.success runs (not yielded) then generator is done
+    // second yield: put ARCHIVE_TEMPLATE_SUCCESS with id and success payload
+    const successStep = gen.next();
+    expect(successStep.value).toEqual(put({ type: types.ARCHIVE_TEMPLATE_SUCCESS, id: 'id1', successMessage, description }));
+    // done — no more yields
     expect(gen.next().done).toBe(true);
-    expect(CapNotification.success).toHaveBeenCalledWith(expect.objectContaining({ message: 'Template archived successfully' }));
   });
 
   it('should dispatch ARCHIVE_TEMPLATE_FAILURE and call CapNotification.error on error', () => {
     const { CapNotification } = require('@capillarytech/cap-ui-library');
-    const action = { channel: 'EMAIL', id: 'id1', templateName: 'Test' };
+    const action = { channel: 'EMAIL', id: 'id1', successMessage: 'archived' };
     const gen = archiveTemplateSaga(action);
     gen.next(); // call archiveTemplate
     const error = new Error('archive failed');
     expect(gen.throw(error).value).toEqual(put({ type: types.ARCHIVE_TEMPLATE_FAILURE, error }));
-    // advance past put — CapNotification.error executes and generator finishes
     const done = gen.next();
     expect(done.done).toBe(true);
-    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'Failed to archive template' });
+    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'archive failed' });
   });
 });
 
 describe('unarchiveTemplateSaga', () => {
-  it('should dispatch UNARCHIVE_TEMPLATE_SUCCESS, refresh listing, then show success notification', () => {
-    const { CapNotification } = require('@capillarytech/cap-ui-library');
-    const action = { channel: 'EMAIL', id: 'id1', templateName: 'Test' };
+  it('should call unarchiveTemplate API then dispatch UNARCHIVE_TEMPLATE_SUCCESS with payload', () => {
+    const successMessage = 'Template unarchived successfully';
+    const description = 'Template name Test';
+    const action = { channel: 'EMAIL', id: 'id1', successMessage, description };
     const gen = unarchiveTemplateSaga(action);
-    // call unarchiveTemplate
+    // first yield: call unarchiveTemplate
     gen.next();
-    // put UNARCHIVE_TEMPLATE_SUCCESS with id
-    expect(gen.next().value).toEqual(put({ type: types.UNARCHIVE_TEMPLATE_SUCCESS, id: 'id1' }));
-    // yield select archiveFilter
-    const selectStep = gen.next();
-    expect(selectStep.value).toBeDefined();
-    // call getAllTemplates (listing refresh) — notification fires AFTER this resolves
-    const callStep = gen.next('archived');
-    expect(callStep.value).toHaveProperty('@@redux-saga/IO');
-    // CapNotification.success runs (not yielded) then generator is done
+    // second yield: put UNARCHIVE_TEMPLATE_SUCCESS with id and success payload
+    const successStep = gen.next();
+    expect(successStep.value).toEqual(put({ type: types.UNARCHIVE_TEMPLATE_SUCCESS, id: 'id1', successMessage, description }));
     expect(gen.next().done).toBe(true);
-    expect(CapNotification.success).toHaveBeenCalledWith(expect.objectContaining({ message: 'Template unarchived successfully' }));
   });
 
   it('should dispatch UNARCHIVE_TEMPLATE_FAILURE and call CapNotification.error on error', () => {
     const { CapNotification } = require('@capillarytech/cap-ui-library');
-    const action = { channel: 'EMAIL', id: 'id1', templateName: 'Test' };
+    const action = { channel: 'EMAIL', id: 'id1', successMessage: 'unarchived' };
     const gen = unarchiveTemplateSaga(action);
     gen.next(); // call unarchiveTemplate
     const error = new Error('unarchive failed');
     expect(gen.throw(error).value).toEqual(put({ type: types.UNARCHIVE_TEMPLATE_FAILURE, error }));
-    // advance past put — CapNotification.error executes and generator finishes
     const done = gen.next();
     expect(done.done).toBe(true);
-    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'Failed to unarchive template' });
+    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'unarchive failed' });
   });
 });
 
 describe('bulkArchiveTemplatesSaga', () => {
-  it('should dispatch BULK_ARCHIVE_SUCCESS, refresh listing, then show success notification', () => {
-    const { CapNotification } = require('@capillarytech/cap-ui-library');
-    const action = { channel: 'EMAIL', ids: ['id1', 'id2'] };
+  it('should call bulkArchiveTemplates API then dispatch BULK_ARCHIVE_SUCCESS with count', () => {
+    const successMessage = (count) => `${count} templates archived`;
+    const action = { channel: 'EMAIL', ids: ['id1', 'id2'], successMessage };
     const gen = bulkArchiveTemplatesSaga(action);
-    // call bulkArchiveTemplates
+    // first yield: call bulkArchiveTemplates
     gen.next();
-    // put BULK_ARCHIVE_SUCCESS
-    expect(gen.next({ response: { modifiedCount: 2 } }).value).toEqual(put({ type: types.BULK_ARCHIVE_SUCCESS }));
-    // yield select archiveFilter
-    const selectStep = gen.next();
-    expect(selectStep.value).toBeDefined();
-    // call getAllTemplates (listing refresh) — notification fires AFTER this resolves
-    const callStep = gen.next('active');
-    expect(callStep.value).toHaveProperty('@@redux-saga/IO');
-    // CapNotification.success runs (not yielded) then generator is done
+    // second yield: put BULK_ARCHIVE_SUCCESS with successMessage and count
+    const successStep = gen.next({ response: { modifiedCount: 2 } });
+    expect(successStep.value).toEqual(put({ type: types.BULK_ARCHIVE_SUCCESS, successMessage, count: 2 }));
     expect(gen.next().done).toBe(true);
-    expect(CapNotification.success).toHaveBeenCalledWith({ message: '2 templates archived successfully' });
+  });
+
+  it('should use ids.length as count fallback when modifiedCount is missing', () => {
+    const successMessage = (count) => `${count} templates archived`;
+    const action = { channel: 'EMAIL', ids: ['id1', 'id2', 'id3'], successMessage };
+    const gen = bulkArchiveTemplatesSaga(action);
+    gen.next();
+    const successStep = gen.next({ response: {} });
+    expect(successStep.value).toEqual(put({ type: types.BULK_ARCHIVE_SUCCESS, successMessage, count: 3 }));
   });
 
   it('should dispatch BULK_ARCHIVE_FAILURE and call CapNotification.error on error', () => {
@@ -952,31 +941,32 @@ describe('bulkArchiveTemplatesSaga', () => {
     gen.next(); // call bulkArchiveTemplates
     const error = new Error('bulk archive failed');
     expect(gen.throw(error).value).toEqual(put({ type: types.BULK_ARCHIVE_FAILURE, error }));
-    // advance past put — CapNotification.error executes and generator finishes
     const done = gen.next();
     expect(done.done).toBe(true);
-    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'Failed to archive templates' });
+    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'bulk archive failed' });
   });
 });
 
 describe('bulkUnarchiveTemplatesSaga', () => {
-  it('should dispatch BULK_UNARCHIVE_SUCCESS, refresh listing, then show success notification', () => {
-    const { CapNotification } = require('@capillarytech/cap-ui-library');
-    const action = { channel: 'EMAIL', ids: ['id1', 'id2'] };
+  it('should call bulkUnarchiveTemplates API then dispatch BULK_UNARCHIVE_SUCCESS with count', () => {
+    const successMessage = (count) => `${count} templates unarchived`;
+    const action = { channel: 'EMAIL', ids: ['id1', 'id2'], successMessage };
     const gen = bulkUnarchiveTemplatesSaga(action);
-    // call bulkUnarchiveTemplates
+    // first yield: call bulkUnarchiveTemplates
     gen.next();
-    // put BULK_UNARCHIVE_SUCCESS
-    expect(gen.next({ response: { modifiedCount: 2 } }).value).toEqual(put({ type: types.BULK_UNARCHIVE_SUCCESS }));
-    // yield select archiveFilter
-    const selectStep = gen.next();
-    expect(selectStep.value).toBeDefined();
-    // call getAllTemplates (listing refresh) — notification fires AFTER this resolves
-    const callStep = gen.next('archived');
-    expect(callStep.value).toHaveProperty('@@redux-saga/IO');
-    // CapNotification.success runs (not yielded) then generator is done
+    // second yield: put BULK_UNARCHIVE_SUCCESS with successMessage and count
+    const successStep = gen.next({ response: { modifiedCount: 2 } });
+    expect(successStep.value).toEqual(put({ type: types.BULK_UNARCHIVE_SUCCESS, successMessage, count: 2 }));
     expect(gen.next().done).toBe(true);
-    expect(CapNotification.success).toHaveBeenCalledWith({ message: '2 templates unarchived successfully' });
+  });
+
+  it('should use ids.length as count fallback when modifiedCount is missing', () => {
+    const successMessage = (count) => `${count} templates unarchived`;
+    const action = { channel: 'EMAIL', ids: ['id1', 'id2'], successMessage };
+    const gen = bulkUnarchiveTemplatesSaga(action);
+    gen.next();
+    const successStep = gen.next({ response: {} });
+    expect(successStep.value).toEqual(put({ type: types.BULK_UNARCHIVE_SUCCESS, successMessage, count: 2 }));
   });
 
   it('should dispatch BULK_UNARCHIVE_FAILURE and call CapNotification.error on error', () => {
@@ -986,10 +976,9 @@ describe('bulkUnarchiveTemplatesSaga', () => {
     gen.next(); // call bulkUnarchiveTemplates
     const error = new Error('bulk unarchive failed');
     expect(gen.throw(error).value).toEqual(put({ type: types.BULK_UNARCHIVE_FAILURE, error }));
-    // advance past put — CapNotification.error executes and generator finishes
     const done = gen.next();
     expect(done.done).toBe(true);
-    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'Failed to unarchive templates' });
+    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'bulk unarchive failed' });
   });
 });
 
@@ -1117,6 +1106,93 @@ describe('archive sagas - CapNotification.error coverage', () => {
   });
 });
 
+describe('archive sagas - first yield and fallback message coverage', () => {
+  it('archiveTemplateSaga first yield should be a redux-saga call effect', () => {
+    const gen = archiveTemplateSaga({ channel: 'EMAIL', id: 'id1', successMessage: 'ok' });
+    const firstStep = gen.next();
+    expect(firstStep.value).toHaveProperty('@@redux-saga/IO', true);
+    expect(firstStep.value).toHaveProperty('CALL');
+    expect(firstStep.value.CALL.args).toEqual([{ channel: 'EMAIL', id: 'id1' }]);
+  });
+
+  it('archiveTemplateSaga error with no message property should use fallback string', () => {
+    const { CapNotification } = require('@capillarytech/cap-ui-library');
+    const gen = archiveTemplateSaga({ channel: 'EMAIL', id: 'id1', successMessage: 'ok' });
+    gen.next(); // call archiveTemplate
+    const error = {}; // no .message
+    gen.throw(error); // put ARCHIVE_TEMPLATE_FAILURE
+    gen.next(); // CapNotification.error runs
+    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'Failed to archive template' });
+  });
+
+  it('unarchiveTemplateSaga first yield should be a redux-saga call effect', () => {
+    const gen = unarchiveTemplateSaga({ channel: 'EMAIL', id: 'id1', successMessage: 'ok' });
+    const firstStep = gen.next();
+    expect(firstStep.value).toHaveProperty('@@redux-saga/IO', true);
+    expect(firstStep.value).toHaveProperty('CALL');
+    expect(firstStep.value.CALL.args).toEqual([{ channel: 'EMAIL', id: 'id1' }]);
+  });
+
+  it('unarchiveTemplateSaga error with no message property should use fallback string', () => {
+    const { CapNotification } = require('@capillarytech/cap-ui-library');
+    const gen = unarchiveTemplateSaga({ channel: 'EMAIL', id: 'id1', successMessage: 'ok' });
+    gen.next(); // call unarchiveTemplate
+    const error = {}; // no .message
+    gen.throw(error); // put UNARCHIVE_TEMPLATE_FAILURE
+    gen.next(); // CapNotification.error runs
+    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'Failed to unarchive template' });
+  });
+
+  it('bulkArchiveTemplatesSaga error with no message property should use fallback string', () => {
+    const { CapNotification } = require('@capillarytech/cap-ui-library');
+    const gen = bulkArchiveTemplatesSaga({ channel: 'EMAIL', ids: ['id1'] });
+    gen.next(); // call bulkArchiveTemplates
+    const error = {}; // no .message
+    gen.throw(error); // put BULK_ARCHIVE_FAILURE
+    gen.next(); // CapNotification.error runs
+    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'Failed to archive templates' });
+  });
+
+  it('bulkArchiveTemplatesSaga with no successMessage stores undefined successMessage in BULK_ARCHIVE_SUCCESS', () => {
+    const gen = bulkArchiveTemplatesSaga({ channel: 'EMAIL', ids: ['id1', 'id2'] });
+    gen.next(); // call bulkArchiveTemplates
+    const successStep = gen.next({ response: { modifiedCount: 2 } });
+    // successMessage is undefined (not provided); component will use fallback
+    expect(successStep.value).toEqual(put({ type: types.BULK_ARCHIVE_SUCCESS, successMessage: undefined, count: 2 }));
+  });
+
+  it('bulkArchiveTemplatesSaga with no modifiedCount in response falls back to ids.length', () => {
+    const gen = bulkArchiveTemplatesSaga({ channel: 'EMAIL', ids: ['id1', 'id2', 'id3'] });
+    gen.next(); // call bulkArchiveTemplates
+    const successStep = gen.next({ response: {} }); // no modifiedCount
+    expect(successStep.value).toEqual(put({ type: types.BULK_ARCHIVE_SUCCESS, successMessage: undefined, count: 3 }));
+  });
+
+  it('bulkUnarchiveTemplatesSaga error with no message property should use fallback string', () => {
+    const { CapNotification } = require('@capillarytech/cap-ui-library');
+    const gen = bulkUnarchiveTemplatesSaga({ channel: 'EMAIL', ids: ['id1'] });
+    gen.next(); // call bulkUnarchiveTemplates
+    const error = {}; // no .message
+    gen.throw(error); // put BULK_UNARCHIVE_FAILURE
+    gen.next(); // CapNotification.error runs
+    expect(CapNotification.error).toHaveBeenCalledWith({ message: 'Failed to unarchive templates' });
+  });
+
+  it('bulkUnarchiveTemplatesSaga with no successMessage stores undefined successMessage in BULK_UNARCHIVE_SUCCESS', () => {
+    const gen = bulkUnarchiveTemplatesSaga({ channel: 'EMAIL', ids: ['id1', 'id2'] });
+    gen.next(); // call bulkUnarchiveTemplates
+    const successStep = gen.next({ response: { modifiedCount: 2 } });
+    expect(successStep.value).toEqual(put({ type: types.BULK_UNARCHIVE_SUCCESS, successMessage: undefined, count: 2 }));
+  });
+
+  it('bulkUnarchiveTemplatesSaga with no modifiedCount in response falls back to ids.length', () => {
+    const gen = bulkUnarchiveTemplatesSaga({ channel: 'EMAIL', ids: ['id1', 'id2', 'id3'] });
+    gen.next(); // call bulkUnarchiveTemplates
+    const successStep = gen.next({ response: {} }); // no modifiedCount
+    expect(successStep.value).toEqual(put({ type: types.BULK_UNARCHIVE_SUCCESS, successMessage: undefined, count: 3 }));
+  });
+});
+
 describe('watchGetSenderDetails', () => {
   it('should take latest GET_SENDER_DETAILS_REQUEST', () => {
     const gen = watchGetSenderDetails();

package/v2Containers/TemplatesV2/TemplatesV2.style.js

@@ -13,7 +13,7 @@ export default css`
       max-width: 1140px;
       margin: 0 auto;
       width: 100%;
-      padding: ${CAP_SPACE_24} 0;
+      padding: 0.714rem 0;
       /* Only main channel tabs content, not HTML Editor validation panel tabs */
       > .cap-tab-v2 > .ant-tabs-content-holder > .ant-tabs-content,
       > .cap-tab-v2 > .ant-tabs-content {