@umituz/react-native-subscription 2.24.3 → 2.24.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.24.3",
+  "version": "2.24.5",
   "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/presentation/hooks/useFeatureGate.ts

@@ -60,6 +60,23 @@ export function useFeatureGate(
   const prevCreditBalanceRef = useRef(creditBalance);
   const isWaitingForPurchaseRef = useRef(false);
 
+  // Refs to always get current values in closures
+  const hasCreditsRef = useRef(hasCredits);
+  const hasSubscriptionRef = useRef(hasSubscription);
+  const onShowPaywallRef = useRef(onShowPaywall);
+
+  useEffect(() => {
+    hasCreditsRef.current = hasCredits;
+  }, [hasCredits]);
+
+  useEffect(() => {
+    hasSubscriptionRef.current = hasSubscription;
+  }, [hasSubscription]);
+
+  useEffect(() => {
+    onShowPaywallRef.current = onShowPaywall;
+  }, [onShowPaywall]);
+
   // Execute pending action when credits increase after purchase
   useEffect(() => {
     const prevBalance = prevCreditBalanceRef.current;
@@ -99,7 +116,27 @@ export function useFeatureGate(
 
       // Step 1: Auth check
       if (!authGate.requireAuth(() => {})) {
-        onShowAuthModal(action);
+        // Wrap action to re-check credits after auth succeeds
+        // Using refs to get current values when callback executes
+        const postAuthAction = () => {
+          // Step 2: Subscription check (bypasses credits if subscribed)
+          if (hasSubscriptionRef.current) {
+            action();
+            return;
+          }
+
+          // Step 3: Credits check (use ref for current value)
+          if (!hasCreditsRef.current) {
+            pendingActionRef.current = action;
+            isWaitingForPurchaseRef.current = true;
+            onShowPaywallRef.current(requiredCredits);
+            return;
+          }
+
+          // All checks passed
+          action();
+        };
+        onShowAuthModal(postAuthAction);
         return;
       }
 
@@ -124,7 +161,10 @@ export function useFeatureGate(
       authGate,
       creditsGate,
       hasSubscription,
+      hasCredits,
+      requiredCredits,
       onShowAuthModal,
+      onShowPaywall,
     ]
   );