@umituz/react-native-settings 4.23.96 → 4.23.98

package/src/presentation/navigation/utils/navigationTranslations.ts

@@ -1,45 +1,42 @@
-/**
- * Navigation Translations Utility
- * Creates translation objects for navigation screens
- */
+import type { SettingsTranslations } from "../../screens/types/SettingsConfig";
 
-export const createNotificationTranslations = (t: (key: string) => string) => ({
-  screenTitle: t("settings.notifications.title"),
-  masterToggleTitle: t("settings.notifications.masterToggleTitle"),
-  masterToggleDescription: t("settings.notifications.masterToggleDescription"),
-  soundTitle: t("settings.notifications.soundTitle"),
-  soundDescription: t("settings.notifications.soundDescription"),
-  vibrationTitle: t("settings.notifications.vibrationTitle"),
-  vibrationDescription: t("settings.notifications.vibrationDescription"),
-  remindersTitle: t("settings.notifications.remindersTitle"),
-  remindersDescription: t("settings.notifications.remindersDescription"),
-  quietHoursTitle: t("settings.notifications.quietHoursTitle"),
-  quietHoursDescription: t("settings.notifications.quietHoursDescription"),
+export const createNotificationTranslations = (translations?: SettingsTranslations["features"]) => ({
+  screenTitle: translations?.notifications?.title || "",
+  masterToggleTitle: translations?.notifications?.masterToggleTitle || "",
+  masterToggleDescription: translations?.notifications?.masterToggleDescription || "",
+  soundTitle: translations?.notifications?.soundTitle || "",
+  soundDescription: translations?.notifications?.soundDescription || "",
+  vibrationTitle: translations?.notifications?.vibrationTitle || "",
+  vibrationDescription: translations?.notifications?.vibrationDescription || "",
+  remindersTitle: translations?.notifications?.remindersTitle || "",
+  remindersDescription: translations?.notifications?.remindersDescription || "",
+  quietHoursTitle: translations?.notifications?.quietHoursTitle || "",
+  quietHoursDescription: translations?.notifications?.quietHoursDescription || "",
 });
 
-export const createQuietHoursTranslations = (t: (key: string) => string) => ({
-  title: t("settings.notifications.quietHours.title"),
-  description: t("settings.notifications.quietHours.description"),
-  startTimeLabel: t("settings.notifications.quietHours.startTimeLabel"),
-  endTimeLabel: t("settings.notifications.quietHours.endTimeLabel"),
-  enabledLabel: t("settings.notifications.quietHours.enabledLabel"),
+export const createQuietHoursTranslations = (translations?: SettingsTranslations["features"]) => ({
+  title: translations?.notifications?.quietHours?.title || "",
+  description: translations?.notifications?.quietHours?.description || "",
+  startTimeLabel: translations?.notifications?.quietHours?.startTimeLabel || "",
+  endTimeLabel: translations?.notifications?.quietHours?.endTimeLabel || "",
+  enabledLabel: translations?.notifications?.quietHours?.enabledLabel || "",
 });
 
 export const createLegalScreenProps = (
-  t: (key: string) => string,
+  translations: SettingsTranslations["features"],
   handlePrivacyPress: () => void,
   handleTermsPress: () => void,
   handleEulaPress: () => void
 ) => ({
-  title: t("settings.legal.title"),
-  description: t("settings.legal.description"),
-  documentsHeader: t("settings.legal.documentsHeader"),
-  privacyTitle: t("settings.legal.privacyTitle"),
-  privacyDescription: t("settings.legal.privacyDescription"),
-  termsTitle: t("settings.legal.termsTitle"),
-  termsDescription: t("settings.legal.termsDescription"),
-  eulaTitle: t("settings.legal.eulaTitle"),
-  eulaDescription: t("settings.legal.eulaDescription"),
+  title: translations?.legal?.title || "",
+  description: translations?.legal?.description || "",
+  documentsHeader: translations?.legal?.documentsHeader || "",
+  privacyTitle: translations?.legal?.privacyTitle || "",
+  privacyDescription: translations?.legal?.privacyDescription || "",
+  termsTitle: translations?.legal?.termsTitle || "",
+  termsDescription: translations?.legal?.termsDescription || "",
+  eulaTitle: translations?.legal?.eulaTitle || "",
+  eulaDescription: translations?.legal?.eulaDescription || "",
   onPrivacyPress: handlePrivacyPress,
   onTermsPress: handleTermsPress,
   onEulaPress: handleEulaPress,

package/src/presentation/screens/SettingsScreen.tsx

@@ -86,7 +86,11 @@ export const SettingsScreen: React.FC<SettingsScreenProps> = (props) => {
   });
 
   const header = showHeader ? (
-    <SettingsHeader showCloseButton={showCloseButton} onClose={handleClose} />
+    <SettingsHeader 
+      showCloseButton={showCloseButton} 
+      onClose={handleClose}
+      title={normalizedConfig.translations?.title}
+    />
   ) : undefined;
 
   return (

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

@@ -10,7 +10,7 @@ import { compareGamificationProps } from "../../../infrastructure/utils/memoComp
 export interface GamificationSettingsItemProps {
   config: GamificationItemConfig;
   gamificationConfig?: GamificationSettingsConfig;
-  t: (key: string) => string;
+  t?: (key: string) => string;
   noBackground?: boolean;
   hideMargin?: boolean;
 }
@@ -18,7 +18,6 @@ export interface GamificationSettingsItemProps {
 const GamificationSettingsItemComponent: React.FC<GamificationSettingsItemProps> = ({
   config,
   gamificationConfig,
-  t,
   noBackground,
   hideMargin,
 }) => {
@@ -31,12 +30,10 @@ const GamificationSettingsItemComponent: React.FC<GamificationSettingsItemProps>
   }, [navigation, config.route]);
 
   const icon = (config.icon || "trophy-outline") as IconName;
-  const title = config.title || t("settings.gamification.title");
+  const title = config.title;
 
-  const description = config.description ||
-    t("settings.gamification.description")
-      .replace("{level}", level.currentLevel.toString())
-      .replace("{points}", level.currentPoints.toString());
+  const description = config.description || 
+    `${level.currentLevel} • ${level.currentPoints}`;
 
   return (
     <SettingsItemCard

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

@@ -1,6 +1,5 @@
 import React, { useMemo } from "react";
 import { View, StyleSheet } from "react-native";
-import { useLocalization } from "../../../domains/localization";
 import { SettingsFooter } from "../../components/SettingsFooter";
 import { SettingsSection } from "../../components/SettingsSection";
 import { DevSettingsSection, DevSettingsProps } from "../../../domains/dev";
@@ -70,7 +69,7 @@ export const SettingsContent: React.FC<SettingsContentProps> = ({
   devSettings,
   gamificationConfig,
 }) => {
-  const { t } = useLocalization();
+  const translations = normalizedConfig.translations;
 
   // Optimize: Only track individual feature flags instead of entire object
   const hasAnyFeatures = useMemo(() =>
@@ -108,30 +107,35 @@ export const SettingsContent: React.FC<SettingsContentProps> = ({
 
   return (
     <View style={styles.container}>
-      {showUserProfile && <ProfileSectionLoader userProfile={userProfile} />}
+      {showUserProfile && (
+        <ProfileSectionLoader 
+          userProfile={userProfile} 
+          translations={translations?.profile}
+        />
+      )}
 
       <CustomSettingsList customSections={customSections} />
 
       {features.subscription && (normalizedConfig.subscription.config?.route || normalizedConfig.subscription.config?.onPress) && (
-        <SubscriptionSettingsItem config={normalizedConfig.subscription.config} t={t} />
+        <SubscriptionSettingsItem 
+          config={normalizedConfig.subscription.config} 
+        />
       )}
 
       {features.wallet && normalizedConfig.wallet.config?.route && (
         <WalletSettingsItem
           config={normalizedConfig.wallet.config}
-          t={t}
         />
       )}
 
       <FeatureSettingsSection normalizedConfig={normalizedConfig} features={features} />
 
       {(features.gamification || features.videoTutorial) && (
-        <SettingsSection title={t("settings.sections.progress")}>
+        <SettingsSection title={translations?.sections?.progress}>
           {features.gamification && (
             <GamificationSettingsItem
               config={normalizedConfig.gamification.config || {}}
               gamificationConfig={gamificationConfig}
-              t={t}
               noBackground={true}
               hideMargin={true}
             />
@@ -140,7 +144,6 @@ export const SettingsContent: React.FC<SettingsContentProps> = ({
           {features.videoTutorial && (
             <VideoTutorialSettingsItem
               config={normalizedConfig.videoTutorial.config || {}}
-              t={t}
               noBackground={true}
               hideMargin={true}
             />
@@ -156,7 +159,7 @@ export const SettingsContent: React.FC<SettingsContentProps> = ({
 
       {!hasAnyFeatures && (
         <View style={styles.emptyContainer}>
-          <SettingsSection title={emptyStateText || t("settings.noOptionsAvailable")}>
+          <SettingsSection title={emptyStateText || translations?.noOptionsAvailable}>
             <View />
           </SettingsSection>
         </View>
@@ -168,7 +171,7 @@ export const SettingsContent: React.FC<SettingsContentProps> = ({
         <SettingsFooter
           versionText={footerText}
           appVersion={appVersion}
-          versionLabel={t("settings.footer.version")}
+          versionLabel={translations?.footer?.version}
         />
       )}
     </View>

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

@@ -1,20 +1,21 @@
 import React from "react";
 import { Pressable } from "react-native";
 import { useAppDesignTokens, AtomicIcon, useAppNavigation, NavigationHeader } from "@umituz/react-native-design-system";
-import { useLocalization } from "../../../domains/localization";
+
 
 interface SettingsHeaderProps {
   showCloseButton?: boolean;
   onClose?: () => void;
+  title?: string;
 }
 
 export const SettingsHeader: React.FC<SettingsHeaderProps> = ({
   showCloseButton = false,
   onClose,
+  title,
 }) => {
   const navigation = useAppNavigation();
   const tokens = useAppDesignTokens();
-  const { t } = useLocalization();
 
   const handleClose = () => {
     if (onClose) {
@@ -45,7 +46,7 @@ export const SettingsHeader: React.FC<SettingsHeaderProps> = ({
 
   return (
     <NavigationHeader
-      title={t('settings.title')}
+      title={title}
       rightElement={rightElement}
       // If NOT showing close button, we might want a back button? 
       // But usually Settings is a root screen in a modal or stack.

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

@@ -7,10 +7,9 @@ import { compareConfigAndTranslate } from "../../../infrastructure/utils/memoCom
 
 export interface SubscriptionSettingsItemProps {
   config: SubscriptionConfig;
-  t: (key: string) => string;
 }
 
-const SubscriptionSettingsItemComponent: React.FC<SubscriptionSettingsItemProps> = ({ config, t }) => {
+const SubscriptionSettingsItemComponent: React.FC<SubscriptionSettingsItemProps> = ({ config }) => {
   const navigation = useAppNavigation();
 
   const handlePress = React.useCallback(() => {
@@ -23,8 +22,8 @@ const SubscriptionSettingsItemComponent: React.FC<SubscriptionSettingsItemProps>
 
   return (
     <SettingsItemCard
-      title={config.title || t("settings.subscription.title")}
-      description={config.description || t("settings.subscription.description")}
+      title={config.title}
+      description={config.description}
       icon={(config.icon || "star") as IconName}
       onPress={handlePress}
       sectionTitle={config.sectionTitle}

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

@@ -7,14 +7,12 @@ import { compareConfigAndTranslate } from "../../../infrastructure/utils/memoCom
 
 export interface VideoTutorialSettingsItemProps {
   config: VideoTutorialConfig;
-  t: (key: string) => string;
   noBackground?: boolean;
   hideMargin?: boolean;
 }
 
 const VideoTutorialSettingsItemComponent: React.FC<VideoTutorialSettingsItemProps> = ({
   config,
-  t,
   noBackground,
   hideMargin,
 }) => {
@@ -30,8 +28,8 @@ const VideoTutorialSettingsItemComponent: React.FC<VideoTutorialSettingsItemProp
   }, [navigation, config.onPress, config.route]);
 
   const icon = (config.icon || "play-circle-outline") as IconName;
-  const title = config.title || t("settings.videoTutorial.title");
-  const description = config.description || t("settings.videoTutorial.description");
+  const title = config.title;
+  const description = config.description;
 
   return (
     <SettingsItemCard

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

@@ -7,10 +7,9 @@ import { compareConfigAndTranslate } from "../../../infrastructure/utils/memoCom
 
 export interface WalletSettingsItemProps {
   config: WalletConfig;
-  t: (key: string) => string;
 }
 
-const WalletSettingsItemComponent: React.FC<WalletSettingsItemProps> = ({ config, t }) => {
+const WalletSettingsItemComponent: React.FC<WalletSettingsItemProps> = ({ config }) => {
   const navigation = useAppNavigation();
 
   const handlePress = React.useCallback(() => {
@@ -21,8 +20,8 @@ const WalletSettingsItemComponent: React.FC<WalletSettingsItemProps> = ({ config
 
   return (
     <SettingsItemCard
-      title={config.title || t("wallet.title")}
-      description={config.description || t("wallet.description")}
+      title={config.title}
+      description={config.description}
       icon={(config.icon || "wallet") as IconName}
       onPress={handlePress}
       sectionTitle={config.sectionTitle}

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

@@ -2,7 +2,7 @@ import React from "react";
 import { useAppNavigation } from "@umituz/react-native-design-system";
 import { AppearanceSection } from "../../../../domains/appearance/presentation/components/AppearanceSection";
 import { NotificationsSection } from "../../../../domains/notifications";
-import { useLocalization, getLanguageByCode } from "../../../../domains/localization";
+import { getLanguageByCode } from "../../../../domains/localization";
 import { SettingsItemCard } from "../../../components/SettingsItemCard";
 import type { NormalizedConfig } from "../../utils/normalizeConfig";
 import { SettingsSection } from "../../../components/SettingsSection";
@@ -15,13 +15,15 @@ interface FeatureSettingsSectionProps {
     language: boolean;
     notifications: boolean;
   };
+  currentLanguage?: string;
 }
 
 export const FeatureSettingsSection: React.FC<FeatureSettingsSectionProps> = ({
   normalizedConfig,
   features,
+  currentLanguage,
 }) => {
-  const { t, currentLanguage } = useLocalization();
+  const translations = normalizedConfig.translations;
   const navigation = useAppNavigation();
 
   const handleLanguagePress = React.useCallback(() => {
@@ -33,24 +35,26 @@ export const FeatureSettingsSection: React.FC<FeatureSettingsSectionProps> = ({
     }
   }, [navigation, normalizedConfig.language.config]);
 
-  const currentLanguageData = React.useMemo(() => getLanguageByCode(currentLanguage), [currentLanguage]);
+  const langCode = currentLanguage || "en-US";
+  const currentLanguageData = React.useMemo(() => getLanguageByCode(langCode), [langCode]);
+  
   const languageDisplayName = React.useMemo(() => {
-    if (!currentLanguageData) return currentLanguage;
+    if (!currentLanguageData) return langCode;
     return `${currentLanguageData.flag} ${currentLanguageData.nativeName}`;
-  }, [currentLanguageData, currentLanguage]);
+  }, [currentLanguageData, langCode]);
 
   if (!features.appearance && !features.language && !features.notifications) return null;
 
   return (
     <SettingsSection
-      title={t("settings.sections.app.title") || t("settings.sections.app") || "App Settings"}
+      title={translations?.sections?.app}
     >
       {features.appearance && (
         <AppearanceSection
           config={{
             ...normalizedConfig.appearance.config,
-            title: t("settings.appearance.title"),
-            description: t("settings.appearance.description"),
+            title: translations?.features?.appearance?.title,
+            description: translations?.features?.appearance?.description,
           }}
           noBackground={true}
           hideMargin={true}
@@ -59,7 +63,7 @@ export const FeatureSettingsSection: React.FC<FeatureSettingsSectionProps> = ({
 
       {features.language && (
         <SettingsItemCard
-          title={t("settings.languageSelection.title")}
+          title={translations?.features?.language?.title}
           description={languageDisplayName}
           icon="globe-outline"
           onPress={handleLanguagePress}
@@ -72,8 +76,8 @@ export const FeatureSettingsSection: React.FC<FeatureSettingsSectionProps> = ({
         <NotificationsSection
           config={{
             ...normalizedConfig.notifications.config,
-            title: t("settings.notifications.title"),
-            description: t("settings.notifications.description"),
+            title: translations?.features?.notifications?.title,
+            description: translations?.features?.notifications?.description,
           }}
           noBackground={true}
           hideMargin={true}

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

@@ -1,7 +1,6 @@
 import React from "react";
 import { AboutSection } from "../../../../domains/about/presentation/components/AboutSection";
 import { LegalSection } from "../../../../domains/legal/presentation/components/LegalSection";
-import { useLocalization } from "../../../../domains/localization";
 import type { NormalizedConfig } from "../../utils/normalizeConfig";
 import { SettingsSection } from "../../../components/SettingsSection";
 import { compareConfigAndFeatures } from "../../../../infrastructure/utils/memoComparisonUtils";
@@ -15,18 +14,18 @@ export const IdentitySettingsSection: React.FC<IdentitySettingsSectionProps> = (
     normalizedConfig,
     features,
 }) => {
-    const { t } = useLocalization();
+    const translations = normalizedConfig.translations;
 
     if (!features.about && !features.legal) return null;
 
     return (
-        <SettingsSection title={t("settings.about.title")}>
+        <SettingsSection title={translations?.sections?.about}>
             {features.about && (
                 <AboutSection
                     config={{
                         ...normalizedConfig.about.config,
-                        title: t("settings.about.title"),
-                        description: t("settings.about.description"),
+                        title: translations?.features?.about?.title,
+                        description: translations?.features?.about?.description,
                     }}
                     noBackground={true}
                     hideMargin={true}
@@ -37,8 +36,8 @@ export const IdentitySettingsSection: React.FC<IdentitySettingsSectionProps> = (
                 <LegalSection
                     config={{
                         ...normalizedConfig.legal.config,
-                        title: t("settings.legal.title"),
-                        description: t("settings.legal.description"),
+                        title: translations?.features?.legal?.title,
+                        description: translations?.features?.legal?.description,
                     }}
                     noBackground={true}
                     hideMargin={true}

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

@@ -1,9 +1,7 @@
 import React from "react";
 import { View, StyleSheet } from "react-native";
 import { ProfileSection } from "@umituz/react-native-auth";
-import { useLocalization } from "../../../../domains/localization";
 import { useAppNavigation } from "@umituz/react-native-design-system";
-import { createSinglePropComparator } from "../../../../infrastructure/utils/memoComparisonUtils";
 
 export interface ProfileSectionLoaderProps {
     userProfile?: {
@@ -15,10 +13,14 @@ export interface ProfileSectionLoaderProps {
         onPress?: () => void;
         benefits?: string[];
     };
+    translations?: {
+        guest?: string;
+        anonymousName?: string;
+        signIn?: string;
+    };
 }
 
-export const ProfileSectionLoader: React.FC<ProfileSectionLoaderProps> = React.memo(({ userProfile }) => {
-    const { t } = useLocalization();
+export const ProfileSectionLoader: React.FC<ProfileSectionLoaderProps> = React.memo(({ userProfile, translations }) => {
     const navigation = useAppNavigation();
 
     const handlePress = React.useCallback(() => {
@@ -33,9 +35,9 @@ export const ProfileSectionLoader: React.FC<ProfileSectionLoaderProps> = React.m
     const anonymousDisplayName = React.useMemo(() => {
         if (!userProfile) return "";
         return userProfile.isAnonymous && userProfile.userId
-            ? `${t("profile.guest", "Guest")} ${userProfile.userId.substring(0, 8)}`
-            : t("settings.profile.anonymousName", "Anonymous User");
-    }, [userProfile, t]);
+            ? `${translations?.guest || ""} ${userProfile.userId.substring(0, 8)}`
+            : (translations?.anonymousName || "");
+    }, [userProfile, translations]);
 
     if (!userProfile) return null;
 
@@ -52,12 +54,12 @@ export const ProfileSectionLoader: React.FC<ProfileSectionLoaderProps> = React.m
                 }}
                 onPress={handlePress}
                 onSignIn={userProfile.onPress}
-                signInText={t("auth.signIn", "Sign In")}
+                signInText={translations?.signIn || ""}
                 anonymousText={anonymousDisplayName}
             />
         </View>
     );
-}, createSinglePropComparator("userProfile"));
+}, (prev, next) => prev.userProfile === next.userProfile && prev.translations === next.translations);
 
 ProfileSectionLoader.displayName = "ProfileSectionLoader";
 

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

@@ -1,5 +1,4 @@
 import React, { useCallback } from "react";
-import { useLocalization } from "../../../../domains/localization";
 import { useAppNavigation } from "@umituz/react-native-design-system";
 import { SupportSection } from "../../../../domains/feedback/presentation/components/SupportSection";
 import { SettingsSection } from "../../../components/SettingsSection";
@@ -16,7 +15,7 @@ export const SupportSettingsSection: React.FC<SupportSettingsSectionProps> = ({
     features,
     normalizedConfig,
 }) => {
-    const { t } = useLocalization();
+    const translations = normalizedConfig.translations;
     const navigation = useAppNavigation();
 
     const handleFAQPress = useCallback(() => {
@@ -26,7 +25,7 @@ export const SupportSettingsSection: React.FC<SupportSettingsSectionProps> = ({
     if (!(features.feedback || features.rating || features.faqs)) return null;
 
     return (
-        <SettingsSection title={t("settings.support.title")}>
+        <SettingsSection title={translations?.sections?.support}>
             {(features.feedback || features.rating) && (
                 <SupportSection
                     renderSection={(props: { title: string; children: React.ReactNode }) => <>{props.children}</>}
@@ -42,8 +41,8 @@ export const SupportSettingsSection: React.FC<SupportSettingsSectionProps> = ({
                     feedbackConfig={{
                         enabled: features.feedback,
                         config: {
-                            title: normalizedConfig.feedback.config?.title || t("settings.feedback.title"),
-                            description: normalizedConfig.feedback.config?.description || t("settings.feedback.description"),
+                            title: normalizedConfig.feedback.config?.title || translations?.features?.feedback?.title,
+                            description: normalizedConfig.feedback.config?.description || translations?.features?.feedback?.description,
                             initialType: normalizedConfig.feedback.config?.initialType,
                             onSubmit: normalizedConfig.feedback.config?.onSubmit,
                             onPress: normalizedConfig.feedback.config?.onPress,
@@ -52,32 +51,32 @@ export const SupportSettingsSection: React.FC<SupportSettingsSectionProps> = ({
                     ratingConfig={{
                         enabled: features.rating,
                         config: {
-                            title: normalizedConfig.rating.config?.title || t("settings.rating.title"),
-                            description: normalizedConfig.rating.config?.description || t("settings.rating.description"),
+                            title: normalizedConfig.rating.config?.title || translations?.features?.rating?.title,
+                            description: normalizedConfig.rating.config?.description || translations?.features?.rating?.description,
                             storeUrl: normalizedConfig.rating.config?.storeUrl,
                             onRate: normalizedConfig.rating.config?.onRate,
                         }
                     }}
                     feedbackModalTexts={{
-                        title: t("settings.feedback.modal.title"),
-                        ratingLabel: t("settings.feedback.modal.ratingLabel"),
-                        descriptionPlaceholder: t("settings.feedback.modal.descriptionPlaceholder"),
-                        submitButton: t("settings.feedback.modal.submitButton"),
-                        submittingButton: t("settings.feedback.modal.submittingButton"),
+                        title: translations?.feedbackModal?.title,
+                        ratingLabel: translations?.feedbackModal?.ratingLabel,
+                        descriptionPlaceholder: translations?.feedbackModal?.descriptionPlaceholder,
+                        submitButton: translations?.feedbackModal?.submitButton,
+                        submittingButton: translations?.feedbackModal?.submittingButton,
                         feedbackTypes: [
-                            { type: 'general', label: t("settings.feedback.types.general") },
-                            { type: 'bug_report', label: t("settings.feedback.types.bugReport") },
-                            { type: 'feature_request', label: t("settings.feedback.types.featureRequest") },
-                            { type: 'improvement', label: t("settings.feedback.types.improvement") },
-                            { type: 'other', label: t("settings.feedback.types.other") },
+                            { type: 'general', label: translations?.feedbackModal?.types?.general },
+                            { type: 'bug_report', label: translations?.feedbackModal?.types?.bugReport },
+                            { type: 'feature_request', label: translations?.feedbackModal?.types?.featureRequest },
+                            { type: 'improvement', label: translations?.feedbackModal?.types?.improvement },
+                            { type: 'other', label: translations?.feedbackModal?.types?.other },
                         ],
                         defaultTitle: (type) => {
                             const titles: Record<string, string> = {
-                                general: t("settings.feedback.types.general"),
-                                bug_report: t("settings.feedback.types.bugReport"),
-                                feature_request: t("settings.feedback.types.featureRequest"),
-                                improvement: t("settings.feedback.types.improvement"),
-                                other: t("settings.feedback.types.other"),
+                                general: translations?.feedbackModal?.types?.general || type,
+                                bug_report: translations?.feedbackModal?.types?.bugReport || type,
+                                feature_request: translations?.feedbackModal?.types?.featureRequest || type,
+                                improvement: translations?.feedbackModal?.types?.improvement || type,
+                                other: translations?.feedbackModal?.types?.other || type,
                             };
                             return titles[type] || type;
                         },
@@ -87,8 +86,8 @@ export const SupportSettingsSection: React.FC<SupportSettingsSectionProps> = ({
 
             {features.faqs && (
                 <SettingsItemCard
-                    title={normalizedConfig.faqs.config?.title || t("settings.faqs.title")}
-                    description={normalizedConfig.faqs.config?.description || t("settings.faqs.description")}
+                    title={normalizedConfig.faqs.config?.title || translations?.features?.faqs?.title}
+                    description={normalizedConfig.faqs.config?.description || translations?.features?.faqs?.description}
                     icon="help-circle-outline"
                     onPress={handleFAQPress}
                     noBackground={true}