@umituz/react-native-settings 5.2.0 → 5.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-settings",
-  "version": "5.2.0",
+  "version": "5.2.5",
   "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",
@@ -74,9 +74,9 @@
     "@types/react": "~19.1.10",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
-    "@umituz/react-native-auth": "^4.1.1",
+    "@umituz/react-native-auth": "^4.2.0",
     "@umituz/react-native-design-system": "latest",
-    "@umituz/react-native-firebase": "latest",
+    "@umituz/react-native-firebase": "^2.4.1",
     "@umituz/react-native-sentry": "latest",
     "eslint": "^8.57.0",
     "eslint-plugin-react": "^7.37.5",

package/src/presentation/hooks/useSettingsScreenConfig.ts

@@ -104,16 +104,6 @@ export const useSettingsScreenConfig = (
       translations,
     };
 
-    // Add subscription title and description from translations if available
-    if (config.subscription && typeof config.subscription === 'object' && translations?.features?.subscription) {
-      config.subscription = {
-        ...config.subscription,
-        title: translations.features.subscription.title,
-        description: translations.features.subscription.description,
-      };
-    }
-
-    // Add subscription title and description from translations if available
     if (config.subscription && typeof config.subscription === 'object') {
       config.subscription = {
         ...config.subscription,
@@ -123,25 +113,23 @@ export const useSettingsScreenConfig = (
       };
     }
 
-    // Add gamification title and description
     if (config.gamification) {
       const existingConfig = typeof config.gamification === 'object' ? config.gamification : { enabled: true };
       config.gamification = {
-        ...(existingConfig as any),
+        ...existingConfig,
         enabled: true,
-        title: translations?.features?.gamification?.title || (existingConfig as any).title || "Your Progress",
-        description: translations?.features?.gamification?.description || (existingConfig as any).description,
+        title: translations?.features?.gamification?.title || existingConfig.title || "Your Progress",
+        description: translations?.features?.gamification?.description || existingConfig.description,
       };
     }
 
-    // Add videoTutorial title and description
     if (config.videoTutorial) {
       const existingConfig = typeof config.videoTutorial === 'object' ? config.videoTutorial : { enabled: true };
       config.videoTutorial = {
-        ...(existingConfig as any),
+        ...existingConfig,
         enabled: true,
-        title: translations?.features?.videoTutorial?.title || (existingConfig as any).title || "Video Tutorials",
-        description: translations?.features?.videoTutorial?.description || (existingConfig as any).description,
+        title: translations?.features?.videoTutorial?.title || existingConfig.title || "Video Tutorials",
+        description: translations?.features?.videoTutorial?.description || existingConfig.description,
       };
     }
 
@@ -154,11 +142,11 @@ export const useSettingsScreenConfig = (
   }), [userProfileData, handleSignIn]);
 
   const accountConfig = useMemo(() => createAccountConfig({
-    displayName: userProfileData?.displayName || user?.displayName || undefined,
-    userId: userProfileData?.userId ?? user?.uid ?? undefined,
-    photoURL: user?.photoURL ?? undefined,
+    displayName: userProfileData?.displayName || user?.displayName,
+    userId: userProfileData?.userId ?? user?.uid,
+    photoURL: user?.photoURL,
     isAnonymous: user?.isAnonymous,
-    avatarUrl: userProfileData?.avatarUrl ?? undefined,
+    avatarUrl: userProfileData?.avatarUrl,
     onSignIn: handleSignIn,
     onLogout: handleSignOut,
     onDeleteAccount: handleDeleteAccount,

package/src/presentation/navigation/SettingsStackNavigator.tsx

@@ -53,6 +53,7 @@ export const SettingsStackNavigator: React.FC<SettingsStackNavigatorProps> = (pr
   });
 
   const navigatorConfig: StackNavigatorConfig<SettingsStackParamList> = {
+    id: "SettingsStack",
     initialRouteName: "SettingsMain",
     screenOptions,
     screens,

package/src/presentation/utils/accountConfigUtils.ts

@@ -69,9 +69,9 @@ export function createAccountConfig(params: CreateAccountConfigParams): AccountS
   return {
     profile: {
       displayName: displayName || "",
-      userId: userId ?? undefined,
+      userId,
       isAnonymous: anonymous,
-      avatarUrl: avatarUrl ?? photoURL ?? undefined,
+      avatarUrl: avatarUrl ?? photoURL,
     },
     isAnonymous: anonymous,
     editProfileText: translations?.editProfile || "",

package/src/presentation/utils/screenFactory.ts

@@ -55,7 +55,7 @@ export function createScreenWithProps<P>(
 export function convertAdditionalScreen(screen: AdditionalScreen): StackScreen {
   const stackScreen: Partial<StackScreen> = { name: screen.name };
   if (screen.component) stackScreen.component = screen.component;
-  if (screen.children) stackScreen.children = screen.children;
+  if (screen.children) stackScreen.children = screen.children as any;
   if (screen.options) stackScreen.options = screen.options;
   return stackScreen as StackScreen;
 }

package/src/presentation/utils/useAuthHandlers.ts

@@ -11,7 +11,7 @@ import {
   useAuthModalStore,
   useAccountManagement,
 } from "@umituz/react-native-auth";
-import { AlertService, useAppNavigation } from "@umituz/react-native-design-system";
+import { AlertService } from "@umituz/react-native-design-system";
 import type { AppInfo } from "../navigation/types";
 import type { SettingsTranslations } from "../screens/types";
 import { usePasswordPromptNavigation } from "./usePasswordPromptNavigation";
@@ -24,10 +24,8 @@ declare const __DEV__: boolean;
 export const useAuthHandlers = (appInfo: AppInfo, translations?: SettingsTranslations["account"] & SettingsTranslations["errors"]) => {
   const { signOut } = useAuth();
   const { showAuthModal } = useAuthModalStore();
-  const navigation = useAppNavigation();
 
   const { showPasswordPrompt } = usePasswordPromptNavigation({
-    navigation,
     title: translations?.deleteAccountTitle || "Confirm Account Deletion",
     message: translations?.deleteAccountMessage || "Please enter your password to permanently delete your account. This action cannot be undone.",
     cancelText: translations?.cancel || "Cancel",

package/src/presentation/utils/usePasswordPromptNavigation.ts

@@ -1,13 +1,13 @@
 /**
  * Password Prompt Navigation Hook
  * Navigation-based password prompt that maintains Promise interface
+ * Uses AppNavigation for global navigation access
  */
 
-import { useCallback, useRef } from 'react';
-import type { useAppNavigation } from '@umituz/react-native-design-system';
+import { useCallback, useRef, useEffect } from 'react';
+import { AppNavigation } from '@umituz/react-native-design-system';
 
 export interface UsePasswordPromptNavigationOptions {
-  navigation: ReturnType<typeof useAppNavigation>;
   title?: string;
   message?: string;
   confirmText?: string;
@@ -21,14 +21,27 @@ export interface UsePasswordPromptNavigationReturn {
 export const usePasswordPromptNavigation = (
   options: UsePasswordPromptNavigationOptions
 ): UsePasswordPromptNavigationReturn => {
-  const { navigation, title, message, confirmText, cancelText } = options;
+  const { title, message, confirmText, cancelText } = options;
   const resolveRef = useRef<((value: string | null) => void) | null>(null);
 
+  useEffect(() => {
+    return () => {
+      if (resolveRef.current) {
+        resolveRef.current(null);
+        resolveRef.current = null;
+      }
+    };
+  }, []);
+
   const showPasswordPrompt = useCallback((): Promise<string | null> => {
-    return new Promise<string | null>((resolve) => {
+    return new Promise<string | null>((resolve, reject) => {
+      if (resolveRef.current) {
+        resolveRef.current(null);
+      }
+
       resolveRef.current = resolve;
 
-      navigation.navigate('PasswordPrompt', {
+      const params = {
         onComplete: (password: string | null) => {
           if (resolveRef.current) {
             resolveRef.current(password);
@@ -39,9 +52,19 @@ export const usePasswordPromptNavigation = (
         message,
         confirmText,
         cancelText,
-      });
+      };
+
+      try {
+        AppNavigation.navigate('PasswordPrompt', params);
+      } catch (error) {
+        if (resolveRef.current) {
+          resolveRef.current(null);
+          resolveRef.current = null;
+        }
+        reject(error);
+      }
     });
-  }, [navigation, title, message, confirmText, cancelText]);
+  }, [title, message, confirmText, cancelText]);
 
   return {
     showPasswordPrompt,