@umituz/react-native-subscription 2.27.56 → 2.27.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.56",
+  "version": "2.27.58",
   "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/domain/errors/SubscriptionError.ts

@@ -10,6 +10,7 @@ export class SubscriptionError extends Error {
         super(message);
         this.name = 'SubscriptionError';
         this.code = code;
+        Object.setPrototypeOf(this, SubscriptionError.prototype);
     }
 
     static notFound(message: string = 'Subscription not found'): SubscriptionError {
@@ -40,6 +41,7 @@ export class SubscriptionRepositoryError extends Error {
         super(message);
         this.name = 'SubscriptionRepositoryError';
         this.code = code;
+        Object.setPrototypeOf(this, SubscriptionRepositoryError.prototype);
     }
 }
 
@@ -50,5 +52,6 @@ export class SubscriptionValidationError extends Error {
         super(message);
         this.name = 'SubscriptionValidationError';
         this.code = code;
+        Object.setPrototypeOf(this, SubscriptionValidationError.prototype);
     }
 }

package/src/domain/types/RevenueCatData.ts

@@ -1,3 +1,5 @@
+import type { PeriodType } from "../entities/SubscriptionStatus";
+
 /**
  * RevenueCat subscription data (Single Source of Truth)
  * Used across the subscription package for storing RevenueCat data in Firestore
@@ -8,5 +10,5 @@ export interface RevenueCatData {
   originalTransactionId?: string;
   isPremium?: boolean;
   /** RevenueCat period type: NORMAL, INTRO, or TRIAL */
-  periodType?: "NORMAL" | "INTRO" | "TRIAL";
+  periodType?: PeriodType;
 }

package/src/domains/config/domain/entities/Plan.ts

@@ -32,8 +32,8 @@ export const calculatePlanMetadata = (
   const totalCost = plan.credits * costPerCredit;
   const netRevenue = plan.price * (1 - commissionRate);
   const profit = netRevenue - totalCost;
-  const profitMargin = (profit / plan.price) * 100;
-  const pricePerCredit = plan.price / plan.credits;
+  const profitMargin = plan.price > 0 ? (profit / plan.price) * 100 : 0;
+  const pricePerCredit = plan.credits > 0 ? plan.price / plan.credits : 0;
 
   return {
     cost: totalCost,

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

@@ -2,7 +2,7 @@
  * Paywall Modal
  */
 
-import React, { useState, useCallback } from "react";
+import React, { useState, useCallback, useEffect } from "react";
 import { View, ScrollView, TouchableOpacity, Linking, type ImageSourcePropType } from "react-native";
 import { BaseModal, useAppDesignTokens, AtomicText, AtomicIcon, AtomicSpinner } from "@umituz/react-native-design-system";
 import { Image } from "expo-image";
@@ -14,8 +14,6 @@ import { PaywallFeatures } from "./PaywallFeatures";
 import { PaywallFooter } from "./PaywallFooter";
 import { usePurchaseLoadingStore, selectIsPurchasing } from "../../../presentation/stores";
 
-declare const __DEV__: boolean;
-
 /** Trial eligibility info per product */
 export interface TrialEligibilityInfo {
   /** Whether eligible for trial */
@@ -56,6 +54,11 @@ export const PaywallModal: React.FC<PaywallModalProps> = React.memo((props) => {
   const isGlobalPurchasing = usePurchaseLoadingStore(selectIsPurchasing);
   const { startPurchase, endPurchase } = usePurchaseLoadingStore();
 
+  // Reset selected plan when packages change
+  useEffect(() => {
+    setSelectedPlanId(null);
+  }, [packages]);
+
   // Combined processing state
   const isProcessing = isLocalProcessing || isGlobalPurchasing;
 

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

@@ -78,7 +78,7 @@ export const PlanCard: React.FC<PlanCardProps> = React.memo(
                                 </AtomicText>
 
                                 {/* Credits info */}
-                                {creditAmount && creditsLabel && (
+                                {creditAmount != null && creditAmount > 0 && creditsLabel && (
                                     <AtomicText type="bodySmall" style={{ color: tokens.colors.textSecondary }}>
                                         {creditAmount} {creditsLabel}
                                     </AtomicText>

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

@@ -4,8 +4,6 @@ import { useRestorePurchase } from "../../../revenuecat/presentation/hooks/useRe
 import { useAuthAwarePurchase } from "../../../presentation/hooks/useAuthAwarePurchase";
 import type { PurchaseSource } from "../../../domain/entities/Credits";
 
-declare const __DEV__: boolean;
-
 interface UsePaywallActionsProps {
   source?: PurchaseSource;
   onPurchaseSuccess?: () => void;

package/src/domains/wallet/domain/mappers/TransactionMapper.ts

@@ -11,7 +11,7 @@ export class TransactionMapper {
     const data = docSnap.data();
     return {
       id: docSnap.id,
-      userId: data.userId || defaultUserId,
+      userId: data.userId ?? defaultUserId,
       change: data.change,
       reason: data.reason,
       feature: data.feature,
@@ -19,7 +19,7 @@ export class TransactionMapper {
       packageId: data.packageId,
       subscriptionPlan: data.subscriptionPlan,
       description: data.description,
-      createdAt: data.createdAt?.toMillis?.() || Date.now(),
+      createdAt: data.createdAt?.toMillis?.() ?? Date.now(),
     };
   }
 

package/src/domains/wallet/infrastructure/services/ProductMetadataService.ts

@@ -13,8 +13,6 @@ import type {
   ProductType,
 } from "../../domain/types/wallet.types";
 
-declare const __DEV__: boolean;
-
 interface CacheEntry {
   data: ProductMetadata[];
   timestamp: number;

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

@@ -14,8 +14,6 @@ import type {
 } from "../../domain/types/wallet.types";
 import { ProductMetadataService } from "../../infrastructure/services/ProductMetadataService";
 
-declare const __DEV__: boolean;
-
 const CACHE_CONFIG = {
   staleTime: 5 * 60 * 1000, // 5 minutes
   gcTime: 30 * 60 * 1000, // 30 minutes

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

@@ -17,8 +17,6 @@ import type {
 } from "../../domain/types/transaction.types";
 import { TransactionRepository } from "../../infrastructure/repositories/TransactionRepository";
 
-declare const __DEV__: boolean;
-
 export const transactionQueryKeys = {
   all: ["transactions"] as const,
   user: (userId: string) => ["transactions", userId] as const,

package/src/infrastructure/models/UserCreditsDocument.ts

@@ -1,23 +1,13 @@
+import type { PurchaseSource, PurchaseType } from "../../domain/entities/Credits";
+import type { SubscriptionStatusType, PeriodType } from "../../domain/entities/SubscriptionStatus";
+
+export type { PurchaseSource, PurchaseType } from "../../domain/entities/Credits";
+export type { SubscriptionStatusType, PeriodType } from "../../domain/entities/SubscriptionStatus";
+
 export interface FirestoreTimestamp {
     toDate: () => Date;
 }
 
-export type PurchaseSource =
-  | "onboarding"
-  | "settings"
-  | "upgrade_prompt"
-  | "home_screen"
-  | "feature_gate"
-  | "credits_exhausted"
-  | "renewal";
-
-export type PurchaseType = "initial" | "renewal" | "upgrade" | "downgrade";
-
-export type SubscriptionDocStatus = "active" | "trial" | "trial_canceled" | "expired" | "canceled" | "free";
-
-/** RevenueCat period types */
-export type PeriodType = "NORMAL" | "INTRO" | "TRIAL";
-
 export interface PurchaseMetadata {
   productId: string;
   packageType: "weekly" | "monthly" | "yearly" | "lifetime";
@@ -33,7 +23,7 @@ export interface PurchaseMetadata {
 export interface UserCreditsDocumentRead {
     // Core subscription status
     isPremium?: boolean;
-    status?: SubscriptionDocStatus;
+    status?: SubscriptionStatusType;
 
     // Dates (all from RevenueCat)
     purchasedAt?: FirestoreTimestamp;

package/src/infrastructure/repositories/CreditsRepository.ts

@@ -1,7 +1,6 @@
 /**
  * Credits Repository
  */
-declare const __DEV__: boolean;
 
 import { doc, getDoc, runTransaction, serverTimestamp, type Firestore, type Transaction } from "firebase/firestore";
 import { BaseRepository, getFirestore } from "@umituz/react-native-firebase";
@@ -76,10 +75,13 @@ export class CreditsRepository extends BaseRepository {
         periodType: revenueCatData?.periodType,
       };
 
-      const res = await initializeCreditsTransaction(db, this.getRef(db, userId), cfg, purchaseId, metadata);
+      await initializeCreditsTransaction(db, this.getRef(db, userId), cfg, purchaseId, metadata);
+      // Re-fetch from Firestore to get the actual stored data with all fields
+      const snap = await getDoc(this.getRef(db, userId));
+      const fullData = snap.exists() ? snap.data() as UserCreditsDocumentRead : undefined;
       return {
         success: true,
-        data: CreditsMapper.toEntity({ ...res, purchasedAt: undefined, lastUpdatedAt: undefined })
+        data: fullData ? CreditsMapper.toEntity(fullData) : undefined,
       };
     } catch (e: unknown) {
       const message = e instanceof Error ? e.message : String(e);

package/src/infrastructure/services/ActivationHandler.ts

@@ -81,17 +81,28 @@ async function notifyStatusChange(
   }
 }
 
-async function handleError(
-  config: ActivationHandlerConfig,
+/**
+ * Safe error handler - wraps error callbacks to prevent secondary failures
+ */
+export async function safeHandleError(
+  onError: ((error: Error, context: string) => Promise<void> | void) | undefined,
   error: unknown,
   context: string
 ): Promise<void> {
-  if (!config.onError) return;
+  if (!onError) return;
 
   try {
     const err = error instanceof Error ? error : new Error("Unknown error");
-    await config.onError(err, `ActivationHandler.${context}`);
+    await onError(err, context);
   } catch {
     // Ignore callback errors
   }
 }
+
+async function handleError(
+  config: ActivationHandlerConfig,
+  error: unknown,
+  context: string
+): Promise<void> {
+  await safeHandleError(config.onError, error, `ActivationHandler.${context}`);
+}

package/src/infrastructure/services/CreditsInitializer.ts

@@ -74,7 +74,7 @@ export async function initializeCreditsTransaction(
         const allocation = packageType && packageType !== "unknown"
           ? getCreditAllocation(packageType, config.packageAllocations)
           : null;
-        const creditLimit = allocation || config.creditLimit;
+        const creditLimit = allocation ?? config.creditLimit;
 
         const platform = Platform.OS as "ios" | "android";
         const appVersion = Constants.expoConfig?.version;
@@ -96,7 +96,7 @@ export async function initializeCreditsTransaction(
             type: purchaseType,
             platform,
             appVersion,
-            timestamp: Date.now() as unknown as PurchaseMetadata["timestamp"],
+            timestamp: Timestamp.fromDate(new Date()) as unknown as PurchaseMetadata["timestamp"],
           } : undefined;
 
         const purchaseHistory = purchaseMetadata
@@ -107,7 +107,9 @@ export async function initializeCreditsTransaction(
         const willRenew = metadata?.willRenew;
         const periodType = metadata?.periodType;
 
-        const status = resolveSubscriptionStatus({ isPremium, willRenew, isExpired: !isPremium, periodType });
+        const expirationDateStr = metadata?.expirationDate;
+        const isExpired = expirationDateStr ? new Date(expirationDateStr).getTime() < Date.now() : false;
+        const status = resolveSubscriptionStatus({ isPremium, willRenew, isExpired, periodType });
 
         // Determine if this is a status sync (not a new purchase or renewal)
         // Status sync should preserve existing credits, only update metadata

package/src/infrastructure/services/SubscriptionInitializer.ts

@@ -6,7 +6,6 @@
  * - Relies on CustomerInfoUpdateListener for state updates
  * - No manual timeouts - uses auth state listener with cleanup
  */
-declare const __DEV__: boolean;
 
 import { Platform } from "react-native";
 import type { CustomerInfo } from "react-native-purchases";

package/src/infrastructure/services/SubscriptionService.ts

@@ -16,6 +16,7 @@ import type { SubscriptionConfig } from "../../domain/value-objects/Subscription
 import {
   activateSubscription,
   deactivateSubscription,
+  safeHandleError,
   type ActivationHandlerConfig,
 } from "./ActivationHandler";
 
@@ -108,14 +109,7 @@ export class SubscriptionService implements ISubscriptionService {
   }
 
   private async handleError(error: unknown, context: string): Promise<void> {
-    if (!this.handlerConfig.onError) return;
-
-    try {
-      const err = error instanceof Error ? error : new Error("Unknown error");
-      await this.handlerConfig.onError(err, `SubscriptionService.${context}`);
-    } catch {
-      // Ignore callback errors
-    }
+    await safeHandleError(this.handlerConfig.onError, error, `SubscriptionService.${context}`);
   }
 }
 

package/src/infrastructure/services/TrialService.ts

@@ -1,7 +1,6 @@
 /**
  * Trial Service - Device-based trial tracking to prevent abuse
  */
-declare const __DEV__: boolean;
 
 import { doc, getDoc, setDoc, serverTimestamp, arrayUnion } from "firebase/firestore";
 import { getFirestore } from "@umituz/react-native-firebase";

package/src/infrastructure/services/app-service-helpers.ts

@@ -17,8 +17,6 @@ import {
   selectUserId,
 } from "@umituz/react-native-auth";
 
-declare const __DEV__: boolean;
-
 export interface CreditServiceConfig {
   entitlementId: string;
 }

package/src/infrastructure/utils/Logger.ts

@@ -4,8 +4,6 @@
  * All logs are dev-only and automatically stripped in production.
  */
 
-declare const __DEV__: boolean;
-
 export type LogLevel = "debug" | "info" | "warn" | "error";
 
 export interface LogContext {

package/src/init/createSubscriptionInitModule.ts

@@ -1,8 +1,6 @@
 import type { InitModule } from '@umituz/react-native-design-system';
 import { initializeSubscription, type SubscriptionInitConfig } from '../infrastructure/services/SubscriptionInitializer';
 
-declare const __DEV__: boolean;
-
 export interface SubscriptionInitModuleConfig extends Omit<SubscriptionInitConfig, 'apiKey'> {
   getApiKey: () => string | undefined;
   critical?: boolean;
@@ -29,7 +27,7 @@ export function createSubscriptionInitModule(config: SubscriptionInitModuleConfi
         return true;
       } catch (error) {
         if (__DEV__) console.error('[SubscriptionInit] Error:', error);
-        return true;
+        return false;
       }
     },
   };

package/src/presentation/hooks/feedback/useFeedbackSubmit.ts

@@ -34,19 +34,23 @@ export function usePaywallFeedbackSubmit(
         });
       }
 
-      const result = await submitPaywallFeedback(
-        user?.uid ?? null,
-        user?.email ?? null,
-        reason
-      );
-
-      if (result.success) {
-        onSuccess?.();
-      } else if (result.error) {
-        onError?.(result.error);
+      try {
+        const result = await submitPaywallFeedback(
+          user?.uid ?? null,
+          user?.email ?? null,
+          reason
+        );
+
+        if (result.success) {
+          onSuccess?.();
+        } else if (result.error) {
+          onError?.(result.error);
+        }
+      } catch (err) {
+        onError?.(err instanceof Error ? err : new Error("Feedback submission failed"));
+      } finally {
+        onComplete?.();
       }
-
-      onComplete?.();
     },
     [user, onSuccess, onError, onComplete]
   );
@@ -84,19 +88,24 @@ export function useSettingsFeedbackSubmit(
         });
       }
 
-      const result = await submitSettingsFeedback(
-        user?.uid ?? null,
-        user?.email ?? null,
-        data
-      );
-
-      if (result.success) {
-        onSuccess?.();
-      } else if (result.error) {
-        onError?.(result.error);
+      try {
+        const result = await submitSettingsFeedback(
+          user?.uid ?? null,
+          user?.email ?? null,
+          data
+        );
+
+        if (result.success) {
+          onSuccess?.();
+        } else if (result.error) {
+          onError?.(result.error);
+        }
+
+        return result;
+      } catch (err) {
+        onError?.(err instanceof Error ? err : new Error("Feedback submission failed"));
+        return { success: false, error: err instanceof Error ? err : new Error("Feedback submission failed") };
       }
-
-      return result;
     },
     [user, onSuccess, onError]
   );

package/src/presentation/hooks/useAuthAwarePurchase.ts

@@ -8,8 +8,6 @@ import type { PurchasesPackage } from "react-native-purchases";
 import { usePremium } from "./usePremium";
 import type { PurchaseSource } from "../../domain/entities/Credits";
 
-declare const __DEV__: boolean;
-
 export interface PurchaseAuthProvider {
   isAuthenticated: () => boolean;
   showAuthModal: () => void;

package/src/presentation/hooks/useAuthSubscriptionSync.ts

@@ -41,11 +41,15 @@ export function useAuthSubscriptionSync(
         return;
       }
 
-      if (previousUserId && previousUserId !== userId) {
-        await initialize(userId);
-      } else if (!isInitializedRef.current) {
-        await initialize(userId);
-        isInitializedRef.current = true;
+      try {
+        if (previousUserId && previousUserId !== userId) {
+          await initialize(userId);
+        } else if (!isInitializedRef.current) {
+          await initialize(userId);
+          isInitializedRef.current = true;
+        }
+      } catch {
+        // Prevent unhandled promise rejection from async auth callback
       }
 
       previousUserIdRef.current = userId;

package/src/presentation/hooks/useCredits.ts

@@ -15,8 +15,6 @@ import {
   isCreditsRepositoryConfigured,
 } from "../../infrastructure/repositories/CreditsRepositoryProvider";
 
-declare const __DEV__: boolean;
-
 export const creditsQueryKeys = {
   all: ["credits"] as const,
   user: (userId: string) => ["credits", userId] as const,

package/src/presentation/hooks/useDeductCredit.ts

@@ -11,8 +11,6 @@ import { creditsQueryKeys } from "./useCredits";
 
 import { timezoneService } from "@umituz/react-native-design-system";
 
-declare const __DEV__: boolean;
-
 export interface UseDeductCreditParams {
   userId: string | undefined;
   onCreditsExhausted?: () => void;

package/src/presentation/hooks/useFeatureGate.ts

@@ -7,8 +7,6 @@
 
 import { useCallback, useRef, useEffect } from "react";
 
-declare const __DEV__: boolean;
-
 export interface UseFeatureGateParams {
   readonly isAuthenticated: boolean;
   readonly onShowAuthModal: (pendingCallback: () => void | Promise<void>) => void;

package/src/presentation/hooks/usePremium.ts

@@ -17,8 +17,6 @@ import {
 } from '../../revenuecat/presentation/hooks/useSubscriptionQueries';
 import { usePaywallVisibility } from './usePaywallVisibility';
 
-declare const __DEV__: boolean;
-
 export interface UsePremiumResult {
   isPremium: boolean;
   isLoading: boolean;

package/src/presentation/hooks/useSavedPurchaseAutoExecution.ts

@@ -14,8 +14,6 @@ import { usePremium } from "./usePremium";
 import { SubscriptionManager } from "../../revenuecat";
 import { usePurchaseLoadingStore } from "../stores";
 
-declare const __DEV__: boolean;
-
 export interface UseSavedPurchaseAutoExecutionParams {
   onSuccess?: () => void;
   onError?: (error: Error) => void;
@@ -118,15 +116,17 @@ export const useSavedPurchaseAutoExecution = (
 
           if (isReady) {
             const pkg = savedPurchase.pkg;
-            clearSavedPurchase();
 
             startPurchaseRef.current(pkg.product.identifier, "auto-execution");
 
             try {
               const success = await purchasePackageRef.current(pkg);
 
-              if (success && onSuccessRef.current) {
-                onSuccessRef.current();
+              if (success) {
+                clearSavedPurchase();
+                if (onSuccessRef.current) {
+                  onSuccessRef.current();
+                }
               }
             } catch (error) {
               if (onErrorRef.current && error instanceof Error) {

package/src/presentation/screens/SubscriptionDetailScreen.tsx

@@ -81,9 +81,9 @@ export const SubscriptionDetailScreen: React.FC<
           />
         )}
 
-        {showCredits && (
+        {showCredits && config.credits && (
           <CreditsList
-            credits={config.credits!}
+            credits={config.credits}
             title={
               config.translations.usageTitle || config.translations.creditsTitle
             }
@@ -92,11 +92,11 @@ export const SubscriptionDetailScreen: React.FC<
           />
         )}
 
-        {showUpgradePrompt && (
+        {showUpgradePrompt && config.upgradePrompt && (
           <UpgradePrompt
-            title={config.upgradePrompt!.title}
-            subtitle={config.upgradePrompt!.subtitle}
-            benefits={config.upgradePrompt!.benefits}
+            title={config.upgradePrompt.title}
+            subtitle={config.upgradePrompt.subtitle}
+            benefits={config.upgradePrompt.benefits}
             upgradeButtonLabel={config.translations.upgradeButton}
             onUpgrade={config.onUpgrade}
           />

package/src/presentation/stores/purchaseLoadingStore.ts

@@ -6,8 +6,6 @@
 
 import { create } from "zustand";
 
-declare const __DEV__: boolean;
-
 export interface PurchaseLoadingState {
   /** Whether a purchase is in progress */
   isPurchasing: boolean;

package/src/revenuecat/application/ports/IRevenueCatService.ts

@@ -8,7 +8,7 @@ import type { PurchasesPackage, PurchasesOffering, CustomerInfo } from "react-na
 export interface InitializeResult {
   success: boolean;
   offering: PurchasesOffering | null;
-  hasPremium: boolean;
+  isPremium: boolean;
 }
 
 export interface PurchaseResult {

package/src/revenuecat/infrastructure/handlers/PackageHandler.ts

@@ -7,8 +7,6 @@ import type { PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService } from "../../application/ports/IRevenueCatService";
 import { getPremiumEntitlement } from "../../domain/types/RevenueCatTypes";
 
-declare const __DEV__: boolean;
-
 export interface PremiumStatus {
   isPremium: boolean;
   expirationDate: Date | null;

package/src/revenuecat/infrastructure/managers/SubscriptionManager.ts

@@ -4,8 +4,6 @@
  * Coordinates UserIdProvider, InitializationCache, and PackageHandler
  */
 
-declare const __DEV__: boolean;
-
 import type { PurchasesPackage } from "react-native-purchases";
 import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
 import type { IRevenueCatService } from "../../application/ports/IRevenueCatService";

package/src/revenuecat/infrastructure/services/CustomerInfoListenerManager.ts

@@ -15,8 +15,6 @@ import {
     type RenewalState,
 } from "../utils/RenewalDetector";
 
-declare const __DEV__: boolean;
-
 export class CustomerInfoListenerManager {
     private listener: CustomerInfoUpdateListener | null = null;
     private currentUserId: string | null = null;

package/src/revenuecat/infrastructure/services/PurchaseHandler.ts

@@ -6,8 +6,6 @@ import { isUserCancelledError, getErrorMessage } from "../../domain/types/Revenu
 import { syncPremiumStatus, notifyPurchaseCompleted } from "../utils/PremiumStatusSyncer";
 import { getSavedPurchase, clearSavedPurchase } from "../../../presentation/hooks/useAuthAwarePurchase";
 
-declare const __DEV__: boolean;
-
 export interface PurchaseHandlerDeps {
   config: RevenueCatConfig;
   isInitialized: () => boolean;

package/src/revenuecat/infrastructure/services/RestoreHandler.ts

@@ -22,7 +22,7 @@ export async function handleRestore(deps: RestoreHandlerDeps, userId: string): P
     }
     await notifyRestoreCompleted(deps.config, userId, isPremium, customerInfo);
 
-    return { success: isPremium, isPremium, customerInfo };
+    return { success: true, isPremium, customerInfo };
   } catch (error) {
     throw new RevenueCatRestoreError(getErrorMessage(error, "Restore failed"));
   }

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

@@ -3,8 +3,6 @@ import type { InitializeResult } from "../../application/ports/IRevenueCatServic
 import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
 import { resolveApiKey } from "../utils/ApiKeyResolver";
 
-declare const __DEV__: boolean;
-
 export interface InitializerDeps {
   config: RevenueCatConfig;
   isInitialized: () => boolean;
@@ -33,8 +31,8 @@ function configureLogHandler(): void {
 }
 
 function buildSuccessResult(deps: InitializerDeps, customerInfo: CustomerInfo, offerings: PurchasesOfferings): InitializeResult {
-  const hasPremium = !!customerInfo.entitlements.active[deps.config.entitlementIdentifier];
-  return { success: true, offering: offerings.current, hasPremium };
+  const isPremium = !!customerInfo.entitlements.active[deps.config.entitlementIdentifier];
+  return { success: true, offering: offerings.current, isPremium };
 }
 
 export async function initializeSDK(
@@ -50,7 +48,7 @@ export async function initializeSDK(
       ]);
       return buildSuccessResult(deps, customerInfo, offerings);
     } catch {
-      return { success: false, offering: null, hasPremium: false };
+      return { success: false, offering: null, isPremium: false };
     }
   }
 
@@ -69,20 +67,20 @@ export async function initializeSDK(
       const offerings = await Purchases.getOfferings();
       return buildSuccessResult(deps, customerInfo, offerings);
     } catch {
-      return { success: false, offering: null, hasPremium: false };
+      return { success: false, offering: null, isPremium: false };
     }
   }
 
   if (configurationInProgress) {
     await new Promise(resolve => setTimeout(resolve, 100));
     if (isPurchasesConfigured) return initializeSDK(deps, userId, apiKey);
-    return { success: false, offering: null, hasPremium: false };
+    return { success: false, offering: null, isPremium: false };
   }
 
   const key = apiKey || resolveApiKey(deps.config);
   if (!key) {
     if (__DEV__) console.log('[RevenueCat] No API key');
-    return { success: false, offering: null, hasPremium: false };
+    return { success: false, offering: null, isPremium: false };
   }
 
   configurationInProgress = true;
@@ -108,7 +106,7 @@ export async function initializeSDK(
     return buildSuccessResult(deps, customerInfo, offerings);
   } catch (error) {
     if (__DEV__) console.error('[RevenueCat] Init failed:', error);
-    return { success: false, offering: null, hasPremium: false };
+    return { success: false, offering: null, isPremium: false };
   } finally {
     configurationInProgress = false;
   }

package/src/revenuecat/infrastructure/services/RevenueCatService.ts

@@ -57,10 +57,12 @@ export class RevenueCatService implements IRevenueCatService {
 
     async initialize(userId: string, apiKey?: string): Promise<InitializeResult> {
         if (this.isInitialized() && this.getCurrentUserId() === userId) {
+            const customerInfo = await Purchases.getCustomerInfo();
+            const isPremium = !!customerInfo.entitlements.active[this.stateManager.getConfig().entitlementIdentifier];
             return {
                 success: true,
                 offering: await this.fetchOfferings(),
-                hasPremium: false,
+                isPremium,
             };
         }
 

package/src/revenuecat/infrastructure/utils/PremiumStatusSyncer.ts

@@ -8,8 +8,6 @@ import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConf
 import type { PurchaseSource } from "../../../domain/entities/Credits";
 import { getPremiumEntitlement } from "../../domain/types/RevenueCatTypes";
 
-declare const __DEV__: boolean;
-
 export async function syncPremiumStatus(
     config: RevenueCatConfig,
     userId: string,

package/src/revenuecat/infrastructure/utils/RenewalDetector.ts

@@ -82,7 +82,15 @@ export function detectRenewal(
     };
   }
 
-  const newExpiration = new Date(newExpirationDate ?? 0);
+  if (!newExpirationDate) {
+    // Lifetime subscription (no expiration) - not a renewal
+    return {
+      ...baseResult,
+      productId,
+      newExpirationDate,
+    };
+  }
+  const newExpiration = new Date(newExpirationDate);
   const previousExpiration = new Date(state.previousExpirationDate);
   const productChanged = productId !== state.previousProductId;
   const expirationExtended = newExpiration > previousExpiration;

package/src/revenuecat/presentation/hooks/usePurchasePackage.ts

@@ -16,8 +16,6 @@ import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionM
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { creditsQueryKeys } from "../../../presentation/hooks/useCredits";
 
-declare const __DEV__: boolean;
-
 /** Purchase mutation result - simplified for presentation layer */
 export interface PurchaseMutationResult {
   success: boolean;

package/src/revenuecat/presentation/hooks/useRevenueCatTrialEligibility.ts

@@ -11,8 +11,6 @@ import Purchases, {
 } from "react-native-purchases";
 import { getRevenueCatService } from "../../infrastructure/services/RevenueCatService";
 
-declare const __DEV__: boolean;
-
 /** Trial eligibility info for a single product */
 export interface ProductTrialEligibility {
   /** Product identifier */

package/src/utils/premiumStatusUtils.ts

@@ -5,6 +5,7 @@
  */
 
 import type { PremiumStatusFetcher } from './types';
+import { isGuest } from './authUtils';
 
 /**
  * Get isPremium value with centralized logic
@@ -13,17 +14,17 @@ export function getIsPremium(
   isGuestFlag: boolean,
   userId: string | null,
   isPremiumOrFetcher: boolean | PremiumStatusFetcher,
-): boolean | Promise<boolean> {
+): Promise<boolean> {
   // Guest users NEVER have premium
-  if (isGuestFlag || userId === null) return false;
+  if (isGuest(isGuestFlag, userId)) return Promise.resolve(false);
 
   // Sync mode: return the provided isPremium value
-  if (typeof isPremiumOrFetcher === 'boolean') return isPremiumOrFetcher;
+  if (typeof isPremiumOrFetcher === 'boolean') return Promise.resolve(isPremiumOrFetcher);
 
   // Async mode: fetch premium status
   return (async () => {
     try {
-      return await isPremiumOrFetcher.isPremium(userId);
+      return await isPremiumOrFetcher.isPremium(userId!);
     } catch (error) {
       throw new Error(
         `Failed to fetch premium status: ${error instanceof Error ? error.message : String(error)}`

package/src/utils/priceUtils.ts

@@ -20,6 +20,14 @@ export function formatPrice(price: number, currencyCode: string): string {
   }
 }
 
+import { detectPackageType } from './packageTypeDetector';
+
+const PERIOD_SUFFIX_MAP: Record<string, string> = {
+  weekly: '/week',
+  monthly: '/month',
+  yearly: '/year',
+};
+
 /**
  * Extract billing period suffix from package identifier
  * Apple App Store Guideline 3.1.2 Compliance:
@@ -30,21 +38,8 @@ export function formatPrice(price: number, currencyCode: string): string {
  * @returns Billing period suffix (e.g., "/week", "/month", "/year") or empty string
  */
 export function getBillingPeriodSuffix(identifier: string): string {
-  const lowerIdentifier = identifier.toLowerCase();
-
-  if (lowerIdentifier.includes('weekly') || lowerIdentifier.includes('week')) {
-    return '/week';
-  }
-
-  if (lowerIdentifier.includes('monthly') || lowerIdentifier.includes('month')) {
-    return '/month';
-  }
-
-  if (lowerIdentifier.includes('annual') || lowerIdentifier.includes('year') || lowerIdentifier.includes('yearly')) {
-    return '/year';
-  }
-
-  return '';
+  const packageType = detectPackageType(identifier);
+  return PERIOD_SUFFIX_MAP[packageType] ?? '';
 }
 
 /**

package/src/utils/tierUtils.ts

@@ -5,13 +5,14 @@
  */
 
 import type { UserTierInfo } from './types';
+import { isGuest } from './authUtils';
 
 export function getUserTierInfo(
   isGuestFlag: boolean,
   userId: string | null,
   isPremium: boolean,
 ): UserTierInfo {
-  if (isGuestFlag || userId === null) {
+  if (isGuest(isGuestFlag, userId)) {
     return {
       tier: 'guest',
       isPremium: false,
@@ -35,6 +36,6 @@ export function checkPremiumAccess(
   userId: string | null,
   isPremium: boolean,
 ): boolean {
-  if (isGuestFlag || userId === null) return false;
+  if (isGuest(isGuestFlag, userId)) return false;
   return isPremium;
 }

package/src/presentation/hooks/useSubscription.utils.ts

@@ -1,79 +0,0 @@
-/**
- * useSubscription Utilities
- * Shared utilities for subscription hook operations
- */
-
-import { getSubscriptionService } from "../../infrastructure/services/SubscriptionService";
-
-export type AsyncSubscriptionOperation<T> = () => Promise<T>;
-
-/**
- * Result of a subscription service initialization check
- */
-export interface ServiceCheckResult {
-  success: boolean;
-  service: ReturnType<typeof getSubscriptionService> | null;
-  error?: string;
-}
-
-/**
- * Checks if subscription service is initialized
- * Returns service instance or error
- */
-export function checkSubscriptionService(): ServiceCheckResult {
-  const service = getSubscriptionService();
-
-  if (!service) {
-    return {
-      success: false,
-      service: null,
-      error: "Subscription service is not initialized",
-    };
-  }
-
-  return { success: true, service, error: undefined };
-}
-
-/**
- * Validates user ID
- */
-export function validateUserId(userId: string): string | null {
-  if (!userId) {
-    return "User ID is required";
-  }
-  return null;
-}
-
-/**
- * Wraps async subscription operations with loading state, error handling, and state updates
- */
-export async function executeSubscriptionOperation<T>(
-  operation: AsyncSubscriptionOperation<T>,
-  setLoading: (loading: boolean) => void,
-  setError: (error: string | null) => void,
-  onSuccess?: (result: T) => void
-): Promise<void> {
-  setLoading(true);
-  setError(null);
-
-  try {
-    const result = await operation();
-    if (onSuccess) {
-      onSuccess(result);
-    }
-  } catch (err) {
-    const errorMessage =
-      err instanceof Error ? err.message : "Operation failed";
-    setError(errorMessage);
-    throw err;
-  } finally {
-    setLoading(false);
-  }
-}
-
-/**
- * Formats error message from unknown error
- */
-export function formatErrorMessage(err: unknown, fallbackMessage: string): string {
-  return err instanceof Error ? err.message : fallbackMessage;
-}