@umituz/react-native-subscription 2.14.44 → 2.14.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.14.44",
+  "version": "2.14.45",
   "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/domain/entities/SubscriptionStatus.test.ts

@@ -2,7 +2,6 @@
  * Tests for Subscription Status Entity
  */
 
-import {
   createDefaultSubscriptionStatus,
   isSubscriptionValid,
 } from './SubscriptionStatus';

package/src/domains/paywall/components/PaywallHeader.tsx

@@ -6,7 +6,6 @@
 import React from "react";
 import { View, StyleSheet, TouchableOpacity } from "react-native";
 import { LinearGradient } from "expo-linear-gradient";
-import {
     AtomicText,
     AtomicIcon,
     useDesignSystemTheme,

package/src/domains/wallet/domain/entities/CreditCost.ts

@@ -7,7 +7,6 @@
 
 import type { AICreditCosts } from "../types/credit-cost.types";
 
-import {
   DEFAULT_AI_CREDIT_COSTS,
   createCreditCostConfig,
 } from "../types/credit-cost.types";

package/src/domains/wallet/infrastructure/repositories/TransactionRepository.ts

@@ -5,7 +5,6 @@
  * Generic repository for use across hundreds of apps.
  */
 
-import {
   collection,
   getDocs,
   addDoc,

package/src/domains/wallet/presentation/components/BalanceCard.tsx

@@ -8,7 +8,6 @@
 import React from "react";
 import { View, StyleSheet } from "react-native";
 import { LinearGradient } from "expo-linear-gradient";
-import {
   useAppDesignTokens,
   AtomicText,
   AtomicIcon,

package/src/domains/wallet/presentation/components/TransactionItem.tsx

@@ -7,7 +7,6 @@
 
 import React, { useMemo } from "react";
 import { View, StyleSheet } from "react-native";
-import {
   useAppDesignTokens,
   AtomicText,
   AtomicIcon,

package/src/domains/wallet/presentation/components/TransactionList.tsx

@@ -7,13 +7,11 @@
 
 import React from "react";
 import { View, StyleSheet, ScrollView, ActivityIndicator } from "react-native";
-import {
   useAppDesignTokens,
   AtomicText,
   AtomicIcon,
 } from "@umituz/react-native-design-system";
 import type { CreditLog } from "../../domain/types/transaction.types";
-import {
   TransactionItem,
   type TransactionItemTranslations,
 } from "./TransactionItem";

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

@@ -6,11 +6,9 @@
  */
 
 import { useCallback, useMemo } from "react";
-import {
   useCredits,
   type UseCreditsParams,
 } from "../../../../presentation/hooks/useCredits";
-import {
   useTransactionHistory,
   type UseTransactionHistoryParams,
 } from "./useTransactionHistory";

package/src/domains/wallet/presentation/screens/WalletScreen.tsx

@@ -9,17 +9,14 @@
 import React from "react";
 import { View, StyleSheet, ActivityIndicator, TouchableOpacity } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import {
   useAppDesignTokens,
   AtomicText,
   AtomicIcon,
   ScreenLayout,
 } from "@umituz/react-native-design-system";
-import {
   BalanceCard,
   type BalanceCardTranslations,
 } from "../components/BalanceCard";
-import {
   TransactionList,
   type TransactionListTranslations,
 } from "../components/TransactionList";

package/src/index.ts

@@ -464,3 +464,4 @@ export {
   useRestorePurchase,
   SUBSCRIPTION_QUERY_KEYS,
 } from "./revenuecat/presentation/hooks/useSubscriptionQueries";
+export { usePaywallFlow, type UsePaywallFlowOptions, type UsePaywallFlowResult } from './revenuecat/presentation/hooks/usePaywallFlow';

package/src/infrastructure/repositories/CreditsRepository.ts

@@ -6,7 +6,6 @@
  * Extends BaseRepository from @umituz/react-native-firebase.
  */
 
-import {
   doc,
   getDoc,
   runTransaction,

package/src/infrastructure/services/CreditsInitializer.ts

@@ -1,5 +1,4 @@
 
-import {
     runTransaction,
     serverTimestamp,
     type Firestore,

package/src/infrastructure/services/SubscriptionService.ts

@@ -7,12 +7,10 @@ import type { ISubscriptionService } from "../../application/ports/ISubscription
 import type { ISubscriptionRepository } from "../../application/ports/ISubscriptionRepository";
 import type { SubscriptionStatus } from "../../domain/entities/SubscriptionStatus";
 import { createDefaultSubscriptionStatus } from "../../domain/entities/SubscriptionStatus";
-import {
   SubscriptionRepositoryError,
   SubscriptionValidationError,
 } from "../../domain/errors/SubscriptionError";
 import type { SubscriptionConfig } from "../../domain/value-objects/SubscriptionConfig";
-import {
   activateSubscription,
   deactivateSubscription,
   type ActivationHandlerConfig,

package/src/presentation/components/feedback/PaywallFeedbackModal.tsx

@@ -4,7 +4,6 @@
  */
 
 import React, { useMemo } from "react";
-import {
     View,
     Modal,
     TouchableOpacity,

package/src/presentation/components/sections/SubscriptionSection.tsx

@@ -7,7 +7,6 @@
 import React from "react";
 import { View, TouchableOpacity } from "react-native";
 import type { StyleProp, ViewStyle } from "react-native";
-import {
   PremiumDetailsCard,
   type CreditInfo,
   type PremiumDetailsTranslations,

package/src/presentation/hooks/useCreditChecker.ts

@@ -7,7 +7,6 @@
 import { useMemo } from "react";
 import type { CreditType } from "../../domain/entities/Credits";
 import { getCreditsRepository } from "../../infrastructure/repositories/CreditsRepositoryProvider";
-import {
   createCreditChecker,
   type CreditCheckResult,
 } from "../../utils/creditChecker";

package/src/presentation/hooks/useCredits.ts

@@ -10,7 +10,6 @@ import { useCallback, useMemo } from "react";
 import type { UserCredits, CreditType } from "../../domain/entities/Credits";
 
 declare const __DEV__: boolean;
-import {
   getCreditsRepository,
   getCreditsConfig,
   isCreditsRepositoryConfigured,

package/src/presentation/hooks/usePremium.ts

@@ -12,7 +12,6 @@ import type { PurchasesPackage } from 'react-native-purchases';
 import type { UserCredits } from '../../domain/entities/Credits';
 import { useCredits } from './useCredits';
 import { useSubscriptionStatus } from './useSubscriptionStatus';
-import {
   useSubscriptionPackages,
   usePurchasePackage,
   useRestorePurchase,

package/src/presentation/hooks/useSubscriptionDetails.ts

@@ -5,7 +5,6 @@
 
 import { useMemo } from "react";
 import type { SubscriptionStatus } from "../../domain/entities/SubscriptionStatus";
-import {
   getDaysUntilExpiration,
   isSubscriptionExpired,
 } from "../../utils/dateValidationUtils";

package/src/presentation/hooks/useSubscriptionSettingsConfig.ts

@@ -10,7 +10,6 @@ import { useSubscriptionStatus } from "./useSubscriptionStatus";
 import { useCustomerInfo } from "../../revenuecat/presentation/hooks/useCustomerInfo";
 import { usePaywallVisibility } from "./usePaywallVisibility";
 import { SubscriptionManager } from "../../revenuecat/infrastructure/managers/SubscriptionManager";
-import {
   convertPurchasedAt,
   formatDateForLocale,
   calculateDaysRemaining,

package/src/presentation/screens/SubscriptionDetailScreen.tsx

@@ -6,7 +6,6 @@
 
 import React, { useMemo } from "react";
 import { StyleSheet, View } from "react-native";
-import {
   useAppDesignTokens,
   ScreenLayout,
 } from "@umituz/react-native-design-system";

package/src/presentation/screens/components/UpgradePrompt.tsx

@@ -5,7 +5,6 @@
 
 import React, { useMemo } from "react";
 import { View, StyleSheet, TouchableOpacity } from "react-native";
-import {
   useAppDesignTokens,
   AtomicText,
   AtomicIcon,

package/src/revenuecat/infrastructure/handlers/PackageHandler.ts

@@ -6,7 +6,6 @@
 import type { PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService } from "../../application/ports/IRevenueCatService";
 import { getPremiumEntitlement } from "../../domain/types/RevenueCatTypes";
-import {
 
 export interface PremiumStatus {
   isPremium: boolean;
@@ -49,26 +48,22 @@ export class PackageHandler {
         });
       }
 
-        identifier: offering?.identifier,
-        count: offering?.availablePackages?.length ?? 0,
-      });
-
       return offering?.availablePackages ?? [];
     } catch (error) {
       if (__DEV__) {
         console.error('[DEBUG PackageHandler] fetchOfferings failed:', error);
       }
-        packageName: "subscription",
-        operation: "fetch_packages",
-      });
       return [];
     }
   }
 
   async purchase(pkg: PurchasesPackage, userId: string): Promise<boolean> {
     if (!this.service?.isInitialized()) {
-        productId: pkg.product.identifier,
-      });
+      if (__DEV__) {
+        console.log('[DEBUG PackageHandler] Service not initialized', {
+          productId: pkg.product.identifier,
+        });
+      }
       return false;
     }
 
@@ -76,11 +71,12 @@ export class PackageHandler {
       const result = await this.service.purchasePackage(pkg, userId);
       return result.success;
     } catch (error) {
-        packageName: "subscription",
-        operation: "purchase",
-        userId,
-        productId: pkg.product.identifier,
-      });
+      if (__DEV__) {
+        console.error('[DEBUG PackageHandler] Purchase failed:', {
+          error,
+          productId: pkg.product.identifier,
+        });
+      }
       return false;
     }
   }
@@ -107,10 +103,12 @@ export class PackageHandler {
 
       return { success: result.success, productId };
     } catch (error) {
-        packageName: "subscription",
-        operation: "restore",
-        userId,
-      });
+      if (__DEV__) {
+        console.error('[DEBUG PackageHandler] Restore failed:', {
+          error,
+          userId,
+        });
+      }
       return { success: false, productId: null };
     }
   }

package/src/revenuecat/infrastructure/managers/SubscriptionManager.ts

@@ -12,7 +12,6 @@ import { UserIdProvider } from "../utils/UserIdProvider";
 import { InitializationCache } from "../utils/InitializationCache";
 import { PackageHandler } from "../handlers/PackageHandler";
 import type { PremiumStatus, RestoreResultInfo } from "../handlers/PackageHandler";
-import {
 
 export interface SubscriptionManagerConfig {
   config: RevenueCatConfig;
@@ -35,16 +34,22 @@ class SubscriptionManagerImpl {
       this.userIdProvider.configure(config.getAnonymousUserId);
     }
 
-      entitlementId: config.config.entitlementIdentifier,
-    });
+    if (__DEV__) {
+      console.log('[DEBUG SubscriptionManager] Configured:', {
+        entitlementId: config.config.entitlementIdentifier,
+      });
+    }
   }
 
   private ensureConfigured(): void {
     if (!this.managerConfig || !this.packageHandler) {
       const error = new Error("SubscriptionManager not configured");
-        packageName: "subscription",
-        operation: "ensure_configured",
-      });
+      if (__DEV__) {
+        console.error('[DEBUG SubscriptionManager] Not configured:', {
+          hasConfig: !!this.managerConfig,
+          hasHandler: !!this.packageHandler,
+        });
+      }
       throw error;
     }
   }
@@ -66,10 +71,12 @@ class SubscriptionManagerImpl {
       const result = await this.serviceInstance.initialize(userId);
       return result.success;
     } catch (error) {
-        packageName: "subscription",
-        operation: "initialize",
-        userId,
-      });
+      if (__DEV__) {
+        console.error('[DEBUG SubscriptionManager] Initialization failed:', {
+          error,
+          userId,
+        });
+      }
       throw error;
     }
   }

package/src/revenuecat/infrastructure/services/OfferingsFetcher.ts

@@ -4,7 +4,6 @@
  */
 
 import Purchases, { type PurchasesOffering } from "react-native-purchases";
-import {
 
 export interface OfferingsFetcherDeps {
   isInitialized: () => boolean;

package/src/revenuecat/infrastructure/services/PurchaseHandler.ts

@@ -5,20 +5,16 @@
 
 import Purchases, { type PurchasesPackage } from "react-native-purchases";
 import type { PurchaseResult } from '../../application/ports/IRevenueCatService';
-import {
   RevenueCatPurchaseError,
   RevenueCatInitializationError,
 } from '../../domain/errors/RevenueCatError';
 import type { RevenueCatConfig } from '../../domain/value-objects/RevenueCatConfig';
-import {
   isUserCancelledError,
   getErrorMessage,
 } from '../../domain/types/RevenueCatTypes';
-import {
   syncPremiumStatus,
   notifyPurchaseCompleted,
 } from '../utils/PremiumStatusSyncer';
-import {
 
 export interface PurchaseHandlerDeps {
   config: RevenueCatConfig;

package/src/revenuecat/infrastructure/services/RestoreHandler.ts

@@ -5,17 +5,14 @@
 
 import Purchases from "react-native-purchases";
 import type { RestoreResult } from '../../application/ports/IRevenueCatService';
-import {
   RevenueCatRestoreError,
   RevenueCatInitializationError,
 } from '../../domain/errors/RevenueCatError';
 import type { RevenueCatConfig } from '../../domain/value-objects/RevenueCatConfig';
 import { getErrorMessage } from '../../domain/types/RevenueCatTypes';
-import {
   syncPremiumStatus,
   notifyRestoreCompleted,
 } from '../utils/PremiumStatusSyncer';
-import {
 
 export interface RestoreHandlerDeps {
   config: RevenueCatConfig;

package/src/revenuecat/infrastructure/services/RevenueCatInitializer.ts

@@ -8,7 +8,6 @@ import type { InitializeResult } from '../../application/ports/IRevenueCatServic
 import type { RevenueCatConfig } from '../../domain/value-objects/RevenueCatConfig';
 import { getErrorMessage } from '../../domain/types/RevenueCatTypes';
 import { resolveApiKey } from '../utils/ApiKeyResolver';
-import {
 
 export interface InitializerDeps {
   config: RevenueCatConfig;

package/src/revenuecat/infrastructure/services/RevenueCatService.ts

@@ -19,7 +19,6 @@ import { handlePurchase } from "./PurchaseHandler";
 import { handleRestore } from "./RestoreHandler";
 import { CustomerInfoListenerManager } from "./CustomerInfoListenerManager";
 import { ServiceStateManager } from "./ServiceStateManager";
-import {
 
 export class RevenueCatService implements IRevenueCatService {
   private stateManager: ServiceStateManager;

package/src/revenuecat/infrastructure/utils/PremiumStatusSyncer.ts

@@ -7,7 +7,6 @@ import type { CustomerInfo } from "react-native-purchases";
 import type { RevenueCatConfig } from '../../domain/value-objects/RevenueCatConfig';
 import { getPremiumEntitlement } from '../../domain/types/RevenueCatTypes';
 import { getExpirationDate } from "./ExpirationDateCalculator";
-import {
 
 export async function syncPremiumStatus(
   config: RevenueCatConfig,

package/src/revenuecat/infrastructure/utils/UserIdProvider.ts

@@ -3,7 +3,6 @@
  * Manages user ID retrieval (anonymous or authenticated)
  */
 
-import {
 
 export class UserIdProvider {
   private cachedAnonUserId: string | null = null;

package/src/revenuecat/presentation/hooks/useCustomerInfo.ts

@@ -66,27 +66,28 @@ export function useCustomerInfo(): UseCustomerInfoResult {
       setIsFetching(true);
       setError(null);
 
-
       // SDK returns cached data instantly if available
       // Network fetch happens in background automatically
       const info = await Purchases.getCustomerInfo();
 
       setCustomerInfo(info);
 
-        hasActiveEntitlements: Object.keys(info.entitlements.active).length > 0,
-        latestExpiration: info.latestExpirationDate || "none",
-      });
+      if (__DEV__) {
+        console.log('[DEBUG useCustomerInfo] Fetched:', {
+          hasActiveEntitlements: Object.keys(info.entitlements.active).length > 0,
+          latestExpiration: info.latestExpirationDate || "none",
+        });
+      }
     } catch (err) {
       const errorMessage =
         err instanceof Error ? err.message : "Failed to fetch customer info";
       setError(errorMessage);
 
-        err instanceof Error ? err : new Error(String(err)),
-        {
-          packageName: "subscription",
-          operation: "fetch_customer_info",
-        }
-      );
+      if (__DEV__) {
+        console.error('[DEBUG useCustomerInfo] Error:', {
+          error: err,
+        });
+      }
     } finally {
       setLoading(false);
       setIsFetching(false);
@@ -99,8 +100,11 @@ export function useCustomerInfo(): UseCustomerInfoResult {
 
     // Listen for real-time updates (renewals, purchases, restore)
     const listener = (info: CustomerInfo) => {
-        hasActiveEntitlements: Object.keys(info.entitlements.active).length > 0,
-      });
+      if (__DEV__) {
+        console.log('[DEBUG useCustomerInfo] Listener update:', {
+          hasActiveEntitlements: Object.keys(info.entitlements.active).length > 0,
+        });
+      }
 
       setCustomerInfo(info);
       setError(null);

package/src/revenuecat/presentation/hooks/useInitializeSubscription.ts

@@ -5,7 +5,6 @@
 
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { SubscriptionManager } from '../../infrastructure/managers/SubscriptionManager';
-import {
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 
 /**
@@ -20,8 +19,9 @@ export const useInitializeSubscription = (userId: string | undefined) => {
         throw new Error("User not authenticated");
       }
 
-        userId,
-      });
+      if (__DEV__) {
+        console.log('[DEBUG useInitializeSubscription] Initializing:', { userId });
+      }
 
       return SubscriptionManager.initialize(userId);
     },
@@ -31,20 +31,18 @@ export const useInitializeSubscription = (userId: string | undefined) => {
           queryKey: SUBSCRIPTION_QUERY_KEYS.packages,
         });
 
-          "subscription",
-          "Initialize mutation success - packages invalidated",
-          { userId }
-        );
+        if (__DEV__) {
+          console.log('[DEBUG useInitializeSubscription] Success:', { userId });
+        }
       }
     },
     onError: (error) => {
-        error instanceof Error ? error : new Error(String(error)),
-        {
-          packageName: "subscription",
-          operation: "initialize_mutation",
+      if (__DEV__) {
+        console.error('[DEBUG useInitializeSubscription] Error:', {
+          error,
           userId: userId ?? "ANONYMOUS",
-        }
-      );
+        });
+      }
     },
   });
 };

package/src/revenuecat/presentation/hooks/usePaywallFlow.ts

@@ -0,0 +1,62 @@
+/**
+ * Paywall Flow Hook
+ * Manages post-onboarding paywall state with persistence
+ */
+
+import { useState, useEffect, useCallback } from 'react';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+
+const PAYWALL_SHOWN_KEY = 'post_onboarding_paywall_shown';
+
+export interface UsePaywallFlowOptions {
+  showAfterOnboarding?: boolean;
+}
+
+export interface UsePaywallFlowResult {
+  showPostOnboardingPaywall: boolean;
+  paywallShown: boolean;
+  closePostOnboardingPaywall: (isPremium: boolean) => Promise<void>;
+  hidePostOnboardingPaywall: () => void;
+  markPaywallShown: () => Promise<void>;
+  setShowPostOnboardingPaywall: (show: boolean) => void;
+}
+
+export const usePaywallFlow = (options: UsePaywallFlowOptions = {}): UsePaywallFlowResult => {
+  const { showAfterOnboarding = false } = options;
+  const [showPostOnboardingPaywall, setShowPostOnboardingPaywall] = useState(showAfterOnboarding);
+  const [paywallShown, setPaywallShown] = useState(false);
+
+  // Load persisted state
+  useEffect(() => {
+    const loadPersistedState = async () => {
+      const value = await AsyncStorage.getItem(PAYWALL_SHOWN_KEY);
+      setPaywallShown(value === 'true');
+    };
+
+    loadPersistedState();
+  }, []);
+
+  const closePostOnboardingPaywall = useCallback(async (isPremium: boolean) => {
+    await AsyncStorage.setItem(PAYWALL_SHOWN_KEY, 'true');
+    setShowPostOnboardingPaywall(false);
+    setPaywallShown(true);
+  }, []);
+
+  const hidePostOnboardingPaywall = useCallback(() => {
+    setShowPostOnboardingPaywall(false);
+  }, []);
+
+  const markPaywallShown = useCallback(async () => {
+    await AsyncStorage.setItem(PAYWALL_SHOWN_KEY, 'true');
+    setPaywallShown(true);
+  }, []);
+
+  return {
+    showPostOnboardingPaywall,
+    paywallShown,
+    closePostOnboardingPaywall,
+    hidePostOnboardingPaywall,
+    markPaywallShown,
+    setShowPostOnboardingPaywall,
+  };
+};

package/src/revenuecat/presentation/hooks/usePurchasePackage.ts

@@ -7,7 +7,6 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import type { PurchasesPackage } from "react-native-purchases";
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
-import {
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { creditsQueryKeys } from "../../../presentation/hooks/useCredits";
 
@@ -31,23 +30,32 @@ export const usePurchasePackage = (userId: string | undefined) => {
 
       const productId = pkg.product.identifier;
 
-        packageId: pkg.identifier,
-        productId,
-        userId,
-      });
-
-      const success = await SubscriptionManager.purchasePackage(pkg);
-
-      if (success) {
+      if (__DEV__) {
+        console.log('[DEBUG usePurchasePackage] Starting purchase:', {
           packageId: pkg.identifier,
           productId,
           userId,
         });
+      }
+
+      const success = await SubscriptionManager.purchasePackage(pkg);
+
+      if (success) {
+        if (__DEV__) {
+          console.log('[DEBUG usePurchasePackage] Purchase successful:', {
+            packageId: pkg.identifier,
+            productId,
+            userId,
+          });
+        }
         // Credits will be initialized by CustomerInfoListener
       } else {
-          packageId: pkg.identifier,
-          userId,
-        });
+        if (__DEV__) {
+          console.log('[DEBUG usePurchasePackage] Purchase failed:', {
+            packageId: pkg.identifier,
+            userId,
+          });
+        }
       }
 
       return { success, productId };
@@ -65,13 +73,12 @@ export const usePurchasePackage = (userId: string | undefined) => {
       }
     },
     onError: (error) => {
-        error instanceof Error ? error : new Error(String(error)),
-        {
-          packageName: "subscription",
-          operation: "purchase_mutation",
+      if (__DEV__) {
+        console.error('[DEBUG usePurchasePackage] Purchase mutation failed:', {
+          error,
           userId: userId ?? "ANONYMOUS",
-        }
-      );
+        });
+      }
     },
   });
 };

package/src/revenuecat/presentation/hooks/useRestorePurchase.ts

@@ -6,7 +6,6 @@
 
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
-import {
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { creditsQueryKeys } from "../../../presentation/hooks/useCredits";
 
@@ -28,19 +27,24 @@ export const useRestorePurchase = (userId: string | undefined) => {
         throw new Error("User not authenticated");
       }
 
-        userId,
-      });
+      if (__DEV__) {
+        console.log('[DEBUG useRestorePurchase] Starting restore:', { userId });
+      }
 
       const result = await SubscriptionManager.restore();
 
       if (result.success) {
-          userId,
-          productId: result.productId,
-        });
+        if (__DEV__) {
+          console.log('[DEBUG useRestorePurchase] Restore successful:', {
+            userId,
+            productId: result.productId,
+          });
+        }
         // Credits will be initialized by CustomerInfoListener
       } else {
-          userId,
-        });
+        if (__DEV__) {
+          console.log('[DEBUG useRestorePurchase] Restore failed:', { userId });
+        }
       }
 
       return result;
@@ -58,13 +62,12 @@ export const useRestorePurchase = (userId: string | undefined) => {
       }
     },
     onError: (error) => {
-        error instanceof Error ? error : new Error(String(error)),
-        {
-          packageName: "subscription",
-          operation: "restore_mutation",
+      if (__DEV__) {
+        console.error('[DEBUG useRestorePurchase] Restore mutation failed:', {
+          error,
           userId: userId ?? "ANONYMOUS",
-        }
-      );
+        });
+      }
     },
   });
 };

package/src/revenuecat/presentation/hooks/useSubscriptionPackages.ts

@@ -32,9 +32,6 @@ export const useSubscriptionPackages = (userId: string | undefined) => {
         console.log('[DEBUG useSubscriptionPackages] QueryFn executing...', { userId: userId || 'ANONYMOUS' });
       }
 
-        userId: userId ?? "ANONYMOUS",
-      });
-
       // Initialize if needed (works for both authenticated and anonymous users)
       try {
         if (userId) {
@@ -83,10 +80,6 @@ export const useSubscriptionPackages = (userId: string | undefined) => {
         });
       }
 
-        userId: userId ?? "ANONYMOUS",
-        count: packages.length,
-      });
-
       return packages;
     },
     staleTime: STALE_TIME,

package/src/utils/__tests__/authUtils.test.ts

@@ -4,7 +4,6 @@
  * Tests for authentication check functions
  */
 
-import {
   isAuthenticated,
   isGuest,
 } from '../authUtils';

package/src/utils/__tests__/dateValidationUtils.test.ts

@@ -2,7 +2,6 @@
  * Tests for Date Validation Utilities
  */
 
-import {
   isSubscriptionExpired,
   getDaysUntilExpiration,
 } from '../dateValidationUtils';

package/src/utils/__tests__/edgeCases.test.ts

@@ -4,10 +4,8 @@
  * Tests for edge cases and special scenarios
  */
 
-import {
   getUserTierInfo,
 } from '../tierUtils';
-import {
   isAuthenticated,
   isGuest,
 } from '../authUtils';

package/src/utils/__tests__/premiumUtils.test.ts

@@ -4,10 +4,8 @@
  * Tests for premium status fetching and async functions
  */
 
-import {
   getIsPremium,
 } from '../premiumStatusUtils';
-import {
   getUserTierInfoAsync,
   checkPremiumAccessAsync,
 } from '../premiumAsyncUtils';

package/src/utils/__tests__/tierUtils.test.ts

@@ -4,11 +4,9 @@
  * Tests for tier determination and comparison functions
  */
 
-import {
   getUserTierInfo,
   checkPremiumAccess,
 } from '../tierUtils';
-import {
   hasTierAccess,
   isTierPremium,
   isTierFreemium,

package/src/utils/__tests__/validation.test.ts

@@ -4,7 +4,6 @@
  * Tests for validation functions and type guards
  */
 
-import {
   isValidUserTier,
   isUserTierInfo,
   validateUserId,