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

package/v2Containers/CommunicationFlow/steps/DeliverySettingsStep/DeliverySettingsSection.js

@@ -34,11 +34,16 @@ const DeliverySettingsSection = ({
   deliverySetting = {},
   onDeliverySettingChange,
   onDomainPropertiesLoaded,
+  orgUnitId,
   intl,
 }) => {
   const [showSlidebox, setShowSlidebox] = useState(false);
   const [domainPropertiesData, setDomainPropertiesData] = useState(null);
   const [wecrmViberData, setWecrmViberData] = useState(null);
+  // Drives SenderDetails' loading spinner — true only while the domain-properties
+  // fetch below is actually in flight (previously nothing tracked this, so opening
+  // the slidebox before the background fetch resolved showed a blank panel).
+  const [isFetchingDomains, setIsFetchingDomains] = useState(false);
   const fetchInFlightRef = useRef(false);
   const lastChannelKeyRef = useRef('');
   const { formatMessage } = intl || {};
@@ -88,12 +93,16 @@ const DeliverySettingsSection = ({
     }
     if (fetchInFlightRef.current) return undefined;
     fetchInFlightRef.current = true;
+    setIsFetchingDomains(true);
     lastChannelKeyRef.current = deliveryChannelKey;
     let cancelled = false;
     const fetchData = async () => {
       try {
-        const orgUnitId = loadItem('ouId') || loadItem('orgID');
-        const response = await getDomainProperties(deliveryChannels, orgUnitId);
+        // Prefer the consumer-supplied config.context.ouId (same source Preview-and-test already
+        // uses) so both screens fetch domains for the same org unit; fall back to the logged-in
+        // user's own cached OU only when a consumer hasn't supplied one.
+        const resolvedOrgUnitId = orgUnitId ?? (loadItem('ouId') || loadItem('orgID'));
+        const response = await getDomainProperties(deliveryChannels, resolvedOrgUnitId);
         if (!cancelled) {
           const raw = response?.entity || response;
           // Normalize channel keys to uppercase (API may return Viber, viber, etc.)
@@ -108,7 +117,10 @@ const DeliverySettingsSection = ({
       } catch (err) {
         if (!cancelled) setDomainPropertiesData(null);
       } finally {
-        if (!cancelled) fetchInFlightRef.current = false;
+        if (!cancelled) {
+          fetchInFlightRef.current = false;
+          setIsFetchingDomains(false);
+        }
       }
     };
     fetchData();
@@ -117,7 +129,7 @@ const DeliverySettingsSection = ({
       // Do NOT reset fetchInFlightRef here - it would allow duplicate fetches when effect re-runs.
       // fetchInFlightRef is reset in finally when the fetch completes.
     };
-  }, [deliveryEnabled, deliveryChannelKey]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [deliveryEnabled, deliveryChannelKey, orgUnitId]); // eslint-disable-line react-hooks/exhaustive-deps
 
   // Fetch WeCRM accounts for VIBER when domainProperties has empty contactInfo
   const needsWecrmViber = deliveryChannels.includes('VIBER');
@@ -303,6 +315,7 @@ const DeliverySettingsSection = ({
           onClose={() => setShowSlidebox(false)}
           channels={deliveryChannels}
           preloadedDomainProperties={entityWithWecrmViber}
+          isLoadingDomainProperties={isFetchingDomains}
           savedFieldValues={parseChannelSettingForDisplay(deliverySetting?.channelSetting)}
           whatsappSourceAccountId={whatsappSourceAccountId}
           whatsappAccountName={whatsappAccNameFromContent || getWhatsappAccountName(entityWithWecrmViber, whatsappSourceAccountId)}
@@ -319,6 +332,7 @@ DeliverySettingsSection.propTypes = {
   deliverySetting: PropTypes.object,
   onDeliverySettingChange: PropTypes.func,
   onDomainPropertiesLoaded: PropTypes.func,
+  orgUnitId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   intl: PropTypes.object.isRequired,
 };
 
@@ -327,6 +341,7 @@ DeliverySettingsSection.defaultProps = {
   deliverySettingsData: null,
   deliverySetting: null,
   onDeliverySettingChange: null,
+  orgUnitId: undefined,
 };
 
 export default injectIntl(DeliverySettingsSection);

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

@@ -42,6 +42,7 @@ const SenderDetails = ({
   onClose,
   channels = [],
   preloadedDomainProperties,
+  isLoadingDomainProperties,
   savedFieldValues,
   onSave,
   whatsappSourceAccountId,
@@ -90,14 +91,15 @@ const SenderDetails = ({
       setLoading(false);
       setError(null);
     } else {
-      // preloadedDomainProperties is not yet available (or the parent's fetch failed).
-      // Show nothing rather than an eternal spinner — the parent controls data availability.
-      setLoading(false);
+      // preloadedDomainProperties is not yet available — either the parent's fetch is still in
+      // flight (show the spinner via isLoadingDomainProperties) or it failed/returned nothing
+      // (show nothing rather than an eternal spinner — the parent controls data availability).
+      setLoading(!!isLoadingDomainProperties);
       setEntity(null);
       setFieldValues({});
       setInitialFieldValues({});
     }
-  }, [show, channels, preloadedDomainProperties, savedFieldValues, fieldConfigs, whatsappAccountName, wabaContext]);
+  }, [show, channels, preloadedDomainProperties, isLoadingDomainProperties, savedFieldValues, fieldConfigs, whatsappAccountName, wabaContext]);
 
   const handleFieldChange = useCallback((fieldKey, value) => {
     setFieldValues((prev) => {
@@ -306,6 +308,7 @@ SenderDetails.propTypes = {
   onClose: PropTypes.func.isRequired,
   channels: PropTypes.arrayOf(PropTypes.string),
   preloadedDomainProperties: PropTypes.object,
+  isLoadingDomainProperties: PropTypes.bool,
   savedFieldValues: PropTypes.object,
   onSave: PropTypes.func,
   whatsappSourceAccountId: PropTypes.string,
@@ -316,6 +319,7 @@ SenderDetails.propTypes = {
 SenderDetails.defaultProps = {
   channels: [],
   preloadedDomainProperties: null,
+  isLoadingDomainProperties: false,
   savedFieldValues: null,
   onSave: null,
   whatsappSourceAccountId: '',

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

@@ -153,6 +153,7 @@ function renderSection(props = {}) {
     deliverySettingsData = {},
     deliverySetting = {},
     onDeliverySettingChange,
+    orgUnitId,
   } = props;
   return render(
     <IntlProvider locale="en" messages={{}} defaultLocale="en">
@@ -161,6 +162,7 @@ function renderSection(props = {}) {
         deliverySettingsData={deliverySettingsData}
         deliverySetting={deliverySetting}
         onDeliverySettingChange={onDeliverySettingChange}
+        orgUnitId={orgUnitId}
       />
     </IntlProvider>,
   );
@@ -299,6 +301,15 @@ describe('DeliverySettingsSection — marketer flows', () => {
       await waitFor(() => expect(getDomainProperties).toHaveBeenCalledWith(['SMS'], 'fallback-org'));
     });
 
+    it('prefers the consumer-supplied orgUnitId (config.context.ouId) over local storage — same source Preview-and-test uses, so both fetch the same org unit', async () => {
+      loadItem.mockImplementation((key) => (key === 'ouId' || key === 'orgID' ? 'logged-in-user-ou' : null));
+      getDomainProperties.mockResolvedValue({ entity: apiEntity.SMS });
+
+      renderSection({ contentItems: [{ channel: 'SMS' }], orgUnitId: 'consumer-ou' });
+
+      await waitFor(() => expect(getDomainProperties).toHaveBeenCalledWith(['SMS'], 'consumer-ou'));
+    });
+
     it('accepts the whole response as the entity when `entity` is omitted (some clients)', async () => {
       getDomainProperties.mockResolvedValue(apiEntity.SMS);
 

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

@@ -9,6 +9,16 @@ import SenderDetails, { parseSenderDetailsFromEntity } from '../SenderDetails';
 import * as deliverySettingsConfig from '../deliverySettingsConfig';
 import { findVisibleSelectOption } from '../../../../../utils/test-utils';
 
+// antd's Spin indicator doesn't render distinctly under jsdom (lazy-loaded), so its
+// `spinning` prop isn't observable via the rendered DOM — mock it to surface the prop directly.
+jest.mock('@capillarytech/cap-ui-library/CapSpin', () => function MockCapSpin({ spinning, children }) {
+  return (
+    <div data-testid="mock-cap-spin" data-spinning={String(!!spinning)}>
+      {children}
+    </div>
+  );
+});
+
 // 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.
@@ -256,6 +266,22 @@ describe('SenderDetails', () => {
     expect(screen.queryByText('SMS Domain')).not.toBeInTheDocument();
   });
 
+  it('shows a loading spinner when preloaded data is missing and the parent reports the domain fetch is still in flight', () => {
+    renderSenderDetails({
+      preloadedDomainProperties: null,
+      isLoadingDomainProperties: true,
+    });
+    expect(screen.getByTestId('mock-cap-spin')).toHaveAttribute('data-spinning', 'true');
+  });
+
+  it('does not show a loading spinner when preloaded data is missing but the parent is not fetching (e.g. the fetch failed)', () => {
+    renderSenderDetails({
+      preloadedDomainProperties: null,
+      isLoadingDomainProperties: false,
+    });
+    expect(screen.getByTestId('mock-cap-spin')).toHaveAttribute('data-spinning', 'false');
+  });
+
   it('applies savedFieldValues over API defaults for SMS sender', async () => {
     renderSenderDetails({
       preloadedDomainProperties: ENTITIES.smsTwoSenders,

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -181,6 +181,8 @@ export function SlideBoxContent(props) {
       onPersonalizationTokensChange,
       isTestAndPreviewMode,
       onHtmlEditorValidationStateChange,
+      onEmbeddedSmsFooterValidity,
+      onContentValidityChange,
     } = props;
   const localTemplatesConfig = props.localTemplatesConfig || pick(props, constants.LOCAL_TEMPLATE_CONFIG_KEYS);
   const useLocalTemplates = !!get(localTemplatesConfig, 'useLocalTemplates');
@@ -456,6 +458,7 @@ export function SlideBoxContent(props) {
     eventContextTags,
     waitEventContextTags,
     handleClose,
+    onContentValidityChange,
   };
 
   return (
@@ -602,6 +605,7 @@ export function SlideBoxContent(props) {
           handleCloseTestAndPreview={handleCloseTestAndPreview}
           isTestAndPreviewMode={isTestAndPreviewMode}
           onValidationFail={onValidationFail}
+          onEmbeddedSmsFooterValidity={onEmbeddedSmsFooterValidity}
         />
       )}
       {isEditFTP && (
@@ -644,6 +648,7 @@ export function SlideBoxContent(props) {
           showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
           handleTestAndPreview={handleTestAndPreview}
           handleCloseTestAndPreview={handleCloseTestAndPreview}
+          onContentValidityChange={onContentValidityChange}
         />
       }
       {
@@ -667,6 +672,7 @@ export function SlideBoxContent(props) {
         templateData={templateData}
         isGetFormData={isGetFormData}
         getFormSubscriptionData={getFormData}
+        onEmbeddedSmsFooterValidity={onEmbeddedSmsFooterValidity}
         getLiquidTags={getLiquidTags}
         getDefaultTags={type}
         isFullMode={isFullMode}
@@ -866,6 +872,7 @@ export function SlideBoxContent(props) {
             restrictPersonalization={restrictPersonalization}
             isAnonymousType={isAnonymousType}
             onPersonalizationTokensChange={onPersonalizationTokensChange}
+            onContentValidityChange={onContentValidityChange}
           />
         ) : (
           <MobilePushNew
@@ -897,6 +904,7 @@ export function SlideBoxContent(props) {
             restrictPersonalization={restrictPersonalization}
             isAnonymousType={isAnonymousType}
             onPersonalizationTokensChange={onPersonalizationTokensChange}
+            onContentValidityChange={onContentValidityChange}
           />
         )
       )}
@@ -939,6 +947,7 @@ export function SlideBoxContent(props) {
             restrictPersonalization={restrictPersonalization}
             isAnonymousType={isAnonymousType}
             onPersonalizationTokensChange={onPersonalizationTokensChange}
+            onContentValidityChange={onContentValidityChange}
           />
         ) : (
           <MobilePushNew
@@ -976,6 +985,7 @@ export function SlideBoxContent(props) {
             creativesMode={creativesMode}
             restrictPersonalization={restrictPersonalization}
             isAnonymousType={isAnonymousType}
+            onContentValidityChange={onContentValidityChange}
           />
         )
       )}
@@ -1085,6 +1095,7 @@ export function SlideBoxContent(props) {
           showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
           handleTestAndPreview={handleTestAndPreview}
           handleCloseTestAndPreview={handleCloseTestAndPreview}
+          onContentValidityChange={onContentValidityChange}
           createNew/>
       )}
 
@@ -1107,6 +1118,7 @@ export function SlideBoxContent(props) {
         eventContextTags={eventContextTags}
         waitEventContextTags={waitEventContextTags}
         showLiquidErrorInFooter={showLiquidErrorInFooter}
+        onContentValidityChange={onContentValidityChange}
         createNew/> }
 
       {isCreateWhatsapp && (<Whatsapp
@@ -1120,6 +1132,7 @@ export function SlideBoxContent(props) {
         handleTestAndPreview={handleTestAndPreview}
         handleCloseTestAndPreview={handleCloseTestAndPreview}
         isTestAndPreviewMode={isTestAndPreviewMode}
+        onContentValidityChange={onContentValidityChange}
         />
       )}
 
@@ -1145,6 +1158,7 @@ export function SlideBoxContent(props) {
           search: '',
         }}
         showLiquidErrorInFooter={showLiquidErrorInFooter}
+        onContentValidityChange={onContentValidityChange}
         />
       )}
 
@@ -1270,6 +1284,7 @@ export function SlideBoxContent(props) {
           restrictPersonalization={restrictPersonalization}
           isAnonymousType={isAnonymousType}
           waitEventContextTags={waitEventContextTags}
+          onContentValidityChange={onContentValidityChange}
         />
       )}
       {isCreateRcs && (<Rcs

package/v2Containers/CreativesContainer/SlideBoxFooter.js

@@ -51,6 +51,8 @@ function SlideBoxFooter(props) {
     hasPersonalizationTokenError: hasPersonalizationTokenErrorProp = false,
     /** When set (e.g. SMS library create), overrides `creativesTemplatesSave` (“Done”) for the primary button */
     primarySaveButtonMessage,
+    /** Live content-validity signal reported by the channel's own editor (currently SMS create) — true disables Save/Done. */
+    isContentInvalid = false,
   } = props;
   // Calculate if buttons should be disabled
   // Only apply validation state checks for EMAIL channel in HTML Editor mode (not BEE/DragDrop)
@@ -193,7 +195,7 @@ function SlideBoxFooter(props) {
             <CapRow useLegacy>
               <CapButton
                 onClick={onSave}
-                disabled={isTemplateNameEmpty || fetchingCmsData || shouldDisableButtons || hasPersonalizationTokenError}
+                disabled={isTemplateNameEmpty || fetchingCmsData || shouldDisableButtons || hasPersonalizationTokenError || isContentInvalid}
               >
                 {getSaveButtonLabel()}
               </CapButton>
@@ -201,7 +203,7 @@ function SlideBoxFooter(props) {
                 <CapButton
                   type="secondary"
                   onClick={onTestAndPreview}
-                  disabled={shouldDisableButtons || hasPersonalizationTokenError}
+                  disabled={shouldDisableButtons || hasPersonalizationTokenError || isContentInvalid}
                   style={{ marginLeft: '8px' }}
                 >
                   <FormattedMessage {...messages.testAndPreview} />
@@ -272,6 +274,7 @@ SlideBoxFooter.propTypes = {
     id: PropTypes.string,
     defaultMessage: PropTypes.string,
   }),
+  isContentInvalid: PropTypes.bool,
 };
 
 SlideBoxFooter.defaultProps = {
@@ -300,5 +303,6 @@ SlideBoxFooter.defaultProps = {
   formData: [],
   hasPersonalizationTokenError: false,
   primarySaveButtonMessage: undefined,
+  isContentInvalid: false,
 };
 export default SlideBoxFooter;

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();
+  });
+});