@umituz/react-native-subscription 2.31.25 → 2.31.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.31.25",
+  "version": "2.31.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/domains/subscription/infrastructure/hooks/useSubscriptionPackages.ts

@@ -4,7 +4,8 @@
  * Auth info automatically read from @umituz/react-native-auth
  */
 
-import { useQuery } from "@umituz/react-native-design-system";
+import { useQuery, useQueryClient } from "@umituz/react-native-design-system";
+import { useEffect, useRef } from "react";
 import {
   useAuthStore,
   selectUserId,
@@ -22,11 +23,12 @@ import {
 export const useSubscriptionPackages = () => {
   const userId = useAuthStore(selectUserId);
   const isConfigured = SubscriptionManager.isConfigured();
+  const queryClient = useQueryClient();
+  const prevUserIdRef = useRef(userId);
 
-  return useQuery({
+  const query = useQuery({
     queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, userId ?? "anonymous"] as const,
     queryFn: async () => {
-      // Initialize if needed (works for both authenticated and anonymous users)
       if (userId) {
         if (!SubscriptionManager.isInitializedForUser(userId)) {
           await SubscriptionManager.initialize(userId);
@@ -46,4 +48,27 @@ export const useSubscriptionPackages = () => {
     refetchOnWindowFocus: false,
     refetchOnReconnect: true,
   });
+
+  useEffect(() => {
+    const prevUserId = prevUserIdRef.current;
+    prevUserIdRef.current = userId;
+
+    if (prevUserId !== userId) {
+      if (prevUserId) {
+        queryClient.removeQueries({
+          queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, prevUserId],
+        });
+      } else {
+        queryClient.removeQueries({
+          queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, "anonymous"],
+        });
+      }
+
+      queryClient.invalidateQueries({
+        queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, userId ?? "anonymous"],
+      });
+    }
+  }, [userId, queryClient]);
+
+  return query;
 };

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

@@ -15,8 +15,9 @@ export const subscriptionStatusQueryKeys = {
 export const useSubscriptionStatus = (): SubscriptionStatusResult => {
   const userId = useAuthStore(selectUserId);
   const queryClient = useQueryClient();
+  const isConfigured = SubscriptionManager.isConfigured();
 
-  const queryEnabled = isAuthenticated(userId) && SubscriptionManager.isInitializedForUser(userId);
+  const queryEnabled = isAuthenticated(userId) && isConfigured;
 
   const { data, status, error, refetch } = useQuery({
     queryKey: subscriptionStatusQueryKeys.user(userId),
@@ -25,6 +26,10 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
         return null;
       }
 
+      if (!SubscriptionManager.isInitializedForUser(userId)) {
+        await SubscriptionManager.initialize(userId);
+      }
+
       try {
         const result = await SubscriptionManager.checkPremiumStatus();
         return result;