@umituz/react-native-subscription 2.17.11 → 2.18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.17.11",
+  "version": "2.18.0",
   "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/PaywallContainer.tsx

@@ -13,17 +13,19 @@ import { usePaywallActions } from "../hooks/usePaywallActions";
 import type { PaywallContainerProps } from "./PaywallContainer.types";
 
 export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
-  const { userId, isAnonymous = false, translations, mode = "subscription", legalUrls, features, heroImage, bestValueIdentifier, creditsLabel, creditAmounts, packageFilterConfig, source = "inApp", onPurchaseSuccess, onPurchaseError, onAuthRequired, visible, onClose } = props;
+  const { userId, isAnonymous = false, translations, mode = "subscription", legalUrls, features, heroImage, bestValueIdentifier, creditsLabel, creditAmounts, packageFilterConfig, source, onPurchaseSuccess, onPurchaseError, onAuthRequired, visible, onClose } = props;
 
-  const { showPaywall, closePaywall } = usePaywallVisibility();
+  const { showPaywall, closePaywall, currentSource } = usePaywallVisibility();
   const isVisible = visible ?? showPaywall;
   const handleClose = onClose ?? closePaywall;
 
+  const purchaseSource = source ?? currentSource ?? "settings";
+
   const { data: allPackages = [], isLoading } = useSubscriptionPackages(userId ?? undefined);
   const { handlePurchase, handleRestore } = usePaywallActions({
     userId: userId ?? undefined,
     isAnonymous,
-    source,
+    source: purchaseSource,
     onPurchaseSuccess,
     onPurchaseError,
     onAuthRequired,

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

@@ -6,6 +6,7 @@
 import type { ImageSourcePropType } from "react-native";
 import type { PaywallMode, PaywallTranslations, PaywallLegalUrls, SubscriptionFeature } from "../entities";
 import type { PackageFilterConfig } from "../../../utils/packageFilter";
+import type { PurchaseSource } from "../../../domain/entities/Credits";
 
 export interface PaywallContainerProps {
   /** User ID for subscription management */
@@ -31,7 +32,7 @@ export interface PaywallContainerProps {
   /** Custom filter config for package categorization */
   readonly packageFilterConfig?: PackageFilterConfig;
   /** Source of the paywall - affects pending purchase handling */
-  readonly source?: "postOnboarding" | "inApp";
+  readonly source?: PurchaseSource;
   /** Callback when purchase succeeds */
   readonly onPurchaseSuccess?: () => void;
   /** Callback when purchase fails */

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

@@ -1,14 +1,15 @@
 import { useCallback } from "react";
 import type { PurchasesPackage } from "react-native-purchases";
-import { usePurchasePackage } from "../../../revenuecat/presentation/hooks/usePurchasePackage";
 import { useRestorePurchase } from "../../../revenuecat/presentation/hooks/useRestorePurchase";
+import { useAuthAwarePurchase } from "../../../presentation/hooks/useAuthAwarePurchase";
+import type { PurchaseSource } from "../../../domain/entities/Credits";
 
 declare const __DEV__: boolean;
 
 interface UsePaywallActionsProps {
   userId?: string;
   isAnonymous: boolean;
-  source?: string;
+  source?: PurchaseSource;
   onPurchaseSuccess?: () => void;
   onPurchaseError?: (error: string) => void;
   onAuthRequired?: () => void;
@@ -18,12 +19,13 @@ interface UsePaywallActionsProps {
 export const usePaywallActions = ({
   userId,
   isAnonymous,
+  source,
   onPurchaseSuccess,
   onPurchaseError,
   onAuthRequired,
   onClose,
 }: UsePaywallActionsProps) => {
-  const { mutateAsync: purchasePackage } = usePurchasePackage(userId);
+  const { handlePurchase: authAwarePurchase } = useAuthAwarePurchase({ source });
   const { mutateAsync: restorePurchases } = useRestorePurchase(userId);
 
   const handlePurchase = useCallback(async (pkg: PurchasesPackage) => {
@@ -35,8 +37,8 @@ export const usePaywallActions = ({
 
     try {
       if (__DEV__) console.log("[PaywallActions] Purchase started:", pkg.product.identifier);
-      const res = await purchasePackage(pkg);
-      if (res.success) {
+      const res = await authAwarePurchase(pkg, source);
+      if (res) {
         onPurchaseSuccess?.();
         onClose();
       }
@@ -44,7 +46,7 @@ export const usePaywallActions = ({
       const message = err instanceof Error ? err.message : String(err);
       onPurchaseError?.(message);
     }
-  }, [isAnonymous, purchasePackage, onClose, onPurchaseSuccess, onPurchaseError, onAuthRequired]);
+  }, [isAnonymous, authAwarePurchase, source, onClose, onPurchaseSuccess, onPurchaseError, onAuthRequired]);
 
   const handleRestore = useCallback(async () => {
     try {
@@ -60,5 +62,5 @@ export const usePaywallActions = ({
     }
   }, [restorePurchases, onClose, onPurchaseSuccess, onPurchaseError]);
 
-  return { handlePurchase, handleRestore, purchasePackage };
+  return { handlePurchase, handleRestore };
 };

package/src/presentation/hooks/usePaywallVisibility.ts

@@ -5,10 +5,16 @@
  */
 
 import { useCallback, useSyncExternalStore } from "react";
+import type { PurchaseSource } from "../../domain/entities/Credits";
 
 type Listener = () => void;
 
-let paywallVisible = false;
+interface PaywallState {
+  visible: boolean;
+  source?: PurchaseSource;
+}
+
+let paywallState: PaywallState = { visible: false, source: undefined };
 const listeners = new Set<Listener>();
 
 const subscribe = (listener: Listener): (() => void) => {
@@ -16,10 +22,10 @@ const subscribe = (listener: Listener): (() => void) => {
   return () => listeners.delete(listener);
 };
 
-const getSnapshot = (): boolean => paywallVisible;
+const getSnapshot = (): PaywallState => paywallState;
 
-const setPaywallVisible = (visible: boolean): void => {
-  paywallVisible = visible;
+const setPaywallState = (visible: boolean, source?: PurchaseSource): void => {
+  paywallState = { visible, source };
   listeners.forEach((listener) => listener());
 };
 
@@ -27,35 +33,38 @@ const setPaywallVisible = (visible: boolean): void => {
  * Direct paywall control for non-React contexts (e.g., appInitializer)
  */
 export const paywallControl = {
-  open: () => setPaywallVisible(true),
-  close: () => setPaywallVisible(false),
-  isOpen: () => paywallVisible,
+  open: (source?: PurchaseSource) => setPaywallState(true, source),
+  close: () => setPaywallState(false, undefined),
+  isOpen: () => paywallState.visible,
+  getSource: () => paywallState.source,
 };
 
 export interface UsePaywallVisibilityResult {
   showPaywall: boolean;
-  setShowPaywall: (visible: boolean) => void;
-  openPaywall: () => void;
+  currentSource?: PurchaseSource;
+  setShowPaywall: (visible: boolean, source?: PurchaseSource) => void;
+  openPaywall: (source?: PurchaseSource) => void;
   closePaywall: () => void;
 }
 
 export function usePaywallVisibility(): UsePaywallVisibilityResult {
-  const showPaywall = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+  const state = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 
-  const setShowPaywall = useCallback((visible: boolean) => {
-    setPaywallVisible(visible);
+  const setShowPaywall = useCallback((visible: boolean, source?: PurchaseSource) => {
+    setPaywallState(visible, source);
   }, []);
 
-  const openPaywall = useCallback(() => {
-    setPaywallVisible(true);
+  const openPaywall = useCallback((source?: PurchaseSource) => {
+    setPaywallState(true, source);
   }, []);
 
   const closePaywall = useCallback(() => {
-    setPaywallVisible(false);
+    setPaywallState(false, undefined);
   }, []);
 
   return {
-    showPaywall,
+    showPaywall: state.visible,
+    currentSource: state.source,
     setShowPaywall,
     openPaywall,
     closePaywall,