@umituz/react-native-subscription 2.19.3 → 2.19.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.19.3",
+  "version": "2.19.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/domains/paywall/hooks/usePaywallActions.ts

@@ -2,6 +2,7 @@ import { useCallback } from "react";
 import type { PurchasesPackage } from "react-native-purchases";
 import { useRestorePurchase } from "../../../revenuecat/presentation/hooks/useRestorePurchase";
 import { useAuthAwarePurchase } from "../../../presentation/hooks/useAuthAwarePurchase";
+import { usePendingPurchaseStore } from "../../../infrastructure/stores/PendingPurchaseStore";
 import type { PurchaseSource } from "../../../domain/entities/Credits";
 
 declare const __DEV__: boolean;
@@ -25,8 +26,15 @@ export const usePaywallActions = ({
 }: UsePaywallActionsProps) => {
   const { handlePurchase: authAwarePurchase } = useAuthAwarePurchase({ source, userId });
   const { mutateAsync: restorePurchases } = useRestorePurchase(userId);
+  const { isExecuting } = usePendingPurchaseStore();
 
   const handlePurchase = useCallback(async (pkg: PurchasesPackage) => {
+    // Block if a pending purchase is already being executed
+    if (isExecuting) {
+      if (__DEV__) console.log("[PaywallActions] Purchase blocked - pending purchase in progress");
+      return;
+    }
+
     try {
       if (__DEV__) console.log("[PaywallActions] Purchase started:", pkg.product.identifier);
       const res = await authAwarePurchase(pkg, source);
@@ -38,7 +46,7 @@ export const usePaywallActions = ({
       const message = err instanceof Error ? err.message : String(err);
       onPurchaseError?.(message);
     }
-  }, [authAwarePurchase, source, onClose, onPurchaseSuccess, onPurchaseError]);
+  }, [authAwarePurchase, source, onClose, onPurchaseSuccess, onPurchaseError, isExecuting]);
 
   const handleRestore = useCallback(async () => {
     try {

package/src/infrastructure/services/CreditsInitializer.ts

@@ -113,22 +113,35 @@ export async function initializeCreditsTransaction(
           ? [...(existing?.purchaseHistory || []), purchaseMetadata].slice(-10)
           : existing?.purchaseHistory;
 
-        const creditsData = {
+        // Build credits data, excluding undefined values (Firestore doesn't accept undefined)
+        const creditsData: Record<string, unknown> = {
             credits: newCredits,
-            packageType: packageType !== "unknown" ? packageType : undefined,
             creditLimit,
-            productId: productId || undefined,
-            purchaseSource: metadata?.source,
-            purchaseType: metadata?.type ? purchaseType : undefined,
-            platform: productId ? platform : undefined,
-            appVersion: productId ? appVersion : undefined,
             purchasedAt,
             lastUpdatedAt: now,
             lastPurchaseAt: now,
             processedPurchases,
-            purchaseHistory,
         };
 
+        // Only add optional fields if they have values
+        if (packageType && packageType !== "unknown") {
+            creditsData.packageType = packageType;
+        }
+        if (productId) {
+            creditsData.productId = productId;
+            creditsData.platform = platform;
+            creditsData.appVersion = appVersion;
+        }
+        if (metadata?.source) {
+            creditsData.purchaseSource = metadata.source;
+        }
+        if (metadata?.type) {
+            creditsData.purchaseType = purchaseType;
+        }
+        if (purchaseHistory && purchaseHistory.length > 0) {
+            creditsData.purchaseHistory = purchaseHistory;
+        }
+
         transaction.set(creditsRef, creditsData, { merge: true });
 
         return { credits: newCredits };

package/src/infrastructure/stores/PendingPurchaseStore.ts

@@ -16,6 +16,7 @@ export interface PendingPurchaseData {
 
 interface PendingPurchaseState {
   pending: PendingPurchaseData | null;
+  isExecuting: boolean;
 }
 
 interface PendingPurchaseActions {
@@ -23,10 +24,12 @@ interface PendingPurchaseActions {
   getPendingPurchase: () => PendingPurchaseData | null;
   clearPendingPurchase: () => void;
   hasPendingPurchase: () => boolean;
+  setExecuting: (executing: boolean) => void;
 }
 
 const initialState: PendingPurchaseState = {
   pending: null,
+  isExecuting: false,
 };
 
 export const usePendingPurchaseStore = createStore<
@@ -52,5 +55,9 @@ export const usePendingPurchaseStore = createStore<
     hasPendingPurchase: () => {
       return get().pending !== null;
     },
+
+    setExecuting: (executing: boolean) => {
+      set({ isExecuting: executing });
+    },
   }),
 });

package/src/presentation/hooks/usePendingPurchaseHandler.ts

@@ -22,7 +22,7 @@ export const usePendingPurchaseHandler = ({
   userId,
   isAuthenticated,
 }: UsePendingPurchaseHandlerParams): void => {
-  const { pending, clearPendingPurchase } = usePendingPurchaseStore();
+  const { pending, clearPendingPurchase, setExecuting } = usePendingPurchaseStore();
   const { purchasePackage } = usePremium(userId);
   const isExecutingRef = useRef(false);
   const executedPackageIdRef = useRef<string | null>(null);
@@ -45,6 +45,7 @@ export const usePendingPurchaseHandler = ({
     const executePendingPurchase = async () => {
       isExecutingRef.current = true;
       executedPackageIdRef.current = pending.package.identifier;
+      setExecuting(true);
 
       if (__DEV__) {
         console.log(
@@ -69,9 +70,10 @@ export const usePendingPurchaseHandler = ({
       } finally {
         clearPendingPurchase();
         isExecutingRef.current = false;
+        setExecuting(false);
       }
     };
 
     void executePendingPurchase();
-  }, [isAuthenticated, userId, pending, clearPendingPurchase, purchasePackage]);
+  }, [isAuthenticated, userId, pending, clearPendingPurchase, purchasePackage, setExecuting]);
 };