@umituz/react-native-settings 5.3.48 → 5.3.50

package/dist/domains/gamification/utils/calculations.d.ts

@@ -6,5 +6,10 @@ import type { LevelDefinition, LevelState, AchievementDefinition } from "../type
 export declare const calculateLevel: (points: number, levels: LevelDefinition[]) => LevelState;
 export declare const checkAchievementUnlock: (definition: AchievementDefinition, tasksCompleted: number, currentStreak: number) => boolean;
 export declare const updateAchievementProgress: (definition: AchievementDefinition, tasksCompleted: number, currentStreak: number) => number;
+/**
+ * Check if streak is active based on last activity date
+ * Returns true if last activity was today or yesterday
+ * FIXED: Now uses date comparison instead of hour-based calculation to avoid timezone issues
+ */
 export declare const isStreakActive: (lastActivityDate: string | null) => boolean;
 export declare const isSameDay: (date1: Date, date2: Date) => boolean;

package/dist/presentation/navigation/hooks/useSettingsScreens.d.ts

@@ -8,5 +8,6 @@ export interface UseSettingsScreensProps extends SettingsStackNavigatorProps {
     legalProps: LegalScreenProps;
     notificationTranslations: NotificationSettingsTranslations;
     quietHoursTranslations: QuietHoursTranslations;
+    navigation?: any;
 }
 export declare const useSettingsScreens: (props: UseSettingsScreensProps) => StackScreen[];

package/dist/presentation/screens/SettingsScreen.d.ts

@@ -45,5 +45,7 @@ export interface SettingsScreenProps {
     showHeader?: boolean;
     /** Password prompt modal component */
     PasswordPromptComponent?: React.ReactNode;
+    /** Navigation object for custom sections */
+    navigation?: any;
 }
 export declare const SettingsScreen: React.FC<SettingsScreenProps>;

package/dist/presentation/screens/components/sections/CustomSettingsList.d.ts

@@ -2,6 +2,7 @@ import React from "react";
 import type { CustomSettingsSection } from "../../types";
 interface CustomSettingsListProps {
     customSections?: CustomSettingsSection[];
+    navigation?: any;
 }
 export declare const CustomSettingsList: React.FC<CustomSettingsListProps>;
 export {};

package/dist/presentation/screens/components/types/SettingsContentProps.d.ts

@@ -44,4 +44,5 @@ export interface SettingsContentProps {
     emptyStateText?: string;
     devSettings?: DevSettingsProps;
     gamificationConfig?: GamificationSettingsConfig;
+    navigation?: any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-settings",
-  "version": "5.3.48",
+  "version": "5.3.50",
   "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": "./dist/index.d.ts",

package/src/domains/about/presentation/hooks/useAboutInfo.ts

@@ -24,6 +24,7 @@ export const useAboutInfo = (
 
   /**
    * Initialize app info with config
+   * FIXED: Set isInitializedRef BEFORE async operation to prevent race condition
    */
   const initialize = useCallback(
     async (config: AboutConfig) => {
@@ -31,10 +32,12 @@ export const useAboutInfo = (
         return;
       }
 
+      // FIX: Set ref immediately to prevent race condition from concurrent calls
+      isInitializedRef.current = true;
+
       await execute(async () => {
         const defaultAppInfo = createDefaultAppInfo(config);
         await repository.saveAppInfo(defaultAppInfo);
-        isInitializedRef.current = true;
         return defaultAppInfo;
       });
     },

package/src/domains/feedback/presentation/screens/FeatureRequestScreen.tsx

@@ -15,7 +15,7 @@ import { ScreenLayout } from "@umituz/react-native-design-system/layouts";
 import { FeedbackModal } from "../components/FeedbackModal";
 import { useFeatureRequests } from "../../infrastructure/useFeatureRequests";
 import type { FeedbackRating } from "../../domain/entities/FeedbackEntity";
-import type { FeatureRequestItem, VoteType } from "../../domain/entities/FeatureRequestEntity";
+import type { FeatureRequestItem } from "../../domain/entities/FeatureRequestEntity";
 import type { FeedbackFormTexts } from "../components/FeedbackFormProps";
 
 interface FeatureRequestScreenProps {

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

@@ -21,7 +21,7 @@ import type { GamificationScreenProps } from "./types";
  * Internal component that renders the screen with all props
  */
 export const GamificationScreenInner: React.FC<GamificationScreenProps> = ({
-  title,
+  title: _title,
   statsTitle,
   achievementsTitle,
   streakTitle,

package/src/domains/gamification/utils/calculations.ts

@@ -63,16 +63,25 @@ export const updateAchievementProgress = (
   return Math.min(100, (value / definition.threshold) * 100);
 };
 
+/**
+ * Check if streak is active based on last activity date
+ * Returns true if last activity was today or yesterday
+ * FIXED: Now uses date comparison instead of hour-based calculation to avoid timezone issues
+ */
 export const isStreakActive = (lastActivityDate: string | null): boolean => {
   if (!lastActivityDate) return false;
 
   const last = new Date(lastActivityDate);
   const now = new Date();
-  const diffDays = Math.floor(
-    (now.getTime() - last.getTime()) / (1000 * 60 * 60 * 24)
-  );
 
-  return diffDays <= 1;
+  // Normalize to midnight to compare days, not hours
+  const lastMidnight = new Date(last.getFullYear(), last.getMonth(), last.getDate());
+  const nowMidnight = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+  const yesterdayMidnight = new Date(nowMidnight);
+  yesterdayMidnight.setDate(yesterdayMidnight.getDate() - 1);
+
+  // Active if last activity was today or yesterday
+  return lastMidnight.getTime() >= yesterdayMidnight.getTime();
 };
 
 export const isSameDay = (date1: Date, date2: Date): boolean => {

package/src/domains/localization/infrastructure/config/I18nInitializer.ts

@@ -10,6 +10,7 @@ import { initReactI18next } from 'react-i18next';
 import { DEFAULT_LANGUAGE } from './languages';
 import { ResourceBuilder } from './ResourceBuilder';
 import { NamespaceResolver } from './NamespaceResolver';
+import { isDev } from '../../../../utils/devUtils';
 
 export class I18nInitializer {
   private static reactI18nextInitialized = false;
@@ -52,7 +53,9 @@ export class I18nInitializer {
         returnNull: false,
       });
     } catch (error) {
-      console.error('[I18nInitializer] Failed to initialize i18n:', languageCode, error);
+      if (isDev()) {
+        console.error('[I18nInitializer] Failed to initialize i18n:', languageCode, error);
+      }
     }
   }
 

package/src/domains/localization/infrastructure/storage/LanguageSwitcher.ts

@@ -47,7 +47,9 @@ export class LanguageSwitcher {
         isRTL: language?.isRTL ?? false,
       };
     } catch (error) {
-      console.error('[LanguageSwitcher] Failed to switch language:', languageCode, error);
+      if (isDev()) {
+        console.error('[LanguageSwitcher] Failed to switch language:', languageCode, error);
+      }
       throw error;
     }
   }

package/src/domains/notifications/infrastructure/services/NotificationScheduler.ts

@@ -1,4 +1,5 @@
 import * as Notifications from 'expo-notifications';
+import { isDev } from "../../../../utils/devUtils";
 import type { ScheduleNotificationOptions, ScheduledNotification } from './types';
 
 export class NotificationScheduler {
@@ -54,7 +55,9 @@ export class NotificationScheduler {
 
       return notificationId;
     } catch (error) {
-      console.error('Failed to schedule notification:', error);
+      if (isDev()) {
+        console.error('Failed to schedule notification:', error);
+      }
       throw new Error(`Notification scheduling failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
     }
   }
@@ -63,7 +66,9 @@ export class NotificationScheduler {
     try {
       await Notifications.cancelScheduledNotificationAsync(notificationId);
     } catch (error) {
-      console.error('Failed to cancel notification:', notificationId, error);
+      if (isDev()) {
+        console.error('Failed to cancel notification:', notificationId, error);
+      }
       // Don't throw - canceling a non-existent notification is not critical
     }
   }
@@ -72,7 +77,9 @@ export class NotificationScheduler {
     try {
       await Notifications.cancelAllScheduledNotificationsAsync();
     } catch (error) {
-      console.error('Failed to cancel all notifications:', error);
+      if (isDev()) {
+        console.error('Failed to cancel all notifications:', error);
+      }
       throw new Error(`Failed to cancel notifications: ${error instanceof Error ? error.message : 'Unknown error'}`);
     }
   }
@@ -90,7 +97,9 @@ export class NotificationScheduler {
         trigger: notification.trigger,
       }));
     } catch (error) {
-      console.error('Failed to get scheduled notifications:', error);
+      if (isDev()) {
+        console.error('Failed to get scheduled notifications:', error);
+      }
       return []; // Return empty array as fallback
     }
   }

package/src/domains/notifications/infrastructure/services/NotificationService.ts

@@ -8,6 +8,7 @@
  */
 
 import { NotificationManager } from './NotificationManager';
+import { isDev } from '../../../../utils/devUtils';
 
 export * from './types';
 
@@ -31,7 +32,9 @@ export class NotificationService {
         NotificationManager.configure();
         this.isConfigured = true;
       } catch (error) {
-        console.error('[NotificationService] Failed to configure NotificationManager:', error);
+        if (isDev()) {
+          console.error('[NotificationService] Failed to configure NotificationManager:', error);
+        }
       }
     }
   }

package/src/domains/notifications/reminders/infrastructure/hooks/useReminderActions.ts

@@ -119,8 +119,11 @@ export const useReminderActions = () => {
         throw error; // Re-throw to allow caller to handle
       }
     } else if (!reminder.enabled) {
+      // FIX: Create temporary updated reminder for trigger building
+      // This prevents state inconsistency where trigger is built with old state
+      const tempEnabledReminder = { ...reminder, enabled: true };
       try {
-        const trigger = buildTrigger(reminder);
+        const trigger = buildTrigger(tempEnabledReminder);
         const notificationId = await scheduler.scheduleNotification({
           title: reminder.title,
           body: reminder.body,

package/src/domains/rating/application/services/RatingService.ts

@@ -4,6 +4,7 @@
  */
 
 import type { RatingConfig, RatingState } from "../../domain/entities/RatingConfig";
+import { isDev } from "../../../../utils/devUtils";
 import {
   getEventCount,
   incrementEventCount,
@@ -40,7 +41,9 @@ export async function trackEvent(eventType: string): Promise<void> {
   try {
     await incrementEventCount(eventType);
   } catch (error) {
-    console.error('[RatingService] Failed to track event:', eventType, error);
+    if (isDev()) {
+      console.error('[RatingService] Failed to track event:', eventType, error);
+    }
   }
 }
 
@@ -90,7 +93,9 @@ export async function markPromptShown(eventType: string): Promise<void> {
   try {
     await setLastPromptDate(eventType, toISOString());
   } catch (error) {
-    console.error('[RatingService] Failed to mark prompt shown:', eventType, error);
+    if (isDev()) {
+      console.error('[RatingService] Failed to mark prompt shown:', eventType, error);
+    }
   }
 }
 
@@ -101,7 +106,9 @@ export async function markRated(): Promise<void> {
   try {
     await setHasRated(true);
   } catch (error) {
-    console.error('[RatingService] Failed to mark as rated:', error);
+    if (isDev()) {
+      console.error('[RatingService] Failed to mark as rated:', error);
+    }
   }
 }
 
@@ -112,7 +119,9 @@ export async function markDismissed(): Promise<void> {
   try {
     await setDismissed(true);
   } catch (error) {
-    console.error('[RatingService] Failed to mark as dismissed:', error);
+    if (isDev()) {
+      console.error('[RatingService] Failed to mark as dismissed:', error);
+    }
   }
 }
 
@@ -130,6 +139,8 @@ export async function reset(eventType?: string): Promise<void> {
   try {
     await resetStorage(eventType);
   } catch (error) {
-    console.error('[RatingService] Failed to reset:', eventType, error);
+    if (isDev()) {
+      console.error('[RatingService] Failed to reset:', eventType, error);
+    }
   }
 }

package/src/domains/rating/infrastructure/storage/RatingStorage.ts

@@ -4,6 +4,7 @@
  */
 
 import { storageRepository, unwrap } from "@umituz/react-native-design-system/storage";
+import { isDev } from "../../../../utils/devUtils";
 import type { RatingState } from "../../domain/entities/RatingConfig";
 
 /**
@@ -36,7 +37,9 @@ export async function setEventCount(eventType: string, count: number): Promise<v
   try {
     await storageRepository.setString(KEYS.eventCount(eventType), count.toString());
   } catch (error) {
-    console.error('[RatingStorage] Failed to set event count:', eventType, count, error);
+    if (isDev()) {
+      console.error('[RatingStorage] Failed to set event count:', eventType, count, error);
+    }
   }
 }
 
@@ -78,7 +81,9 @@ export async function setLastPromptDate(eventType: string, date: string): Promis
   try {
     await storageRepository.setString(KEYS.lastPrompt(eventType), date);
   } catch (error) {
-    console.error('[RatingStorage] Failed to set last prompt date:', eventType, date, error);
+    if (isDev()) {
+      console.error('[RatingStorage] Failed to set last prompt date:', eventType, date, error);
+    }
   }
 }
 
@@ -101,7 +106,9 @@ export async function setHasRated(value: boolean): Promise<void> {
   try {
     await storageRepository.setString(KEYS.hasRated, value.toString());
   } catch (error) {
-    console.error('[RatingStorage] Failed to set has rated:', value, error);
+    if (isDev()) {
+      console.error('[RatingStorage] Failed to set has rated:', value, error);
+    }
   }
 }
 
@@ -124,7 +131,9 @@ export async function setDismissed(value: boolean): Promise<void> {
   try {
     await storageRepository.setString(KEYS.dismissed, value.toString());
   } catch (error) {
-    console.error('[RatingStorage] Failed to set dismissed:', value, error);
+    if (isDev()) {
+      console.error('[RatingStorage] Failed to set dismissed:', value, error);
+    }
   }
 }
 
@@ -165,6 +174,8 @@ export async function reset(eventType?: string): Promise<void> {
       );
     }
   } catch (error) {
-    console.error('[RatingStorage] Failed to reset rating data:', eventType, error);
+    if (isDev()) {
+      console.error('[RatingStorage] Failed to reset rating data:', eventType, error);
+    }
   }
 }

package/src/presentation/hooks/useSettingsScreenConfig.ts

@@ -9,7 +9,7 @@
 import { useMemo } from "react";
 import { useAuth, useUserProfile, useAuthHandlers } from "@umituz/react-native-auth";
 import { createUserProfileDisplay } from "../utils/userProfileUtils";
-import { createAccountConfig } from "../utils/accountConfigUtils";
+import { createAccountConfig, type AccountTranslations } from "../utils/accountConfigUtils";
 import { useSettingsConfigFactory } from "../utils/settingsConfigFactory";
 import type { SettingsConfig, SettingsTranslations } from "../screens/types";
 import type { FeedbackFormData } from "../utils/config-creators";
@@ -147,7 +147,15 @@ export const useSettingsScreenConfig = (
     onSignIn: handleSignIn,
     onLogout: handleSignOut,
     onDeleteAccount: handleDeleteAccount,
-    translations: translations?.account as any,
+    translations: (translations?.account?.logout &&
+      translations?.account?.deleteAccount &&
+      translations?.account?.logoutConfirmTitle &&
+      translations?.account?.logoutConfirmMessage &&
+      translations?.account?.deleteConfirmTitle &&
+      translations?.account?.deleteConfirmMessage &&
+      translations?.account?.cancel)
+      ? translations.account as AccountTranslations
+      : undefined,
   }), [user, userProfileData, handleSignIn, handleSignOut, handleDeleteAccount, translations]);
 
   return {

package/src/presentation/navigation/SettingsStackNavigator.tsx

@@ -6,6 +6,7 @@
  */
 
 import React from "react";
+import { useNavigation } from "@react-navigation/native";
 import { StackNavigator, type StackNavigatorConfig } from "@umituz/react-native-design-system/molecules";
 import { useNavigationHandlers, useSettingsScreens } from "./hooks";
 import {
@@ -41,12 +42,16 @@ export const SettingsStackNavigator: React.FC<SettingsStackNavigatorProps> = (pr
     [translations, handlePrivacyPress, handleTermsPress, handleEulaPress]
   );
 
+  // Get navigation for custom sections
+  const navigation = useNavigation();
+
   const screens = useSettingsScreens({
     ...props,
     aboutConfig,
     legalProps: legalScreenProps,
     notificationTranslations,
     quietHoursTranslations,
+    navigation,
   });
 
   const navigatorConfig: StackNavigatorConfig<SettingsStackParamList> = {

package/src/presentation/navigation/hooks/useNavigationHandlers.ts

@@ -5,6 +5,7 @@
 
 import { useCallback, useMemo } from "react";
 import { Linking } from "react-native";
+import { isDev } from "../../../utils/devUtils";
 import type { AppInfo, LegalUrls } from "../types";
 import type { AboutConfig } from "../../../domains/about";
 
@@ -26,10 +27,14 @@ export const useNavigationHandlers = (
       if (canOpen) {
         await Linking.openURL(legalUrls.privacy);
       } else {
-        console.warn('Cannot open privacy policy URL:', legalUrls.privacy);
+        if (isDev()) {
+          console.warn('Cannot open privacy policy URL:', legalUrls.privacy);
+        }
       }
     } catch (error) {
-      console.error('Failed to open privacy policy:', error);
+      if (isDev()) {
+        console.error('Failed to open privacy policy:', error);
+      }
     }
   }, [legalUrls.privacy]);
 
@@ -39,10 +44,14 @@ export const useNavigationHandlers = (
       if (canOpen) {
         await Linking.openURL(legalUrls.terms);
       } else {
-        console.warn('Cannot open terms of service URL:', legalUrls.terms);
+        if (isDev()) {
+          console.warn('Cannot open terms of service URL:', legalUrls.terms);
+        }
       }
     } catch (error) {
-      console.error('Failed to open terms of service:', error);
+      if (isDev()) {
+        console.error('Failed to open terms of service:', error);
+      }
     }
   }, [legalUrls.terms]);
 
@@ -53,10 +62,14 @@ export const useNavigationHandlers = (
         if (canOpen) {
           await Linking.openURL(legalUrls.eula);
         } else {
-          console.warn('Cannot open EULA URL:', legalUrls.eula);
+          if (isDev()) {
+            console.warn('Cannot open EULA URL:', legalUrls.eula);
+          }
         }
       } catch (error) {
-        console.error('Failed to open EULA:', error);
+        if (isDev()) {
+          console.error('Failed to open EULA:', error);
+        }
       }
     }
   }, [legalUrls.eula]);

package/src/presentation/navigation/hooks/useSettingsScreens.ts

@@ -38,6 +38,7 @@ export interface UseSettingsScreensProps extends SettingsStackNavigatorProps {
   legalProps: LegalScreenProps;
   notificationTranslations: NotificationSettingsTranslations;
   quietHoursTranslations: QuietHoursTranslations;
+  navigation?: any;
 }
 
 export const useSettingsScreens = (props: UseSettingsScreensProps): StackScreen[] => {
@@ -60,6 +61,7 @@ export const useSettingsScreens = (props: UseSettingsScreensProps): StackScreen[
     gamificationConfig,
     videoTutorialConfig,
     accountConfig,
+    navigation,
   } = props;
 
   const translations = config?.translations;
@@ -79,12 +81,13 @@ export const useSettingsScreens = (props: UseSettingsScreensProps): StackScreen[
         showHeader,
         showCloseButton,
         onClose,
+        navigation,
       }
     );
 
     const appearanceScreen = {
       name: "Appearance",
-      component: AppearanceScreen as any,
+      component: AppearanceScreen,
       options: { headerShown: false },
     };
 
@@ -121,7 +124,7 @@ export const useSettingsScreens = (props: UseSettingsScreensProps): StackScreen[
 
     const additionalStackScreens: StackScreen[] = (additionalScreens || []).map(convertAdditionalScreen);
 
-    const gamificationScreen = createScreenWithProps("Gamification", GamificationScreen as any, { config: gamificationConfig });
+    const gamificationScreen = createScreenWithProps("Gamification", GamificationScreen, { config: gamificationConfig });
 
     const languageScreen = createScreenWithProps("LanguageSelection", LanguageSelectionScreen, {
       headerTitle: featureTranslations?.language?.title || "",
@@ -130,10 +133,10 @@ export const useSettingsScreens = (props: UseSettingsScreensProps): StackScreen[
 
     const accountScreen = createConditionalScreen(
       !!accountConfig && !!AccountScreen,
-      () => createScreenWithProps("Account", AccountScreen as any, { config: accountConfig })
+      () => createScreenWithProps("Account", AccountScreen, { config: accountConfig })
     );
 
-    const videoTutorialScreen = createScreenWithProps("VideoTutorial", VideoTutorialsScreen as any, {
+    const videoTutorialScreen = createScreenWithProps("VideoTutorial", VideoTutorialsScreen, {
       ...videoTutorialConfig,
       title: videoTutorialConfig?.title || featureTranslations?.videoTutorial?.title || "",
     });
@@ -198,5 +201,6 @@ export const useSettingsScreens = (props: UseSettingsScreensProps): StackScreen[
     gamificationConfig,
     videoTutorialConfig,
     accountConfig,
+    navigation,
   ]);
 };

package/src/presentation/screens/SettingsScreen.tsx

@@ -51,6 +51,8 @@ export interface SettingsScreenProps {
   showHeader?: boolean;
   /** Password prompt modal component */
   PasswordPromptComponent?: React.ReactNode;
+  /** Navigation object for custom sections */
+  navigation?: any;
 }
 
 export const SettingsScreen: React.FC<SettingsScreenProps> = (props) => {
@@ -70,6 +72,7 @@ export const SettingsScreen: React.FC<SettingsScreenProps> = (props) => {
     devSettings,
     gamificationConfig,
     PasswordPromptComponent,
+    navigation,
   } = props;
 
   const {
@@ -109,6 +112,7 @@ export const SettingsScreen: React.FC<SettingsScreenProps> = (props) => {
             customSections={customSections}
             devSettings={devSettings}
             gamificationConfig={gamificationConfig}
+            navigation={navigation}
           />
         )}
       </ScreenLayout>

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

@@ -29,6 +29,7 @@ export const SettingsContent: React.FC<SettingsContentProps> = ({
   emptyStateText,
   devSettings,
   gamificationConfig,
+  navigation,
 }) => {
   const translations = normalizedConfig.translations;
   const { level } = useGamification(gamificationConfig);
@@ -54,7 +55,7 @@ export const SettingsContent: React.FC<SettingsContentProps> = ({
         />
       )}
 
-      <CustomSettingsList customSections={customSections} />
+      <CustomSettingsList customSections={customSections} navigation={navigation} />
 
       {features.subscription && (normalizedConfig.subscription.config?.route || normalizedConfig.subscription.config?.onPress) && (
         <SettingsSection title={translations?.sections?.subscription || ''}>

package/src/presentation/screens/components/sections/CustomSettingsList.tsx

@@ -5,6 +5,7 @@ import type { CustomSettingsSection } from "../../types";
 
 interface CustomSettingsListProps {
     customSections?: CustomSettingsSection[];
+    navigation?: any;
 }
 
 const EMPTY_SECTIONS: CustomSettingsSection[] = [];

package/src/presentation/screens/components/types/SettingsContentProps.ts

@@ -48,4 +48,5 @@ export interface SettingsContentProps {
   emptyStateText?: string;
   devSettings?: DevSettingsProps;
   gamificationConfig?: GamificationSettingsConfig;
+  navigation?: any;
 }

package/src/presentation/utils/screenFactory.ts

@@ -20,7 +20,7 @@ export function createScreenWithProps<P>(
   return {
     name,
     options: { headerShown: false, ...options },
-    children: (() => React.createElement(component as React.ComponentType, props as any)) as () => React.ReactElement,
+    children: (() => React.createElement(component, props)) as () => React.ReactElement,
   };
 }
 
@@ -28,11 +28,13 @@ export function createScreenWithProps<P>(
  * Convert additional screen to stack screen
  */
 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 as any;
-  if (screen.options) stackScreen.options = screen.options;
-  return stackScreen as StackScreen;
+  const stackScreen: StackScreen = {
+    name: screen.name,
+    component: screen.component,
+    children: screen.children,
+    options: screen.options,
+  };
+  return stackScreen;
 }
 
 /**