@capillarytech/creatives-library 9.0.56-alpha.6 → 9.0.56-alpha.8

package/v2Containers/CreativesContainer/index.js

@@ -197,6 +197,9 @@ export class Creatives extends React.Component {
         errorsAcknowledged: false, // Flag to track if user has acknowledged errors by clicking redirection icon
       },
       hasPersonalizationTokenError: false, // Track personalization token errors in form
+      // Live content-validity signal for channels that report it (currently SMS create) —
+      // false by default so unwired channels are never blocked by this flag.
+      isContentInvalid: false,
     };
     this.creativesTemplateSteps = {
       1: 'modeSelection',
@@ -1893,6 +1896,26 @@ export class Creatives extends React.Component {
     this.setState({ isDiscardMessage: true });
   }
 
+  // Reported live by SMS's own content editor (Sms/Create and Sms/Edit's componentDidUpdate)
+  // so the Done/Save button reflects an empty/invalid form immediately, instead of only
+  // failing silently on click.
+  handleEmbeddedSmsFooterValidity = (validity) => {
+    const isContentInvalid = !!validity?.isMessageEmpty;
+    if (this.state.isContentInvalid !== isContentInvalid) {
+      this.setState({ isContentInvalid });
+    }
+  }
+
+  // Generic counterpart of the above for every other channel wrapper (Email, MobilePush,
+  // Zalo, WebPush, RCS, WhatsApp, Viber) — each reports { isContentEmpty } live from its own
+  // form state so the Done/Preview-and-test buttons disable immediately, not just on click.
+  handleContentValidityChange = (validity) => {
+    const isContentInvalid = !!validity?.isContentEmpty;
+    if (this.state.isContentInvalid !== isContentInvalid) {
+      this.setState({ isContentInvalid });
+    }
+  }
+
 
   // NEW: Handler for Test and Preview button
   handleTestAndPreview = () => {
@@ -2213,6 +2236,7 @@ export class Creatives extends React.Component {
       isTestAndPreviewMode,
       inAppEditorType,
       htmlEditorValidationState,
+      isContentInvalid,
     } = this.state;
     const useLocalTemplates = get(
       this.props,
@@ -2410,6 +2434,8 @@ export class Creatives extends React.Component {
               handleCloseTestAndPreview={this.handleCloseTestAndPreview}
               isTestAndPreviewMode={(() => this.state.isTestAndPreviewMode)()}
               onHtmlEditorValidationStateChange={this.updateHtmlEditorValidationState}
+              onEmbeddedSmsFooterValidity={this.handleEmbeddedSmsFooterValidity}
+              onContentValidityChange={this.handleContentValidityChange}
               onPersonalizationTokensChange={this.handlePersonalizationTokensChange}
               localTemplatesConfig={pick(this.props.localTemplatesConfig || this.props, constants.LOCAL_TEMPLATE_CONFIG_KEYS)}
                           />
@@ -2432,6 +2458,7 @@ export class Creatives extends React.Component {
               shouldShowDoneFooter={this.shouldShowDoneFooter}
               fetchingCmsData={fetchingCmsData}
               isTemplateNameEmpty={isTemplateNameEmpty}
+              isContentInvalid={isContentInvalid}
               isLiquidValidationError={isLiquidValidationError}
               errorMessages={liquidErrorMessage}
               currentTab={activeFormBuilderTab}

package/v2Containers/CreativesContainer/tests/SlideBoxFooter.test.js

@@ -658,4 +658,33 @@ describe('SlideBoxFooter — isBEEEditor detection in create mode via emailCreat
       expect(screen.getByRole('button', { name: /done/i })).toBeInTheDocument();
     });
   });
+});
+
+describe('SlideBoxFooter — isContentInvalid (live content-validity signal, e.g. empty SMS body)', () => {
+  it('disables Save/Done when isContentInvalid is true, independent of currentChannel/htmlEditorValidationState', () => {
+    renderComponent({
+      ...baseFooterProps,
+      currentChannel: 'SMS',
+      isContentInvalid: true,
+    });
+    expect(screen.getByRole('button', { name: /update/i })).toBeDisabled();
+  });
+
+  it('disables the Test & Preview button when isContentInvalid is true', () => {
+    renderComponent({
+      ...baseFooterProps,
+      currentChannel: 'SMS',
+      isContentInvalid: true,
+      showTestAndPreviewButton: true,
+    });
+    expect(screen.getByRole('button', { name: /preview.*test/i })).toBeDisabled();
+  });
+
+  it('leaves Save/Done enabled when isContentInvalid is false (default)', () => {
+    renderComponent({
+      ...baseFooterProps,
+      currentChannel: 'SMS',
+    });
+    expect(screen.getByRole('button', { name: /update/i })).not.toBeDisabled();
+  });
 });

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

@@ -28,10 +28,12 @@ exports[`Test SlideBoxContent container campaign message, add creative click rcs
         }
         onCallTaskSubmit={[Function]}
         onChannelChange={[Function]}
+        onContentValidityChange={[Function]}
         onCreateComplete={[MockFunction]}
         onCreateNew={[Function]}
         onCreateNextStep={[Function]}
         onEmailModeChange={[Function]}
+        onEmbeddedSmsFooterValidity={[Function]}
         onEnterTemplateName={[Function]}
         onFTPSubmit={[MockFunction]}
         onFacebookSubmit={[MockFunction]}
@@ -122,10 +124,12 @@ exports[`Test SlideBoxContent container campaign message, add creative click wha
         }
         onCallTaskSubmit={[Function]}
         onChannelChange={[Function]}
+        onContentValidityChange={[Function]}
         onCreateComplete={[MockFunction]}
         onCreateNew={[Function]}
         onCreateNextStep={[Function]}
         onEmailModeChange={[Function]}
+        onEmbeddedSmsFooterValidity={[Function]}
         onEnterTemplateName={[Function]}
         onFTPSubmit={[MockFunction]}
         onFacebookSubmit={[MockFunction]}
@@ -216,10 +220,12 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
         }
         onCallTaskSubmit={[Function]}
         onChannelChange={[Function]}
+        onContentValidityChange={[Function]}
         onCreateComplete={[MockFunction]}
         onCreateNew={[Function]}
         onCreateNextStep={[Function]}
         onEmailModeChange={[Function]}
+        onEmbeddedSmsFooterValidity={[Function]}
         onEnterTemplateName={[Function]}
         onFTPSubmit={[MockFunction]}
         onFacebookSubmit={[MockFunction]}
@@ -281,6 +287,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
           }
         }
         isAnonymousType={false}
+        isContentInvalid={false}
         isContinueButtonDisabled={false}
         isCreatingTemplate={false}
         isEmptyContent={false}
@@ -353,10 +360,12 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
         }
         onCallTaskSubmit={[Function]}
         onChannelChange={[Function]}
+        onContentValidityChange={[Function]}
         onCreateComplete={[MockFunction]}
         onCreateNew={[Function]}
         onCreateNextStep={[Function]}
         onEmailModeChange={[Function]}
+        onEmbeddedSmsFooterValidity={[Function]}
         onEnterTemplateName={[Function]}
         onFTPSubmit={[MockFunction]}
         onFacebookSubmit={[MockFunction]}
@@ -418,6 +427,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
           }
         }
         isAnonymousType={false}
+        isContentInvalid={false}
         isContinueButtonDisabled={false}
         isCreatingTemplate={false}
         isEmptyContent={false}
@@ -490,10 +500,12 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
         }
         onCallTaskSubmit={[Function]}
         onChannelChange={[Function]}
+        onContentValidityChange={[Function]}
         onCreateComplete={[MockFunction]}
         onCreateNew={[Function]}
         onCreateNextStep={[Function]}
         onEmailModeChange={[Function]}
+        onEmbeddedSmsFooterValidity={[Function]}
         onEnterTemplateName={[Function]}
         onFTPSubmit={[MockFunction]}
         onFacebookSubmit={[MockFunction]}
@@ -555,6 +567,7 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
           }
         }
         isAnonymousType={false}
+        isContentInvalid={false}
         isContinueButtonDisabled={false}
         isCreatingTemplate={false}
         isEmptyContent={false}

package/v2Containers/MobilePush/Create/index.js

@@ -30,7 +30,7 @@ import getEventsMap from '../eventsMap';
 import { GA } from '@capillarytech/cap-ui-utils';
 import { CREATE, TRACK_CREATE_MPUSH } from '../../App/constants';
 import { MOBILE_PUSH } from '../../CreativesContainer/constants';
-import { getContent } from '../commonMethods';
+import { getContent, getMobilePushEmbeddedContentValidity } from '../commonMethods';
 import { getCdnUrl } from '../../../utils/cdnTransformation';
 import injectReducer from '../../../utils/injectReducer';
 import injectSaga from '../../../utils/injectSaga';
@@ -67,6 +67,22 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     }
     this.hasFetchedInitialTagsRef = false;
     this.lastFetchedTagContextRef = null;
+    // Tracks the last content-emptiness value reported to the parent so componentDidUpdate
+    // does not dispatch on every render. Intentionally undefined (not true) so the first
+    // render always reports the real validity rather than assuming the form starts invalid.
+    this._lastReportedMobilePushContentEmpty = undefined;
+  }
+  componentDidUpdate() {
+    // Reports live form validity so the host (CreativesContainer) can disable Done/Preview
+    // and Test as soon as the message content is cleared — mirrors Sms/Create's own reporting.
+    if (typeof this.props.onContentValidityChange !== 'function') {
+      return;
+    }
+    const validity = getMobilePushEmbeddedContentValidity(this.state?.formData, this.state?.tabCount);
+    const isContentEmpty = !!validity.isContentEmpty;
+    if (this._lastReportedMobilePushContentEmpty === isContentEmpty) return;
+    this._lastReportedMobilePushContentEmpty = isContentEmpty;
+    this.props.onContentValidityChange({ isContentEmpty });
   }
   componentWillMount = () => {
     if (this.props.route.name === 'view') {
@@ -2072,6 +2088,7 @@ Create.propTypes = {
   getFormLibraryData: PropTypes.func,
   onPreviewContentClicked: PropTypes.func,
   onTestContentClicked: PropTypes.func,
+  onContentValidityChange: PropTypes.func,
   eventContextTags: PropTypes.array,
   waitEventContextTags: PropTypes.object,
   getLiquidTags: PropTypes.func,

package/v2Containers/MobilePush/Create/test/contentValidity.test.js

@@ -0,0 +1,96 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import { Create } from '../index';
+
+// Shallow-render the plain class (bypassing the withCreatives/Redux/saga HOC) so this test
+// only exercises the componentDidUpdate → onContentValidityChange wiring in isolation.
+// Mirrors app/v2Containers/Sms/Create/index.js's own reporting and
+// app/v2Containers/MobilePush/Edit/test/contentValidity.test.js.
+
+const baseProps = () => ({
+  actions: {},
+  globalActions: {
+    fetchSchemaForEntity: jest.fn(),
+  },
+  Templates: { selectedWeChatAccount: { id: 'acc-1' } },
+  Create: {},
+  params: {},
+  location: { query: { type: 'library', module: 'default' } },
+  route: { name: 'mobilepush' },
+  router: { push: jest.fn() },
+  metaEntities: {},
+  intl: { formatMessage: (m) => (m && (m.defaultMessage || m.id)) || '' },
+  isFullMode: false,
+});
+
+describe('MobilePush/Create — onContentValidityChange reporting', () => {
+  it('reports isContentEmpty: true on mount when both Android title and message are empty', () => {
+    const onContentValidityChange = jest.fn();
+    const wrapper = shallow(<Create {...baseProps()} onContentValidityChange={onContentValidityChange} />);
+    wrapper.setState({
+      formData: { 0: { 'message-title': '', 'message-editor': '' } },
+      tabCount: 1,
+    });
+
+    expect(onContentValidityChange).toHaveBeenCalledWith(
+      expect.objectContaining({ isContentEmpty: true }),
+    );
+  });
+
+  it('reports isContentEmpty: false once the Android message has content', () => {
+    const onContentValidityChange = jest.fn();
+    const wrapper = shallow(<Create {...baseProps()} onContentValidityChange={onContentValidityChange} />);
+    wrapper.setState({
+      formData: { 0: { 'message-title': '', 'message-editor': '' } },
+      tabCount: 1,
+    });
+    onContentValidityChange.mockClear();
+
+    wrapper.setState({
+      formData: { 0: { 'message-title': 'Hello', 'message-editor': 'World' } },
+      tabCount: 1,
+    });
+
+    expect(onContentValidityChange).toHaveBeenCalledWith(
+      expect.objectContaining({ isContentEmpty: false }),
+    );
+  });
+
+  it('re-reports empty when a previously entered message is cleared out', () => {
+    const onContentValidityChange = jest.fn();
+    const wrapper = shallow(<Create {...baseProps()} onContentValidityChange={onContentValidityChange} />);
+    wrapper.setState({
+      formData: { 0: { 'message-title': 'Existing', 'message-editor': 'content' } },
+      tabCount: 1,
+    });
+    onContentValidityChange.mockClear();
+
+    wrapper.setState({
+      formData: { 0: { 'message-title': '', 'message-editor': '' } },
+      tabCount: 1,
+    });
+
+    expect(onContentValidityChange).toHaveBeenCalledWith(
+      expect.objectContaining({ isContentEmpty: true }),
+    );
+  });
+
+  it('does not throw and does not report when onContentValidityChange is not provided', () => {
+    const wrapper = shallow(<Create {...baseProps()} />);
+    expect(() => {
+      wrapper.setState({ formData: { 0: { 'message-title': '', 'message-editor': '' } }, tabCount: 1 });
+    }).not.toThrow();
+  });
+
+  it('does not dispatch again on a re-render that does not change validity (dedup guard)', () => {
+    const onContentValidityChange = jest.fn();
+    const wrapper = shallow(<Create {...baseProps()} onContentValidityChange={onContentValidityChange} />);
+    wrapper.setState({ formData: { 0: { 'message-title': '', 'message-editor': '' } }, tabCount: 1 });
+    onContentValidityChange.mockClear();
+
+    // Unrelated state change — content emptiness is unchanged.
+    wrapper.setState({ currentTab: 1 });
+
+    expect(onContentValidityChange).not.toHaveBeenCalled();
+  });
+});

package/v2Containers/MobilePush/Edit/index.js

@@ -28,7 +28,7 @@ import withCreatives from '../../../hoc/withCreatives';
 import { gtmPush } from '../../../utils/gtmTrackers';
 
 import getEventsMap from '../eventsMap';
-import {getPrimaryCtaFields, getSecondaryCtaFields, getLinkTypeFields, getContent} from '../commonMethods';
+import {getPrimaryCtaFields, getSecondaryCtaFields, getLinkTypeFields, getContent, getMobilePushEmbeddedContentValidity} from '../commonMethods';
 import { GA } from '@capillarytech/cap-ui-utils';
 import { EDIT, TRACK_EDIT_MPUSH } from '../../App/constants';
 import { MOBILE_PUSH } from '../../CreativesContainer/constants';
@@ -85,6 +85,10 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     this.hasFetchedInitialTagsRef = false;
     // Guard: avoid duplicate fetch when multiple TagList instances trigger same context
     this.lastFetchedTagContextRef = null;
+    // Tracks the last content-emptiness value reported to the parent so componentDidUpdate
+    // does not dispatch on every render. Intentionally undefined (not true) so the first
+    // render always reports the real validity rather than assuming the form starts invalid.
+    this._lastReportedMobilePushContentEmpty = undefined;
   }
   componentWillMount() {
     this.props.actions.getWeCrmAccounts("mobilepush");
@@ -126,6 +130,18 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       parent.postMessage(JSON.stringify(response), '*');
     }
   }
+  componentDidUpdate() {
+    // Reports live form validity so the host (CreativesContainer) can disable Done/Preview
+    // and Test as soon as the message content is cleared — mirrors Sms/Edit's own reporting.
+    if (typeof this.props.onContentValidityChange !== 'function') {
+      return;
+    }
+    const validity = getMobilePushEmbeddedContentValidity(this.state.formData, this.state.tabCount);
+    const isContentEmpty = !!validity.isContentEmpty;
+    if (this._lastReportedMobilePushContentEmpty === isContentEmpty) return;
+    this._lastReportedMobilePushContentEmpty = isContentEmpty;
+    this.props.onContentValidityChange({ isContentEmpty });
+  }
   componentWillReceiveProps(nextProps) {
     if (nextProps.params?.id !== this.props.params?.id) {
       this.hasFetchedInitialTagsRef = false;
@@ -2337,6 +2353,7 @@ Edit.propTypes = {
   onValidationFail: PropTypes.func,
   onPreviewContentClicked: PropTypes.func,
   onTestContentClicked: PropTypes.func,
+  onContentValidityChange: PropTypes.func,
   creativesMode: PropTypes.string,
   eventContextTags: PropTypes.array,
   waitEventContextTags: PropTypes.object,

package/v2Containers/MobilePush/Edit/test/contentValidity.test.js

@@ -0,0 +1,116 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import { Edit } from '../index';
+
+// Shallow-render the plain class (bypassing the withCreatives/Redux/saga HOC) so this test
+// only exercises the componentDidUpdate → onContentValidityChange wiring in isolation.
+// Mirrors app/v2Containers/Sms/Edit/tests/index.test.js.
+
+const baseProps = () => ({
+  actions: {
+    getWeCrmAccounts: jest.fn(),
+    getTemplateDetails: jest.fn(),
+    setTemplateDetails: jest.fn(),
+  },
+  globalActions: {
+    fetchSchemaForEntity: jest.fn(),
+  },
+  Templates: { selectedWeChatAccount: { id: 'acc-1' } },
+  Edit: {},
+  Create: {},
+  params: {},
+  location: { query: { type: 'library', module: 'default' } },
+  router: { push: jest.fn() },
+  metaEntities: {},
+  templateData: {},
+  intl: { formatMessage: (m) => (m && (m.defaultMessage || m.id)) || '' },
+  isFullMode: false,
+});
+
+describe('MobilePush/Edit — onContentValidityChange reporting', () => {
+  it('reports isContentEmpty: true on mount when both Android title and message are empty', () => {
+    const onContentValidityChange = jest.fn();
+    const wrapper = shallow(<Edit {...baseProps()} onContentValidityChange={onContentValidityChange} />);
+    wrapper.setState({
+      formData: { 0: { 'message-title': '', 'message-editor': '' } },
+      tabCount: 1,
+    });
+
+    expect(onContentValidityChange).toHaveBeenCalledWith(
+      expect.objectContaining({ isContentEmpty: true }),
+    );
+  });
+
+  it('reports isContentEmpty: false once the Android message has content', () => {
+    const onContentValidityChange = jest.fn();
+    const wrapper = shallow(<Edit {...baseProps()} onContentValidityChange={onContentValidityChange} />);
+    wrapper.setState({
+      formData: { 0: { 'message-title': '', 'message-editor': '' } },
+      tabCount: 1,
+    });
+    onContentValidityChange.mockClear();
+
+    wrapper.setState({
+      formData: { 0: { 'message-title': 'Hello', 'message-editor': 'World' } },
+      tabCount: 1,
+    });
+
+    expect(onContentValidityChange).toHaveBeenCalledWith(
+      expect.objectContaining({ isContentEmpty: false }),
+    );
+  });
+
+  it('re-reports empty when an existing (edit-loaded) message is cleared out', () => {
+    const onContentValidityChange = jest.fn();
+    const wrapper = shallow(<Edit {...baseProps()} onContentValidityChange={onContentValidityChange} />);
+    wrapper.setState({
+      formData: { 0: { 'message-title': 'Existing', 'message-editor': 'content' } },
+      tabCount: 1,
+    });
+    onContentValidityChange.mockClear();
+
+    wrapper.setState({
+      formData: { 0: { 'message-title': '', 'message-editor': '' } },
+      tabCount: 1,
+    });
+
+    expect(onContentValidityChange).toHaveBeenCalledWith(
+      expect.objectContaining({ isContentEmpty: true }),
+    );
+  });
+
+  it('treats content as empty when the iOS tab (tabCount 2) is cleared even if Android has content', () => {
+    const onContentValidityChange = jest.fn();
+    const wrapper = shallow(<Edit {...baseProps()} onContentValidityChange={onContentValidityChange} />);
+    wrapper.setState({
+      formData: {
+        0: { 'message-title': 'Android title', 'message-editor': 'Android body' },
+        1: { 'message-title2': '', 'message-editor2': '' },
+      },
+      tabCount: 2,
+    });
+
+    expect(onContentValidityChange).toHaveBeenCalledWith(
+      expect.objectContaining({ isContentEmpty: true }),
+    );
+  });
+
+  it('does not throw and does not report when onContentValidityChange is not provided', () => {
+    const wrapper = shallow(<Edit {...baseProps()} />);
+    expect(() => {
+      wrapper.setState({ formData: { 0: { 'message-title': '', 'message-editor': '' } }, tabCount: 1 });
+    }).not.toThrow();
+  });
+
+  it('does not dispatch again on a re-render that does not change validity (dedup guard)', () => {
+    const onContentValidityChange = jest.fn();
+    const wrapper = shallow(<Edit {...baseProps()} onContentValidityChange={onContentValidityChange} />);
+    wrapper.setState({ formData: { 0: { 'message-title': '', 'message-editor': '' } }, tabCount: 1 });
+    onContentValidityChange.mockClear();
+
+    // Unrelated state change — content emptiness is unchanged.
+    wrapper.setState({ currentTab: 1 });
+
+    expect(onContentValidityChange).not.toHaveBeenCalled();
+  });
+});

package/v2Containers/MobilePush/commonMethods.js

@@ -2,6 +2,7 @@ import {get, filter, cloneDeep} from 'lodash';
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 import messages from './Create/messages';
+import { extractContent } from '../../utils/commonUtils';
 function getPrimaryCtaFields({inputFields, fieldIndex, deepLinkOptions, tab}) {
   const currentTab = tab || this.state.currentTab;
   const newInputFields = cloneDeep(inputFields);
@@ -282,6 +283,53 @@ function getContent(obj) {
   const iosMessage = ios.message || '';
   return `${androidTitle} ${androidMessage} ${iosTitle} ${iosMessage}`;
 }
+
+/**
+ * Extracts the plain-text content of a single Mobile Push tab (Android or iOS),
+ * mirroring the shape-detection logic in `validateMobilePushContent`
+ * (app/utils/commonUtils.js) so "empty" is defined consistently in both places.
+ * @param {number} tabIndex 0 = Android, 1 = iOS
+ * @param {object} tabData formData[tabIndex]
+ * @returns {string}
+ */
+function getMobilePushTabContent(tabIndex, tabData) {
+  if (!tabData || typeof tabData !== 'object') {
+    return '';
+  }
+  const titleKey = tabIndex === 1 ? 'message-title2' : 'message-title';
+  const messageKey = tabIndex === 1 ? 'message-editor2' : 'message-editor';
+  const isOldUiShape = titleKey in tabData || messageKey in tabData;
+  if (isOldUiShape) {
+    return [tabData[titleKey], tabData[messageKey]].filter(Boolean).join(' ');
+  }
+  return extractContent(tabData);
+}
+
+/**
+ * Live "is content empty" check for the legacy Mobile Push Edit/Create forms — the
+ * Mobile Push analogue of Sms's `getSmsEmbeddedFooterValidity` (see
+ * app/v2Containers/Sms/smsFormDataHelpers.js). Checks every active tab (Android, and
+ * iOS when tabCount > 1); if any active tab's title+message are both empty, the
+ * overall content is considered empty so Done/Preview-and-test can be disabled.
+ * @param {object} formData FormBuilder state (same shape as this.state.formData)
+ * @param {number} [tabCount] Total number of active tabs (1 = Android only, 2 = Android + iOS)
+ * @returns {{ isContentEmpty: boolean }}
+ */
+function getMobilePushEmbeddedContentValidity(formData, tabCount) {
+  const count = tabCount != null && tabCount > 1 ? tabCount : 1;
+  let isContentEmpty = false;
+  for (let i = 0; i < count; i++) {
+    const content = getMobilePushTabContent(i, formData?.[i]);
+    const trimmed = content != null && content !== '' ? String(content).trim() : '';
+    if (!trimmed) {
+      isContentEmpty = true;
+      break;
+    }
+  }
+  return { isContentEmpty };
+}
+
 export {
-  getPrimaryCtaFields, getSecondaryCtaFields, getLinkTypeFields, getContent
+  getPrimaryCtaFields, getSecondaryCtaFields, getLinkTypeFields, getContent,
+  getMobilePushEmbeddedContentValidity
 };

package/v2Containers/MobilePushNew/index.js

@@ -86,7 +86,7 @@ import useUpload from "./hooks/useUpload";
 import { validateTags } from "../../utils/tagValidations";
 import { PlatformContentFields } from "./components";
 import { CREATE, EDIT, TRACK_CREATE_MPUSH } from "../App/constants";
-import { validateExternalLink, validateDeepLink } from "./utils";
+import { validateExternalLink, validateDeepLink, isPlatformFieldsMissing } from "./utils";
 import messages from "./messages";
 import { EXTERNAL_URL, MOBILE_PUSH } from "../CreativesContainer/constants";
 import createMobilePushPayloadWithIntl from "../../utils/createMobilePushPayload";
@@ -477,7 +477,7 @@ const processPlatformContent = (contentType, expandableDetails, deepLink, proces
   };
 };
 
-const MobilePushNew = ({
+export const MobilePushNew = ({
   isFullMode,
   intl,
   onEnterTemplateName,
@@ -509,6 +509,7 @@ const MobilePushNew = ({
   // new flag from parent - when true personalization via tags should be disabled
   restrictPersonalization = false,
   onPersonalizationTokensChange,
+  onContentValidityChange,
 }) => {
   const { formatMessage } = intl;
 
@@ -1758,8 +1759,30 @@ const MobilePushNew = ({
   ]);
 
   // Validation logic for template creation/update
-  const isAndroidFieldsMissing = isAndroidSupported && (!androidContent?.title?.trim() || !androidContent?.message?.trim());
-  const isIosFieldsMissing = isIosSupported && (!iosContent?.title?.trim() || !iosContent?.message?.trim());
+  const isAndroidFieldsMissing = isPlatformFieldsMissing(isAndroidSupported, androidContent);
+  const isIosFieldsMissing = isPlatformFieldsMissing(isIosSupported, iosContent);
+
+  // Ref to dedupe reporting of content emptiness to the parent, so we only
+  // call onContentValidityChange when the computed value actually changes.
+  const lastReportedIsContentEmptyRef = useRef(undefined);
+
+  // Notify parent whenever content emptiness (based on required fields for
+  // supported platforms) changes, mirroring the Save-button gating logic.
+  useEffect(() => {
+    if (typeof onContentValidityChange !== 'function') return;
+    const isContentEmpty = isAndroidFieldsMissing || isIosFieldsMissing;
+    if (lastReportedIsContentEmptyRef.current === isContentEmpty) return;
+    lastReportedIsContentEmptyRef.current = isContentEmpty;
+    onContentValidityChange({ isContentEmpty });
+  }, [
+    androidContent,
+    iosContent,
+    isAndroidSupported,
+    isIosSupported,
+    isAndroidFieldsMissing,
+    isIosFieldsMissing,
+    onContentValidityChange,
+  ]);
 
   // Add changeSourceRef for debounced sync
   const changeSourceRef = useRef(null);
@@ -3148,6 +3171,7 @@ MobilePushNew.propTypes = {
   getTemplateDetailsInProgress: PropTypes.bool,
   onCreateComplete: PropTypes.func,
   onPersonalizationTokensChange: PropTypes.func,
+  onContentValidityChange: PropTypes.func,
 };
 
 MobilePushNew.defaultProps = {
@@ -3179,6 +3203,7 @@ MobilePushNew.defaultProps = {
   getTemplateDetailsInProgress: false,
   onCreateComplete: () => {},
   onPersonalizationTokensChange: undefined,
+  onContentValidityChange: undefined,
 };
 
 const mapStateToProps = createStructuredSelector({