@umituz/react-native-settings 5.2.47 → 5.2.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-settings",
-  "version": "5.2.47",
+  "version": "5.2.49",
   "description": "Complete settings hub for React Native apps - consolidated package with settings, localization, about, legal, appearance, feedback, FAQs, rating, and gamification",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/presentation/hooks/useSettings.ts

@@ -10,42 +10,44 @@ import { useUpdateSettingsMutation, useResetSettingsMutation } from './mutations
 import type { UserSettings } from '../../application/ports/ISettingsRepository';
 
 export const useSettings = (userId: string) => {
-    // Validate userId
-    if (!userId || typeof userId !== 'string' || userId.trim() === '') {
-        throw new Error(
-            'Invalid userId: must be a non-empty string. ' +
-            'Received: ' + (userId === null ? 'null' : typeof userId)
-        );
-    }
+    const isValidUserId = !!userId && typeof userId === 'string' && userId.trim() !== '';
 
     const {
         data: settings,
         isLoading: loading,
         error: queryError
-    } = useSettingsQuery(userId);
+    } = useSettingsQuery(isValidUserId ? userId : '__invalid__');
 
-    const updateMutation = useUpdateSettingsMutation(userId);
-    const resetMutation = useResetSettingsMutation(userId);
+    const updateMutation = useUpdateSettingsMutation(isValidUserId ? userId : '__invalid__');
+    const resetMutation = useResetSettingsMutation(isValidUserId ? userId : '__invalid__');
 
     const updateSettings = async (updates: Partial<UserSettings>) => {
+        if (!isValidUserId) {
+            throw new Error('Invalid userId: must be a non-empty string');
+        }
         return updateMutation.mutateAsync(updates);
     };
 
     const resetSettings = async () => {
+        if (!isValidUserId) {
+            throw new Error('Invalid userId: must be a non-empty string');
+        }
         return resetMutation.mutateAsync();
     };
 
-    const error = queryError instanceof Error
-        ? queryError.message
-        : updateMutation.error instanceof Error
-            ? updateMutation.error.message
-            : resetMutation.error instanceof Error
-                ? resetMutation.error.message
-                : null;
+    const error = !isValidUserId
+        ? 'Invalid userId: must be a non-empty string'
+        : queryError instanceof Error
+            ? queryError.message
+            : updateMutation.error instanceof Error
+                ? updateMutation.error.message
+                : resetMutation.error instanceof Error
+                    ? resetMutation.error.message
+                    : null;
 
     return {
-        settings,
-        loading: loading || updateMutation.isPending || resetMutation.isPending,
+        settings: isValidUserId ? settings : undefined,
+        loading: isValidUserId ? (loading || updateMutation.isPending || resetMutation.isPending) : false,
         error,
         updateSettings,
         resetSettings,