@capillarytech/creatives-library 8.0.138 → 8.0.139-alpha.1

package/v2Containers/MobilePushNew/index.js

@@ -69,7 +69,6 @@ import {
   makeSelectUploadAssetSuccess,
   makeSelectCreateError,
   makeSelectGetTemplateDetailsInProgress,
-  makeSelectAssetUploading,
 } from "./selectors";
 import withCreatives from "../../hoc/withCreatives";
 import { BIG_TEXT, DEEP_LINK, DEVICE_SUPPORTED } from "../InApp/constants";
@@ -93,6 +92,403 @@ import messages from "./messages";
 import { EXTERNAL_URL } from "../CreativesContainer/constants";
 import createMobilePushPayloadWithIntl from "../../utils/createMobilePushPayload";
 
+// Helper function to extract deep link keys from URL where value equals key
+const extractDeepLinkKeys = (deepLinkValue) => {
+  try {
+    if (deepLinkValue?.includes('?')) {
+      const queryString = deepLinkValue.split('?')[1];
+      const searchParams = new URLSearchParams(queryString);
+      const extractedKeys = [];
+      searchParams.forEach((value, key) => {
+        if (value === key) { // Only extract keys where value equals key
+          extractedKeys.push(key);
+        }
+      });
+      return extractedKeys;
+    }
+    return [];
+  } catch (error) {
+    return [];
+  }
+};
+
+// Helper function to process media type from various sources
+const processMediaType = (contentType, expandableDetails) => {
+  const {
+    type: rootType = NONE,
+    mediaType: mediaTypeFromRoot = NONE,
+  } = contentType || {};
+
+  const {
+    style: expandableStyle = "",
+    media: expandableMedia = [],
+    mediaType: mediaTypeFromStyle = NONE,
+    carouselData: expandableCarouselData = [],
+  } = expandableDetails || {};
+
+  let mediaType = NONE;
+  let imageSrc = "";
+  let videoSrc = "";
+  let videoPreview = "";
+  let carouselData = [];
+
+  // First check expandableDetails.style
+  if (expandableStyle === BIG_PICTURE) {
+    mediaType = IMAGE;
+    imageSrc = expandableDetails?.image || contentType?.image;
+  } else if (expandableStyle === MANUAL_CAROUSEL || expandableStyle === AUTO_CAROUSEL || expandableStyle === FILMSTRIP_CAROUSEL || expandableStyle === CAROUSEL) {
+    mediaType = CAROUSEL;
+    // Extract carousel data from expandableDetails
+    carouselData = expandableCarouselData || [];
+  } else if (expandableStyle === BIG_TEXT) {
+    mediaType = NONE;
+  }
+
+  // Then check media array for video/GIF
+  if (expandableMedia?.length > 0) {
+    const mediaItem = expandableMedia[0];
+    const { type, url, videoPreviewUrl } = mediaItem || {};
+    if (type === VIDEO) {
+      // Check if it's actually a GIF
+      if (url && url.toLowerCase().includes('.gif')) {
+        mediaType = GIF;
+      } else {
+        mediaType = VIDEO;
+      }
+      videoSrc = url;
+      videoPreview = videoPreviewUrl || url;
+    } else if (type === GIF) {
+      mediaType = GIF;
+      videoSrc = url;
+      videoPreview = url;
+    }
+  }
+
+  // Check all possible media type sources
+  if (rootType === VIDEO || rootType === GIF || rootType === CAROUSEL) {
+    mediaType = rootType;
+    // If root type is CAROUSEL, also check for carousel data
+    if (rootType === CAROUSEL && expandableCarouselData?.length > 0) {
+      carouselData = expandableCarouselData;
+    }
+  }
+  if (mediaTypeFromRoot === VIDEO || mediaTypeFromRoot === GIF || mediaTypeFromRoot === CAROUSEL || mediaTypeFromRoot === IMAGE) {
+    mediaType = mediaTypeFromRoot;
+    // If mediaType from root is CAROUSEL, also check for carousel data
+    if (mediaTypeFromRoot === CAROUSEL && expandableCarouselData?.length > 0) {
+      carouselData = expandableCarouselData;
+    }
+  }
+  if (mediaTypeFromStyle === VIDEO || mediaTypeFromStyle === GIF || mediaTypeFromStyle === CAROUSEL || mediaTypeFromStyle === IMAGE) {
+    mediaType = mediaTypeFromStyle;
+    // If mediaType from style is CAROUSEL, also check for carousel data
+    if (mediaTypeFromStyle === CAROUSEL && expandableCarouselData?.length > 0) {
+      carouselData = expandableCarouselData;
+    }
+  }
+
+  return {
+    mediaType,
+    imageSrc,
+    videoSrc,
+    videoPreview,
+    carouselData,
+  };
+};
+
+// Helper function to process CTA buttons
+const processCtaButtons = (ctas, deepLink) => {
+  const buttons = ctas || [];
+  const ctaData = buttons.map((button, index) => {
+    // Use deep link keys from the button if available, otherwise try to extract from URL
+    let deepLinkKeys = button?.deepLinkKeys || [];
+    if (!deepLinkKeys.length && button?.type === DEEP_LINK && button?.actionLink) {
+      const extractedKeys = extractDeepLinkKeys(button?.actionLink);
+      if (extractedKeys?.length > 0) {
+        deepLinkKeys = extractedKeys;
+      }
+    }
+
+    return {
+      text: button?.actionText || "",
+      url: (() => {
+        const deepLinkValue = button?.actionLink || "";
+        if (deepLink?.length > 0 && deepLinkValue && button?.type === DEEP_LINK) {
+          const baseDeepLinkValue = deepLinkValue.split('?')[0];
+          const match = deepLink.find((link) => link.value === baseDeepLinkValue);
+          if (match) return match.value;
+        }
+        return deepLinkValue ? deepLinkValue.split('?')[0] : "";
+      })(),
+      urlType: button?.type || DEEP_LINK,
+      deepLinkKeys,
+      ctaType: index === 0 ? PRIMARY : SECONDARY,
+      isSaved: true,
+      index,
+    };
+  });
+
+  const hasPrimaryButton = buttons.some((button, index) => index === 0 && button?.actionText);
+  const hasSecondaryButton = buttons.some((button, index) => index === 1 && button?.actionText);
+
+  return {
+    ctaData,
+    hasPrimaryButton,
+    hasSecondaryButton,
+  };
+};
+
+// Helper function to create content data object
+const createContentData = (contentType, mediaInfo, buttons, deepLink, processCarouselDataForDeepLinks) => {
+  const {
+    mediaType,
+    imageSrc,
+    videoSrc,
+    videoPreview,
+    carouselData,
+  } = mediaInfo;
+  const { title, message } = contentType;
+  const { ctaData } = buttons;
+
+  // Create CTA condition variables
+  const hasVideoWithButtons = mediaType === VIDEO && ctaData?.length > 0;
+  const hasRootLevelCta = !!contentType?.cta;
+  const hasExternalUrlCta = contentType?.cta?.type === EXTERNAL_URL;
+  const hasDeepLinkCta = contentType?.cta?.type === DEEP_LINK;
+
+  // Determine actionOnClick and linkType
+  const actionOnClick = (() => {
+    // For video templates, prioritize CTA buttons over root level CTA
+    if (hasVideoWithButtons) {
+      return true;
+    }
+    // If there's a root level CTA, use it (for all media types including video)
+    if (hasRootLevelCta) {
+      return true;
+    }
+    // Otherwise, check carousel data
+    if (mediaType === CAROUSEL) {
+      const carouselLinkInfo = processCarouselDataForDeepLinks(carouselData);
+      return carouselLinkInfo.deepLinkValue || carouselLinkInfo.externalLinkValue;
+    }
+    return false;
+  })();
+
+  const linkType = (() => {
+    // For video templates, prioritize root-level CTA over expandable CTA buttons for notification body action
+    if (hasExternalUrlCta) {
+      return EXTERNAL_LINK;
+    }
+    if (hasDeepLinkCta) {
+      return DEEP_LINK;
+    }
+    if (hasVideoWithButtons) {
+      const firstButton = ctaData[0];
+      const result = firstButton?.type === EXTERNAL_URL ? EXTERNAL_LINK : DEEP_LINK;
+      return result;
+    }
+    if (mediaType === CAROUSEL) {
+      const carouselLinkInfo = processCarouselDataForDeepLinks(carouselData);
+      return carouselLinkInfo.externalLinkValue ? EXTERNAL_LINK : DEEP_LINK;
+    }
+    return DEEP_LINK;
+  })();
+
+  return {
+    title,
+    message,
+    mediaType,
+    imageSrc,
+    videoSrc,
+    videoPreview,
+    carouselData,
+    actionOnClick,
+    linkType,
+    deepLinkValue: (() => {
+      // For video templates with CTA buttons, use root level CTA for notification body action
+      if (hasVideoWithButtons && hasDeepLinkCta) {
+        const deepLinkValue = contentType?.cta?.actionLink;
+
+        if (deepLink?.length > 0 && deepLinkValue) {
+          const exactMatch = deepLink.find((link) => link.value === deepLinkValue);
+          if (exactMatch) {
+            return exactMatch.value;
+          }
+
+          const baseDeepLinkValue = deepLinkValue.split('?')[0];
+          const partialMatch = deepLink.find((link) => link.value === baseDeepLinkValue || link.value.split('?')[0] === baseDeepLinkValue);
+          if (partialMatch) {
+            return partialMatch.value;
+          }
+        }
+
+        return deepLinkValue ? deepLinkValue.split('?')[0] : "";
+      }
+      // For video templates with CTA buttons but no root level CTA, use first button
+      if (hasVideoWithButtons) {
+        const firstButton = ctaData[0];
+        if (firstButton?.type === DEEP_LINK && firstButton?.actionLink) {
+          const deepLinkValue = firstButton.actionLink;
+
+          if (deepLink?.length > 0 && deepLinkValue) {
+            const exactMatch = deepLink.find((link) => link.value === deepLinkValue);
+            if (exactMatch) {
+              return exactMatch.value;
+            }
+
+            const baseDeepLinkValue = deepLinkValue.split('?')[0];
+            const partialMatch = deepLink.find((link) => link.value === baseDeepLinkValue || link.value.split('?')[0] === baseDeepLinkValue);
+            if (partialMatch) {
+              return partialMatch.value;
+            }
+          }
+
+          return deepLinkValue ? deepLinkValue.split('?')[0] : "";
+        }
+        return "";
+      }
+      // For other cases, use root level CTA
+      if (hasDeepLinkCta) {
+        const deepLinkValue = contentType?.cta?.actionLink;
+
+        if (deepLink?.length > 0 && deepLinkValue) {
+          const exactMatch = deepLink.find((link) => link.value === deepLinkValue);
+          if (exactMatch) {
+            return exactMatch.value;
+          }
+
+          const baseDeepLinkValue = deepLinkValue.split('?')[0];
+          const partialMatch = deepLink.find((link) => link.value === baseDeepLinkValue || link.value.split('?')[0] === baseDeepLinkValue);
+          if (partialMatch) {
+            return partialMatch.value;
+          }
+        }
+
+        return deepLinkValue ? deepLinkValue.split('?')[0] : "";
+      }
+      if (mediaType === CAROUSEL) {
+        const carouselLinkInfo = processCarouselDataForDeepLinks(carouselData);
+        return carouselLinkInfo.deepLinkValue;
+      }
+      return "";
+    })(),
+    deepLinkKeysValue: (() => {
+      // For video templates with CTA buttons, use root level CTA for notification body action
+      if (hasVideoWithButtons && hasDeepLinkCta) {
+        const deepLinkValue = contentType?.cta?.actionLink;
+
+        if (deepLinkValue?.includes('?')) {
+          try {
+            const queryString = deepLinkValue.split('?')[1];
+            const searchParams = new URLSearchParams(queryString);
+            const extractedKeys = [];
+            searchParams.forEach((value, key) => {
+              if (value === key) {
+                extractedKeys.push(key);
+              }
+            });
+            return extractedKeys;
+          } catch (error) {
+            return [];
+          }
+        }
+        return [];
+      }
+      // For video templates with CTA buttons but no root level CTA, use first button
+      if (hasVideoWithButtons) {
+        const firstButton = ctaData[0];
+        if (firstButton?.type === DEEP_LINK && firstButton?.actionLink) {
+          const deepLinkValue = firstButton.actionLink;
+
+          if (deepLinkValue?.includes('?')) {
+            try {
+              const queryString = deepLinkValue.split('?')[1];
+              const searchParams = new URLSearchParams(queryString);
+              const extractedKeys = [];
+              searchParams.forEach((value, key) => {
+                if (value === key) {
+                  extractedKeys.push(key);
+                }
+              });
+              return extractedKeys;
+            } catch (error) {
+              return [];
+            }
+          }
+          return [];
+        }
+        return [];
+      }
+      // For other cases, use root level CTA
+      if (hasDeepLinkCta) {
+        const deepLinkValue = contentType?.cta?.actionLink;
+
+        if (deepLinkValue?.includes('?')) {
+          try {
+            const queryString = deepLinkValue.split('?')[1];
+            const searchParams = new URLSearchParams(queryString);
+            const extractedKeys = [];
+            searchParams.forEach((value, key) => {
+              if (value === key) {
+                extractedKeys.push(key);
+              }
+            });
+            return extractedKeys;
+          } catch (error) {
+            return [];
+          }
+        }
+        return [];
+      }
+      if (mediaType === CAROUSEL) {
+        const carouselLinkInfo = processCarouselDataForDeepLinks(carouselData);
+        return carouselLinkInfo.deepLinkKeysValue;
+      }
+      return [];
+    })(),
+    externalLinkValue: (() => {
+      // For video templates with CTA buttons, use root level CTA for notification body action
+      if (hasVideoWithButtons && hasExternalUrlCta) {
+        return contentType?.cta?.actionLink;
+      }
+      // For video templates with CTA buttons but no root level CTA, use first button
+      if (hasVideoWithButtons) {
+        const firstButton = ctaData[0];
+        if (firstButton?.type === EXTERNAL_URL) {
+          return firstButton?.actionLink || "";
+        }
+        return "";
+      }
+      // For other cases, use root level CTA
+      if (hasExternalUrlCta) {
+        return contentType?.cta?.actionLink;
+      }
+      if (mediaType === CAROUSEL) {
+        const carouselLinkInfo = processCarouselDataForDeepLinks(carouselData);
+        return carouselLinkInfo.externalLinkValue;
+      }
+      return "";
+    })(),
+  };
+};
+
+// Main helper function to process platform content
+const processPlatformContent = (contentType, expandableDetails, deepLink, processCarouselDataForDeepLinks, mainCta = null) => {
+  // Process media type
+  const mediaInfo = processMediaType(contentType, expandableDetails);
+
+  // Process CTA buttons
+  const buttons = processCtaButtons(expandableDetails?.ctas, deepLink);
+
+  // Create content data with main CTA
+  const contentData = createContentData({ ...contentType, cta: mainCta }, mediaInfo, buttons, deepLink, processCarouselDataForDeepLinks);
+  return {
+    mediaInfo,
+    buttons,
+    contentData,
+  };
+};
+
 const MobilePushNew = ({
   isFullMode,
   intl,
@@ -245,9 +641,6 @@ const MobilePushNew = ({
   // Ref to track if schema has been fetched to prevent duplicate calls
   const schemaFetched = useRef(false);
 
-  // Ref to track previous mode to detect mode changes
-  const prevModeRef = useRef({ id: params?.id, isFullMode });
-
   // Add URL validation state
   const [androidExternalLinkError, setAndroidExternalLinkError] = useState("");
   const [iosExternalLinkError, setIosExternalLinkError] = useState("");
@@ -523,7 +916,6 @@ const MobilePushNew = ({
         setActiveTab(isAndroidSupported ? ANDROID : IOS);
         setDeepLink(keys);
       } catch (error) {
-        console.error("[MobilePushNew] Error parsing deeplinks:", error, { deepLinkObj });
         setDeepLink([]);
       }
     } else {
@@ -575,112 +967,25 @@ const MobilePushNew = ({
           title: androidTitle = "",
           message: androidMessage = "",
           expandableDetails: androidExpandableDetails = {},
-          image: androidImage = "",
           cta: androidMainCta = null,
-          type: androidType = NONE, // Get the type from root level
         } = androidContentType || {};
 
-        const {
-          style: androidStyle = "",
-          ctas: androidCtas = [],
-          image: androidExpandableImage = "",
-          media: androidMedia = [],
-          carouselData: androidCarouselData = [],
-        } = androidExpandableDetails || {};
-
-        // Determine media type based on all available information
-        let androidMediaType = NONE;
-        let androidImageSrc = "";
-        let androidVideoSrc = "";
-        let androidVideoPreview = "";
-
-        // First check expandableDetails.style
-        if (androidStyle === BIG_PICTURE) {
-          androidMediaType = IMAGE;
-          androidImageSrc = androidExpandableImage || androidImage;
-        } else if (androidStyle === MANUAL_CAROUSEL || androidStyle === AUTO_CAROUSEL || androidStyle === FILMSTRIP_CAROUSEL || androidStyle === CAROUSEL) {
-          androidMediaType = CAROUSEL;
-        } else if (androidStyle === BIG_TEXT) {
-          androidMediaType = NONE;
-        }
-
-        // Then check media array for video/GIF
-        if (androidMedia?.length > 0) {
-          const mediaItem = androidMedia[0];
-          const { type, url, videoPreviewUrl } = mediaItem || {};
-          if (type === VIDEO) {
-            // Check if it's actually a GIF
-            if (url && url.toLowerCase().includes('.gif')) {
-              androidMediaType = GIF;
-            } else {
-              androidMediaType = VIDEO;
-            }
-            androidVideoSrc = url;
-            androidVideoPreview = videoPreviewUrl || url;
-          } else if (type === GIF) {
-            androidMediaType = GIF;
-            androidVideoSrc = url;
-            androidVideoPreview = url;
-          }
-        }
-
-        // Also check root level type
-        if (androidType === VIDEO || androidType === GIF || androidType === CAROUSEL) {
-          androidMediaType = androidType;
-        }
-
-        // Handle CTA data
-        const androidButtons = androidCtas || [];
-        if (androidButtons.length > 0) {
-          const ctaDataFromAndroid = androidButtons.map((button, index) => {
-            // Use deep link keys from the button if available, otherwise try to extract from URL
-            let deepLinkKeys = button?.deepLinkKeys || [];
-            if (!deepLinkKeys.length && button?.type === DEEP_LINK && button?.actionLink) {
-              try {
-                // Extract query parameters from deep link URL using the same approach as main content
-                const deepLinkValue = button?.actionLink;
-                if (deepLinkValue && deepLinkValue.includes('?')) {
-                  const queryString = deepLinkValue.split('?')[1];
-                  const searchParams = new URLSearchParams(queryString);
-                  const extractedKeys = [];
-                  searchParams.forEach((value, key) => {
-                    if (value === key) { // Only extract keys where value equals key
-                      extractedKeys.push(key);
-                    }
-                  });
-                  if (extractedKeys?.length > 0) {
-                    deepLinkKeys = extractedKeys;
-                  }
-                }
-              } catch (error) {
-                console.error("[MobilePushNew] Error extracting deep link keys from CTA button:", error);
-              }
-            }
+        // Use helper function to process Android content
+        const androidResult = processPlatformContent(
+          { ...androidContentType, title: androidTitle, message: androidMessage },
+          androidExpandableDetails,
+          deepLink,
+          processCarouselDataForDeepLinks,
+          androidMainCta
+        );
 
-            return {
-              text: button?.actionText || "",
-              url: (() => {
-                const deepLinkValue = button?.actionLink || "";
-                if (deepLink?.length > 0 && deepLinkValue && button?.type === DEEP_LINK) {
-                  const baseDeepLinkValue = deepLinkValue.split('?')[0];
-                  const match = deepLink.find((link) => link.value === baseDeepLinkValue);
-                  if (match) return match.value;
-                }
-                return deepLinkValue ? deepLinkValue.split('?')[0] : "";
-              })(),
-              urlType: button?.type || DEEP_LINK,
-              deepLinkKeys,
-              ctaType: index === 0 ? PRIMARY : SECONDARY,
-              isSaved: true,
-              index,
-            };
-          });
+        const { mediaInfo: androidMediaInfo, buttons: androidButtons, contentData: androidContentData } = androidResult;
+        const { imageSrc: androidImageSrc, videoSrc: androidVideoSrc, videoPreview: androidVideoPreview } = androidMediaInfo;
+        const { ctaData: ctaDataFromAndroid, hasPrimaryButton, hasSecondaryButton } = androidButtons;
 
+        if (ctaDataFromAndroid?.length > 0) {
           stateUpdates.push(() => setCtaDataAndroid(ctaDataFromAndroid));
 
-          const hasPrimaryButton = androidButtons.some((button, index) => index === 0 && button?.actionText);
-          const hasSecondaryButton = androidButtons.some((button, index) => index === 1 && button?.actionText);
-
           if (hasPrimaryButton) {
             stateUpdates.push(() => setPrimaryButtonAndroid(true));
           }
@@ -689,194 +994,8 @@ const MobilePushNew = ({
           }
         }
 
-        // Determine actionOnClick and linkType for Android - prioritize CTA buttons for video, root level CTA for others, carousel data as fallback
-        const androidActionOnClick = (() => {
-          // For video templates, prioritize CTA buttons over root level CTA
-          if (androidMediaType === VIDEO && androidButtons.length > 0) {
-            return true;
-          }
-          // If there's a root level CTA, use it
-          if (!!androidMainCta || !!androidContentType?.cta) {
-            return true;
-          }
-          // Otherwise, check carousel data
-          if (androidMediaType === CAROUSEL) {
-            const carouselLinkInfo = processCarouselDataForDeepLinks(androidCarouselData);
-            return carouselLinkInfo.deepLinkValue || carouselLinkInfo.externalLinkValue;
-          }
-          return false;
-        })();
-
-        const androidLinkType = (() => {
-          // For video templates, prioritize CTA buttons over root level CTA
-          if (androidMediaType === VIDEO && androidButtons.length > 0) {
-            const firstButton = androidButtons[0];
-            return firstButton?.type === EXTERNAL_URL ? EXTERNAL_LINK : DEEP_LINK;
-          }
-          // If there's a root level CTA, use its type
-          if (androidMainCta?.type === EXTERNAL_URL || androidContentType?.cta?.type === EXTERNAL_URL) {
-            return EXTERNAL_LINK;
-          }
-          if (androidMainCta?.type === DEEP_LINK || androidContentType?.cta?.type === DEEP_LINK) {
-            return DEEP_LINK;
-          }
-          // Otherwise, check carousel data
-          if (androidMediaType === CAROUSEL) {
-            const carouselLinkInfo = processCarouselDataForDeepLinks(androidCarouselData);
-            return carouselLinkInfo.externalLinkValue ? EXTERNAL_LINK : DEEP_LINK;
-          }
-          return DEEP_LINK;
-        })();
-
-        // Process Android content
-        const androidContentData = {
-          title: androidTitle,
-          message: androidMessage,
-          mediaType: androidMediaType,
-          imageSrc: androidImageSrc,
-          videoSrc: androidVideoSrc,
-          videoPreview: androidVideoPreview,
-          carouselData: androidCarouselData,
-          // Handle root level CTA or carousel data
-          actionOnClick: androidActionOnClick,
-          linkType: androidLinkType,
-          deepLinkValue: (() => {
-            // For video templates, prioritize CTA buttons over root level CTA
-            if (androidMediaType === VIDEO && androidButtons.length > 0) {
-              const firstButton = androidButtons[0];
-              if (firstButton?.type === DEEP_LINK && firstButton?.actionLink) {
-                const deepLinkValue = firstButton.actionLink;
-                
-                // If we have deep links available, find the matching one
-                if (deepLink?.length > 0 && deepLinkValue) {
-                  // Try to find exact match first
-                  const exactMatch = deepLink.find((link) => link.value === deepLinkValue);
-                  if (exactMatch) {
-                    return exactMatch.value;
-                  }
-
-                  // Try to find match without query params
-                  const baseDeepLinkValue = deepLinkValue.split('?')[0];
-                  const partialMatch = deepLink.find((link) => link.value === baseDeepLinkValue || link.value.split('?')[0] === baseDeepLinkValue);
-                  if (partialMatch) {
-                    return partialMatch.value;
-                  }
-                }
-
-                // If no match found, return the base URL without query parameters
-                return deepLinkValue ? deepLinkValue.split('?')[0] : "";
-              }
-              return "";
-            }
-            // If there's a root level CTA, use it
-            if (androidMainCta?.type === DEEP_LINK || androidContentType?.cta?.type === DEEP_LINK) {
-              const deepLinkValue = androidMainCta?.type === DEEP_LINK ? androidMainCta?.actionLink : androidContentType?.cta?.actionLink;
-              
-              // If we have deep links available, find the matching one
-              if (deepLink?.length > 0 && deepLinkValue) {
-                // Try to find exact match first
-                const exactMatch = deepLink.find((link) => link.value === deepLinkValue);
-                if (exactMatch) {
-                  return exactMatch.value;
-                }
-
-                // Try to find match without query params
-                const baseDeepLinkValue = deepLinkValue.split('?')[0];
-                const partialMatch = deepLink.find((link) => link.value === baseDeepLinkValue || link.value.split('?')[0] === baseDeepLinkValue);
-                if (partialMatch) {
-                  return partialMatch.value;
-                }
-              }
 
-              // If no match found, return the base URL without query parameters
-              return deepLinkValue ? deepLinkValue.split('?')[0] : "";
-            }
-            // Otherwise, check carousel data
-            if (androidMediaType === CAROUSEL) {
-              const carouselLinkInfo = processCarouselDataForDeepLinks(androidCarouselData);
-              return carouselLinkInfo.deepLinkValue;
-            }
-            return "";
-          })(),
-          deepLinkKeysValue: (() => {
-            // For video templates, prioritize CTA buttons over root level CTA
-            if (androidMediaType === VIDEO && androidButtons.length > 0) {
-              const firstButton = androidButtons[0];
-              if (firstButton?.type === DEEP_LINK && firstButton?.actionLink) {
-                const deepLinkValue = firstButton.actionLink;
-                
-                if (deepLinkValue && deepLinkValue.includes('?')) {
-                  try {
-                    // Extract query parameters from deep link URL
-                    const queryString = deepLinkValue.split('?')[1];
-                    const searchParams = new URLSearchParams(queryString);
-                    const extractedKeys = [];
-                    searchParams.forEach((value, key) => {
-                      if (value === key) { // Only extract keys where value equals key
-                        extractedKeys.push(key);
-                      }
-                    });
-                    return extractedKeys;
-                  } catch (error) {
-                    console.error("[MobilePushNew] Error extracting deep link keys:", error);
-                    return [];
-                  }
-                }
-                return [];
-              }
-              return [];
-            }
-            // If there's a root level CTA, extract keys from URL
-            if (androidMainCta?.type === DEEP_LINK || androidContentType?.cta?.type === DEEP_LINK) {
-              const deepLinkValue = androidMainCta?.type === DEEP_LINK ? androidMainCta?.actionLink : androidContentType?.cta?.actionLink;
-              
-              if (deepLinkValue && deepLinkValue.includes('?')) {
-                try {
-                  // Extract query parameters from deep link URL
-                  const queryString = deepLinkValue.split('?')[1];
-                  const searchParams = new URLSearchParams(queryString);
-                  const extractedKeys = [];
-                  searchParams.forEach((value, key) => {
-                    if (value === key) { // Only extract keys where value equals key
-                      extractedKeys.push(key);
-                    }
-                  });
-                  return extractedKeys;
-                } catch (error) {
-                  console.error("[MobilePushNew] Error extracting deep link keys:", error);
-                  return [];
-                }
-              }
-              return [];
-            }
-            // Otherwise, check carousel data
-            if (androidMediaType === CAROUSEL) {
-              const carouselLinkInfo = processCarouselDataForDeepLinks(androidCarouselData);
-              return carouselLinkInfo.deepLinkKeysValue;
-            }
-            return [];
-          })(),
-          externalLinkValue: (() => {
-            // For video templates, prioritize CTA buttons over root level CTA
-            if (androidMediaType === VIDEO && androidButtons.length > 0) {
-              const firstButton = androidButtons[0];
-              if (firstButton?.type === EXTERNAL_URL) {
-                return firstButton?.actionLink || "";
-              }
-              return "";
-            }
-            // If there's a root level CTA, use it
-            if (androidMainCta?.type === EXTERNAL_URL || androidContentType?.cta?.type === EXTERNAL_URL) {
-              return androidMainCta?.type === EXTERNAL_URL ? androidMainCta?.actionLink : androidContentType?.cta?.actionLink;
-            }
-            // Otherwise, check carousel data
-            if (androidMediaType === CAROUSEL) {
-              const carouselLinkInfo = processCarouselDataForDeepLinks(androidCarouselData);
-              return carouselLinkInfo.externalLinkValue;
-            }
-            return "";
-          })(),
-        };
+        // Use the processed content data from helper function
 
         stateUpdates.push(() => setAndroidContent(androidContentData));
 
@@ -899,254 +1018,34 @@ const MobilePushNew = ({
           title: iosTitle = "",
           message: iosMessage = "",
           expandableDetails: iosExpandableDetails = {},
-          image: iosImage = "",
           cta: iosMainCta = null,
-          type: iosType = NONE, // Get the type from root level
-          mediaType: iosMediaTypeFromRoot = NONE, // Also check mediaType from root
         } = iosContentType || {};
 
-        const {
-          style: iosStyle = "",
-          ctas: iosCtas = [],
-          image: iosExpandableImage = "",
-          media: iosMedia = [],
-          carouselData: iosCarouselData = [],
-          mediaType: iosMediaTypeFromStyle = NONE, // Also check mediaType from style
-        } = iosExpandableDetails || {};
-
-        // Determine media type based on all available information
-        let iosMediaType = NONE;
-        let iosImageSrc = "";
-        let iosVideoSrc = "";
-        let iosVideoPreview = "";
-
-        // First check expandableDetails.style
-        if (iosStyle === BIG_PICTURE) {
-          iosMediaType = IMAGE;
-          iosImageSrc = iosExpandableImage || iosImage;
-        } else if (iosStyle === MANUAL_CAROUSEL || iosStyle === AUTO_CAROUSEL || iosStyle === FILMSTRIP_CAROUSEL) {
-          iosMediaType = CAROUSEL;
-        } else if (iosStyle === BIG_TEXT) {
-          iosMediaType = NONE;
-        }
-
-        // Then check media array for video/GIF
-        if (iosMedia?.length > 0) {
-          const mediaItem = iosMedia[0];
-          const { type, url, videoPreviewUrl } = mediaItem || {};
-          if (type === VIDEO) {
-            // Check if it's actually a GIF
-            if (url && url.toLowerCase().includes('.gif')) {
-              iosMediaType = GIF;
-            } else {
-              iosMediaType = VIDEO;
-            }
-            iosVideoSrc = url;
-            iosVideoPreview = videoPreviewUrl || url;
-          } else if (type === GIF) {
-            iosMediaType = GIF;
-            iosVideoSrc = url;
-            iosVideoPreview = url;
-          }
-        }
-
-        // Check all possible media type sources
-        if (iosType === VIDEO || iosType === GIF || iosType === CAROUSEL) {
-          iosMediaType = iosType;
-        }
-        if (iosMediaTypeFromRoot === VIDEO || iosMediaTypeFromRoot === GIF || iosMediaTypeFromRoot === CAROUSEL || iosMediaTypeFromRoot === IMAGE) {
-          iosMediaType = iosMediaTypeFromRoot;
-        }
-        if (iosMediaTypeFromStyle === VIDEO || iosMediaTypeFromStyle === GIF || iosMediaTypeFromStyle === CAROUSEL || iosMediaTypeFromStyle === IMAGE) {
-          iosMediaType = iosMediaTypeFromStyle;
-        }
-
-        // Handle iOS CTA data
-        const iosButtons = iosCtas || [];
-        if (iosButtons.length > 0) {
-          const ctaDataFromIos = iosButtons.map((button, index) => {
-            // Use deep link keys from the button if available, otherwise try to extract from URL
-            let deepLinkKeys = button?.deepLinkKeys || [];
-            if (!deepLinkKeys?.length && button?.type === DEEP_LINK && button?.actionLink) {
-              try {
-                // Extract query parameters from deep link URL using the same approach as main content
-                const deepLinkValue = button?.actionLink;
-                if (deepLinkValue && deepLinkValue.includes('?')) {
-                  const queryString = deepLinkValue.split('?')[1];
-                  const searchParams = new URLSearchParams(queryString);
-                  const extractedKeys = [];
-                  searchParams.forEach((value, key) => {
-                    if (value === key) { // Only extract keys where value equals key
-                      extractedKeys.push(key);
-                    }
-                  });
-                  if (extractedKeys?.length > 0) {
-                    deepLinkKeys = extractedKeys;
-                  }
-                }
-              } catch (error) {
-                console.error("[MobilePushNew] Error extracting deep link keys from CTA button:", error);
-              }
-            }
+        // Use helper function to process iOS content
+        const iosResult = processPlatformContent(
+          { ...iosContentType, title: iosTitle, message: iosMessage },
+          iosExpandableDetails,
+          deepLink,
+          processCarouselDataForDeepLinks,
+          iosMainCta
+        );
 
-            return {
-              text: button?.actionText || "",
-              url: (() => {
-                const deepLinkValue = button?.actionLink || "";
-                if (deepLink?.length > 0 && deepLinkValue && button?.type === DEEP_LINK) {
-                  const baseDeepLinkValue = deepLinkValue.split('?')[0];
-                  const match = deepLink.find((link) => link.value === baseDeepLinkValue);
-                  if (match) return match.value;
-                }
-                return deepLinkValue ? deepLinkValue.split('?')[0] : "";
-              })(),
-              urlType: button?.type || DEEP_LINK,
-              deepLinkKeys,
-              ctaType: index === 0 ? PRIMARY : SECONDARY,
-              isSaved: true,
-              index,
-            };
-          });
+        const { mediaInfo: iosMediaInfo, buttons: iosButtons, contentData: iosContentData } = iosResult;
+        const { imageSrc: iosImageSrc, videoSrc: iosVideoSrc, videoPreview: iosVideoPreview } = iosMediaInfo;
+        const { ctaData: ctaDataFromIos, hasPrimaryButton: hasPrimaryButtonIos, hasSecondaryButton: hasSecondaryButtonIos } = iosButtons;
 
+        if (ctaDataFromIos.length > 0) {
           stateUpdates.push(() => setCtaDataIos(ctaDataFromIos));
 
-          const hasPrimaryButton = iosButtons.some((button, index) => index === 0 && button?.actionText);
-          const hasSecondaryButton = iosButtons.some((button, index) => index === 1 && button?.actionText);
-
-          if (hasPrimaryButton) {
+          if (hasPrimaryButtonIos) {
             stateUpdates.push(() => setPrimaryButtonIos(true));
           }
-          if (hasSecondaryButton) {
+          if (hasSecondaryButtonIos) {
             stateUpdates.push(() => setSecondaryButtonIos(true));
           }
         }
 
-        // Determine actionOnClick and linkType for iOS - prioritize CTA buttons for video, root level CTA for others, carousel data as fallback
-        const iosActionOnClick = (() => {
-          // For video templates, prioritize CTA buttons over root level CTA
-          if (iosMediaType === VIDEO && iosButtons.length > 0) {
-            return true;
-          }
-          // If there's a root level CTA, use it
-          if (!!iosMainCta || !!iosContentType?.cta) {
-            return true;
-          }
-          // Otherwise, check carousel data
-          if (iosMediaType === CAROUSEL) {
-            const iosCarouselLinkInfo = processCarouselDataForDeepLinks(iosCarouselData);
-            return iosCarouselLinkInfo.deepLinkValue || iosCarouselLinkInfo.externalLinkValue;
-          }
-          return false;
-        })();
-
-        const iosLinkType = (() => {
-          // For video templates, prioritize CTA buttons over root level CTA
-          if (iosMediaType === VIDEO && iosButtons.length > 0) {
-            const firstButton = iosButtons[0];
-            return firstButton?.type === EXTERNAL_URL ? EXTERNAL_LINK : DEEP_LINK;
-          }
-          // If there's a root level CTA, use its type
-          if (iosMainCta?.type === EXTERNAL_URL || iosContentType?.cta?.type === EXTERNAL_URL) {
-            return EXTERNAL_LINK;
-          }
-          if (iosMainCta?.type === DEEP_LINK || iosContentType?.cta?.type === DEEP_LINK) {
-            return DEEP_LINK;
-          }
-          // Otherwise, check carousel data
-          if (iosMediaType === CAROUSEL) {
-            const iosCarouselLinkInfo = processCarouselDataForDeepLinks(iosCarouselData);
-            return iosCarouselLinkInfo.externalLinkValue ? EXTERNAL_LINK : DEEP_LINK;
-          }
-          return DEEP_LINK;
-        })();
-
-        // iOS content
-        const iosContentData = {
-          title: iosTitle,
-          message: iosMessage,
-          mediaType: iosMediaType,
-          imageSrc: iosImageSrc,
-          videoSrc: iosVideoSrc,
-          videoPreview: iosVideoPreview,
-          carouselData: iosCarouselData,
-          // Handle root level CTA or carousel data
-          actionOnClick: iosActionOnClick,
-          linkType: iosLinkType,
-          deepLinkValue: (() => {
-            // If there's a root level CTA, use it
-            if (iosMainCta?.type === DEEP_LINK || iosContentType?.cta?.type === DEEP_LINK) {
-              const deepLinkValue = iosMainCta?.type === DEEP_LINK ? iosMainCta?.actionLink : iosContentType?.cta?.actionLink;
-              
-              // If we have deep links available, find the matching one
-              if (deepLink?.length > 0 && deepLinkValue) {
-                // Try to find exact match first
-                const exactMatch = deepLink.find((link) => link.value === deepLinkValue);
-                if (exactMatch) {
-                  return exactMatch.value;
-                }
-
-                // Try to find match without query params
-                const baseDeepLinkValue = deepLinkValue.split('?')[0];
-                const partialMatch = deepLink.find((link) => link.value === baseDeepLinkValue || link.value.split('?')[0] === baseDeepLinkValue);
-                if (partialMatch) {
-                  return partialMatch.value;
-                }
-              }
-
-              // If no match found, return the base URL without query parameters
-              return deepLinkValue ? deepLinkValue.split('?')[0] : "";
-            }
-            // Otherwise, check carousel data
-            if (iosMediaType === CAROUSEL) {
-              const iosCarouselLinkInfo = processCarouselDataForDeepLinks(iosCarouselData);
-              return iosCarouselLinkInfo.deepLinkValue;
-            }
-            return "";
-          })(),
-          deepLinkKeysValue: (() => {
-            // If there's a root level CTA, extract keys from URL
-            if (iosMainCta?.type === DEEP_LINK || iosContentType?.cta?.type === DEEP_LINK) {
-              const deepLinkValue = iosMainCta?.type === DEEP_LINK ? iosMainCta?.actionLink : iosContentType?.cta?.actionLink;
-              
-              if (deepLinkValue && deepLinkValue.includes('?')) {
-                try {
-                  // Extract query parameters from deep link URL
-                  const queryString = deepLinkValue.split('?')[1];
-                  const searchParams = new URLSearchParams(queryString);
-                  const extractedKeys = [];
-                  searchParams.forEach((value, key) => {
-                    if (value === key) { // Only extract keys where value equals key
-                      extractedKeys.push(key);
-                    }
-                  });
-                  return extractedKeys;
-                } catch (error) {
-                  console.error("[MobilePushNew] Error extracting deep link keys:", error);
-                  return [];
-                }
-              }
-              return [];
-            }
-            // Otherwise, check carousel data
-            if (iosMediaType === CAROUSEL) {
-              const iosCarouselLinkInfo = processCarouselDataForDeepLinks(iosCarouselData);
-              return iosCarouselLinkInfo.deepLinkKeysValue;
-            }
-            return [];
-          })(),
-          externalLinkValue: (() => {
-            // If there's a root level CTA, use it
-            if (iosMainCta?.type === EXTERNAL_URL || iosContentType?.cta?.type === EXTERNAL_URL) {
-              return iosMainCta?.type === EXTERNAL_URL ? iosMainCta?.actionLink : iosContentType?.cta?.actionLink;
-            }
-            // Otherwise, check carousel data
-            if (iosMediaType === CAROUSEL) {
-              const iosCarouselLinkInfo = processCarouselDataForDeepLinks(iosCarouselData);
-              return iosCarouselLinkInfo.externalLinkValue;
-            }
-            return "";
-          })(),
-        };
+        // Use the processed content data from helper function
 
         stateUpdates.push(() => setIosContent(iosContentData));
 
@@ -1259,29 +1158,18 @@ const MobilePushNew = ({
 
       // Handle CTA data
       const androidButtons = androidCtas || [];
+      const hasVideoWithButtons = androidMediaType === VIDEO && androidButtons?.length > 0;
+      const hasRootLevelCta = !!androidMainCta || !!androidContentType?.cta;
+      const hasExternalUrlCta = androidMainCta?.type === EXTERNAL_URL || androidContentType?.cta?.type === EXTERNAL_URL;
+      const hasDeepLinkCta = androidMainCta?.type === DEEP_LINK || androidContentType?.cta?.type === DEEP_LINK;
       if (androidButtons.length > 0) {
         const ctaDataFromAndroid = androidButtons.map((button, index) => {
           // Use deep link keys from the button if available, otherwise try to extract from URL
           let deepLinkKeys = button?.deepLinkKeys || [];
           if (!deepLinkKeys.length && button?.type === DEEP_LINK && button?.actionLink) {
-            try {
-              // Extract query parameters from deep link URL using the same approach as main content
-              const deepLinkValue = button?.actionLink;
-              if (deepLinkValue && deepLinkValue.includes('?')) {
-                const queryString = deepLinkValue.split('?')[1];
-                const searchParams = new URLSearchParams(queryString);
-                const extractedKeys = [];
-                searchParams.forEach((value, key) => {
-                  if (value === key) { // Only extract keys where value equals key
-                    extractedKeys.push(key);
-                  }
-                });
-                if (extractedKeys?.length > 0) {
-                  deepLinkKeys = extractedKeys;
-                }
-              }
-            } catch (error) {
-              console.error("[MobilePushNew] Error extracting deep link keys from CTA button:", error);
+            const extractedKeys = extractDeepLinkKeys(button?.actionLink);
+            if (extractedKeys?.length > 0) {
+              deepLinkKeys = extractedKeys;
             }
           }
 
@@ -1320,11 +1208,11 @@ const MobilePushNew = ({
       // Determine actionOnClick and linkType for Android - prioritize CTA buttons for video, root level CTA for others, carousel data as fallback
       const androidActionOnClick = (() => {
         // For video templates, prioritize CTA buttons over root level CTA
-        if (androidMediaType === VIDEO && androidButtons.length > 0) {
+        if (hasVideoWithButtons) {
           return true;
         }
         // If there's a root level CTA, use it
-        if (!!androidMainCta || !!androidContentType?.cta) {
+        if (hasRootLevelCta) {
           return true;
         }
         // Otherwise, check carousel data
@@ -1337,15 +1225,15 @@ const MobilePushNew = ({
 
       const androidLinkType = (() => {
         // For video templates, prioritize CTA buttons over root level CTA
-        if (androidMediaType === VIDEO && androidButtons.length > 0) {
+        if (hasVideoWithButtons) {
           const firstButton = androidButtons[0];
           return firstButton?.type === EXTERNAL_URL ? EXTERNAL_LINK : DEEP_LINK;
         }
         // If there's a root level CTA, use its type
-        if (androidMainCta?.type === EXTERNAL_URL || androidContentType?.cta?.type === EXTERNAL_URL) {
+        if (hasExternalUrlCta) {
           return EXTERNAL_LINK;
         }
-        if (androidMainCta?.type === DEEP_LINK || androidContentType?.cta?.type === DEEP_LINK) {
+        if (hasDeepLinkCta) {
           return DEEP_LINK;
         }
         // Otherwise, check carousel data
@@ -1370,11 +1258,11 @@ const MobilePushNew = ({
         linkType: androidLinkType,
         deepLinkValue: (() => {
           // For video templates, prioritize CTA buttons over root level CTA
-          if (androidMediaType === VIDEO && androidButtons.length > 0) {
+          if (hasVideoWithButtons) {
             const firstButton = androidButtons[0];
             if (firstButton?.type === DEEP_LINK && firstButton?.actionLink) {
               const deepLinkValue = firstButton.actionLink;
-              
+
               // If we have deep links available, find the matching one
               if (deepLink?.length > 0 && deepLinkValue) {
                 // Try to find exact match first
@@ -1397,9 +1285,9 @@ const MobilePushNew = ({
             return "";
           }
           // If there's a root level CTA, use it
-          if (androidMainCta?.type === DEEP_LINK || androidContentType?.cta?.type === DEEP_LINK) {
+          if (hasDeepLinkCta) {
             const deepLinkValue = androidMainCta?.type === DEEP_LINK ? androidMainCta?.actionLink : androidContentType?.cta?.actionLink;
-            
+
             // If we have deep links available, find the matching one
             if (deepLink?.length > 0 && deepLinkValue) {
               // Try to find exact match first
@@ -1428,12 +1316,12 @@ const MobilePushNew = ({
         })(),
         deepLinkKeysValue: (() => {
           // For video templates, prioritize CTA buttons over root level CTA
-          if (androidMediaType === VIDEO && androidButtons.length > 0) {
+          if (hasVideoWithButtons) {
             const firstButton = androidButtons[0];
             if (firstButton?.type === DEEP_LINK && firstButton?.actionLink) {
               const deepLinkValue = firstButton.actionLink;
-              
-              if (deepLinkValue && deepLinkValue.includes('?')) {
+
+              if (deepLinkValue?.includes('?')) {
                 try {
                   // Extract query parameters from deep link URL
                   const queryString = deepLinkValue.split('?')[1];
@@ -1446,7 +1334,6 @@ const MobilePushNew = ({
                   });
                   return extractedKeys;
                 } catch (error) {
-                  console.error("[MobilePushNew] Error extracting deep link keys:", error);
                   return [];
                 }
               }
@@ -1455,10 +1342,10 @@ const MobilePushNew = ({
             return [];
           }
           // If there's a root level CTA, extract keys from URL
-          if (androidMainCta?.type === DEEP_LINK || androidContentType?.cta?.type === DEEP_LINK) {
+          if (hasDeepLinkCta) {
             const deepLinkValue = androidMainCta?.type === DEEP_LINK ? androidMainCta?.actionLink : androidContentType?.cta?.actionLink;
-            
-            if (deepLinkValue && deepLinkValue.includes('?')) {
+
+            if (deepLinkValue?.includes('?')) {
               try {
                 // Extract query parameters from deep link URL
                 const queryString = deepLinkValue.split('?')[1];
@@ -1471,7 +1358,6 @@ const MobilePushNew = ({
                 });
                 return extractedKeys;
               } catch (error) {
-                console.error("[MobilePushNew] Error extracting deep link keys:", error);
                 return [];
               }
             }
@@ -1486,7 +1372,7 @@ const MobilePushNew = ({
         })(),
         externalLinkValue: (() => {
           // For video templates, prioritize CTA buttons over root level CTA
-          if (androidMediaType === VIDEO && androidButtons.length > 0) {
+          if (hasVideoWithButtons) {
             const firstButton = androidButtons[0];
             if (firstButton?.type === EXTERNAL_URL) {
               return firstButton?.actionLink || "";
@@ -1494,7 +1380,7 @@ const MobilePushNew = ({
             return "";
           }
           // If there's a root level CTA, use it
-          if (androidMainCta?.type === EXTERNAL_URL || androidContentType?.cta?.type === EXTERNAL_URL) {
+          if (hasExternalUrlCta) {
             return androidMainCta?.type === EXTERNAL_URL ? androidMainCta?.actionLink : androidContentType?.cta?.actionLink;
           }
           // Otherwise, check carousel data
@@ -1596,24 +1482,9 @@ const MobilePushNew = ({
           // Use deep link keys from the button if available, otherwise try to extract from URL
           let deepLinkKeys = button?.deepLinkKeys || [];
           if (!deepLinkKeys?.length && button?.type === DEEP_LINK && button?.actionLink) {
-            try {
-              // Extract query parameters from deep link URL using the same approach as main content
-              const deepLinkValue = button?.actionLink;
-              if (deepLinkValue && deepLinkValue.includes('?')) {
-                const queryString = deepLinkValue.split('?')[1];
-                const searchParams = new URLSearchParams(queryString);
-                const extractedKeys = [];
-                searchParams.forEach((value, key) => {
-                  if (value === key) { // Only extract keys where value equals key
-                    extractedKeys.push(key);
-                  }
-                });
-                if (extractedKeys?.length > 0) {
-                  deepLinkKeys = extractedKeys;
-                }
-              }
-            } catch (error) {
-              console.error("[MobilePushNew] Error extracting deep link keys from CTA button:", error);
+            const extractedKeys = extractDeepLinkKeys(button?.actionLink);
+            if (extractedKeys?.length > 0) {
+              deepLinkKeys = extractedKeys;
             }
           }
 
@@ -1706,7 +1577,7 @@ const MobilePushNew = ({
             const firstButton = iosButtons[0];
             if (firstButton?.type === DEEP_LINK && firstButton?.actionLink) {
               const deepLinkValue = firstButton.actionLink;
-              
+
               // If we have deep links available, find the matching one
               if (deepLink?.length > 0 && deepLinkValue) {
                 // Try to find exact match first
@@ -1731,7 +1602,7 @@ const MobilePushNew = ({
           // If there's a root level CTA, use it
           if (iosMainCta?.type === DEEP_LINK || iosContentType?.cta?.type === DEEP_LINK) {
             const deepLinkValue = iosMainCta?.type === DEEP_LINK ? iosMainCta?.actionLink : iosContentType?.cta?.actionLink;
-            
+
             // If we have deep links available, find the matching one
             if (deepLink?.length > 0 && deepLinkValue) {
               // Try to find exact match first
@@ -1764,8 +1635,8 @@ const MobilePushNew = ({
             const firstButton = iosButtons[0];
             if (firstButton?.type === DEEP_LINK && firstButton?.actionLink) {
               const deepLinkValue = firstButton.actionLink;
-              
-              if (deepLinkValue && deepLinkValue.includes('?')) {
+
+              if (deepLinkValue?.includes('?')) {
                 try {
                   // Extract query parameters from deep link URL
                   const queryString = deepLinkValue.split('?')[1];
@@ -1778,7 +1649,6 @@ const MobilePushNew = ({
                   });
                   return extractedKeys;
                 } catch (error) {
-                  console.error("[MobilePushNew] Error extracting deep link keys:", error);
                   return [];
                 }
               }
@@ -1789,8 +1659,8 @@ const MobilePushNew = ({
           // If there's a root level CTA, extract keys from URL
           if (iosMainCta?.type === DEEP_LINK || iosContentType?.cta?.type === DEEP_LINK) {
             const deepLinkValue = iosMainCta?.type === DEEP_LINK ? iosMainCta?.actionLink : iosContentType?.cta?.actionLink;
-            
-            if (deepLinkValue && deepLinkValue.includes('?')) {
+
+            if (deepLinkValue?.includes('?')) {
               try {
                 // Extract query parameters from deep link URL
                 const queryString = deepLinkValue.split('?')[1];
@@ -1803,7 +1673,6 @@ const MobilePushNew = ({
                 });
                 return extractedKeys;
               } catch (error) {
-                console.error("[MobilePushNew] Error extracting deep link keys:", error);
                 return [];
               }
             }
@@ -3146,7 +3015,6 @@ const mapStateToProps = createStructuredSelector({
   uploadedAssetData0: makeSelectUploadedAssetData0(),
   uploadedAssetData1: makeSelectUploadedAssetData1(),
   uploadAssetSuccess: makeSelectUploadAssetSuccess(),
-  assetUploading: makeSelectAssetUploading(),
   fetchingLiquidValidation: selectLiquidStateDetails(),
   createTemplateError: makeSelectCreateError(),
   supportedTags: () => [],