@umituz/react-native-subscription 2.24.15 → 2.24.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.24.15",
+  "version": "2.24.17",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -56,8 +56,8 @@
     "@types/react": "~19.1.10",
     "@typescript-eslint/eslint-plugin": "^8.50.1",
     "@typescript-eslint/parser": "^8.50.1",
-    "@umituz/react-native-auth": "*",
-    "@umituz/react-native-design-system": "^2.9.0",
+    "@umituz/react-native-auth": "^3.6.14",
+    "@umituz/react-native-design-system": "^2.9.35",
     "@umituz/react-native-firebase": "*",
     "@umituz/react-native-localization": "^3.6.0",
     "eslint": "^9.39.2",

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

@@ -18,7 +18,6 @@ interface PaywallTabBarProps {
 export const PaywallTabBar: React.FC<PaywallTabBarProps> = React.memo(
     ({ activeTab, onTabChange, creditsLabel, subscriptionLabel }) => {
         const tokens = useAppDesignTokens();
-        const isCreditsActive = activeTab === "credits";
 
         const renderTab = (tab: PaywallTabType, label: string) => {
             const isActive = activeTab === tab;

package/src/infrastructure/services/CreditsInitializer.ts

@@ -122,9 +122,19 @@ export async function initializeCreditsTransaction(
           ? [...(existing?.purchaseHistory || []), purchaseMetadata].slice(-10)
           : existing?.purchaseHistory;
 
-        // Determine subscription status
+        // Determine subscription status based on isPremium and willRenew
         const isPremium = metadata?.isPremium ?? true;
-        const status: SubscriptionDocStatus = isPremium ? "active" : "expired";
+        const willRenew = metadata?.willRenew;
+
+        // Status logic: canceled if premium but willRenew=false, expired if not premium, active otherwise
+        let status: SubscriptionDocStatus;
+        if (!isPremium) {
+            status = "expired";
+        } else if (willRenew === false) {
+            status = "canceled";
+        } else {
+            status = "active";
+        }
 
         // Build credits data (Single Source of Truth)
         const creditsData: Record<string, unknown> = {

package/src/infrastructure/services/SubscriptionInitializer.ts

@@ -104,9 +104,54 @@ export const initializeSubscription = async (config: SubscriptionInitConfig): Pr
     }
   };
 
+  /** Sync premium status changes (including cancellation) to Firestore */
+  const onPremiumStatusChanged = async (
+    userId: string,
+    isPremium: boolean,
+    productId?: string,
+    expiresAt?: string,
+    willRenew?: boolean
+  ) => {
+    if (__DEV__) {
+      console.log('[SubscriptionInitializer] onPremiumStatusChanged:', { userId, isPremium, productId, willRenew });
+    }
+    try {
+      const revenueCatData: RevenueCatData = {
+        expirationDate: expiresAt ?? null,
+        willRenew: willRenew ?? false,
+        isPremium,
+      };
+      await getCreditsRepository().initializeCredits(
+        userId,
+        `status_sync_${Date.now()}`,
+        productId,
+        "settings" as any,
+        revenueCatData
+      );
+      if (__DEV__) {
+        console.log('[SubscriptionInitializer] Premium status synced to Firestore');
+      }
+      onCreditsUpdated?.(userId);
+    } catch (error) {
+      if (__DEV__) {
+        console.error('[SubscriptionInitializer] Premium status sync failed:', error);
+      }
+    }
+  };
+
   SubscriptionManager.configure({
-    config: { apiKey: key, testStoreKey, entitlementIdentifier: entitlementId, consumableProductIdentifiers: [creditPackages?.identifierPattern || "credit"], onPurchaseCompleted: onPurchase, onRenewalDetected: onRenewal, onCreditsUpdated },
-    apiKey: key, getAnonymousUserId
+    config: {
+      apiKey: key,
+      testStoreKey,
+      entitlementIdentifier: entitlementId,
+      consumableProductIdentifiers: [creditPackages?.identifierPattern || "credit"],
+      onPurchaseCompleted: onPurchase,
+      onRenewalDetected: onRenewal,
+      onPremiumStatusChanged,
+      onCreditsUpdated,
+    },
+    apiKey: key,
+    getAnonymousUserId,
   });
 
   const userId = await waitForAuthState(getFirebaseAuth, authStateTimeoutMs);

package/src/presentation/components/feedback/PaywallFeedbackModal.tsx

@@ -4,14 +4,7 @@
  */
 
 import React, { useMemo } from "react";
-import {
-    View,
-    Modal,
-    TouchableOpacity,
-    Pressable,
-    TextInput,
-    KeyboardAvoidingView,
-} from "react-native";
+import { View, TouchableOpacity, TextInput } from "react-native";
 import { AtomicText, BaseModal } from "@umituz/react-native-design-system";
 import { useAppDesignTokens } from "@umituz/react-native-design-system";
 import { useLocalization } from "@umituz/react-native-localization";
@@ -78,7 +71,7 @@ export const PaywallFeedbackModal: React.FC<PaywallFeedbackModalProps> = React.m
         >
             <View style={{ paddingHorizontal: tokens.spacing.md, paddingBottom: tokens.spacing.lg }}>
                 <View style={[styles.optionsContainer, { backgroundColor: 'transparent', padding: 0 }]}>
-                    {FEEDBACK_OPTION_IDS.map((optionId, index) => {
+                    {FEEDBACK_OPTION_IDS.map((optionId) => {
                         const isSelected = selectedReason === optionId;
                         const isOther = optionId === "other";
                         const showInput = isSelected && isOther;

package/src/presentation/hooks/useSubscriptionSettingsConfig.ts

@@ -65,10 +65,10 @@ export const useSubscriptionSettingsConfig = (
   // Days remaining
   const daysRemaining = useMemo(() => calculateDaysRemaining(expiresAtIso), [expiresAtIso]);
 
-  // Status type from Firestore or derived
+  // Status type: prioritize Firestore status, then derive from willRenew + expiration
   const statusType: SubscriptionStatusType = credits?.status
     ? (credits.status as SubscriptionStatusType)
-    : getSubscriptionStatusType(isPremium);
+    : getSubscriptionStatusType(isPremium, willRenew, expiresAtIso);
 
   const creditsArray = useCreditsArray(credits, dynamicCreditLimit, translations);
 

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

@@ -37,10 +37,36 @@ export function useCreditsArray(
 }
 
 /**
- * Calculates subscription status type
+ * Calculates subscription status type based on premium and renewal status
+ * @param isPremium - Whether user has premium subscription
+ * @param willRenew - Whether subscription will auto-renew (false = canceled)
+ * @param expiresAt - Expiration date ISO string (null for lifetime)
  */
 export function getSubscriptionStatusType(
-  isPremium: boolean
-): "active" | "none" {
-  return isPremium ? "active" : "none";
+  isPremium: boolean,
+  willRenew?: boolean,
+  expiresAt?: string | null
+): "active" | "canceled" | "expired" | "none" {
+  if (!isPremium) {
+    return "none";
+  }
+
+  // Lifetime subscription (no expiration) - always active
+  if (!expiresAt) {
+    return "active";
+  }
+
+  // Check if expired
+  const now = new Date();
+  const expDate = new Date(expiresAt);
+  if (expDate < now) {
+    return "expired";
+  }
+
+  // Premium with willRenew=false means subscription is canceled but still active until expiration
+  if (willRenew === false) {
+    return "canceled";
+  }
+
+  return "active";
 }

package/src/revenuecat/domain/value-objects/RevenueCatConfig.ts

@@ -19,7 +19,8 @@ export interface RevenueCatConfig {
     userId: string,
     isPremium: boolean,
     productId?: string,
-    expiresAt?: string
+    expiresAt?: string,
+    willRenew?: boolean
   ) => Promise<void> | void;
   /** Callback for purchase completion */
   onPurchaseCompleted?: (

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

@@ -27,10 +27,11 @@ export async function syncPremiumStatus(
                 userId,
                 true,
                 premiumEntitlement.productIdentifier,
-                premiumEntitlement.expirationDate ?? undefined
+                premiumEntitlement.expirationDate ?? undefined,
+                premiumEntitlement.willRenew
             );
         } else {
-            await config.onPremiumStatusChanged(userId, false);
+            await config.onPremiumStatusChanged(userId, false, undefined, undefined, undefined);
         }
     } catch {
         // Silent error handling