@umituz/react-native-subscription 2.39.9 → 2.39.11

package/package.json

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

@@ -1,21 +1,10 @@
 import type { CreditsConfig } from "../core/Credits";
-import { detectPackageType } from "../../../utils/packageTypeDetector";
-import { getCreditAllocation } from "../../../utils/creditMapper";
+import { calculateCreditLimit as calculateLimit } from "../utils/creditCalculations";
 
+/**
+ * Service to calculate credit limits based on product configuration.
+ * Uses centralized utility functions for calculations.
+ */
 export function calculateCreditLimit(productId: string | undefined, config: CreditsConfig): number {
-  if (!productId) {
-    throw new Error("[CreditLimitCalculator] Cannot calculate credit limit without productId");
-  }
-
-  const explicitAmount = config.creditPackageAmounts?.[productId];
-  if (explicitAmount !== undefined && explicitAmount !== null) return explicitAmount;
-
-  const packageType = detectPackageType(productId);
-  const dynamicLimit = getCreditAllocation(packageType, config.packageAllocations);
-
-  if (dynamicLimit === null || dynamicLimit === undefined) {
-    throw new Error(`[CreditLimitCalculator] Cannot determine credit limit for productId: ${productId}, packageType: ${packageType}`);
-  }
-
-  return dynamicLimit;
+  return calculateLimit(productId, config);
 }

package/src/domains/credits/core/UserCreditsDocument.ts

@@ -5,7 +5,7 @@ import type {
   PackageType,
   Platform
 } from "../../subscription/core/SubscriptionConstants";
-import type { Store, OwnershipType } from "../../revenuecat/core/types";
+import type { Store, OwnershipType } from "../../revenuecat/core/types/RevenueCatTypes";
 
 export type {
   PurchaseSource,

package/src/domains/credits/infrastructure/CreditsRepository.ts

@@ -2,14 +2,14 @@ import type { Firestore, DocumentReference } from "@umituz/react-native-firebase
 import { BaseRepository } from "@umituz/react-native-firebase";
 import type { CreditsConfig, CreditsResult, DeductCreditsResult } from "../core/Credits";
 import type { PurchaseSource } from "../core/UserCreditsDocument";
-import type { RevenueCatData } from "../../revenuecat/core/types";
+import type { RevenueCatData } from "../../revenuecat/core/types/RevenueCatData";
 import { deductCreditsOperation } from "../application/DeductCreditsCommand";
 import { refundCreditsOperation } from "../application/RefundCreditsCommand";
 import { PURCHASE_TYPE, type PurchaseType } from "../../subscription/core/SubscriptionConstants";
-import { requireFirestore, buildDocRef, type CollectionConfig } from "../../../shared/infrastructure/firestore";
+import { requireFirestore, buildDocRef, type CollectionConfig } from "../../../shared/infrastructure/firestore/collectionUtils";
 import { fetchCredits, checkHasCredits, documentExists } from "./operations/CreditsFetcher";
 import { syncExpiredStatus, syncPremiumMetadata, createRecoveryCreditsDocument } from "./operations/CreditsWriter";
-import type { SubscriptionMetadata } from "../../subscription/core/types";
+import type { SubscriptionMetadata } from "../../subscription/core/types/SubscriptionMetadata";
 import { initializeCreditsWithRetry } from "./operations/CreditsInitializer";
 import { calculateCreditLimit } from "../application/CreditLimitCalculator";
 

package/src/domains/credits/infrastructure/operations/CreditsInitializer.ts

@@ -3,7 +3,7 @@ import type { CreditsConfig, CreditsResult } from "../../core/Credits";
 import type { PurchaseSource } from "../../core/UserCreditsDocument";
 import { initializeCreditsTransaction } from "../../application/CreditsInitializer";
 import { mapCreditsDocumentToEntity } from "../../core/CreditsMapper";
-import type { RevenueCatData } from "../../../revenuecat/core/types";
+import type { RevenueCatData } from "../../../revenuecat/core/types/RevenueCatData";
 import { calculateCreditLimit } from "../../application/CreditLimitCalculator";
 import { PURCHASE_TYPE, type PurchaseType } from "../../../subscription/core/SubscriptionConstants";
 

package/src/domains/credits/infrastructure/operations/CreditsWriter.ts

@@ -3,7 +3,7 @@ import { runTransaction, serverTimestamp } from "@umituz/react-native-firebase";
 import { doc, getDoc, setDoc } from "firebase/firestore";
 import { SUBSCRIPTION_STATUS } from "../../../subscription/core/SubscriptionConstants";
 import { resolveSubscriptionStatus } from "../../../subscription/core/SubscriptionStatus";
-import type { SubscriptionMetadata } from "../../../subscription/core/types";
+import type { SubscriptionMetadata } from "../../../subscription/core/types/SubscriptionMetadata";
 import { toTimestamp } from "../../../../shared/utils/dateConverter";
 import { isPast } from "../../../../utils/dateUtils";
 import { getAppVersion, validatePlatform } from "../../../../utils/appUtils";

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

@@ -10,7 +10,7 @@ export const PaywallFeatures: React.FC<{ features: SubscriptionFeature[] }> = ({
   if (!features.length) return null;
 
   return (
-    <View style={[styles.features, { backgroundColor: tokens.colors.surfaceSecondary }]}>
+    <View style={[styles.featuresContainer, { backgroundColor: tokens.colors.surfaceSecondary }]}>
       {features.map((feature) => (
         <View key={`${feature.icon}-${feature.text}`} style={styles.featureRow}>
           <View style={[styles.featureIcon, { backgroundColor: tokens.colors.primary }]}>

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

@@ -25,7 +25,7 @@ export const PaywallFooter: React.FC<PaywallFooterProps> = ({
   return (
     <View style={styles.footer}>
       {onRestore && (
-        <TouchableOpacity onPress={onRestore} disabled={isProcessing} style={[styles.restoreButton, isProcessing && styles.restoreButtonDisabled]}>
+        <TouchableOpacity onPress={onRestore} disabled={isProcessing} style={[styles.restoreButton, isProcessing && styles.ctaDisabled]}>
           <AtomicText type="bodySmall" style={[styles.footerLink, { color: tokens.colors.textSecondary }]}>
             {isProcessing ? translations.processingText : translations.restoreButtonText}
           </AtomicText>

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

@@ -17,20 +17,16 @@ import { AtomicText, AtomicIcon, AtomicSpinner } from "@umituz/react-native-desi
 import { useSafeAreaInsets } from "@umituz/react-native-design-system/safe-area";
 import { useAppDesignTokens } from "@umituz/react-native-design-system/theme";
 import { Image } from "expo-image";
-import type { PurchasesPackage } from "react-native-purchases";
 import { PlanCard } from "./PlanCard";
 import { paywallScreenStyles as styles } from "./PaywallScreen.styles";
 import { PaywallFooter } from "./PaywallFooter";
+import { PurchaseLoadingOverlay } from "../../subscription/presentation/components/overlay/PurchaseLoadingOverlay";
 import { usePaywallActions } from "../hooks/usePaywallActions";
 import { PaywallScreenProps } from "./PaywallScreen.types";
-import type { SubscriptionFeature } from "../entities/types";
-
-type PaywallListItem = 
-  | { type: 'HEADER' }
-  | { type: 'FEATURE_HEADER' }
-  | { type: 'FEATURE'; feature: SubscriptionFeature }
-  | { type: 'PLAN_HEADER' }
-  | { type: 'PLAN'; pkg: PurchasesPackage };
+import { 
+  calculatePaywallItemLayout, 
+  type PaywallListItem 
+} from "../utils/paywallLayoutUtils";
 
 export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) => {
   const {
@@ -55,7 +51,14 @@ export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) =>
   const tokens = useAppDesignTokens();
   const insets = useSafeAreaInsets();
 
-  const { selectedPlanId, setSelectedPlanId, isProcessing, handlePurchase, handleRestore } = usePaywallActions({
+  const { 
+    selectedPlanId, 
+    setSelectedPlanId, 
+    isProcessing, 
+    handlePurchase, 
+    handleRestore,
+    resetState
+  } = usePaywallActions({
     packages,
     onPurchase,
     onRestore,
@@ -66,6 +69,13 @@ export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) =>
     onClose
   });
 
+  // Reset state when screen is closed to avoid lockups
+  useEffect(() => {
+    return () => {
+      resetState();
+    };
+  }, [resetState]);
+
   // Auto-select first package
   useEffect(() => {
     if (packages.length > 0 && !selectedPlanId) {
@@ -186,24 +196,7 @@ export const PaywallScreen: React.FC<PaywallScreenProps> = React.memo((props) =>
 
   // Performance Optimization: getItemLayout for FlatList
   const getItemLayout = useCallback((_data: any, index: number) => {
-    // Estimated heights for different item types
-    // HEADER: ~300, FEATURE_HEADER: ~60, FEATURE: ~46, PLAN_HEADER: ~60, PLAN: ~80
-    let offset = 0;
-    for (let i = 0; i < index; i++) {
-      const item = flatData[i];
-      if (item.type === 'HEADER') offset += 300;
-      else if (item.type === 'FEATURE_HEADER' || item.type === 'PLAN_HEADER') offset += 60;
-      else if (item.type === 'FEATURE') offset += 46;
-      else if (item.type === 'PLAN') offset += 80;
-    }
-    
-    const currentItem = flatData[index];
-    let length = 80;
-    if (currentItem.type === 'HEADER') length = 300;
-    else if (currentItem.type === 'FEATURE_HEADER' || currentItem.type === 'PLAN_HEADER') length = 60;
-    else if (currentItem.type === 'FEATURE') length = 46;
-    
-    return { length, offset, index };
+    return calculatePaywallItemLayout(flatData, index);
   }, [flatData]);
 
   const keyExtractor = useCallback((item: PaywallListItem, index: number) => {

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

@@ -6,13 +6,18 @@ import { formatPriceWithPeriod } from '../../../utils/priceUtils';
 import { PlanCardProps } from "./PlanCard.types";
 
 export const PlanCard: React.FC<PlanCardProps> = React.memo(
-  ({ pkg, isSelected, onSelect, badge, creditAmount, creditsLabel }) => {
+  ({ pkg, isSelected, onSelect, badge, creditAmount, creditsLabel, disabled }) => {
     const tokens = useAppDesignTokens();
     const title = pkg.product.title;
     const price = formatPriceWithPeriod(pkg.product.price, pkg.product.currencyCode, pkg.identifier);
 
     return (
-      <TouchableOpacity onPress={onSelect} activeOpacity={0.7} style={styles.touchable}>
+      <TouchableOpacity 
+        onPress={onSelect} 
+        disabled={disabled}
+        activeOpacity={0.7} 
+        style={[styles.touchable, disabled && { opacity: 0.8 }]}
+      >
         <View style={[styles.container, { 
           backgroundColor: tokens.colors.surface, 
           borderColor: isSelected ? tokens.colors.primary : tokens.colors.border,

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

@@ -5,6 +5,7 @@ export interface PlanCardProps {
     isSelected: boolean;
     onSelect: () => void;
     badge?: string;
-    creditAmount?: number;
+    creditAmount?: number | null;
     creditsLabel?: string;
-}
+    disabled?: boolean;
+    }

package/src/domains/paywall/utils/paywallLayoutUtils.ts

@@ -0,0 +1,55 @@
+import type { PurchasesPackage } from "react-native-purchases";
+import type { SubscriptionFeature } from "../entities/types";
+
+export type PaywallListItem = 
+  | { type: 'HEADER' }
+  | { type: 'FEATURE_HEADER' }
+  | { type: 'FEATURE'; feature: SubscriptionFeature }
+  | { type: 'PLAN_HEADER' }
+  | { type: 'PLAN'; pkg: PurchasesPackage };
+
+/**
+ * Constants for estimated layout heights
+ */
+export const LAYOUT_CONSTANTS = {
+  HEADER_HEIGHT: 300,
+  SECTION_HEADER_HEIGHT: 60,
+  FEATURE_ITEM_HEIGHT: 46,
+  PLAN_ITEM_HEIGHT: 80,
+};
+
+/**
+ * Calculates the offset and length for FlatList items to optimize scrolling performance.
+ */
+export function calculatePaywallItemLayout(data: PaywallListItem[] | null | undefined, index: number) {
+  if (!data) return { length: 0, offset: 0, index };
+
+  let offset = 0;
+  for (let i = 0; i < index; i++) {
+    const item = data[i];
+    offset += getItemHeight(item);
+  }
+
+  const length = getItemHeight(data[index]);
+  
+  return { length, offset, index };
+}
+
+/**
+ * Returns the estimated height of a single paywall list item based on its type.
+ */
+function getItemHeight(item: PaywallListItem): number {
+  switch (item.type) {
+    case 'HEADER':
+      return LAYOUT_CONSTANTS.HEADER_HEIGHT;
+    case 'FEATURE_HEADER':
+    case 'PLAN_HEADER':
+      return LAYOUT_CONSTANTS.SECTION_HEADER_HEIGHT;
+    case 'FEATURE':
+      return LAYOUT_CONSTANTS.FEATURE_ITEM_HEIGHT;
+    case 'PLAN':
+      return LAYOUT_CONSTANTS.PLAN_ITEM_HEIGHT;
+    default:
+      return 0;
+  }
+}

package/src/domains/revenuecat/core/types/RevenueCatData.ts

@@ -1,4 +1,4 @@
-import type { SubscriptionMetadata } from "../../../subscription/core/types";
+import type { SubscriptionMetadata } from "../../../subscription/core/types/SubscriptionMetadata";
 import type { PackageType } from "./RevenueCatTypes";
 
 export interface RevenueCatData extends Omit<SubscriptionMetadata, 'willRenew' | 'productId'> {

package/src/domains/revenuecat/core/types/RevenueCatTypes.ts

@@ -88,9 +88,9 @@ export function isInvalidCredentialsError(error: unknown): boolean {
   return code === "INVALID_CREDENTIALS_ERROR" || code === "9";
 }
 
-export function getRawErrorMessage(error: unknown, fallback: string): string {
+export function getRawErrorMessage(error: unknown): string {
   if (error instanceof Error) {
     return error.message;
   }
-  return fallback;
+  return "Unknown error";
 }

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

@@ -1,4 +1,4 @@
-import type { RevenueCatConfig } from "../../core/types";
+import type { RevenueCatConfig } from "../../core/types/RevenueCatConfig";
 
 export interface InitializerDeps {
   config: RevenueCatConfig;

package/src/domains/revenuecat/infrastructure/services/userSwitchHandler.ts

@@ -3,7 +3,7 @@ import type { InitializeResult } from "../../../../shared/application/ports/IRev
 import type { InitializerDeps } from "./RevenueCatInitializer.types";
 import { FAILED_INITIALIZATION_RESULT } from "./initializerConstants";
 import { UserSwitchMutex } from "./UserSwitchMutex";
-import { getPremiumEntitlement } from "../../core/types";
+import { getPremiumEntitlement } from "../../core/types/RevenueCatTypes";
 import { ANONYMOUS_CACHE_KEY, type PeriodType } from "../../../subscription/core/SubscriptionConstants";
 
 declare const __DEV__: boolean;

package/src/domains/subscription/application/SubscriptionInitializerTypes.ts

@@ -1,7 +1,7 @@
 import type { CreditsConfig } from "../../credits/core/Credits";
 import type { UserCreditsDocumentRead } from "../../credits/core/UserCreditsDocument";
 import type { PurchaseSource, PurchaseType } from "../core/SubscriptionConstants";
-import type { SubscriptionMetadata } from "../core/types";
+import type { SubscriptionMetadata } from "../core/types/SubscriptionMetadata";
 
 export interface FirebaseAuthLike {
   currentUser: { uid: string; isAnonymous: boolean } | null;

package/src/domains/subscription/application/SubscriptionSyncProcessor.ts

@@ -1,4 +1,3 @@
-import Purchases from "react-native-purchases";
 import { PURCHASE_SOURCE, PURCHASE_TYPE } from "../core/SubscriptionConstants";
 import type { PremiumStatusChangedEvent, PurchaseCompletedEvent, RenewalDetectedEvent } from "../core/SubscriptionEvents";
 import { getCreditsRepository } from "../../credits/infrastructure/CreditsRepositoryManager";
@@ -80,14 +79,6 @@ export class SubscriptionSyncProcessor {
 
   // ─── Internal Processing ──────────────────────────────────────────
 
-  private async getRevenueCatAppUserId(): Promise<string | null> {
-    try {
-      return await Purchases.getAppUserID();
-    } catch {
-      return null;
-    }
-  }
-
   private async getCreditsUserId(revenueCatUserId: string | null | undefined): Promise<string> {
     const trimmed = revenueCatUserId?.trim();
     if (trimmed && trimmed.length > 0 && trimmed !== 'undefined' && trimmed !== 'null') {
@@ -108,8 +99,8 @@ export class SubscriptionSyncProcessor {
     try {
       const revenueCatData = extractRevenueCatData(event.customerInfo, this.entitlementId);
       revenueCatData.packageType = event.packageType ?? null;
-      const revenueCatAppUserId = await this.getRevenueCatAppUserId();
-      revenueCatData.revenueCatUserId = revenueCatAppUserId ?? event.userId;
+      // Use the event.userId instead of polling the SDK to avoid race conditions during rapid user switching
+      revenueCatData.revenueCatUserId = event.userId;
       const purchaseId = generatePurchaseId(revenueCatData.storeTransactionId, event.productId);
 
       const creditsUserId = await this.getCreditsUserId(event.userId);
@@ -138,8 +129,8 @@ export class SubscriptionSyncProcessor {
     try {
       const revenueCatData = extractRevenueCatData(event.customerInfo, this.entitlementId);
       revenueCatData.expirationDate = event.newExpirationDate ?? revenueCatData.expirationDate;
-      const revenueCatAppUserId = await this.getRevenueCatAppUserId();
-      revenueCatData.revenueCatUserId = revenueCatAppUserId ?? event.userId;
+      // Use the event.userId instead of polling the SDK to avoid race conditions during rapid user switching
+      revenueCatData.revenueCatUserId = event.userId;
       const purchaseId = generateRenewalId(revenueCatData.storeTransactionId, event.productId, event.newExpirationDate);
 
       const creditsUserId = await this.getCreditsUserId(event.userId);
@@ -164,9 +155,6 @@ export class SubscriptionSyncProcessor {
   }
 
   private async processStatusChange(event: PremiumStatusChangedEvent): Promise<void> {
-    // If a purchase is in progress, skip metadata sync (purchase handler does it)
-    // but still allow recovery to run — the purchase handler's credit initialization
-    // might have failed, and this is the safety net.
     if (this.purchaseInProgress) {
       if (typeof __DEV__ !== "undefined" && __DEV__) {
         console.log("[SubscriptionSyncProcessor] Purchase in progress - running recovery only");
@@ -186,9 +174,6 @@ export class SubscriptionSyncProcessor {
     }
 
     if (!event.isPremium && !event.productId) {
-      // No entitlement and no productId — could be:
-      // 1. Free user who never purchased (no credits doc) → skip
-      // 2. Previously premium user whose entitlement was removed → expire
       const hasDoc = await getCreditsRepository().creditsDocumentExists(creditsUserId);
       if (hasDoc) {
         await this.expireSubscription(creditsUserId);
@@ -203,7 +188,7 @@ export class SubscriptionSyncProcessor {
     await this.syncPremiumStatus(creditsUserId, event);
   }
 
-  // ─── Credit Document Operations (replaces statusChangeHandlers) ───
+  // ─── Credit Document Operations ───
 
   private async expireSubscription(userId: string): Promise<void> {
     await getCreditsRepository().syncExpiredStatus(userId);
@@ -213,8 +198,6 @@ export class SubscriptionSyncProcessor {
   private async syncPremiumStatus(userId: string, event: PremiumStatusChangedEvent): Promise<void> {
     const repo = getCreditsRepository();
 
-    // Recovery: if premium user has no credits document, create one.
-    // Handles edge cases like test store, reinstalls, or failed purchase initialization.
     if (event.isPremium) {
       const created = await repo.ensurePremiumCreditsExist(
         userId,

package/src/domains/subscription/application/SubscriptionSyncUtils.ts

@@ -1,5 +1,5 @@
 import type { CustomerInfo } from "react-native-purchases";
-import type { RevenueCatData } from "../../revenuecat/core/types";
+import type { RevenueCatData } from "../../revenuecat/core/types/RevenueCatData";
 import { PERIOD_TYPE, type PeriodType } from "../core/SubscriptionConstants";
 
 function validatePeriodType(periodType: string | undefined): PeriodType | null {

package/src/domains/subscription/application/featureGate/featureGateBusinessRules.ts

@@ -1,5 +1,13 @@
+import { 
+    canExecuteAuthAction as canAuth, 
+    canExecutePurchaseAction as canPurchase 
+} from "../../utils/featureGateUtils";
+
 export const DEFAULT_REQUIRED_CREDITS = 1;
 
+/**
+ * Business rule for executing auth-related actions.
+ */
 export function canExecuteAuthAction(
   isWaitingForAuthCredits: boolean,
   isCreditsLoaded: boolean,
@@ -8,12 +16,19 @@ export function canExecuteAuthAction(
   creditBalance: number,
   requiredCredits: number
 ): boolean {
-  if (!isWaitingForAuthCredits || !isCreditsLoaded || !hasPendingAction) {
-    return false;
-  }
-  return hasSubscription || creditBalance >= requiredCredits;
+  return canAuth(
+    isWaitingForAuthCredits, 
+    isCreditsLoaded, 
+    hasPendingAction, 
+    hasSubscription, 
+    creditBalance, 
+    requiredCredits
+  );
 }
 
+/**
+ * Business rule for executing purchase-related actions.
+ */
 export function canExecutePurchaseAction(
   isWaitingForPurchase: boolean,
   creditBalance: number,
@@ -22,10 +37,12 @@ export function canExecutePurchaseAction(
   prevHasSubscription: boolean,
   hasPendingAction: boolean
 ): boolean {
-  if (!isWaitingForPurchase || !hasPendingAction) {
-    return false;
-  }
-  const creditsIncreased = creditBalance > prevBalance;
-  const subscriptionAcquired = hasSubscription && !prevHasSubscription;
-  return creditsIncreased || subscriptionAcquired;
+  return canPurchase(
+    isWaitingForPurchase,
+    creditBalance,
+    prevBalance,
+    hasSubscription,
+    prevHasSubscription,
+    hasPendingAction
+  );
 }

package/src/domains/subscription/application/initializer/BackgroundInitializer.ts

@@ -2,16 +2,18 @@ import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionM
 import { getCurrentUserId, setupAuthStateListener } from "../SubscriptionAuthListener";
 import type { SubscriptionInitConfig } from "../SubscriptionInitializerTypes";
 
-const AUTH_STATE_DEBOUNCE_MS = 500; // Wait 500ms before processing auth state changes
+const AUTH_STATE_DEBOUNCE_MS = 500;
 const MAX_RETRY_ATTEMPTS = 3;
 const RETRY_DELAY_MS = 2000;
 
 export async function startBackgroundInitialization(config: SubscriptionInitConfig): Promise<() => void> {
   let debounceTimer: ReturnType<typeof setTimeout> | null = null;
   let retryTimer: ReturnType<typeof setTimeout> | null = null;
-  let lastUserId: string | undefined = undefined;
+  
+  // Track the ID of the current initialization sequence to abort stale retries/state updates
+  let currentSequenceId = 0;
   let lastInitSucceeded = false;
-  let isInitializing = false; // true while attemptInitWithRetry is awaited
+  let lastUserId: string | undefined = undefined;
 
   const initializeInBackground = async (revenueCatUserId?: string): Promise<void> => {
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
@@ -20,20 +22,23 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
     await SubscriptionManager.initialize(revenueCatUserId);
   };
 
-  const attemptInitWithRetry = async (revenueCatUserId?: string, attempt = 0): Promise<void> => {
-    // Abort if user changed since retry was scheduled
-    if (attempt > 0 && lastUserId !== revenueCatUserId) {
+  const attemptInitWithRetry = async (revenueCatUserId: string | undefined, attempt: number, sequenceId: number): Promise<void> => {
+    // Abort if this is no longer the active sequence (e.g., user changed)
+    if (sequenceId !== currentSequenceId) {
       if (typeof __DEV__ !== 'undefined' && __DEV__) {
-        console.log('[BackgroundInitializer] Aborting retry - user changed');
+        console.log('[BackgroundInitializer] Aborting retry - sequence changed');
       }
       return;
     }
 
     try {
       await initializeInBackground(revenueCatUserId);
-      lastUserId = revenueCatUserId;
-      lastInitSucceeded = true;
+      if (sequenceId === currentSequenceId) {
+        lastInitSucceeded = true;
+      }
     } catch (error) {
+      if (sequenceId !== currentSequenceId) return;
+      
       lastInitSucceeded = false;
       console.error('[BackgroundInitializer] Initialization failed:', {
         userId: revenueCatUserId,
@@ -47,12 +52,11 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
           console.log('[BackgroundInitializer] Scheduling retry', { attempt: attempt + 2 });
         }
         retryTimer = setTimeout(() => {
-          void attemptInitWithRetry(revenueCatUserId, attempt + 1);
+          // Fire and forget promise, but safe because of sequenceId check
+          attemptInitWithRetry(revenueCatUserId, attempt + 1, sequenceId).catch(err => {
+              console.error('[BackgroundInitializer] Retry failed unhandled:', err);
+          });
         }, RETRY_DELAY_MS * (attempt + 1));
-      } else {
-        // After all retries failed, set lastUserId so we don't block
-        // but mark as failed so next auth change can retry
-        lastUserId = revenueCatUserId;
       }
     }
   };
@@ -66,7 +70,7 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
       retryTimer = null;
     }
 
-    if (lastUserId === revenueCatUserId && (lastInitSucceeded || isInitializing)) {
+    if (lastUserId === revenueCatUserId && lastInitSucceeded) {
       if (typeof __DEV__ !== 'undefined' && __DEV__) {
         console.log('[BackgroundInitializer] UserId unchanged and init succeeded, skipping');
       }
@@ -74,8 +78,10 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
     }
 
     debounceTimer = setTimeout(async () => {
-      // Don't initialize when there's no user and no previous user.
-      // This is the initial signed-out state before auth resolves, not a logout.
+      // Start a new sequence
+      currentSequenceId++;
+      const sequenceId = currentSequenceId;
+
       if (!revenueCatUserId && !lastUserId) {
         if (typeof __DEV__ !== 'undefined' && __DEV__) {
           console.log('[BackgroundInitializer] No user and no previous user, waiting for auth');
@@ -87,18 +93,19 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
         console.log('[BackgroundInitializer] Auth state listener triggered, reinitializing with userId:', revenueCatUserId || '(undefined - anonymous)');
       }
 
-      // Reset subscription state on logout to prevent stale cache
-      if (!revenueCatUserId && lastUserId) {
-        await SubscriptionManager.reset();
-        lastInitSucceeded = false;
+      // Important: Always reset on user change, not just on logout.
+      // This ensures previous user's cached state is cleared before init.
+      if (lastUserId !== revenueCatUserId) {
+          await SubscriptionManager.reset();
+          lastInitSucceeded = false;
       }
 
-      isInitializing = true;
-      try {
-        await attemptInitWithRetry(revenueCatUserId);
-      } finally {
-        isInitializing = false;
-      }
+      lastUserId = revenueCatUserId;
+
+      // Start the retry chain
+      attemptInitWithRetry(revenueCatUserId, 0, sequenceId).catch(err => {
+        console.error('[BackgroundInitializer] Init sequence failed unhandled:', err);
+      });
     }, AUTH_STATE_DEBOUNCE_MS);
   };
 
@@ -114,12 +121,11 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
     console.log('[BackgroundInitializer] Initial RevenueCat userId:', initialRevenueCatUserId || '(undefined - anonymous)');
   }
 
-  // Initialize RevenueCat for all users (including anonymous).
-  // Anonymous users get their Firebase UID passed to RevenueCat so they can make purchases.
-  // Credits are stored at users/{uid}/credits/balance regardless of auth status.
   if (initialRevenueCatUserId) {
-    await initializeInBackground(initialRevenueCatUserId);
-    lastInitSucceeded = true;
+    currentSequenceId++;
+    attemptInitWithRetry(initialRevenueCatUserId, 0, currentSequenceId).catch(err => {
+        console.error('[BackgroundInitializer] Initial sequence failed unhandled:', err);
+    });
   } else if (typeof __DEV__ !== 'undefined' && __DEV__) {
     console.log('[BackgroundInitializer] No user available yet, waiting for auth state');
   }
@@ -127,14 +133,9 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
   const unsubscribe = setupAuthStateListener(() => auth, debouncedInitialize);
 
   return () => {
-    if (debounceTimer) {
-      clearTimeout(debounceTimer);
-    }
-    if (retryTimer) {
-      clearTimeout(retryTimer);
-    }
-    if (unsubscribe) {
-      unsubscribe();
-    }
+    currentSequenceId++; // Invalidate any running sequences
+    if (debounceTimer) clearTimeout(debounceTimer);
+    if (retryTimer) clearTimeout(retryTimer);
+    if (unsubscribe) unsubscribe();
   };
 }

package/src/domains/subscription/core/SubscriptionEvents.ts

@@ -1,6 +1,6 @@
 import type { CustomerInfo } from "react-native-purchases";
 import type { PurchaseSource } from "./SubscriptionConstants";
-import type { SubscriptionMetadata } from "./types";
+import type { SubscriptionMetadata } from "./types/SubscriptionMetadata";
 import type { PackageType } from "../../revenuecat/core/types/RevenueCatTypes";
 
 export interface PurchaseCompletedEvent {