@umituz/react-native-subscription 2.39.8 → 2.39.10

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 {

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

@@ -13,10 +13,6 @@ abstract class BaseStatusHandler {
     }
 
     abstract handle(input: StatusResolverInput): SubscriptionStatusType;
-
-    protected nextOrFallback(input: StatusResolverInput, fallback: SubscriptionStatusType): SubscriptionStatusType {
-        return this.next ? this.next.handle(input) : fallback;
-    }
 }
 
 export class InactiveStatusHandler extends BaseStatusHandler {
@@ -26,7 +22,7 @@ export class InactiveStatusHandler extends BaseStatusHandler {
         if (!input.isPremium || isExpired) {
             return isExpired ? SUBSCRIPTION_STATUS.EXPIRED : SUBSCRIPTION_STATUS.NONE;
         }
-        return this.nextOrFallback(input, SUBSCRIPTION_STATUS.NONE);
+        return this.next ? this.next.handle(input) : SUBSCRIPTION_STATUS.NONE;
     }
 }
 

package/src/domains/subscription/infrastructure/handlers/PackageHandler.ts

@@ -1,12 +1,10 @@
 import type { PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
 import { PurchaseStatusResolver, type PremiumStatus } from "./PurchaseStatusResolver";
-import {
-  fetchPackages,
-  executePurchase,
-  restorePurchases,
-  type RestoreResultInfo,
-} from "./package-operations";
+import { fetchPackages } from "./package-operations/PackageFetcher";
+import { executePurchase } from "./package-operations/PackagePurchaser";
+import { restorePurchases } from "./package-operations/PackageRestorer";
+import type { RestoreResultInfo } from "./package-operations/types";
 
 export class PackageHandler {
   constructor(

package/src/domains/subscription/infrastructure/handlers/PurchaseStatusResolver.ts

@@ -1,8 +1,8 @@
 import type { CustomerInfo } from "react-native-purchases";
-import { getPremiumEntitlement } from "../../../revenuecat/core/types";
+import { getPremiumEntitlement } from "../../../revenuecat/core/types/RevenueCatTypes";
 import { toDate } from "../../../../shared/utils/dateConverter";
 import { detectPackageType } from "../../../../utils/packageTypeDetector";
-import type { PremiumStatus } from "../../core/types";
+import type { PremiumStatus } from "../../core/types/PremiumStatus";
 
 export type { PremiumStatus };
 

package/src/domains/subscription/infrastructure/handlers/package-operations/PackageRestorer.ts

@@ -1,5 +1,5 @@
 import type { IRevenueCatService } from "../../../../../shared/application/ports/IRevenueCatService";
-import { getPremiumEntitlement } from "../../../../revenuecat/core/types";
+import { getPremiumEntitlement } from "../../../../revenuecat/core/types/RevenueCatTypes";
 import type { RestoreResultInfo } from "./types";
 
 export async function restorePurchases(

package/src/domains/subscription/infrastructure/hooks/usePurchasePackage.ts

@@ -9,7 +9,7 @@ import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionM
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { subscriptionStatusQueryKeys } from "../../presentation/useSubscriptionStatus";
 import { creditsQueryKeys } from "../../../credits/presentation/creditsQueryKeys";
-import { getErrorMessage } from "../../../revenuecat/core/errors";
+import { getErrorMessage } from "../../../revenuecat/core/errors/RevenueCatErrorHandler";
 
 interface PurchaseMutationResult {
   success: boolean;

package/src/domains/subscription/infrastructure/hooks/useRestorePurchase.ts

@@ -8,7 +8,7 @@ import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionM
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { subscriptionStatusQueryKeys } from "../../presentation/useSubscriptionStatus";
 import { creditsQueryKeys } from "../../../credits/presentation/creditsQueryKeys";
-import { getErrorMessage } from "../../../revenuecat/core/errors";
+import { getErrorMessage } from "../../../revenuecat/core/errors/RevenueCatErrorHandler";
 
 interface RestoreResult {
   success: boolean;

package/src/domains/subscription/infrastructure/managers/SubscriptionManager.types.ts

@@ -1,5 +1,5 @@
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
-import type { PremiumStatus } from "../../core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
+import type { PremiumStatus } from "../../core/types/PremiumStatus";
 import type { RestoreResultInfo } from "../handlers/package-operations/types";
 
 export interface SubscriptionManagerConfig {

package/src/domains/subscription/infrastructure/managers/initializationHandler.ts

@@ -1,7 +1,7 @@
 import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
 import { initializeRevenueCatService, getRevenueCatService } from "../services/revenueCatServiceInstance";
 import { ensureServiceAvailable } from "./subscriptionManagerUtils";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 
 export const performServiceInitialization = async (config: RevenueCatConfig, userId: string): Promise<{ service: IRevenueCatService; success: boolean }> => {
   await initializeRevenueCatService(config);

package/src/domains/subscription/infrastructure/services/CustomerInfoListenerManager.ts

@@ -1,5 +1,5 @@
 import Purchases, { type CustomerInfo } from "react-native-purchases";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 import { ListenerState } from "./listeners/ListenerState";
 import { processCustomerInfo } from "./listeners/CustomerInfoHandler";
 

package/src/domains/subscription/infrastructure/services/PurchaseHandler.ts

@@ -1,7 +1,7 @@
 import type { PurchasesPackage } from "react-native-purchases";
 import type { PurchaseResult } from "../../../../shared/application/ports/IRevenueCatService";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
-import { isUserCancelledError, isAlreadyPurchasedError } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
+import { isUserCancelledError, isAlreadyPurchasedError } from "../../../revenuecat/core/types/RevenueCatTypes";
 import { validatePurchaseReady, isConsumableProduct } from "./purchase/PurchaseValidator";
 import { executePurchase } from "./purchase/PurchaseExecutor";
 import { handleAlreadyPurchasedError, handlePurchaseError } from "./purchase/PurchaseErrorHandler";

package/src/domains/subscription/infrastructure/services/RestoreHandler.ts

@@ -4,14 +4,14 @@ import {
   RevenueCatRestoreError,
   RevenueCatInitializationError,
   RevenueCatNetworkError,
-} from "../../../revenuecat/core/errors";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+} from "../../../revenuecat/core/errors/RevenueCatError";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 import {
   getRawErrorMessage,
   getErrorCode,
   isNetworkError,
   isInvalidCredentialsError,
-} from "../../../revenuecat/core/types";
+} from "../../../revenuecat/core/types/RevenueCatTypes";
 import { notifyRestoreCompleted } from "../utils/PremiumStatusSyncer";
 
 interface RestoreHandlerDeps {
@@ -50,7 +50,7 @@ export async function handleRestore(deps: RestoreHandlerDeps, userId: string): P
 
     // Generic error with code
     const errorCode = getErrorCode(error);
-    const errorMessage = getRawErrorMessage(error, "Restore failed");
+    const errorMessage = getRawErrorMessage(error);
     const enhancedMessage = errorCode
       ? `${errorMessage} (Code: ${errorCode})`
       : errorMessage;

package/src/domains/subscription/infrastructure/services/RevenueCatService.types.ts

@@ -1,7 +1,7 @@
 import Purchases from "react-native-purchases";
 import type { PurchasesOffering, PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService, InitializeResult, PurchaseResult, RestoreResult } from "../../../../shared/application/ports/IRevenueCatService";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 import { initializeSDK } from "../../../revenuecat/infrastructure/services/RevenueCatInitializer";
 import { fetchOfferings } from "./OfferingsFetcher";
 import { handlePurchase } from "./PurchaseHandler";

package/src/domains/subscription/infrastructure/services/ServiceStateManager.ts

@@ -1,4 +1,4 @@
-import type { RevenueCatConfig } from '../../../revenuecat/core/types';
+import type { RevenueCatConfig } from '../../../revenuecat/core/types/RevenueCatConfig';
 
 export class ServiceStateManager {
   private isInitializedFlag = false;

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

@@ -1,7 +1,9 @@
 import type { CustomerInfo } from "react-native-purchases";
-import type { RevenueCatConfig } from "../../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../../revenuecat/core/types/RevenueCatConfig";
 import { syncPremiumStatus } from "../../utils/PremiumStatusSyncer";
-import { detectRenewal, updateRenewalState, type RenewalState } from "../../utils/renewal";
+import { detectRenewal } from "../../utils/renewal/RenewalDetector";
+import { updateRenewalState } from "../../utils/renewal/RenewalStateUpdater";
+import type { RenewalState } from "../../utils/renewal/types";
 
 async function handleRenewal(
   userId: string,

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

@@ -1,5 +1,5 @@
 import type { CustomerInfoUpdateListener } from "react-native-purchases";
-import type { RenewalState } from "../../utils/renewal";
+import type { RenewalState } from "../../utils/renewal/types";
 
 export class ListenerState {
   listener: CustomerInfoUpdateListener | null = null;

package/src/domains/subscription/infrastructure/services/purchase/PurchaseErrorHandler.ts

@@ -3,14 +3,14 @@ import type { PurchaseResult } from "../../../../../shared/application/ports/IRe
 import {
   RevenueCatPurchaseError,
   RevenueCatNetworkError,
-} from "../../../../revenuecat/core/errors";
+} from "../../../../revenuecat/core/errors/RevenueCatError";
 import {
   isUserCancelledError,
   isNetworkError,
   isInvalidCredentialsError,
   getRawErrorMessage,
   getErrorCode,
-} from "../../../../revenuecat/core/types";
+} from "../../../../revenuecat/core/types/RevenueCatTypes";
 import { getSavedPurchase, clearSavedPurchase } from "../../../presentation/useAuthAwarePurchase";
 import { notifyPurchaseCompleted } from "../../utils/PremiumStatusSyncer";
 import { handleRestore } from "../RestoreHandler";
@@ -80,7 +80,7 @@ export function handlePurchaseError(
   }
 
   const errorCode = getErrorCode(error);
-  const errorMessage = getRawErrorMessage(error, "Purchase failed");
+  const errorMessage = getRawErrorMessage(error);
   const enhancedMessage = errorCode
     ? `${errorMessage} (Code: ${errorCode})`
     : errorMessage;

package/src/domains/subscription/infrastructure/services/purchase/PurchaseExecutor.ts

@@ -1,6 +1,7 @@
 import Purchases, { type PurchasesPackage, type CustomerInfo } from "react-native-purchases";
 import type { PurchaseResult } from "../../../../../shared/application/ports/IRevenueCatService";
-import type { RevenueCatConfig, PackageType } from "../../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../../revenuecat/core/types/RevenueCatConfig";
+import type { PackageType } from "../../../../revenuecat/core/types/RevenueCatTypes";
 import { notifyPurchaseCompleted, syncPremiumStatus } from "../../utils/PremiumStatusSyncer";
 import { getSavedPurchase, clearSavedPurchase } from "../../../presentation/useAuthAwarePurchase";
 

package/src/domains/subscription/infrastructure/services/purchase/PurchaseValidator.ts

@@ -1,5 +1,5 @@
 import type { PurchasesPackage } from "react-native-purchases";
-import { RevenueCatInitializationError } from "../../../../revenuecat/core/errors";
+import { RevenueCatInitializationError } from "../../../../revenuecat/core/errors/RevenueCatError";
 
 export function validatePurchaseReady(isInitialized: boolean): void {
   if (!isInitialized) {

package/src/domains/subscription/infrastructure/services/revenueCatServiceInstance.ts

@@ -1,5 +1,5 @@
 import { RevenueCatService } from "./RevenueCatService.types";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 
 let revenueCatServiceInstance: RevenueCatService | null = null;