@umituz/react-native-subscription 2.43.13 → 2.43.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.43.13",
+  "version": "2.43.16",
   "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/hooks/usePaywallOrchestrator.ts

@@ -18,6 +18,8 @@ export interface PaywallOrchestratorOptions {
   isLocalizationReady?: boolean;
   bestValueIdentifier?: string;
   creditsLabel?: string;
+  /** Disable manual navigation (used when paywall is rendered inline) */
+  disableNavigation?: boolean;
 }
 
 export function usePaywallOrchestrator({
@@ -30,6 +32,7 @@ export function usePaywallOrchestrator({
   isLocalizationReady = true,
   bestValueIdentifier = "yearly",
   creditsLabel,
+  disableNavigation = false,
 }: PaywallOrchestratorOptions) {
   const { isPremium, isSyncing, credits } = usePremiumStatus();
   const { packages } = usePremiumPackages();
@@ -67,6 +70,25 @@ export function usePaywallOrchestrator({
       if (hasNavigatedRef.current) return;
       hasNavigatedRef.current = true;
 
+      // Skip navigation if disabled (paywall rendered inline)
+      if (disableNavigation) {
+        if (__DEV__) {
+          console.log('[usePaywallOrchestrator] ⏭️ Skipping navigation (disableNavigation=true)', {
+            source: shouldShowPostOnboarding ? "onboarding" : "manual",
+          });
+        }
+
+        if (shouldShowPostOnboarding) {
+          markPaywallShown();
+        }
+
+        if (showPaywall) {
+          closePaywall();
+        }
+
+        return;
+      }
+
       if (__DEV__) console.log('[usePaywallOrchestrator] 🚀 Navigating to Paywall', {
         source: shouldShowPostOnboarding ? "onboarding" : "manual",
         packagesCount: packages.length
@@ -123,6 +145,7 @@ export function usePaywallOrchestrator({
     purchasePackage,
     restorePurchase,
     handleClose,
+    disableNavigation,
   ]);
 
   const completeOnboarding = useSubscriptionFlowStore((state) => state.completeOnboarding);

package/src/domains/subscription/presentation/components/ManagedSubscriptionFlow.tsx

@@ -5,11 +5,15 @@ import { SplashScreen, useSplashFlow } from "@umituz/react-native-design-system/
 import { OnboardingScreen } from "@umituz/react-native-design-system/onboarding";
 import { OfflineBanner } from "@umituz/react-native-design-system/offline";
 import { useAppDesignTokens } from "@umituz/react-native-design-system/theme";
+import { usePremiumStatus } from "../../presentation/usePremiumStatus";
+import { usePremiumPackages } from "../../presentation/usePremiumPackages";
+import { usePremiumActions } from "../../presentation/usePremiumActions";
 import { usePaywallOrchestrator } from "../../../paywall/hooks/usePaywallOrchestrator";
 import { PaywallFeedbackScreen } from "../../../subscription/presentation/components/feedback/PaywallFeedbackScreen";
 import { PaywallFeedbackTranslations } from "../../../subscription/presentation/components/feedback/PaywallFeedbackScreen.types";
 import { PaywallTranslations, PaywallLegalUrls, SubscriptionFeature } from "../../../paywall/entities/types";
 import { usePaywallFeedbackSubmit } from "../../../../presentation/hooks/feedback/useFeedbackSubmit";
+import { PaywallScreen } from "../../../paywall/components/PaywallScreen";
 
 export interface ManagedSubscriptionFlowProps {
   children: React.ReactNode;
@@ -70,9 +74,10 @@ export interface ManagedSubscriptionFlowProps {
  * 
  * Use this to reduce AppNavigator boilerplate to nearly zero.
  */
-import { 
-  SubscriptionFlowProvider, 
-  useSubscriptionFlowStatus 
+import {
+  SubscriptionFlowProvider,
+  useSubscriptionFlowStatus,
+  useSubscriptionFlowStore
 } from "../providers/SubscriptionFlowProvider";
 import { SubscriptionFlowStatus } from "../useSubscriptionFlow";
 
@@ -116,6 +121,7 @@ const ManagedSubscriptionFlowInner = React.memo<ManagedSubscriptionFlowProps>(({
     heroImage: paywall.heroImage,
     bestValueIdentifier: paywall.bestValueIdentifier,
     creditsLabel: paywall.creditsLabel,
+    disableNavigation: true, // Paywall is rendered inline, don't navigate
   });
 
   const { submit: internalSubmit } = usePaywallFeedbackSubmit();
@@ -174,6 +180,43 @@ const ManagedSubscriptionFlowInner = React.memo<ManagedSubscriptionFlowProps>(({
     );
   }
 
+  // 2.5. Post-Onboarding Paywall View
+  if (status === SubscriptionFlowStatus.POST_ONBOARDING_PAYWALL) {
+    if (__DEV__) {
+      console.log('[ManagedSubscriptionFlow] 💳 Rendering Post-Onboarding Paywall', {
+        hasPackages: flowState.showPostOnboardingPaywall
+      });
+    }
+
+    const PostOnboardingPaywall = () => {
+      const { isPremium, isSyncing, credits } = usePremiumStatus();
+      const { packages } = usePremiumPackages();
+      const { purchasePackage, restorePurchase } = usePremiumActions();
+      const { closePostOnboardingPaywall } = useSubscriptionFlowStore();
+
+      return (
+        <PaywallScreen
+          translations={paywall.translations}
+          legalUrls={paywall.legalUrls}
+          features={paywall.features}
+          bestValueIdentifier={paywall.bestValueIdentifier}
+          creditsLabel={paywall.creditsLabel}
+          heroImage={paywall.heroImage}
+          source="onboarding"
+          packages={packages}
+          isPremium={isPremium}
+          credits={credits}
+          isSyncing={isSyncing}
+          onPurchase={purchasePackage}
+          onRestore={restorePurchase}
+          onClose={closePostOnboardingPaywall}
+        />
+      );
+    };
+
+    return <PostOnboardingPaywall />;
+  }
+
   // 3. Application Content + Overlays
   return (
     <>