@capillarytech/creatives-library 8.0.340-beta.0.5 → 8.0.340-beta.0.8

package/v2Containers/CommunicationFlow/steps/ChannelSelectionStep/Tests/ChannelSelectionStep.test.js

@@ -9,6 +9,14 @@ import { IntlProvider } from 'react-intl';
 import ChannelSelectionStep from '../ChannelSelectionStep';
 import { CHANNELS } from '../../../constants';
 
+// CapDropdown opens via @rc-component portal animations that need real time;
+// under jest -w 90% parallel load the default 5s budget is too tight for
+// click → menu-paint → menu-item-click chains. Bump per-test timeout.
+jest.setTimeout(30000);
+
+// Larger wait budget for individual menu/portal transitions under parallel load.
+const WAIT_OPTIONS = { timeout: 10000 };
+
 jest.mock('../../../../CreativesContainer', () => function MockCreativesContainer({
   getCreativesData,
   handleCloseCreatives,
@@ -126,7 +134,7 @@ describe('ChannelSelectionStep', () => {
     await userEvent.click(screen.getByLabelText('Show more content options icon'));
     await waitFor(() => {
       expect(screen.getByRole('menu')).toBeInTheDocument();
-    });
+    }, WAIT_OPTIONS);
     await userEvent.click(within(screen.getByRole('menu')).getByText('Remove'));
 
     expect(onChange).toHaveBeenCalledWith({ contentItems: [] });
@@ -145,12 +153,12 @@ describe('ChannelSelectionStep', () => {
     await userEvent.click(screen.getByRole('button', { name: /content template/i }));
     await waitFor(() => {
       expect(screen.getByRole('menu')).toBeInTheDocument();
-    });
+    }, WAIT_OPTIONS);
     await userEvent.click(within(screen.getByRole('menu')).getByText('SMS'));
 
     await waitFor(() => {
       expect(screen.getByTestId('creatives-mock')).toBeInTheDocument();
-    });
+    }, WAIT_OPTIONS);
 
     expect(screen.getByTestId('creatives-mock')).toHaveAttribute('data-creatives-mode', 'create');
 
@@ -181,9 +189,9 @@ describe('ChannelSelectionStep', () => {
     );
 
     await userEvent.click(screen.getByRole('button', { name: /content template/i }));
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     await userEvent.click(within(screen.getByRole('menu')).getByText('SMS'));
-    await waitFor(() => expect(screen.getByTestId('creatives-mock')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByTestId('creatives-mock')).toBeInTheDocument(), WAIT_OPTIONS);
 
     await userEvent.click(screen.getByTestId('creatives-close'));
 
@@ -209,10 +217,10 @@ describe('ChannelSelectionStep', () => {
     );
 
     await userEvent.click(screen.getByLabelText('Show more content options icon'));
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     await userEvent.click(within(screen.getByRole('menu')).getByText('Edit'));
 
-    await waitFor(() => expect(screen.getByTestId('creatives-mock')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByTestId('creatives-mock')).toBeInTheDocument(), WAIT_OPTIONS);
     expect(screen.getByTestId('creatives-mock')).toHaveAttribute('data-creatives-mode', 'edit');
 
     await userEvent.click(screen.getByTestId('creatives-save'));
@@ -242,7 +250,7 @@ describe('ChannelSelectionStep', () => {
     );
 
     await userEvent.click(screen.getByLabelText('Show more content options icon'));
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     await userEvent.click(within(screen.getByRole('menu')).getByText('Preview and Test'));
 
     expect(console.log).toHaveBeenCalledWith('Preview content', 'p1');
@@ -288,7 +296,7 @@ describe('ChannelSelectionStep', () => {
     await userEvent.click(screen.getByRole('button', { name: /^add incentive$/i }));
     await waitFor(() => {
       expect(screen.getByRole('menu')).toBeInTheDocument();
-    });
+    }, WAIT_OPTIONS);
     await userEvent.click(within(screen.getByRole('menu')).getByText('Badges'));
 
     expect(onChange).toHaveBeenCalledWith({
@@ -316,7 +324,7 @@ describe('ChannelSelectionStep', () => {
     const addIncentiveLinks = screen.getAllByRole('button', { name: /add incentive/i });
     expect(addIncentiveLinks.length).toBeGreaterThanOrEqual(1);
     await userEvent.click(addIncentiveLinks[addIncentiveLinks.length - 1]);
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     await userEvent.click(within(screen.getByRole('menu')).getByText('Badges'));
 
     expect(onChange).toHaveBeenCalledWith({
@@ -462,7 +470,7 @@ describe('ChannelSelectionStep', () => {
       <ChannelSelectionStep value={{ contentItems: [] }} onChange={jest.fn()} channels={null} />,
     );
     await userEvent.click(screen.getByRole('button', { name: /content template/i }));
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     expect(within(screen.getByRole('menu')).getByText('SMS')).toBeInTheDocument();
   });
 
@@ -485,7 +493,7 @@ describe('ChannelSelectionStep', () => {
       />,
     );
     await userEvent.click(screen.getByRole('button', { name: /content template/i }));
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     await userEvent.click(screen.getByText('Custom'));
     expect(onChange).toHaveBeenCalledWith({ channel: 'CUSTOM', channels: [] });
     expect(screen.queryByTestId('creatives-mock')).not.toBeInTheDocument();
@@ -497,9 +505,9 @@ describe('ChannelSelectionStep', () => {
       <ChannelSelectionStep value={{ contentItems: [] }} onChange={onChange} channels={CHANNELS} />,
     );
     await userEvent.click(screen.getByRole('button', { name: /content template/i }));
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     await userEvent.click(within(screen.getByRole('menu')).getByText('SMS'));
-    await waitFor(() => expect(screen.getByTestId('creatives-mock')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByTestId('creatives-mock')).toBeInTheDocument(), WAIT_OPTIONS);
 
     await userEvent.click(screen.getByTestId('creatives-save-null'));
 
@@ -522,7 +530,7 @@ describe('ChannelSelectionStep', () => {
     );
 
     await userEvent.click(screen.getByLabelText('Show more content options icon'));
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     await userEvent.click(within(screen.getByRole('menu')).getByText('Edit'));
 
     expect(screen.queryByTestId('creatives-mock')).not.toBeInTheDocument();
@@ -538,9 +546,9 @@ describe('ChannelSelectionStep', () => {
       />,
     );
     await userEvent.click(screen.getByRole('button', { name: /content template/i }));
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     await userEvent.click(within(screen.getByRole('menu')).getByText('SMS'));
-    await waitFor(() => expect(screen.getByTestId('creatives-mock')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByTestId('creatives-mock')).toBeInTheDocument(), WAIT_OPTIONS);
     expect(screen.getByTestId('creatives-mock')).toHaveAttribute('data-creatives-mode', 'preview');
   });
 
@@ -558,7 +566,7 @@ describe('ChannelSelectionStep', () => {
       />,
     );
     await userEvent.click(screen.getByRole('button', { name: /^add incentive$/i }));
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     await userEvent.click(within(screen.getByRole('menu')).getByText('Badges'));
     expect(onChange).toHaveBeenCalledWith({
       selectedOfferDetails: [{ type: 'existing' }, { type: 'badges' }],
@@ -712,7 +720,7 @@ describe('ChannelSelectionStep', () => {
       />,
     );
     await userEvent.click(screen.getByRole('button', { name: /content template/i }));
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     // SMS is in channelsToDisable — clicking it should not call onChange or show creatives
     await userEvent.click(within(screen.getByRole('menu')).getByText('SMS'));
     expect(screen.queryByTestId('creatives-mock')).not.toBeInTheDocument();
@@ -767,7 +775,7 @@ describe('ChannelSelectionStep', () => {
       />,
     );
     await userEvent.click(screen.getByRole('button', { name: /content template/i }));
-    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByRole('menu')).toBeInTheDocument(), WAIT_OPTIONS);
     // Click the disabled EMAIL menu item — handleChannelSelect should return early
     await userEvent.click(within(screen.getByRole('menu')).getByText('Email'));
     expect(onChange).not.toHaveBeenCalled();

package/v2Containers/CommunicationFlow/steps/DeliverySettingsStep/Tests/SenderDetails.test.js

@@ -9,6 +9,11 @@ import SenderDetails, { parseSenderDetailsFromEntity } from '../SenderDetails';
 import * as deliverySettingsConfig from '../deliverySettingsConfig';
 import { findVisibleSelectOption } from '../../../../../utils/test-utils';
 
+// antd v6 Selects rely on real-time animations + portal mounts; under the full
+// parallel suite (jest -w 90%) the default 5s budget is too tight for
+// click → listbox-paint → option-click chains. Bump per-test timeout.
+jest.setTimeout(30000);
+
 const { parseEntityForDisplay } = deliverySettingsConfig;
 
 /** Shared domainProperties entity shapes (see deliverySettingsConfig). */
@@ -173,11 +178,14 @@ function renderSenderDetails(override = {}) {
   return { ...view, onClose, onSave };
 }
 
+// Larger wait budget for individual portal/listbox transitions under parallel load.
+const WAIT_OPTIONS = { timeout: 10000 };
+
 async function openSelectAndChoose(root, comboIndex, optionText) {
   const combos = within(root).getAllByRole('combobox');
   await userEvent.click(combos[comboIndex]);
-  await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument());
-  await userEvent.click(await findVisibleSelectOption(optionText));
+  await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument(), WAIT_OPTIONS);
+  await userEvent.click(await findVisibleSelectOption(optionText, WAIT_OPTIONS));
 }
 
 describe('SenderDetails', () => {
@@ -266,8 +274,8 @@ describe('SenderDetails', () => {
 
     const combos = within(root).getAllByRole('combobox');
     await userEvent.click(combos[1]);
-    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument());
-    await userEvent.click(await findVisibleSelectOption('+1002003002'));
+    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument(), WAIT_OPTIONS);
+    await userEvent.click(await findVisibleSelectOption('+1002003002', WAIT_OPTIONS));
 
     const saveBtn = within(root).getByRole('button', { name: /save changes/i });
     await waitFor(() => expect(saveBtn).not.toBeDisabled());
@@ -342,8 +350,8 @@ describe('SenderDetails', () => {
 
     const combos = within(root).getAllByRole('combobox');
     await userEvent.click(combos[1]);
-    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument());
-    await userEvent.click(await findVisibleSelectOption('+1002003002'));
+    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument(), WAIT_OPTIONS);
+    await userEvent.click(await findVisibleSelectOption('+1002003002', WAIT_OPTIONS));
 
     const resetLinks = within(root).getAllByText('Reset');
     await userEvent.click(resetLinks[1]);
@@ -363,8 +371,8 @@ describe('SenderDetails', () => {
 
     const combos = within(root).getAllByRole('combobox');
     await userEvent.click(combos[combos.length - 1]);
-    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument());
-    await userEvent.click(await findVisibleSelectOption('+91900111333'));
+    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument(), WAIT_OPTIONS);
+    await userEvent.click(await findVisibleSelectOption('+91900111333', WAIT_OPTIONS));
 
     const saveBtn = within(root).getByRole('button', { name: /save changes/i });
     await waitFor(() => expect(saveBtn).not.toBeDisabled());
@@ -418,8 +426,8 @@ describe('SenderDetails', () => {
 
     const combos = within(root).getAllByRole('combobox');
     await userEvent.click(combos[0]);
-    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument());
-    await userEvent.click(await findVisibleSelectOption('Gateway B'));
+    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument(), WAIT_OPTIONS);
+    await userEvent.click(await findVisibleSelectOption('Gateway B', WAIT_OPTIONS));
 
     // The sender ID should now auto-update to Gateway B's sender
     await waitFor(() => expect(within(root).getByText('+222')).toBeInTheDocument());
@@ -437,8 +445,8 @@ describe('SenderDetails', () => {
     // Switch to Mail Beta domain
     const combos = within(root).getAllByRole('combobox');
     await userEvent.click(combos[0]);
-    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument());
-    await userEvent.click(await findVisibleSelectOption('Mail Beta'));
+    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument(), WAIT_OPTIONS);
+    await userEvent.click(await findVisibleSelectOption('Mail Beta', WAIT_OPTIONS));
 
     // Sender ID should auto-update to beta@other.com
     await waitFor(() => expect(within(root).getByText('beta@other.com')).toBeInTheDocument());
@@ -461,8 +469,8 @@ describe('SenderDetails', () => {
     const combos = within(root).getAllByRole('combobox');
     const senderCombo = combos[combos.length - 1];
     await userEvent.click(senderCombo);
-    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument());
-    await userEvent.click(await findVisibleSelectOption('+91900111333'));
+    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument(), WAIT_OPTIONS);
+    await userEvent.click(await findVisibleSelectOption('+91900111333', WAIT_OPTIONS));
 
     const saveBtn = within(root).getByRole('button', { name: /save changes/i });
     await waitFor(() => expect(saveBtn).not.toBeDisabled());
@@ -500,8 +508,8 @@ describe('SenderDetails', () => {
     const combos = within(root).getAllByRole('combobox');
     const senderCombo = combos[combos.length - 1];
     await userEvent.click(senderCombo);
-    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument());
-    await userEvent.click(await findVisibleSelectOption('+viber-alt'));
+    await waitFor(() => expect(screen.getByRole('listbox')).toBeInTheDocument(), WAIT_OPTIONS);
+    await userEvent.click(await findVisibleSelectOption('+viber-alt', WAIT_OPTIONS));
 
     // antd v6 also renders selected option in an aria-live polite region for
     // screen readers, so the text appears twice. Match only the visible select

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -698,9 +698,16 @@ export function SlideBoxContent(props) {
       {(isEditEmailWithId || isEmailEditWithContent) && (
         (() => {
           const supportCKEditor = commonUtil.hasSupportCKEditor();
-          // When supportCKEditor is true: Use Email component (legacy flow with CKEditor).
-          // When supportCKEditor is false: Always use EmailWrapper (BEE or HTML editor, never CKEditor).
-          if (supportCKEditor) {
+          // BEE templates always use the <Email> component directly (the same
+          // path the SUPPORT_CK_EDITOR=true branch uses). EmailWrapper's
+          // useEmailWrapper strips templateData from props, so library-mode
+          // pencil-edit on a BEE template would never reach startTemplateCreation
+          // and getDetails?type=BEE_PLUGIN would never fire. Routing BEE
+          // templates through the direct <Email> path — which is already
+          // battle-tested for the CKEditor flow — sidesteps that entirely.
+          const isBEETemplate = templateData?.base?.is_drag_drop === true
+            || templateData?.base?.is_drag_drop === 1;
+          if (supportCKEditor || isBEETemplate) {
             return (
               <Email
                 key="cretives-container-email-edit"
@@ -776,8 +783,12 @@ export function SlideBoxContent(props) {
               isTestAndPreviewMode={isTestAndPreviewMode}
               onHtmlEditorValidationStateChange={onHtmlEditorValidationStateChange}
               location={{
-                pathname: `/email/edit/${templateData._id}`,
-                query: { type: 'embedded', module: 'library', id: templateData._id },
+                pathname: `/email/edit/${templateData._id || ''}`,
+                query: {
+                  type: 'embedded',
+                  module: 'library',
+                  ...(templateData._id ? { id: templateData._id } : {}),
+                },
               }}
               params={{ id: templateData._id }}
             />

package/v2Containers/CreativesContainer/SlideBoxFooter.js

@@ -24,6 +24,7 @@ function SlideBoxFooter(props) {
     slidBoxContent,
     onSave,
     onEditTemplate,
+    isTemplateArchived,
     onCreateNextStep,
     isFullMode,
     fetchingCmsData,
@@ -214,7 +215,7 @@ function SlideBoxFooter(props) {
             <FormattedMessage {...(continueButtonLabel || messages.continue)} />
           </CapButton>
         )}
-        {slidBoxContent === PREVIEW && (
+        {slidBoxContent === PREVIEW && !isTemplateArchived && (
           <CapButton onClick={onEditTemplate} type="secondary">
             <FormattedMessage {...messages.creativesTemplatesEdit} />
           </CapButton>
@@ -227,6 +228,7 @@ SlideBoxFooter.propTypes = {
   slidBoxContent: PropTypes.node,
   onSave: PropTypes.func,
   onEditTemplate: PropTypes.func,
+  isTemplateArchived: PropTypes.bool,
   onCreateNextStep: PropTypes.func,
   shouldShowContinueFooter: PropTypes.func,
   shouldShowDoneFooter: PropTypes.func,

package/v2Containers/CreativesContainer/index.js

@@ -50,7 +50,7 @@ import { RCS_STATUSES } from '../Rcs/constants';
 import { CREATIVE } from '../Facebook/constants';
 import { LOYALTY } from '../App/constants';
 import {
-  WHATSAPP_STATUSES, WHATSAPP_MEDIA_TYPES, PHONE_NUMBER, URL,
+  WHATSAPP_STATUSES, WHATSAPP_MEDIA_TYPES, PHONE_NUMBER, URL, ADD_IMAGE_URL_PREVIEW_MARKER,
 } from '../Whatsapp/constants';
 import { updateImagesInHtml } from '../../utils/cdnTransformation';
 
@@ -260,6 +260,10 @@ export class Creatives extends React.Component {
   };
 
   onEditTemplate = () => {
+    if (commonUtil.hasCreativesArchivalEnabled() && this.props.templateData?.isArchived) {
+      CapNotification.error({ message: this.props.intl.formatMessage(messages.cannotEditArchivedTemplate) });
+      return;
+    }
     this.setState({ slidBoxContent: 'editTemplate', showSlideBox: true, templateNameExists: true });
   };
 
@@ -684,6 +688,8 @@ export class Creatives extends React.Component {
           switch (mediaType) {
             case (WHATSAPP_MEDIA_TYPES.IMAGE):
               mediaParams.imageUrl = url;
+              // Detect isAddImageUrl from previewUrl marker (previewUrl is unused for IMAGE type)
+              mediaParams.isAddImageUrl = previewUrl === ADD_IMAGE_URL_PREVIEW_MARKER;
               break;
             case (WHATSAPP_MEDIA_TYPES.VIDEO):
               mediaParams.videoUrl = url;
@@ -1142,6 +1148,7 @@ export class Creatives extends React.Component {
               headerTemplate = '',
             } = {},
             isPreviewUrl = false,
+            isAddImageUrl = false,
             carouselData = [],
           } = cloneDeep(versions.base.content.whatsapp);
 
@@ -1178,6 +1185,11 @@ export class Creatives extends React.Component {
           switch (mediaType) {
             case (WHATSAPP_MEDIA_TYPES.IMAGE):
               whatsappMedia.url = imageUrl;
+              // previewUrl is unused for IMAGE type — reuse it to persist isAddImageUrl flag
+              // without adding any new field that the backend would reject
+              if (isAddImageUrl) {
+                whatsappMedia.previewUrl = ADD_IMAGE_URL_PREVIEW_MARKER;
+              }
               break;
             case (WHATSAPP_MEDIA_TYPES.VIDEO):
               whatsappMedia.url = videoUrl;
@@ -2136,6 +2148,7 @@ export class Creatives extends React.Component {
               onSave={this.saveMessage}
               onDiscard={this.discardMessage}
               onEditTemplate={this.onEditTemplate}
+              isTemplateArchived={!!(commonUtil.hasCreativesArchivalEnabled() && this.props.templateData && this.props.templateData.isArchived)}
               slidBoxContent={slidBoxContent}
               onCreateNextStep={this.onCreateNextStep}
               currentChannel={currentChannel.toUpperCase()}

package/v2Containers/CreativesContainer/messages.js

@@ -390,4 +390,8 @@ export default defineMessages({
     id: `${scope}.personalizationTokensErrorMessage`,
     defaultMessage: `Personalization tags are not supported for anonymous customers, please remove the tags.`,
   },
+  "cannotEditArchivedTemplate": {
+    id: `${scope}.cannotEditArchivedTemplate`,
+    defaultMessage: 'Cannot edit an archived template. Please unarchive it first.',
+  },
 });

package/v2Containers/CreativesContainer/tests/__snapshots__/SlideBoxContent.test.js.snap

@@ -120,9 +120,8 @@ exports[`Test SlideBoxContent container Email component isTestAndPreviewMode IIF
     key="cretives-container-email-edit-wrapper"
     location={
       Object {
-        "pathname": "/email/edit/undefined",
+        "pathname": "/email/edit/",
         "query": Object {
-          "id": undefined,
           "module": "library",
           "type": "embedded",
         },
@@ -171,9 +170,8 @@ exports[`Test SlideBoxContent container Email component isTestAndPreviewMode IIF
     key="cretives-container-email-edit-wrapper"
     location={
       Object {
-        "pathname": "/email/edit/undefined",
+        "pathname": "/email/edit/",
         "query": Object {
-          "id": undefined,
           "module": "library",
           "type": "embedded",
         },

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

@@ -284,6 +284,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
         isEmptyContent={false}
         isFullMode={false}
         isLiquidValidationError={false}
+        isTemplateArchived={false}
         isTemplateNameEmpty={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}
@@ -419,6 +420,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
         isEmptyContent={false}
         isFullMode={false}
         isLiquidValidationError={false}
+        isTemplateArchived={false}
         isTemplateNameEmpty={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}
@@ -554,6 +556,7 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
         isEmptyContent={false}
         isFullMode={false}
         isLiquidValidationError={false}
+        isTemplateArchived={false}
         isTemplateNameEmpty={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}

package/v2Containers/Email/reducer.js

@@ -12,6 +12,8 @@ const initialState = fromJS({
   createTemplateInProgress: false,
   createResponse: {},
   isBeeEnabled: null,
+  fetchingCmsAccounts: false,
+  cmsAccountsLoaded: false,
 });
 
 function emailReducer(state = initialState, action) {
@@ -85,6 +87,7 @@ function emailReducer(state = initialState, action) {
     case types.GET_CMS_EDITOR_DETAILS_SUCCESS:
       return state
         .set('fetchingCmsSettings', false)
+        .set('isBeeEnabled', action.isBeeEnabled)
         .set('CmsSettings', fromJS(action.settings));
     case types.GET_CMS_EDITOR_DETAILS_FAILURE:
       return state
@@ -110,13 +113,19 @@ function emailReducer(state = initialState, action) {
         .set('fetchingCmsDataFailed', true);
     case types.GET_CMS_ACCOUNTS_REQUEST:
       return state
-        .set('isBeeEnabled', false); // default to false
+        .set('isBeeEnabled', false)
+        .set('fetchingCmsAccounts', true)
+        .set('cmsAccountsLoaded', false);
     case types.GET_CMS_ACCOUNTS_SUCCESS:
       return state
-        .set('isBeeEnabled', action.isBeeEnabled);
+        .set('isBeeEnabled', action.isBeeEnabled)
+        .set('fetchingCmsAccounts', false)
+        .set('cmsAccountsLoaded', true);
     case types.GET_CMS_ACCOUNTS_FAILURE:
       return state
-        .set('isBeeEnabled', false);
+        .set('isBeeEnabled', false)
+        .set('fetchingCmsAccounts', false)
+        .set('cmsAccountsLoaded', true);
     case types.CLEAR_EMAIL_CRUD_RESPONSE_REQUEST:
       return state
         .set('createResponse', fromJS({}));

package/v2Containers/Email/sagas.js

@@ -1,5 +1,5 @@
 import {
-  call, put, takeLatest, takeEvery, all,
+  call, put, takeLatest, takeEvery, all, select, take,
 } from 'redux-saga/effects';
 import CapNotification from '@capillarytech/cap-ui-library/CapNotification';
 import * as Api from '../../services/api';
@@ -103,14 +103,19 @@ export function* getAllAssets(assetType, queryParams) {
 }
 
 export function* getCmsSetting({
-  cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable,
+  cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable: isBEEAppEnableFromAction,
 }) {
   try {
+    const emailState = yield select((state) => state.get('email'));
+    if (!emailState.get('cmsAccountsLoaded') && emailState.get('fetchingCmsAccounts')) {
+      yield take([types.GET_CMS_ACCOUNTS_SUCCESS, types.GET_CMS_ACCOUNTS_FAILURE]);
+    }
+    const updatedState = yield select((state) => state.get('email'));
+    const isBEEAppEnable = updatedState.get('isBeeEnabled') ?? isBEEAppEnableFromAction;
     const result = yield call(Api.getCmsTemplateSettingsV2, cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable);
     const cmsAccountDetail = result.data?.response.cmsDetails || {};
     const isBeeEnabled = cmsAccountDetail?.type === cmsType;
-    yield put({ type: types.GET_CMS_ACCOUNTS_SUCCESS, isBeeEnabled });
-    yield put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: result.data.response.cmsDetails });
+    yield put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: cmsAccountDetail, isBeeEnabled });
   } catch (error) {
     yield put({ type: types.GET_CMS_EDITOR_DETAILS_FAILURE, error });
   }

package/v2Containers/Email/tests/__snapshots__/reducer.test.js.snap

@@ -5,6 +5,8 @@ Immutable.Map {
   "createTemplateInProgress": false,
   "createResponse": Immutable.Map {},
   "isBeeEnabled": null,
+  "fetchingCmsAccounts": false,
+  "cmsAccountsLoaded": false,
 }
 `;
 
@@ -13,5 +15,7 @@ Immutable.Map {
   "createTemplateInProgress": true,
   "createResponse": Immutable.Map {},
   "isBeeEnabled": null,
+  "fetchingCmsAccounts": false,
+  "cmsAccountsLoaded": false,
 }
 `;

package/v2Containers/Email/tests/reducer.test.js

@@ -16,6 +16,53 @@ describe('emailReducer', () => {
     expect(emailReducer(undefined, action)).toMatchSnapshot();
   });
 
+  it.concurrent('it handles GET_CMS_EDITOR_DETAILS_SUCCESS action — sets isBeeEnabled true and CmsSettings', () => {
+    const initialState = fromJS({ isBeeEnabled: null, fetchingCmsSettings: true });
+    const action = {
+      type: types.GET_CMS_EDITOR_DETAILS_SUCCESS,
+      isBeeEnabled: true,
+      settings: { isDragDrop: true, editorType: 'bee' },
+    };
+    const result = emailReducer(initialState, action);
+    expect(result.get('fetchingCmsSettings')).toBe(false);
+    expect(result.get('isBeeEnabled')).toBe(true);
+    expect(result.getIn(['CmsSettings', 'isDragDrop'])).toBe(true);
+  });
+
+  it.concurrent('it handles GET_CMS_EDITOR_DETAILS_SUCCESS action — sets isBeeEnabled false', () => {
+    const initialState = fromJS({ isBeeEnabled: true, fetchingCmsSettings: true });
+    const action = {
+      type: types.GET_CMS_EDITOR_DETAILS_SUCCESS,
+      isBeeEnabled: false,
+      settings: {},
+    };
+    const result = emailReducer(initialState, action);
+    expect(result.get('fetchingCmsSettings')).toBe(false);
+    expect(result.get('isBeeEnabled')).toBe(false);
+  });
+
+  it.concurrent('it handles GET_CMS_EDITOR_DETAILS_SUCCESS action — overwrites stale isBeeEnabled from CLEAR_ALL_VALUES (null)', () => {
+    const initialState = fromJS({ isBeeEnabled: null, fetchingCmsSettings: true });
+    const action = {
+      type: types.GET_CMS_EDITOR_DETAILS_SUCCESS,
+      isBeeEnabled: true,
+      settings: { type: 'bee' },
+    };
+    const result = emailReducer(initialState, action);
+    expect(result.get('isBeeEnabled')).toBe(true);
+  });
+
+  it.concurrent('it handles GET_CMS_EDITOR_DETAILS_SUCCESS action — sets CmsSettings to empty object when settings is {}', () => {
+    const initialState = fromJS({ CmsSettings: { old: 'data' } });
+    const action = {
+      type: types.GET_CMS_EDITOR_DETAILS_SUCCESS,
+      isBeeEnabled: false,
+      settings: {},
+    };
+    const result = emailReducer(initialState, action);
+    expect(result.get('CmsSettings').toJS()).toEqual({});
+  });
+
   it.concurrent('it handles GET_CMS_ACCOUNTS_REQUEST action (line 111-113)', () => {
     const initialState = fromJS({
       isBeeEnabled: true, // Start with true to verify it gets set to false