@umituz/react-native-subscription 2.24.4 → 2.24.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.24.4",
+  "version": "2.24.6",
   "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/usePaywallActions.ts

@@ -30,12 +30,17 @@ export const usePaywallActions = ({
     try {
       if (__DEV__) console.log("[PaywallActions] Purchase started:", pkg.product.identifier);
       const res = await authAwarePurchase(pkg, source);
+      if (__DEV__) console.log("[PaywallActions] Purchase result:", { res, productId: pkg.product.identifier });
       if (res) {
+        if (__DEV__) console.log("[PaywallActions] Purchase successful, closing paywall");
         onPurchaseSuccess?.();
         onClose();
+      } else {
+        if (__DEV__) console.log("[PaywallActions] Purchase returned false, paywall stays open");
       }
     } catch (err: unknown) {
       const message = err instanceof Error ? err.message : String(err);
+      if (__DEV__) console.log("[PaywallActions] Purchase error:", message);
       onPurchaseError?.(message);
     }
   }, [authAwarePurchase, source, onClose, onPurchaseSuccess, onPurchaseError]);

package/src/infrastructure/services/FeedbackService.ts

@@ -1,10 +1,11 @@
 /**
  * Feedback Service
  * Handles feedback submission to Firestore
+ * Feedback is stored under users/{userId}/feedback/{feedbackId}
  */
 
 import { getFirestore } from "@umituz/react-native-firebase";
-import { collection, addDoc } from "firebase/firestore";
+import { collection, addDoc, doc } from "firebase/firestore";
 
 export interface FeedbackData {
   userId: string | null;
@@ -21,10 +22,9 @@ export interface FeedbackSubmitResult {
   error?: Error;
 }
 
-const FEEDBACK_COLLECTION = "feedback";
-
 /**
  * Submit feedback to Firestore
+ * Stores under users/{userId}/feedback
  */
 export async function submitFeedback(
   data: FeedbackData
@@ -38,6 +38,13 @@ export async function submitFeedback(
     return { success: false, error: new Error("Firestore not available") };
   }
 
+  if (!data.userId) {
+    if (__DEV__) {
+      console.warn("[FeedbackService] User ID is required for feedback");
+    }
+    return { success: false, error: new Error("User ID is required") };
+  }
+
   try {
     if (__DEV__) {
       console.log("[FeedbackService] Submitting feedback:", {
@@ -48,8 +55,11 @@ export async function submitFeedback(
 
     const now = new Date().toISOString();
 
-    await addDoc(collection(db, FEEDBACK_COLLECTION), {
-      userId: data.userId,
+    // Store under users/{userId}/feedback
+    const userDocRef = doc(db, "users", data.userId);
+    const feedbackCollectionRef = collection(userDocRef, "feedback");
+
+    await addDoc(feedbackCollectionRef, {
       userEmail: data.userEmail,
       type: data.type,
       title: data.title,

package/src/presentation/hooks/useAuthAwarePurchase.ts

@@ -53,6 +53,13 @@ export const useAuthAwarePurchase = (
 
   const handlePurchase = useCallback(
     async (pkg: PurchasesPackage, source?: PurchaseSource): Promise<boolean> => {
+      if (__DEV__) {
+        console.log("[useAuthAwarePurchase] handlePurchase called:", {
+          productId: pkg.product.identifier,
+          hasAuthProvider: !!globalAuthProvider,
+        });
+      }
+
       if (!globalAuthProvider) {
         if (__DEV__) {
           console.error("[useAuthAwarePurchase] Auth provider not configured");
@@ -60,7 +67,12 @@ export const useAuthAwarePurchase = (
         return false;
       }
 
-      if (!globalAuthProvider.isAuthenticated()) {
+      const isAuth = globalAuthProvider.isAuthenticated();
+      if (__DEV__) {
+        console.log("[useAuthAwarePurchase] Auth check:", { isAuthenticated: isAuth });
+      }
+
+      if (!isAuth) {
         if (__DEV__) {
           console.log("[useAuthAwarePurchase] Not authenticated, saving and showing auth");
         }
@@ -70,7 +82,14 @@ export const useAuthAwarePurchase = (
         return false;
       }
 
-      return purchasePackage(pkg);
+      if (__DEV__) {
+        console.log("[useAuthAwarePurchase] Calling purchasePackage");
+      }
+      const result = await purchasePackage(pkg);
+      if (__DEV__) {
+        console.log("[useAuthAwarePurchase] purchasePackage returned:", result);
+      }
+      return result;
     },
     [purchasePackage, params?.source]
   );

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;
@@ -100,18 +117,19 @@ export function useFeatureGate(
       // Step 1: Auth check
       if (!authGate.requireAuth(() => {})) {
         // 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 (hasSubscription) {
+          if (hasSubscriptionRef.current) {
             action();
             return;
           }
 
-          // Step 3: Credits check
-          if (!hasCredits) {
+          // Step 3: Credits check (use ref for current value)
+          if (!hasCreditsRef.current) {
             pendingActionRef.current = action;
             isWaitingForPurchaseRef.current = true;
-            onShowPaywall(requiredCredits);
+            onShowPaywallRef.current(requiredCredits);
             return;
           }
 

package/src/presentation/hooks/usePremium.ts

@@ -85,8 +85,14 @@ export const usePremium = (userId?: string): UsePremiumResult => {
   // Purchase handler with proper error handling
   const handlePurchase = useCallback(
     async (pkg: PurchasesPackage): Promise<boolean> => {
+      if (__DEV__) {
+        console.log("[usePremium] handlePurchase called:", pkg.product.identifier);
+      }
       try {
         const result = await purchaseMutation.mutateAsync(pkg);
+        if (__DEV__) {
+          console.log("[usePremium] Purchase result:", { success: result.success });
+        }
         return result.success;
       } catch (error) {
         if (__DEV__) {