@umituz/react-native-subscription 2.14.25 → 2.14.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.14.25",
+  "version": "2.14.26",
   "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/presentation/hooks/useSubscriptionSettingsConfig.ts

@@ -9,6 +9,7 @@ import { useCredits } from "./useCredits";
 import { useSubscriptionStatus } from "./useSubscriptionStatus";
 import { useCustomerInfo } from "../../revenuecat/presentation/hooks/useCustomerInfo";
 import { usePaywallVisibility } from "./usePaywallVisibility";
+import { SubscriptionManager } from "../../revenuecat/infrastructure/managers/SubscriptionManager";
 import {
   convertPurchasedAt,
   formatDateForLocale,
@@ -45,7 +46,10 @@ export const useSubscriptionSettingsConfig = (
 
   // Internal hooks
   const { credits } = useCredits({ userId, enabled: !!userId });
-  const { isPremium: subscriptionActive } = useSubscriptionStatus({
+  const {
+    isPremium: subscriptionActive,
+    expirationDate: statusExpirationDate,
+  } = useSubscriptionStatus({
     userId,
     enabled: !!userId,
   });
@@ -55,9 +59,16 @@ export const useSubscriptionSettingsConfig = (
   // Premium status from actual RevenueCat subscription
   const isPremium = subscriptionActive;
 
-  // RevenueCat entitlement info
-  const premiumEntitlement = customerInfo?.entitlements.active["premium"];
-  const expiresAtIso = premiumEntitlement?.expirationDate || null;
+  // RevenueCat entitlement info - dynamically using configured entitlementId
+  const entitlementId = SubscriptionManager.getEntitlementId() || "premium";
+  const premiumEntitlement = customerInfo?.entitlements.active[entitlementId];
+
+  // Prefer expiration date from useSubscriptionStatus (checkPremiumStatus)
+  // as it is already processed and typed. Fallback to CustomerInfo ISO string.
+  const expiresAtIso = statusExpirationDate
+    ? statusExpirationDate.toISOString()
+    : premiumEntitlement?.expirationDate || null;
+
   const willRenew = premiumEntitlement?.willRenew || false;
   const purchasedAtIso = convertPurchasedAt(credits?.purchasedAt);
 

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

@@ -53,6 +53,11 @@ export interface IRevenueCatService {
    */
   reset(): Promise<void>;
 
+  /**
+   * Get current customer info
+   */
+  getCustomerInfo(): Promise<CustomerInfo | null>;
+
   /**
    * Get RevenueCat API key for current platform
    */

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

@@ -3,7 +3,7 @@
  * Handles package operations (fetch, purchase, restore, premium status)
  */
 
-import type { PurchasesPackage } from "react-native-purchases";
+import type { PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService } from "../../application/ports/IRevenueCatService";
 import { getPremiumEntitlement } from "../../domain/types/RevenueCatTypes";
 import {
@@ -126,37 +126,24 @@ export class PackageHandler {
     }
   }
 
-  async checkPremiumStatus(userId: string): Promise<PremiumStatus> {
-    if (!this.service?.isInitialized()) {
-      return { isPremium: false, expirationDate: null };
+  checkPremiumStatusFromInfo(customerInfo: CustomerInfo): PremiumStatus {
+    const entitlement = getPremiumEntitlement(
+      customerInfo,
+      this.entitlementId
+    );
+
+    if (entitlement) {
+      return {
+        isPremium: true,
+        expirationDate: entitlement.expirationDate
+          ? new Date(entitlement.expirationDate)
+          : null,
+      };
     }
 
-    try {
-      const restoreResult = await this.service.restorePurchases(userId);
-
-      if (restoreResult.customerInfo) {
-        const entitlement = getPremiumEntitlement(
-          restoreResult.customerInfo,
-          this.entitlementId
-        );
-        if (entitlement) {
-          return {
-            isPremium: true,
-            expirationDate: entitlement.expirationDate
-              ? new Date(entitlement.expirationDate)
-              : null,
-          };
-        }
-      }
-
-      return { isPremium: restoreResult.isPremium, expirationDate: null };
-    } catch (error) {
-      trackPackageError(error instanceof Error ? error : new Error(String(error)), {
-        packageName: "subscription",
-        operation: "check_premium_status",
-        userId,
-      });
-      return { isPremium: false, expirationDate: null };
-    }
+    return {
+      isPremium: !!customerInfo.entitlements.active[this.entitlementId],
+      expirationDate: null,
+    };
   }
 }

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

@@ -107,6 +107,10 @@ class SubscriptionManagerImpl {
       this.initCache.getCurrentUserId() === userId;
   }
 
+  getEntitlementId(): string | null {
+    return this.managerConfig?.config.entitlementIdentifier || null;
+  }
+
   async getPackages(): Promise<PurchasesPackage[]> {
     this.ensureConfigured();
     if (__DEV__) {
@@ -150,7 +154,13 @@ class SubscriptionManagerImpl {
     this.ensureConfigured();
     const userId = this.initCache.getCurrentUserId();
     if (!userId) return { isPremium: false, expirationDate: null };
-    return this.packageHandler!.checkPremiumStatus(userId);
+
+    const customerInfo = await this.serviceInstance?.getCustomerInfo();
+    if (customerInfo) {
+      return this.packageHandler!.checkPremiumStatusFromInfo(customerInfo);
+    }
+
+    return { isPremium: false, expirationDate: null };
   }
 
   async reset(): Promise<void> {

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

@@ -4,7 +4,7 @@
  */
 
 import Purchases from "react-native-purchases";
-import type { PurchasesOffering, PurchasesPackage } from "react-native-purchases";
+import type { PurchasesOffering, PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type {
   IRevenueCatService,
   InitializeResult,
@@ -129,6 +129,13 @@ export class RevenueCatService implements IRevenueCatService {
     );
   }
 
+  async getCustomerInfo(): Promise<CustomerInfo | null> {
+    if (!this.isInitialized()) {
+      return null;
+    }
+    return Purchases.getCustomerInfo();
+  }
+
   async reset(): Promise<void> {
     if (!this.isInitialized()) {
       return;