@umituz/react-native-subscription 2.43.6 → 2.43.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.43.6",
+  "version": "2.43.8",
   "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/credits/presentation/deduct-credit/useDeductCredit.ts

@@ -1,39 +1,32 @@
-import { useCallback, useRef } from "react";
-import { useMutation, useQueryClient } from "@umituz/react-native-design-system/tanstack";
+import { useCallback, useState } from "react";
 import { getCreditsRepository } from "../../infrastructure/CreditsRepositoryManager";
 import type { UseDeductCreditParams, UseDeductCreditResult } from "./types";
-import type { DeductCreditsResult } from "../../core/Credits";
-import { createDeductCreditMutationConfig, type MutationContext } from "./mutationConfig";
 
 export const useDeductCredit = ({
   userId,
   onCreditsExhausted,
 }: UseDeductCreditParams): UseDeductCreditResult => {
   const repository = getCreditsRepository();
-  const queryClient = useQueryClient();
-
-  const mutation = useMutation<DeductCreditsResult, Error, number, MutationContext>(
-    createDeductCreditMutationConfig(userId, repository, queryClient)
-  );
-
-  // Use ref for stable reference to mutateAsync — avoids re-creating callbacks every render
-  const mutateAsyncRef = useRef(mutation.mutateAsync);
-  mutateAsyncRef.current = mutation.mutateAsync;
+  const [isDeducting, setIsDeducting] = useState(false);
 
   const deductCredit = useCallback(async (cost: number = 1): Promise<boolean> => {
-    if (__DEV__) console.log('[useDeductCredit] >>> deductCredit called', { cost, userId });
+    if (!userId) return false;
+
+    setIsDeducting(true);
     try {
-      const res = await mutateAsyncRef.current(cost);
-      if (__DEV__) console.log('[useDeductCredit] mutation result:', JSON.stringify(res));
+      const res = await repository.deductCredit(userId, cost);
+      if (__DEV__) console.log('[useDeductCredit] deduction result:', JSON.stringify(res));
+
       if (!res.success) {
         if (__DEV__) console.log('[useDeductCredit] deduction FAILED:', res.error?.code, res.error?.message);
-        // Call onCreditsExhausted for any credit-related error codes
+
         if (res.error?.code === "CREDITS_EXHAUSTED" || res.error?.code === "DEDUCT_ERR" || res.error?.code === "NO_CREDITS") {
           if (__DEV__) console.log('[useDeductCredit] Credits exhausted, calling onCreditsExhausted callback');
           onCreditsExhausted?.();
         }
         return false;
       }
+
       if (__DEV__) console.log('[useDeductCredit] deduction SUCCESS, remaining:', res.remainingCredits);
       return true;
     } catch (error) {
@@ -43,8 +36,10 @@ export const useDeductCredit = ({
         error: error instanceof Error ? error.message : String(error)
       });
       return false;
+    } finally {
+      setIsDeducting(false);
     }
-  }, [onCreditsExhausted, userId]);
+  }, [userId, repository, onCreditsExhausted]);
 
   const checkCredits = useCallback(async (cost: number = 1): Promise<boolean> => {
     if (!userId) return false;
@@ -55,11 +50,7 @@ export const useDeductCredit = ({
     if (!userId) return false;
     try {
       const result = await repository.refundCredit(userId, amount);
-      if (result.success) {
-        // Real-time sync (onSnapshot) handles automatic update
-        return true;
-      }
-      return false;
+      return result.success;
     } catch (error) {
       if (__DEV__) {
         console.error('[useDeductCredit] Unexpected error during credit refund', {
@@ -76,6 +67,6 @@ export const useDeductCredit = ({
     checkCredits,
     deductCredit,
     refundCredits,
-    isDeducting: mutation.isPending
+    isDeducting
   };
 };

package/src/domains/paywall/hooks/usePaywallOrchestrator.ts

@@ -1,7 +1,9 @@
 import { useEffect, useRef } from "react";
 import type { NavigationProp } from "@react-navigation/native";
 import type { ImageSourcePropType } from "react-native";
-import { usePremium } from "../../subscription/presentation/usePremium";
+import { usePremiumStatus } from "../../subscription/presentation/usePremiumStatus";
+import { usePremiumPackages } from "../../subscription/presentation/usePremiumPackages";
+import { usePremiumActions } from "../../subscription/presentation/usePremiumActions";
 import { useSubscriptionFlowStore } from "../../subscription/presentation/useSubscriptionFlow";
 import { usePaywallVisibility } from "../../subscription/presentation/usePaywallVisibility";
 import { PaywallTranslations, PaywallLegalUrls, SubscriptionFeature } from "../entities/types";
@@ -18,11 +20,6 @@ export interface PaywallOrchestratorOptions {
   creditsLabel?: string;
 }
 
-/**
- * High-level orchestrator for Paywall navigation.
- * Handles automatic triggers (post-onboarding) and manual triggers (showPaywall state).
- * Centralizes handlers for success, close, and feedback triggers.
- */
 export function usePaywallOrchestrator({
   navigation,
   translations,
@@ -34,17 +31,10 @@ export function usePaywallOrchestrator({
   bestValueIdentifier = "yearly",
   creditsLabel,
 }: PaywallOrchestratorOptions) {
-  // Get all premium data and actions from usePremium
-  const {
-    isPremium,
-    packages,
-    credits,
-    isSyncing,
-    purchasePackage,
-    restorePurchase,
-  } = usePremium();
+  const { isPremium, isSyncing, credits } = usePremiumStatus();
+  const { packages } = usePremiumPackages();
+  const { purchasePackage, restorePurchase } = usePremiumActions();
 
-  // Selectors for stable references and fine-grained updates
   const isOnboardingComplete = useSubscriptionFlowStore((state) => state.isOnboardingComplete);
   const showPostOnboardingPaywall = useSubscriptionFlowStore((state) => state.showPostOnboardingPaywall);
   const paywallShown = useSubscriptionFlowStore((state) => state.paywallShown);
@@ -74,7 +64,6 @@ export function usePaywallOrchestrator({
     const shouldShowManual = showPaywall && !isPremium && !isAuthModalOpen;
 
     if (shouldShowPostOnboarding || shouldShowManual) {
-      // Guard against double navigation in same render cycle
       if (hasNavigatedRef.current) return;
       hasNavigatedRef.current = true;
 
@@ -84,7 +73,6 @@ export function usePaywallOrchestrator({
       });
 
       navigation.navigate("PaywallScreen", {
-        // UI Props
         translations,
         legalUrls,
         features,
@@ -92,14 +80,10 @@ export function usePaywallOrchestrator({
         creditsLabel,
         heroImage,
         source: shouldShowPostOnboarding ? "onboarding" : "manual",
-
-        // Data Props
         packages,
         isPremium,
         credits,
         isSyncing,
-
-        // Action Props
         onPurchase: purchasePackage,
         onRestore: restorePurchase,
         onClose: handleClose,
@@ -108,12 +92,11 @@ export function usePaywallOrchestrator({
       if (shouldShowPostOnboarding) {
         markPaywallShown();
       }
-      
+
       if (showPaywall) {
         closePaywall();
       }
     } else {
-      // Reset navigation flag if conditions no longer met
       hasNavigatedRef.current = false;
     }
   }, [

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

@@ -1,4 +1,4 @@
-import { useMutation, useQueryClient } from "@umituz/react-native-design-system/tanstack";
+import { useMutation } from "@umituz/react-native-design-system/tanstack";
 import type { PurchasesPackage } from "react-native-purchases";
 import { useAlert } from "@umituz/react-native-design-system/molecules";
 import {
@@ -6,7 +6,6 @@ import {
   selectUserId,
 } from "@umituz/react-native-auth";
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
-import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { getErrorMessage } from "../../../revenuecat/core/errors/RevenueCatErrorHandler";
 
 interface PurchaseMutationResult {
@@ -16,7 +15,6 @@ interface PurchaseMutationResult {
 
 export const usePurchasePackage = () => {
   const userId = useAuthStore(selectUserId);
-  const queryClient = useQueryClient();
   const { showSuccess, showError } = useAlert();
 
   return useMutation({
@@ -37,14 +35,6 @@ export const usePurchasePackage = () => {
     onSuccess: (result) => {
       if (result.success) {
         showSuccess("Purchase Successful", "Your subscription is now active!");
-
-        // Invalidate packages cache (no event listener for packages)
-        queryClient.invalidateQueries({ queryKey: SUBSCRIPTION_QUERY_KEYS.packages });
-
-        // Credits and subscription status updated via real-time sync:
-        // - Credits: Firestore onSnapshot (useCreditsRealTime)
-        // - Subscription status: PREMIUM_STATUS_CHANGED event (RevenueCat)
-        // No manual invalidation needed here
       } else {
         showError("Purchase Failed", "Unable to complete purchase. Please try again.");
       }

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

@@ -1,11 +1,10 @@
-import { useMutation, useQueryClient } from "@umituz/react-native-design-system/tanstack";
+import { useMutation } from "@umituz/react-native-design-system/tanstack";
 import { useAlert } from "@umituz/react-native-design-system/molecules";
 import {
   useAuthStore,
   selectUserId,
 } from "@umituz/react-native-auth";
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
-import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { getErrorMessage } from "../../../revenuecat/core/errors/RevenueCatErrorHandler";
 
 interface RestoreResult {
@@ -15,7 +14,6 @@ interface RestoreResult {
 
 export const useRestorePurchase = () => {
   const userId = useAuthStore(selectUserId);
-  const queryClient = useQueryClient();
   const { showSuccess, showInfo, showError } = useAlert();
 
   return useMutation({
@@ -29,14 +27,6 @@ export const useRestorePurchase = () => {
     },
     onSuccess: (result) => {
       if (result.success) {
-        // Invalidate packages cache (no event listener for packages)
-        queryClient.invalidateQueries({ queryKey: SUBSCRIPTION_QUERY_KEYS.packages });
-
-        // Credits and subscription status updated via real-time sync:
-        // - Credits: Firestore onSnapshot (useCreditsRealTime)
-        // - Subscription status: PREMIUM_STATUS_CHANGED event (RevenueCat)
-        // No manual invalidation needed here
-
         if (result.productId) {
           showSuccess("Restore Successful", "Your subscription has been restored!");
         } else {

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

@@ -1,21 +1,20 @@
-import { useQuery, useQueryClient } from "@umituz/react-native-design-system/tanstack";
-import { useEffect, useRef, useSyncExternalStore } from "react";
+import { useState, useEffect, useSyncExternalStore, useRef, useCallback } from "react";
 import {
   useAuthStore,
   selectUserId,
 } from "@umituz/react-native-auth";
 import { SubscriptionManager } from '../../infrastructure/managers/SubscriptionManager';
 import { initializationState } from "../../infrastructure/state/initializationState";
-import {
-  SUBSCRIPTION_QUERY_KEYS,
-} from "./subscriptionQueryKeys";
 
 export const useSubscriptionPackages = () => {
   const userId = useAuthStore(selectUserId);
   const isConfigured = SubscriptionManager.isConfigured();
-  const queryClient = useQueryClient();
   const prevUserIdRef = useRef(userId);
 
+  const [packages, setPackages] = useState<any[] | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<Error | null>(null);
+
   const initState = useSyncExternalStore(
     initializationState.subscribe,
     initializationState.getSnapshot,
@@ -24,45 +23,48 @@ export const useSubscriptionPackages = () => {
 
   const isInitialized = initState.initialized || SubscriptionManager.isInitialized();
 
-  const query = useQuery({
-    queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, userId ?? "anonymous"] as const,
-    queryFn: async () => {
-      return SubscriptionManager.getPackages();
-    },
-    enabled: isConfigured && isInitialized,
-    gcTime: 5 * 60 * 1000,
-    staleTime: 2 * 60 * 1000,
-    refetchOnMount: true,
-    refetchOnWindowFocus: false,
-    refetchOnReconnect: true,
-  });
+  const fetchPackages = useCallback(async () => {
+    if (!isConfigured || !isInitialized) {
+      setPackages(null);
+      setIsLoading(false);
+      setError(null);
+      return;
+    }
+
+    setIsLoading(true);
+    setError(null);
+
+    try {
+      const result = await SubscriptionManager.getPackages();
+      setPackages(result);
+    } catch (err) {
+      setError(err as Error);
+    } finally {
+      setIsLoading(false);
+    }
+  }, [isConfigured, isInitialized]);
+
+  useEffect(() => {
+    fetchPackages();
+  }, [fetchPackages]);
 
   useEffect(() => {
     const prevUserId = prevUserIdRef.current;
     prevUserIdRef.current = userId;
 
     if (prevUserId !== userId) {
-      // Clean up previous user's cache to prevent data leakage
-      if (prevUserId) {
-        queryClient.cancelQueries({
-          queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, prevUserId],
-        });
-        queryClient.removeQueries({
-          queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, prevUserId],
-        });
-      } else {
-        queryClient.cancelQueries({
-          queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, "anonymous"],
-        });
-        queryClient.removeQueries({
-          queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, "anonymous"],
-        });
-      }
-
-      // No need to invalidate - removeQueries already cleared cache
-      // Query will refetch automatically on mount if needed
+      fetchPackages();
     }
-  }, [userId, queryClient]);
+  }, [userId, fetchPackages]);
+
+  const refetch = useCallback(() => {
+    fetchPackages();
+  }, [fetchPackages]);
 
-  return query;
+  return {
+    data: packages,
+    isLoading,
+    error,
+    refetch,
+  };
 };

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

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef } from "react";
 import type { PurchasesPackage } from "react-native-purchases";
-import { usePremium } from "./usePremium";
+import { usePremiumActions } from "./usePremiumActions";
 import type { PurchaseSource } from "../core/SubscriptionConstants";
 import { authPurchaseStateManager } from "../infrastructure/utils/authPurchaseState";
 import { requireAuthentication } from "./utils/authCheckUtils";
@@ -27,14 +27,10 @@ interface UseAuthAwarePurchaseResult {
   executeSavedPurchase: () => Promise<boolean>;
 }
 
-/**
- * Hook for purchase operations that handle authentication.
- * Automatically saves pending purchases and shows auth modal when needed.
- */
 export const useAuthAwarePurchase = (
   params?: UseAuthAwarePurchaseParams
 ): UseAuthAwarePurchaseResult => {
-  const { purchasePackage, restorePurchase } = usePremium();
+  const { purchasePackage, restorePurchase } = usePremiumActions();
   const isExecutingSavedRef = useRef(false);
 
   const executeSavedPurchase = useCallback(async (): Promise<boolean> => {
@@ -55,7 +51,6 @@ export const useAuthAwarePurchase = (
     }
   }, [purchasePackage]);
 
-  // Auto-execute saved purchase when user authenticates
   useEffect(() => {
     const authProvider = authPurchaseStateManager.getProvider();
     const hasUser = authProvider && authProvider.hasFirebaseUser();
@@ -74,12 +69,10 @@ export const useAuthAwarePurchase = (
       const authProvider = authPurchaseStateManager.getProvider();
 
       if (!requireAuthentication(authProvider)) {
-        // User not authenticated, purchase saved and auth modal shown
         authPurchaseStateManager.savePurchase(pkg, source || params?.source || "settings");
         return false;
       }
 
-      // User authenticated, proceed with purchase
       const result = await purchasePackage(pkg);
       return result;
     },

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

@@ -1,26 +1,21 @@
-import { useQuery, useQueryClient } from "@umituz/react-native-design-system/tanstack";
-import { useEffect, useSyncExternalStore } from "react";
+import { useState, useEffect, useSyncExternalStore, useCallback } from "react";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
 import { SubscriptionManager } from "../infrastructure/managers/SubscriptionManager";
 import { initializationState } from "../infrastructure/state/initializationState";
 import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
-import { SubscriptionStatusResult } from "./useSubscriptionStatus.types";
+import type { SubscriptionStatusResult } from "./useSubscriptionStatus.types";
+import type { PremiumStatus } from "../core/types/PremiumStatus";
 import { isAuthenticated } from "../utils/authGuards";
-import { SHORT_CACHE_CONFIG } from "../../../shared/infrastructure/react-query/queryConfig";
-import { usePreviousUserCleanup } from "../../../shared/infrastructure/react-query/hooks/usePreviousUserCleanup";
-
-export const subscriptionStatusQueryKeys = {
-  all: ["subscriptionStatus"] as const,
-  user: (userId: string | null | undefined) =>
-    userId ? (["subscriptionStatus", userId] as const) : (["subscriptionStatus"] as const),
-};
 
 export const useSubscriptionStatus = (): SubscriptionStatusResult => {
   const userId = useAuthStore(selectUserId);
-  const queryClient = useQueryClient();
   const isConfigured = SubscriptionManager.isConfigured();
   const hasUser = isAuthenticated(userId);
 
+  const [data, setData] = useState<PremiumStatus | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<Error | null>(null);
+
   const initState = useSyncExternalStore(
     initializationState.subscribe,
     initializationState.getSnapshot,
@@ -31,22 +26,30 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
     ? initState.initialized && initState.userId === userId
     : false;
 
-  const queryEnabled = hasUser && isConfigured && isInitialized;
+  const fetchStatus = useCallback(async () => {
+    if (!hasUser || !isConfigured || !isInitialized) {
+      setData(null);
+      setIsLoading(false);
+      setError(null);
+      return;
+    }
 
-  const { data, status, error, refetch } = useQuery({
-    queryKey: subscriptionStatusQueryKeys.user(userId),
-    queryFn: async () => {
-      if (!hasUser) {
-        return null;
-      }
+    setIsLoading(true);
+    setError(null);
 
-      return SubscriptionManager.checkPremiumStatus();
-    },
-    enabled: queryEnabled,
-    ...SHORT_CACHE_CONFIG,
-  });
+    try {
+      const result = await SubscriptionManager.checkPremiumStatus();
+      setData(result);
+    } catch (err) {
+      setError(err as Error);
+    } finally {
+      setIsLoading(false);
+    }
+  }, [hasUser, isConfigured, isInitialized]);
 
-  usePreviousUserCleanup(userId, queryClient, subscriptionStatusQueryKeys.user);
+  useEffect(() => {
+    fetchStatus();
+  }, [fetchStatus]);
 
   useEffect(() => {
     if (!hasUser) return undefined;
@@ -55,34 +58,18 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
       SUBSCRIPTION_EVENTS.PREMIUM_STATUS_CHANGED,
       (event: { userId: string; isPremium: boolean }) => {
         if (event.userId === userId) {
-          queryClient.invalidateQueries({
-            queryKey: subscriptionStatusQueryKeys.user(userId),
-          });
+          fetchStatus();
         }
       }
     );
 
     return unsubscribe;
-  }, [userId, hasUser, queryClient]);
-
-  const isLoading = status === "pending";
+  }, [userId, hasUser, fetchStatus]);
 
   return {
-    isPremium: data?.isPremium ?? false,
-    expirationDate: data?.expirationDate ?? null,
-    willRenew: data?.willRenew ?? false,
-    productIdentifier: data?.productIdentifier ?? null,
-    originalPurchaseDate: data?.originalPurchaseDate ?? null,
-    latestPurchaseDate: data?.latestPurchaseDate ?? null,
-    billingIssuesDetected: data?.billingIssuesDetected ?? false,
-    isSandbox: data?.isSandbox ?? false,
-    periodType: data?.periodType ?? null,
-    packageType: data?.packageType ?? null,
-    store: data?.store ?? null,
-    gracePeriodExpiresDate: data?.gracePeriodExpiresDate ?? null,
-    unsubscribeDetectedAt: data?.unsubscribeDetectedAt ?? null,
+    ...data,
     isLoading,
-    error: error as Error | null,
-    refetch,
-  };
+    error,
+    refetch: fetchStatus,
+  } as SubscriptionStatusResult;
 };

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

@@ -1,17 +1,11 @@
-import { useQuery } from "@umituz/react-native-design-system/tanstack";
-import { useMemo } from "react";
+import { useState, useEffect } from "react";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
-import { MEDIUM_CACHE_CONFIG } from "../../../../shared/infrastructure/react-query/queryConfig";
+import { collection, onSnapshot, query, orderBy, limit, Query } from "firebase/firestore";
 import type {
   CreditLog,
   TransactionRepositoryConfig,
 } from "../../domain/types/transaction.types";
-import { TransactionRepository } from "../../infrastructure/repositories/transaction/TransactionRepository";
-
-const transactionQueryKeys = {
-  all: ["transactions"] as const,
-  user: (userId: string) => ["transactions", userId] as const,
-};
+import { requireFirestore } from "../../../../shared/infrastructure/firestore/collectionUtils";
 
 export interface UseTransactionHistoryParams {
   config: TransactionRepositoryConfig;
@@ -28,43 +22,75 @@ interface UseTransactionHistoryResult {
 
 export function useTransactionHistory({
   config,
-  limit = 50,
+  limit: limitCount = 50,
 }: UseTransactionHistoryParams): UseTransactionHistoryResult {
   const userId = useAuthStore(selectUserId);
+  const [transactions, setTransactions] = useState<CreditLog[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<Error | null>(null);
 
-  const repository = useMemo(
-    () => new TransactionRepository(config),
-    [config]
-  );
+  useEffect(() => {
+    if (!userId) {
+      setTransactions([]);
+      setIsLoading(false);
+      setError(null);
+      return;
+    }
 
-  const hasUser = !!userId;
+    setIsLoading(true);
+    setError(null);
 
-  const { data, isLoading, error, refetch } = useQuery({
-    queryKey: [...transactionQueryKeys.user(userId ?? ""), limit],
-    queryFn: async () => {
-      if (!userId) return [];
+    try {
+      const db = requireFirestore();
+      const collectionPath = config.useUserSubcollection
+        ? `users/${userId}/${config.collectionName}`
+        : config.collectionName;
 
-      const result = await repository.getTransactions({
-        userId,
-        limit,
-      });
+      const q = query(
+        collection(db, collectionPath),
+        orderBy("timestamp", "desc"),
+        limit(limitCount)
+      ) as Query;
 
-      if (!result.success) {
-        throw new Error(result.error?.message || "Failed to fetch history");
-      }
+      const unsubscribe = onSnapshot(
+        q,
+        (snapshot) => {
+          const logs: CreditLog[] = [];
+          snapshot.forEach((doc) => {
+            logs.push({
+              id: doc.id,
+              ...doc.data(),
+            } as CreditLog);
+          });
+          setTransactions(logs);
+          setIsLoading(false);
+        },
+        (err) => {
+          console.error("[useTransactionHistory] Snapshot error:", err);
+          setError(err as Error);
+          setIsLoading(false);
+        }
+      );
 
-      return result.data ?? [];
-    },
-    enabled: hasUser,
-    ...MEDIUM_CACHE_CONFIG,
-  });
+      return () => unsubscribe();
+    } catch (err) {
+      const error = err instanceof Error ? err : new Error(String(err));
+      console.error("[useTransactionHistory] Setup error:", err);
+      setError(error);
+      setIsLoading(false);
+    }
+  }, [userId, config.collectionName, config.useUserSubcollection, limitCount]);
 
-  const transactions = data ?? [];
+  const refetch = () => {
+    if (__DEV__) {
+      console.warn("[useTransactionHistory] Refetch called - not needed for real-time sync");
+    }
+  };
 
   return {
     transactions,
     isLoading,
-    error: error as Error | null,
+    error,
     refetch,
     isEmpty: transactions.length === 0,
   };

package/src/index.ts

@@ -10,12 +10,6 @@ export {
   ANONYMOUS_CACHE_KEY,
 } from "./domains/subscription/core/SubscriptionConstants";
 
-// Domain Events
-export { SUBSCRIPTION_EVENTS } from "./domains/subscription/core/events/SubscriptionEvents";
-export type { SubscriptionEventType, SyncStatusChangedEvent } from "./domains/subscription/core/events/SubscriptionEvents";
-export type { PurchaseCompletedEvent, RenewalDetectedEvent, PremiumStatusChangedEvent } from "./domains/subscription/core/SubscriptionEvents";
-export { FLOW_EVENTS } from "./domains/subscription/core/events/FlowEvents";
-export type { FlowEventType, OnboardingCompletedEvent, PaywallShownEvent, PaywallClosedEvent } from "./domains/subscription/core/events/FlowEvents";
 export type {
   UserTierType,
   SubscriptionStatusType,
@@ -25,9 +19,7 @@ export type {
   PurchaseSource,
   PurchaseType,
 } from "./domains/subscription/core/SubscriptionConstants";
-export type { SubscriptionMetadata } from "./domains/subscription/core/types/SubscriptionMetadata";
-export type { PremiumStatus as PremiumStatusMetadata } from "./domains/subscription/core/types/PremiumStatus";
-export type { CreditInfo } from "./domains/subscription/core/types/CreditInfo";
+
 export {
   createDefaultSubscriptionStatus,
   isSubscriptionValid,
@@ -35,6 +27,17 @@ export {
 } from "./domains/subscription/core/SubscriptionStatus";
 export type { SubscriptionStatus, StatusResolverInput } from "./domains/subscription/core/SubscriptionStatus";
 
+// Domain Events
+export { SUBSCRIPTION_EVENTS } from "./domains/subscription/core/events/SubscriptionEvents";
+export type { SubscriptionEventType, SyncStatusChangedEvent } from "./domains/subscription/core/events/SubscriptionEvents";
+export type { PurchaseCompletedEvent, RenewalDetectedEvent, PremiumStatusChangedEvent } from "./domains/subscription/core/SubscriptionEvents";
+export { FLOW_EVENTS } from "./domains/subscription/core/events/FlowEvents";
+export type { FlowEventType, OnboardingCompletedEvent, PaywallShownEvent, PaywallClosedEvent } from "./domains/subscription/core/events/FlowEvents";
+
+export type { SubscriptionMetadata } from "./domains/subscription/core/types/SubscriptionMetadata";
+export type { PremiumStatus as PremiumStatusMetadata } from "./domains/subscription/core/types/PremiumStatus";
+export type { CreditInfo } from "./domains/subscription/core/types/CreditInfo";
+
 // Application Layer - Ports
 export type { ISubscriptionRepository } from "./shared/application/ports/ISubscriptionRepository";
 export type { IRevenueCatService } from "./shared/application/ports/IRevenueCatService";
@@ -51,29 +54,29 @@ export {
 } from "./shared/utils/Result";
 export type { Result, Success, Failure } from "./shared/utils/Result";
 
-// Infrastructure Layer (Services & Repositories)
+// Infrastructure Layer
 export { initializeSubscription } from "./domains/subscription/application/initializer/SubscriptionInitializer";
 export type { SubscriptionInitConfig, CreditPackageConfig } from "./domains/subscription/application/SubscriptionInitializerTypes";
 
 export { CreditsRepository } from "./domains/credits/infrastructure/CreditsRepository";
-export { 
-  configureCreditsRepository, 
-  getCreditsRepository, 
-  getCreditsConfig, 
-  isCreditsRepositoryConfigured 
+export {
+  configureCreditsRepository,
+  getCreditsRepository,
+  getCreditsConfig,
+  isCreditsRepositoryConfigured
 } from "./domains/credits/infrastructure/CreditsRepositoryManager";
 
+export { CreditLimitService, calculateCreditLimit } from "./domains/credits/domain/services/CreditLimitService";
+
 // Presentation Layer - Hooks
 export { useAuthAwarePurchase } from "./domains/subscription/presentation/useAuthAwarePurchase";
 export { useCredits } from "./domains/credits/presentation/useCredits";
 export { useDeductCredit } from "./domains/credits/presentation/deduct-credit/useDeductCredit";
 export { useFeatureGate } from "./domains/subscription/presentation/useFeatureGate";
 export { usePaywallVisibility, paywallControl } from "./domains/subscription/presentation/usePaywallVisibility";
-export { usePremium } from "./domains/subscription/presentation/usePremium";
 export { usePremiumStatus } from "./domains/subscription/presentation/usePremiumStatus";
 export { usePremiumPackages } from "./domains/subscription/presentation/usePremiumPackages";
 export { usePremiumActions } from "./domains/subscription/presentation/usePremiumActions";
-export type { UsePremiumResult } from "./domains/subscription/presentation/usePremium.types";
 export type { PremiumStatus } from "./domains/subscription/presentation/usePremiumStatus";
 export type { PremiumPackages } from "./domains/subscription/presentation/usePremiumPackages";
 export type { PremiumActions } from "./domains/subscription/presentation/usePremiumActions";
@@ -81,7 +84,6 @@ export { useSubscriptionFlowStore } from "./domains/subscription/presentation/us
 export type { SubscriptionFlowState, SubscriptionFlowActions, SubscriptionFlowStore } from "./domains/subscription/presentation/useSubscriptionFlow";
 export { useSubscriptionStatus } from "./domains/subscription/presentation/useSubscriptionStatus";
 export type { SubscriptionStatusResult } from "./domains/subscription/presentation/useSubscriptionStatus.types";
-export { useSyncStatusListener } from "./domains/subscription/presentation/useSyncStatusListener";
 export { usePaywallFeedback } from "./presentation/hooks/feedback/usePaywallFeedback";
 export {
   usePaywallFeedbackSubmit,
@@ -123,7 +125,6 @@ export type {
   CreditsResult,
   DeductCreditsResult,
 } from "./domains/credits/core/Credits";
-export { CreditLimitService, calculateCreditLimit } from "./domains/credits/domain/services/CreditLimitService";
 
 // Utils
 export {
@@ -170,9 +171,6 @@ export {
 export { getAppVersion, validatePlatform } from "./utils/appUtils";
 export { toDate, toISOString, toTimestamp, getCurrentISOString } from "./shared/utils/dateConverter";
 
-// Credits Query Keys
-export { creditsQueryKeys } from "./domains/credits/presentation/creditsQueryKeys";
-
 // Paywall Types & Utils
 export type { PaywallTranslations, PaywallLegalUrls, SubscriptionFeature } from "./domains/paywall/entities/types";
 export { createPaywallTranslations, createFeedbackTranslations } from "./domains/paywall/utils/paywallTranslationUtils";

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

@@ -1,5 +0,0 @@
-export const creditsQueryKeys = {
-  all: ["credits"] as const,
-  user: (userId: string | null | undefined) =>
-    userId ? (["credits", userId] as const) : (["credits"] as const),
-};

package/src/domains/credits/presentation/deduct-credit/mutationConfig.ts

@@ -1,78 +0,0 @@
-import type { QueryClient } from "@umituz/react-native-design-system/tanstack";
-import { timezoneService } from "@umituz/react-native-design-system/timezone";
-import type { UserCredits, DeductCreditsResult } from "../../core/Credits";
-import type { CreditsRepository } from "../../infrastructure/CreditsRepository";
-import { creditsQueryKeys } from "../creditsQueryKeys";
-import { calculateRemaining } from "../../../../shared/utils/numberUtils.core";
-
-export interface MutationContext {
-  previousCredits: UserCredits | null;
-  skippedOptimistic: boolean;
-  wasInsufficient?: boolean;
-  capturedUserId: string | null;
-}
-
-export function createDeductCreditMutationConfig(
-  userId: string | undefined,
-  repository: CreditsRepository,
-  queryClient: QueryClient
-) {
-  return {
-    mutationFn: async (cost: number): Promise<DeductCreditsResult> => {
-      if (__DEV__) console.log('[deductCreditMutation] mutationFn called', { userId, cost });
-      if (!userId) throw new Error("User not authenticated");
-      return repository.deductCredit(userId, cost);
-    },
-    onMutate: async (cost: number): Promise<MutationContext> => {
-      if (!userId) {
-        return { previousCredits: null, skippedOptimistic: true, capturedUserId: null };
-      }
-
-      const capturedUserId = userId;
-
-      await queryClient.cancelQueries({ queryKey: creditsQueryKeys.user(capturedUserId) });
-      const previousCredits = queryClient.getQueryData<UserCredits>(
-        creditsQueryKeys.user(capturedUserId)
-      );
-
-      if (!previousCredits) {
-        return {
-          previousCredits: null as UserCredits | null,
-          skippedOptimistic: true,
-          capturedUserId
-        };
-      }
-
-      const newCredits = calculateRemaining(previousCredits.credits, cost);
-
-      queryClient.setQueryData<UserCredits | null>(
-        creditsQueryKeys.user(capturedUserId),
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            credits: newCredits,
-            lastUpdatedAt: timezoneService.getNow()
-          };
-        }
-      );
-
-      return {
-        previousCredits,
-        skippedOptimistic: false,
-        wasInsufficient: previousCredits.credits < cost,
-        capturedUserId
-      };
-    },
-    onError: (_err: unknown, _cost: number, context: MutationContext | undefined) => {
-      if (context?.capturedUserId && context.previousCredits && !context.skippedOptimistic) {
-        queryClient.setQueryData(
-          creditsQueryKeys.user(context.capturedUserId),
-          context.previousCredits
-        );
-      }
-    },
-    // onSuccess removed - real-time sync (onSnapshot) handles automatic updates
-    // Optimistic update already applied, real-time listener will confirm actual value
-  };
-}

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

@@ -1,6 +0,0 @@
-export const SUBSCRIPTION_QUERY_KEYS = {
-  packages: ["subscription", "packages"] as const,
-  initialized: (userId: string) =>
-    ["subscription", "initialized", userId] as const,
-  customerInfo: ["subscription", "customerInfo"] as const,
-} as const;

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

@@ -1,33 +0,0 @@
-import { useMemo } from 'react';
-import { usePremiumStatus } from './usePremiumStatus';
-import { usePremiumPackages } from './usePremiumPackages';
-import { usePremiumActions } from './usePremiumActions';
-import { UsePremiumResult } from './usePremium.types';
-
-/**
- * Facade hook that combines status, packages, and actions.
- *
- * Consider using the focused hooks for better performance:
- * - usePremiumStatus() - when you only need premium status
- * - usePremiumPackages() - when you only need package data
- * - usePremiumActions() - when you only need actions
- *
- * This facade re-renders when ANY of the sub-hooks change, whereas focused hooks
- * only re-render when their specific data changes.
- */
-export const usePremium = (): UsePremiumResult => {
-  const status = usePremiumStatus();
-  const packages = usePremiumPackages();
-  const actions = usePremiumActions();
-
-  return useMemo(() => ({
-    ...status,
-    ...packages,
-    ...actions,
-    isLoading: status.isSyncing || packages.isLoading || actions.isLoading,
-  }), [
-    status,
-    packages,
-    actions,
-  ]);
-};

package/src/domains/subscription/presentation/usePremium.types.ts

@@ -1,16 +0,0 @@
-import type { PurchasesPackage } from 'react-native-purchases';
-import type { UserCredits } from '../../credits/core/Credits';
-
-export interface UsePremiumResult {
-  isPremium: boolean;
-  isLoading: boolean;
-  packages: PurchasesPackage[];
-  credits: UserCredits | null;
-  showPaywall: boolean;
-  isSyncing: boolean;
-  purchasePackage: (pkg: PurchasesPackage) => Promise<boolean>;
-  restorePurchase: () => Promise<boolean>;
-  setShowPaywall: (show: boolean) => void;
-  closePaywall: () => void;
-  openPaywall: () => void;
-}

package/src/shared/infrastructure/react-query/hooks/usePreviousUserCleanup.ts

@@ -1,22 +0,0 @@
-import { useEffect, useRef } from "react";
-import type { QueryClient } from "@umituz/react-native-design-system/tanstack";
-import { isAuthenticated } from "../../../../domains/subscription/utils/authGuards";
-
-export function usePreviousUserCleanup(
-  userId: string | null | undefined,
-  queryClient: QueryClient,
-  queryKey: (userId: string) => readonly unknown[]
-): void {
-  const prevUserIdRef = useRef(userId);
-
-  useEffect(() => {
-    const prevUserId = prevUserIdRef.current;
-    prevUserIdRef.current = userId;
-
-    if (prevUserId !== userId && isAuthenticated(prevUserId)) {
-      queryClient.removeQueries({
-        queryKey: queryKey(prevUserId),
-      });
-    }
-  }, [userId, queryClient, queryKey]);
-}

package/src/shared/infrastructure/react-query/queryConfig.ts

@@ -1,38 +0,0 @@
-/**
- * Query cache configurations for optimal performance
- * Uses event-based invalidation via subscriptionEventBus for real-time updates
- */
-
-/**
- * Short-lived cache for frequently changing data (credits, subscription status)
- * Events automatically invalidate the cache, so we can safely cache for 60s
- */
-export const SHORT_CACHE_CONFIG = {
-  gcTime: 1000 * 60, // 1 minute - keep in memory for 1 minute
-  staleTime: 1000 * 30, // 30 seconds - consider stale after 30s
-  refetchOnMount: false, // Don't refetch on mount if cache exists
-  refetchOnWindowFocus: false, // Don't refetch on app focus
-  refetchOnReconnect: true, // Refetch on reconnect only
-};
-
-/**
- * Medium cache for relatively stable data (packages, transaction history)
- */
-export const MEDIUM_CACHE_CONFIG = {
-  gcTime: 1000 * 60 * 5, // 5 minutes
-  staleTime: 1000 * 60 * 2, // 2 minutes
-  refetchOnMount: false,
-  refetchOnWindowFocus: false,
-  refetchOnReconnect: true,
-};
-
-/**
- * Long cache for rarely changing data (config, metadata)
- */
-export const LONG_CACHE_CONFIG = {
-  gcTime: 1000 * 60 * 30, // 30 minutes
-  staleTime: 1000 * 60 * 10, // 10 minutes
-  refetchOnMount: false,
-  refetchOnWindowFocus: false,
-  refetchOnReconnect: true,
-};