react-native-inapp-inspector 2.0.0 → 2.0.2

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

@@ -1,13 +1,12 @@
-import React, { useMemo, useState, useEffect } from 'react';
-import { Alert, Platform, ScrollView, StatusBar, Text, TextInput, View, } from 'react-native';
+import React, { useMemo, useState, useEffect, useRef } from 'react';
+import { Alert, Animated, Platform, ScrollView, StatusBar, StyleSheet, Text, TextInput, View, } from 'react-native';
 import Svg, { Path } from 'react-native-svg';
-import LinearGradient from 'react-native-linear-gradient';
 import { animateNextLayout, useInspector } from './InspectorContext';
 import TouchableScale from '../TouchableScale';
-import styles, { toggleGlobalTheme } from '../../styles';
+import Slider from '../Slider';
+import { toggleGlobalTheme } from '../../styles';
 import { AppColors } from '../../styles/AppColors';
 import { AppFonts } from '../../styles/AppFonts';
-import { LIB_VERSION } from '../../constants';
 import { isPersistentStorageAvailable, calculateRamBasedLimits, } from '../../helpers/settingsStore';
 import { clearNetworkLogs } from '../../customHooks/networkLogger';
 import { clearConsoleLogs } from '../../customHooks/consoleLogger';
@@ -18,10 +17,14 @@ 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, ForwardChevronIcon, } from '../NetworkIcons';
+import { SignalIcon, TerminalIcon, AnalyticsIcon, SettingsIcon, SunIcon, MoonIcon, ScreenIcon, MotionIcon, LayersIcon, EyeIcon, CheckIcon, TrashIcon, PackageIcon, ReduxIcon, PerformanceIcon, CrashIcon, ShieldAlertIcon, ForwardChevronIcon, ChevronDownIcon, } 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, maxAnalyticsEventsLimit, setMaxAnalyticsEventsLimit, isAutoRamLimitEnabled, setIsAutoRamLimitEnabled, deviceFreeRamMb, reduxAutoRefresh, setReduxAutoRefreshState, reduxExpandDepth, setReduxExpandDepth, switchActiveTab, setSelected, setSelectedEvent, setReduxState, crashRecords, maxCrashLogs, setMaxCrashLogs, } = useInspector();
+    const [stagedHeight, setStagedHeight] = useState(modalHeightPercent);
+    useEffect(() => {
+        setStagedHeight(modalHeightPercent);
+    }, [modalHeightPercent]);
     const autoRamProfile = calculateRamBasedLimits(deviceFreeRamMb);
     const isPersistent = isPersistentStorageAvailable();
     // Safe Area & Status Bar Padding for All Device Form Factors
@@ -118,638 +121,638 @@ const SettingsPanel = () => {
         });
         Alert.alert(t('settings.settingsSaved'), t('settings.settingsSavedDesc'));
     };
-    if (settingsPage === 'main') {
+    const [isDefaultTabDropdownOpen, setIsDefaultTabDropdownOpen] = useState(false);
+    const goBackToMain = () => {
+        animateNextLayout();
+        setSettingsPage('main');
+    };
+    // Helper: settings row with icon + label + optional description
+    const renderSettingRow = (opts) => {
         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, paddingVertical: 12, gap: 12 },
-            ]}>
-              <TouchableScale accessible={true} accessibilityRole="button" accessibilityLabel={t('settings.back')} onPress={() => {
-                animateNextLayout();
-                setSettingsPage(null);
-                switchActiveTab('apis');
-            }} hitSlop={12} style={{
-                padding: 8,
-                borderRadius: 10,
-                backgroundColor: `${AppColors.white}26`,
-                borderWidth: 1,
-                borderColor: `${AppColors.white}18`,
+                paddingVertical: 12,
+                borderBottomWidth: opts.isLast ? 0 : 1,
+                borderBottomColor: AppColors.dividerColor,
             }}>
-                <WhiteBackNavigation color={AppColors.white} size={16}/>
-              </TouchableScale>
-
-              <View style={{ flex: 1 }}>
-                <View style={{
+        <TouchableScale disabled={!opts.onPress} onPress={opts.onPress} style={{
                 flexDirection: 'row',
                 alignItems: 'center',
-                gap: 8,
-            }}>
-                  <Text style={{
-                fontFamily: AppFonts.interBold,
-                fontSize: 17,
-                color: AppColors.white,
-                letterSpacing: -0.3,
-                lineHeight: 22,
-            }}>
-                    {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}CC`,
-                marginTop: 2,
-                lineHeight: 15,
+                gap: 12,
             }}>
-                  {t('settings.mainSubtitle')}
-                </Text>
-              </View>
-
-              <View style={{
-                backgroundColor: `${AppColors.white}22`,
-                paddingHorizontal: 8,
-                paddingVertical: 4,
-                borderRadius: 8,
+          <View style={{
+                width: 36,
+                height: 36,
+                borderRadius: 10,
+                backgroundColor: AppColors.purpleShade50,
                 borderWidth: 1,
-                borderColor: `${AppColors.white}1A`,
+                borderColor: `${AppColors.purple}2E`,
+                alignItems: 'center',
+                justifyContent: 'center',
             }}>
-                <Text style={{
+            {opts.icon}
+          </View>
+          <View style={{ flex: 1 }}>
+            <Text style={{
                 fontFamily: AppFonts.interBold,
-                fontSize: 10.5,
-                color: AppColors.white,
-                lineHeight: 14,
+                fontSize: 14,
+                lineHeight: 18,
+                color: AppColors.primaryBlack,
             }}>
-                  v{LIB_VERSION}
-                </Text>
-              </View>
-            </View>
+              {opts.label}
+            </Text>
+            {opts.description ? (<Text style={{
+                    fontFamily: AppFonts.interRegular,
+                    fontSize: 11,
+                    lineHeight: 15,
+                    color: AppColors.grayText,
+                    marginTop: 1,
+                }}>
+                {opts.description}
+              </Text>) : null}
           </View>
-        </LinearGradient>
-
-        <ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 14 }} showsVerticalScrollIndicator={false}>
+          {opts.right || null}
+        </TouchableScale>
+        {opts.numericInput && (<View style={{ marginTop: 10, gap: 6 }}>
+            <View style={{
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    backgroundColor: AppColors.grayBackground,
+                    borderRadius: 8,
+                    borderWidth: 1,
+                    borderColor: AppColors.dividerColor,
+                    paddingHorizontal: 12,
+                    paddingVertical: 4,
+                }}>
+              <TextInput style={{
+                    flex: 1,
+                    fontFamily: AppFonts.interMedium,
+                    fontSize: 14,
+                    lineHeight: 18,
+                    color: AppColors.primaryBlack,
+                    paddingVertical: 6,
+                }} value={String(opts.numericInput.value || '')} onChangeText={text => {
+                    const num = parseInt(text.replace(/[^0-9]/g, ''), 10);
+                    if (!isNaN(num)) {
+                        const clamped = Math.max(opts.numericInput?.min ?? 1, Math.min(opts.numericInput?.max ?? 10000, num));
+                        opts.numericInput?.onChange(clamped);
+                    }
+                }} keyboardType={opts.numericInput.keyboardType ?? 'number-pad'} placeholder={opts.numericInput.placeholder} placeholderTextColor={AppColors.grayTextWeak} maxLength={6} selectTextOnFocus/>
+              <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 11,
+                    color: AppColors.purple,
+                    marginLeft: 6,
+                }}>
+                MAX
+              </Text>
+            </View>
+            {opts.numericInput.min !== undefined || opts.numericInput.max !== undefined ? (<Text style={{
+                        fontFamily: AppFonts.interRegular,
+                        fontSize: 10,
+                        lineHeight: 13,
+                        color: AppColors.grayTextWeak,
+                    }}>
+                Range: {opts.numericInput.min ?? 1} - {opts.numericInput.max ?? '∞'}
+              </Text>) : null}
+          </View>)}
+        {opts.picker && (<View style={{
+                    flexDirection: 'row',
+                    backgroundColor: AppColors.grayBackground,
+                    borderRadius: 8,
+                    padding: 2.5,
+                    marginTop: 10,
+                    borderWidth: 1,
+                    borderColor: AppColors.dividerColor,
+                }}>
+            {opts.picker.options.map(opt => {
+                    const isActive = opts.picker.selectedValue === opt;
+                    return (<TouchableScale key={String(opt)} onPress={() => opts.picker.onSelect(opt)} style={{
+                            flex: 1,
+                            paddingVertical: 6,
+                            alignItems: 'center',
+                            borderRadius: 6,
+                            backgroundColor: isActive
+                                ? AppColors.purple
+                                : 'transparent',
+                        }}>
+                  <Text style={{
+                            fontFamily: AppFonts.interBold,
+                            fontSize: 11,
+                            lineHeight: 14,
+                            color: isActive ? AppColors.white : AppColors.grayText,
+                        }}>
+                    {opts.picker.formatLabel
+                            ? opts.picker.formatLabel(opt)
+                            : opt}
+                  </Text>
+                </TouchableScale>);
+                })}
+          </View>)}
+      </View>);
+    };
+    const renderMainSettingsContent = () => (<View style={{
+            flex: 1,
+            backgroundColor: AppColors.grayBackground,
+        }}>
+      <ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, paddingBottom: 100, gap: 14 }} showsVerticalScrollIndicator={false}>
           {/* Segmented Top Navigation Sub-Tabs */}
           <View style={{
-                flexDirection: 'row',
-                backgroundColor: AppColors.primaryLight,
-                borderRadius: 12,
-                padding: 4,
-                borderWidth: 1,
-                borderColor: AppColors.grayBorderSecondary,
-                shadowColor: AppColors.black,
-                shadowOpacity: 0.04,
-                shadowRadius: 4,
-                shadowOffset: { width: 0, height: 2 },
-            }}>
+            flexDirection: 'row',
+            backgroundColor: AppColors.primaryLight,
+            borderRadius: 12,
+            padding: 4,
+            borderWidth: 1,
+            borderColor: AppColors.grayBorderSecondary,
+            shadowColor: AppColors.black,
+            shadowOpacity: 0.04,
+            shadowRadius: 4,
+            shadowOffset: { width: 0, height: 2 },
+        }}>
             <TouchableScale accessible={true} accessibilityRole="tab" accessibilityLabel={t('settings.modulesAndTools')} accessibilityState={{ selected: settingsActiveSubTab === 'module' }} onPress={() => {
-                animateNextLayout();
-                setSettingsActiveSubTab('module');
-            }} style={{
-                flex: 1,
-                paddingVertical: 9,
-                flexDirection: 'row',
-                alignItems: 'center',
-                justifyContent: 'center',
-                gap: 6,
-                borderRadius: 9,
-                backgroundColor: settingsActiveSubTab === 'module'
-                    ? AppColors.purple
-                    : 'transparent',
-            }}>
+            animateNextLayout();
+            setSettingsActiveSubTab('module');
+        }} style={{
+            flex: 1,
+            paddingVertical: 9,
+            flexDirection: 'row',
+            alignItems: 'center',
+            justifyContent: 'center',
+            gap: 6,
+            borderRadius: 9,
+            backgroundColor: settingsActiveSubTab === 'module'
+                ? AppColors.purple
+                : 'transparent',
+        }}>
               <LayersIcon color={settingsActiveSubTab === 'module'
-                ? AppColors.white
-                : AppColors.grayText} size={13}/>
+            ? AppColors.white
+            : AppColors.grayText} size={13}/>
               <Text style={{
-                fontFamily: AppFonts.interBold,
-                fontSize: 12.5,
-                lineHeight: 16,
-                color: settingsActiveSubTab === 'module'
-                    ? AppColors.white
-                    : AppColors.grayText,
-            }}>
+            fontFamily: AppFonts.interBold,
+            fontSize: 12.5,
+            lineHeight: 16,
+            color: settingsActiveSubTab === 'module'
+                ? AppColors.white
+                : AppColors.grayText,
+        }}>
                 {t('settings.modulesAndTools')}
               </Text>
             </TouchableScale>
 
             <TouchableScale accessible={true} accessibilityRole="tab" accessibilityLabel={t('settings.uiPreferences')} accessibilityState={{ selected: settingsActiveSubTab === 'ui' }} onPress={() => {
-                animateNextLayout();
-                setSettingsActiveSubTab('ui');
-            }} style={{
-                flex: 1,
-                paddingVertical: 9,
-                flexDirection: 'row',
-                alignItems: 'center',
-                justifyContent: 'center',
-                gap: 6,
-                borderRadius: 9,
-                backgroundColor: settingsActiveSubTab === 'ui'
-                    ? AppColors.purple
-                    : 'transparent',
-            }}>
+            animateNextLayout();
+            setSettingsActiveSubTab('ui');
+        }} style={{
+            flex: 1,
+            paddingVertical: 9,
+            flexDirection: 'row',
+            alignItems: 'center',
+            justifyContent: 'center',
+            gap: 6,
+            borderRadius: 9,
+            backgroundColor: settingsActiveSubTab === 'ui'
+                ? AppColors.purple
+                : 'transparent',
+        }}>
               <ScreenIcon color={settingsActiveSubTab === 'ui'
-                ? AppColors.white
-                : AppColors.grayText} size={13}/>
+            ? AppColors.white
+            : AppColors.grayText} size={13}/>
               <Text style={{
-                fontFamily: AppFonts.interBold,
-                fontSize: 12.5,
-                lineHeight: 16,
-                color: settingsActiveSubTab === 'ui'
-                    ? AppColors.white
-                    : AppColors.grayText,
-            }}>
+            fontFamily: AppFonts.interBold,
+            fontSize: 12.5,
+            lineHeight: 16,
+            color: settingsActiveSubTab === 'ui'
+                ? AppColors.white
+                : AppColors.grayText,
+        }}>
                 {t('settings.uiPreferences')}
               </Text>
             </TouchableScale>
           </View>
 
           {settingsActiveSubTab === 'module' ? (<View style={{ gap: 12 }}>
-              {/* Performance Advisory Banner */}
-              <View style={{
-                    backgroundColor: `${AppColors.purple}0A`,
-                    borderRadius: 12,
-                    padding: 12,
-                    borderWidth: 1,
-                    borderColor: `${AppColors.purple}20`,
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    gap: 10,
-                }}>
-                <View style={{
-                    width: 32,
-                    height: 32,
-                    borderRadius: 8,
-                    backgroundColor: `${AppColors.purple}14`,
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                }}>
-                  <SignalIcon color={AppColors.purple} size={15}/>
-                </View>
-                <View style={{ flex: 1 }}>
-                  <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 12,
-                    color: AppColors.primaryBlack,
-                    lineHeight: 16,
-                }}>
-                    {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>
-
-              {/* Enhanced Individual Module Cards with Decorative Checkboxes */}
+              {/* Individual Module Cards with Left Checkboxes */}
               <View style={{ gap: 10 }}>
                 {allModules.map(moduleItem => {
-                    const isReduxAvail = isReduxConnected();
-                    const isAnalyticsAvail = isAnalyticsConnected();
-                    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 */}
+                const isReduxAvail = isReduxConnected();
+                const isAnalyticsAvail = isAnalyticsConnected();
+                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: [Checkbox] -> [Icon Tile] -> [Title & Subtitle] */}
                       <View style={{
-                            flexDirection: 'row',
-                            alignItems: 'flex-start',
-                            justifyContent: 'space-between',
-                            gap: 10,
-                        }}>
-                        {/* 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: 'flex-start',
-                            gap: 10,
-                        }}>
-                          {/* Icon Tile */}
-                          <View style={{
-                            width: 36,
-                            height: 36,
-                            borderRadius: 10,
-                            backgroundColor: isLocked
-                                ? `${AppColors.grayBorderSecondary}4D`
-                                : isChecked
-                                    ? `${AppColors.purple}14`
-                                    : AppColors.grayBackground,
-                            borderWidth: 1,
-                            borderColor: isLocked
-                                ? AppColors.dividerColor
-                                : isChecked
-                                    ? `${AppColors.purple}33`
-                                    : AppColors.grayBorderSecondary,
-                            alignItems: 'center',
-                            justifyContent: 'center',
-                            marginTop: 1,
-                        }}>
-                            {moduleItem.icon === 'apis' && (<SignalIcon color={isChecked
+                        flexDirection: 'row',
+                        alignItems: 'flex-start',
+                        gap: 10,
+                    }}>
+                        {/* 1. Checkbox on the Left */}
+                        <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],
+                        }));
+                    }} hitSlop={8} style={{
+                        width: 22,
+                        height: 22,
+                        borderRadius: 6,
+                        borderWidth: isChecked ? 0 : 1.8,
+                        borderColor: isLocked
+                            ? AppColors.dividerColor
+                            : AppColors.grayBorderSecondary,
+                        backgroundColor: moduleItem.key === 'apis'
+                            ? `${AppColors.blue500}22`
+                            : isChecked
                                 ? AppColors.purple
-                                : AppColors.grayTextWeak} size={16}/>)}
-                            {moduleItem.icon === 'logs' && (<TerminalIcon color={isChecked
-                                ? AppColors.purple
-                                : AppColors.grayTextWeak} size={16}/>)}
+                                : AppColors.grayBackground,
+                        alignItems: 'center',
+                        justifyContent: 'center',
+                        marginTop: 7,
+                        shadowColor: isChecked
+                            ? AppColors.purple
+                            : 'transparent',
+                        shadowOpacity: isChecked ? 0.25 : 0,
+                        shadowRadius: 2,
+                        elevation: isChecked ? 2 : 0,
+                    }}>
+                          {moduleItem.key === 'apis' ? (<CheckIcon size={12} color={AppColors.blue500}/>) : isChecked ? (<CheckIcon size={12} 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>) : null}
+                        </TouchableScale>
+
+                        {/* 2. Middle Tap Zone: Icon + Title & Desc */}
+                        <TouchableScale accessible={true} accessibilityRole="button" accessibilityLabel={`${moduleItem.label} settings`} disabled={isUnavailable} onPress={() => {
+                        animateNextLayout();
+                        setSettingsPage(moduleItem.key);
+                    }} style={{
+                        flex: 1,
+                        flexDirection: 'row',
+                        alignItems: 'flex-start',
+                        gap: 10,
+                    }}>
+                          {/* Icon Tile */}
+                          <View style={{
+                        width: 36,
+                        height: 36,
+                        borderRadius: 10,
+                        backgroundColor: isLocked
+                            ? `${AppColors.grayBorderSecondary}4D`
+                            : isChecked
+                                ? `${AppColors.purple}14`
+                                : AppColors.grayBackground,
+                        borderWidth: 1,
+                        borderColor: isLocked
+                            ? AppColors.dividerColor
+                            : isChecked
+                                ? `${AppColors.purple}33`
+                                : AppColors.grayBorderSecondary,
+                        alignItems: 'center',
+                        justifyContent: 'center',
+                        marginTop: 1,
+                    }}>
+                            {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}/>)}
+                            ? AppColors.purple
+                            : AppColors.grayTextWeak} size={16}/>)}
                             {moduleItem.icon === 'bundle' && (<PackageIcon color={isChecked
-                                ? AppColors.purple
-                                : AppColors.grayTextWeak} size={16}/>)}
+                            ? AppColors.purple
+                            : AppColors.grayTextWeak} size={16}/>)}
                             {moduleItem.icon === 'crash' && (<CrashIcon color={isChecked
-                                ? AppColors.purple
-                                : AppColors.grayTextWeak} size={16}/>)}
+                            ? AppColors.purple
+                            : AppColors.grayTextWeak} size={16}/>)}
                             {moduleItem.icon === 'analytics' && (<AnalyticsIcon color={isChecked
-                                ? AppColors.purple
-                                : AppColors.grayTextWeak} size={16}/>)}
+                            ? AppColors.purple
+                            : AppColors.grayTextWeak} size={16}/>)}
                             {moduleItem.icon === 'redux' && (<ReduxIcon color={isChecked
-                                ? AppColors.purple
-                                : AppColors.grayTextWeak} size={16}/>)}
+                            ? 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',
-                        }}>
+                        flexDirection: 'row',
+                        alignItems: 'center',
+                        gap: 6,
+                        flexWrap: 'wrap',
+                    }}>
                               <Text style={{
-                            fontFamily: AppFonts.interBold,
-                            fontSize: 14,
-                            lineHeight: 18,
-                            color: isLocked
-                                ? AppColors.grayText
-                                : AppColors.primaryBlack,
-                        }}>
+                        fontFamily: AppFonts.interBold,
+                        fontSize: 14,
+                        lineHeight: 18,
+                        color: isLocked
+                            ? AppColors.grayText
+                            : AppColors.primaryBlack,
+                    }}>
                                 {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,
-                            }}>
+                        !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,
-                            }}/>
+                            width: 4,
+                            height: 4,
+                            borderRadius: 2,
+                            backgroundColor: AppColors.purple,
+                        }}/>
                                     <Text style={{
-                                fontFamily: AppFonts.interBold,
-                                fontSize: 8,
-                                lineHeight: 11,
-                                color: AppColors.purple,
-                                letterSpacing: 0.4,
-                            }}>
+                            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`,
-                            }}>
+                            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,
-                            }}>
+                            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,
-                                paddingVertical: 1.5,
-                                borderWidth: 1,
-                                borderColor: `${AppColors.amber500}35`,
-                            }}>
+                            backgroundColor: `${AppColors.amber500}18`,
+                            borderRadius: 4,
+                            paddingHorizontal: 5,
+                            paddingVertical: 1.5,
+                            borderWidth: 1,
+                            borderColor: `${AppColors.amber500}35`,
+                        }}>
                                   <Text style={{
-                                fontFamily: AppFonts.interBold,
-                                fontSize: 8,
-                                lineHeight: 11,
-                                color: AppColors.amber700,
-                                letterSpacing: 0.3,
-                            }}>
+                            fontFamily: AppFonts.interBold,
+                            fontSize: 8,
+                            lineHeight: 11,
+                            color: AppColors.amber700,
+                            letterSpacing: 0.3,
+                        }}>
                                     {moduleItem.key === 'redux'
-                                ? t('settings.notConnectedBadge')
-                                : t('settings.notDetectedBadge')}
+                            ? t('settings.notConnectedBadge')
+                            : t('settings.notDetectedBadge')}
                                   </Text>
                                 </View>) : isChecked ? (<View style={{
-                                backgroundColor: `${AppColors.liveGreen}18`,
-                                borderRadius: 4,
-                                paddingHorizontal: 5,
-                                paddingVertical: 1.5,
-                                borderWidth: 1,
-                                borderColor: `${AppColors.liveGreen}38`,
-                            }}>
+                            backgroundColor: `${AppColors.liveGreen}18`,
+                            borderRadius: 4,
+                            paddingHorizontal: 5,
+                            paddingVertical: 1.5,
+                            borderWidth: 1,
+                            borderColor: `${AppColors.liveGreen}38`,
+                        }}>
                                   <Text style={{
-                                fontFamily: AppFonts.interBold,
-                                fontSize: 8,
-                                lineHeight: 11,
-                                color: AppColors.green700,
-                                letterSpacing: 0.3,
-                            }}>
+                            fontFamily: AppFonts.interBold,
+                            fontSize: 8,
+                            lineHeight: 11,
+                            color: AppColors.green700,
+                            letterSpacing: 0.3,
+                        }}>
                                     {t('settings.activeBadge')}
                                   </Text>
                                 </View>) : (<View style={{
-                                backgroundColor: `${AppColors.grayTextWeak}18`,
-                                borderRadius: 4,
-                                paddingHorizontal: 5,
-                                paddingVertical: 1.5,
-                                borderWidth: 1,
-                                borderColor: `${AppColors.grayTextWeak}2E`,
-                            }}>
+                            backgroundColor: `${AppColors.grayTextWeak}18`,
+                            borderRadius: 4,
+                            paddingHorizontal: 5,
+                            paddingVertical: 1.5,
+                            borderWidth: 1,
+                            borderColor: `${AppColors.grayTextWeak}2E`,
+                        }}>
                                   <Text style={{
-                                fontFamily: AppFonts.interBold,
-                                fontSize: 8,
-                                lineHeight: 11,
-                                color: AppColors.grayTextWeak,
-                                letterSpacing: 0.3,
-                            }}>
+                            fontFamily: AppFonts.interBold,
+                            fontSize: 8,
+                            lineHeight: 11,
+                            color: AppColors.grayTextWeak,
+                            letterSpacing: 0.3,
+                        }}>
                                     {t('settings.dormantBadge')}
                                   </Text>
                                 </View>)}
                             </View>
 
                             <Text style={{
-                            fontFamily: AppFonts.interRegular,
-                            fontSize: 11,
-                            color: AppColors.grayText,
-                            lineHeight: 15,
-                            marginTop: 1,
-                        }}>
+                        fontFamily: AppFonts.interRegular,
+                        fontSize: 11,
+                        color: AppColors.grayText,
+                        lineHeight: 15,
+                        marginTop: 1,
+                    }}>
                               {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.dividerColor
-                                : AppColors.grayBorderSecondary,
-                            backgroundColor: moduleItem.key === 'apis'
-                                ? `${AppColors.blue500}22`
-                                : isChecked
-                                    ? AppColors.purple
-                                    : AppColors.grayBackground,
-                            alignItems: 'center',
-                            justifyContent: 'center',
-                            shadowColor: isChecked
-                                ? AppColors.purple
-                                : 'transparent',
-                            shadowOpacity: isChecked ? 0.3 : 0,
-                            shadowRadius: 3,
-                            shadowOffset: { width: 0, height: 1 },
-                            elevation: isChecked ? 2 : 0,
-                        }}>
-                          {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>) : 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,
-                            }}>
+                            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,
-                            }}>
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 6,
+                            flex: 1,
+                        }}>
                             <View style={{
-                                width: 6,
-                                height: 6,
-                                borderRadius: 3,
-                                backgroundColor: isChecked
-                                    ? AppColors.liveGreen
-                                    : AppColors.grayTextWeak,
-                            }}/>
+                            width: 6,
+                            height: 6,
+                            borderRadius: 3,
+                            backgroundColor: isChecked
+                                ? AppColors.liveGreen
+                                : AppColors.grayTextWeak,
+                        }}/>
                             <Text style={{
-                                fontFamily: AppFonts.interMedium,
-                                fontSize: 11,
-                                color: AppColors.grayText,
-                                lineHeight: 14,
-                            }}>
+                            fontFamily: AppFonts.interMedium,
+                            fontSize: 11,
+                            color: AppColors.grayText,
+                            lineHeight: 14,
+                        }}>
                               {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`,
-                            }}>
+                            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,
-                            }}>
+                            fontFamily: AppFonts.interBold,
+                            fontSize: 11,
+                            lineHeight: 14,
+                            color: AppColors.purple,
+                        }}>
                               {t('settings.configure')}
                             </Text>
                             <ForwardChevronIcon color={AppColors.purple} size={9}/>
                           </TouchableScale>
                         </View>)}
                     </View>);
-                })}
+            })}
               </View>
 
               {/* Section 3.5: RAM-Based Auto Limits */}
               <View style={{
-                    backgroundColor: AppColors.primaryLight,
-                    borderRadius: 14,
-                    borderWidth: 1,
-                    borderColor: AppColors.grayBorderSecondary,
-                    overflow: 'hidden',
-                    padding: 14,
-                    gap: 12,
-                }}>
+                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,
-                }}>
+                fontFamily: AppFonts.interBold,
+                fontSize: 11,
+                lineHeight: 14,
+                color: AppColors.grayTextWeak,
+                letterSpacing: 0.8,
+            }}>
                   RAM-Based Auto Limits
                 </Text>
 
                 {/* Auto RAM Limit Toggle */}
                 <View style={{
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    justifyContent: 'space-between',
-                }}>
+                flexDirection: 'row',
+                alignItems: 'center',
+                justifyContent: 'space-between',
+            }}>
                   <View style={{
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    gap: 10,
-                    flex: 1,
-                }}>
+                flexDirection: 'row',
+                alignItems: 'center',
+                gap: 10,
+                flex: 1,
+            }}>
                     <View style={{
-                    width: 32,
-                    height: 32,
-                    borderRadius: 8,
-                    backgroundColor: AppColors.purpleShade50,
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                }}>
+                width: 32,
+                height: 32,
+                borderRadius: 8,
+                backgroundColor: AppColors.purpleShade50,
+                alignItems: 'center',
+                justifyContent: 'center',
+            }}>
                       <PerformanceIcon color={AppColors.purple} size={15}/>
                     </View>
                     <View style={{ flex: 1 }}>
                       <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 13.5,
-                    lineHeight: 18,
-                    color: AppColors.primaryBlack,
-                }}>
+                fontFamily: AppFonts.interBold,
+                fontSize: 13.5,
+                lineHeight: 18,
+                color: AppColors.primaryBlack,
+            }}>
                         Auto-Calculate Limits from Device RAM
                       </Text>
                       <Text style={{
-                    fontFamily: AppFonts.interRegular,
-                    fontSize: 11,
-                    lineHeight: 15,
-                    color: AppColors.grayText,
-                    marginTop: 1,
-                }}>
+                fontFamily: AppFonts.interRegular,
+                fontSize: 11,
+                lineHeight: 15,
+                color: AppColors.grayText,
+                marginTop: 1,
+            }}>
                         Automatically set API, Logs, Analytics & Crash limits based on available memory
                       </Text>
                     </View>
                   </View>
 
                   <TouchableScale accessible={true} accessibilityRole="switch" accessibilityLabel="Toggle auto RAM limit calculation" accessibilityState={{ checked: isAutoRamLimitEnabled }} onPress={() => setIsAutoRamLimitEnabled(prev => !prev)} style={{
-                    width: 42,
-                    height: 24,
-                    borderRadius: 12,
-                    backgroundColor: isAutoRamLimitEnabled
-                        ? AppColors.purple
-                        : AppColors.grayBorderSecondary,
-                    padding: 2,
-                    justifyContent: 'center',
-                    alignItems: isAutoRamLimitEnabled ? 'flex-end' : 'flex-start',
-                }}>
+                width: 42,
+                height: 24,
+                borderRadius: 12,
+                backgroundColor: isAutoRamLimitEnabled
+                    ? AppColors.purple
+                    : AppColors.grayBorderSecondary,
+                padding: 2,
+                justifyContent: 'center',
+                alignItems: isAutoRamLimitEnabled ? 'flex-end' : 'flex-start',
+            }}>
                     <View style={{
-                    width: 20,
-                    height: 20,
-                    borderRadius: 10,
-                    backgroundColor: AppColors.white,
-                    shadowColor: AppColors.black,
-                    shadowOpacity: 0.18,
-                    shadowRadius: 2,
-                    shadowOffset: { width: 0, height: 1 },
-                }}/>
+                width: 20,
+                height: 20,
+                borderRadius: 10,
+                backgroundColor: AppColors.white,
+                shadowColor: AppColors.black,
+                shadowOpacity: 0.18,
+                shadowRadius: 2,
+                shadowOffset: { width: 0, height: 1 },
+            }}/>
                   </TouchableScale>
                 </View>
 
@@ -758,58 +761,58 @@ const SettingsPanel = () => {
                 {/* Device Free RAM Display */}
                 <View style={{ flexDirection: 'row', alignItems: 'center', gap: 10 }}>
                   <View style={{
-                    width: 32,
-                    height: 32,
-                    borderRadius: 8,
-                    backgroundColor: isAutoRamLimitEnabled
-                        ? `${AppColors.purple}14`
-                        : AppColors.grayBackground,
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                }}>
+                width: 32,
+                height: 32,
+                borderRadius: 8,
+                backgroundColor: isAutoRamLimitEnabled
+                    ? `${AppColors.purple}14`
+                    : AppColors.grayBackground,
+                alignItems: 'center',
+                justifyContent: 'center',
+            }}>
                     <SignalIcon color={isAutoRamLimitEnabled ? AppColors.purple : AppColors.grayTextWeak} size={15}/>
                   </View>
                   <View style={{ flex: 1 }}>
                     <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 13.5,
-                    lineHeight: 18,
-                    color: isAutoRamLimitEnabled
-                        ? AppColors.primaryBlack
-                        : AppColors.grayText,
-                }}>
+                fontFamily: AppFonts.interBold,
+                fontSize: 13.5,
+                lineHeight: 18,
+                color: isAutoRamLimitEnabled
+                    ? AppColors.primaryBlack
+                    : AppColors.grayText,
+            }}>
                       Detected Free RAM
                     </Text>
                     <Text style={{
-                    fontFamily: AppFonts.interRegular,
-                    fontSize: 11,
-                    lineHeight: 15,
-                    color: AppColors.grayText,
-                    marginTop: 1,
-                }}>
+                fontFamily: AppFonts.interRegular,
+                fontSize: 11,
+                lineHeight: 15,
+                color: AppColors.grayText,
+                marginTop: 1,
+            }}>
                       {deviceFreeRamMb} MB available
                     </Text>
                   </View>
                   <View style={{
-                    paddingHorizontal: 10,
-                    paddingVertical: 5,
-                    borderRadius: 8,
-                    backgroundColor: isAutoRamLimitEnabled
-                        ? `${AppColors.purple}12`
-                        : AppColors.grayBackground,
-                    borderWidth: 1,
-                    borderColor: isAutoRamLimitEnabled
-                        ? `${AppColors.purple}26`
-                        : AppColors.dividerColor,
-                }}>
+                paddingHorizontal: 10,
+                paddingVertical: 5,
+                borderRadius: 8,
+                backgroundColor: isAutoRamLimitEnabled
+                    ? `${AppColors.purple}12`
+                    : AppColors.grayBackground,
+                borderWidth: 1,
+                borderColor: isAutoRamLimitEnabled
+                    ? `${AppColors.purple}26`
+                    : AppColors.dividerColor,
+            }}>
                     <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 12,
-                    lineHeight: 15,
-                    color: isAutoRamLimitEnabled
-                        ? AppColors.purple
-                        : AppColors.grayText,
-                }}>
+                fontFamily: AppFonts.interBold,
+                fontSize: 12,
+                lineHeight: 15,
+                color: isAutoRamLimitEnabled
+                    ? AppColors.purple
+                    : AppColors.grayText,
+            }}>
                       {deviceFreeRamMb} MB
                     </Text>
                   </View>
@@ -818,44 +821,44 @@ const SettingsPanel = () => {
                 {/* Current Auto-Calculated Limits Preview */}
                 {isAutoRamLimitEnabled && (<View style={{ marginTop: 8, paddingTop: 8, borderTopWidth: 1, borderTopColor: AppColors.dividerColor, gap: 6 }}>
                     <Text style={{
-                        fontFamily: AppFonts.interBold,
-                        fontSize: 11.5,
-                        lineHeight: 15,
-                        color: AppColors.purple,
-                    }}>
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 11.5,
+                    lineHeight: 15,
+                    color: AppColors.purple,
+                }}>
                       Auto Profile: {autoRamProfile.profileName}
                     </Text>
                     <View style={{ flexDirection: 'row', flexWrap: 'wrap', gap: 8 }}>
                       {[
-                        { label: 'APIs', value: autoRamProfile.maxNetworkLogs, color: AppColors.blue500 },
-                        { label: 'Logs', value: autoRamProfile.maxConsoleLogs, color: AppColors.sky500 },
-                        { label: 'Analytics', value: autoRamProfile.maxAnalyticsEvents, color: AppColors.purple },
-                        { label: 'Crash', value: autoRamProfile.maxCrashRecords, color: AppColors.errorColor },
-                    ].map(item => (<View key={item.label} style={{
-                            flexDirection: 'row',
-                            alignItems: 'center',
-                            gap: 4,
-                            paddingHorizontal: 8,
-                            paddingVertical: 4,
-                            borderRadius: 6,
-                            backgroundColor: `${item.color}14`,
-                            borderWidth: 1,
-                            borderColor: `${item.color}33`,
-                        }}>
-                          <Text style={{
-                            fontFamily: AppFonts.interBold,
-                            fontSize: 10.5,
-                            lineHeight: 14,
-                            color: item.color,
-                        }}>
+                    { label: 'APIs', value: autoRamProfile.maxNetworkLogs, color: AppColors.blue500 },
+                    { label: 'Logs', value: autoRamProfile.maxConsoleLogs, color: AppColors.sky500 },
+                    { label: 'Analytics', value: autoRamProfile.maxAnalyticsEvents, color: AppColors.purple },
+                    { label: 'Crash', value: autoRamProfile.maxCrashRecords, color: AppColors.errorColor },
+                ].map(item => (<View key={item.label} style={{
+                        flexDirection: 'row',
+                        alignItems: 'center',
+                        gap: 4,
+                        paddingHorizontal: 8,
+                        paddingVertical: 4,
+                        borderRadius: 6,
+                        backgroundColor: `${item.color}14`,
+                        borderWidth: 1,
+                        borderColor: `${item.color}33`,
+                    }}>
+                          <Text style={{
+                        fontFamily: AppFonts.interBold,
+                        fontSize: 10.5,
+                        lineHeight: 14,
+                        color: item.color,
+                    }}>
                             {item.label}
                           </Text>
                           <Text style={{
-                            fontFamily: AppFonts.interBold,
-                            fontSize: 10.5,
-                            lineHeight: 14,
-                            color: item.color,
-                        }}>
+                        fontFamily: AppFonts.interBold,
+                        fontSize: 10.5,
+                        lineHeight: 14,
+                        color: item.color,
+                    }}>
                             {item.value}
                           </Text>
                         </View>))}
@@ -865,184 +868,189 @@ const SettingsPanel = () => {
             </View>) : (<View style={{ gap: 14 }}>
               {/* Section 1: Appearance */}
               <View style={{
-                    backgroundColor: AppColors.primaryLight,
-                    borderRadius: 14,
-                    borderWidth: 1,
-                    borderColor: AppColors.grayBorderSecondary,
-                    overflow: 'hidden',
-                    padding: 14,
-                    gap: 12,
-                }}>
+                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,
-                }}>
+                fontFamily: AppFonts.interBold,
+                fontSize: 11,
+                lineHeight: 14,
+                color: AppColors.grayTextWeak,
+                letterSpacing: 0.8,
+            }}>
                   {t('settings.appearanceTheme')}
                 </Text>
 
                 <View style={{
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    justifyContent: 'space-between',
-                }}>
+                flexDirection: 'row',
+                alignItems: 'center',
+                justifyContent: 'space-between',
+            }}>
                   <View style={{
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    gap: 10,
-                    flex: 1,
-                }}>
+                flexDirection: 'row',
+                alignItems: 'center',
+                gap: 10,
+                flex: 1,
+            }}>
                     <View style={{
-                    width: 32,
-                    height: 32,
-                    borderRadius: 8,
-                    backgroundColor: AppColors.purpleShade50,
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                }}>
+                width: 32,
+                height: 32,
+                borderRadius: 8,
+                backgroundColor: AppColors.purpleShade50,
+                alignItems: 'center',
+                justifyContent: 'center',
+            }}>
                       {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.5,
-                    lineHeight: 18,
-                    color: AppColors.primaryBlack,
-                }}>
+                fontFamily: AppFonts.interBold,
+                fontSize: 13.5,
+                lineHeight: 18,
+                color: AppColors.primaryBlack,
+            }}>
                         {t('settings.general.darkMode')}
                       </Text>
                       <Text style={{
-                    fontFamily: AppFonts.interRegular,
-                    fontSize: 11,
-                    lineHeight: 15,
-                    color: AppColors.grayText,
-                    marginTop: 1,
-                }}>
+                fontFamily: AppFonts.interRegular,
+                fontSize: 11,
+                lineHeight: 15,
+                color: AppColors.grayText,
+                marginTop: 1,
+            }}>
                         {t('settings.general.darkModeDescription')}
                       </Text>
                     </View>
                   </View>
 
                   <TouchableScale accessible={true} accessibilityRole="switch" accessibilityLabel="Toggle Dark Theme" accessibilityState={{ checked: isDark }} onPress={() => {
-                    const newTheme = !isDark;
-                    setIsDark(newTheme);
-                    toggleGlobalTheme(newTheme);
-                }} style={{
-                    width: 42,
-                    height: 24,
-                    borderRadius: 12,
-                    backgroundColor: isDark
-                        ? AppColors.purple
-                        : AppColors.grayBorderSecondary,
-                    padding: 2,
-                    justifyContent: 'center',
-                    alignItems: isDark ? 'flex-end' : 'flex-start',
-                }}>
+                const newTheme = !isDark;
+                setIsDark(newTheme);
+                toggleGlobalTheme(newTheme);
+            }} style={{
+                width: 42,
+                height: 24,
+                borderRadius: 12,
+                backgroundColor: isDark
+                    ? AppColors.purple
+                    : AppColors.grayBorderSecondary,
+                padding: 2,
+                justifyContent: 'center',
+                alignItems: isDark ? 'flex-end' : 'flex-start',
+            }}>
                     <View style={{
-                    width: 20,
-                    height: 20,
-                    borderRadius: 10,
-                    backgroundColor: AppColors.white,
-                    shadowColor: AppColors.black,
-                    shadowOpacity: 0.18,
-                    shadowRadius: 2,
-                    shadowOffset: { width: 0, height: 1 },
-                }}/>
+                width: 20,
+                height: 20,
+                borderRadius: 10,
+                backgroundColor: AppColors.white,
+                shadowColor: AppColors.black,
+                shadowOpacity: 0.18,
+                shadowRadius: 2,
+                shadowOffset: { width: 0, height: 1 },
+            }}/>
                   </TouchableScale>
                 </View>
               </View>
 
               {/* Section 2: Window & Layout */}
               <View style={{
-                    backgroundColor: AppColors.primaryLight,
-                    borderRadius: 14,
-                    borderWidth: 1,
-                    borderColor: AppColors.grayBorderSecondary,
-                    overflow: 'hidden',
-                    padding: 14,
-                    gap: 14,
-                }}>
+                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,
-                }}>
+                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: 10,
-                }}>
+                flexDirection: 'row',
+                alignItems: 'center',
+                justifyContent: 'space-between',
+                gap: 10,
+            }}>
                     <View style={{
-                    width: 32,
-                    height: 32,
-                    borderRadius: 8,
-                    backgroundColor: AppColors.purpleShade50,
+                flexDirection: 'row',
+                alignItems: 'center',
+                gap: 10,
+                flex: 1,
+            }}>
+                      <View style={{
+                width: 32,
+                height: 32,
+                borderRadius: 8,
+                backgroundColor: AppColors.purpleShade50,
+                alignItems: 'center',
+                justifyContent: 'center',
+            }}>
+                        <ScreenIcon color={AppColors.purple} size={15}/>
+                      </View>
+                      <View style={{ flex: 1 }}>
+                        <Text style={{
+                fontFamily: AppFonts.interBold,
+                fontSize: 13.5,
+                lineHeight: 18,
+                color: AppColors.primaryBlack,
+            }}>
+                          {t('settings.general.modalHeight')}
+                        </Text>
+                        <Text style={{
+                fontFamily: AppFonts.interRegular,
+                fontSize: 11,
+                lineHeight: 15,
+                color: AppColors.grayText,
+                marginTop: 1,
+            }}>
+                          {t('settings.general.modalHeightDescription')}
+                        </Text>
+                      </View>
+                    </View>
+
+                    {stagedHeight !== modalHeightPercent && (<TouchableScale onPress={() => {
+                    setModalHeightPercent(stagedHeight);
+                }} style={{
+                    flexDirection: 'row',
                     alignItems: 'center',
-                    justifyContent: 'center',
+                    gap: 5,
+                    backgroundColor: AppColors.purple,
+                    paddingHorizontal: 10,
+                    paddingVertical: 5,
+                    borderRadius: 7,
+                    shadowColor: AppColors.purple,
+                    shadowOffset: { width: 0, height: 1 },
+                    shadowOpacity: 0.28,
+                    shadowRadius: 2,
+                    elevation: 2,
                 }}>
-                      <ScreenIcon color={AppColors.purple} size={15}/>
-                    </View>
-                    <View style={{ flex: 1 }}>
-                      <Text style={{
+                        <CheckIcon size={11} color={AppColors.white}/>
+                        <Text style={{
                     fontFamily: AppFonts.interBold,
-                    fontSize: 13.5,
-                    lineHeight: 18,
-                    color: AppColors.primaryBlack,
-                }}>
-                        {t('settings.general.modalHeight')}
-                      </Text>
-                      <Text style={{
-                    fontFamily: AppFonts.interRegular,
                     fontSize: 11,
-                    lineHeight: 15,
-                    color: AppColors.grayText,
-                    marginTop: 1,
+                    color: AppColors.white,
                 }}>
-                        {t('settings.general.modalHeightDescription')}
-                      </Text>
-                    </View>
+                          Save ({stagedHeight}%)
+                        </Text>
+                      </TouchableScale>)}
                   </View>
 
-                  <View style={{
-                    flexDirection: 'row',
-                    backgroundColor: AppColors.grayBackground,
-                    borderRadius: 10,
-                    padding: 3,
-                    borderWidth: 1,
-                    borderColor: AppColors.dividerColor,
-                }}>
-                    {[50, 70, 90, 100].map(opt => {
-                    const isActive = modalHeightPercent === opt;
-                    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: 7,
-                            alignItems: 'center',
-                            borderRadius: 8,
-                            backgroundColor: isActive
-                                ? AppColors.purple
-                                : 'transparent',
-                        }}>
-                          <Text style={{
-                            fontFamily: AppFonts.interBold,
-                            fontSize: 11.5,
-                            lineHeight: 15,
-                            color: isActive
-                                ? AppColors.white
-                                : AppColors.grayText,
-                        }}>
-                            {opt}%
-                          </Text>
-                        </TouchableScale>);
-                })}
+                  <View style={{ marginTop: 6 }}>
+                    <Slider value={stagedHeight} onValueChange={setStagedHeight} min={50} max={90} step={5} quickPresets={[50, 60, 70, 80, 90]} formatLabel={val => `${Math.round(val)}%`}/>
                   </View>
                 </View>
 
@@ -1051,694 +1059,330 @@ const SettingsPanel = () => {
                 {/* Modal Animation */}
                 <View style={{ gap: 8 }}>
                   <View style={{
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    gap: 10,
-                }}>
+                flexDirection: 'row',
+                alignItems: 'center',
+                gap: 10,
+            }}>
                     <View style={{
-                    width: 32,
-                    height: 32,
-                    borderRadius: 8,
-                    backgroundColor: AppColors.purpleShade50,
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                }}>
+                width: 32,
+                height: 32,
+                borderRadius: 8,
+                backgroundColor: AppColors.purpleShade50,
+                alignItems: 'center',
+                justifyContent: 'center',
+            }}>
                       <MotionIcon color={AppColors.purple} size={15}/>
                     </View>
                     <View style={{ flex: 1 }}>
                       <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 13.5,
-                    lineHeight: 18,
-                    color: AppColors.primaryBlack,
-                }}>
+                fontFamily: AppFonts.interBold,
+                fontSize: 13.5,
+                lineHeight: 18,
+                color: AppColors.primaryBlack,
+            }}>
                         {t('settings.general.modalAnimation')}
                       </Text>
                       <Text style={{
-                    fontFamily: AppFonts.interRegular,
-                    fontSize: 11,
-                    lineHeight: 15,
-                    color: AppColors.grayText,
-                    marginTop: 1,
-                }}>
+                fontFamily: AppFonts.interRegular,
+                fontSize: 11,
+                lineHeight: 15,
+                color: AppColors.grayText,
+                marginTop: 1,
+            }}>
                         {t('settings.general.modalAnimationDescription')}
                       </Text>
                     </View>
                   </View>
 
                   <View style={{
-                    flexDirection: 'row',
-                    backgroundColor: AppColors.grayBackground,
-                    borderRadius: 10,
-                    padding: 3,
-                    borderWidth: 1,
-                    borderColor: AppColors.dividerColor,
-                }}>
+                flexDirection: 'row',
+                backgroundColor: AppColors.grayBackground,
+                borderRadius: 10,
+                padding: 3,
+                borderWidth: 1,
+                borderColor: AppColors.dividerColor,
+            }}>
                     {[
-                    { key: 'slide', label: 'Slide Up' },
-                    { key: 'fade', label: 'Fade' },
-                    { key: 'none', label: 'None' },
-                ].map(opt => {
-                    const isActive = modalAnimationType === opt.key;
-                    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: 7,
-                            alignItems: 'center',
-                            borderRadius: 8,
-                            backgroundColor: isActive
-                                ? AppColors.purple
-                                : 'transparent',
-                        }}>
+                { key: 'slide', label: 'Slide Up' },
+                { key: 'fade', label: 'Fade' },
+                { key: 'none', label: 'None' },
+            ].map(opt => {
+                const isActive = modalAnimationType === opt.key;
+                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: 7,
+                        alignItems: 'center',
+                        borderRadius: 8,
+                        backgroundColor: isActive
+                            ? AppColors.purple
+                            : 'transparent',
+                    }}>
                           <Text style={{
-                            fontFamily: AppFonts.interBold,
-                            fontSize: 11.5,
-                            lineHeight: 15,
-                            color: isActive
-                                ? AppColors.white
-                                : AppColors.grayText,
-                        }}>
+                        fontFamily: AppFonts.interBold,
+                        fontSize: 11.5,
+                        lineHeight: 15,
+                        color: isActive
+                            ? AppColors.white
+                            : AppColors.grayText,
+                    }}>
                             {opt.label}
                           </Text>
                         </TouchableScale>);
-                })}
+            })}
                   </View>
                 </View>
               </View>
 
               {/* Section 3: Default Startup Tab */}
               <View style={{
-                    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,
-                }}>
+                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: 10,
-                }}>
+                flexDirection: 'row',
+                alignItems: 'center',
+                gap: 10,
+            }}>
                   <View style={{
-                    width: 32,
-                    height: 32,
-                    borderRadius: 8,
-                    backgroundColor: AppColors.purpleShade50,
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                }}>
+                width: 32,
+                height: 32,
+                borderRadius: 8,
+                backgroundColor: AppColors.purpleShade50,
+                alignItems: 'center',
+                justifyContent: 'center',
+            }}>
                     <LayersIcon color={AppColors.purple} size={15}/>
                   </View>
                   <View style={{ flex: 1 }}>
                     <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 13.5,
-                    lineHeight: 18,
-                    color: AppColors.primaryBlack,
-                }}>
+                fontFamily: AppFonts.interBold,
+                fontSize: 13.5,
+                lineHeight: 18,
+                color: AppColors.primaryBlack,
+            }}>
                       {t('settings.general.defaultOpeningTab')}
                     </Text>
                     <Text style={{
-                    fontFamily: AppFonts.interRegular,
-                    fontSize: 11,
-                    lineHeight: 15,
-                    color: AppColors.grayText,
-                    marginTop: 1,
-                }}>
+                fontFamily: AppFonts.interRegular,
+                fontSize: 11,
+                lineHeight: 15,
+                color: AppColors.grayText,
+                marginTop: 1,
+            }}>
                       {t('settings.general.defaultOpeningTabDesc')}
                     </Text>
                   </View>
                 </View>
 
-                {/* Grid of Default Tab Cards */}
-                <View style={{
-                    flexDirection: 'row',
-                    flexWrap: 'wrap',
-                    gap: 8,
-                    marginTop: 4,
-                }}>
-                  {allModules
-                    .filter(tab => tab.key === 'apis' ||
-                    stagedTabVisibility?.[tab.key] ||
-                    tabVisibility?.[tab.key])
-                    .map(tab => {
-                    const isActive = defaultTab === tab.key;
-                    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,
-                            paddingVertical: 10,
-                            paddingHorizontal: 12,
-                            borderRadius: 10,
-                            borderWidth: 1.5,
-                            borderColor: isActive
-                                ? AppColors.purple
-                                : AppColors.grayBorderSecondary,
-                            backgroundColor: isActive
-                                ? `${AppColors.purple}0F`
-                                : AppColors.primaryLight,
-                            minWidth: '47%',
-                            flex: 1,
-                        }}>
-                          <Text style={{
-                            fontFamily: AppFonts.interBold,
-                            fontSize: 12.5,
-                            lineHeight: 16,
-                            color: isActive
-                                ? AppColors.purple
-                                : AppColors.primaryBlack,
-                            flex: 1,
-                        }}>
-                            {tab.label}
-                          </Text>
-                          {isActive && (<View style={{
-                                width: 16,
-                                height: 16,
-                                borderRadius: 8,
-                                backgroundColor: AppColors.purple,
-                                alignItems: 'center',
-                                justifyContent: 'center',
-                            }}>
-                              <CheckIcon size={9} color={AppColors.white}/>
-                            </View>)}
-                        </TouchableScale>);
-                })}
-                </View>
-              </View>
-
-              {/* Section 4: Log Deduplication & Levels */}
-              <View style={{
-                    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>
-
-                {/* Show Duplicate Logs */}
-                <View style={{
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    justifyContent: 'space-between',
-                }}>
-                  <View style={{
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    gap: 10,
-                    flex: 1,
-                }}>
+                {/* Sleek Interactive Dropdown Picker */}
+                <View style={{ marginTop: 6, gap: 6 }}>
+                  <TouchableScale accessible={true} accessibilityRole="button" accessibilityLabel={`Default opening tab: ${allModules.find(m => m.key === defaultTab)?.label || 'APIs'}`} onPress={() => setIsDefaultTabDropdownOpen(prev => !prev)} style={{
+                flexDirection: 'row',
+                alignItems: 'center',
+                justifyContent: 'space-between',
+                backgroundColor: AppColors.grayBackground,
+                borderRadius: 10,
+                borderWidth: 1.5,
+                borderColor: isDefaultTabDropdownOpen
+                    ? AppColors.purple
+                    : AppColors.grayBorderSecondary,
+                paddingHorizontal: 14,
+                paddingVertical: 11,
+            }}>
                     <View style={{
-                    width: 32,
-                    height: 32,
-                    borderRadius: 8,
-                    backgroundColor: AppColors.purpleShade50,
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                }}>
-                      <EyeIcon color={AppColors.purple} size={15}/>
-                    </View>
-                    <View style={{ flex: 1 }}>
-                      <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 13.5,
-                    lineHeight: 18,
-                    color: AppColors.primaryBlack,
-                }}>
-                        {t('settings.general.duplicateLogs')}
-                      </Text>
+                flexDirection: 'row',
+                alignItems: 'center',
+                gap: 10,
+                flex: 1,
+            }}>
+                      <View style={{
+                width: 8,
+                height: 8,
+                borderRadius: 4,
+                backgroundColor: AppColors.purple,
+            }}/>
                       <Text style={{
-                    fontFamily: AppFonts.interRegular,
-                    fontSize: 11,
-                    lineHeight: 15,
-                    color: AppColors.grayText,
-                    marginTop: 1,
-                }}>
-                        {t('settings.general.duplicateLogsDescription')}
+                fontFamily: AppFonts.interBold,
+                fontSize: 13.5,
+                lineHeight: 18,
+                color: AppColors.primaryBlack,
+            }}>
+                        {allModules.find(m => m.key === defaultTab)?.label || 'APIs (Network)'}
                       </Text>
+                      <View style={{
+                backgroundColor: `${AppColors.purple}14`,
+                paddingHorizontal: 6,
+                paddingVertical: 1.5,
+                borderRadius: 6,
+            }}>
+                        <Text style={{
+                fontFamily: AppFonts.interBold,
+                fontSize: 8.5,
+                color: AppColors.purple,
+            }}>
+                          DEFAULT
+                        </Text>
+                      </View>
                     </View>
-                  </View>
 
-                  <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',
-                }}>
                     <View style={{
-                    width: 20,
-                    height: 20,
-                    borderRadius: 10,
-                    backgroundColor: AppColors.white,
-                    shadowColor: AppColors.black,
-                    shadowOpacity: 0.18,
-                    shadowRadius: 2,
-                    shadowOffset: { width: 0, height: 1 },
-                }}/>
+                transform: [
+                    { rotate: isDefaultTabDropdownOpen ? '180deg' : '0deg' },
+                ],
+            }}>
+                      <ChevronDownIcon color={AppColors.grayText} size={15}/>
+                    </View>
                   </TouchableScale>
-                </View>
-
-                <View style={{ height: 1, backgroundColor: AppColors.dividerColor }}/>
 
-                {/* Console Log Levels */}
-                <View style={{ gap: 8 }}>
-                  <View style={{
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    gap: 10,
-                }}>
-                    <View style={{
-                    width: 32,
-                    height: 32,
-                    borderRadius: 8,
-                    backgroundColor: AppColors.purpleShade50,
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                }}>
-                      <TerminalIcon color={AppColors.purple} size={15}/>
-                    </View>
-                    <View style={{ flex: 1 }}>
-                      <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 13.5,
-                    lineHeight: 18,
-                    color: AppColors.primaryBlack,
-                }}>
-                        {t('settings.general.activeConsoleLogLevels')}
-                      </Text>
-                      <Text style={{
-                    fontFamily: AppFonts.interRegular,
-                    fontSize: 11,
-                    lineHeight: 15,
-                    color: AppColors.grayText,
-                    marginTop: 1,
+                  {/* Dropdown Options List */}
+                  {isDefaultTabDropdownOpen && (<View style={{
+                    backgroundColor: AppColors.primaryLight,
+                    borderRadius: 10,
+                    borderWidth: 1,
+                    borderColor: AppColors.grayBorderSecondary,
+                    overflow: 'hidden',
+                    shadowColor: AppColors.black,
+                    shadowOpacity: 0.08,
+                    shadowRadius: 6,
+                    shadowOffset: { width: 0, height: 3 },
+                    elevation: 4,
                 }}>
-                        {t('settings.general.activeConsoleLogLevelsDesc')}
-                      </Text>
-                    </View>
-                  </View>
-
-                  <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} accessible={true} accessibilityRole="checkbox" accessibilityLabel={`Toggle ${level.label} logs`} accessibilityState={{ checked: isActive }} onPress={() => setShowConsoleLevels(prev => ({
-                            ...prev,
-                            [level.key]: !prev[level.key],
-                        }))} style={{
-                            flex: 1,
+                      {allModules
+                    .filter(tab => tab.key === 'apis' ||
+                    stagedTabVisibility?.[tab.key] ||
+                    tabVisibility?.[tab.key])
+                    .map((tab, idx, arr) => {
+                    const isActive = defaultTab === tab.key;
+                    const isLast = idx === arr.length - 1;
+                    return (<TouchableScale key={tab.key} accessible={true} accessibilityRole="button" accessibilityLabel={`Select ${tab.label} as default tab`} onPress={() => {
+                            setDefaultTab(tab.key);
+                            setIsDefaultTabDropdownOpen(false);
+                        }} style={{
                             flexDirection: 'row',
                             alignItems: 'center',
-                            justifyContent: 'center',
-                            gap: 6,
-                            paddingVertical: 8,
-                            borderRadius: 9,
-                            borderWidth: 1.5,
-                            borderColor: isActive
-                                ? level.color
-                                : AppColors.grayBorderSecondary,
+                            justifyContent: 'space-between',
+                            paddingHorizontal: 14,
+                            paddingVertical: 11,
                             backgroundColor: isActive
-                                ? `${level.color}0D`
-                                : AppColors.primaryLight,
+                                ? `${AppColors.purple}0F`
+                                : 'transparent',
+                            borderBottomWidth: isLast ? 0 : 1,
+                            borderBottomColor: AppColors.dividerColor,
                         }}>
-                          <View style={{
-                            width: 8,
-                            height: 8,
-                            borderRadius: 4,
+                              <View style={{
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 10,
+                        }}>
+                                <View style={{
+                            width: 6,
+                            height: 6,
+                            borderRadius: 3,
                             backgroundColor: isActive
-                                ? level.color
-                                : AppColors.grayBorderSecondary,
+                                ? AppColors.purple
+                                : AppColors.grayTextWeak,
                         }}/>
-                          <Text style={{
-                            fontFamily: AppFonts.interBold,
-                            fontSize: 11.5,
-                            lineHeight: 15,
+                                <Text style={{
+                            fontFamily: isActive
+                                ? AppFonts.interBold
+                                : AppFonts.interMedium,
+                            fontSize: 13,
                             color: isActive
-                                ? level.color
-                                : AppColors.grayText,
+                                ? AppColors.purple
+                                : AppColors.primaryBlack,
                         }}>
-                            {level.label}
-                          </Text>
-                        </TouchableScale>);
+                                  {tab.label}
+                                </Text>
+                              </View>
+                              {isActive && (<CheckIcon size={14} color={AppColors.purple}/>)}
+                            </TouchableScale>);
                 })}
-                  </View>
+                    </View>)}
                 </View>
               </View>
-
-              {/* 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',
-                    gap: 12,
-                }}>
-                <View style={{
-                    width: 34,
-                    height: 34,
-                    borderRadius: 9,
-                    backgroundColor: `${AppColors.errorColor}14`,
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                }}>
-                  <TrashIcon color={AppColors.errorColor} size={15}/>
-                </View>
-                <View style={{ flex: 1 }}>
-                  <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 13.5,
-                    lineHeight: 18,
-                    color: AppColors.primaryBlack,
-                }}>
-                    {t('settings.resetSettings')}
-                  </Text>
-                  <Text style={{
-                    fontFamily: AppFonts.interRegular,
-                    fontSize: 11,
-                    lineHeight: 15,
-                    color: AppColors.grayText,
-                    marginTop: 1,
-                }}>
-                    {t('settings.resetSettingsDesc')}
-                  </Text>
-                </View>
-
-                <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}38`,
-                }}>
-                  <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 11.5,
-                    lineHeight: 15,
-                    color: AppColors.errorColor,
-                }}>
-                    {t('settings.reset')}
-                  </Text>
-                </TouchableScale>
-              </View>
             </View>)}
-
-          {/* Storage & Engine Status Card */}
-          <View style={{
-                backgroundColor: isPersistent
-                    ? `${AppColors.liveGreen}12`
-                    : `${AppColors.amber600}12`,
-                borderRadius: 12,
-                borderWidth: 1,
-                borderColor: isPersistent
-                    ? `${AppColors.liveGreen}33`
-                    : `${AppColors.amber600}33`,
-                padding: 12,
-                marginBottom: 10,
-                flexDirection: 'row',
-                alignItems: 'center',
-                gap: 10,
-            }}>
-            <View style={{
-                width: 8,
-                height: 8,
-                borderRadius: 4,
-                backgroundColor: isPersistent
-                    ? AppColors.green500
-                    : AppColors.amber600,
-            }}/>
-            <View style={{ flex: 1 }}>
-              <Text style={{
-                fontFamily: AppFonts.interBold,
-                fontSize: 12,
-                lineHeight: 16,
-                color: isPersistent
-                    ? AppColors.green700
-                    : AppColors.amber800,
-            }}>
-                {isPersistent
-                ? t('settings.general.storageStatusEnabled', {
-                    type: storage ? 'Custom Storage' : 'iOS NSUserDefaults',
-                })
-                : t('settings.general.storageStatusDisabled')}
-              </Text>
-              <Text style={{
-                fontFamily: AppFonts.interRegular,
-                fontSize: 10.5,
-                lineHeight: 14,
-                color: isPersistent
-                    ? AppColors.green800
-                    : AppColors.amber800,
-                marginTop: 2,
-                opacity: 0.85,
-            }}>
-                {isPersistent
-                ? t('settings.general.storageStatusEnabledDesc')
-                : t('settings.general.storageStatusDisabledDesc')}
-              </Text>
-            </View>
-          </View>
+          <View style={{ height: 48 }}/>
         </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,
-                }}>
+                paddingHorizontal: 16,
+                paddingTop: 12,
+                paddingBottom: Platform.OS === 'ios' ? 36 : 24,
+                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,
-                }}>
+                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,
-                }}>
+                fontFamily: AppFonts.interRegular,
+                fontSize: 11,
+                lineHeight: 15,
+                color: hasUnsavedChanges
+                    ? AppColors.purple
+                    : AppColors.grayText,
+                marginTop: 1,
+            }}>
                 {hasUnsavedChanges
-                    ? t('settings.unsavedPending')
-                    : t('settings.allSynchronized')}
+                ? 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 = () => {
-        animateNextLayout();
-        setSettingsPage('main');
-    };
-    // Helper: settings row with icon + label + optional description
-    const renderSettingRow = (opts) => {
-        return (<View style={{
-                paddingVertical: 12,
-                borderBottomWidth: opts.isLast ? 0 : 1,
-                borderBottomColor: AppColors.dividerColor,
-            }}>
-        <TouchableScale disabled={!opts.onPress} onPress={opts.onPress} style={{
                 flexDirection: 'row',
                 alignItems: 'center',
-                gap: 12,
-            }}>
-          <View style={{
-                width: 36,
-                height: 36,
+                gap: 6,
+                backgroundColor: hasUnsavedChanges
+                    ? AppColors.purple
+                    : `${AppColors.purple}22`,
+                paddingHorizontal: 18,
+                paddingVertical: 10,
                 borderRadius: 10,
-                backgroundColor: AppColors.purpleShade50,
-                borderWidth: 1,
-                borderColor: `${AppColors.purple}2E`,
-                alignItems: 'center',
-                justifyContent: 'center',
             }}>
-            {opts.icon}
-          </View>
-          <View style={{ flex: 1 }}>
-            <Text style={{
+              <CheckIcon size={14} color={hasUnsavedChanges ? AppColors.white : AppColors.purple}/>
+              <Text style={{
                 fontFamily: AppFonts.interBold,
-                fontSize: 14,
-                lineHeight: 18,
-                color: AppColors.primaryBlack,
+                fontSize: 13,
+                lineHeight: 17,
+                color: hasUnsavedChanges ? AppColors.white : AppColors.purple,
             }}>
-              {opts.label}
-            </Text>
-            {opts.description ? (<Text style={{
-                    fontFamily: AppFonts.interRegular,
-                    fontSize: 11,
-                    lineHeight: 15,
-                    color: AppColors.grayText,
-                    marginTop: 1,
-                }}>
-                {opts.description}
-              </Text>) : null}
-          </View>
-          {opts.right || null}
-        </TouchableScale>
-        {opts.numericInput && (<View style={{ marginTop: 10, gap: 6 }}>
-            <View style={{
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    backgroundColor: AppColors.grayBackground,
-                    borderRadius: 8,
-                    borderWidth: 1,
-                    borderColor: AppColors.dividerColor,
-                    paddingHorizontal: 12,
-                    paddingVertical: 4,
-                }}>
-              <TextInput style={{
-                    flex: 1,
-                    fontFamily: AppFonts.interMedium,
-                    fontSize: 14,
-                    lineHeight: 18,
-                    color: AppColors.primaryBlack,
-                    paddingVertical: 6,
-                }} value={String(opts.numericInput.value || '')} onChangeText={text => {
-                    const num = parseInt(text.replace(/[^0-9]/g, ''), 10);
-                    if (!isNaN(num)) {
-                        const clamped = Math.max(opts.numericInput?.min ?? 1, Math.min(opts.numericInput?.max ?? 10000, num));
-                        opts.numericInput?.onChange(clamped);
-                    }
-                }} keyboardType={opts.numericInput.keyboardType ?? 'number-pad'} placeholder={opts.numericInput.placeholder} placeholderTextColor={AppColors.grayTextWeak} maxLength={6} selectTextOnFocus/>
-              <Text style={{
-                    fontFamily: AppFonts.interBold,
-                    fontSize: 11,
-                    color: AppColors.purple,
-                    marginLeft: 6,
-                }}>
-                MAX
+                {t('settings.saveChanges')}
               </Text>
-            </View>
-            {opts.numericInput.min !== undefined || opts.numericInput.max !== undefined ? (<Text style={{
-                        fontFamily: AppFonts.interRegular,
-                        fontSize: 10,
-                        lineHeight: 13,
-                        color: AppColors.grayTextWeak,
-                    }}>
-                Range: {opts.numericInput.min ?? 1} - {opts.numericInput.max ?? '∞'}
-              </Text>) : null}
-          </View>)}
-        {opts.picker && (<View style={{
-                    flexDirection: 'row',
-                    backgroundColor: AppColors.grayBackground,
-                    borderRadius: 8,
-                    padding: 2.5,
-                    marginTop: 10,
-                    borderWidth: 1,
-                    borderColor: AppColors.dividerColor,
-                }}>
-            {opts.picker.options.map(opt => {
-                    const isActive = opts.picker.selectedValue === opt;
-                    return (<TouchableScale key={String(opt)} onPress={() => opts.picker.onSelect(opt)} style={{
-                            flex: 1,
-                            paddingVertical: 6,
-                            alignItems: 'center',
-                            borderRadius: 6,
-                            backgroundColor: isActive
-                                ? AppColors.purple
-                                : 'transparent',
-                        }}>
-                  <Text style={{
-                            fontFamily: AppFonts.interBold,
-                            fontSize: 11,
-                            lineHeight: 14,
-                            color: isActive ? AppColors.white : AppColors.grayText,
-                        }}>
-                    {opts.picker.formatLabel
-                            ? opts.picker.formatLabel(opt)
-                            : opt}
-                  </Text>
-                </TouchableScale>);
-                })}
+            </TouchableScale>
           </View>)}
       </View>);
-    };
     let content = null;
     let title = '';
     let icon = null;
@@ -1747,7 +1391,7 @@ const SettingsPanel = () => {
         title = t('settings.apis.title');
         icon = <SignalIcon color={AppColors.white} size={16}/>;
         rightInfo = t('settings.apis.total', { count: logs.length });
-        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, paddingBottom: 100, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
@@ -1763,8 +1407,8 @@ const SettingsPanel = () => {
                     value: maxNetworkLogs,
                     onChange: setMaxNetworkLogs,
                     min: 10,
-                    max: 5000,
-                    placeholder: 'Enter max requests (10-5000)',
+                    max: 100,
+                    placeholder: 'Enter max requests (10-100)',
                 },
                 isLast: true,
             })}
@@ -1806,13 +1450,14 @@ const SettingsPanel = () => {
               </View>),
             })}
         </View>
+        <View style={{ height: 48 }}/>
       </ScrollView>);
     }
     else if (settingsPage === 'logs') {
         title = t('settings.logs.title');
         icon = <TerminalIcon color={AppColors.white} size={16}/>;
         rightInfo = t('settings.logs.total', { count: consoleLogs.length });
-        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, paddingBottom: 100, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
@@ -1829,8 +1474,8 @@ const SettingsPanel = () => {
                     value: maxConsoleLogs,
                     onChange: setMaxConsoleLogs,
                     min: 10,
-                    max: 10000,
-                    placeholder: 'Enter max logs (10-10000)',
+                    max: 100,
+                    placeholder: 'Enter max logs (10-100)',
                 },
             })}
           <View style={{ height: 1, backgroundColor: AppColors.dividerColor }}/>
@@ -1894,6 +1539,96 @@ const SettingsPanel = () => {
             })}
         </View>
 
+        {/* Log Deduplication Card */}
+        <View style={{
+                backgroundColor: AppColors.primaryLight,
+                borderRadius: 14,
+                borderWidth: 1,
+                borderColor: AppColors.grayBorderSecondary,
+                overflow: 'hidden',
+                padding: 16,
+                gap: 14,
+            }}>
+          <Text style={{
+                fontFamily: AppFonts.interBold,
+                fontSize: 11,
+                lineHeight: 14,
+                color: AppColors.grayTextWeak,
+                letterSpacing: 0.8,
+            }}>
+            {t('settings.logFiltersDeduplication')}
+          </Text>
+
+          {/* Show Duplicate Logs */}
+          <View style={{
+                flexDirection: 'row',
+                alignItems: 'center',
+                justifyContent: 'space-between',
+            }}>
+            <View style={{
+                flexDirection: 'row',
+                alignItems: 'center',
+                gap: 10,
+                flex: 1,
+            }}>
+              <View style={{
+                width: 32,
+                height: 32,
+                borderRadius: 8,
+                backgroundColor: AppColors.purpleShade50,
+                alignItems: 'center',
+                justifyContent: 'center',
+            }}>
+                <EyeIcon color={AppColors.purple} size={15}/>
+              </View>
+              <View style={{ flex: 1 }}>
+                <Text style={{
+                fontFamily: AppFonts.interBold,
+                fontSize: 13.5,
+                lineHeight: 18,
+                color: AppColors.primaryBlack,
+            }}>
+                  {t('settings.general.duplicateLogs')}
+                </Text>
+                <Text style={{
+                fontFamily: AppFonts.interRegular,
+                fontSize: 11,
+                lineHeight: 15,
+                color: AppColors.grayText,
+                marginTop: 1,
+            }}>
+                  {t('settings.general.duplicateLogsDescription')}
+                </Text>
+              </View>
+            </View>
+
+            <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',
+            }}>
+              <View style={{
+                width: 20,
+                height: 20,
+                borderRadius: 10,
+                backgroundColor: AppColors.white,
+                shadowColor: AppColors.black,
+                shadowOpacity: 0.18,
+                shadowRadius: 2,
+                shadowOffset: { width: 0, height: 1 },
+            }}/>
+            </TouchableScale>
+          </View>
+        </View>
+
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 borderRadius: 14,
@@ -1929,13 +1664,14 @@ const SettingsPanel = () => {
               </View>),
             })}
         </View>
+        <View style={{ height: 48 }}/>
       </ScrollView>);
     }
     else if (settingsPage === 'analytics') {
         title = t('settings.analytics.title');
         icon = <AnalyticsIcon color={AppColors.white} size={16}/>;
         rightInfo = t('settings.analytics.total', { count: analyticsEvents.length });
-        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, paddingBottom: 100, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
@@ -1951,8 +1687,8 @@ const SettingsPanel = () => {
                     value: maxAnalyticsEventsLimit,
                     onChange: setMaxAnalyticsEventsLimit,
                     min: 10,
-                    max: 5000,
-                    placeholder: 'Enter max events (10-5000)',
+                    max: 75,
+                    placeholder: 'Enter max events (10-75)',
                 },
                 isLast: true,
             })}
@@ -1993,13 +1729,14 @@ const SettingsPanel = () => {
               </View>),
             })}
         </View>
+        <View style={{ height: 48 }}/>
       </ScrollView>);
     }
     else if (settingsPage === 'redux') {
         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 }}>
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, paddingBottom: 100, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
@@ -2081,13 +1818,14 @@ const SettingsPanel = () => {
               </View>),
             })}
         </View>
+        <View style={{ height: 48 }}/>
       </ScrollView>);
     }
     else if (settingsPage === 'crash') {
         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, gap: 12 }}>
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, paddingBottom: 100, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
@@ -2104,8 +1842,8 @@ const SettingsPanel = () => {
                     value: maxCrashLogs,
                     onChange: setMaxCrashLogs,
                     min: 5,
-                    max: 500,
-                    placeholder: 'Enter max crashes (5-500)',
+                    max: 50,
+                    placeholder: 'Enter max crashes (5-50)',
                 },
             })}
           <View style={{ height: 1, backgroundColor: AppColors.dividerColor }}/>
@@ -2167,13 +1905,14 @@ const SettingsPanel = () => {
               </View>),
             })}
         </View>
+        <View style={{ height: 48 }}/>
       </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 }}>
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, paddingBottom: 100, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
@@ -2250,13 +1989,14 @@ const SettingsPanel = () => {
               </View>),
             })}
         </View>
+        <View style={{ height: 48 }}/>
       </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 }}>
+        content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, paddingBottom: 100, gap: 12 }}>
         <View style={{
                 backgroundColor: AppColors.primaryLight,
                 padding: 16,
@@ -2333,65 +2073,51 @@ const SettingsPanel = () => {
               </View>),
             })}
         </View>
+        <View style={{ height: 48 }}/>
       </ScrollView>);
     }
+    const subPageAnim = useRef(new Animated.Value(0)).current;
+    useEffect(() => {
+        if (settingsPage !== 'main') {
+            subPageAnim.setValue(0);
+            Animated.spring(subPageAnim, {
+                toValue: 1,
+                friction: 8,
+                tension: 65,
+                useNativeDriver: true,
+            }).start();
+        }
+    }, [settingsPage]);
     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 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={{
-                width: 30,
-                height: 30,
-                borderRadius: 8,
-                backgroundColor: `${AppColors.white}26`,
-                alignItems: 'center',
-                justifyContent: 'center',
-            }}>
-                {icon}
-              </View>)}
-            <View style={{ flex: 1 }}>
-              <Text style={{
-            fontFamily: AppFonts.interBold,
-            fontSize: 17,
-            lineHeight: 22,
-            color: AppColors.white,
-        }}>
-                {title}
-              </Text>
-            </View>
-            {rightInfo ? (<View style={{
-                backgroundColor: `${AppColors.white}26`,
-                paddingHorizontal: 8,
-                paddingVertical: 4,
-                borderRadius: 8,
-                borderWidth: 1,
-                borderColor: `${AppColors.white}1A`,
-            }}>
-                <Text style={{
-                fontFamily: AppFonts.interBold,
-                fontSize: 11,
-                lineHeight: 14,
-                color: AppColors.white,
-            }}>
-                  {rightInfo}
-                </Text>
-              </View>) : null}
-          </View>
-        </View>
-      </LinearGradient>
-      {content}
+      {/* ─── Persistent Main Settings (Retains 100% scroll position) ─── */}
+      <View style={[
+            StyleSheet.absoluteFill,
+            settingsPage !== 'main' && { pointerEvents: 'none' },
+        ]}>
+        {renderMainSettingsContent()}
+      </View>
+
+      {/* ─── Sub-module Settings Overlay (Smooth Animated Slide) ─── */}
+      {settingsPage !== 'main' && (<Animated.View style={[
+                StyleSheet.absoluteFill,
+                {
+                    backgroundColor: AppColors.grayBackground,
+                    opacity: subPageAnim,
+                    transform: [
+                        {
+                            translateX: subPageAnim.interpolate({
+                                inputRange: [0, 1],
+                                outputRange: [30, 0],
+                            }),
+                        },
+                    ],
+                },
+            ]}>
+          {content}
+        </Animated.View>)}
     </View>);
 };
 export default SettingsPanel;