@umituz/react-native-subscription 2.41.7 → 2.41.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.41.7",
+  "version": "2.41.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/application/RefundCreditsCommand.ts

@@ -41,7 +41,8 @@ export async function refundCreditsOperation(
 
       const data = docSnap.data();
       const current = data.credits as number;
-      const creditLimit = (data.creditLimit as number) ?? Infinity;
+      // If creditLimit is null, use the refund amount as the limit to prevent unlimited credits
+      const creditLimit = (data.creditLimit as number) ?? (current + amount);
       const updated = Math.min(current + amount, creditLimit);
 
       tx.update(creditsRef, {

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

@@ -63,11 +63,13 @@ export const useDeductCredit = ({
       }
       return false;
     } catch (error) {
-      console.error('[useDeductCredit] Unexpected error during credit refund', {
-        amount,
-        userId,
-        error: error instanceof Error ? error.message : String(error),
-      });
+      if (__DEV__) {
+        console.error('[useDeductCredit] Unexpected error during credit refund', {
+          amount,
+          userId,
+          error: error instanceof Error ? error.message : String(error),
+        });
+      }
       return false;
     }
   }, [userId, repository, queryClient]);

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

@@ -2,7 +2,7 @@ import { useQuery, useQueryClient } from "@umituz/react-native-design-system/tan
 import { useCallback, useMemo, useEffect } from "react";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
 import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
-import { NO_CACHE_QUERY_CONFIG } from "../../../shared/infrastructure/react-query/queryConfig";
+import { SHORT_CACHE_CONFIG } from "../../../shared/infrastructure/react-query/queryConfig";
 import { usePreviousUserCleanup } from "../../../shared/infrastructure/react-query/hooks/usePreviousUserCleanup";
 import {
   getCreditsRepository,
@@ -13,6 +13,7 @@ import { calculateSafePercentage, canAffordAmount } from "../utils/creditValidat
 import { isAuthenticated } from "../../subscription/utils/authGuards";
 import { creditsQueryKeys } from "./creditsQueryKeys";
 import type { UseCreditsResult, CreditsLoadStatus } from "./useCredits.types";
+import type { UserCredits } from "../core/Credits";
 
 const deriveLoadStatus = (
   queryStatus: "pending" | "error" | "success",
@@ -32,7 +33,7 @@ export const useCredits = (): UseCreditsResult => {
   const hasUser = isAuthenticated(userId);
   const queryEnabled = hasUser && isConfigured;
 
-  const { data, status, error, refetch } = useQuery({
+  const { data, status, error, refetch } = useQuery<UserCredits | null, Error>({
     queryKey: creditsQueryKeys.user(userId),
     queryFn: async () => {
       if (!hasUser || !isConfigured) return null;
@@ -47,7 +48,7 @@ export const useCredits = (): UseCreditsResult => {
       return result.data ?? null;
     },
     enabled: queryEnabled,
-    ...NO_CACHE_QUERY_CONFIG,
+    ...SHORT_CACHE_CONFIG,
   });
 
   const queryClient = useQueryClient();

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

@@ -1,6 +1,6 @@
 import { useEffect, useCallback, useRef } from "react";
 import { usePremium } from "../../subscription/presentation/usePremium";
-import { useSubscriptionFlow } from "../../subscription/presentation/useSubscriptionFlow";
+import { useSubscriptionFlowStore } from "../../subscription/presentation/useSubscriptionFlow";
 import { usePaywallVisibility } from "../../subscription/presentation/usePaywallVisibility";
 import { PaywallTranslations, PaywallLegalUrls, SubscriptionFeature } from "../entities/types";
 
@@ -36,34 +36,39 @@ export function usePaywallOrchestrator({
   bestValueIdentifier = "yearly",
   creditsLabel,
 }: PaywallOrchestratorOptions) {
-  const { 
-    isPremium, 
-    packages, 
-    purchasePackage, 
-    restorePurchase 
+  const {
+    isPremium,
+    packages,
+    purchasePackage,
+    restorePurchase
   } = usePremium();
-  
-  const { 
-    state, 
-    markPaywallShown, 
-    closePostOnboardingPaywall, 
-    setShowFeedback 
-  } = useSubscriptionFlow();
-  
+
+  // 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);
+  const isAuthModalOpen = useSubscriptionFlowStore((state) => state.isAuthModalOpen);
+  const showFeedback = useSubscriptionFlowStore((state) => state.showFeedback);
+  const markPaywallShown = useSubscriptionFlowStore((state) => state.markPaywallShown);
+  const closePostOnboardingPaywall = useSubscriptionFlowStore((state) => state.closePostOnboardingPaywall);
+  const setShowFeedback = useSubscriptionFlowStore((state) => state.setShowFeedback);
+
   const { showPaywall, closePaywall } = usePaywallVisibility();
   const purchasedRef = useRef(false);
+  const hasNavigatedRef = useRef(false);
 
   const handleClose = useCallback(async () => {
     await closePostOnboardingPaywall();
     closePaywall();
-    
+
     // Trigger feedback if user declined and isn't premium
     if (!isPremium && !purchasedRef.current) {
       setTimeout(() => setShowFeedback(true), 300);
     }
-    
+
     purchasedRef.current = false;
-    
+    hasNavigatedRef.current = false;
+
     if (navigation.canGoBack()) {
       navigation.goBack();
     }
@@ -73,9 +78,9 @@ export function usePaywallOrchestrator({
     purchasedRef.current = true;
     await markPaywallShown();
     await closePostOnboardingPaywall();
-    
+
     onPurchaseSuccess?.();
-    
+
     if (navigation.canGoBack()) {
       navigation.goBack();
     }
@@ -84,16 +89,24 @@ export function usePaywallOrchestrator({
   useEffect(() => {
     if (!isNavReady || !isLocalizationReady) return;
 
-    const shouldShowPostOnboarding = 
-      state.isOnboardingComplete && 
-      state.showPostOnboardingPaywall && 
-      !state.paywallShown && 
-      !state.isAuthModalOpen && 
+    const shouldShowPostOnboarding =
+      isOnboardingComplete &&
+      showPostOnboardingPaywall &&
+      !paywallShown &&
+      !isAuthModalOpen &&
       !isPremium;
 
-    const shouldShowManual = showPaywall && !isPremium && !state.isAuthModalOpen;
+    const shouldShowManual = showPaywall && !isPremium && !isAuthModalOpen;
 
     if (shouldShowPostOnboarding || shouldShowManual) {
+      // Guard against double navigation in same render cycle
+      if (hasNavigatedRef.current) return;
+      hasNavigatedRef.current = true;
+
+      if (__DEV__) console.log('[usePaywallOrchestrator] 🚀 Navigating to Paywall', { 
+        source: shouldShowPostOnboarding ? "onboarding" : "manual" 
+      });
+
       navigation.navigate("PaywallScreen", {
         onClose: handleClose,
         translations,
@@ -117,14 +130,17 @@ export function usePaywallOrchestrator({
       if (showPaywall) {
         closePaywall();
       }
+    } else {
+      // Reset navigation flag if conditions no longer met
+      hasNavigatedRef.current = false;
     }
   }, [
     isNavReady,
     isLocalizationReady,
-    state.isOnboardingComplete,
-    state.showPostOnboardingPaywall,
-    state.paywallShown,
-    state.isAuthModalOpen,
+    isOnboardingComplete,
+    showPostOnboardingPaywall,
+    paywallShown,
+    isAuthModalOpen,
     isPremium,
     showPaywall,
     navigation,
@@ -144,12 +160,21 @@ export function usePaywallOrchestrator({
     onAuthRequired
   ]);
 
-  return { 
-    isPremium, 
-    packages, 
-    flowState: state,
+  const completeOnboarding = useSubscriptionFlowStore((state) => state.completeOnboarding);
+
+  return {
+    isPremium,
+    packages,
+    flowState: {
+      isOnboardingComplete,
+      showPostOnboardingPaywall,
+      paywallShown,
+      isAuthModalOpen,
+      showFeedback
+    },
     markPaywallShown,
     closePostOnboardingPaywall,
+    completeOnboarding,
     setShowFeedback
   };
 }

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

@@ -85,20 +85,28 @@ export async function processCustomerInfo(
   );
 
   if (renewalResult.isRenewal) {
+    if (!renewalResult.productId || !renewalResult.newExpirationDate) {
+      console.error('[CustomerInfoHandler] Invalid renewal state: missing productId or expirationDate');
+      return renewalState;
+    }
     await handleRenewal(
       userId,
-      renewalResult.productId!,
-      renewalResult.newExpirationDate!,
+      renewalResult.productId,
+      renewalResult.newExpirationDate,
       customerInfo,
       config.onRenewalDetected
     );
   }
 
   if (renewalResult.isPlanChange) {
+    if (!renewalResult.productId || !renewalResult.previousProductId) {
+      console.error('[CustomerInfoHandler] Invalid plan change state: missing productId(s)');
+      return renewalState;
+    }
     await handlePlanChange(
       userId,
-      renewalResult.productId!,
-      renewalResult.previousProductId!,
+      renewalResult.productId,
+      renewalResult.previousProductId,
       renewalResult.isUpgrade,
       customerInfo,
       config.onPlanChanged

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

@@ -49,10 +49,12 @@ export async function syncPremiumStatus(
         }
         return { success: true };
     } catch (error) {
-        console.error('[PremiumStatusSyncer] Premium status callback failed:', {
-            userId,
-            error: error instanceof Error ? error.message : String(error)
-        });
+        if (__DEV__) {
+            console.error('[PremiumStatusSyncer] Premium status callback failed:', {
+                userId,
+                error: error instanceof Error ? error.message : String(error)
+            });
+        }
 
         return {
             success: false,
@@ -85,6 +87,8 @@ export async function notifyRestoreCompleted(
     try {
         await config.onRestoreCompleted({ userId, isPremium, customerInfo });
     } catch (error) {
-        console.error('[PremiumStatusSyncer] Restore callback failed:', error instanceof Error ? error.message : String(error));
+        if (__DEV__) {
+            console.error('[PremiumStatusSyncer] Restore callback failed:', error instanceof Error ? error.message : String(error));
+        }
     }
 }

package/src/domains/subscription/presentation/components/ManagedSubscriptionFlow.tsx

@@ -104,7 +104,8 @@ const ManagedSubscriptionFlowInner = React.memo<ManagedSubscriptionFlowProps>(({
 
   const { 
     flowState, 
-    setShowFeedback 
+    setShowFeedback,
+    completeOnboarding 
   } = usePaywallOrchestrator({
     navigation,
     isNavReady,
@@ -165,7 +166,7 @@ const ManagedSubscriptionFlowInner = React.memo<ManagedSubscriptionFlowProps>(({
     return (
       <OnboardingScreen
         slides={onboarding.slides}
-        onComplete={flowState.completeOnboarding}
+        onComplete={completeOnboarding}
         showSkipButton={onboarding.showSkipButton ?? true}
         showBackButton={onboarding.showBackButton ?? true}
         showProgressBar={onboarding.showProgressBar ?? true}

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

@@ -105,6 +105,7 @@ export const useSubscriptionFlowStore = createStore<SubscriptionFlowState, Subsc
         status: SubscriptionFlowStatus.INITIALIZING,
         syncStatus: SyncStatus.IDLE,
         syncError: null,
+        isInitialized: false, // Reset isInitialized to allow fresh initialization
         isOnboardingComplete: false,
         showPostOnboardingPaywall: false,
         showFeedback: false,
@@ -114,22 +115,3 @@ export const useSubscriptionFlowStore = createStore<SubscriptionFlowState, Subsc
     },
   }),
 });
-
-/**
- * Hook for backward compatibility and easier consumption.
- * Provides a unified object structure matching the previous implementation.
- */
-export function useSubscriptionFlow(_userId?: string) {
-  const store = useSubscriptionFlowStore();
-  
-  return {
-    state: store,
-    completeOnboarding: store.completeOnboarding,
-    closePostOnboardingPaywall: store.closePostOnboardingPaywall,
-    closeFeedback: store.closeFeedback,
-    setAuthModalOpen: store.setAuthModalOpen,
-    markPaywallShown: store.markPaywallShown,
-    setShowFeedback: store.setShowFeedback,
-    resetFlow: store.resetFlow,
-  };
-}

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

@@ -6,7 +6,7 @@ import { initializationState } from "../infrastructure/state/initializationState
 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 { SHORT_CACHE_CONFIG } from "../../../shared/infrastructure/react-query/queryConfig";
 import { usePreviousUserCleanup } from "../../../shared/infrastructure/react-query/hooks/usePreviousUserCleanup";
 
 export const subscriptionStatusQueryKeys = {
@@ -43,7 +43,7 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
       return SubscriptionManager.checkPremiumStatus();
     },
     enabled: queryEnabled,
-    ...NO_CACHE_QUERY_CONFIG,
+    ...SHORT_CACHE_CONFIG,
   });
 
   usePreviousUserCleanup(userId, queryClient, subscriptionStatusQueryKeys.user);

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

@@ -1,7 +1,7 @@
 import { useQuery } from "@umituz/react-native-design-system/tanstack";
 import { useMemo } from "react";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
-import { NO_CACHE_QUERY_CONFIG } from "../../../../shared/infrastructure/react-query/queryConfig";
+import { MEDIUM_CACHE_CONFIG } from "../../../../shared/infrastructure/react-query/queryConfig";
 import type {
   CreditLog,
   TransactionRepositoryConfig,
@@ -56,7 +56,7 @@ export function useTransactionHistory({
       return result.data ?? [];
     },
     enabled: hasUser,
-    ...NO_CACHE_QUERY_CONFIG,
+    ...MEDIUM_CACHE_CONFIG,
   });
 
   const transactions = data ?? [];

package/src/index.ts

@@ -1,5 +1,23 @@
 // Domain Layer - Constants & Types
-export * from "./domains/subscription/core/SubscriptionConstants";
+export {
+  USER_TIER,
+  SUBSCRIPTION_STATUS,
+  PERIOD_TYPE,
+  PACKAGE_TYPE,
+  PLATFORM,
+  PURCHASE_SOURCE,
+  PURCHASE_TYPE,
+  ANONYMOUS_CACHE_KEY,
+} from "./domains/subscription/core/SubscriptionConstants";
+export type {
+  UserTierType,
+  SubscriptionStatusType,
+  PeriodType,
+  PackageType,
+  Platform,
+  PurchaseSource,
+  PurchaseType,
+} from "./domains/subscription/core/SubscriptionConstants";
 export type { SubscriptionMetadata } from "./domains/subscription/core/types/SubscriptionMetadata";
 export type { PremiumStatus } from "./domains/subscription/core/types/PremiumStatus";
 export type { CreditInfo } from "./domains/subscription/core/types/CreditInfo";
@@ -45,20 +63,33 @@ export { useDeductCredit } from "./domains/credits/presentation/deduct-credit/us
 export { useFeatureGate } from "./domains/subscription/presentation/useFeatureGate";
 export { usePaywallVisibility, paywallControl } from "./domains/subscription/presentation/usePaywallVisibility";
 export { usePremium } from "./domains/subscription/presentation/usePremium";
-export { useSubscriptionFlow, useSubscriptionFlowStore } from "./domains/subscription/presentation/useSubscriptionFlow";
+export { useSubscriptionFlowStore } from "./domains/subscription/presentation/useSubscriptionFlow";
 export type { SubscriptionFlowState, SubscriptionFlowActions, SubscriptionFlowStore } from "./domains/subscription/presentation/useSubscriptionFlow";
 export { useSubscriptionStatus } from "./domains/subscription/presentation/useSubscriptionStatus";
-export * from "./domains/subscription/presentation/useSubscriptionStatus.types";
-export * from "./presentation/hooks/feedback/usePaywallFeedback";
-export * from "./presentation/hooks/feedback/useFeedbackSubmit";
+export type { SubscriptionStatusResult } from "./domains/subscription/presentation/useSubscriptionStatus.types";
+export { usePaywallFeedback } from "./presentation/hooks/feedback/usePaywallFeedback";
+export {
+  usePaywallFeedbackSubmit,
+  useSettingsFeedbackSubmit,
+} from "./presentation/hooks/feedback/useFeedbackSubmit";
+export type {
+  UsePaywallFeedbackSubmitOptions,
+  SettingsFeedbackData,
+  UseSettingsFeedbackSubmitOptions,
+} from "./presentation/hooks/feedback/useFeedbackSubmit";
 
 // Presentation Layer - Components
-export * from "./domains/subscription/presentation/components/details/PremiumDetailsCard";
+export { PremiumDetailsCard } from "./domains/subscription/presentation/components/details/PremiumDetailsCard";
+export type {
+  PremiumDetailsTranslations,
+  PremiumDetailsCardProps,
+} from "./domains/subscription/presentation/components/details/PremiumDetailsCardTypes";
 export { PremiumStatusBadge } from "./domains/subscription/presentation/components/details/PremiumStatusBadge";
 export type { PremiumStatusBadgeProps } from "./domains/subscription/presentation/components/details/PremiumStatusBadge.types";
-export * from "./domains/subscription/presentation/components/sections/SubscriptionSection";
-export * from "./domains/subscription/presentation/components/feedback/PaywallFeedbackScreen";
-export * from "./domains/subscription/presentation/screens/SubscriptionDetailScreen";
+export { SubscriptionSection } from "./domains/subscription/presentation/components/sections/SubscriptionSection";
+export type { SubscriptionSectionProps } from "./domains/subscription/presentation/components/sections/SubscriptionSection.types";
+export { PaywallFeedbackScreen } from "./domains/subscription/presentation/components/feedback/PaywallFeedbackScreen";
+export type { PaywallFeedbackScreenProps } from "./domains/subscription/presentation/components/feedback/PaywallFeedbackScreen.types";
 export type {
   SubscriptionDetailConfig,
   SubscriptionDetailTranslations,
@@ -79,11 +110,47 @@ export type {
 } from "./domains/credits/core/Credits";
 
 // Utils
-export * from "./utils/creditMapper";
-export * from "./utils/packageTypeDetector";
-export * from "./utils/priceUtils";
-export * from "./utils/types";
-export * from "./utils/dateUtils";
+export {
+  getCreditAllocation,
+  createCreditAmountsFromPackages,
+} from "./utils/creditMapper";
+export {
+  isCreditPackage,
+  detectPackageType,
+} from "./utils/packageTypeDetector";
+export type { SubscriptionPackageType } from "./utils/packageTypeDetector";
+export {
+  formatPrice,
+  getBillingPeriodSuffix,
+  formatPriceWithPeriod,
+} from "./utils/priceUtils";
+export type { UserTierInfo, PremiumStatusFetcher } from "./utils/types";
+export type { DateLike } from "./utils/dateUtils.core";
+export {
+  isNow,
+  isPast,
+  isFuture,
+  isValidDate,
+  toSafeDate,
+  formatISO,
+  now,
+} from "./utils/dateUtils.core";
+export {
+  daysBetween,
+  daysUntil,
+  isSameDay,
+  isToday,
+} from "./utils/dateUtils.compare";
+export {
+  formatRelative,
+  formatShort,
+  formatLong,
+} from "./utils/dateUtils.format";
+export {
+  addDays,
+  addMonths,
+  addYears,
+} from "./utils/dateUtils.math";
 export { getAppVersion, validatePlatform } from "./utils/appUtils";
 export { toDate, toISOString, toTimestamp, getCurrentISOString } from "./shared/utils/dateConverter";
 

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

@@ -1,7 +1,41 @@
-export const NO_CACHE_QUERY_CONFIG = {
-  gcTime: 0,
-  staleTime: 0,
-  refetchOnMount: "always" as const,
-  refetchOnWindowFocus: "always" as const,
-  refetchOnReconnect: "always" as const,
+/**
+ * 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,
+};
+
+/** @deprecated Use SHORT_CACHE_CONFIG instead */
+export const NO_CACHE_QUERY_CONFIG = SHORT_CACHE_CONFIG;