@umituz/react-native-subscription 2.35.15 → 2.35.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.35.15",
+  "version": "2.35.16",
   "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/config/utils/planSelectors.ts

@@ -32,7 +32,11 @@ export const getCreditLimitForPlan = (
     planId: string
 ): number => {
     const plan = getPlanById(config, planId);
-    return plan?.credits ?? 0;
+    if (!plan) {
+        console.warn(`[planSelectors] Plan not found: ${planId}, returning 0`);
+        return 0;
+    }
+    return plan.credits;
 };
 
 export const determinePlanFromCredits = (

package/src/domains/credits/presentation/useCredits.ts

@@ -1,5 +1,5 @@
 import { useQuery, useQueryClient } from "@umituz/react-native-design-system";
-import { useCallback, useMemo, useEffect } from "react";
+import { useCallback, useMemo, useEffect, useRef } from "react";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
 import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
 import {
@@ -44,15 +44,30 @@ export const useCredits = (): UseCreditsResult => {
       return result.data ?? null;
     },
     enabled: queryEnabled,
-    gcTime: 10 * 60 * 1000,
-    staleTime: 30 * 1000,
-    refetchOnMount: true,
-    refetchOnWindowFocus: false,
-    refetchOnReconnect: true,
+    gcTime: 0,
+    staleTime: 0,
+    refetchOnMount: "always",
+    refetchOnWindowFocus: "always",
+    refetchOnReconnect: "always",
   });
 
   const queryClient = useQueryClient();
 
+  // Track previous userId to clear stale cache on logout/user switch
+  const prevUserIdRef = useRef(userId);
+
+  useEffect(() => {
+    const prevUserId = prevUserIdRef.current;
+    prevUserIdRef.current = userId;
+
+    // Clear previous user's cache when userId changes (logout or user switch)
+    if (prevUserId !== userId && isAuthenticated(prevUserId)) {
+      queryClient.removeQueries({
+        queryKey: creditsQueryKeys.user(prevUserId),
+      });
+    }
+  }, [userId, queryClient]);
+
   useEffect(() => {
     if (!isAuthenticated(userId)) return undefined;
 

package/src/domains/subscription/application/SubscriptionSyncProcessor.ts

@@ -43,7 +43,7 @@ export class SubscriptionSyncProcessor {
 
   async processRenewal(userId: string, productId: string, newExpirationDate: string, customerInfo: CustomerInfo) {
     const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
-    revenueCatData.expirationDate = newExpirationDate || revenueCatData.expirationDate;
+    revenueCatData.expirationDate = newExpirationDate ?? revenueCatData.expirationDate;
     const purchaseId = generateRenewalId(revenueCatData.originalTransactionId, productId, newExpirationDate);
 
     const creditsUserId = await this.getCreditsUserId(userId);

package/src/domains/subscription/application/initializer/ConfigValidator.ts

@@ -4,8 +4,8 @@ import type { SubscriptionInitConfig } from "../SubscriptionInitializerTypes";
 export function getApiKey(config: SubscriptionInitConfig): string {
   const { apiKey, apiKeyIos, apiKeyAndroid } = config;
   const key = Platform.OS === 'ios'
-    ? (apiKeyIos || apiKey)
-    : (apiKeyAndroid || apiKey);
+    ? (apiKeyIos ?? apiKey)
+    : (apiKeyAndroid ?? apiKey);
 
   if (!key) {
     throw new Error('API key required');

package/src/domains/subscription/application/initializer/ServiceConfigurator.ts

@@ -3,6 +3,8 @@ import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionM
 import { configureAuthProvider } from "../../presentation/useAuthAwarePurchase";
 import { SubscriptionSyncService } from "../SubscriptionSyncService";
 import type { SubscriptionInitConfig } from "../SubscriptionInitializerTypes";
+import type { CustomerInfo } from "react-native-purchases";
+import type { PackageType } from "../../../revenuecat/core/types/RevenueCatTypes";
 
 export function configureServices(config: SubscriptionInitConfig, apiKey: string): SubscriptionSyncService {
   const { entitlementId, credits, creditPackages, getFirebaseAuth, showAuthModal, onCreditsUpdated, getAnonymousUserId } = config;
@@ -23,9 +25,27 @@ export function configureServices(config: SubscriptionInitConfig, apiKey: string
       apiKey,
       entitlementIdentifier: entitlementId,
       consumableProductIdentifiers: [creditPackages.identifierPattern],
-      onPurchaseCompleted: (u: string, p: string, c: any, s: any, pkgType: any) => syncService.handlePurchase(u, p, c, s, pkgType),
-      onRenewalDetected: (u: string, p: string, expires: string, c: any) => syncService.handleRenewal(u, p, expires, c),
-      onPremiumStatusChanged: (u: string, isP: boolean, pId: any, exp: any, willR: any, pt: any) => syncService.handlePremiumStatusChanged(u, isP, pId, exp, willR, pt),
+      onPurchaseCompleted: (
+        u: string,
+        p: string,
+        c: CustomerInfo,
+        s?: string,
+        pkgType?: PackageType | null
+      ) => syncService.handlePurchase(u, p, c, s as any, pkgType),
+      onRenewalDetected: (
+        u: string,
+        p: string,
+        expires: string,
+        c: CustomerInfo
+      ) => syncService.handleRenewal(u, p, expires, c),
+      onPremiumStatusChanged: (
+        u: string,
+        isP: boolean,
+        pId?: string,
+        exp?: string,
+        willR?: boolean,
+        pt?: string
+      ) => syncService.handlePremiumStatusChanged(u, isP, pId, exp, willR, pt as any),
       onCreditsUpdated,
     },
     apiKey,

package/src/domains/subscription/infrastructure/hooks/customer-info/useCustomerInfo.ts

@@ -45,7 +45,7 @@ export function useCustomerInfo(): UseCustomerInfoResult {
         listenerRef.current = null;
       }
     };
-  }, [fetchCustomerInfo]);
+  }, []); // fetchCustomerInfo is stable, setup listener once
 
   return {
     customerInfo,

package/src/domains/subscription/infrastructure/hooks/usePaywallFlow.ts

@@ -29,17 +29,27 @@ export const usePaywallFlow = (options: UsePaywallFlowOptions = {}): UsePaywallF
 
   // Load persisted state
   useEffect(() => {
+    let isMounted = true;
+
     const loadPersistedState = async () => {
       try {
         const value = await getString(PAYWALL_SHOWN_KEY, '');
-        setPaywallShown(value === 'true');
+        if (isMounted) {
+          setPaywallShown(value === 'true');
+        }
       } catch (error) {
         console.error('[usePaywallFlow] Failed to load paywall state', error);
-        setPaywallShown(false); // Safe default
+        if (isMounted) {
+          setPaywallShown(false); // Safe default
+        }
       }
     };
 
     loadPersistedState();
+
+    return () => {
+      isMounted = false;
+    };
   }, [getString]);
 
   const closePostOnboardingPaywall = useCallback(async (_isPremium: boolean) => {

package/src/domains/subscription/infrastructure/hooks/useRevenueCat.ts

@@ -3,7 +3,7 @@
  * React hook for RevenueCat subscription management
  */
 
-import { useState, useCallback } from "react";
+import { useState, useCallback, useEffect, useRef } from "react";
 import type { PurchasesOffering, PurchasesPackage } from "react-native-purchases";
 import { getRevenueCatService } from '../../infrastructure/services/RevenueCatService';
 import type { PurchaseResult, RestoreResult } from '../../../../shared/application/ports/IRevenueCatService';
@@ -35,8 +35,18 @@ export interface UseRevenueCatResult {
 export function useRevenueCat(): UseRevenueCatResult {
   const [offering, setOffering] = useState<PurchasesOffering | null>(null);
   const [loading, setLoading] = useState(false);
+  const isMountedRef = useRef(true);
+
+  useEffect(() => {
+    isMountedRef.current = true;
+    return () => {
+      isMountedRef.current = false;
+    };
+  }, []);
 
   const initialize = useCallback(async (userId: string, apiKey?: string) => {
+    if (!isMountedRef.current) return;
+
     setLoading(true);
     try {
       const service = getRevenueCatService();
@@ -44,17 +54,21 @@ export function useRevenueCat(): UseRevenueCatResult {
         return;
       }
       const result = await service.initialize(userId, apiKey);
-      if (result.success) {
+      if (result.success && isMountedRef.current) {
         setOffering(result.offering);
       }
     } catch {
       // Error handling is done by service
     } finally {
-      setLoading(false);
+      if (isMountedRef.current) {
+        setLoading(false);
+      }
     }
   }, []);
 
   const loadOfferings = useCallback(async () => {
+    if (!isMountedRef.current) return;
+
     setLoading(true);
     try {
       const service = getRevenueCatService();
@@ -62,11 +76,15 @@ export function useRevenueCat(): UseRevenueCatResult {
         return;
       }
       const fetchedOffering = await service.fetchOfferings();
-      setOffering(fetchedOffering);
+      if (isMountedRef.current) {
+        setOffering(fetchedOffering);
+      }
     } catch {
       // Error handling is done by service
     } finally {
-      setLoading(false);
+      if (isMountedRef.current) {
+        setLoading(false);
+      }
     }
   }, []);
 

package/src/domains/subscription/presentation/useFeatureGate.ts

@@ -108,7 +108,7 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
     }
 
     prevCreditBalanceRef.current = creditBalance;
-    hasSubscriptionRef.current = hasSubscription;
+    // hasSubscriptionRef is already synced by useSyncedRefs, no need to update manually
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [creditBalance, hasSubscription]);
 

package/src/domains/trial/application/TrialEligibilityService.ts

@@ -12,7 +12,7 @@ export class TrialEligibilityService {
 
     const { hasUsedTrial, trialInProgress, userIds = [] } = record;
 
-    if (userId && userIds.includes(userId)) {
+    if (userId && userId.length > 0 && userIds.includes(userId)) {
       return { eligible: false, reason: "user_already_used", deviceId };
     }
 

package/src/domains/trial/application/TrialService.ts

@@ -26,9 +26,17 @@ const repository = new DeviceTrialRepository();
 
 export const getDeviceId = () => PersistentDeviceIdService.getDeviceId();
 
+/**
+ * Ensures a valid device ID is available
+ * Uses provided deviceId if non-empty, otherwise fetches from PersistentDeviceIdService
+ */
+async function ensureDeviceId(deviceId?: string): Promise<string> {
+  return (deviceId && deviceId.length > 0) ? deviceId : await getDeviceId();
+}
+
 export async function checkTrialEligibility(userId?: string, deviceId?: string): Promise<TrialEligibilityResult> {
   try {
-    const id = deviceId || await getDeviceId();
+    const id = await ensureDeviceId(deviceId);
     const record = await repository.getRecord(id);
     return TrialEligibilityService.check(userId, id, record);
   } catch {
@@ -38,7 +46,7 @@ export async function checkTrialEligibility(userId?: string, deviceId?: string):
 
 export async function recordTrialStart(userId: string, deviceId?: string): Promise<boolean> {
   try {
-    const id = deviceId || await getDeviceId();
+    const id = await ensureDeviceId(deviceId);
     const record: TrialRecordWrite = {
       deviceId: id,
       trialInProgress: true,
@@ -54,7 +62,7 @@ export async function recordTrialStart(userId: string, deviceId?: string): Promi
 
 export async function recordTrialEnd(deviceId?: string): Promise<boolean> {
   try {
-    const id = deviceId || await getDeviceId();
+    const id = await ensureDeviceId(deviceId);
     const record: TrialRecordWrite = {
       hasUsedTrial: true,
       trialInProgress: false,
@@ -68,7 +76,7 @@ export async function recordTrialEnd(deviceId?: string): Promise<boolean> {
 
 export async function recordTrialConversion(deviceId?: string): Promise<boolean> {
   try {
-    const id = deviceId || await getDeviceId();
+    const id = await ensureDeviceId(deviceId);
     const record: TrialRecordWrite = {
       hasUsedTrial: true,
       trialInProgress: false,

package/src/domains/wallet/infrastructure/repositories/transaction/TransactionWriter.ts

@@ -34,7 +34,7 @@ export async function addTransaction(
         change,
         reason,
         ...metadata,
-        createdAt: Date.now(),
+        createdAt: Date.now(), // Approximate - actual server timestamp written to Firestore
       },
     };
   } catch (error) {

package/src/domains/wallet/presentation/hooks/useProductMetadata.ts

@@ -34,7 +34,7 @@ export function useProductMetadata({
 }: UseProductMetadataParams): UseProductMetadataResult {
   const service = useMemo(
     () => new ProductMetadataService(config),
-    [config]
+    [config.collectionName, config.cacheTTL]
   );
 
   const queryKey = type

package/src/domains/wallet/presentation/hooks/useTransactionHistory.ts

@@ -33,7 +33,7 @@ export function useTransactionHistory({
 
   const repository = useMemo(
     () => new TransactionRepository(config),
-    [config]
+    [config.collectionName, config.useUserSubcollection]
   );
 
   const { data, isLoading, error, refetch } = useQuery({