Merge branch 'main' into fix-channel-del

2026-07-08 09:43:23 +10:00 · 2026-02-22 13:01:36 -07:00
parent 4bf2519559 c28b38a233
commit 6e1cb0482f
71 changed files with 9045 additions and 1360 deletions
@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';

 import '../l10n/l10n.dart';
 import '../services/app_debug_log_service.dart';
+import '../widgets/adaptive_app_bar_title.dart';

 class AppDebugLogScreen extends StatelessWidget {
  const AppDebugLogScreen({super.key});
@@ -17,7 +18,7 @@ class AppDebugLogScreen extends StatelessWidget {

        return Scaffold(
          appBar: AppBar(
-            title: Text(context.l10n.debugLog_appTitle),
+            title: AdaptiveAppBarTitle(context.l10n.debugLog_appTitle),
            centerTitle: true,
            actions: [
              IconButton(
@@ -3,8 +3,10 @@ import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
+import '../models/app_settings.dart';
 import '../services/app_settings_service.dart';
 import '../services/notification_service.dart';
+import '../widgets/adaptive_app_bar_title.dart';
 import 'map_cache_screen.dart';

 class AppSettingsScreen extends StatelessWidget {
@@ -14,7 +16,7 @@ class AppSettingsScreen extends StatelessWidget {
  Widget build(BuildContext context) {
    return Scaffold(
      appBar: AppBar(
-        title: Text(context.l10n.appSettings_title),
+        title: AdaptiveAppBarTitle(context.l10n.appSettings_title),
        centerTitle: true,
      ),
      body: SafeArea(
@@ -360,6 +362,18 @@ class AppSettingsScreen extends StatelessWidget {
            onTap: () => _showTimeFilterDialog(context, settingsService),
          ),
          const Divider(height: 1),
+          ListTile(
+            leading: const Icon(Icons.straighten),
+            title: Text(context.l10n.appSettings_unitsTitle),
+            subtitle: Text(
+              settingsService.settings.unitSystem == UnitSystem.imperial
+                  ? context.l10n.appSettings_unitsImperial
+                  : context.l10n.appSettings_unitsMetric,
+            ),
+            trailing: const Icon(Icons.chevron_right),
+            onTap: () => _showUnitsDialog(context, settingsService),
+          ),
+          const Divider(height: 1),
          ListTile(
            leading: const Icon(Icons.download_outlined),
            title: Text(context.l10n.appSettings_offlineMapCache),
@@ -706,6 +720,46 @@ class AppSettingsScreen extends StatelessWidget {
    );
  }

+  void _showUnitsDialog(
+    BuildContext context,
+    AppSettingsService settingsService,
+  ) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(context.l10n.appSettings_unitsTitle),
+        content: RadioGroup<UnitSystem>(
+          groupValue: settingsService.settings.unitSystem,
+          onChanged: (value) {
+            if (value != null) {
+              settingsService.setUnitSystem(value);
+              Navigator.pop(context);
+            }
+          },
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              ListTile(
+                title: Text(context.l10n.appSettings_unitsMetric),
+                leading: const Radio<UnitSystem>(value: UnitSystem.metric),
+              ),
+              ListTile(
+                title: Text(context.l10n.appSettings_unitsImperial),
+                leading: const Radio<UnitSystem>(value: UnitSystem.imperial),
+              ),
+            ],
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: Text(context.l10n.common_close),
+          ),
+        ],
+      ),
+    );
+  }
+
  Widget _buildDebugCard(
    BuildContext context,
    AppSettingsService settingsService,
@@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
 import '../l10n/l10n.dart';
 import '../services/ble_debug_log_service.dart';
 import '../connector/meshcore_protocol.dart';
+import '../widgets/adaptive_app_bar_title.dart';

 enum _BleLogView { frames, rawLogRx }

@@ -29,7 +30,7 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
            : rawEntries.isNotEmpty;
        return Scaffold(
          appBar: AppBar(
-            title: Text(context.l10n.debugLog_bleTitle),
+            title: AdaptiveAppBarTitle(context.l10n.debugLog_bleTitle),
            actions: [
              IconButton(
                tooltip: context.l10n.debugLog_copyLog,
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:math' as math;

 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
@@ -271,193 +272,243 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
              ? message.pathVariants.first
              : Uint8List(0));

-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
-      child: Column(
-        crossAxisAlignment: isOutgoing
-            ? CrossAxisAlignment.end
-            : CrossAxisAlignment.start,
-        children: [
-          Row(
-            mainAxisAlignment: isOutgoing
-                ? MainAxisAlignment.end
-                : MainAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (!isOutgoing) ...[
-                _buildAvatar(message.senderName),
-                const SizedBox(width: 8),
-              ],
-              Flexible(
-                child: GestureDetector(
-                  onTap: () => _showMessagePathInfo(message),
-                  onLongPress: () => _showMessageActions(message),
-                  child: Container(
-                    padding: gifId != null
-                        ? const EdgeInsets.all(4)
-                        : const EdgeInsets.symmetric(
-                            horizontal: 12,
-                            vertical: 8,
-                          ),
-                    constraints: BoxConstraints(
-                      maxWidth: MediaQuery.of(context).size.width * 0.65,
-                    ),
-                    decoration: BoxDecoration(
-                      color: isOutgoing
-                          ? Theme.of(context).colorScheme.primaryContainer
-                          : Theme.of(
-                              context,
-                            ).colorScheme.surfaceContainerHighest,
-                      borderRadius: BorderRadius.circular(12),
-                    ),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        if (!isOutgoing) ...[
-                          Padding(
-                            padding: gifId != null
-                                ? const EdgeInsets.only(
-                                    left: 8,
-                                    top: 4,
-                                    bottom: 4,
-                                  )
-                                : EdgeInsets.zero,
-                            child: Text(
-                              message.senderName,
-                              style: TextStyle(
-                                fontSize: 12,
-                                fontWeight: FontWeight.bold,
-                                color: Theme.of(context).colorScheme.primary,
-                              ),
+    const maxSwipeOffset = 64.0;
+    const replySwipeThreshold = 64.0;
+    final messageBody = Column(
+      crossAxisAlignment: isOutgoing
+          ? CrossAxisAlignment.end
+          : CrossAxisAlignment.start,
+      children: [
+        Row(
+          mainAxisAlignment: isOutgoing
+              ? MainAxisAlignment.end
+              : MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (!isOutgoing) ...[
+              _buildAvatar(message.senderName),
+              const SizedBox(width: 8),
+            ],
+            Flexible(
+              child: GestureDetector(
+                onTap: () => _showMessagePathInfo(message),
+                onLongPress: () => _showMessageActions(message),
+                child: Container(
+                  padding: gifId != null
+                      ? const EdgeInsets.all(4)
+                      : const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                  constraints: BoxConstraints(
+                    maxWidth: MediaQuery.of(context).size.width * 0.65,
+                  ),
+                  decoration: BoxDecoration(
+                    color: isOutgoing
+                        ? Theme.of(context).colorScheme.primaryContainer
+                        : Theme.of(context).colorScheme.surfaceContainerHighest,
+                    borderRadius: BorderRadius.circular(12),
+                  ),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      if (!isOutgoing) ...[
+                        Padding(
+                          padding: gifId != null
+                              ? const EdgeInsets.only(
+                                  left: 8,
+                                  top: 4,
+                                  bottom: 4,
+                                )
+                              : EdgeInsets.zero,
+                          child: Text(
+                            message.senderName,
+                            style: TextStyle(
+                              fontSize: 12,
+                              fontWeight: FontWeight.bold,
+                              color: Theme.of(context).colorScheme.primary,
                            ),
                          ),
-                          if (gifId == null) const SizedBox(height: 4),
-                        ],
-                        if (message.replyToMessageId != null) ...[
-                          _buildReplyPreview(message),
-                          const SizedBox(height: 8),
-                        ],
-                        if (poi != null)
-                          _buildPoiMessage(context, poi, isOutgoing)
-                        else if (gifId != null)
-                          ClipRRect(
-                            borderRadius: BorderRadius.circular(8),
-                            child: GifMessage(
-                              url:
-                                  'https://media.giphy.com/media/$gifId/giphy.gif',
-                              backgroundColor: Colors.transparent,
-                              fallbackTextColor: isOutgoing
-                                  ? Theme.of(context)
-                                        .colorScheme
-                                        .onPrimaryContainer
-                                        .withValues(alpha: 0.7)
-                                  : Theme.of(context).colorScheme.onSurface
-                                        .withValues(alpha: 0.6),
-                            ),
-                          )
-                        else
-                          Linkify(
-                            text: message.text,
-                            style: const TextStyle(fontSize: 14),
-                            linkStyle: const TextStyle(
-                              fontSize: 14,
-                              color: Colors.green,
-                              decoration: TextDecoration.underline,
-                            ),
-                            options: const LinkifyOptions(
-                              humanize: false,
-                              defaultToHttps: false,
-                            ),
-                            linkifiers: const [UrlLinkifier()],
-                            onOpen: (link) =>
-                                LinkHandler.handleLinkTap(context, link.url),
+                        ),
+                        if (gifId == null) const SizedBox(height: 4),
+                      ],
+                      if (message.replyToMessageId != null) ...[
+                        _buildReplyPreview(message),
+                        const SizedBox(height: 8),
+                      ],
+                      if (poi != null)
+                        _buildPoiMessage(context, poi, isOutgoing)
+                      else if (gifId != null)
+                        ClipRRect(
+                          borderRadius: BorderRadius.circular(8),
+                          child: GifMessage(
+                            url:
+                                'https://media.giphy.com/media/$gifId/giphy.gif',
+                            backgroundColor: Colors.transparent,
+                            fallbackTextColor: isOutgoing
+                                ? Theme.of(context)
+                                      .colorScheme
+                                      .onPrimaryContainer
+                                      .withValues(alpha: 0.7)
+                                : Theme.of(context).colorScheme.onSurface
+                                      .withValues(alpha: 0.6),
                          ),
-                        if (displayPath.isNotEmpty) ...[
-                          const SizedBox(height: 4),
-                          Padding(
-                            padding: gifId != null
-                                ? const EdgeInsets.symmetric(horizontal: 8)
-                                : EdgeInsets.zero,
-                            child: Text(
-                              'via ${_formatPathPrefixes(displayPath)}',
+                        )
+                      else
+                        Linkify(
+                          text: message.text,
+                          style: const TextStyle(fontSize: 14),
+                          linkStyle: const TextStyle(
+                            fontSize: 14,
+                            color: Colors.green,
+                            decoration: TextDecoration.underline,
+                          ),
+                          options: const LinkifyOptions(
+                            humanize: false,
+                            defaultToHttps: false,
+                          ),
+                          linkifiers: const [UrlLinkifier()],
+                          onOpen: (link) =>
+                              LinkHandler.handleLinkTap(context, link.url),
+                        ),
+                      if (displayPath.isNotEmpty) ...[
+                        const SizedBox(height: 4),
+                        Padding(
+                          padding: gifId != null
+                              ? const EdgeInsets.symmetric(horizontal: 8)
+                              : EdgeInsets.zero,
+                          child: Text(
+                            'via ${_formatPathPrefixes(displayPath)}',
+                            style: TextStyle(
+                              fontSize: 11,
+                              color: Colors.grey[600],
+                            ),
+                          ),
+                        ),
+                      ],
+                      const SizedBox(height: 4),
+                      Padding(
+                        padding: gifId != null
+                            ? const EdgeInsets.only(
+                                left: 8,
+                                right: 8,
+                                bottom: 4,
+                              )
+                            : EdgeInsets.zero,
+                        child: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Text(
+                              _formatTime(message.timestamp),
                              style: TextStyle(
                                fontSize: 11,
                                color: Colors.grey[600],
                              ),
                            ),
-                          ),
-                        ],
-                        const SizedBox(height: 4),
-                        Padding(
-                          padding: gifId != null
-                              ? const EdgeInsets.only(
-                                  left: 8,
-                                  right: 8,
-                                  bottom: 4,
-                                )
-                              : EdgeInsets.zero,
-                          child: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
+                            if (message.repeatCount > 0) ...[
+                              const SizedBox(width: 6),
+                              Icon(
+                                Icons.repeat,
+                                size: 12,
+                                color: Colors.grey[600],
+                              ),
+                              const SizedBox(width: 2),
                              Text(
-                                _formatTime(message.timestamp),
+                                '${message.repeatCount}',
                                style: TextStyle(
                                  fontSize: 11,
                                  color: Colors.grey[600],
                                ),
                              ),
-                              if (message.repeatCount > 0) ...[
-                                const SizedBox(width: 6),
-                                Icon(
-                                  Icons.repeat,
-                                  size: 12,
-                                  color: Colors.grey[600],
-                                ),
-                                const SizedBox(width: 2),
-                                Text(
-                                  '${message.repeatCount}',
-                                  style: TextStyle(
-                                    fontSize: 11,
-                                    color: Colors.grey[600],
-                                  ),
-                                ),
-                              ],
-                              if (isOutgoing) ...[
-                                const SizedBox(width: 4),
-                                Icon(
-                                  message.status == ChannelMessageStatus.sent
-                                      ? Icons.check
-                                      : message.status ==
-                                            ChannelMessageStatus.pending
-                                      ? Icons.schedule
-                                      : Icons.error_outline,
-                                  size: 14,
-                                  color:
-                                      message.status ==
-                                          ChannelMessageStatus.failed
-                                      ? Colors.red
-                                      : Colors.grey[600],
-                                ),
-                              ],
                            ],
-                          ),
+                            if (isOutgoing) ...[
+                              const SizedBox(width: 4),
+                              Icon(
+                                message.status == ChannelMessageStatus.sent
+                                    ? Icons.check
+                                    : message.status ==
+                                          ChannelMessageStatus.pending
+                                    ? Icons.schedule
+                                    : Icons.error_outline,
+                                size: 14,
+                                color:
+                                    message.status ==
+                                        ChannelMessageStatus.failed
+                                    ? Colors.red
+                                    : Colors.grey[600],
+                              ),
+                            ],
+                          ],
                        ),
-                      ],
-                    ),
+                      ),
+                    ],
                  ),
                ),
              ),
-            ],
-          ),
-          if (message.reactions.isNotEmpty) ...[
-            const SizedBox(height: 4),
-            Padding(
-              padding: EdgeInsets.only(left: isOutgoing ? 0 : 48),
-              child: _buildReactionsDisplay(message),
            ),
          ],
+        ),
+        if (message.reactions.isNotEmpty) ...[
+          const SizedBox(height: 4),
+          Padding(
+            padding: EdgeInsets.only(left: isOutgoing ? 0 : 48),
+            child: _buildReactionsDisplay(message),
+          ),
        ],
-      ),
+      ],
+    );
+
+    if (!isOutgoing) {
+      return _SwipeReplyBubble(
+        maxSwipeOffset: maxSwipeOffset,
+        replySwipeThreshold: replySwipeThreshold,
+        onReplyTriggered: () => _setReplyingTo(message),
+        hintBuilder: ({required isStart}) =>
+            _buildReplySwipeHint(isStart: isStart),
+        child: messageBody,
+      );
+    } else {
+      return Padding(
+        padding: const EdgeInsets.symmetric(vertical: 4),
+        child: messageBody,
+      );
+    }
+  }
+
+  Widget _buildReplySwipeHint({required bool isStart}) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final content = Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Icon(Icons.reply, color: colorScheme.primary),
+        const SizedBox(width: 6),
+        Text(
+          context.l10n.chat_reply,
+          style: TextStyle(
+            color: colorScheme.primary,
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+      ],
+    );
+
+    return Container(
+      alignment: isStart ? Alignment.centerLeft : Alignment.centerRight,
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      color: colorScheme.primary.withValues(alpha: 0.08),
+      child: isStart
+          ? content
+          : Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(
+                  context.l10n.chat_reply,
+                  style: TextStyle(
+                    color: colorScheme.primary,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const SizedBox(width: 6),
+                Icon(Icons.reply, color: colorScheme.primary),
+              ],
+            ),
    );
  }

@@ -901,7 +952,8 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    Navigator.push(
      context,
      MaterialPageRoute(
-        builder: (context) => ChannelMessagePathScreen(message: message),
+        builder: (context) =>
+            ChannelMessagePathScreen(message: message, channelMessage: true),
      ),
    );
  }
@@ -1006,6 +1058,157 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
  }
 }

+class _SwipeReplyBubble extends StatefulWidget {
+  final double maxSwipeOffset;
+  final double replySwipeThreshold;
+  final VoidCallback onReplyTriggered;
+  final Widget Function({required bool isStart}) hintBuilder;
+  final Widget child;
+
+  const _SwipeReplyBubble({
+    required this.maxSwipeOffset,
+    required this.replySwipeThreshold,
+    required this.onReplyTriggered,
+    required this.hintBuilder,
+    required this.child,
+  });
+
+  @override
+  State<_SwipeReplyBubble> createState() => _SwipeReplyBubbleState();
+}
+
+class _SwipeReplyBubbleState extends State<_SwipeReplyBubble> {
+  Offset? _swipeStartPosition;
+  double _swipeOffset = 0;
+  double _maxSwipeDistance = 0;
+  int? _swipePointerId;
+  bool _swipeLockedToHorizontal = false;
+
+  void _handleSwipeStart(Offset position) {
+    _swipeStartPosition = position;
+    _maxSwipeDistance = 0;
+    if (_swipeOffset != 0) {
+      setState(() => _swipeOffset = 0);
+    }
+  }
+
+  void _handleSwipePointerDown(PointerDownEvent event) {
+    _swipePointerId = event.pointer;
+    _swipeLockedToHorizontal = false;
+    _handleSwipeStart(event.position);
+  }
+
+  void _handleSwipePointerMove(PointerMoveEvent event) {
+    if (_swipePointerId != event.pointer || _swipeStartPosition == null) {
+      return;
+    }
+
+    final dx = event.position.dx - _swipeStartPosition!.dx;
+
+    const axisLockThreshold = 12.0;
+    if (!_swipeLockedToHorizontal) {
+      if (-dx < axisLockThreshold) {
+        return;
+      }
+      _swipeLockedToHorizontal = true;
+    }
+
+    _handleSwipeUpdate(event.position);
+  }
+
+  void _handleSwipeUpdate(Offset position) {
+    if (_swipeStartPosition == null) return;
+
+    final dx = position.dx - _swipeStartPosition!.dx;
+    if (dx >= 0) return;
+
+    if (-dx < 6) return;
+
+    if (-dx > _maxSwipeDistance) {
+      _maxSwipeDistance = -dx;
+    }
+
+    final double clamped = dx.clamp(-widget.maxSwipeOffset, 0.0).toDouble();
+    final adjusted = _applySwipeResistance(clamped, widget.maxSwipeOffset);
+    if (adjusted != _swipeOffset) {
+      setState(() => _swipeOffset = adjusted);
+    }
+  }
+
+  void _handleSwipePointerUp(Offset position) {
+    if (_swipeLockedToHorizontal && _swipeStartPosition != null) {
+      final dx = position.dx - _swipeStartPosition!.dx;
+      final peak = math.max(
+        _maxSwipeDistance,
+        (-dx).clamp(0.0, double.infinity),
+      );
+      if (peak >= widget.replySwipeThreshold) {
+        widget.onReplyTriggered();
+        HapticFeedback.selectionClick();
+      }
+    }
+    _resetSwipe();
+  }
+
+  void _resetSwipe() {
+    if (_swipeOffset != 0) {
+      setState(() => _swipeOffset = 0);
+    }
+    _swipeStartPosition = null;
+    _maxSwipeDistance = 0;
+    _swipePointerId = null;
+    _swipeLockedToHorizontal = false;
+  }
+
+  double _applySwipeResistance(double rawOffset, double maxOffset) {
+    final abs = rawOffset.abs();
+    if (abs <= 0) return 0;
+    final norm = (abs / maxOffset).clamp(0.0, 1.0);
+    const deadZone = 0.18;
+    if (norm <= deadZone) {
+      return rawOffset.sign * maxOffset * (norm * 0.08);
+    }
+    final t = ((norm - deadZone) / (1 - deadZone)).clamp(0.0, 1.0);
+    final curved = t < 0.5
+        ? 16 * math.pow(t, 5)
+        : 1 - math.pow(-2 * t + 2, 5) / 2;
+    const deadZoneEnd = 0.0144;
+    return rawOffset.sign *
+        maxOffset *
+        (deadZoneEnd + curved * (1 - deadZoneEnd));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Listener(
+      onPointerDown: _handleSwipePointerDown,
+      onPointerMove: _handleSwipePointerMove,
+      onPointerUp: (event) => _handleSwipePointerUp(event.position),
+      onPointerCancel: (_) => _resetSwipe(),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
+        child: Stack(
+          alignment: Alignment.center,
+          children: [
+            Positioned.fill(
+              child: Opacity(
+                opacity: _swipeOffset.abs() / widget.maxSwipeOffset,
+                child: widget.hintBuilder(isStart: false),
+              ),
+            ),
+            AnimatedContainer(
+              duration: const Duration(milliseconds: 150),
+              transform: Matrix4.translationValues(_swipeOffset, 0, 0),
+              curve: Curves.easeOut,
+              child: widget.child,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
 class _PoiInfo {
  final double lat;
  final double lon;
@@ -9,26 +9,38 @@ import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../services/map_tile_cache_service.dart';
+import '../services/app_settings_service.dart';
 import '../connector/meshcore_protocol.dart';
 import '../l10n/app_localizations.dart';
 import '../l10n/l10n.dart';
 import '../models/channel_message.dart';
+import '../models/app_settings.dart';
 import '../models/contact.dart';
+import '../widgets/adaptive_app_bar_title.dart';

 class ChannelMessagePathScreen extends StatelessWidget {
  final ChannelMessage message;
-
-  const ChannelMessagePathScreen({super.key, required this.message});
+  final bool channelMessage;
+  const ChannelMessagePathScreen({
+    super.key,
+    required this.message,
+    this.channelMessage = false,
+  });

  @override
  Widget build(BuildContext context) {
    return Consumer<MeshCoreConnector>(
      builder: (context, connector, _) {
        final l10n = context.l10n;
-        final primaryPath = _selectPrimaryPath(
+        final primaryPathTmp = _selectPrimaryPath(
          message.pathBytes,
          message.pathVariants,
        );
+
+        final primaryPath = !channelMessage && !message.isOutgoing
+            ? Uint8List.fromList(primaryPathTmp.reversed.toList())
+            : primaryPathTmp;
+
        final hops = _buildPathHops(primaryPath, connector.contacts, l10n);
        final hasHopDetails = primaryPath.isNotEmpty;
        final observedLabel = _formatObservedHops(
@@ -37,10 +49,9 @@ class ChannelMessagePathScreen extends StatelessWidget {
          l10n,
        );
        final extraPaths = _otherPaths(primaryPath, message.pathVariants);
-
        return Scaffold(
          appBar: AppBar(
-            title: Text(l10n.channelPath_title),
+            title: AdaptiveAppBarTitle(l10n.channelPath_title),
            actions: [
              IconButton(
                icon: const Icon(Icons.radar_outlined),
@@ -50,9 +61,9 @@ class ChannelMessagePathScreen extends StatelessWidget {
                  MaterialPageRoute(
                    builder: (context) => PathTraceMapScreen(
                      title: context.l10n.contacts_repeaterPathTrace,
-                      path: Uint8List.fromList(primaryPath),
+                      path: primaryPath,
                      flipPathRound: true,
-                      reversePathRound: true,
+                      reversePathRound: !message.isOutgoing && !channelMessage,
                    ),
                  ),
                ),
@@ -62,7 +73,7 @@ class ChannelMessagePathScreen extends StatelessWidget {
                tooltip: l10n.channelPath_viewMap,
                onPressed: hasHopDetails
                    ? () {
-                        _openPathMap(context);
+                        _openPathMap(context, channelMessage: channelMessage);
                      }
                    : null,
              ),
@@ -157,7 +168,11 @@ class ChannelMessagePathScreen extends StatelessWidget {
              ),
              subtitle: Text(_formatPathPrefixes(variants[i])),
              trailing: const Icon(Icons.map_outlined, size: 20),
-              onTap: () => _openPathMap(context, initialPath: variants[i]),
+              onTap: () => _openPathMap(
+                context,
+                initialPath: variants[i],
+                channelMessage: channelMessage,
+              ),
            ),
          ),
      ],
@@ -248,13 +263,18 @@ class ChannelMessagePathScreen extends StatelessWidget {
    );
  }

-  void _openPathMap(BuildContext context, {Uint8List? initialPath}) {
+  void _openPathMap(
+    BuildContext context, {
+    Uint8List? initialPath,
+    bool channelMessage = false,
+  }) {
    Navigator.push(
      context,
      MaterialPageRoute(
        builder: (context) => ChannelMessagePathMapScreen(
          message: message,
          initialPath: initialPath,
+          channelMessage: channelMessage,
        ),
      ),
    );
@@ -264,11 +284,13 @@ class ChannelMessagePathScreen extends StatelessWidget {
 class ChannelMessagePathMapScreen extends StatefulWidget {
  final ChannelMessage message;
  final Uint8List? initialPath;
+  final bool channelMessage;

  const ChannelMessagePathMapScreen({
    super.key,
    required this.message,
    this.initialPath,
+    this.channelMessage = false,
  });

  @override
@@ -278,8 +300,12 @@ class ChannelMessagePathMapScreen extends StatefulWidget {

 class _ChannelMessagePathMapScreenState
    extends State<ChannelMessagePathMapScreen> {
+  static const double _labelZoomThreshold = 8.5;
+
  Uint8List? _selectedPath;
  double _pathDistance = 0.0;
+  bool _showNodeLabels = true;
+  bool _didReceivePositionUpdate = false;

  @override
  void initState() {
@@ -314,6 +340,8 @@ class _ChannelMessagePathMapScreenState
  Widget build(BuildContext context) {
    return Consumer<MeshCoreConnector>(
      builder: (context, connector, _) {
+        final settings = context.watch<AppSettingsService>().settings;
+        final isImperial = settings.unitSystem == UnitSystem.imperial;
        final tileCache = context.read<MapTileCacheService>();
        final primaryPath = _selectPrimaryPath(
          widget.message.pathBytes,
@@ -323,11 +351,18 @@ class _ChannelMessagePathMapScreenState
          primaryPath,
          widget.message.pathVariants,
        );
-        final selectedPath = _resolveSelectedPath(
+        final selectedPathTmp = _resolveSelectedPath(
          _selectedPath,
          observedPaths,
          primaryPath,
        );
+
+        final selectedPath =
+            ((!widget.message.isOutgoing && !widget.channelMessage) ||
+                (widget.message.isOutgoing && widget.channelMessage))
+            ? Uint8List.fromList(selectedPathTmp.reversed.toList())
+            : selectedPathTmp;
+
        final selectedIndex = _indexForPath(selectedPath, observedPaths);
        final hops = _buildPathHops(
          selectedPath,
@@ -336,12 +371,22 @@ class _ChannelMessagePathMapScreenState
        );

        final points = <LatLng>[];
+
+        if ((widget.message.isOutgoing && !widget.channelMessage) ||
+            (widget.message.isOutgoing && widget.channelMessage)) {
+          points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        }
+
        for (final hop in hops) {
          if (hop.hasLocation) {
            points.add(hop.position!);
          }
        }
-        points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+
+        if ((!widget.message.isOutgoing && !widget.channelMessage) ||
+            (!widget.message.isOutgoing && widget.channelMessage)) {
+          points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        }

        final polylines = points.length > 1
            ? [
@@ -357,6 +402,9 @@ class _ChannelMessagePathMapScreenState
            ? points.first
            : const LatLng(0, 0);
        final initialZoom = points.isNotEmpty ? 13.0 : 2.0;
+        if (!_didReceivePositionUpdate) {
+          _showNodeLabels = initialZoom >= _labelZoomThreshold;
+        }
        final bounds = points.length > 1
            ? LatLngBounds.fromPoints(points)
            : null;
@@ -366,7 +414,9 @@ class _ChannelMessagePathMapScreenState
        _pathDistance = _getPathDistance(points);

        return Scaffold(
-          appBar: AppBar(title: Text(context.l10n.channelPath_mapTitle)),
+          appBar: AppBar(
+            title: AdaptiveAppBarTitle(context.l10n.channelPath_mapTitle),
+          ),
          body: SafeArea(
            top: false,
            child: Stack(
@@ -388,6 +438,17 @@ class _ChannelMessagePathMapScreenState
                    interactionOptions: InteractionOptions(
                      flags: ~InteractiveFlag.rotate,
                    ),
+                    onPositionChanged: (camera, hasGesture) {
+                      final shouldShow = camera.zoom >= _labelZoomThreshold;
+                      if (!_didReceivePositionUpdate ||
+                          shouldShow != _showNodeLabels) {
+                        if (!mounted) return;
+                        setState(() {
+                          _didReceivePositionUpdate = true;
+                          _showNodeLabels = shouldShow;
+                        });
+                      }
+                    },
                  ),
                  children: [
                    TileLayer(
@@ -399,7 +460,12 @@ class _ChannelMessagePathMapScreenState
                    ),
                    if (polylines.isNotEmpty)
                      PolylineLayer(polylines: polylines),
-                    MarkerLayer(markers: _buildHopMarkers(hops)),
+                    MarkerLayer(
+                      markers: _buildHopMarkers(
+                        hops,
+                        showLabels: _showNodeLabels,
+                      ),
+                    ),
                  ],
                ),
                if (observedPaths.length > 1)
@@ -422,7 +488,7 @@ class _ChannelMessagePathMapScreenState
                      ),
                    ),
                  ),
-                _buildLegendCard(context, hops),
+                _buildLegendCard(context, hops, isImperial),
              ],
            ),
          ),
@@ -494,45 +560,61 @@ class _ChannelMessagePathMapScreenState
    );
  }

-  List<Marker> _buildHopMarkers(List<_PathHop> hops) {
-    return [
-      for (final hop in hops)
-        if (hop.hasLocation)
-          Marker(
-            point: hop.position!,
-            width: 35,
-            height: 35,
-            child: Container(
-              decoration: BoxDecoration(
-                color: Colors.green,
-                shape: BoxShape.circle,
-                border: Border.all(color: Colors.white, width: 2),
-                boxShadow: [
-                  BoxShadow(
-                    color: Colors.black.withValues(alpha: 0.3),
-                    blurRadius: 4,
-                    offset: const Offset(0, 2),
-                  ),
-                ],
-              ),
-              alignment: Alignment.center,
-              child: Text(
-                hop.index.toString(),
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontWeight: FontWeight.bold,
-                  fontSize: 12,
+  List<Marker> _buildHopMarkers(
+    List<_PathHop> hops, {
+    required bool showLabels,
+  }) {
+    final markers = <Marker>[];
+    for (final hop in hops) {
+      if (!hop.hasLocation) continue;
+      final point = hop.position!;
+      markers.add(
+        Marker(
+          point: point,
+          width: 35,
+          height: 35,
+          child: Container(
+            decoration: BoxDecoration(
+              color: Colors.green,
+              shape: BoxShape.circle,
+              border: Border.all(color: Colors.white, width: 2),
+              boxShadow: [
+                BoxShadow(
+                  color: Colors.black.withValues(alpha: 0.3),
+                  blurRadius: 4,
+                  offset: const Offset(0, 2),
                ),
+              ],
+            ),
+            alignment: Alignment.center,
+            child: Text(
+              hop.index.toString(),
+              style: const TextStyle(
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
+                fontSize: 12,
              ),
            ),
          ),
-      if (context.read<MeshCoreConnector>().selfLatitude != null &&
-          context.read<MeshCoreConnector>().selfLongitude != null)
-        Marker(
-          point: LatLng(
-            context.read<MeshCoreConnector>().selfLatitude!,
-            context.read<MeshCoreConnector>().selfLongitude!,
+        ),
+      );
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: point,
+            label: hop.contact?.name ?? _formatPrefix(hop.prefix),
          ),
+        );
+      }
+    }
+
+    final selfLat = context.read<MeshCoreConnector>().selfLatitude;
+    final selfLon = context.read<MeshCoreConnector>().selfLongitude;
+    if (selfLat != null && selfLon != null) {
+      final selfPoint = LatLng(selfLat, selfLon);
+      markers.add(
+        Marker(
+          point: selfPoint,
          width: 35,
          height: 35,
          child: Container(
@@ -559,10 +641,60 @@ class _ChannelMessagePathMapScreenState
            ),
          ),
        ),
-    ];
+      );
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: selfPoint,
+            label: context.l10n.pathTrace_you,
+          ),
+        );
+      }
+    }
+
+    return markers;
  }

-  Widget _buildLegendCard(BuildContext context, List<_PathHop> hops) {
+  Marker _buildNodeLabelMarker({required LatLng point, required String label}) {
+    return Marker(
+      point: point,
+      width: 120,
+      height: 24,
+      alignment: Alignment.topCenter,
+      child: IgnorePointer(
+        child: Transform.translate(
+          offset: const Offset(0, -20),
+          child: FittedBox(
+            fit: BoxFit.contain,
+            child: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+              decoration: BoxDecoration(
+                color: Colors.black54,
+                borderRadius: BorderRadius.circular(8),
+              ),
+              alignment: Alignment.center,
+              child: Text(
+                label,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 11,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLegendCard(
+    BuildContext context,
+    List<_PathHop> hops,
+    bool isImperial,
+  ) {
    final l10n = context.l10n;
    final maxHeight = MediaQuery.of(context).size.height * 0.35;
    final estimatedHeight = 72.0 + (hops.length * 56.0);
@@ -581,7 +713,7 @@ class _ChannelMessagePathMapScreenState
              Padding(
                padding: const EdgeInsets.all(12),
                child: Text(
-                  '${l10n.channelPath_repeaterHops} (${(_pathDistance / 1609.34).toStringAsFixed(2)} Miles / ${(_pathDistance / 1000).toStringAsFixed(2)} Km)',
+                  '${l10n.channelPath_repeaterHops} ${formatDistance(_pathDistance, isImperial: isImperial)}',
                  style: const TextStyle(fontWeight: FontWeight.w600),
                ),
              ),
@@ -4,18 +4,19 @@ import 'dart:typed_data';

 import 'package:flutter/material.dart';
 import 'package:meshcore_open/storage/channel_message_store.dart';
+import 'package:meshcore_open/widgets/app_bar.dart';
 import 'package:provider/provider.dart';
 import 'package:uuid/uuid.dart';

 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
+import '../services/app_settings_service.dart';
 import '../models/channel.dart';
 import '../models/community.dart';
 import '../storage/community_store.dart';
 import '../utils/dialog_utils.dart';
 import '../utils/disconnect_navigation_mixin.dart';
 import '../utils/route_transitions.dart';
-import '../widgets/battery_indicator.dart';
 import '../widgets/list_filter_widget.dart';
 import '../widgets/empty_state.dart';
 import '../widgets/qr_code_display.dart';
@@ -118,8 +119,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
      canPop: allowBack,
      child: Scaffold(
        appBar: AppBar(
-          leading: BatteryIndicator(connector: connector),
-          title: Text(context.l10n.channels_title),
+          title: AppBarTitle(context.l10n.channels_title),
          centerTitle: true,
          automaticallyImplyLeading: false,
          actions: [
@@ -489,6 +489,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
    ChannelMessageStore channelMessageStore,
    Channel channel,
  ) {
+    final settingsService = context.read<AppSettingsService>();
+    final isMuted = settingsService.isChannelMuted(channel.name);
+
    showModalBottomSheet(
      context: context,
      builder: (context) => SafeArea(
@@ -506,6 +509,26 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                }
              },
            ),
+            ListTile(
+              leading: Icon(
+                isMuted
+                    ? Icons.notifications_outlined
+                    : Icons.notifications_off_outlined,
+              ),
+              title: Text(
+                isMuted
+                    ? context.l10n.channels_unmuteChannel
+                    : context.l10n.channels_muteChannel,
+              ),
+              onTap: () async {
+                Navigator.pop(context);
+                if (isMuted) {
+                  await settingsService.unmuteChannel(channel.name);
+                } else {
+                  await settingsService.muteChannel(channel.name);
+                }
+              },
+            ),
            ListTile(
              leading: const Icon(Icons.delete_outline, color: Colors.red),
              title: Text(
@@ -19,7 +19,9 @@ import '../helpers/utf8_length_limiter.dart';
 import '../models/channel_message.dart';
 import '../models/contact.dart';
 import '../models/message.dart';
+import '../models/path_history.dart';
 import '../services/path_history_service.dart';
+import '../widgets/elements_ui.dart';
 import 'channel_message_path_screen.dart';
 import 'map_screen.dart';
 import '../utils/emoji_utils.dart';
@@ -431,242 +433,317 @@ class _ChatScreenState extends State<ChatScreen> {

  void _showPathHistory(BuildContext context) {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
-
+    bool showAllPaths = false;
    showDialog(
      context: context,
-      builder: (context) => Consumer<PathHistoryService>(
-        builder: (context, pathService, _) {
-          final paths = pathService.getRecentPaths(widget.contact.publicKeyHex);
-          return AlertDialog(
-            title: Row(
-              children: [
-                const Icon(Icons.timeline),
-                const SizedBox(width: 8),
-                Text(context.l10n.chat_pathManagement),
-              ],
-            ),
-            content: SingleChildScrollView(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
+      builder: (context) => StatefulBuilder(
+        builder: (context, setDialogState) => Consumer<PathHistoryService>(
+          builder: (context, pathService, _) {
+            final paths = pathService.getRecentPaths(
+              widget.contact.publicKeyHex,
+            );
+
+            final repeatersList = List.of(connector.directRepeaters)
+              ..sort((a, b) => b.ranking.compareTo(a.ranking));
+
+            if (repeatersList.isEmpty) {
+              showAllPaths = true;
+            }
+
+            final directRepeater = repeatersList.isEmpty
+                ? null
+                : repeatersList.first;
+            final secondDirectRepeater = repeatersList.length < 2
+                ? null
+                : repeatersList.elementAt(1);
+            final thirdDirectRepeater = repeatersList.length < 3
+                ? null
+                : repeatersList.elementAt(2);
+
+            List<MapEntry<int, MapEntry<Color, PathRecord>>>
+            pathsWithRepeaters = paths.map((path) {
+              final isDirectRepeater =
+                  directRepeater != null &&
+                  path.pathBytes.isNotEmpty &&
+                  directRepeater.pubkeyFirstByte == path.pathBytes.first;
+              final isSecondDirectRepeater =
+                  secondDirectRepeater != null &&
+                  path.pathBytes.isNotEmpty &&
+                  secondDirectRepeater.pubkeyFirstByte == path.pathBytes.first;
+              final isThirdDirectRepeater =
+                  thirdDirectRepeater != null &&
+                  path.pathBytes.isNotEmpty &&
+                  thirdDirectRepeater.pubkeyFirstByte == path.pathBytes.first;
+
+              int ranking = -1;
+              Color color = Colors.grey;
+              if (isDirectRepeater) {
+                color = Colors.green;
+                ranking = 3;
+              } else if (isSecondDirectRepeater) {
+                color = Colors.yellow;
+                ranking = 2;
+              } else if (isThirdDirectRepeater) {
+                color = Colors.red;
+                ranking = 1;
+              } else if (path.wasFloodDiscovery) {
+                color = Colors.blue;
+                ranking = 0;
+              }
+
+              return MapEntry(ranking, MapEntry(color, path));
+            }).toList();
+
+            pathsWithRepeaters.sort((a, b) => b.key.compareTo(a.key));
+
+            return AlertDialog(
+              title: Row(
                children: [
-                  if (paths.isNotEmpty) ...[
+                  const Icon(Icons.timeline),
+                  const SizedBox(width: 8),
+                  Text(context.l10n.chat_pathManagement),
+                ],
+              ),
+              content: SingleChildScrollView(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    if (pathsWithRepeaters.isNotEmpty) ...[
+                      if (repeatersList.isNotEmpty)
+                        FeatureToggleRow(
+                          title: context.l10n.chat_ShowAllPaths,
+                          subtitle: "",
+                          value: showAllPaths,
+                          onChanged: (val) {
+                            setDialogState(() {
+                              showAllPaths = val;
+                            });
+                          },
+                        ),
+                      Text(
+                        context.l10n.chat_recentAckPaths,
+                        style: const TextStyle(
+                          fontWeight: FontWeight.bold,
+                          fontSize: 12,
+                        ),
+                      ),
+                      if (pathsWithRepeaters.length >= 100) ...[
+                        const SizedBox(height: 8),
+                        Container(
+                          width: double.infinity,
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 12,
+                            vertical: 8,
+                          ),
+                          decoration: BoxDecoration(
+                            color: Colors.amber[100],
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                          child: Text(
+                            context.l10n.chat_pathHistoryFull,
+                            style: const TextStyle(fontSize: 12),
+                          ),
+                        ),
+                      ],
+                      const SizedBox(height: 8),
+                      ...pathsWithRepeaters.map((entry) {
+                        final path = entry.value.value;
+                        final color = entry.value.key;
+                        if (!showAllPaths && entry.key < 1) {
+                          return const SizedBox.shrink();
+                        } else {
+                          return Card(
+                            margin: const EdgeInsets.symmetric(vertical: 4),
+                            child: ListTile(
+                              dense: true,
+                              leading: CircleAvatar(
+                                radius: 16,
+                                backgroundColor: color,
+                                child: Text(
+                                  '${path.hopCount}',
+                                  style: const TextStyle(fontSize: 12),
+                                ),
+                              ),
+                              title: Text(
+                                '${path.hopCount} ${path.hopCount == 1 ? context.l10n.chat_hopSingular : context.l10n.chat_hopPlural}',
+                                style: const TextStyle(fontSize: 14),
+                              ),
+                              subtitle: Text(
+                                '${(path.tripTimeMs / 1000).toStringAsFixed(2)}s • ${_formatRelativeTime(path.timestamp)} • ${path.successCount} ${context.l10n.chat_successes}',
+                                style: const TextStyle(fontSize: 11),
+                              ),
+                              trailing: Row(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  IconButton(
+                                    icon: const Icon(Icons.close, size: 16),
+                                    tooltip: context.l10n.chat_removePath,
+                                    onPressed: () async {
+                                      await pathService.removePathRecord(
+                                        widget.contact.publicKeyHex,
+                                        path.pathBytes,
+                                      );
+                                    },
+                                  ),
+                                  path.wasFloodDiscovery
+                                      ? const Icon(
+                                          Icons.waves,
+                                          size: 16,
+                                          color: Colors.grey,
+                                        )
+                                      : const Icon(
+                                          Icons.route,
+                                          size: 16,
+                                          color: Colors.grey,
+                                        ),
+                                ],
+                              ),
+                              onLongPress: () =>
+                                  _showFullPathDialog(context, path.pathBytes),
+                              onTap: () async {
+                                if (path.pathBytes.isEmpty) {
+                                  ScaffoldMessenger.of(context).showSnackBar(
+                                    SnackBar(
+                                      content: Text(
+                                        context
+                                            .l10n
+                                            .chat_pathDetailsNotAvailable,
+                                      ),
+                                      duration: const Duration(seconds: 2),
+                                    ),
+                                  );
+                                  return;
+                                }
+
+                                final pathBytes = Uint8List.fromList(
+                                  path.pathBytes,
+                                );
+                                final pathLength = path.pathBytes.length;
+
+                                // Set the path override to persist user's choice
+                                await connector.setPathOverride(
+                                  widget.contact,
+                                  pathLen: pathLength,
+                                  pathBytes: pathBytes,
+                                );
+
+                                if (!context.mounted) return;
+                                Navigator.pop(context);
+                                await _notifyPathSet(
+                                  connector,
+                                  widget.contact,
+                                  pathBytes,
+                                  path.hopCount,
+                                );
+                              },
+                            ),
+                          );
+                        }
+                      }),
+                      const Divider(),
+                    ] else ...[
+                      Text(context.l10n.chat_noPathHistoryYet),
+                      const Divider(),
+                    ],
+                    const SizedBox(height: 8),
                    Text(
-                      context.l10n.chat_recentAckPaths,
+                      context.l10n.chat_pathActions,
                      style: const TextStyle(
                        fontWeight: FontWeight.bold,
                        fontSize: 12,
                      ),
                    ),
-                    if (paths.length >= 100) ...[
-                      const SizedBox(height: 8),
-                      Container(
-                        width: double.infinity,
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 12,
-                          vertical: 8,
-                        ),
-                        decoration: BoxDecoration(
-                          color: Colors.amber[100],
-                          borderRadius: BorderRadius.circular(8),
-                        ),
-                        child: Text(
-                          context.l10n.chat_pathHistoryFull,
-                          style: const TextStyle(fontSize: 12),
-                        ),
-                      ),
-                    ],
                    const SizedBox(height: 8),
-                    ...paths.map((path) {
-                      return Card(
-                        margin: const EdgeInsets.symmetric(vertical: 4),
-                        child: ListTile(
-                          dense: true,
-                          leading: CircleAvatar(
-                            radius: 16,
-                            backgroundColor: path.wasFloodDiscovery
-                                ? Colors.blue
-                                : Colors.green,
-                            child: Text(
-                              '${path.hopCount}',
-                              style: const TextStyle(fontSize: 12),
-                            ),
+                    ListTile(
+                      dense: true,
+                      leading: const CircleAvatar(
+                        radius: 16,
+                        backgroundColor: Colors.purple,
+                        child: Icon(Icons.edit_road, size: 16),
+                      ),
+                      title: Text(
+                        context.l10n.chat_setCustomPath,
+                        style: const TextStyle(fontSize: 14),
+                      ),
+                      subtitle: Text(
+                        context.l10n.chat_setCustomPathSubtitle,
+                        style: const TextStyle(fontSize: 11),
+                      ),
+                      onTap: () {
+                        Navigator.pop(context);
+                        _showCustomPathDialog(context);
+                      },
+                    ),
+                    ListTile(
+                      dense: true,
+                      leading: const CircleAvatar(
+                        radius: 16,
+                        backgroundColor: Colors.orange,
+                        child: Icon(Icons.clear_all, size: 16),
+                      ),
+                      title: Text(
+                        context.l10n.chat_clearPath,
+                        style: const TextStyle(fontSize: 14),
+                      ),
+                      subtitle: Text(
+                        context.l10n.chat_clearPathSubtitle,
+                        style: const TextStyle(fontSize: 11),
+                      ),
+                      onTap: () async {
+                        await connector.clearContactPath(widget.contact);
+                        if (!context.mounted) return;
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(
+                            content: Text(context.l10n.chat_pathCleared),
+                            duration: const Duration(seconds: 2),
                          ),
-                          title: Text(
-                            '${path.hopCount} ${path.hopCount == 1 ? context.l10n.chat_hopSingular : context.l10n.chat_hopPlural}',
-                            style: const TextStyle(fontSize: 14),
+                        );
+                        Navigator.pop(context);
+                      },
+                    ),
+                    ListTile(
+                      dense: true,
+                      leading: const CircleAvatar(
+                        radius: 16,
+                        backgroundColor: Colors.blue,
+                        child: Icon(Icons.waves, size: 16),
+                      ),
+                      title: Text(
+                        context.l10n.chat_forceFloodMode,
+                        style: const TextStyle(fontSize: 14),
+                      ),
+                      subtitle: Text(
+                        context.l10n.chat_floodModeSubtitle,
+                        style: const TextStyle(fontSize: 11),
+                      ),
+                      onTap: () async {
+                        await connector.setPathOverride(
+                          widget.contact,
+                          pathLen: -1,
+                        );
+                        if (!context.mounted) return;
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(
+                            content: Text(context.l10n.chat_floodModeEnabled),
+                            duration: const Duration(seconds: 2),
                          ),
-                          subtitle: Text(
-                            '${(path.tripTimeMs / 1000).toStringAsFixed(2)}s • ${_formatRelativeTime(path.timestamp)} • ${path.successCount} ${context.l10n.chat_successes}',
-                            style: const TextStyle(fontSize: 11),
-                          ),
-                          trailing: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              IconButton(
-                                icon: const Icon(Icons.close, size: 16),
-                                tooltip: context.l10n.chat_removePath,
-                                onPressed: () async {
-                                  await pathService.removePathRecord(
-                                    widget.contact.publicKeyHex,
-                                    path.pathBytes,
-                                  );
-                                },
-                              ),
-                              path.wasFloodDiscovery
-                                  ? const Icon(
-                                      Icons.waves,
-                                      size: 16,
-                                      color: Colors.grey,
-                                    )
-                                  : const Icon(
-                                      Icons.route,
-                                      size: 16,
-                                      color: Colors.grey,
-                                    ),
-                            ],
-                          ),
-                          onLongPress: () =>
-                              _showFullPathDialog(context, path.pathBytes),
-                          onTap: () async {
-                            if (path.pathBytes.isEmpty) {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                SnackBar(
-                                  content: Text(
-                                    context.l10n.chat_pathDetailsNotAvailable,
-                                  ),
-                                  duration: const Duration(seconds: 2),
-                                ),
-                              );
-                              return;
-                            }
-
-                            final pathBytes = Uint8List.fromList(
-                              path.pathBytes,
-                            );
-                            final pathLength = path.pathBytes.length;
-
-                            // Set the path override to persist user's choice
-                            await connector.setPathOverride(
-                              widget.contact,
-                              pathLen: pathLength,
-                              pathBytes: pathBytes,
-                            );
-
-                            if (!context.mounted) return;
-                            Navigator.pop(context);
-                            await _notifyPathSet(
-                              connector,
-                              widget.contact,
-                              pathBytes,
-                              path.hopCount,
-                            );
-                          },
-                        ),
-                      );
-                    }),
-                    const Divider(),
-                  ] else ...[
-                    Text(context.l10n.chat_noPathHistoryYet),
-                    const Divider(),
+                        );
+                        Navigator.pop(context);
+                      },
+                    ),
                  ],
-                  const SizedBox(height: 8),
-                  Text(
-                    context.l10n.chat_pathActions,
-                    style: const TextStyle(
-                      fontWeight: FontWeight.bold,
-                      fontSize: 12,
-                    ),
-                  ),
-                  const SizedBox(height: 8),
-                  ListTile(
-                    dense: true,
-                    leading: const CircleAvatar(
-                      radius: 16,
-                      backgroundColor: Colors.purple,
-                      child: Icon(Icons.edit_road, size: 16),
-                    ),
-                    title: Text(
-                      context.l10n.chat_setCustomPath,
-                      style: const TextStyle(fontSize: 14),
-                    ),
-                    subtitle: Text(
-                      context.l10n.chat_setCustomPathSubtitle,
-                      style: const TextStyle(fontSize: 11),
-                    ),
-                    onTap: () {
-                      Navigator.pop(context);
-                      _showCustomPathDialog(context);
-                    },
-                  ),
-                  ListTile(
-                    dense: true,
-                    leading: const CircleAvatar(
-                      radius: 16,
-                      backgroundColor: Colors.orange,
-                      child: Icon(Icons.clear_all, size: 16),
-                    ),
-                    title: Text(
-                      context.l10n.chat_clearPath,
-                      style: const TextStyle(fontSize: 14),
-                    ),
-                    subtitle: Text(
-                      context.l10n.chat_clearPathSubtitle,
-                      style: const TextStyle(fontSize: 11),
-                    ),
-                    onTap: () async {
-                      await connector.clearContactPath(widget.contact);
-                      if (!context.mounted) return;
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(
-                          content: Text(context.l10n.chat_pathCleared),
-                          duration: const Duration(seconds: 2),
-                        ),
-                      );
-                      Navigator.pop(context);
-                    },
-                  ),
-                  ListTile(
-                    dense: true,
-                    leading: const CircleAvatar(
-                      radius: 16,
-                      backgroundColor: Colors.blue,
-                      child: Icon(Icons.waves, size: 16),
-                    ),
-                    title: Text(
-                      context.l10n.chat_forceFloodMode,
-                      style: const TextStyle(fontSize: 14),
-                    ),
-                    subtitle: Text(
-                      context.l10n.chat_floodModeSubtitle,
-                      style: const TextStyle(fontSize: 11),
-                    ),
-                    onTap: () async {
-                      await connector.setPathOverride(
-                        widget.contact,
-                        pathLen: -1,
-                      );
-                      if (!context.mounted) return;
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(
-                          content: Text(context.l10n.chat_floodModeEnabled),
-                          duration: const Duration(seconds: 2),
-                        ),
-                      );
-                      Navigator.pop(context);
-                    },
-                  ),
-                ],
+                ),
              ),
-            ),
-            actions: [
-              TextButton(
-                onPressed: () => Navigator.pop(context),
-                child: Text(context.l10n.common_close),
-              ),
-            ],
-          );
-        },
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.pop(context),
+                  child: Text(context.l10n.common_close),
+                ),
+              ],
+            );
+          },
+        ),
      ),
    );
  }
@@ -6,6 +6,7 @@ import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
 import '../models/community.dart';
 import '../storage/community_store.dart';
+import '../widgets/adaptive_app_bar_title.dart';
 import '../widgets/qr_scanner_widget.dart';

 /// Screen for scanning community QR codes to join communities.
@@ -29,7 +30,7 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
  Widget build(BuildContext context) {
    return Scaffold(
      appBar: AppBar(
-        title: Text(context.l10n.community_scanQr),
+        title: AdaptiveAppBarTitle(context.l10n.community_scanQr),
        centerTitle: true,
      ),
      body: _isProcessing
@@ -3,6 +3,8 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:meshcore_open/screens/path_trace_map.dart';
+import 'package:meshcore_open/utils/app_logger.dart';
+import 'package:meshcore_open/widgets/app_bar.dart';
 import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
@@ -16,7 +18,6 @@ import '../utils/dialog_utils.dart';
 import '../utils/disconnect_navigation_mixin.dart';
 import '../utils/emoji_utils.dart';
 import '../utils/route_transitions.dart';
-import '../widgets/battery_indicator.dart';
 import '../widgets/list_filter_widget.dart';
 import '../widgets/empty_state.dart';
 import '../widgets/quick_switch_bar.dart';
@@ -90,79 +91,90 @@ class _ContactsScreenState extends State<ContactsScreen>
    _frameSubscription = connector.receivedFrames.listen((frame) {
      if (frame.isEmpty) return;
      final frameBuffer = BufferReader(frame);
-      final code = frameBuffer.readUInt8();
+      try {
+        final code = frameBuffer.readUInt8();

-      if (code == respCodeExportContact) {
-        final advertPacket = frameBuffer.readRemainingBytes();
-        // Validate packet has expected minimum size (98+ bytes per protocol)
-        if (advertPacket.length < 98) {
-          if (mounted) {
+        if (code == respCodeExportContact) {
+          final advertPacket = frameBuffer.readRemainingBytes();
+          // Validate packet has expected minimum size (98+ bytes per protocol)
+          if (advertPacket.length < 98) {
+            if (mounted) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  content: Text(context.l10n.contacts_invalidAdvertFormat),
+                ),
+              );
+            }
+            _pendingOperations.remove(ContactOperationType.export);
+            return;
+          }
+          final hexString = pubKeyToHex(advertPacket);
+          Clipboard.setData(ClipboardData(text: "meshcore://$hexString"));
+        }
+
+        if (code == respCodeOk) {
+          // Show a snackbar indicating success
+          if (!mounted) return;
+
+          if (_pendingOperations.contains(ContactOperationType.import)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(content: Text(context.l10n.contacts_contactImported)),
+            );
+          }
+
+          if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
            ScaffoldMessenger.of(context).showSnackBar(
              SnackBar(
-                content: Text(context.l10n.contacts_invalidAdvertFormat),
+                content: Text(context.l10n.contacts_zeroHopContactAdvertSent),
              ),
            );
          }
-          _pendingOperations.remove(ContactOperationType.export);
-          return;
-        }
-        final hexString = pubKeyToHex(advertPacket);
-        Clipboard.setData(ClipboardData(text: "meshcore://$hexString"));
-      }

-      if (code == respCodeOk) {
-        // Show a snackbar indicating success
-        if (!mounted) return;
+          if (_pendingOperations.contains(ContactOperationType.export)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_contactAdvertCopied),
+              ),
+            );
+          }

-        if (_pendingOperations.contains(ContactOperationType.import)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(context.l10n.contacts_contactImported)),
-          );
+          _pendingOperations.clear();
        }

-        if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(context.l10n.contacts_zeroHopContactAdvertSent),
-            ),
-          );
+        if (code == respCodeErr) {
+          // Show a snackbar indicating failure
+          if (!mounted) return;
+
+          if (_pendingOperations.contains(ContactOperationType.import)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_contactImportFailed),
+              ),
+            );
+          }
+
+          if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_zeroHopContactAdvertFailed),
+              ),
+            );
+          }
+          if (_pendingOperations.contains(ContactOperationType.export)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_contactAdvertCopyFailed),
+              ),
+            );
+          }
+
+          _pendingOperations.clear();
        }
-
-        if (_pendingOperations.contains(ContactOperationType.export)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(context.l10n.contacts_contactAdvertCopied)),
-          );
-        }
-
-        _pendingOperations.clear();
-      }
-
-      if (code == respCodeErr) {
-        // Show a snackbar indicating failure
-        if (!mounted) return;
-
-        if (_pendingOperations.contains(ContactOperationType.import)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(context.l10n.contacts_contactImportFailed)),
-          );
-        }
-
-        if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(context.l10n.contacts_zeroHopContactAdvertFailed),
-            ),
-          );
-        }
-        if (_pendingOperations.contains(ContactOperationType.export)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(context.l10n.contacts_contactAdvertCopyFailed),
-            ),
-          );
-        }
-
-        _pendingOperations.clear();
+      } catch (e) {
+        appLogger.error(
+          'Error processing received frame: $e',
+          tag: 'ContactsScreen',
+        );
      }
    });
  }
@@ -171,14 +183,17 @@ class _ContactsScreenState extends State<ContactsScreen>
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
    final exportContactFrame = buildExportContactFrame(pubKey);
    _pendingOperations.add(ContactOperationType.export);
-    await connector.sendFrame(exportContactFrame);
+    await connector.sendFrame(exportContactFrame, expectsGenericAck: true);
  }

  Future<void> _contactZeroHop(Uint8List pubKey) async {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
    final exportContactZeroHopFrame = buildZeroHopContact(pubKey);
    _pendingOperations.add(ContactOperationType.zeroHopShare);
-    await connector.sendFrame(exportContactZeroHopFrame);
+    await connector.sendFrame(
+      exportContactZeroHopFrame,
+      expectsGenericAck: true,
+    );
  }

  Future<void> _contactImport() async {
@@ -205,7 +220,7 @@ class _ContactsScreenState extends State<ContactsScreen>
    try {
      final importContactFrame = buildImportContactFrame(hexString);
      _pendingOperations.add(ContactOperationType.import);
-      await connector.sendFrame(importContactFrame);
+      await connector.sendFrame(importContactFrame, expectsGenericAck: true);
    } catch (e) {
      if (mounted) {
        ScaffoldMessenger.of(context).showSnackBar(
@@ -229,9 +244,7 @@ class _ContactsScreenState extends State<ContactsScreen>
      canPop: allowBack,
      child: Scaffold(
        appBar: AppBar(
-          leading: BatteryIndicator(connector: connector),
-          title: Text(context.l10n.contacts_title),
-          centerTitle: true,
+          title: AppBarTitle(context.l10n.contacts_title),
          automaticallyImplyLeading: false,
          actions: [
            PopupMenuButton(
@@ -1160,12 +1173,17 @@ class _ContactTile extends StatelessWidget {
        backgroundColor: _getTypeColor(contact.type),
        child: _buildContactAvatar(contact),
      ),
-      title: Text(contact.name),
+      title: Text(contact.name, maxLines: 1, overflow: TextOverflow.ellipsis),
      subtitle: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          Text(contact.pathLabel),
-          Text(contact.shortPubKeyHex, style: TextStyle(fontSize: 12)),
+          Text(contact.pathLabel, maxLines: 1, overflow: TextOverflow.ellipsis),
+          Text(
+            contact.shortPubKeyHex,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: const TextStyle(fontSize: 12),
+          ),
        ],
      ),
      // Clamp text scaling in trailing section to prevent overflow while
@@ -1176,26 +1194,32 @@ class _ContactTile extends StatelessWidget {
            MediaQuery.textScalerOf(context).scale(1.0).clamp(1.0, 1.3),
          ),
        ),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.end,
-          children: [
-            if (unreadCount > 0) ...[
-              UnreadBadge(count: unreadCount),
-              const SizedBox(height: 4),
-            ],
-            Text(
-              _formatLastSeen(context, lastSeen),
-              style: TextStyle(fontSize: 12, color: Colors.grey[600]),
-            ),
-            Row(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                if (contact.hasLocation)
-                  Icon(Icons.location_on, size: 14, color: Colors.grey[400]),
+        child: SizedBox(
+          width: 120,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.end,
+            children: [
+              if (unreadCount > 0) ...[
+                UnreadBadge(count: unreadCount),
+                const SizedBox(height: 4),
              ],
-            ),
-          ],
+              Text(
+                _formatLastSeen(context, lastSeen),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                textAlign: TextAlign.right,
+                style: TextStyle(fontSize: 12, color: Colors.grey[600]),
+              ),
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  if (contact.hasLocation)
+                    Icon(Icons.location_on, size: 14, color: Colors.grey[400]),
+                ],
+              ),
+            ],
+          ),
        ),
      ),
      onTap: onTap,
@@ -7,6 +7,7 @@ import '../l10n/app_localizations.dart';
 import '../l10n/l10n.dart';
 import '../services/app_settings_service.dart';
 import '../services/map_tile_cache_service.dart';
+import '../widgets/adaptive_app_bar_title.dart';

 class MapCacheScreen extends StatefulWidget {
  const MapCacheScreen({super.key});
@@ -224,7 +225,10 @@ class _MapCacheScreenState extends State<MapCacheScreen> {
        : (_completedTiles / _estimatedTiles).clamp(0.0, 1.0).toDouble();

    return Scaffold(
-      appBar: AppBar(title: Text(l10n.mapCache_title), centerTitle: true),
+      appBar: AppBar(
+        title: AdaptiveAppBarTitle(l10n.mapCache_title),
+        centerTitle: true,
+      ),
      body: Column(
        children: [
          Expanded(
@@ -5,11 +5,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:meshcore_open/screens/path_trace_map.dart';
+import 'package:meshcore_open/widgets/app_bar.dart';
 import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
 import '../connector/meshcore_protocol.dart';
+import '../models/app_settings.dart';
 import '../models/channel.dart';
 import '../models/contact.dart';
 import '../services/app_settings_service.dart';
@@ -17,7 +19,6 @@ import '../services/map_marker_service.dart';
 import '../services/map_tile_cache_service.dart';
 import '../utils/contact_search.dart';
 import '../utils/route_transitions.dart';
-import '../widgets/battery_indicator.dart';
 import '../widgets/quick_switch_bar.dart';
 import 'channels_screen.dart';
 import 'chat_screen.dart';
@@ -26,6 +27,7 @@ import '../widgets/repeater_login_dialog.dart';
 import '../widgets/room_login_dialog.dart';
 import 'repeater_hub_screen.dart';
 import 'settings_screen.dart';
+import 'line_of_sight_map_screen.dart';

 class MapScreen extends StatefulWidget {
  final LatLng? highlightPosition;
@@ -46,6 +48,8 @@ class MapScreen extends StatefulWidget {
 }

 class _MapScreenState extends State<MapScreen> {
+  static const double _labelZoomThreshold = 8.5;
+
  final MapController _mapController = MapController();
  final MapMarkerService _markerService = MapMarkerService();
  final Set<String> _hiddenMarkerIds = {};
@@ -58,6 +62,7 @@ class _MapScreenState extends State<MapScreen> {
  final List<LatLng> _points = [];
  final List<Polyline> _polylines = [];
  bool _legendExpanded = false;
+  bool _showNodeLabels = true;

  @override
  void initState() {
@@ -105,7 +110,7 @@ class _MapScreenState extends State<MapScreen> {
  double _zoomFromStdDev(double latStdDev, double lonStdDev) {
    final maxSpread = max(latStdDev, lonStdDev);
    if (maxSpread <= 0) return 13.0;
-    // Approzimate: each zoom level halves the visible area
+    // Approximate: each zoom level halves the visible area
    // ~0.01 degrees spread -> zoom 13, ~0.1 -> zoom 10, ~1.0 -> zoom 7
    final zoom = 10.0 - log(maxSpread * 10 + 1) / ln10 * 3;
    return zoom.clamp(4.0, 15.0);
@@ -247,6 +252,7 @@ class _MapScreenState extends State<MapScreen> {
        // Re center map after removed markers have loaded
        if (!_hasInitializedMap && _removedMarkersLoaded) {
          _hasInitializedMap = true;
+          _showNodeLabels = initialZoom >= _labelZoomThreshold;
          if (hasMapContent) {
            WidgetsBinding.instance.addPostFrameCallback((_) {
              if (mounted) {
@@ -262,8 +268,7 @@ class _MapScreenState extends State<MapScreen> {
          canPop: allowBack,
          child: Scaffold(
            appBar: AppBar(
-              leading: BatteryIndicator(connector: connector),
-              title: Text(context.l10n.map_title),
+              title: AppBarTitle(context.l10n.map_title),
              centerTitle: true,
              automaticallyImplyLeading: false,
              actions: [
@@ -273,6 +278,47 @@ class _MapScreenState extends State<MapScreen> {
                    onPressed: () => _startPath(),
                    tooltip: context.l10n.contacts_pathTrace,
                  ),
+                if (!_isBuildingPathTrace)
+                  IconButton(
+                    icon: const Icon(Icons.visibility),
+                    onPressed: () {
+                      final candidates = <LineOfSightEndpoint>[];
+                      if (connector.selfLatitude != null &&
+                          connector.selfLongitude != null) {
+                        candidates.add(
+                          LineOfSightEndpoint(
+                            label: context.l10n.pathTrace_you,
+                            point: LatLng(
+                              connector.selfLatitude!,
+                              connector.selfLongitude!,
+                            ),
+                            color: Colors.teal,
+                            icon: Icons.person_pin_circle,
+                          ),
+                        );
+                      }
+                      for (final c in contactsWithLocation) {
+                        candidates.add(
+                          LineOfSightEndpoint(
+                            label: c.name,
+                            point: LatLng(c.latitude!, c.longitude!),
+                            color: _getNodeColor(c.type),
+                            icon: _getNodeIcon(c.type),
+                          ),
+                        );
+                      }
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (context) => LineOfSightMapScreen(
+                            title: context.l10n.map_losScreenTitle,
+                            candidates: candidates,
+                          ),
+                        ),
+                      );
+                    },
+                    tooltip: context.l10n.map_lineOfSight,
+                  ),
                PopupMenuButton(
                  itemBuilder: (context) => [
                    PopupMenuItem(
@@ -351,6 +397,14 @@ class _MapScreenState extends State<MapScreen> {
                        position: latLng,
                      );
                    },
+                    onPositionChanged: (camera, hasGesture) {
+                      final shouldShow = camera.zoom >= _labelZoomThreshold;
+                      if (shouldShow != _showNodeLabels && mounted) {
+                        setState(() {
+                          _showNodeLabels = shouldShow;
+                        });
+                      }
+                    },
                  ),
                  children: [
                    TileLayer(
@@ -375,7 +429,11 @@ class _MapScreenState extends State<MapScreen> {
                              size: 34,
                            ),
                          ),
-                        ..._buildMarkers(contactsWithLocation, settings),
+                        ..._buildMarkers(
+                          contactsWithLocation,
+                          settings,
+                          showLabels: _showNodeLabels,
+                        ),
                        ...sharedMarkers.map(_buildSharedMarker),
                        if (connector.selfLatitude != null &&
                            connector.selfLongitude != null)
@@ -384,8 +442,8 @@ class _MapScreenState extends State<MapScreen> {
                              connector.selfLatitude!,
                              connector.selfLongitude!,
                            ),
-                            width: 35,
-                            height: 35,
+                            width: 40,
+                            height: 40,
                            child: Container(
                              padding: const EdgeInsets.all(4),
                              decoration: BoxDecoration(
@@ -404,23 +462,31 @@ class _MapScreenState extends State<MapScreen> {
                                ],
                              ),
                              alignment: Alignment.center,
-                              child: Text(
-                                context.l10n.pathTrace_you,
-                                style: const TextStyle(
-                                  color: Colors.black,
-                                  fontWeight: FontWeight.bold,
-                                  fontSize: 12,
-                                ),
+                              child: const Icon(
+                                Icons.person_pin_circle,
+                                color: Colors.white,
+                                size: 20,
                              ),
                            ),
                          ),
+                        if (_showNodeLabels &&
+                            connector.selfLatitude != null &&
+                            connector.selfLongitude != null)
+                          _buildNodeLabelMarker(
+                            point: LatLng(
+                              connector.selfLatitude!,
+                              connector.selfLongitude!,
+                            ),
+                            label: context.l10n.pathTrace_you,
+                          ),
                      ],
                    ),
                  ],
                ),
                if (!_isBuildingPathTrace)
                  _buildLegend(
-                    contactsWithLocation.length,
+                    contactsWithLocation,
+                    settings,
                    sharedMarkers.length,
                  ),
                if (_isBuildingPathTrace) _buildPathTraceOverlay(),
@@ -445,20 +511,28 @@ class _MapScreenState extends State<MapScreen> {
    );
  }

-  List<Marker> _buildMarkers(List<Contact> contacts, settings) {
+  List<Marker> _buildMarkers(
+    List<Contact> contacts,
+    settings, {
+    required bool showLabels,
+  }) {
    final markers = <Marker>[];

    for (final contact in contacts) {
      if (!contact.hasLocation) continue;

      // Apply node type filters
-      if (contact.type == advTypeRepeater && !settings.mapShowRepeaters) {
+      if (contact.type == advTypeRepeater &&
+          (!settings.mapShowRepeaters && !_isBuildingPathTrace)) {
+        continue;
+      }
+      if (contact.type == advTypeChat &&
+          !(settings.mapShowChatNodes && !_isBuildingPathTrace)) {
        continue;
      }
-      if (contact.type == advTypeChat && !settings.mapShowChatNodes) continue;
      if (contact.type != advTypeChat &&
          contact.type != advTypeRepeater &&
-          !settings.mapShowOtherNodes) {
+          (!settings.mapShowOtherNodes && !_isBuildingPathTrace)) {
        continue;
      }

@@ -500,11 +574,54 @@ class _MapScreenState extends State<MapScreen> {
      );

      markers.add(marker);
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: LatLng(contact.latitude!, contact.longitude!),
+            label: contact.name,
+          ),
+        );
+      }
    }

    return markers;
  }

+  Marker _buildNodeLabelMarker({required LatLng point, required String label}) {
+    return Marker(
+      point: point,
+      width: 120,
+      height: 24,
+      alignment: Alignment.topCenter,
+      child: IgnorePointer(
+        child: Transform.translate(
+          offset: const Offset(0, -20),
+          child: FittedBox(
+            fit: BoxFit.contain,
+            child: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+              decoration: BoxDecoration(
+                color: Colors.black54,
+                borderRadius: BorderRadius.circular(8),
+              ),
+              alignment: Alignment.center,
+              child: Text(
+                label,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 11,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
  Color _getNodeColor(int type) {
    switch (type) {
      case advTypeChat:
@@ -535,7 +652,26 @@ class _MapScreenState extends State<MapScreen> {
    }
  }

-  Widget _buildLegend(int nodeCount, int markerCount) {
+  Widget _buildLegend(
+    List<Contact> contactsWithLocation,
+    settings,
+    int markerCount,
+  ) {
+    int nodeCount = 0;
+    for (final contact in contactsWithLocation) {
+      // Apply node type filters
+      if (contact.type == advTypeRepeater && !settings.mapShowRepeaters) {
+        continue;
+      }
+      if (contact.type == advTypeChat && !settings.mapShowChatNodes) continue;
+      if (contact.type != advTypeChat &&
+          contact.type != advTypeRepeater &&
+          !settings.mapShowOtherNodes) {
+        continue;
+      }
+      nodeCount++;
+    }
+
    return Positioned(
      top: 16,
      right: 16,
@@ -826,7 +962,7 @@ class _MapScreenState extends State<MapScreen> {
              color: _getNodeColor(contact.type),
            ),
            const SizedBox(width: 8),
-            Expanded(child: Text(contact.name)),
+            Expanded(child: SelectableText(contact.name)),
          ],
        ),
        content: Column(
@@ -997,7 +1133,7 @@ class _MapScreenState extends State<MapScreen> {
            ),
          ),
          const SizedBox(height: 2),
-          Text(value, style: const TextStyle(fontSize: 14)),
+          SelectableText(value, style: const TextStyle(fontSize: 14)),
        ],
      ),
    );
@@ -1520,6 +1656,9 @@ class _MapScreenState extends State<MapScreen> {

  Widget _buildPathTraceOverlay() {
    final l10n = context.l10n;
+    final isImperial =
+        context.read<AppSettingsService>().settings.unitSystem ==
+        UnitSystem.imperial;
    return Positioned(
      top: 16,
      left: 16,
@@ -1540,7 +1679,7 @@ class _MapScreenState extends State<MapScreen> {
              const SizedBox(height: 6),
              if (_pathTrace.isNotEmpty)
                Text(
-                  "${l10n.path_currentPathLabel} ${formatDistance(getPathDistanceMeters(_points))}",
+                  "${l10n.path_currentPathLabel} ${formatDistance(getPathDistanceMeters(_points), isImperial: isImperial)}",
                  style: TextStyle(fontSize: 12, color: Colors.grey[700]),
                ),
              SelectableText(
@@ -1550,8 +1689,10 @@ class _MapScreenState extends State<MapScreen> {
                style: TextStyle(fontSize: 18),
              ),
              const SizedBox(height: 6),
-              Row(
-                mainAxisSize: MainAxisSize.min,
+              Wrap(
+                alignment: WrapAlignment.center,
+                spacing: 8,
+                runSpacing: 8,
                children: [
                  if (_pathTrace.isNotEmpty)
                    ElevatedButton(
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:meshcore_open/utils/app_logger.dart';
 import 'package:provider/provider.dart';
 import '../l10n/l10n.dart';
 import '../models/contact.dart';
@@ -11,28 +12,28 @@ import '../services/repeater_command_service.dart';
 import '../widgets/path_management_dialog.dart';
 import '../widgets/snr_indicator.dart';

-class NeighboursScreen extends StatefulWidget {
+class NeighborsScreen extends StatefulWidget {
  final Contact repeater;
  final String password;

-  const NeighboursScreen({
+  const NeighborsScreen({
    super.key,
    required this.repeater,
    required this.password,
  });

  @override
-  State<NeighboursScreen> createState() => _NeighboursScreenState();
+  State<NeighborsScreen> createState() => _NeighborsScreenState();
 }

-class _NeighboursScreenState extends State<NeighboursScreen> {
-  static const int _reqNeighboursKeyLen = 4;
+class _NeighborsScreenState extends State<NeighborsScreen> {
+  static const int _reqNeighborsKeyLen = 4;
  static const int _statusPayloadOffset = 8;
  static const int _statusStatsSize = 52;
  static const int _statusResponseBytes =
      _statusPayloadOffset + _statusStatsSize;
  Uint8List _tagData = Uint8List(4);
-  int _neighbourCount = 0;
+  int _neighborCount = 0;

  bool _isLoading = false;
  bool _isLoaded = false;
@@ -41,7 +42,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
  StreamSubscription<Uint8List>? _frameSubscription;
  RepeaterCommandService? _commandService;
  PathSelection? _pendingStatusSelection;
-  List<Map<String, dynamic>>? _parsedNeighbours;
+  List<Map<String, dynamic>>? _parsedNeighbors;

  @override
  void initState() {
@@ -49,7 +50,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
    _commandService = RepeaterCommandService(connector);
    _setupMessageListener();
-    _loadNeighbours();
+    _loadNeighbors();
    _hasData = false;
  }

@@ -62,13 +63,12 @@ class _NeighboursScreenState extends State<NeighboursScreen> {

      if (frame[0] == respCodeSent) {
        _tagData = frame.sublist(2, 6);
-        //_timeEstment = frame.buffer.asByteData().getUint32(6, Endian.little);
      }

      // Check if it's a binary response
      if (frame[0] == pushCodeBinaryResponse &&
          listEquals(frame.sublist(2, 6), _tagData)) {
-        _handleNeighboursResponse(connector, frame.sublist(6));
+        _handleNeighborsResponse(connector, frame.sublist(6));
      }
    });
  }
@@ -91,65 +91,77 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
    return '${h}h ${m2}m';
  }

-  static List<Map<String, dynamic>> parseNeighboursData(
+  static List<Map<String, dynamic>> parseNeighborsData(
    BufferReader buffer,
    int resultsCount,
  ) {
-    final Map<int, Map<String, dynamic>> neighbours = {};
-    for (var i = 0; i < resultsCount; i++) {
-      final neighbourData = neighbours.putIfAbsent(
-        i,
-        () => {
-          'contact': null,
-          'publicKey': <Uint8List>{},
-          'lastHeard': <int>{},
-          'snr': <double>{},
-        },
-      );
-      neighbourData['publicKey'] = buffer.readBytes(_reqNeighboursKeyLen);
-      neighbourData['lastHeard'] = buffer.readUInt32LE();
-      neighbourData['snr'] = buffer.readInt8() / 4.0;
-    }
+    final Map<int, Map<String, dynamic>> neighbors = {};
+    try {
+      for (var i = 0; i < resultsCount; i++) {
+        final neighborData = neighbors.putIfAbsent(
+          i,
+          () => {
+            'contact': null,
+            'publicKey': <Uint8List>{},
+            'lastHeard': <int>{},
+            'snr': <double>{},
+          },
+        );
+        neighborData['publicKey'] = buffer.readBytes(_reqNeighborsKeyLen);
+        neighborData['lastHeard'] = buffer.readUInt32LE();
+        neighborData['snr'] = buffer.readInt8() / 4.0;
+      }

-    return neighbours.values.toList();
+      return neighbors.values.toList();
+    } catch (e) {
+      appLogger.error(
+        'Error parsing neighbors data: $e',
+        tag: 'NeighborsScreen',
+      );
+      return [];
+    }
  }

-  void _handleNeighboursResponse(MeshCoreConnector connector, Uint8List frame) {
+  void _handleNeighborsResponse(MeshCoreConnector connector, Uint8List frame) {
    final buffer = BufferReader(frame);
-    final neighbourCount = buffer.readUInt16LE();
-    final parsedNeighbours = parseNeighboursData(buffer, buffer.readUInt16LE());
-    connector.contacts.where((c) => c.type == advTypeRepeater).forEach((
-      repeater,
-    ) {
-      for (var neighbourData in parsedNeighbours) {
-        final publicKey = neighbourData['publicKey'];
-        if (listEquals(
-          repeater.publicKey.sublist(0, _reqNeighboursKeyLen),
-          publicKey,
-        )) {
-          neighbourData['contact'] = repeater;
+    try {
+      final neighborCount = buffer.readUInt16LE();
+      final parsedNeighbors = parseNeighborsData(buffer, buffer.readUInt16LE());
+      connector.contacts.where((c) => c.type == advTypeRepeater).forEach((
+        repeater,
+      ) {
+        for (var neighborData in parsedNeighbors) {
+          final publicKey = neighborData['publicKey'];
+          if (listEquals(
+            repeater.publicKey.sublist(0, _reqNeighborsKeyLen),
+            publicKey,
+          )) {
+            neighborData['contact'] = repeater;
+          }
        }
-      }
-    });
+      });

-    setState(() {
-      _parsedNeighbours = parsedNeighbours;
-      _neighbourCount = neighbourCount;
-    });
+      setState(() {
+        _parsedNeighbors = parsedNeighbors;
+        _neighborCount = neighborCount;
+      });

-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        content: Text(context.l10n.neighbors_receivedData),
-        backgroundColor: Colors.green,
-      ),
-    );
-    _statusTimeout?.cancel();
-    if (!mounted) return;
-    setState(() {
-      _isLoading = false;
-      _isLoaded = true;
-      _hasData = true;
-    });
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(context.l10n.neighbors_receivedData),
+          backgroundColor: Colors.green,
+        ),
+      );
+      _statusTimeout?.cancel();
+      if (!mounted) return;
+      setState(() {
+        _isLoading = false;
+        _isLoaded = true;
+        _hasData = true;
+      });
+    } catch (e) {
+      appLogger.error('Error handling neighbors response: $e');
+    }
  }

  Contact _resolveRepeater(MeshCoreConnector connector) {
@@ -159,7 +171,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
    );
  }

-  Future<void> _loadNeighbours() async {
+  Future<void> _loadNeighbors() async {
    if (_commandService == null) return;

    setState(() {
@@ -172,17 +184,17 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
      final selection = await connector.preparePathForContactSend(repeater);
      _pendingStatusSelection = selection;

-      //[version][number of requested neighbours][offset_16bit][order by][len of public key]
+      //[version][number of requested neighbors][offset_16bit][order by][len of public key]
      final frame = buildSendBinaryReq(
        repeater.publicKey,
        payload: Uint8List.fromList([
-          reqTypeGetNeighbours,
+          reqTypeGetNeighbors,
          0x00,
          0x0F,
          0x00,
          0x00,
          0x00,
-          _reqNeighboursKeyLen,
+          _reqNeighborsKeyLen,
        ]),
      );
      await connector.sendFrame(frame);
@@ -258,7 +270,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
          mainAxisSize: MainAxisSize.min,
          children: [
            Text(
-              l10n.neighbors_repeatersNeighbours,
+              l10n.neighbors_repeatersNeighbors,
              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
            ),
            Text(
@@ -345,7 +357,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
                    child: CircularProgressIndicator(strokeWidth: 2),
                  )
                : const Icon(Icons.refresh),
-            onPressed: _isLoading ? null : _loadNeighbours,
+            onPressed: _isLoading ? null : _loadNeighbors,
            tooltip: l10n.repeater_refresh,
          ),
        ],
@@ -353,13 +365,13 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
      body: SafeArea(
        top: false,
        child: RefreshIndicator(
-          onRefresh: _loadNeighbours,
+          onRefresh: _loadNeighbors,
          child: ListView(
            padding: const EdgeInsets.all(16),
            children: [
              if (!_isLoaded &&
                  !_hasData &&
-                  (_parsedNeighbours == null || _parsedNeighbours!.isEmpty))
+                  (_parsedNeighbors == null || _parsedNeighbors!.isEmpty))
                Center(
                  child: Text(
                    l10n.neighbors_noData,
@@ -368,10 +380,9 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
                ),
              if (_isLoaded ||
                  _hasData &&
-                      !(_parsedNeighbours == null ||
-                          _parsedNeighbours!.isEmpty))
-                _buildNeighboursInfoCard(
-                  "${l10n.repeater_neighbours} - $_neighbourCount",
+                      !(_parsedNeighbors == null || _parsedNeighbors!.isEmpty))
+                _buildNeighborsInfoCard(
+                  "${l10n.repeater_neighbors} - $_neighborCount",
                ),
            ],
          ),
@@ -380,7 +391,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
    );
  }

-  Widget _buildNeighboursInfoCard(String title) {
+  Widget _buildNeighborsInfoCard(String title) {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
    return Card(
      child: Padding(
@@ -405,7 +416,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
              ],
            ),
            const Divider(),
-            for (final entry in _parsedNeighbours!.asMap().entries)
+            for (final entry in _parsedNeighbors!.asMap().entries)
              _buildInfoRow(
                entry.value['contact'] != null
                    ? entry.value['contact'].name
@@ -430,6 +441,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
    double snr,
    int spreadingFactor,
  ) {
+    final snrUi = snrUiFromSNR(snr, spreadingFactor);
    return Padding(
      padding: const EdgeInsets.symmetric(vertical: 3),
      child: Row(
@@ -443,9 +455,15 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
                style: const TextStyle(fontWeight: FontWeight.w500),
              ),
              subtitle: Text(value),
-              trailing: SNRIcon(
-                snr: snr,
-                snrLevels: getSNRfromSF(spreadingFactor),
+              trailing: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Icon(snrUi.icon, color: snrUi.color, size: 18.0),
+                  Text(
+                    snrUi.text,
+                    style: TextStyle(fontSize: 10, color: snrUi.color),
+                  ),
+                ],
              ),
            ),
          ),
@@ -8,8 +8,11 @@ import 'package:latlong2/latlong.dart';
 import 'package:meshcore_open/connector/meshcore_connector.dart';
 import 'package:meshcore_open/connector/meshcore_protocol.dart';
 import 'package:meshcore_open/l10n/l10n.dart';
+import 'package:meshcore_open/models/app_settings.dart';
 import 'package:meshcore_open/models/contact.dart';
+import 'package:meshcore_open/services/app_settings_service.dart';
 import 'package:meshcore_open/services/map_tile_cache_service.dart';
+import 'package:meshcore_open/utils/app_logger.dart';
 import 'package:meshcore_open/widgets/snr_indicator.dart';
 import 'package:provider/provider.dart';

@@ -26,13 +29,16 @@ double getPathDistanceMeters(List<LatLng> points) {
  return distanceMeters;
 }

-String formatDistance(double distanceMeters) {
-  return '(${(distanceMeters / 1609.34).toStringAsFixed(2)} Miles / ${(distanceMeters / 1000).toStringAsFixed(2)} Km)';
+String formatDistance(double distanceMeters, {required bool isImperial}) {
+  if (isImperial) {
+    return '(${(distanceMeters / 1609.34).toStringAsFixed(2)} mi)';
+  }
+  return '(${(distanceMeters / 1000).toStringAsFixed(2)} km)';
 }

 class PathTraceData {
  final Uint8List pathData;
-  final Uint8List snrData;
+  final List<double> snrData;
  final Map<int, Contact> pathContacts;

  PathTraceData({
@@ -45,6 +51,7 @@ class PathTraceData {
 class PathTraceMapScreen extends StatefulWidget {
  final String title;
  final Uint8List path;
+  final int? repeaterId;
  final bool flipPathRound;
  final bool reversePathRound;

@@ -52,6 +59,7 @@ class PathTraceMapScreen extends StatefulWidget {
    super.key,
    required this.title,
    required this.path,
+    this.repeaterId,
    this.flipPathRound = false,
    this.reversePathRound = false,
  });
@@ -61,6 +69,8 @@ class PathTraceMapScreen extends StatefulWidget {
 }

 class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
+  static const double _labelZoomThreshold = 8.5;
+
  StreamSubscription<Uint8List>? _frameSubscription;
  Timer? _timeoutTimer;

@@ -75,6 +85,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
  LatLngBounds? _bounds;
  ValueKey<String> _mapKey = const ValueKey('initial');
  double _pathDistanceMeters = 0.0;
+  bool _showNodeLabels = true;

  String _formatPathPrefixes(Uint8List pathBytes) {
    return pathBytes
@@ -96,7 +107,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
    super.dispose();
  }

-  Uint8List addReturnpath(Uint8List pathBytes) {
+  Uint8List addReturnPath(Uint8List pathBytes) {
    Uint8List? traceBytes;
    final len = (pathBytes.length + pathBytes.length - 1);
    traceBytes = Uint8List(len);
@@ -124,7 +135,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
        : widget.path;

    if (widget.flipPathRound) {
-      path = addReturnpath(pathTmp);
+      path = addReturnPath(pathTmp);
    } else {
      path = pathTmp;
    }
@@ -146,42 +157,57 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
    _frameSubscription = connector.receivedFrames.listen((frame) {
      if (frame.isEmpty) return;
      final frameBuffer = BufferReader(frame);
-      final code = frameBuffer.readUInt8();
+      try {
+        final code = frameBuffer.readUInt8();

-      if (code == respCodeSent) {
-        frameBuffer.skipBytes(1); //reserved
-        tagData = frameBuffer.readBytes(4);
-        final timeoutSeconds = frameBuffer.readUInt32LE();
+        if (code == respCodeSent) {
+          frameBuffer.skipBytes(1); //reserved
+          tagData = frameBuffer.readBytes(4);
+          final timeoutMilliseconds = frameBuffer.readUInt32LE();

-        // Start timeout timer for trace response
-        _timeoutTimer?.cancel();
-        _timeoutTimer = Timer(Duration(milliseconds: timeoutSeconds), () {
+          // Start timeout timer for trace response
+          _timeoutTimer?.cancel();
+          _timeoutTimer = Timer(
+            Duration(milliseconds: timeoutMilliseconds),
+            () {
+              if (!mounted) return;
+              setState(() {
+                _isLoading = false;
+                _failed2Loaded = true;
+              });
+            },
+          );
+        }
+
+        if (code == respCodeErr) {
+          _timeoutTimer?.cancel();
          if (!mounted) return;
          setState(() {
            _isLoading = false;
            _failed2Loaded = true;
          });
-        });
-      }
+        }

-      if (code == respCodeErr) {
+        // Check if it's a binary response
+        if (frame.length > 8 &&
+            code == pushCodeTraceData &&
+            listEquals(frame.sublist(4, 8), tagData)) {
+          _timeoutTimer?.cancel();
+          if (!mounted) return;
+          frameBuffer.skipBytes(3); //reserved + path length + flag
+          if (listEquals(frameBuffer.readBytes(4), tagData)) {
+            _handleTraceResponse(frame);
+          }
+        }
+      } catch (e) {
        _timeoutTimer?.cancel();
        if (!mounted) return;
        setState(() {
          _isLoading = false;
          _failed2Loaded = true;
        });
-      }
-      // Check if it's a binary response
-      if (frame.length > 8 &&
-          code == pushCodeTraceData &&
-          listEquals(frame.sublist(4, 8), tagData)) {
-        _timeoutTimer?.cancel();
-        if (!mounted) return;
-        frameBuffer.skipBytes(3); //reserved + path length + flag
-        if (listEquals(frameBuffer.readBytes(4), tagData)) {
-          _handleTraceResponse(frame);
-        }
+        // Handle any parsing errors gracefully
+        appLogger.error('Error parsing frame: $e', tag: 'PathTraceMapScreen');
      }
    });
  }
@@ -190,69 +216,91 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);

    final buffer = BufferReader(frame);
-    buffer.skipBytes(2); // Skip push code and reserved byte
-    int pathLength = buffer.readUInt8();
-    buffer.skipBytes(5); // Skip Flag byte and tag data
-    buffer.skipBytes(4); // Skip auth code
-    Uint8List pathData = buffer.readBytes(pathLength);
-    Uint8List snrData = buffer.readRemainingBytes();
+    try {
+      buffer.skipBytes(2); // Skip push code and reserved byte
+      int pathLength = buffer.readUInt8();
+      buffer.skipBytes(5); // Skip Flag byte and tag data
+      buffer.skipBytes(4); // Skip auth code
+      Uint8List pathData = buffer.readBytes(pathLength);
+      List<double> snrData = buffer
+          .readRemainingBytes()
+          .map((snr) => snr.toSigned(8).toDouble() / 4)
+          .toList();

-    Map<int, Contact> pathContacts = {};
+      Map<int, Contact> pathContacts = {};

-    connector.contacts.where((c) => c.type != advTypeChat).forEach((repeater) {
-      for (var repeaterData in pathData) {
-        if (listEquals(
-          repeater.publicKey.sublist(0, 1),
-          Uint8List.fromList([repeaterData]),
-        )) {
-          pathContacts[repeaterData] = repeater;
+      connector.contacts.where((c) => c.type != advTypeChat).forEach((
+        repeater,
+      ) {
+        for (var repeaterData in pathData) {
+          if (listEquals(
+            repeater.publicKey.sublist(0, 1),
+            Uint8List.fromList([repeaterData]),
+          )) {
+            pathContacts[repeaterData] = repeater;
+          }
        }
-      }
-    });
+      });

-    setState(() {
-      _isLoading = false;
-      _hasData = true;
-      _traceData = PathTraceData(
-        pathData: pathData,
-        snrData: snrData,
-        pathContacts: pathContacts,
-      );
-      _points = <LatLng>[];
-      _points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
-      for (final hop in _traceData!.pathData) {
-        final contact = _traceData!.pathContacts[hop];
-        if (contact != null &&
-            contact.hasLocation &&
-            contact.latitude != null &&
-            contact.longitude != null) {
-          _points.add(LatLng(contact.latitude!, contact.longitude!));
+      setState(() {
+        _isLoading = false;
+        _hasData = true;
+        _traceData = PathTraceData(
+          pathData: pathData,
+          snrData: snrData,
+          pathContacts: pathContacts,
+        );
+        _points = <LatLng>[];
+        _points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        for (final hop in _traceData!.pathData) {
+          final contact = _traceData!.pathContacts[hop];
+          if (contact != null &&
+              contact.hasLocation &&
+              contact.latitude != null &&
+              contact.longitude != null) {
+            _points.add(LatLng(contact.latitude!, contact.longitude!));
+          }
        }
-      }
-      _polylines = _points.length > 1
-          ? [
-              Polyline(
-                points: _points,
-                strokeWidth: 4,
-                color: Colors.blueAccent,
-              ),
-            ]
-          : <Polyline>[];
+        _polylines = _points.length > 1
+            ? [
+                Polyline(
+                  points: _points,
+                  strokeWidth: 4,
+                  color: Colors.blueAccent,
+                ),
+              ]
+            : <Polyline>[];

-      _initialCenter = _points.isNotEmpty ? _points.first : const LatLng(0, 0);
-      _initialZoom = _points.isNotEmpty ? 13.0 : 2.0;
-      _bounds = _points.length > 1 ? LatLngBounds.fromPoints(_points) : null;
-      _mapKey = ValueKey(
-        '${context.l10n.pathTrace_you},${_formatPathPrefixes(_traceData!.pathData)}',
+        _initialCenter = _points.isNotEmpty
+            ? _points.first
+            : const LatLng(0, 0);
+        _initialZoom = _points.isNotEmpty ? 13.0 : 2.0;
+        _bounds = _points.length > 1 ? LatLngBounds.fromPoints(_points) : null;
+        _mapKey = ValueKey(
+          '${context.l10n.pathTrace_you},${_formatPathPrefixes(_traceData!.pathData)}',
+        );
+        _pathDistanceMeters = getPathDistanceMeters(_points);
+      });
+    } catch (e) {
+      appLogger.error(
+        'Error handling trace response: $e',
+        tag: 'PathTraceMapScreen',
      );
-      _pathDistanceMeters = getPathDistanceMeters(_points);
-    });
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+          _failed2Loaded = true;
+        });
+      }
+    }
  }

  @override
  Widget build(BuildContext context) {
    return Consumer<MeshCoreConnector>(
      builder: (context, connector, _) {
+        final settings = context.watch<AppSettingsService>().settings;
+        final isImperial = settings.unitSystem == UnitSystem.imperial;
        final tileCache = context.read<MapTileCacheService>();

        return Scaffold(
@@ -317,7 +365,8 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                      ),
                    ),
                  ),
-                if (_hasData) _buildLegendCard(context, _traceData!),
+                if (_hasData)
+                  _buildLegendCard(context, _traceData!, isImperial),
              ],
            ),
          ),
@@ -326,55 +375,61 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
    );
  }

-  List<Marker> _buildHopMarkers(List<int> pathData) {
-    return [
-      for (final hop in pathData)
-        if (_traceData!.pathContacts[hop] != null &&
-            _traceData!.pathContacts[hop]!.hasLocation)
-          Marker(
-            point: LatLng(
-              _traceData!.pathContacts[hop]!.latitude!,
-              _traceData!.pathContacts[hop]!.longitude!,
-            ),
-            width: 35,
-            height: 35,
-            child: Container(
-              padding: const EdgeInsets.all(4),
-              decoration: BoxDecoration(
-                color: Colors.green,
-                shape: BoxShape.circle,
-                border: Border.all(color: Colors.white, width: 2),
-                boxShadow: [
-                  BoxShadow(
-                    color: Colors.black.withValues(alpha: 0.3),
-                    blurRadius: 4,
-                    offset: const Offset(0, 2),
-                  ),
-                ],
-              ),
-              alignment: Alignment.center,
-              child: Text(
-                _traceData!.pathContacts[hop]!.publicKey
-                    .sublist(0, 1)
-                    .map(
-                      (b) => b.toRadixString(16).padLeft(2, '0').toUpperCase(),
-                    )
-                    .join(),
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontWeight: FontWeight.bold,
-                  fontSize: 12,
-                ),
-              ),
-            ),
-          ),
-      if (context.read<MeshCoreConnector>().selfLatitude != null &&
-          context.read<MeshCoreConnector>().selfLongitude != null)
+  List<Marker> _buildHopMarkers(
+    List<int> pathData, {
+    required bool showLabels,
+  }) {
+    final markers = <Marker>[];
+    for (final hop in pathData) {
+      final contact = _traceData!.pathContacts[hop];
+      if (contact == null || !contact.hasLocation) continue;
+      final point = LatLng(contact.latitude!, contact.longitude!);
+      markers.add(
        Marker(
-          point: LatLng(
-            context.read<MeshCoreConnector>().selfLatitude!,
-            context.read<MeshCoreConnector>().selfLongitude!,
+          point: point,
+          width: 35,
+          height: 35,
+          child: Container(
+            padding: const EdgeInsets.all(4),
+            decoration: BoxDecoration(
+              color: Colors.green,
+              shape: BoxShape.circle,
+              border: Border.all(color: Colors.white, width: 2),
+              boxShadow: [
+                BoxShadow(
+                  color: Colors.black.withValues(alpha: 0.3),
+                  blurRadius: 4,
+                  offset: const Offset(0, 2),
+                ),
+              ],
+            ),
+            alignment: Alignment.center,
+            child: Text(
+              contact.publicKey
+                  .sublist(0, 1)
+                  .map((b) => b.toRadixString(16).padLeft(2, '0').toUpperCase())
+                  .join(),
+              style: const TextStyle(
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
+                fontSize: 12,
+              ),
+            ),
          ),
+        ),
+      );
+      if (showLabels) {
+        markers.add(_buildNodeLabelMarker(point: point, label: contact.name));
+      }
+    }
+
+    final selfLat = context.read<MeshCoreConnector>().selfLatitude;
+    final selfLon = context.read<MeshCoreConnector>().selfLongitude;
+    if (selfLat != null && selfLon != null) {
+      final selfPoint = LatLng(selfLat, selfLon);
+      markers.add(
+        Marker(
+          point: selfPoint,
          width: 35,
          height: 35,
          child: Container(
@@ -402,7 +457,53 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
            ),
          ),
        ),
-    ];
+      );
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: selfPoint,
+            label: context.l10n.pathTrace_you,
+          ),
+        );
+      }
+    }
+
+    return markers;
+  }
+
+  Marker _buildNodeLabelMarker({required LatLng point, required String label}) {
+    return Marker(
+      point: point,
+      width: 120,
+      height: 24,
+      alignment: Alignment.topCenter,
+      child: IgnorePointer(
+        child: Transform.translate(
+          offset: const Offset(0, -20),
+          child: FittedBox(
+            fit: BoxFit.contain,
+            child: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+              decoration: BoxDecoration(
+                color: Colors.black54,
+                borderRadius: BorderRadius.circular(8),
+              ),
+              alignment: Alignment.center,
+              child: Text(
+                label,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 11,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
  }

  String formatDirectionText(PathTraceData pathTraceData, int index) {
@@ -482,6 +583,14 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
              ),
        minZoom: 2.0,
        maxZoom: 18.0,
+        onPositionChanged: (camera, hasGesture) {
+          final shouldShow = camera.zoom >= _labelZoomThreshold;
+          if (shouldShow != _showNodeLabels && mounted) {
+            setState(() {
+              _showNodeLabels = shouldShow;
+            });
+          }
+        },
      ),
      children: [
        TileLayer(
@@ -492,12 +601,21 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
        ),
        if (_polylines.isNotEmpty) PolylineLayer(polylines: _polylines),
        if (_traceData!.pathData.isNotEmpty)
-          MarkerLayer(markers: _buildHopMarkers(_traceData!.pathData)),
+          MarkerLayer(
+            markers: _buildHopMarkers(
+              _traceData!.pathData,
+              showLabels: _showNodeLabels,
+            ),
+          ),
      ],
    );
  }

-  Widget _buildLegendCard(BuildContext context, PathTraceData pathTraceData) {
+  Widget _buildLegendCard(
+    BuildContext context,
+    PathTraceData pathTraceData,
+    bool isImperial,
+  ) {
    final l10n = context.l10n;
    final maxHeight = MediaQuery.of(context).size.height * 0.35;
    final estimatedHeight = 72.0 + (pathTraceData.pathData.length * 56.0);
@@ -516,7 +634,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
              Padding(
                padding: const EdgeInsets.all(12),
                child: Text(
-                  '${l10n.channelPath_repeaterHops} ${formatDistance(_pathDistanceMeters)}',
+                  '${l10n.channelPath_repeaterHops} ${formatDistance(_pathDistanceMeters, isImperial: isImperial)}',
                  style: const TextStyle(fontWeight: FontWeight.w600),
                ),
              ),
@@ -532,6 +650,12 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                          itemCount: pathTraceData.pathData.length + 1,
                          separatorBuilder: (_, _) => const Divider(height: 1),
                          itemBuilder: (context, index) {
+                            final snrUi = snrUiFromSNR(
+                              index < pathTraceData.snrData.length
+                                  ? pathTraceData.snrData[index]
+                                  : null,
+                              context.read<MeshCoreConnector>().currentSf,
+                            );
                            return Column(
                              children: [
                                ListTile(
@@ -550,12 +674,22 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                                    ),
                                    style: const TextStyle(fontSize: 14),
                                  ),
-                                  trailing: SNRIcon(
-                                    snr:
-                                        pathTraceData.snrData[index].toSigned(
-                                          8,
-                                        ) /
-                                        4.0,
+                                  trailing: Column(
+                                    mainAxisAlignment: MainAxisAlignment.center,
+                                    children: [
+                                      Icon(
+                                        snrUi.icon,
+                                        color: snrUi.color,
+                                        size: 18.0,
+                                      ),
+                                      Text(
+                                        snrUi.text,
+                                        style: TextStyle(
+                                          fontSize: 10,
+                                          color: snrUi.color,
+                                        ),
+                                      ),
+                                    ],
                                  ),
                                  onTap: () {
                                    // Handle item tap
@@ -1,12 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:meshcore_open/connector/meshcore_protocol.dart';
+import 'package:provider/provider.dart';
 import '../l10n/l10n.dart';
 import '../models/contact.dart';
+import '../services/app_settings_service.dart';
 import 'repeater_status_screen.dart';
 import 'repeater_cli_screen.dart';
 import 'repeater_settings_screen.dart';
 import 'telemetry_screen.dart';
-import 'neighbours_screen.dart';
+import 'neighbors_screen.dart';

 class RepeaterHubScreen extends StatelessWidget {
  final Contact repeater;
@@ -21,6 +23,10 @@ class RepeaterHubScreen extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final l10n = context.l10n;
+    final settingsService = context.watch<AppSettingsService>();
+    final chemistry = settingsService.batteryChemistryForRepeater(
+      repeater.publicKeyHex,
+    );
    return Scaffold(
      appBar: AppBar(
        title: Column(
@@ -107,6 +113,62 @@ class RepeaterHubScreen extends StatelessWidget {
              ),
            ),
            const SizedBox(height: 24),
+            Card(
+              child: Padding(
+                padding: const EdgeInsets.fromLTRB(16, 16, 16, 12),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        const Icon(Icons.battery_full),
+                        const SizedBox(width: 10),
+                        Expanded(
+                          child: Text(
+                            l10n.appSettings_batteryChemistry,
+                            style: const TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.w600,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 12),
+                    DropdownButtonFormField<String>(
+                      initialValue: chemistry,
+                      isExpanded: true,
+                      decoration: const InputDecoration(
+                        border: UnderlineInputBorder(),
+                        isDense: true,
+                      ),
+                      onChanged: (value) {
+                        if (value == null) return;
+                        settingsService.setBatteryChemistryForRepeater(
+                          repeater.publicKeyHex,
+                          value,
+                        );
+                      },
+                      items: [
+                        DropdownMenuItem(
+                          value: 'nmc',
+                          child: Text(l10n.appSettings_batteryNmc),
+                        ),
+                        DropdownMenuItem(
+                          value: 'lifepo4',
+                          child: Text(l10n.appSettings_batteryLifepo4),
+                        ),
+                        DropdownMenuItem(
+                          value: 'lipo',
+                          child: Text(l10n.appSettings_batteryLipo),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            const SizedBox(height: 24),
            Text(
              l10n.repeater_managementTools,
              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
@@ -174,17 +236,15 @@ class RepeaterHubScreen extends StatelessWidget {
            _buildManagementCard(
              context,
              icon: Icons.group,
-              title: l10n.repeater_neighbours,
-              subtitle: l10n.repeater_neighboursSubtitle,
+              title: l10n.repeater_neighbors,
+              subtitle: l10n.repeater_neighborsSubtitle,
              color: Colors.orange,
              onTap: () {
                Navigator.push(
                  context,
                  MaterialPageRoute(
-                    builder: (context) => NeighboursScreen(
-                      repeater: repeater,
-                      password: password,
-                    ),
+                    builder: (context) =>
+                        NeighborsScreen(repeater: repeater, password: password),
                  ),
                );
              },
@@ -8,7 +8,9 @@ import '../models/contact.dart';
 import '../models/path_selection.dart';
 import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
+import '../services/app_settings_service.dart';
 import '../services/repeater_command_service.dart';
+import '../utils/battery_utils.dart';
 import '../widgets/path_management_dialog.dart';

 class RepeaterStatusScreen extends StatefulWidget {
@@ -179,6 +181,12 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
      _dupDirect = directDups;
      _dupFlood = floodDups;
    });
+    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
+    connector.updateRepeaterBatterySnapshot(
+      widget.repeater.publicKeyHex,
+      batteryMv,
+      source: 'status_binary',
+    );
    _recordStatusResult(true);
  }

@@ -201,6 +209,18 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
          _uptimeSecs = _asInt(data['uptime_secs']);
          _queueLen = _asInt(data['queue_len']);
          _debugFlags = _asInt(data['errors']);
+          final batteryMv = _batteryMv;
+          if (batteryMv != null) {
+            final connector = Provider.of<MeshCoreConnector>(
+              context,
+              listen: false,
+            );
+            connector.updateRepeaterBatterySnapshot(
+              widget.repeater.publicKeyHex,
+              batteryMv,
+              source: 'status_text',
+            );
+          }
        } else if (data.containsKey('noise_floor')) {
          _noiseFloor = _asInt(data['noise_floor']);
          _lastRssi = _asInt(data['last_rssi']);
@@ -590,18 +610,24 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
  }

  String _batteryText() {
-    if (_batteryMv == null) return '—';
-    final percent = _batteryPercentFromMv(_batteryMv!);
-    final volts = (_batteryMv! / 1000.0).toStringAsFixed(2);
+    final connector = context.watch<MeshCoreConnector>();
+    final batteryMv =
+        connector.getRepeaterBatteryMillivolts(widget.repeater.publicKeyHex) ??
+        _batteryMv;
+    if (batteryMv == null) return '—';
+    final percent = estimateBatteryPercentFromMillivolts(
+      batteryMv,
+      _batteryChemistry(),
+    );
+    final volts = (batteryMv / 1000.0).toStringAsFixed(2);
    return '$percent% / ${volts}V';
  }

-  int _batteryPercentFromMv(int millivolts) {
-    const minMv = 3000;
-    const maxMv = 4200;
-    if (millivolts <= minMv) return 0;
-    if (millivolts >= maxMv) return 100;
-    return (((millivolts - minMv) * 100) / (maxMv - minMv)).round();
+  String _batteryChemistry() {
+    final settingsService = context.read<AppSettingsService>();
+    return settingsService.batteryChemistryForRepeater(
+      widget.repeater.publicKeyHex,
+    );
  }

  String _clockText() {
@@ -7,6 +7,7 @@ import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
+import '../widgets/adaptive_app_bar_title.dart';
 import '../widgets/device_tile.dart';
 import 'contacts_screen.dart';

@@ -70,7 +71,7 @@ class _ScannerScreenState extends State<ScannerScreen> {
  Widget build(BuildContext context) {
    return Scaffold(
      appBar: AppBar(
-        title: Text(context.l10n.scanner_title),
+        title: AdaptiveAppBarTitle(context.l10n.scanner_title),
        centerTitle: true,
        automaticallyImplyLeading: false,
      ),
@@ -8,6 +8,7 @@ import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
 import '../l10n/l10n.dart';
 import '../models/radio_settings.dart';
+import '../widgets/adaptive_app_bar_title.dart';
 import 'app_settings_screen.dart';
 import 'app_debug_log_screen.dart';
 import 'ble_debug_log_screen.dart';
@@ -41,7 +42,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
  Widget build(BuildContext context) {
    final l10n = context.l10n;
    return Scaffold(
-      appBar: AppBar(title: Text(l10n.settings_title), centerTitle: true),
+      appBar: AppBar(
+        title: AdaptiveAppBarTitle(l10n.settings_title),
+        centerTitle: true,
+      ),
      body: SafeArea(
        top: false,
        child: Consumer<MeshCoreConnector>(
@@ -5,11 +5,14 @@ import 'package:provider/provider.dart';
 import '../l10n/l10n.dart';
 import '../models/contact.dart';
 import '../models/path_selection.dart';
+import '../models/app_settings.dart';
 import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
+import '../services/app_settings_service.dart';
 import '../services/repeater_command_service.dart';
 import '../widgets/path_management_dialog.dart';
 import '../helpers/cayenne_lpp.dart';
+import '../utils/battery_utils.dart';

 class TelemetryScreen extends StatefulWidget {
  final Contact repeater;
@@ -72,9 +75,19 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
  }

  void _handleStatusResponse(Uint8List frame) {
+    final parsedTelemetry = CayenneLpp.parseByChannel(frame);
+    final batteryMv = _extractTelemetryBatteryMillivolts(parsedTelemetry);
+    if (batteryMv != null) {
+      final connector = Provider.of<MeshCoreConnector>(context, listen: false);
+      connector.updateRepeaterBatterySnapshot(
+        widget.repeater.publicKeyHex,
+        batteryMv,
+        source: 'telemetry',
+      );
+    }
    if (!mounted) return;
    setState(() {
-      _parsedTelemetry = CayenneLpp.parseByChannel(frame);
+      _parsedTelemetry = parsedTelemetry;
    });

    ScaffoldMessenger.of(context).showSnackBar(
@@ -181,6 +194,8 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
  Widget build(BuildContext context) {
    final l10n = context.l10n;
    final connector = context.watch<MeshCoreConnector>();
+    final settings = context.watch<AppSettingsService>().settings;
+    final isImperialUnits = settings.unitSystem == UnitSystem.imperial;
    final repeater = _resolveRepeater(connector);
    final isFloodMode = repeater.pathOverride == -1;

@@ -307,6 +322,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
                    entry['values'],
                    l10n.telemetry_channelTitle(entry['channel']),
                    entry['channel'],
+                    isImperialUnits,
                  ),
            ],
          ),
@@ -319,6 +335,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
    Map<String, dynamic> channelData,
    String title,
    int channel,
+    bool isImperialUnits,
  ) {
    final l10n = context.l10n;
    return Card(
@@ -358,12 +375,12 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
              else if (entry.key == 'temperature' && channel == 1)
                _buildInfoRow(
                  l10n.telemetry_mcuTemperatureLabel,
-                  _temperatureText(entry.value),
+                  _temperatureText(entry.value, isImperialUnits),
                )
              else if (entry.key == 'temperature')
                _buildInfoRow(
                  l10n.telemetry_temperatureLabel,
-                  _temperatureText(entry.value),
+                  _temperatureText(entry.value, isImperialUnits),
                )
              else if (entry.key == 'current' && channel == 1)
                _buildInfoRow(
@@ -405,29 +422,44 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
    );
  }

-  String _batteryText(double? batteryMv) {
+  int? _extractTelemetryBatteryMillivolts(List<Map<String, dynamic>> entries) {
+    for (final entry in entries) {
+      if (entry['channel'] != 1) continue;
+      final values = entry['values'];
+      if (values is! Map<String, dynamic>) continue;
+      final voltage = values['voltage'];
+      if (voltage is num) return (voltage.toDouble() * 1000).round();
+    }
+    return null;
+  }
+
+  String _batteryText(double? telemetryVolts) {
    final l10n = context.l10n;
+    final connector = context.watch<MeshCoreConnector>();
+    final batteryMv =
+        connector.getRepeaterBatteryMillivolts(widget.repeater.publicKeyHex) ??
+        (telemetryVolts == null ? null : (telemetryVolts * 1000).round());
    if (batteryMv == null) return l10n.common_notAvailable;
-    final percent = _batteryPercentFromMv(batteryMv);
-    final volts = batteryMv.toStringAsFixed(2);
+    final chemistry = _batteryChemistry();
+    final percent = estimateBatteryPercentFromMillivolts(batteryMv, chemistry);
+    final volts = (batteryMv / 1000).toStringAsFixed(2);
    return l10n.telemetry_batteryValue(percent, volts);
  }

-  int _batteryPercentFromMv(double millivolts) {
-    const minMv = 2.800;
-    const maxMv = 4.200;
-    if (millivolts <= minMv) return 0;
-    if (millivolts >= maxMv) return 100;
-    return (((millivolts - minMv) * 100) / (maxMv - minMv)).round();
+  String _batteryChemistry() {
+    final settingsService = context.read<AppSettingsService>();
+    return settingsService.batteryChemistryForRepeater(
+      widget.repeater.publicKeyHex,
+    );
  }

-  String _temperatureText(double? tempC) {
+  String _temperatureText(double? tempC, bool isImperialUnits) {
    final l10n = context.l10n;
    if (tempC == null) return l10n.common_notAvailable;
    final tempF = (tempC * 9 / 5) + 32;
-    return l10n.telemetry_temperatureValue(
-      tempC.toStringAsFixed(1),
-      tempF.toStringAsFixed(1),
-    );
+    if (isImperialUnits) {
+      return '${tempF.toStringAsFixed(1)}°F';
+    }
+    return '${tempC.toStringAsFixed(1)}°C';
  }
 }