@umituz/react-native-subscription 2.27.123 → 2.27.125

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.123",
+  "version": "2.27.125",
   "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/creditOperationUtils.ts

@@ -1,154 +1,75 @@
-/**
- * Credit Operation Utilities
- * Business logic for credit calculations and data building
- */
-
+import { Timestamp, serverTimestamp } from "firebase/firestore";
 import { resolveSubscriptionStatus } from "../../subscription/core/SubscriptionStatus";
 import { creditAllocationOrchestrator } from "./credit-strategies/CreditAllocationOrchestrator";
 import { isPast } from "../../../utils";
-import type { UserCreditsDocumentRead } from "../core/UserCreditsDocument";
-import type { InitializeCreditsMetadata } from "../../subscription/application/SubscriptionInitializerTypes";
-import { serverTimestamp } from "firebase/firestore";
-
-interface CalculateCreditsParams {
-    metadata: InitializeCreditsMetadata;
-    existingData: UserCreditsDocumentRead;
-    creditLimit: number;
-    purchaseId: string;
-}
-
-interface BuildCreditsDataParams {
-    existingData: UserCreditsDocumentRead;
-    newCredits: number;
-    creditLimit: number;
-    purchaseId: string;
-    metadata: InitializeCreditsMetadata;
-    purchaseHistory: any[];
-    platform: "ios" | "android";
+import { 
+  CalculateCreditsParams, 
+  BuildCreditsDataParams 
+} from "./creditOperationUtils.types";
+
+export function calculateNewCredits({ metadata, existingData, creditLimit, purchaseId }: CalculateCreditsParams): number {
+  const isPremium = metadata.isPremium;
+  const isExpired = metadata.expirationDate ? isPast(metadata.expirationDate) : false;
+  const status = resolveSubscriptionStatus({
+    isPremium,
+    willRenew: metadata.willRenew ?? false,
+    isExpired,
+    periodType: metadata.periodType ?? undefined,
+  });
+  const isStatusSync = purchaseId.startsWith("status_sync_");
+  return creditAllocationOrchestrator.allocate({
+    status,
+    isStatusSync,
+    existingData,
+    creditLimit,
+    isSubscriptionActive: isPremium && !isExpired,
+    productId: metadata.productId,
+  });
 }
 
-/**
- * Calculate new credits based on subscription status
- */
-export function calculateNewCredits(params: CalculateCreditsParams): number {
-    const { metadata, existingData, creditLimit, purchaseId } = params;
-
-    const isPremium = metadata.isPremium;
-    const isExpired = metadata.expirationDate ? isPast(metadata.expirationDate) : false;
-
-    const status = resolveSubscriptionStatus({
-        isPremium,
-        willRenew: metadata.willRenew ?? false,
-        isExpired,
-        periodType: metadata.periodType ?? undefined,
-    });
-
-    const isStatusSync = purchaseId.startsWith("status_sync_");
-    const isSubscriptionActive = isPremium && !isExpired;
-
-    return creditAllocationOrchestrator.allocate({
-        status,
-        isStatusSync,
-        existingData,
-        creditLimit,
-        isSubscriptionActive,
-        productId: metadata.productId,
-    });
-}
-
-/**
- * Build credits data object for Firestore update
- */
-export function buildCreditsData(params: BuildCreditsDataParams): Record<string, any> {
-    const {
-        existingData,
-        newCredits,
-        creditLimit,
-        purchaseId,
-        metadata,
-        purchaseHistory,
-        platform,
-    } = params;
-
-    const isPremium = metadata.isPremium;
-    const isExpired = metadata.expirationDate ? isPast(metadata.expirationDate) : false;
-
-    const status = resolveSubscriptionStatus({
-        isPremium,
-        willRenew: metadata.willRenew ?? false,
-        isExpired,
-        periodType: metadata.periodType ?? undefined,
-    });
-
-    const newProcessedPurchases = addProcessedPurchase(existingData.processedPurchases, purchaseId);
-
-    const creditsData: Record<string, any> = {
-        isPremium,
-        status,
-        credits: newCredits,
-        creditLimit,
-        lastUpdatedAt: serverTimestamp(),
-        processedPurchases: newProcessedPurchases,
-    };
-
-    if (purchaseHistory.length > 0) {
-        creditsData.purchaseHistory = purchaseHistory;
-    }
-
-    const isNewPurchaseOrRenewal = purchaseId.startsWith("purchase_") || purchaseId.startsWith("renewal_");
-    if (isNewPurchaseOrRenewal) {
-        creditsData.lastPurchaseAt = serverTimestamp();
-    }
-
-    if (metadata.expirationDate) {
-        creditsData.expirationDate = serverTimestamp();
-    }
-
-    if (metadata.willRenew !== undefined) {
-        creditsData.willRenew = metadata.willRenew;
-    }
-
-    if (metadata.originalTransactionId) {
-        creditsData.originalTransactionId = metadata.originalTransactionId;
-    }
-
-    creditsData.productId = metadata.productId;
-    creditsData.platform = platform;
-
-    return creditsData;
+export function buildCreditsData({
+  existingData, newCredits, creditLimit, purchaseId, metadata, purchaseHistory, platform
+}: BuildCreditsDataParams): Record<string, any> {
+  const isPremium = metadata.isPremium;
+  const isExpired = metadata.expirationDate ? isPast(metadata.expirationDate) : false;
+  const status = resolveSubscriptionStatus({
+    isPremium,
+    willRenew: metadata.willRenew ?? false,
+    isExpired,
+    periodType: metadata.periodType ?? undefined,
+  });
+
+  const creditsData: Record<string, any> = {
+    isPremium,
+    status,
+    credits: newCredits,
+    creditLimit,
+    lastUpdatedAt: serverTimestamp(),
+    processedPurchases: [...(existingData?.processedPurchases ?? []), purchaseId].slice(-50),
+    productId: metadata.productId,
+    platform,
+  };
+
+  if (purchaseHistory.length > 0) creditsData.purchaseHistory = purchaseHistory;
+  if (purchaseId.startsWith("purchase_") || purchaseId.startsWith("renewal_")) creditsData.lastPurchaseAt = serverTimestamp();
+  if (metadata.expirationDate) creditsData.expirationDate = Timestamp.fromDate(new Date(metadata.expirationDate));
+  if (metadata.willRenew !== undefined) creditsData.willRenew = metadata.willRenew;
+  if (metadata.originalTransactionId) creditsData.originalTransactionId = metadata.originalTransactionId;
+
+  return creditsData;
 }
 
-/**
- * Check if status sync write should be skipped (no changes)
- */
 export function shouldSkipStatusSyncWrite(
-    purchaseId: string,
-    existingData: UserCreditsDocumentRead,
-    newCreditsData: Record<string, any>
+  purchaseId: string,
+  existingData: any,
+  newCreditsData: Record<string, any>
 ): boolean {
-    const isStatusSync = purchaseId.startsWith("status_sync_");
-
-    if (!isStatusSync) {
-        return false;
-    }
-
-    const hasChanged =
-        existingData.isPremium !== newCreditsData.isPremium ||
-        existingData.status !== newCreditsData.status ||
-        existingData.credits !== newCreditsData.credits ||
-        existingData.creditLimit !== newCreditsData.creditLimit ||
-        existingData.productId !== newCreditsData.productId;
-
-    return !hasChanged;
-}
-
-/**
- * Add purchase ID to processed purchases list
- */
-function addProcessedPurchase(
-    existing: string[],
-    purchaseId: string,
-    limit: number = 50
-): string[] {
-    return [...existing, purchaseId].slice(-limit);
+  if (!purchaseId.startsWith("status_sync_")) return false;
+  return (
+    existingData.isPremium === newCreditsData.isPremium &&
+    existingData.status === newCreditsData.status &&
+    existingData.credits === newCreditsData.credits &&
+    existingData.creditLimit === newCreditsData.creditLimit &&
+    existingData.productId === newCreditsData.productId
+  );
 }

package/src/domains/credits/application/creditOperationUtils.types.ts

@@ -0,0 +1,19 @@
+import type { UserCreditsDocumentRead } from "../core/UserCreditsDocument";
+import type { InitializeCreditsMetadata } from "../../subscription/application/SubscriptionInitializerTypes";
+
+export interface CalculateCreditsParams {
+  metadata: InitializeCreditsMetadata;
+  existingData: UserCreditsDocumentRead;
+  creditLimit: number;
+  purchaseId: string;
+}
+
+export interface BuildCreditsDataParams {
+  existingData: UserCreditsDocumentRead;
+  newCredits: number;
+  creditLimit: number;
+  purchaseId: string;
+  metadata: InitializeCreditsMetadata;
+  purchaseHistory: any[];
+  platform: "ios" | "android";
+}

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

@@ -1,10 +1,3 @@
-/**
- * useCredits Hook
- *
- * Fetches user credits with TanStack Query best practices.
- * Uses status-based state management for reliable loading detection.
- */
-
 import { useQuery, useQueryClient } from "@umituz/react-native-design-system";
 import { useCallback, useMemo, useEffect } from "react";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
@@ -50,7 +43,6 @@ export const useCredits = (): UseCreditsResult => {
   const userId = useAuthStore(selectUserId);
   const isConfigured = isCreditsRepositoryConfigured();
   
-  // Only access config if configured to avoid throwing errors
   const config = isConfigured ? getCreditsConfig() : null;
   const queryEnabled = !!userId && isConfigured;
 
@@ -69,8 +61,6 @@ export const useCredits = (): UseCreditsResult => {
       return result.data || null;
     },
     enabled: queryEnabled,
-    staleTime: 30 * 1000, // 30 seconds - data considered fresh
-    gcTime: 5 * 60 * 1000, // 5 minutes - keep in cache after unmount
     refetchOnMount: "always",
     refetchOnWindowFocus: true,
     refetchOnReconnect: true,
@@ -78,7 +68,6 @@ export const useCredits = (): UseCreditsResult => {
 
   const queryClient = useQueryClient();
 
-  // Observer Pattern: Listen for credit updates
   useEffect(() => {
     if (!userId) return;
 
@@ -126,3 +115,4 @@ export const useHasCredits = (): boolean => {
   const { hasCredits } = useCredits();
   return hasCredits;
 };
+

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

@@ -9,7 +9,9 @@ import { usePaywallVisibility } from "../../subscription/presentation/usePaywall
 import { useSubscriptionPackages } from "../../subscription/infrastructure/hooks/useSubscriptionPackages";
 import { useRevenueCatTrialEligibility } from "../../subscription/infrastructure/hooks/useRevenueCatTrialEligibility";
 import { createCreditAmountsFromPackages } from "../../../utils/creditMapper";
-import { PaywallModal, type TrialEligibilityInfo } from "./PaywallModal";
+import { PaywallModal } from "./PaywallModal";
+import type { TrialEligibilityInfo } from "./PaywallModal.types";
+
 import { usePaywallActions } from "../hooks/usePaywallActions";
 import { useAuthAwarePurchase } from "../../subscription/presentation/useAuthAwarePurchase";
 import type { PaywallContainerProps } from "./PaywallContainer.types";

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

@@ -1,151 +1,63 @@
-/**
- * Paywall Modal
- */
-
 import React, { useCallback, useEffect } from "react";
-import { View, TouchableOpacity, Linking, type ImageSourcePropType } from "react-native";
+import { View, TouchableOpacity, Linking } from "react-native";
 import { BaseModal, useAppDesignTokens, AtomicText, AtomicIcon, AtomicSpinner, useSafeAreaInsets } from "@umituz/react-native-design-system";
 import { ScreenLayout } from "../../../shared/presentation";
 import { Image } from "expo-image";
-import type { PurchasesPackage } from "react-native-purchases";
 import { PlanCard } from "./PlanCard";
-import type { SubscriptionFeature, PaywallTranslations, PaywallLegalUrls } from "../entities/types";
 import { paywallModalStyles as styles } from "./PaywallModal.styles";
 import { PaywallFeatures } from "./PaywallFeatures";
 import { PaywallFooter } from "./PaywallFooter";
 import { usePaywallActions } from "../hooks/usePaywallActions";
-
-/** Trial eligibility info per product */
-export interface TrialEligibilityInfo {
-  /** Whether eligible for trial */
-  eligible: boolean;
-  /** Trial duration in days */
-  durationDays?: number;
-}
-
-export interface PaywallModalProps {
-  visible: boolean;
-  onClose: () => void;
-  translations: PaywallTranslations;
-  packages?: PurchasesPackage[];
-  features?: SubscriptionFeature[];
-  isLoading?: boolean;
-  legalUrls?: PaywallLegalUrls;
-  bestValueIdentifier?: string;
-  /** Credit amounts per product identifier */
-  creditAmounts?: Record<string, number>;
-  /** Credits label text (e.g., "credits") */
-  creditsLabel?: string;
-  heroImage?: ImageSourcePropType;
-  onPurchase?: (pkg: PurchasesPackage) => Promise<void | boolean>;
-  onRestore?: () => Promise<void | boolean>;
-  /** Trial eligibility map per product ID */
-  trialEligibility?: Record<string, TrialEligibilityInfo>;
-  /** Trial subtitle text for PlanCard (e.g., "7 days free, then billed") */
-  trialSubtitleText?: string;
-}
+import { PaywallModalProps } from "./PaywallModal.types";
 
 export const PaywallModal: React.FC<PaywallModalProps> = React.memo((props) => {
   const { visible, onClose, translations, packages = [], features = [], isLoading = false, legalUrls = {}, bestValueIdentifier, creditAmounts, creditsLabel, heroImage, onPurchase, onRestore, trialEligibility = {}, trialSubtitleText } = props;
   const tokens = useAppDesignTokens();
   const insets = useSafeAreaInsets();
-  
-  const {
-    selectedPlanId,
-    setSelectedPlanId,
-    isProcessing,
-    handlePurchase,
-    handleRestore,
-    resetState,
-  } = usePaywallActions({ packages, onPurchase, onRestore });
-
-  // Reset selected plan when packages change
-  useEffect(() => {
-    setSelectedPlanId(null);
-  }, [packages, setSelectedPlanId]);
+  const { selectedPlanId, setSelectedPlanId, isProcessing, handlePurchase, handleRestore, resetState } = usePaywallActions({ packages, onPurchase, onRestore });
 
-  // Cleanup state when modal closes to prevent stale state
-  useEffect(() => {
-    if (!visible) {
-      resetState();
-    }
-  }, [visible, resetState]);
+  useEffect(() => { setSelectedPlanId(null); }, [packages, setSelectedPlanId]);
+  useEffect(() => { if (!visible) resetState(); }, [visible, resetState]);
 
   const handleLegalUrl = useCallback(async (url: string | undefined) => {
     if (!url) return;
-    try { if (await Linking.canOpenURL(url)) await Linking.openURL(url); } catch { /* Silent fail */ }
+    try { 
+      if (await Linking.canOpenURL(url)) await Linking.openURL(url); 
+    } catch (err) {
+      console.error("[PaywallModal] Legal link error:", err);
+    }
   }, []);
 
+
   return (
     <BaseModal visible={visible} onClose={onClose} contentStyle={styles.modalContent}>
       <View style={[styles.container, { backgroundColor: tokens.colors.surface }]}>
-        <TouchableOpacity 
-          onPress={onClose} 
-          style={[
-            styles.closeBtn, 
-            { backgroundColor: tokens.colors.surfaceSecondary, top: Math.max(insets.top, 12) }
-          ]} 
-          hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
-        >
+        <TouchableOpacity onPress={onClose} style={[styles.closeBtn, { backgroundColor: tokens.colors.surfaceSecondary, top: Math.max(insets.top, 12) }]} hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}>
           <AtomicIcon name="close-outline" size="md" customColor={tokens.colors.textPrimary} />
         </TouchableOpacity>
-
         <ScreenLayout scrollable={true} edges={["bottom"]} backgroundColor="transparent" contentContainerStyle={styles.scroll}>
-          {heroImage && (
-            <View style={styles.heroContainer}>
-              <Image source={heroImage} style={styles.heroImage} contentFit="cover" transition={0} />
-            </View>
-          )}
-
+          {heroImage && <View style={styles.heroContainer}><Image source={heroImage} style={styles.heroImage} contentFit="cover" transition={0} /></View>}
           <View style={styles.header}>
             <AtomicText type="headlineMedium" style={[styles.title, { color: tokens.colors.textPrimary }]}>{translations.title}</AtomicText>
-            {/* Apple compliance: Don't promote trial in header, show regular subtitle only */}
-            {translations.subtitle && (
-              <AtomicText type="bodyMedium" style={[styles.subtitle, { color: tokens.colors.textSecondary }]}>
-                {translations.subtitle}
-              </AtomicText>
-            )}
+            {translations.subtitle && <AtomicText type="bodyMedium" style={[styles.subtitle, { color: tokens.colors.textSecondary }]}>{translations.subtitle}</AtomicText>}
           </View>
-
           <PaywallFeatures features={features} />
-
           {isLoading ? (
             <View style={styles.loading}><AtomicSpinner size="lg" color="primary" text={translations.loadingText} /></View>
           ) : (
             <View style={styles.plans}>
               {packages.map((pkg) => {
-                const productId = pkg.product.identifier;
-                const eligibility = trialEligibility[productId];
-                const hasFreeTrial = eligibility?.eligible ?? false;
-
+                const pid = pkg.product.identifier;
+                const hasTrial = trialEligibility[pid]?.eligible ?? false;
                 return (
-                  <PlanCard
-                    key={productId}
-                    pkg={pkg}
-                    isSelected={selectedPlanId === productId}
-                    onSelect={() => setSelectedPlanId(productId)}
-                    badge={productId === bestValueIdentifier ? translations.bestValueBadgeText : undefined}
-                    creditAmount={creditAmounts?.[productId]}
-                    creditsLabel={creditsLabel}
-                    hasFreeTrial={hasFreeTrial}
-                    trialSubtitleText={hasFreeTrial ? trialSubtitleText : undefined}
-                  />
+                  <PlanCard key={pid} pkg={pkg} isSelected={selectedPlanId === pid} onSelect={() => setSelectedPlanId(pid)} badge={pid === bestValueIdentifier ? translations.bestValueBadgeText : undefined} creditAmount={creditAmounts?.[pid]} creditsLabel={creditsLabel} hasFreeTrial={hasTrial} trialSubtitleText={hasTrial ? trialSubtitleText : undefined} />
                 );
               })}
             </View>
           )}
-
-          <TouchableOpacity
-            onPress={handlePurchase}
-            disabled={!selectedPlanId || isProcessing}
-            style={[styles.cta, { backgroundColor: tokens.colors.primary }, (!selectedPlanId || isProcessing) && styles.ctaDisabled]}
-            activeOpacity={0.8}
-          >
-            <AtomicText type="titleLarge" style={[styles.ctaText, { color: tokens.colors.onPrimary }]}>
-              {isProcessing ? translations.processingText : translations.purchaseButtonText}
-            </AtomicText>
+          <TouchableOpacity onPress={handlePurchase} disabled={!selectedPlanId || isProcessing} style={[styles.cta, { backgroundColor: tokens.colors.primary }, (!selectedPlanId || isProcessing) && styles.ctaDisabled]} activeOpacity={0.8}>
+            <AtomicText type="titleLarge" style={[styles.ctaText, { color: tokens.colors.onPrimary }]}>{isProcessing ? translations.processingText : translations.purchaseButtonText}</AtomicText>
           </TouchableOpacity>
-
           <PaywallFooter translations={translations} legalUrls={legalUrls} isProcessing={isProcessing} onRestore={onRestore ? handleRestore : undefined} onLegalClick={handleLegalUrl} />
         </ScreenLayout>
       </View>

package/src/domains/paywall/components/PaywallModal.types.ts

@@ -0,0 +1,26 @@
+import type { ImageSourcePropType } from "react-native";
+import type { PurchasesPackage } from "react-native-purchases";
+import type { SubscriptionFeature, PaywallTranslations, PaywallLegalUrls } from "../entities/types";
+
+export interface TrialEligibilityInfo {
+  eligible: boolean;
+  durationDays?: number;
+}
+
+export interface PaywallModalProps {
+  visible: boolean;
+  onClose: () => void;
+  translations: PaywallTranslations;
+  packages?: PurchasesPackage[];
+  features?: SubscriptionFeature[];
+  isLoading?: boolean;
+  legalUrls?: PaywallLegalUrls;
+  bestValueIdentifier?: string;
+  creditAmounts?: Record<string, number>;
+  creditsLabel?: string;
+  heroImage?: ImageSourcePropType;
+  onPurchase?: (pkg: PurchasesPackage) => Promise<void | boolean>;
+  onRestore?: () => Promise<void | boolean>;
+  trialEligibility?: Record<string, TrialEligibilityInfo>;
+  trialSubtitleText?: string;
+}