@umituz/react-native-subscription 2.35.16 → 2.35.18

package/src/domains/subscription/infrastructure/services/OfferingsFetcher.ts

@@ -4,8 +4,6 @@ export interface OfferingsFetcherDeps {
   isInitialized: () => boolean;
 }
 
-declare const __DEV__: boolean;
-
 export async function fetchOfferings(deps: OfferingsFetcherDeps): Promise<PurchasesOffering | null> {
   if (!deps.isInitialized()) return null;
   try {
@@ -21,35 +19,16 @@ export async function fetchOfferings(deps: OfferingsFetcherDeps): Promise<Purcha
     }
 
     if (offerings.current) {
-      if (__DEV__) {
-        console.log('[OfferingsFetcher] Using current offering:', {
-          id: offerings.current.identifier,
-          packagesCount: offerings.current.availablePackages.length,
-        });
-      }
       return offerings.current;
     }
 
     const allOfferings = Object.values(offerings.all);
     if (allOfferings.length > 0) {
-      if (__DEV__) {
-        console.log('[OfferingsFetcher] No current offering, using first from all:', {
-          id: allOfferings[0].identifier,
-          packagesCount: allOfferings[0].availablePackages.length,
-        });
-      }
       return allOfferings[0];
     }
 
-    if (__DEV__) {
-      console.warn('[OfferingsFetcher] No offerings available!');
-    }
-
     return null;
   } catch (error) {
-    if (__DEV__) {
-      console.error('[OfferingsFetcher] Error:', error);
-    }
     throw new Error(`Failed to fetch offerings: ${error instanceof Error ? error.message : "Unknown error"}`);
   }
 }

package/src/domains/subscription/infrastructure/services/listeners/CustomerInfoHandler.ts

@@ -3,8 +3,6 @@ import type { RevenueCatConfig } from "../../../../revenuecat/core/types";
 import { syncPremiumStatus } from "../../utils/PremiumStatusSyncer";
 import { detectRenewal, updateRenewalState, type RenewalState } from "../../utils/renewal";
 
-declare const __DEV__: boolean;
-
 async function handleRenewal(
   userId: string,
   productId: string,
@@ -16,12 +14,8 @@ async function handleRenewal(
 
   try {
     await onRenewalDetected(userId, productId, expirationDate, customerInfo);
-  } catch (error) {
-    console.error('[CustomerInfoHandler] Renewal detection callback failed', {
-      userId,
-      productId,
-      error
-    });
+  } catch (_error) {
+    // Callback errors should not break customer info processing
   }
 }
 
@@ -37,14 +31,8 @@ async function handlePlanChange(
 
   try {
     await onPlanChanged(userId, newProductId, previousProductId, isUpgrade, customerInfo);
-  } catch (error) {
-    console.error('[CustomerInfoHandler] Plan change callback failed', {
-      userId,
-      newProductId,
-      previousProductId,
-      isUpgrade,
-      error
-    });
+  } catch (_error) {
+    // Callback errors should not break customer info processing
   }
 }
 
@@ -55,11 +43,8 @@ async function handlePremiumStatusSync(
 ): Promise<void> {
   try {
     await syncPremiumStatus(config, userId, customerInfo);
-  } catch (error) {
-    console.error('[CustomerInfoHandler] Premium status sync failed', {
-      userId,
-      error
-    });
+  } catch (_error) {
+    // Sync errors are logged by PremiumStatusSyncer, don't break processing
   }
 }
 
@@ -84,19 +69,7 @@ export async function processCustomerInfo(
     config.entitlementIdentifier
   );
 
-  if (typeof __DEV__ !== "undefined" && __DEV__) {
-    console.log("[CustomerInfoHandler] Renewal detection result:", {
-      isRenewal: renewalResult.isRenewal,
-      isPlanChange: renewalResult.isPlanChange,
-      productId: renewalResult.productId,
-      previousProductId: renewalResult.previousProductId,
-    });
-  }
-
   if (renewalResult.isRenewal) {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[CustomerInfoHandler] Handling renewal");
-    }
     await handleRenewal(
       userId,
       renewalResult.productId!,
@@ -107,9 +80,6 @@ export async function processCustomerInfo(
   }
 
   if (renewalResult.isPlanChange) {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[CustomerInfoHandler] Handling plan change");
-    }
     await handlePlanChange(
       userId,
       renewalResult.productId!,

package/src/domains/subscription/infrastructure/services/purchase/PurchaseExecutor.ts

@@ -28,8 +28,6 @@ async function executeConsumablePurchase(
   };
 }
 
-declare const __DEV__: boolean;
-
 async function executeSubscriptionPurchase(
   config: RevenueCatConfig,
   userId: string,
@@ -59,10 +57,6 @@ async function executeSubscriptionPurchase(
 
   await notifyPurchaseCompleted(config, userId, productId, customerInfo, source, packageType);
 
-  if (typeof __DEV__ !== "undefined" && __DEV__) {
-    console.log("[PurchaseExecutor] Purchase flow completed successfully");
-  }
-
   return {
     success: true,
     isPremium,

package/src/domains/subscription/infrastructure/utils/PremiumStatusSyncer.ts

@@ -8,8 +8,6 @@ import type { RevenueCatConfig, PackageType } from "../../../revenuecat/core/typ
 import type { PurchaseSource } from "../../../subscription/core/SubscriptionConstants";
 import { getPremiumEntitlement } from "../../../revenuecat/core/types";
 
-declare const __DEV__: boolean;
-
 export async function syncPremiumStatus(
     config: RevenueCatConfig,
     userId: string,
@@ -25,9 +23,6 @@ export async function syncPremiumStatus(
     }
 
     if (!config.onPremiumStatusChanged) {
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-            console.log("[PremiumStatusSyncer] No onPremiumStatusChanged callback - skipping");
-        }
         return { success: true };
     }
 
@@ -36,21 +31,8 @@ export async function syncPremiumStatus(
         config.entitlementIdentifier
     );
 
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[PremiumStatusSyncer] Premium entitlement:", {
-            found: !!premiumEntitlement,
-            productId: premiumEntitlement?.productIdentifier,
-            expirationDate: premiumEntitlement?.expirationDate,
-            willRenew: premiumEntitlement?.willRenew,
-            periodType: premiumEntitlement?.periodType,
-        });
-    }
-
     try {
         if (premiumEntitlement) {
-            if (typeof __DEV__ !== "undefined" && __DEV__) {
-                console.log("[PremiumStatusSyncer] Calling onPremiumStatusChanged with premium=true");
-            }
             await config.onPremiumStatusChanged(
                 userId,
                 true,
@@ -60,22 +42,11 @@ export async function syncPremiumStatus(
                 premiumEntitlement.periodType as "NORMAL" | "INTRO" | "TRIAL" | undefined
             );
         } else {
-            if (typeof __DEV__ !== "undefined" && __DEV__) {
-                console.log("[PremiumStatusSyncer] Calling onPremiumStatusChanged with premium=false");
-            }
             await config.onPremiumStatusChanged(userId, false, undefined, undefined, undefined, undefined);
         }
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-            console.log("[PremiumStatusSyncer] onPremiumStatusChanged completed successfully");
-        }
         return { success: true };
     } catch (error) {
-        console.error('[PremiumStatusSyncer] Premium status change callback failed', {
-            userId,
-            isPremium: !!premiumEntitlement,
-            productId: premiumEntitlement?.productIdentifier,
-            error
-        });
+
         return {
             success: false,
             error: error instanceof Error ? error : new Error(String(error))
@@ -97,14 +68,7 @@ export async function notifyPurchaseCompleted(
 
     try {
         await config.onPurchaseCompleted(userId, productId, customerInfo, source, packageType);
-    } catch (error) {
-        console.error('[PremiumStatusSyncer] Purchase completion callback failed', {
-            userId,
-            productId,
-            source,
-            packageType,
-            error
-        });
+    } catch (_error) {
         // Silently fail callback notifications to prevent crashing the main flow
     }
 }
@@ -121,12 +85,7 @@ export async function notifyRestoreCompleted(
 
     try {
         await config.onRestoreCompleted(userId, isPremium, customerInfo);
-    } catch (error) {
-        console.error('[PremiumStatusSyncer] Restore completion callback failed', {
-            userId,
-            isPremium,
-            error
-        });
+    } catch (_error) {
         // Silently fail callback notifications to prevent crashing the main flow
     }
 }

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

@@ -1,7 +1,5 @@
 import type { MutableRefObject } from "react";
 
-declare const __DEV__: boolean;
-
 export const executeFeatureAction = (
   action: () => void | Promise<void>,
   isAuthenticated: boolean,
@@ -15,45 +13,20 @@ export const executeFeatureAction = (
   isWaitingForPurchaseRef: MutableRefObject<boolean>,
   isCreditsLoadedRef: MutableRefObject<boolean>
 ): boolean => {
-  if (typeof __DEV__ !== "undefined" && __DEV__) {
-    console.log("[FeatureGate] executeFeatureAction called:", {
-      isAuthenticated,
-      hasSubscription: hasSubscriptionRef.current,
-      creditBalance: creditBalanceRef.current,
-      requiredCredits: requiredCreditsRef.current,
-      isCreditsLoaded: isCreditsLoadedRef.current,
-    });
-  }
 
   if (!isAuthenticated) {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[FeatureGate] User not authenticated, showing auth modal");
-    }
     const postAuthAction = () => {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[FeatureGate] Post-auth action called");
-      }
       if (hasSubscriptionRef.current || creditBalanceRef.current >= requiredCreditsRef.current) {
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-          console.log("[FeatureGate] Post-auth: User has access, executing action");
-        }
         action();
         return;
       }
 
       if (isCreditsLoadedRef.current) {
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-          console.log("[FeatureGate] Post-auth: Credits loaded, showing paywall");
-        }
         pendingActionRef.current = action;
         isWaitingForPurchaseRef.current = true;
         onShowPaywallRef.current(requiredCreditsRef.current);
         return;
       }
-
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[FeatureGate] Post-auth: Waiting for credits to load");
-      }
       pendingActionRef.current = action;
       isWaitingForAuthCreditsRef.current = true;
     };
@@ -62,26 +35,16 @@ export const executeFeatureAction = (
   }
 
   if (hasSubscriptionRef.current) {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[FeatureGate] User has subscription, executing action");
-    }
     action();
     return true;
   }
 
   if (creditBalanceRef.current < requiredCreditsRef.current) {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[FeatureGate] Insufficient credits, showing paywall");
-    }
     pendingActionRef.current = action;
     isWaitingForPurchaseRef.current = true;
     onShowPaywallRef.current(requiredCreditsRef.current);
     return false;
   }
-
-  if (typeof __DEV__ !== "undefined" && __DEV__) {
-    console.log("[FeatureGate] User has enough credits, executing action");
-  }
   action();
   return true;
 };

package/src/domains/subscription/presentation/screens/components/SubscriptionHeader.tsx

@@ -4,7 +4,7 @@ import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-syst
 import { PremiumStatusBadge } from "../../components/details/PremiumStatusBadge";
 import type { SubscriptionHeaderProps } from "./SubscriptionHeader.types";
 import { createSubscriptionHeaderStyles } from "./SubscriptionHeader.styles";
-import { EXPIRING_SOON_THRESHOLD_DAYS } from "./SubscriptionHeader.constants";
+import { EXPIRATION_WARNING_THRESHOLD_DAYS as EXPIRING_SOON_THRESHOLD_DAYS } from "../../../constants/thresholds";
 import { SubscriptionHeaderContent } from "./SubscriptionHeaderContent";
 
 export type { SubscriptionHeaderProps } from "./SubscriptionHeader.types";

package/src/domains/subscription/presentation/screens/components/SubscriptionHeaderContent.tsx

@@ -31,7 +31,7 @@ export const SubscriptionHeaderContent: React.FC<SubscriptionHeaderContentProps>
   translations,
   styles,
   willRenew,
-  periodType,
+  periodType: _periodType,
   packageType,
   store,
   originalPurchaseDate,

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

@@ -9,8 +9,6 @@ import { usePremium } from "./usePremium";
 import type { PurchaseSource } from "../core/SubscriptionConstants";
 import { authPurchaseStateManager } from "../infrastructure/utils/authPurchaseState";
 
-declare const __DEV__: boolean;
-
 export type { PurchaseAuthProvider } from "../infrastructure/utils/authPurchaseState";
 
 export const configureAuthProvider = (provider: import("../infrastructure/utils/authPurchaseState").PurchaseAuthProvider): void => {
@@ -46,84 +44,43 @@ export const useAuthAwarePurchase = (
 
   const handlePurchase = useCallback(
     async (pkg: PurchasesPackage, source?: PurchaseSource): Promise<boolean> => {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useAuthAwarePurchase] handlePurchase called", {
-          productId: pkg.product.identifier,
-          source: source || params?.source,
-        });
-      }
 
       const authProvider = authPurchaseStateManager.getProvider();
 
       if (!authProvider) {
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-          console.error("[useAuthAwarePurchase] ❌ No auth provider configured");
-        }
         return false;
       }
 
       const isAuth = authProvider.isAuthenticated();
 
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useAuthAwarePurchase] Auth status:", { isAuth });
-      }
-
       if (!isAuth) {
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-          console.log("[useAuthAwarePurchase] 🔐 User not authenticated, saving purchase and showing auth modal");
-        }
         authPurchaseStateManager.savePurchase(pkg, source || params?.source || "settings");
         authProvider.showAuthModal();
         return false;
       }
 
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useAuthAwarePurchase] ✅ User authenticated, proceeding with purchase");
-      }
-
       const result = await purchasePackage(pkg);
 
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useAuthAwarePurchase] Purchase result:", result);
-      }
-
       return result;
     },
     [purchasePackage, params?.source]
   );
 
   const handleRestore = useCallback(async (): Promise<boolean> => {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[useAuthAwarePurchase] handleRestore called");
-    }
 
     const authProvider = authPurchaseStateManager.getProvider();
 
     if (!authProvider) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.error("[useAuthAwarePurchase] ❌ No auth provider configured");
-      }
       return false;
     }
 
     if (!authProvider.isAuthenticated()) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useAuthAwarePurchase] 🔐 User not authenticated, showing auth modal");
-      }
       authProvider.showAuthModal();
       return false;
     }
 
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[useAuthAwarePurchase] ✅ User authenticated, proceeding with restore");
-    }
-
     const result = await restorePurchase();
 
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[useAuthAwarePurchase] Restore result:", result);
-    }
-
     return result;
   }, [restorePurchase]);
 

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

@@ -6,8 +6,6 @@ import { executeFeatureAction } from "./featureGateActions";
 
 export type { UseFeatureGateParams, UseFeatureGateResult } from "./useFeatureGate.types";
 
-declare const __DEV__: boolean;
-
 export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResult {
   const {
     isAuthenticated,
@@ -27,16 +25,6 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
   const { creditBalanceRef, hasSubscriptionRef, onShowPaywallRef, requiredCreditsRef, isCreditsLoadedRef } = useSyncedRefs(creditBalance, hasSubscription, onShowPaywall, requiredCredits, isCreditsLoaded);
 
   useEffect(() => {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[FeatureGate] Auth completion useEffect triggered:", {
-        isWaitingForAuthCredits: isWaitingForAuthCreditsRef.current,
-        isCreditsLoaded,
-        hasPendingAction: !!pendingActionRef.current,
-        hasSubscription,
-        creditBalance,
-        requiredCredits,
-      });
-    }
 
     const shouldExecute = canExecuteAuthAction(
       isWaitingForAuthCreditsRef.current,
@@ -47,14 +35,7 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
       requiredCredits
     );
 
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[FeatureGate] canExecuteAuthAction:", shouldExecute);
-    }
-
     if (shouldExecute) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[FeatureGate] ✅ EXECUTING PENDING ACTION after auth!");
-      }
       isWaitingForAuthCreditsRef.current = false;
       const action = pendingActionRef.current!;
       pendingActionRef.current = null;
@@ -63,9 +44,6 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
     }
 
     if (isWaitingForAuthCreditsRef.current && isCreditsLoaded && pendingActionRef.current) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[FeatureGate] Auth credits loaded but insufficient, showing paywall");
-      }
       isWaitingForAuthCreditsRef.current = false;
       isWaitingForPurchaseRef.current = true;
       onShowPaywall(requiredCredits);
@@ -73,16 +51,6 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
   }, [isCreditsLoaded, creditBalance, hasSubscription, requiredCredits, onShowPaywall]);
 
   useEffect(() => {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[FeatureGate] Purchase completion useEffect triggered:", {
-        creditBalance,
-        prevCreditBalance: prevCreditBalanceRef.current,
-        hasSubscription,
-        prevHasSubscription: hasSubscriptionRef.current,
-        isWaitingForPurchase: isWaitingForPurchaseRef.current,
-        hasPendingAction: !!pendingActionRef.current,
-      });
-    }
 
     const shouldExecute = canExecutePurchaseAction(
       isWaitingForPurchaseRef.current,
@@ -93,14 +61,7 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
       !!pendingActionRef.current
     );
 
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[FeatureGate] canExecutePurchaseAction:", shouldExecute);
-    }
-
     if (shouldExecute) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[FeatureGate] ✅ EXECUTING PENDING ACTION after purchase!");
-      }
       const action = pendingActionRef.current!;
       pendingActionRef.current = null;
       isWaitingForPurchaseRef.current = false;

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

@@ -1,10 +1,12 @@
 import { useQuery, useQueryClient } from "@umituz/react-native-design-system";
-import { useEffect, useRef } from "react";
+import { useEffect } from "react";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
 import { SubscriptionManager } from "../infrastructure/managers/SubscriptionManager";
 import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
 import { SubscriptionStatusResult } from "./useSubscriptionStatus.types";
 import { isAuthenticated } from "../utils/authGuards";
+import { NO_CACHE_QUERY_CONFIG } from "../../../shared/infrastructure/react-query/queryConfig";
+import { usePreviousUserCleanup } from "../../../shared/infrastructure/react-query/hooks/usePreviousUserCleanup";
 
 export const subscriptionStatusQueryKeys = {
   all: ["subscriptionStatus"] as const,
@@ -38,27 +40,11 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
       }
     },
     enabled: queryEnabled,
-    gcTime: 0,
-    staleTime: 0,
-    refetchOnMount: "always",
-    refetchOnWindowFocus: "always",
-    refetchOnReconnect: "always",
+    ...NO_CACHE_QUERY_CONFIG,
   });
 
-  // 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: subscriptionStatusQueryKeys.user(prevUserId),
-      });
-    }
-  }, [userId, queryClient]);
+  // Clean up previous user's cache on logout/user switch
+  usePreviousUserCleanup(userId, queryClient, subscriptionStatusQueryKeys.user);
 
   useEffect(() => {
     if (!isAuthenticated(userId)) return undefined;

package/src/domains/subscription/utils/authGuards.ts

@@ -1,5 +1,29 @@
 import { isDefined } from "../../../shared/utils/validators";
 
-export const isAuthenticated = (userId: string | null | undefined): userId is string => {
+export function isAuthenticated(userId: string | null | undefined): userId is string {
   return isDefined(userId) && userId.length > 0;
-};
+}
+
+/**
+ * Requires user to be authenticated, throws if not
+ * Type guard that asserts userId is string
+ *
+ * @param userId - User ID to check
+ * @param errorMessage - Custom error message (optional)
+ * @throws Error if user is not authenticated
+ *
+ * @example
+ * function purchaseProduct(userId: string | null) {
+ *   requireAuthentication(userId); // throws if null/undefined
+ *   // TypeScript now knows userId is string
+ *   await purchase(userId);
+ * }
+ */
+export function requireAuthentication(
+  userId: string | null | undefined,
+  errorMessage = "User not authenticated"
+): asserts userId is string {
+  if (!isAuthenticated(userId)) {
+    throw new Error(errorMessage);
+  }
+}

package/src/domains/subscription/utils/expirationHelpers.ts

@@ -1,5 +1,5 @@
-const DAYS_REMAINING_WARNING_THRESHOLD = 7;
+import { EXPIRATION_WARNING_THRESHOLD_DAYS } from '../constants/thresholds';
 
 export function shouldHighlightExpiration(daysRemaining: number | null | undefined): boolean {
-  return daysRemaining !== null && daysRemaining !== undefined && daysRemaining > 0 && daysRemaining <= DAYS_REMAINING_WARNING_THRESHOLD;
+  return daysRemaining !== null && daysRemaining !== undefined && daysRemaining > 0 && daysRemaining <= EXPIRATION_WARNING_THRESHOLD_DAYS;
 }

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

@@ -1,5 +1,6 @@
 import { useQuery } from "@umituz/react-native-design-system";
 import { useMemo } from "react";
+import { NO_CACHE_QUERY_CONFIG } from "../../../../shared/infrastructure/react-query/queryConfig";
 import type {
   ProductMetadata,
   ProductMetadataConfig,
@@ -34,7 +35,7 @@ export function useProductMetadata({
 }: UseProductMetadataParams): UseProductMetadataResult {
   const service = useMemo(
     () => new ProductMetadataService(config),
-    [config.collectionName, config.cacheTTL]
+    [config]
   );
 
   const queryKey = type
@@ -50,11 +51,7 @@ export function useProductMetadata({
       return service.getAll();
     },
     enabled,
-    gcTime: 0,
-    staleTime: 0,
-    refetchOnMount: "always",
-    refetchOnWindowFocus: "always",
-    refetchOnReconnect: "always",
+    ...NO_CACHE_QUERY_CONFIG,
   });
 
   const products = data ?? [];

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

@@ -1,6 +1,7 @@
 import { useQuery } from "@umituz/react-native-design-system";
 import { useMemo } from "react";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
+import { NO_CACHE_QUERY_CONFIG } from "../../../../shared/infrastructure/react-query/queryConfig";
 import type {
   CreditLog,
   TransactionRepositoryConfig,
@@ -33,7 +34,7 @@ export function useTransactionHistory({
 
   const repository = useMemo(
     () => new TransactionRepository(config),
-    [config.collectionName, config.useUserSubcollection]
+    [config]
   );
 
   const { data, isLoading, error, refetch } = useQuery({
@@ -53,11 +54,7 @@ export function useTransactionHistory({
       return result.data ?? [];
     },
     enabled: !!userId,
-    gcTime: 0,
-    staleTime: 0,
-    refetchOnMount: "always",
-    refetchOnWindowFocus: "always",
-    refetchOnReconnect: "always",
+    ...NO_CACHE_QUERY_CONFIG,
   });
 
   const transactions = data ?? [];