@umituz/react-native-subscription 2.17.12 → 2.18.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.17.12",
+  "version": "2.18.1",
   "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 = "settings", 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/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,

package/src/presentation/hooks/useSubscriptionSettingsConfig.ts

@@ -4,7 +4,7 @@
  * Package-driven: all logic handled internally
  */
 
-import { useMemo } from "react";
+import { useMemo, useCallback } from "react";
 import { useCredits } from "./useCredits";
 import { useSubscriptionStatus } from "./useSubscriptionStatus";
 import { useCustomerInfo } from "../../revenuecat/presentation/hooks/useCustomerInfo";
@@ -55,6 +55,10 @@ export const useSubscriptionSettingsConfig = (
   const { customerInfo } = useCustomerInfo();
   const { openPaywall } = usePaywallVisibility();
 
+  const handleOpenPaywall = useCallback(() => {
+    openPaywall("settings");
+  }, [openPaywall]);
+
   // RevenueCat entitlement info - dynamically using configured entitlementId
   const entitlementId = SubscriptionManager.getEntitlementId() || "premium";
   const premiumEntitlement = customerInfo?.entitlements.active[entitlementId];
@@ -137,7 +141,7 @@ export const useSubscriptionSettingsConfig = (
           ? translations.statusActive
           : translations.statusFree,
         icon: "diamond",
-        onPress: openPaywall,
+        onPress: handleOpenPaywall,
       },
       sectionConfig: {
         statusType,
@@ -163,7 +167,7 @@ export const useSubscriptionSettingsConfig = (
           manageButton: translations.manageButton,
           upgradeButton: translations.upgradeButton,
         },
-        onUpgrade: openPaywall,
+        onUpgrade: handleOpenPaywall,
         upgradePrompt,
       },
     }),
@@ -177,7 +181,7 @@ export const useSubscriptionSettingsConfig = (
       daysRemaining,
       willRenew,
       creditsArray,
-      openPaywall,
+      handleOpenPaywall,
       upgradePrompt,
     ]
   );