@umituz/react-native-subscription 2.41.10 → 2.41.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.41.10",
+  "version": "2.41.12",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/domains/paywall/components/PaywallScreen.tsx

@@ -13,6 +13,7 @@ import {
   ListRenderItem,
   StatusBar,
 } from "react-native";
+import { useNavigation } from "@react-navigation/native";
 import { AtomicText, AtomicIcon, AtomicSpinner } from "@umituz/react-native-design-system/atoms";
 import { useSafeAreaInsets } from "@umituz/react-native-design-system/safe-area";
 import { useAppDesignTokens } from "@umituz/react-native-design-system/theme";
@@ -29,6 +30,8 @@ import {
 import { hasItems } from "../../../shared/utils/arrayUtils";
 
 export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) => {
+  const navigation = useNavigation();
+
   const {
     onClose,
     translations,
@@ -51,11 +54,20 @@ export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) =>
   const tokens = useAppDesignTokens();
   const insets = useSafeAreaInsets();
 
-  const { 
-    selectedPlanId, 
-    setSelectedPlanId, 
-    isProcessing, 
-    handlePurchase, 
+  // Default close handler using navigation
+  const handleClose = useCallback(() => {
+    if (onClose) {
+      onClose();
+    } else if (navigation.canGoBack()) {
+      navigation.goBack();
+    }
+  }, [onClose, navigation]);
+
+  const {
+    selectedPlanId,
+    setSelectedPlanId,
+    isProcessing,
+    handlePurchase,
     handleRestore,
     resetState
   } = usePaywallActions({
@@ -66,7 +78,7 @@ export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) =>
     onPurchaseSuccess,
     onPurchaseError,
     onAuthRequired,
-    onClose
+    onClose: handleClose
   });
 
   // Reset state when screen is closed to avoid lockups
@@ -235,7 +247,7 @@ export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) =>
         zIndex: 10,
       }}>
         <TouchableOpacity
-          onPress={onClose}
+          onPress={handleClose}
           style={[styles.closeBtn, { backgroundColor: tokens.colors.surfaceSecondary }]}
           activeOpacity={0.7}
         >

package/src/domains/paywall/components/PaywallScreen.types.ts

@@ -4,7 +4,7 @@ import type { SubscriptionFeature, PaywallTranslations, PaywallLegalUrls } from
 import type { PurchaseSource } from "../../subscription/core/SubscriptionConstants";
 
 export interface PaywallScreenProps {
-  onClose: () => void;
+  onClose?: () => void;
   translations: PaywallTranslations;
   packages?: PurchasesPackage[];
   features?: SubscriptionFeature[];

package/src/domains/paywall/hooks/usePaywallOrchestrator.ts

@@ -57,35 +57,6 @@ export function usePaywallOrchestrator({
   const purchasedRef = useRef(false);
   const hasNavigatedRef = useRef(false);
 
-  const handleClose = useCallback(async () => {
-    await closePostOnboardingPaywall();
-    closePaywall();
-
-    // Trigger feedback if user declined and isn't premium
-    if (!isPremium && !purchasedRef.current) {
-      setTimeout(() => setShowFeedback(true), 300);
-    }
-
-    purchasedRef.current = false;
-    hasNavigatedRef.current = false;
-
-    if (navigation.canGoBack()) {
-      navigation.goBack();
-    }
-  }, [closePostOnboardingPaywall, closePaywall, isPremium, navigation, setShowFeedback]);
-
-  const handleSuccess = useCallback(async () => {
-    purchasedRef.current = true;
-    await markPaywallShown();
-    await closePostOnboardingPaywall();
-
-    onPurchaseSuccess?.();
-
-    if (navigation.canGoBack()) {
-      navigation.goBack();
-    }
-  }, [markPaywallShown, closePostOnboardingPaywall, onPurchaseSuccess, navigation]);
-
   useEffect(() => {
     if (!isNavReady || !isLocalizationReady) return;
 
@@ -108,19 +79,14 @@ export function usePaywallOrchestrator({
       });
 
       navigation.navigate("PaywallScreen", {
-        onClose: handleClose,
         translations,
         legalUrls,
         features,
         bestValueIdentifier,
         creditsLabel,
-        onAuthRequired,
-        onPurchaseSuccess: handleSuccess,
         heroImage,
         source: shouldShowPostOnboarding ? "onboarding" : "manual",
         packages,
-        onPurchase: purchasePackage,
-        onRestore: restorePurchase,
       });
 
       if (shouldShowPostOnboarding) {
@@ -144,20 +110,15 @@ export function usePaywallOrchestrator({
     isPremium,
     showPaywall,
     navigation,
-    handleClose,
-    handleSuccess,
     translations,
     legalUrls,
     features,
     heroImage,
     packages,
-    purchasePackage,
-    restorePurchase,
     markPaywallShown,
     closePaywall,
     bestValueIdentifier,
     creditsLabel,
-    onAuthRequired
   ]);
 
   const completeOnboarding = useSubscriptionFlowStore((state) => state.completeOnboarding);