@umituz/react-native-subscription 2.31.5 → 2.31.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.31.5",
+  "version": "2.31.6",
   "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/core/Credits.ts

@@ -9,7 +9,6 @@ import type { SubscriptionPackageType } from "../../../utils/packageTypeDetector
 // Types imported from SubscriptionConstants are used directly in UserCredits interface
 import type {
   SubscriptionStatusType,
-  PeriodType,
   PackageType,
   Platform,
   PurchaseSource,
@@ -36,8 +35,8 @@ export interface UserCredits {
   packageType: PackageType | null;
   originalTransactionId: string | null;
 
-  // Trial fields
-  periodType: PeriodType | null;
+  // Trial fields - periodType comes from RevenueCat SDK
+  periodType: string | null;
   isTrialing: boolean | null;
   trialStartDate: Date | null;
   trialEndDate: Date | null;

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

@@ -1,6 +1,5 @@
 import type { UserCredits } from "./Credits";
-import { resolveSubscriptionStatus } from "../../subscription/core/SubscriptionStatus";
-import type { PeriodType, SubscriptionStatusType } from "../../subscription/core/SubscriptionConstants";
+import { resolveSubscriptionStatus, type SubscriptionStatusType } from "../../subscription/core/SubscriptionStatus";
 import type { UserCreditsDocumentRead } from "./UserCreditsDocument";
 import { toSafeDate } from "../../../utils/dateUtils";
 
@@ -10,7 +9,7 @@ import { toSafeDate } from "../../../utils/dateUtils";
 function validateSubscription(
   doc: UserCreditsDocumentRead,
   expirationDate: Date | null,
-  periodType: PeriodType | null
+  periodType: string | null
 ): { isPremium: boolean; status: SubscriptionStatusType } {
   const isPremium = doc.isPremium;
   const willRenew = doc.willRenew ?? false;

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

@@ -2,17 +2,15 @@ import type {
   PurchaseSource,
   PurchaseType,
   SubscriptionStatusType,
-  PeriodType,
   PackageType,
   Platform
 } from "../../subscription/core/SubscriptionConstants";
-import type { Store, OwnershipType } from "../../subscription/core/RevenueCatTypes";
+import type { Store, OwnershipType } from "../../revenuecat/core/types";
 
 export type {
   PurchaseSource,
   PurchaseType,
   SubscriptionStatusType,
-  PeriodType,
   Store,
   OwnershipType
 };
@@ -55,7 +53,7 @@ export interface UserCreditsDocumentRead {
     ownershipType: OwnershipType | null;
 
     // Trial fields
-    periodType: PeriodType | null;
+    periodType: string | null;
     isTrialing: boolean | null;
     trialStartDate: FirestoreTimestamp | null;
     trialEndDate: FirestoreTimestamp | null;

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

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

package/src/domains/revenuecat/core/constants/RevenueCatConstants.ts

@@ -0,0 +1,201 @@
+/**
+ * RevenueCat Constants
+ * Error codes, messages, and logging constants
+ */
+
+import Purchases from "react-native-purchases";
+
+export const REVENUECAT_LOG_PREFIX = "[RevenueCat]";
+
+/**
+ * RevenueCat Error Code Type
+ * Re-export for type safety
+ */
+export type PurchasesErrorCode = typeof Purchases.PURCHASES_ERROR_CODE[keyof typeof Purchases.PURCHASES_ERROR_CODE];
+
+/**
+ * Error Message Configuration
+ */
+export interface ErrorMessage {
+  title: string;
+  message: string;
+  shouldShowAlert?: boolean;
+}
+
+/**
+ * Error Code to Enum Mapping
+ * Maps both string keys and numeric codes to Purchases error enum values
+ */
+const ERROR_CODE_MAP = new Map<string, PurchasesErrorCode>([
+  ["PURCHASE_CANCELLED_ERROR", Purchases.PURCHASES_ERROR_CODE.PURCHASE_CANCELLED_ERROR],
+  ["PURCHASE_NOT_ALLOWED_ERROR", Purchases.PURCHASES_ERROR_CODE.PURCHASE_NOT_ALLOWED_ERROR],
+  ["PURCHASE_INVALID_ERROR", Purchases.PURCHASES_ERROR_CODE.PURCHASE_INVALID_ERROR],
+  ["PRODUCT_ALREADY_PURCHASED_ERROR", Purchases.PURCHASES_ERROR_CODE.PRODUCT_ALREADY_PURCHASED_ERROR],
+  ["PRODUCT_NOT_AVAILABLE_FOR_PURCHASE_ERROR", Purchases.PURCHASES_ERROR_CODE.PRODUCT_NOT_AVAILABLE_FOR_PURCHASE_ERROR],
+  ["NETWORK_ERROR", Purchases.PURCHASES_ERROR_CODE.NETWORK_ERROR],
+  ["UNKNOWN_ERROR", Purchases.PURCHASES_ERROR_CODE.UNKNOWN_ERROR],
+  ["RECEIPT_ALREADY_IN_USE_ERROR", Purchases.PURCHASES_ERROR_CODE.RECEIPT_ALREADY_IN_USE_ERROR],
+  ["INVALID_CREDENTIALS_ERROR", Purchases.PURCHASES_ERROR_CODE.INVALID_CREDENTIALS_ERROR],
+  ["UNEXPECTED_BACKEND_RESPONSE_ERROR", Purchases.PURCHASES_ERROR_CODE.UNEXPECTED_BACKEND_RESPONSE_ERROR],
+  ["CONFIGURATION_ERROR", Purchases.PURCHASES_ERROR_CODE.CONFIGURATION_ERROR],
+  ["STORE_PROBLEM_ERROR", Purchases.PURCHASES_ERROR_CODE.STORE_PROBLEM_ERROR],
+  ["PAYMENT_PENDING_ERROR", Purchases.PURCHASES_ERROR_CODE.PAYMENT_PENDING_ERROR],
+  // Numeric codes as fallback
+  ["1", Purchases.PURCHASES_ERROR_CODE.PURCHASE_CANCELLED_ERROR],
+  ["2", Purchases.PURCHASES_ERROR_CODE.STORE_PROBLEM_ERROR],
+  ["3", Purchases.PURCHASES_ERROR_CODE.PURCHASE_NOT_ALLOWED_ERROR],
+  ["4", Purchases.PURCHASES_ERROR_CODE.PURCHASE_INVALID_ERROR],
+  ["5", Purchases.PURCHASES_ERROR_CODE.PRODUCT_NOT_AVAILABLE_FOR_PURCHASE_ERROR],
+  ["6", Purchases.PURCHASES_ERROR_CODE.PRODUCT_ALREADY_PURCHASED_ERROR],
+  ["7", Purchases.PURCHASES_ERROR_CODE.NETWORK_ERROR],
+  ["8", Purchases.PURCHASES_ERROR_CODE.RECEIPT_ALREADY_IN_USE_ERROR],
+  ["9", Purchases.PURCHASES_ERROR_CODE.INVALID_CREDENTIALS_ERROR],
+  ["10", Purchases.PURCHASES_ERROR_CODE.UNEXPECTED_BACKEND_RESPONSE_ERROR],
+  ["16", Purchases.PURCHASES_ERROR_CODE.CONFIGURATION_ERROR],
+  ["20", Purchases.PURCHASES_ERROR_CODE.PAYMENT_PENDING_ERROR],
+  ["0", Purchases.PURCHASES_ERROR_CODE.UNKNOWN_ERROR],
+]);
+
+/**
+ * User-friendly error messages mapped by error code enum
+ * Strategy Pattern: Each error code has its own message configuration
+ */
+const ERROR_MESSAGES_MAP = new Map<PurchasesErrorCode, ErrorMessage>([
+  [
+    Purchases.PURCHASES_ERROR_CODE.PURCHASE_CANCELLED_ERROR,
+    {
+      title: "Purchase Cancelled",
+      message: "The purchase was cancelled.",
+      shouldShowAlert: false, // Don't show alert for user cancellation
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.PURCHASE_NOT_ALLOWED_ERROR,
+    {
+      title: "Purchase Not Allowed",
+      message: "In-app purchases are disabled on this device.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.PURCHASE_INVALID_ERROR,
+    {
+      title: "Invalid Purchase",
+      message: "The purchase is invalid. Please contact support.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.PRODUCT_ALREADY_PURCHASED_ERROR,
+    {
+      title: "Already Purchased",
+      message: "You already own this subscription. Restoring your purchase...",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.PRODUCT_NOT_AVAILABLE_FOR_PURCHASE_ERROR,
+    {
+      title: "Product Unavailable",
+      message: "This product is not available for purchase at this time.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.NETWORK_ERROR,
+    {
+      title: "Network Error",
+      message: "Please check your internet connection and try again.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.UNKNOWN_ERROR,
+    {
+      title: "Unknown Error",
+      message: "An unexpected error occurred. Please try again.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.RECEIPT_ALREADY_IN_USE_ERROR,
+    {
+      title: "Receipt Already Used",
+      message: "This receipt is already associated with another account.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.INVALID_CREDENTIALS_ERROR,
+    {
+      title: "Configuration Error",
+      message: "The app is not configured correctly. Please contact support.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.UNEXPECTED_BACKEND_RESPONSE_ERROR,
+    {
+      title: "Server Error",
+      message: "The server returned an unexpected response. Please try again later.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.CONFIGURATION_ERROR,
+    {
+      title: "Configuration Error",
+      message: "RevenueCat is not configured correctly. Please contact support.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.STORE_PROBLEM_ERROR,
+    {
+      title: "Store Error",
+      message: "There was a problem with the app store. Please try again.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.PAYMENT_PENDING_ERROR,
+    {
+      title: "Payment Pending",
+      message: "Your payment is still being processed. Please check back later.",
+      shouldShowAlert: true,
+    },
+  ],
+]);
+
+/**
+ * Default error message for unknown errors
+ */
+const DEFAULT_ERROR_MESSAGE: ErrorMessage = {
+  title: "Error",
+  message: "An error occurred. Please try again.",
+  shouldShowAlert: true,
+};
+
+/**
+ * Get error message configuration for a given error code
+ * Uses Strategy Pattern with Map lookup - O(1) complexity
+ *
+ * @param errorCode - Error code string from RevenueCat error
+ * @returns ErrorMessage configuration
+ */
+export function getErrorMessageForCode(errorCode: string | null | undefined): ErrorMessage {
+  if (!errorCode) {
+    return DEFAULT_ERROR_MESSAGE;
+  }
+
+  // Try to map string code to enum value
+  const enumCode = ERROR_CODE_MAP.get(errorCode);
+  if (enumCode) {
+    const message = ERROR_MESSAGES_MAP.get(enumCode);
+    if (message) {
+      return message;
+    }
+  }
+
+  return DEFAULT_ERROR_MESSAGE;
+}

package/src/domains/revenuecat/core/constants/index.ts

@@ -0,0 +1,5 @@
+/**
+ * RevenueCat Domain - Constants
+ */
+
+export { REVENUECAT_LOG_PREFIX } from "./RevenueCatConstants";

package/src/domains/{subscription/core → revenuecat/core/errors}/RevenueCatError.ts

@@ -3,7 +3,7 @@
  * Domain-specific error types for RevenueCat operations
  */
 
-import { BaseError } from "../../../shared/utils/BaseError";
+import { BaseError } from "../../../../shared/utils/BaseError";
 
 export class RevenueCatError extends BaseError {
     constructor(message: string, code: string = 'REVENUE_CAT_ERROR', cause?: Error) {

package/src/domains/revenuecat/core/errors/RevenueCatErrorHandler.ts

@@ -0,0 +1,91 @@
+/**
+ * RevenueCat Error Handler
+ * Error code mapping and message resolution utilities
+ */
+
+import Purchases from "react-native-purchases";
+import {
+  ERROR_MESSAGES_MAP,
+  DEFAULT_ERROR_MESSAGE,
+  type ErrorMessage,
+  type PurchasesErrorCode,
+} from "./RevenueCatErrorMessages";
+
+/**
+ * Error Code to Enum Mapping
+ * Maps both string keys and numeric codes to Purchases error enum values
+ */
+const ERROR_CODE_MAP = new Map<string, PurchasesErrorCode>([
+  // String error codes
+  ["PURCHASE_CANCELLED_ERROR", Purchases.PURCHASES_ERROR_CODE.PURCHASE_CANCELLED_ERROR],
+  ["PURCHASE_NOT_ALLOWED_ERROR", Purchases.PURCHASES_ERROR_CODE.PURCHASE_NOT_ALLOWED_ERROR],
+  ["PURCHASE_INVALID_ERROR", Purchases.PURCHASES_ERROR_CODE.PURCHASE_INVALID_ERROR],
+  ["PRODUCT_ALREADY_PURCHASED_ERROR", Purchases.PURCHASES_ERROR_CODE.PRODUCT_ALREADY_PURCHASED_ERROR],
+  ["PRODUCT_NOT_AVAILABLE_FOR_PURCHASE_ERROR", Purchases.PURCHASES_ERROR_CODE.PRODUCT_NOT_AVAILABLE_FOR_PURCHASE_ERROR],
+  ["NETWORK_ERROR", Purchases.PURCHASES_ERROR_CODE.NETWORK_ERROR],
+  ["UNKNOWN_ERROR", Purchases.PURCHASES_ERROR_CODE.UNKNOWN_ERROR],
+  ["RECEIPT_ALREADY_IN_USE_ERROR", Purchases.PURCHASES_ERROR_CODE.RECEIPT_ALREADY_IN_USE_ERROR],
+  ["INVALID_CREDENTIALS_ERROR", Purchases.PURCHASES_ERROR_CODE.INVALID_CREDENTIALS_ERROR],
+  ["UNEXPECTED_BACKEND_RESPONSE_ERROR", Purchases.PURCHASES_ERROR_CODE.UNEXPECTED_BACKEND_RESPONSE_ERROR],
+  ["CONFIGURATION_ERROR", Purchases.PURCHASES_ERROR_CODE.CONFIGURATION_ERROR],
+  ["STORE_PROBLEM_ERROR", Purchases.PURCHASES_ERROR_CODE.STORE_PROBLEM_ERROR],
+  ["PAYMENT_PENDING_ERROR", Purchases.PURCHASES_ERROR_CODE.PAYMENT_PENDING_ERROR],
+
+  // Numeric error codes as fallback
+  ["1", Purchases.PURCHASES_ERROR_CODE.PURCHASE_CANCELLED_ERROR],
+  ["2", Purchases.PURCHASES_ERROR_CODE.STORE_PROBLEM_ERROR],
+  ["3", Purchases.PURCHASES_ERROR_CODE.PURCHASE_NOT_ALLOWED_ERROR],
+  ["4", Purchases.PURCHASES_ERROR_CODE.PURCHASE_INVALID_ERROR],
+  ["5", Purchases.PURCHASES_ERROR_CODE.PRODUCT_NOT_AVAILABLE_FOR_PURCHASE_ERROR],
+  ["6", Purchases.PURCHASES_ERROR_CODE.PRODUCT_ALREADY_PURCHASED_ERROR],
+  ["7", Purchases.PURCHASES_ERROR_CODE.NETWORK_ERROR],
+  ["8", Purchases.PURCHASES_ERROR_CODE.RECEIPT_ALREADY_IN_USE_ERROR],
+  ["9", Purchases.PURCHASES_ERROR_CODE.INVALID_CREDENTIALS_ERROR],
+  ["10", Purchases.PURCHASES_ERROR_CODE.UNEXPECTED_BACKEND_RESPONSE_ERROR],
+  ["16", Purchases.PURCHASES_ERROR_CODE.CONFIGURATION_ERROR],
+  ["20", Purchases.PURCHASES_ERROR_CODE.PAYMENT_PENDING_ERROR],
+  ["0", Purchases.PURCHASES_ERROR_CODE.UNKNOWN_ERROR],
+]);
+
+/**
+ * Get error message configuration for a given error code
+ * Strategy Pattern with Map lookup - O(1) complexity
+ *
+ * @param errorCode - Error code string from RevenueCat error
+ * @returns ErrorMessage configuration
+ */
+export function getErrorMessageForCode(errorCode: string | null | undefined): ErrorMessage {
+  if (!errorCode) {
+    return DEFAULT_ERROR_MESSAGE;
+  }
+
+  const enumCode = ERROR_CODE_MAP.get(errorCode);
+  if (enumCode) {
+    const message = ERROR_MESSAGES_MAP.get(enumCode);
+    if (message) {
+      return message;
+    }
+  }
+
+  return DEFAULT_ERROR_MESSAGE;
+}
+
+/**
+ * Get error message from RevenueCat error object
+ *
+ * @param error - RevenueCat error object
+ * @returns ErrorMessage configuration
+ */
+export function getErrorMessage(error: unknown): ErrorMessage {
+  if (!error || typeof error !== "object") {
+    return DEFAULT_ERROR_MESSAGE;
+  }
+
+  const errorCode = "code" in error
+    ? String(error.code)
+    : "readableErrorCode" in error
+    ? String(error.readableErrorCode)
+    : null;
+
+  return getErrorMessageForCode(errorCode);
+}

package/src/domains/revenuecat/core/errors/RevenueCatErrorMessages.ts

@@ -0,0 +1,140 @@
+/**
+ * RevenueCat Error Messages
+ * User-friendly error message configurations
+ */
+
+import Purchases from "react-native-purchases";
+
+/**
+ * Error Message Configuration
+ */
+export interface ErrorMessage {
+  title: string;
+  message: string;
+  shouldShowAlert?: boolean;
+}
+
+/**
+ * RevenueCat Error Code Type
+ */
+export type PurchasesErrorCode = typeof Purchases.PURCHASES_ERROR_CODE[keyof typeof Purchases.PURCHASES_ERROR_CODE];
+
+/**
+ * User-friendly error messages mapped by error code enum
+ * Strategy Pattern: Each error code has its own message configuration
+ */
+export const ERROR_MESSAGES_MAP = new Map<PurchasesErrorCode, ErrorMessage>([
+  [
+    Purchases.PURCHASES_ERROR_CODE.PURCHASE_CANCELLED_ERROR,
+    {
+      title: "Purchase Cancelled",
+      message: "The purchase was cancelled.",
+      shouldShowAlert: false,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.PURCHASE_NOT_ALLOWED_ERROR,
+    {
+      title: "Purchase Not Allowed",
+      message: "In-app purchases are disabled on this device.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.PURCHASE_INVALID_ERROR,
+    {
+      title: "Invalid Purchase",
+      message: "The purchase is invalid. Please contact support.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.PRODUCT_ALREADY_PURCHASED_ERROR,
+    {
+      title: "Already Purchased",
+      message: "You already own this subscription. Restoring your purchase...",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.PRODUCT_NOT_AVAILABLE_FOR_PURCHASE_ERROR,
+    {
+      title: "Product Unavailable",
+      message: "This product is not available for purchase at this time.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.NETWORK_ERROR,
+    {
+      title: "Network Error",
+      message: "Please check your internet connection and try again.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.UNKNOWN_ERROR,
+    {
+      title: "Unknown Error",
+      message: "An unexpected error occurred. Please try again.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.RECEIPT_ALREADY_IN_USE_ERROR,
+    {
+      title: "Receipt Already Used",
+      message: "This receipt is already associated with another account.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.INVALID_CREDENTIALS_ERROR,
+    {
+      title: "Configuration Error",
+      message: "The app is not configured correctly. Please contact support.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.UNEXPECTED_BACKEND_RESPONSE_ERROR,
+    {
+      title: "Server Error",
+      message: "The server returned an unexpected response. Please try again later.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.CONFIGURATION_ERROR,
+    {
+      title: "Configuration Error",
+      message: "RevenueCat is not configured correctly. Please contact support.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.STORE_PROBLEM_ERROR,
+    {
+      title: "Store Error",
+      message: "There was a problem with the app store. Please try again.",
+      shouldShowAlert: true,
+    },
+  ],
+  [
+    Purchases.PURCHASES_ERROR_CODE.PAYMENT_PENDING_ERROR,
+    {
+      title: "Payment Pending",
+      message: "Your payment is still being processed. Please check back later.",
+      shouldShowAlert: true,
+    },
+  ],
+]);
+
+/**
+ * Default error message for unknown errors
+ */
+export const DEFAULT_ERROR_MESSAGE: ErrorMessage = {
+  title: "Error",
+  message: "An error occurred. Please try again.",
+  shouldShowAlert: true,
+};

package/src/domains/revenuecat/core/errors/index.ts

@@ -0,0 +1,7 @@
+/**
+ * RevenueCat Domain - Error Handling
+ */
+
+export * from "./RevenueCatError";
+export * from "./RevenueCatErrorMessages";
+export * from "./RevenueCatErrorHandler";

package/src/domains/revenuecat/core/index.ts

@@ -0,0 +1,7 @@
+/**
+ * RevenueCat Domain - Core Layer
+ */
+
+export * from "./errors";
+export * from "./types";
+export * from "./constants";

package/src/domains/{subscription/core → revenuecat/core/types}/RevenueCatConfig.ts

@@ -1,6 +1,9 @@
 import type { CustomerInfo } from "react-native-purchases";
-import type { PurchaseSource } from "./SubscriptionConstants";
 
+/**
+ * RevenueCat Configuration
+ * All callbacks receive data directly from RevenueCat SDK
+ */
 export interface RevenueCatConfig {
   apiKey?: string;
   entitlementIdentifier: string;
@@ -11,13 +14,13 @@ export interface RevenueCatConfig {
     productId?: string,
     expiresAt?: string,
     willRenew?: boolean,
-    periodType?: "NORMAL" | "INTRO" | "TRIAL"
+    periodType?: string // From RevenueCat SDK (NORMAL, INTRO, TRIAL)
   ) => Promise<void> | void;
   onPurchaseCompleted?: (
     userId: string,
     productId: string,
     customerInfo: CustomerInfo,
-    source?: PurchaseSource
+    source?: string // Purchase source tracking (app-specific)
   ) => Promise<void> | void;
   onRestoreCompleted?: (
     userId: string,

package/src/domains/{subscription/core → revenuecat/core/types}/RevenueCatData.ts

@@ -1,18 +1,18 @@
-import type { PeriodType } from "./SubscriptionConstants";
 import type { Store, OwnershipType } from "./RevenueCatTypes";
 
 /**
  * RevenueCat subscription data (Single Source of Truth)
  * Used across the subscription package for storing RevenueCat data in Firestore
+ * All fields come directly from RevenueCat SDK - no manual definitions
  */
 export interface RevenueCatData {
   expirationDate: string | null;
   willRenew: boolean | null;
   originalTransactionId: string | null;
   isPremium: boolean;
-  periodType: PeriodType | null;
+  periodType: string | null; // From RevenueCat SDK (NORMAL, INTRO, TRIAL)
   unsubscribeDetectedAt: string | null;
   billingIssueDetectedAt: string | null;
-  store: Store | null;
-  ownershipType: OwnershipType | null;
+  store: Store | null; // From PurchasesEntitlementInfo['store']
+  ownershipType: OwnershipType | null; // From PurchasesEntitlementInfo['ownershipType']
 }

package/src/domains/{subscription/core → revenuecat/core/types}/RevenueCatTypes.ts

@@ -4,16 +4,21 @@
  */
 
 import type { CustomerInfo, PurchasesEntitlementInfo } from "react-native-purchases";
-import { DEFAULT_ENTITLEMENT_ID } from "./SubscriptionConstants";
 
 /**
- * Store type extracted from RevenueCat's PurchasesEntitlementInfo
+ * Default entitlement identifier
+ * Can be overridden in RevenueCatConfig
+ */
+export const DEFAULT_ENTITLEMENT_ID = "premium";
+
+/**
+ * Store type - Directly from RevenueCat SDK
  * Automatically stays in sync with RevenueCat SDK updates
  */
 export type Store = PurchasesEntitlementInfo['store'];
 
 /**
- * OwnershipType extracted from RevenueCat's PurchasesEntitlementInfo
+ * OwnershipType - Directly from RevenueCat SDK
  * Automatically stays in sync with RevenueCat SDK updates
  */
 export type OwnershipType = PurchasesEntitlementInfo['ownershipType'];
@@ -132,10 +137,10 @@ export function isInvalidCredentialsError(error: unknown): boolean {
 }
 
 /**
- * Extract error message safely
- * Returns user-friendly message if available, otherwise raw error message
+ * Extract raw error message from error object
+ * For user-friendly messages, use getErrorMessageForCode from errors module
  */
-export function getErrorMessage(error: unknown, fallback: string): string {
+export function getRawErrorMessage(error: unknown, fallback: string): string {
   if (error instanceof Error) {
     return error.message;
   }

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

@@ -0,0 +1,7 @@
+/**
+ * RevenueCat Domain - Types
+ */
+
+export * from "./RevenueCatTypes";
+export * from "./RevenueCatConfig";
+export * from "./RevenueCatData";

package/src/domains/revenuecat/index.ts

@@ -0,0 +1,7 @@
+/**
+ * RevenueCat Domain
+ * Bounded Context for RevenueCat SDK Integration
+ */
+
+export * from "./core";
+export * from "./infrastructure";

package/src/domains/revenuecat/infrastructure/index.ts

@@ -0,0 +1,5 @@
+/**
+ * RevenueCat Domain - Infrastructure Layer
+ */
+
+export * from "./services";

package/src/domains/{subscription → revenuecat}/infrastructure/services/RevenueCatInitializer.ts

@@ -94,14 +94,23 @@ export async function initializeSDK(
     try {
       const currentAppUserId = await Purchases.getAppUserID();
       let customerInfo;
+
+      // Handle user switching
       if (currentAppUserId !== userId) {
-        const result = await Purchases.logIn(userId);
-        customerInfo = result.customerInfo;
+        if (userId) {
+          // Switch to authenticated user
+          const result = await Purchases.logIn(userId);
+          customerInfo = result.customerInfo;
+        } else {
+          // User logged out - switch to anonymous
+          customerInfo = await Purchases.logOut();
+        }
       } else {
         customerInfo = await Purchases.getCustomerInfo();
       }
+
       deps.setInitialized(true);
-      deps.setCurrentUserId(userId);
+      deps.setCurrentUserId(userId ?? null);
       const offerings = await Purchases.getOfferings();
       return buildSuccessResult(deps, customerInfo, offerings);
     } catch {
@@ -133,9 +142,11 @@ export async function initializeSDK(
   }
 
   try {
-    await Purchases.configure({ apiKey: key, appUserID: userId });
+    // Configure with null appUserID for anonymous users (generates RevenueCat anonymous ID)
+    // For authenticated users, use their userId
+    await Purchases.configure({ apiKey: key, appUserID: userId ?? null });
     deps.setInitialized(true);
-    deps.setCurrentUserId(userId);
+    deps.setCurrentUserId(userId ?? null);
 
     const [customerInfo, offerings] = await Promise.all([
       Purchases.getCustomerInfo(),

package/src/domains/{subscription → revenuecat}/infrastructure/services/RevenueCatInitializer.types.ts

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

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

@@ -0,0 +1,7 @@
+/**
+ * RevenueCat Domain - Infrastructure Services
+ * Pure RevenueCat SDK Integration
+ */
+
+export * from "./RevenueCatInitializer";
+export * from "./RevenueCatInitializer.types";

package/src/domains/{subscription → revenuecat}/infrastructure/utils/ApiKeyResolver.ts

@@ -1,4 +1,4 @@
-import type { RevenueCatConfig } from '../../core/RevenueCatConfig';
+import type { RevenueCatConfig } from '../../core/types';
 
 export function resolveApiKey(config: RevenueCatConfig): string | null {
   return config.apiKey || null;

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

@@ -2,16 +2,25 @@ import type { FirebaseAuthLike } from "./SubscriptionInitializerTypes";
 
 /**
  * Gets the current user ID from Firebase auth.
+ * Returns undefined for anonymous users to prevent RevenueCat from using anonymous Firebase UIDs.
  */
 export const getCurrentUserId = (getAuth: () => FirebaseAuthLike | null): string | undefined => {
   const auth = getAuth();
   if (!auth) return undefined;
-  return auth.currentUser?.uid;
+
+  const user = auth.currentUser;
+  if (!user) return undefined;
+
+  // Don't return userId for anonymous users - let RevenueCat use its own anonymous ID
+  if (user.isAnonymous) return undefined;
+
+  return user.uid;
 };
 
 /**
  * Sets up auth state listener that will re-initialize subscription
  * when user auth state changes (login/logout).
+ * Returns undefined for anonymous users to prevent RevenueCat from using anonymous Firebase UIDs.
  */
 export const setupAuthStateListener = (
   getAuth: () => FirebaseAuthLike | null,
@@ -21,6 +30,8 @@ export const setupAuthStateListener = (
   if (!auth) return null;
 
   return auth.onAuthStateChanged((user) => {
-    onUserChange(user?.uid);
+    // Don't pass userId for anonymous users - let RevenueCat use its own anonymous ID
+    const userId = (user && !user.isAnonymous) ? user.uid : undefined;
+    onUserChange(userId);
   });
 };

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

@@ -5,8 +5,7 @@
 import type { CreditsConfig } from "../../credits/core/Credits";
 import type { UserCreditsDocumentRead } from "../../credits/core/UserCreditsDocument";
 import type { PurchaseSource, PurchaseType } from "../core/SubscriptionConstants";
-import type { PeriodType } from "../core/SubscriptionStatus";
-import type { Store, OwnershipType } from "../core/RevenueCatTypes";
+import type { Store, OwnershipType } from "../../revenuecat/core/types";
 
 export interface FirebaseAuthLike {
   currentUser: { uid: string; isAnonymous: boolean } | null;
@@ -41,7 +40,7 @@ export interface InitializeCreditsMetadata {
   willRenew: boolean | null;
   originalTransactionId: string | null;
   isPremium: boolean;
-  periodType: PeriodType | null;
+  periodType: string | null; // Raw value from RevenueCat SDK
   unsubscribeDetectedAt: string | null;
   billingIssueDetectedAt: string | null;
   store: Store | null;

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

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

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

@@ -1,4 +1,4 @@
-import type { RevenueCatData } from "../core/RevenueCatData";
+import type { RevenueCatData } from "../../revenuecat/core/types";
 import type { PeriodType } from "../core/SubscriptionConstants";
 import { PURCHASE_SOURCE, PURCHASE_TYPE } from "../core/SubscriptionConstants";
 import { getCreditsRepository } from "../../credits/infrastructure/CreditsRepositoryManager";

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

@@ -1,4 +1,4 @@
-import type { RevenueCatData } from "../core/RevenueCatData";
+import type { RevenueCatData } from "../../revenuecat/core/types";
 
 export const NO_SUBSCRIPTION_PRODUCT_ID = 'no_subscription';
 

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

@@ -26,7 +26,7 @@ export interface SubscriptionStatus {
     customerId?: string | null;
     syncedAt?: string | null;
     status?: SubscriptionStatusType;
-    periodType?: PeriodType;
+    periodType?: string; // Raw value from RevenueCat SDK (NORMAL, INTRO, TRIAL)
     isTrialing?: boolean;
 }
 
@@ -55,7 +55,7 @@ export interface StatusResolverInput {
     isPremium: boolean;
     willRenew?: boolean;
     isExpired?: boolean;
-    periodType?: PeriodType;
+    periodType?: string; // Raw value from RevenueCat SDK (NORMAL, INTRO, TRIAL)
 }
 
 // Singleton Chain Instance

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

@@ -5,7 +5,7 @@
 
 import type { PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
-import { getPremiumEntitlement } from "../../core/RevenueCatTypes";
+import { getPremiumEntitlement } from "../../../revenuecat/core/types";
 import { PurchaseStatusResolver, type PremiumStatus } from "./PurchaseStatusResolver";
 
 export interface RestoreResultInfo {

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

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

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

@@ -6,18 +6,18 @@
  */
 
 import { useMutation, useQueryClient } from "@umituz/react-native-design-system";
-import Purchases, { type PurchasesPackage } from "react-native-purchases";
+import type { PurchasesPackage } from "react-native-purchases";
 import { useAlert } from "@umituz/react-native-design-system";
 import {
   useAuthStore,
   selectUserId,
+  selectIsAnonymous,
 } from "@umituz/react-native-auth";
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { subscriptionStatusQueryKeys } from "../../presentation/useSubscriptionStatus";
 import { creditsQueryKeys } from "../../../credits/presentation/creditsQueryKeys";
-import { ERROR_MESSAGES } from "../../core/RevenueCatConstants";
-import type { RevenueCatPurchaseErrorInfo } from "../../core/RevenueCatTypes";
+import { getErrorMessage } from "../../../revenuecat/core/errors";
 
 /** Purchase mutation result - simplified for presentation layer */
 export interface PurchaseMutationResult {
@@ -33,6 +33,7 @@ export interface PurchaseMutationResult {
  */
 export const usePurchasePackage = () => {
   const userId = useAuthStore(selectUserId);
+  const isAnonymous = useAuthStore(selectIsAnonymous);
   const queryClient = useQueryClient();
   const { showSuccess, showError } = useAlert();
 
@@ -42,6 +43,10 @@ export const usePurchasePackage = () => {
         throw new Error("User not authenticated");
       }
 
+      if (isAnonymous) {
+        throw new Error("Anonymous users cannot purchase subscriptions");
+      }
+
       const productId = pkg.product.identifier;
       const success = await SubscriptionManager.purchasePackage(pkg);
 
@@ -66,60 +71,15 @@ export const usePurchasePackage = () => {
       }
     },
     onError: (error) => {
-      let title = "Purchase Error";
-      let message = "Unable to complete purchase. Please try again.";
-
-      if (error instanceof Error) {
-        // Type assertion for RevenueCat error
-        const rcError = error as RevenueCatPurchaseErrorInfo;
-        const errorCode = rcError.code || rcError.readableErrorCode;
+      // Use map-based lookup - O(1) complexity
+      const errorInfo = getErrorMessage(error);
 
-        // Get user-friendly message from constants if available
-        if (errorCode && errorCode in ERROR_MESSAGES) {
-          const errorInfo = ERROR_MESSAGES[errorCode];
-          title = errorInfo.title;
-          message = errorInfo.message;
-        } else {
-          // Fallback to specific error code checks using Purchases enum
-          const code = errorCode;
-
-          if (code === Purchases.PURCHASES_ERROR_CODE.PURCHASE_CANCELLED_ERROR) {
-            return; // Don't show error for user cancellation
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.PURCHASE_NOT_ALLOWED_ERROR) {
-            title = "Purchase Not Allowed";
-            message = "In-app purchases are disabled on this device.";
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.PURCHASE_INVALID_ERROR) {
-            title = "Invalid Purchase";
-            message = "The purchase is invalid. Please contact support.";
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.PRODUCT_ALREADY_PURCHASED_ERROR) {
-            title = "Already Purchased";
-            message = "You already own this subscription. Restoring...";
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.PRODUCT_NOT_AVAILABLE_FOR_PURCHASE_ERROR) {
-            title = "Product Unavailable";
-            message = "This product is not available for purchase.";
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.NETWORK_ERROR) {
-            title = "Network Error";
-            message = "Please check your internet connection and try again.";
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.RECEIPT_ALREADY_IN_USE_ERROR) {
-            title = "Receipt Already Used";
-            message = "This receipt is already associated with another account.";
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.INVALID_CREDENTIALS_ERROR) {
-            title = "Configuration Error";
-            message = "App is not configured correctly. Please contact support.";
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.UNEXPECTED_BACKEND_RESPONSE_ERROR) {
-            title = "Server Error";
-            message = "The server returned an unexpected response. Please try again later.";
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.CONFIGURATION_ERROR) {
-            title = "Configuration Error";
-            message = "RevenueCat is not configured correctly. Please contact support.";
-          } else {
-            // Use error message if no specific code matched
-            message = error.message || message;
-          }
-        }
+      // Don't show alert for user cancellation
+      if (!errorInfo.shouldShowAlert) {
+        return;
       }
 
-      showError(title, message);
+      showError(errorInfo.title, errorInfo.message);
     },
   });
 };

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

@@ -6,18 +6,17 @@
  */
 
 import { useMutation, useQueryClient } from "@umituz/react-native-design-system";
-import Purchases from "react-native-purchases";
 import { useAlert } from "@umituz/react-native-design-system";
 import {
   useAuthStore,
   selectUserId,
+  selectIsAnonymous,
 } from "@umituz/react-native-auth";
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { subscriptionStatusQueryKeys } from "../../presentation/useSubscriptionStatus";
 import { creditsQueryKeys } from "../../../credits/presentation/creditsQueryKeys";
-import { ERROR_MESSAGES } from "../../core/RevenueCatConstants";
-import type { RevenueCatPurchaseErrorInfo } from "../../core/RevenueCatTypes";
+import { getErrorMessage } from "../../../revenuecat/core/errors";
 
 interface RestoreResult {
   success: boolean;
@@ -31,6 +30,7 @@ interface RestoreResult {
  */
 export const useRestorePurchase = () => {
   const userId = useAuthStore(selectUserId);
+  const isAnonymous = useAuthStore(selectIsAnonymous);
   const queryClient = useQueryClient();
   const { showSuccess, showInfo, showError } = useAlert();
 
@@ -40,6 +40,10 @@ export const useRestorePurchase = () => {
         throw new Error("User not authenticated");
       }
 
+      if (isAnonymous) {
+        throw new Error("Anonymous users cannot restore purchases");
+      }
+
       const result = await SubscriptionManager.restore();
       return result;
     },
@@ -67,43 +71,9 @@ export const useRestorePurchase = () => {
       }
     },
     onError: (error) => {
-      let title = "Restore Error";
-      let message = "Unable to restore purchases. Please try again.";
-
-      if (error instanceof Error) {
-        // Type assertion for RevenueCat error
-        const rcError = error as RevenueCatPurchaseErrorInfo;
-        const errorCode = rcError.code || rcError.readableErrorCode;
-
-        // Get user-friendly message from constants if available
-        if (errorCode && errorCode in ERROR_MESSAGES) {
-          const errorInfo = ERROR_MESSAGES[errorCode];
-          title = errorInfo.title;
-          message = errorInfo.message;
-        } else {
-          // Fallback to specific error code checks
-          const code = errorCode;
-
-          if (code === Purchases.PURCHASES_ERROR_CODE.NETWORK_ERROR) {
-            title = "Network Error";
-            message = "Please check your internet connection and try again.";
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.INVALID_CREDENTIALS_ERROR) {
-            title = "Configuration Error";
-            message = "App is not configured correctly. Please contact support.";
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.UNEXPECTED_BACKEND_RESPONSE_ERROR) {
-            title = "Server Error";
-            message = "The server returned an unexpected response. Please try again later.";
-          } else if (code === Purchases.PURCHASES_ERROR_CODE.CONFIGURATION_ERROR) {
-            title = "Configuration Error";
-            message = "RevenueCat is not configured correctly. Please contact support.";
-          } else {
-            // Use error message if no specific code matched
-            message = error.message || message;
-          }
-        }
-      }
-
-      showError(title, message);
+      // Use map-based lookup - O(1) complexity
+      const errorInfo = getErrorMessage(error);
+      showError(errorInfo.title, errorInfo.message);
     },
   });
 };

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

@@ -1,4 +1,4 @@
-import type { RevenueCatConfig } from "../../core/RevenueCatConfig";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types";
 import type { PremiumStatus } from "../handlers/PurchaseStatusResolver";
 
 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/RevenueCatService";
 import { ensureServiceAvailable } from "./subscriptionManagerUtils";
-import type { RevenueCatConfig } from "../../core/RevenueCatConfig";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types";
 
 export const performServiceInitialization = async (config: RevenueCatConfig, userId: string): Promise<{ service: IRevenueCatService; success: boolean }> => {
   await initializeRevenueCatService(config);

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

@@ -7,7 +7,7 @@ import Purchases, {
     type CustomerInfo,
     type CustomerInfoUpdateListener,
 } from "react-native-purchases";
-import type { RevenueCatConfig } from "../../core/RevenueCatConfig";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types";
 import { syncPremiumStatus } from "../utils/PremiumStatusSyncer";
 import {
     detectRenewal,

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

@@ -4,16 +4,16 @@ import {
   RevenueCatPurchaseError,
   RevenueCatInitializationError,
   RevenueCatNetworkError,
-} from "../../core/RevenueCatError";
-import type { RevenueCatConfig } from "../../core/RevenueCatConfig";
+} from "../../../revenuecat/core/errors";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types";
 import {
   isUserCancelledError,
   isNetworkError,
   isAlreadyPurchasedError,
   isInvalidCredentialsError,
-  getErrorMessage,
+  getRawErrorMessage,
   getErrorCode,
-} from "../../core/RevenueCatTypes";
+} from "../../../revenuecat/core/types";
 import { syncPremiumStatus, notifyPurchaseCompleted } from "../utils/PremiumStatusSyncer";
 import { getSavedPurchase, clearSavedPurchase } from "../../presentation/useAuthAwarePurchase";
 import { handleRestore } from "./RestoreHandler";
@@ -120,7 +120,7 @@ export async function handlePurchase(
 
     // Generic error with code
     const errorCode = getErrorCode(error);
-    const errorMessage = getErrorMessage(error, "Purchase failed");
+    const errorMessage = getRawErrorMessage(error, "Purchase failed");
     const enhancedMessage = errorCode
       ? `${errorMessage} (Code: ${errorCode})`
       : errorMessage;

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

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

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

@@ -1,9 +1,9 @@
 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 "../../core/RevenueCatConfig";
-import { resolveApiKey } from "../utils/ApiKeyResolver";
-import { initializeSDK } from "./RevenueCatInitializer";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import { resolveApiKey } from "../../../revenuecat/infrastructure/utils/ApiKeyResolver";
+import { initializeSDK } from "../../../revenuecat/infrastructure/services/RevenueCatInitializer";
 import { fetchOfferings } from "./OfferingsFetcher";
 import { handlePurchase } from "./PurchaseHandler";
 import { handleRestore } from "./RestoreHandler";

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

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

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

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

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

@@ -4,9 +4,9 @@
  */
 
 import type { CustomerInfo } from "react-native-purchases";
-import type { RevenueCatConfig } from "../../core/RevenueCatConfig";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types";
 import type { PurchaseSource } from "../../../subscription/core/SubscriptionConstants";
-import { getPremiumEntitlement } from "../../core/RevenueCatTypes";
+import { getPremiumEntitlement } from "../../../revenuecat/core/types";
 
 export async function syncPremiumStatus(
     config: RevenueCatConfig,

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

@@ -1,73 +0,0 @@
-/**
- * RevenueCat Constants
- * Error codes, messages, and logging constants
- */
-
-import Purchases from "react-native-purchases";
-
-export const REVENUECAT_LOG_PREFIX = "[RevenueCat]";
-
-/**
- * RevenueCat Error Code Type
- * Re-export for type safety
- */
-export type PurchasesErrorCode = typeof Purchases.PURCHASES_ERROR_CODE[keyof typeof Purchases.PURCHASES_ERROR_CODE];
-
-/**
- * User-friendly error messages for RevenueCat errors
- * Maps error codes to human-readable messages
- */
-export const ERROR_MESSAGES: Record<string, { title: string; message: string }> = {
-  PURCHASE_CANCELLED_ERROR: {
-    title: "Purchase Cancelled",
-    message: "The purchase was cancelled.",
-  },
-  PURCHASE_NOT_ALLOWED_ERROR: {
-    title: "Purchase Not Allowed",
-    message: "In-app purchases are disabled on this device.",
-  },
-  PURCHASE_INVALID_ERROR: {
-    title: "Invalid Purchase",
-    message: "The purchase is invalid. Please contact support.",
-  },
-  PRODUCT_ALREADY_PURCHASED_ERROR: {
-    title: "Already Purchased",
-    message: "You already own this subscription. Restoring your purchase...",
-  },
-  PRODUCT_NOT_AVAILABLE_FOR_PURCHASE_ERROR: {
-    title: "Product Unavailable",
-    message: "This product is not available for purchase at this time.",
-  },
-  NETWORK_ERROR: {
-    title: "Network Error",
-    message: "Please check your internet connection and try again.",
-  },
-  UNKNOWN_ERROR: {
-    title: "Unknown Error",
-    message: "An unexpected error occurred. Please try again.",
-  },
-  RECEIPT_ALREADY_IN_USE_ERROR: {
-    title: "Receipt Already Used",
-    message: "This receipt is already associated with another account.",
-  },
-  INVALID_CREDENTIALS_ERROR: {
-    title: "Configuration Error",
-    message: "The app is not configured correctly. Please contact support.",
-  },
-  UNEXPECTED_BACKEND_RESPONSE_ERROR: {
-    title: "Server Error",
-    message: "The server returned an unexpected response. Please try again later.",
-  },
-  CONFIGURATION_ERROR: {
-    title: "Configuration Error",
-    message: "RevenueCat is not configured correctly. Please contact support.",
-  },
-  STORE_PROBLEM_ERROR: {
-    title: "Store Error",
-    message: "There was a problem with the app store. Please try again.",
-  },
-  PAYMENT_PENDING_ERROR: {
-    title: "Payment Pending",
-    message: "Your payment is still being processed. Please check back later.",
-  },
-};