@umituz/react-native-subscription 2.31.21 → 2.31.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.31.21",
+  "version": "2.31.23",
   "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/paywall/components/PaywallContainer.tsx

@@ -75,7 +75,6 @@ export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
       onClose={handleClose}
       translations={translations}
       packages={packages}
-      isLoading={isLoading}
       legalUrls={legalUrls}
       features={features ? [...features] : undefined}
       heroImage={heroImage}

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

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from "react";
 import { View, TouchableOpacity, Linking } from "react-native";
-import { BaseModal, useAppDesignTokens, AtomicText, AtomicIcon, AtomicSpinner, useSafeAreaInsets } from "@umituz/react-native-design-system";
+import { BaseModal, useAppDesignTokens, AtomicText, AtomicIcon, useSafeAreaInsets } from "@umituz/react-native-design-system";
 import { ScreenLayout } from "../../../shared/presentation";
 import { Image } from "expo-image";
 import { PlanCard } from "./PlanCard";
@@ -11,7 +11,7 @@ import { usePaywallActions } from "../hooks/usePaywallActions";
 import { PaywallModalProps } from "./PaywallModal.types";
 
 export const PaywallModal: React.FC<PaywallModalProps> = React.memo((props) => {
-  const { visible, onClose, translations, packages = [], features = [], isLoading = false, legalUrls = {}, bestValueIdentifier, creditAmounts, creditsLabel, heroImage, onPurchase, onRestore, trialEligibility = {}, trialSubtitleText } = props;
+  const { visible, onClose, translations, packages = [], features = [], legalUrls = {}, bestValueIdentifier, creditAmounts, creditsLabel, heroImage, onPurchase, onRestore, trialEligibility = {}, trialSubtitleText } = props;
   const tokens = useAppDesignTokens();
   const insets = useSafeAreaInsets();
   const { selectedPlanId, setSelectedPlanId, isProcessing, handlePurchase, handleRestore, resetState } = usePaywallActions({ packages, onPurchase, onRestore });
@@ -42,19 +42,15 @@ export const PaywallModal: React.FC<PaywallModalProps> = React.memo((props) => {
             {translations.subtitle && <AtomicText type="bodyMedium" style={[styles.subtitle, { color: tokens.colors.textSecondary }]}>{translations.subtitle}</AtomicText>}
           </View>
           <PaywallFeatures features={features} />
-          {isLoading ? (
-            <View style={styles.loading}><AtomicSpinner size="lg" color="primary" text={translations.loadingText} /></View>
-          ) : (
-            <View style={styles.plans}>
-              {packages.map((pkg) => {
-                const pid = pkg.product.identifier;
-                const hasTrial = trialEligibility[pid]?.eligible ?? false;
-                return (
-                  <PlanCard key={pid} pkg={pkg} isSelected={selectedPlanId === pid} onSelect={() => setSelectedPlanId(pid)} badge={pid === bestValueIdentifier ? translations.bestValueBadgeText : undefined} creditAmount={creditAmounts?.[pid]} creditsLabel={creditsLabel} hasFreeTrial={hasTrial} trialSubtitleText={hasTrial ? trialSubtitleText : undefined} />
-                );
-              })}
-            </View>
-          )}
+          <View style={styles.plans}>
+            {packages.map((pkg) => {
+              const pid = pkg.product.identifier;
+              const hasTrial = trialEligibility[pid]?.eligible ?? false;
+              return (
+                <PlanCard key={pid} pkg={pkg} isSelected={selectedPlanId === pid} onSelect={() => setSelectedPlanId(pid)} badge={pid === bestValueIdentifier ? translations.bestValueBadgeText : undefined} creditAmount={creditAmounts?.[pid]} creditsLabel={creditsLabel} hasFreeTrial={hasTrial} trialSubtitleText={hasTrial ? trialSubtitleText : undefined} />
+              );
+            })}
+          </View>
           <TouchableOpacity onPress={handlePurchase} disabled={!selectedPlanId || isProcessing} style={[styles.cta, { backgroundColor: tokens.colors.primary }, (!selectedPlanId || isProcessing) && styles.ctaDisabled]} activeOpacity={0.8}>
             <AtomicText type="titleLarge" style={[styles.ctaText, { color: tokens.colors.onPrimary }]}>{isProcessing ? translations.processingText : translations.purchaseButtonText}</AtomicText>
           </TouchableOpacity>

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

@@ -13,7 +13,6 @@ export interface PaywallModalProps {
   translations: PaywallTranslations;
   packages?: PurchasesPackage[];
   features?: SubscriptionFeature[];
-  isLoading?: boolean;
   legalUrls?: PaywallLegalUrls;
   bestValueIdentifier?: string;
   creditAmounts?: Record<string, number>;

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

@@ -34,7 +34,7 @@ class SubscriptionManagerImpl {
   async initialize(userId?: string): Promise<boolean> {
     this.ensureConfigured();
 
-    const actualUserId = userId ?? (await this.managerConfig.getAnonymousUserId());
+    const actualUserId = userId ?? (await this.managerConfig.getAnonymousUserId()) ?? '';
     const { shouldInit, existingPromise } = this.state.initCache.tryAcquireInitialization(actualUserId);
 
     if (!shouldInit && existingPromise) {
@@ -49,7 +49,7 @@ class SubscriptionManagerImpl {
   private async performInitialization(userId: string): Promise<boolean> {
     this.ensureConfigured();
     const { service, success } = await performServiceInitialization(this.managerConfig.config, userId);
-    this.serviceInstance = service;
+    this.serviceInstance = service ?? null;
     this.ensurePackageHandlerInitialized();
     return success;
   }
@@ -95,7 +95,7 @@ class SubscriptionManagerImpl {
 
   getEntitlementId(): string {
     this.ensureConfigured();
-    return this.managerConfig.config.entitlementIdentifier;
+    return this.managerConfig.config.entitlementIdentifier ?? '';
   }
 }
 

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

@@ -76,7 +76,9 @@ export async function handlePurchase(
         const restoreResult = await handleRestore(deps, userId);
         if (restoreResult.success && restoreResult.isPremium) {
           // Restore succeeded, notify and return success
-          await notifyPurchaseCompleted(deps.config, userId, pkg.product.identifier, restoreResult.customerInfo, getSavedPurchase()?.source);
+          if (restoreResult.customerInfo) {
+            await notifyPurchaseCompleted(deps.config, userId, pkg.product.identifier, restoreResult.customerInfo, getSavedPurchase()?.source);
+          }
           clearSavedPurchase();
           return {
             success: true,

package/src/domains/trial/application/TrialEligibilityService.ts

@@ -13,16 +13,6 @@ export class TrialEligibilityService {
     const { hasUsedTrial, trialInProgress, userIds = [] } = record;
 
     if (userId && userIds.includes(userId)) {
-      // Detect corrupted state: user in list but flags say trial not used
-      if (!hasUsedTrial && !trialInProgress) {
-        console.warn('[TrialEligibilityService] Corrupted trial state detected', {
-          userId,
-          deviceId,
-          hasUsedTrial,
-          trialInProgress,
-          userIdsCount: userIds.length
-        });
-      }
       return { eligible: false, reason: "user_already_used", deviceId };
     }