@umituz/react-native-settings 5.2.1 → 5.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-settings",
-  "version": "5.2.1",
+  "version": "5.2.6",
   "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/useSettingsScreenConfig.ts

@@ -7,10 +7,9 @@
  */
 
 import { useMemo } from "react";
-import { useAuth, useUserProfile } from "@umituz/react-native-auth";
+import { useAuth, useUserProfile, useAuthHandlers } from "@umituz/react-native-auth";
 import { createUserProfileDisplay } from "../utils/userProfileUtils";
 import { createAccountConfig } from "../utils/accountConfigUtils";
-import { useAuthHandlers } from "../utils/useAuthHandlers";
 import { translateFAQData } from "../utils/faqTranslator";
 import { useSettingsConfigFactory } from "../utils/settingsConfigFactory";
 import type { SettingsConfig, SettingsTranslations } from "../screens/types";
@@ -104,16 +103,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 +112,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 +141,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/navigation/hooks/useSettingsScreens.ts

@@ -2,8 +2,7 @@ import { useMemo } from 'react';
 import type { StackScreen } from "@umituz/react-native-design-system";
 import { LanguageSelectionScreen } from "../../../domains/localization";
 import { NotificationSettingsScreen } from "../../../domains/notifications";
-import { AccountScreen } from "@umituz/react-native-auth";
-import { PasswordPromptScreen } from "@umituz/react-native-firebase";
+import { AccountScreen, PasswordPromptScreen } from "@umituz/react-native-auth";
 import { SettingsScreen } from "../../screens/SettingsScreen";
 import { AppearanceScreen } from "../../screens/AppearanceScreen";
 import { FAQScreen } from "../../../domains/faqs";

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/index.ts

@@ -7,4 +7,3 @@ export * from "./userProfileUtils";
 export * from "./accountConfigUtils";
 export * from "./faqTranslator";
 export * from "./settingsConfigFactory";
-export * from "./useAuthHandlers";

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

@@ -1,100 +0,0 @@
-/**
- * Auth Handlers Hook
- * Centralized authentication-related handlers for settings screen
- * Uses auth package for all auth operations - no duplication
- */
-
-import { useCallback } from "react";
-import { Linking, Alert } from "react-native";
-import {
-  useAuth,
-  useAuthModalStore,
-  useAccountManagement,
-} from "@umituz/react-native-auth";
-import { AlertService } from "@umituz/react-native-design-system";
-import type { AppInfo } from "../navigation/types";
-import type { SettingsTranslations } from "../screens/types";
-import { usePasswordPromptNavigation } from "./usePasswordPromptNavigation";
-
-declare const __DEV__: boolean;
-
-/**
- * Hook that provides authentication-related handlers
- */
-export const useAuthHandlers = (appInfo: AppInfo, translations?: SettingsTranslations["account"] & SettingsTranslations["errors"]) => {
-  const { signOut } = useAuth();
-  const { showAuthModal } = useAuthModalStore();
-
-  const { showPasswordPrompt } = usePasswordPromptNavigation({
-    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",
-    confirmText: translations?.delete || "Delete",
-  });
-
-  const { deleteAccount: deleteAccountFromAuth } = useAccountManagement({
-    onPasswordRequired: showPasswordPrompt,
-  });
-
-  const handleRatePress = useCallback(async () => {
-    const url = appInfo.appStoreUrl;
-    if (!url) {
-      Alert.alert(translations?.common || "", translations?.appStoreUrlNotConfigured || "");
-      return;
-    }
-
-    try {
-      const canOpen = await Linking.canOpenURL(url);
-      if (!canOpen) {
-        Alert.alert(
-          translations?.common || "",
-          translations?.unableToOpenAppStore || ""
-        );
-        return;
-      }
-      await Linking.openURL(url);
-    } catch (error) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.error("[useAuthHandlers] Failed to open app store:", error);
-      }
-      Alert.alert(translations?.common || "", translations?.failedToOpenAppStore || "");
-    }
-  }, [appInfo.appStoreUrl, translations]);
-
-  const handleSignOut = useCallback(async () => {
-    try {
-      await signOut();
-    } catch (error) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.error("[useAuthHandlers] Sign out failed:", error);
-      }
-      AlertService.createErrorAlert(
-        translations?.common || "",
-        translations?.unknown || ""
-      );
-    }
-  }, [signOut, translations]);
-
-  const handleDeleteAccount = useCallback(async () => {
-    try {
-      await deleteAccountFromAuth();
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      AlertService.createErrorAlert(
-        translations?.common || "Error",
-        errorMessage || translations?.deleteAccountError || "Failed to delete account"
-      );
-    }
-  }, [deleteAccountFromAuth, translations]);
-
-  const handleSignIn = useCallback(() => {
-    showAuthModal(undefined, "login");
-  }, [showAuthModal]);
-
-  return {
-    handleRatePress,
-    handleSignOut,
-    handleDeleteAccount,
-    handleSignIn,
-  };
-};

package/src/presentation/utils/usePasswordPromptNavigation.ts

@@ -1,53 +0,0 @@
-/**
- * Password Prompt Navigation Hook
- * Navigation-based password prompt that maintains Promise interface
- */
-
-import { useCallback, useRef } from 'react';
-import { AppNavigation } from '@umituz/react-native-design-system';
-
-export interface UsePasswordPromptNavigationOptions {
-  title?: string;
-  message?: string;
-  confirmText?: string;
-  cancelText?: string;
-}
-
-export interface UsePasswordPromptNavigationReturn {
-  showPasswordPrompt: () => Promise<string | null>;
-}
-
-export const usePasswordPromptNavigation = (
-  options: UsePasswordPromptNavigationOptions
-): UsePasswordPromptNavigationReturn => {
-  const { title, message, confirmText, cancelText } = options;
-  const resolveRef = useRef<((value: string | null) => void) | null>(null);
-
-  const showPasswordPrompt = useCallback((): Promise<string | null> => {
-    return new Promise<string | null>((resolve) => {
-      resolveRef.current = resolve;
-
-      const params = {
-        onComplete: (password: string | null) => {
-          if (resolveRef.current) {
-            resolveRef.current(password);
-            resolveRef.current = null;
-          }
-        },
-        title,
-        message,
-        confirmText,
-        cancelText,
-      };
-
-      AppNavigation.navigate('Settings', {
-        screen: 'PasswordPrompt',
-        params,
-      } as any);
-    });
-  }, [title, message, confirmText, cancelText]);
-
-  return {
-    showPasswordPrompt,
-  };
-};