@umituz/react-native-subscription 2.41.11 → 2.41.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.41.11",
+  "version": "2.41.13",
   "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

@@ -14,6 +14,7 @@ import {
   StatusBar,
 } from "react-native";
 import { useNavigation } from "@react-navigation/native";
+import { usePremium } from "../../subscription/presentation/usePremium";
 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";
@@ -32,6 +33,9 @@ import { hasItems } from "../../../shared/utils/arrayUtils";
 export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) => {
   const navigation = useNavigation();
 
+  // Get purchase functions from usePremium as fallback
+  const { purchasePackage: premiumPurchase, restorePurchase: premiumRestore } = usePremium();
+
   const {
     onClose,
     translations,
@@ -54,6 +58,21 @@ export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) =>
   const tokens = useAppDesignTokens();
   const insets = useSafeAreaInsets();
 
+  // Use provided purchase functions or fall back to usePremium
+  const handlePurchasePackage = useCallback(async (pkg: any) => {
+    if (onPurchase) {
+      return await onPurchase(pkg);
+    }
+    return await premiumPurchase(pkg);
+  }, [onPurchase, premiumPurchase]);
+
+  const handleRestorePackages = useCallback(async () => {
+    if (onRestore) {
+      return await onRestore();
+    }
+    return await premiumRestore();
+  }, [onRestore, premiumRestore]);
+
   // Default close handler using navigation
   const handleClose = useCallback(() => {
     if (onClose) {
@@ -72,8 +91,8 @@ export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) =>
     resetState
   } = usePaywallActions({
     packages,
-    onPurchase,
-    onRestore,
+    onPurchase: handlePurchasePackage,
+    onRestore: handleRestorePackages,
     source,
     onPurchaseSuccess,
     onPurchaseError,
@@ -86,7 +105,7 @@ export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) =>
     return () => {
       resetState();
     };
-  }, [resetState]);
+  }, [resetState, handlePurchasePackage, handleRestorePackages]);
 
   // Auto-select first package
   useEffect(() => {

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,18 @@ 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,
+        onPurchaseSuccess,
+        onAuthRequired,
       });
 
       if (shouldShowPostOnboarding) {
@@ -144,8 +114,6 @@ export function usePaywallOrchestrator({
     isPremium,
     showPaywall,
     navigation,
-    handleClose,
-    handleSuccess,
     translations,
     legalUrls,
     features,
@@ -157,7 +125,8 @@ export function usePaywallOrchestrator({
     closePaywall,
     bestValueIdentifier,
     creditsLabel,
-    onAuthRequired
+    onPurchaseSuccess,
+    onAuthRequired,
   ]);
 
   const completeOnboarding = useSubscriptionFlowStore((state) => state.completeOnboarding);