react-native-inapp-inspector 1.1.34 → 1.1.35

package/dist/esm/components/Inspector/SettingsPanel.js

@@ -1,5 +1,5 @@
-import React from 'react';
-import { Alert, Platform, ScrollView, Text, TouchableOpacity, View, } from 'react-native';
+import React, { useMemo, useState, useEffect } from 'react';
+import { Alert, Platform, ScrollView, StatusBar, Text, View, } from 'react-native';
 import Svg, { Path } from 'react-native-svg';
 import LinearGradient from 'react-native-linear-gradient';
 import { animateNextLayout, useInspector } from './InspectorContext';
@@ -12,32 +12,124 @@ import { isPersistentStorageAvailable } from '../../helpers/settingsStore';
 import { clearNetworkLogs } from '../../customHooks/networkLogger';
 import { clearConsoleLogs } from '../../customHooks/consoleLogger';
 import { clearAnalyticsEvents } from '../../customHooks/analyticsLogger';
-import { clearCrashRecords, } from '../../customHooks/crashHandler';
+import { clearCrashRecords } from '../../customHooks/crashHandler';
+import { clearCachedBundleAnalysis } from '../../customHooks/bundleAnalyzer';
+import { clearPerformanceEvents } from '../../customHooks/performanceTracker';
 import { isReduxConnected } from '../../customHooks/reduxLogger';
 import { isAnalyticsConnected } from '../../customHooks/analyticsLogger';
 import { useTranslation } from '../../i18n';
-import { SignalIcon, TerminalIcon, AnalyticsIcon, SettingsIcon, SunIcon, MoonIcon, ScreenIcon, MotionIcon, LayersIcon, EyeIcon, CheckIcon, TrashIcon, WhiteBackNavigation, PackageIcon, ReduxIcon, PerformanceIcon, CrashIcon, ShieldAlertIcon, } from '../NetworkIcons';
+import { SignalIcon, TerminalIcon, AnalyticsIcon, SettingsIcon, SunIcon, MoonIcon, ScreenIcon, MotionIcon, LayersIcon, EyeIcon, CheckIcon, TrashIcon, WhiteBackNavigation, PackageIcon, ReduxIcon, PerformanceIcon, CrashIcon, ShieldAlertIcon, ForwardChevronIcon, } from '../NetworkIcons';
 const SettingsPanel = () => {
     const { t } = useTranslation();
     const { settingsPage, setSettingsPage, settingsActiveSubTab, setSettingsActiveSubTab, tabVisibility, toggleTabVisibility, defaultTab, setDefaultTab, isDark, setIsDark, modalHeightPercent, setModalHeightPercent, modalAnimationType, setModalAnimationType, showDuplicateLogs, setShowDuplicateLogs, showConsoleLevels, setShowConsoleLevels, resetToDefaults, storage, logs, consoleLogs, analyticsEvents, reduxState, maxNetworkLogs, setMaxNetworkLogs, maxConsoleLogs, setMaxConsoleLogs, reduxAutoRefresh, setReduxAutoRefreshState, reduxExpandDepth, setReduxExpandDepth, switchActiveTab, setSelected, setSelectedEvent, setReduxState, crashRecords, maxCrashLogs, setMaxCrashLogs, } = useInspector();
     const isPersistent = isPersistentStorageAvailable();
-    const headerTopPadding = Platform.OS === 'ios' && modalHeightPercent >= 95 ? 44 : 0;
+    // Safe Area & Status Bar Padding for All Device Form Factors
+    const statusBarHeight = Platform.OS === 'android' ? StatusBar.currentHeight || 24 : 44;
+    const headerTopPadding = modalHeightPercent >= 95 ? statusBarHeight : 0;
+    const allModules = [
+        {
+            key: 'apis',
+            label: 'APIs (Network)',
+            category: 'core',
+            icon: 'apis',
+            desc: 'HTTP/HTTPS requests, GraphQL, Axios & WebSocket inspector',
+        },
+        {
+            key: 'logs',
+            label: 'Console Logs',
+            category: 'core',
+            icon: 'logs',
+            desc: 'Terminal console logs, warnings, errors & stack traces',
+        },
+        {
+            key: 'performance',
+            label: 'Performance Tracker',
+            category: 'diagnostic',
+            icon: 'performance',
+            desc: '60 FPS monitor, Hermes memory telemetry & re-render profiler',
+        },
+        {
+            key: 'bundle',
+            label: 'Bundle Analyzer',
+            category: 'diagnostic',
+            icon: 'bundle',
+            desc: 'Metro packager dependencies, source maps & asset breakdown',
+        },
+        {
+            key: 'crash',
+            label: 'Crash Protection',
+            category: 'diagnostic',
+            icon: 'crash',
+            desc: 'Runtime exception guard, breadcrumbs & memory snapshot',
+        },
+        {
+            key: 'analytics',
+            label: 'Analytics Logger',
+            category: 'telemetry',
+            icon: 'analytics',
+            desc: 'Firebase & custom analytics events, user properties & params',
+        },
+        {
+            key: 'redux',
+            label: 'Redux Inspector',
+            category: 'telemetry',
+            icon: 'redux',
+            desc: 'Store state diffing, action history & reducer timeline',
+        },
+    ];
+    // Staged selection state for checkboxes before clicking "Save Changes"
+    const [stagedTabVisibility, setStagedTabVisibility] = useState(() => ({
+        apis: true,
+        logs: Boolean(tabVisibility?.logs),
+        analytics: Boolean(tabVisibility?.analytics),
+        redux: Boolean(tabVisibility?.redux),
+        bundle: Boolean(tabVisibility?.bundle),
+        performance: Boolean(tabVisibility?.performance),
+        crash: Boolean(tabVisibility?.crash),
+    }));
+    // Synchronize staged state with tabVisibility when tabVisibility updates
+    useEffect(() => {
+        setStagedTabVisibility({
+            apis: true,
+            logs: Boolean(tabVisibility?.logs),
+            analytics: Boolean(tabVisibility?.analytics),
+            redux: Boolean(tabVisibility?.redux),
+            bundle: Boolean(tabVisibility?.bundle),
+            performance: Boolean(tabVisibility?.performance),
+            crash: Boolean(tabVisibility?.crash),
+        });
+    }, [tabVisibility]);
+    const hasUnsavedChanges = useMemo(() => {
+        return allModules.some(m => Boolean(stagedTabVisibility[m.key]) !==
+            Boolean(tabVisibility?.[m.key]));
+    }, [stagedTabVisibility, tabVisibility, allModules]);
+    const stagedActiveCount = allModules.filter(m => m.key === 'apis' || Boolean(stagedTabVisibility[m.key])).length;
+    const handleSaveChanges = () => {
+        animateNextLayout();
+        allModules.forEach(m => {
+            if (m.key !== 'apis') {
+                const isStagedOn = Boolean(stagedTabVisibility[m.key]);
+                const isCurrentOn = Boolean(tabVisibility?.[m.key]);
+                if (isStagedOn !== isCurrentOn) {
+                    toggleTabVisibility(m.key);
+                }
+            }
+        });
+        Alert.alert(t('settings.settingsSaved'), t('settings.settingsSavedDesc'));
+    };
     if (settingsPage === 'main') {
-        const settingsTabs = [
-            { key: 'apis', label: 'APIs', icon: 'apis' },
-            { key: 'logs', label: 'Logs', icon: 'logs' },
-            { key: 'analytics', label: 'Analytics', icon: 'analytics' },
-            { key: 'redux', label: 'Redux', icon: 'redux' },
-            { key: 'bundle', label: 'Bundle', icon: 'bundle' },
-            { key: 'performance', label: 'Performance', icon: 'performance' },
-            { key: 'crash', label: 'Crash', icon: 'crash' },
-        ];
-        return (<View style={{ flex: 1, backgroundColor: AppColors.grayBackground }}>
-        {/* Settings Header with back button */}
+        return (<View style={{
+                flex: 1,
+                backgroundColor: AppColors.grayBackground,
+            }}>
+        {/* Modern Floating Gradient Header */}
         <LinearGradient colors={[AppColors.purple, AppColors.brandPurple]} start={{ x: 0, y: 0 }} end={{ x: 1, y: 0 }} style={styles.headerGradient}>
           <View style={{ paddingTop: headerTopPadding, width: '100%' }}>
-            <View style={[styles.header, { paddingHorizontal: 16, gap: 12 }]}>
-            <TouchableScale onPress={() => {
+            <View style={[
+                styles.header,
+                { paddingHorizontal: 16, paddingVertical: 12, gap: 12 },
+            ]}>
+              <TouchableScale accessible={true} accessibilityRole="button" accessibilityLabel={t('settings.back')} onPress={() => {
                 animateNextLayout();
                 setSettingsPage(null);
                 switchActiveTab('apis');
@@ -46,223 +138,360 @@ const SettingsPanel = () => {
                 borderRadius: 10,
                 backgroundColor: `${AppColors.white}26`,
                 borderWidth: 1,
-                borderColor: `${AppColors.white}14`,
+                borderColor: `${AppColors.white}18`,
             }}>
-              <WhiteBackNavigation color={AppColors.white} size={16}/>
-            </TouchableScale>
-            <View style={{ flex: 1 }}>
-              <Text style={{
+                <WhiteBackNavigation color={AppColors.white} size={16}/>
+              </TouchableScale>
+
+              <View style={{ flex: 1 }}>
+                <View style={{
+                flexDirection: 'row',
+                alignItems: 'center',
+                gap: 8,
+            }}>
+                  <Text style={{
                 fontFamily: AppFonts.interBold,
                 fontSize: 17,
                 color: AppColors.white,
+                letterSpacing: -0.3,
+                lineHeight: 22,
             }}>
-                Settings
-              </Text>
-              <Text style={{
+                    {t('settings.mainTitle')}
+                  </Text>
+                  <View style={{
+                backgroundColor: `${AppColors.white}26`,
+                paddingHorizontal: 7,
+                paddingVertical: 2,
+                borderRadius: 12,
+            }}>
+                    <Text style={{
+                fontFamily: AppFonts.interBold,
+                fontSize: 10,
+                color: AppColors.white,
+                lineHeight: 13,
+            }}>
+                      {stagedActiveCount}/{allModules.length} Active
+                    </Text>
+                  </View>
+                </View>
+                <Text style={{
                 fontFamily: AppFonts.interRegular,
                 fontSize: 11,
-                color: `${AppColors.white}BF`,
-                marginTop: 1,
+                color: `${AppColors.white}CC`,
+                marginTop: 2,
+                lineHeight: 15,
             }}>
-                Manage modules and preferences
-              </Text>
-            </View>
-            <View style={{
-                backgroundColor: `${AppColors.white}26`,
+                  {t('settings.mainSubtitle')}
+                </Text>
+              </View>
+
+              <View style={{
+                backgroundColor: `${AppColors.white}22`,
                 paddingHorizontal: 8,
                 paddingVertical: 4,
                 borderRadius: 8,
                 borderWidth: 1,
                 borderColor: `${AppColors.white}1A`,
             }}>
-              <Text style={{
+                <Text style={{
                 fontFamily: AppFonts.interBold,
                 fontSize: 10.5,
                 color: AppColors.white,
+                lineHeight: 14,
             }}>
-                v{LIB_VERSION}
-              </Text>
+                  v{LIB_VERSION}
+                </Text>
+              </View>
             </View>
           </View>
-        </View>
-      </LinearGradient>
+        </LinearGradient>
 
-        <ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
-          {/* Sub Tabs */}
+        <ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 14 }} showsVerticalScrollIndicator={false}>
+          {/* Segmented Top Navigation Sub-Tabs */}
           <View style={{
                 flexDirection: 'row',
                 backgroundColor: AppColors.primaryLight,
-                borderRadius: 10,
-                padding: 3,
+                borderRadius: 12,
+                padding: 4,
                 borderWidth: 1,
                 borderColor: AppColors.grayBorderSecondary,
-                marginBottom: 4,
+                shadowColor: AppColors.black,
+                shadowOpacity: 0.04,
+                shadowRadius: 4,
+                shadowOffset: { width: 0, height: 2 },
             }}>
-            <TouchableOpacity onPress={() => {
+            <TouchableScale accessible={true} accessibilityRole="tab" accessibilityLabel={t('settings.modulesAndTools')} accessibilityState={{ selected: settingsActiveSubTab === 'module' }} onPress={() => {
                 animateNextLayout();
                 setSettingsActiveSubTab('module');
             }} style={{
                 flex: 1,
-                paddingVertical: 8,
+                paddingVertical: 9,
+                flexDirection: 'row',
                 alignItems: 'center',
                 justifyContent: 'center',
-                borderRadius: 8,
+                gap: 6,
+                borderRadius: 9,
                 backgroundColor: settingsActiveSubTab === 'module'
                     ? AppColors.purple
                     : 'transparent',
             }}>
+              <LayersIcon color={settingsActiveSubTab === 'module'
+                ? AppColors.white
+                : AppColors.grayText} size={13}/>
               <Text style={{
                 fontFamily: AppFonts.interBold,
-                fontSize: 12,
+                fontSize: 12.5,
+                lineHeight: 16,
                 color: settingsActiveSubTab === 'module'
                     ? AppColors.white
                     : AppColors.grayText,
             }}>
-                Module
+                {t('settings.modulesAndTools')}
               </Text>
-            </TouchableOpacity>
-            <TouchableOpacity onPress={() => {
+            </TouchableScale>
+
+            <TouchableScale accessible={true} accessibilityRole="tab" accessibilityLabel={t('settings.uiPreferences')} accessibilityState={{ selected: settingsActiveSubTab === 'ui' }} onPress={() => {
                 animateNextLayout();
                 setSettingsActiveSubTab('ui');
             }} style={{
                 flex: 1,
-                paddingVertical: 8,
+                paddingVertical: 9,
+                flexDirection: 'row',
                 alignItems: 'center',
                 justifyContent: 'center',
-                borderRadius: 8,
+                gap: 6,
+                borderRadius: 9,
                 backgroundColor: settingsActiveSubTab === 'ui'
                     ? AppColors.purple
                     : 'transparent',
             }}>
+              <ScreenIcon color={settingsActiveSubTab === 'ui'
+                ? AppColors.white
+                : AppColors.grayText} size={13}/>
               <Text style={{
                 fontFamily: AppFonts.interBold,
-                fontSize: 12,
+                fontSize: 12.5,
+                lineHeight: 16,
                 color: settingsActiveSubTab === 'ui'
                     ? AppColors.white
                     : AppColors.grayText,
             }}>
-                UI Preferences
+                {t('settings.uiPreferences')}
               </Text>
-            </TouchableOpacity>
+            </TouchableScale>
           </View>
 
-          {settingsActiveSubTab === 'module' ? (
-            /* Tab list */
-            <View style={{
-                    backgroundColor: AppColors.primaryLight,
+          {settingsActiveSubTab === 'module' ? (<View style={{ gap: 12 }}>
+              {/* Performance Advisory Banner */}
+              <View style={{
+                    backgroundColor: `${AppColors.purple}0A`,
                     borderRadius: 12,
+                    padding: 12,
                     borderWidth: 1,
-                    borderColor: AppColors.grayBorderSecondary,
-                    overflow: 'hidden',
-                }}>
-              {/* Table Header */}
-              <View style={{
+                    borderColor: `${AppColors.purple}20`,
                     flexDirection: 'row',
                     alignItems: 'center',
-                    paddingVertical: 8,
-                    paddingHorizontal: 14,
-                    backgroundColor: AppColors.grayBackground,
-                    borderBottomWidth: 1,
-                    borderBottomColor: AppColors.dividerColor,
-                    gap: 12,
+                    gap: 10,
                 }}>
-                <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 10,
-                    color: AppColors.grayTextWeak,
-                    letterSpacing: 0.6,
-                    flex: 1,
+                <View style={{
+                    width: 32,
+                    height: 32,
+                    borderRadius: 8,
+                    backgroundColor: `${AppColors.purple}14`,
+                    alignItems: 'center',
+                    justifyContent: 'center',
                 }}>
-                  MODULE
-                </Text>
-                <Text style={{
+                  <SignalIcon color={AppColors.purple} size={15}/>
+                </View>
+                <View style={{ flex: 1 }}>
+                  <Text style={{
                     fontFamily: AppFonts.interBold,
-                    fontSize: 10,
-                    color: AppColors.grayTextWeak,
-                    letterSpacing: 0.6,
-                    width: 90,
-                    textAlign: 'right',
-                    paddingRight: 4,
+                    fontSize: 12,
+                    color: AppColors.primaryBlack,
+                    lineHeight: 16,
                 }}>
-                  VISIBILITY
-                </Text>
+                    {t('settings.zeroOverheadTitle')}
+                  </Text>
+                  <Text style={{
+                    fontFamily: AppFonts.interRegular,
+                    fontSize: 10.5,
+                    color: AppColors.grayText,
+                    marginTop: 2,
+                    lineHeight: 14,
+                }}>
+                    {t('settings.zeroOverheadDesc')}
+                  </Text>
+                </View>
               </View>
 
-              {settingsTabs.map((tab, idx) => {
+              {/* Enhanced Individual Module Cards with Decorative Checkboxes */}
+              <View style={{ gap: 10 }}>
+                {allModules.map(moduleItem => {
                     const isReduxAvail = isReduxConnected();
                     const isAnalyticsAvail = isAnalyticsConnected();
-                    const isUnavailable = (tab.key === 'redux' && !isReduxAvail) ||
-                        (tab.key === 'analytics' && !isAnalyticsAvail);
-                    const isLocked = tab.key === 'apis' || isUnavailable;
-                    const isVisible = tab.key === 'apis' ||
-                        (Boolean(tabVisibility?.[tab.key]) && !isUnavailable);
-                    const isLast = idx === settingsTabs.length - 1;
-                    return (<View key={tab.key} style={{
+                    const isUnavailable = (moduleItem.key === 'redux' && !isReduxAvail) ||
+                        (moduleItem.key === 'analytics' && !isAnalyticsAvail);
+                    const isLocked = moduleItem.key === 'apis' || isUnavailable;
+                    const isChecked = moduleItem.key === 'apis' ||
+                        (Boolean(stagedTabVisibility?.[moduleItem.key]) &&
+                            !isUnavailable);
+                    const liveStats = moduleItem.key === 'apis'
+                        ? `${logs.length} requests • Limit: ${maxNetworkLogs}`
+                        : moduleItem.key === 'logs'
+                            ? `${consoleLogs.length} logs • Limit: ${maxConsoleLogs}`
+                            : moduleItem.key === 'performance'
+                                ? '60 FPS Target • Memory Telemetry'
+                                : moduleItem.key === 'bundle'
+                                    ? 'Metro Packager • Dependency Map'
+                                    : moduleItem.key === 'crash'
+                                        ? `${crashRecords?.length || 0} crashes recorded • Crash Guard`
+                                        : moduleItem.key === 'analytics'
+                                            ? `${analyticsEvents.length} events logged`
+                                            : moduleItem.key === 'redux'
+                                                ? `${Object.keys(reduxState || {}).length} slices • Depth: ${reduxExpandDepth}`
+                                                : '';
+                    return (<View key={moduleItem.key} style={{
+                            backgroundColor: AppColors.primaryLight,
+                            borderRadius: 14,
+                            borderWidth: 1.5,
+                            borderColor: isChecked
+                                ? `${AppColors.purple}38`
+                                : AppColors.grayBorderSecondary,
+                            padding: 14,
+                            gap: 10,
+                            shadowColor: AppColors.black,
+                            shadowOpacity: isChecked ? 0.04 : 0.02,
+                            shadowRadius: 5,
+                            shadowOffset: { width: 0, height: 2 },
+                        }}>
+                      {/* Top Row: Icon + Title & Badges + Checkbox */}
+                      <View style={{
                             flexDirection: 'row',
-                            alignItems: 'center',
-                            paddingVertical: 10,
-                            paddingHorizontal: 14,
-                            borderBottomWidth: isLast ? 0 : 1,
-                            borderBottomColor: AppColors.dividerColor,
-                            gap: 12,
+                            alignItems: 'flex-start',
+                            justifyContent: 'space-between',
+                            gap: 10,
                         }}>
-                    {/* Icon + Label — fills remaining space */}
-                    <View style={{
+                        {/* Tap Zone for Details/Settings */}
+                        <TouchableScale accessible={true} accessibilityRole="button" accessibilityLabel={`${moduleItem.label} settings`} disabled={isUnavailable} onPress={() => {
+                            animateNextLayout();
+                            setSettingsPage(moduleItem.key);
+                        }} style={{
                             flex: 1,
                             flexDirection: 'row',
-                            alignItems: 'center',
-                            gap: 8,
-                            flexWrap: 'wrap',
+                            alignItems: 'flex-start',
+                            gap: 10,
                         }}>
-                      {/* Small icon tile */}
-                      <View style={{
-                            width: 20,
-                            height: 20,
-                            borderRadius: 6,
+                          {/* Icon Tile */}
+                          <View style={{
+                            width: 36,
+                            height: 36,
+                            borderRadius: 10,
                             backgroundColor: isLocked
-                                ? AppColors.grayBorderSecondary
-                                : AppColors.purpleShade50,
+                                ? `${AppColors.grayBorderSecondary}4D`
+                                : isChecked
+                                    ? `${AppColors.purple}14`
+                                    : AppColors.grayBackground,
                             borderWidth: 1,
                             borderColor: isLocked
                                 ? AppColors.dividerColor
-                                : `${AppColors.purple}33`,
+                                : isChecked
+                                    ? `${AppColors.purple}33`
+                                    : AppColors.grayBorderSecondary,
                             alignItems: 'center',
                             justifyContent: 'center',
+                            marginTop: 1,
                         }}>
-                        {tab.icon === 'apis' && (<SignalIcon color={isLocked
-                                ? AppColors.grayTextWeak
-                                : AppColors.purple} size={11}/>)}
-                        {tab.icon === 'logs' && (<TerminalIcon color={isLocked
-                                ? AppColors.grayTextWeak
-                                : AppColors.purple} size={11}/>)}
-                        {tab.icon === 'analytics' && (<AnalyticsIcon color={isLocked
-                                ? AppColors.grayTextWeak
-                                : AppColors.purple} size={11}/>)}
-                        {tab.icon === 'redux' && (<ReduxIcon color={isLocked
-                                ? AppColors.grayTextWeak
-                                : AppColors.purple} size={11}/>)}
-                        {tab.icon === 'bundle' && (<PackageIcon color={isLocked
-                                ? AppColors.grayTextWeak
-                                : AppColors.purple} size={11}/>)}
-                        {tab.icon === 'performance' && (<PerformanceIcon color={isLocked
-                                ? AppColors.grayTextWeak
-                                : AppColors.purple} size={11}/>)}
-                        {tab.icon === 'crash' && (<CrashIcon color={isLocked
-                                ? AppColors.grayTextWeak
-                                : AppColors.purple} size={11}/>)}
-                      </View>
-                      {/* Label + Required badge */}
-                      <Text style={{
+                            {moduleItem.icon === 'apis' && (<SignalIcon color={isChecked
+                                ? AppColors.purple
+                                : AppColors.grayTextWeak} size={16}/>)}
+                            {moduleItem.icon === 'logs' && (<TerminalIcon color={isChecked
+                                ? AppColors.purple
+                                : AppColors.grayTextWeak} size={16}/>)}
+                            {moduleItem.icon === 'performance' && (<PerformanceIcon color={isChecked
+                                ? AppColors.purple
+                                : AppColors.grayTextWeak} size={16}/>)}
+                            {moduleItem.icon === 'bundle' && (<PackageIcon color={isChecked
+                                ? AppColors.purple
+                                : AppColors.grayTextWeak} size={16}/>)}
+                            {moduleItem.icon === 'crash' && (<CrashIcon color={isChecked
+                                ? AppColors.purple
+                                : AppColors.grayTextWeak} size={16}/>)}
+                            {moduleItem.icon === 'analytics' && (<AnalyticsIcon color={isChecked
+                                ? AppColors.purple
+                                : AppColors.grayTextWeak} size={16}/>)}
+                            {moduleItem.icon === 'redux' && (<ReduxIcon color={isChecked
+                                ? AppColors.purple
+                                : AppColors.grayTextWeak} size={16}/>)}
+                          </View>
+
+                          {/* Titles & Status Pill */}
+                          <View style={{ flex: 1, gap: 2 }}>
+                            <View style={{
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 6,
+                            flexWrap: 'wrap',
+                        }}>
+                              <Text style={{
                             fontFamily: AppFonts.interBold,
-                            fontSize: 13,
+                            fontSize: 14,
+                            lineHeight: 18,
                             color: isLocked
                                 ? AppColors.grayText
                                 : AppColors.primaryBlack,
                         }}>
-                        {tab.label}
-                      </Text>
-                      {/* Unavailable badge */}
-                      {isUnavailable && (<View style={{
+                                {moduleItem.label}
+                              </Text>
+
+                              {/* Default Startup Tab Badge */}
+                              {moduleItem.key === defaultTab &&
+                            !isUnavailable && (<View style={{
+                                flexDirection: 'row',
+                                alignItems: 'center',
+                                backgroundColor: `${AppColors.purple}14`,
+                                borderRadius: 12,
+                                paddingHorizontal: 5,
+                                paddingVertical: 1.5,
+                                borderWidth: 1,
+                                borderColor: `${AppColors.purple}2E`,
+                                gap: 3,
+                            }}>
+                                    <View style={{
+                                width: 4,
+                                height: 4,
+                                borderRadius: 2,
+                                backgroundColor: AppColors.purple,
+                            }}/>
+                                    <Text style={{
+                                fontFamily: AppFonts.interBold,
+                                fontSize: 8,
+                                lineHeight: 11,
+                                color: AppColors.purple,
+                                letterSpacing: 0.4,
+                            }}>
+                                      {t('settings.defaultBadge')}
+                                    </Text>
+                                  </View>)}
+
+                              {/* Status Pill */}
+                              {moduleItem.key === 'apis' ? (<View style={{
+                                backgroundColor: `${AppColors.blue500}14`,
+                                borderRadius: 4,
+                                paddingHorizontal: 5,
+                                paddingVertical: 1.5,
+                                borderWidth: 1,
+                                borderColor: `${AppColors.blue500}33`,
+                            }}>
+                                  <Text style={{
+                                fontFamily: AppFonts.interBold,
+                                fontSize: 8,
+                                lineHeight: 11,
+                                color: AppColors.blue500,
+                                letterSpacing: 0.3,
+                            }}>
+                                    {t('settings.coreBadge')}
+                                  </Text>
+                                </View>) : isUnavailable ? (<View style={{
                                 backgroundColor: `${AppColors.amber500}18`,
                                 borderRadius: 4,
                                 paddingHorizontal: 5,
@@ -270,181 +499,244 @@ const SettingsPanel = () => {
                                 borderWidth: 1,
                                 borderColor: `${AppColors.amber500}35`,
                             }}>
-                          <Text style={{
+                                  <Text style={{
                                 fontFamily: AppFonts.interBold,
                                 fontSize: 8,
+                                lineHeight: 11,
                                 color: AppColors.amber700,
                                 letterSpacing: 0.3,
                             }}>
-                            {tab.key === 'redux'
+                                    {moduleItem.key === 'redux'
                                 ? t('settings.notConnectedBadge')
                                 : t('settings.notDetectedBadge')}
-                          </Text>
-                        </View>)}
-                      {/* #6 — badge marks the configured default tab */}
-                      {tab.key === defaultTab && !isUnavailable && (<View style={{
-                                flexDirection: 'row',
-                                alignItems: 'center',
-                                backgroundColor: `${AppColors.purple}14`,
-                                borderRadius: 20,
-                                paddingHorizontal: 6,
-                                paddingVertical: 2,
+                                  </Text>
+                                </View>) : isChecked ? (<View style={{
+                                backgroundColor: `${AppColors.liveGreen}18`,
+                                borderRadius: 4,
+                                paddingHorizontal: 5,
+                                paddingVertical: 1.5,
                                 borderWidth: 1,
-                                borderColor: `${AppColors.purple}2E`,
-                                gap: 3,
+                                borderColor: `${AppColors.liveGreen}38`,
                             }}>
-                          <View style={{
-                                width: 4,
-                                height: 4,
-                                borderRadius: 2,
-                                backgroundColor: AppColors.purple,
-                                opacity: 0.7,
-                            }}/>
-                          <Text style={{
+                                  <Text style={{
                                 fontFamily: AppFonts.interBold,
-                                fontSize: 8.5,
-                                color: AppColors.purple,
-                                letterSpacing: 0.4,
+                                fontSize: 8,
+                                lineHeight: 11,
+                                color: AppColors.green700,
+                                letterSpacing: 0.3,
                             }}>
-                            DEFAULT
-                          </Text>
-                        </View>)}
-
-                      {/* Settings gear icon next to label */}
-                      {!isUnavailable && (<TouchableScale onPress={() => {
-                                animateNextLayout();
-                                setSettingsPage(tab.key);
-                            }} hitSlop={8} style={{
-                                marginLeft: 4,
-                                padding: 4,
-                                borderRadius: 6,
-                                backgroundColor: AppColors.purpleShade50,
+                                    {t('settings.activeBadge')}
+                                  </Text>
+                                </View>) : (<View style={{
+                                backgroundColor: `${AppColors.grayTextWeak}18`,
+                                borderRadius: 4,
+                                paddingHorizontal: 5,
+                                paddingVertical: 1.5,
                                 borderWidth: 1,
-                                borderColor: `${AppColors.purple}26`,
-                                alignItems: 'center',
-                                justifyContent: 'center',
+                                borderColor: `${AppColors.grayTextWeak}2E`,
                             }}>
-                          <SettingsIcon color={AppColors.purple} size={10}/>
-                        </TouchableScale>)}
-                    </View>
+                                  <Text style={{
+                                fontFamily: AppFonts.interBold,
+                                fontSize: 8,
+                                lineHeight: 11,
+                                color: AppColors.grayTextWeak,
+                                letterSpacing: 0.3,
+                            }}>
+                                    {t('settings.dormantBadge')}
+                                  </Text>
+                                </View>)}
+                            </View>
 
-                    {/* Visibility Switch in VISIBILITY column */}
-                    <View style={{
-                            width: 90,
-                            alignItems: 'flex-end',
-                            justifyContent: 'center',
+                            <Text style={{
+                            fontFamily: AppFonts.interRegular,
+                            fontSize: 11,
+                            color: AppColors.grayText,
+                            lineHeight: 15,
+                            marginTop: 1,
                         }}>
-                      <TouchableScale disabled={isLocked} onPress={() => toggleTabVisibility(tab.key)} style={{
-                            width: 38,
-                            height: 22,
-                            borderRadius: 11,
-                            backgroundColor: isLocked
-                                ? AppColors.grayBackground
-                                : isVisible
-                                    ? AppColors.purple
-                                    : AppColors.grayBorderSecondary,
-                            borderWidth: isLocked ? 1.5 : 0,
+                              {moduleItem.desc}
+                            </Text>
+                          </View>
+                        </TouchableScale>
+
+                        {/* Decorative Custom Checkbox */}
+                        <TouchableScale accessible={true} accessibilityRole="checkbox" accessibilityLabel={`Select ${moduleItem.label}`} accessibilityState={{
+                            checked: isChecked,
+                            disabled: isLocked,
+                        }} disabled={isLocked} onPress={() => {
+                            if (isLocked)
+                                return;
+                            setStagedTabVisibility(prev => ({
+                                ...prev,
+                                [moduleItem.key]: !prev[moduleItem.key],
+                            }));
+                        }} style={{
+                            width: 26,
+                            height: 26,
+                            borderRadius: 8,
+                            borderWidth: isChecked ? 0 : 2,
                             borderColor: isLocked
-                                ? AppColors.grayBorderSecondary
-                                : 'transparent',
-                            borderStyle: isLocked ? 'dashed' : 'solid',
-                            padding: 2,
-                            justifyContent: 'center',
-                            alignItems: isVisible ? 'flex-end' : 'flex-start',
-                            opacity: isLocked ? 0.9 : 1,
-                        }}>
-                        <View style={{
-                            width: 18,
-                            height: 18,
-                            borderRadius: 9,
-                            backgroundColor: isLocked
-                                ? AppColors.grayBorderSecondary
-                                : AppColors.white,
+                                ? AppColors.dividerColor
+                                : AppColors.grayBorderSecondary,
+                            backgroundColor: moduleItem.key === 'apis'
+                                ? `${AppColors.blue500}22`
+                                : isChecked
+                                    ? AppColors.purple
+                                    : AppColors.grayBackground,
                             alignItems: 'center',
                             justifyContent: 'center',
-                            shadowColor: AppColors.black,
-                            shadowOpacity: isLocked ? 0 : 0.15,
-                            shadowRadius: 1.5,
+                            shadowColor: isChecked
+                                ? AppColors.purple
+                                : 'transparent',
+                            shadowOpacity: isChecked ? 0.3 : 0,
+                            shadowRadius: 3,
                             shadowOffset: { width: 0, height: 1 },
+                            elevation: isChecked ? 2 : 0,
                         }}>
-                          {isLocked && (<Svg width={10} height={10} viewBox="0 0 24 24" fill="none">
+                          {moduleItem.key === 'apis' ? (<CheckIcon size={14} color={AppColors.blue500}/>) : isChecked ? (<CheckIcon size={14} color={AppColors.white}/>) : isLocked ? (<Svg width={10} height={10} viewBox="0 0 24 24" fill="none">
                               <Path d="M7 10V7a5 5 0 0 1 10 0v3" stroke={AppColors.grayText} strokeWidth="2.2" strokeLinecap="round"/>
                               <Path d="M5 10h14v9a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1z" fill={AppColors.grayText}/>
-                            </Svg>)}
-                        </View>
-                      </TouchableScale>
-                      {isLocked && (<Text style={{
-                                fontFamily: AppFonts.interBold,
-                                fontSize: 7.5,
-                                color: isUnavailable
-                                    ? AppColors.amber700
+                            </Svg>) : null}
+                        </TouchableScale>
+                      </View>
+
+                      {/* Card Footer: Live Stats + Configure Button */}
+                      {!isUnavailable && (<View style={{
+                                flexDirection: 'row',
+                                alignItems: 'center',
+                                justifyContent: 'space-between',
+                                paddingTop: 8,
+                                borderTopWidth: 1,
+                                borderTopColor: AppColors.dividerColor,
+                            }}>
+                          {/* Live Info Pill */}
+                          <View style={{
+                                flexDirection: 'row',
+                                alignItems: 'center',
+                                gap: 6,
+                                flex: 1,
+                            }}>
+                            <View style={{
+                                width: 6,
+                                height: 6,
+                                borderRadius: 3,
+                                backgroundColor: isChecked
+                                    ? AppColors.liveGreen
                                     : AppColors.grayTextWeak,
-                                letterSpacing: 0.3,
-                                marginTop: 3,
-                                textAlign: 'right',
+                            }}/>
+                            <Text style={{
+                                fontFamily: AppFonts.interMedium,
+                                fontSize: 11,
+                                color: AppColors.grayText,
+                                lineHeight: 14,
                             }}>
-                          {tab.key === 'apis'
-                                ? t('settings.requiredBadge')
-                                : t('settings.readOnlyBadge')}
-                        </Text>)}
-                    </View>
-                  </View>);
+                              {liveStats}
+                            </Text>
+                          </View>
+
+                          {/* Sleek Configure Button */}
+                          <TouchableScale accessible={true} accessibilityRole="button" accessibilityLabel={`Configure ${moduleItem.label} settings`} onPress={() => {
+                                animateNextLayout();
+                                setSettingsPage(moduleItem.key);
+                            }} style={{
+                                flexDirection: 'row',
+                                alignItems: 'center',
+                                gap: 5,
+                                backgroundColor: `${AppColors.purple}12`,
+                                paddingHorizontal: 10,
+                                paddingVertical: 5,
+                                borderRadius: 8,
+                                borderWidth: 1,
+                                borderColor: `${AppColors.purple}26`,
+                            }}>
+                            <SettingsIcon color={AppColors.purple} size={11}/>
+                            <Text style={{
+                                fontFamily: AppFonts.interBold,
+                                fontSize: 11,
+                                lineHeight: 14,
+                                color: AppColors.purple,
+                            }}>
+                              {t('settings.configure')}
+                            </Text>
+                            <ForwardChevronIcon color={AppColors.purple} size={9}/>
+                          </TouchableScale>
+                        </View>)}
+                    </View>);
                 })}
+              </View>
             </View>) : (
-            /* UI Preferences Section */
-            <View style={{
+            /* UI Preferences Subtab */
+            <View style={{ gap: 14 }}>
+              {/* Section 1: Appearance */}
+              <View style={{
                     backgroundColor: AppColors.primaryLight,
-                    borderRadius: 12,
+                    borderRadius: 14,
                     borderWidth: 1,
                     borderColor: AppColors.grayBorderSecondary,
                     overflow: 'hidden',
-                }}>
-              <View style={{
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    paddingVertical: 12,
-                    paddingHorizontal: 14,
+                    padding: 14,
                     gap: 12,
                 }}>
-                {/* Icon + Label */}
+                <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 11,
+                    lineHeight: 14,
+                    color: AppColors.grayTextWeak,
+                    letterSpacing: 0.8,
+                }}>
+                  {t('settings.appearanceTheme')}
+                </Text>
+
                 <View style={{
-                    flex: 1,
                     flexDirection: 'row',
                     alignItems: 'center',
-                    gap: 8,
+                    justifyContent: 'space-between',
                 }}>
                   <View style={{
-                    width: 20,
-                    height: 20,
-                    borderRadius: 6,
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    gap: 10,
+                    flex: 1,
+                }}>
+                    <View style={{
+                    width: 32,
+                    height: 32,
+                    borderRadius: 8,
                     backgroundColor: AppColors.purpleShade50,
-                    borderWidth: 1,
-                    borderColor: `${AppColors.purple}33`,
                     alignItems: 'center',
                     justifyContent: 'center',
                 }}>
-                    {isDark ? (<SunIcon color={AppColors.purple} size={11}/>) : (<MoonIcon color={AppColors.purple} size={11}/>)}
-                  </View>
-                  <View style={{ flex: 1 }}>
-                    <Text style={{
+                      {isDark ? (<SunIcon color={AppColors.purple} size={15}/>) : (<MoonIcon color={AppColors.purple} size={15}/>)}
+                    </View>
+                    <View style={{ flex: 1 }}>
+                      <Text style={{
                     fontFamily: AppFonts.interBold,
-                    fontSize: 13,
+                    fontSize: 13.5,
+                    lineHeight: 18,
                     color: AppColors.primaryBlack,
                 }}>
-                      Dark Theme
-                    </Text>
+                        {t('settings.general.darkMode')}
+                      </Text>
+                      <Text style={{
+                    fontFamily: AppFonts.interRegular,
+                    fontSize: 11,
+                    lineHeight: 15,
+                    color: AppColors.grayText,
+                    marginTop: 1,
+                }}>
+                        {t('settings.general.darkModeDescription')}
+                      </Text>
+                    </View>
                   </View>
-                </View>
 
-                {/* Toggle Switch */}
-                <TouchableScale onPress={() => {
+                  <TouchableScale accessible={true} accessibilityRole="switch" accessibilityLabel="Toggle Dark Theme" accessibilityState={{ checked: isDark }} onPress={() => {
                     const newTheme = !isDark;
                     setIsDark(newTheme);
                     toggleGlobalTheme(newTheme);
                 }} style={{
-                    width: 38,
-                    height: 22,
-                    borderRadius: 11,
+                    width: 42,
+                    height: 24,
+                    borderRadius: 12,
                     backgroundColor: isDark
                         ? AppColors.purple
                         : AppColors.grayBorderSecondary,
@@ -452,226 +744,243 @@ const SettingsPanel = () => {
                     justifyContent: 'center',
                     alignItems: isDark ? 'flex-end' : 'flex-start',
                 }}>
-                  <View style={{
-                    width: 18,
-                    height: 18,
-                    borderRadius: 9,
+                    <View style={{
+                    width: 20,
+                    height: 20,
+                    borderRadius: 10,
                     backgroundColor: AppColors.white,
                     shadowColor: AppColors.black,
-                    shadowOpacity: 0.15,
-                    shadowRadius: 1.5,
+                    shadowOpacity: 0.18,
+                    shadowRadius: 2,
                     shadowOffset: { width: 0, height: 1 },
                 }}/>
-                </TouchableScale>
+                  </TouchableScale>
+                </View>
               </View>
 
-              {/* Divider */}
-              <View style={{
-                    height: 1,
-                    backgroundColor: AppColors.dividerColor,
-                }}/>
-
-              {/* Modal Height */}
+              {/* Section 2: Window & Layout */}
               <View style={{
-                    paddingVertical: 12,
-                    paddingHorizontal: 14,
+                    backgroundColor: AppColors.primaryLight,
+                    borderRadius: 14,
+                    borderWidth: 1,
+                    borderColor: AppColors.grayBorderSecondary,
+                    overflow: 'hidden',
+                    padding: 14,
+                    gap: 14,
                 }}>
-                <View style={{
+                <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 11,
+                    lineHeight: 14,
+                    color: AppColors.grayTextWeak,
+                    letterSpacing: 0.8,
+                }}>
+                  {t('settings.windowLayout')}
+                </Text>
+
+                {/* Modal Height */}
+                <View style={{ gap: 8 }}>
+                  <View style={{
                     flexDirection: 'row',
                     alignItems: 'center',
-                    gap: 8,
+                    gap: 10,
                 }}>
-                  <View style={{
-                    width: 20,
-                    height: 20,
-                    borderRadius: 6,
+                    <View style={{
+                    width: 32,
+                    height: 32,
+                    borderRadius: 8,
                     backgroundColor: AppColors.purpleShade50,
-                    borderWidth: 1,
-                    borderColor: `${AppColors.purple}33`,
                     alignItems: 'center',
                     justifyContent: 'center',
                 }}>
-                    <ScreenIcon color={AppColors.purple} size={11}/>
-                  </View>
-                  <View style={{ flex: 1 }}>
-                    <Text style={{
+                      <ScreenIcon color={AppColors.purple} size={15}/>
+                    </View>
+                    <View style={{ flex: 1 }}>
+                      <Text style={{
                     fontFamily: AppFonts.interBold,
-                    fontSize: 13,
+                    fontSize: 13.5,
+                    lineHeight: 18,
                     color: AppColors.primaryBlack,
                 }}>
-                      Modal Height
-                    </Text>
-                    <Text style={{
+                        {t('settings.general.modalHeight')}
+                      </Text>
+                      <Text style={{
                     fontFamily: AppFonts.interRegular,
                     fontSize: 11,
+                    lineHeight: 15,
                     color: AppColors.grayText,
                     marginTop: 1,
                 }}>
-                      Height of the inspector panel relative to the screen
-                    </Text>
+                        {t('settings.general.modalHeightDescription')}
+                      </Text>
+                    </View>
                   </View>
-                </View>
 
-                {/* Segmented picker */}
-                <View style={{
+                  <View style={{
                     flexDirection: 'row',
                     backgroundColor: AppColors.grayBackground,
-                    borderRadius: 8,
-                    padding: 2.5,
-                    marginTop: 10,
+                    borderRadius: 10,
+                    padding: 3,
                     borderWidth: 1,
                     borderColor: AppColors.dividerColor,
                 }}>
-                  {[50, 70, 90, 100].map(opt => {
+                    {[50, 70, 90, 100].map(opt => {
                     const isActive = modalHeightPercent === opt;
-                    return (<TouchableScale key={opt} onPress={() => setModalHeightPercent(opt)} style={{
+                    return (<TouchableScale key={opt} accessible={true} accessibilityRole="button" accessibilityLabel={`Set window height to ${opt} percent`} accessibilityState={{ selected: isActive }} onPress={() => setModalHeightPercent(opt)} style={{
                             flex: 1,
-                            paddingVertical: 6,
+                            paddingVertical: 7,
                             alignItems: 'center',
-                            borderRadius: 6,
+                            borderRadius: 8,
                             backgroundColor: isActive
                                 ? AppColors.purple
                                 : 'transparent',
                         }}>
-                        <Text style={{
+                          <Text style={{
                             fontFamily: AppFonts.interBold,
-                            fontSize: 11,
-                            color: isActive ? AppColors.white : AppColors.grayText,
+                            fontSize: 11.5,
+                            lineHeight: 15,
+                            color: isActive
+                                ? AppColors.white
+                                : AppColors.grayText,
                         }}>
-                          {opt}%
-                        </Text>
-                      </TouchableScale>);
+                            {opt}%
+                          </Text>
+                        </TouchableScale>);
                 })}
+                  </View>
                 </View>
-              </View>
 
-              {/* Divider */}
-              <View style={{
-                    height: 1,
-                    backgroundColor: AppColors.dividerColor,
-                }}/>
+                <View style={{ height: 1, backgroundColor: AppColors.dividerColor }}/>
 
-              {/* Modal Animation */}
-              <View style={{
-                    paddingVertical: 12,
-                    paddingHorizontal: 14,
-                }}>
-                <View style={{
+                {/* Modal Animation */}
+                <View style={{ gap: 8 }}>
+                  <View style={{
                     flexDirection: 'row',
                     alignItems: 'center',
-                    gap: 8,
+                    gap: 10,
                 }}>
-                  <View style={{
-                    width: 20,
-                    height: 20,
-                    borderRadius: 6,
+                    <View style={{
+                    width: 32,
+                    height: 32,
+                    borderRadius: 8,
                     backgroundColor: AppColors.purpleShade50,
-                    borderWidth: 1,
-                    borderColor: `${AppColors.purple}33`,
                     alignItems: 'center',
                     justifyContent: 'center',
                 }}>
-                    <MotionIcon color={AppColors.purple} size={11}/>
-                  </View>
-                  <View style={{ flex: 1 }}>
-                    <Text style={{
+                      <MotionIcon color={AppColors.purple} size={15}/>
+                    </View>
+                    <View style={{ flex: 1 }}>
+                      <Text style={{
                     fontFamily: AppFonts.interBold,
-                    fontSize: 13,
+                    fontSize: 13.5,
+                    lineHeight: 18,
                     color: AppColors.primaryBlack,
                 }}>
-                      Modal Animation
-                    </Text>
-                    <Text style={{
+                        {t('settings.general.modalAnimation')}
+                      </Text>
+                      <Text style={{
                     fontFamily: AppFonts.interRegular,
                     fontSize: 11,
+                    lineHeight: 15,
                     color: AppColors.grayText,
                     marginTop: 1,
                 }}>
-                      How the inspector panel enters and exits the screen
-                    </Text>
+                        {t('settings.general.modalAnimationDescription')}
+                      </Text>
+                    </View>
                   </View>
-                </View>
 
-                {/* Segmented picker */}
-                <View style={{
+                  <View style={{
                     flexDirection: 'row',
                     backgroundColor: AppColors.grayBackground,
-                    borderRadius: 8,
-                    padding: 2.5,
-                    marginTop: 10,
+                    borderRadius: 10,
+                    padding: 3,
                     borderWidth: 1,
                     borderColor: AppColors.dividerColor,
                 }}>
-                  {([
+                    {[
                     { key: 'slide', label: 'Slide Up' },
                     { key: 'fade', label: 'Fade' },
                     { key: 'none', label: 'None' },
-                ]).map(opt => {
+                ].map(opt => {
                     const isActive = modalAnimationType === opt.key;
-                    return (<TouchableScale key={opt.key} onPress={() => setModalAnimationType(opt.key)} style={{
+                    return (<TouchableScale key={opt.key} accessible={true} accessibilityRole="button" accessibilityLabel={`Set transition animation to ${opt.label}`} accessibilityState={{ selected: isActive }} onPress={() => setModalAnimationType(opt.key)} style={{
                             flex: 1,
-                            paddingVertical: 6,
+                            paddingVertical: 7,
                             alignItems: 'center',
-                            borderRadius: 6,
+                            borderRadius: 8,
                             backgroundColor: isActive
                                 ? AppColors.purple
                                 : 'transparent',
                         }}>
-                        <Text style={{
+                          <Text style={{
                             fontFamily: AppFonts.interBold,
-                            fontSize: 11,
-                            color: isActive ? AppColors.white : AppColors.grayText,
+                            fontSize: 11.5,
+                            lineHeight: 15,
+                            color: isActive
+                                ? AppColors.white
+                                : AppColors.grayText,
                         }}>
-                          {opt.label}
-                        </Text>
-                      </TouchableScale>);
+                            {opt.label}
+                          </Text>
+                        </TouchableScale>);
                 })}
+                  </View>
                 </View>
               </View>
 
-              {/* Divider */}
+              {/* Section 3: Default Startup Tab */}
               <View style={{
-                    height: 1,
-                    backgroundColor: AppColors.dividerColor,
-                }}/>
-
-              {/* #6 — Default Tab */}
-              <View style={{
-                    paddingVertical: 12,
-                    paddingHorizontal: 14,
+                    backgroundColor: AppColors.primaryLight,
+                    borderRadius: 14,
+                    borderWidth: 1,
+                    borderColor: AppColors.grayBorderSecondary,
+                    overflow: 'hidden',
+                    padding: 14,
+                    gap: 12,
+                }}>
+                <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 11,
+                    lineHeight: 14,
+                    color: AppColors.grayTextWeak,
+                    letterSpacing: 0.8,
                 }}>
+                  {t('settings.startupDefault')}
+                </Text>
+
                 <View style={{
                     flexDirection: 'row',
                     alignItems: 'center',
-                    gap: 8,
+                    gap: 10,
                 }}>
                   <View style={{
-                    width: 20,
-                    height: 20,
-                    borderRadius: 6,
+                    width: 32,
+                    height: 32,
+                    borderRadius: 8,
                     backgroundColor: AppColors.purpleShade50,
-                    borderWidth: 1,
-                    borderColor: `${AppColors.purple}33`,
                     alignItems: 'center',
                     justifyContent: 'center',
                 }}>
-                    <LayersIcon color={AppColors.purple} size={11}/>
+                    <LayersIcon color={AppColors.purple} size={15}/>
                   </View>
                   <View style={{ flex: 1 }}>
                     <Text style={{
                     fontFamily: AppFonts.interBold,
-                    fontSize: 13,
+                    fontSize: 13.5,
+                    lineHeight: 18,
                     color: AppColors.primaryBlack,
                 }}>
-                      Default Tab
+                      {t('settings.general.defaultOpeningTab')}
                     </Text>
                     <Text style={{
                     fontFamily: AppFonts.interRegular,
                     fontSize: 11,
+                    lineHeight: 15,
                     color: AppColors.grayText,
                     marginTop: 1,
                 }}>
-                      Tab shown when the inspector opens
+                      {t('settings.general.defaultOpeningTabDesc')}
                     </Text>
                   </View>
                 </View>
@@ -681,13 +990,15 @@ const SettingsPanel = () => {
                     flexDirection: 'row',
                     flexWrap: 'wrap',
                     gap: 8,
-                    marginTop: 12,
+                    marginTop: 4,
                 }}>
-                  {settingsTabs
-                    .filter(tab => tab.key === 'apis' || tabVisibility?.[tab.key])
+                  {allModules
+                    .filter(tab => tab.key === 'apis' ||
+                    stagedTabVisibility?.[tab.key] ||
+                    tabVisibility?.[tab.key])
                     .map(tab => {
                     const isActive = defaultTab === tab.key;
-                    return (<TouchableScale key={tab.key} onPress={() => setDefaultTab(tab.key)} style={{
+                    return (<TouchableScale key={tab.key} accessible={true} accessibilityRole="button" accessibilityLabel={`Set ${tab.label} as default tab`} accessibilityState={{ selected: isActive }} onPress={() => setDefaultTab(tab.key)} style={{
                             flexDirection: 'row',
                             alignItems: 'center',
                             gap: 8,
@@ -695,186 +1006,190 @@ const SettingsPanel = () => {
                             paddingHorizontal: 12,
                             borderRadius: 10,
                             borderWidth: 1.5,
-                            borderColor: isActive ? AppColors.purple : AppColors.grayBorderSecondary,
-                            backgroundColor: isActive ? `${AppColors.purple}0F` : AppColors.primaryLight,
+                            borderColor: isActive
+                                ? AppColors.purple
+                                : AppColors.grayBorderSecondary,
+                            backgroundColor: isActive
+                                ? `${AppColors.purple}0F`
+                                : AppColors.primaryLight,
                             minWidth: '47%',
                             flex: 1,
                         }}>
-                          <View style={{
-                            width: 22,
-                            height: 22,
-                            borderRadius: 6,
-                            backgroundColor: isActive ? AppColors.purple : AppColors.purpleShade50,
-                            alignItems: 'center',
-                            justifyContent: 'center',
-                        }}>
-                            {tab.icon === 'apis' && (<SignalIcon color={isActive ? AppColors.white : AppColors.purple} size={11}/>)}
-                            {tab.icon === 'logs' && (<TerminalIcon color={isActive ? AppColors.white : AppColors.purple} size={11}/>)}
-                            {tab.icon === 'analytics' && (<AnalyticsIcon color={isActive ? AppColors.white : AppColors.purple} size={11}/>)}
-                            {tab.icon === 'redux' && (<ReduxIcon color={isActive ? AppColors.white : AppColors.purple} size={11}/>)}
-                            {tab.icon === 'bundle' && (<PackageIcon color={isActive ? AppColors.white : AppColors.purple} size={11}/>)}
-                            {tab.icon === 'performance' && (<PerformanceIcon color={isActive ? AppColors.white : AppColors.purple} size={11}/>)}
-                            {tab.icon === 'crash' && (<CrashIcon color={isActive ? AppColors.white : AppColors.purple} size={11}/>)}
-                          </View>
                           <Text style={{
                             fontFamily: AppFonts.interBold,
-                            fontSize: 13,
-                            color: isActive ? AppColors.purple : AppColors.primaryBlack,
+                            fontSize: 12.5,
+                            lineHeight: 16,
+                            color: isActive
+                                ? AppColors.purple
+                                : AppColors.primaryBlack,
                             flex: 1,
                         }}>
-                              {tab.label}
+                            {tab.label}
                           </Text>
                           {isActive && (<View style={{
-                                width: 14,
-                                height: 14,
-                                borderRadius: 7,
+                                width: 16,
+                                height: 16,
+                                borderRadius: 8,
                                 backgroundColor: AppColors.purple,
                                 alignItems: 'center',
                                 justifyContent: 'center',
                             }}>
-                              <CheckIcon size={8} color={AppColors.white}/>
+                              <CheckIcon size={9} color={AppColors.white}/>
                             </View>)}
                         </TouchableScale>);
                 })}
                 </View>
               </View>
 
-              {/* Divider */}
+              {/* Section 4: Log Deduplication & Levels */}
               <View style={{
-                    height: 1,
-                    backgroundColor: AppColors.dividerColor,
-                }}/>
+                    backgroundColor: AppColors.primaryLight,
+                    borderRadius: 14,
+                    borderWidth: 1,
+                    borderColor: AppColors.grayBorderSecondary,
+                    overflow: 'hidden',
+                    padding: 14,
+                    gap: 14,
+                }}>
+                <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 11,
+                    lineHeight: 14,
+                    color: AppColors.grayTextWeak,
+                    letterSpacing: 0.8,
+                }}>
+                  {t('settings.logFiltersDeduplication')}
+                </Text>
 
-              {/* #9 — Show Duplicate Logs */}
-              <View style={{
+                {/* Show Duplicate Logs */}
+                <View style={{
                     flexDirection: 'row',
                     alignItems: 'center',
-                    paddingVertical: 12,
-                    paddingHorizontal: 14,
-                    gap: 12,
+                    justifyContent: 'space-between',
                 }}>
-                <View style={{
-                    flex: 1,
+                  <View style={{
                     flexDirection: 'row',
                     alignItems: 'center',
-                    gap: 8,
+                    gap: 10,
+                    flex: 1,
                 }}>
-                  <View style={{
-                    width: 20,
-                    height: 20,
-                    borderRadius: 6,
+                    <View style={{
+                    width: 32,
+                    height: 32,
+                    borderRadius: 8,
                     backgroundColor: AppColors.purpleShade50,
-                    borderWidth: 1,
-                    borderColor: `${AppColors.purple}33`,
                     alignItems: 'center',
                     justifyContent: 'center',
                 }}>
-                    <EyeIcon color={AppColors.purple} size={11}/>
-                  </View>
-                  <View style={{ flex: 1 }}>
-                    <Text style={{
+                      <EyeIcon color={AppColors.purple} size={15}/>
+                    </View>
+                    <View style={{ flex: 1 }}>
+                      <Text style={{
                     fontFamily: AppFonts.interBold,
-                    fontSize: 13,
+                    fontSize: 13.5,
+                    lineHeight: 18,
                     color: AppColors.primaryBlack,
                 }}>
-                      Show Duplicate Logs
-                    </Text>
-                    <Text style={{
+                        {t('settings.general.duplicateLogs')}
+                      </Text>
+                      <Text style={{
                     fontFamily: AppFonts.interRegular,
                     fontSize: 11,
+                    lineHeight: 15,
                     color: AppColors.grayText,
                     marginTop: 1,
                 }}>
-                      Off: repeated identical entries collapse into one row
-                      with a ×N count
-                    </Text>
+                        {t('settings.general.duplicateLogsDescription')}
+                      </Text>
+                    </View>
                   </View>
-                </View>
 
-                {/* Toggle Switch */}
-                <TouchableScale onPress={() => setShowDuplicateLogs(prev => !prev)} style={{
-                    width: 38,
-                    height: 22,
-                    borderRadius: 11,
+                  <TouchableScale accessible={true} accessibilityRole="switch" accessibilityLabel="Toggle show duplicate logs" accessibilityState={{ checked: showDuplicateLogs }} onPress={() => setShowDuplicateLogs(prev => !prev)} style={{
+                    width: 42,
+                    height: 24,
+                    borderRadius: 12,
                     backgroundColor: showDuplicateLogs
                         ? AppColors.purple
                         : AppColors.grayBorderSecondary,
                     padding: 2,
                     justifyContent: 'center',
-                    alignItems: showDuplicateLogs ? 'flex-end' : 'flex-start',
+                    alignItems: showDuplicateLogs
+                        ? 'flex-end'
+                        : 'flex-start',
                 }}>
-                  <View style={{
-                    width: 18,
-                    height: 18,
-                    borderRadius: 9,
+                    <View style={{
+                    width: 20,
+                    height: 20,
+                    borderRadius: 10,
                     backgroundColor: AppColors.white,
                     shadowColor: AppColors.black,
-                    shadowOpacity: 0.15,
-                    shadowRadius: 1.5,
+                    shadowOpacity: 0.18,
+                    shadowRadius: 2,
                     shadowOffset: { width: 0, height: 1 },
                 }}/>
-                </TouchableScale>
-              </View>
+                  </TouchableScale>
+                </View>
 
-              {/* Divider */}
-              <View style={{
-                    height: 1,
-                    backgroundColor: AppColors.dividerColor,
-                }}/>
+                <View style={{ height: 1, backgroundColor: AppColors.dividerColor }}/>
 
-              {/* Logs Console Levels */}
-              <View style={{
-                    paddingVertical: 12,
-                    paddingHorizontal: 14,
-                }}>
-                <View style={{
+                {/* Console Log Levels */}
+                <View style={{ gap: 8 }}>
+                  <View style={{
                     flexDirection: 'row',
                     alignItems: 'center',
-                    gap: 8,
+                    gap: 10,
                 }}>
-                  <View style={{
-                    width: 20,
-                    height: 20,
-                    borderRadius: 6,
+                    <View style={{
+                    width: 32,
+                    height: 32,
+                    borderRadius: 8,
                     backgroundColor: AppColors.purpleShade50,
-                    borderWidth: 1,
-                    borderColor: `${AppColors.purple}33`,
                     alignItems: 'center',
                     justifyContent: 'center',
                 }}>
-                    <TerminalIcon color={AppColors.purple} size={11}/>
-                  </View>
-                  <View style={{ flex: 1 }}>
-                    <Text style={{
+                      <TerminalIcon color={AppColors.purple} size={15}/>
+                    </View>
+                    <View style={{ flex: 1 }}>
+                      <Text style={{
                     fontFamily: AppFonts.interBold,
-                    fontSize: 13,
+                    fontSize: 13.5,
+                    lineHeight: 18,
                     color: AppColors.primaryBlack,
                 }}>
-                      Logs Console Levels
-                    </Text>
-                    <Text style={{
+                        {t('settings.general.activeConsoleLogLevels')}
+                      </Text>
+                      <Text style={{
                     fontFamily: AppFonts.interRegular,
                     fontSize: 11,
+                    lineHeight: 15,
                     color: AppColors.grayText,
                     marginTop: 1,
                 }}>
-                      Toggle which log levels are visible in the Logs tab
-                    </Text>
+                        {t('settings.general.activeConsoleLogLevelsDesc')}
+                      </Text>
+                    </View>
                   </View>
-                </View>
 
-                <View style={{
-                    flexDirection: 'row',
-                    gap: 8,
-                    marginTop: 10,
-                }}>
-                  {([
-                    { key: 'info', label: 'Info', color: AppColors.blue500 },
-                    { key: 'warn', label: 'Warning', color: AppColors.amber500 },
-                    { key: 'error', label: 'Error', color: AppColors.errorColor },
-                ]).map(level => {
+                  <View style={{ flexDirection: 'row', gap: 8, marginTop: 4 }}>
+                    {[
+                    {
+                        key: 'info',
+                        label: 'Info',
+                        color: AppColors.blue500,
+                    },
+                    {
+                        key: 'warn',
+                        label: 'Warning',
+                        color: AppColors.amber500,
+                    },
+                    {
+                        key: 'error',
+                        label: 'Error',
+                        color: AppColors.errorColor,
+                    },
+                ].map(level => {
                     const isActive = showConsoleLevels[level.key];
-                    return (<TouchableScale key={level.key} onPress={() => setShowConsoleLevels(prev => ({
+                    return (<TouchableScale key={level.key} accessible={true} accessibilityRole="checkbox" accessibilityLabel={`Toggle ${level.label} logs`} accessibilityState={{ checked: isActive }} onPress={() => setShowConsoleLevels(prev => ({
                             ...prev,
                             [level.key]: !prev[level.key],
                         }))} style={{
@@ -884,112 +1199,113 @@ const SettingsPanel = () => {
                             justifyContent: 'center',
                             gap: 6,
                             paddingVertical: 8,
-                            borderRadius: 8,
+                            borderRadius: 9,
                             borderWidth: 1.5,
-                            borderColor: isActive ? level.color : AppColors.grayBorderSecondary,
-                            backgroundColor: isActive ? `${level.color}0D` : AppColors.primaryLight,
+                            borderColor: isActive
+                                ? level.color
+                                : AppColors.grayBorderSecondary,
+                            backgroundColor: isActive
+                                ? `${level.color}0D`
+                                : AppColors.primaryLight,
                         }}>
-                        <View style={{
+                          <View style={{
                             width: 8,
                             height: 8,
                             borderRadius: 4,
-                            backgroundColor: isActive ? level.color : AppColors.grayBorderSecondary,
+                            backgroundColor: isActive
+                                ? level.color
+                                : AppColors.grayBorderSecondary,
                         }}/>
-                        <Text style={{
+                          <Text style={{
                             fontFamily: AppFonts.interBold,
-                            fontSize: 11,
-                            color: isActive ? level.color : AppColors.grayText,
+                            fontSize: 11.5,
+                            lineHeight: 15,
+                            color: isActive
+                                ? level.color
+                                : AppColors.grayText,
                         }}>
-                          {level.label}
-                        </Text>
-                      </TouchableScale>);
+                            {level.label}
+                          </Text>
+                        </TouchableScale>);
                 })}
+                  </View>
                 </View>
               </View>
 
-              {/* Divider */}
-              <View style={{
-                    height: 1,
-                    backgroundColor: AppColors.dividerColor,
-                }}/>
-
-              {/* Reset Settings */}
+              {/* Section 5: Reset Settings */}
               <View style={{
+                    backgroundColor: AppColors.primaryLight,
+                    borderRadius: 14,
+                    borderWidth: 1,
+                    borderColor: `${AppColors.errorColor}33`,
+                    overflow: 'hidden',
+                    padding: 14,
                     flexDirection: 'row',
                     alignItems: 'center',
-                    paddingVertical: 12,
-                    paddingHorizontal: 14,
                     gap: 12,
                 }}>
                 <View style={{
-                    flex: 1,
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    gap: 8,
-                }}>
-                  <View style={{
-                    width: 20,
-                    height: 20,
-                    borderRadius: 6,
+                    width: 34,
+                    height: 34,
+                    borderRadius: 9,
                     backgroundColor: `${AppColors.errorColor}14`,
-                    borderWidth: 1,
-                    borderColor: `${AppColors.errorColor}33`,
                     alignItems: 'center',
                     justifyContent: 'center',
                 }}>
-                    <TrashIcon color={AppColors.errorColor} size={11}/>
-                  </View>
-                  <View style={{ flex: 1 }}>
-                    <Text style={{
+                  <TrashIcon color={AppColors.errorColor} size={15}/>
+                </View>
+                <View style={{ flex: 1 }}>
+                  <Text style={{
                     fontFamily: AppFonts.interBold,
-                    fontSize: 13,
+                    fontSize: 13.5,
+                    lineHeight: 18,
                     color: AppColors.primaryBlack,
                 }}>
-                      Reset Settings
-                    </Text>
-                    <Text style={{
+                    {t('settings.resetSettings')}
+                  </Text>
+                  <Text style={{
                     fontFamily: AppFonts.interRegular,
                     fontSize: 11,
+                    lineHeight: 15,
                     color: AppColors.grayText,
                     marginTop: 1,
                 }}>
-                      Wipe custom configurations and load package defaults
-                    </Text>
-                  </View>
+                    {t('settings.resetSettingsDesc')}
+                  </Text>
                 </View>
 
-                <TouchableScale onPress={resetToDefaults} style={{
-                    paddingHorizontal: 10,
-                    paddingVertical: 5,
-                    borderRadius: 7,
+                <TouchableScale accessible={true} accessibilityRole="button" accessibilityLabel="Reset all settings to default" onPress={resetToDefaults} style={{
+                    paddingHorizontal: 12,
+                    paddingVertical: 7,
+                    borderRadius: 8,
                     backgroundColor: `${AppColors.errorColor}14`,
                     borderWidth: 1,
-                    borderColor: `${AppColors.errorColor}33`,
+                    borderColor: `${AppColors.errorColor}38`,
                 }}>
                   <Text style={{
                     fontFamily: AppFonts.interBold,
-                    fontSize: 11,
+                    fontSize: 11.5,
+                    lineHeight: 15,
                     color: AppColors.errorColor,
                 }}>
-                    Reset
+                    {t('settings.reset')}
                   </Text>
                 </TouchableScale>
               </View>
             </View>)}
 
-
-          {/* Storage Status */}
+          {/* Storage & Engine Status Card */}
           <View style={{
-                backgroundColor: isPersistentStorageAvailable()
-                    ? `${AppColors.liveGreen}14`
-                    : `${AppColors.amber600}14`,
+                backgroundColor: isPersistent
+                    ? `${AppColors.liveGreen}12`
+                    : `${AppColors.amber600}12`,
                 borderRadius: 12,
                 borderWidth: 1,
-                borderColor: isPersistentStorageAvailable()
+                borderColor: isPersistent
                     ? `${AppColors.liveGreen}33`
                     : `${AppColors.amber600}33`,
                 padding: 12,
-                marginTop: 16,
+                marginBottom: 10,
                 flexDirection: 'row',
                 alignItems: 'center',
                 gap: 10,
@@ -998,32 +1314,106 @@ const SettingsPanel = () => {
                 width: 8,
                 height: 8,
                 borderRadius: 4,
-                backgroundColor: isPersistentStorageAvailable() ? AppColors.green500 : AppColors.amber600,
+                backgroundColor: isPersistent
+                    ? AppColors.green500
+                    : AppColors.amber600,
             }}/>
             <View style={{ flex: 1 }}>
               <Text style={{
                 fontFamily: AppFonts.interBold,
                 fontSize: 12,
-                color: isPersistentStorageAvailable() ? AppColors.green700 : AppColors.amber800,
+                lineHeight: 16,
+                color: isPersistent
+                    ? AppColors.green700
+                    : AppColors.amber800,
             }}>
-                {isPersistentStorageAvailable()
-                ? `Storage: Persistent (${storage ? 'Custom' : 'iOS Settings'})`
-                : 'Storage: Temporary (In-Memory)'}
+                {isPersistent
+                ? t('settings.general.storageStatusEnabled', {
+                    type: storage ? 'Custom Storage' : 'iOS NSUserDefaults',
+                })
+                : t('settings.general.storageStatusDisabled')}
               </Text>
               <Text style={{
                 fontFamily: AppFonts.interRegular,
                 fontSize: 10.5,
-                color: isPersistentStorageAvailable() ? AppColors.green800 : AppColors.amber800,
+                lineHeight: 14,
+                color: isPersistent
+                    ? AppColors.green800
+                    : AppColors.amber800,
                 marginTop: 2,
-                opacity: 0.8,
+                opacity: 0.85,
             }}>
-                {isPersistentStorageAvailable()
-                ? 'Your settings are saved across app restarts.'
-                : 'Settings reset when closed. To persist settings, pass a storage object to <NetworkInspector storage={...} />.'}
+                {isPersistent
+                ? t('settings.general.storageStatusEnabledDesc')
+                : t('settings.general.storageStatusDisabledDesc')}
               </Text>
             </View>
           </View>
         </ScrollView>
+
+        {/* Bottom Sticky Action Bar for Save Changes */}
+        {settingsActiveSubTab === 'module' && (<View style={{
+                    paddingHorizontal: 16,
+                    paddingTop: 12,
+                    paddingBottom: Platform.OS === 'ios' ? 26 : 14,
+                    backgroundColor: AppColors.primaryLight,
+                    borderTopWidth: 1,
+                    borderTopColor: AppColors.dividerColor,
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    gap: 12,
+                    shadowColor: AppColors.black,
+                    shadowOpacity: 0.08,
+                    shadowRadius: 8,
+                    shadowOffset: { width: 0, height: -3 },
+                    elevation: 8,
+                }}>
+            <View style={{ flex: 1 }}>
+              <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 13,
+                    lineHeight: 17,
+                    color: AppColors.primaryBlack,
+                }}>
+                {stagedActiveCount} of {allModules.length} Modules Active
+              </Text>
+              <Text style={{
+                    fontFamily: AppFonts.interRegular,
+                    fontSize: 11,
+                    lineHeight: 15,
+                    color: hasUnsavedChanges
+                        ? AppColors.purple
+                        : AppColors.grayText,
+                    marginTop: 1,
+                }}>
+                {hasUnsavedChanges
+                    ? t('settings.unsavedPending')
+                    : t('settings.allSynchronized')}
+              </Text>
+            </View>
+
+            <TouchableScale accessible={true} accessibilityRole="button" accessibilityLabel="Save Changes" onPress={handleSaveChanges} style={{
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    gap: 6,
+                    backgroundColor: hasUnsavedChanges
+                        ? AppColors.purple
+                        : `${AppColors.purple}22`,
+                    paddingHorizontal: 18,
+                    paddingVertical: 10,
+                    borderRadius: 10,
+                }}>
+              <CheckIcon size={14} color={hasUnsavedChanges ? AppColors.white : AppColors.purple}/>
+              <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 13,
+                    lineHeight: 17,
+                    color: hasUnsavedChanges ? AppColors.white : AppColors.purple,
+                }}>
+                {t('settings.saveChanges')}
+              </Text>
+            </TouchableScale>
+          </View>)}
       </View>);
     }
     const goBackToMain = () => {
@@ -1057,6 +1447,7 @@ const SettingsPanel = () => {
           <Text style={{
             fontFamily: AppFonts.interBold,
             fontSize: 14,
+            lineHeight: 18,
             color: AppColors.primaryBlack,
         }}>
             {opts.label}
@@ -1064,6 +1455,7 @@ const SettingsPanel = () => {
           {opts.description ? (<Text style={{
                 fontFamily: AppFonts.interRegular,
                 fontSize: 11,
+                lineHeight: 15,
                 color: AppColors.grayText,
                 marginTop: 1,
             }}>
@@ -1095,6 +1487,7 @@ const SettingsPanel = () => {
                 <Text style={{
                         fontFamily: AppFonts.interBold,
                         fontSize: 11,
+                        lineHeight: 14,
                         color: isActive ? AppColors.white : AppColors.grayText,
                     }}>
                   {opts.picker.formatLabel
@@ -1110,22 +1503,21 @@ const SettingsPanel = () => {
     let icon = null;
     let rightInfo = '';
     if (settingsPage === 'apis') {
-        title = 'APIs Settings';
+        title = t('settings.apis.title');
         icon = <SignalIcon color={AppColors.white} size={16}/>;
-        rightInfo = `Total: ${logs.length}`;
-        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16 }}>
+        rightInfo = t('settings.apis.total', { count: logs.length });
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
-                borderRadius: 12,
+                borderRadius: 14,
                 borderWidth: 1,
                 borderColor: AppColors.grayBorderSecondary,
-                gap: 4,
             }}>
           {renderSettingRow({
                 icon: <SignalIcon color={AppColors.purple} size={16}/>,
-                label: 'Max Request Logs',
-                description: 'How many network requests to keep in memory',
+                label: t('settings.apis.maxRequestLogs'),
+                description: t('settings.apis.maxRequestLogsDescription'),
                 picker: {
                     options: [50, 100, 200, 500],
                     selectedValue: maxNetworkLogs,
@@ -1137,26 +1529,25 @@ const SettingsPanel = () => {
 
         <View style={{
                 backgroundColor: AppColors.primaryLight,
-                borderRadius: 12,
+                borderRadius: 14,
                 borderWidth: 1,
                 borderColor: AppColors.grayBorderSecondary,
                 padding: 16,
-                marginTop: 12,
             }}>
           {renderSettingRow({
                 icon: <TrashIcon color={AppColors.errorColor} size={16}/>,
-                label: 'Clear Network Logs',
-                description: `${logs.length} requests stored`,
+                label: t('settings.apis.clearNetworkLogs'),
+                description: t('settings.apis.clearNetworkLogsDescription', { count: logs.length }),
                 isLast: true,
                 onPress: () => {
                     clearNetworkLogs();
                     setSelected(null);
-                    Alert.alert('Success', 'Network logs cleared.');
+                    Alert.alert(t('common.success'), t('settings.apis.networkLogsCleared'));
                 },
                 right: (<View style={{
-                        paddingHorizontal: 10,
-                        paddingVertical: 5,
-                        borderRadius: 7,
+                        paddingHorizontal: 12,
+                        paddingVertical: 6,
+                        borderRadius: 8,
                         backgroundColor: `${AppColors.errorColor}14`,
                         borderWidth: 1,
                         borderColor: `${AppColors.errorColor}33`,
@@ -1164,9 +1555,10 @@ const SettingsPanel = () => {
                 <Text style={{
                         fontFamily: AppFonts.interBold,
                         fontSize: 11,
+                        lineHeight: 14,
                         color: AppColors.errorColor,
                     }}>
-                  Clear
+                  {t('common.clear')}
                 </Text>
               </View>),
             })}
@@ -1174,22 +1566,22 @@ const SettingsPanel = () => {
       </ScrollView>);
     }
     else if (settingsPage === 'logs') {
-        title = 'Logs Settings';
+        title = t('settings.logs.title');
         icon = <TerminalIcon color={AppColors.white} size={16}/>;
-        rightInfo = `Total: ${consoleLogs.length}`;
-        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16 }}>
+        rightInfo = t('settings.logs.total', { count: consoleLogs.length });
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
-                borderRadius: 12,
+                borderRadius: 14,
                 borderWidth: 1,
                 borderColor: AppColors.grayBorderSecondary,
                 gap: 4,
             }}>
           {renderSettingRow({
                 icon: <TerminalIcon color={AppColors.purple} size={16}/>,
-                label: 'Max Console Logs',
-                description: 'How many console messages to retain',
+                label: t('settings.logs.maxConsoleLogs'),
+                description: t('settings.logs.maxConsoleLogsDescription'),
                 picker: {
                     options: [100, 200, 500, 1000],
                     selectedValue: maxConsoleLogs,
@@ -1200,10 +1592,11 @@ const SettingsPanel = () => {
           <Text style={{
                 fontFamily: AppFonts.interBold,
                 fontSize: 13,
+                lineHeight: 17,
                 color: AppColors.primaryBlack,
-                paddingTop: 4,
+                paddingTop: 6,
             }}>
-            Log Levels
+            {t('settings.logs.logLevels')}
           </Text>
           {['info', 'warn', 'error'].map(level => {
                 const isLvlActive = showConsoleLevels?.[level];
@@ -1212,19 +1605,25 @@ const SettingsPanel = () => {
                     : level === 'warn'
                         ? AppColors.warningIconGold
                         : AppColors.skyBlue;
+                const label = level === 'info'
+                    ? t('settings.logs.showInfo')
+                    : level === 'warn'
+                        ? t('settings.logs.showWarn')
+                        : t('settings.logs.showError');
+                const desc = level === 'info'
+                    ? t('settings.logs.showInfoDesc')
+                    : level === 'warn'
+                        ? t('settings.logs.showWarnDesc')
+                        : t('settings.logs.showErrorDesc');
                 return renderSettingRow({
                     icon: (<View style={{
-                            width: 10,
-                            height: 10,
-                            borderRadius: 5,
+                            width: 12,
+                            height: 12,
+                            borderRadius: 6,
                             backgroundColor: levelColor,
                         }}/>),
-                    label: `Show ${level.charAt(0).toUpperCase() + level.slice(1)} logs`,
-                    description: level === 'info'
-                        ? 'Informational messages'
-                        : level === 'warn'
-                            ? 'Warning messages'
-                            : 'Error messages',
+                    label,
+                    description: desc,
                     isLast: level === 'error',
                     onPress: () => setShowConsoleLevels(prev => ({
                         ...prev,
@@ -1252,25 +1651,24 @@ const SettingsPanel = () => {
 
         <View style={{
                 backgroundColor: AppColors.primaryLight,
-                borderRadius: 12,
+                borderRadius: 14,
                 borderWidth: 1,
                 borderColor: AppColors.grayBorderSecondary,
                 padding: 16,
-                marginTop: 12,
             }}>
           {renderSettingRow({
                 icon: <TrashIcon color={AppColors.errorColor} size={16}/>,
-                label: 'Clear Console Logs',
-                description: `${consoleLogs.length} logs stored`,
+                label: t('settings.logs.clearConsoleLogs'),
+                description: t('settings.logs.clearConsoleLogsDescription', { count: consoleLogs.length }),
                 isLast: true,
                 onPress: () => {
                     clearConsoleLogs();
-                    Alert.alert('Success', 'Console logs cleared.');
+                    Alert.alert(t('common.success'), t('settings.logs.consoleLogsCleared'));
                 },
                 right: (<View style={{
-                        paddingHorizontal: 10,
-                        paddingVertical: 5,
-                        borderRadius: 7,
+                        paddingHorizontal: 12,
+                        paddingVertical: 6,
+                        borderRadius: 8,
                         backgroundColor: `${AppColors.errorColor}14`,
                         borderWidth: 1,
                         borderColor: `${AppColors.errorColor}33`,
@@ -1278,9 +1676,10 @@ const SettingsPanel = () => {
                 <Text style={{
                         fontFamily: AppFonts.interBold,
                         fontSize: 11,
+                        lineHeight: 14,
                         color: AppColors.errorColor,
                     }}>
-                  Clear
+                  {t('common.clear')}
                 </Text>
               </View>),
             })}
@@ -1288,47 +1687,45 @@ const SettingsPanel = () => {
       </ScrollView>);
     }
     else if (settingsPage === 'analytics') {
-        title = 'Analytics Settings';
+        title = t('settings.analytics.title');
         icon = <AnalyticsIcon color={AppColors.white} size={16}/>;
-        rightInfo = `Events: ${analyticsEvents.length}`;
-        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16 }}>
+        rightInfo = t('settings.analytics.total', { count: analyticsEvents.length });
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
-                borderRadius: 12,
+                borderRadius: 14,
                 borderWidth: 1,
                 borderColor: AppColors.grayBorderSecondary,
-                gap: 4,
             }}>
           {renderSettingRow({
                 icon: <AnalyticsIcon color={AppColors.purple} size={16}/>,
-                label: 'Events Captured',
-                description: `${analyticsEvents.length} analytics events stored`,
+                label: t('settings.analytics.maxAnalyticsEvents'),
+                description: t('settings.analytics.maxAnalyticsEventsDescription', { count: analyticsEvents.length }),
                 isLast: true,
             })}
         </View>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
-                borderRadius: 12,
+                borderRadius: 14,
                 borderWidth: 1,
                 borderColor: AppColors.grayBorderSecondary,
                 padding: 16,
-                marginTop: 12,
             }}>
           {renderSettingRow({
                 icon: <TrashIcon color={AppColors.errorColor} size={16}/>,
-                label: 'Clear Analytics History',
-                description: 'Remove all captured events',
+                label: t('settings.analytics.clearAnalyticsEvents'),
+                description: t('settings.analytics.clearAnalyticsEventsDescription'),
                 isLast: true,
                 onPress: () => {
                     clearAnalyticsEvents();
                     setSelectedEvent(null);
-                    Alert.alert('Success', 'Analytics events cleared.');
+                    Alert.alert(t('common.success'), t('settings.analytics.analyticsEventsCleared'));
                 },
                 right: (<View style={{
-                        paddingHorizontal: 10,
-                        paddingVertical: 5,
-                        borderRadius: 7,
+                        paddingHorizontal: 12,
+                        paddingVertical: 6,
+                        borderRadius: 8,
                         backgroundColor: `${AppColors.errorColor}14`,
                         borderWidth: 1,
                         borderColor: `${AppColors.errorColor}33`,
@@ -1336,9 +1733,10 @@ const SettingsPanel = () => {
                 <Text style={{
                         fontFamily: AppFonts.interBold,
                         fontSize: 11,
+                        lineHeight: 14,
                         color: AppColors.errorColor,
                     }}>
-                  Clear
+                  {t('common.clear')}
                 </Text>
               </View>),
             })}
@@ -1346,22 +1744,22 @@ const SettingsPanel = () => {
       </ScrollView>);
     }
     else if (settingsPage === 'redux') {
-        title = 'Redux Settings';
-        icon = <TerminalIcon color={AppColors.white} size={16}/>;
-        rightInfo = `Reducers: ${Object.keys(reduxState || {}).length}`;
-        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16 }}>
+        title = t('settings.redux.title');
+        icon = <ReduxIcon color={AppColors.white} size={16}/>;
+        rightInfo = t('settings.redux.reducers', { count: Object.keys(reduxState || {}).length });
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
-                borderRadius: 12,
+                borderRadius: 14,
                 borderWidth: 1,
                 borderColor: AppColors.grayBorderSecondary,
                 gap: 4,
             }}>
           {renderSettingRow({
-                icon: <TerminalIcon color={AppColors.purple} size={16}/>,
-                label: 'Auto-refresh Store',
-                description: 'Automatically capture Redux store state updates',
+                icon: <ReduxIcon color={AppColors.purple} size={16}/>,
+                label: t('settings.redux.autoRefresh'),
+                description: t('settings.redux.autoRefreshDescription'),
                 onPress: () => setReduxAutoRefreshState(prev => !prev),
                 right: (<View style={{
                         width: 22,
@@ -1383,8 +1781,8 @@ const SettingsPanel = () => {
           <View style={{ height: 1, backgroundColor: AppColors.dividerColor }}/>
           {renderSettingRow({
                 icon: <LayersIcon color={AppColors.purple} size={16}/>,
-                label: 'Default JSON Expand Depth',
-                description: 'Initial depth of Redux state tree to auto-expand',
+                label: t('settings.redux.defaultJsonExpandDepth'),
+                description: t('settings.redux.defaultJsonExpandDepthDescription'),
                 picker: {
                     options: [1, 2, 3, 5],
                     selectedValue: reduxExpandDepth,
@@ -1396,27 +1794,26 @@ const SettingsPanel = () => {
 
         <View style={{
                 backgroundColor: AppColors.primaryLight,
-                borderRadius: 12,
+                borderRadius: 14,
                 borderWidth: 1,
                 borderColor: AppColors.grayBorderSecondary,
                 padding: 16,
-                marginTop: 12,
             }}>
           {renderSettingRow({
                 icon: <TrashIcon color={AppColors.errorColor} size={16}/>,
-                label: 'Clear Redux State',
+                label: t('settings.redux.clearReduxState'),
                 description: reduxState
-                    ? 'Reset state snapshot in inspector'
-                    : 'No store snapshot stored',
+                    ? t('settings.redux.clearReduxStateDescription')
+                    : t('settings.redux.clearReduxStateEmpty'),
                 isLast: true,
                 onPress: () => {
                     setReduxState(null);
-                    Alert.alert('Success', 'Redux state snapshot cleared.');
+                    Alert.alert(t('common.success'), t('settings.redux.reduxStateCleared'));
                 },
                 right: (<View style={{
-                        paddingHorizontal: 10,
-                        paddingVertical: 5,
-                        borderRadius: 7,
+                        paddingHorizontal: 12,
+                        paddingVertical: 6,
+                        borderRadius: 8,
                         backgroundColor: `${AppColors.errorColor}14`,
                         borderWidth: 1,
                         borderColor: `${AppColors.errorColor}33`,
@@ -1424,9 +1821,10 @@ const SettingsPanel = () => {
                 <Text style={{
                         fontFamily: AppFonts.interBold,
                         fontSize: 11,
+                        lineHeight: 14,
                         color: AppColors.errorColor,
                     }}>
-                  Clear
+                  {t('common.clear')}
                 </Text>
               </View>),
             })}
@@ -1434,22 +1832,22 @@ const SettingsPanel = () => {
       </ScrollView>);
     }
     else if (settingsPage === 'crash') {
-        title = 'Crash Settings';
+        title = t('settings.crash.title');
         icon = <CrashIcon color={AppColors.white} size={16}/>;
         rightInfo = `Total: ${crashRecords?.length || 0}`;
-        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16 }}>
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
-                borderRadius: 12,
+                borderRadius: 14,
                 borderWidth: 1,
                 borderColor: AppColors.grayBorderSecondary,
                 gap: 4,
             }}>
           {renderSettingRow({
                 icon: <LayersIcon color={AppColors.purple} size={16}/>,
-                label: 'Max Crash Logs',
-                description: 'How many crash records to preserve in history',
+                label: t('settings.crash.maxCrashLogs'),
+                description: t('settings.crash.maxCrashLogsDesc'),
                 picker: {
                     options: [25, 50, 100, 200],
                     selectedValue: maxCrashLogs || 100,
@@ -1459,8 +1857,8 @@ const SettingsPanel = () => {
           <View style={{ height: 1, backgroundColor: AppColors.dividerColor }}/>
           {renderSettingRow({
                 icon: <ShieldAlertIcon color={AppColors.greenColor} size={16}/>,
-                label: 'Global Crash Guard',
-                description: 'Intercepts native, JS, and render errors directly',
+                label: t('settings.crash.globalGuard'),
+                description: t('settings.crash.globalGuardDesc'),
                 isLast: true,
                 right: (<View style={{
                         paddingHorizontal: 8,
@@ -1471,9 +1869,10 @@ const SettingsPanel = () => {
                 <Text style={{
                         fontFamily: AppFonts.interBold,
                         fontSize: 10,
+                        lineHeight: 13,
                         color: AppColors.greenColor,
                     }}>
-                  PROTECTED
+                  {t('settings.protectedBadge')}
                 </Text>
               </View>),
             })}
@@ -1481,25 +1880,190 @@ const SettingsPanel = () => {
 
         <View style={{
                 backgroundColor: AppColors.primaryLight,
-                borderRadius: 12,
+                borderRadius: 14,
                 borderWidth: 1,
                 borderColor: AppColors.grayBorderSecondary,
                 padding: 16,
-                marginTop: 12,
             }}>
           {renderSettingRow({
                 icon: <TrashIcon color={AppColors.errorColor} size={16}/>,
-                label: 'Clear Crash History',
-                description: `${crashRecords?.length || 0} crash logs stored`,
+                label: t('settings.crash.clearHistory'),
+                description: t('settings.crash.clearHistoryDesc', { count: crashRecords?.length || 0 }),
                 isLast: true,
                 onPress: () => {
                     clearCrashRecords();
-                    Alert.alert('Success', 'Crash logs cleared.');
+                    Alert.alert(t('common.success'), t('settings.crash.historyCleared'));
+                },
+                right: (<View style={{
+                        paddingHorizontal: 12,
+                        paddingVertical: 6,
+                        borderRadius: 8,
+                        backgroundColor: `${AppColors.errorColor}14`,
+                        borderWidth: 1,
+                        borderColor: `${AppColors.errorColor}33`,
+                    }}>
+                <Text style={{
+                        fontFamily: AppFonts.interBold,
+                        fontSize: 11,
+                        lineHeight: 14,
+                        color: AppColors.errorColor,
+                    }}>
+                  {t('common.clear')}
+                </Text>
+              </View>),
+            })}
+        </View>
+      </ScrollView>);
+    }
+    else if (settingsPage === 'bundle') {
+        title = t('settings.bundle.title');
+        icon = <PackageIcon color={AppColors.white} size={16}/>;
+        rightInfo = 'Metro';
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
+        <View style={{
+                backgroundColor: AppColors.primaryLight,
+                padding: 16,
+                borderRadius: 14,
+                borderWidth: 1,
+                borderColor: AppColors.grayBorderSecondary,
+                gap: 8,
+            }}>
+          <View style={{ flexDirection: 'row', alignItems: 'center', gap: 10 }}>
+            <View style={{
+                width: 36,
+                height: 36,
+                borderRadius: 10,
+                backgroundColor: AppColors.purpleShade50,
+                alignItems: 'center',
+                justifyContent: 'center',
+            }}>
+              <PackageIcon color={AppColors.purple} size={16}/>
+            </View>
+            <View style={{ flex: 1 }}>
+              <Text style={{
+                fontFamily: AppFonts.interBold,
+                fontSize: 14,
+                lineHeight: 18,
+                color: AppColors.primaryBlack,
+            }}>
+                {t('settings.bundle.sourceBundler')}
+              </Text>
+              <Text style={{
+                fontFamily: AppFonts.interRegular,
+                fontSize: 11,
+                lineHeight: 15,
+                color: AppColors.grayText,
+                marginTop: 1,
+            }}>
+                {t('settings.bundle.sourceBundlerDesc')}
+              </Text>
+            </View>
+          </View>
+        </View>
+
+        <View style={{
+                backgroundColor: AppColors.primaryLight,
+                borderRadius: 14,
+                borderWidth: 1,
+                borderColor: AppColors.grayBorderSecondary,
+                padding: 16,
+            }}>
+          {renderSettingRow({
+                icon: <TrashIcon color={AppColors.errorColor} size={16}/>,
+                label: t('settings.bundle.clearCache'),
+                description: t('settings.bundle.clearCacheDesc'),
+                isLast: true,
+                onPress: () => {
+                    clearCachedBundleAnalysis();
+                    Alert.alert(t('common.success'), t('settings.bundle.cacheCleared'));
+                },
+                right: (<View style={{
+                        paddingHorizontal: 12,
+                        paddingVertical: 6,
+                        borderRadius: 8,
+                        backgroundColor: `${AppColors.errorColor}14`,
+                        borderWidth: 1,
+                        borderColor: `${AppColors.errorColor}33`,
+                    }}>
+                <Text style={{
+                        fontFamily: AppFonts.interBold,
+                        fontSize: 11,
+                        lineHeight: 14,
+                        color: AppColors.errorColor,
+                    }}>
+                  {t('common.clear')}
+                </Text>
+              </View>),
+            })}
+        </View>
+      </ScrollView>);
+    }
+    else if (settingsPage === 'performance') {
+        title = t('settings.performance.title');
+        icon = <PerformanceIcon color={AppColors.white} size={16}/>;
+        rightInfo = '60 FPS Target';
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
+        <View style={{
+                backgroundColor: AppColors.primaryLight,
+                padding: 16,
+                borderRadius: 14,
+                borderWidth: 1,
+                borderColor: AppColors.grayBorderSecondary,
+                gap: 8,
+            }}>
+          <View style={{ flexDirection: 'row', alignItems: 'center', gap: 10 }}>
+            <View style={{
+                width: 36,
+                height: 36,
+                borderRadius: 10,
+                backgroundColor: AppColors.purpleShade50,
+                alignItems: 'center',
+                justifyContent: 'center',
+            }}>
+              <PerformanceIcon color={AppColors.purple} size={16}/>
+            </View>
+            <View style={{ flex: 1 }}>
+              <Text style={{
+                fontFamily: AppFonts.interBold,
+                fontSize: 14,
+                lineHeight: 18,
+                color: AppColors.primaryBlack,
+            }}>
+                {t('settings.performance.frameMeasurement')}
+              </Text>
+              <Text style={{
+                fontFamily: AppFonts.interRegular,
+                fontSize: 11,
+                lineHeight: 15,
+                color: AppColors.grayText,
+                marginTop: 1,
+            }}>
+                {t('settings.performance.frameMeasurementDesc')}
+              </Text>
+            </View>
+          </View>
+        </View>
+
+        <View style={{
+                backgroundColor: AppColors.primaryLight,
+                borderRadius: 14,
+                borderWidth: 1,
+                borderColor: AppColors.grayBorderSecondary,
+                padding: 16,
+            }}>
+          {renderSettingRow({
+                icon: <TrashIcon color={AppColors.errorColor} size={16}/>,
+                label: t('settings.performance.clearEvents'),
+                description: t('settings.performance.clearEventsDesc'),
+                isLast: true,
+                onPress: () => {
+                    clearPerformanceEvents();
+                    Alert.alert(t('common.success'), t('settings.performance.eventsCleared'));
                 },
                 right: (<View style={{
-                        paddingHorizontal: 10,
-                        paddingVertical: 5,
-                        borderRadius: 7,
+                        paddingHorizontal: 12,
+                        paddingVertical: 6,
+                        borderRadius: 8,
                         backgroundColor: `${AppColors.errorColor}14`,
                         borderWidth: 1,
                         borderColor: `${AppColors.errorColor}33`,
@@ -1507,29 +2071,33 @@ const SettingsPanel = () => {
                 <Text style={{
                         fontFamily: AppFonts.interBold,
                         fontSize: 11,
+                        lineHeight: 14,
                         color: AppColors.errorColor,
                     }}>
-                  Clear
+                  {t('common.clear')}
                 </Text>
               </View>),
             })}
         </View>
       </ScrollView>);
     }
-    return (<View style={{ flex: 1, backgroundColor: AppColors.grayBackground }}>
+    return (<View style={{
+            flex: 1,
+            backgroundColor: AppColors.grayBackground,
+        }}>
       <LinearGradient colors={[AppColors.purple, AppColors.brandPurple]} start={{ x: 0, y: 0 }} end={{ x: 1, y: 0 }} style={styles.headerGradient}>
         <View style={{ paddingTop: headerTopPadding, width: '100%' }}>
           <View style={[styles.header, { paddingHorizontal: 16, gap: 12 }]}>
-          <TouchableScale onPress={goBackToMain} hitSlop={12} style={{
+            <TouchableScale accessible={true} accessibilityRole="button" accessibilityLabel={t('settings.back')} onPress={goBackToMain} hitSlop={12} style={{
             padding: 8,
             borderRadius: 10,
             backgroundColor: `${AppColors.white}26`,
             borderWidth: 1,
             borderColor: `${AppColors.white}14`,
         }}>
-            <WhiteBackNavigation color={AppColors.white} size={16}/>
-          </TouchableScale>
-          {icon && (<View style={{
+              <WhiteBackNavigation color={AppColors.white} size={16}/>
+            </TouchableScale>
+            {icon && (<View style={{
                 width: 30,
                 height: 30,
                 borderRadius: 8,
@@ -1537,18 +2105,19 @@ const SettingsPanel = () => {
                 alignItems: 'center',
                 justifyContent: 'center',
             }}>
-              {icon}
-            </View>)}
-          <View style={{ flex: 1 }}>
-            <Text style={{
+                {icon}
+              </View>)}
+            <View style={{ flex: 1 }}>
+              <Text style={{
             fontFamily: AppFonts.interBold,
             fontSize: 17,
+            lineHeight: 22,
             color: AppColors.white,
         }}>
-              {title}
-            </Text>
-          </View>
-          {rightInfo ? (<View style={{
+                {title}
+              </Text>
+            </View>
+            {rightInfo ? (<View style={{
                 backgroundColor: `${AppColors.white}26`,
                 paddingHorizontal: 8,
                 paddingVertical: 4,
@@ -1556,17 +2125,18 @@ const SettingsPanel = () => {
                 borderWidth: 1,
                 borderColor: `${AppColors.white}1A`,
             }}>
-              <Text style={{
+                <Text style={{
                 fontFamily: AppFonts.interBold,
                 fontSize: 11,
+                lineHeight: 14,
                 color: AppColors.white,
             }}>
-                {rightInfo}
-              </Text>
-            </View>) : null}
+                  {rightInfo}
+                </Text>
+              </View>) : null}
+          </View>
         </View>
-      </View>
-    </LinearGradient>
+      </LinearGradient>
       {content}
     </View>);
 };