@umituz/react-native-settings 4.23.68 → 4.23.70

package/src/presentation/hooks/useSettingsScreenConfig.ts

@@ -137,9 +137,9 @@ export const useSettingsScreenConfig = (
 
     return {
       displayName: userProfileData?.displayName || anonymousName,
-      userId: userProfileData?.userId ?? null,
+      userId: userProfileData?.userId ?? undefined,
       isAnonymous,
-      avatarUrl: userProfileData?.avatarUrl ?? null,
+      avatarUrl: userProfileData?.avatarUrl ?? undefined,
       onPress: isAnonymous ? handleSignIn : undefined,
       accountSettingsRoute: isAnonymous ? undefined : "Account",
     };
@@ -155,7 +155,7 @@ export const useSettingsScreenConfig = (
     return {
       profile: {
         displayName: userProfileData?.displayName || user?.displayName || getTranslation("settings.profile.anonymousName", "Anonymous"),
-        userId: userProfileData?.userId ?? user?.uid ?? null,
+        userId: userProfileData?.userId ?? user?.uid ?? undefined,
         isAnonymous,
         avatarUrl: userProfileData?.avatarUrl ?? user?.photoURL ?? undefined,
         benefits: isAnonymous ? [

package/src/presentation/navigation/SettingsStackNavigator.tsx

@@ -13,18 +13,16 @@ import { AccountScreen } from "@umituz/react-native-auth";
 import { SettingsScreen } from "../screens/SettingsScreen";
 import { AppearanceScreen } from "../screens/AppearanceScreen";
 import { FAQScreen } from "../../domains/faqs";
+import { AboutScreen } from "../../domains/about";
+import { LegalScreen } from "../../domains/legal";
+import { GamificationScreen } from "../../domains/gamification";
 import { useNavigationHandlers } from "./hooks";
-import {
-  LegalScreenWrapper,
-  AboutScreenWrapper,
-} from "./components/wrappers";
 import {
   createNotificationTranslations,
   createQuietHoursTranslations,
   createLegalScreenProps,
 } from "./utils";
 import type { SettingsStackParamList, SettingsStackNavigatorProps, AdditionalScreen } from "./types";
-import { GamificationScreenWrapper } from "../../domains/gamification";
 
 export const SettingsStackNavigator: React.FC<SettingsStackNavigatorProps> = ({
   appInfo,
@@ -100,12 +98,12 @@ export const SettingsStackNavigator: React.FC<SettingsStackNavigatorProps> = ({
       {
         name: "About",
         options: { headerTitle: t("settings.about.title") },
-        children: () => <AboutScreenWrapper config={aboutConfig} />,
+        children: () => <AboutScreen config={aboutConfig} />,
       },
       {
         name: "Legal",
         options: { headerTitle: t("settings.legal.title") },
-        children: () => <LegalScreenWrapper {...legalScreenProps} />,
+        children: () => <LegalScreen {...legalScreenProps} />,
       },
       {
         name: "Notifications",
@@ -163,7 +161,7 @@ export const SettingsStackNavigator: React.FC<SettingsStackNavigatorProps> = ({
       ? {
           name: "Gamification",
           options: { headerTitle: t("settings.gamification.title") },
-          children: () => <GamificationScreenWrapper config={gamificationConfig} />,
+          children: () => <GamificationScreen config={gamificationConfig} />,
         }
       : null;
 

package/src/presentation/screens/SettingsScreen.tsx

@@ -80,10 +80,13 @@ export const SettingsScreen: React.FC<SettingsScreenProps> = ({
     [config]
   );
 
-  // Memoize feature detection to prevent unnecessary recalculations
+  // Feature detection hook (must be called at top level)
+  const detectedFeatures = useFeatureDetection(normalizedConfig, navigation, featureOptions);
+
+  // Memoize features to prevent unnecessary recalculations
   const features = React.useMemo(
-    () => useFeatureDetection(normalizedConfig, navigation, featureOptions),
-    [normalizedConfig, navigation, featureOptions]
+    () => detectedFeatures,
+    [detectedFeatures]
   );
 
   // Determine if user profile should be shown (explicit prop takes priority, then config)

package/src/presentation/screens/components/SettingsContent.tsx

@@ -70,6 +70,7 @@ export const SettingsContent: React.FC<SettingsContentProps> = ({
 }) => {
   const { t } = useLocalization();
 
+  // Optimize: Only track individual feature flags instead of entire object
   const hasAnyFeatures = useMemo(() =>
     features.appearance ||
     features.language ||
@@ -84,7 +85,21 @@ export const SettingsContent: React.FC<SettingsContentProps> = ({
     features.wallet ||
     features.gamification ||
     customSections.length > 0,
-    [features, customSections.length]
+    [
+      features.appearance,
+      features.language,
+      features.notifications,
+      features.about,
+      features.legal,
+      features.disclaimer,
+      features.feedback,
+      features.rating,
+      features.faqs,
+      features.subscription,
+      features.wallet,
+      features.gamification,
+      customSections.length,
+    ]
   );
 
   return (

package/src/domains/appearance/hooks/index.ts

@@ -1,6 +0,0 @@
-/**
- * Appearance Hooks
- */
-
-export { useAppearance } from "./useAppearance";
-export { useAppearanceActions } from "./useAppearanceActions";

package/src/domains/appearance/presentation/screens/index.ts

@@ -1,2 +0,0 @@
-export { AppearanceScreen } from "./AppearanceScreen";
-export type { AppearanceScreenProps } from "./AppearanceScreen";

package/src/domains/gamification/components/GamificationScreenWrapper.tsx

@@ -1,65 +0,0 @@
-import React from 'react';
-import { useGamification } from '../hooks/useGamification';
-import { GamificationScreen } from './GamificationScreen';
-import type { GamificationConfig } from '../types';
-import type { AchievementItemProps } from '../components';
-
-interface GamificationScreenWrapperProps {
-  config: GamificationConfig;
-}
-
-export const GamificationScreenWrapper: React.FC<GamificationScreenWrapperProps> = ({ config }) => {
-  const {
-    points,
-    totalTasksCompleted,
-    level,
-    streak,
-    achievements,
-  } = useGamification(config);
-
-  // Transform store achievements to UI props
-  const achievementItems: AchievementItemProps[] = achievements.map(a => ({
-    ...a,
-    title: a.title,
-    description: a.description,
-    icon: a.icon,
-    isUnlocked: a.isUnlocked,
-    progress: a.progress,
-    threshold: a.threshold,
-    id: a.id,
-    type: a.type
-  }));
-
-  return (
-    <GamificationScreen
-      title={config.translations.title}
-      statsTitle={config.translations.statsTitle}
-      achievementsTitle={config.translations.achievementsTitle}
-      streakTitle={config.translations.streakTitle}
-      levelProps={{
-        level: level.currentLevel,
-        points: level.currentPoints,
-        pointsToNext: level.pointsToNext,
-        progress: level.progress,
-        levelTitle: config.translations.levelTitle,
-        showPoints: true,
-      }}
-      streakProps={{
-        current: streak.current,
-        longest: streak.longest,
-        currentLabel: config.translations.currentStreak,
-        bestLabel: config.translations.bestStreak,
-        daysLabel: config.translations.days,
-      }}
-      stats={[
-        {
-          label: config.translations.statsTitle,
-          value: points, // Pass number directly
-          icon: "star",
-        },
-      ]}
-      achievements={achievementItems}
-      emptyAchievementsText={config.translations.emptyAchievements}
-    />
-  );
-};

package/src/presentation/navigation/components/wrappers/AboutScreenWrapper.tsx

@@ -1,14 +0,0 @@
-/**
- * About Screen Wrapper Component
- */
-import React from "react";
-import { AboutScreen } from "../../../../domains/about";
-import type { AboutConfig } from "../../../../domains/about/domain/entities/AppInfo";
-
-export interface AboutScreenWrapperProps {
-  config: AboutConfig;
-}
-
-export const AboutScreenWrapper: React.FC<AboutScreenWrapperProps> = ({
-  config,
-}) => <AboutScreen config={config} />;

package/src/presentation/navigation/components/wrappers/LegalScreenWrapper.tsx

@@ -1,50 +0,0 @@
-/**
- * Legal Screen Wrapper Component
- */
-import React from "react";
-import { LegalScreen } from "../../../../domains/legal";
-
-export interface LegalScreenWrapperProps {
-  title: string;
-  description: string;
-  documentsHeader: string;
-  privacyTitle: string;
-  privacyDescription: string;
-  termsTitle: string;
-  termsDescription: string;
-  eulaTitle: string;
-  eulaDescription: string;
-  onPrivacyPress: () => void;
-  onTermsPress: () => void;
-  onEulaPress: () => void;
-}
-
-export const LegalScreenWrapper: React.FC<LegalScreenWrapperProps> = ({
-  title,
-  description,
-  documentsHeader,
-  privacyTitle,
-  privacyDescription,
-  termsTitle,
-  termsDescription,
-  eulaTitle,
-  eulaDescription,
-  onPrivacyPress,
-  onTermsPress,
-  onEulaPress,
-}) => (
-  <LegalScreen
-    title={title}
-    description={description}
-    documentsHeader={documentsHeader}
-    privacyTitle={privacyTitle}
-    privacyDescription={privacyDescription}
-    termsTitle={termsTitle}
-    termsDescription={termsDescription}
-    eulaTitle={eulaTitle}
-    eulaDescription={eulaDescription}
-    onPrivacyPress={onPrivacyPress}
-    onTermsPress={onTermsPress}
-    onEulaPress={onEulaPress}
-  />
-);

package/src/presentation/navigation/components/wrappers/SettingsScreenWrapper.tsx

@@ -1,44 +0,0 @@
-/**
- * Settings Screen Wrapper Component
- */
-import React from "react";
-import { SettingsScreen } from "../../../screens/SettingsScreen";
-import type { SettingsConfig, CustomSettingsSection } from "../../../screens/types";
-import type { UserProfileDisplay } from "../../types";
-import type { DevSettingsProps } from "../../../../domains/dev";
-
-export interface SettingsScreenWrapperProps {
-  config?: SettingsConfig;
-  appVersion: string;
-  showUserProfile: boolean;
-  userProfile?: UserProfileDisplay;
-  devSettings?: DevSettingsProps;
-  customSections?: CustomSettingsSection[];
-  showHeader?: boolean;
-  showCloseButton?: boolean;
-  onClose?: () => void;
-}
-
-export const SettingsScreenWrapper: React.FC<SettingsScreenWrapperProps> = ({
-  config,
-  appVersion,
-  showUserProfile,
-  userProfile,
-  devSettings,
-  customSections,
-  showHeader,
-  showCloseButton,
-  onClose,
-}) => (
-  <SettingsScreen
-    config={config}
-    appVersion={appVersion}
-    showUserProfile={showUserProfile}
-    userProfile={userProfile}
-    devSettings={devSettings}
-    customSections={customSections}
-    showHeader={showHeader}
-    showCloseButton={showCloseButton}
-    onClose={onClose}
-  />
-);

package/src/presentation/navigation/components/wrappers/index.ts

@@ -1,7 +0,0 @@
-/**
- * Wrapper Components
- */
-export { LegalScreenWrapper } from './LegalScreenWrapper';
-export type { LegalScreenWrapperProps } from './LegalScreenWrapper';
-export { AboutScreenWrapper } from './AboutScreenWrapper';
-export type { AboutScreenWrapperProps } from './AboutScreenWrapper';