react-native-inapp-inspector 1.1.2 → 1.1.4

package/dist/esm/index.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useRef, useState, useCallback } from 'react';
-import { Alert, Animated, StyleSheet, FlatList, LayoutAnimation, Modal, PanResponder, Platform, Pressable, ScrollView, Text, TextInput, View, Linking, Image, InteractionManager, ActivityIndicator, StatusBar, TouchableOpacity, UIManager, LogBox, } from 'react-native';
+import { Alert, Animated, StyleSheet, FlatList, LayoutAnimation, Modal, PanResponder, Platform, Pressable, ScrollView, Text, TextInput, View, Linking, Image, InteractionManager, ActivityIndicator, StatusBar, TouchableOpacity, UIManager, LogBox, SafeAreaView, } from 'react-native';
 import Svg, { Circle, Path } from 'react-native-svg';
 import LinearGradient from 'react-native-linear-gradient';
 import { useNavigationState, NavigationContext } from '@react-navigation/native';
@@ -23,8 +23,10 @@ import CodeSnippet from './components/CodeSnippet';
 import AnimatedEntrance from './components/AnimatedEntrance';
 // Helpers
 import { formatDateTime, getStatusColor, getNavigationInfo, deduplicateLogs, getDomainColor, formatDisplayUrl, getFetchCommand, getCurlCommand, getSize, } from './helpers';
+// #5 — settings persistence
+import { loadSettings, saveSettings, setCustomStorage, isPersistentStorageAvailable, clearPersistedSettings, } from './helpers/settingsStore';
 // Assets
-import { EmptyRadarIcon, FailIcon, SearchIcon, ScreenIcon, ClearIcon, SortArrowIcon, FilterIcon, InsightsIcon, GlobeIcon, DownloadIcon, CloseWhite, TrashIcon, WhiteBackNavigation, TerminalIcon, SignalIcon, AnalyticsIcon, SunIcon, MoonIcon, BrandCircleIcon, BrandSquareIcon, HtmlIcon, CssIcon, JsIcon, ClockIcon, EyeIcon, CheckIcon, SettingsIcon, RequestIcon, ResponseIcon, HeadersIcon, StatusIcon, ChevronIcon, } from './components/NetworkIcons';
+import { EmptyRadarIcon, FailIcon, SearchIcon, ScreenIcon, ClearIcon, SortArrowIcon, FilterIcon, InsightsIcon, GlobeIcon, DownloadIcon, CloseWhite, TrashIcon, WhiteBackNavigation, TerminalIcon, SignalIcon, AnalyticsIcon, SunIcon, MoonIcon, BrandCircleIcon, BrandSquareIcon, HtmlIcon, CssIcon, JsIcon, ClockIcon, EyeIcon, CheckIcon, SettingsIcon, RequestIcon, ResponseIcon, HeadersIcon, StatusIcon, ChevronIcon, WipeIcon, LayersIcon, UserIcon, InfoCircleIcon, WarningTriangleIcon, ErrorCircleIcon, TrendingUpIcon, } from './components/NetworkIcons';
 import ErrorBoundary from './components/ErrorBoundary';
 // Stylesheet
 import { AppColors } from './styles/AppColors';
@@ -111,7 +113,9 @@ const NavigationTracker = ({ onStateChange }) => {
 const animateNextLayout = () => {
     LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
 };
-const NetworkInspector = ({ enabled = true, }) => {
+const NetworkInspector = ({ enabled = true, storage, }) => {
+    // Set custom storage synchronously during render phase
+    setCustomStorage(storage || null);
     const [isDark, setIsDark] = useState(false);
     const [reduxState, setReduxState] = useState(null);
     // Action timeline + per-reducer last action are kept in component state so the
@@ -193,11 +197,11 @@ const NetworkInspector = ({ enabled = true, }) => {
     const visibleConsoleLogs = useMemo(() => {
         const filtered = consoleLogs.filter(log => {
             const type = log.type;
-            if (type === 'info' && !showConsoleLevels.info)
+            if (type === 'info' && !showConsoleLevels?.info)
                 return false;
-            if (type === 'warn' && !showConsoleLevels.warn)
+            if (type === 'warn' && !showConsoleLevels?.warn)
                 return false;
-            if (type === 'error' && !showConsoleLevels.error)
+            if (type === 'error' && !showConsoleLevels?.error)
                 return false;
             const message = log.message || '';
             const allPrefixes = [
@@ -227,9 +231,9 @@ const NetworkInspector = ({ enabled = true, }) => {
         insights: true,
         apis: true,
         logs: true,
-        analytics: true,
-        webview: true,
-        redux: true,
+        analytics: false,
+        webview: false,
+        redux: false,
     });
     const [maxNetworkLogs, setMaxNetworkLogs] = useState(100);
     const [webViewCaptureCssJs, setWebViewCaptureCssJs] = useState(true);
@@ -237,6 +241,168 @@ const NetworkInspector = ({ enabled = true, }) => {
     const [reduxExpandDepth, setReduxExpandDepth] = useState(1);
     const [slowRequestThreshold, setSlowRequestThreshold] = useState(1000);
     const [insightsShowConsoleAlerts, setInsightsShowConsoleAlerts] = useState(true);
+    // #6 — tab the inspector opens on. Shown with a DEFAULT badge in Settings.
+    const [defaultTab, setDefaultTab] = useState('apis');
+    const [showDuplicateLogs, setShowDuplicateLogs] = useState(false);
+    const resetToDefaults = async () => {
+        await clearPersistedSettings();
+        setIsDark(false);
+        toggleGlobalTheme(false);
+        setModalHeightPercent(90);
+        setTabVisibility({
+            insights: true,
+            apis: true,
+            logs: true,
+            analytics: false,
+            webview: false,
+            redux: false,
+        });
+        setDefaultTab('apis');
+        setMaxNetworkLogs(100);
+        setMaxConsoleLogs(200);
+        setShowConsoleLevels({
+            info: true,
+            warn: true,
+            error: true,
+        });
+        setWebViewCaptureCssJs(true);
+        setReduxAutoRefreshState(true);
+        setReduxExpandDepth(1);
+        setSlowRequestThreshold(1000);
+        setInsightsShowConsoleAlerts(true);
+        setShowDuplicateLogs(false);
+        Alert.alert('Settings Reset', 'All settings have been reset to default values.');
+    };
+    // #5 — hydrate persisted settings once, then auto-save on any change.
+    const settingsHydratedRef = useRef(false);
+    useEffect(() => {
+        let cancelled = false;
+        loadSettings().then(saved => {
+            if (cancelled)
+                return;
+            if (saved.isDark != null) {
+                setIsDark(saved.isDark);
+                toggleGlobalTheme(saved.isDark);
+            }
+            if (saved.modalHeightPercent != null)
+                setModalHeightPercent(saved.modalHeightPercent);
+            if (saved.tabVisibility)
+                setTabVisibility(prev => ({
+                    ...prev,
+                    ...saved.tabVisibility,
+                    apis: true, // APIs is always required
+                }));
+            if (saved.defaultTab)
+                setDefaultTab(saved.defaultTab);
+            if (saved.maxNetworkLogs != null)
+                setMaxNetworkLogs(saved.maxNetworkLogs);
+            if (saved.maxConsoleLogs != null)
+                setMaxConsoleLogs(saved.maxConsoleLogs);
+            if (saved.showConsoleLevels)
+                setShowConsoleLevels(saved.showConsoleLevels);
+            if (saved.webViewCaptureCssJs != null)
+                setWebViewCaptureCssJs(saved.webViewCaptureCssJs);
+            if (saved.reduxAutoRefresh != null)
+                setReduxAutoRefreshState(saved.reduxAutoRefresh);
+            if (saved.reduxExpandDepth != null)
+                setReduxExpandDepth(saved.reduxExpandDepth);
+            if (saved.slowRequestThreshold != null)
+                setSlowRequestThreshold(saved.slowRequestThreshold);
+            if (saved.insightsShowConsoleAlerts != null)
+                setInsightsShowConsoleAlerts(saved.insightsShowConsoleAlerts);
+            if (saved.showDuplicateLogs != null)
+                setShowDuplicateLogs(saved.showDuplicateLogs);
+            if (saved.defaultTab) {
+                const dt = saved.defaultTab;
+                const vis = {
+                    ...{
+                        insights: true,
+                        apis: true,
+                        logs: true,
+                        analytics: false,
+                        webview: false,
+                        redux: false,
+                    },
+                    ...(saved.tabVisibility || {}),
+                    apis: true,
+                };
+                setActiveTab(vis[dt] ? dt : 'apis');
+            }
+            settingsHydratedRef.current = true;
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, []);
+    useEffect(() => {
+        if (!settingsHydratedRef.current)
+            return;
+        saveSettings({
+            isDark,
+            modalHeightPercent,
+            tabVisibility,
+            defaultTab,
+            maxNetworkLogs,
+            maxConsoleLogs,
+            showConsoleLevels,
+            webViewCaptureCssJs,
+            reduxAutoRefresh,
+            reduxExpandDepth,
+            slowRequestThreshold,
+            insightsShowConsoleAlerts,
+            showDuplicateLogs,
+        });
+    }, [
+        isDark,
+        modalHeightPercent,
+        tabVisibility,
+        defaultTab,
+        maxNetworkLogs,
+        maxConsoleLogs,
+        showConsoleLevels,
+        webViewCaptureCssJs,
+        reduxAutoRefresh,
+        reduxExpandDepth,
+        slowRequestThreshold,
+        insightsShowConsoleAlerts,
+        showDuplicateLogs,
+    ]);
+    // #1 — check NPM for a newer published version; surfaces an animated dot
+    // in the header next to the npm chip when an update is available.
+    const [latestNpmVersion, setLatestNpmVersion] = useState(null);
+    const updateAvailable = useMemo(() => {
+        if (!latestNpmVersion)
+            return false;
+        const parse = (v) => v
+            .replace(/^v/, '')
+            .split('.')
+            .map(n => parseInt(n, 10) || 0);
+        const cur = parse(LIB_VERSION);
+        const latest = parse(latestNpmVersion);
+        for (let i = 0; i < 3; i++) {
+            if ((latest[i] || 0) > (cur[i] || 0))
+                return true;
+            if ((latest[i] || 0) < (cur[i] || 0))
+                return false;
+        }
+        return false;
+    }, [latestNpmVersion]);
+    useEffect(() => {
+        let cancelled = false;
+        fetch('https://registry.npmjs.org/react-native-inapp-inspector/latest')
+            .then(res => (res.ok ? res.json() : null))
+            .then(data => {
+            if (!cancelled && data && typeof data.version === 'string') {
+                setLatestNpmVersion(data.version);
+            }
+        })
+            .catch(() => {
+            // Offline / blocked — silently skip the update check.
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, []);
     useEffect(() => {
         setReduxAutoRefresh(reduxAutoRefresh);
     }, [reduxAutoRefresh]);
@@ -250,6 +416,10 @@ const NetworkInspector = ({ enabled = true, }) => {
                 animateNextLayout();
                 setActiveTab('apis');
             }
+            // #6 — a hidden module can't be the default landing tab.
+            if (!nextVal && defaultTab === key) {
+                setDefaultTab('apis');
+            }
             return newVisibility;
         });
     };
@@ -331,6 +501,8 @@ const NetworkInspector = ({ enabled = true, }) => {
     const badgeAnim = useRef(new Animated.Value(1)).current;
     const activePulseAnim = useRef(new Animated.Value(0.4)).current;
     const unreadPulseAnim = useRef(new Animated.Value(1)).current;
+    // #4 — diagonal light streak sweeping across the floating launcher
+    const fabShineAnim = useRef(new Animated.Value(0)).current;
     // #11 — header "clear all" icon spin/scale animation
     const clearAnim = useRef(new Animated.Value(0)).current;
     // #4 — draggable floating launcher (drag anywhere on screen)
@@ -373,9 +545,9 @@ const NetworkInspector = ({ enabled = true, }) => {
             fabDraggedRef.current = false;
         },
     })).current;
-    // #10 — scroll-to-top affordance for the main APIs list
+    // #2 — scroll-to-top button for the main APIs list, always visible at the
+    // bottom right of the list.
     const apisListRef = useRef(null);
-    const [showScrollTop, setShowScrollTop] = useState(false);
     const runClearAllWithAnimation = useCallback(() => {
         Animated.sequence([
             Animated.timing(clearAnim, {
@@ -412,6 +584,24 @@ const NetworkInspector = ({ enabled = true, }) => {
         loop.start();
         return () => loop.stop();
     }, [pulseAnim]);
+    // #4 — sweep the shine streak across the launcher, pause, repeat.
+    useEffect(() => {
+        const loop = Animated.loop(Animated.sequence([
+            Animated.timing(fabShineAnim, {
+                toValue: 1,
+                duration: 1100,
+                useNativeDriver: true,
+            }),
+            Animated.delay(1600),
+            Animated.timing(fabShineAnim, {
+                toValue: 0,
+                duration: 0,
+                useNativeDriver: true,
+            }),
+        ]));
+        loop.start();
+        return () => loop.stop();
+    }, [fabShineAnim]);
     useEffect(() => {
         const loop = Animated.loop(Animated.sequence([
             Animated.timing(activePulseAnim, {
@@ -455,6 +645,16 @@ const NetworkInspector = ({ enabled = true, }) => {
             }).start();
         }
     }, [newLogIds]);
+    // #6 — every time the inspector is opened, land on the chosen default tab.
+    useEffect(() => {
+        if (visible) {
+            const target = defaultTab === 'apis' || tabVisibility?.[defaultTab]
+                ? defaultTab
+                : 'apis';
+            setActiveTab(target);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [visible]);
     useEffect(() => {
         if (visible) {
             const task = InteractionManager.runAfterInteractions(() => {
@@ -608,8 +808,38 @@ const NetworkInspector = ({ enabled = true, }) => {
         if (sortOrder === 'oldest') {
             result = [...result].reverse();
         }
+        // #9 — collapse consecutive identical requests (same method + url +
+        // status) into one row carrying a ×N counter, unless the user opted in
+        // to seeing every duplicate via Settings → "Show Duplicate Logs".
+        if (!showDuplicateLogs) {
+            const collapsed = [];
+            for (const log of result) {
+                const last = collapsed[collapsed.length - 1];
+                if (last &&
+                    last.method === log.method &&
+                    last.url === log.url &&
+                    last.status === log.status) {
+                    collapsed[collapsed.length - 1] = {
+                        ...last,
+                        duplicateCount: (last.duplicateCount || 1) + 1,
+                    };
+                }
+                else {
+                    collapsed.push({ ...log, duplicateCount: 1 });
+                }
+            }
+            result = collapsed;
+        }
         return result.slice(0, maxNetworkLogs);
-    }, [logs, search, statusFilters, methodFilters, sortOrder, maxNetworkLogs]);
+    }, [
+        logs,
+        search,
+        statusFilters,
+        methodFilters,
+        sortOrder,
+        maxNetworkLogs,
+        showDuplicateLogs,
+    ]);
     const availableMethods = useMemo(() => {
         const methods = new Set();
         logs.forEach(log => {
@@ -819,8 +1049,35 @@ const NetworkInspector = ({ enabled = true, }) => {
         result = [...result].sort((a, b) => logSortOrder === 'newest'
             ? b.timestamp - a.timestamp
             : a.timestamp - b.timestamp);
+        // #9 — collapse consecutive identical messages into one row with a ×N
+        // counter unless duplicates are explicitly enabled in Settings.
+        if (!showDuplicateLogs) {
+            const collapsed = [];
+            for (const log of result) {
+                const last = collapsed[collapsed.length - 1];
+                if (last &&
+                    last.type === log.type &&
+                    last.sourceMethod === log.sourceMethod &&
+                    last.message === log.message) {
+                    collapsed[collapsed.length - 1] = {
+                        ...last,
+                        duplicateCount: (last.duplicateCount || 1) + 1,
+                    };
+                }
+                else {
+                    collapsed.push({ ...log, duplicateCount: 1 });
+                }
+            }
+            result = collapsed;
+        }
         return result;
-    }, [visibleConsoleLogs, logFilters, logSearch, logSortOrder]);
+    }, [
+        visibleConsoleLogs,
+        logFilters,
+        logSearch,
+        logSortOrder,
+        showDuplicateLogs,
+    ]);
     const filteredWebViewLogs = useMemo(() => {
         let result = webViewLogs;
         if (webViewSearch) {
@@ -969,7 +1226,11 @@ const NetworkInspector = ({ enabled = true, }) => {
         else {
             Alert.alert('Clear Logs', 'Are you sure you want to clear all network logs?', [
                 { text: 'Cancel', style: 'cancel' },
-                { text: 'Clear All', onPress: clearNetworkOnly, style: 'destructive' },
+                {
+                    text: 'Clear All',
+                    onPress: clearNetworkOnly,
+                    style: 'destructive',
+                },
             ]);
         }
     }
@@ -1057,7 +1318,8 @@ const NetworkInspector = ({ enabled = true, }) => {
             return (<View style={{ flex: 1, backgroundColor: AppColors.grayBackground }}>
           {/* Settings Header with back button */}
           <LinearGradient colors={[AppColors.purple, '#6B4EFF']} start={{ x: 0, y: 0 }} end={{ x: 1, y: 0 }} style={styles.headerGradient}>
-            <View style={[styles.header, { paddingHorizontal: 16, gap: 12 }]}>
+            <SafeAreaView style={{ width: '100%' }}>
+              <View style={[styles.header, { paddingHorizontal: 16, gap: 12 }]}>
               <TouchableScale onPress={() => {
                     animateNextLayout();
                     setSettingsPage(null);
@@ -1105,7 +1367,8 @@ const NetworkInspector = ({ enabled = true, }) => {
                 </Text>
               </View>
             </View>
-          </LinearGradient>
+          </SafeAreaView>
+        </LinearGradient>
 
           <ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16, gap: 12 }}>
             {/* Tab list */}
@@ -1150,7 +1413,7 @@ const NetworkInspector = ({ enabled = true, }) => {
               </View>
 
               {settingsTabs.map((tab, idx) => {
-                    const isVisible = tab.key === 'apis' || tabVisibility[tab.key];
+                    const isVisible = tab.key === 'apis' || tabVisibility?.[tab.key];
                     const isLast = idx === settingsTabs.length - 1;
                     const isLocked = tab.key === 'apis';
                     return (<View key={tab.key} style={{
@@ -1213,7 +1476,8 @@ const NetworkInspector = ({ enabled = true, }) => {
                         }}>
                         {tab.label}
                       </Text>
-                      {isLocked && (<View style={{
+                      {/* #6 — badge marks the configured default tab */}
+                      {tab.key === defaultTab && (<View style={{
                                 flexDirection: 'row',
                                 alignItems: 'center',
                                 backgroundColor: 'rgba(104,75,155,0.08)',
@@ -1481,73 +1745,316 @@ const NetworkInspector = ({ enabled = true, }) => {
                 })}
                   </View>
                 </View>
-              </View>
-            </View>
-          </ScrollView>
-        </View>);
-        }
-        const goBackToMain = () => {
-            animateNextLayout();
-            setSettingsPage('main');
-        };
-        const renderSubHeader = (title, icon, rightInfo) => (<View style={{
-                flexDirection: 'row',
-                alignItems: 'center',
-                gap: 12,
-                paddingBottom: 16,
-                borderBottomWidth: 1,
-                borderBottomColor: AppColors.dividerColor,
-                marginBottom: 16,
-            }}>
-        <TouchableScale onPress={goBackToMain} style={{
-                width: 36,
-                height: 36,
-                borderRadius: 10,
-                backgroundColor: AppColors.purpleShade50,
-                borderWidth: 1,
-                borderColor: 'rgba(104,75,155,0.2)',
-                alignItems: 'center',
-                justifyContent: 'center',
-            }}>
-          <WhiteBackNavigation color={AppColors.purple} size={16}/>
-        </TouchableScale>
-        {icon && (<View style={{
-                    width: 36,
-                    height: 36,
-                    borderRadius: 10,
+
+                {/* Divider */}
+                <View style={{
+                    height: 1,
+                    backgroundColor: AppColors.dividerColor,
+                }}/>
+
+                {/* #6 — Default Tab */}
+                <View style={{
+                    paddingVertical: 12,
+                    paddingHorizontal: 14,
+                }}>
+                  <View style={{
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    gap: 8,
+                }}>
+                    <View style={{
+                    width: 20,
+                    height: 20,
+                    borderRadius: 6,
                     backgroundColor: AppColors.purpleShade50,
                     borderWidth: 1,
                     borderColor: 'rgba(104,75,155,0.2)',
                     alignItems: 'center',
                     justifyContent: 'center',
                 }}>
-            {icon}
-          </View>)}
-        <Text style={{
-                fontFamily: AppFonts.interBold,
-                fontSize: 18,
-                color: AppColors.primaryBlack,
-                flex: 1,
-            }}>
-          {title}
-        </Text>
-        {rightInfo ? (<View style={{
-                    backgroundColor: 'rgba(104,75,155,0.08)',
+                      <LayersIcon color={AppColors.purple} size={11}/>
+                    </View>
+                    <View style={{ flex: 1 }}>
+                      <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 13,
+                    color: AppColors.primaryBlack,
+                }}>
+                        Default Tab
+                      </Text>
+                      <Text style={{
+                    fontFamily: AppFonts.interRegular,
+                    fontSize: 11,
+                    color: AppColors.grayText,
+                    marginTop: 1,
+                }}>
+                        Tab shown when the inspector opens
+                      </Text>
+                    </View>
+                  </View>
+
+                  {/* Grid of Default Tab Cards */}
+                  <View style={{
+                    flexDirection: 'row',
+                    flexWrap: 'wrap',
+                    gap: 8,
+                    marginTop: 12,
+                }}>
+                    {settingsTabs
+                    .filter(tab => tab.key === 'apis' || tabVisibility?.[tab.key])
+                    .map(tab => {
+                    const isActive = defaultTab === tab.key;
+                    return (<TouchableScale key={tab.key} 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 ? 'rgba(104,75,155,0.06)' : AppColors.primaryLight,
+                            minWidth: '47%',
+                            flex: 1,
+                        }}>
+                            <View style={{
+                            width: 22,
+                            height: 22,
+                            borderRadius: 6,
+                            backgroundColor: isActive ? AppColors.purple : AppColors.purpleShade50,
+                            alignItems: 'center',
+                            justifyContent: 'center',
+                        }}>
+                              {tab.icon === 'insights' && (<InsightsIcon color={isActive ? '#FFFFFF' : AppColors.purple} size={11}/>)}
+                              {tab.icon === 'apis' && (<SignalIcon color={isActive ? '#FFFFFF' : AppColors.purple} size={11}/>)}
+                              {tab.icon === 'logs' && (<TerminalIcon color={isActive ? '#FFFFFF' : AppColors.purple} size={11}/>)}
+                              {tab.icon === 'analytics' && (<AnalyticsIcon color={isActive ? '#FFFFFF' : AppColors.purple} size={11}/>)}
+                              {tab.icon === 'webview' && (<GlobeIcon color={isActive ? '#FFFFFF' : AppColors.purple} size={11}/>)}
+                              {tab.icon === 'redux' && (<TerminalIcon color={isActive ? '#FFFFFF' : AppColors.purple} size={11}/>)}
+                            </View>
+                            <Text style={{
+                            fontFamily: AppFonts.interBold,
+                            fontSize: 13,
+                            color: isActive ? AppColors.purple : AppColors.primaryBlack,
+                            flex: 1,
+                        }}>
+                                {tab.label}
+                            </Text>
+                            {isActive && (<View style={{
+                                width: 14,
+                                height: 14,
+                                borderRadius: 7,
+                                backgroundColor: AppColors.purple,
+                                alignItems: 'center',
+                                justifyContent: 'center',
+                            }}>
+                                <CheckIcon size={8} color="#FFFFFF"/>
+                              </View>)}
+                          </TouchableScale>);
+                })}
+                  </View>
+                </View>
+
+                {/* Divider */}
+                <View style={{
+                    height: 1,
+                    backgroundColor: AppColors.dividerColor,
+                }}/>
+
+                {/* #9 — Show Duplicate Logs */}
+                <View style={{
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    paddingVertical: 12,
+                    paddingHorizontal: 14,
+                    gap: 12,
+                }}>
+                  <View style={{
+                    flex: 1,
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    gap: 8,
+                }}>
+                    <View style={{
+                    width: 20,
+                    height: 20,
+                    borderRadius: 6,
+                    backgroundColor: AppColors.purpleShade50,
+                    borderWidth: 1,
+                    borderColor: 'rgba(104,75,155,0.2)',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                }}>
+                      <EyeIcon color={AppColors.purple} size={11}/>
+                    </View>
+                    <View style={{ flex: 1 }}>
+                      <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 13,
+                    color: AppColors.primaryBlack,
+                }}>
+                        Show Duplicate Logs
+                      </Text>
+                      <Text style={{
+                    fontFamily: AppFonts.interRegular,
+                    fontSize: 11,
+                    color: AppColors.grayText,
+                    marginTop: 1,
+                }}>
+                        Off: repeated identical entries collapse into one row
+                        with a ×N count
+                      </Text>
+                    </View>
+                  </View>
+
+                  {/* Toggle Switch */}
+                  <TouchableScale onPress={() => setShowDuplicateLogs(prev => !prev)} style={{
+                    width: 38,
+                    height: 22,
+                    borderRadius: 11,
+                    backgroundColor: showDuplicateLogs
+                        ? AppColors.purple
+                        : AppColors.grayBorderSecondary,
+                    padding: 2,
+                    justifyContent: 'center',
+                    alignItems: showDuplicateLogs ? 'flex-end' : 'flex-start',
+                }}>
+                    <View style={{
+                    width: 18,
+                    height: 18,
+                    borderRadius: 9,
+                    backgroundColor: '#FFFFFF',
+                    shadowColor: '#000',
+                    shadowOpacity: 0.15,
+                    shadowRadius: 1.5,
+                    shadowOffset: { width: 0, height: 1 },
+                }}/>
+                  </TouchableScale>
+                </View>
+
+                {/* Divider */}
+                <View style={{
+                    height: 1,
+                    backgroundColor: AppColors.dividerColor,
+                }}/>
+
+                {/* Reset Settings */}
+                <View style={{
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    paddingVertical: 12,
+                    paddingHorizontal: 14,
+                    gap: 12,
+                }}>
+                  <View style={{
+                    flex: 1,
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    gap: 8,
+                }}>
+                    <View style={{
+                    width: 20,
+                    height: 20,
+                    borderRadius: 6,
+                    backgroundColor: 'rgba(239,68,68,0.08)',
+                    borderWidth: 1,
+                    borderColor: 'rgba(239,68,68,0.2)',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                }}>
+                      <TrashIcon color={AppColors.errorColor} size={11}/>
+                    </View>
+                    <View style={{ flex: 1 }}>
+                      <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 13,
+                    color: AppColors.primaryBlack,
+                }}>
+                        Reset Settings
+                      </Text>
+                      <Text style={{
+                    fontFamily: AppFonts.interRegular,
+                    fontSize: 11,
+                    color: AppColors.grayText,
+                    marginTop: 1,
+                }}>
+                        Wipe custom configurations and load package defaults
+                      </Text>
+                    </View>
+                  </View>
+
+                  <TouchableScale onPress={resetToDefaults} style={{
                     paddingHorizontal: 10,
                     paddingVertical: 5,
-                    borderRadius: 8,
+                    borderRadius: 7,
+                    backgroundColor: 'rgba(255,46,87,0.08)',
                     borderWidth: 1,
-                    borderColor: 'rgba(104,75,155,0.15)',
+                    borderColor: 'rgba(255,46,87,0.2)',
                 }}>
-            <Text style={{
+                    <Text style={{
                     fontFamily: AppFonts.interBold,
                     fontSize: 11,
-                    color: AppColors.purple,
+                    color: AppColors.errorColor,
                 }}>
-              {rightInfo}
-            </Text>
-          </View>) : null}
-      </View>);
+                      Reset
+                    </Text>
+                  </TouchableScale>
+                </View>
+              </View>
+            </View>
+
+            {/* Storage Status */}
+            <View style={{
+                    backgroundColor: isPersistentStorageAvailable()
+                        ? 'rgba(74,222,128,0.08)'
+                        : 'rgba(234,179,8,0.08)',
+                    borderRadius: 12,
+                    borderWidth: 1,
+                    borderColor: isPersistentStorageAvailable()
+                        ? 'rgba(74,222,128,0.2)'
+                        : 'rgba(234,179,8,0.2)',
+                    padding: 12,
+                    marginTop: 16,
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    gap: 10,
+                }}>
+              <View style={{
+                    width: 8,
+                    height: 8,
+                    borderRadius: 4,
+                    backgroundColor: isPersistentStorageAvailable() ? '#22C55E' : '#EAB308',
+                }}/>
+              <View style={{ flex: 1 }}>
+                <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 12,
+                    color: isPersistentStorageAvailable() ? '#15803D' : '#854D0E',
+                }}>
+                  {isPersistentStorageAvailable()
+                    ? `Storage: Persistent (${storage ? 'Custom' : 'iOS Settings'})`
+                    : 'Storage: Temporary (In-Memory)'}
+                </Text>
+                <Text style={{
+                    fontFamily: AppFonts.interRegular,
+                    fontSize: 10.5,
+                    color: isPersistentStorageAvailable() ? '#166534' : '#854D0E',
+                    marginTop: 2,
+                    opacity: 0.8,
+                }}>
+                  {isPersistentStorageAvailable()
+                    ? 'Your settings are saved across app restarts.'
+                    : 'Settings reset when closed. To persist settings, pass a storage object to <NetworkInspector storage={...} />.'}
+                </Text>
+              </View>
+            </View>
+          </ScrollView>
+        </View>);
+        }
+        const goBackToMain = () => {
+            animateNextLayout();
+            setSettingsPage('main');
+        };
         // Helper: settings row with icon + label + optional description
         const renderSettingRow = (opts) => (<View style={{
                 paddingVertical: 12,
@@ -1627,9 +2134,15 @@ const NetworkInspector = ({ enabled = true, }) => {
                 })}
           </View>)}
       </View>);
+        let content = null;
+        let title = '';
+        let icon = null;
+        let rightInfo = '';
         if (settingsPage === 'apis') {
-            return (<ScrollView style={{ flex: 1, backgroundColor: AppColors.grayBackground }} contentContainerStyle={{ padding: 16 }}>
-          {renderSubHeader('APIs Settings', <SignalIcon color={AppColors.purple} size={16}/>, `Total: ${logs.length}`)}
+            title = 'APIs Settings';
+            icon = <SignalIcon color="#FFFFFF" size={16}/>;
+            rightInfo = `Total: ${logs.length}`;
+            content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16 }}>
           <View style={{
                     backgroundColor: AppColors.primaryLight,
                     padding: 16,
@@ -1689,9 +2202,11 @@ const NetworkInspector = ({ enabled = true, }) => {
           </View>
         </ScrollView>);
         }
-        if (settingsPage === 'logs') {
-            return (<ScrollView style={{ flex: 1, backgroundColor: AppColors.grayBackground }} contentContainerStyle={{ padding: 16 }}>
-          {renderSubHeader('Logs Settings', <TerminalIcon color={AppColors.purple} size={16}/>, `Total: ${consoleLogs.length}`)}
+        else if (settingsPage === 'logs') {
+            title = 'Logs Settings';
+            icon = <TerminalIcon color="#FFFFFF" size={16}/>;
+            rightInfo = `Total: ${consoleLogs.length}`;
+            content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16 }}>
           <View style={{
                     backgroundColor: AppColors.primaryLight,
                     padding: 16,
@@ -1720,7 +2235,7 @@ const NetworkInspector = ({ enabled = true, }) => {
               Log Levels
             </Text>
             {['info', 'warn', 'error'].map((level, li) => {
-                    const isLvlActive = showConsoleLevels[level];
+                    const isLvlActive = showConsoleLevels?.[level];
                     const levelColor = level === 'error'
                         ? AppColors.errorColor
                         : level === 'warn'
@@ -1801,9 +2316,11 @@ const NetworkInspector = ({ enabled = true, }) => {
           </View>
         </ScrollView>);
         }
-        if (settingsPage === 'analytics') {
-            return (<ScrollView style={{ flex: 1, backgroundColor: AppColors.grayBackground }} contentContainerStyle={{ padding: 16 }}>
-          {renderSubHeader('Analytics Settings', <AnalyticsIcon color={AppColors.purple} size={16}/>, `Events: ${analyticsEvents.length}`)}
+        else if (settingsPage === 'analytics') {
+            title = 'Analytics Settings';
+            icon = <AnalyticsIcon color="#FFFFFF" size={16}/>;
+            rightInfo = `Events: ${analyticsEvents.length}`;
+            content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16 }}>
           <View style={{
                     backgroundColor: AppColors.primaryLight,
                     padding: 16,
@@ -1857,9 +2374,11 @@ const NetworkInspector = ({ enabled = true, }) => {
           </View>
         </ScrollView>);
         }
-        if (settingsPage === 'webview') {
-            return (<ScrollView style={{ flex: 1, backgroundColor: AppColors.grayBackground }} contentContainerStyle={{ padding: 16 }}>
-          {renderSubHeader('WebView Settings', <GlobeIcon color={AppColors.purple} size={16}/>, `History: ${webViewNavHistory.length}`)}
+        else if (settingsPage === 'webview') {
+            title = 'WebView Settings';
+            icon = <GlobeIcon color="#FFFFFF" size={16}/>;
+            rightInfo = `History: ${webViewNavHistory.length}`;
+            content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16 }}>
           <View style={{
                     backgroundColor: AppColors.primaryLight,
                     padding: 16,
@@ -1929,9 +2448,11 @@ const NetworkInspector = ({ enabled = true, }) => {
           </View>
         </ScrollView>);
         }
-        if (settingsPage === 'redux') {
-            return (<ScrollView style={{ flex: 1, backgroundColor: AppColors.grayBackground }} contentContainerStyle={{ padding: 16 }}>
-          {renderSubHeader('Redux Settings', <TerminalIcon color={AppColors.purple} size={16}/>, `Reducers: ${Object.keys(reduxState || {}).length}`)}
+        else if (settingsPage === 'redux') {
+            title = 'Redux Settings';
+            icon = <TerminalIcon color="#FFFFFF" size={16}/>;
+            rightInfo = `Reducers: ${Object.keys(reduxState || {}).length}`;
+            content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16 }}>
           <View style={{
                     backgroundColor: AppColors.primaryLight,
                     padding: 16,
@@ -2015,53 +2536,108 @@ const NetworkInspector = ({ enabled = true, }) => {
           </View>
         </ScrollView>);
         }
-        // Default return page is Insights settings
-        return (<ScrollView style={{ flex: 1, backgroundColor: AppColors.grayBackground }} contentContainerStyle={{ padding: 16 }}>
-        {renderSubHeader('Insights Settings', <InsightsIcon color={AppColors.purple} size={16}/>)}
-        <View style={{
-                backgroundColor: AppColors.primaryLight,
-                padding: 16,
-                borderRadius: 12,
+        else {
+            title = 'Insights Settings';
+            icon = <InsightsIcon color="#FFFFFF" size={16}/>;
+            content = (<ScrollView style={{ flex: 1 }} contentContainerStyle={{ padding: 16 }}>
+          <View style={{
+                    backgroundColor: AppColors.primaryLight,
+                    padding: 16,
+                    borderRadius: 12,
+                    borderWidth: 1,
+                    borderColor: AppColors.grayBorderSecondary,
+                    gap: 4,
+                }}>
+            {renderSettingRow({
+                    icon: <SignalIcon color={AppColors.purple} size={16}/>,
+                    label: 'Slow Latency Warning',
+                    description: 'Alert threshold for slow API request duration',
+                    picker: {
+                        options: [500, 1000, 2000],
+                        selectedValue: slowRequestThreshold,
+                        onSelect: setSlowRequestThreshold,
+                    },
+                })}
+            <View style={{ height: 1, backgroundColor: AppColors.dividerColor }}/>
+            {renderSettingRow({
+                    icon: <TerminalIcon color={AppColors.purple} size={16}/>,
+                    label: 'Show Console Alerts',
+                    description: 'Flags critical warnings or crash events on dashboard',
+                    isLast: true,
+                    onPress: () => setInsightsShowConsoleAlerts(prev => !prev),
+                    right: (<View style={{
+                            width: 22,
+                            height: 22,
+                            borderRadius: 6,
+                            borderWidth: 2,
+                            borderColor: insightsShowConsoleAlerts
+                                ? AppColors.purple
+                                : AppColors.grayTextWeak,
+                            backgroundColor: insightsShowConsoleAlerts
+                                ? 'rgba(104, 75, 155, 0.1)'
+                                : 'transparent',
+                            alignItems: 'center',
+                            justifyContent: 'center',
+                        }}>
+                  {insightsShowConsoleAlerts && (<CheckIcon size={12} color={AppColors.purple}/>)}
+                </View>),
+                })}
+          </View>
+        </ScrollView>);
+        }
+        return (<View style={{ flex: 1, backgroundColor: AppColors.grayBackground }}>
+        <LinearGradient colors={[AppColors.purple, '#6B4EFF']} start={{ x: 0, y: 0 }} end={{ x: 1, y: 0 }} style={styles.headerGradient}>
+          <SafeAreaView style={{ width: '100%' }}>
+            <View style={[styles.header, { paddingHorizontal: 16, gap: 12 }]}>
+            <TouchableScale onPress={goBackToMain} hitSlop={12} style={{
+                padding: 8,
+                borderRadius: 10,
+                backgroundColor: 'rgba(255, 255, 255, 0.15)',
                 borderWidth: 1,
-                borderColor: AppColors.grayBorderSecondary,
-                gap: 4,
+                borderColor: 'rgba(255, 255, 255, 0.08)',
             }}>
-          {renderSettingRow({
-                icon: <SignalIcon color={AppColors.purple} size={16}/>,
-                label: 'Slow Latency Warning',
-                description: 'Alert threshold for slow API request duration',
-                picker: {
-                    options: [500, 1000, 2000],
-                    selectedValue: slowRequestThreshold,
-                    onSelect: setSlowRequestThreshold,
-                },
-            })}
-          <View style={{ height: 1, backgroundColor: AppColors.dividerColor }}/>
-          {renderSettingRow({
-                icon: <TerminalIcon color={AppColors.purple} size={16}/>,
-                label: 'Show Console Alerts',
-                description: 'Flags critical warnings or crash events on dashboard',
-                isLast: true,
-                onPress: () => setInsightsShowConsoleAlerts(prev => !prev),
-                right: (<View style={{
-                        width: 22,
-                        height: 22,
-                        borderRadius: 6,
-                        borderWidth: 2,
-                        borderColor: insightsShowConsoleAlerts
-                            ? AppColors.purple
-                            : AppColors.grayTextWeak,
-                        backgroundColor: insightsShowConsoleAlerts
-                            ? 'rgba(104, 75, 155, 0.1)'
-                            : 'transparent',
-                        alignItems: 'center',
-                        justifyContent: 'center',
-                    }}>
-                {insightsShowConsoleAlerts && (<CheckIcon size={12} color={AppColors.purple}/>)}
-              </View>),
-            })}
-        </View>
-      </ScrollView>);
+              <WhiteBackNavigation color="#FFFFFF" size={16}/>
+            </TouchableScale>
+            {icon && (<View style={{
+                    width: 30,
+                    height: 30,
+                    borderRadius: 8,
+                    backgroundColor: 'rgba(255, 255, 255, 0.15)',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                }}>
+                {icon}
+              </View>)}
+            <View style={{ flex: 1 }}>
+              <Text style={{
+                fontFamily: AppFonts.interBold,
+                fontSize: 17,
+                color: '#FFFFFF',
+            }}>
+                {title}
+              </Text>
+            </View>
+            {rightInfo ? (<View style={{
+                    backgroundColor: 'rgba(255, 255, 255, 0.15)',
+                    paddingHorizontal: 8,
+                    paddingVertical: 4,
+                    borderRadius: 8,
+                    borderWidth: 1,
+                    borderColor: 'rgba(255, 255, 255, 0.1)',
+                }}>
+                <Text style={{
+                    fontFamily: AppFonts.interBold,
+                    fontSize: 11,
+                    color: '#FFFFFF',
+                }}>
+                  {rightInfo}
+                </Text>
+              </View>) : null}
+          </View>
+        </SafeAreaView>
+      </LinearGradient>
+        {content}
+      </View>);
     };
     const renderInsightsDashboard = () => {
         const apiTotal = logs.length;
@@ -2097,11 +2673,11 @@ const NetworkInspector = ({ enabled = true, }) => {
         const totalSignals = apiTotal + logTotal + analyticsTotal + webviewTotal;
         const totalIssues = apiErrors + logErrors;
         const activeModules = [
-            tabVisibility.apis,
-            tabVisibility.logs,
-            tabVisibility.analytics,
-            tabVisibility.webview,
-            tabVisibility.redux,
+            tabVisibility?.apis,
+            tabVisibility?.logs,
+            tabVisibility?.analytics,
+            tabVisibility?.webview,
+            tabVisibility?.redux,
         ].filter(Boolean).length;
         // Composite health score: success rate penalised by error volume and slow requests.
         const healthScore = totalSignals === 0
@@ -2268,7 +2844,7 @@ const NetworkInspector = ({ enabled = true, }) => {
         </View>
 
         {/* Module 1: APIs */}
-        {tabVisibility.apis && (<TouchableScale style={styles.dashboardModuleCard} onPress={() => switchActiveTab('apis')}>
+        {tabVisibility?.apis && (<TouchableScale style={styles.dashboardModuleCard} onPress={() => switchActiveTab('apis')}>
             <View style={styles.dashboardModuleHeader}>
               <View style={{ flexDirection: 'row', alignItems: 'center', gap: 8 }}>
                 <SignalIcon color={AppColors.purple} size={18}/>
@@ -2375,7 +2951,7 @@ const NetworkInspector = ({ enabled = true, }) => {
                 </View>)}
             </View>
           </TouchableScale>)}
-        {tabVisibility.logs && (<TouchableScale style={styles.dashboardModuleCard} onPress={() => switchActiveTab('logs')}>
+        {tabVisibility?.logs && (<TouchableScale style={styles.dashboardModuleCard} onPress={() => switchActiveTab('logs')}>
             <View style={styles.dashboardModuleHeader}>
               <View style={{ flexDirection: 'row', alignItems: 'center', gap: 8 }}>
                 <TerminalIcon color="#0D9488" size={18}/>
@@ -2416,7 +2992,7 @@ const NetworkInspector = ({ enabled = true, }) => {
           </TouchableScale>)}
 
         {/* Module 3: Analytics */}
-        {tabVisibility.analytics && (<TouchableScale style={styles.dashboardModuleCard} onPress={() => switchActiveTab('analytics')}>
+        {tabVisibility?.analytics && (<TouchableScale style={styles.dashboardModuleCard} onPress={() => switchActiveTab('analytics')}>
             <View style={styles.dashboardModuleHeader}>
               <View style={{ flexDirection: 'row', alignItems: 'center', gap: 8 }}>
                 <AnalyticsIcon color="#EA580C" size={18}/>
@@ -2453,7 +3029,7 @@ const NetworkInspector = ({ enabled = true, }) => {
           </TouchableScale>)}
 
         {/* Module 4: WebView */}
-        {tabVisibility.webview && (<TouchableScale style={styles.dashboardModuleCard} onPress={() => switchActiveTab('webview')}>
+        {tabVisibility?.webview && (<TouchableScale style={styles.dashboardModuleCard} onPress={() => switchActiveTab('webview')}>
             <View style={styles.dashboardModuleHeader}>
               <View style={{ flexDirection: 'row', alignItems: 'center', gap: 8 }}>
                 <GlobeIcon color="#2563EB" size={18}/>
@@ -2486,7 +3062,7 @@ const NetworkInspector = ({ enabled = true, }) => {
           </TouchableScale>)}
 
         {/* Module 5: Redux Store */}
-        {tabVisibility.redux && (<TouchableScale style={styles.dashboardModuleCard} onPress={() => switchActiveTab('redux')}>
+        {tabVisibility?.redux && (<TouchableScale style={styles.dashboardModuleCard} onPress={() => switchActiveTab('redux')}>
             <View style={styles.dashboardModuleHeader}>
               <View style={{ flexDirection: 'row', alignItems: 'center', gap: 8 }}>
                 <TerminalIcon color={AppColors.purple} size={18}/>
@@ -2751,6 +3327,29 @@ const NetworkInspector = ({ enabled = true, }) => {
         }} hitSlop={10}>
           <Animated.View style={[styles.fabPulseRing, { transform: [{ scale: pulseAnim }] }]}/>
           <BrandCircleIcon size={62}/>
+          {/* #4 — shining sweep, clipped inside the circular launcher */}
+          <View pointerEvents="none" style={styles.fabShineClip}>
+            <Animated.View style={[
+            styles.fabShineStreak,
+            {
+                transform: [
+                    {
+                        translateX: fabShineAnim.interpolate({
+                            inputRange: [0, 1],
+                            outputRange: [-48, 96],
+                        }),
+                    },
+                    { rotate: '25deg' },
+                ],
+            },
+        ]}>
+              <LinearGradient colors={[
+            'rgba(255,255,255,0)',
+            'rgba(255,255,255,0.55)',
+            'rgba(255,255,255,0)',
+        ]} start={{ x: 0, y: 0.5 }} end={{ x: 1, y: 0.5 }} style={{ flex: 1 }}/>
+            </Animated.View>
+          </View>
           {(logs.length > 0 || analyticsEvents.length > 0) && (<Animated.View style={[
                 styles.fabBadge,
                 hasErrors ? styles.fabBadgeError : styles.fabBadgeNormal,
@@ -2776,7 +3375,8 @@ const NetworkInspector = ({ enabled = true, }) => {
                 <StatusBar translucent backgroundColor="transparent" barStyle="light-content"/>
 
                 <LinearGradient colors={[AppColors.purple, '#6B4EFF']} style={styles.headerGradient}>
-                  <View style={styles.header}>
+                  <SafeAreaView style={{ width: '100%' }}>
+                    <View style={styles.header}>
                     <View style={[
                 styles.headerLeft,
                 {
@@ -2923,6 +3523,29 @@ const NetworkInspector = ({ enabled = true, }) => {
                                   </Text>
                                 </View>
                               </View>
+
+                              {/* #1 — pulsing dot when a newer version is on NPM */}
+                              {updateAvailable && (<Pressable hitSlop={10} onPress={() => Alert.alert('Update Available', `react-native-inapp-inspector v${latestNpmVersion} is available on NPM (installed: v${LIB_VERSION}).`, [
+                        { text: 'Later', style: 'cancel' },
+                        {
+                            text: 'View on NPM',
+                            onPress: () => Linking.openURL('https://www.npmjs.com/package/react-native-inapp-inspector').catch(() => { }),
+                        },
+                    ])} style={{
+                        alignItems: 'center',
+                        justifyContent: 'center',
+                    }}>
+                                  <Animated.View style={{
+                        width: 8,
+                        height: 8,
+                        borderRadius: 4,
+                        backgroundColor: '#4ADE80',
+                        borderWidth: 1,
+                        borderColor: 'rgba(255,255,255,0.9)',
+                        opacity: activePulseAnim,
+                        transform: [{ scale: unreadPulseAnim }],
+                    }}/>
+                                </Pressable>)}
                             </View>
                           </View>
                         </View>) : null}
@@ -3071,7 +3694,7 @@ const NetworkInspector = ({ enabled = true, }) => {
                         },
                     ],
                 }}>
-                            <TrashIcon color="#FFFFFF" size={15}/>
+                            <WipeIcon color="#FFFFFF" size={16}/>
                           </Animated.View>
                         </TouchableScale>)}
 
@@ -3090,7 +3713,8 @@ const NetworkInspector = ({ enabled = true, }) => {
                       </TouchableScale>
                     </View>
                   </View>
-                </LinearGradient>
+                </SafeAreaView>
+              </LinearGradient>
 
                 {/* ─── Horizontal Scrollable Tab Bar inside Content ─── */}
                 {selected == null &&
@@ -3135,7 +3759,7 @@ const NetworkInspector = ({ enabled = true, }) => {
                         icon: 'redux',
                     },
                 ]
-                    .filter(tab => tabVisibility[tab.key])
+                    .filter(tab => tabVisibility?.[tab.key])
                     .map(tab => {
                     const isActive = activeTab === tab.key;
                     const iconColor = isActive
@@ -3251,7 +3875,16 @@ const NetworkInspector = ({ enabled = true, }) => {
                     animateNextLayout();
                     setAnalyticsSubTab('ga_events');
                 }}>
-                          <Text style={[
+                          <View style={{
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    gap: 6,
+                }}>
+                            {/* #7 */}
+                            <AnalyticsIcon size={13} color={analyticsSubTab === 'ga_events'
+                    ? AppColors.purple
+                    : AppColors.grayTextStrong}/>
+                            <Text style={[
                     {
                         fontFamily: AppFonts.interMedium,
                         fontSize: 13,
@@ -3262,12 +3895,13 @@ const NetworkInspector = ({ enabled = true, }) => {
                         color: AppColors.purple,
                     },
                 ]}>
-                            GA Events (
-                            {analyticsSearch
+                              GA Events (
+                              {analyticsSearch
                     ? filteredAnalyticsEvents.length
                     : analyticsEvents.length}
-                            )
-                          </Text>
+                              )
+                            </Text>
+                          </View>
                         </Pressable>
                         <Pressable style={[
                     {
@@ -3288,7 +3922,16 @@ const NetworkInspector = ({ enabled = true, }) => {
                     animateNextLayout();
                     setAnalyticsSubTab('top_events');
                 }}>
-                          <Text style={[
+                          <View style={{
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    gap: 6,
+                }}>
+                            {/* #7 */}
+                            <TrendingUpIcon size={13} color={analyticsSubTab === 'top_events'
+                    ? AppColors.purple
+                    : AppColors.grayTextStrong}/>
+                            <Text style={[
                     {
                         fontFamily: AppFonts.interMedium,
                         fontSize: 13,
@@ -3299,8 +3942,9 @@ const NetworkInspector = ({ enabled = true, }) => {
                         color: AppColors.purple,
                     },
                 ]}>
-                            Top Events ({topEventsArray.length})
-                          </Text>
+                              Top Events ({topEventsArray.length})
+                            </Text>
+                          </View>
                         </Pressable>
                       </View>
                     </View>)}
@@ -3410,7 +4054,7 @@ const NetworkInspector = ({ enabled = true, }) => {
                         flexGrow: 1,
                     },
                 ]} keyboardShouldPersistTaps="handled"/>)) : activeTab === 'apis' && selected == null ? (<View style={{ flex: 1 }}>
-                      <FlatList ref={apisListRef} onScroll={e => setShowScrollTop(e.nativeEvent.contentOffset.y > 320)} scrollEventThrottle={16} data={groupedData} keyExtractor={item => item?.id?.toString()} renderItem={renderItem} initialNumToRender={10} maxToRenderPerBatch={10} windowSize={5} removeClippedSubviews={true} ListHeaderComponent={<View style={{ marginTop: 8 }}>
+                      <FlatList ref={apisListRef} data={groupedData} keyExtractor={item => item?.id?.toString()} renderItem={renderItem} initialNumToRender={10} maxToRenderPerBatch={10} windowSize={5} removeClippedSubviews={true} ListHeaderComponent={<View style={{ marginTop: 8 }}>
                             <View style={styles.toolbarRow}>
                               <View style={styles.searchContainer}>
                                 <SearchIcon color={AppColors.grayTextWeak} size={16}/>
@@ -3561,17 +4205,17 @@ const NetworkInspector = ({ enabled = true, }) => {
                     styles.listContent,
                     filteredLogs.length === 0 && { flexGrow: 1 },
                 ]} keyboardShouldPersistTaps="handled"/>
-                      {showScrollTop && (<TouchableScale onPress={() => {
-                        apisListRef.current?.scrollToOffset({
-                            offset: 0,
-                            animated: true,
-                        });
-                        setShowScrollTop(false);
-                    }} hitSlop={10} style={styles.scrollTopBtn}>
-                          <View style={{ transform: [{ rotate: '180deg' }] }}>
-                            <ChevronIcon color="#FFFFFF" size={18}/>
-                          </View>
-                        </TouchableScale>)}
+                      {/* #2 — always-visible scroll-to-top, bottom right */}
+                      <TouchableScale onPress={() => {
+                    apisListRef.current?.scrollToOffset({
+                        offset: 0,
+                        animated: true,
+                    });
+                }} hitSlop={10} style={styles.scrollTopBtn}>
+                        <View style={{ transform: [{ rotate: '180deg' }] }}>
+                          <ChevronIcon color="#FFFFFF" size={18}/>
+                        </View>
+                      </TouchableScale>
                     </View>) : activeTab === 'logs' ? (<View style={{ flex: 1 }}>
                       <View style={{
                     backgroundColor: '#FFFFFF',
@@ -3620,15 +4264,25 @@ const NetworkInspector = ({ enabled = true, }) => {
                                 backgroundColor: '#F4EBFF',
                             },
                         ]}>
-                                  <Text numberOfLines={1} style={[
+                                  {/* #7 */}
+                                  <View style={{
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 5,
+                        }}>
+                                    <LayersIcon size={12} color={active
+                            ? AppColors.purpleShade700
+                            : AppColors.grayTextStrong}/>
+                                    <Text numberOfLines={1} style={[
                             styles.statusFilterText,
                             active && {
                                 color: AppColors.purpleShade700,
                                 fontFamily: AppFonts.interBold,
                             },
                         ]}>
-                                    All ({logCounts.all})
-                                  </Text>
+                                      All ({logCounts.all})
+                                    </Text>
+                                  </View>
                                 </View>
                               </TouchableScale>);
                 })()}
@@ -3654,15 +4308,25 @@ const NetworkInspector = ({ enabled = true, }) => {
                                 backgroundColor: '#F1F5F9',
                             },
                         ]}>
-                                  <Text numberOfLines={1} style={[
+                                  {/* #7 */}
+                                  <View style={{
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 5,
+                        }}>
+                                    <UserIcon size={12} color={active
+                            ? '#334155'
+                            : AppColors.grayTextStrong}/>
+                                    <Text numberOfLines={1} style={[
                             styles.statusFilterText,
                             active && {
                                 color: '#334155',
                                 fontFamily: AppFonts.interBold,
                             },
                         ]}>
-                                    User Log ({logCounts['user-log']})
-                                  </Text>
+                                      User Log ({logCounts['user-log']})
+                                    </Text>
+                                  </View>
                                 </View>
                               </TouchableScale>);
                 })()}
@@ -3688,15 +4352,25 @@ const NetworkInspector = ({ enabled = true, }) => {
                                 backgroundColor: AppColors.purpleShade50,
                             },
                         ]}>
-                                  <Text numberOfLines={1} style={[
+                                  {/* #7 */}
+                                  <View style={{
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 5,
+                        }}>
+                                    <InfoCircleIcon size={12} color={active
+                            ? AppColors.purple
+                            : AppColors.grayTextStrong}/>
+                                    <Text numberOfLines={1} style={[
                             styles.statusFilterText,
                             active && {
                                 color: AppColors.purple,
                                 fontFamily: AppFonts.interBold,
                             },
                         ]}>
-                                    Info ({logCounts.info})
-                                  </Text>
+                                      Info ({logCounts.info})
+                                    </Text>
+                                  </View>
                                 </View>
                               </TouchableScale>);
                 })()}
@@ -3722,7 +4396,17 @@ const NetworkInspector = ({ enabled = true, }) => {
                                 backgroundColor: '#FFFDF6',
                             },
                         ]}>
-                                  <Text numberOfLines={1} style={[
+                                  {/* #7 */}
+                                  <View style={{
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 5,
+                        }}>
+                                    <WarningTriangleIcon size={12} color={active
+                            ? AppColors.darkOrange ||
+                                AppColors.lightOrange
+                            : AppColors.grayTextStrong}/>
+                                    <Text numberOfLines={1} style={[
                             styles.statusFilterText,
                             active && {
                                 color: AppColors.darkOrange ||
@@ -3730,8 +4414,9 @@ const NetworkInspector = ({ enabled = true, }) => {
                                 fontFamily: AppFonts.interBold,
                             },
                         ]}>
-                                    Warning ({logCounts.warn})
-                                  </Text>
+                                      Warning ({logCounts.warn})
+                                    </Text>
+                                  </View>
                                 </View>
                               </TouchableScale>);
                 })()}
@@ -3757,15 +4442,25 @@ const NetworkInspector = ({ enabled = true, }) => {
                                 backgroundColor: '#FFF5F6',
                             },
                         ]}>
-                                  <Text numberOfLines={1} style={[
+                                  {/* #7 */}
+                                  <View style={{
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 5,
+                        }}>
+                                    <ErrorCircleIcon size={12} color={active
+                            ? AppColors.errorColor
+                            : AppColors.grayTextStrong}/>
+                                    <Text numberOfLines={1} style={[
                             styles.statusFilterText,
                             active && {
                                 color: AppColors.errorColor,
                                 fontFamily: AppFonts.interBold,
                             },
                         ]}>
-                                    Error ({logCounts.error})
-                                  </Text>
+                                      Error ({logCounts.error})
+                                    </Text>
+                                  </View>
                                 </View>
                               </TouchableScale>);
                 })()}
@@ -3791,15 +4486,25 @@ const NetworkInspector = ({ enabled = true, }) => {
                                 backgroundColor: `${AppColors.skyBlue}15`,
                             },
                         ]}>
-                                  <Text numberOfLines={1} style={[
+                                  {/* #7 */}
+                                  <View style={{
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 5,
+                        }}>
+                                    <AnalyticsIcon size={12} color={active
+                            ? AppColors.skyBlue
+                            : AppColors.grayTextStrong}/>
+                                    <Text numberOfLines={1} style={[
                             styles.statusFilterText,
                             active && {
                                 color: AppColors.skyBlue,
                                 fontFamily: AppFonts.interBold,
                             },
                         ]}>
-                                    Analytics ({logCounts.analytics})
-                                  </Text>
+                                      Analytics ({logCounts.analytics})
+                                    </Text>
+                                  </View>
                                 </View>
                               </TouchableScale>);
                 })()}
@@ -4556,13 +5261,13 @@ const NetworkInspector = ({ enabled = true, }) => {
                                     <View style={[
                             styles.methodBadge,
                             {
-                                backgroundColor: `${METHOD_COLORS[selected.method] ?? METHOD_COLORS.ALL}15`,
+                                backgroundColor: METHOD_COLORS[selected.method] ?? METHOD_COLORS.ALL,
                             },
                         ]}>
                                       <Text style={[
                             styles.methodBadgeText,
                             {
-                                color: METHOD_COLORS[selected.method] ?? METHOD_COLORS.ALL,
+                                color: '#FFFFFF',
                             },
                         ]}>
                                         {selected.method}
@@ -4872,4 +5577,4 @@ export { setupConsoleLogger, clearConsoleLogs, subscribeConsoleLogs, } from './c
 export { setupAnalyticsLogger, logAnalyticsEvent, subscribeAnalyticsEvents, clearAnalyticsEvents, } from './customHooks/analyticsLogger';
 export { WebView, getWebViewLogs, getWebViewNavHistory, getWebViewHtml, getWebViewCss, getWebViewJs, getWebViewHtmlUrl, clearWebViewData, subscribeWebView, } from './customHooks/webViewLogger';
 export { default as ErrorBoundary } from './components/ErrorBoundary';
-export { connectReduxStore, getReduxState, subscribeReduxState, } from './customHooks/reduxLogger';
+export { connectReduxStore, inspectorReduxMiddleware, getReduxState, subscribeReduxState, getActionHistory, clearActionHistory, } from './customHooks/reduxLogger';