@umituz/react-native-subscription 2.26.9 → 2.26.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.26.9",
+  "version": "2.26.11",
   "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/infrastructure/repositories/CreditsRepository.ts

@@ -166,9 +166,10 @@ export class CreditsRepository extends BaseRepository {
         isPremium: false,
         status: "free" as const,
 
-        // Free credits
+        // Free credits - store initial amount for tracking
         credits: freeCredits,
         creditLimit: freeCredits,
+        initialFreeCredits: freeCredits,
         isFreeCredits: true,
 
         // Dates

package/src/presentation/hooks/useCredits.ts

@@ -7,7 +7,7 @@
  */
 
 import { useQuery } from "@umituz/react-native-design-system";
-import { useCallback, useMemo, useRef, useEffect } from "react";
+import { useCallback, useMemo, useEffect } from "react";
 import type { UserCredits } from "../../domain/entities/Credits";
 import {
     getCreditsRepository,
@@ -27,6 +27,12 @@ const DEFAULT_STALE_TIME = 30 * 1000;
 /** Default gc time: 5 minutes */
 const DEFAULT_GC_TIME = 5 * 60 * 1000;
 
+/**
+ * Global tracker for free credits initialization attempts.
+ * Shared across all useCredits hook instances to prevent multiple inits.
+ */
+const freeCreditsInitAttempted = new Set<string>();
+
 export interface CreditsCacheConfig {
   /** Time in ms before data is considered stale. Default: 30 seconds */
   staleTime?: number;
@@ -37,6 +43,8 @@ export interface CreditsCacheConfig {
 export interface UseCreditsParams {
   userId: string | undefined;
   enabled?: boolean;
+  /** Whether user is anonymous. Anonymous users don't get free credits. */
+  isAnonymous?: boolean;
   /** Cache configuration. Default: 30 second staleTime, 5 minute gcTime */
   cache?: CreditsCacheConfig;
 }
@@ -55,6 +63,7 @@ export interface UseCreditsResult {
 export const useCredits = ({
   userId,
   enabled = true,
+  isAnonymous = false,
   cache,
 }: UseCreditsParams): UseCreditsResult => {
   const isConfigured = isCreditsRepositoryConfigured();
@@ -66,9 +75,6 @@ export const useCredits = ({
 
   const queryEnabled = enabled && !!userId && isConfigured;
 
-  // Track if free credits initialization has been attempted
-  const freeCreditsInitAttemptedRef = useRef<string | null>(null);
-
   const { data, isLoading, error, refetch, isFetched } = useQuery({
     queryKey: creditsQueryKeys.user(userId ?? ""),
     queryFn: async () => {
@@ -109,23 +115,26 @@ export const useCredits = ({
   useEffect(() => {
     // Only run if:
     // 1. Query has completed (isFetched)
-    // 2. User is authenticated
+    // 2. User is authenticated (not anonymous)
     // 3. No credits data exists
     // 4. Free credits configured
     // 5. Auto-init enabled
-    // 6. Haven't already attempted for this user
+    // 6. Haven't already attempted for this user (global tracking)
+    // 7. User is NOT anonymous (anonymous users must register first)
     if (
       isFetched &&
       userId &&
+      !isAnonymous &&
       isConfigured &&
       !credits &&
       autoInit &&
-      freeCreditsInitAttemptedRef.current !== userId
+      !freeCreditsInitAttempted.has(userId)
     ) {
-      freeCreditsInitAttemptedRef.current = userId;
+      // Mark as attempted IMMEDIATELY to prevent other hook instances
+      freeCreditsInitAttempted.add(userId);
 
       if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useCredits] Auto-initializing free credits for new user:", userId.slice(0, 8));
+        console.log("[useCredits] Auto-initializing free credits for new registered user:", userId.slice(0, 8));
       }
 
       const repository = getCreditsRepository();
@@ -134,7 +143,6 @@ export const useCredits = ({
           if (typeof __DEV__ !== "undefined" && __DEV__) {
             console.log("[useCredits] Free credits initialized:", result.data?.credits);
           }
-          // Refetch to get the new credits
           refetch();
         } else {
           if (typeof __DEV__ !== "undefined" && __DEV__) {
@@ -142,8 +150,12 @@ export const useCredits = ({
           }
         }
       });
+    } else if (isFetched && userId && isAnonymous && !credits && autoInit) {
+      if (typeof __DEV__ !== "undefined" && __DEV__) {
+        console.log("[useCredits] Skipping free credits for anonymous user - registration required");
+      }
     }
-  }, [isFetched, userId, isConfigured, credits, autoInit, refetch]);
+  }, [isFetched, userId, isAnonymous, isConfigured, credits, autoInit, refetch]);
 
   // Memoize derived values to prevent unnecessary re-renders
   const derivedValues = useMemo(() => {
@@ -179,9 +191,10 @@ export const useCredits = ({
 };
 
 export const useHasCredits = (
-  userId: string | undefined
+  userId: string | undefined,
+  isAnonymous?: boolean
 ): boolean => {
-  const { credits } = useCredits({ userId });
+  const { credits } = useCredits({ userId, isAnonymous });
   if (!credits) return false;
   return credits.credits > 0;
 };