@umituz/react-native-subscription 2.17.8 → 2.17.10

package/package.json

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

@@ -13,8 +13,6 @@ export interface UserCredits {
   credits: number;
   purchasedAt: Date | null;
   lastUpdatedAt: Date | null;
-  activeProductId?: string;
-  activeCreditLimit?: number;
 }
 
 export interface CreditAllocation {

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

@@ -8,6 +8,7 @@ declare const __DEV__: boolean;
 interface UsePaywallActionsProps {
   userId?: string;
   isAnonymous: boolean;
+  source?: string;
   onPurchaseSuccess?: () => void;
   onPurchaseError?: (error: string) => void;
   onAuthRequired?: () => void;

package/src/infrastructure/mappers/CreditsMapper.ts

@@ -7,8 +7,6 @@ export class CreditsMapper {
       credits: snapData.credits,
       purchasedAt: snapData.purchasedAt?.toDate?.() || null,
       lastUpdatedAt: snapData.lastUpdatedAt?.toDate?.() || null,
-      activeProductId: snapData.activeProductId,
-      activeCreditLimit: snapData.activeCreditLimit,
     };
   }
 

package/src/infrastructure/models/UserCreditsDocument.ts

@@ -10,6 +10,4 @@ export interface UserCreditsDocumentRead {
     lastUpdatedAt?: FirestoreTimestamp;
     lastPurchaseAt?: FirestoreTimestamp;
     processedPurchases?: string[];
-    activeProductId?: string;
-    activeCreditLimit?: number;
 }

package/src/infrastructure/repositories/CreditsRepository.ts

@@ -46,7 +46,7 @@ export class CreditsRepository extends BaseRepository {
           if (dynamicLimit !== null) cfg = { ...cfg, creditLimit: dynamicLimit };
         }
       }
-      const res = await initializeCreditsTransaction(db, this.getRef(db, userId), cfg, purchaseId, productId);
+      const res = await initializeCreditsTransaction(db, this.getRef(db, userId), cfg, purchaseId);
       return {
         success: true,
         data: CreditsMapper.toEntity({

package/src/infrastructure/services/CreditsInitializer.ts

@@ -17,8 +17,7 @@ export async function initializeCreditsTransaction(
     db: Firestore,
     creditsRef: DocumentReference,
     config: CreditsConfig,
-    purchaseId?: string,
-    productId?: string
+    purchaseId?: string
 ): Promise<InitializationResult> {
     return runTransaction(db, async (transaction: Transaction) => {
         const creditsDoc = await transaction.get(creditsRef);
@@ -56,11 +55,8 @@ export async function initializeCreditsTransaction(
             lastUpdatedAt: now,
             lastPurchaseAt: now,
             processedPurchases,
-            activeProductId: productId || undefined,
-            activeCreditLimit: config.creditLimit,
         };
 
-        // Use merge:true to avoid overwriting other user fields
         transaction.set(creditsRef, creditsData, { merge: true });
 
         return { credits: newCredits };

package/src/presentation/hooks/useSubscriptionSettingsConfig.ts

@@ -64,17 +64,23 @@ export const useSubscriptionSettingsConfig = (
   const isPremium = !!premiumEntitlement || subscriptionActive;
 
   const dynamicCreditLimit = useMemo(() => {
-    if (credits?.activeCreditLimit) {
-      return credits.activeCreditLimit;
+    const config = getCreditsConfig();
+
+    if (premiumEntitlement?.productIdentifier) {
+      const packageType = detectPackageType(premiumEntitlement.productIdentifier);
+      const allocation = getCreditAllocation(packageType, config.packageAllocations);
+      if (allocation !== null) return allocation;
     }
-    if (!premiumEntitlement?.productIdentifier) {
-      return creditLimit;
+
+    if (credits?.credits && config.packageAllocations) {
+      const currentCredits = credits.credits;
+      const allocations = Object.values(config.packageAllocations).map(a => a.credits);
+      const closest = allocations.find(a => a >= currentCredits) || Math.max(...allocations);
+      return closest;
     }
-    const config = getCreditsConfig();
-    const packageType = detectPackageType(premiumEntitlement.productIdentifier);
-    const allocation = getCreditAllocation(packageType, config.packageAllocations);
-    return allocation ?? creditLimit ?? config.creditLimit;
-  }, [credits?.activeCreditLimit, premiumEntitlement?.productIdentifier, creditLimit]);
+
+    return creditLimit ?? config.creditLimit;
+  }, [premiumEntitlement?.productIdentifier, credits?.credits, creditLimit]);
 
   // Get expiration date directly from RevenueCat (source of truth)
   const entitlementExpirationDate = premiumEntitlement?.expirationDate ?? null;