Update pubspec version

Fix the Chinese translation switching issue

android/app/src/main/AndroidManifest.xml

@@ -23,6 +23,7 @@
 
     <!-- Microphone for voice messages -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <!-- Notifications -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

ios/Podfile

@@ -39,5 +39,13 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+    # codec2_flutter uses ARM-specific register asm("sp") in debug_alloc.h that
+    # fails to compile for iOS simulators. Voice codec support is only required
+    # on real iOS devices, so skip the native Codec2 sources for simulator SDKs.
+    if target.name == 'codec2_flutter'
+      target.build_configurations.each do |config|
+        config.build_settings['EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]'] = '*.c *.cpp'
+      end
+    end
   end
 end

ios/Podfile.lock

@@ -65,6 +65,9 @@ PODS:
     - ObjectBox (= 4.4.1)
   - package_info_plus (0.4.5):
     - Flutter
+  - path_provider_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
   - permission_handler_apple (9.3.0):
     - Flutter
   - record_ios (1.2.0):
@@ -102,6 +105,7 @@ DEPENDENCIES:
   - nsd_ios (from `.symlinks/plugins/nsd_ios/ios`)
   - objectbox_flutter_libs (from `.symlinks/plugins/objectbox_flutter_libs/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - record_ios (from `.symlinks/plugins/record_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
@@ -149,6 +153,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/objectbox_flutter_libs/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
+  path_provider_foundation:
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
   record_ios:
@@ -165,7 +171,7 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/vibration/ios"
 
 SPEC CHECKSUMS:
-  audioplayers_darwin: 4f9ca89d92d3d21cec7ec580e78ca888e5fb68bd
+  audioplayers_darwin: 835ced6edd4c9fc8ebb0a7cc9e294a91d99917d5
   codec2_flutter: 15e24fa897d9d903a2afb1cc5a17ae3ac88b6d6f
   device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
@@ -183,6 +189,7 @@ SPEC CHECKSUMS:
   ObjectBox: 7da4aceb5013d041bfafdbc6d744a26918b09757
   objectbox_flutter_libs: 09b1dec1b4cd27bf1a5f9bae7ccaa7e43588bf31
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   record_ios: 412daca2350b228e698fffcd08f1f94ceb1e3844
   SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
@@ -193,6 +200,6 @@ SPEC CHECKSUMS:
   url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
   vibration: ca8104a8875b9c493e15b21b04e456befd0ff6eb
 
-PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e
+PODFILE CHECKSUM: 2d56c9747241a29800bf539d978b210bda037878
 
 COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -489,7 +489,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 95;
 				DEVELOPMENT_TEAM = JND55328G8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -511,7 +511,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 95;
 				DEVELOPMENT_TEAM = JND55328G8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -530,7 +530,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 95;
 				DEVELOPMENT_TEAM = JND55328G8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -547,7 +547,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 95;
 				DEVELOPMENT_TEAM = JND55328G8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -679,7 +679,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 95;
 				DEVELOPMENT_TEAM = JND55328G8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -702,7 +702,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 95;
 				DEVELOPMENT_TEAM = JND55328G8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

ios/Runner/Info.plist

@@ -43,7 +43,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>84</string>
+	<string>95</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>

ios/fastlane/report.xml

@@ -5,22 +5,22 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000211">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000273">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.408783">
+      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.453879">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: build_app" time="120.492323">
+      <testcase classname="fastlane.lanes" name="2: build_app" time="117.623994">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="12.544865">
+      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="209.300865">
         
       </testcase>
     

lib/models/device_info.dart

@@ -73,12 +73,14 @@ class DeviceInfo {
   final String? selfName;
 
   // Additional device capabilities (from RESP_CODE_DEVICE_INFO)
-  final int? maxContacts;        // Max contacts device supports
+  final int? maxContacts; // Max contacts device supports
-  final int? maxChannels;        // Max channels device supports
+  final int? maxChannels; // Max channels device supports
-  final int? telemetryModes;     // Telemetry permission modes (bits 0-1: Base, bits 2-3: Location)
+  final int?
-  final int? blePin;             // BLE PIN code
+  telemetryModes; // Telemetry permission modes (bits 0-1: Base, bits 2-3: Location)
-  final int? multiAcks;          // Extra ACK mode (0=no, 1=yes)
+  final int? blePin; // BLE PIN code
-  final int? advertLocPolicy;    // Location sharing policy (0=don't share, 1=share)
+  final int? multiAcks; // Extra ACK mode (0=no, 1=yes)
+  final int?
+  advertLocPolicy; // Location sharing policy (0=don't share, 1=share)
 
   // Firmware info
   final int? firmwareVersion;
@@ -88,6 +90,9 @@ class DeviceInfo {
 
   // Repeat mode (firmware v9+)
   final bool? clientRepeat;
+  final bool? supportsSpectrumScan;
+  final int? spectrumScanMinKhz;
+  final int? spectrumScanMaxKhz;
   final List<({int lower, int upper})>? allowedRepeatFreqRanges;
 
   DeviceInfo({
@@ -124,6 +129,9 @@ class DeviceInfo {
     this.manufacturerModel,
     this.semanticVersion,
     this.clientRepeat,
+    this.supportsSpectrumScan,
+    this.spectrumScanMinKhz,
+    this.spectrumScanMaxKhz,
     this.allowedRepeatFreqRanges,
   });
 
@@ -160,7 +168,9 @@ class DeviceInfo {
 
   /// Get storage usage percentage (0-100)
   double? get storageUsedPercent {
-    if (storageUsedKb == null || storageTotalKb == null || storageTotalKb == 0) {
+    if (storageUsedKb == null ||
+        storageTotalKb == null ||
+        storageTotalKb == 0) {
       return null;
     }
     return (storageUsedKb! / storageTotalKb!) * 100.0;
@@ -245,6 +255,9 @@ class DeviceInfo {
     String? manufacturerModel,
     String? semanticVersion,
     bool? clientRepeat,
+    bool? supportsSpectrumScan,
+    int? spectrumScanMinKhz,
+    int? spectrumScanMaxKhz,
     List<({int lower, int upper})>? allowedRepeatFreqRanges,
   }) {
     return DeviceInfo(
@@ -281,7 +294,11 @@ class DeviceInfo {
       manufacturerModel: manufacturerModel ?? this.manufacturerModel,
       semanticVersion: semanticVersion ?? this.semanticVersion,
       clientRepeat: clientRepeat ?? this.clientRepeat,
-      allowedRepeatFreqRanges: allowedRepeatFreqRanges ?? this.allowedRepeatFreqRanges,
+      supportsSpectrumScan: supportsSpectrumScan ?? this.supportsSpectrumScan,
+      spectrumScanMinKhz: spectrumScanMinKhz ?? this.spectrumScanMinKhz,
+      spectrumScanMaxKhz: spectrumScanMaxKhz ?? this.spectrumScanMaxKhz,
+      allowedRepeatFreqRanges:
+          allowedRepeatFreqRanges ?? this.allowedRepeatFreqRanges,
     );
   }
 

lib/models/message_contact_location.dart

@@ -0,0 +1,63 @@
+import 'package:latlong2/latlong.dart';
+
+class MessageContactLocation {
+  final LatLng location;
+  final String source;
+  final DateTime capturedAt;
+  final DateTime? sourceTimestamp;
+
+  const MessageContactLocation({
+    required this.location,
+    required this.source,
+    required this.capturedAt,
+    this.sourceTimestamp,
+  });
+
+  String get technicalSourceLabel {
+    switch (source) {
+      case 'telemetry':
+        return 'telemetry';
+      case 'advert':
+        return 'advert';
+      default:
+        return source;
+    }
+  }
+
+  String get formattedCoordinates =>
+      '${location.latitude.toStringAsFixed(6)}, ${location.longitude.toStringAsFixed(6)}';
+
+  Map<String, dynamic> toJson() {
+    return {
+      'latitude': location.latitude,
+      'longitude': location.longitude,
+      'source': source,
+      'capturedAtMillis': capturedAt.millisecondsSinceEpoch,
+      'sourceTimestampMillis': sourceTimestamp?.millisecondsSinceEpoch,
+    };
+  }
+
+  static MessageContactLocation? fromJson(Map<String, dynamic> json) {
+    final latitude = json['latitude'];
+    final longitude = json['longitude'];
+    final source = json['source'];
+    final capturedAtMillis = json['capturedAtMillis'];
+    if (latitude is! num ||
+        longitude is! num ||
+        source is! String ||
+        capturedAtMillis is! int) {
+      return null;
+    }
+
+    return MessageContactLocation(
+      location: LatLng(latitude.toDouble(), longitude.toDouble()),
+      source: source,
+      capturedAt: DateTime.fromMillisecondsSinceEpoch(capturedAtMillis),
+      sourceTimestamp: json['sourceTimestampMillis'] is int
+          ? DateTime.fromMillisecondsSinceEpoch(
+              json['sourceTimestampMillis'] as int,
+            )
+          : null,
+    );
+  }
+}

lib/models/message_reception_details.dart

@@ -0,0 +1,86 @@
+const int _transmitEstimateToleranceMs = 1500;
+
+int? sanitizeEstimatedTransmitMs({
+  required int? estimatedTransmitMs,
+  required int? senderToReceiptMs,
+}) {
+  if (estimatedTransmitMs == null || estimatedTransmitMs <= 0) {
+    return null;
+  }
+
+  if (senderToReceiptMs == null || senderToReceiptMs <= 0) {
+    return estimatedTransmitMs;
+  }
+
+  // Sender timestamps are second-granularity, so allow a small cushion before
+  // treating the estimate as impossible for the observed delivery time.
+  if (estimatedTransmitMs > senderToReceiptMs + _transmitEstimateToleranceMs) {
+    return null;
+  }
+
+  return estimatedTransmitMs;
+}
+
+class MessageReceptionDetails {
+  final DateTime capturedAt;
+  final DateTime? packetLoggedAt;
+  final int? rssiDbm;
+  final double? snrDb;
+  final List<int>? pathBytes;
+  final int? senderToReceiptMs;
+  final int? estimatedTransmitMs;
+  final int? postTransmitDelayMs;
+
+  const MessageReceptionDetails({
+    required this.capturedAt,
+    this.packetLoggedAt,
+    this.rssiDbm,
+    this.snrDb,
+    this.pathBytes,
+    this.senderToReceiptMs,
+    this.estimatedTransmitMs,
+    this.postTransmitDelayMs,
+  });
+
+  String? get pathBytesHex => pathBytes == null || pathBytes!.isEmpty
+      ? null
+      : pathBytes!.map((b) => b.toRadixString(16).padLeft(2, '0')).join(':');
+
+  Map<String, dynamic> toJson() {
+    return {
+      'capturedAtMillis': capturedAt.millisecondsSinceEpoch,
+      'packetLoggedAtMillis': packetLoggedAt?.millisecondsSinceEpoch,
+      'rssiDbm': rssiDbm,
+      'snrDb': snrDb,
+      'pathBytes': pathBytes,
+      'senderToReceiptMs': senderToReceiptMs,
+      'estimatedTransmitMs': estimatedTransmitMs,
+      'postTransmitDelayMs': postTransmitDelayMs,
+    };
+  }
+
+  static MessageReceptionDetails? fromJson(Map<String, dynamic> json) {
+    final capturedAtMillis = json['capturedAtMillis'];
+    if (capturedAtMillis is! int) {
+      return null;
+    }
+
+    final pathBytes = json['pathBytes'];
+    return MessageReceptionDetails(
+      capturedAt: DateTime.fromMillisecondsSinceEpoch(capturedAtMillis),
+      packetLoggedAt: json['packetLoggedAtMillis'] is int
+          ? DateTime.fromMillisecondsSinceEpoch(
+              json['packetLoggedAtMillis'] as int,
+            )
+          : null,
+      rssiDbm: json['rssiDbm'] as int?,
+      snrDb: (json['snrDb'] as num?)?.toDouble(),
+      pathBytes: pathBytes is List
+          ? pathBytes.whereType<num>().map((b) => b.toInt()).toList()
+          : null,
+      senderToReceiptMs: json['senderToReceiptMs'] as int?,
+      estimatedTransmitMs: json['estimatedTransmitMs'] as int?,
+      postTransmitDelayMs: json['postTransmitDelayMs'] as int?,
+    );
+  }
+}

lib/providers/app_provider.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:math' as math;
 import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'connection_provider.dart';
@@ -16,9 +17,12 @@ import '../services/packet_capture_storage_service.dart';
 import '../models/contact.dart';
 import '../models/message.dart';
 import '../models/ble_packet_log.dart';
+import '../models/message_reception_details.dart';
 import '../utils/drawing_message_parser.dart';
+import '../utils/raw_route_probe.dart';
 import '../utils/voice_message_parser.dart';
 import '../utils/image_message_parser.dart';
+import '../utils/message_airtime_estimator.dart';
 
 /// Main App Provider - coordinates all other providers
 class AppProvider with ChangeNotifier {
@@ -64,10 +68,10 @@ class AppProvider with ChangeNotifier {
   final Map<String, String> _imageSessionSenderKey6 = {};
   final Map<String, Timer> _voiceMissingRetryTimers = {};
   final Map<String, int> _voiceMissingRetryAttempts = {};
-  final FragmentAckWaitRegistry _voiceFragmentAckWaiters =
+  final Map<String, Timer> _imageMissingRetryTimers = {};
-      FragmentAckWaitRegistry();
+  final Map<String, int> _imageMissingRetryAttempts = {};
-  final FragmentAckWaitRegistry _imageFragmentAckWaiters =
+  final FragmentAckWaitRegistry _rawProbeWaiters = FragmentAckWaitRegistry();
-      FragmentAckWaitRegistry();
+  final Map<String, Future<bool>> _pendingRawRouteProbes = {};
   Timer? _packetCaptureFlushTimer;
   String? _lastPersistedPacketSignature;
   bool _isPersistingPacketCapture = false;
@@ -198,6 +202,21 @@ class AppProvider with ChangeNotifier {
     }
   }
 
+  String? _resolveContactNameForNotification(Uint8List? publicKey) {
+    if (publicKey == null || publicKey.isEmpty) return null;
+
+    Contact? contact;
+    if (publicKey.length >= 32) {
+      contact = contactsProvider.findContactByKey(publicKey);
+    }
+    contact ??= publicKey.length >= 6
+        ? contactsProvider.findContactByPrefix(
+            Uint8List.fromList(publicKey.sublist(0, 6)),
+          )
+        : null;
+    return contact?.advName;
+  }
+
   /// Load simple mode setting from shared preferences
   Future<void> _loadSimpleMode() async {
     try {
@@ -433,6 +452,10 @@ class AppProvider with ChangeNotifier {
   void _setupCallbacks() {
     // Monitor connection state changes to start/stop location tracking
     connectionProvider.addListener(_handleConnectionStateChange);
+    messagesProvider.resolveContactNameCallback =
+        _resolveContactNameForNotification;
+    messagesProvider.resolveChannelNameCallback =
+        channelsProvider.getChannelDisplayName;
 
     voiceProvider.sendRawPacketCallback =
         ({
@@ -460,27 +483,6 @@ class AppProvider with ChangeNotifier {
             payload: payload,
           );
         };
-    voiceProvider.waitForFragmentAckCallback =
-        ({
-          required sessionId,
-          required index,
-          timeout = const Duration(seconds: 8),
-        }) => _waitForVoiceFragmentAck(
-          sessionId: sessionId,
-          index: index,
-          timeout: timeout,
-        );
-    imageProvider.waitForFragmentAckCallback =
-        ({
-          required sessionId,
-          required index,
-          timeout = const Duration(seconds: 8),
-        }) => _waitForImageFragmentAck(
-          sessionId: sessionId,
-          index: index,
-          timeout: timeout,
-        );
-
     // When a contact is received from BLE
     connectionProvider.onContactReceived = (contact) {
       // Pass device public key to filter out our own contact
@@ -607,14 +609,33 @@ class AppProvider with ChangeNotifier {
     connectionProvider.onMessageReceived = (message) {
       // Enrich message with sender name from contacts first
       Message enrichedMessage = message;
+      Contact? senderContact;
       if (message.senderPublicKeyPrefix != null && message.senderName == null) {
         final contact = contactsProvider.findContactByKey(
           message.senderPublicKeyPrefix!,
         );
         if (contact != null) {
+          senderContact = contact;
           enrichedMessage = message.copyWith(senderName: contact.advName);
         }
       }
+      senderContact ??= message.senderPublicKeyPrefix != null
+          ? contactsProvider.findContactByKey(message.senderPublicKeyPrefix!)
+          : null;
+      senderContact ??= enrichedMessage.senderName != null
+          ? contactsProvider.contacts
+                .where((c) => c.advName == enrichedMessage.senderName)
+                .firstOrNull
+          : null;
+      final contactLocationSnapshot = senderContact != null
+          ? contactsProvider.buildMessageContactLocationSnapshot(
+              senderContact,
+              capturedAt: enrichedMessage.receivedAt,
+            )
+          : null;
+      final receptionDetailsSnapshot = _buildReceptionDetailsSnapshot(
+        enrichedMessage,
+      );
 
       // Check if message is a drawing broadcast
       if (DrawingMessageParser.isDrawingMessage(enrichedMessage.text)) {
@@ -645,6 +666,8 @@ class AppProvider with ChangeNotifier {
           messagesProvider.addMessage(
             updatedMessage,
             contactLookup: (name) => '',
+            contactLocationSnapshot: contactLocationSnapshot,
+            receptionDetailsSnapshot: receptionDetailsSnapshot,
           );
 
           // Broadcast drawing message to SSE clients if server is running
@@ -680,6 +703,8 @@ class AppProvider with ChangeNotifier {
               return '';
             }
           },
+          contactLocationSnapshot: contactLocationSnapshot,
+          receptionDetailsSnapshot: receptionDetailsSnapshot,
         );
         connectionProvider.broadcastMessageToSseClients(enrichedMessage);
         return;
@@ -707,6 +732,8 @@ class AppProvider with ChangeNotifier {
               return '';
             }
           },
+          contactLocationSnapshot: contactLocationSnapshot,
+          receptionDetailsSnapshot: receptionDetailsSnapshot,
         );
         connectionProvider.broadcastMessageToSseClients(enrichedMessage);
         return;
@@ -743,12 +770,17 @@ class AppProvider with ChangeNotifier {
             return '';
           }
         },
+        contactLocationSnapshot: contactLocationSnapshot,
+        receptionDetailsSnapshot: receptionDetailsSnapshot,
       );
 
       // Broadcast message to SSE clients if server is running
       connectionProvider.broadcastMessageToSseClients(enrichedMessage);
     };
 
+    // Keep a compact receive-time snapshot because packet logs roll over.
+    // This lets the UI still show timing/link details after app restarts.
+
     // When telemetry is received via PUSH_CODE_TELEMETRY_RESPONSE (0x8B)
     // Used by older firmware versions for telemetry responses
     connectionProvider.onTelemetryReceived = (publicKey, lppData) {
@@ -774,11 +806,30 @@ class AppProvider with ChangeNotifier {
     // Magic 0x72 'r' = voice fetch request; 0x69 'i' = image fetch request.
     // Magic 0x56 'V' = voice packet; magic 0x49 'I' = image packet.
     connectionProvider.onRawDataReceived = (payload, snrRaw, rssiDbm) {
+      final rawProbeRequest = RawRouteProbeRequest.tryParseBinary(payload);
+      if (rawProbeRequest != null) {
+        debugPrint(
+          '📡 [AppProvider] Incoming raw route probe: nonce=${rawProbeRequest.nonce.toRadixString(16)} requester=${rawProbeRequest.requesterKey6}',
+        );
+        _handleRawRouteProbeRequest(rawProbeRequest);
+        return;
+      }
+
+      final rawProbeAck = RawRouteProbeAck.tryParseBinary(payload);
+      if (rawProbeAck != null) {
+        debugPrint(
+          '📡 [AppProvider] Incoming raw route probe ACK: nonce=${rawProbeAck.nonce.toRadixString(16)}',
+        );
+        _completeRawRouteProbeAck(rawProbeAck.nonce);
+        return;
+      }
+
       final voiceFetchRequest = VoiceFetchRequest.tryParseBinary(payload);
       if (voiceFetchRequest != null) {
-        final requester = contactsProvider.findContactByPrefixHex(
+        debugPrint(
-          voiceFetchRequest.requesterKey6,
+          '🎙️ [AppProvider] Incoming voice fetch request: session=${voiceFetchRequest.sessionId} want=${voiceFetchRequest.want} requester=${voiceFetchRequest.requesterKey6}',
         );
+        final requester = _resolveVoiceFetchRequester(voiceFetchRequest);
         if (requester == null) {
           debugPrint(
             '⚠️ [AppProvider] Voice fetch requester contact not found (binary)',
@@ -858,18 +909,6 @@ class AppProvider with ChangeNotifier {
         return;
       }
 
-      final voiceAck = VoiceFragmentAck.tryParseBinary(payload);
-      if (voiceAck != null) {
-        _completeVoiceFragmentAck(voiceAck.sessionId, voiceAck.index);
-        return;
-      }
-
-      final imageAck = ImageFragmentAck.tryParseBinary(payload);
-      if (imageAck != null) {
-        _completeImageFragmentAck(imageAck.sessionId, imageAck.index);
-        return;
-      }
-
       if (ImagePacket.isImageBinary(payload)) {
         final frag = ImagePacket.tryParseBinary(payload);
         if (frag == null) return;
@@ -880,7 +919,10 @@ class AppProvider with ChangeNotifier {
           width: session?.width ?? 0,
           height: session?.height ?? 0,
         );
-        _sendImageFragmentAck(frag);
+        _scheduleImageMissingRetry(
+          frag.sessionId,
+          justComplete: imageProvider.isComplete(frag.sessionId),
+        );
         return;
       }
 
@@ -889,7 +931,6 @@ class AppProvider with ChangeNotifier {
       if (pkt == null) return;
       debugPrint('🎙️ [AppProvider] Binary voice packet received: $pkt');
       final justComplete = voiceProvider.addPacket(pkt);
-      _sendVoiceFragmentAck(pkt);
       _scheduleVoiceMissingRetry(pkt.sessionId, justComplete: justComplete);
       // Insert or update the placeholder message in the chat list
       _handleIncomingVoicePacket(pkt, justComplete: justComplete);
@@ -1021,6 +1062,32 @@ class AppProvider with ChangeNotifier {
             retryAttempt: retryAttempt,
           );
         };
+
+    messagesProvider.onDirectPathFailedCallback =
+        ({required contact, required failureStreak}) async {
+          debugPrint(
+            '🧭 [AppProvider] Clearing unhealthy path for ${contact.advName} after $failureStreak failed send chain(s)',
+          );
+
+          contactsProvider.markPathUnhealthy(contact.publicKey);
+
+          if (!connectionProvider.deviceInfo.isConnected) {
+            return;
+          }
+
+          try {
+            await connectionProvider.resetPath(contact.publicKey);
+            Future.delayed(const Duration(milliseconds: 150), () {
+              if (connectionProvider.deviceInfo.isConnected) {
+                connectionProvider.getContact(contact.publicKey);
+              }
+            });
+          } catch (e) {
+            debugPrint(
+              '⚠️ [AppProvider] Failed to reset path for ${contact.advName}: $e',
+            );
+          }
+        };
   }
 
   /// Initialize the app (load contacts, sync time, etc.)
@@ -1222,15 +1289,51 @@ class AppProvider with ChangeNotifier {
     return contactsProvider.findContactByPrefixHex(prefixHex.toLowerCase());
   }
 
+  Contact? _resolveVoiceFetchRequester(VoiceFetchRequest request) {
+    final liveContact = _resolveContactByPrefixHex(request.requesterKey6);
+    if (liveContact != null) {
+      return liveContact;
+    }
+
+    return _resolveRequesterFromSentMessages(
+      sessionId: request.sessionId,
+      requesterKey6: request.requesterKey6,
+      tryParseEnvelope: VoiceEnvelope.tryParseText,
+      mediaLabel: 'voice',
+    );
+  }
+
   Contact? _resolveImageFetchRequester(ImageFetchRequest request) {
     final liveContact = _resolveContactByPrefixHex(request.requesterKey6);
     if (liveContact != null) {
       return liveContact;
     }
 
+    return _resolveRequesterFromSentMessages(
+      sessionId: request.sessionId,
+      requesterKey6: request.requesterKey6,
+      tryParseEnvelope: ImageEnvelope.tryParse,
+      mediaLabel: 'image',
+    );
+  }
+
+  Contact? _resolveRequesterFromSentMessages<T>({
+    required String sessionId,
+    required String requesterKey6,
+    required T? Function(String text) tryParseEnvelope,
+    required String mediaLabel,
+  }) {
     for (final message in messagesProvider.messages.reversed) {
-      final envelope = ImageEnvelope.tryParse(message.text);
+      final envelope = tryParseEnvelope(message.text);
-      if (envelope == null || envelope.sessionId != request.sessionId) {
+      if (envelope == null) {
+        continue;
+      }
+      final envelopeSessionId = switch (envelope) {
+        VoiceEnvelope voiceEnvelope => voiceEnvelope.sessionId,
+        ImageEnvelope imageEnvelope => imageEnvelope.sessionId,
+        _ => null,
+      };
+      if (envelopeSessionId != sessionId) {
         continue;
       }
       final recipientKey = message.recipientPublicKey;
@@ -1245,12 +1348,13 @@ class AppProvider with ChangeNotifier {
           .sublist(0, 6)
           .map((b) => b.toRadixString(16).padLeft(2, '0'))
           .join();
-      if (recipientKey6 != request.requesterKey6) {
+      if (recipientKey6 != requesterKey6) {
         continue;
       }
       debugPrint(
-        '📷 [AppProvider] Resolved image requester from sent message metadata '
+        '${mediaLabel == 'voice' ? '🎙️' : '📷'} [AppProvider] Resolved '
-        'for session ${request.sessionId}: ${recipient.advName}',
+        '$mediaLabel requester from sent message metadata for session '
+        '$sessionId: ${recipient.advName}',
       );
       return recipient;
     }
@@ -1262,9 +1366,12 @@ class AppProvider with ChangeNotifier {
     String sessionId, {
     required bool justComplete,
   }) {
+    if (voiceProvider.isReceiveCanceled(sessionId)) {
+      _clearVoiceMissingRetry(sessionId);
+      return;
+    }
     if (justComplete || voiceProvider.isComplete(sessionId)) {
-      _voiceMissingRetryTimers.remove(sessionId)?.cancel();
+      _clearVoiceMissingRetry(sessionId);
-      _voiceMissingRetryAttempts.remove(sessionId);
       return;
     }
 
@@ -1275,10 +1382,43 @@ class AppProvider with ChangeNotifier {
     });
   }
 
+  void _scheduleImageMissingRetry(
+    String sessionId, {
+    required bool justComplete,
+  }) {
+    if (imageProvider.isReceiveCanceled(sessionId)) {
+      _clearImageMissingRetry(sessionId);
+      return;
+    }
+    if (justComplete || imageProvider.isComplete(sessionId)) {
+      _clearImageMissingRetry(sessionId);
+      return;
+    }
+
+    _imageMissingRetryAttempts[sessionId] = 0;
+    _imageMissingRetryTimers[sessionId]?.cancel();
+    _imageMissingRetryTimers[sessionId] = Timer(_packetRetryDelay, () {
+      unawaited(_requestMissingImageFragments(sessionId));
+    });
+  }
+
+  void _clearVoiceMissingRetry(String sessionId) {
+    _voiceMissingRetryTimers.remove(sessionId)?.cancel();
+    _voiceMissingRetryAttempts.remove(sessionId);
+  }
+
+  void _clearImageMissingRetry(String sessionId) {
+    _imageMissingRetryTimers.remove(sessionId)?.cancel();
+    _imageMissingRetryAttempts.remove(sessionId);
+  }
+
   Future<void> _requestMissingVoicePackets(String sessionId) async {
+    if (voiceProvider.isReceiveCanceled(sessionId)) {
+      _clearVoiceMissingRetry(sessionId);
+      return;
+    }
     if (voiceProvider.isComplete(sessionId)) {
-      _voiceMissingRetryTimers.remove(sessionId)?.cancel();
+      _clearVoiceMissingRetry(sessionId);
-      _voiceMissingRetryAttempts.remove(sessionId);
       return;
     }
 
@@ -1287,7 +1427,7 @@ class AppProvider with ChangeNotifier {
       debugPrint(
         '⚠️ [AppProvider] Voice re-request limit reached for $sessionId',
       );
-      _voiceMissingRetryTimers.remove(sessionId)?.cancel();
+      _clearVoiceMissingRetry(sessionId);
       return;
     }
 
@@ -1299,8 +1439,7 @@ class AppProvider with ChangeNotifier {
 
     final missing = voiceProvider.missingPacketIndices(sessionId);
     if (missing.isEmpty) {
-      _voiceMissingRetryTimers.remove(sessionId)?.cancel();
+      _clearVoiceMissingRetry(sessionId);
-      _voiceMissingRetryAttempts.remove(sessionId);
       return;
     }
 
@@ -1335,6 +1474,67 @@ class AppProvider with ChangeNotifier {
     });
   }
 
+  Future<void> _requestMissingImageFragments(String sessionId) async {
+    if (imageProvider.isReceiveCanceled(sessionId)) {
+      _clearImageMissingRetry(sessionId);
+      return;
+    }
+    if (imageProvider.isComplete(sessionId)) {
+      _clearImageMissingRetry(sessionId);
+      return;
+    }
+
+    final attempt = _imageMissingRetryAttempts[sessionId] ?? 0;
+    if (attempt >= _maxPacketRetryAttempts) {
+      debugPrint(
+        '⚠️ [AppProvider] Image re-request limit reached for $sessionId',
+      );
+      _clearImageMissingRetry(sessionId);
+      return;
+    }
+
+    final senderKey6 = _imageSessionSenderKey6[sessionId];
+    if (senderKey6 == null) return;
+    final sender = _resolveContactByPrefixHex(senderKey6);
+    final deviceKey = connectionProvider.deviceInfo.publicKey;
+    if (sender == null || deviceKey == null || deviceKey.length < 6) return;
+
+    final missing = imageProvider.missingFragmentIndices(sessionId);
+    if (missing.isEmpty) {
+      _clearImageMissingRetry(sessionId);
+      return;
+    }
+
+    final requesterKey6 = deviceKey
+        .sublist(0, 6)
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join('');
+
+    final request = ImageFetchRequest(
+      sessionId: sessionId,
+      want: 'missing',
+      missingIndices: missing,
+      requesterKey6: requesterKey6,
+      timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+    );
+
+    try {
+      await connectionProvider.sendRawVoicePacket(
+        contactPath: sender.outPath,
+        contactPathLen: sender.outPathLen,
+        payload: request.encodeBinary(),
+      );
+    } catch (_) {
+      return;
+    }
+
+    _imageMissingRetryAttempts[sessionId] = attempt + 1;
+    _imageMissingRetryTimers[sessionId]?.cancel();
+    _imageMissingRetryTimers[sessionId] = Timer(_packetRetryDelay, () {
+      unawaited(_requestMissingImageFragments(sessionId));
+    });
+  }
+
   /// Insert or update a voice placeholder message for binary raw-data packets.
   ///
   /// Binary voice packets arrive without a chat message, so we synthesise one
@@ -1375,94 +1575,206 @@ class AppProvider with ChangeNotifier {
     messagesProvider.addMessage(placeholder, contactLookup: (_) => '');
   }
 
-  String _fragmentAckKey(String sessionId, int index) => '$sessionId:$index';
+  String _rawProbeKey(int nonce) =>
+      nonce.toRadixString(16).padLeft(8, '0').toLowerCase();
 
-  Future<bool> _waitForVoiceFragmentAck({
+  Future<bool> verifyRawTransportRoute(
-    required String sessionId,
+    Contact target, {
-    required int index,
     Duration timeout = const Duration(seconds: 8),
-  }) => _voiceFragmentAckWaiters.waitFor(
+  }) async {
-    _fragmentAckKey(sessionId, index),
+    if (!connectionProvider.deviceInfo.isConnected) {
-    timeout: timeout,
+      return false;
-  );
+    }
+    if (target.outPathLen < 0 || target.outPathLen > _maxDirectPayloadHops) {
+      return false;
+    }
+    if (target.outPath.isEmpty) {
+      return false;
+    }
 
-  void _completeVoiceFragmentAck(String sessionId, int index) {
+    final probeKey = _routeProbeTargetKey(target);
-    final completed = _voiceFragmentAckWaiters.complete(
+    final pendingProbe = _pendingRawRouteProbes[probeKey];
-      _fragmentAckKey(sessionId, index),
+    if (pendingProbe != null) {
-    );
+      return pendingProbe;
-    if (completed == 0) {
+    }
+
+    final deviceKey = connectionProvider.deviceInfo.publicKey;
+    if (deviceKey == null || deviceKey.length < 6) {
+      return false;
+    }
+
+    final requesterKey6 = deviceKey
+        .sublist(0, 6)
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join();
+    final future = () async {
+      final nonce = math.Random.secure().nextInt(0x100000000);
+      final ackFuture = _rawProbeWaiters.waitFor(
+        _rawProbeKey(nonce),
+        timeout: timeout,
+      );
+
+      try {
+        debugPrint(
+          '📡 [AppProvider] Outgoing raw route probe: target=${target.advName} hops=${target.outPathLen} nonce=${nonce.toRadixString(16)}',
+        );
+        await connectionProvider.sendRawVoicePacket(
+          contactPath: target.outPath,
+          contactPathLen: target.outPathLen,
+          payload: RawRouteProbeRequest(
+            nonce: nonce,
+            requesterKey6: requesterKey6,
+          ).encodeBinary(),
+        );
+        return await ackFuture;
+      } catch (e) {
+        debugPrint(
+          '⚠️ [AppProvider] Raw route probe failed for ${target.advName}: $e',
+        );
+        _rawProbeWaiters.complete(_rawProbeKey(nonce));
+        return false;
+      }
+    }();
+
+    _pendingRawRouteProbes[probeKey] = future;
+    try {
+      return await future;
+    } finally {
+      _pendingRawRouteProbes.remove(probeKey);
+    }
+  }
+
+  String _routeProbeTargetKey(Contact target) {
+    if (target.publicKeyHex.isNotEmpty) {
+      return 'pk:${target.publicKeyHex}';
+    }
+    return 'name:${target.advName}:${target.outPathLen}:${target.outPath.map((b) => b.toRadixString(16).padLeft(2, '0')).join()}';
+  }
+
+  void _handleRawRouteProbeRequest(RawRouteProbeRequest request) {
+    final requester = _resolveContactByPrefixHex(request.requesterKey6);
+    if (requester == null) {
       debugPrint(
-        'ℹ️ [AppProvider] Voice fragment ACK had no waiter: $sessionId#$index',
+        '⚠️ [AppProvider] Raw route probe requester not found: ${request.requesterKey6}',
       );
       return;
     }
-    debugPrint(
+    if (requester.outPathLen < 0 ||
-      '✅ [AppProvider] Voice fragment ACK received for $sessionId#$index ($completed waiter(s))',
+        requester.outPathLen > _maxDirectPayloadHops) {
-    );
-  }
-
-  Future<bool> _waitForImageFragmentAck({
-    required String sessionId,
-    required int index,
-    Duration timeout = const Duration(seconds: 8),
-  }) => _imageFragmentAckWaiters.waitFor(
-    _fragmentAckKey(sessionId, index),
-    timeout: timeout,
-  );
-
-  void _completeImageFragmentAck(String sessionId, int index) {
-    final completed = _imageFragmentAckWaiters.complete(
-      _fragmentAckKey(sessionId, index),
-    );
-    if (completed == 0) {
       debugPrint(
-        'ℹ️ [AppProvider] Image fragment ACK had no waiter: $sessionId#$index',
+        '⚠️ [AppProvider] Raw route probe requester out of range: ${requester.outPathLen}',
       );
       return;
     }
-    debugPrint(
+    if (requester.outPath.isEmpty) {
-      '✅ [AppProvider] Image fragment ACK received for $sessionId#$index ($completed waiter(s))',
-    );
-  }
-
-  void _sendVoiceFragmentAck(VoicePacket packet) {
-    final senderKey6 = _voiceSessionSenderKey6[packet.sessionId];
-    if (senderKey6 == null) return;
-    final sender = _resolveContactByPrefixHex(senderKey6);
-    if (sender == null) return;
-    if (sender.outPathLen < 0 || sender.outPathLen > _maxDirectPayloadHops) {
       return;
     }
+    debugPrint(
+      '📡 [AppProvider] Outgoing raw route probe ACK: requester=${requester.advName} hops=${requester.outPathLen} nonce=${request.nonce.toRadixString(16)}',
+    );
     unawaited(
       connectionProvider.sendRawVoicePacket(
-        contactPath: sender.outPath,
+        contactPath: requester.outPath,
-        contactPathLen: sender.outPathLen,
+        contactPathLen: requester.outPathLen,
-        payload: VoiceFragmentAck(
+        payload: RawRouteProbeAck(nonce: request.nonce).encodeBinary(),
-          sessionId: packet.sessionId,
-          index: packet.index,
-        ).encodeBinary(),
       ),
     );
   }
 
-  void _sendImageFragmentAck(ImagePacket fragment) {
+  void _completeRawRouteProbeAck(int nonce) {
-    final senderKey6 = _imageSessionSenderKey6[fragment.sessionId];
+    _rawProbeWaiters.complete(_rawProbeKey(nonce));
-    if (senderKey6 == null) return;
+  }
-    final sender = _resolveContactByPrefixHex(senderKey6);
+
-    if (sender == null) return;
+  MessageReceptionDetails? _buildReceptionDetailsSnapshot(Message message) {
-    if (sender.outPathLen < 0 || sender.outPathLen > _maxDirectPayloadHops) {
+    final matchedRxLog = _findBestMatchingRxLog(message);
-      return;
+    final estimatedTx = estimateMessageTransmitDuration(
-    }
+      message,
-    unawaited(
+      radioBw: connectionProvider.deviceInfo.radioBw,
-      connectionProvider.sendRawVoicePacket(
+      radioSf: connectionProvider.deviceInfo.radioSf,
-        contactPath: sender.outPath,
+      radioCr: connectionProvider.deviceInfo.radioCr,
-        contactPathLen: sender.outPathLen,
-        payload: ImageFragmentAck(
-          sessionId: fragment.sessionId,
-          index: fragment.index,
-        ).encodeBinary(),
-      ),
     );
+    final senderToReceiptMs = _senderToReceiptMs(message);
+    final estimatedTransmitMs = sanitizeEstimatedTransmitMs(
+      estimatedTransmitMs: estimatedTx > Duration.zero
+          ? estimatedTx.inMilliseconds
+          : null,
+      senderToReceiptMs: senderToReceiptMs,
+    );
+    final postTransmitDelayMs =
+        senderToReceiptMs != null && estimatedTransmitMs != null
+        ? (senderToReceiptMs - estimatedTransmitMs).clamp(0, 86400000).toInt()
+        : null;
+
+    if (matchedRxLog == null &&
+        senderToReceiptMs == null &&
+        estimatedTransmitMs == null) {
+      return null;
+    }
+
+    return MessageReceptionDetails(
+      capturedAt: DateTime.now(),
+      packetLoggedAt: matchedRxLog?.timestamp,
+      rssiDbm: matchedRxLog?.logRxDataInfo?.rssiDbm,
+      snrDb: matchedRxLog?.logRxDataInfo?.snrDb,
+      pathBytes: _extractPathBytesFromLog(matchedRxLog),
+      senderToReceiptMs: senderToReceiptMs,
+      estimatedTransmitMs: estimatedTransmitMs,
+      postTransmitDelayMs: postTransmitDelayMs,
+    );
+  }
+
+  int? _senderToReceiptMs(Message message) {
+    if (message.senderTimestamp <= 0) return null;
+    final senderAt = DateTime.fromMillisecondsSinceEpoch(
+      message.senderTimestamp * 1000,
+      isUtc: true,
+    );
+    final deltaMs = message.receivedAt
+        .toUtc()
+        .difference(senderAt)
+        .inMilliseconds;
+    if (deltaMs < 0 || deltaMs > 86400000) return null;
+    return deltaMs;
+  }
+
+  BlePacketLog? _findBestMatchingRxLog(Message message) {
+    if (message.pathLen < 0 || message.pathLen >= 255) return null;
+    final expectedPayloadType = message.messageType == MessageType.channel
+        ? 0x05
+        : 0x02;
+    BlePacketLog? bestLog;
+    var bestDeltaMs = 999999999;
+
+    for (final log in connectionProvider.bleService.packetLogs) {
+      if (log.responseCode != 0x88) continue;
+      if (log.rawData.length < 6) continue;
+
+      final raw = log.rawData;
+      final payloadType = (raw[3] >> 2) & 0x0F;
+      final pathLen = raw[4];
+      if (payloadType != expectedPayloadType) continue;
+      if (pathLen != message.pathLen) continue;
+      if (raw.length < 5 + pathLen) continue;
+
+      final deltaMs =
+          (log.timestamp.difference(message.receivedAt).inMilliseconds).abs();
+      if (deltaMs < bestDeltaMs) {
+        bestDeltaMs = deltaMs;
+        bestLog = log;
+      }
+    }
+
+    if (bestDeltaMs > 30000) return null;
+    return bestLog;
+  }
+
+  List<int>? _extractPathBytesFromLog(BlePacketLog? log) {
+    if (log == null) return null;
+    final raw = log.rawData;
+    if (raw.length < 6) return null;
+    final pathLen = raw[4];
+    if (pathLen <= 0 || raw.length < 5 + pathLen) return null;
+    return raw.sublist(5, 5 + pathLen);
   }
 
   // Removed _syncMessages() - messages are automatically synced via PUSH_CODE_MSG_WAITING events
@@ -1558,9 +1870,15 @@ class AppProvider with ChangeNotifier {
     for (final timer in _voiceMissingRetryTimers.values) {
       timer.cancel();
     }
+    for (final timer in _imageMissingRetryTimers.values) {
+      timer.cancel();
+    }
     _voiceMissingRetryTimers.clear();
     _voiceMissingRetryAttempts.clear();
+    _imageMissingRetryTimers.clear();
+    _imageMissingRetryAttempts.clear();
     _voiceSessionSenderKey6.clear();
+    _imageSessionSenderKey6.clear();
     notifyListeners();
   }
 
@@ -1594,6 +1912,9 @@ class AppProvider with ChangeNotifier {
     for (final timer in _voiceMissingRetryTimers.values) {
       timer.cancel();
     }
+    for (final timer in _imageMissingRetryTimers.values) {
+      timer.cancel();
+    }
     super.dispose();
   }
 }

lib/providers/connection_provider.dart

@@ -89,6 +89,8 @@ class ConnectionProvider with ChangeNotifier {
 
   bool _isScanning = false;
   bool get isScanning => _isScanning;
+  bool _isSpectrumScanActive = false;
+  bool get isSpectrumScanActive => _isSpectrumScanActive;
 
   String? _error;
   String? get error => _error;
@@ -144,11 +146,15 @@ class ConnectionProvider with ChangeNotifier {
   final MessageDeliveryTracker _messageDeliveryTracker =
       MessageDeliveryTracker();
   final PingTracker _pingTracker = PingTracker();
+  final Map<String, Future<PingResult>> _pendingSmartPings = {};
 
   // Expose room login states
   Map<String, RoomLoginState> get roomLoginStates =>
       _roomLoginManager.roomLoginStates;
 
+  bool isPingInProgress(Uint8List publicKey) =>
+      _pendingSmartPings.containsKey(_publicKeyToHex(publicKey));
+
   // Callbacks for other providers
   Function(Contact)? onContactReceived;
   Function(List<Contact>)? onContactsComplete;
@@ -247,7 +253,10 @@ class ConnectionProvider with ChangeNotifier {
         await Future.delayed(const Duration(milliseconds: 300));
 
         if (pendingOp.messageId != null) {
-          _messageDeliveryTracker.trackPendingMessage(pendingOp.messageId!);
+          _messageDeliveryTracker.trackPendingDirectMessage(
+            pendingOp.messageId!,
+            pendingOp.contactPublicKey,
+          );
         }
 
         await _activeService.sendTextMessage(
@@ -312,6 +321,10 @@ class ConnectionProvider with ChangeNotifier {
     };
 
     service.onMessageWaiting = () {
+      if (_isSpectrumScanActive) {
+        debugPrint('📥 [Provider] MSG_WAITING ignored during spectrum scan');
+        return;
+      }
       debugPrint('📥 [Provider] MSG_WAITING - auto-syncing');
       if (_isSyncingMessages) {
         _syncRequestedWhileBusy = true;
@@ -346,7 +359,11 @@ class ConnectionProvider with ChangeNotifier {
 
     service.onMessageSent =
         (expectedAckTag, suggestedTimeoutMs, isFloodMode, contactPublicKey) {
-          final messageId = _messageDeliveryTracker.popPendingMessageId();
+          final messageId = contactPublicKey != null
+              ? _messageDeliveryTracker.popPendingDirectMessageId(
+                  contactPublicKey,
+                )
+              : _messageDeliveryTracker.popPendingMessageId();
           if (messageId != null) {
             _messageDeliveryTracker.mapAckTagToMessageId(
               expectedAckTag,
@@ -379,6 +396,9 @@ class ConnectionProvider with ChangeNotifier {
         manufacturerModel: deviceInfo['manufacturerModel'] as String?,
         semanticVersion: deviceInfo['semanticVersion'] as String?,
         clientRepeat: deviceInfo['clientRepeat'] as bool?,
+        supportsSpectrumScan: deviceInfo['supportsSpectrumScan'] as bool?,
+        spectrumScanMinKhz: deviceInfo['spectrumScanMinKhz'] as int?,
+        spectrumScanMaxKhz: deviceInfo['spectrumScanMaxKhz'] as int?,
       );
       notifyListeners();
       if (_sseServer.isRunning) {
@@ -1139,7 +1159,10 @@ class ConnectionProvider with ChangeNotifier {
       // The MessagesProvider now uses simple ACK tag → recipientPublicKey mapping.
       // We still track here for the SENT response callback to work.
       if (messageId != null) {
-        _messageDeliveryTracker.trackPendingMessage(messageId);
+        _messageDeliveryTracker.trackPendingDirectMessage(
+          messageId,
+          contactPublicKey,
+        );
         debugPrint('  📝 Tracked pending message: $messageId');
       }
 
@@ -1297,6 +1320,34 @@ class ConnectionProvider with ChangeNotifier {
     required Uint8List contactPublicKey,
     required bool hasPath,
     Function()? onRetryWithFlooding,
+  }) async {
+    final pingKey = _publicKeyToHex(contactPublicKey);
+    final pendingPing = _pendingSmartPings[pingKey];
+    if (pendingPing != null) {
+      debugPrint('ℹ️ [Provider] Joining in-flight ping for $pingKey');
+      return pendingPing;
+    }
+
+    final future = _runSmartPing(
+      contactPublicKey: contactPublicKey,
+      hasPath: hasPath,
+      onRetryWithFlooding: onRetryWithFlooding,
+    );
+    _pendingSmartPings[pingKey] = future;
+    notifyListeners();
+
+    try {
+      return await future;
+    } finally {
+      _pendingSmartPings.remove(pingKey);
+      notifyListeners();
+    }
+  }
+
+  Future<PingResult> _runSmartPing({
+    required Uint8List contactPublicKey,
+    required bool hasPath,
+    Function()? onRetryWithFlooding,
   }) async {
     if (!_activeService.isConnected) {
       _error = 'Not connected to device';
@@ -1315,7 +1366,10 @@ class ConnectionProvider with ChangeNotifier {
       );
 
       // Send the ping
-      await _activeService.requestTelemetry(contactPublicKey, zeroHop: true);
+      await _activeService.requestTelemetry(
+        contactPublicKey,
+        zeroHop: firstAttemptDirect,
+      );
 
       // Wait for response or timeout
       final bool gotResponse = await pingFuture;
@@ -1342,8 +1396,8 @@ class ConnectionProvider with ChangeNotifier {
           wasDirectAttempt: false,
         );
 
-        // Retry with flooding (zeroHop=true acts as broadcast to neighbors)
+        // Retry with flooding.
-        await _activeService.requestTelemetry(contactPublicKey, zeroHop: true);
+        await _activeService.requestTelemetry(contactPublicKey, zeroHop: false);
 
         // Wait for response or timeout
         final bool gotRetryResponse = await retryFuture;
@@ -1365,6 +1419,10 @@ class ConnectionProvider with ChangeNotifier {
     }
   }
 
+  String _publicKeyToHex(Uint8List publicKey) {
+    return publicKey.map((b) => b.toRadixString(16).padLeft(2, '0')).join('');
+  }
+
   /// Send binary request to contact (modern replacement for requestTelemetry)
   ///
   /// Supports multiple request types:
@@ -1555,6 +1613,43 @@ class ConnectionProvider with ChangeNotifier {
     }
   }
 
+  Future<SpectrumScanResult?> scanSpectrum({
+    required int startFrequencyKhz,
+    required int stopFrequencyKhz,
+    required int bandwidthKhz,
+    required int stepKhz,
+    required int dwellMs,
+    required int thresholdDb,
+  }) async {
+    if (!_activeService.isConnected) {
+      _error = 'Not connected to device';
+      notifyListeners();
+      return null;
+    }
+
+    try {
+      _isSpectrumScanActive = true;
+      _activeService.setSpectrumScanActive(true);
+      notifyListeners();
+      return await _activeService.scanSpectrum(
+        startFrequencyKhz: startFrequencyKhz,
+        stopFrequencyKhz: stopFrequencyKhz,
+        bandwidthKhz: bandwidthKhz,
+        stepKhz: stepKhz,
+        dwellMs: dwellMs,
+        thresholdDb: thresholdDb,
+      );
+    } catch (e) {
+      _error = 'Failed to scan spectrum: $e';
+      notifyListeners();
+      return null;
+    } finally {
+      _isSpectrumScanActive = false;
+      _activeService.setSpectrumScanActive(false);
+      notifyListeners();
+    }
+  }
+
   /// Set transmit power
   Future<void> setTxPower(int powerDbm) async {
     if (!_activeService.isConnected) {
@@ -1599,6 +1694,7 @@ class ConnectionProvider with ChangeNotifier {
 
   /// Request fresh device info (triggers SelfInfo response)
   Future<void> refreshDeviceInfo() async {
+    if (_isSpectrumScanActive) return;
     if (!_activeService.isConnected) {
       _error = 'Not connected to device';
       notifyListeners();
@@ -1642,6 +1738,7 @@ class ConnectionProvider with ChangeNotifier {
   /// Sync messages from device queue
   /// Call this repeatedly until no more messages are available
   Future<bool> syncNextMessage() async {
+    if (_isSpectrumScanActive) return false;
     // Prevent re-entrancy and too-fast triggers
     if (_isSyncingMessages) {
       // Another sync (single or loop) is in progress
@@ -1680,6 +1777,10 @@ class ConnectionProvider with ChangeNotifier {
 
   /// Sync all waiting messages from device
   Future<int> syncAllMessages() async {
+    if (_isSpectrumScanActive) {
+      debugPrint('⏸️ [Provider] Message sync skipped during spectrum scan');
+      return 0;
+    }
     if (_isSyncingMessages) {
       // Already syncing; avoid overlapping loops
       _syncRequestedWhileBusy = true;

lib/providers/contacts_provider.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:latlong2/latlong.dart';
 import '../models/contact.dart';
+import '../models/message_contact_location.dart';
 import '../services/cayenne_lpp_parser.dart';
 import '../services/contact_storage_service.dart';
 import '../utils/key_comparison.dart';
@@ -214,6 +215,52 @@ class ContactsProvider with ChangeNotifier {
   List<Contact> get chatContactsWithLocation =>
       chatContacts.where((c) => c.displayLocation != null).toList();
 
+  MessageContactLocation? buildMessageContactLocationSnapshot(
+    Contact contact, {
+    DateTime? capturedAt,
+  }) {
+    final snapshotTime = capturedAt ?? DateTime.now();
+    final telemetryGps = _getValidGpsOrNull(contact.telemetry?.gpsLocation);
+    final telemetryTimestamp = contact.telemetry?.timestamp;
+
+    AdvertLocation? advertLocation;
+    for (final point in contact.advertHistory) {
+      if (!point.timestamp.isAfter(snapshotTime)) {
+        advertLocation = point;
+        break;
+      }
+    }
+    advertLocation ??= contact.advertHistory.isNotEmpty
+        ? contact.advertHistory.first
+        : null;
+
+    if (telemetryGps != null) {
+      final shouldUseTelemetry =
+          telemetryTimestamp == null ||
+          advertLocation == null ||
+          !telemetryTimestamp.isBefore(advertLocation.timestamp);
+      if (shouldUseTelemetry) {
+        return MessageContactLocation(
+          location: telemetryGps,
+          source: 'telemetry',
+          capturedAt: snapshotTime,
+          sourceTimestamp: telemetryTimestamp,
+        );
+      }
+    }
+
+    if (advertLocation != null) {
+      return MessageContactLocation(
+        location: advertLocation.location,
+        source: 'advert',
+        capturedAt: snapshotTime,
+        sourceTimestamp: advertLocation.timestamp,
+      );
+    }
+
+    return null;
+  }
+
   /// Sort contacts by last seen (most recent first)
   int _sortByLastSeen(Contact a, Contact b) {
     return b.lastSeenTime.compareTo(a.lastSeenTime);
@@ -470,6 +517,22 @@ class ContactsProvider with ChangeNotifier {
     return _contacts[keyHex];
   }
 
+  /// Clear a contact's learned path locally so the UI and next send both
+  /// prefer flood routing until the radio reports a fresh route.
+  void markPathUnhealthy(Uint8List publicKey) {
+    final contact = findContactByKey(publicKey);
+    if (contact == null || !contact.hasPath) {
+      return;
+    }
+
+    _contacts[contact.publicKeyHex] = contact.copyWith(
+      outPathLen: -1,
+      outPath: Uint8List(0),
+    );
+    _persistContacts();
+    notifyListeners();
+  }
+
   /// Add or refresh a pending advert entry from PUSH_CODE_ADVERT (0x80).
   /// Excludes self key and existing contacts.
   void addPendingAdvert(Uint8List publicKey, {Uint8List? devicePublicKey}) {

lib/providers/helpers/message_delivery_tracker.dart

@@ -1,3 +1,5 @@
+import 'dart:typed_data';
+
 /// Message delivery tracking helper
 ///
 /// Manages message delivery tracking for sent messages, including:
@@ -16,6 +18,9 @@ class MessageDeliveryTracker {
   /// Messages tracked here before sending, popped when RESP_CODE_SENT arrives
   final List<String> _pendingMessageIds = [];
 
+  /// Contact-scoped FIFOs for matching direct-message SENT responses.
+  final Map<String, List<String>> _pendingMessageIdsByContact = {};
+
   /// Map of ACK tag to message ID for delivery confirmation
   final Map<int, String> _ackTagToMessageId = {};
 
@@ -33,6 +38,15 @@ class MessageDeliveryTracker {
     _pendingMessageIds.add(messageId);
   }
 
+  /// Track a pending direct message ID for a specific contact.
+  void trackPendingDirectMessage(String messageId, Uint8List contactPublicKey) {
+    trackPendingMessage(messageId);
+    final contactKey = _contactKey(contactPublicKey);
+    _pendingMessageIdsByContact
+        .putIfAbsent(contactKey, () => [])
+        .add(messageId);
+  }
+
   /// Pop the next pending message ID from FIFO queue
   ///
   /// Called when RESP_CODE_SENT arrives. Returns null if queue empty.
@@ -43,6 +57,24 @@ class MessageDeliveryTracker {
     return _pendingMessageIds.removeAt(0);
   }
 
+  /// Pop the next pending direct message ID for a specific contact.
+  ///
+  /// Falls back to the legacy global FIFO if the contact queue is empty.
+  String? popPendingDirectMessageId(Uint8List contactPublicKey) {
+    final contactKey = _contactKey(contactPublicKey);
+    final queue = _pendingMessageIdsByContact[contactKey];
+    if (queue == null || queue.isEmpty) {
+      return popPendingMessageId();
+    }
+
+    final messageId = queue.removeAt(0);
+    if (queue.isEmpty) {
+      _pendingMessageIdsByContact.remove(contactKey);
+    }
+    _pendingMessageIds.remove(messageId);
+    return messageId;
+  }
+
   /// Map ACK tag to message ID after RESP_CODE_SENT received
   ///
   /// Creates bidirectional mapping for efficient cleanup and tracking.
@@ -86,6 +118,17 @@ class MessageDeliveryTracker {
       _ackTagToMessageId.remove(ackTag);
       _ackTagTimestamps.remove(ackTag);
     }
+    _pendingMessageIds.remove(messageId);
+    final emptyKeys = <String>[];
+    for (final entry in _pendingMessageIdsByContact.entries) {
+      entry.value.remove(messageId);
+      if (entry.value.isEmpty) {
+        emptyKeys.add(entry.key);
+      }
+    }
+    for (final key in emptyKeys) {
+      _pendingMessageIdsByContact.remove(key);
+    }
   }
 
   /// Clean up stale ACK mappings
@@ -114,6 +157,7 @@ class MessageDeliveryTracker {
   /// Clear all tracking state
   void clearTracking() {
     _pendingMessageIds.clear();
+    _pendingMessageIdsByContact.clear();
     _ackTagToMessageId.clear();
     _messageIdToAckTag.clear();
     _ackTagTimestamps.clear();
@@ -133,9 +177,7 @@ class MessageDeliveryTracker {
   /// Get oldest pending ACK timestamp (for debugging)
   DateTime? get oldestPendingTimestamp {
     if (_ackTagTimestamps.isEmpty) return null;
-    return _ackTagTimestamps.values.reduce(
+    return _ackTagTimestamps.values.reduce((a, b) => a.isBefore(b) ? a : b);
-      (a, b) => a.isBefore(b) ? a : b,
-    );
   }
 
   /// Get diagnostic info for debugging
@@ -145,6 +187,15 @@ class MessageDeliveryTracker {
       'shouldRateLimit': shouldRateLimit,
       'oldestPending': oldestPendingTimestamp?.toIso8601String(),
       'ackTags': _ackTagToMessageId.keys.toList(),
+      'pendingByContact': _pendingMessageIdsByContact.map(
+        (key, value) => MapEntry(key, value.length),
+      ),
     };
   }
+
+  String _contactKey(Uint8List contactPublicKey) {
+    return contactPublicKey
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join();
+  }
 }

lib/providers/helpers/message_retry_manager.dart

@@ -1,3 +1,6 @@
+import 'dart:convert';
+import 'dart:math' as math;
+
 import '../../models/message.dart';
 import '../../models/contact.dart';
 
@@ -17,11 +20,18 @@ class MessageRetryManager {
   // Track retry state for each message ID
   final Map<String, int> _retryAttempts = {};
   final Map<String, DateTime> _lastRetryTimes = {};
+  final Map<String, int> _pathFailureStreaks = {};
 
   // Progressive timeout values in milliseconds
   // These are app-level timeouts, separate from firmware's suggested timeout
   // Firmware timeout is for ACK arrival, these are for retry attempts
   static const List<int> _timeouts = [4000, 8000, 12000];
+  static const int _defaultLoRaSf = 10;
+  static const int _defaultLoRaCr = 5;
+  static const int _defaultLoRaBwHz = 250000;
+  static const int _defaultLoRaPreambleSymbols = 8;
+  static const int _defaultLoRaCrcEnabled = 1;
+  static const int _defaultLoRaExplicitHeader = 1;
 
   /// Get timeout for a specific retry attempt (0-2)
   /// Returns: 4000ms for attempt 0, 8000ms for attempt 1, 12000ms for attempt 2
@@ -32,6 +42,30 @@ class MessageRetryManager {
     return _timeouts[attempt];
   }
 
+  /// Calculate a conservative delivery-ACK timeout when firmware doesn't
+  /// provide one or returns an invalid value.
+  int calculateAckTimeoutMs({
+    required String text,
+    required Contact? contact,
+    int? suggestedTimeoutMs,
+  }) {
+    if (suggestedTimeoutMs != null && suggestedTimeoutMs > 0) {
+      return suggestedTimeoutMs;
+    }
+
+    final payloadBytes = utf8.encode(text).length;
+    final airtimeMs = _estimateLoRaAirtimeMs(payloadBytes);
+    final hopCount = contact?.hasPath == true
+        ? math.max(contact!.outPathLen, 0)
+        : -1;
+
+    if (hopCount < 0) {
+      return ((airtimeMs * 10) + 4000).clamp(10000, 30000);
+    }
+
+    return ((airtimeMs * (hopCount + 1) * 2) + 1500).clamp(4000, 20000);
+  }
+
   /// Check if a message is eligible for retry
   ///
   /// Returns true if:
@@ -67,8 +101,8 @@ class MessageRetryManager {
   /// Contacts without paths already use flood mode automatically.
   bool shouldUseFloodFallback(Message message, Contact contact) {
     return message.retryAttempt >= 3 &&
-           contact.hasPath &&  // ✅ FIXED: Flood fallback for failed direct paths
+        contact.hasPath && // ✅ FIXED: Flood fallback for failed direct paths
-           !message.usedFloodFallback;
+        !message.usedFloodFallback;
   }
 
   /// Track a retry attempt for a message
@@ -87,6 +121,7 @@ class MessageRetryManager {
   void clearAll() {
     _retryAttempts.clear();
     _lastRetryTimes.clear();
+    _pathFailureStreaks.clear();
   }
 
   /// Get current retry attempt for a message (for debugging)
@@ -98,4 +133,50 @@ class MessageRetryManager {
   DateTime? getLastRetryTime(String messageId) {
     return _lastRetryTimes[messageId];
   }
+
+  /// Record a successful delivery for a contact and clear any accumulated
+  /// route failure streak for future sends.
+  void recordDeliverySuccess(Contact contact) {
+    _pathFailureStreaks.remove(contact.publicKeyHex);
+  }
+
+  /// Record a permanent route failure for a contact.
+  ///
+  /// Returns the updated failure streak so callers can decide when to reset
+  /// the learned path on the radio and in local state.
+  int recordPathFailure(Contact contact) {
+    final contactKey = contact.publicKeyHex;
+    final next = (_pathFailureStreaks[contactKey] ?? 0) + 1;
+    _pathFailureStreaks[contactKey] = next;
+    return next;
+  }
+
+  int? getPathFailureStreak(Contact contact) {
+    return _pathFailureStreaks[contact.publicKeyHex];
+  }
+
+  int _estimateLoRaAirtimeMs(int payloadLenBytes) {
+    final sf = _defaultLoRaSf;
+    final bw = _defaultLoRaBwHz.toDouble();
+    final cr = (_defaultLoRaCr - 4).clamp(1, 4);
+    final ih = _defaultLoRaExplicitHeader == 1 ? 0 : 1;
+    final de = (sf >= 11 && _defaultLoRaBwHz <= 125000) ? 1 : 0;
+
+    final symbolMs = ((1 << sf) / bw) * 1000.0;
+    final preambleMs = (_defaultLoRaPreambleSymbols + 4.25) * symbolMs;
+
+    final num =
+        (8 * payloadLenBytes) -
+        (4 * sf) +
+        28 +
+        (16 * _defaultLoRaCrcEnabled) -
+        (20 * ih);
+    final den = 4 * (sf - (2 * de));
+    final payloadSymCoeff = den <= 0 ? 0 : (num / den).ceil();
+    final payloadSymbols =
+        8 + (payloadSymCoeff < 0 ? 0 : payloadSymCoeff) * (cr + 4);
+    final payloadMs = payloadSymbols * symbolMs;
+
+    return (preambleMs + payloadMs).ceil();
+  }
 }

lib/providers/helpers/raw_session_retransmit.dart

@@ -9,13 +9,6 @@ typedef RawPacketSender =
       required Uint8List payload,
     });
 
-typedef FragmentAckWaiter =
-    Future<bool> Function({
-      required String sessionId,
-      required int index,
-      Duration timeout,
-    });
-
 Future<bool> serveCachedSessionFragments<T>({
   required String providerLabel,
   required String sessionId,
@@ -25,9 +18,7 @@ Future<bool> serveCachedSessionFragments<T>({
   required int Function(T fragment) indexOf,
   required Uint8List Function(T fragment) encodeBinary,
   required RawPacketSender? sendRawPacket,
-  FragmentAckWaiter? waitForFragmentAck,
   Set<int>? requestedIndices,
-  Duration ackTimeout = const Duration(seconds: 8),
 }) async {
   if (fragments.isEmpty) {
     debugPrint('⚠️ [$providerLabel] No cached fragments for $sessionId');
@@ -65,24 +56,12 @@ Future<bool> serveCachedSessionFragments<T>({
       continue;
     }
     try {
-      final ackFuture = waitForFragmentAck?.call(
-        sessionId: sessionId,
-        index: index,
-        timeout: ackTimeout,
-      );
       await sendRawPacket(
         contactPath: requester.outPath,
         contactPathLen: requester.outPathLen,
         payload: encodeBinary(fragment),
       );
       servedCount++;
-      if (ackFuture != null) {
-        final acked = await ackFuture;
-        if (!acked) {
-          debugPrint('⚠️ [$providerLabel] ACK timeout for $sessionId#$index');
-          return false;
-        }
-      }
     } catch (e, st) {
       debugPrint(
         '❌ [$providerLabel] Serve error for $sessionId#$index: $e\n$st',

lib/providers/image_provider.dart

@@ -70,12 +70,6 @@ class ImageProvider with ChangeNotifier {
     required Uint8List payload,
   })?
   sendRawPacketCallback;
-  Future<bool> Function({
-    required String sessionId,
-    required int index,
-    Duration timeout,
-  })?
-  waitForFragmentAckCallback;
 
   ImageProvider() {
     _restore();
@@ -264,7 +258,6 @@ class ImageProvider with ChangeNotifier {
       indexOf: (fragment) => fragment.index,
       encodeBinary: (fragment) => fragment.encodeBinary(),
       sendRawPacket: sendRawPacketCallback,
-      waitForFragmentAck: waitForFragmentAckCallback,
       requestedIndices: requestedIndices,
     );
   }

lib/providers/messages_provider.dart

@@ -2,6 +2,8 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import '../models/message.dart';
 import '../models/contact.dart';
+import '../models/message_contact_location.dart';
+import '../models/message_reception_details.dart';
 import '../models/sar_marker.dart';
 import '../models/map_drawing.dart';
 import '../services/message_storage_service.dart';
@@ -9,6 +11,7 @@ import '../services/notification_service.dart';
 import '../utils/sar_message_parser.dart';
 import '../utils/drawing_message_parser.dart';
 import '../utils/voice_message_parser.dart';
+import '../utils/image_message_parser.dart';
 import '../l10n/app_localizations.dart';
 import 'helpers/message_retry_manager.dart';
 
@@ -20,6 +23,8 @@ class MessagesProvider with ChangeNotifier {
   final NotificationService _notificationService = NotificationService();
   bool _isInitialized = false;
   AppLocalizations? _localizations;
+  final Map<String, MessageContactLocation> _messageContactLocations = {};
+  final Map<String, MessageReceptionDetails> _messageReceptionDetails = {};
 
   // Track pending sent messages by expected ACK/TAG
   final Map<int, Message> _pendingSentMessages = {};
@@ -28,6 +33,13 @@ class MessagesProvider with ChangeNotifier {
   // Key: message ID (not ACK tag, since multiple messages can share same ACK)
   final Map<String, Timer> _timeoutTimers = {};
 
+  // Recently completed ACKs are kept briefly to ignore duplicate confirms.
+  final Map<int, DateTime> _completedAckHistory = {};
+
+  // Preserve ACK tags assigned to a message across retries.
+  final Map<String, Set<int>> _messageAckHistory = {};
+  final Map<int, (String, DateTime)> _ackHistoryLookup = {};
+
   // Retry management
   final MessageRetryManager _retryManager = MessageRetryManager();
 
@@ -65,6 +77,12 @@ class MessagesProvider with ChangeNotifier {
   })?
   sendMessageCallback;
 
+  Future<void> Function({required Contact contact, required int failureStreak})?
+  onDirectPathFailedCallback;
+
+  String? Function(Uint8List? publicKey)? resolveContactNameCallback;
+  String Function(int channelIdx)? resolveChannelNameCallback;
+
   List<Message> get messages => List.unmodifiable(_messages);
 
   List<Message> get contactMessages =>
@@ -97,6 +115,12 @@ class MessagesProvider with ChangeNotifier {
 
   String? get targetMessageId => _targetMessageId;
 
+  MessageContactLocation? getMessageContactLocation(String messageId) =>
+      _messageContactLocations[messageId];
+
+  MessageReceptionDetails? getMessageReceptionDetails(String messageId) =>
+      _messageReceptionDetails[messageId];
+
   /// Set localizations for notifications
   void setLocalizations(AppLocalizations localizations) {
     _localizations = localizations;
@@ -125,6 +149,16 @@ class MessagesProvider with ChangeNotifier {
     try {
       debugPrint('📦 [MessagesProvider] Loading persisted messages...');
       final storedMessages = await _storageService.loadMessages();
+      final storedContactLocations = await _storageService
+          .loadMessageContactLocations();
+      final storedReceptionDetails = await _storageService
+          .loadMessageReceptionDetails();
+      _messageContactLocations
+        ..clear()
+        ..addAll(storedContactLocations);
+      _messageReceptionDetails
+        ..clear()
+        ..addAll(storedReceptionDetails);
 
       // Add stored messages with enhancement to ensure SAR detection
       for (final message in storedMessages) {
@@ -287,6 +321,8 @@ class MessagesProvider with ChangeNotifier {
   void addMessage(
     Message message, {
     String Function(String name)? contactLookup,
+    MessageContactLocation? contactLocationSnapshot,
+    MessageReceptionDetails? receptionDetailsSnapshot,
   }) {
     // Always enhance message with SAR parser to detect SAR markers
     var enhancedMessage = SarMessageParser.enhanceMessage(message);
@@ -373,10 +409,32 @@ class MessagesProvider with ChangeNotifier {
       debugPrint(
         '   Text: ${finalMessage.text.substring(0, finalMessage.text.length > 50 ? 50 : finalMessage.text.length)}...',
       );
+      final existingIndex = _messages.indexWhere(
+        (existing) =>
+            existing.messageType == finalMessage.messageType &&
+            existing.senderTimestamp == finalMessage.senderTimestamp &&
+            existing.text == finalMessage.text,
+      );
+      if (existingIndex != -1) {
+        final existingId = _messages[existingIndex].id;
+        if (contactLocationSnapshot != null) {
+          _messageContactLocations[existingId] = contactLocationSnapshot;
+        }
+        if (receptionDetailsSnapshot != null) {
+          _messageReceptionDetails[existingId] = receptionDetailsSnapshot;
+        }
+        _persistMessages();
+      }
       return; // Skip duplicate
     }
 
     _messages.add(finalMessage);
+    if (contactLocationSnapshot != null) {
+      _messageContactLocations[finalMessage.id] = contactLocationSnapshot;
+    }
+    if (receptionDetailsSnapshot != null) {
+      _messageReceptionDetails[finalMessage.id] = receptionDetailsSnapshot;
+    }
 
     // If it's a SAR marker message, extract and store the marker
     if (finalMessage.isSarMarker) {
@@ -522,33 +580,31 @@ class MessagesProvider with ChangeNotifier {
   /// Trigger notification for regular message
   Future<void> _triggerMessageNotification(Message message) async {
     try {
-      // Get sender name from message
+      final senderName = _resolveParticipantName(
-      final senderName =
+        publicKey: message.senderPublicKeyPrefix,
-          message.senderName ?? message.senderKeyShort ?? 'Unknown';
+        fallback: message.senderName ?? message.senderKeyShort,
-
+      );
-      // Determine if it's a channel message
       final isChannelMessage = message.isChannelMessage;
-
+      final channelName = isChannelMessage
-      // Get channel name if available
+          ? _resolveChannelName(message.channelIdx)
-      String? channelName;
+          : null;
-      if (isChannelMessage) {
+      final messageText = _buildNotificationMessageText(
-        // You could map channelIdx to channel name here if needed
+        message,
-        // For now, use "Public" for channel 0
+        senderName: senderName,
-        channelName = message.channelIdx == 0
+        isChannelMessage: isChannelMessage,
-            ? 'Public'
+        channelName: channelName,
-            : 'Channel ${message.channelIdx}';
+      );
-      }
 
       debugPrint('🔔 [MessagesProvider] Triggering message notification');
       debugPrint('   Sender: $senderName');
       debugPrint('   Type: ${isChannelMessage ? "Channel" : "Direct"}');
       debugPrint(
-        '   Message: ${message.text.substring(0, message.text.length > 50 ? 50 : message.text.length)}...',
+        '   Message: ${messageText.substring(0, messageText.length > 50 ? 50 : messageText.length)}...',
       );
 
       await _notificationService.showMessageNotification(
         senderName: senderName,
-        messageText: message.text,
+        messageText: messageText,
         isChannelMessage: isChannelMessage,
         channelName: channelName,
         localizations: _localizations,
@@ -560,10 +616,86 @@ class MessagesProvider with ChangeNotifier {
     }
   }
 
+  String _resolveParticipantName({
+    required Uint8List? publicKey,
+    String? fallback,
+  }) {
+    final resolved = resolveContactNameCallback?.call(publicKey)?.trim();
+    if (resolved != null && resolved.isNotEmpty) {
+      return resolved;
+    }
+    final normalizedFallback = fallback?.trim();
+    if (normalizedFallback != null && normalizedFallback.isNotEmpty) {
+      return normalizedFallback;
+    }
+    return 'Unknown';
+  }
+
+  String _resolveChannelName(int? channelIdx) {
+    final idx = channelIdx ?? 0;
+    final resolved = resolveChannelNameCallback?.call(idx).trim();
+    if (resolved != null && resolved.isNotEmpty) {
+      return resolved;
+    }
+    return idx == 0 ? 'Public' : 'Channel $idx';
+  }
+
+  String _buildNotificationMessageText(
+    Message message, {
+    required String senderName,
+    required bool isChannelMessage,
+    String? channelName,
+  }) {
+    final voiceEnvelope = VoiceEnvelope.tryParseText(message.text);
+    if (voiceEnvelope != null) {
+      final seconds = (voiceEnvelope.durationMs / 1000).ceil();
+      final route = isChannelMessage
+          ? 'Channel: ${channelName ?? _resolveChannelName(message.channelIdx)}'
+          : 'From: $senderName';
+      return '$route\nVoice message - ${voiceEnvelope.mode.label} - ${seconds}s - ${voiceEnvelope.total} packets';
+    }
+
+    final imageEnvelope = ImageEnvelope.tryParse(message.text);
+    if (imageEnvelope != null) {
+      final route = isChannelMessage
+          ? 'Channel: ${channelName ?? _resolveChannelName(message.channelIdx)}'
+          : 'From: $senderName';
+      return '$route\nImage - ${imageEnvelope.format.label} - ${imageEnvelope.width}x${imageEnvelope.height} - ${_formatBytes(imageEnvelope.sizeBytes)}';
+    }
+
+    if (!isChannelMessage && message.recipientPublicKey != null) {
+      final recipientName = _resolveParticipantName(
+        publicKey: message.recipientPublicKey,
+        fallback: null,
+      );
+      if (recipientName != 'Unknown') {
+        return 'From: $senderName\nTo: $recipientName\n${message.text}';
+      }
+    }
+
+    if (isChannelMessage && channelName != null && channelName.isNotEmpty) {
+      return 'Channel: $channelName\n${message.text}';
+    }
+
+    return message.text;
+  }
+
+  String _formatBytes(int bytes) {
+    if (bytes < 1024) return '$bytes B';
+    final kib = bytes / 1024;
+    if (kib < 1024) return '${kib.toStringAsFixed(kib >= 10 ? 0 : 1)} KB';
+    final mib = kib / 1024;
+    return '${mib.toStringAsFixed(mib >= 10 ? 0 : 1)} MB';
+  }
+
   /// Persist messages to storage (async, non-blocking)
   Future<void> _persistMessages() async {
     try {
-      await _storageService.saveMessages(_messages);
+      await _storageService.saveMessages(
+        _messages,
+        messageContactLocations: _messageContactLocations,
+        messageReceptionDetails: _messageReceptionDetails,
+      );
     } catch (e) {
       debugPrint('❌ [MessagesProvider] Error persisting messages: $e');
     }
@@ -678,6 +810,8 @@ class MessagesProvider with ChangeNotifier {
       }
       _messageContactMap.remove(messageId);
       _groupedMessageMapping.remove(messageId);
+      _messageContactLocations.remove(messageId);
+      _messageReceptionDetails.remove(messageId);
 
       debugPrint('🗑️ [MessagesProvider] Message $messageId deleted');
 
@@ -706,6 +840,8 @@ class MessagesProvider with ChangeNotifier {
   void clearMessages() {
     _messages.clear();
     _sarMarkers.clear();
+    _messageContactLocations.clear();
+    _messageReceptionDetails.clear();
     _persistMessages();
     notifyListeners();
   }
@@ -720,6 +856,8 @@ class MessagesProvider with ChangeNotifier {
   void clearAll() {
     _messages.clear();
     _sarMarkers.clear();
+    _messageContactLocations.clear();
+    _messageReceptionDetails.clear();
     _persistMessages();
     notifyListeners();
   }
@@ -906,11 +1044,13 @@ class MessagesProvider with ChangeNotifier {
       final (groupId, recipientPublicKey) = groupMapping;
       debugPrint('  ✅ This is part of a grouped message: $groupId');
 
-      // Update the recipient status to "sent" in the grouped message
+      // ACK-tracked recipients stay pending until the delivery confirm arrives.
       updateGroupedMessageRecipientStatus(
         groupId,
         recipientPublicKey,
-        MessageDeliveryStatus.sent,
+        expectedAckTag > 0
+            ? MessageDeliveryStatus.sending
+            : MessageDeliveryStatus.sent,
       );
 
       // Track the ACK for this specific recipient
@@ -1015,23 +1155,36 @@ class MessagesProvider with ChangeNotifier {
 
     if (index != -1) {
       final message = _messages[index];
+      final contact = _messageContactMap[messageId];
+      final effectiveTimeout = _retryManager.calculateAckTimeoutMs(
+        text: message.text,
+        contact: contact,
+        suggestedTimeoutMs: suggestedTimeoutMs > 0 ? suggestedTimeoutMs : null,
+      );
       debugPrint('  Current status: ${message.deliveryStatus}');
       debugPrint('  Message type: ${message.messageType}');
       debugPrint(
         '  Message text preview: ${message.text.substring(0, message.text.length > 30 ? 30 : message.text.length)}...',
       );
 
+      // Once the device accepts a direct message and returns an ACK tag, the
+      // send itself succeeded locally even if end-to-end delivery confirmation
+      // may still arrive later. Keep ACK tracking, but stop showing "waiting".
       final updatedMessage = message.copyWith(
         deliveryStatus: MessageDeliveryStatus.sent,
         expectedAckTag: expectedAckTag > 0 ? expectedAckTag : null,
-        suggestedTimeoutMs: suggestedTimeoutMs > 0 ? suggestedTimeoutMs : null,
+        suggestedTimeoutMs: expectedAckTag > 0 ? effectiveTimeout : null,
       );
       _messages[index] = updatedMessage;
 
       // Only track and set timeout for direct messages (channel messages have expectedAckTag=0)
-      if (expectedAckTag > 0 && suggestedTimeoutMs > 0) {
+      if (expectedAckTag > 0) {
         // Track by ACK tag for matching with delivery confirmation
         _pendingSentMessages[expectedAckTag] = updatedMessage;
+        _messageAckHistory
+            .putIfAbsent(messageId, () => <int>{})
+            .add(expectedAckTag);
+        _ackHistoryLookup[expectedAckTag] = (messageId, DateTime.now());
         debugPrint(
           '  ✅ Added to pending messages map with ACK: $expectedAckTag',
         );
@@ -1042,7 +1195,7 @@ class MessagesProvider with ChangeNotifier {
 
         // Start timeout timer using message ID as key
         _timeoutTimers[messageId] = Timer(
-          Duration(milliseconds: suggestedTimeoutMs),
+          Duration(milliseconds: effectiveTimeout),
           () {
             debugPrint(
               '⏱️ [MessagesProvider] Timeout for message $messageId (ACK $expectedAckTag)',
@@ -1054,7 +1207,7 @@ class MessagesProvider with ChangeNotifier {
         );
 
         debugPrint(
-          '⏱️ [MessagesProvider] Started ${suggestedTimeoutMs}ms timeout timer for message $messageId (ACK $expectedAckTag)',
+          '⏱️ [MessagesProvider] Started ${effectiveTimeout}ms timeout timer for message $messageId (ACK $expectedAckTag)',
         );
       } else {
         debugPrint(
@@ -1245,6 +1398,8 @@ class MessagesProvider with ChangeNotifier {
 
   /// Update message status to delivered with RTT
   void markMessageDelivered(int ackCode, int roundTripTimeMs) {
+    _cleanupCompletedAckHistory();
+    _cleanupAckHistoryLookup();
     debugPrint(
       '🔍 [MessagesProvider] markMessageDelivered called with ACK: $ackCode, RTT: ${roundTripTimeMs}ms',
     );
@@ -1296,6 +1451,7 @@ class MessagesProvider with ChangeNotifier {
         );
         _ackTagToRecipients.remove(ackCode);
         _pendingSentMessages.remove(ackCode);
+        _rememberCompletedAck(ackCode);
       }
 
       debugPrint(
@@ -1339,9 +1495,15 @@ class MessagesProvider with ChangeNotifier {
 
         // Remove from pending
         _pendingSentMessages.remove(ackCode);
+        _rememberCompletedAck(ackCode);
+        _clearAckHistoryForMessage(message.id);
 
         // Clear retry tracking on successful delivery
         _retryManager.clearRetry(message.id);
+        final deliveredContact = _messageContactMap[message.id];
+        if (deliveredContact != null) {
+          _retryManager.recordDeliverySuccess(deliveredContact);
+        }
 
         debugPrint(
           '✅ [MessagesProvider] Message ${message.id} delivered in ${roundTripTimeMs}ms (ACK $ackCode)',
@@ -1362,6 +1524,43 @@ class MessagesProvider with ChangeNotifier {
         );
       }
     } else {
+      final historicalMatch = _ackHistoryLookup[ackCode];
+      if (historicalMatch != null) {
+        final historicalMessageId = historicalMatch.$1;
+        final historicalIndex = _messages.indexWhere(
+          (m) => m.id == historicalMessageId,
+        );
+        if (historicalIndex != -1 &&
+            _messages[historicalIndex].deliveryStatus !=
+                MessageDeliveryStatus.delivered) {
+          _messages[historicalIndex] = _messages[historicalIndex].copyWith(
+            deliveryStatus: MessageDeliveryStatus.delivered,
+            roundTripTimeMs: roundTripTimeMs,
+            deliveredAt: DateTime.now(),
+          );
+          _timeoutTimers[historicalMessageId]?.cancel();
+          _timeoutTimers.remove(historicalMessageId);
+          _rememberCompletedAck(ackCode);
+          _clearAckHistoryForMessage(historicalMessageId);
+          _retryManager.clearRetry(historicalMessageId);
+          final deliveredContact = _messageContactMap[historicalMessageId];
+          if (deliveredContact != null) {
+            _retryManager.recordDeliverySuccess(deliveredContact);
+          }
+          _persistMessages();
+          notifyListeners();
+          debugPrint(
+            '✅ [MessagesProvider] Historical ACK $ackCode matched message $historicalMessageId',
+          );
+          return;
+        }
+      }
+      if (_completedAckHistory.containsKey(ackCode)) {
+        debugPrint(
+          'ℹ️ [MessagesProvider] Duplicate/late ACK $ackCode ignored (already completed)',
+        );
+        return;
+      }
       debugPrint(
         '⚠️ [MessagesProvider] No pending message found for ACK code: $ackCode',
       );
@@ -1482,18 +1681,31 @@ class MessagesProvider with ChangeNotifier {
         debugPrint(
           '⏰ [MessagesProvider] Executing retry $nextAttempt for message $messageId',
         );
+        final currentIndex = _messages.indexWhere((m) => m.id == messageId);
+        if (currentIndex == -1) {
+          return;
+        }
+        final currentMessage = _messages[currentIndex];
+        if (currentMessage.deliveryStatus == MessageDeliveryStatus.delivered) {
+          return;
+        }
+
         if (sendMessageCallback != null) {
-          await sendMessageCallback!(
+          final queued = await sendMessageCallback!(
             contactPublicKey: contact.publicKey,
             text: message.text,
             messageId: messageId,
             contact: contact,
             retryAttempt: nextAttempt,
           );
+          if (!queued) {
+            _markAsPermanentlyFailed(messageId, currentMessage);
+          }
         } else {
           debugPrint(
             '⚠️ [MessagesProvider] sendMessageCallback not set, cannot retry',
           );
+          _markAsPermanentlyFailed(messageId, currentMessage);
         }
       });
 
@@ -1529,17 +1741,21 @@ class MessagesProvider with ChangeNotifier {
 
       // Send with flood mode (no retry after this)
       if (sendMessageCallback != null) {
-        await sendMessageCallback!(
+        final queued = await sendMessageCallback!(
           contactPublicKey: contact.publicKey,
           text: message.text,
           messageId: messageId,
           contact: contact,
           retryAttempt: 0, // Reset attempt for flood
         );
+        if (!queued) {
+          _markAsPermanentlyFailed(messageId, _messages[index]);
+        }
       } else {
         debugPrint(
           '⚠️ [MessagesProvider] sendMessageCallback not set, cannot send flood',
         );
+        _markAsPermanentlyFailed(messageId, _messages[index]);
       }
 
       _persistMessages();
@@ -1562,10 +1778,27 @@ class MessagesProvider with ChangeNotifier {
       if (message.expectedAckTag != null) {
         _pendingSentMessages.remove(message.expectedAckTag);
       }
+      _clearAckHistoryForMessage(messageId);
 
       // Clear retry tracking
       _retryManager.clearRetry(messageId);
 
+      final failedContact = _messageContactMap[messageId];
+      if (failedContact != null && failedContact.hasPath) {
+        final failureStreak = _retryManager.recordPathFailure(failedContact);
+        debugPrint(
+          '   Path failure streak for ${failedContact.advName}: $failureStreak',
+        );
+        if (failureStreak >= 2 && onDirectPathFailedCallback != null) {
+          unawaited(
+            onDirectPathFailedCallback!(
+              contact: failedContact,
+              failureStreak: failureStreak,
+            ),
+          );
+        }
+      }
+
       _persistMessages();
       notifyListeners();
     }
@@ -1608,17 +1841,21 @@ class MessagesProvider with ChangeNotifier {
 
     // Send again
     if (sendMessageCallback != null) {
-      await sendMessageCallback!(
+      final queued = await sendMessageCallback!(
         contactPublicKey: contact.publicKey,
         text: message.text,
         messageId: messageId,
         contact: contact,
         retryAttempt: 0,
       );
+      if (!queued) {
+        _markAsPermanentlyFailed(messageId, _messages[index]);
+      }
     } else {
       debugPrint(
         '⚠️ [MessagesProvider] sendMessageCallback not set, cannot resend',
       );
+      _markAsPermanentlyFailed(messageId, _messages[index]);
     }
 
     _persistMessages();
@@ -1631,10 +1868,62 @@ class MessagesProvider with ChangeNotifier {
       timer.cancel();
     }
     _timeoutTimers.clear();
+    _completedAckHistory.clear();
+    _messageAckHistory.clear();
+    _ackHistoryLookup.clear();
 
     // Clear retry manager
     _retryManager.clearAll();
 
     super.dispose();
   }
+
+  void _rememberCompletedAck(int ackCode) {
+    _completedAckHistory[ackCode] = DateTime.now();
+    _cleanupCompletedAckHistory();
+  }
+
+  void _cleanupCompletedAckHistory({
+    Duration maxAge = const Duration(minutes: 15),
+  }) {
+    final cutoff = DateTime.now().subtract(maxAge);
+    final staleAcks = _completedAckHistory.entries
+        .where((entry) => entry.value.isBefore(cutoff))
+        .map((entry) => entry.key)
+        .toList();
+    for (final ack in staleAcks) {
+      _completedAckHistory.remove(ack);
+    }
+  }
+
+  void _clearAckHistoryForMessage(String messageId) {
+    final ackTags = _messageAckHistory.remove(messageId);
+    if (ackTags == null) {
+      return;
+    }
+    for (final ack in ackTags) {
+      _ackHistoryLookup.remove(ack);
+    }
+  }
+
+  void _cleanupAckHistoryLookup({
+    Duration maxAge = const Duration(minutes: 15),
+  }) {
+    final cutoff = DateTime.now().subtract(maxAge);
+    final staleAcks = _ackHistoryLookup.entries
+        .where((entry) => entry.value.$2.isBefore(cutoff))
+        .map((entry) => entry.key)
+        .toList();
+    for (final ack in staleAcks) {
+      final messageId = _ackHistoryLookup.remove(ack)?.$1;
+      if (messageId == null) {
+        continue;
+      }
+      final history = _messageAckHistory[messageId];
+      history?.remove(ack);
+      if (history != null && history.isEmpty) {
+        _messageAckHistory.remove(messageId);
+      }
+    }
+  }
 }

lib/providers/voice_provider.dart

@@ -71,12 +71,6 @@ class VoiceProvider with ChangeNotifier {
     required Uint8List payload,
   })?
   sendRawPacketCallback;
-  Future<bool> Function({
-    required String sessionId,
-    required int index,
-    Duration timeout,
-  })?
-  waitForFragmentAckCallback;
 
   final Map<String, _OutgoingVoiceSession> _outgoingSessions = {};
 
@@ -217,7 +211,6 @@ class VoiceProvider with ChangeNotifier {
       indexOf: (packet) => packet.index,
       encodeBinary: (packet) => packet.encodeBinary(),
       sendRawPacket: sendRawPacketCallback,
-      waitForFragmentAck: waitForFragmentAckCallback,
       requestedIndices: requestedIndices,
     );
   }

lib/screens/device_config_screen.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:provider/provider.dart';
 import 'package:geolocator/geolocator.dart';
+import 'package:provider/provider.dart';
 import '../providers/connection_provider.dart';
 import '../services/validation_service.dart';
 import '../l10n/app_localizations.dart';
@@ -722,7 +722,8 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                     SwitchListTile(
                       contentPadding: EdgeInsets.zero,
                       title: const Text('Client Repeat Mode'),
-                      subtitle: deviceInfo.allowedRepeatFreqRanges != null &&
+                      subtitle:
+                          deviceInfo.allowedRepeatFreqRanges != null &&
                               deviceInfo.allowedRepeatFreqRanges!.isNotEmpty
                           ? Text(
                               'Allowed: ${deviceInfo.allowedRepeatFreqRanges!.map((r) => r.lower == r.upper ? '${(r.lower / 1000).toStringAsFixed(3)} MHz' : '${(r.lower / 1000).toStringAsFixed(3)}–${(r.upper / 1000).toStringAsFixed(3)} MHz').join(', ')}',

lib/screens/home_screen.dart

@@ -17,6 +17,7 @@ import 'map_management_screen.dart';
 import 'settings_screen.dart';
 import 'device_config_screen.dart';
 import 'packet_log_screen.dart';
+import 'spectrum_scan_screen.dart';
 import '../utils/toast_logger.dart';
 import '../l10n/app_localizations.dart';
 import '../widgets/permission_request_dialog.dart';
@@ -45,9 +46,9 @@ class HomeScreen extends StatefulWidget {
   State<HomeScreen> createState() => _HomeScreenState();
 }
 
-class _HomeScreenState extends State<HomeScreen>
+class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
-    with SingleTickerProviderStateMixin {
   late TabController _tabController;
+  late final AppProvider _appProvider;
   int _currentIndex = 0;
   bool _isMapFullscreen = false;
   bool _showRxTxIndicators = true;
@@ -73,9 +74,13 @@ class _HomeScreenState extends State<HomeScreen>
   @override
   void initState() {
     super.initState();
+    _appProvider = context.read<AppProvider>();
+    _isMapEnabled = _appProvider.isMapEnabled;
+    _isContactsEnabled = _appProvider.isContactsEnabled;
+    _appProvider.addListener(_handleAppProviderChanged);
+
     // Initialize synchronously so first build always has a valid controller.
     _initTabController();
-    _loadTabVisibilityAndInitTabs();
     _loadRxTxPreference();
 
     // Show permission dialog after the first frame if needed
@@ -86,31 +91,39 @@ class _HomeScreenState extends State<HomeScreen>
     }
   }
 
-  Future<void> _loadTabVisibilityAndInitTabs() async {
-    final prefs = await SharedPreferences.getInstance();
-    final mapEnabled = prefs.getBool('map_enabled') ?? true;
-    final contactsEnabled = prefs.getBool('contacts_enabled') ?? true;
-    if (!mounted) return;
-    if (_isMapEnabled != mapEnabled || _isContactsEnabled != contactsEnabled) {
-      _updateTabController(
-        mapEnabled: mapEnabled,
-        contactsEnabled: contactsEnabled,
-      );
-    }
-  }
-
   void _initTabController() {
     _tabController = TabController(length: _enabledTabs.length, vsync: this);
     _tabController.addListener(_onTabChanged);
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      _handleTabActivated(_currentTab);
+    });
+  }
+
+  void _handleAppProviderChanged() {
+    if (!mounted) return;
+    _updateTabController(
+      mapEnabled: _appProvider.isMapEnabled,
+      contactsEnabled: _appProvider.isContactsEnabled,
+    );
   }
 
   void _onTabChanged() {
+    final previousTab = _currentTab;
+    final nextIndex = _tabController.index;
+
     setState(() {
-      _currentIndex = _tabController.index;
+      _currentIndex = nextIndex;
       if (_currentTab != _HomeTab.map) {
         _isMapFullscreen = false;
       }
     });
+
+    final nextTab = _currentTab;
+    if (previousTab != nextTab) {
+      _handleTabActivated(nextTab);
+    }
   }
 
   void _updateTabController({
@@ -122,15 +135,21 @@ class _HomeScreenState extends State<HomeScreen>
     }
 
     final oldTabs = _enabledTabs;
-    final oldIndex = _tabController.index;
+    final oldIndex = oldTabs.isEmpty
+        ? 0
+        : _tabController.index.clamp(0, oldTabs.length - 1);
     final oldTab = oldTabs[oldIndex];
 
     final oldController = _tabController;
     oldController.removeListener(_onTabChanged);
+    oldController.dispose();
 
     // Update state
     _isMapEnabled = mapEnabled;
     _isContactsEnabled = contactsEnabled;
+    if (!_isMapEnabled) {
+      _isMapFullscreen = false;
+    }
 
     final newTabs = _enabledTabs;
     final newIndex = newTabs.indexOf(oldTab);
@@ -143,11 +162,7 @@ class _HomeScreenState extends State<HomeScreen>
     _tabController.index = _currentIndex;
 
     setState(() {});
-
+    _handleTabActivated(_currentTab);
-    // Dispose old controller after widgets have rebound to the new controller.
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      oldController.dispose();
-    });
   }
 
   void _navigateToTab(_HomeTab tab) {
@@ -157,6 +172,23 @@ class _HomeScreenState extends State<HomeScreen>
     }
   }
 
+  void _handleTabActivated(_HomeTab tab) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+
+      switch (tab) {
+        case _HomeTab.messages:
+          context.read<MessagesProvider>().markAllAsRead();
+          break;
+        case _HomeTab.contacts:
+          context.read<ContactsProvider>().markAllAsViewed();
+          break;
+        case _HomeTab.map:
+          break;
+      }
+    });
+  }
+
   Future<void> _loadRxTxPreference() async {
     final prefs = await SharedPreferences.getInstance();
     if (mounted) {
@@ -168,6 +200,7 @@ class _HomeScreenState extends State<HomeScreen>
 
   @override
   void dispose() {
+    _appProvider.removeListener(_handleAppProviderChanged);
     _tabController.removeListener(_onTabChanged);
     _tabController.dispose();
     super.dispose();
@@ -312,18 +345,7 @@ class _HomeScreenState extends State<HomeScreen>
       messagesProvider.setLocalizations(localizations);
     }
 
-    // Check if tab visibility settings changed and update tab controller
+    context.watch<AppProvider>();
-    final appProvider = context.watch<AppProvider>();
-    if (_isMapEnabled != appProvider.isMapEnabled ||
-        _isContactsEnabled != appProvider.isContactsEnabled) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (!mounted) return;
-        _updateTabController(
-          mapEnabled: appProvider.isMapEnabled,
-          contactsEnabled: appProvider.isContactsEnabled,
-        );
-      });
-    }
 
     final enabledTabs = _enabledTabs;
     final isMapTabActive = _currentTab == _HomeTab.map;
@@ -381,6 +403,26 @@ class _HomeScreenState extends State<HomeScreen>
                         });
                       },
                     ),
+                    PopupMenuItem(
+                      child: Row(
+                        children: [
+                          const Icon(Icons.radar),
+                          const SizedBox(width: 8),
+                          const Text('Spectrum Scan'),
+                        ],
+                      ),
+                      onTap: () {
+                        final navigator = Navigator.of(context);
+                        Future.delayed(Duration.zero, () {
+                          if (!mounted) return;
+                          navigator.push(
+                            MaterialPageRoute(
+                              builder: (context) => const SpectrumScanScreen(),
+                            ),
+                          );
+                        });
+                      },
+                    ),
                     PopupMenuItem(
                       child: Row(
                         children: [

lib/screens/messages_tab.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io' show Platform;
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'dart:math' as math;
@@ -18,7 +19,9 @@ import '../models/message.dart';
 import '../models/contact.dart';
 import '../widgets/messages/sar_update_sheet.dart';
 import '../widgets/messages/recipient_selector_sheet.dart';
-import '../widgets/messages/message_bubble.dart';
+import '../widgets/messages/messages_composer.dart';
+import '../widgets/messages/messages_content.dart';
+import '../widgets/common/contact_avatar.dart';
 import '../services/message_destination_preferences.dart';
 import '../services/voice_bitrate_preferences.dart';
 import '../services/voice_recorder_service.dart';
@@ -44,11 +47,14 @@ class MessagesTab extends StatefulWidget {
 }
 
 class _MessagesTabState extends State<MessagesTab> {
+  static const int _maxContactMessageBytes = 156;
+  static const int _maxChannelMessageBytes = 127;
+  static const double _composerOverlayHeight = 148;
+
   final TextEditingController _textController = TextEditingController();
   final FocusNode _focusNode = FocusNode();
   final ScrollController _scrollController = ScrollController();
-  int _characterCount = 0;
+  int _messageByteCount = 0;
-  static const int _maxCharacters = 160;
   String? _highlightedMessageId;
   Timer? _highlightTimer; // Timer for clearing message highlight
 
@@ -166,10 +172,44 @@ class _MessagesTabState extends State<MessagesTab> {
 
   void _updateCharacterCount() {
     setState(() {
-      _characterCount = _textController.text.length;
+      _messageByteCount = utf8.encode(_textController.text).length;
     });
   }
 
+  int get _maxMessageBytes =>
+      _destinationType == MessageDestinationPreferences.destinationTypeChannel
+      ? _maxChannelMessageBytes
+      : _maxContactMessageBytes;
+
+  TextInputFormatter get _messageByteLimiter =>
+      TextInputFormatter.withFunction((oldValue, newValue) {
+        if (utf8.encode(newValue.text).length <= _maxMessageBytes) {
+          return newValue;
+        }
+        return oldValue;
+      });
+
+  void _enforceMessageByteLimit() {
+    final currentText = _textController.text;
+    if (utf8.encode(currentText).length <= _maxMessageBytes) {
+      _updateCharacterCount();
+      return;
+    }
+
+    var truncated = currentText;
+    while (truncated.isNotEmpty &&
+        utf8.encode(truncated).length > _maxMessageBytes) {
+      truncated = truncated.substring(0, truncated.length - 1);
+    }
+
+    _textController.value = _textController.value.copyWith(
+      text: truncated,
+      selection: TextSelection.collapsed(offset: truncated.length),
+      composing: TextRange.empty,
+    );
+    _updateCharacterCount();
+  }
+
   /// Load saved message destination from preferences
   Future<void> _loadSavedDestination() async {
     final savedDestination =
@@ -211,6 +251,8 @@ class _MessagesTabState extends State<MessagesTab> {
         await MessageDestinationPreferences.clearDestination();
       }
     }
+
+    _enforceMessageByteLimit();
   }
 
   /// Show recipient selector bottom sheet
@@ -250,6 +292,8 @@ class _MessagesTabState extends State<MessagesTab> {
       _selectedRecipient = recipient;
     });
 
+    _enforceMessageByteLimit();
+
     // Save to preferences
     await MessageDestinationPreferences.setDestination(
       type,
@@ -273,73 +317,16 @@ class _MessagesTabState extends State<MessagesTab> {
     }
   }
 
-  /// Get tooltip for destination button
+  String _getDestinationLabel() {
-  String _getDestinationTooltip() {
     if (_destinationType ==
             MessageDestinationPreferences.destinationTypeChannel &&
         _selectedRecipient != null) {
-      final channelName = _selectedRecipient!.getLocalizedDisplayName(context);
+      return _selectedRecipient!.getLocalizedDisplayName(context);
-      return '$channelName (tap to change)';
-    } else if (_selectedRecipient != null) {
-      final recipientName = _selectedRecipient!.displayName;
-      return '$recipientName (tap to change)';
     }
-    return 'Select recipient';
+    if (_selectedRecipient != null) {
-  }
+      return _selectedRecipient!.displayName;
-
-  String _getCurrentScopeLabel() {
-    if (_destinationType ==
-        MessageDestinationPreferences.destinationTypeChannel) {
-      final channelName =
-          _selectedRecipient?.getLocalizedDisplayName(context) ??
-          AppLocalizations.of(context)!.publicChannel;
-      return 'Channel > $channelName';
     }
-
+    return 'Public Channel';
-    if (_destinationType == MessageDestinationPreferences.destinationTypeRoom) {
-      final roomName =
-          _selectedRecipient?.displayName ??
-          AppLocalizations.of(context)!.messages;
-      return 'Room > $roomName';
-    }
-
-    final contactName =
-        _selectedRecipient?.displayName ??
-        AppLocalizations.of(context)!.messages;
-    return 'Direct > $contactName';
-  }
-
-  Widget _buildScopeIndicator() {
-    final theme = Theme.of(context);
-
-    return SizedBox(
-      width: double.infinity,
-      child: Align(
-        alignment: Alignment.centerLeft,
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Icon(
-              Icons.visibility_outlined,
-              size: 14,
-              color: theme.colorScheme.onSurfaceVariant,
-            ),
-            const SizedBox(width: 6),
-            Flexible(
-              child: Text(
-                'View: ${_getCurrentScopeLabel()}',
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-                textAlign: TextAlign.left,
-                style: theme.textTheme.labelSmall?.copyWith(
-                  color: theme.colorScheme.onSurfaceVariant,
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
   }
 
   Future<void> _sendMessage() async {
@@ -426,7 +413,7 @@ class _MessagesTabState extends State<MessagesTab> {
     );
 
     // Add to messages list with "sending" status
-    messagesProvider.addSentMessage(sentMessage);
+    messagesProvider.addSentMessage(sentMessage, contact: _selectedRecipient);
 
     // Send to selected channel
     await connectionProvider.sendChannelMessage(
@@ -468,7 +455,7 @@ class _MessagesTabState extends State<MessagesTab> {
     );
 
     // Add to messages list with "sending" status
-    messagesProvider.addSentMessage(sentMessage);
+    messagesProvider.addSentMessage(sentMessage, contact: _selectedRecipient);
 
     // Send message to selected recipient
     final sentSuccessfully = await connectionProvider.sendTextMessage(
@@ -659,7 +646,7 @@ class _MessagesTabState extends State<MessagesTab> {
         deliveryStatus: MessageDeliveryStatus.sending,
         recipientPublicKey: isChannel ? null : recipient?.publicKey,
       );
-      messagesProvider.addSentMessage(placeholder);
+      messagesProvider.addSentMessage(placeholder, contact: recipient);
 
       // Send IE1 envelope via normal message path.
       final envelopeText = envelope.encode();
@@ -964,7 +951,7 @@ class _MessagesTabState extends State<MessagesTab> {
       channelIdx: channelIdx,
       recipientPublicKey: isChannel ? null : recipient?.publicKey,
     );
-    messagesProvider.addSentMessage(sentMsg);
+    messagesProvider.addSentMessage(sentMsg, contact: recipient);
 
     try {
       if (isChannel) {
@@ -1114,6 +1101,16 @@ class _MessagesTabState extends State<MessagesTab> {
     );
   }
 
+  Future<void> _runAfterSheetDismissal(
+    BuildContext sheetContext,
+    Future<void> Function() action,
+  ) async {
+    Navigator.pop(sheetContext);
+    await Future<void>.delayed(const Duration(milliseconds: 180));
+    if (!mounted) return;
+    await action();
+  }
+
   void _showComposerActions() {
     showModalBottomSheet(
       context: context,
@@ -1125,9 +1122,10 @@ class _MessagesTabState extends State<MessagesTab> {
               ListTile(
                 leading: const Icon(Icons.add_location_alt),
                 title: Text(AppLocalizations.of(context)!.sendSarMarker),
-                onTap: () {
+                onTap: () async {
-                  Navigator.pop(sheetContext);
+                  await _runAfterSheetDismissal(sheetContext, () async {
-                  _showSarDialog();
+                    _showSarDialog();
+                  });
                 },
               ),
               if (_voiceSupported)
@@ -1137,13 +1135,14 @@ class _MessagesTabState extends State<MessagesTab> {
                   title: Text(_isRecording ? 'Stop recording' : 'Record voice'),
                   onTap: _isSendingVoice
                       ? null
-                      : () {
+                      : () async {
-                          Navigator.pop(sheetContext);
+                          await _runAfterSheetDismissal(sheetContext, () async {
-                          if (_isRecording) {
+                            if (_isRecording) {
-                            _stopAndSendVoice();
+                              await _stopAndSendVoice();
-                          } else {
+                            } else {
-                            _startVoiceRecording();
+                              await _startVoiceRecording();
-                          }
+                            }
+                          });
                         },
                 ),
               ListTile(
@@ -1152,9 +1151,10 @@ class _MessagesTabState extends State<MessagesTab> {
                 title: const Text('Send image from gallery'),
                 onTap: _isSendingImage
                     ? null
-                    : () {
+                    : () async {
-                        Navigator.pop(sheetContext);
+                        await _runAfterSheetDismissal(sheetContext, () async {
-                        _pickAndSendImage(source: ImageSource.gallery);
+                          await _pickAndSendImage(source: ImageSource.gallery);
+                        });
                       },
               ),
               ListTile(
@@ -1163,18 +1163,20 @@ class _MessagesTabState extends State<MessagesTab> {
                 title: const Text('Take photo'),
                 onTap: _isSendingImage
                     ? null
-                    : () {
+                    : () async {
-                        Navigator.pop(sheetContext);
+                        await _runAfterSheetDismissal(sheetContext, () async {
-                        _pickAndSendImage(source: ImageSource.camera);
+                          await _pickAndSendImage(source: ImageSource.camera);
+                        });
                       },
               ),
               ListTile(
                 leading: const Icon(Icons.grid_3x3),
                 title: const Text('Start Tic-Tac-Toe'),
                 subtitle: const Text('DM only'),
-                onTap: () {
+                onTap: () async {
-                  Navigator.pop(sheetContext);
+                  await _runAfterSheetDismissal(sheetContext, () async {
-                  _startTicTacToeGame();
+                    await _startTicTacToeGame();
+                  });
                 },
               ),
             ],
@@ -1184,6 +1186,23 @@ class _MessagesTabState extends State<MessagesTab> {
     );
   }
 
+  Widget _buildDestinationAvatar(BuildContext context) {
+    final recipient = _selectedRecipient;
+    if (recipient != null) {
+      return ContactAvatar(
+        contact: recipient,
+        radius: 14,
+        displayName: _getDestinationLabel(),
+      );
+    }
+
+    return Icon(
+      _getDestinationIcon(),
+      size: 17,
+      color: Theme.of(context).colorScheme.onSurfaceVariant,
+    );
+  }
+
   Future<void> _sendSarMessage(
     String emoji,
     String name,
@@ -1370,9 +1389,6 @@ class _MessagesTabState extends State<MessagesTab> {
           // SAR marker data is automatically added by SarMessageParser.enhanceMessage in MessagesProvider
         );
 
-        // Add to messages list with "sending" status
-        messagesProvider.addSentMessage(sentMessage);
-
         // Look up the room contact for path logging
         final contactsProvider = context.read<ContactsProvider>();
         final roomContact = contactsProvider.contacts.where((c) {
@@ -1380,6 +1396,9 @@ class _MessagesTabState extends State<MessagesTab> {
               c.publicKey.matches(roomPublicKey);
         }).firstOrNull;
 
+        // Add to messages list with "sending" status
+        messagesProvider.addSentMessage(sentMessage, contact: roomContact);
+
         // Send SAR message to selected room (persisted and immutable)
         final sentSuccessfully = await connectionProvider.sendTextMessage(
           contactPublicKey: roomPublicKey!,
@@ -1495,300 +1514,78 @@ class _MessagesTabState extends State<MessagesTab> {
     return filteredMessages;
   }
 
+  void _handleMessageTap(Message message) {
+    if (widget.onNavigateToMap == null) return;
+
+    if (message.isSarMarker && message.sarGpsCoordinates != null) {
+      final mapProvider = context.read<MapProvider>();
+      mapProvider.navigateToLocation(
+        location: message.sarGpsCoordinates!,
+        zoom: 15.0,
+      );
+      widget.onNavigateToMap?.call();
+      return;
+    }
+
+    if (message.isDrawing && message.drawingId != null) {
+      debugPrint('🗺️ [MessagesTab] Drawing tapped! ID: ${message.drawingId}');
+      final mapProvider = context.read<MapProvider>();
+      final drawingProvider = context.read<DrawingProvider>();
+      mapProvider.navigateToDrawing(message.drawingId!, drawingProvider);
+      widget.onNavigateToMap?.call();
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Consumer<MessagesProvider>(
       builder: (context, messagesProvider, child) {
         final messages = _getFilteredMessages(messagesProvider);
+        final bottomInset = MediaQuery.of(context).viewPadding.bottom;
+        final composerBottomPadding = bottomInset > 0 ? 2.0 : 10.0;
 
-        return Column(
+        return GestureDetector(
-          children: [
+          behavior: HitTestBehavior.translucent,
-            // Messages list with pull-to-refresh
+          onTap: () => FocusScope.of(context).unfocus(),
-            Expanded(
+          child: Stack(
-              child: RefreshIndicator(
+            children: [
-                onRefresh: _handleRefresh,
+              Positioned.fill(
-                child: messages.isEmpty
+                child: MessagesContent(
-                    ? LayoutBuilder(
+                  messages: messages,
-                        builder: (context, constraints) =>
+                  scrollController: _scrollController,
-                            SingleChildScrollView(
+                  highlightedMessageId: _highlightedMessageId,
-                              physics: const AlwaysScrollableScrollPhysics(),
+                  bottomContentPadding:
-                              child: ConstrainedBox(
+                      _composerOverlayHeight + composerBottomPadding,
-                                constraints: BoxConstraints(
+                  onRefresh: _handleRefresh,
-                                  minHeight: constraints.maxHeight,
+                  onNavigateToMap: widget.onNavigateToMap,
-                                ),
+                  onMessageTap: _handleMessageTap,
-                                child: Center(
-                                  child: Column(
-                                    mainAxisAlignment: MainAxisAlignment.center,
-                                    children: [
-                                      Icon(
-                                        Icons.message_outlined,
-                                        size: 64,
-                                        color: Theme.of(context).disabledColor,
-                                      ),
-                                      const SizedBox(height: 16),
-                                      Text(
-                                        AppLocalizations.of(
-                                          context,
-                                        )!.noMessagesYet,
-                                        style: Theme.of(
-                                          context,
-                                        ).textTheme.titleLarge,
-                                      ),
-                                      const SizedBox(height: 8),
-                                      Text(
-                                        AppLocalizations.of(
-                                          context,
-                                        )!.pullDownToSync,
-                                        style: Theme.of(
-                                          context,
-                                        ).textTheme.bodyMedium,
-                                        textAlign: TextAlign.center,
-                                      ),
-                                    ],
-                                  ),
-                                ),
-                              ),
-                            ),
-                      )
-                    : ListView.builder(
-                        controller: _scrollController,
-                        reverse: true,
-                        padding: const EdgeInsets.all(8),
-                        itemCount: messages.length,
-                        itemBuilder: (context, index) {
-                          final message = messages[index];
-                          final isHighlighted =
-                              message.id == _highlightedMessageId;
-
-                          return MessageBubble(
-                            key: ValueKey(message.id),
-                            message: message,
-                            isHighlighted: isHighlighted,
-                            onNavigateToMap: widget.onNavigateToMap,
-                            onTap:
-                                widget.onNavigateToMap != null &&
-                                    message.isSarMarker &&
-                                    message.sarGpsCoordinates != null
-                                ? () {
-                                    final mapProvider = context
-                                        .read<MapProvider>();
-                                    mapProvider.navigateToLocation(
-                                      location: message.sarGpsCoordinates!,
-                                      zoom: 15.0,
-                                    );
-                                    widget.onNavigateToMap?.call();
-                                  }
-                                : widget.onNavigateToMap != null &&
-                                      message.isDrawing &&
-                                      message.drawingId != null
-                                ? () {
-                                    debugPrint(
-                                      '🗺️ [MessagesTab] Drawing tapped! ID: ${message.drawingId}',
-                                    );
-                                    final mapProvider = context
-                                        .read<MapProvider>();
-                                    final drawingProvider = context
-                                        .read<DrawingProvider>();
-                                    mapProvider.navigateToDrawing(
-                                      message.drawingId!,
-                                      drawingProvider,
-                                    );
-                                    widget.onNavigateToMap?.call();
-                                  }
-                                : null,
-                          );
-                        },
-                      ),
-              ),
-            ),
-
-            // Message input area
-            Container(
-              decoration: BoxDecoration(
-                color: Theme.of(context).colorScheme.surface,
-                border: Border(
-                  top: BorderSide(
-                    color: Theme.of(context).dividerColor,
-                    width: 1,
-                  ),
                 ),
               ),
-              child: Column(
+              Positioned(
-                mainAxisSize: MainAxisSize.min,
+                left: 0,
-                children: [
+                right: 0,
-                  Padding(
+                bottom: 0,
-                    padding: const EdgeInsets.symmetric(
+                child: MessagesComposer(
-                      horizontal: 8,
+                  textController: _textController,
-                      vertical: 8,
+                  focusNode: _focusNode,
-                    ),
+                  messageByteLimiter: _messageByteLimiter,
-                    child: Row(
+                  messageByteCount: _messageByteCount,
-                      crossAxisAlignment: CrossAxisAlignment.end,
+                  maxMessageBytes: _maxMessageBytes,
-                      children: [
+                  isRecording: _isRecording,
-                        // Quick actions (+) button
+                  isSendingVoice: _isSendingVoice,
-                        IconButton(
+                  voiceSupported: _voiceSupported,
-                          icon: Icon(_isRecording ? Icons.stop : Icons.add),
+                  bottomPadding: composerBottomPadding,
-                          tooltip: _isRecording
+                  destinationLabel: _getDestinationLabel(),
-                              ? 'Stop recording'
+                  destinationAvatar: _buildDestinationAvatar(context),
-                              : 'More actions',
+                  onShowComposerActions: _showComposerActions,
-                          onPressed: _isRecording
+                  onShowRecipientSelector: _showRecipientSelector,
-                              ? _stopAndSendVoice
+                  onStartVoiceRecording: _startVoiceRecording,
-                              : _showComposerActions,
+                  onStopAndSendVoice: _stopAndSendVoice,
-                          style: IconButton.styleFrom(
+                  onSendMessage: _sendMessage,
-                            backgroundColor: Theme.of(
+                ),
-                              context,
-                            ).colorScheme.primaryContainer,
-                            foregroundColor: _isRecording
-                                ? Colors.red
-                                : Theme.of(
-                                    context,
-                                  ).colorScheme.onPrimaryContainer,
-                          ),
-                        ),
-                        const SizedBox(width: 4),
-                        // Destination switcher button
-                        IconButton(
-                          icon: Icon(_getDestinationIcon()),
-                          tooltip: _getDestinationTooltip(),
-                          onPressed: _showRecipientSelector,
-                          style: IconButton.styleFrom(
-                            backgroundColor:
-                                _destinationType ==
-                                    MessageDestinationPreferences
-                                        .destinationTypeChannel
-                                ? Theme.of(
-                                    context,
-                                  ).colorScheme.surfaceContainerHighest
-                                : Theme.of(
-                                    context,
-                                  ).colorScheme.secondaryContainer,
-                            foregroundColor:
-                                _destinationType ==
-                                    MessageDestinationPreferences
-                                        .destinationTypeChannel
-                                ? Theme.of(context).colorScheme.onSurface
-                                : Theme.of(
-                                    context,
-                                  ).colorScheme.onSecondaryContainer,
-                          ),
-                        ),
-                        const SizedBox(width: 4),
-                        // Scope label + text field share the same alignment
-                        Expanded(
-                          child: Column(
-                            mainAxisSize: MainAxisSize.min,
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Padding(
-                                padding: const EdgeInsets.only(
-                                  left: 4,
-                                  right: 4,
-                                  bottom: 6,
-                                ),
-                                child: _buildScopeIndicator(),
-                              ),
-                              TextField(
-                                controller: _textController,
-                                focusNode: _focusNode,
-                                maxLength: _maxCharacters,
-                                maxLines: null,
-                                maxLengthEnforcement:
-                                    MaxLengthEnforcement.enforced,
-                                style: const TextStyle(fontSize: 14),
-                                decoration: InputDecoration(
-                                  hintText: AppLocalizations.of(
-                                    context,
-                                  )!.typeYourMessage,
-                                  hintStyle: const TextStyle(fontSize: 14),
-                                  border: OutlineInputBorder(
-                                    borderRadius: BorderRadius.circular(24),
-                                  ),
-                                  contentPadding: const EdgeInsets.symmetric(
-                                    horizontal: 16,
-                                    vertical: 10,
-                                  ),
-                                  isDense: true,
-                                  counterText: _characterCount >= 150
-                                      ? '$_characterCount/$_maxCharacters'
-                                      : '',
-                                  counterStyle: TextStyle(
-                                    fontSize: 10,
-                                    color:
-                                        _characterCount > _maxCharacters * 0.9
-                                        ? Colors.orange
-                                        : Theme.of(
-                                            context,
-                                          ).textTheme.bodySmall?.color,
-                                  ),
-                                  suffixIcon: GestureDetector(
-                                    onLongPressStart:
-                                        (_voiceSupported && !_isSendingVoice)
-                                        ? (_) => _startVoiceRecording()
-                                        : null,
-                                    onLongPressEnd:
-                                        (_voiceSupported && _isRecording)
-                                        ? (_) => _stopAndSendVoice()
-                                        : null,
-                                    onLongPressCancel:
-                                        (_voiceSupported && _isRecording)
-                                        ? () => _stopAndSendVoice()
-                                        : null,
-                                    child: IconButton(
-                                      icon: _isSendingVoice
-                                          ? const SizedBox(
-                                              width: 18,
-                                              height: 18,
-                                              child: CircularProgressIndicator(
-                                                strokeWidth: 2,
-                                              ),
-                                            )
-                                          : Icon(
-                                              _isRecording
-                                                  ? Icons.mic
-                                                  : Icons.send_rounded,
-                                              size: 22,
-                                              color: _isRecording
-                                                  ? Colors.red
-                                                  : (_textController.text
-                                                            .trim()
-                                                            .isEmpty
-                                                        ? Theme.of(
-                                                            context,
-                                                          ).disabledColor
-                                                        : Theme.of(context)
-                                                              .colorScheme
-                                                              .primary),
-                                            ),
-                                      onPressed:
-                                          _isRecording ||
-                                              _isSendingVoice ||
-                                              _textController.text
-                                                  .trim()
-                                                  .isEmpty
-                                          ? null
-                                          : _sendMessage,
-                                      tooltip: _isRecording
-                                          ? 'Recording... release to send voice'
-                                          : (_isSendingVoice
-                                                ? 'Sending voice...'
-                                                : _voiceSupported
-                                                ? 'Send (long press to record voice)'
-                                                : 'Send'),
-                                    ),
-                                  ),
-                                ),
-                                textInputAction: TextInputAction.send,
-                                onSubmitted: (_) => _sendMessage(),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
               ),
-            ),
+            ],
-          ],
+          ),
         );
       },
     );

lib/screens/packet_log_screen.dart

@@ -1,10 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
 import 'package:share_plus/share_plus.dart';
 import 'dart:io';
 import 'package:path_provider/path_provider.dart';
 import 'package:meshcore_client/meshcore_client.dart';
 import '../l10n/app_localizations.dart';
+import '../providers/connection_provider.dart';
+import '../providers/contacts_provider.dart';
+import '../utils/log_rx_route_decoder.dart';
 
 class PacketLogScreen extends StatefulWidget {
   final MeshCoreBleService bleService;
@@ -456,6 +460,26 @@ class _PacketLogCard extends StatelessWidget {
     final isRx = log.direction == PacketDirection.rx;
     final directionColor = isRx ? Colors.green : Colors.blue;
     final rxInfo = log.logRxDataInfo;
+    final contacts = context.watch<ContactsProvider>().contacts;
+    final connectionProvider = context.watch<ConnectionProvider>();
+    final decodedRoute = LogRxRouteDecoder.decode(log.rawData);
+    final ownPublicKey = connectionProvider.deviceInfo.publicKey;
+    final ownName =
+        connectionProvider.deviceInfo.selfName ??
+        connectionProvider.deviceInfo.displayName;
+    final resolvedPath = decodedRoute?.pathHashes
+        .map(
+          (hash) => LogRxRouteDecoder.resolveHash(
+            hash,
+            contacts: contacts,
+            ownPublicKey: ownPublicKey,
+            ownName: ownName,
+          ),
+        )
+        .toList();
+    final originalSender = resolvedPath != null && resolvedPath.isNotEmpty
+        ? resolvedPath.first
+        : null;
 
     return Card(
       margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
@@ -580,6 +604,14 @@ class _PacketLogCard extends StatelessWidget {
                     ),
                   ),
                 ],
+                if (isRx && decodedRoute != null) ...[
+                  const SizedBox(height: 12),
+                  _RouteSection(
+                    route: decodedRoute,
+                    path: resolvedPath ?? const [],
+                    originalSender: originalSender,
+                  ),
+                ],
                 const SizedBox(height: 12),
                 Container(
                   padding: const EdgeInsets.all(12),
@@ -723,6 +755,162 @@ class _PacketLogCard extends StatelessWidget {
   }
 }
 
+class _RouteSection extends StatelessWidget {
+  final DecodedLogRxRoute route;
+  final List<ResolvedNodeHash> path;
+  final ResolvedNodeHash? originalSender;
+
+  const _RouteSection({
+    required this.route,
+    required this.path,
+    required this.originalSender,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: Theme.of(
+          context,
+        ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5),
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const Row(
+            children: [
+              Icon(Icons.alt_route, size: 16),
+              SizedBox(width: 6),
+              Text(
+                'Mesh Route',
+                style: TextStyle(fontWeight: FontWeight.w700, fontSize: 12),
+              ),
+            ],
+          ),
+          const SizedBox(height: 10),
+          Wrap(
+            spacing: 10,
+            runSpacing: 10,
+            children: [
+              _FactCard(
+                icon: Icons.route,
+                label: 'Payload',
+                value: _payloadTypeLabel(route.payloadType),
+              ),
+              _FactCard(
+                icon: Icons.hub,
+                label: 'Hops',
+                value: '${route.pathHashes.length}',
+              ),
+              if (originalSender != null)
+                _FactCard(
+                  icon: Icons.person_pin_circle,
+                  label: 'Original sender',
+                  value: _nodeLabel(originalSender!),
+                ),
+            ],
+          ),
+          const SizedBox(height: 12),
+          if (path.isEmpty)
+            Text(
+              'Direct packet, no hop path attached.',
+              style: TextStyle(fontSize: 12, color: Colors.grey[700]),
+            )
+          else
+            Wrap(
+              spacing: 6,
+              runSpacing: 6,
+              children: [
+                for (var i = 0; i < path.length; i++) ...[
+                  _RouteHopChip(index: i + 1, node: path[i]),
+                  if (i < path.length - 1)
+                    const Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 2),
+                      child: Icon(Icons.arrow_right_alt, size: 16),
+                    ),
+                ],
+              ],
+            ),
+        ],
+      ),
+    );
+  }
+
+  static String _payloadTypeLabel(int payloadType) {
+    switch (payloadType) {
+      case 0x00:
+        return 'REQ';
+      case 0x01:
+        return 'RESP';
+      case 0x02:
+        return 'TXT';
+      case 0x03:
+        return 'ACK';
+      case 0x04:
+        return 'ADVERT';
+      case 0x05:
+        return 'GRP_TXT';
+      case 0x06:
+        return 'GRP_DATA';
+      case 0x07:
+        return 'ANON_REQ';
+      case 0x08:
+        return 'PATH';
+      case 0x09:
+        return 'TRACE';
+      case 0x0A:
+        return 'MULTIPART';
+      case 0x0B:
+        return 'CONTROL';
+      default:
+        return '0x${payloadType.toRadixString(16).padLeft(2, '0')}';
+    }
+  }
+
+  static String _nodeLabel(ResolvedNodeHash node) {
+    if (node.isOwnNode) {
+      return '${node.label} (${node.hexLabel})';
+    }
+    if (node.matchCount == 0) {
+      return node.hexLabel;
+    }
+    if (node.isUniqueMatch) {
+      return '${node.label} (${node.hexLabel})';
+    }
+    return '${node.label} (${node.hexLabel}, ${node.matchCount} matches)';
+  }
+}
+
+class _RouteHopChip extends StatelessWidget {
+  final int index;
+  final ResolvedNodeHash node;
+
+  const _RouteHopChip({required this.index, required this.node});
+
+  @override
+  Widget build(BuildContext context) {
+    final color = node.isOwnNode
+        ? Colors.blue
+        : node.isUniqueMatch
+        ? Colors.green
+        : Colors.orange;
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+      decoration: BoxDecoration(
+        color: color.withValues(alpha: 0.12),
+        borderRadius: BorderRadius.circular(999),
+        border: Border.all(color: color.withValues(alpha: 0.35)),
+      ),
+      child: Text(
+        '$index. ${_RouteSection._nodeLabel(node)}',
+        style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w600),
+      ),
+    );
+  }
+}
+
 class _FactCard extends StatelessWidget {
   final IconData icon;
   final String label;

lib/screens/settings_screen.dart

@@ -403,25 +403,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
         channelCount: 2,
       );
 
-      final sarMessages = SampleDataGenerator.generateSarMarkerMessages(
+      final sampleMessages = SampleDataGenerator.generateAllMessages(
         centerLocation: centerLocation,
         l10n: l10n,
         foundPersonCount: 2,
         fireCount: 1,
         stagingCount: 1,
         objectCount: 1,
-      );
-
-      final channelMessages = SampleDataGenerator.generateChannelMessages(
-        centerLocation: centerLocation,
-        l10n: l10n,
         generalChannelMessages: 8,
         emergencyChannelMessages: 5,
       );
 
-      // Combine all messages
-      final allMessages = [...sarMessages, ...channelMessages];
-
       // Add to providers
       final contactsProvider = Provider.of<ContactsProvider>(
         context,
@@ -433,7 +425,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
       );
 
       contactsProvider.addContacts(contacts);
-      messagesProvider.addMessages(allMessages);
+      for (final message in sampleMessages.messages) {
+        messagesProvider.addMessage(
+          message,
+          contactLocationSnapshot: sampleMessages.contactLocations[message.id],
+        );
+      }
 
       if (!mounted) return;
 
@@ -446,8 +443,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
             AppLocalizations.of(context)!.loadedSampleData(
               teamCount,
               channelCount,
-              sarMessages.length,
+              sampleMessages.messages.where((m) => m.isSarMarker).length,
-              channelMessages.length,
+              sampleMessages.messages.length,
             ),
           ),
           backgroundColor: Colors.green,

lib/screens/spectrum_scan_screen.dart

@@ -0,0 +1,601 @@
+import 'package:flutter/material.dart';
+import 'package:meshcore_client/meshcore_client.dart';
+import 'package:provider/provider.dart';
+import '../models/device_info.dart';
+import '../providers/connection_provider.dart';
+import '../widgets/device/spectrum_scan_panel.dart';
+
+class SpectrumScanScreen extends StatefulWidget {
+  const SpectrumScanScreen({super.key});
+
+  @override
+  State<SpectrumScanScreen> createState() => _SpectrumScanScreenState();
+}
+
+class _SpectrumScanScreenState extends State<SpectrumScanScreen> {
+  static const List<String> _bandwidthOptions = [
+    '7.8 kHz',
+    '10.4 kHz',
+    '15.6 kHz',
+    '20.8 kHz',
+    '31.25 kHz',
+    '41.7 kHz',
+    '62.5 kHz',
+    '125 kHz',
+    '250 kHz',
+    '500 kHz',
+  ];
+
+  String _selectedBandwidth = '62.5 kHz';
+  bool _isSpectrumScanRunning = false;
+  bool _rangeInitialized = false;
+  String? _lastRangeSourceKey;
+  late double _scanRangeMinMhz;
+  late double _scanRangeMaxMhz;
+  late RangeValues _scanRangeValues;
+  List<SpectrumScanCandidate> _scanCandidates = const [];
+  int? _selectedScanFrequencyKhz;
+  int _completedScanSectors = 0;
+  int _totalScanSectors = 0;
+
+  List<SpectrumScanCandidate> get _recommendedScanCandidates =>
+      _scanCandidates.take(8).toList();
+
+  @override
+  void initState() {
+    super.initState();
+    final deviceInfo = _deviceInfo;
+    if (deviceInfo.radioBw != null &&
+        deviceInfo.radioBw! >= 0 &&
+        deviceInfo.radioBw! < _bandwidthOptions.length) {
+      _selectedBandwidth = _bandwidthOptions[deviceInfo.radioBw!];
+    }
+    _syncRangeFromDevice(deviceInfo);
+    _selectedScanFrequencyKhz = deviceInfo.radioFreq;
+  }
+
+  DeviceInfo get _deviceInfo => context.read<ConnectionProvider>().deviceInfo;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    _syncRangeFromDevice(context.watch<ConnectionProvider>().deviceInfo);
+  }
+
+  void _syncRangeFromDevice(DeviceInfo deviceInfo) {
+    final minKhz = deviceInfo.spectrumScanMinKhz;
+    final maxKhz = deviceInfo.spectrumScanMaxKhz;
+    late double normalizedMinMhz;
+    late double normalizedMaxMhz;
+    late String sourceKey;
+
+    if (minKhz != null && maxKhz != null && maxKhz > minKhz) {
+      final normalized = _normalizeScanRange(
+        minKhz / 1000.0,
+        maxKhz / 1000.0,
+        deviceInfo.radioFreq != null ? deviceInfo.radioFreq! / 1000.0 : null,
+      );
+      normalizedMinMhz = normalized.$1;
+      normalizedMaxMhz = normalized.$2;
+      sourceKey = 'fw:$minKhz:$maxKhz';
+    } else {
+      final normalized = _normalizeScanRange(
+        null,
+        null,
+        deviceInfo.radioFreq != null ? deviceInfo.radioFreq! / 1000.0 : null,
+      );
+      normalizedMinMhz = normalized.$1;
+      normalizedMaxMhz = normalized.$2;
+      sourceKey =
+          'fallback:${deviceInfo.radioFreq != null ? deviceInfo.radioFreq! ~/ 1000 : 869525}';
+    }
+
+    if (_rangeInitialized && _lastRangeSourceKey == sourceKey) {
+      return;
+    }
+
+    _scanRangeMinMhz = normalizedMinMhz;
+    _scanRangeMaxMhz = normalizedMaxMhz;
+
+    if (_scanRangeMaxMhz <= _scanRangeMinMhz) {
+      _scanRangeMaxMhz = _scanRangeMinMhz + 0.5;
+    }
+
+    _scanRangeValues = RangeValues(_scanRangeMinMhz, _scanRangeMaxMhz);
+    _rangeInitialized = true;
+    _lastRangeSourceKey = sourceKey;
+  }
+
+  (double, double) _normalizeScanRange(
+    double? minMhz,
+    double? maxMhz,
+    double? centerMhz,
+  ) {
+    const hardMinMhz = 800.0;
+    const hardMaxMhz = 950.0;
+    final center = centerMhz ?? 869.525;
+
+    if (minMhz != null && maxMhz != null) {
+      final clampedMin = minMhz.clamp(hardMinMhz, hardMaxMhz);
+      final clampedMax = maxMhz.clamp(hardMinMhz, hardMaxMhz);
+      if (clampedMax > clampedMin) {
+        return (clampedMin, clampedMax);
+      }
+    }
+
+    if (center >= 900.0 && center <= 930.0) {
+      return (902.0, 928.0);
+    }
+
+    return (863.0, 870.0);
+  }
+
+  double _bandwidthToKhz(String bw) {
+    switch (bw) {
+      case '7.8 kHz':
+        return 7.8;
+      case '10.4 kHz':
+        return 10.4;
+      case '15.6 kHz':
+        return 15.6;
+      case '20.8 kHz':
+        return 20.8;
+      case '31.25 kHz':
+        return 31.25;
+      case '41.7 kHz':
+        return 41.7;
+      case '62.5 kHz':
+        return 62.5;
+      case '125 kHz':
+        return 125.0;
+      case '250 kHz':
+        return 250.0;
+      case '500 kHz':
+        return 500.0;
+      default:
+        return 62.5;
+    }
+  }
+
+  String _currentParamProfile(DeviceInfo deviceInfo) {
+    final sf = deviceInfo.radioSf ?? 8;
+    final cr = deviceInfo.radioCr ?? 8;
+    return 'BW $_selectedBandwidth  |  SF$sf  |  CR 4/$cr';
+  }
+
+  String _recommendationTitle(int index) {
+    switch (index) {
+      case 0:
+        return 'Best candidate';
+      case 1:
+        return 'Alternate';
+      case 2:
+        return 'Fallback';
+      default:
+        return 'Candidate ${index + 1}';
+    }
+  }
+
+  List<int> _possibleBracketFrequenciesKhz() {
+    final bandwidthKhz = _bandwidthToKhz(_selectedBandwidth);
+    final halfBandwidthKhz = bandwidthKhz / 2.0;
+    final startKhz = (_scanRangeValues.start * 1000).round();
+    final stopKhz = (_scanRangeValues.end * 1000).round();
+    final firstCenterKhz = (startKhz + halfBandwidthKhz).round();
+    final lastCenterKhz = (stopKhz - halfBandwidthKhz).round();
+
+    if (lastCenterKhz < firstCenterKhz) {
+      return const [];
+    }
+
+    final stepKhz = bandwidthKhz >= 125.0 ? bandwidthKhz.round() : 25;
+    final centers = <int>[];
+    for (
+      var centerKhz = firstCenterKhz;
+      centerKhz <= lastCenterKhz && centers.length < 8;
+      centerKhz += stepKhz
+    ) {
+      centers.add(centerKhz);
+    }
+
+    if (centers.isEmpty || centers.last != lastCenterKhz) {
+      centers.add(lastCenterKhz);
+    }
+
+    return centers.toSet().toList()..sort();
+  }
+
+  void _resetDerivedScanResults() {
+    _scanCandidates = const [];
+    _selectedScanFrequencyKhz = null;
+  }
+
+  List<(int startKhz, int stopKhz)> _buildScanSectors(double bandwidthKhz) {
+    final startKhz = (_scanRangeValues.start * 1000).round();
+    final stopKhz = (_scanRangeValues.end * 1000).round();
+    final sectorWidthKhz = (bandwidthKhz * 24).round().clamp(250, 1200);
+    final overlapKhz = bandwidthKhz.round().clamp(8, 500);
+    final sectors = <(int startKhz, int stopKhz)>[];
+
+    var sectorStartKhz = startKhz;
+    while (sectorStartKhz < stopKhz) {
+      final sectorStopKhz = (sectorStartKhz + sectorWidthKhz).clamp(
+        sectorStartKhz + overlapKhz,
+        stopKhz,
+      );
+      sectors.add((sectorStartKhz, sectorStopKhz));
+      if (sectorStopKhz >= stopKhz) {
+        break;
+      }
+      sectorStartKhz = sectorStopKhz - overlapKhz;
+    }
+
+    return sectors;
+  }
+
+  List<SpectrumScanCandidate> _mergeSectorCandidates(
+    Iterable<SpectrumScanCandidate> candidates,
+  ) {
+    final byFrequency = <int, SpectrumScanCandidate>{};
+    for (final candidate in candidates) {
+      final existing = byFrequency[candidate.centerFrequencyKhz];
+      if (existing == null ||
+          candidate.occupancyPercent < existing.occupancyPercent ||
+          (candidate.occupancyPercent == existing.occupancyPercent &&
+              candidate.peakRssiDbm < existing.peakRssiDbm) ||
+          (candidate.occupancyPercent == existing.occupancyPercent &&
+              candidate.peakRssiDbm == existing.peakRssiDbm &&
+              candidate.avgRssiDbm < existing.avgRssiDbm)) {
+        byFrequency[candidate.centerFrequencyKhz] = candidate;
+      }
+    }
+
+    final merged = byFrequency.values.toList()
+      ..sort((a, b) {
+        final occupancyCompare = a.occupancyPercent.compareTo(
+          b.occupancyPercent,
+        );
+        if (occupancyCompare != 0) return occupancyCompare;
+        final peakCompare = a.peakRssiDbm.compareTo(b.peakRssiDbm);
+        if (peakCompare != 0) return peakCompare;
+        return a.avgRssiDbm.compareTo(b.avgRssiDbm);
+      });
+    return merged;
+  }
+
+  Future<void> _runSpectrumScan() async {
+    final connectionProvider = context.read<ConnectionProvider>();
+    final bandwidthKhz = _bandwidthToKhz(_selectedBandwidth);
+    final sectors = _buildScanSectors(bandwidthKhz);
+    final sectorCandidates = <SpectrumScanCandidate>[];
+
+    setState(() {
+      _isSpectrumScanRunning = true;
+      _resetDerivedScanResults();
+      _completedScanSectors = 0;
+      _totalScanSectors = sectors.length;
+    });
+
+    try {
+      for (var i = 0; i < sectors.length; i++) {
+        final sector = sectors[i];
+        final result = await connectionProvider.scanSpectrum(
+          startFrequencyKhz: sector.$1,
+          stopFrequencyKhz: sector.$2,
+          bandwidthKhz: bandwidthKhz.round(),
+          stepKhz: (bandwidthKhz / 2).round().clamp(1, 1000),
+          dwellMs: 160,
+          thresholdDb: 8,
+        );
+        if (result != null) {
+          sectorCandidates.addAll(result.candidates);
+          final mergedCandidates = _mergeSectorCandidates(sectorCandidates);
+          if (mounted) {
+            setState(() {
+              _scanCandidates = mergedCandidates;
+              if (_selectedScanFrequencyKhz == null &&
+                  mergedCandidates.isNotEmpty) {
+                _selectedScanFrequencyKhz =
+                    mergedCandidates.first.centerFrequencyKhz;
+              }
+              _completedScanSectors = i + 1;
+            });
+          }
+        } else if (mounted) {
+          setState(() {
+            _completedScanSectors = i + 1;
+          });
+        }
+      }
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isSpectrumScanRunning = false;
+          if (_completedScanSectors == 0) {
+            _totalScanSectors = sectors.length;
+          }
+        });
+      }
+    }
+
+    if (!mounted) return;
+
+    final mergedCandidates = _mergeSectorCandidates(sectorCandidates);
+    if (mergedCandidates.isEmpty) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Spectrum scan returned no candidate frequencies'),
+          backgroundColor: Colors.red,
+        ),
+      );
+      return;
+    }
+
+    setState(() {
+      _scanCandidates = mergedCandidates;
+      _selectedScanFrequencyKhz = mergedCandidates.first.centerFrequencyKhz;
+    });
+  }
+
+  Future<void> _applySelectedScanFrequency() async {
+    if (_selectedScanFrequencyKhz == null) return;
+
+    final connectionProvider = context.read<ConnectionProvider>();
+    final deviceInfo = connectionProvider.deviceInfo;
+
+    await connectionProvider.setRadioParams(
+      frequency: _selectedScanFrequencyKhz!,
+      bandwidth: _bandwidthOptions.indexOf(_selectedBandwidth),
+      spreadingFactor: deviceInfo.radioSf ?? 8,
+      codingRate: deviceInfo.radioCr ?? 8,
+      repeat: deviceInfo.clientRepeat,
+    );
+    await connectionProvider.refreshDeviceInfo();
+
+    if (!mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(
+          'Applied ${(_selectedScanFrequencyKhz! / 1000.0).toStringAsFixed(3)} MHz',
+        ),
+        backgroundColor: Colors.green,
+      ),
+    );
+  }
+
+  int? _currentPreviewFrequencyKhz(DeviceInfo deviceInfo) {
+    if (_selectedScanFrequencyKhz != null) {
+      return _selectedScanFrequencyKhz;
+    }
+    return deviceInfo.radioFreq;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final deviceInfo = context.watch<ConnectionProvider>().deviceInfo;
+    final theme = Theme.of(context);
+    final possibleBracketFrequencies = _possibleBracketFrequenciesKhz();
+    final recommendedScanCandidates = _recommendedScanCandidates;
+    final recommendationFrequencies = recommendedScanCandidates.isNotEmpty
+        ? recommendedScanCandidates
+              .map((candidate) => candidate.centerFrequencyKhz)
+              .toList()
+        : possibleBracketFrequencies;
+
+    return Scaffold(
+      appBar: AppBar(title: const Text('Spectrum Scan')),
+      body: ListView(
+        padding: const EdgeInsets.all(16),
+        children: [
+          Card(
+            child: Padding(
+              padding: const EdgeInsets.all(16),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  DropdownButtonFormField<String>(
+                    initialValue: _selectedBandwidth,
+                    decoration: const InputDecoration(
+                      labelText: 'Bandwidth',
+                      border: OutlineInputBorder(),
+                      helperText:
+                          'Scan and apply frequencies for this bandwidth',
+                    ),
+                    items: _bandwidthOptions.map((value) {
+                      return DropdownMenuItem<String>(
+                        value: value,
+                        child: Text(value),
+                      );
+                    }).toList(),
+                    onChanged: (value) {
+                      if (value == null) return;
+                      setState(() {
+                        _selectedBandwidth = value;
+                        _resetDerivedScanResults();
+                      });
+                    },
+                  ),
+                  const SizedBox(height: 16),
+                  Text(
+                    deviceInfo.spectrumScanMinKhz != null &&
+                            deviceInfo.spectrumScanMaxKhz != null
+                        ? 'Firmware scan range: ${_scanRangeMinMhz.toStringAsFixed(3)}-${_scanRangeMaxMhz.toStringAsFixed(3)} MHz'
+                        : 'Fallback scan range selected from current band. MeshCore commonly uses EU868 or US915.',
+                    style: theme.textTheme.bodySmall?.copyWith(
+                      color: theme.colorScheme.onSurfaceVariant,
+                    ),
+                  ),
+                  if (_isSpectrumScanRunning) ...[
+                    const SizedBox(height: 8),
+                    Text(
+                      'Scanning sector ${_completedScanSectors + 1} of $_totalScanSectors. Results update as each sector completes.',
+                      style: theme.textTheme.bodySmall?.copyWith(
+                        color: theme.colorScheme.primary,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                  ],
+                  const SizedBox(height: 12),
+                  SpectrumScanPanel(
+                    theme: theme,
+                    scanSupported: deviceInfo.supportsSpectrumScan == true,
+                    isRunning: _isSpectrumScanRunning,
+                    rangeMinMhz: _scanRangeMinMhz,
+                    rangeMaxMhz: _scanRangeMaxMhz,
+                    rangeValues: _scanRangeValues,
+                    bandwidthKhz: _bandwidthToKhz(_selectedBandwidth),
+                    selectedFrequencyKhz: _currentPreviewFrequencyKhz(
+                      deviceInfo,
+                    ),
+                    graphCandidates: _scanCandidates,
+                    selectableCandidates: recommendedScanCandidates,
+                    onRangeChanged: (values) {
+                      setState(() {
+                        _scanRangeValues = values;
+                        _resetDerivedScanResults();
+                      });
+                    },
+                    onCandidateChanged: (value) {
+                      setState(() {
+                        _selectedScanFrequencyKhz = value;
+                      });
+                    },
+                    onRunScan: _runSpectrumScan,
+                    onApplySelected: _applySelectedScanFrequency,
+                  ),
+                  if (recommendationFrequencies.isNotEmpty) ...[
+                    const SizedBox(height: 18),
+                    Text(
+                      _scanCandidates.isNotEmpty
+                          ? 'Recommended profiles'
+                          : 'Possible brackets',
+                      style: theme.textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      _scanCandidates.isNotEmpty
+                          ? 'Suggested frequencies from the latest scan with the radio parameters to keep alongside them.'
+                          : 'Usable frequency brackets derived from the selected span and bandwidth, even without live scan data.',
+                      style: theme.textTheme.bodySmall?.copyWith(
+                        color: theme.colorScheme.onSurfaceVariant,
+                      ),
+                    ),
+                    const SizedBox(height: 12),
+                    for (
+                      var i = 0;
+                      i < recommendationFrequencies.length;
+                      i++
+                    ) ...[
+                      _RecommendationTile(
+                        title: _recommendationTitle(i),
+                        frequencyKhz: recommendationFrequencies[i],
+                        candidate: recommendedScanCandidates.isNotEmpty
+                            ? recommendedScanCandidates[i]
+                            : null,
+                        bandwidthKhz: _bandwidthToKhz(_selectedBandwidth),
+                        paramsLabel: _currentParamProfile(deviceInfo),
+                        isSelected:
+                            _selectedScanFrequencyKhz ==
+                            recommendationFrequencies[i],
+                        onSelect: () {
+                          setState(() {
+                            _selectedScanFrequencyKhz =
+                                recommendationFrequencies[i];
+                          });
+                        },
+                      ),
+                      if (i != recommendationFrequencies.length - 1)
+                        const SizedBox(height: 10),
+                    ],
+                  ],
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _RecommendationTile extends StatelessWidget {
+  final String title;
+  final int frequencyKhz;
+  final SpectrumScanCandidate? candidate;
+  final double bandwidthKhz;
+  final String paramsLabel;
+  final bool isSelected;
+  final VoidCallback onSelect;
+
+  const _RecommendationTile({
+    required this.title,
+    required this.frequencyKhz,
+    required this.candidate,
+    required this.bandwidthKhz,
+    required this.paramsLabel,
+    required this.isSelected,
+    required this.onSelect,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final scheme = theme.colorScheme;
+
+    return InkWell(
+      onTap: onSelect,
+      borderRadius: BorderRadius.circular(14),
+      child: Container(
+        padding: const EdgeInsets.all(14),
+        decoration: BoxDecoration(
+          color: isSelected
+              ? scheme.primaryContainer.withValues(alpha: 0.55)
+              : scheme.surfaceContainerHighest.withValues(alpha: 0.35),
+          borderRadius: BorderRadius.circular(14),
+          border: Border.all(
+            color: isSelected ? scheme.primary : scheme.outlineVariant,
+          ),
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    title,
+                    style: theme.textTheme.titleSmall?.copyWith(
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                ),
+                if (isSelected)
+                  Icon(Icons.check_circle, color: scheme.primary, size: 18),
+              ],
+            ),
+            const SizedBox(height: 8),
+            Text(
+              '${(frequencyKhz / 1000.0).toStringAsFixed(3)} MHz',
+              style: theme.textTheme.headlineSmall?.copyWith(
+                fontWeight: FontWeight.w800,
+              ),
+            ),
+            const SizedBox(height: 6),
+            Text(paramsLabel, style: theme.textTheme.bodyMedium),
+            const SizedBox(height: 6),
+            Text(
+              candidate != null
+                  ? 'Occupancy ${candidate!.occupancyPercent}%  |  Avg ${candidate!.avgRssiDbm} dBm  |  Peak ${candidate!.peakRssiDbm} dBm'
+                  : 'Bracket ${(frequencyKhz / 1000.0 - bandwidthKhz / 2000.0).toStringAsFixed(3)}-${(frequencyKhz / 1000.0 + bandwidthKhz / 2000.0).toStringAsFixed(3)} MHz',
+              style: theme.textTheme.bodySmall?.copyWith(
+                color: scheme.onSurfaceVariant,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/services/locale_preferences.dart

@@ -64,6 +64,8 @@ class LocalePreferences {
         return 'Italiano';
       case 'el':
         return 'Greek';
+      case 'zh':
+        return '简体中文';
       default:
         return locale.languageCode;
     }
@@ -88,6 +90,8 @@ class LocalePreferences {
         return 'Italiano';
       case 'el':
         return 'Ελληνικά';
+      case 'zh':
+        return '简体中文';
       default:
         return locale.languageCode;
     }

lib/services/mesh_map_nodes_service.dart

@@ -31,17 +31,22 @@ class MeshMapNode {
 }
 
 class MeshMapNodesService {
-  static const String _nodesEndpoint = 'https://api.meshcore.nz/api/v1/map/nodes';
+  static const String _nodesEndpoint =
+      'https://api.meshcore.nz/api/v1/map/nodes';
   static const Duration _cacheTtl = Duration(minutes: 2);
+  static const Duration traceCacheTtl = Duration(minutes: 10);
   static List<MeshMapNode>? _cachedNodes;
   static DateTime? _cachedAt;
 
-  static Future<List<MeshMapNode>> fetchNodes({bool forceRefresh = false}) async {
+  static Future<List<MeshMapNode>> fetchNodes({
+    bool forceRefresh = false,
+    Duration cacheTtl = _cacheTtl,
+  }) async {
     final now = DateTime.now();
     if (!forceRefresh &&
         _cachedNodes != null &&
         _cachedAt != null &&
-        now.difference(_cachedAt!) < _cacheTtl) {
+        now.difference(_cachedAt!) < cacheTtl) {
       return _cachedNodes!;
     }
 
@@ -58,7 +63,9 @@ class MeshMapNodesService {
     final nodes = nodesRaw
         .whereType<Map<String, dynamic>>()
         .map(MeshMapNode.fromJson)
-        .where((n) => n.publicKey.isNotEmpty && n.latitude != 0 && n.longitude != 0)
+        .where(
+          (n) => n.publicKey.isNotEmpty && n.latitude != 0 && n.longitude != 0,
+        )
         .toList();
 
     _cachedNodes = nodes;

lib/services/message_storage_service.dart

@@ -2,15 +2,25 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../models/message.dart';
+import '../models/message_contact_location.dart';
+import '../models/message_reception_details.dart';
 import 'package:latlong2/latlong.dart';
 
 /// Service for persisting messages to local storage
 class MessageStorageService {
   static const String _messagesKey = 'stored_messages';
+  static const String _messageContactLocationsKey =
+      'stored_message_contact_locations';
+  static const String _messageReceptionDetailsKey =
+      'stored_message_reception_details';
   static const int _maxStoredMessages = 1000; // Store up to 1000 messages
 
   /// Save messages to persistent storage
-  Future<void> saveMessages(List<Message> messages) async {
+  Future<void> saveMessages(
+    List<Message> messages, {
+    Map<String, MessageContactLocation> messageContactLocations = const {},
+    Map<String, MessageReceptionDetails> messageReceptionDetails = const {},
+  }) async {
     try {
       final prefs = await SharedPreferences.getInstance();
 
@@ -24,6 +34,29 @@ class MessageStorageService {
 
       final jsonString = jsonEncode(limitedList);
       await prefs.setString(_messagesKey, jsonString);
+      final retainedMessageIds = limitedList
+          .map((entry) => entry['id'] as String)
+          .toSet();
+      final locationJson = <String, dynamic>{};
+      final receptionJson = <String, dynamic>{};
+      for (final entry in messageContactLocations.entries) {
+        if (retainedMessageIds.contains(entry.key)) {
+          locationJson[entry.key] = entry.value.toJson();
+        }
+      }
+      for (final entry in messageReceptionDetails.entries) {
+        if (retainedMessageIds.contains(entry.key)) {
+          receptionJson[entry.key] = entry.value.toJson();
+        }
+      }
+      await prefs.setString(
+        _messageContactLocationsKey,
+        jsonEncode(locationJson),
+      );
+      await prefs.setString(
+        _messageReceptionDetailsKey,
+        jsonEncode(receptionJson),
+      );
 
       debugPrint(
         '✅ [MessageStorage] Saved ${limitedList.length} messages to storage',
@@ -33,6 +66,66 @@ class MessageStorageService {
     }
   }
 
+  Future<Map<String, MessageContactLocation>>
+  loadMessageContactLocations() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final jsonString = prefs.getString(_messageContactLocationsKey);
+      if (jsonString == null || jsonString.isEmpty) {
+        return const {};
+      }
+
+      final decoded = jsonDecode(jsonString);
+      if (decoded is! Map<String, dynamic>) {
+        return const {};
+      }
+
+      final result = <String, MessageContactLocation>{};
+      for (final entry in decoded.entries) {
+        final value = entry.value;
+        if (value is! Map<String, dynamic>) continue;
+        final snapshot = MessageContactLocation.fromJson(value);
+        if (snapshot != null) {
+          result[entry.key] = snapshot;
+        }
+      }
+      return result;
+    } catch (e) {
+      debugPrint('❌ [MessageStorage] Error loading contact locations: $e');
+      return const {};
+    }
+  }
+
+  Future<Map<String, MessageReceptionDetails>>
+  loadMessageReceptionDetails() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final jsonString = prefs.getString(_messageReceptionDetailsKey);
+      if (jsonString == null || jsonString.isEmpty) {
+        return const {};
+      }
+
+      final decoded = jsonDecode(jsonString);
+      if (decoded is! Map<String, dynamic>) {
+        return const {};
+      }
+
+      final result = <String, MessageReceptionDetails>{};
+      for (final entry in decoded.entries) {
+        final value = entry.value;
+        if (value is! Map<String, dynamic>) continue;
+        final snapshot = MessageReceptionDetails.fromJson(value);
+        if (snapshot != null) {
+          result[entry.key] = snapshot;
+        }
+      }
+      return result;
+    } catch (e) {
+      debugPrint('❌ [MessageStorage] Error loading reception details: $e');
+      return const {};
+    }
+  }
+
   /// Load messages from persistent storage
   Future<List<Message>> loadMessages() async {
     try {
@@ -66,6 +159,8 @@ class MessageStorageService {
     try {
       final prefs = await SharedPreferences.getInstance();
       await prefs.remove(_messagesKey);
+      await prefs.remove(_messageContactLocationsKey);
+      await prefs.remove(_messageReceptionDetailsKey);
       debugPrint('✅ [MessageStorage] Cleared all stored messages');
     } catch (e) {
       debugPrint('❌ [MessageStorage] Error clearing messages: $e');

lib/services/voice_recorder_service.dart

@@ -18,7 +18,7 @@ class VoiceRecorderService {
 
   /// Request microphone permission.  Returns true if granted.
   Future<bool> requestPermission() async {
-    return _recorder.hasPermission();
+    return _recorder.hasPermission(request: true);
   }
 
   /// Start capturing PCM audio.
@@ -38,9 +38,7 @@ class VoiceRecorderService {
       throw StateError('VoiceRecorderService: already recording');
     }
 
-    _controller = StreamController<Int16List>(
+    _controller = StreamController<Int16List>(onCancel: () => _stopInternal());
-      onCancel: () => _stopInternal(),
-    );
     _isRecording = true;
 
     _startRecording(
@@ -167,17 +165,17 @@ class _VoiceDynamicsProcessor {
     required int sampleRate,
     required bool enableCompressor,
     required bool enableLimiter,
-  })  : _enableCompressor = enableCompressor,
+  }) : _enableCompressor = enableCompressor,
-        _enableLimiter = enableLimiter,
+       _enableLimiter = enableLimiter,
-        _compressor = _SimpleCompressor(
+       _compressor = _SimpleCompressor(
-          sampleRate: sampleRate.toDouble(),
+         sampleRate: sampleRate.toDouble(),
-          thresholdDb: -18.0,
+         thresholdDb: -18.0,
-          ratio: 2.5,
+         ratio: 2.5,
-          attackMs: 8.0,
+         attackMs: 8.0,
-          releaseMs: 120.0,
+         releaseMs: 120.0,
-          makeupGainDb: 4.0,
+         makeupGainDb: 4.0,
-        ),
+       ),
-        _limiter = _PeakLimiter(ceilingDb: -1.0);
+       _limiter = _PeakLimiter(ceilingDb: -1.0);
 
   Int16List process(Int16List input) {
     final output = Int16List(input.length);
@@ -214,11 +212,11 @@ class _SimpleCompressor {
     required double attackMs,
     required double releaseMs,
     required double makeupGainDb,
-  })  : _thresholdDb = thresholdDb,
+  }) : _thresholdDb = thresholdDb,
-        _ratio = ratio,
+       _ratio = ratio,
-        _makeupGain = math.pow(10.0, makeupGainDb / 20.0).toDouble(),
+       _makeupGain = math.pow(10.0, makeupGainDb / 20.0).toDouble(),
-        _attackCoeff = math.exp(-1.0 / (sampleRate * (attackMs / 1000.0))),
+       _attackCoeff = math.exp(-1.0 / (sampleRate * (attackMs / 1000.0))),
-        _releaseCoeff = math.exp(-1.0 / (sampleRate * (releaseMs / 1000.0)));
+       _releaseCoeff = math.exp(-1.0 / (sampleRate * (releaseMs / 1000.0)));
 
   double process(double x) {
     final absX = x.abs();
@@ -266,14 +264,14 @@ class _VoiceBandPassFilter {
     required int sampleRate,
     required double lowCutHz,
     required double highCutHz,
-  })  : _highPass = _BiquadFilter.highPass(
+  }) : _highPass = _BiquadFilter.highPass(
-          sampleRate: sampleRate.toDouble(),
+         sampleRate: sampleRate.toDouble(),
-          cutoffHz: lowCutHz,
+         cutoffHz: lowCutHz,
-        ),
+       ),
-        _lowPass = _BiquadFilter.lowPass(
+       _lowPass = _BiquadFilter.lowPass(
-          sampleRate: sampleRate.toDouble(),
+         sampleRate: sampleRate.toDouble(),
-          cutoffHz: highCutHz,
+         cutoffHz: highCutHz,
-        );
+       );
 
   Int16List process(Int16List input) {
     final output = Int16List(input.length);
@@ -306,11 +304,11 @@ class _BiquadFilter {
     required double b2,
     required double a1,
     required double a2,
-  })  : _b0 = b0,
+  }) : _b0 = b0,
-        _b1 = b1,
+       _b1 = b1,
-        _b2 = b2,
+       _b2 = b2,
-        _a1 = a1,
+       _a1 = a1,
-        _a2 = a2;
+       _a2 = a2;
 
   factory _BiquadFilter.lowPass({
     required double sampleRate,

lib/utils/avatar_label_helper.dart

@@ -0,0 +1,32 @@
+class AvatarLabelHelper {
+  static String buildLabel(String name) {
+    final trimmed = name.trim();
+    if (trimmed.isEmpty) return '?';
+
+    if (trimmed.startsWith('#')) {
+      final hashBody = trimmed.substring(1).replaceAll(RegExp(r'[\s_-]+'), '');
+      if (hashBody.isEmpty) {
+        return '#';
+      }
+      return '#${_take(hashBody, 2)}'.toUpperCase();
+    }
+
+    final parts = trimmed
+        .split(RegExp(r'[\s_-]+'))
+        .where((part) => part.isNotEmpty)
+        .toList();
+
+    if (parts.length >= 2) {
+      final first = _take(parts[0], 1);
+      final second = _take(parts[1], 1);
+      return '$first$second'.toUpperCase();
+    }
+
+    return _take(trimmed, 2).toUpperCase();
+  }
+
+  static String _take(String value, int count) {
+    if (value.length <= count) return value;
+    return value.substring(0, count);
+  }
+}

lib/utils/location_formats.dart

@@ -0,0 +1,25 @@
+String formatPlusCode(double lat, double lon) {
+  const base = '23456789CFGHJMPQRVWX';
+
+  var normalizedLat = (lat + 90) / 180;
+  var normalizedLon = (lon + 180) / 360;
+
+  final buffer = StringBuffer();
+  for (var i = 0; i < 8; i++) {
+    if (i == 4) {
+      buffer.write('+');
+    }
+
+    final latDigit = (normalizedLat * 20).floor() % 20;
+    final lonDigit = (normalizedLon * 20).floor() % 20;
+
+    buffer
+      ..write(base[latDigit])
+      ..write(base[lonDigit]);
+
+    normalizedLat = (normalizedLat * 20) % 1;
+    normalizedLon = (normalizedLon * 20) % 1;
+  }
+
+  return buffer.toString();
+}

lib/utils/log_rx_route_decoder.dart

@@ -0,0 +1,129 @@
+import 'dart:typed_data';
+
+import '../models/contact.dart';
+
+class DecodedLogRxRoute {
+  final int payloadType;
+  final List<int> pathHashes;
+
+  const DecodedLogRxRoute({
+    required this.payloadType,
+    required this.pathHashes,
+  });
+
+  int? get originalSenderHash => pathHashes.isEmpty ? null : pathHashes.first;
+}
+
+class ResolvedNodeHash {
+  final int hash;
+  final String label;
+  final bool isOwnNode;
+  final bool isUniqueMatch;
+  final int matchCount;
+
+  const ResolvedNodeHash({
+    required this.hash,
+    required this.label,
+    required this.isOwnNode,
+    required this.isUniqueMatch,
+    required this.matchCount,
+  });
+
+  String get hexLabel => '0x${hash.toRadixString(16).padLeft(2, '0')}';
+}
+
+class LogRxRouteDecoder {
+  const LogRxRouteDecoder._();
+
+  static DecodedLogRxRoute? decode(Uint8List rawData) {
+    if (rawData.length < 5 || rawData[0] != 0x88) return null;
+
+    final rawPacketData = rawData.sublist(3);
+    if (rawPacketData.length < 2) return null;
+
+    final header = rawPacketData[0];
+    final routeType = header & 0x03;
+    final payloadType = (header >> 2) & 0x0F;
+
+    var index = 1;
+    if (routeType == 0x00 || routeType == 0x03) {
+      if (rawPacketData.length < index + 5) return null;
+      index += 4;
+    }
+
+    if (rawPacketData.length <= index) return null;
+    final pathLen = rawPacketData[index++];
+    if (rawPacketData.length < index + pathLen) return null;
+
+    return DecodedLogRxRoute(
+      payloadType: payloadType,
+      pathHashes: rawPacketData.sublist(index, index + pathLen),
+    );
+  }
+
+  static ResolvedNodeHash resolveHash(
+    int hash, {
+    required Iterable<Contact> contacts,
+    Uint8List? ownPublicKey,
+    String? ownName,
+  }) {
+    final ownHash = ownPublicKey != null && ownPublicKey.isNotEmpty
+        ? ownPublicKey.first
+        : null;
+    if (ownHash == hash) {
+      final ownLabel = (ownName != null && ownName.trim().isNotEmpty)
+          ? '$ownName (you)'
+          : 'You';
+      return ResolvedNodeHash(
+        hash: hash,
+        label: ownLabel,
+        isOwnNode: true,
+        isUniqueMatch: true,
+        matchCount: 1,
+      );
+    }
+
+    final matches = contacts.where((contact) {
+      return contact.publicKey.isNotEmpty && contact.publicKey.first == hash;
+    }).toList();
+
+    if (matches.isEmpty) {
+      return ResolvedNodeHash(
+        hash: hash,
+        label: 'Unknown',
+        isOwnNode: false,
+        isUniqueMatch: false,
+        matchCount: 0,
+      );
+    }
+
+    if (matches.length == 1) {
+      return ResolvedNodeHash(
+        hash: hash,
+        label: matches.first.displayName,
+        isOwnNode: false,
+        isUniqueMatch: true,
+        matchCount: 1,
+      );
+    }
+
+    final candidateNames = matches
+        .map((contact) => contact.displayName)
+        .where((name) => name.trim().isNotEmpty)
+        .take(2)
+        .join(', ');
+    final extraCount = matches.length - 2;
+    final label = candidateNames.isEmpty
+        ? '${matches.length} contacts'
+        : extraCount > 0
+        ? '$candidateNames +$extraCount'
+        : candidateNames;
+    return ResolvedNodeHash(
+      hash: hash,
+      label: label,
+      isOwnNode: false,
+      isUniqueMatch: false,
+      matchCount: matches.length,
+    );
+  }
+}

lib/utils/message_airtime_estimator.dart

@@ -0,0 +1,149 @@
+import '../models/message.dart';
+import 'image_message_parser.dart';
+import 'voice_message_parser.dart';
+
+const int _defaultLoRaSf = 10;
+const int _defaultLoRaCr = 5;
+const int _defaultLoRaBwHz = 250000;
+const int _defaultLoRaPreambleSymbols = 8;
+const int _defaultLoRaCrcEnabled = 1;
+const int _defaultLoRaExplicitHeader = 1;
+const double _defaultAirtimeBudgetFactor = 1.0;
+const int _meshPacketHeaderBytes = 2;
+const int _textFrameBaseBytes = 10;
+
+Duration estimateMessageTransmitDuration(
+  Message message, {
+  int? radioBw,
+  int? radioSf,
+  int? radioCr,
+}) {
+  final imageEnvelope = ImageEnvelope.tryParse(message.text);
+  if (imageEnvelope != null) {
+    return estimateImageTransmitDuration(
+      fragmentCount: imageEnvelope.total,
+      sizeBytes: imageEnvelope.sizeBytes,
+      pathLen: message.pathLen,
+      radioBw: radioBw,
+      radioSf: radioSf,
+      radioCr: radioCr,
+    );
+  }
+
+  final voiceEnvelope = VoiceEnvelope.tryParseText(message.text);
+  if (voiceEnvelope != null) {
+    return estimateVoiceTransmitDuration(
+      mode: voiceEnvelope.mode,
+      packetCount: voiceEnvelope.total,
+      durationMs: voiceEnvelope.durationMs,
+      pathLen: message.pathLen,
+      radioBw: radioBw,
+      radioSf: radioSf,
+      radioCr: radioCr,
+    );
+  }
+
+  final voicePacket = VoicePacket.tryParseText(message.text);
+  if (voicePacket != null) {
+    return estimateVoiceTransmitDuration(
+      mode: voicePacket.mode,
+      packetCount: voicePacket.total,
+      durationMs: voicePacket.durationMs * voicePacket.total,
+      pathLen: message.pathLen,
+      radioBw: radioBw,
+      radioSf: radioSf,
+      radioCr: radioCr,
+    );
+  }
+
+  final normalizedPathLen = _normalizedPathLen(message.pathLen);
+  final payloadBytes = _textFrameBaseBytes + message.text.length;
+  final hops = normalizedPathLen + 1;
+  final airtimeMs = _estimateLoRaAirtimeMs(
+    _meshPacketHeaderBytes + normalizedPathLen + payloadBytes,
+    radioBw: radioBw,
+    radioSf: radioSf,
+    radioCr: radioCr,
+  );
+
+  return Duration(
+    milliseconds: (airtimeMs * (1.0 + _defaultAirtimeBudgetFactor) * hops)
+        .round(),
+  );
+}
+
+int _normalizedPathLen(int pathLen) {
+  if (pathLen < 0 || pathLen >= 255) return 0;
+  return pathLen.clamp(0, 64).toInt();
+}
+
+double _estimateLoRaAirtimeMs(
+  int payloadLenBytes, {
+  int? radioBw,
+  int? radioSf,
+  int? radioCr,
+}) {
+  final sf = _normalizeSf(radioSf);
+  final bw = _resolveBandwidthHz(radioBw).toDouble();
+  final cr = (_normalizeCr(radioCr) - 4).clamp(1, 4);
+  final ih = _defaultLoRaExplicitHeader == 1 ? 0 : 1;
+  final de = (sf >= 11 && _defaultLoRaBwHz <= 125000) ? 1 : 0;
+
+  final symbolMs = ((1 << sf) / bw) * 1000.0;
+  final preambleMs = (_defaultLoRaPreambleSymbols + 4.25) * symbolMs;
+
+  final num =
+      (8 * payloadLenBytes) -
+      (4 * sf) +
+      28 +
+      (16 * _defaultLoRaCrcEnabled) -
+      (20 * ih);
+  final den = 4 * (sf - (2 * de));
+  final payloadSymCoeff = den <= 0 ? 0 : (num / den).ceil();
+  final payloadSymbols =
+      8 + (payloadSymCoeff < 0 ? 0 : payloadSymCoeff) * (cr + 4);
+  final payloadMs = payloadSymbols * symbolMs;
+
+  return preambleMs + payloadMs;
+}
+
+int _normalizeSf(int? value) {
+  if (value == null) return _defaultLoRaSf;
+  if (value >= 5 && value <= 12) return value;
+  return _defaultLoRaSf;
+}
+
+int _normalizeCr(int? value) {
+  if (value == null) return _defaultLoRaCr;
+  if (value >= 5 && value <= 8) return value;
+  return _defaultLoRaCr;
+}
+
+int _resolveBandwidthHz(int? rawBw) {
+  if (rawBw == null) return _defaultLoRaBwHz;
+  if (rawBw > 1000) return rawBw;
+  switch (rawBw) {
+    case 0:
+      return 7800;
+    case 1:
+      return 10400;
+    case 2:
+      return 15600;
+    case 3:
+      return 20800;
+    case 4:
+      return 31250;
+    case 5:
+      return 41700;
+    case 6:
+      return 62500;
+    case 7:
+      return 125000;
+    case 8:
+      return 250000;
+    case 9:
+      return 500000;
+    default:
+      return _defaultLoRaBwHz;
+  }
+}

lib/utils/message_extensions.dart

@@ -24,15 +24,30 @@ extension MessageLocalization on Message {
 
     switch (deliveryStatus) {
       case MessageDeliveryStatus.sending:
+        if (isContactMessage) {
+          if (retryAttempt > 0) {
+            return '${l10n.pending} • ${l10n.retryAttempt} $retryAttempt/3';
+          }
+          return l10n.pending;
+        }
         return l10n.sending;
       case MessageDeliveryStatus.sent:
         return l10n.sent;
       case MessageDeliveryStatus.delivered:
+        if (retryAttempt > 0 && roundTripTimeMs != null) {
+          return '${l10n.deliveredWithTime(roundTripTimeMs!)} • ${l10n.retryAttempt} $retryAttempt/3';
+        }
+        if (retryAttempt > 0) {
+          return '${l10n.delivered} • ${l10n.retryAttempt} $retryAttempt/3';
+        }
         if (roundTripTimeMs != null) {
           return l10n.deliveredWithTime(roundTripTimeMs!);
         }
         return l10n.delivered;
       case MessageDeliveryStatus.failed:
+        if (retryAttempt > 0) {
+          return '${l10n.failed} • ${l10n.retryAttempt} $retryAttempt/3';
+        }
         return l10n.failed;
       case MessageDeliveryStatus.received:
         return '';

lib/utils/raw_route_probe.dart

@@ -0,0 +1,87 @@
+import 'dart:typed_data';
+
+class RawRouteProbeRequest {
+  static const int _binaryMagic = 0x70; // 'p'
+
+  final int nonce;
+  final String requesterKey6;
+
+  const RawRouteProbeRequest({
+    required this.nonce,
+    required this.requesterKey6,
+  });
+
+  static RawRouteProbeRequest? tryParseBinary(Uint8List payload) {
+    if (payload.length != 11 || payload[0] != _binaryMagic) return null;
+    try {
+      final nonce =
+          (payload[1] << 24) |
+          (payload[2] << 16) |
+          (payload[3] << 8) |
+          payload[4];
+      final requesterKey6 = payload
+          .sublist(5, 11)
+          .map((b) => b.toRadixString(16).padLeft(2, '0'))
+          .join()
+          .toLowerCase();
+      return RawRouteProbeRequest(nonce: nonce, requesterKey6: requesterKey6);
+    } catch (_) {
+      return null;
+    }
+  }
+
+  Uint8List encodeBinary() {
+    if (!RegExp(r'^[0-9a-fA-F]{12}$').hasMatch(requesterKey6)) {
+      throw ArgumentError.value(
+        requesterKey6,
+        'requesterKey6',
+        'Expected 12 hex chars',
+      );
+    }
+    final out = Uint8List(11);
+    out[0] = _binaryMagic;
+    out[1] = (nonce >> 24) & 0xFF;
+    out[2] = (nonce >> 16) & 0xFF;
+    out[3] = (nonce >> 8) & 0xFF;
+    out[4] = nonce & 0xFF;
+    for (var i = 0; i < 6; i++) {
+      out[5 + i] = int.parse(
+        requesterKey6.substring(i * 2, i * 2 + 2),
+        radix: 16,
+      );
+    }
+    return out;
+  }
+}
+
+class RawRouteProbeAck {
+  static const int _binaryMagic = 0x71; // 'q'
+
+  final int nonce;
+
+  const RawRouteProbeAck({required this.nonce});
+
+  static RawRouteProbeAck? tryParseBinary(Uint8List payload) {
+    if (payload.length != 5 || payload[0] != _binaryMagic) return null;
+    try {
+      final nonce =
+          (payload[1] << 24) |
+          (payload[2] << 16) |
+          (payload[3] << 8) |
+          payload[4];
+      return RawRouteProbeAck(nonce: nonce);
+    } catch (_) {
+      return null;
+    }
+  }
+
+  Uint8List encodeBinary() {
+    final out = Uint8List(5);
+    out[0] = _binaryMagic;
+    out[1] = (nonce >> 24) & 0xFF;
+    out[2] = (nonce >> 16) & 0xFF;
+    out[3] = (nonce >> 8) & 0xFF;
+    out[4] = nonce & 0xFF;
+    return out;
+  }
+}

lib/utils/sample_data_generator.dart

@@ -4,12 +4,66 @@ import 'package:flutter/material.dart';
 import 'package:latlong2/latlong.dart';
 import '../models/contact.dart';
 import '../models/message.dart';
+import '../models/message_contact_location.dart';
 import '../l10n/app_localizations.dart';
 
 /// Generates sample data for testing/demo purposes
 class SampleDataGenerator {
   static final Random _random = Random();
 
+  static MessageContactLocation _sampleSnapshot({
+    required LatLng location,
+    required DateTime receivedAt,
+    required String source,
+  }) {
+    return MessageContactLocation(
+      location: location,
+      source: source,
+      capturedAt: receivedAt,
+      sourceTimestamp: receivedAt.subtract(const Duration(minutes: 2)),
+    );
+  }
+
+  static LatLng _randomNearbyLocation(LatLng center, double spread) {
+    final latOffset = (_random.nextDouble() - 0.5) * spread;
+    final lonOffset = (_random.nextDouble() - 0.5) * spread;
+    return LatLng(center.latitude + latOffset, center.longitude + lonOffset);
+  }
+
+  static SampleMessageBatch generateAllMessages({
+    required LatLng centerLocation,
+    required AppLocalizations l10n,
+    int foundPersonCount = 2,
+    int fireCount = 1,
+    int stagingCount = 1,
+    int objectCount = 1,
+    int generalChannelMessages = 8,
+    int emergencyChannelMessages = 5,
+  }) {
+    final sarBatch = generateSarMarkerMessages(
+      centerLocation: centerLocation,
+      l10n: l10n,
+      foundPersonCount: foundPersonCount,
+      fireCount: fireCount,
+      stagingCount: stagingCount,
+      objectCount: objectCount,
+    );
+    final channelBatch = generateChannelMessages(
+      centerLocation: centerLocation,
+      l10n: l10n,
+      generalChannelMessages: generalChannelMessages,
+      emergencyChannelMessages: emergencyChannelMessages,
+    );
+
+    return SampleMessageBatch(
+      messages: [...sarBatch.messages, ...channelBatch.messages],
+      contactLocations: {
+        ...sarBatch.contactLocations,
+        ...channelBatch.contactLocations,
+      },
+    );
+  }
+
   /// Generate sample contacts around a center location
   static List<Contact> generateContacts({
     required LatLng centerLocation,
@@ -113,7 +167,7 @@ class SampleDataGenerator {
   }
 
   /// Generate sample SAR markers around a center location
-  static List<Message> generateSarMarkerMessages({
+  static SampleMessageBatch generateSarMarkerMessages({
     required LatLng centerLocation,
     required AppLocalizations l10n,
     int foundPersonCount = 2,
@@ -122,6 +176,7 @@ class SampleDataGenerator {
     int objectCount = 1,
   }) {
     final messages = <Message>[];
+    final contactLocations = <String, MessageContactLocation>{};
     final now = DateTime.now();
     int messageId = 1;
 
@@ -137,7 +192,7 @@ class SampleDataGenerator {
       );
 
       final timestamp = now.subtract(Duration(minutes: 10 + i * 5));
-      messages.add(Message(
+      final message = Message(
         id: 'sample_fp_$messageId',
         messageType: MessageType.contact,
         senderPublicKeyPrefix: senderKey.sublist(0, 6),
@@ -150,7 +205,13 @@ class SampleDataGenerator {
         sarGpsCoordinates: LatLng(lat, lon),
         sarCustomEmoji: '🧑',
         senderName: l10n.sampleTeamMember,
-      ));
+      );
+      messages.add(message);
+      contactLocations[message.id] = _sampleSnapshot(
+        location: _randomNearbyLocation(message.sarGpsCoordinates!, 0.006),
+        receivedAt: timestamp,
+        source: 'telemetry',
+      );
       messageId++;
     }
 
@@ -166,7 +227,7 @@ class SampleDataGenerator {
       );
 
       final timestamp = now.subtract(Duration(minutes: 20 + i * 5));
-      messages.add(Message(
+      final message = Message(
         id: 'sample_fire_$messageId',
         messageType: MessageType.contact,
         senderPublicKeyPrefix: senderKey.sublist(0, 6),
@@ -179,7 +240,13 @@ class SampleDataGenerator {
         sarGpsCoordinates: LatLng(lat, lon),
         sarCustomEmoji: '🔥',
         senderName: l10n.sampleScout,
-      ));
+      );
+      messages.add(message);
+      contactLocations[message.id] = _sampleSnapshot(
+        location: _randomNearbyLocation(message.sarGpsCoordinates!, 0.008),
+        receivedAt: timestamp,
+        source: 'advert',
+      );
       messageId++;
     }
 
@@ -195,7 +262,7 @@ class SampleDataGenerator {
       );
 
       final timestamp = now.subtract(Duration(minutes: 30 + i * 5));
-      messages.add(Message(
+      final message = Message(
         id: 'sample_staging_$messageId',
         messageType: MessageType.contact,
         senderPublicKeyPrefix: senderKey.sublist(0, 6),
@@ -208,7 +275,13 @@ class SampleDataGenerator {
         sarGpsCoordinates: LatLng(lat, lon),
         sarCustomEmoji: '🏕️',
         senderName: l10n.sampleBase,
-      ));
+      );
+      messages.add(message);
+      contactLocations[message.id] = _sampleSnapshot(
+        location: _randomNearbyLocation(message.sarGpsCoordinates!, 0.01),
+        receivedAt: timestamp,
+        source: 'advert',
+      );
       messageId++;
     }
 
@@ -231,24 +304,34 @@ class SampleDataGenerator {
         l10n.sampleObjectTrailMarker,
       ];
 
-      messages.add(Message(
+      final message = Message(
         id: 'sample_object_$messageId',
         messageType: MessageType.contact,
         senderPublicKeyPrefix: senderKey.sublist(0, 6),
         pathLen: 1,
         textType: MessageTextType.plain,
         senderTimestamp: timestamp.millisecondsSinceEpoch ~/ 1000,
-        text: 'S:📦:${lat.toStringAsFixed(5)},${lon.toStringAsFixed(5)}${notes[i % notes.length]}',
+        text:
+            'S:📦:${lat.toStringAsFixed(5)},${lon.toStringAsFixed(5)}${notes[i % notes.length]}',
         receivedAt: timestamp,
         isSarMarker: true,
         sarGpsCoordinates: LatLng(lat, lon),
         sarCustomEmoji: '📦',
         senderName: l10n.sampleSearcher,
-      ));
+      );
+      messages.add(message);
+      contactLocations[message.id] = _sampleSnapshot(
+        location: _randomNearbyLocation(message.sarGpsCoordinates!, 0.007),
+        receivedAt: timestamp,
+        source: 'telemetry',
+      );
       messageId++;
     }
 
-    return messages;
+    return SampleMessageBatch(
+      messages: messages,
+      contactLocations: contactLocations,
+    );
   }
 
   /// Generate sample map drawings
@@ -272,7 +355,9 @@ class SampleDataGenerator {
       'id': 'sample_line_${now.millisecondsSinceEpoch}',
       'color': Colors.blue.toARGB32(),
       'createdAt': now.subtract(const Duration(minutes: 15)).toIso8601String(),
-      'points': linePoints.map((p) => {'lat': p.latitude, 'lon': p.longitude}).toList(),
+      'points': linePoints
+          .map((p) => {'lat': p.latitude, 'lon': p.longitude})
+          .toList(),
       'sender': l10n.sampleTeamMember,
     });
 
@@ -297,7 +382,7 @@ class SampleDataGenerator {
   }
 
   /// Generate sample channel messages for public channels
-  static List<Message> generateChannelMessages({
+  static SampleMessageBatch generateChannelMessages({
     LatLng? centerLocation,
     required AppLocalizations l10n,
     int generalChannelMessages = 8,
@@ -306,6 +391,7 @@ class SampleDataGenerator {
     // Use provided location or default to Ljubljana, Slovenia
     final center = centerLocation ?? const LatLng(46.0569, 14.5058);
     final messages = <Message>[];
+    final contactLocations = <String, MessageContactLocation>{};
     final now = DateTime.now();
     int messageId = 1000; // Start with high ID to avoid conflicts
 
@@ -352,7 +438,11 @@ class SampleDataGenerator {
     ];
 
     // Generate General channel messages
-    for (int i = 0; i < generalChannelMessages && i < generalMessages.length; i++) {
+    for (
+      int i = 0;
+      i < generalChannelMessages && i < generalMessages.length;
+      i++
+    ) {
       final senderKey = Uint8List.fromList(
         List.generate(32, (_) => _random.nextInt(256)),
       );
@@ -361,7 +451,7 @@ class SampleDataGenerator {
       final minutesAgo = 120 - (i * 15) - _random.nextInt(10);
       final timestamp = now.subtract(Duration(minutes: minutesAgo));
 
-      messages.add(Message(
+      final message = Message(
         id: 'sample_general_$messageId',
         messageType: MessageType.channel,
         channelIdx: 0, // General channel
@@ -372,12 +462,22 @@ class SampleDataGenerator {
         text: generalMessages[i],
         receivedAt: timestamp,
         senderName: teamNames[_random.nextInt(teamNames.length)],
-      ));
+      );
+      messages.add(message);
+      contactLocations[message.id] = _sampleSnapshot(
+        location: _randomNearbyLocation(center, 0.018),
+        receivedAt: timestamp,
+        source: i.isEven ? 'telemetry' : 'advert',
+      );
       messageId++;
     }
 
     // Generate Emergency channel messages
-    for (int i = 0; i < emergencyChannelMessages && i < emergencyMessages.length; i++) {
+    for (
+      int i = 0;
+      i < emergencyChannelMessages && i < emergencyMessages.length;
+      i++
+    ) {
       final senderKey = Uint8List.fromList(
         List.generate(32, (_) => _random.nextInt(256)),
       );
@@ -386,7 +486,7 @@ class SampleDataGenerator {
       final minutesAgo = 60 - (i * 10) - _random.nextInt(5);
       final timestamp = now.subtract(Duration(minutes: minutesAgo));
 
-      messages.add(Message(
+      final message = Message(
         id: 'sample_emergency_$messageId',
         messageType: MessageType.channel,
         channelIdx: 1, // Emergency channel
@@ -397,10 +497,29 @@ class SampleDataGenerator {
         text: emergencyMessages[i],
         receivedAt: timestamp,
         senderName: teamNames[_random.nextInt(teamNames.length)],
-      ));
+      );
+      messages.add(message);
+      contactLocations[message.id] = _sampleSnapshot(
+        location: _randomNearbyLocation(center, 0.012),
+        receivedAt: timestamp,
+        source: i.isEven ? 'advert' : 'telemetry',
+      );
       messageId++;
     }
 
-    return messages;
+    return SampleMessageBatch(
+      messages: messages,
+      contactLocations: contactLocations,
+    );
   }
 }
+
+class SampleMessageBatch {
+  final List<Message> messages;
+  final Map<String, MessageContactLocation> contactLocations;
+
+  const SampleMessageBatch({
+    required this.messages,
+    required this.contactLocations,
+  });
+}

lib/utils/transmission_target_resolver.dart

@@ -3,7 +3,7 @@ import 'dart:typed_data';
 import '../models/contact.dart';
 import '../providers/contacts_provider.dart';
 
-enum TransmissionTargetFailure { unknownContact, unknownRoute, tooFar }
+enum TransmissionTargetFailure { unknownContact, unknownRoute, tooFar, unreachable }
 
 class TransmissionTargetResolution {
   final Contact? target;

lib/widgets/common/contact_avatar.dart

@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+
+import '../../models/contact.dart';
+import '../../services/trail_color_service.dart';
+import '../../utils/avatar_label_helper.dart';
+
+class ContactAvatar extends StatelessWidget {
+  final Contact contact;
+  final double radius;
+  final String? displayName;
+
+  const ContactAvatar({
+    super.key,
+    required this.contact,
+    this.radius = 20,
+    this.displayName,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final backgroundColor = _getBackgroundColor(context);
+    final foregroundColor = _getForegroundColor(backgroundColor);
+    final emoji = contact.roleEmoji;
+
+    if (emoji != null && emoji.isNotEmpty) {
+      return _buildAvatarFrame(
+        backgroundColor: backgroundColor,
+        child: Text(emoji, style: TextStyle(fontSize: radius * 1.05)),
+      );
+    }
+
+    if (_shouldUseLabelFallback) {
+      return _buildAvatarFrame(
+        backgroundColor: backgroundColor,
+        child: Text(
+          AvatarLabelHelper.buildLabel(displayName ?? contact.displayName),
+          style: TextStyle(
+            color: foregroundColor,
+            fontSize: radius * 0.68,
+            fontWeight: FontWeight.w700,
+            letterSpacing: -0.4,
+          ),
+        ),
+      );
+    }
+
+    return _buildAvatarFrame(
+      backgroundColor: backgroundColor,
+      child: Icon(
+        _getTypeIcon(contact.type),
+        color: foregroundColor,
+        size: radius,
+      ),
+    );
+  }
+
+  Widget _buildAvatarFrame({
+    required Color backgroundColor,
+    required Widget child,
+  }) {
+    if (_usesSquareShape) {
+      return Container(
+        width: radius * 2,
+        height: radius * 2,
+        decoration: BoxDecoration(
+          color: backgroundColor,
+          borderRadius: BorderRadius.circular(radius * 0.6),
+        ),
+        alignment: Alignment.center,
+        child: child,
+      );
+    }
+
+    return CircleAvatar(
+      radius: radius,
+      backgroundColor: backgroundColor,
+      child: child,
+    );
+  }
+
+  bool get _shouldUseLabelFallback =>
+      contact.type == ContactType.chat ||
+      contact.type == ContactType.channel ||
+      contact.type == ContactType.room;
+
+  bool get _usesSquareShape =>
+      contact.type == ContactType.channel || contact.type == ContactType.room;
+
+  Color _getBackgroundColor(BuildContext context) {
+    if (_shouldUseLabelFallback || (contact.roleEmoji?.isNotEmpty ?? false)) {
+      return TrailColorService.getTrailColor(contact);
+    }
+
+    switch (contact.type) {
+      case ContactType.none:
+        return Theme.of(context).colorScheme.surfaceContainerHighest;
+      case ContactType.chat:
+        return Colors.blue;
+      case ContactType.repeater:
+        return Colors.orange;
+      case ContactType.room:
+        return Colors.purple;
+      case ContactType.channel:
+        return Colors.teal;
+    }
+  }
+
+  Color _getForegroundColor(Color backgroundColor) {
+    return ThemeData.estimateBrightnessForColor(backgroundColor) ==
+            Brightness.dark
+        ? Colors.white
+        : Colors.black87;
+  }
+
+  IconData _getTypeIcon(ContactType type) {
+    switch (type) {
+      case ContactType.none:
+        return Icons.help_outline;
+      case ContactType.chat:
+        return Icons.person;
+      case ContactType.repeater:
+        return Icons.router;
+      case ContactType.room:
+        return Icons.meeting_room;
+      case ContactType.channel:
+        return Icons.public;
+    }
+  }
+}

lib/widgets/common/location_display.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:latlong2/latlong.dart';
 import '../../l10n/app_localizations.dart';
+import '../../utils/location_formats.dart';
 
 /// Reusable location display widget with tap-to-show modal
 /// Shows coordinates in a compact format with ability to view all formats
@@ -35,9 +36,9 @@ class LocationDisplay extends StatelessWidget {
               Text(
                 '${location.latitude.toStringAsFixed(5)}, ${location.longitude.toStringAsFixed(5)}',
                 style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                      fontFamily: 'monospace',
+                  fontFamily: 'monospace',
-                      fontWeight: FontWeight.w600,
+                  fontWeight: FontWeight.w600,
-                    ),
+                ),
               ),
               const SizedBox(width: 6),
               Icon(
@@ -54,9 +55,9 @@ class LocationDisplay extends StatelessWidget {
     // Non-compact version (just text)
     return Text(
       '${location.latitude.toStringAsFixed(5)}, ${location.longitude.toStringAsFixed(5)}',
-      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+      style: Theme.of(
-            fontFamily: 'monospace',
+        context,
-          ),
+      ).textTheme.bodyMedium?.copyWith(fontFamily: 'monospace'),
     );
   }
 
@@ -79,10 +80,7 @@ class LocationDisplay extends StatelessWidget {
                 children: [
                   const Text(
                     'Location Formats',
-                    style: TextStyle(
+                    style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
                   ),
                   IconButton(
                     icon: const Icon(Icons.close),
@@ -121,7 +119,7 @@ class LocationDisplay extends StatelessWidget {
               _buildFormatRow(
                 context,
                 'Plus Code',
-                _convertToPlusCode(location.latitude, location.longitude),
+                formatPlusCode(location.latitude, location.longitude),
               ),
               const SizedBox(height: 8),
             ],
@@ -140,9 +138,9 @@ class LocationDisplay extends StatelessWidget {
           Text(
             label,
             style: Theme.of(context).textTheme.labelMedium?.copyWith(
-                  color: Colors.grey,
+              color: Colors.grey,
-                  fontWeight: FontWeight.w500,
+              fontWeight: FontWeight.w500,
-                ),
+            ),
           ),
           const SizedBox(height: 4),
           InkWell(
@@ -150,7 +148,9 @@ class LocationDisplay extends StatelessWidget {
               Clipboard.setData(ClipboardData(text: value));
               ScaffoldMessenger.of(context).showSnackBar(
                 SnackBar(
-                  content: Text(AppLocalizations.of(context)!.copiedToClipboard(label)),
+                  content: Text(
+                    AppLocalizations.of(context)!.copiedToClipboard(label),
+                  ),
                   duration: const Duration(seconds: 2),
                 ),
               );
@@ -168,9 +168,9 @@ class LocationDisplay extends StatelessWidget {
                     child: Text(
                       value,
                       style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                            fontFamily: 'monospace',
+                        fontFamily: 'monospace',
-                            fontWeight: FontWeight.w500,
+                        fontWeight: FontWeight.w500,
-                          ),
+                      ),
                     ),
                   ),
                   Icon(
@@ -242,31 +242,4 @@ class LocationDisplay extends StatelessWidget {
     // Full MGRS would require UTM conversion library
     return '$zone$letter (approximate)';
   }
-
-  /// Convert to Google Plus Code format
-  /// Simplified implementation - returns approximate code
-  String _convertToPlusCode(double lat, double lon) {
-    // This is a simplified version - full Plus Code requires the open_location_code package
-    const base = '23456789CFGHJMPQRVWX';
-
-    // Normalize coordinates
-    lat = (lat + 90) / 180; // 0 to 1
-    lon = (lon + 180) / 360; // 0 to 1
-
-    String code = '';
-    for (int i = 0; i < 8; i++) {
-      if (i == 4) code += '+';
-
-      int latDigit = (lat * 20).floor() % 20;
-      int lonDigit = (lon * 20).floor() % 20;
-
-      code += base[latDigit];
-      code += base[lonDigit];
-
-      lat = (lat * 20) % 1;
-      lon = (lon * 20) % 1;
-    }
-
-    return code;
-  }
 }

lib/widgets/connection_dialog.dart

@@ -21,10 +21,19 @@ class _ConnectionDialogState extends State<ConnectionDialog>
   final List<DiscoveredServer> _discoveredServers = [];
   int _scannedCount = 0;
   int _totalToScan = 0;
-  String? _connectingToServerKey; // Track which server is being connected to (ip:port)
+  int _lastTabIndex = 0;
+  String?
+  _connectingToServerKey; // Track which server is being connected to (ip:port)
 
   // Named listener method for proper cleanup
   void _onTabChanged() {
+    if (_tabController.index == _lastTabIndex) return;
+    _lastTabIndex = _tabController.index;
+
+    if (_tabController.index == 0) {
+      _refreshBleDevices();
+    }
+
     if (_tabController.index == 1) {
       // Switched to network tab
       if (_networkScanner.hasCachedResults && _discoveredServers.isEmpty) {
@@ -47,13 +56,16 @@ class _ConnectionDialogState extends State<ConnectionDialog>
   void initState() {
     super.initState();
     _tabController = TabController(length: 2, vsync: this);
-    _connectionProvider = Provider.of<ConnectionProvider>(context, listen: false);
+    _connectionProvider = Provider.of<ConnectionProvider>(
+      context,
+      listen: false,
+    );
 
     // Defer scan startup until after the first frame so Provider listeners
     // are not notified while this dialog is still being built.
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!mounted) return;
-      _connectionProvider.startScan();
+      _refreshBleDevices();
     });
 
     // Set up network scanner callbacks
@@ -101,6 +113,12 @@ class _ConnectionDialogState extends State<ConnectionDialog>
     _networkScanner.scan();
   }
 
+  Future<void> _refreshBleDevices() async {
+    await _connectionProvider.stopScan();
+    if (!mounted) return;
+    await _connectionProvider.startScan();
+  }
+
   Color _getSignalColor(int rssi) {
     if (rssi >= -60) return Colors.green;
     if (rssi >= -75) return Colors.orange;
@@ -218,10 +236,7 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                   Icons.refresh,
                   color: Theme.of(context).colorScheme.onPrimaryContainer,
                 ),
-                onPressed: () {
+                onPressed: _refreshBleDevices,
-                  connectionProvider.stopScan();
-                  connectionProvider.startScan();
-                },
               ),
             ],
           ),
@@ -255,10 +270,7 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                       ),
                       const SizedBox(height: 8),
                       TextButton.icon(
-                        onPressed: () {
+                        onPressed: _refreshBleDevices,
-                          connectionProvider.stopScan();
-                          connectionProvider.startScan();
-                        },
                         icon: const Icon(Icons.refresh),
                         label: Text(AppLocalizations.of(context)!.scanAgain),
                       ),

lib/widgets/contacts/contact_tile.dart

@@ -11,6 +11,7 @@ import '../../providers/map_provider.dart';
 import '../../providers/app_provider.dart';
 import 'direct_message_sheet.dart';
 import 'room_login_sheet.dart';
+import '../../utils/location_formats.dart';
 import '../../utils/toast_logger.dart';
 import '../../utils/battery_display_helper.dart';
 import '../../l10n/app_localizations.dart';
@@ -69,6 +70,9 @@ class ContactTile extends StatelessWidget {
 
     // Get room login state if this is a room
     final connectionProvider = context.watch<ConnectionProvider>();
+    final isPingInProgress = connectionProvider.isPingInProgress(
+      contact.publicKey,
+    );
     final roomLoginState = contact.type == ContactType.room
         ? connectionProvider.getRoomLoginState(contact.publicKeyPrefix)
         : null;
@@ -187,6 +191,17 @@ class ContactTile extends StatelessWidget {
                 ),
               ),
             ],
+            if (isPingInProgress) ...[
+              const SizedBox(width: 6),
+              SizedBox(
+                width: 14,
+                height: 14,
+                child: CircularProgressIndicator(
+                  strokeWidth: 2,
+                  color: Theme.of(context).colorScheme.primary,
+                ),
+              ),
+            ],
           ],
         ),
         subtitle: isSimpleMode
@@ -457,39 +472,43 @@ class ContactTile extends StatelessWidget {
             _showContactDetails(context, contact);
           }
         },
-        onLongPress: () async {
+        onLongPress: isPingInProgress
-          final connectionProvider = context.read<ConnectionProvider>();
+            ? null
+            : () async {
+                final connectionProvider = context.read<ConnectionProvider>();
 
-          // Determine if we should use flooding (no path) or direct (has path)
+                // Determine if we should use flooding (no path) or direct (has path)
-          final hasPath = contact.hasPath;
+                final hasPath = contact.hasPath;
 
-          // Use smart ping with automatic fallback
+                // Use smart ping with automatic fallback
-          final result = await connectionProvider.smartPing(
+                final result = await connectionProvider.smartPing(
-            contactPublicKey: contact.publicKey,
+                  contactPublicKey: contact.publicKey,
-            hasPath: hasPath,
+                  hasPath: hasPath,
-            onRetryWithFlooding: () {
+                  onRetryWithFlooding: () {
-              // Called when retrying with flooding after direct timeout
+                    // Called when retrying with flooding after direct timeout
-              if (context.mounted) {
+                    if (context.mounted) {
-                ToastLogger.warning(
+                      ToastLogger.warning(
-                  context,
+                        context,
-                  AppLocalizations.of(
+                        AppLocalizations.of(
-                    context,
+                          context,
-                  )!.directPingTimeout(contact.displayName),
+                        )!.directPingTimeout(contact.displayName),
+                      );
+                    }
+                  },
                 );
-              }
-            },
-          );
 
-          // Show final result
+                // Show final result
-          if (context.mounted) {
+                if (context.mounted) {
-            if (!result.success) {
+                  if (!result.success) {
-              ToastLogger.error(
+                    ToastLogger.error(
-                context,
+                      context,
-                AppLocalizations.of(context)!.pingFailed(contact.displayName),
+                      AppLocalizations.of(
-              );
+                        context,
-            }
+                      )!.pingFailed(contact.displayName),
-          }
+                    );
-        },
+                  }
+                }
+              },
       ),
     );
   }
@@ -602,8 +621,12 @@ class ContactTile extends StatelessWidget {
         minChildSize: 0.4,
         maxChildSize: 0.9,
         expand: false,
-        builder: (context, scrollController) => Column(
+        builder: (context, scrollController) {
-          children: [
+          final isPingInProgress = context
+              .watch<ConnectionProvider>()
+              .isPingInProgress(contact.publicKey);
+          return Column(
+            children: [
             // Handle bar
             Container(
               margin: const EdgeInsets.only(top: 8, bottom: 16),
@@ -827,7 +850,7 @@ class ContactTile extends StatelessWidget {
                     _detailRowWithCopy(
                       context,
                       'Plus Code',
-                      _convertToPlusCode(
+                      formatPlusCode(
                         contact.displayLocation!.latitude,
                         contact.displayLocation!.longitude,
                       ),
@@ -846,15 +869,25 @@ class ContactTile extends StatelessWidget {
                           ),
                         ),
                         TextButton.icon(
-                          onPressed: () {
+                          onPressed: isPingInProgress
-                            final connectionProvider = context
+                              ? null
-                                .read<ConnectionProvider>();
+                              : () {
-                            connectionProvider.requestTelemetry(
+                                  final connectionProvider = context
-                              contact.publicKey,
+                                      .read<ConnectionProvider>();
-                              zeroHop: true,
+                                  connectionProvider.requestTelemetry(
-                            );
+                                    contact.publicKey,
-                          },
+                                    zeroHop: true,
-                          icon: const Icon(Icons.refresh, size: 18),
+                                  );
+                                },
+                          icon: isPingInProgress
+                              ? const SizedBox(
+                                  width: 16,
+                                  height: 16,
+                                  child: CircularProgressIndicator(
+                                    strokeWidth: 2,
+                                  ),
+                                )
+                              : const Icon(Icons.refresh, size: 18),
                           label: Text(AppLocalizations.of(context)!.refresh),
                           style: TextButton.styleFrom(
                             padding: const EdgeInsets.symmetric(
@@ -990,8 +1023,9 @@ class ContactTile extends StatelessWidget {
                 ],
               ),
             ),
-          ],
+            ],
-        ),
+          );
+        },
       ),
     );
   }
@@ -1113,34 +1147,6 @@ class ContactTile extends StatelessWidget {
     return '$zone$letter (approximate)';
   }
 
-  /// Convert to Google Plus Code format
-  /// Simplified implementation - returns approximate code
-  String _convertToPlusCode(double lat, double lon) {
-    // This is a simplified version - full Plus Code requires the open_location_code package
-    // For now, return a placeholder that shows it's not fully implemented
-    const base = '23456789CFGHJMPQRVWX';
-
-    // Normalize coordinates
-    lat = (lat + 90) / 180; // 0 to 1
-    lon = (lon + 180) / 360; // 0 to 1
-
-    String code = '';
-    for (int i = 0; i < 8; i++) {
-      if (i == 4) code += '+';
-
-      int latDigit = (lat * 20).floor() % 20;
-      int lonDigit = (lon * 20).floor() % 20;
-
-      code += base[latDigit];
-      code += base[lonDigit];
-
-      lat = (lat * 20) % 1;
-      lon = (lon * 20) % 1;
-    }
-
-    return code;
-  }
-
   IconData _getTypeIcon(ContactType type) {
     switch (type) {
       case ContactType.chat:

lib/widgets/device/spectrum_scan_panel.dart

@@ -0,0 +1,394 @@
+import 'package:flutter/material.dart';
+import 'package:meshcore_client/meshcore_client.dart';
+
+class SpectrumScanPanel extends StatelessWidget {
+  final ThemeData theme;
+  final bool scanSupported;
+  final bool isRunning;
+  final double rangeMinMhz;
+  final double rangeMaxMhz;
+  final RangeValues rangeValues;
+  final double bandwidthKhz;
+  final int? selectedFrequencyKhz;
+  final List<SpectrumScanCandidate> graphCandidates;
+  final List<SpectrumScanCandidate> selectableCandidates;
+  final ValueChanged<RangeValues> onRangeChanged;
+  final ValueChanged<int?> onCandidateChanged;
+  final VoidCallback onRunScan;
+  final VoidCallback onApplySelected;
+
+  const SpectrumScanPanel({
+    super.key,
+    required this.theme,
+    required this.scanSupported,
+    required this.isRunning,
+    required this.rangeMinMhz,
+    required this.rangeMaxMhz,
+    required this.rangeValues,
+    required this.bandwidthKhz,
+    required this.selectedFrequencyKhz,
+    required this.graphCandidates,
+    required this.selectableCandidates,
+    required this.onRangeChanged,
+    required this.onCandidateChanged,
+    required this.onRunScan,
+    required this.onApplySelected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(14),
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surfaceContainerHighest.withValues(
+          alpha: 0.45,
+        ),
+        borderRadius: BorderRadius.circular(18),
+        border: Border.all(color: theme.colorScheme.outlineVariant),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Icon(Icons.tune, color: theme.colorScheme.primary),
+              const SizedBox(width: 10),
+              Expanded(
+                child: Text(
+                  'Power Scan',
+                  style: theme.textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+                ),
+              ),
+              FilledButton.icon(
+                onPressed: scanSupported && !isRunning ? onRunScan : null,
+                icon: isRunning
+                    ? const SizedBox(
+                        width: 16,
+                        height: 16,
+                        child: CircularProgressIndicator(strokeWidth: 2),
+                      )
+                    : const Icon(Icons.radar),
+                label: Text(
+                  scanSupported
+                      ? (isRunning ? 'Scanning' : 'Scan')
+                      : 'Unavailable',
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 8),
+          Text(
+            scanSupported
+                ? 'Full range with bandwidth footprint. Firmware enforces hardware band limits and pauses the mesh while scanning.'
+                : 'Full range with bandwidth footprint. This companion does not support spectrum scan mode, so scanning is disabled.',
+            style: theme.textTheme.bodySmall?.copyWith(
+              color: theme.colorScheme.onSurfaceVariant,
+            ),
+          ),
+          const SizedBox(height: 14),
+          _FrequencyRangePreview(
+            minMhz: rangeMinMhz,
+            maxMhz: rangeMaxMhz,
+            selectedRange: rangeValues,
+            selectedBandwidthKhz: bandwidthKhz,
+            selectedFrequencyKhz: selectedFrequencyKhz,
+            candidates: graphCandidates,
+          ),
+          const SizedBox(height: 10),
+          Wrap(
+            spacing: 14,
+            runSpacing: 6,
+            children: [
+              _LegendChip(
+                color: theme.colorScheme.primary,
+                label: 'Quiet',
+              ),
+              const _LegendChip(color: Colors.orange, label: 'Moderate'),
+              _LegendChip(
+                color: theme.colorScheme.error,
+                label: 'Busy',
+              ),
+            ],
+          ),
+          const SizedBox(height: 10),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(
+                '${rangeValues.start.toStringAsFixed(3)} MHz',
+                style: theme.textTheme.labelMedium,
+              ),
+              Text(
+                '${rangeValues.end.toStringAsFixed(3)} MHz',
+                style: theme.textTheme.labelMedium,
+              ),
+            ],
+          ),
+          RangeSlider(
+            values: rangeValues,
+            min: rangeMinMhz,
+            max: rangeMaxMhz,
+            divisions: (((rangeMaxMhz - rangeMinMhz) * 20).round()).clamp(
+              1,
+              400,
+            ),
+            labels: RangeLabels(
+              rangeValues.start.toStringAsFixed(3),
+              rangeValues.end.toStringAsFixed(3),
+            ),
+            onChanged: onRangeChanged,
+          ),
+          if (selectableCandidates.isEmpty) ...[
+            const SizedBox(height: 6),
+            Container(
+              width: double.infinity,
+              padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
+              decoration: BoxDecoration(
+                color: theme.colorScheme.surface.withValues(alpha: 0.7),
+                borderRadius: BorderRadius.circular(12),
+                border: Border.all(color: theme.colorScheme.outlineVariant),
+              ),
+              child: Text(
+                scanSupported
+                    ? 'No scan results yet. Adjust the range and run a scan to populate candidate frequencies.'
+                    : 'Spectrum preview only. This companion can display the configured span, but cannot scan for open channels.',
+                style: theme.textTheme.bodySmall?.copyWith(
+                  color: theme.colorScheme.onSurfaceVariant,
+                ),
+              ),
+            ),
+          ] else ...[
+            const SizedBox(height: 10),
+            DropdownButtonFormField<int>(
+              initialValue: selectedFrequencyKhz,
+              isExpanded: true,
+              decoration: const InputDecoration(
+                labelText: 'Candidate frequency',
+                border: OutlineInputBorder(),
+                helperText: 'Best frequencies for the current bandwidth',
+              ),
+              items: selectableCandidates.map((candidate) {
+                return DropdownMenuItem<int>(
+                  value: candidate.centerFrequencyKhz,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        '${candidate.centerFrequencyMhz.toStringAsFixed(3)} MHz',
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                      Text(
+                        '${candidate.occupancyPercent}% occupied  |  peak ${candidate.peakRssiDbm} dBm',
+                        style: theme.textTheme.bodySmall?.copyWith(
+                          color: theme.colorScheme.onSurfaceVariant,
+                        ),
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ],
+                  ),
+                );
+              }).toList(),
+              selectedItemBuilder: (context) {
+                return selectableCandidates.map((candidate) {
+                  return Align(
+                    alignment: Alignment.centerLeft,
+                    child: Text(
+                      '${candidate.centerFrequencyMhz.toStringAsFixed(3)} MHz',
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  );
+                }).toList();
+              },
+              onChanged: onCandidateChanged,
+            ),
+            const SizedBox(height: 10),
+            Align(
+              alignment: Alignment.centerRight,
+              child: OutlinedButton.icon(
+                onPressed: selectedFrequencyKhz == null
+                    ? null
+                    : onApplySelected,
+                icon: const Icon(Icons.north_east),
+                label: const Text('Use selected frequency'),
+              ),
+            ),
+          ],
+        ],
+      ),
+    );
+  }
+}
+
+class _LegendChip extends StatelessWidget {
+  final Color color;
+  final String label;
+
+  const _LegendChip({required this.color, required this.label});
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          width: 10,
+          height: 10,
+          decoration: BoxDecoration(color: color, shape: BoxShape.circle),
+        ),
+        const SizedBox(width: 6),
+        Text(label, style: Theme.of(context).textTheme.labelMedium),
+      ],
+    );
+  }
+}
+
+class _FrequencyRangePreview extends StatelessWidget {
+  final double minMhz;
+  final double maxMhz;
+  final RangeValues selectedRange;
+  final double selectedBandwidthKhz;
+  final int? selectedFrequencyKhz;
+  final List<SpectrumScanCandidate> candidates;
+
+  const _FrequencyRangePreview({
+    required this.minMhz,
+    required this.maxMhz,
+    required this.selectedRange,
+    required this.selectedBandwidthKhz,
+    required this.selectedFrequencyKhz,
+    required this.candidates,
+  });
+
+  double _positionFor(double mhz) {
+    final span = maxMhz - minMhz;
+    if (span <= 0) return 0;
+    return ((mhz - minMhz) / span).clamp(0.0, 1.0);
+  }
+
+  Color _candidateColor(BuildContext context, int occupancyPercent) {
+    final scheme = Theme.of(context).colorScheme;
+    if (occupancyPercent <= 10) return scheme.primary;
+    if (occupancyPercent <= 35) return Colors.orange;
+    return scheme.error;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final scheme = Theme.of(context).colorScheme;
+    final spanMhz = maxMhz - minMhz;
+    final selectedFreqMhz = selectedFrequencyKhz != null
+        ? selectedFrequencyKhz! / 1000.0
+        : null;
+    final bwMhz = selectedBandwidthKhz / 1000.0;
+
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final width = constraints.maxWidth;
+        final rangeLeft = _positionFor(selectedRange.start) * width;
+        final rangeRight = _positionFor(selectedRange.end) * width;
+
+        double? bwLeft;
+        double? bwWidth;
+        if (selectedFreqMhz != null && spanMhz > 0) {
+          bwLeft = _positionFor(selectedFreqMhz - (bwMhz / 2)) * width;
+          final bwRight = _positionFor(selectedFreqMhz + (bwMhz / 2)) * width;
+          bwWidth = (bwRight - bwLeft).clamp(4.0, width);
+        }
+
+        return Container(
+          height: 108,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(16),
+            gradient: LinearGradient(
+              colors: [
+                scheme.surface,
+                scheme.surfaceContainerHighest.withValues(alpha: 0.9),
+              ],
+            ),
+            border: Border.all(color: scheme.outlineVariant),
+          ),
+          child: Stack(
+            children: [
+              Positioned.fill(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 10,
+                    vertical: 12,
+                  ),
+                  child: DecoratedBox(
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(12),
+                      gradient: LinearGradient(
+                        colors: [
+                          scheme.primary.withValues(alpha: 0.12),
+                          scheme.tertiary.withValues(alpha: 0.08),
+                          scheme.primary.withValues(alpha: 0.12),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+              Positioned(
+                left: rangeLeft,
+                top: 12,
+                width: (rangeRight - rangeLeft).clamp(8.0, width),
+                height: 56,
+                child: DecoratedBox(
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(12),
+                    color: scheme.primary.withValues(alpha: 0.20),
+                    border: Border.all(color: scheme.primary),
+                  ),
+                ),
+              ),
+              if (bwLeft != null && bwWidth != null)
+                Positioned(
+                  left: bwLeft,
+                  top: 28,
+                  width: bwWidth,
+                  height: 24,
+                  child: DecoratedBox(
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(999),
+                      color: scheme.tertiary.withValues(alpha: 0.32),
+                      border: Border.all(color: scheme.tertiary),
+                    ),
+                  ),
+                ),
+              for (final candidate in candidates)
+                Positioned(
+                  left: (_positionFor(candidate.centerFrequencyMhz) * width)
+                      .clamp(10.0, width - 18.0),
+                  top: 72,
+                  child: Column(
+                    children: [
+                      Container(
+                        width: 10,
+                        height: 10,
+                        decoration: BoxDecoration(
+                          shape: BoxShape.circle,
+                          color: _candidateColor(
+                            context,
+                            candidate.occupancyPercent,
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        candidate.centerFrequencyMhz.toStringAsFixed(3),
+                        style: Theme.of(context).textTheme.labelSmall,
+                      ),
+                    ],
+                  ),
+                ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}

lib/widgets/map/drawing_toolbar.dart

@@ -849,6 +849,7 @@ class DrawingToolbar extends StatelessWidget {
           contactPublicKey: room.publicKey,
           text: message,
           messageId: messageId,
+          contact: room,
         );
         debugPrint('  ✅ Sent successfully');
 

lib/widgets/messages/image_message_bubble.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_avif/flutter_avif.dart';
 import 'package:provider/provider.dart';
 import '../../models/message.dart';
+import '../../providers/app_provider.dart';
 import '../../providers/connection_provider.dart';
 import '../../providers/contacts_provider.dart';
 import '../../providers/image_provider.dart' as ip;
@@ -254,11 +255,17 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
     int pathLen = 0,
   }) async {
     if (_isRequesting) return;
+    setState(() {
+      _isRequesting = true;
+      _errorText = null;
+    });
+
     final conn = context.read<ConnectionProvider>();
     final imageProvider = context.read<ip.ImageProvider>();
     imageProvider.resumeIncomingSession(envelope.sessionId);
     final contactsProvider = context.read<ContactsProvider>();
-    final resolution = await TransmissionTargetResolver.resolveFetchTarget(
+    final appProvider = context.read<AppProvider>();
+    var resolution = await TransmissionTargetResolver.resolveFetchTarget(
       contactsProvider: contactsProvider,
       refreshContacts: conn.getContacts,
       isSentByMe: widget.isSentByMe,
@@ -271,6 +278,7 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
     if (!mounted) return;
 
     if (resolution.failure == TransmissionTargetFailure.unknownContact) {
+      _clearRequestState();
       await _showBlockingAlert(
         'Cannot fetch image',
         'Sender contact is unknown. Sync contacts first.',
@@ -278,6 +286,7 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
       return;
     }
     if (resolution.failure == TransmissionTargetFailure.unknownRoute) {
+      _clearRequestState();
       await _showBlockingAlert(
         'Cannot fetch image',
         'Sender route is unknown. Sync contacts/path first.',
@@ -285,14 +294,76 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
       return;
     }
     if (resolution.failure == TransmissionTargetFailure.tooFar) {
+      _clearRequestState();
       await _showBlockingAlert(
         'Cannot fetch image',
         'Message is too far (${resolution.hops} hops, max ${resolution.maxHops}).',
       );
       return;
     }
+    if (resolution.failure == TransmissionTargetFailure.unreachable) {
+      _clearRequestState();
+      await _showBlockingAlert(
+        'Cannot fetch image',
+        'Sender route did not respond to a path check. Sync contacts/path and try again.',
+      );
+      return;
+    }
+
+    var sender = resolution.target!;
+    var routeVerified = await appProvider.verifyRawTransportRoute(sender);
+    if (!mounted) return;
+    if (!routeVerified) {
+      await conn.getContacts();
+      if (!mounted) return;
+      resolution = await TransmissionTargetResolver.resolveFetchTarget(
+        contactsProvider: contactsProvider,
+        refreshContacts: conn.getContacts,
+        isSentByMe: widget.isSentByMe,
+        recipientPublicKey: widget.message.recipientPublicKey,
+        senderPublicKeyPrefix: widget.message.senderPublicKeyPrefix,
+        senderKey6FromEnvelope: envelope.senderKey6,
+        senderName: widget.message.senderName,
+        maxFetchHops: _maxFetchHops,
+      );
+      if (!mounted) return;
+      if (resolution.failure == TransmissionTargetFailure.unknownContact) {
+        _clearRequestState();
+        await _showBlockingAlert(
+          'Cannot fetch image',
+          'Sender contact is unknown. Sync contacts first.',
+        );
+        return;
+      }
+      if (resolution.failure == TransmissionTargetFailure.unknownRoute) {
+        _clearRequestState();
+        await _showBlockingAlert(
+          'Cannot fetch image',
+          'Sender route is unknown. Sync contacts/path first.',
+        );
+        return;
+      }
+      if (resolution.failure == TransmissionTargetFailure.tooFar) {
+        _clearRequestState();
+        await _showBlockingAlert(
+          'Cannot fetch image',
+          'Message is too far (${resolution.hops} hops, max ${resolution.maxHops}).',
+        );
+        return;
+      }
+      sender = resolution.target!;
+      routeVerified = await appProvider.verifyRawTransportRoute(sender);
+      if (!mounted) return;
+      if (!routeVerified) {
+        _clearRequestState();
+        await _showBlockingAlert(
+          'Cannot fetch image',
+          'Sender route did not respond on the raw transport path.',
+        );
+        return;
+      }
+    }
 
-    final sender = resolution.target!;
     if (sender.outPathLen >= 2) {
       _showToast(
         'Image fetch over ${sender.outPathLen} hops may take a while.',
@@ -302,6 +373,7 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
     setState(() => _errorText = null);
     final deviceKey = conn.deviceInfo.publicKey;
     if (deviceKey == null || deviceKey.length < 6) {
+      _clearRequestState();
       await _showBlockingAlert(
         'Cannot fetch image',
         'Device key is unavailable.',
@@ -332,13 +404,11 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
             timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
           );
 
-    setState(() {
-      _isRequesting = true;
-      _errorText = null;
-    });
-
     final payload = request.encodeBinary();
     try {
+      debugPrint(
+        '📷 [ImageMessageBubble] Outgoing image fetch request: session=${envelope.sessionId} want=${isPartialResume ? 'missing' : 'all'} target=${sender.advName} hops=${sender.outPathLen}',
+      );
       await conn.sendRawVoicePacket(
         contactPath: sender.outPath,
         contactPathLen: sender.outPathLen,
@@ -405,6 +475,13 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
     });
   }
 
+  void _clearRequestState() {
+    if (!mounted) return;
+    setState(() {
+      _isRequesting = false;
+    });
+  }
+
   Future<void> _showBlockingAlert(String title, String message) async {
     if (!mounted) return;
     _showToast('$title: $message');

lib/widgets/messages/message_bubble_header.dart

@@ -0,0 +1,160 @@
+import 'package:flutter/material.dart';
+
+import '../../models/contact.dart';
+import '../../models/message.dart';
+import '../../utils/avatar_label_helper.dart';
+import '../../utils/message_extensions.dart';
+import '../common/contact_avatar.dart';
+
+Widget buildMessageHeaderAvatar(
+  BuildContext context, {
+  required bool isOwnMessage,
+  required bool isChannelMessage,
+  required dynamic senderContact,
+  required String displayName,
+}) {
+  if (isOwnMessage) {
+    return CircleAvatar(
+      radius: 10.5,
+      backgroundColor: Theme.of(context).colorScheme.primaryContainer,
+      child: Icon(
+        Icons.account_circle,
+        size: 16,
+        color: Theme.of(context).colorScheme.primary,
+      ),
+    );
+  }
+
+  if (senderContact is Contact) {
+    return ContactAvatar(
+      contact: senderContact,
+      radius: 10.5,
+      displayName: displayName,
+    );
+  }
+
+  final background = isChannelMessage
+      ? Colors.teal.withValues(alpha: 0.16)
+      : Theme.of(context).colorScheme.surfaceContainerHighest;
+  final foreground = isChannelMessage
+      ? Colors.teal.shade800
+      : Theme.of(context).colorScheme.onSurfaceVariant;
+
+  return CircleAvatar(
+    radius: 10.5,
+    backgroundColor: background,
+    child: Text(
+      AvatarLabelHelper.buildLabel(displayName),
+      style: TextStyle(
+        fontSize: 10,
+        fontWeight: FontWeight.w700,
+        color: foreground,
+        letterSpacing: -0.2,
+      ),
+    ),
+  );
+}
+
+Widget buildBubbleMetaFooter(
+  BuildContext context, {
+  required Message message,
+  required bool isSarMarker,
+}) {
+  final metaColor = Theme.of(
+    context,
+  ).textTheme.labelSmall?.color?.withValues(alpha: 0.68);
+
+  final items = <Widget>[];
+
+  if (!isSarMarker && message.pathLen < 255) {
+    items.addAll([
+      Icon(Icons.alt_route, size: 11, color: metaColor),
+      const SizedBox(width: 3),
+      Text(
+        message.pathLen == 0 ? 'direct' : '${message.pathLen}hop',
+        style: Theme.of(
+          context,
+        ).textTheme.labelSmall?.copyWith(color: metaColor),
+      ),
+      Text(
+        ' • ',
+        style: Theme.of(
+          context,
+        ).textTheme.labelSmall?.copyWith(color: metaColor),
+      ),
+    ]);
+  }
+
+  items.add(
+    Text(
+      message.getLocalizedTimeAgo(context),
+      style: Theme.of(context).textTheme.labelSmall?.copyWith(
+        color: metaColor,
+        fontWeight: FontWeight.w500,
+      ),
+    ),
+  );
+
+  return Padding(
+    padding: const EdgeInsets.only(left: 6, right: 6, top: 1, bottom: 18),
+    child: Align(
+      alignment: Alignment.centerRight,
+      child: Row(mainAxisSize: MainAxisSize.min, children: items),
+    ),
+  );
+}
+
+Widget buildChannelHeaderPill(
+  BuildContext context, {
+  required String label,
+  IconData icon = Icons.campaign_outlined,
+}) {
+  final labelColor = Theme.of(
+    context,
+  ).textTheme.labelSmall?.color?.withValues(alpha: 0.82);
+
+  return Container(
+    padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
+    decoration: BoxDecoration(
+      color: Theme.of(
+        context,
+      ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.65),
+      borderRadius: BorderRadius.circular(999),
+    ),
+    child: Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Icon(
+          icon,
+          size: 11,
+          color: Theme.of(
+            context,
+          ).textTheme.labelSmall?.color?.withValues(alpha: 0.7),
+        ),
+        const SizedBox(width: 5),
+        Flexible(
+          child: Text(
+            label,
+            style: Theme.of(context).textTheme.labelSmall?.copyWith(
+              color: labelColor,
+              fontWeight: FontWeight.w600,
+            ),
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+          ),
+        ),
+      ],
+    ),
+  );
+}
+
+Widget buildDirectHeaderCounterpart(
+  BuildContext context, {
+  required String label,
+}) {
+  return buildChannelHeaderPill(
+    context,
+    label: label,
+    icon: Icons.alternate_email,
+  );
+}

lib/widgets/messages/message_bubble_signal.dart

@@ -0,0 +1,382 @@
+import 'package:flutter/material.dart';
+
+import '../../models/message.dart';
+import '../../models/message_reception_details.dart';
+
+IconData getDeliveryStatusIcon(MessageDeliveryStatus status) {
+  switch (status) {
+    case MessageDeliveryStatus.sending:
+      return Icons.schedule;
+    case MessageDeliveryStatus.sent:
+      return Icons.done;
+    case MessageDeliveryStatus.delivered:
+      return Icons.done_all;
+    case MessageDeliveryStatus.failed:
+      return Icons.error_outline;
+    case MessageDeliveryStatus.received:
+      return Icons.inbox;
+  }
+}
+
+Color getDeliveryStatusColor(MessageDeliveryStatus status) {
+  switch (status) {
+    case MessageDeliveryStatus.sending:
+      return Colors.orange;
+    case MessageDeliveryStatus.sent:
+      return Colors.blue;
+    case MessageDeliveryStatus.delivered:
+      return Colors.green;
+    case MessageDeliveryStatus.failed:
+      return Colors.red;
+    case MessageDeliveryStatus.received:
+      return Colors.grey;
+  }
+}
+
+Widget buildChannelEchoStatus(BuildContext context, Message message) {
+  final hasEcho = message.echoCount > 0;
+
+  if (!hasEcho) {
+    return const SizedBox.shrink();
+  }
+
+  final statusColor = getDeliveryStatusColor(message.deliveryStatus);
+  final rssi = message.lastEchoRssiDbm;
+  final snr = message.lastEchoSnrRaw != null
+      ? message.lastEchoSnrRaw!.toSigned(8) / 4.0
+      : null;
+  final quality = linkQualityLabel(rssi, snr);
+  final qualityColor = linkQualityColor(quality);
+
+  return Wrap(
+    spacing: 4,
+    crossAxisAlignment: WrapCrossAlignment.center,
+    children: [
+      _techChip(
+        context,
+        icon: Icons.hub_outlined,
+        label: 'x${message.echoCount}',
+        color: statusColor,
+      ),
+      if (message.expectedAckTag != null)
+        _techChip(
+          context,
+          icon: Icons.tag,
+          label:
+              'ACK ${message.expectedAckTag!.toRadixString(16).toUpperCase()}',
+          color: Colors.indigo,
+        ),
+      _techChip(context, icon: Icons.bolt, label: quality, color: qualityColor),
+      if (message.lastEchoRssiDbm != null)
+        _signalCapsule(
+          context,
+          icon: Icons.network_cell,
+          label: message.lastEchoRssiDbm!.toString(),
+          filled: rssiScore(message.lastEchoRssiDbm!),
+          color: Colors.blueGrey,
+        ),
+      if (message.lastEchoSnrRaw != null)
+        _signalCapsule(
+          context,
+          icon: Icons.graphic_eq,
+          label: (message.lastEchoSnrRaw!.toSigned(8) / 4.0).toStringAsFixed(1),
+          filled: snrScore(message.lastEchoSnrRaw!.toSigned(8) / 4.0),
+          color: Colors.teal,
+        ),
+    ],
+  );
+}
+
+bool shouldShowSentChannelStats(
+  Message message, {
+  required bool showReceivedStats,
+}) {
+  if (!message.isSentMessage || !message.isChannelMessage) {
+    return false;
+  }
+
+  final hasSignalData =
+      message.echoCount > 0 ||
+      message.lastEchoRssiDbm != null ||
+      message.lastEchoSnrRaw != null ||
+      message.expectedAckTag != null;
+  return showReceivedStats && hasSignalData;
+}
+
+Widget buildReceivedSignalStatus(
+  BuildContext context,
+  Message message, {
+  MessageReceptionDetails? receptionDetails,
+  required int? rssiDbm,
+  required double? snrDb,
+}) {
+  final hopLabel = hopDisplayLabel(message);
+
+  return Wrap(
+    spacing: 4,
+    runSpacing: 4,
+    crossAxisAlignment: WrapCrossAlignment.center,
+    children: [
+      _techChip(
+        context,
+        icon: Icons.alt_route,
+        label: hopLabel,
+        color: Colors.indigo,
+      ),
+      if (receptionDetails?.senderToReceiptMs != null)
+        _techChip(
+          context,
+          icon: Icons.schedule,
+          label: _formatMs(receptionDetails!.senderToReceiptMs!),
+          color: Colors.deepPurple,
+        ),
+      if (receptionDetails?.estimatedTransmitMs != null)
+        _techChip(
+          context,
+          icon: Icons.timelapse,
+          label: '~${_formatMs(receptionDetails!.estimatedTransmitMs!)} tx',
+          color: Colors.blue,
+        ),
+      if (receptionDetails?.postTransmitDelayMs != null)
+        _techChip(
+          context,
+          icon: Icons.hourglass_bottom,
+          label: '+${_formatMs(receptionDetails!.postTransmitDelayMs!)} lag',
+          color: Colors.orange,
+        ),
+      if (receptionDetails?.pathBytesHex != null)
+        _techChip(
+          context,
+          icon: Icons.route,
+          label: receptionDetails!.pathBytesHex!,
+          color: Colors.brown,
+        ),
+      if (rssiDbm != null || snrDb != null) ...[
+        _techChip(
+          context,
+          icon: Icons.bolt,
+          label: linkQualityLabel(rssiDbm, snrDb),
+          color: linkQualityColor(linkQualityLabel(rssiDbm, snrDb)),
+        ),
+        if (rssiDbm != null)
+          _signalCapsule(
+            context,
+            icon: Icons.network_cell,
+            label: '$rssiDbm',
+            filled: rssiScore(rssiDbm),
+            color: Colors.blueGrey,
+          ),
+        if (snrDb != null)
+          _signalCapsule(
+            context,
+            icon: Icons.graphic_eq,
+            label: snrDb.toStringAsFixed(1),
+            filled: snrScore(snrDb),
+            color: Colors.teal,
+          ),
+      ],
+    ],
+  );
+}
+
+Widget buildSentDirectSignalStatus(
+  BuildContext context,
+  Message message, {
+  required int roundTripTimeMs,
+  required Duration txEstimate,
+}) {
+  final estimatedTransmitMs = sanitizeEstimatedTransmitMs(
+    estimatedTransmitMs: txEstimate > Duration.zero
+        ? txEstimate.inMilliseconds
+        : null,
+    senderToReceiptMs: roundTripTimeMs,
+  );
+  final postTransmitDelayMs = estimatedTransmitMs != null
+      ? (roundTripTimeMs - estimatedTransmitMs).clamp(0, 86400000).toInt()
+      : null;
+
+  return Wrap(
+    spacing: 4,
+    runSpacing: 4,
+    crossAxisAlignment: WrapCrossAlignment.center,
+    children: [
+      _techChip(
+        context,
+        icon: Icons.alt_route,
+        label: hopDisplayLabel(message),
+        color: Colors.indigo,
+      ),
+      _techChip(
+        context,
+        icon: Icons.schedule,
+        label: _formatMs(roundTripTimeMs),
+        color: Colors.deepPurple,
+      ),
+      if (estimatedTransmitMs != null)
+        _techChip(
+          context,
+          icon: Icons.timelapse,
+          label: '~${_formatMs(estimatedTransmitMs)} tx',
+          color: Colors.blue,
+        ),
+      if (postTransmitDelayMs != null)
+        _techChip(
+          context,
+          icon: Icons.hourglass_bottom,
+          label: '+${_formatMs(postTransmitDelayMs)} lag',
+          color: Colors.orange,
+        ),
+      if (message.retryAttempt > 0)
+        _techChip(
+          context,
+          icon: Icons.refresh,
+          label: 'retry ${message.retryAttempt}/3',
+          color: Colors.redAccent,
+        ),
+      if (message.suggestedTimeoutMs != null)
+        _techChip(
+          context,
+          icon: Icons.timer_outlined,
+          label: 'timeout ${_formatMs(message.suggestedTimeoutMs!)}',
+          color: Colors.blueGrey,
+        ),
+      if (message.usedFloodFallback)
+        _techChip(
+          context,
+          icon: Icons.waves,
+          label: 'flood fallback',
+          color: Colors.teal,
+        )
+      else if (message.expectedAckTag != null)
+        _techChip(
+          context,
+          icon: Icons.route,
+          label: 'direct ACK',
+          color: Colors.indigo,
+        ),
+    ],
+  );
+}
+
+String _formatMs(int value) {
+  if (value >= 60000) {
+    final minutes = value ~/ 60000;
+    final seconds = (value % 60000) ~/ 1000;
+    return '${minutes}m ${seconds}s';
+  }
+  if (value >= 1000) {
+    return '${(value / 1000).toStringAsFixed(value >= 10000 ? 0 : 1)}s';
+  }
+  return '${value}ms';
+}
+
+String hopDisplayLabel(Message message) {
+  if (message.pathLen == 0) return 'Direct';
+  if (message.pathLen >= 255 && message.isContactMessage) return 'Direct';
+  if (message.pathLen >= 255) return 'Unknown';
+  return '${message.pathLen} hop${message.pathLen == 1 ? '' : 's'}';
+}
+
+Widget _techChip(
+  BuildContext context, {
+  required IconData icon,
+  required String label,
+  required Color color,
+}) {
+  return Container(
+    padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 1.5),
+    decoration: BoxDecoration(
+      color: color.withValues(alpha: 0.12),
+      borderRadius: BorderRadius.circular(8),
+    ),
+    child: Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Icon(icon, size: 10, color: color),
+        const SizedBox(width: 2),
+        Text(
+          label,
+          style: Theme.of(context).textTheme.labelSmall?.copyWith(
+            color: color,
+            fontWeight: FontWeight.w600,
+            fontSize: 10,
+          ),
+        ),
+      ],
+    ),
+  );
+}
+
+Widget _signalCapsule(
+  BuildContext context, {
+  required IconData icon,
+  required String label,
+  required int filled,
+  required Color color,
+}) {
+  return Container(
+    padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 1.5),
+    decoration: BoxDecoration(
+      color: color.withValues(alpha: 0.12),
+      borderRadius: BorderRadius.circular(8),
+    ),
+    child: Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Icon(icon, size: 10, color: color),
+        const SizedBox(width: 2),
+        Row(
+          mainAxisSize: MainAxisSize.min,
+          children: List.generate(5, (i) {
+            final active = i < filled;
+            return Container(
+              width: 3,
+              height: (4 + i).toDouble(),
+              margin: const EdgeInsets.symmetric(horizontal: 0.5),
+              decoration: BoxDecoration(
+                color: active ? color : color.withValues(alpha: 0.18),
+                borderRadius: BorderRadius.circular(1),
+              ),
+            );
+          }),
+        ),
+        const SizedBox(width: 2),
+        Text(
+          label,
+          style: Theme.of(context).textTheme.labelSmall?.copyWith(
+            color: color,
+            fontWeight: FontWeight.w600,
+            fontSize: 10,
+          ),
+        ),
+      ],
+    ),
+  );
+}
+
+int rssiScore(int rssiDbm) => ((rssiDbm + 120) / 10).round().clamp(0, 5);
+
+int snrScore(double snrDb) => ((snrDb + 5.0) / 5.0).round().clamp(0, 5);
+
+String linkQualityLabel(int? rssiDbm, double? snrDb) {
+  var score = 0;
+  if (rssiDbm != null) score += rssiScore(rssiDbm);
+  if (snrDb != null) score += snrScore(snrDb);
+  if (score >= 8) return 'Excellent';
+  if (score >= 6) return 'Good';
+  if (score >= 4) return 'Fair';
+  return 'Weak';
+}
+
+Color linkQualityColor(String quality) {
+  switch (quality) {
+    case 'Excellent':
+      return Colors.green;
+    case 'Good':
+      return Colors.lightGreen;
+    case 'Fair':
+      return Colors.orange;
+    default:
+      return Colors.redAccent;
+  }
+}

lib/widgets/messages/message_trace_sheet.dart

@@ -30,7 +30,9 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
 
   Future<_TraceResult> _loadTrace() async {
     final connectionProvider = context.read<ConnectionProvider>();
-    final nodes = await MeshMapNodesService.fetchNodes();
+    final nodes = await MeshMapNodesService.fetchNodes(
+      cacheTtl: MeshMapNodesService.traceCacheTtl,
+    );
     final packetPath = _extractPathFromPacketLogs(
       logs: connectionProvider.bleService.packetLogs,
       message: widget.message,
@@ -166,23 +168,31 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
                               child: hasMapPath
                                   ? flutter_map.FlutterMap(
                                       options: flutter_map.MapOptions(
-                                        initialCameraFit: flutter_map.CameraFit.bounds(
+                                        initialCameraFit:
-                                          bounds: flutter_map.LatLngBounds.fromPoints(mapPoints),
+                                            flutter_map.CameraFit.bounds(
-                                          padding: const EdgeInsets.all(28),
+                                              bounds:
-                                        ),
+                                                  flutter_map
+                                                      .LatLngBounds.fromPoints(
+                                                    mapPoints,
+                                                  ),
+                                              padding: const EdgeInsets.all(28),
+                                            ),
                                       ),
                                       children: [
                                         flutter_map.TileLayer(
                                           urlTemplate:
                                               'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-                                          userAgentPackageName: 'com.meshcore.sar',
+                                          userAgentPackageName:
+                                              'com.meshcore.sar',
                                         ),
                                         flutter_map.PolylineLayer(
                                           polylines: [
                                             flutter_map.Polyline(
                                               points: mapPoints,
                                               strokeWidth: 4,
-                                              color: Theme.of(context).colorScheme.primary,
+                                              color: Theme.of(
+                                                context,
+                                              ).colorScheme.primary,
                                             ),
                                           ],
                                         ),
@@ -202,12 +212,14 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
                                                   height: 34,
                                                   child: CircleAvatar(
                                                     radius: 16,
-                                                    backgroundColor: entry.key == 0
+                                                    backgroundColor:
+                                                        entry.key == 0
                                                         ? Colors.green
                                                         : (entry.key ==
-                                                                  trace
+                                                                  trace.matchedPathNodes
-                                                                          .matchedPathNodes
+                                                                          .whereType<
-                                                                          .whereType<MeshMapNode>()
+                                                                            MeshMapNode
+                                                                          >()
                                                                           .length -
                                                                       1
                                                               ? Colors.red
@@ -216,7 +228,8 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
                                                       '${entry.key + 1}',
                                                       style: const TextStyle(
                                                         color: Colors.white,
-                                                        fontWeight: FontWeight.bold,
+                                                        fontWeight:
+                                                            FontWeight.bold,
                                                         fontSize: 11,
                                                       ),
                                                     ),
@@ -228,7 +241,9 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
                                       ],
                                     )
                                   : const Center(
-                                      child: Text('Not enough geolocated nodes to draw path'),
+                                      child: Text(
+                                        'Not enough geolocated nodes to draw path',
+                                      ),
                                     ),
                             ),
                           ),
@@ -244,8 +259,13 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
                       ),
                       if (relayNodes.isEmpty)
                         const Padding(
-                          padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                          padding: EdgeInsets.symmetric(
-                          child: Text('No relay nodes could be matched for this message.'),
+                            horizontal: 16,
+                            vertical: 8,
+                          ),
+                          child: Text(
+                            'No relay nodes could be matched for this message.',
+                          ),
                         ),
                       ...relayNodes.map(
                         (node) => ListTile(
@@ -286,10 +306,9 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
 
   MeshMapNode? _bestNodeForPrefix(List<MeshMapNode> nodes, String? prefixHex) {
     if (prefixHex == null || prefixHex.isEmpty) return null;
-    final matches = nodes
+    final matches =
-        .where((n) => n.publicKey.startsWith(prefixHex))
+        nodes.where((n) => n.publicKey.startsWith(prefixHex)).toList()
-        .toList()
+          ..sort((a, b) => b.updatedAtMs.compareTo(a.updatedAtMs));
-      ..sort((a, b) => b.updatedAtMs.compareTo(a.updatedAtMs));
     return matches.isEmpty ? null : matches.first;
   }
 
@@ -298,7 +317,9 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
     required Message message,
   }) {
     if (message.pathLen <= 0 || message.pathLen >= 255) return null;
-    final expectedPayloadType = message.messageType == MessageType.channel ? 0x05 : 0x02;
+    final expectedPayloadType = message.messageType == MessageType.channel
+        ? 0x05
+        : 0x02;
     BlePacketLog? bestLog;
     var bestDeltaMs = 999999999;
 
@@ -313,7 +334,8 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
       if (pathLen != message.pathLen) continue;
       if (raw.length < 5 + pathLen) continue;
 
-      final deltaMs = (log.timestamp.difference(message.receivedAt).inMilliseconds).abs();
+      final deltaMs =
+          (log.timestamp.difference(message.receivedAt).inMilliseconds).abs();
       if (deltaMs < bestDeltaMs) {
         bestDeltaMs = deltaMs;
         bestLog = log;
@@ -335,7 +357,9 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
     final result = <MeshMapNode?>[];
     for (var i = 0; i < pathHashes.length; i++) {
       final hashHex = pathHashes[i].toRadixString(16).padLeft(2, '0');
-      final candidates = nodes.where((n) => n.publicKey.startsWith(hashHex)).toList();
+      final candidates = nodes
+          .where((n) => n.publicKey.startsWith(hashHex))
+          .toList();
       if (candidates.isEmpty) {
         result.add(null);
         continue;
@@ -343,7 +367,9 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
 
       List<MeshMapNode> filtered = candidates;
       if (i == 0 && senderPrefix != null) {
-        final senderMatches = filtered.where((n) => n.publicKey.startsWith(senderPrefix)).toList();
+        final senderMatches = filtered
+            .where((n) => n.publicKey.startsWith(senderPrefix))
+            .toList();
         if (senderMatches.isNotEmpty) filtered = senderMatches;
       } else if (i == pathHashes.length - 1 && recipientPrefix != null) {
         final recipientMatches = filtered
@@ -366,7 +392,8 @@ class _MessageTraceSheetState extends State<MessageTraceSheet> {
   }) {
     if (relayCount <= 0 || sender == null || recipient == null) return const [];
     final candidates = nodes.where((n) {
-      if (sender.publicKey == n.publicKey || recipient.publicKey == n.publicKey) {
+      if (sender.publicKey == n.publicKey ||
+          recipient.publicKey == n.publicKey) {
         return false;
       }
       return true;

lib/widgets/messages/messages_composer.dart

@@ -0,0 +1,432 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import '../../l10n/app_localizations.dart';
+
+class MessagesComposer extends StatelessWidget {
+  final TextEditingController textController;
+  final FocusNode focusNode;
+  final TextInputFormatter messageByteLimiter;
+  final int messageByteCount;
+  final int maxMessageBytes;
+  final bool isRecording;
+  final bool isSendingVoice;
+  final bool voiceSupported;
+  final double bottomPadding;
+  final String destinationLabel;
+  final Widget destinationAvatar;
+  final VoidCallback onShowComposerActions;
+  final VoidCallback onShowRecipientSelector;
+  final Future<void> Function() onStartVoiceRecording;
+  final Future<void> Function() onStopAndSendVoice;
+  final Future<void> Function() onSendMessage;
+
+  const MessagesComposer({
+    super.key,
+    required this.textController,
+    required this.focusNode,
+    required this.messageByteLimiter,
+    required this.messageByteCount,
+    required this.maxMessageBytes,
+    required this.isRecording,
+    required this.isSendingVoice,
+    required this.voiceSupported,
+    required this.bottomPadding,
+    required this.destinationLabel,
+    required this.destinationAvatar,
+    required this.onShowComposerActions,
+    required this.onShowRecipientSelector,
+    required this.onStartVoiceRecording,
+    required this.onStopAndSendVoice,
+    required this.onSendMessage,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: const BoxDecoration(color: Colors.transparent),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          SafeArea(
+            top: false,
+            child: Padding(
+              padding: EdgeInsets.fromLTRB(10, 4, 10, bottomPadding),
+              child: Container(
+                decoration: BoxDecoration(
+                  color: Theme.of(context).colorScheme.surfaceContainerLow,
+                  borderRadius: BorderRadius.circular(28),
+                  border: Border.all(
+                    color: Theme.of(
+                      context,
+                    ).dividerColor.withValues(alpha: 0.35),
+                  ),
+                  boxShadow: [
+                    BoxShadow(
+                      color: Colors.black.withValues(alpha: 0.05),
+                      blurRadius: 18,
+                      offset: const Offset(0, 6),
+                    ),
+                  ],
+                ),
+                child: Padding(
+                  padding: const EdgeInsets.fromLTRB(10, 10, 10, 8),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: [
+                      Row(
+                        children: [
+                          _ComposerActionButton(
+                            isRecording: isRecording,
+                            onPressed: isRecording
+                                ? onStopAndSendVoice
+                                : onShowComposerActions,
+                          ),
+                          const SizedBox(width: 8),
+                          Expanded(
+                            child: _DestinationSelector(
+                              destinationLabel: destinationLabel,
+                              destinationAvatar: destinationAvatar,
+                              onTap: onShowRecipientSelector,
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 8),
+                      ListenableBuilder(
+                        listenable: Listenable.merge([
+                          textController,
+                          focusNode,
+                        ]),
+                        builder: (context, _) {
+                          final canSendText =
+                              !isRecording &&
+                              !isSendingVoice &&
+                              textController.text.trim().isNotEmpty;
+                          final semanticsLabel = isRecording
+                              ? 'Recording... release to send voice'
+                              : (isSendingVoice
+                                    ? 'Sending voice...'
+                                    : voiceSupported
+                                    ? 'Send (long press to record voice)'
+                                    : 'Send');
+
+                          return Row(
+                            crossAxisAlignment: CrossAxisAlignment.center,
+                            children: [
+                              Expanded(
+                                child: _MessageInput(
+                                  textController: textController,
+                                  focusNode: focusNode,
+                                  messageByteLimiter: messageByteLimiter,
+                                ),
+                              ),
+                              const SizedBox(width: 8),
+                              _SendButton(
+                                canSendText: canSendText,
+                                isRecording: isRecording,
+                                isSendingVoice: isSendingVoice,
+                                voiceSupported: voiceSupported,
+                                semanticsLabel: semanticsLabel,
+                                messageByteCount: messageByteCount,
+                                maxMessageBytes: maxMessageBytes,
+                                onSendMessage: onSendMessage,
+                                onStartVoiceRecording: onStartVoiceRecording,
+                                onStopAndSendVoice: onStopAndSendVoice,
+                              ),
+                            ],
+                          );
+                        },
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _ComposerActionButton extends StatelessWidget {
+  final bool isRecording;
+  final VoidCallback onPressed;
+
+  const _ComposerActionButton({
+    required this.isRecording,
+    required this.onPressed,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 42,
+      height: 42,
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surface,
+        shape: BoxShape.circle,
+        border: Border.all(
+          color: Theme.of(context).dividerColor.withValues(alpha: 0.35),
+        ),
+      ),
+      child: IconButton(
+        icon: Icon(isRecording ? Icons.stop : Icons.add, size: 22),
+        tooltip: isRecording ? 'Stop recording' : 'More actions',
+        onPressed: onPressed,
+        color: isRecording ? Colors.red : Theme.of(context).colorScheme.primary,
+      ),
+    );
+  }
+}
+
+class _DestinationSelector extends StatelessWidget {
+  final String destinationLabel;
+  final Widget destinationAvatar;
+  final VoidCallback onTap;
+
+  const _DestinationSelector({
+    required this.destinationLabel,
+    required this.destinationAvatar,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        borderRadius: BorderRadius.circular(20),
+        onTap: onTap,
+        child: Ink(
+          height: 42,
+          decoration: BoxDecoration(
+            color: Theme.of(context).colorScheme.surface,
+            borderRadius: BorderRadius.circular(20),
+            border: Border.all(
+              color: Theme.of(context).dividerColor.withValues(alpha: 0.35),
+            ),
+          ),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 14),
+            child: Row(
+              children: [
+                destinationAvatar,
+                const SizedBox(width: 10),
+                Expanded(
+                  child: Text(
+                    destinationLabel,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      fontSize: 15,
+                      fontWeight: FontWeight.w600,
+                      color: Theme.of(context).colorScheme.onSurface,
+                    ),
+                  ),
+                ),
+                Icon(
+                  Icons.expand_more_rounded,
+                  size: 20,
+                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _MessageInput extends StatelessWidget {
+  final TextEditingController textController;
+  final FocusNode focusNode;
+  final TextInputFormatter messageByteLimiter;
+
+  const _MessageInput({
+    required this.textController,
+    required this.focusNode,
+    required this.messageByteLimiter,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedContainer(
+      duration: const Duration(milliseconds: 180),
+      constraints: const BoxConstraints(minHeight: 46, maxHeight: 132),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surface,
+        borderRadius: BorderRadius.circular(24),
+        border: Border.all(
+          color: focusNode.hasFocus
+              ? Theme.of(context).colorScheme.primary
+              : Theme.of(context).dividerColor.withValues(alpha: 0.35),
+          width: focusNode.hasFocus ? 1.4 : 1,
+        ),
+        boxShadow: focusNode.hasFocus
+            ? [
+                BoxShadow(
+                  color: Theme.of(
+                    context,
+                  ).colorScheme.primary.withValues(alpha: 0.10),
+                  blurRadius: 12,
+                  offset: const Offset(0, 4),
+                ),
+              ]
+            : null,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+        child: TextField(
+          controller: textController,
+          focusNode: focusNode,
+          minLines: 1,
+          maxLines: 4,
+          keyboardType: TextInputType.multiline,
+          inputFormatters: [messageByteLimiter],
+          style: const TextStyle(fontSize: 15),
+          textAlignVertical: TextAlignVertical.center,
+          decoration: InputDecoration(
+            hintText: AppLocalizations.of(context)!.typeYourMessage,
+            hintStyle: TextStyle(
+              fontSize: 15,
+              color: Theme.of(
+                context,
+              ).colorScheme.onSurfaceVariant.withValues(alpha: 0.9),
+            ),
+            filled: false,
+            fillColor: Colors.transparent,
+            border: InputBorder.none,
+            isCollapsed: true,
+          ),
+          textInputAction: TextInputAction.newline,
+        ),
+      ),
+    );
+  }
+}
+
+class _SendButton extends StatelessWidget {
+  final bool canSendText;
+  final bool isRecording;
+  final bool isSendingVoice;
+  final bool voiceSupported;
+  final String semanticsLabel;
+  final int messageByteCount;
+  final int maxMessageBytes;
+  final Future<void> Function() onSendMessage;
+  final Future<void> Function() onStartVoiceRecording;
+  final Future<void> Function() onStopAndSendVoice;
+
+  const _SendButton({
+    required this.canSendText,
+    required this.isRecording,
+    required this.isSendingVoice,
+    required this.voiceSupported,
+    required this.semanticsLabel,
+    required this.messageByteCount,
+    required this.maxMessageBytes,
+    required this.onSendMessage,
+    required this.onStartVoiceRecording,
+    required this.onStopAndSendVoice,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Semantics(
+      button: true,
+      enabled: canSendText || (voiceSupported && !isSendingVoice),
+      label: semanticsLabel,
+      onTap: canSendText ? onSendMessage : null,
+      onLongPress: (voiceSupported && !isSendingVoice)
+          ? () {
+              if (isRecording) {
+                onStopAndSendVoice();
+                return;
+              }
+              onStartVoiceRecording();
+            }
+          : null,
+      child: Tooltip(
+        message: semanticsLabel,
+        excludeFromSemantics: true,
+        child: GestureDetector(
+          excludeFromSemantics: true,
+          onTap: canSendText ? onSendMessage : null,
+          onLongPressStart: (voiceSupported && !isSendingVoice)
+              ? (_) => onStartVoiceRecording()
+              : null,
+          onLongPressEnd: (voiceSupported && isRecording)
+              ? (_) => onStopAndSendVoice()
+              : null,
+          onLongPressCancel: (voiceSupported && isRecording)
+              ? onStopAndSendVoice
+              : null,
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              AnimatedContainer(
+                duration: const Duration(milliseconds: 180),
+                width: 46,
+                height: 46,
+                decoration: BoxDecoration(
+                  color: canSendText || isRecording
+                      ? Theme.of(context).colorScheme.primary
+                      : Theme.of(context).colorScheme.surface,
+                  shape: BoxShape.circle,
+                  border: Border.all(
+                    color: canSendText || isRecording
+                        ? Colors.transparent
+                        : Theme.of(
+                            context,
+                          ).dividerColor.withValues(alpha: 0.35),
+                  ),
+                  boxShadow: canSendText || isRecording
+                      ? [
+                          BoxShadow(
+                            color: Theme.of(
+                              context,
+                            ).colorScheme.primary.withValues(alpha: 0.22),
+                            blurRadius: 14,
+                            offset: const Offset(0, 6),
+                          ),
+                        ]
+                      : null,
+                ),
+                child: isSendingVoice
+                    ? Center(
+                        child: CircularProgressIndicator(
+                          strokeWidth: 2,
+                          color: Theme.of(context).colorScheme.onPrimary,
+                        ),
+                      )
+                    : Icon(
+                        isRecording ? Icons.mic_rounded : Icons.send_rounded,
+                        size: 22,
+                        color: canSendText || isRecording
+                            ? Theme.of(context).colorScheme.onPrimary
+                            : Theme.of(context).colorScheme.onSurfaceVariant,
+                      ),
+              ),
+              const SizedBox(height: 4),
+              Text(
+                '$messageByteCount/$maxMessageBytes',
+                style: TextStyle(
+                  fontSize: 11,
+                  fontWeight: FontWeight.w500,
+                  color: messageByteCount > maxMessageBytes * 0.9
+                      ? Colors.orange.shade800
+                      : Theme.of(
+                          context,
+                        ).colorScheme.onSurfaceVariant.withValues(alpha: 0.9),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/messages/messages_content.dart

@@ -0,0 +1,94 @@
+import 'package:flutter/material.dart';
+
+import '../../l10n/app_localizations.dart';
+import '../../models/message.dart';
+import '../../widgets/messages/message_bubble.dart';
+
+class MessagesContent extends StatelessWidget {
+  static const double defaultPadding = 8;
+
+  final List<Message> messages;
+  final ScrollController scrollController;
+  final String? highlightedMessageId;
+  final double bottomContentPadding;
+  final Future<void> Function() onRefresh;
+  final VoidCallback? onNavigateToMap;
+  final ValueChanged<Message>? onMessageTap;
+
+  const MessagesContent({
+    super.key,
+    required this.messages,
+    required this.scrollController,
+    required this.highlightedMessageId,
+    this.bottomContentPadding = 0,
+    required this.onRefresh,
+    this.onNavigateToMap,
+    this.onMessageTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return RefreshIndicator(
+      onRefresh: onRefresh,
+      child: messages.isEmpty
+          ? LayoutBuilder(
+              builder: (context, constraints) => SingleChildScrollView(
+                keyboardDismissBehavior:
+                    ScrollViewKeyboardDismissBehavior.onDrag,
+                physics: const AlwaysScrollableScrollPhysics(),
+                child: ConstrainedBox(
+                  constraints: BoxConstraints(minHeight: constraints.maxHeight),
+                  child: Center(
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Icon(
+                          Icons.message_outlined,
+                          size: 64,
+                          color: Theme.of(context).disabledColor,
+                        ),
+                        const SizedBox(height: 16),
+                        Text(
+                          AppLocalizations.of(context)!.noMessagesYet,
+                          style: Theme.of(context).textTheme.titleLarge,
+                        ),
+                        const SizedBox(height: 8),
+                        Text(
+                          AppLocalizations.of(context)!.pullDownToSync,
+                          style: Theme.of(context).textTheme.bodyMedium,
+                          textAlign: TextAlign.center,
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+            )
+          : ListView.builder(
+              controller: scrollController,
+              keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
+              reverse: true,
+              padding: EdgeInsets.fromLTRB(
+                defaultPadding,
+                defaultPadding,
+                defaultPadding,
+                defaultPadding + bottomContentPadding,
+              ),
+              itemCount: messages.length,
+              itemBuilder: (context, index) {
+                final message = messages[index];
+
+                return MessageBubble(
+                  key: ValueKey(message.id),
+                  message: message,
+                  isHighlighted: message.id == highlightedMessageId,
+                  onNavigateToMap: onNavigateToMap,
+                  onTap: onMessageTap == null
+                      ? null
+                      : () => onMessageTap!(message),
+                );
+              },
+            ),
+    );
+  }
+}

lib/widgets/messages/recipient_selector_sheet.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import '../../models/contact.dart';
 import '../../l10n/app_localizations.dart';
+import '../common/contact_avatar.dart';
 
 /// Bottom sheet for selecting message recipient (channel, contact, or room)
 class RecipientSelectorSheet extends StatefulWidget {
@@ -168,7 +169,7 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
                     ...filteredChannels.map((channel) {
                       return _buildRecipientTile(
                         context: context,
-                        icon: Icons.public,
+                        contact: channel,
                         title: channel.getLocalizedDisplayName(context),
                         subtitle: channel.isPublicChannel
                             ? l10n.broadcastToAllNearby
@@ -215,10 +216,9 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
                     ...filteredContacts.map((contact) {
                       return _buildRecipientTile(
                         context: context,
-                        icon: Icons.person,
+                        contact: contact,
                         title: contact.displayName,
                         subtitle: contact.publicKeyShort,
-                        emoji: contact.roleEmoji,
                         isSelected: _isSelected('contact', contact),
                         onTap: () {
                           widget.onSelect('contact', contact);
@@ -261,10 +261,9 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
                     ...filteredRooms.map((room) {
                       return _buildRecipientTile(
                         context: context,
-                        icon: Icons.meeting_room,
+                        contact: room,
                         title: room.displayName,
                         subtitle: room.publicKeyShort,
-                        emoji: room.roleEmoji,
                         isSelected: _isSelected('room', room),
                         onTap: () {
                           widget.onSelect('room', room);
@@ -275,7 +274,9 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
                 ],
 
                 // Empty state
-                if (widget.contacts.isEmpty && widget.rooms.isEmpty && widget.channels.isEmpty) ...[
+                if (widget.contacts.isEmpty &&
+                    widget.rooms.isEmpty &&
+                    widget.channels.isEmpty) ...[
                   Padding(
                     padding: const EdgeInsets.all(32),
                     child: Column(
@@ -310,36 +311,16 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
 
   Widget _buildRecipientTile({
     required BuildContext context,
-    required IconData icon,
+    required Contact contact,
     required String title,
     required String subtitle,
-    String? emoji,
     required bool isSelected,
     required VoidCallback onTap,
   }) {
     return ListTile(
-      leading: Container(
+      leading: ContactAvatar(contact: contact, radius: 20, displayName: title),
-        width: 40,
-        height: 40,
-        decoration: BoxDecoration(
-          color: isSelected
-              ? Theme.of(context).colorScheme.primaryContainer
-              : Theme.of(context).colorScheme.surfaceContainerHighest,
-          borderRadius: BorderRadius.circular(20),
-        ),
-        child: Icon(
-          icon,
-          color: isSelected
-              ? Theme.of(context).colorScheme.primary
-              : Theme.of(context).colorScheme.onSurfaceVariant,
-        ),
-      ),
       title: Row(
         children: [
-          if (emoji != null && emoji.isNotEmpty) ...[
-            Text(emoji, style: const TextStyle(fontSize: 16)),
-            const SizedBox(width: 8),
-          ],
           Expanded(
             child: Text(
               title,

lib/widgets/messages/system_message_bubble.dart

@@ -0,0 +1,107 @@
+import 'package:flutter/material.dart';
+
+import '../../models/message.dart';
+import '../../utils/message_extensions.dart';
+
+class SystemMessageBubble extends StatelessWidget {
+  final Message message;
+
+  const SystemMessageBubble({super.key, required this.message});
+
+  Color _getLevelColor(String? level) {
+    switch (level?.toLowerCase()) {
+      case 'success':
+        return Colors.green;
+      case 'warning':
+        return Colors.orange;
+      case 'error':
+        return Colors.red;
+      case 'info':
+      default:
+        return Colors.blue.shade300;
+    }
+  }
+
+  IconData _getLevelIcon(String? level) {
+    switch (level?.toLowerCase()) {
+      case 'success':
+        return Icons.check_circle_outline;
+      case 'warning':
+        return Icons.warning_amber_outlined;
+      case 'error':
+        return Icons.error_outline;
+      case 'info':
+      default:
+        return Icons.info_outline;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isDarkMode = Theme.of(context).brightness == Brightness.dark;
+    final level = message.senderName ?? 'info';
+    final levelColor = _getLevelColor(level);
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      child: Container(
+        width: double.infinity,
+        padding: const EdgeInsets.all(10),
+        decoration: BoxDecoration(
+          color: levelColor.withValues(alpha: isDarkMode ? 0.18 : 0.08),
+          borderRadius: BorderRadius.circular(12),
+          border: Border.all(
+            color: levelColor.withValues(alpha: isDarkMode ? 0.3 : 0.16),
+          ),
+        ),
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Icon(_getLevelIcon(level), size: 16, color: levelColor),
+            const SizedBox(width: 8),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      Expanded(
+                        child: Text(
+                          level.toUpperCase(),
+                          style: Theme.of(context).textTheme.labelSmall
+                              ?.copyWith(
+                                color: levelColor,
+                                fontWeight: FontWeight.bold,
+                                letterSpacing: 0.4,
+                              ),
+                        ),
+                      ),
+                      Text(
+                        message.getLocalizedTimeAgo(context),
+                        style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                          color: Theme.of(
+                            context,
+                          ).textTheme.bodySmall?.color?.withValues(alpha: 0.6),
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 4),
+                  Text(
+                    message.text,
+                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                      height: 1.3,
+                      color: Theme.of(
+                        context,
+                      ).textTheme.bodySmall?.color?.withValues(alpha: 0.8),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/widgets/messages/tictactoe_message_bubble.dart

@@ -97,9 +97,7 @@ class TicTacToeMessageBubble extends StatelessWidget {
         children: [
           Text(
             'Tic-Tac-Toe · Game ${state.gameId}',
-            style: Theme.of(
+            style: Theme.of(context).textTheme.labelMedium?.copyWith(
-              context,
-            ).textTheme.labelMedium?.copyWith(
               fontWeight: FontWeight.bold,
               color: titleColor,
             ),
@@ -167,7 +165,7 @@ class TicTacToeMessageBubble extends StatelessWidget {
       deliveryStatus: MessageDeliveryStatus.sending,
       recipientPublicKey: opponent.publicKey,
     );
-    messagesProvider.addSentMessage(sentMessage);
+    messagesProvider.addSentMessage(sentMessage, contact: opponent);
 
     final sent = await connectionProvider.sendTextMessage(
       contactPublicKey: opponent.publicKey,

lib/widgets/messages/voice_message_bubble.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../../l10n/app_localizations.dart';
 import '../../models/message.dart';
+import '../../providers/app_provider.dart';
 import '../../providers/connection_provider.dart';
 import '../../providers/contacts_provider.dart';
 import '../../providers/voice_provider.dart';
@@ -218,11 +219,18 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
     int pathLen = 0,
   }) async {
     if (_isRequesting) return;
+    setState(() {
+      _isRequesting = true;
+      _autoPlayWhenReady = true;
+      _errorText = null;
+    });
+
     final connectionProvider = context.read<ConnectionProvider>();
     final voiceProvider = context.read<VoiceProvider>();
     voiceProvider.resumeIncomingSession(sessionId);
     final contactsProvider = context.read<ContactsProvider>();
-    final resolution = await TransmissionTargetResolver.resolveFetchTarget(
+    final appProvider = context.read<AppProvider>();
+    var resolution = await TransmissionTargetResolver.resolveFetchTarget(
       contactsProvider: contactsProvider,
       refreshContacts: connectionProvider.getContacts,
       isSentByMe: widget.isSentByMe,
@@ -235,6 +243,7 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
     if (!mounted) return;
 
     if (resolution.failure == TransmissionTargetFailure.unknownContact) {
+      _clearRequestState();
       await _showBlockingAlert(
         'Cannot fetch voice',
         'Sender contact is unknown. Sync contacts first.',
@@ -242,6 +251,7 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
       return;
     }
     if (resolution.failure == TransmissionTargetFailure.unknownRoute) {
+      _clearRequestState();
       await _showBlockingAlert(
         'Cannot fetch voice',
         'Sender route is unknown. Sync contacts/path first.',
@@ -249,27 +259,85 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
       return;
     }
     if (resolution.failure == TransmissionTargetFailure.tooFar) {
+      _clearRequestState();
       await _showBlockingAlert(
         'Cannot fetch voice',
         'Message is too far (${resolution.hops} hops, max ${resolution.maxHops}).',
       );
       return;
     }
+    if (resolution.failure == TransmissionTargetFailure.unreachable) {
+      _clearRequestState();
+      await _showBlockingAlert(
+        'Cannot fetch voice',
+        'Sender route did not respond to a path check. Sync contacts/path and try again.',
+      );
+      return;
+    }
+
+    var sender = resolution.target!;
+    var routeVerified = await appProvider.verifyRawTransportRoute(sender);
+    if (!mounted) return;
+    if (!routeVerified) {
+      await connectionProvider.getContacts();
+      if (!mounted) return;
+      resolution = await TransmissionTargetResolver.resolveFetchTarget(
+        contactsProvider: contactsProvider,
+        refreshContacts: connectionProvider.getContacts,
+        isSentByMe: widget.isSentByMe,
+        recipientPublicKey: widget.message.recipientPublicKey,
+        senderPublicKeyPrefix: widget.message.senderPublicKeyPrefix,
+        senderKey6FromEnvelope: envelope?.senderKey6,
+        senderName: widget.message.senderName,
+        maxFetchHops: _maxFetchHops,
+      );
+      if (!mounted) return;
+      if (resolution.failure == TransmissionTargetFailure.unknownContact) {
+        _clearRequestState();
+        await _showBlockingAlert(
+          'Cannot fetch voice',
+          'Sender contact is unknown. Sync contacts first.',
+        );
+        return;
+      }
+      if (resolution.failure == TransmissionTargetFailure.unknownRoute) {
+        _clearRequestState();
+        await _showBlockingAlert(
+          'Cannot fetch voice',
+          'Sender route is unknown. Sync contacts/path first.',
+        );
+        return;
+      }
+      if (resolution.failure == TransmissionTargetFailure.tooFar) {
+        _clearRequestState();
+        await _showBlockingAlert(
+          'Cannot fetch voice',
+          'Message is too far (${resolution.hops} hops, max ${resolution.maxHops}).',
+        );
+        return;
+      }
+      sender = resolution.target!;
+      routeVerified = await appProvider.verifyRawTransportRoute(sender);
+      if (!mounted) return;
+      if (!routeVerified) {
+        _clearRequestState();
+        await _showBlockingAlert(
+          'Cannot fetch voice',
+          'Sender route did not respond on the raw transport path.',
+        );
+        return;
+      }
+    }
 
-    final sender = resolution.target!;
     if (sender.outPathLen >= 2) {
       _showToast(
         'Voice fetch over ${sender.outPathLen} hops may take a while.',
       );
     }
 
-    if (!mounted) return;
-    setState(() {
-      _errorText = null;
-    });
-
     final deviceKey = connectionProvider.deviceInfo.publicKey;
     if (deviceKey == null || deviceKey.length < 6) {
+      _clearRequestState();
       await _showBlockingAlert(
         'Cannot fetch voice',
         'Device key is unavailable.',
@@ -281,20 +349,34 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
         .sublist(0, 6)
         .map((b) => b.toRadixString(16).padLeft(2, '0'))
         .join('');
-    final request = VoiceFetchRequest(
+    final missing = voiceProvider.missingPacketIndices(sessionId);
+    final totalPackets = sessionPacketCount(
+      voiceProvider: voiceProvider,
       sessionId: sessionId,
-      requesterKey6: requesterKey6,
+      envelope: envelope,
-      timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
-      version: 2,
     );
-
+    final isPartialResume =
-    setState(() {
+        missing.isNotEmpty && totalPackets > 0 && missing.length < totalPackets;
-      _isRequesting = true;
+    final request = isPartialResume
-      _autoPlayWhenReady = true;
+        ? VoiceFetchRequest(
-      _errorText = null;
+            sessionId: sessionId,
-    });
+            want: 'missing',
+            missingIndices: missing,
+            requesterKey6: requesterKey6,
+            timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+            version: 2,
+          )
+        : VoiceFetchRequest(
+            sessionId: sessionId,
+            requesterKey6: requesterKey6,
+            timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+            version: 2,
+          );
 
     try {
+      debugPrint(
+        '🎙️ [VoiceMessageBubble] Outgoing voice fetch request: session=$sessionId want=${isPartialResume ? 'missing' : 'all'} target=${sender.advName} hops=${sender.outPathLen}',
+      );
       await connectionProvider.sendRawVoicePacket(
         contactPath: sender.outPath,
         contactPathLen: sender.outPathLen,
@@ -309,11 +391,18 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
     final effectivePathLen = sender.outPathLen >= 0
         ? sender.outPathLen
         : pathLen;
+    final estimatedDurationMs =
+        envelope != null &&
+            totalPackets > 0 &&
+            missing.isNotEmpty &&
+            missing.length < totalPackets
+        ? ((envelope.durationMs * missing.length) / totalPackets).round()
+        : envelope?.durationMs;
     final txEstimate = envelope != null
         ? estimateVoiceTransmitDuration(
-            packetCount: envelope.total,
+            packetCount: isPartialResume ? missing.length : envelope.total,
             mode: envelope.mode,
-            durationMs: envelope.durationMs,
+            durationMs: estimatedDurationMs ?? envelope.durationMs,
             pathLen: effectivePathLen,
             radioBw: radioBw,
             radioSf: radioSf,
@@ -331,6 +420,14 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
     );
   }
 
+  int sessionPacketCount({
+    required VoiceProvider voiceProvider,
+    required String sessionId,
+    required VoiceEnvelope? envelope,
+  }) {
+    return voiceProvider.session(sessionId)?.total ?? envelope?.total ?? 0;
+  }
+
   void _setUnavailable() {
     if (!mounted) return;
     _showToast(AppLocalizations.of(context)!.voiceUnavailable);
@@ -341,6 +438,14 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
     });
   }
 
+  void _clearRequestState() {
+    if (!mounted) return;
+    setState(() {
+      _isRequesting = false;
+      _autoPlayWhenReady = false;
+    });
+  }
+
   void _cancelReceive(String sessionId) {
     if (!mounted) return;
     _requestTimeoutTimer?.cancel();

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -16,6 +16,7 @@ import geolocator_apple
 import nsd_macos
 import objectbox_flutter_libs
 import package_info_plus
+import path_provider_foundation
 import record_macos
 import share_plus
 import shared_preferences_foundation
@@ -34,6 +35,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   NsdMacosPlugin.register(with: registry.registrar(forPlugin: "NsdMacosPlugin"))
   ObjectboxFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "ObjectboxFlutterLibsPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
+  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   RecordMacOsPlugin.register(with: registry.registrar(forPlugin: "RecordMacOsPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))

pubspec.lock

@@ -29,10 +29,10 @@ packages:
     dependency: "direct main"
     description:
       name: audioplayers
-      sha256: "5441fa0ceb8807a5ad701199806510e56afde2b4913d9d17c2f19f2902cf0ae4"
+      sha256: a72dd459d1a48f61a6fb9c0134dba26597c9236af40639ff0eb70eb4e0baab70
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.1"
+    version: "6.6.0"
   audioplayers_android:
     dependency: transitive
     description:
@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: audioplayers_darwin
-      sha256: "0811d6924904ca13f9ef90d19081e4a87f7297ddc19fc3d31f60af1aaafee333"
+      sha256: c994b3bb3a921e4904ac40e013fbc94488e824fd7c1de6326f549943b0b44a91
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.4.0"
   audioplayers_linux:
     dependency: transitive
     description:
@@ -69,18 +69,18 @@ packages:
     dependency: transitive
     description:
       name: audioplayers_web
-      sha256: "1c0f17cec68455556775f1e50ca85c40c05c714a99c5eb1d2d57cc17ba5522d7"
+      sha256: faa8fa6587f996a6f604433b53af44c57a1407d4fe8dff5766cf63d6875e8de9
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "5.2.0"
   audioplayers_windows:
     dependency: transitive
     description:
       name: audioplayers_windows
-      sha256: "4048797865105b26d47628e6abb49231ea5de84884160229251f37dfcbe52fd7"
+      sha256: bafff2b38b6f6d331887558ba6e0a01c9c208d9dbb3ad0005234db065122a734
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.1"
+    version: "4.3.0"
   bluez:
     dependency: transitive
     description:
@@ -129,14 +129,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.2"
-  code_assets:
-    dependency: transitive
-    description:
-      name: code_assets
-      sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   codec2_flutter:
     dependency: "direct main"
     description:
@@ -243,7 +235,7 @@ packages:
     source: hosted
     version: "3.3.0"
   fake_async:
-    dependency: transitive
+    dependency: "direct dev"
     description:
       name: fake_async
       sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
@@ -646,14 +638,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.5"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
   gsettings:
     dependency: transitive
     description:
@@ -662,14 +646,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.8"
-  hooks:
-    dependency: transitive
-    description:
-      name: hooks
-      sha256: "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
   http:
     dependency: "direct main"
     description:
@@ -846,14 +822,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.6.2"
-  logging:
-    dependency: transitive
-    description:
-      name: logging
-      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
   matcher:
     dependency: transitive
     description:
@@ -883,7 +851,7 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: "11f51ccaba850531496179bf63e023cb4c9ad797"
+      resolved-ref: cea66b5251135c7f9b84f15c0878d4c8af6e88e9
       url: "https://github.com/dz0ny/meshcore_client.git"
     source: git
     version: "0.1.0"
@@ -911,14 +879,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
-  native_toolchain_c:
-    dependency: transitive
-    description:
-      name: native_toolchain_c
-      sha256: "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.17.4"
   nested:
     dependency: transitive
     description:
@@ -991,14 +951,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.3.1"
-  objective_c:
-    dependency: transitive
-    description:
-      name: objective_c
-      sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.3.0"
   package_info_plus:
     dependency: "direct main"
     description:
@@ -1040,13 +992,13 @@ packages:
     source: hosted
     version: "2.2.22"
   path_provider_foundation:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: path_provider_foundation
-      sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
+      sha256: "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.5.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -1183,14 +1135,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.5+1"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
   record:
     dependency: "direct main"
     description:
@@ -1702,5 +1646,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.10.3 <4.0.0"
+  dart: ">=3.10.0 <4.0.0"
-  flutter: ">=3.38.4"
+  flutter: ">=3.38.0"

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2026.0305.3+9
+version: 2026.0307.2+15
 
 environment:
   sdk: ^3.9.2
@@ -144,6 +144,10 @@ dev_dependencies:
   # rules and activating additional ones.
   flutter_lints: ^6.0.0
   flutter_launcher_icons: "^0.14.4"
+  fake_async: ^1.3.3
+
+dependency_overrides:
+  path_provider_foundation: 2.5.1
 
 flutter_launcher_icons:
   android: "launcher_icon"

test/models/message_reception_details_test.dart

@@ -0,0 +1,50 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/models/message_reception_details.dart';
+
+void main() {
+  test('drops impossible transmit estimate for received messages', () {
+    expect(
+      sanitizeEstimatedTransmitMs(
+        estimatedTransmitMs: 16 * 60 * 1000 + 54 * 1000,
+        senderToReceiptMs: 4200,
+      ),
+      isNull,
+    );
+  });
+
+  test(
+    'keeps close transmit estimate despite second-level timestamp rounding',
+    () {
+      expect(
+        sanitizeEstimatedTransmitMs(
+          estimatedTransmitMs: 1800,
+          senderToReceiptMs: 900,
+        ),
+        1800,
+      );
+    },
+  );
+
+  test('round trips reception details json', () {
+    final details = MessageReceptionDetails(
+      capturedAt: DateTime.fromMillisecondsSinceEpoch(1700000000000),
+      packetLoggedAt: DateTime.fromMillisecondsSinceEpoch(1700000000500),
+      rssiDbm: -92,
+      snrDb: 7.5,
+      pathBytes: const [0xAA, 0xBB, 0xCC],
+      senderToReceiptMs: 4200,
+      estimatedTransmitMs: 1800,
+      postTransmitDelayMs: 2400,
+    );
+
+    final decoded = MessageReceptionDetails.fromJson(details.toJson());
+
+    expect(decoded, isNotNull);
+    expect(decoded!.rssiDbm, -92);
+    expect(decoded.snrDb, 7.5);
+    expect(decoded.pathBytesHex, 'aa:bb:cc');
+    expect(decoded.senderToReceiptMs, 4200);
+    expect(decoded.estimatedTransmitMs, 1800);
+    expect(decoded.postTransmitDelayMs, 2400);
+  });
+}

test/providers/contacts_provider_test.dart

@@ -194,5 +194,43 @@ void main() {
         }
       },
     );
+
+    test('builds message snapshot from latest valid telemetry', () {
+      final telemetryData = CayenneLppParser.createGpsData(
+        latitude: 45.0001,
+        longitude: 13.9999,
+      );
+
+      provider.updateTelemetry(publicKey.sublist(0, 6), telemetryData);
+      final contact = provider.findContactByKey(publicKey)!;
+      final snapshot = provider.buildMessageContactLocationSnapshot(
+        contact,
+        capturedAt: DateTime.now(),
+      );
+
+      expect(snapshot, isNotNull);
+      expect(snapshot!.source, equals('telemetry'));
+      expect(snapshot.location.latitude, closeTo(45.0001, 0.0001));
+      expect(snapshot.location.longitude, closeTo(13.9999, 0.0001));
+    });
+
+    test('builds message snapshot from advert when telemetry is invalid', () {
+      final invalidTelemetry = CayenneLppParser.createGpsData(
+        latitude: 0.0,
+        longitude: 0.0,
+      );
+
+      provider.updateTelemetry(publicKey.sublist(0, 6), invalidTelemetry);
+      final contact = provider.findContactByKey(publicKey)!;
+      final snapshot = provider.buildMessageContactLocationSnapshot(
+        contact,
+        capturedAt: DateTime.now(),
+      );
+
+      expect(snapshot, isNotNull);
+      expect(snapshot!.source, equals('advert'));
+      expect(snapshot.location.latitude, closeTo(46.0569, 0.000001));
+      expect(snapshot.location.longitude, closeTo(14.5058, 0.000001));
+    });
   });
 }

test/providers/helpers/message_delivery_tracker_test.dart

@@ -0,0 +1,37 @@
+import 'dart:typed_data';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/providers/helpers/message_delivery_tracker.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('MessageDeliveryTracker', () {
+    test('matches pending direct messages by contact', () {
+      final tracker = MessageDeliveryTracker();
+      final alice = Uint8List.fromList(List<int>.filled(32, 0xAA));
+      final bob = Uint8List.fromList(List<int>.filled(32, 0xBB));
+
+      tracker.trackPendingDirectMessage('alice-1', alice);
+      tracker.trackPendingDirectMessage('bob-1', bob);
+      tracker.trackPendingDirectMessage('alice-2', alice);
+
+      expect(tracker.popPendingDirectMessageId(alice), 'alice-1');
+      expect(tracker.popPendingDirectMessageId(bob), 'bob-1');
+      expect(tracker.popPendingDirectMessageId(alice), 'alice-2');
+    });
+
+    test('removeByMessageId clears pending queue state', () {
+      final tracker = MessageDeliveryTracker();
+      final alice = Uint8List.fromList(List<int>.filled(32, 0xAA));
+
+      tracker.trackPendingDirectMessage('alice-1', alice);
+      tracker.mapAckTagToMessageId(42, 'alice-1');
+
+      tracker.removeByMessageId('alice-1');
+
+      expect(tracker.getMessageIdForAck(42), isNull);
+      expect(tracker.popPendingDirectMessageId(alice), isNull);
+    });
+  });
+}

test/providers/helpers/raw_session_retransmit_test.dart

@@ -47,9 +47,8 @@ void main() {
       expect(ok, isFalse);
     });
 
-    test('sends only requested indices and waits for ack', () async {
+    test('sends only requested indices', () async {
       final sent = <Uint8List>[];
-      final waited = <int>[];
       final ok = await serveCachedSessionFragments<_Fragment>(
         providerLabel: 'TestProvider',
         sessionId: 'deadbeef',
@@ -70,15 +69,6 @@ void main() {
             }) async {
               sent.add(payload);
             },
-        waitForFragmentAck:
-            ({
-              required sessionId,
-              required index,
-              timeout = const Duration(seconds: 8),
-            }) async {
-              waited.add(index);
-              return true;
-            },
         requestedIndices: {1, 2},
       );
 
@@ -86,37 +76,6 @@ void main() {
       expect(sent.length, equals(2));
       expect(sent[0], equals(Uint8List.fromList([20])));
       expect(sent[1], equals(Uint8List.fromList([30])));
-      expect(waited, equals([1, 2]));
-    });
-
-    test('fails when ack does not arrive', () async {
-      final ok = await serveCachedSessionFragments<_Fragment>(
-        providerLabel: 'TestProvider',
-        sessionId: 'deadbeef',
-        requester: _buildContact(outPathLen: 1),
-        fragments: [
-          _Fragment(0, Uint8List.fromList([1])),
-        ],
-        maxDirectPayloadHops: 3,
-        indexOf: (f) => f.index,
-        encodeBinary: (f) => f.payload,
-        sendRawPacket:
-            ({
-              required contactPath,
-              required contactPathLen,
-              required payload,
-            }) async {},
-        waitForFragmentAck:
-            ({
-              required sessionId,
-              required index,
-              timeout = const Duration(seconds: 8),
-            }) async {
-              return false;
-            },
-      );
-
-      expect(ok, isFalse);
     });
 
     test('fails when no requested index matches cached fragments', () async {

test/providers/messages_provider_retransmission_test.dart

@@ -0,0 +1,254 @@
+import 'dart:typed_data';
+
+import 'package:fake_async/fake_async.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/models/contact.dart';
+import 'package:meshcore_sar_app/models/message.dart';
+import 'package:meshcore_sar_app/providers/messages_provider.dart';
+
+Contact _buildContact() {
+  return Contact(
+    publicKey: Uint8List.fromList(List<int>.generate(32, (i) => i)),
+    type: ContactType.chat,
+    flags: 0,
+    outPathLen: 1,
+    outPath: Uint8List.fromList([1, 2, 3, 4]),
+    advName: 'Teammate',
+    lastAdvert: 1700000000,
+    advLat: 0,
+    advLon: 0,
+    lastMod: 1700000000,
+  );
+}
+
+Message _buildDirectMessage(String id) {
+  return Message(
+    id: id,
+    messageType: MessageType.contact,
+    senderPublicKeyPrefix: Uint8List.fromList([0, 1, 2, 3, 4, 5]),
+    pathLen: 0,
+    textType: MessageTextType.plain,
+    senderTimestamp: 1700000000,
+    text: 'hello',
+    receivedAt: DateTime.now(),
+    deliveryStatus: MessageDeliveryStatus.sending,
+    recipientPublicKey: Uint8List.fromList(List<int>.generate(32, (i) => i)),
+  );
+}
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('MessagesProvider retransmission', () {
+    test('direct messages become sent before delivery ACK arrives', () {
+      final provider = MessagesProvider();
+      provider.addSentMessage(
+        _buildDirectMessage('m1'),
+        contact: _buildContact(),
+      );
+
+      provider.markMessageSent('m1', 77, 250);
+
+      expect(
+        provider.messages.single.deliveryStatus,
+        MessageDeliveryStatus.sent,
+      );
+      expect(provider.messages.single.expectedAckTag, 77);
+
+      provider.markMessageDelivered(77, 180);
+
+      expect(
+        provider.messages.single.deliveryStatus,
+        MessageDeliveryStatus.delivered,
+      );
+      expect(provider.messages.single.roundTripTimeMs, 180);
+    });
+
+    test('direct messages stay sent after device accept until confirm arrives', () {
+      final provider = MessagesProvider();
+      provider.addSentMessage(
+        _buildDirectMessage('m1b'),
+        contact: _buildContact(),
+      );
+
+      provider.markMessageSent('m1b', 78, 250);
+
+      expect(
+        provider.messages.single.deliveryStatus,
+        MessageDeliveryStatus.sent,
+      );
+      expect(provider.messages.single.expectedAckTag, 78);
+      expect(provider.messages.single.roundTripTimeMs, isNull);
+      expect(provider.messages.single.deliveredAt, isNull);
+    });
+
+    test('channel messages are marked sent immediately', () {
+      final provider = MessagesProvider();
+      provider.addSentMessage(
+        Message(
+          id: 'c1',
+          messageType: MessageType.channel,
+          senderPublicKeyPrefix: Uint8List.fromList([0, 1, 2, 3, 4, 5]),
+          channelIdx: 0,
+          pathLen: 0,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000000,
+          text: 'broadcast',
+          receivedAt: DateTime.now(),
+          deliveryStatus: MessageDeliveryStatus.sending,
+        ),
+      );
+
+      provider.markMessageSent('c1', 0, 0);
+
+      expect(
+        provider.messages.single.deliveryStatus,
+        MessageDeliveryStatus.sent,
+      );
+    });
+
+    test('missing ACK schedules a delayed retransmission', () {
+      fakeAsync((async) {
+        final provider = MessagesProvider();
+        var retryCalls = 0;
+        provider.sendMessageCallback =
+            ({
+              required contactPublicKey,
+              required text,
+              required messageId,
+              required contact,
+              retryAttempt = 0,
+            }) async {
+              retryCalls += 1;
+              return true;
+            };
+
+        provider.addSentMessage(
+          _buildDirectMessage('m2'),
+          contact: _buildContact(),
+        );
+        provider.markMessageSent('m2', 88, 10);
+
+        async.elapse(const Duration(milliseconds: 11));
+        async.flushMicrotasks();
+
+        expect(provider.messages.single.retryAttempt, 1);
+        expect(
+          provider.messages.single.deliveryStatus,
+          MessageDeliveryStatus.sending,
+        );
+        expect(retryCalls, 0);
+
+        async.elapse(const Duration(seconds: 4));
+        async.flushMicrotasks();
+
+        expect(retryCalls, 1);
+      });
+    });
+
+    test('uses calculated timeout when radio timeout is missing', () {
+      final provider = MessagesProvider();
+      provider.addSentMessage(
+        _buildDirectMessage('m3'),
+        contact: _buildContact(),
+      );
+
+      provider.markMessageSent('m3', 99, 0);
+
+      expect(provider.messages.single.suggestedTimeoutMs, isNotNull);
+      expect(
+        provider.messages.single.suggestedTimeoutMs!,
+        greaterThanOrEqualTo(4000),
+      );
+    });
+
+    test('older retry ack still marks message delivered', () {
+      final provider = MessagesProvider();
+      provider.addSentMessage(
+        _buildDirectMessage('m4'),
+        contact: _buildContact(),
+      );
+
+      provider.markMessageSent('m4', 111, 10);
+      provider.markMessageSent('m4', 112, 10);
+      provider.markMessageDelivered(111, 220);
+
+      expect(
+        provider.messages.single.deliveryStatus,
+        MessageDeliveryStatus.delivered,
+      );
+      expect(provider.messages.single.roundTripTimeMs, 220);
+    });
+
+    test('repeated max-retry failures request path reset', () async {
+      final provider = MessagesProvider();
+      final contact = _buildContact();
+      final resetRequests = <(String, int)>[];
+      provider.onDirectPathFailedCallback =
+          ({required contact, required failureStreak}) async {
+            resetRequests.add((contact.advName, failureStreak));
+          };
+
+      provider.addSentMessage(
+        _buildDirectMessage('m5').copyWith(
+          retryAttempt: 3,
+          usedFloodFallback: true,
+        ),
+        contact: contact,
+      );
+      provider.markMessageFailed('m5');
+
+      provider.addSentMessage(
+        _buildDirectMessage('m6').copyWith(
+          retryAttempt: 3,
+          usedFloodFallback: true,
+        ),
+        contact: contact,
+      );
+      provider.markMessageFailed('m6');
+
+      await Future<void>.delayed(Duration.zero);
+
+      expect(resetRequests, [('Teammate', 2)]);
+    });
+
+    test('successful delivery clears path failure streak', () async {
+      final provider = MessagesProvider();
+      final contact = _buildContact();
+      final resetRequests = <int>[];
+      provider.onDirectPathFailedCallback =
+          ({required contact, required failureStreak}) async {
+            resetRequests.add(failureStreak);
+          };
+
+      provider.addSentMessage(
+        _buildDirectMessage('m7').copyWith(
+          retryAttempt: 3,
+          usedFloodFallback: true,
+        ),
+        contact: contact,
+      );
+      provider.markMessageFailed('m7');
+
+      provider.addSentMessage(
+        _buildDirectMessage('m8'),
+        contact: contact,
+      );
+      provider.markMessageSent('m8', 123, 10);
+      provider.markMessageDelivered(123, 150);
+
+      provider.addSentMessage(
+        _buildDirectMessage('m9').copyWith(
+          retryAttempt: 3,
+          usedFloodFallback: true,
+        ),
+        contact: contact,
+      );
+      provider.markMessageFailed('m9');
+
+      await Future<void>.delayed(Duration.zero);
+
+      expect(resetRequests, isEmpty);
+    });
+  });
+}

test/providers/messages_provider_voice_test.dart

@@ -1,13 +1,20 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:meshcore_sar_app/models/message.dart';
+import 'package:meshcore_sar_app/models/message_contact_location.dart';
 import 'package:meshcore_sar_app/providers/messages_provider.dart';
 import 'package:meshcore_sar_app/utils/voice_message_parser.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   group('MessagesProvider voice detection', () {
+    setUp(() {
+      SharedPreferences.setMockInitialValues({});
+    });
+
     test('marks VE2 envelope messages as voice', () {
       final provider = MessagesProvider();
       final envelope = VoiceEnvelope(
@@ -65,5 +72,39 @@ void main() {
       expect(stored.isVoice, isTrue);
       expect(stored.voiceId, equals('00112233'));
     });
+
+    test('persists received contact location snapshots', () async {
+      final provider = MessagesProvider();
+      final message = Message(
+        id: 'm3',
+        messageType: MessageType.contact,
+        pathLen: 1,
+        textType: MessageTextType.plain,
+        senderTimestamp: 1700000002,
+        text: 'status update',
+        receivedAt: DateTime.now(),
+        senderPublicKeyPrefix: Uint8List.fromList([0, 1, 2, 3, 4, 5]),
+      );
+
+      provider.addMessage(
+        message,
+        contactLocationSnapshot: MessageContactLocation(
+          location: const LatLng(46.0569, 14.5058),
+          source: 'advert',
+          capturedAt: DateTime.now(),
+          sourceTimestamp: DateTime.now(),
+        ),
+      );
+      await Future<void>.delayed(const Duration(milliseconds: 50));
+
+      final restoredProvider = MessagesProvider();
+      await restoredProvider.initialize();
+      final snapshot = restoredProvider.getMessageContactLocation('m3');
+
+      expect(snapshot, isNotNull);
+      expect(snapshot!.source, equals('advert'));
+      expect(snapshot.location.latitude, closeTo(46.0569, 0.000001));
+      expect(snapshot.location.longitude, closeTo(14.5058, 0.000001));
+    });
   });
 }

test/utils/avatar_label_helper_test.dart

@@ -0,0 +1,26 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/utils/avatar_label_helper.dart';
+
+void main() {
+  group('AvatarLabelHelper.buildLabel', () {
+    test('returns two initials for multi-word names', () {
+      expect(AvatarLabelHelper.buildLabel('John Smith'), 'JS');
+    });
+
+    test('returns first two characters for single-word names', () {
+      expect(AvatarLabelHelper.buildLabel('Alpha'), 'AL');
+    });
+
+    test('allows three compact characters for hash-prefixed names', () {
+      expect(AvatarLabelHelper.buildLabel('#ops'), '#OP');
+    });
+
+    test('removes spacing after hash-prefixed names', () {
+      expect(AvatarLabelHelper.buildLabel('# foo alpha'), '#FO');
+    });
+
+    test('keeps non-hash labels at two characters', () {
+      expect(AvatarLabelHelper.buildLabel('abc'), 'AB');
+    });
+  });
+}

test/utils/log_rx_route_decoder_test.dart

@@ -0,0 +1,92 @@
+import 'dart:typed_data';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/models/contact.dart';
+import 'package:meshcore_sar_app/utils/log_rx_route_decoder.dart';
+
+void main() {
+  group('LogRxRouteDecoder.decode', () {
+    test('parses route and sender from LOG_RX_DATA packet', () {
+      final packet = Uint8List.fromList([
+        0x88,
+        0x37,
+        0xae,
+        0x05,
+        0x04,
+        0xc2,
+        0xba,
+        0x5f,
+        0xde,
+        0x5c,
+      ]);
+
+      final decoded = LogRxRouteDecoder.decode(packet);
+
+      expect(decoded, isNotNull);
+      expect(decoded!.payloadType, 0x01);
+      expect(decoded.pathHashes, [0xc2, 0xba, 0x5f, 0xde]);
+      expect(decoded.originalSenderHash, 0xc2);
+    });
+  });
+
+  group('LogRxRouteDecoder.resolveHash', () {
+    test('prefers own node when hash matches device key', () {
+      final resolved = LogRxRouteDecoder.resolveHash(
+        0xc2,
+        contacts: const [],
+        ownPublicKey: Uint8List.fromList([0xc2, 0x01, 0x02]),
+        ownName: 'Base',
+      );
+
+      expect(resolved.isOwnNode, isTrue);
+      expect(resolved.label, 'Base (you)');
+    });
+
+    test('resolves unique contact by first public key byte', () {
+      final resolved = LogRxRouteDecoder.resolveHash(
+        0xc2,
+        contacts: [_contact(name: 'Alpha', keyPrefix: 0xc2)],
+      );
+
+      expect(resolved.isUniqueMatch, isTrue);
+      expect(resolved.label, 'Alpha');
+    });
+
+    test('marks ambiguous matches without pretending certainty', () {
+      final resolved = LogRxRouteDecoder.resolveHash(
+        0xc2,
+        contacts: [
+          _contact(name: 'Alpha', keyPrefix: 0xc2),
+          _contact(name: 'Bravo', keyPrefix: 0xc2),
+        ],
+      );
+
+      expect(resolved.isUniqueMatch, isFalse);
+      expect(resolved.matchCount, 2);
+    });
+  });
+}
+
+Contact _contact({required String name, required int keyPrefix}) {
+  return Contact(
+    publicKey: Uint8List.fromList([
+      keyPrefix,
+      0x11,
+      0x22,
+      0x33,
+      0x44,
+      0x55,
+      0x66,
+      0x77,
+    ]),
+    type: ContactType.chat,
+    flags: 0,
+    outPathLen: 0,
+    outPath: Uint8List(0),
+    advName: name,
+    lastAdvert: 0,
+    advLat: 0,
+    advLon: 0,
+    lastMod: 0,
+  );
+}

test/widgets/contact_avatar_test.dart

@@ -0,0 +1,106 @@
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/models/contact.dart';
+import 'package:meshcore_sar_app/widgets/common/contact_avatar.dart';
+
+void main() {
+  Contact buildContact({
+    required String name,
+    required ContactType type,
+    int secondByte = 0,
+  }) {
+    final publicKey = Uint8List(32);
+    publicKey[1] = secondByte;
+
+    return Contact(
+      publicKey: publicKey,
+      type: type,
+      flags: 0,
+      outPathLen: 0,
+      outPath: Uint8List(0),
+      advName: name,
+      lastAdvert: 0,
+      advLat: 0,
+      advLon: 0,
+      lastMod: 0,
+    );
+  }
+
+  Future<void> pumpAvatar(WidgetTester tester, Contact contact) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(body: Center(child: ContactAvatar(contact: contact))),
+      ),
+    );
+  }
+
+  testWidgets('renders label avatar for rooms', (tester) async {
+    await pumpAvatar(
+      tester,
+      buildContact(name: 'Operations Room', type: ContactType.room),
+    );
+
+    expect(find.text('OR'), findsOneWidget);
+    expect(find.byType(CircleAvatar), findsNothing);
+    expect(find.byIcon(Icons.meeting_room), findsNothing);
+  });
+
+  testWidgets('renders hash label avatar for rooms', (tester) async {
+    await pumpAvatar(
+      tester,
+      buildContact(name: '#ops-room', type: ContactType.room),
+    );
+
+    expect(find.text('#OP'), findsOneWidget);
+    expect(find.byType(CircleAvatar), findsNothing);
+    expect(find.byIcon(Icons.meeting_room), findsNothing);
+  });
+
+  testWidgets('renders compact hash label avatar when name includes spacing', (
+    tester,
+  ) async {
+    await pumpAvatar(
+      tester,
+      buildContact(name: '# foo alpha', type: ContactType.room),
+    );
+
+    expect(find.text('#FO'), findsOneWidget);
+    expect(find.byType(CircleAvatar), findsNothing);
+    expect(find.byIcon(Icons.meeting_room), findsNothing);
+  });
+
+  testWidgets('renders label avatar for channels', (tester) async {
+    await pumpAvatar(
+      tester,
+      buildContact(name: '#ops', type: ContactType.channel, secondByte: 3),
+    );
+
+    expect(find.text('#OP'), findsOneWidget);
+    expect(find.byType(CircleAvatar), findsNothing);
+    expect(find.byIcon(Icons.public), findsNothing);
+  });
+
+  testWidgets('renders non-hash label avatar for channels', (tester) async {
+    await pumpAvatar(
+      tester,
+      buildContact(name: 'Command Net', type: ContactType.channel, secondByte: 3),
+    );
+
+    expect(find.text('CN'), findsOneWidget);
+    expect(find.byType(CircleAvatar), findsNothing);
+    expect(find.byIcon(Icons.public), findsNothing);
+  });
+
+  testWidgets('renders round avatar for chat contacts', (tester) async {
+    await pumpAvatar(
+      tester,
+      buildContact(name: 'John Smith', type: ContactType.chat),
+    );
+
+    expect(find.text('JS'), findsOneWidget);
+    expect(find.byType(CircleAvatar), findsOneWidget);
+    expect(find.byIcon(Icons.person), findsNothing);
+  });
+}