@umituz/react-native-subscription 2.27.65 → 2.27.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.65",
+  "version": "2.27.66",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -55,7 +55,9 @@
     "@tanstack/query-async-storage-persister": "^5.66.7",
     "@tanstack/react-query": "^5.0.0",
     "@tanstack/react-query-persist-client": "^5.66.7",
+    "@types/jest": "^30.0.0",
     "@types/react": "~19.1.10",
+    "@types/react-native": "^0.72.8",
     "@typescript-eslint/eslint-plugin": "^8.50.1",
     "@typescript-eslint/parser": "^8.50.1",
     "@umituz/react-native-auth": "^3.6.14",

package/src/domain/entities/SubscriptionStatus.test.ts

@@ -1,7 +1,11 @@
+import { 
+  SUBSCRIPTION_STATUS,
+} from './SubscriptionConstants';
 import {
   createDefaultSubscriptionStatus,
   isSubscriptionValid,
   calculateDaysRemaining,
+  resolveSubscriptionStatus,
 } from './SubscriptionStatus';
 
 describe('SubscriptionStatus', () => {
@@ -16,7 +20,7 @@ describe('SubscriptionStatus', () => {
         purchasedAt: null,
         customerId: null,
         syncedAt: null,
-        status: 'none',
+        status: SUBSCRIPTION_STATUS.NONE,
       });
     });
   });
@@ -102,4 +106,44 @@ describe('SubscriptionStatus', () => {
       expect(calculateDaysRemaining(pastDate.toISOString())).toBe(0);
     });
   });
+
+  describe('resolveSubscriptionStatus', () => {
+    it('should return NONE when not premium', () => {
+      expect(resolveSubscriptionStatus({ isPremium: false })).toBe(SUBSCRIPTION_STATUS.NONE);
+    });
+
+    it('should return EXPIRED when expired', () => {
+      expect(resolveSubscriptionStatus({ isPremium: true, isExpired: true })).toBe(SUBSCRIPTION_STATUS.EXPIRED);
+    });
+
+    it('should return TRIAL when trialing and set to renew', () => {
+      expect(resolveSubscriptionStatus({
+        isPremium: true,
+        periodType: 'TRIAL',
+        willRenew: true
+      })).toBe(SUBSCRIPTION_STATUS.TRIAL);
+    });
+
+    it('should return TRIAL_CANCELED when trialing and will not renew', () => {
+      expect(resolveSubscriptionStatus({
+        isPremium: true,
+        periodType: 'TRIAL',
+        willRenew: false
+      })).toBe(SUBSCRIPTION_STATUS.TRIAL_CANCELED);
+    });
+
+    it('should return ACTIVE when premium, not expired, not trial, and set to renew', () => {
+      expect(resolveSubscriptionStatus({
+        isPremium: true,
+        willRenew: true
+      })).toBe(SUBSCRIPTION_STATUS.ACTIVE);
+    });
+
+    it('should return CANCELED when premium, not expired, not trial, and will not renew', () => {
+      expect(resolveSubscriptionStatus({
+        isPremium: true,
+        willRenew: false
+      })).toBe(SUBSCRIPTION_STATUS.CANCELED);
+    });
+  });
 });

package/src/infrastructure/services/SubscriptionInitializer.ts

@@ -13,7 +13,7 @@ import { configureCreditsRepository, getCreditsRepository } from "../repositorie
 import { SubscriptionManager } from "../../revenuecat/infrastructure/managers/SubscriptionManager";
 import { configureAuthProvider } from "../../presentation/hooks/useAuthAwarePurchase";
 import type { RevenueCatData } from "../../domain/types/RevenueCatData";
-import { PERIOD_TYPE, type PeriodType, type PurchaseSource } from "../../domain/entities/SubscriptionConstants";
+import { type PeriodType, type PurchaseSource } from "../../domain/entities/SubscriptionConstants";
 import type { SubscriptionInitConfig, FirebaseAuthLike } from "./SubscriptionInitializerTypes";
 
 export type { FirebaseAuthLike, CreditPackageConfig, SubscriptionInitConfig } from "./SubscriptionInitializerTypes";

package/src/presentation/components/details/PremiumStatusBadge.tsx

@@ -33,14 +33,14 @@ export const PremiumStatusBadge: React.FC<PremiumStatusBadgeProps> = ({
 }) => {
   const tokens = useAppDesignTokens();
 
-  const labels: Record<SubscriptionStatusType, string> = {
+  const labels: Record<SubscriptionStatusType, string> = useMemo(() => ({
     [SUBSCRIPTION_STATUS.ACTIVE]: activeLabel,
     [SUBSCRIPTION_STATUS.TRIAL]: activeLabel,
     [SUBSCRIPTION_STATUS.TRIAL_CANCELED]: trialCanceledLabel ?? canceledLabel,
     [SUBSCRIPTION_STATUS.EXPIRED]: expiredLabel,
     [SUBSCRIPTION_STATUS.NONE]: noneLabel,
     [SUBSCRIPTION_STATUS.CANCELED]: canceledLabel,
-  };
+  }), [activeLabel, trialCanceledLabel, canceledLabel, expiredLabel, noneLabel]);
 
   const backgroundColor = useMemo(() => {
     const colors: Record<SubscriptionStatusType, string> = {

package/src/utils/packageTypeDetector.ts

@@ -7,23 +7,22 @@ import { PACKAGE_TYPE, type PackageType } from "../domain/entities/SubscriptionC
 
 export type SubscriptionPackageType = PackageType;
 
+/**
+ * Check if identifier is a credit package (consumable purchase)
+ * Credit packages use a different system and don't need type detection
+ */
 /**
  * Check if identifier is a credit package (consumable purchase)
  * Credit packages use a different system and don't need type detection
  */
 function isCreditPackage(identifier: string): boolean {
-  return identifier.includes("credit");
+  // Matches "credit" as a word or part of a common naming pattern
+  return /\bcredit\b|_credit_|-credit-/i.test(identifier) || identifier.toLowerCase().includes("credit");
 }
 
 /**
  * Detect package type from product identifier
- * Supports common RevenueCat naming patterns:
- * - premium_weekly, weekly_premium, premium-weekly
- * - premium_monthly, monthly_premium, premium-monthly
- * - premium_yearly, yearly_premium, premium-yearly, premium_annual, annual_premium
- * - preview-product-id (Preview API mode in Expo Go)
- *
- * Note: Credit packages (consumable purchases) are skipped silently
+ * Supports common RevenueCat naming patterns with regex for better accuracy
  */
 export function detectPackageType(productIdentifier: string): SubscriptionPackageType {
   if (!productIdentifier) {
@@ -45,28 +44,24 @@ export function detectPackageType(productIdentifier: string): SubscriptionPackag
     return PACKAGE_TYPE.MONTHLY;
   }
 
-  // Weekly detection
-  if (normalized.includes("weekly") || normalized.includes("week")) {
+  // Weekly detection: matches "weekly" or "week" as distinct parts of the ID
+  if (/\bweekly?\b|_week_|-week-|\.week\./i.test(normalized)) {
     if (__DEV__) {
       console.log("[PackageTypeDetector] Detected: WEEKLY");
     }
     return PACKAGE_TYPE.WEEKLY;
   }
 
-  // Monthly detection
-  if (normalized.includes("monthly") || normalized.includes("month")) {
+  // Monthly detection: matches "monthly" or "month"
+  if (/\bmonthly?\b|_month_|-month-|\.month\./i.test(normalized)) {
     if (__DEV__) {
       console.log("[PackageTypeDetector] Detected: MONTHLY");
     }
     return PACKAGE_TYPE.MONTHLY;
   }
 
-  // Yearly detection (includes annual)
-  if (
-    normalized.includes("yearly") ||
-    normalized.includes("year") ||
-    normalized.includes("annual")
-  ) {
+  // Yearly detection: matches "yearly", "year", or "annual"
+  if (/\byearly?\b|_year_|-year-|\.year\.|annual/i.test(normalized)) {
     if (__DEV__) {
       console.log("[PackageTypeDetector] Detected: YEARLY");
     }