@umituz/react-native-subscription 2.43.7 → 2.43.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.43.7",
+  "version": "2.43.9",
   "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/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/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/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;
-}