@capillarytech/creatives-library 9.0.59 → 9.0.61-alpha.0

package/v2Components/FormBuilder/index.js

@@ -6,11 +6,10 @@
  * monolith, frozen) and the new functional implementation (./Functional)
  * based on the per-channel, per-org feature flag.
  *
- * Phase 1 migrated SMS behind `ENABLE_NEW_FORMBUILDER_SMS`; Phase 2 migrates
- * MOBILEPUSH behind `ENABLE_NEW_FORMBUILDER_MPUSH`. The new path is taken ONLY
- * when (a) the org has that channel's flag AND (b) this FormBuilder instance is
- * rendering that channel. Every other channel — and every org without the
- * flag — keeps using Classic with byte-identical behavior. The flags default
+ * Phase 1 migrates SMS only, behind `ENABLE_NEW_FORMBUILDER_SMS`. The new path
+ * is taken ONLY when (a) the org has that flag AND (b) this FormBuilder instance
+ * is rendering the SMS channel. Every other channel — and every org without the
+ * flag — keeps using Classic with byte-identical behavior. The flag defaults
  * OFF, so until rollout this gate always renders Classic.
  *
  * This component is a pure pass-through: no defaultProps, no prop mapping, no
@@ -22,30 +21,24 @@
 import React, { useState } from 'react';
 import ClassicFormBuilder from './Classic';
 import FunctionalFormBuilder from './Functional';
-import {
-  hasNewFormBuilderEnabledForSms,
-  hasNewFormBuilderEnabledForMpush,
-} from '../../utils/common';
-import { SMS, MOBILE_PUSH } from '../../v2Containers/CreativesContainer/constants';
+import { hasNewFormBuilderEnabledForSms } from '../../utils/common';
+import { SMS } from '../../v2Containers/CreativesContainer/constants';
 
 const FormBuilder = (props) => {
-  // One-time org-flag read (API-provisioned via Auth.hasFeatureAccess); the try/catch
-  // guards early bootstrap where window.capAuth is not ready — any failure routes to Classic.
-  const [newBuilderFlags] = useState(() => {
+  // The try/catch guards the early bootstrap / test case where window.capAuth is not yet initialized — any failure routes safely to Classic.
+  const [isSmsNewBuilderOrg] = useState(() => {
     try {
-      return {
-        [SMS]: Boolean(hasNewFormBuilderEnabledForSms()),
-        [MOBILE_PUSH]: Boolean(hasNewFormBuilderEnabledForMpush()),
-      };
+      console.log('### ENABLE_NEW_FORMBUILDER_SMS enabled for org:', hasNewFormBuilderEnabledForSms());
+      return Boolean(hasNewFormBuilderEnabledForSms());
     } catch (e) {
-      return {};
+      return false;
     }
   });
 
-  // Derived every render: the schema (and therefore the channel) arrives asynchronously.
   const channel = (props?.channel || props.schema?.channel)?.toUpperCase();
 
-  return newBuilderFlags[channel] ? (
+  const useNewFormBuilder = isSmsNewBuilderOrg && channel === SMS;
+  return useNewFormBuilder ? (
     <FunctionalFormBuilder {...props} />
   ) : (
     <ClassicFormBuilder {...props} />

package/v2Components/FormBuilder/tests/entryGate.test.js

@@ -5,10 +5,10 @@
  * implementations are mocked with trivial stubs so this stays a fast unit test
  * of the gate, independent of the 4,400-line monolith.
  *
- * Contract pinned here (per-channel flag map — SMS Phase 1, MOBILEPUSH Phase 2):
- *   - flags OFF -> Classic, for every channel (the default until rollout)
- *   - a channel's flag ON + that channel (via `channel` prop OR `schema.channel`) -> Functional
- *   - a channel's flag ON + any OTHER channel -> Classic (flags are independent)
+ * Contract pinned here:
+ *   - flag OFF  -> Classic, for every channel (the default until rollout)
+ *   - flag ON + SMS channel (via `channel` prop OR `schema.channel`) -> Functional
+ *   - flag ON + non-SMS channel -> Classic (other channels untouched)
  *   - flag ON + channel unknown (async schema not yet arrived) -> Classic
  *   - flag read throws (bootstrap/test race) -> Classic, no crash
  */
@@ -25,26 +25,20 @@ jest.mock('../Functional', () => (props) => (
   <div data-testid="impl-functional">functional:{(props.schema && props.schema.channel) || props.channel || ''}</div>
 ));
 
-// Mock only the flag readers the gate uses; keep the rest of common.js intact.
+// Mock only the one flag reader the gate uses; keep the rest of common.js intact.
 jest.mock('../../../utils/common', () => ({
   ...jest.requireActual('../../../utils/common'),
   hasNewFormBuilderEnabledForSms: jest.fn(),
-  hasNewFormBuilderEnabledForMpush: jest.fn(),
 }));
 
 // eslint-disable-next-line import/first
 import FormBuilder from '../index';
 // eslint-disable-next-line import/first
-import { hasNewFormBuilderEnabledForSms, hasNewFormBuilderEnabledForMpush } from '../../../utils/common';
+import { hasNewFormBuilderEnabledForSms } from '../../../utils/common';
 
 const renderGate = (props = {}) => render(<FormBuilder {...props} />);
 
 describe('FormBuilder entry gate — routing', () => {
-  beforeEach(() => {
-    hasNewFormBuilderEnabledForSms.mockReturnValue(false);
-    hasNewFormBuilderEnabledForMpush.mockReturnValue(false);
-  });
-
   describe('flag OFF (default)', () => {
     beforeEach(() => hasNewFormBuilderEnabledForSms.mockReturnValue(false));
 
@@ -99,73 +93,8 @@ describe('FormBuilder entry gate — routing', () => {
     });
   });
 
-  describe('MPUSH flag (ENABLE_NEW_FORMBUILDER_MPUSH — Phase 2)', () => {
-    it('flag OFF: MOBILEPUSH renders Classic', () => {
-      renderGate({ schema: { channel: 'MOBILEPUSH' } });
-      expect(screen.getByTestId('impl-classic')).toBeInTheDocument();
-    });
-
-    it('flag ON: routes MOBILEPUSH to Functional (schema.channel)', () => {
-      hasNewFormBuilderEnabledForMpush.mockReturnValue(true);
-      renderGate({ schema: { channel: 'MOBILEPUSH' } });
-      expect(screen.getByTestId('impl-functional')).toBeInTheDocument();
-      expect(screen.queryByTestId('impl-classic')).toBeNull();
-    });
-
-    it('flag ON: is case-insensitive and honors the channel prop', () => {
-      hasNewFormBuilderEnabledForMpush.mockReturnValue(true);
-      renderGate({ channel: 'mobilepush', schema: {} });
-      expect(screen.getByTestId('impl-functional')).toBeInTheDocument();
-    });
-
-    it('flags are independent: MPUSH flag ON does not move SMS (and vice versa)', () => {
-      hasNewFormBuilderEnabledForMpush.mockReturnValue(true);
-      renderGate({ schema: { channel: 'SMS' } });
-      expect(screen.getByTestId('impl-classic')).toBeInTheDocument();
-    });
-
-    it('SMS flag ON does not move MOBILEPUSH', () => {
-      hasNewFormBuilderEnabledForSms.mockReturnValue(true);
-      renderGate({ schema: { channel: 'MOBILEPUSH' } });
-      expect(screen.getByTestId('impl-classic')).toBeInTheDocument();
-    });
-
-    it('both flags ON route each channel to Functional', () => {
-      hasNewFormBuilderEnabledForSms.mockReturnValue(true);
-      hasNewFormBuilderEnabledForMpush.mockReturnValue(true);
-      renderGate({ schema: { channel: 'MOBILEPUSH' } });
-      expect(screen.getByTestId('impl-functional')).toHaveTextContent('functional:MOBILEPUSH');
-    });
-
-    it('unmigrated channels stay on Classic even with both flags ON', () => {
-      hasNewFormBuilderEnabledForSms.mockReturnValue(true);
-      hasNewFormBuilderEnabledForMpush.mockReturnValue(true);
-      renderGate({ schema: { channel: 'EMAIL' } });
-      expect(screen.getByTestId('impl-classic')).toBeInTheDocument();
-    });
-  });
-
-  describe('the gate is purely org-flag controlled (no localStorage override)', () => {
-    afterEach(() => {
-      window.localStorage.removeItem('ENABLE_NEW_FORMBUILDER_MPUSH');
-    });
-
-    it('a localStorage key does NOT enable the new path when the org flag is OFF', () => {
-      window.localStorage.setItem('ENABLE_NEW_FORMBUILDER_MPUSH', 'true');
-      renderGate({ schema: { channel: 'MOBILEPUSH' } });
-      expect(screen.getByTestId('impl-classic')).toBeInTheDocument();
-    });
-
-    it('a localStorage key does NOT disable the new path when the org flag is ON', () => {
-      hasNewFormBuilderEnabledForMpush.mockReturnValue(true);
-      window.localStorage.setItem('ENABLE_NEW_FORMBUILDER_MPUSH', 'false');
-      renderGate({ schema: { channel: 'MOBILEPUSH' } });
-      expect(screen.getByTestId('impl-functional')).toBeInTheDocument();
-    });
-  });
-
   describe('resilience', () => {
-    it('falls back to Classic if a flag read throws (window.capAuth not initialized)', () => {
+    it('falls back to Classic if the flag read throws (window.capAuth not initialized)', () => {
       hasNewFormBuilderEnabledForSms.mockImplementation(() => {
         throw new Error('capAuth not initialized');
       });
@@ -173,14 +102,5 @@ describe('FormBuilder entry gate — routing', () => {
       expect(screen.getByTestId('impl-classic')).toBeInTheDocument();
       expect(screen.queryByTestId('impl-functional')).toBeNull();
     });
-
-    it('one flag reader throwing routes EVERY channel to Classic (whole map falls back)', () => {
-      hasNewFormBuilderEnabledForSms.mockReturnValue(true);
-      hasNewFormBuilderEnabledForMpush.mockImplementation(() => {
-        throw new Error('capAuth not initialized');
-      });
-      renderGate({ schema: { channel: 'SMS' } });
-      expect(screen.getByTestId('impl-classic')).toBeInTheDocument();
-    });
   });
 });

package/v2Containers/CommunicationFlow/CommunicationFlow.js

@@ -20,7 +20,7 @@ import CapNotification from '@capillarytech/cap-ui-library/CapNotification';
 import injectReducer from '../../utils/injectReducer';
 import { makeSelectAuthenticated } from '../Cap/selectors';
 import capReducer from '../Cap/reducer';
-import { createCommDefinition, editCommDefinition, getCommDefinition, getCommDefinitionVersion } from '../../services/api';
+import { createCommDefinition, editCommDefinition } from '../../services/api';
 import DynamicControlsStep from './steps/DynamicControlsStep';
 import MessageTypeStep from './steps/MessageTypeStep';
 import CommunicationStrategyStep from './steps/CommunicationStrategyStep';
@@ -44,7 +44,7 @@ import {
   SINGLE_TEMPLATE,
 } from './constants';
 import { getEnabledSteps } from './utils/getEnabledSteps';
-import { fetchAndMapCommDefinition } from './utils/mapCommDefinitionToStepData';
+import useFetchCommDefinition from './hooks/useFetchCommDefinition';
 import messages from './messages';
 import './CommunicationFlow.scss';
 
@@ -79,11 +79,12 @@ const CommunicationFlow = ({
   const { formatMessage } = intl || {};
   const { messageTypeData = {}, communicationStrategyData = {}, contentTemplateData = {} } = config?.features || {};
 
-  // Other consumers may provide only commDefinitionId and rely on CommunicationFlow to fetch content; capture this decision once at mount.
+  // Other consumers may provide only commDefinitionId and rely on CommunicationFlow to fetch
+  // content; captured once at mount so it also seeds messageType/communicationStrategy below,
+  // before useFetchCommDefinition's effect (mount-only) has a chance to run.
   const [shouldFetchCommDefinition] = useState(
     () => !!config?.context?.existingCommDefinitionId && !initialData?.contentItems?.length,
   );
-  const [isFetchingCommDefinition, setIsFetchingCommDefinition] = useState(shouldFetchCommDefinition);
 
   // Initialize step data from initialData or defaults
   const [stepData, setStepData] = useState(() => {
@@ -103,27 +104,13 @@ const CommunicationFlow = ({
   const [validationErrors, setValidationErrors] = useState({});
 
   // Fetch-by-id: populate stepData from the CommDefinition itself when the consumer only
-  // supplied a commDefinitionId (see shouldFetchCommDefinition above). Runs once on mount.
-  useEffect(() => {
-    if (!shouldFetchCommDefinition) return;
-    let cancelled = false;
-    (async () => {
-      try {
-        const mapped = await fetchAndMapCommDefinition(config.context.existingCommDefinitionId, {
-          getCommDefinition,
-          getCommDefinitionVersion,
-        });
-        if (!cancelled && mapped) {
-          setStepData((prevStepData) => ({ ...prevStepData, ...mapped }));
-        }
-      } catch (error) {
-        console.error('[CommunicationFlow] fetchAndMapCommDefinition error:', error);
-      } finally {
-        if (!cancelled) setIsFetchingCommDefinition(false);
-      }
-    })();
-    return () => { cancelled = true; };
-  }, []);
+  // supplied a commDefinitionId (see shouldFetchCommDefinition above). Shared with
+  // CommunicationFlowCard.js via useFetchCommDefinition.
+  const isFetchingCommDefinition = useFetchCommDefinition({
+    existingCommDefinitionId: config?.context?.existingCommDefinitionId,
+    hasLocalContent: !!initialData?.contentItems?.length,
+    onFetched: (mapped) => setStepData((prevStepData) => ({ ...prevStepData, ...mapped })),
+  });
 
   // Memoize enabled steps
   const enabledSteps = useMemo(() => getEnabledSteps(config), [config]);

package/v2Containers/CommunicationFlow/CommunicationFlowCard.js

@@ -27,8 +27,7 @@ import {
   VIBER, SMS, EMAIL, WHATSAPP, RCS, ZALO,
 } from '../CreativesContainer/constants';
 import getContentBody from './utils/getContentBody';
-import { getCommDefinition, getCommDefinitionVersion } from '../../services/api';
-import { fetchAndMapCommDefinition } from './utils/mapCommDefinitionToStepData';
+import useFetchCommDefinition from './hooks/useFetchCommDefinition';
 import messages from './messages';
 import addCreativesIllustration from '../Assets/images/addCreativesIllustration.svg';
 import './CommunicationFlow.scss';
@@ -93,32 +92,14 @@ const CommunicationFlowCard = ({
     }
   }, [initialData]);
 
-  // Other consumers may provide only commDefinitionId; fetch it here so the summary card shows configured content immediately instead of "Add creatives".
-  const [isFetchingCommDefinition, setIsFetchingCommDefinition] = useState(
-    () => !!config?.context?.existingCommDefinitionId && !initialData?.contentItems?.length,
-  );
-
-  useEffect(() => {
-    const existingCommDefinitionId = config?.context?.existingCommDefinitionId;
-    if (!existingCommDefinitionId || initialData?.contentItems?.length) return undefined;
-    let cancelled = false;
-    (async () => {
-      try {
-        const mapped = await fetchAndMapCommDefinition(existingCommDefinitionId, {
-          getCommDefinition,
-          getCommDefinitionVersion,
-        });
-        if (!cancelled && mapped) {
-          setSavedData((prevSavedData) => ({ ...prevSavedData, ...mapped }));
-        }
-      } catch (error) {
-        console.error('[CommunicationFlowCard] fetchAndMapCommDefinition error:', error);
-      } finally {
-        if (!cancelled) setIsFetchingCommDefinition(false);
-      }
-    })();
-    return () => { cancelled = true; };
-  }, []);
+  // Other consumers may provide only commDefinitionId; fetch it here so the summary card shows
+  // configured content immediately instead of "Add creatives". Shared with CommunicationFlow.js
+  // via useFetchCommDefinition.
+  const isFetchingCommDefinition = useFetchCommDefinition({
+    existingCommDefinitionId: config?.context?.existingCommDefinitionId,
+    hasLocalContent: !!initialData?.contentItems?.length,
+    onFetched: (mapped) => setSavedData((prevSavedData) => ({ ...prevSavedData, ...mapped })),
+  });
 
   const handleSave = useCallback((data) => {
     setSavedData(data);

package/v2Containers/CommunicationFlow/hooks/Tests/useFetchCommDefinition.test.js

@@ -0,0 +1,118 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { waitFor } from '@testing-library/react';
+
+jest.mock('../../../../services/api', () => ({
+  getCommDefinition: jest.fn(),
+  getCommDefinitionVersion: jest.fn(),
+}));
+
+jest.mock('../../utils/mapCommDefinitionToStepData', () => ({
+  fetchAndMapCommDefinition: jest.fn(),
+}));
+
+import useFetchCommDefinition from '../useFetchCommDefinition';
+import { getCommDefinition, getCommDefinitionVersion } from '../../../../services/api';
+import { fetchAndMapCommDefinition } from '../../utils/mapCommDefinitionToStepData';
+
+describe('useFetchCommDefinition', () => {
+  beforeEach(() => {
+    fetchAndMapCommDefinition.mockReset();
+  });
+
+  it('starts in a fetching state and calls onFetched with the mapped result once the fetch resolves', async () => {
+    fetchAndMapCommDefinition.mockResolvedValue({ channel: 'SMS', contentItems: [{ contentId: 'cd_1' }] });
+    const onFetched = jest.fn();
+
+    const { result } = renderHook(() => useFetchCommDefinition({
+      existingCommDefinitionId: 'cd_1',
+      hasLocalContent: false,
+      onFetched,
+    }));
+
+    expect(result.current).toBe(true);
+
+    await waitFor(() => expect(result.current).toBe(false));
+    expect(fetchAndMapCommDefinition).toHaveBeenCalledWith('cd_1', {
+      getCommDefinition,
+      getCommDefinitionVersion,
+    });
+    expect(onFetched).toHaveBeenCalledWith({ channel: 'SMS', contentItems: [{ contentId: 'cd_1' }] });
+  });
+
+  it('does not call onFetched when the fetch resolves with nothing mappable, but still stops fetching', async () => {
+    fetchAndMapCommDefinition.mockResolvedValue(null);
+    const onFetched = jest.fn();
+
+    const { result } = renderHook(() => useFetchCommDefinition({
+      existingCommDefinitionId: 'cd_1',
+      hasLocalContent: false,
+      onFetched,
+    }));
+
+    await waitFor(() => expect(result.current).toBe(false));
+    expect(onFetched).not.toHaveBeenCalled();
+  });
+
+  it('does not crash and stops fetching when the fetch rejects', async () => {
+    fetchAndMapCommDefinition.mockRejectedValue(new Error('network error'));
+    const onFetched = jest.fn();
+    const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+
+    const { result } = renderHook(() => useFetchCommDefinition({
+      existingCommDefinitionId: 'cd_1',
+      hasLocalContent: false,
+      onFetched,
+    }));
+
+    await waitFor(() => expect(result.current).toBe(false));
+    expect(onFetched).not.toHaveBeenCalled();
+    expect(consoleErrorSpy).toHaveBeenCalled();
+    consoleErrorSpy.mockRestore();
+  });
+
+  it('never fetches, and reports isFetchingCommDefinition as false throughout, when hasLocalContent is true', async () => {
+    const onFetched = jest.fn();
+
+    const { result } = renderHook(() => useFetchCommDefinition({
+      existingCommDefinitionId: 'cd_1',
+      hasLocalContent: true,
+      onFetched,
+    }));
+
+    expect(result.current).toBe(false);
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    expect(fetchAndMapCommDefinition).not.toHaveBeenCalled();
+  });
+
+  it('never fetches when existingCommDefinitionId is absent', async () => {
+    const onFetched = jest.fn();
+
+    const { result } = renderHook(() => useFetchCommDefinition({
+      existingCommDefinitionId: undefined,
+      hasLocalContent: false,
+      onFetched,
+    }));
+
+    expect(result.current).toBe(false);
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    expect(fetchAndMapCommDefinition).not.toHaveBeenCalled();
+  });
+
+  it('does not call onFetched after unmount, even if the fetch resolves late', async () => {
+    let resolveFetch;
+    fetchAndMapCommDefinition.mockReturnValue(new Promise((resolve) => { resolveFetch = resolve; }));
+    const onFetched = jest.fn();
+
+    const { unmount } = renderHook(() => useFetchCommDefinition({
+      existingCommDefinitionId: 'cd_1',
+      hasLocalContent: false,
+      onFetched,
+    }));
+
+    unmount();
+    resolveFetch({ channel: 'SMS', contentItems: [{ contentId: 'cd_1' }] });
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    expect(onFetched).not.toHaveBeenCalled();
+  });
+});

package/v2Containers/CommunicationFlow/hooks/useFetchCommDefinition.js

@@ -0,0 +1,49 @@
+/**
+ * Shared by CommunicationFlow.js and CommunicationFlowCard.js — both need to fetch + reverse-map
+ * a CommDefinition by id when a consumer supplies only config.context.existingCommDefinitionId
+ * and no local content copy (see mapCommDefinitionToStepData.js). Previously duplicated in both
+ * files; this hook is the single place that owns the fetch, its loading state, and error handling.
+ */
+import { useState, useEffect } from 'react';
+import { getCommDefinition, getCommDefinitionVersion } from '../../../services/api';
+import { fetchAndMapCommDefinition } from '../utils/mapCommDefinitionToStepData';
+
+/**
+ * @param {string|undefined} existingCommDefinitionId - config.context.existingCommDefinitionId
+ * @param {boolean} hasLocalContent - true when the consumer already supplied content
+ *   (e.g. CapNotify, which always pre-fetches and passes full initialData itself) — skips the fetch.
+ * @param {(mapped: object) => void} onFetched - called once, only when the fetch resolves with
+ *   mappable data; the caller merges `mapped` into its own state (stepData/savedData).
+ * @returns {boolean} isFetchingCommDefinition - true from mount until the fetch settles; always
+ *   false when existingCommDefinitionId is absent or hasLocalContent is true.
+ */
+export default function useFetchCommDefinition({ existingCommDefinitionId, hasLocalContent, onFetched }) {
+  // Captured once at mount — existingCommDefinitionId/hasLocalContent aren't expected to change
+  // identity across the component's lifetime for this decision.
+  const [shouldFetch] = useState(() => !!existingCommDefinitionId && !hasLocalContent);
+  const [isFetchingCommDefinition, setIsFetchingCommDefinition] = useState(shouldFetch);
+
+  useEffect(() => {
+    if (!shouldFetch) return undefined;
+    let cancelled = false;
+    (async () => {
+      try {
+        const mapped = await fetchAndMapCommDefinition(existingCommDefinitionId, {
+          getCommDefinition,
+          getCommDefinitionVersion,
+        });
+        if (!cancelled && mapped) {
+          onFetched(mapped);
+        }
+      } catch (error) {
+        console.error('[useFetchCommDefinition] fetchAndMapCommDefinition error:', error);
+      } finally {
+        if (!cancelled) setIsFetchingCommDefinition(false);
+      }
+    })();
+    return () => { cancelled = true; };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return isFetchingCommDefinition;
+}

package/v2Containers/TagList/index.js

@@ -110,9 +110,9 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     } = prevProps;
 
     if (
-      tags !== prevTags
-      || injectedTags !== prevInjectedTags
-      || selectedOfferDetails !== prevSelectedOfferDetails
+      !_.isEqual(tags, prevTags)
+      || !_.isEqual(injectedTags, prevInjectedTags)
+      || !_.isEqual(selectedOfferDetails, prevSelectedOfferDetails)
       || !_.isEqual(eventContextTags, prevEventContextTags)
       || !_.isEqual(waitEventContextTags, prevWaitEventContextTags)
     ) {

package/v2Containers/TagList/tests/TagList.test.js

@@ -134,6 +134,22 @@ describe("TagList test :  UNIT", () => {
     expect(() => unmount()).not.toThrow();
   });
 
+  it('does not regenerate tags when selectedOfferDetails gets a new [] reference with same content', () => {
+    const spy = jest.spyOn(TagList.prototype, 'populateTags');
+    const { rerender, Component, store } = initializeTagList({
+      selectedOfferDetails: [],
+      tags: TagListData.tags,
+    });
+    spy.mockClear();
+    rerender(
+      <Provider store={store}>
+        <Component {...buildProps({ selectedOfferDetails: [], tags: TagListData.tags })} />
+      </Provider>
+    );
+    expect(spy).not.toHaveBeenCalled();
+    spy.mockRestore();
+  });
+
   it('regenerates tags when props.tags change (componentDidUpdate)', () => {
     const { rerender, Component, store } = initializeTagList({ tags: TagListData.tags });
     const extra = [

package/v2Containers/Viber/constants.js

@@ -13,6 +13,12 @@ export const VIBER_IMG_SIZE = 10000000;
 export const VIBER_VIDEO_SIZE = 209715200;
 export const charLimit = 1000;
 
+/** Stable fallbacks for TagList props — inline `= []` / `|| {}` allocate new refs every render. */
+export const EMPTY_OFFER_DETAILS = [];
+export const EMPTY_INJECTED_TAGS = {};
+export const EMPTY_TAGS = [];
+export const EMPTY_TEMPLATE_DATA = {};
+
 export const UPLOAD_VIBER_ASSET_REQUEST = 'app/v2Containers/Viber/UPLOAD_ASSET_REQUEST';
 export const UPLOAD_VIBER_ASSET_SUCCESS = 'app/v2Containers/Viber/UPLOAD_ASSET_SUCCESS';
 export const UPLOAD_VIBER_ASSET_FAILURE = 'app/v2Containers/Viber/UPLOAD_ASSET_FAILURE';

package/v2Containers/Viber/index.js

@@ -63,6 +63,10 @@ import {
   VIBER_CAROUSEL_IMG_SIZE,
   STATIC_URL,
   DYNAMIC_URL,
+  EMPTY_OFFER_DETAILS,
+  EMPTY_INJECTED_TAGS,
+  EMPTY_TAGS,
+  EMPTY_TEMPLATE_DATA,
 } from './constants';
 import withCreatives from '../../hoc/withCreatives';
 import {
@@ -129,12 +133,12 @@ export const Viber = (props) => {
     handleClose,
     onCreateComplete,
     params,
-    templateData = {},
+    templateData = EMPTY_TEMPLATE_DATA,
     actions,
     viber = {},
     getFormSubscriptionData,
     viberData = {},
-    selectedOfferDetails = [],
+    selectedOfferDetails = EMPTY_OFFER_DETAILS,
     eventContextTags,
     waitEventContextTags,
     // TestAndPreviewSlidebox props
@@ -258,7 +262,7 @@ export const Viber = (props) => {
         setTemplateMediaType(VIBER_MEDIA_TYPES.TEXT);
       }
     }
-  }, [viber.templateDetails || templateData]);
+  }, [params?.id, viber.templateDetails, templateData]);
 
   // Reports live message-content validity to a parent (e.g. CreativesContainer's
   // slidebox) so it can disable its own Done/Preview-and-test buttons whenever the
@@ -332,7 +336,8 @@ export const Viber = (props) => {
     globalActionsProps.fetchSchemaForEntity(query);
   };
 
-  const tags = metaEntities?.tags?.standard || [];
+  const tags = metaEntities?.tags?.standard ?? EMPTY_TAGS;
+  const resolvedInjectedTags = injectedTags ?? EMPTY_INJECTED_TAGS;
   // tags Code end here
 
   // validation on Text area and tags validation
@@ -393,7 +398,7 @@ export const Viber = (props) => {
           onContextChange={handleOnTagsContextChange}
           location={location}
           tags={tags}
-          injectedTags={injectedTags || {}}
+          injectedTags={resolvedInjectedTags}
           id="viber_tags"
           userLocale={localStorage.getItem("jlocale") || "en"}
           selectedOfferDetails={selectedOfferDetails}
@@ -882,7 +887,7 @@ export const Viber = (props) => {
               onContextChange={handleOnTagsContextChange}
               location={location}
               tags={tags}
-              injectedTags={injectedTags || {}}
+              injectedTags={resolvedInjectedTags}
               id={`viber_carousel_card_tags_${cardIndex}`}
               userLocale={localStorage.getItem("jlocale") || "en"}
               selectedOfferDetails={selectedOfferDetails}
@@ -1260,7 +1265,7 @@ export const Viber = (props) => {
         onContextChange={handleOnTagsContextChange}
         location={location}
         tags={tags}
-        injectedTags={injectedTags || {}}
+        injectedTags={resolvedInjectedTags}
         userLocale={localStorage.getItem("jlocale") || "en"}
         selectedOfferDetails={selectedOfferDetails}
         eventContextTags={eventContextTags}
@@ -1578,15 +1583,16 @@ export const Viber = (props) => {
           </CapButton>
         </ViberFooter>
       </CapSpin>
-      {/* Test and Preview Slidebox */}
-      <TestAndPreviewSlidebox
-        show={showTestAndPreviewSlidebox || propsShowTestAndPreviewSlidebox}
-        onClose={handleCloseTestAndPreview}
-        channel={VIBER}
-        formData={getTemplateContent()} // Pass templateContent as formData (contains all payload fields)
-        content={getTemplateContent()} // Also pass as content for preview (contains viberPreviewContent)
-        formatMessage={formatMessage}
-      />
+      {(showTestAndPreviewSlidebox || propsShowTestAndPreviewSlidebox) && (
+        <TestAndPreviewSlidebox
+          show={showTestAndPreviewSlidebox || propsShowTestAndPreviewSlidebox}
+          onClose={handleCloseTestAndPreview}
+          channel={VIBER}
+          formData={getTemplateContent()}
+          content={getTemplateContent()}
+          formatMessage={formatMessage}
+        />
+      )}
     </>
   );
 };

package/v2Components/FormBuilder/Functional/channels/mobilepush/buildSubmitPayload.js

@@ -1,10 +0,0 @@
-/**
- * MOBILEPUSH submit payload — identity, exactly like Classic: the container
- * receives the full legacy formData object and builds the API payload itself
- * (getTransformedData). Note that getChannelData has NO MOBILEPUSH branch —
- * Classic short-circuits before reaching it (Classic.js:1402-1405) — so this
- * adapter must never call it.
- */
-const buildSubmitPayload = (legacyFormData) => legacyFormData;
-
-export default buildSubmitPayload;