@umituz/react-native-subscription 2.27.138 → 2.27.139

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.138",
+  "version": "2.27.139",
   "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/credits/presentation/useCredits.ts

@@ -1,5 +1,5 @@
 import { useQuery, useQueryClient } from "@umituz/react-native-design-system";
-import { useCallback, useMemo, useEffect } from "react";
+import { useCallback, useMemo, useEffect, useRef } from "react";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
 import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
 import type { UserCredits } from "../core/Credits";
@@ -47,7 +47,7 @@ export const useCredits = (): UseCreditsResult => {
   const queryEnabled = !!userId && isConfigured;
 
   const { data, status, error, refetch } = useQuery({
-    queryKey: creditsQueryKeys.user(userId ?? ""),
+    queryKey: userId ? creditsQueryKeys.user(userId) : creditsQueryKeys.all,
     queryFn: async () => {
       if (!userId || !isConfigured) return null;
 
@@ -67,18 +67,23 @@ export const useCredits = (): UseCreditsResult => {
   });
 
   const queryClient = useQueryClient();
+  const queryClientRef = useRef(queryClient);
+
+  useEffect(() => {
+    queryClientRef.current = queryClient;
+  }, [queryClient]);
 
   useEffect(() => {
     if (!userId) return;
 
     const unsubscribe = subscriptionEventBus.on(SUBSCRIPTION_EVENTS.CREDITS_UPDATED, (updatedUserId) => {
       if (updatedUserId === userId) {
-        queryClient.invalidateQueries({ queryKey: creditsQueryKeys.user(userId) });
+        queryClientRef.current.invalidateQueries({ queryKey: creditsQueryKeys.user(userId) });
       }
     });
 
     return unsubscribe;
-  }, [userId, queryClient]);
+  }, [userId]);
 
   const credits = data ?? null;
 

package/src/domains/subscription/infrastructure/hooks/useCustomerInfo.ts

@@ -14,7 +14,7 @@
  * @see https://www.revenuecat.com/docs/customers/customer-info
  */
 
-import { useEffect, useState, useCallback } from "react";
+import { useEffect, useState, useCallback, useRef } from "react";
 import Purchases, { type CustomerInfo } from "react-native-purchases";
 
 export interface UseCustomerInfoResult {
@@ -81,21 +81,23 @@ export function useCustomerInfo(): UseCustomerInfoResult {
     }
   }, []);
 
+  const listenerRef = useRef<((info: CustomerInfo) => void) | null>(null);
+
   useEffect(() => {
-    // Initial fetch
     fetchCustomerInfo();
 
-    // Listen for real-time updates (renewals, purchases, restore)
     const listener = (info: CustomerInfo) => {
       setCustomerInfo(info);
       setError(null);
     };
 
+    listenerRef.current = listener;
     Purchases.addCustomerInfoUpdateListener(listener);
 
-    // Cleanup listener on unmount
     return () => {
-      Purchases.removeCustomerInfoUpdateListener(listener);
+      if (listenerRef.current) {
+        Purchases.removeCustomerInfoUpdateListener(listenerRef.current);
+      }
     };
   }, [fetchCustomerInfo]);
 

package/src/domains/subscription/presentation/components/details/PremiumDetailsCard.tsx

@@ -66,6 +66,7 @@ export const PremiumDetailsCard: React.FC<PremiumDetailsCardProps> = ({
                   highlight={
                     daysRemaining !== null &&
                     daysRemaining !== undefined &&
+                    daysRemaining > 0 &&
                     daysRemaining <= 7
                   }
                 />

package/src/domains/subscription/presentation/usePremium.ts

@@ -22,9 +22,14 @@ export const usePremium = (): UsePremiumResult => {
   const restoreMutation = useRestorePurchase();
 
   const { showPaywall, setShowPaywall, closePaywall, openPaywall } = usePaywallVisibility();
- 
+
   const isPremium = subscriptionActive || (credits?.isPremium ?? false);
-  const isSyncing = subscriptionActive && credits !== null && !credits.isPremium;
+  const isSyncing =
+    !statusLoading &&
+    !creditsLoading &&
+    subscriptionActive &&
+    credits !== null &&
+    !credits.isPremium;
 
   const handlePurchase = useCallback(
     async (pkg: PurchasesPackage): Promise<boolean> => {

package/src/domains/subscription/presentation/useSubscriptionStatus.ts

@@ -14,8 +14,10 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
   const userId = useAuthStore(selectUserId);
   const queryClient = useQueryClient();
 
+  const queryEnabled = !!userId && SubscriptionManager.isInitializedForUser(userId);
+
   const { data, status, error, refetch } = useQuery({
-    queryKey: subscriptionStatusQueryKeys.user(userId ?? ""),
+    queryKey: userId ? subscriptionStatusQueryKeys.user(userId) : subscriptionStatusQueryKeys.all,
     queryFn: async () => {
       if (!userId) {
         return { isPremium: false, expirationDate: null };
@@ -28,7 +30,7 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
         return { isPremium: false, expirationDate: null };
       }
     },
-    enabled: !!userId && SubscriptionManager.isInitializedForUser(userId),
+    enabled: queryEnabled,
   });
 
   useEffect(() => {

package/src/shared/utils/numberUtils.core.ts

@@ -59,7 +59,7 @@ export function calculateRemaining(current: number, cost: number): number {
  * Check if user can afford a cost
  */
 export function canAfford(balance: number | null | undefined, cost: number): boolean {
-  if (balance === null || balance === undefined) return false;
+  if (balance === null || balance === undefined || cost < 0) return false;
   return balance >= cost;
 }
 
@@ -67,7 +67,6 @@ export function canAfford(balance: number | null | undefined, cost: number): boo
  * Calculate credit percentage for UI display
  */
 export function calculateCreditPercentage(current: number | null | undefined, max: number): number {
-  if (current === null || current === undefined) return 0;
-  if (max <= 0) return 100;
+  if (current === null || current === undefined || max <= 0) return 0;
   return calculatePercentageClamped(current, max);
 }