@capillarytech/creatives-library 8.0.200-alpha.0 → 8.0.200

package/constants/unified.js

@@ -44,6 +44,7 @@ export const REGISTRATION_CUSTOM_FIELD = 'Registration custom fields';
 export const GIFT_CARDS = 'GIFT_CARDS';
 export const PROMO_ENGINE = 'PROMO_ENGINE';
 export const LIQUID_SUPPORT = 'ENABLE_LIQUID_SUPPORT';
+export const ENABLE_NEW_MPUSH = 'ENABLE_NEW_MPUSH';
 export const CUSTOM_TAG = 'CustomTagMessage';
 export const CUSTOMER_EXTENDED_FIELD = 'Customer extended fields';
 export const EXTENDED_TAG = 'ExtendedTagMessage';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.200-alpha.0",
+  "version": "8.0.200",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/utils/common.js

@@ -21,7 +21,8 @@ import {
   EMAIL_UNSUBSCRIBE_TAG_MANDATORY,
   BADGES_ISSUE,
   ENABLE_WECHAT,
-  LIQUID_SUPPORT
+  LIQUID_SUPPORT,
+  ENABLE_NEW_MPUSH
 } from '../constants/unified';
 import { apiMessageFormatHandler } from './commonUtils';
 
@@ -125,6 +126,11 @@ export const isEmailUnsubscribeTagMandatory = Auth.hasFeatureAccess.bind(
   EMAIL_UNSUBSCRIBE_TAG_MANDATORY,
 );
 
+export const hasNewMobilePushFeatureEnabled = Auth.hasFeatureAccess.bind(
+  null,
+  ENABLE_NEW_MPUSH,
+);
+
 //filtering tags based on scope
 export const filterTags = (tagsToFilter, tagsList) => tagsList?.filter(
     (tag) => !tagsToFilter?.includes(tag?.definition?.value)

package/utils/createMobilePushPayload.js

@@ -62,33 +62,12 @@ const createMobilePushPayload = ({
     throw new Error(intl.formatMessage(messages.templateNameEmptyError));
   }
 
-  // Validate content - allow single platform if explicitly allowed
-  const allowSinglePlatform = options?.allowSinglePlatform || false;
-  
-  if (!allowSinglePlatform) {
-    // Normal validation: require all supported platforms to have content
-    if (isAndroidSupported && (!androidContent?.title || !androidContent?.message)) {
-      throw new Error(intl.formatMessage(messages.contentValidationError, { platform: 'Android' }));
-    }
-    if (isIosSupported && (!iosContent?.title || !iosContent?.message)) {
-      throw new Error(intl.formatMessage(messages.contentValidationError, { platform: 'iOS' }));
-    }
-  } else {
-    // Single platform mode: require at least one platform to have content
-    const hasAndroidContent = isAndroidSupported && androidContent?.title?.trim() && androidContent?.message?.trim();
-    const hasIosContent = isIosSupported && iosContent?.title?.trim() && iosContent?.message?.trim();
-    
-    if (!hasAndroidContent && !hasIosContent) {
-      throw new Error(intl.formatMessage(messages.singlePlatformContentMissing));
-    }
-    
-    // Validate individual platforms that are supported but have incomplete content
-    if (isAndroidSupported && !hasAndroidContent && androidContent) {
-      throw new Error(intl.formatMessage(messages.contentValidationError, { platform: 'Android' }));
-    }
-    if (isIosSupported && !hasIosContent && iosContent) {
-      throw new Error(intl.formatMessage(messages.contentValidationError, { platform: 'iOS' }));
-    }
+  // Validate content
+  if (isAndroidSupported && (!androidContent?.title || !androidContent?.message)) {
+    throw new Error(intl.formatMessage(messages.contentValidationError, { platform: 'Android' }));
+  }
+  if (isIosSupported && (!iosContent?.title || !iosContent?.message)) {
+    throw new Error(intl.formatMessage(messages.contentValidationError, { platform: 'iOS' }));
   }
 
   // Ensure imageSrc has the required properties

package/utils/tests/createMobilePushPayload.test.js

@@ -261,59 +261,6 @@ describe('createMobilePushPayload', () => {
         accountData: unsupportedAccountData,
       })).not.toThrow();
     });
-
-    // Single Platform Mode Tests
-    it('should allow single platform when allowSinglePlatform is true - Android only', () => {
-      expect(() => callWithIntl({
-        templateName: 'Test',
-        androidContent: { title: 'Title', message: 'Message' },
-        iosContent: null,
-        accountData: mockAccountData,
-        options: { allowSinglePlatform: true },
-      })).not.toThrow();
-    });
-
-    it('should allow single platform when allowSinglePlatform is true - iOS only', () => {
-      expect(() => callWithIntl({
-        templateName: 'Test',
-        androidContent: null,
-        iosContent: { title: 'Title', message: 'Message' },
-        accountData: mockAccountData,
-        options: { allowSinglePlatform: true },
-      })).not.toThrow();
-    });
-
-    it('should throw error when no platforms have content even with allowSinglePlatform', () => {
-      expect(() => callWithIntl({
-        templateName: 'Test',
-        androidContent: null,
-        iosContent: null,
-        accountData: mockAccountData,
-        options: { allowSinglePlatform: true },
-      })).toThrow(intl.formatMessage(messages.singlePlatformContentMissing));
-    });
-
-    it('should validate individual platforms in single platform mode - Android incomplete', () => {
-      // Test case where iOS has valid content but Android has incomplete content
-      expect(() => callWithIntl({
-        templateName: 'Test',
-        androidContent: { title: 'Valid Title' }, // Missing message property
-        iosContent: { title: 'Valid Title', message: 'Valid Message' }, // Complete content
-        accountData: mockAccountData,
-        options: { allowSinglePlatform: true },
-      })).toThrow(intl.formatMessage(messages.contentValidationError, { platform: 'Android' }));
-    });
-
-    it('should validate individual platforms in single platform mode - iOS incomplete', () => {
-      // Test case where Android has valid content but iOS has incomplete content
-      expect(() => callWithIntl({
-        templateName: 'Test',
-        androidContent: { title: 'Valid Title', message: 'Valid Message' }, // Complete content
-        iosContent: { title: 'Valid Title' }, // Missing message property
-        accountData: mockAccountData,
-        options: { allowSinglePlatform: true },
-      })).toThrow(intl.formatMessage(messages.contentValidationError, { platform: 'iOS' }));
-    });
   });
 
   // Account Data Validation Tests

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -668,7 +668,9 @@ export function SlideBoxContent(props) {
       />
         )}
       {isEditMPush && (
-        (!isFullMode && isLoyaltyModule) ? (
+        (isFullMode && !commonUtil.hasNewMobilePushFeatureEnabled()) || 
+        (!isFullMode && isLoyaltyModule) || 
+        (!isFullMode && !isLoyaltyModule && !commonUtil.hasNewMobilePushFeatureEnabled()) ? (
           <MobliPushEdit
             getFormLibraryData={getFormData}
             setIsLoadingContent={setIsLoadingContent}
@@ -724,7 +726,9 @@ export function SlideBoxContent(props) {
         )
       )}
       {isCreateMPush && (
-        (!isFullMode && isLoyaltyModule) ? (
+        (isFullMode && !commonUtil.hasNewMobilePushFeatureEnabled()) || 
+        (!isFullMode && isLoyaltyModule) || 
+        (!isFullMode && !isLoyaltyModule && !commonUtil.hasNewMobilePushFeatureEnabled()) ? (
           <MobilepushWrapper
             key="creatives-mobilepush-wrapper"
             date={new Date().getMilliseconds()}

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

@@ -700,139 +700,4 @@ describe('Test SlideBoxContent container', () => {
       expect(renderedComponent).toMatchSnapshot();
     });
   });
-
-  // Mobile Push Loyalty Module Tests
-  describe('Mobile Push with Loyalty Module', () => {
-    it('Should render MobliPushEdit for loyalty module in library mode (edit)', () => {
-      renderFunction('MOBILE_PUSH', 'editTemplate', { _id: 'test-id' }, { 
-        isFullMode: false, 
-        isLoyaltyModule: true 
-      });
-      expect(renderedComponent).toMatchSnapshot();
-    });
-
-    it('Should render MobilePushNew for loyalty module in full mode (edit)', () => {
-      renderFunction('MOBILE_PUSH', 'editTemplate', { _id: 'test-id' }, { 
-        isFullMode: true, 
-        isLoyaltyModule: true 
-      });
-      expect(renderedComponent).toMatchSnapshot();
-    });
-
-    it('Should render MobilepushWrapper for loyalty module in library mode (create)', () => {
-      renderFunction('MOBILE_PUSH', 'createTemplate', { mode: 'create' }, { 
-        isFullMode: false, 
-        isLoyaltyModule: true 
-      });
-      expect(renderedComponent).toMatchSnapshot();
-    });
-
-    it('Should render MobilePushNew for loyalty module in full mode (create)', () => {
-      renderFunction('MOBILE_PUSH', 'createTemplate', { mode: 'create' }, { 
-        isFullMode: true, 
-        isLoyaltyModule: true 
-      });
-      expect(renderedComponent).toMatchSnapshot();
-    });
-
-    it('Should render MobilePushNew for non-loyalty module in library mode (edit)', () => {
-      renderFunction('MOBILE_PUSH', 'editTemplate', { _id: 'test-id' }, { 
-        isFullMode: false, 
-        isLoyaltyModule: false 
-      });
-      expect(renderedComponent).toMatchSnapshot();
-    });
-
-    it('Should render MobilePushNew for non-loyalty module in library mode (create)', () => {
-      renderFunction('MOBILE_PUSH', 'createTemplate', { mode: 'create' }, { 
-        isFullMode: false, 
-        isLoyaltyModule: false 
-      });
-      expect(renderedComponent).toMatchSnapshot();
-    });
-  });
-
-  // Additional edge case tests to cover uncovered lines
-  describe('Edge Cases for Uncovered Lines', () => {
-    it('Should handle getLineType with LINE channel and empty templateData', () => {
-      // This should cover lines 72-74 in getLineType function
-      // LINE channel, not full mode, templateData exists but has no _id, no messageBody, and not isDefault
-      const emptyLineTemplateData = {
-        type: 'LINE',
-        isDefault: false,
-        // No _id and no versions.base.content.messages[0]
-      };
-      renderFunction('LINE', 'editTemplate', emptyLineTemplateData, { 
-        isFullMode: false 
-      });
-      expect(renderedComponent).toMatchSnapshot();
-    });
-
-    it('Should handle SMS channel with DLT content processing', () => {
-      // This should cover line 251 in SMS content processing
-      // Need isDltEnabled = true and updatedSmsEditor as array
-      // Mock hasTraiDltFeature to return true
-      const commonUtils = require('../../../utils/common');
-      const originalHasTraiDltFeature = commonUtils.hasTraiDltFeature;
-      commonUtils.hasTraiDltFeature = jest.fn(() => true);
-      
-      const smsTemplateData = {
-        type: 'SMS',
-        versions: {
-          base: {
-            'updated-sms-editor': ['Line 1', 'Line 2', 'Line 3'], // Array to trigger join()
-            'sms-editor': 'Fallback SMS content'
-          }
-        }
-      };
-      renderFunction('SMS', 'preview', smsTemplateData, { 
-        smsRegister: 'DLT', // Enable DLT for library mode
-        isFullMode: false
-      });
-      
-      // Restore original function
-      commonUtils.hasTraiDltFeature = originalHasTraiDltFeature;
-      expect(renderedComponent).toMatchSnapshot();
-    });
-
-    it('Should handle LINE channel with video content', () => {
-      // This should cover lines 314-315 for video detection
-      // Need a LINE message with video property but no text, previewImageUrl, selectedSticker, baseUrl, template, or contents
-      const lineTemplateDataWithVideo = {
-        type: 'LINE',
-        versions: {
-          base: {
-            content: {
-              messages: [{
-                video: {
-                  originalContentUrl: 'https://example.com/video.mp4',
-                  externalLink: {
-                    linkUri: 'https://example.com/link'
-                  }
-                }
-                // No text, previewImageUrl, selectedSticker, baseUrl, template, or contents
-              }]
-            }
-          }
-        }
-      };
-      renderFunction('LINE', 'preview', lineTemplateDataWithVideo);
-      expect(renderedComponent).toMatchSnapshot();
-    });
-
-    it('Should handle default case in getChannelPreviewContent', () => {
-      // This should cover line 395 - default case return
-      const unknownChannelData = {
-        versions: {
-          base: {
-            content: {
-              customField: 'custom content'
-            }
-          }
-        }
-      };
-      renderFunction('UNKNOWN_CHANNEL', 'preview', unknownChannelData);
-      expect(renderedComponent).toMatchSnapshot();
-    });
-  });
 });

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

@@ -1,138 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Test SlideBoxContent container Edge Cases for Uncovered Lines Should handle LINE channel with video content 1`] = `
-<SlideBoxContent__CreativesWrapper>
-  <InjectIntl(TemplatePreview)
-    channel="line"
-    charCounterEnabled={false}
-    content={
-      Array [
-        Object {
-          "actionUrl": "https://example.com/link",
-          "baseUrl": undefined,
-          "imageCarousel": Array [
-            Object {
-              "actionLabel": undefined,
-              "imageUrl": undefined,
-            },
-          ],
-          "messageContent": undefined,
-          "previewImageUrl": undefined,
-          "selectedSticker": Object {
-            "animatedStickerUrl": undefined,
-            "packageId": undefined,
-            "stickerId": undefined,
-            "stickerUrl": undefined,
-          },
-          "type": "image_carousel",
-          "video": "https://example.com/video.mp4",
-        },
-      ]
-    }
-    showCount={true}
-    templateData={
-      Object {
-        "type": "LINE",
-        "versions": Object {
-          "base": Object {
-            "content": Object {
-              "messages": Array [
-                Object {
-                  "video": Object {
-                    "externalLink": Object {
-                      "linkUri": "https://example.com/link",
-                    },
-                    "originalContentUrl": "https://example.com/video.mp4",
-                  },
-                },
-              ],
-            },
-          },
-        },
-      }
-    }
-    viberBrandName=""
-  />
-  <Connect(Connect(UserIsAuthenticated(InjectIntl(CreativesCommon))))
-    location={
-      Object {
-        "pathname": "/sms/edit",
-        "query": Object {
-          "isEditFromCampaigns": undefined,
-          "module": "library",
-          "type": "embedded",
-        },
-        "search": "",
-      }
-    }
-    onCreateComplete={[MockFunction]}
-    params={
-      Object {
-        "id": undefined,
-        "mode": undefined,
-      }
-    }
-    route={
-      Object {
-        "name": "edit_text",
-      }
-    }
-    templateData={
-      Object {
-        "type": "LINE",
-        "versions": Object {
-          "base": Object {
-            "content": Object {
-              "messages": Array [
-                Object {
-                  "video": Object {
-                    "externalLink": Object {
-                      "linkUri": "https://example.com/link",
-                    },
-                    "originalContentUrl": "https://example.com/video.mp4",
-                  },
-                },
-              ],
-            },
-          },
-        },
-      }
-    }
-  />
-</SlideBoxContent__CreativesWrapper>
-`;
-
-exports[`Test SlideBoxContent container Edge Cases for Uncovered Lines Should handle SMS channel with DLT content processing 1`] = `
-<SlideBoxContent__CreativesWrapper>
-  <InjectIntl(TemplatePreview)
-    channel="sms"
-    charCounterEnabled={true}
-    content="Fallback SMS content"
-    showCount={true}
-    templateData={
-      Object {
-        "type": "SMS",
-        "versions": Object {
-          "base": Object {
-            "sms-editor": "Fallback SMS content",
-            "updated-sms-editor": Array [
-              "Line 1",
-              "Line 2",
-              "Line 3",
-            ],
-          },
-        },
-      }
-    }
-    viberBrandName=""
-  />
-</SlideBoxContent__CreativesWrapper>
-`;
-
-exports[`Test SlideBoxContent container Edge Cases for Uncovered Lines Should handle default case in getChannelPreviewContent 1`] = `<SlideBoxContent__CreativesWrapper />`;
-
-exports[`Test SlideBoxContent container Edge Cases for Uncovered Lines Should handle getLineType with LINE channel and empty templateData 1`] = `<SlideBoxContent__CreativesWrapper />`;
-
 exports[`Test SlideBoxContent container Email component isTestAndPreviewMode IIFE Should handle isTestAndPreviewMode IIFE in Email edit mode with ID 1`] = `
 <SlideBoxContent__CreativesWrapper>
   <ForwardRef
@@ -335,18 +202,6 @@ exports[`Test SlideBoxContent container Email component isTestAndPreviewMode IIF
 </SlideBoxContent__CreativesWrapper>
 `;
 
-exports[`Test SlideBoxContent container Mobile Push with Loyalty Module Should render MobilePushNew for loyalty module in full mode (create) 1`] = `<SlideBoxContent__CreativesWrapper />`;
-
-exports[`Test SlideBoxContent container Mobile Push with Loyalty Module Should render MobilePushNew for loyalty module in full mode (edit) 1`] = `<SlideBoxContent__CreativesWrapper />`;
-
-exports[`Test SlideBoxContent container Mobile Push with Loyalty Module Should render MobilePushNew for non-loyalty module in library mode (create) 1`] = `<SlideBoxContent__CreativesWrapper />`;
-
-exports[`Test SlideBoxContent container Mobile Push with Loyalty Module Should render MobilePushNew for non-loyalty module in library mode (edit) 1`] = `<SlideBoxContent__CreativesWrapper />`;
-
-exports[`Test SlideBoxContent container Mobile Push with Loyalty Module Should render MobilepushWrapper for loyalty module in library mode (create) 1`] = `<SlideBoxContent__CreativesWrapper />`;
-
-exports[`Test SlideBoxContent container Mobile Push with Loyalty Module Should render MobliPushEdit for loyalty module in library mode (edit) 1`] = `<SlideBoxContent__CreativesWrapper />`;
-
 exports[`Test SlideBoxContent container Should handle isTestAndPreviewMode IIFE implementation correctly 1`] = `
 <SlideBoxContent__CreativesWrapper>
   <ForwardRef

package/v2Containers/MobilePushNew/index.js

@@ -21,7 +21,6 @@ import { intlShape } from "react-intl";
 import "./index.scss";
 import { GA } from "@capillarytech/cap-ui-utils";
 import CapNotification from "@capillarytech/cap-ui-library/CapNotification";
-import { CapModal } from "@capillarytech/cap-react-ui-library";
 import { DAEMON } from "@capillarytech/vulcan-react-sdk/utils/sagaInjectorTypes";
 import globalMessages from "../Cap/messages";
 import * as actions from "./actions";
@@ -530,9 +529,6 @@ const MobilePushNew = ({
     STANDARD_ERROR_MSG: {},
     LIQUID_ERROR_MSG: {},
   });
-  // Modal state for single platform confirmation
-  const [showModal, setShowModal] = useState(false);
-  const [modalContent, setModalContent] = useState({});
   const [androidContent, setAndroidContent] = useState(INITIAL_CONTENT);
 
   const [iosContent, setIosContent] = useState(INITIAL_CONTENT);
@@ -2134,93 +2130,39 @@ const MobilePushNew = ({
     return panes;
   }, [isAndroidSupported, isIosSupported, renderContentFields, formatMessage]);
 
-  // Save button disabled logic: require at least one platform to have data
-  const hasAndroidData = isAndroidSupported && androidContent?.title?.trim() && androidContent?.message?.trim();
-  const hasIosData = isIosSupported && iosContent?.title?.trim() && iosContent?.message?.trim();
-  const hasAnyPlatformData = hasAndroidData || hasIosData;
-
-  // Validation checks for save button
-  const carouselErrors = Object.values(carouselLinkErrors).some((error) => error !== null && error !== "");
-  const carouselValid = isCarouselDataValid();
-
+  // Save button disabled logic: only check enabled platforms
   const isSaveDisabled = (
-    !hasAnyPlatformData // At least one supported platform must have data
-    || (isFullMode && (!templateName || !templateName.trim())) // Template name required in full mode
-    || carouselErrors
-    || !carouselValid
+    (isAndroidSupported && (!androidContent?.title?.trim() || !androidContent?.message?.trim()))
+    || (isIosSupported && (!iosContent?.title?.trim() || !iosContent?.message?.trim()))
+    || templateNameError
+    || Object.values(carouselLinkErrors).some((error) => error !== null && error !== "")
+    || !isCarouselDataValid()
   );
 
-  // Modal handler functions
-  const setModalContentHandler = useCallback((type) => {
-    if (type === 'ios') {
-      const content = {
-        title: formatMessage(messages.alertMessage),
-        body: formatMessage(messages.iosTemplateNotConfigured),
-        type: 'confirm',
-        id: 'ios',
-      };
-      setModalContent(content);
-      setShowModal(true);
-    } else if (type === 'android') {
-      const content = {
-        title: formatMessage(messages.alertMessage),
-        body: formatMessage(messages.androidTemplateNotConfigured),
-        type: 'confirm',
-        id: 'android',
-      };
-      setModalContent(content);
-      setShowModal(true);
+  // Validation in handleSave: only show errors for enabled platforms
+  const handleSave = useCallback(() => {
+    if (isAndroidSupported && (!androidContent?.title?.trim() || !androidContent?.message?.trim())) {
+      CapNotification.error({
+        message: formatMessage(messages.androidValidationError),
+      });
+      if (onValidationFail) onValidationFail();
+      return;
     }
-  }, [formatMessage]);
-
-  const handleCancelModal = useCallback(() => {
-    setShowModal(false);
-    setModalContent({});
-  }, []);
-
-  // Internal save function with optional modal validation skip
-  const handleSaveInternal = useCallback((skipModalValidation = false) => {
-    // Check for single platform data and show modal confirmation (unless skipped)
-    if (!skipModalValidation) {
-      const androidHasData = androidContent?.title?.trim() && androidContent?.message?.trim();
-      const iosHasData = iosContent?.title?.trim() && iosContent?.message?.trim();
-
-      // If both platforms are supported but only one has data, show confirmation modal
-      if (isAndroidSupported && isIosSupported) {
-        if (androidHasData && !iosHasData) {
-          setModalContentHandler('ios'); // Show iOS not configured modal
-          return;
-        }
-        if (iosHasData && !androidHasData) {
-          setModalContentHandler('android'); // Show Android not configured modal
-          return;
-        }
-      }
+    if (isIosSupported && (!iosContent?.title?.trim() || !iosContent?.message?.trim())) {
+      CapNotification.error({
+        message: formatMessage(messages.iosValidationError),
+      });
+      if (onValidationFail) onValidationFail();
+      return;
     }
-
-    // Only validate platforms that have data or are required
-    // If user confirmed via modal, we allow single platform data
-    if (!skipModalValidation) {
-      // In normal flow, require data for all supported platforms
-      if (isAndroidSupported && (!androidContent?.title?.trim() || !androidContent?.message?.trim())) {
-        CapNotification.error({
-          message: formatMessage(messages.androidValidationError),
-        });
-        if (onValidationFail) onValidationFail();
-        return;
-      }
-      if (isIosSupported && (!iosContent?.title?.trim() || !iosContent?.message?.trim())) {
-        CapNotification.error({
-          message: formatMessage(messages.iosValidationError),
-        });
-        if (onValidationFail) onValidationFail();
-        return;
-      }
+    if (templateNameError) {
+      CapNotification.error({
+        message: formatMessage(messages.emptyTemplateErrorMessage),
+      });
+      return;
     }
-    // Note: In modal-confirmed flow (skipModalValidation = true), we skip platform validation
-    // since user has already confirmed they want to save with incomplete platform data
-
-    // Template name validation - only required in full mode
+    // Only require templateName in full mode
+    // Use ref to get the latest template name value for validation
     const currentTemplateName = templateNameRef.current || templateName;
     if (isFullMode && !currentTemplateName?.trim()) {
       CapNotification.error({
@@ -2385,8 +2327,6 @@ const MobilePushNew = ({
       }
 
       // Create payload with enabled platform content and intl
-      // In modal-confirmed flow, we may have intentionally missing platform data
-      const allowSinglePlatform = skipModalValidation;
       const payload = createMobilePushPayloadWithIntl({
         templateName: finalTemplateName,
         androidContent: isAndroidSupported ? processedAndroidContent : undefined,
@@ -2397,7 +2337,6 @@ const MobilePushNew = ({
         sameContent,
         options: {
           mode: params?.mode,
-          allowSinglePlatform,
         },
         intl,
       });
@@ -2577,68 +2516,6 @@ const MobilePushNew = ({
     isCarouselDataValid,
     isFullMode,
     templateId,
-    activeTab,
-    setModalContentHandler,
-  ]);
-
-  // Public save function (with modal validation)
-  const handleSave = useCallback(() => {
-    handleSaveInternal(false);
-  }, [handleSaveInternal]);
-
-  // Save function that skips single platform modal validation
-  const handleSaveWithoutModal = useCallback(() => {
-    handleSaveInternal(true);
-  }, [handleSaveInternal]);
-
-  const handleConfirmModal = useCallback(() => {
-    setShowModal(false);
-    setModalContent({});
-    // Proceed with save after modal confirmation - skip single platform validation
-    handleSaveWithoutModal();
-  }, [handleSaveWithoutModal]);
-
-  const liquidMiddleWare = useCallback(() => {
-    const onError = ({ standardErrors, liquidErrors }) => {
-      setErrorMessage((prev) => ({
-        STANDARD_ERROR_MSG: { ...prev.STANDARD_ERROR_MSG, ...standardErrors },
-        LIQUID_ERROR_MSG: { ...prev.LIQUID_ERROR_MSG, ...liquidErrors },
-      }));
-    };
-    const onSuccess = () => handleSave();
-
-    validateMobilePushContent([androidContent, iosContent], {
-      currentTab: activeTab === ANDROID ? 1 : 2,
-      onError,
-      onSuccess,
-      getLiquidTags: globalActionsProps.getLiquidTags,
-      formatMessage,
-      messages: formBuilderMessages,
-      tagLookupMap: metaEntities?.tagLookupMap || {},
-      eventContextTags: metaEntities?.eventContextTags || [],
-      isLiquidFlow: hasLiquidSupportFeature(),
-      forwardedTags: {},
-      skipTags: (tag) => {
-        const skipRegexes = [
-          /dynamic_expiry_date_after_\d+_days\.FORMAT_\d/,
-          /unsubscribe\(#[a-zA-Z\d]{6}\)/,
-          /Link_to_[a-zA-z]/,
-          /SURVEY.*\.TOKEN/,
-          /^[A-Za-z].*\([a-zA-Z\d]*\)/,
-        ];
-        return skipRegexes.some((regex) => regex.test(tag));
-      },
-      singleTab: getSingleTab(accountData),
-    });
-  }, [
-    androidContent,
-    iosContent,
-    activeTab,
-    globalActionsProps,
-    formatMessage,
-    metaEntities,
-    accountData,
-    handleSave,
   ]);
 
   // Helper to sync content between platforms
@@ -2670,9 +2547,7 @@ const MobilePushNew = ({
       setTemplateName(value);
       // Update ref to always have the latest value
       templateNameRef.current = value;
-      // Only set error if user has interacted and field is empty
-      // In full mode, template name is required only at save time, not during typing
-      const isInvalid = isFullMode && value.trim() === "";
+      const isInvalid = !value || value.trim() === "";
       setTemplateNameError(isInvalid);
       if (value && onEnterTemplateName) {
         onEnterTemplateName();
@@ -2680,7 +2555,7 @@ const MobilePushNew = ({
         onRemoveTemplateName();
       }
     },
-    [onEnterTemplateName, onRemoveTemplateName, isFullMode]
+    [onEnterTemplateName, onRemoveTemplateName]
   );
 
   // --- Only show template name input in full mode (not library/consumer mode) ---
@@ -2709,6 +2584,47 @@ const MobilePushNew = ({
     [isFullMode, formatMessage, templateName, onTemplateNameChange, templateNameError, params?.id]
   );
 
+  const liquidMiddleWare = useCallback(() => {
+    const onError = ({ standardErrors, liquidErrors }) => {
+      setErrorMessage((prev) => ({
+        STANDARD_ERROR_MSG: { ...prev.STANDARD_ERROR_MSG, ...standardErrors },
+        LIQUID_ERROR_MSG: { ...prev.LIQUID_ERROR_MSG, ...liquidErrors },
+      }));
+    };
+    const onSuccess = () => handleSave();
+
+    validateMobilePushContent([androidContent, iosContent], {
+      currentTab: activeTab === ANDROID ? 1 : 2,
+      onError,
+      onSuccess,
+      getLiquidTags: globalActionsProps.getLiquidTags,
+      formatMessage,
+      messages: formBuilderMessages,
+      tagLookupMap: metaEntities?.tagLookupMap || {},
+      eventContextTags: metaEntities?.eventContextTags || [],
+      isLiquidFlow: hasLiquidSupportFeature(),
+      forwardedTags: {},
+      skipTags: (tag) => {
+        const skipRegexes = [
+          /dynamic_expiry_date_after_\d+_days\.FORMAT_\d/,
+          /unsubscribe\(#[a-zA-Z\d]{6}\)/,
+          /Link_to_[a-zA-z]/,
+          /SURVEY.*\.TOKEN/,
+          /^[A-Za-z].*\([a-zA-Z\d]*\)/,
+        ];
+        return skipRegexes.some((regex) => regex.test(tag));
+      },
+      singleTab: getSingleTab(accountData),
+    });
+  }, [
+    androidContent,
+    iosContent,
+    activeTab,
+    globalActionsProps,
+    formatMessage,
+    metaEntities,
+    accountData,
+  ]);
 
   const isLiquidFlow = hasLiquidSupportFeature();
 
@@ -3029,24 +2945,6 @@ const MobilePushNew = ({
           />
         </CapColumn>
       </CapRow>
-
-      {/* Modal for single platform confirmation */}
-      <CapModal
-        visible={showModal}
-        title={modalContent.title}
-        onOk={handleConfirmModal}
-        onCancel={handleCancelModal}
-        footer={[
-          <CapButton key="cancel" onClick={handleCancelModal}>
-            No
-          </CapButton>,
-          <CapButton key="confirm" type="primary" onClick={handleConfirmModal}>
-            Yes
-          </CapButton>,
-        ]}
-      >
-        {modalContent.body}
-      </CapModal>
     </CapSpin>
   );
 };

package/v2Containers/MobilePushNew/messages.js

@@ -252,10 +252,6 @@ export default defineMessages({
     id: `${scope}.contentValidationError`,
     defaultMessage: '{platform} content must have title and message',
   },
-  singlePlatformContentMissing: {
-    id: `${scope}.singlePlatformContentMissing`,
-    defaultMessage: 'At least one platform must have title and message',
-  },
   // File validation error messages for useUpload.js
   fileSizeError: {
     id: `${scope}.fileSizeError`,
@@ -273,17 +269,4 @@ export default defineMessages({
     id: `${scope}.gifFileTypeError`,
     defaultMessage: 'Only GIF files are allowed',
   },
-  // Modal confirmation messages for single platform data
-  alertMessage: {
-    id: `${scope}.alertMessage`,
-    defaultMessage: 'Alert',
-  },
-  androidTemplateNotConfigured: {
-    id: `${scope}.androidTemplateNotConfigured`,
-    defaultMessage: 'Android template is not configured. Continue save?',
-  },
-  iosTemplateNotConfigured: {
-    id: `${scope}.iosTemplateNotConfigured`,
-    defaultMessage: 'IOS template is not configured, Save without IOS template',
-  },
 });

package/v2Containers/Templates/index.js

@@ -1357,16 +1357,19 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           break;
         }
         case MOBILE_PUSH:
-          const mpushData = get(template, 'versions.base', template);
-          const androidData = get(mpushData, 'ANDROID') || get(mpushData, 'androidContent');
-          const iosData = get(mpushData, 'IOS') || get(mpushData, 'iosContent');
-          let mpushListingData = androidData;
-          if (isEmpty(androidData) || !androidData?.title) {
-            mpushListingData = iosData;
-          };
-          const { title, message, expandableDetails: { style = '', image, carouselData = [], ctas = [], media = [] } = {} } = mpushListingData || {};
-          const {url = ''} = media?.[0] || {};
-          templateData.content = (
+          if (!commonUtil.hasNewMobilePushFeatureEnabled()) {
+            templateData.content = template;
+          } else {
+            const mpushData = get(template, 'versions.base', template);
+            const androidData = get(mpushData, 'ANDROID') || get(mpushData, 'androidContent');
+            const iosData = get(mpushData, 'IOS') || get(mpushData, 'iosContent');
+            let mpushListingData = androidData;
+            if (isEmpty(androidData) || !androidData?.title) {
+              mpushListingData = iosData;
+            };
+            const { title, message, expandableDetails: { style = '', image, carouselData = [], ctas = [], media = [] } = {} } = mpushListingData || {};
+            const {url = ''} = media?.[0] || {};
+            templateData.content = (
               <div className='mobilepush-container'>
                 <div className="app-header">
                   <div className="app-header-left">
@@ -1438,7 +1441,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
                 )}
               </div>
             );
-          templateData.isNewMobilePush = true;
+            templateData.isNewMobilePush = commonUtil.hasNewMobilePushFeatureEnabled();
+          }
           break;
         case INAPP:
           templateData.content = template;