fix: migrate filter menus to type-safe generics and harden popup dismissal

- Move ContactSortOption/ContactTypeFilter enums to dedicated
  contact_filter_types.dart (re-exported from contact_search.dart)
- Migrate ContactsFilterMenu and DiscoveryContactsFilterMenu to use
  sealed class action types with SortFilterMenu<T> generics, replacing
  int action constants and switch statements
- Guard _closeDropdownAndRun with ModalRoute.isCurrent check to prevent
  accidental dismissal of parent routes

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

lib/connector/meshcore_connector.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:crypto/crypto.dart' as crypto;
-import 'package:meshcore_open/models/discovery_contact.dart';
 import 'package:pointycastle/export.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
@@ -22,6 +21,7 @@ import '../services/app_settings_service.dart';
 import '../services/background_service.dart';
 import '../services/notification_service.dart';
 import 'meshcore_connector_usb.dart';
+import 'meshcore_connector_tcp.dart';
 import '../storage/channel_message_store.dart';
 import '../storage/channel_order_store.dart';
 import '../storage/channel_settings_store.dart';
@@ -86,7 +86,7 @@ enum MeshCoreConnectionState {
   disconnecting,
 }
 
-enum MeshCoreTransportType { bluetooth, usb }
+enum MeshCoreTransportType { bluetooth, usb, tcp }
 
 class RepeaterBatterySnapshot {
   final int millivolts;
@@ -116,11 +116,12 @@ class MeshCoreConnector extends ChangeNotifier {
   bool _manualDisconnect = false;
   final MeshCoreUsbManager _usbManager = MeshCoreUsbManager();
   StreamSubscription<Uint8List>? _usbFrameSubscription;
+  final MeshCoreTcpConnector _tcpConnector = MeshCoreTcpConnector();
   MeshCoreTransportType _activeTransport = MeshCoreTransportType.bluetooth;
 
   final List<ScanResult> _scanResults = [];
   final List<Contact> _contacts = [];
-  final List<DiscoveryContact> _discoveredContacts = [];
+  final List<Contact> _discoveredContacts = [];
   final List<Channel> _channels = [];
   final Map<String, List<Message>> _conversations = {};
   final Map<int, List<ChannelMessage>> _channelMessages = {};
@@ -255,6 +256,10 @@ class MeshCoreConnector extends ChangeNotifier {
   bool get isUsbTransportConnected =>
       _state == MeshCoreConnectionState.connected &&
       _activeTransport == MeshCoreTransportType.usb;
+  String? get activeTcpEndpoint => _tcpConnector.activeEndpoint;
+  bool get isTcpTransportConnected =>
+      _state == MeshCoreConnectionState.connected &&
+      _activeTransport == MeshCoreTransportType.tcp;
 
   String get deviceDisplayName {
     if (_selfName != null && _selfName!.isNotEmpty) {
@@ -281,7 +286,7 @@ class MeshCoreConnector extends ChangeNotifier {
     );
   }
 
-  List<DiscoveryContact> get discoveredContacts {
+  List<Contact> get discoveredContacts {
     return List.unmodifiable(_discoveredContacts);
   }
 
@@ -660,11 +665,11 @@ class MeshCoreConnector extends ChangeNotifier {
     _appDebugLogService = appDebugLogService;
     _backgroundService = backgroundService;
     _usbManager.setDebugLogService(_appDebugLogService);
+    _tcpConnector.setDebugLogService(_appDebugLogService);
 
     // Initialize notification service
     _notificationService.initialize();
     _loadChannelOrder();
-    _loadDiscoveredContactCache();
 
     // Initialize retry service callbacks
     _retryService?.initialize(
@@ -966,6 +971,142 @@ class MeshCoreConnector extends ChangeNotifier {
     }
   }
 
+  Future<void> connectTcp({required String host, required int port}) async {
+    if (_state == MeshCoreConnectionState.connecting ||
+        _state == MeshCoreConnectionState.connected) {
+      _appDebugLogService?.warn(
+        'connectTcp ignored: already $_state',
+        tag: 'TCP',
+      );
+      return;
+    }
+
+    _appDebugLogService?.info('connectTcp: endpoint=$host:$port', tag: 'TCP');
+
+    await stopScan();
+    _cancelReconnectTimer();
+    _manualDisconnect = false;
+    _resetConnectionHandshakeState();
+    _activeTransport = MeshCoreTransportType.tcp;
+    _setState(MeshCoreConnectionState.connecting);
+
+    try {
+      Future<void> handleTcpConnectAbort({required String message}) async {
+        _appDebugLogService?.warn(message, tag: 'TCP');
+        final shouldResetState = shouldResetStateAfterTcpConnectAbort(
+          state: _state,
+          activeTransport: _activeTransport,
+        );
+        if (shouldResetState) {
+          await disconnect(manual: false);
+          return;
+        }
+        if (_tcpConnector.isConnected) {
+          await _tcpConnector.disconnect();
+        }
+      }
+
+      await _tcpConnector.cancelFrameSubscription();
+      await _tcpConnector.connect(host: host, port: port);
+      final isTcpConnectCancelled =
+          _activeTransport != MeshCoreTransportType.tcp ||
+          _state != MeshCoreConnectionState.connecting ||
+          !_tcpConnector.isConnected;
+      if (isTcpConnectCancelled) {
+        await handleTcpConnectAbort(
+          message:
+              'connectTcp aborted before handshake: state=$_state transport=$_activeTransport connected=${_tcpConnector.isConnected}',
+        );
+        return;
+      }
+      notifyListeners();
+
+      await Future<void>.delayed(const Duration(milliseconds: 200));
+      final isTcpConnectCancelledAfterDelay =
+          _activeTransport != MeshCoreTransportType.tcp ||
+          _state != MeshCoreConnectionState.connecting ||
+          !_tcpConnector.isConnected;
+      if (isTcpConnectCancelledAfterDelay) {
+        await handleTcpConnectAbort(
+          message:
+              'connectTcp aborted after connect delay: state=$_state transport=$_activeTransport connected=${_tcpConnector.isConnected}',
+        );
+        return;
+      }
+      _tcpConnector.listenFrames(
+        onFrame: _handleFrame,
+        onError: (error, stackTrace) {
+          _appDebugLogService?.error('TCP transport error: $error', tag: 'TCP');
+          unawaited(disconnect(manual: false));
+        },
+        onDone: () {
+          _appDebugLogService?.warn('TCP frame stream ended', tag: 'TCP');
+          unawaited(disconnect(manual: false));
+        },
+      );
+
+      _setState(MeshCoreConnectionState.connected);
+      _pendingInitialChannelSync = true;
+      await _requestDeviceInfo();
+      _startBatteryPolling();
+
+      var gotSelfInfo = await _waitForSelfInfo(
+        timeout: const Duration(seconds: 3),
+      );
+      if (!gotSelfInfo) {
+        await refreshDeviceInfo();
+        gotSelfInfo = await _waitForSelfInfo(
+          timeout: const Duration(seconds: 3),
+        );
+      }
+      if (!gotSelfInfo) {
+        throw StateError('Timed out waiting for SELF_INFO during TCP connect');
+      }
+
+      await syncTime();
+    } catch (error) {
+      _appDebugLogService?.error('TCP connection error: $error', tag: 'TCP');
+      final tcpConnectCancelledBeforeHandshake =
+          shouldIgnoreLateTcpConnectError(
+            manualDisconnect: _manualDisconnect,
+            state: _state,
+            activeTransport: _activeTransport,
+            tcpManagerConnected: _tcpConnector.isConnected,
+          );
+      if (tcpConnectCancelledBeforeHandshake) {
+        _appDebugLogService?.info(
+          'Ignoring late TCP connect error after cancellation/switch: state=$_state transport=$_activeTransport',
+          tag: 'TCP',
+        );
+        return;
+      }
+      await disconnect(manual: false);
+      rethrow;
+    }
+  }
+
+  @visibleForTesting
+  static bool shouldIgnoreLateTcpConnectError({
+    required bool manualDisconnect,
+    required MeshCoreConnectionState state,
+    required MeshCoreTransportType activeTransport,
+    required bool tcpManagerConnected,
+  }) {
+    return manualDisconnect &&
+        (state == MeshCoreConnectionState.disconnected ||
+            state == MeshCoreConnectionState.disconnecting) &&
+        (activeTransport != MeshCoreTransportType.tcp || !tcpManagerConnected);
+  }
+
+  @visibleForTesting
+  static bool shouldResetStateAfterTcpConnectAbort({
+    required MeshCoreConnectionState state,
+    required MeshCoreTransportType activeTransport,
+  }) {
+    return state == MeshCoreConnectionState.connecting &&
+        activeTransport == MeshCoreTransportType.tcp;
+  }
+
   Future<void> connect(BluetoothDevice device, {String? displayName}) async {
     if (_state == MeshCoreConnectionState.connecting ||
         _state == MeshCoreConnectionState.connected) {
@@ -1231,6 +1372,7 @@ class MeshCoreConnector extends ChangeNotifier {
 
   bool get _shouldGateInitialChannelSync =>
       _activeTransport == MeshCoreTransportType.usb ||
+      _activeTransport == MeshCoreTransportType.tcp ||
       (_activeTransport == MeshCoreTransportType.bluetooth &&
           PlatformInfo.isWeb);
 
@@ -1277,9 +1419,11 @@ class MeshCoreConnector extends ChangeNotifier {
   Future<void> disconnect({bool manual = true}) async {
     if (_state == MeshCoreConnectionState.disconnecting) return;
     final transportAtDisconnect = _activeTransport;
-    final transportLabel = transportAtDisconnect == MeshCoreTransportType.usb
-        ? 'USB'
-        : 'BLE';
+    final transportLabel = switch (transportAtDisconnect) {
+      MeshCoreTransportType.bluetooth => 'BLE',
+      MeshCoreTransportType.usb => 'USB',
+      MeshCoreTransportType.tcp => 'TCP',
+    };
 
     _appDebugLogService?.info(
       'Starting disconnect transport=$transportLabel manual=$manual',
@@ -1299,6 +1443,7 @@ class MeshCoreConnector extends ChangeNotifier {
     await _usbFrameSubscription?.cancel();
     _usbFrameSubscription = null;
     await _usbManager.disconnect();
+    await _tcpConnector.disconnect();
 
     await _notifySubscription?.cancel();
     _notifySubscription = null;
@@ -1380,6 +1525,8 @@ class MeshCoreConnector extends ChangeNotifier {
 
     if (_activeTransport == MeshCoreTransportType.usb) {
       await _usbManager.write(data);
+    } else if (_activeTransport == MeshCoreTransportType.tcp) {
+      await _tcpConnector.write(data);
     } else {
       if (_rxCharacteristic == null) {
         throw Exception("MeshCore RX characteristic not available");
@@ -1904,7 +2051,11 @@ class MeshCoreConnector extends ChangeNotifier {
   Future<void> removeContact(Contact contact) async {
     if (!isConnected) return;
 
-    _handleDiscovery(contact, Uint8List(0), noNotify: true);
+    _handleDiscovery(
+      contact,
+      contact.rawPacket ?? Uint8List(0),
+      noNotify: true,
+    );
 
     await sendFrame(buildRemoveContactFrame(contact.publicKey));
     _contacts.removeWhere((c) => c.publicKeyHex == contact.publicKeyHex);
@@ -1920,7 +2071,20 @@ class MeshCoreConnector extends ChangeNotifier {
     notifyListeners();
   }
 
-  Future<void> removeDiscoveredContact(DiscoveryContact contact) async {
+  Future<void> updateKnownDiscovered() async {
+    if (!isConnected) return;
+    for (int i = 0; i < _discoveredContacts.length; i++) {
+      _discoveredContacts[i] = _discoveredContacts[i].copyWith(
+        isActive: _knownContactKeys.contains(
+          _discoveredContacts[i].publicKeyHex,
+        ),
+      );
+    }
+    unawaited(_persistDiscoveredContacts());
+    notifyListeners();
+  }
+
+  Future<void> removeDiscoveredContact(Contact contact) async {
     if (!isConnected) return;
     _discoveredContacts.removeWhere(
       (c) => c.publicKeyHex == contact.publicKeyHex,
@@ -1929,7 +2093,7 @@ class MeshCoreConnector extends ChangeNotifier {
     notifyListeners();
   }
 
-  Future<void> importDiscoveredContact(DiscoveryContact contact) async {
+  Future<void> importDiscoveredContact(Contact contact) async {
     if (!isConnected) return;
 
     await sendFrame(
@@ -1938,11 +2102,23 @@ class MeshCoreConnector extends ChangeNotifier {
         contact.path,
         contact.pathLength,
         type: contact.type,
-        flags: 0,
+        flags: contact.flags,
         name: contact.name,
+        lat: contact.latitude,
+        lon: contact.longitude,
+        lastModified: contact.lastSeen,
       ),
     );
 
+    // Update the discovered contact to mark it as active (imported)
+    final discoveredIndex = _discoveredContacts.indexWhere(
+      (c) => c.publicKeyHex == contact.publicKeyHex,
+    );
+    if (discoveredIndex >= 0) {
+      _discoveredContacts[discoveredIndex] =
+          _discoveredContacts[discoveredIndex].copyWith(isActive: true);
+    }
+
     _handleContactAdvert(
       Contact(
         publicKey: contact.publicKey,
@@ -1953,6 +2129,7 @@ class MeshCoreConnector extends ChangeNotifier {
         latitude: contact.latitude,
         longitude: contact.longitude,
         lastSeen: DateTime.now(),
+        flags: contact.flags,
       ),
     );
     notifyListeners();
@@ -1969,6 +2146,8 @@ class MeshCoreConnector extends ChangeNotifier {
       final existing = _contacts[existingIndex];
       // Use copyWith to preserve pathOverride and pathOverrideBytes
       _contacts[existingIndex] = existing.copyWith(
+        pathOverride: null,
+        pathOverrideBytes: null,
         pathLength: -1,
         path: Uint8List(0),
       );
@@ -2324,6 +2503,7 @@ class MeshCoreConnector extends ChangeNotifier {
         debugPrint('Got END_OF_CONTACTS');
         _isLoadingContacts = false;
         _preserveContactsOnRefresh = false;
+        unawaited(updateKnownDiscovered());
         notifyListeners();
         unawaited(_persistContacts());
         if (PlatformInfo.isWeb &&
@@ -2339,7 +2519,8 @@ class MeshCoreConnector extends ChangeNotifier {
         }
         if (_pendingDeferredChannelSyncAfterContacts &&
             (_activeTransport == MeshCoreTransportType.bluetooth ||
-                _activeTransport == MeshCoreTransportType.usb)) {
+                _activeTransport == MeshCoreTransportType.usb ||
+                _activeTransport == MeshCoreTransportType.tcp)) {
           _pendingDeferredChannelSyncAfterContacts = false;
           _pendingInitialChannelSync = false;
           unawaited(getChannels());
@@ -2510,6 +2691,7 @@ class MeshCoreConnector extends ChangeNotifier {
     // Load persisted channel messages
     loadAllChannelMessages();
     loadUnreadState();
+    _loadDiscoveredContactCache();
 
     _awaitingSelfInfo = false;
     _selfInfoRetryTimer?.cancel();
@@ -2527,14 +2709,16 @@ class MeshCoreConnector extends ChangeNotifier {
     if (PlatformInfo.isWeb &&
         _activeTransport == MeshCoreTransportType.bluetooth) {
       _pendingInitialContactsSync = true;
-    } else if (_activeTransport == MeshCoreTransportType.usb) {
+    } else if (_activeTransport == MeshCoreTransportType.usb ||
+        _activeTransport == MeshCoreTransportType.tcp) {
       _pendingDeferredChannelSyncAfterContacts = true;
       getContacts();
     } else {
       getContacts();
     }
     if (_shouldGateInitialChannelSync &&
-        _activeTransport != MeshCoreTransportType.usb) {
+        _activeTransport != MeshCoreTransportType.usb &&
+        _activeTransport != MeshCoreTransportType.tcp) {
       _maybeStartInitialChannelSync();
     }
   }
@@ -4302,6 +4486,7 @@ class MeshCoreConnector extends ChangeNotifier {
     _batteryPollTimer?.cancel();
     _receivedFramesController.close();
     _usbManager.dispose();
+    _tcpConnector.dispose();
 
     // Flush pending unread writes before disposal
     _unreadStore.flush();
@@ -4406,7 +4591,7 @@ class MeshCoreConnector extends ChangeNotifier {
     }
 
     importDiscoveredContact(
-      DiscoveryContact(
+      Contact(
         rawPacket: frame,
         publicKey: publicKey,
         name: name,
@@ -4477,6 +4662,7 @@ class MeshCoreConnector extends ChangeNotifier {
 
     if (isNewContact) {
       final newContact = Contact(
+        rawPacket: rawPacket,
         publicKey: publicKey,
         name: name,
         type: type,
@@ -4622,13 +4808,15 @@ class MeshCoreConnector extends ChangeNotifier {
             latitude: contact.latitude,
             longitude: contact.longitude,
             lastSeen: contact.lastSeen,
+            flags: 0,
+            isActive: false,
           );
       notifyListeners();
       unawaited(_persistDiscoveredContacts());
       return;
     }
 
-    final disContact = DiscoveryContact(
+    final disContact = Contact(
       rawPacket: rawPacket,
       publicKey: contact.publicKey,
       name: contact.name,
@@ -4638,6 +4826,9 @@ class MeshCoreConnector extends ChangeNotifier {
       latitude: contact.latitude,
       longitude: contact.longitude,
       lastSeen: contact.lastSeen,
+      lastMessageAt: contact.lastMessageAt,
+      isActive: false,
+      flags: 0,
     );
     _discoveredContacts.add(disContact);
 

lib/connector/meshcore_connector_tcp.dart

@@ -0,0 +1,70 @@
+import 'dart:async';
+import 'dart:typed_data';
+
+import '../services/app_debug_log_service.dart';
+import '../services/tcp_transport_service.dart';
+
+/// Manages TCP transport for MeshCore devices.
+///
+/// Owns the [TcpTransportService] and TCP-specific connection state.
+/// The main [MeshCoreConnector] delegates all TCP operations here.
+class MeshCoreTcpConnector {
+  final TcpTransportService _service = TcpTransportService();
+  AppDebugLogService? _debugLog;
+  StreamSubscription<Uint8List>? _frameSubscription;
+
+  // --- Getters ---
+  String? get activeEndpoint => _service.activeEndpoint;
+  bool get isConnected => _service.isConnected;
+
+  // --- Configuration ---
+  void setDebugLogService(AppDebugLogService? service) {
+    _debugLog = service;
+    _service.setDebugLogService(service);
+  }
+
+  // --- Connection lifecycle ---
+  Future<void> connect({required String host, required int port}) async {
+    _debugLog?.info('TcpConnector.connect endpoint=$host:$port', tag: 'TCP');
+    await _frameSubscription?.cancel();
+    _frameSubscription = null;
+    await _service.connect(host: host, port: port);
+    _debugLog?.info(
+      'TcpConnector.connect done, endpoint=${_service.activeEndpoint}',
+      tag: 'TCP',
+    );
+  }
+
+  StreamSubscription<Uint8List> listenFrames({
+    required void Function(Uint8List) onFrame,
+    required void Function(Object, StackTrace?) onError,
+    required void Function() onDone,
+  }) {
+    _frameSubscription = _service.frameStream.listen(
+      onFrame,
+      onError: onError,
+      onDone: onDone,
+    );
+    return _frameSubscription!;
+  }
+
+  Future<void> cancelFrameSubscription() async {
+    await _frameSubscription?.cancel();
+    _frameSubscription = null;
+  }
+
+  Future<void> disconnect() async {
+    if (!_service.isConnected && _frameSubscription == null) return;
+    _debugLog?.info('TcpConnector.disconnect', tag: 'TCP');
+    await _frameSubscription?.cancel();
+    _frameSubscription = null;
+    await _service.disconnect();
+  }
+
+  Future<void> write(Uint8List data) => _service.write(data);
+
+  void dispose() {
+    _frameSubscription?.cancel();
+    _service.dispose();
+  }
+}

lib/connector/meshcore_connector_usb.dart

@@ -53,6 +53,9 @@ class MeshCoreUsbManager {
   }
 
   Future<void> disconnect() async {
+    if (!_service.isConnected && _activePortKey == null) {
+      return;
+    }
     _debugLog?.info('UsbManager.disconnect', tag: 'USB');
     await _service.disconnect();
     _activePortKey = null;

lib/connector/meshcore_protocol.dart

@@ -148,6 +148,19 @@ class BufferWriter {
   void writeHex(String hex) {
     writeBytes(hex2Uint8List(hex));
   }
+
+  void writeBytesPadded(Uint8List bytes, int totalLength) {
+    // Path data (64 bytes, zero-padded)
+    final bytesPadded = Uint8List(totalLength);
+    final len = bytes.length < totalLength ? bytes.length : totalLength;
+    if (bytes.isNotEmpty && len > 0) {
+      final copyLen = bytes.length < totalLength ? bytes.length : totalLength;
+      for (int i = 0; i < copyLen; i++) {
+        bytesPadded[i] = bytes[i];
+      }
+    }
+    writeBytes(bytesPadded);
+  }
 }
 
 Uint8List hex2Uint8List(String hex) {
@@ -676,14 +689,17 @@ Uint8List buildResetPathFrame(Uint8List pubKey) {
 }
 
 // Build CMD_ADD_UPDATE_CONTACT frame to set custom path
-// Format: [cmd][pub_key x32][type][flags][path_len][path x64][name x32][timestamp x4]
+// Format: [cmd][pub_key x32][type][flags][path_len][path x64][name x32][Lat? x4, Lon? x4][timestamp? x4]
 Uint8List buildUpdateContactPathFrame(
   Uint8List pubKey,
-  Uint8List customPath,
+  Uint8List path,
   int pathLen, {
   int type = 1, // ADV_TYPE_CHAT
   int flags = 0,
   String name = '',
+  double? lat,
+  double? lon,
+  DateTime? lastModified,
 }) {
   final writer = BufferWriter();
   writer.writeByte(cmdAddUpdateContact);
@@ -692,17 +708,7 @@ Uint8List buildUpdateContactPathFrame(
   writer.writeByte(flags);
   writer.writeByte(pathLen);
 
-  // Path data (64 bytes, zero-padded)
-  final pathPadded = Uint8List(maxPathSize);
-  if (customPath.isNotEmpty && pathLen > 0) {
-    final copyLen = customPath.length < maxPathSize
-        ? customPath.length
-        : maxPathSize;
-    for (int i = 0; i < copyLen; i++) {
-      pathPadded[i] = customPath[i];
-    }
-  }
-  writer.writeBytes(pathPadded);
+  writer.writeBytesPadded(path, maxPathSize);
 
   // Name (32 bytes, null-padded)
   writer.writeCString(name, maxNameSize);
@@ -711,6 +717,27 @@ Uint8List buildUpdateContactPathFrame(
   final timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
   writer.writeUInt32LE(timestamp);
 
+  if ((lat == null || lon == null) && lastModified != null) {
+    // If lat/lon not provided, write zeros
+    writer.writeInt32LE(0);
+    writer.writeInt32LE(0);
+  } else {
+    // Latitude and Longitude are expected in degrees, convert to int by multiplying by 1e6
+    // Latitude
+    final latitude = lat ?? 0.0;
+    writer.writeInt32LE((latitude * 1e6).round());
+
+    // Longitude
+    final longitude = lon ?? 0.0;
+    writer.writeInt32LE((longitude * 1e6).round());
+  }
+
+  if (lastModified != null) {
+    // Last modified
+    final lastModifiedTimestamp = lastModified.millisecondsSinceEpoch ~/ 1000;
+    writer.writeUInt32LE(lastModifiedTimestamp);
+  }
+
   return writer.toBytes();
 }
 

lib/l10n/app_bg.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Нова група",
   "contacts_groupName": "Група",
   "contacts_groupNameRequired": "Името на групата е задължително.",
+  "contacts_groupNameReserved": "Това име на група е запазено",
   "contacts_groupAlreadyExists": "Групата \"{name}\" вече съществува.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1859,5 +1860,33 @@
   "usbConnectionFailed": "Неуспешно свързване през USB: {error}",
   "usbStatus_notConnected": "Изберете USB устройство",
   "usbStatus_searching": "Търсене на USB устройства...",
-  "usbErrorConnectTimedOut": "Връзката прекъсна. Уверете се, че устройството има софтуер за USB връзка."
+  "usbErrorConnectTimedOut": "Връзката прекъсна. Уверете се, че устройството има софтуер за USB връзка.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpHostHint": "192.168.40.10",
+  "tcpScreenTitle": "Свържете се чрез TCP",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpHostLabel": "IP адрес",
+  "tcpPortLabel": "Пристанище",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Въведете крайната точка и свържете се.",
+  "tcpStatus_connectingTo": "Свързване към {endpoint}...",
+  "tcpErrorHostRequired": "Необходим е IP адрес.",
+  "tcpErrorPortInvalid": "Портът трябва да бъде между 1 и 65535.",
+  "tcpErrorUnsupported": "Транспортът чрез TCP не се поддържа на тази платформа.",
+  "tcpErrorTimedOut": "Връзката TCP изтекла.",
+  "tcpConnectionFailed": "Неуспешно е установено TCP връзката: {error}",
+  "map_showDiscoveryContacts": "Покажи контакти за откриване"
 }

lib/l10n/app_de.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Neue Gruppe",
   "contacts_groupName": "Gruppenname",
   "contacts_groupNameRequired": "Der Gruppennamen ist erforderlich.",
+  "contacts_groupNameReserved": "Dieser Gruppenname ist reserviert",
   "contacts_groupAlreadyExists": "Die Gruppe \"{name}\" existiert bereits.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1887,5 +1888,33 @@
   "usbStatus_notConnected": "Wählen Sie ein USB-Gerät aus",
   "usbStatus_connecting": "Verbindung zum USB-Gerät...",
   "usbConnectionFailed": "Fehler beim USB-Verbindungsaufbau: {error}",
-  "usbErrorConnectTimedOut": "Verbindung konnte nicht hergestellt werden. Stellen Sie sicher, dass das Gerät die entsprechende USB-Firmware enthält."
+  "usbErrorConnectTimedOut": "Verbindung konnte nicht hergestellt werden. Stellen Sie sicher, dass das Gerät die entsprechende USB-Firmware enthält.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpHostLabel": "IP-Adresse",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpHostHint": "192.168.40.10",
+  "tcpScreenTitle": "Verbinden über TCP",
+  "tcpPortLabel": "Port",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Geben Sie den Endpunkt ein und verbinden Sie sich.",
+  "tcpStatus_connectingTo": "Verbindung zu {endpoint}...",
+  "tcpErrorHostRequired": "Eine IP-Adresse ist erforderlich.",
+  "tcpErrorPortInvalid": "Die Portnummer muss zwischen 1 und 65535 liegen.",
+  "tcpErrorUnsupported": "Die TCP-Übertragung wird auf dieser Plattform nicht unterstützt.",
+  "tcpErrorTimedOut": "Die TCP-Verbindung ist abgelaufen.",
+  "tcpConnectionFailed": "Fehler beim TCP-Verbindungsaufbau: {error}",
+  "map_showDiscoveryContacts": "Entdeckungs-Kontakte anzeigen"
 }

lib/l10n/app_en.arb

@@ -49,6 +49,33 @@
   "scanner_title": "MeshCore Open",
   "connectionChoiceUsbLabel": "USB",
   "connectionChoiceBluetoothLabel": "Bluetooth",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpScreenTitle": "Connect over TCP",
+  "tcpHostLabel": "IP Address",
+  "tcpHostHint": "192.168.40.10",
+  "tcpPortLabel": "Port",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Enter endpoint and connect",
+  "tcpStatus_connectingTo": "Connecting to {endpoint}...",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpErrorHostRequired": "IP address is required.",
+  "tcpErrorPortInvalid": "Port must be between 1 and 65535.",
+  "tcpErrorUnsupported": "TCP transport is not supported on this platform.",
+  "tcpErrorTimedOut": "TCP connection timed out.",
+  "tcpConnectionFailed": "TCP connection failed: {error}",
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
   "usbScreenTitle": "Connect over USB",
   "usbScreenSubtitle": "Choose a detected serial device and connect directly to your MeshCore node.",
   "usbScreenStatus": "Select a USB device",
@@ -389,6 +416,7 @@
   "contacts_newGroup": "New Group",
   "contacts_groupName": "Group name",
   "contacts_groupNameRequired": "Group name is required",
+  "contacts_groupNameReserved": "This group name is reserved",
   "contacts_groupAlreadyExists": "Group \"{name}\" already exists",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -807,6 +835,7 @@
   "map_markers": "Markers",
   "map_showSharedMarkers": "Show shared markers",
   "map_showGuessedLocations": "Show guessed node locations",
+  "map_showDiscoveryContacts": "Show Discovery Contacts",
   "map_guessedLocation": "Guessed location",
   "map_lastSeenTime": "Last Seen Time",
   "map_sharedPin": "Shared pin",

lib/l10n/app_es.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nuevo Grupo",
   "contacts_groupName": "Nombre del grupo",
   "contacts_groupNameRequired": "El nombre del grupo es obligatorio",
+  "contacts_groupNameReserved": "Este nombre de grupo está reservado",
   "contacts_groupAlreadyExists": "El grupo \"{name}\" ya existe",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1887,5 +1888,33 @@
   "usbStatus_searching": "Buscando dispositivos USB...",
   "usbStatus_notConnected": "Seleccione un dispositivo USB",
   "usbConnectionFailed": "Error al conectar mediante USB: {error}",
-  "usbErrorConnectTimedOut": "La conexión ha caducado. Asegúrese de que el dispositivo tenga el firmware USB Companion."
+  "usbErrorConnectTimedOut": "La conexión ha caducado. Asegúrese de que el dispositivo tenga el firmware USB Companion.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpScreenTitle": "Establecer conexión a través de TCP",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpHostHint": "192.168.40.10",
+  "tcpHostLabel": "Dirección IP",
+  "tcpPortLabel": "Puerto",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Ingrese la dirección final y conecte.",
+  "tcpStatus_connectingTo": "Conectándose a {endpoint}...",
+  "tcpErrorHostRequired": "Se requiere la dirección IP.",
+  "tcpErrorPortInvalid": "El puerto debe estar entre 1 y 65535.",
+  "tcpErrorUnsupported": "El protocolo de transporte TCP no está soportado en esta plataforma.",
+  "tcpErrorTimedOut": "La conexión TCP ha caducado.",
+  "tcpConnectionFailed": "Error en la conexión TCP: {error}",
+  "map_showDiscoveryContacts": "Mostrar Contactos de Descubrimiento"
 }

lib/l10n/app_fr.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nouveau Groupe",
   "contacts_groupName": "Nom du groupe",
   "contacts_groupNameRequired": "Le nom du groupe est obligatoire.",
+  "contacts_groupNameReserved": "Ce nom de groupe est réservé",
   "contacts_groupAlreadyExists": "Le groupe \"{name}\" existe déjà.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1859,5 +1860,33 @@
   "usbConnectionFailed": "Échec de la connexion USB : {error}",
   "usbStatus_connecting": "Connexion au périphérique USB...",
   "usbStatus_searching": "Recherche de périphériques USB...",
-  "usbErrorConnectTimedOut": "La connexion a expiré. Assurez-vous que l'appareil dispose du firmware USB Companion."
+  "usbErrorConnectTimedOut": "La connexion a expiré. Assurez-vous que l'appareil dispose du firmware USB Companion.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpHostLabel": "Adresse IP",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpScreenTitle": "Établir une connexion via TCP",
+  "tcpHostHint": "192.168.40.10",
+  "tcpPortLabel": "Port",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Entrez l'adresse de destination et connectez-vous.",
+  "tcpStatus_connectingTo": "Connexion à {endpoint}...",
+  "tcpErrorHostRequired": "Une adresse IP est obligatoire.",
+  "tcpErrorPortInvalid": "La taille du port doit être comprise entre 1 et 65535.",
+  "tcpErrorUnsupported": "Le protocole TCP n'est pas pris en charge sur cette plateforme.",
+  "tcpErrorTimedOut": "La connexion TCP a expiré.",
+  "tcpConnectionFailed": "Échec de la connexion TCP : {error}",
+  "map_showDiscoveryContacts": "Afficher les contacts de découverte"
 }

lib/l10n/app_it.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nuovo Gruppo",
   "contacts_groupName": "Nome gruppo",
   "contacts_groupNameRequired": "Il nome del gruppo è obbligatorio.",
+  "contacts_groupNameReserved": "Questo nome del gruppo è riservato",
   "contacts_groupAlreadyExists": "Il gruppo \"{name}\" esiste già.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1859,5 +1860,33 @@
   "usbConnectionFailed": "Errore nella connessione USB: {error}",
   "usbStatus_notConnected": "Seleziona un dispositivo USB",
   "usbStatus_connecting": "Connessione al dispositivo USB...",
-  "usbErrorConnectTimedOut": "La connessione è scaduta. Assicurarsi che il dispositivo abbia il firmware USB Companion."
+  "usbErrorConnectTimedOut": "La connessione è scaduta. Assicurarsi che il dispositivo abbia il firmware USB Companion.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpHostLabel": "Indirizzo IP",
+  "tcpHostHint": "192.168.40.10",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpScreenTitle": "Stabilire una connessione tramite TCP",
+  "tcpPortLabel": "Porta",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Inserisci l'endpoint e connettiti.",
+  "tcpStatus_connectingTo": "Connessione a {endpoint}...",
+  "tcpErrorHostRequired": "È necessario fornire un indirizzo IP.",
+  "tcpErrorPortInvalid": "La dimensione della porta deve essere compresa tra 1 e 65535.",
+  "tcpErrorUnsupported": "Il protocollo TCP non è supportato su questa piattaforma.",
+  "tcpErrorTimedOut": "La connessione TCP è scaduta.",
+  "tcpConnectionFailed": "Impossibile stabilire la connessione TCP: {error}",
+  "map_showDiscoveryContacts": "Mostra Contatti di Discovery"
 }

lib/l10n/app_localizations.dart

@@ -334,6 +334,84 @@ abstract class AppLocalizations {
   /// **'Bluetooth'**
   String get connectionChoiceBluetoothLabel;
 
+  /// No description provided for @connectionChoiceTcpLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'TCP'**
+  String get connectionChoiceTcpLabel;
+
+  /// No description provided for @tcpScreenTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Connect over TCP'**
+  String get tcpScreenTitle;
+
+  /// No description provided for @tcpHostLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'IP Address'**
+  String get tcpHostLabel;
+
+  /// No description provided for @tcpHostHint.
+  ///
+  /// In en, this message translates to:
+  /// **'192.168.40.10'**
+  String get tcpHostHint;
+
+  /// No description provided for @tcpPortLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'Port'**
+  String get tcpPortLabel;
+
+  /// No description provided for @tcpPortHint.
+  ///
+  /// In en, this message translates to:
+  /// **'5000'**
+  String get tcpPortHint;
+
+  /// No description provided for @tcpStatus_notConnected.
+  ///
+  /// In en, this message translates to:
+  /// **'Enter endpoint and connect'**
+  String get tcpStatus_notConnected;
+
+  /// No description provided for @tcpStatus_connectingTo.
+  ///
+  /// In en, this message translates to:
+  /// **'Connecting to {endpoint}...'**
+  String tcpStatus_connectingTo(String endpoint);
+
+  /// No description provided for @tcpErrorHostRequired.
+  ///
+  /// In en, this message translates to:
+  /// **'IP address is required.'**
+  String get tcpErrorHostRequired;
+
+  /// No description provided for @tcpErrorPortInvalid.
+  ///
+  /// In en, this message translates to:
+  /// **'Port must be between 1 and 65535.'**
+  String get tcpErrorPortInvalid;
+
+  /// No description provided for @tcpErrorUnsupported.
+  ///
+  /// In en, this message translates to:
+  /// **'TCP transport is not supported on this platform.'**
+  String get tcpErrorUnsupported;
+
+  /// No description provided for @tcpErrorTimedOut.
+  ///
+  /// In en, this message translates to:
+  /// **'TCP connection timed out.'**
+  String get tcpErrorTimedOut;
+
+  /// No description provided for @tcpConnectionFailed.
+  ///
+  /// In en, this message translates to:
+  /// **'TCP connection failed: {error}'**
+  String tcpConnectionFailed(String error);
+
   /// No description provided for @usbScreenTitle.
   ///
   /// In en, this message translates to:
@@ -1636,6 +1714,12 @@ abstract class AppLocalizations {
   /// **'Group name is required'**
   String get contacts_groupNameRequired;
 
+  /// No description provided for @contacts_groupNameReserved.
+  ///
+  /// In en, this message translates to:
+  /// **'This group name is reserved'**
+  String get contacts_groupNameReserved;
+
   /// No description provided for @contacts_groupAlreadyExists.
   ///
   /// In en, this message translates to:
@@ -2788,6 +2872,12 @@ abstract class AppLocalizations {
   /// **'Show guessed node locations'**
   String get map_showGuessedLocations;
 
+  /// No description provided for @map_showDiscoveryContacts.
+  ///
+  /// In en, this message translates to:
+  /// **'Show Discovery Contacts'**
+  String get map_showDiscoveryContacts;
+
   /// No description provided for @map_guessedLocation.
   ///
   /// In en, this message translates to:

lib/l10n/app_localizations_bg.dart

@@ -117,6 +117,50 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Свържете се чрез TCP';
+
+  @override
+  String get tcpHostLabel => 'IP адрес';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Пристанище';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Въведете крайната точка и свържете се.';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Свързване към $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'Необходим е IP адрес.';
+
+  @override
+  String get tcpErrorPortInvalid => 'Портът трябва да бъде между 1 и 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'Транспортът чрез TCP не се поддържа на тази платформа.';
+
+  @override
+  String get tcpErrorTimedOut => 'Връзката TCP изтекла.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Неуспешно е установено TCP връзката: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Свържете се чрез USB';
 
@@ -858,6 +902,9 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Името на групата е задължително.';
 
+  @override
+  String get contacts_groupNameReserved => 'Това име на група е запазено';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Групата \"$name\" вече съществува.';
@@ -1531,6 +1578,9 @@ class AppLocalizationsBg extends AppLocalizations {
   String get map_showGuessedLocations =>
       'Покажете местоположенията на предположените възли.';
 
+  @override
+  String get map_showDiscoveryContacts => 'Покажи контакти за откриване';
+
   @override
   String get map_guessedLocation => 'Предполагано местоположение';
 

lib/l10n/app_localizations_de.dart

@@ -117,6 +117,52 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Verbinden über TCP';
+
+  @override
+  String get tcpHostLabel => 'IP-Adresse';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Port';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected =>
+      'Geben Sie den Endpunkt ein und verbinden Sie sich.';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Verbindung zu $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'Eine IP-Adresse ist erforderlich.';
+
+  @override
+  String get tcpErrorPortInvalid =>
+      'Die Portnummer muss zwischen 1 und 65535 liegen.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'Die TCP-Übertragung wird auf dieser Plattform nicht unterstützt.';
+
+  @override
+  String get tcpErrorTimedOut => 'Die TCP-Verbindung ist abgelaufen.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Fehler beim TCP-Verbindungsaufbau: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Verbinden über USB';
 
@@ -856,6 +902,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Der Gruppennamen ist erforderlich.';
 
+  @override
+  String get contacts_groupNameReserved => 'Dieser Gruppenname ist reserviert';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Die Gruppe \"$name\" existiert bereits.';
@@ -1531,6 +1580,9 @@ class AppLocalizationsDe extends AppLocalizations {
   String get map_showGuessedLocations =>
       'Zeige die vermuteten Knotenpositionen';
 
+  @override
+  String get map_showDiscoveryContacts => 'Entdeckungs-Kontakte anzeigen';
+
   @override
   String get map_guessedLocation => 'Geschätzter Ort';
 

lib/l10n/app_localizations_en.dart

@@ -117,6 +117,50 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Connect over TCP';
+
+  @override
+  String get tcpHostLabel => 'IP Address';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Port';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Enter endpoint and connect';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Connecting to $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'IP address is required.';
+
+  @override
+  String get tcpErrorPortInvalid => 'Port must be between 1 and 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'TCP transport is not supported on this platform.';
+
+  @override
+  String get tcpErrorTimedOut => 'TCP connection timed out.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'TCP connection failed: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Connect over USB';
 
@@ -845,6 +889,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Group name is required';
 
+  @override
+  String get contacts_groupNameReserved => 'This group name is reserved';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Group \"$name\" already exists';
@@ -1506,6 +1553,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get map_showGuessedLocations => 'Show guessed node locations';
 
+  @override
+  String get map_showDiscoveryContacts => 'Show Discovery Contacts';
+
   @override
   String get map_guessedLocation => 'Guessed location';
 

lib/l10n/app_localizations_es.dart

@@ -117,6 +117,50 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Establecer conexión a través de TCP';
+
+  @override
+  String get tcpHostLabel => 'Dirección IP';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Puerto';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Ingrese la dirección final y conecte.';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Conectándose a $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'Se requiere la dirección IP.';
+
+  @override
+  String get tcpErrorPortInvalid => 'El puerto debe estar entre 1 y 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'El protocolo de transporte TCP no está soportado en esta plataforma.';
+
+  @override
+  String get tcpErrorTimedOut => 'La conexión TCP ha caducado.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Error en la conexión TCP: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Conecte mediante USB';
 
@@ -857,6 +901,10 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'El nombre del grupo es obligatorio';
 
+  @override
+  String get contacts_groupNameReserved =>
+      'Este nombre de grupo está reservado';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'El grupo \"$name\" ya existe';
@@ -1529,6 +1577,9 @@ class AppLocalizationsEs extends AppLocalizations {
   String get map_showGuessedLocations =>
       'Mostrar las ubicaciones estimadas de los nodos.';
 
+  @override
+  String get map_showDiscoveryContacts => 'Mostrar Contactos de Descubrimiento';
+
   @override
   String get map_guessedLocation => 'Ubicación estimada';
 

lib/l10n/app_localizations_fr.dart

@@ -117,6 +117,52 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Établir une connexion via TCP';
+
+  @override
+  String get tcpHostLabel => 'Adresse IP';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Port';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected =>
+      'Entrez l\'adresse de destination et connectez-vous.';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Connexion à $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'Une adresse IP est obligatoire.';
+
+  @override
+  String get tcpErrorPortInvalid =>
+      'La taille du port doit être comprise entre 1 et 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'Le protocole TCP n\'est pas pris en charge sur cette plateforme.';
+
+  @override
+  String get tcpErrorTimedOut => 'La connexion TCP a expiré.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Échec de la connexion TCP : $error';
+  }
+
   @override
   String get usbScreenTitle => 'Connectez via USB';
 
@@ -859,6 +905,9 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Le nom du groupe est obligatoire.';
 
+  @override
+  String get contacts_groupNameReserved => 'Ce nom de groupe est réservé';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Le groupe \"$name\" existe déjà.';
@@ -1536,6 +1585,9 @@ class AppLocalizationsFr extends AppLocalizations {
   String get map_showGuessedLocations =>
       'Afficher les emplacements des nœuds estimés';
 
+  @override
+  String get map_showDiscoveryContacts => 'Afficher les contacts de découverte';
+
   @override
   String get map_guessedLocation => 'Lieu deviné';
 

lib/l10n/app_localizations_it.dart

@@ -117,6 +117,51 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Stabilire una connessione tramite TCP';
+
+  @override
+  String get tcpHostLabel => 'Indirizzo IP';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Porta';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Inserisci l\'endpoint e connettiti.';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Connessione a $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'È necessario fornire un indirizzo IP.';
+
+  @override
+  String get tcpErrorPortInvalid =>
+      'La dimensione della porta deve essere compresa tra 1 e 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'Il protocollo TCP non è supportato su questa piattaforma.';
+
+  @override
+  String get tcpErrorTimedOut => 'La connessione TCP è scaduta.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Impossibile stabilire la connessione TCP: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Connessione tramite USB';
 
@@ -856,6 +901,9 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Il nome del gruppo è obbligatorio.';
 
+  @override
+  String get contacts_groupNameReserved => 'Questo nome del gruppo è riservato';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Il gruppo \"$name\" esiste già.';
@@ -1528,6 +1576,9 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get map_showGuessedLocations => 'Mostra le posizioni stimate dei nodi';
 
+  @override
+  String get map_showDiscoveryContacts => 'Mostra Contatti di Discovery';
+
   @override
   String get map_guessedLocation => 'Località indovinata';
 

lib/l10n/app_localizations_nl.dart

@@ -117,6 +117,51 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Verbind via TCP';
+
+  @override
+  String get tcpHostLabel => 'IP-adres';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Poort';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Voer het eindpunt in en verbind';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Verbinding maken met $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'Een IP-adres is vereist.';
+
+  @override
+  String get tcpErrorPortInvalid =>
+      'De poortwaarde moet tussen 1 en 65535 liggen.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'TCP-transport wordt niet ondersteund op deze platform.';
+
+  @override
+  String get tcpErrorTimedOut => 'De TCP-verbinding is verlopen.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Verbinding met TCP mislukt: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Verbind via USB';
 
@@ -850,6 +895,9 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'De groepnaam is verplicht.';
 
+  @override
+  String get contacts_groupNameReserved => 'Deze groepsnaam is gereserveerd';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'De groep \"$name\" bestaat al.';
@@ -1521,6 +1569,9 @@ class AppLocalizationsNl extends AppLocalizations {
   String get map_showGuessedLocations =>
       'Toon de voorspelde locaties van de knopen';
 
+  @override
+  String get map_showDiscoveryContacts => 'Ontdek contacten weergeven';
+
   @override
   String get map_guessedLocation => 'Geroerde locatie';
 

lib/l10n/app_localizations_pl.dart

@@ -117,6 +117,52 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Połącz się za pomocą protokołu TCP';
+
+  @override
+  String get tcpHostLabel => 'Adres IP';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Port';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Wprowadź adres URL i połącz';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Połączenie z $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'Wymagana jest adresa IP.';
+
+  @override
+  String get tcpErrorPortInvalid =>
+      'Numer portu musi mieścić się w zakresie od 1 do 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'Transport protokoł TCP nie jest obsługiwany na tym urządzeniu.';
+
+  @override
+  String get tcpErrorTimedOut =>
+      'Połączenie TCP zakończyło się bez powodzenia.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Błąd połączenia TCP: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Połącz przez USB';
 
@@ -858,6 +904,9 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Nazwa grupy jest wymagana';
 
+  @override
+  String get contacts_groupNameReserved => 'Ta nazwa grupy jest zastrzeżona';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Grupa \"$name\" już istnieje';
@@ -1530,6 +1579,9 @@ class AppLocalizationsPl extends AppLocalizations {
   String get map_showGuessedLocations =>
       'Wyświetl lokalizacje zgadanych węzłów';
 
+  @override
+  String get map_showDiscoveryContacts => 'Pokaż kontakty odkrywania';
+
   @override
   String get map_guessedLocation => 'Wydana lokalizacja';
 

lib/l10n/app_localizations_pt.dart

@@ -117,6 +117,51 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Estabelecer conexão via TCP';
+
+  @override
+  String get tcpHostLabel => 'Endereço IP';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Porta';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Insira o endereço final e conecte-se.';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Conectando a $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'É necessário fornecer um endereço IP.';
+
+  @override
+  String get tcpErrorPortInvalid =>
+      'O valor do porto deve estar entre 1 e 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'O protocolo TCP não é suportado nesta plataforma.';
+
+  @override
+  String get tcpErrorTimedOut => 'A conexão TCP expirou.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Falha na conexão TCP: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Conecte via USB';
 
@@ -858,6 +903,9 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'O nome do grupo é obrigatório.';
 
+  @override
+  String get contacts_groupNameReserved => 'Este nome de grupo está reservado';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'O grupo \"$name\" já existe';
@@ -1530,6 +1578,9 @@ class AppLocalizationsPt extends AppLocalizations {
   String get map_showGuessedLocations =>
       'Mostrar as localizações dos nós estimados';
 
+  @override
+  String get map_showDiscoveryContacts => 'Mostrar Contatos de Descoberta';
+
   @override
   String get map_guessedLocation => 'Localização estimada';
 

lib/l10n/app_localizations_ru.dart

@@ -117,6 +117,51 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Установить соединение по протоколу TCP';
+
+  @override
+  String get tcpHostLabel => 'IP-адрес';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Порт';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Введите адрес и подключитесь.';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Подключение к $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'Необходимо указать IP-адрес.';
+
+  @override
+  String get tcpErrorPortInvalid =>
+      'Порт должен находиться в диапазоне от 1 до 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'Протокол TCP не поддерживается на этой платформе.';
+
+  @override
+  String get tcpErrorTimedOut => 'Соединение TCP не удалось установить.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Не удалось установить соединение TCP: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Подключение через USB';
 
@@ -857,6 +902,9 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Имя группы обязательно';
 
+  @override
+  String get contacts_groupNameReserved => 'Это имя группы зарезервировано';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Группа \"$name\" уже существует';
@@ -1532,6 +1580,9 @@ class AppLocalizationsRu extends AppLocalizations {
   String get map_showGuessedLocations =>
       'Отобразить предполагаемые места расположения узлов';
 
+  @override
+  String get map_showDiscoveryContacts => 'Показать контакты Discovery';
+
   @override
   String get map_guessedLocation => 'Угаданное место';
 

lib/l10n/app_localizations_sk.dart

@@ -117,6 +117,50 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Spojte sa pomocou protokolu TCP';
+
+  @override
+  String get tcpHostLabel => 'IP adresa';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Port';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Zadajte cieľovú adresu a pripojte sa.';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Pripojenie k $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'Je potrebné zadať IP adresu.';
+
+  @override
+  String get tcpErrorPortInvalid => 'Číslo portu musí byť medzi 1 a 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'Prevoz prostredníctvom protokolu TCP nie je na tejto platforme podporovaný.';
+
+  @override
+  String get tcpErrorTimedOut => 'Pripojenie TCP vypršalo.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Neúspešné vytvorenie TCP spojenia: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Pripojte cez USB';
 
@@ -850,6 +894,9 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Skupina musí mať názov.';
 
+  @override
+  String get contacts_groupNameReserved => 'Tento názov skupiny je rezervovaný';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Skupina \"$name\" už existuje';
@@ -1524,6 +1571,9 @@ class AppLocalizationsSk extends AppLocalizations {
   String get map_showGuessedLocations =>
       'Zobraziť umiestnenia odhadnutých uzlov';
 
+  @override
+  String get map_showDiscoveryContacts => 'Zobraziť kontakty objavov';
+
   @override
   String get map_guessedLocation => 'Odhadnutá lokalita';
 

lib/l10n/app_localizations_sl.dart

@@ -117,6 +117,50 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Komunicirajte preko protokola TCP';
+
+  @override
+  String get tcpHostLabel => 'IP naslov';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Vrata';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Vnesite končni naslov in se povežite';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Povezava z $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'Potrebna je IP-naslov.';
+
+  @override
+  String get tcpErrorPortInvalid => 'Port mora biti med 1 in 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'Transport preko protokola TCP ni podprt na tej platformi.';
+
+  @override
+  String get tcpErrorTimedOut => 'Povezava TCP je presegla časovno obdobje.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Napaka pri povezavi TCP: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Povežite preko USB';
 
@@ -848,6 +892,9 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Ime skupine je obvezno.';
 
+  @override
+  String get contacts_groupNameReserved => 'To ime skupine je rezervirano';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Skupina \"$name\" že obstaja';
@@ -1517,6 +1564,9 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get map_showGuessedLocations => 'Pokaži lokacije domnevnih not.';
 
+  @override
+  String get map_showDiscoveryContacts => 'Prikaži odkritja kontaktov';
+
   @override
   String get map_guessedLocation => 'Predpostavljena lokacija';
 

lib/l10n/app_localizations_sv.dart

@@ -117,6 +117,50 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'Anslut via TCP';
+
+  @override
+  String get tcpHostLabel => 'IP-adress';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Port';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Ange slutpunkt och anslut';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Anslutning till $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'IP-adress krävs.';
+
+  @override
+  String get tcpErrorPortInvalid => 'Porten måste vara mellan 1 och 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'TCP-transport fungerar inte på denna plattform.';
+
+  @override
+  String get tcpErrorTimedOut => 'TCP-anslutningen har tidsut gått.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Fel vid TCP-anslutning: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Anslut via USB';
 
@@ -844,6 +888,9 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Gruppnamnet är obligatoriskt';
 
+  @override
+  String get contacts_groupNameReserved => 'Detta gruppnamn är reserverat';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Gruppen \"$name\" finns redan.';
@@ -1514,6 +1561,9 @@ class AppLocalizationsSv extends AppLocalizations {
   String get map_showGuessedLocations =>
       'Visa upp de antagna nodernas placeringar';
 
+  @override
+  String get map_showDiscoveryContacts => 'Visa Discovery-kontakter';
+
   @override
   String get map_guessedLocation => 'Gissad plats';
 

lib/l10n/app_localizations_uk.dart

@@ -117,6 +117,51 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => 'Bluetooth';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => 'З\'єднатися через протокол TCP';
+
+  @override
+  String get tcpHostLabel => 'IP-адреса';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => 'Порт';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => 'Введіть кінцеву точку та підключіться';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return 'Підключення до $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => 'Необхідно вказати IP-адресу.';
+
+  @override
+  String get tcpErrorPortInvalid => 'Порт повинен бути в межах від 1 до 65535.';
+
+  @override
+  String get tcpErrorUnsupported =>
+      'Транспорт TCP не підтримується на цій платформі.';
+
+  @override
+  String get tcpErrorTimedOut =>
+      'З\'єднання TCP завершилося через закінчення часу очікування.';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'Не вдалося встановити з\'єднання TCP: $error';
+  }
+
   @override
   String get usbScreenTitle => 'Підключити через USB';
 
@@ -853,6 +898,9 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Назва групи обов\'язкова.';
 
+  @override
+  String get contacts_groupNameReserved => 'Ця назва групи зарезервована';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Група «$name» вже існує.';
@@ -1529,6 +1577,9 @@ class AppLocalizationsUk extends AppLocalizations {
   String get map_showGuessedLocations =>
       'Показати місцезнаходження передбачених вузлів';
 
+  @override
+  String get map_showDiscoveryContacts => 'Показати контакти Відкриття';
+
   @override
   String get map_guessedLocation => 'Визначено місцезнаходження';
 

lib/l10n/app_localizations_zh.dart

@@ -117,6 +117,49 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get connectionChoiceBluetoothLabel => '蓝牙';
 
+  @override
+  String get connectionChoiceTcpLabel => 'TCP';
+
+  @override
+  String get tcpScreenTitle => '通过 TCP 连接';
+
+  @override
+  String get tcpHostLabel => 'IP地址';
+
+  @override
+  String get tcpHostHint => '192.168.40.10';
+
+  @override
+  String get tcpPortLabel => '端口';
+
+  @override
+  String get tcpPortHint => '5000';
+
+  @override
+  String get tcpStatus_notConnected => '输入目标地址，然后连接';
+
+  @override
+  String tcpStatus_connectingTo(String endpoint) {
+    return '连接到 $endpoint...';
+  }
+
+  @override
+  String get tcpErrorHostRequired => '需要提供IP地址。';
+
+  @override
+  String get tcpErrorPortInvalid => '端口号必须在 1 到 65535 之间。';
+
+  @override
+  String get tcpErrorUnsupported => '此平台不支持 TCP 传输。';
+
+  @override
+  String get tcpErrorTimedOut => 'TCP 连接超时。';
+
+  @override
+  String tcpConnectionFailed(String error) {
+    return 'TCP 连接失败：$error';
+  }
+
   @override
   String get usbScreenTitle => '通过USB连接';
 
@@ -802,6 +845,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => '请输入群聊名称';
 
+  @override
+  String get contacts_groupNameReserved => '该群组名称已被保留';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return '名为 \"$name\" 的群聊已存在';
@@ -1440,6 +1486,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get map_showGuessedLocations => '显示猜测的节点位置';
 
+  @override
+  String get map_showDiscoveryContacts => '显示发现联系人';
+
   @override
   String get map_guessedLocation => '猜测的位置';
 

lib/l10n/app_nl.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nieuwe Groep",
   "contacts_groupName": "Groepnaam",
   "contacts_groupNameRequired": "De groepnaam is verplicht.",
+  "contacts_groupNameReserved": "Deze groepsnaam is gereserveerd",
   "contacts_groupAlreadyExists": "De groep \"{name}\" bestaat al.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1859,5 +1860,33 @@
   "usbStatus_notConnected": "Selecteer een USB-apparaat",
   "usbStatus_connecting": "Verbinding maken met USB-apparaat...",
   "usbStatus_searching": "Zoeken naar USB-apparaten...",
-  "usbErrorConnectTimedOut": "Verbinding is verbroken. Zorg ervoor dat het apparaat de juiste USB-firmware heeft."
+  "usbErrorConnectTimedOut": "Verbinding is verbroken. Zorg ervoor dat het apparaat de juiste USB-firmware heeft.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpScreenTitle": "Verbind via TCP",
+  "tcpHostLabel": "IP-adres",
+  "tcpHostHint": "192.168.40.10",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpPortLabel": "Poort",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Voer het eindpunt in en verbind",
+  "tcpStatus_connectingTo": "Verbinding maken met {endpoint}...",
+  "tcpErrorHostRequired": "Een IP-adres is vereist.",
+  "tcpErrorPortInvalid": "De poortwaarde moet tussen 1 en 65535 liggen.",
+  "tcpErrorUnsupported": "TCP-transport wordt niet ondersteund op deze platform.",
+  "tcpErrorTimedOut": "De TCP-verbinding is verlopen.",
+  "tcpConnectionFailed": "Verbinding met TCP mislukt: {error}",
+  "map_showDiscoveryContacts": "Ontdek contacten weergeven"
 }

lib/l10n/app_pl.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nowa Grupa",
   "contacts_groupName": "Nazwa grupy",
   "contacts_groupNameRequired": "Nazwa grupy jest wymagana",
+  "contacts_groupNameReserved": "Ta nazwa grupy jest zastrzeżona",
   "contacts_groupAlreadyExists": "Grupa \"{name}\" już istnieje",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1859,5 +1860,33 @@
   "usbStatus_connecting": "Połączenie z urządzeniem USB...",
   "usbStatus_notConnected": "Wybierz urządzenie USB",
   "usbConnectionFailed": "Błąd połączenia USB: {error}",
-  "usbErrorConnectTimedOut": "Połączenie nie zostało nawiązane. Upewnij się, że urządzenie posiada oprogramowanie \"USB Companion\"."
+  "usbErrorConnectTimedOut": "Połączenie nie zostało nawiązane. Upewnij się, że urządzenie posiada oprogramowanie \"USB Companion\".",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpHostHint": "192.168.40.10",
+  "tcpScreenTitle": "Połącz się za pomocą protokołu TCP",
+  "tcpHostLabel": "Adres IP",
+  "tcpPortLabel": "Port",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Wprowadź adres URL i połącz",
+  "tcpStatus_connectingTo": "Połączenie z {endpoint}...",
+  "tcpErrorHostRequired": "Wymagana jest adresa IP.",
+  "tcpErrorPortInvalid": "Numer portu musi mieścić się w zakresie od 1 do 65535.",
+  "tcpErrorUnsupported": "Transport protokoł TCP nie jest obsługiwany na tym urządzeniu.",
+  "tcpErrorTimedOut": "Połączenie TCP zakończyło się bez powodzenia.",
+  "tcpConnectionFailed": "Błąd połączenia TCP: {error}",
+  "map_showDiscoveryContacts": "Pokaż kontakty odkrywania"
 }

lib/l10n/app_pt.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Novo Grupo",
   "contacts_groupName": "Nome do grupo",
   "contacts_groupNameRequired": "O nome do grupo é obrigatório.",
+  "contacts_groupNameReserved": "Este nome de grupo está reservado",
   "contacts_groupAlreadyExists": "O grupo \"{name}\" já existe",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1859,5 +1860,33 @@
   "usbStatus_notConnected": "Selecione um dispositivo USB",
   "usbConnectionFailed": "Falha na conexão USB: {error}",
   "usbStatus_connecting": "Conectando ao dispositivo USB...",
-  "usbErrorConnectTimedOut": "A conexão expirou. Verifique se o dispositivo possui o firmware USB Companion."
+  "usbErrorConnectTimedOut": "A conexão expirou. Verifique se o dispositivo possui o firmware USB Companion.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpHostLabel": "Endereço IP",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpScreenTitle": "Estabelecer conexão via TCP",
+  "tcpHostHint": "192.168.40.10",
+  "tcpPortLabel": "Porta",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Insira o endereço final e conecte-se.",
+  "tcpStatus_connectingTo": "Conectando a {endpoint}...",
+  "tcpErrorHostRequired": "É necessário fornecer um endereço IP.",
+  "tcpErrorPortInvalid": "O valor do porto deve estar entre 1 e 65535.",
+  "tcpErrorUnsupported": "O protocolo TCP não é suportado nesta plataforma.",
+  "tcpErrorTimedOut": "A conexão TCP expirou.",
+  "tcpConnectionFailed": "Falha na conexão TCP: {error}",
+  "map_showDiscoveryContacts": "Mostrar Contatos de Descoberta"
 }

lib/l10n/app_ru.arb

@@ -212,6 +212,7 @@
   "contacts_newGroup": "Новая группа",
   "contacts_groupName": "Имя группы",
   "contacts_groupNameRequired": "Имя группы обязательно",
+  "contacts_groupNameReserved": "Это имя группы зарезервировано",
   "contacts_groupAlreadyExists": "Группа \"{name}\" уже существует",
   "contacts_filterContacts": "Фильтр контактов...",
   "contacts_noContactsMatchFilter": "Нет контактов, соответствующих фильтру",
@@ -1099,5 +1100,33 @@
   "usbStatus_connecting": "Подключение к USB-устройству...",
   "usbConnectionFailed": "Не удалось установить соединение через USB: {error}",
   "usbStatus_notConnected": "Выберите USB-устройство",
-  "usbErrorConnectTimedOut": "Соединение не установлено. Убедитесь, что устройство имеет установленное программное обеспечение USB Companion."
+  "usbErrorConnectTimedOut": "Соединение не установлено. Убедитесь, что устройство имеет установленное программное обеспечение USB Companion.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpHostHint": "192.168.40.10",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpHostLabel": "IP-адрес",
+  "tcpScreenTitle": "Установить соединение по протоколу TCP",
+  "tcpPortLabel": "Порт",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Введите адрес и подключитесь.",
+  "tcpStatus_connectingTo": "Подключение к {endpoint}...",
+  "tcpErrorHostRequired": "Необходимо указать IP-адрес.",
+  "tcpErrorPortInvalid": "Порт должен находиться в диапазоне от 1 до 65535.",
+  "tcpErrorUnsupported": "Протокол TCP не поддерживается на этой платформе.",
+  "tcpErrorTimedOut": "Соединение TCP не удалось установить.",
+  "tcpConnectionFailed": "Не удалось установить соединение TCP: {error}",
+  "map_showDiscoveryContacts": "Показать контакты Discovery"
 }

lib/l10n/app_sk.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nová skupina",
   "contacts_groupName": "Názov skupiny",
   "contacts_groupNameRequired": "Skupina musí mať názov.",
+  "contacts_groupNameReserved": "Tento názov skupiny je rezervovaný",
   "contacts_groupAlreadyExists": "Skupina \"{name}\" už existuje",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1859,5 +1860,33 @@
   "usbConnectionFailed": "Neúspešné pripojenie cez USB: {error}",
   "usbStatus_notConnected": "Vyberte USB zariadenie",
   "usbStatus_connecting": "Pripojenie k USB zariadeniu...",
-  "usbErrorConnectTimedOut": "Pripojenie nebolo úspešné. Uistite sa, že zariadenie má nainštalovaný firmware USB Companion."
+  "usbErrorConnectTimedOut": "Pripojenie nebolo úspešné. Uistite sa, že zariadenie má nainštalovaný firmware USB Companion.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpHostHint": "192.168.40.10",
+  "tcpHostLabel": "IP adresa",
+  "tcpScreenTitle": "Spojte sa pomocou protokolu TCP",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpPortLabel": "Port",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Zadajte cieľovú adresu a pripojte sa.",
+  "tcpStatus_connectingTo": "Pripojenie k {endpoint}...",
+  "tcpErrorHostRequired": "Je potrebné zadať IP adresu.",
+  "tcpErrorPortInvalid": "Číslo portu musí byť medzi 1 a 65535.",
+  "tcpErrorUnsupported": "Prevoz prostredníctvom protokolu TCP nie je na tejto platforme podporovaný.",
+  "tcpErrorTimedOut": "Pripojenie TCP vypršalo.",
+  "tcpConnectionFailed": "Neúspešné vytvorenie TCP spojenia: {error}",
+  "map_showDiscoveryContacts": "Zobraziť kontakty objavov"
 }

lib/l10n/app_sl.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nova skupina",
   "contacts_groupName": "Ime skupine",
   "contacts_groupNameRequired": "Ime skupine je obvezno.",
+  "contacts_groupNameReserved": "To ime skupine je rezervirano",
   "contacts_groupAlreadyExists": "Skupina \"{name}\" že obstaja",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1859,5 +1860,33 @@
   "usbStatus_connecting": "Povezava z USB napravo...",
   "usbStatus_searching": "Iskanje USB naprav...",
   "usbConnectionFailed": "Napaka pri povezavi preko USB: {error}",
-  "usbErrorConnectTimedOut": "Vzpostavitve ni bilo mogo. Prosimo, da se prepričate, da ima naprave trenutno nameštan firmware USB Companion."
+  "usbErrorConnectTimedOut": "Vzpostavitve ni bilo mogo. Prosimo, da se prepričate, da ima naprave trenutno nameštan firmware USB Companion.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpHostLabel": "IP naslov",
+  "tcpHostHint": "192.168.40.10",
+  "tcpScreenTitle": "Komunicirajte preko protokola TCP",
+  "tcpPortLabel": "Vrata",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Vnesite končni naslov in se povežite",
+  "tcpStatus_connectingTo": "Povezava z {endpoint}...",
+  "tcpErrorHostRequired": "Potrebna je IP-naslov.",
+  "tcpErrorPortInvalid": "Port mora biti med 1 in 65535.",
+  "tcpErrorUnsupported": "Transport preko protokola TCP ni podprt na tej platformi.",
+  "tcpErrorTimedOut": "Povezava TCP je presegla časovno obdobje.",
+  "tcpConnectionFailed": "Napaka pri povezavi TCP: {error}",
+  "map_showDiscoveryContacts": "Prikaži odkritja kontaktov"
 }

lib/l10n/app_sv.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Ny grupp",
   "contacts_groupName": "Gruppnamn",
   "contacts_groupNameRequired": "Gruppnamnet är obligatoriskt",
+  "contacts_groupNameReserved": "Detta gruppnamn är reserverat",
   "contacts_groupAlreadyExists": "Gruppen \"{name}\" finns redan.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1859,5 +1860,33 @@
   "usbStatus_notConnected": "Välj en USB-enhet",
   "usbConnectionFailed": "Fel vid USB-anslutning: {error}",
   "usbStatus_searching": "Söker efter USB-enheter...",
-  "usbErrorConnectTimedOut": "Anslutningen har tidsutgått. Se till att enheten har rätt USB-firmware."
+  "usbErrorConnectTimedOut": "Anslutningen har tidsutgått. Se till att enheten har rätt USB-firmware.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpHostHint": "192.168.40.10",
+  "tcpHostLabel": "IP-adress",
+  "tcpScreenTitle": "Anslut via TCP",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpPortLabel": "Port",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Ange slutpunkt och anslut",
+  "tcpStatus_connectingTo": "Anslutning till {endpoint}...",
+  "tcpErrorHostRequired": "IP-adress krävs.",
+  "tcpErrorPortInvalid": "Porten måste vara mellan 1 och 65535.",
+  "tcpErrorUnsupported": "TCP-transport fungerar inte på denna plattform.",
+  "tcpErrorTimedOut": "TCP-anslutningen har tidsut gått.",
+  "tcpConnectionFailed": "Fel vid TCP-anslutning: {error}",
+  "map_showDiscoveryContacts": "Visa Discovery-kontakter"
 }

lib/l10n/app_uk.arb

@@ -286,6 +286,7 @@
   "contacts_newGroup": "Нова група",
   "contacts_groupName": "Назва групи",
   "contacts_groupNameRequired": "Назва групи обов'язкова.",
+  "contacts_groupNameReserved": "Ця назва групи зарезервована",
   "contacts_groupAlreadyExists": "Група «{name}» вже існує.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1859,5 +1860,33 @@
   "usbStatus_notConnected": "Виберіть пристрій USB",
   "usbConnectionFailed": "Не вдалося встановити з'єднання через USB: {error}",
   "usbStatus_connecting": "Підключення до USB-пристрою...",
-  "usbErrorConnectTimedOut": "З'єднання не вдалося встановити. Переконайтеся, що пристрій має встановлене програмне забезпечення USB Companion."
+  "usbErrorConnectTimedOut": "З'єднання не вдалося встановити. Переконайтеся, що пристрій має встановлене програмне забезпечення USB Companion.",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpHostHint": "192.168.40.10",
+  "tcpHostLabel": "IP-адреса",
+  "tcpScreenTitle": "З'єднатися через протокол TCP",
+  "tcpPortLabel": "Порт",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "Введіть кінцеву точку та підключіться",
+  "tcpStatus_connectingTo": "Підключення до {endpoint}...",
+  "tcpErrorHostRequired": "Необхідно вказати IP-адресу.",
+  "tcpErrorPortInvalid": "Порт повинен бути в межах від 1 до 65535.",
+  "tcpErrorUnsupported": "Транспорт TCP не підтримується на цій платформі.",
+  "tcpErrorTimedOut": "З'єднання TCP завершилося через закінчення часу очікування.",
+  "tcpConnectionFailed": "Не вдалося встановити з'єднання TCP: {error}",
+  "map_showDiscoveryContacts": "Показати контакти Відкриття"
 }

lib/l10n/app_zh.arb

@@ -300,6 +300,7 @@
   "contacts_newGroup": "新建群聊",
   "contacts_groupName": "群聊名称",
   "contacts_groupNameRequired": "请输入群聊名称",
+  "contacts_groupNameReserved": "该群组名称已被保留",
   "contacts_groupAlreadyExists": "名为 \"{name}\" 的群聊已存在",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1864,5 +1865,33 @@
   "usbStatus_connecting": "连接USB设备...",
   "usbStatus_notConnected": "选择一个 USB 设备",
   "usbConnectionFailed": "USB 连接失败：{error}",
-  "usbErrorConnectTimedOut": "连接超时。请确保设备已安装 USB 伴侣固件。"
+  "usbErrorConnectTimedOut": "连接超时。请确保设备已安装 USB 伴侣固件。",
+  "@tcpStatus_connectingTo": {
+    "placeholders": {
+      "endpoint": {
+        "type": "String"
+      }
+    }
+  },
+  "@tcpConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "tcpHostLabel": "IP地址",
+  "tcpHostHint": "192.168.40.10",
+  "tcpScreenTitle": "通过 TCP 连接",
+  "connectionChoiceTcpLabel": "TCP",
+  "tcpPortLabel": "端口",
+  "tcpPortHint": "5000",
+  "tcpStatus_notConnected": "输入目标地址，然后连接",
+  "tcpStatus_connectingTo": "连接到 {endpoint}...",
+  "tcpErrorHostRequired": "需要提供IP地址。",
+  "tcpErrorPortInvalid": "端口号必须在 1 到 65535 之间。",
+  "tcpErrorUnsupported": "此平台不支持 TCP 传输。",
+  "tcpErrorTimedOut": "TCP 连接超时。",
+  "tcpConnectionFailed": "TCP 连接失败：{error}",
+  "map_showDiscoveryContacts": "显示发现联系人"
 }

lib/main.dart

@@ -19,6 +19,7 @@ import 'services/app_debug_log_service.dart';
 import 'services/background_service.dart';
 import 'services/map_tile_cache_service.dart';
 import 'services/chat_text_scale_service.dart';
+import 'services/ui_view_state_service.dart';
 import 'storage/prefs_manager.dart';
 import 'utils/app_logger.dart';
 
@@ -39,6 +40,7 @@ void main() async {
   final backgroundService = BackgroundService();
   final mapTileCacheService = MapTileCacheService();
   final chatTextScaleService = ChatTextScaleService();
+  final uiViewStateService = UiViewStateService();
 
   // Load settings
   await appSettingsService.loadSettings();
@@ -56,6 +58,7 @@ void main() async {
   _registerThirdPartyLicenses();
 
   await chatTextScaleService.initialize();
+  await uiViewStateService.initialize();
 
   // Wire up connector with services
   connector.initialize(
@@ -86,6 +89,7 @@ void main() async {
       appDebugLogService: appDebugLogService,
       mapTileCacheService: mapTileCacheService,
       chatTextScaleService: chatTextScaleService,
+      uiViewStateService: uiViewStateService,
     ),
   );
 }
@@ -121,6 +125,7 @@ class MeshCoreApp extends StatelessWidget {
   final AppDebugLogService appDebugLogService;
   final MapTileCacheService mapTileCacheService;
   final ChatTextScaleService chatTextScaleService;
+  final UiViewStateService uiViewStateService;
 
   const MeshCoreApp({
     super.key,
@@ -133,6 +138,7 @@ class MeshCoreApp extends StatelessWidget {
     required this.appDebugLogService,
     required this.mapTileCacheService,
     required this.chatTextScaleService,
+    required this.uiViewStateService,
   });
 
   @override
@@ -146,6 +152,7 @@ class MeshCoreApp extends StatelessWidget {
         ChangeNotifierProvider.value(value: bleDebugLogService),
         ChangeNotifierProvider.value(value: appDebugLogService),
         ChangeNotifierProvider.value(value: chatTextScaleService),
+        ChangeNotifierProvider.value(value: uiViewStateService),
         Provider.value(value: storage),
         Provider.value(value: mapTileCacheService),
       ],

lib/models/app_settings.dart

@@ -39,6 +39,7 @@ class AppSettings {
   final Map<String, String> batteryChemistryByRepeaterId;
   final UnitSystem unitSystem;
   final Set<String> mutedChannels;
+  final bool mapShowDiscoveryContacts;
 
   AppSettings({
     this.clearPathOnMaxRetry = false,
@@ -66,6 +67,7 @@ class AppSettings {
     Map<String, String>? batteryChemistryByRepeaterId,
     this.unitSystem = UnitSystem.metric,
     Set<String>? mutedChannels,
+    this.mapShowDiscoveryContacts = true,
   }) : batteryChemistryByDeviceId = batteryChemistryByDeviceId ?? {},
        batteryChemistryByRepeaterId = batteryChemistryByRepeaterId ?? {},
        mutedChannels = mutedChannels ?? {};
@@ -97,6 +99,7 @@ class AppSettings {
       'battery_chemistry_by_repeater_id': batteryChemistryByRepeaterId,
       'unit_system': unitSystem.value,
       'muted_channels': mutedChannels.toList(),
+      'map_show_discovery_contacts': mapShowDiscoveryContacts,
     };
   }
 
@@ -152,6 +155,8 @@ class AppSettings {
               ?.map((e) => e.toString())
               .toSet()) ??
           {},
+      mapShowDiscoveryContacts:
+          json['map_show_discovery_contacts'] as bool? ?? true,
     );
   }
 
@@ -181,6 +186,7 @@ class AppSettings {
     Map<String, String>? batteryChemistryByRepeaterId,
     UnitSystem? unitSystem,
     Set<String>? mutedChannels,
+    bool? mapShowDiscoveryContacts,
   }) {
     return AppSettings(
       clearPathOnMaxRetry: clearPathOnMaxRetry ?? this.clearPathOnMaxRetry,
@@ -217,6 +223,8 @@ class AppSettings {
           batteryChemistryByRepeaterId ?? this.batteryChemistryByRepeaterId,
       unitSystem: unitSystem ?? this.unitSystem,
       mutedChannels: mutedChannels ?? this.mutedChannels,
+      mapShowDiscoveryContacts:
+          mapShowDiscoveryContacts ?? this.mapShowDiscoveryContacts,
     );
   }
 }

lib/models/contact.dart

@@ -17,6 +17,8 @@ class Contact {
   final double? longitude;
   final DateTime lastSeen;
   final DateTime lastMessageAt;
+  final bool isActive;
+  final Uint8List? rawPacket;
 
   Contact({
     required this.publicKey,
@@ -31,6 +33,8 @@ class Contact {
     this.longitude,
     required this.lastSeen,
     DateTime? lastMessageAt,
+    this.isActive = true,
+    this.rawPacket,
   }) : lastMessageAt = lastMessageAt ?? lastSeen;
 
   String get publicKeyHex => pubKeyToHex(publicKey);
@@ -78,6 +82,8 @@ class Contact {
     double? longitude,
     DateTime? lastSeen,
     DateTime? lastMessageAt,
+    bool? isActive,
+    Uint8List? rawPacket,
   }) {
     return Contact(
       publicKey: publicKey ?? this.publicKey,
@@ -96,6 +102,8 @@ class Contact {
       longitude: longitude ?? this.longitude,
       lastSeen: lastSeen ?? this.lastSeen,
       lastMessageAt: lastMessageAt ?? this.lastMessageAt,
+      isActive: isActive ?? this.isActive,
+      rawPacket: rawPacket ?? this.rawPacket,
     );
   }
 
@@ -204,6 +212,8 @@ class Contact {
         latitude: lat,
         longitude: lon,
         lastSeen: DateTime.fromMillisecondsSinceEpoch(lastMod * 1000),
+        isActive: true,
+        rawPacket: null,
       );
     } catch (e) {
       appLogger.error('Failed to parse contact frame: $e');

lib/models/discovery_contact.dart

@@ -1,105 +0,0 @@
-import 'dart:typed_data';
-import '../connector/meshcore_protocol.dart';
-
-class DiscoveryContact {
-  final Uint8List rawPacket;
-  final Uint8List publicKey;
-  final String name;
-  final int type;
-  final int pathLength; // -1 = flood, 0+ = direct hops (from device)
-  final Uint8List path; // Path bytes from device
-  final double? latitude;
-  final double? longitude;
-  final DateTime lastSeen;
-
-  DiscoveryContact({
-    required this.rawPacket,
-    required this.publicKey,
-    required this.name,
-    required this.type,
-    required this.pathLength,
-    required this.path,
-    this.latitude,
-    this.longitude,
-    required this.lastSeen,
-  });
-
-  String get publicKeyHex => pubKeyToHex(publicKey);
-
-  String get typeLabel {
-    switch (type) {
-      case advTypeChat:
-        return 'Chat';
-      case advTypeRepeater:
-        return 'Repeater';
-      case advTypeRoom:
-        return 'Room';
-      case advTypeSensor:
-        return 'Sensor';
-      default:
-        return 'Unknown';
-    }
-  }
-
-  String get pathLabel {
-    if (pathLength < 0) return 'Flood';
-    if (pathLength == 0) return 'Direct';
-    return '$pathLength hops';
-  }
-
-  bool get hasLocation => latitude != null && longitude != null;
-
-  DiscoveryContact copyWith({
-    Uint8List? rawPacket,
-    Uint8List? publicKey,
-    String? name,
-    int? type,
-    int? pathLength,
-    Uint8List? path,
-    double? latitude,
-    double? longitude,
-    DateTime? lastSeen,
-  }) {
-    return DiscoveryContact(
-      rawPacket: rawPacket ?? this.rawPacket,
-      publicKey: publicKey ?? this.publicKey,
-      name: name ?? this.name,
-      type: type ?? this.type,
-      pathLength: pathLength ?? this.pathLength,
-      path: path ?? this.path,
-      latitude: latitude ?? this.latitude,
-      longitude: longitude ?? this.longitude,
-      lastSeen: lastSeen ?? this.lastSeen,
-    );
-  }
-
-  String get pathIdList {
-    final pathBytes = path;
-    if (pathBytes.isEmpty) return '';
-    final parts = <String>[];
-    final groupSize = pathHashSize;
-    for (int i = 0; i < pathBytes.length; i += groupSize) {
-      final end = (i + groupSize) <= pathBytes.length
-          ? (i + groupSize)
-          : pathBytes.length;
-      final chunk = pathBytes.sublist(i, end);
-      parts.add(
-        chunk
-            .map((b) => b.toRadixString(16).padLeft(2, '0').toUpperCase())
-            .join(),
-      );
-    }
-    return parts.join(',');
-  }
-
-  String get shortPubKeyHex {
-    return "<${publicKeyHex.substring(0, 8)}...${publicKeyHex.substring(publicKeyHex.length - 8)}>";
-  }
-
-  @override
-  bool operator ==(Object other) =>
-      other is DiscoveryContact && publicKeyHex == other.publicKeyHex;
-
-  @override
-  int get hashCode => publicKeyHex.hashCode;
-}

lib/screens/ble_debug_log_screen.dart

@@ -118,6 +118,19 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
                                       : Icons.download,
                                   size: 18,
                                 ),
+                                onLongPress: () async {
+                                  await Clipboard.setData(
+                                    ClipboardData(
+                                      text: entry.payload
+                                          .map(
+                                            (b) => b
+                                                .toRadixString(16)
+                                                .padLeft(2, '0'),
+                                          )
+                                          .join(''),
+                                    ),
+                                  );
+                                },
                               );
                             }
 

lib/screens/channel_message_path_screen.dart

@@ -40,8 +40,11 @@ class ChannelMessagePathScreen extends StatelessWidget {
         final primaryPath = !channelMessage && !message.isOutgoing
             ? Uint8List.fromList(primaryPathTmp.reversed.toList())
             : primaryPathTmp;
-
-        final hops = _buildPathHops(primaryPath, connector.contacts, l10n);
+        final contacts = <Contact>[
+          ...connector.contacts,
+          ...connector.discoveredContacts,
+        ];
+        final hops = _buildPathHops(primaryPath, contacts, l10n);
         final hasHopDetails = primaryPath.isNotEmpty;
         final observedLabel = _formatObservedHops(
           primaryPath.length,
@@ -364,11 +367,11 @@ class _ChannelMessagePathMapScreenState
             : selectedPathTmp;
 
         final selectedIndex = _indexForPath(selectedPath, observedPaths);
-        final hops = _buildPathHops(
-          selectedPath,
-          connector.contacts,
-          context.l10n,
-        );
+        final contacts = <Contact>[
+          ...connector.contacts,
+          ...connector.discoveredContacts,
+        ];
+        final hops = _buildPathHops(selectedPath, contacts, context.l10n);
 
         final points = <LatLng>[];
 

lib/screens/channels_screen.dart

@@ -11,6 +11,7 @@ import 'package:uuid/uuid.dart';
 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
 import '../services/app_settings_service.dart';
+import '../services/ui_view_state_service.dart';
 import '../models/channel.dart';
 import '../models/community.dart';
 import '../storage/community_store.dart';
@@ -28,8 +29,6 @@ import 'contacts_screen.dart';
 import 'map_screen.dart';
 import 'settings_screen.dart';
 
-enum ChannelSortOption { manual, name, latestMessages, unread }
-
 class ChannelsScreen extends StatefulWidget {
   final bool hideBackButton;
 
@@ -43,19 +42,20 @@ class _ChannelsScreenState extends State<ChannelsScreen>
     with DisconnectNavigationMixin {
   final TextEditingController _searchController = TextEditingController();
   final CommunityStore _communityStore = CommunityStore();
-  String _searchQuery = '';
   Timer? _searchDebounce;
-  ChannelSortOption _sortOption = ChannelSortOption.manual;
   List<Community> _communities = [];
 
   // Cache of PSK hex -> Community for quick lookup
   final Map<String, Community> _pskToCommunity = {};
 
+  ChannelMessageStore get _channelMessageStore => ChannelMessageStore();
+
   @override
   void initState() {
     super.initState();
-    final connector = context.read<MeshCoreConnector>();
-    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
+    _searchController.text = context
+        .read<UiViewStateService>()
+        .channelsSearchText;
     WidgetsBinding.instance.addPostFrameCallback((_) {
       context.read<MeshCoreConnector>().getChannels();
       _loadCommunities();
@@ -63,6 +63,8 @@ class _ChannelsScreenState extends State<ChannelsScreen>
   }
 
   Future<void> _loadCommunities() async {
+    final connector = context.read<MeshCoreConnector>();
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
     final communities = await _communityStore.loadCommunities();
     if (mounted) {
       setState(() {
@@ -108,6 +110,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
   @override
   Widget build(BuildContext context) {
     final connector = context.watch<MeshCoreConnector>();
+    final viewState = context.watch<UiViewStateService>();
 
     final channelMessageStore = ChannelMessageStore();
     channelMessageStore.setPublicKeyHex = connector.selfPublicKeyHex;
@@ -203,6 +206,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
             final filteredChannels = _filterAndSortChannels(
               channels,
               connector,
+              viewState,
             );
 
             return Column(
@@ -217,17 +221,19 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                       suffixIcon: Row(
                         mainAxisSize: MainAxisSize.min,
                         children: [
-                          if (_searchQuery.isNotEmpty)
+                          if (viewState.channelsSearchText.isNotEmpty)
                             IconButton(
                               icon: const Icon(Icons.clear),
                               onPressed: () {
+                                _searchDebounce?.cancel();
+                                _searchDebounce = null;
                                 _searchController.clear();
-                                setState(() {
-                                  _searchQuery = '';
-                                });
+                                context
+                                    .read<UiViewStateService>()
+                                    .setChannelsSearchText('');
                               },
                             ),
-                          _buildFilterButton(),
+                          _buildFilterButton(viewState),
                         ],
                       ),
                       border: OutlineInputBorder(
@@ -244,9 +250,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                         const Duration(milliseconds: 300),
                         () {
                           if (!mounted) return;
-                          setState(() {
-                            _searchQuery = value.toLowerCase();
-                          });
+                          context
+                              .read<UiViewStateService>()
+                              .setChannelsSearchText(value);
                         },
                       );
                     },
@@ -281,8 +287,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                             ),
                           ],
                         )
-                      : (_sortOption == ChannelSortOption.manual &&
-                            _searchQuery.isEmpty)
+                      : (viewState.channelsSortOption ==
+                                ChannelSortOption.manual &&
+                            viewState.channelsSearchText.isEmpty)
                       ? ReorderableListView.builder(
                           padding: const EdgeInsets.only(
                             left: 16,
@@ -582,59 +589,40 @@ class _ChannelsScreenState extends State<ChannelsScreen>
     await showDisconnectDialog(context, connector);
   }
 
-  Widget _buildFilterButton() {
-    const actionSortManual = 0;
-    const actionSortName = 1;
-    const actionSortLatest = 2;
-    const actionSortUnread = 3;
-
-    return SortFilterMenu(
+  Widget _buildFilterButton(UiViewStateService viewState) {
+    return SortFilterMenu<ChannelSortOption>(
       tooltip: context.l10n.listFilter_tooltip,
       sections: [
-        SortFilterMenuSection(
+        SortFilterMenuSection<ChannelSortOption>(
           title: context.l10n.channels_sortBy,
           options: [
-            SortFilterMenuOption(
-              value: actionSortManual,
+            SortFilterMenuOption<ChannelSortOption>(
+              value: ChannelSortOption.manual,
               label: context.l10n.channels_sortManual,
-              checked: _sortOption == ChannelSortOption.manual,
+              checked: viewState.channelsSortOption == ChannelSortOption.manual,
             ),
-            SortFilterMenuOption(
-              value: actionSortName,
+            SortFilterMenuOption<ChannelSortOption>(
+              value: ChannelSortOption.name,
               label: context.l10n.channels_sortAZ,
-              checked: _sortOption == ChannelSortOption.name,
+              checked: viewState.channelsSortOption == ChannelSortOption.name,
             ),
-            SortFilterMenuOption(
-              value: actionSortLatest,
+            SortFilterMenuOption<ChannelSortOption>(
+              value: ChannelSortOption.latestMessages,
               label: context.l10n.channels_sortLatestMessages,
-              checked: _sortOption == ChannelSortOption.latestMessages,
+              checked:
+                  viewState.channelsSortOption ==
+                  ChannelSortOption.latestMessages,
             ),
-            SortFilterMenuOption(
-              value: actionSortUnread,
+            SortFilterMenuOption<ChannelSortOption>(
+              value: ChannelSortOption.unread,
               label: context.l10n.channels_sortUnread,
-              checked: _sortOption == ChannelSortOption.unread,
+              checked: viewState.channelsSortOption == ChannelSortOption.unread,
             ),
           ],
         ),
       ],
-      onSelected: (action) {
-        setState(() {
-          switch (action) {
-            case actionSortManual:
-              _sortOption = ChannelSortOption.manual;
-              break;
-            case actionSortLatest:
-              _sortOption = ChannelSortOption.latestMessages;
-              break;
-            case actionSortUnread:
-              _sortOption = ChannelSortOption.unread;
-              break;
-            case actionSortName:
-            default:
-              _sortOption = ChannelSortOption.name;
-              break;
-          }
-        });
+      onSelected: (sortOption) {
+        viewState.setChannelsSortOption(sortOption);
       },
     );
   }
@@ -642,11 +630,14 @@ class _ChannelsScreenState extends State<ChannelsScreen>
   List<Channel> _filterAndSortChannels(
     List<Channel> channels,
     MeshCoreConnector connector,
+    UiViewStateService viewState,
   ) {
     var filtered = channels.where((channel) {
-      if (_searchQuery.isEmpty) return true;
+      if (viewState.channelsSearchText.isEmpty) return true;
       final label = _normalizeChannelName(channel);
-      return label.toLowerCase().contains(_searchQuery);
+      return label.toLowerCase().contains(
+        viewState.channelsSearchText.toLowerCase(),
+      );
     }).toList();
 
     int compareByName(Channel a, Channel b) {
@@ -655,7 +646,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
       return nameA.toLowerCase().compareTo(nameB.toLowerCase());
     }
 
-    switch (_sortOption) {
+    switch (viewState.channelsSortOption) {
       case ChannelSortOption.manual:
         break;
       case ChannelSortOption.latestMessages:
@@ -716,6 +707,8 @@ class _ChannelsScreenState extends State<ChannelsScreen>
     bool isRegularHashtag = true;
     Community? selectedCommunity;
 
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
+
     showDialog(
       context: context,
       builder: (dialogContext) => StatefulBuilder(
@@ -767,7 +760,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
             );
           }
 
-          Widget? buildExpandedContent() {
+          Widget? buildExpandedContent(
+            ChannelMessageStore channelMessageStore,
+          ) {
             switch (selectedOption) {
               case 0: // Create Private Channel
                 return Column(
@@ -792,7 +787,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                         children: [
                           Expanded(
                             child: FilledButton(
-                              onPressed: () {
+                              onPressed: () async {
                                 final name = nameController.text.trim();
                                 if (name.isEmpty) {
                                   ScaffoldMessenger.of(
@@ -814,7 +809,14 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                                   psk[i] = random.nextInt(256);
                                 }
                                 Navigator.pop(dialogContext);
-                                connector.setChannel(nextIndex, name, psk);
+                                await connector.setChannel(
+                                  nextIndex,
+                                  name,
+                                  psk,
+                                );
+                                await channelMessageStore.clearChannelMessages(
+                                  nextIndex,
+                                );
                                 if (context.mounted) {
                                   ScaffoldMessenger.of(context).showSnackBar(
                                     SnackBar(
@@ -1333,7 +1335,8 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                       subtitle:
                           dialogContext.l10n.channels_createPrivateChannelDesc,
                     ),
-                    if (selectedOption == 0) buildExpandedContent()!,
+                    if (selectedOption == 0)
+                      buildExpandedContent(_channelMessageStore)!,
                     const Divider(height: 1),
                     buildOptionTile(
                       optionIndex: 1,
@@ -1342,7 +1345,8 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                       subtitle:
                           dialogContext.l10n.channels_joinPrivateChannelDesc,
                     ),
-                    if (selectedOption == 1) buildExpandedContent()!,
+                    if (selectedOption == 1)
+                      buildExpandedContent(_channelMessageStore)!,
                     if (!hasPublicChannel) ...[
                       const Divider(height: 1),
                       buildOptionTile(
@@ -1352,7 +1356,8 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                         subtitle:
                             dialogContext.l10n.channels_joinPublicChannelDesc,
                       ),
-                      if (selectedOption == 2) buildExpandedContent()!,
+                      if (selectedOption == 2)
+                        buildExpandedContent(_channelMessageStore)!,
                     ],
                     const Divider(height: 1),
                     buildOptionTile(
@@ -1362,7 +1367,8 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                       subtitle:
                           dialogContext.l10n.channels_joinHashtagChannelDesc,
                     ),
-                    if (selectedOption == 3) buildExpandedContent()!,
+                    if (selectedOption == 3)
+                      buildExpandedContent(_channelMessageStore)!,
                     const Divider(height: 1),
                     buildOptionTile(
                       optionIndex: 4,
@@ -1370,7 +1376,8 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                       title: dialogContext.l10n.community_scanQr,
                       subtitle: dialogContext.l10n.community_join,
                     ),
-                    if (selectedOption == 4) buildExpandedContent()!,
+                    if (selectedOption == 4)
+                      buildExpandedContent(_channelMessageStore)!,
                     const Divider(height: 1),
                     buildOptionTile(
                       optionIndex: 5,
@@ -1378,7 +1385,8 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                       title: dialogContext.l10n.community_create,
                       subtitle: dialogContext.l10n.community_createDesc,
                     ),
-                    if (selectedOption == 5) buildExpandedContent()!,
+                    if (selectedOption == 5)
+                      buildExpandedContent(_channelMessageStore)!,
                   ],
                 ),
               ),
@@ -1528,7 +1536,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
               try {
                 await connector.deleteChannel(channel.index);
 
-                channelMessageStore.clearChannelMessages(channel.index);
+                await channelMessageStore.clearChannelMessages(channel.index);
 
                 if (!context.mounted) return;
 
@@ -1753,6 +1761,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
     }
 
     final channelCount = communityChannels.length;
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
 
     showDialog(
       context: context,

lib/screens/contacts_screen.dart

@@ -12,8 +12,9 @@ import '../l10n/l10n.dart';
 import '../connector/meshcore_protocol.dart';
 import '../models/contact.dart';
 import '../models/contact_group.dart';
-import '../storage/contact_group_store.dart';
+import '../services/ui_view_state_service.dart';
 import '../utils/contact_search.dart';
+import '../storage/contact_group_store.dart';
 import '../utils/dialog_utils.dart';
 import '../utils/disconnect_navigation_mixin.dart';
 import '../utils/emoji_utils.dart';
@@ -47,12 +48,10 @@ class ContactsScreen extends StatefulWidget {
 class _ContactsScreenState extends State<ContactsScreen>
     with DisconnectNavigationMixin {
   final TextEditingController _searchController = TextEditingController();
-  String _searchQuery = '';
-  ContactSortOption _sortOption = ContactSortOption.lastSeen;
-  bool _showUnreadOnly = false;
-  ContactTypeFilter _typeFilter = ContactTypeFilter.all;
   final ContactGroupStore _groupStore = ContactGroupStore();
+  MeshCoreConnector? _scopeSyncConnector;
   List<ContactGroup> _groups = [];
+  String _loadedGroupScopeKeyHex = '';
   Timer? _searchDebounce;
 
   final Set<ContactOperationType> _pendingOperations = {};
@@ -62,30 +61,91 @@ class _ContactsScreenState extends State<ContactsScreen>
   @override
   void initState() {
     super.initState();
+    _searchController.text = context
+        .read<UiViewStateService>()
+        .contactsSearchText;
     _loadGroups();
     _setupFrameListener();
   }
 
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    final connector = context.read<MeshCoreConnector>();
+    if (!identical(_scopeSyncConnector, connector)) {
+      _scopeSyncConnector?.removeListener(_handleConnectorScopeChange);
+      _scopeSyncConnector = connector;
+      _scopeSyncConnector?.addListener(_handleConnectorScopeChange);
+    }
+    _handleConnectorScopeChange();
+  }
+
   @override
   void dispose() {
     _searchDebounce?.cancel();
     _searchController.dispose();
     _frameSubscription?.cancel();
+    _scopeSyncConnector?.removeListener(_handleConnectorScopeChange);
     super.dispose();
   }
 
+  void _handleConnectorScopeChange() {
+    final connector = _scopeSyncConnector;
+    if (connector == null) return;
+    _syncGroupScopeIfNeeded(connector);
+  }
+
   Future<void> _loadGroups() async {
+    final selfPublicKeyHex = context.read<MeshCoreConnector>().selfPublicKeyHex;
+    if (selfPublicKeyHex.isEmpty) {
+      return;
+    }
+    _groupStore.setPublicKeyHex = selfPublicKeyHex;
     final groups = await _groupStore.loadGroups();
     if (!mounted) return;
     setState(() {
+      _loadedGroupScopeKeyHex = selfPublicKeyHex;
       _groups = groups;
+      _ensureValidSelectedGroup();
     });
   }
 
   Future<void> _saveGroups() async {
+    final selfPublicKeyHex = context.read<MeshCoreConnector>().selfPublicKeyHex;
+    if (selfPublicKeyHex.isEmpty) {
+      return;
+    }
+    _groupStore.setPublicKeyHex = selfPublicKeyHex;
     await _groupStore.saveGroups(_groups);
   }
 
+  bool _hasGroupStoreScope(MeshCoreConnector connector) {
+    return connector.selfPublicKeyHex.isNotEmpty;
+  }
+
+  void _syncGroupScopeIfNeeded(MeshCoreConnector connector) {
+    final selfPublicKeyHex = connector.selfPublicKeyHex;
+    if (selfPublicKeyHex.isEmpty ||
+        selfPublicKeyHex == _loadedGroupScopeKeyHex) {
+      return;
+    }
+    _loadGroups();
+  }
+
+  void _collapseContactsSearch(UiViewStateService viewState) {
+    _searchDebounce?.cancel();
+    _searchDebounce = null;
+    _searchController.clear();
+    viewState.setContactsSearchText('');
+    viewState.setContactsSearchExpanded(false);
+  }
+
+  void _showGroupsUnavailableMessage(BuildContext context) {
+    ScaffoldMessenger.of(
+      context,
+    ).showSnackBar(SnackBar(content: Text(context.l10n.common_loading)));
+  }
+
   void _setupFrameListener() {
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
     // Listen for incoming text messages from the repeater
@@ -375,31 +435,166 @@ class _ContactsScreenState extends State<ContactsScreen>
     await showDisconnectDialog(context, connector);
   }
 
-  Widget _buildFilterButton(BuildContext context, MeshCoreConnector connector) {
-    return ContactsFilterMenu(
-      sortOption: _sortOption,
-      typeFilter: _typeFilter,
-      showUnreadOnly: _showUnreadOnly,
-      onSortChanged: (value) {
-        setState(() {
-          _sortOption = value;
+  ContactGroup? _selectedGroupForName(String selectedGroupName) {
+    if (selectedGroupName == contactsAllGroupsValue) return null;
+    for (final group in _groups) {
+      if (group.name == selectedGroupName) return group;
+    }
+    return null;
+  }
+
+  void _ensureValidSelectedGroup() {
+    final viewState = context.read<UiViewStateService>();
+    if (viewState.contactsSelectedGroupName == contactsAllGroupsValue) return;
+    final exists = _groups.any(
+      (group) => group.name == viewState.contactsSelectedGroupName,
+    );
+    if (!exists) {
+      viewState.setContactsSelectedGroupName(contactsAllGroupsValue);
+    }
+  }
+
+  void _closeDropdownAndRun(BuildContext popupContext, VoidCallback action) {
+    final route = ModalRoute.of(popupContext);
+    if (route != null && route.isCurrent) {
+      Navigator.of(popupContext).pop();
+    }
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      action();
     });
+  }
+
+  Widget _buildFilterButton(
+    BuildContext context,
+    UiViewStateService viewState,
+  ) {
+    return ContactsFilterMenu(
+      sortOption: viewState.contactsSortOption,
+      typeFilter: viewState.contactsTypeFilter,
+      showUnreadOnly: viewState.contactsShowUnreadOnly,
+      onSortChanged: (value) {
+        viewState.setContactsSortOption(value);
       },
       onTypeFilterChanged: (value) {
-        setState(() {
-          _typeFilter = value;
-        });
+        viewState.setContactsTypeFilter(value);
       },
       onUnreadOnlyChanged: (value) {
-        setState(() {
-          _showUnreadOnly = value;
-        });
+        viewState.setContactsShowUnreadOnly(value);
       },
-      onNewGroup: () => _showGroupEditor(context, connector.contacts),
+    );
+  }
+
+  Widget _buildGroupButton(
+    BuildContext context,
+    MeshCoreConnector connector,
+    UiViewStateService viewState,
+    List<Contact> contacts,
+    List<ContactGroup> sortedGroups,
+  ) {
+    final canManageGroups = _hasGroupStoreScope(connector);
+    final selectedGroupName =
+        _selectedGroupForName(viewState.contactsSelectedGroupName)?.name ??
+        context.l10n.listFilter_all;
+    final double menuWidth = (MediaQuery.sizeOf(context).width - 16).clamp(
+      0.0,
+      double.infinity,
+    );
+
+    return PopupMenuButton<String>(
+      position: PopupMenuPosition.under,
+      constraints: BoxConstraints.tightFor(width: menuWidth),
+      onSelected: (String value) {
+        viewState.setContactsSelectedGroupName(value);
+      },
+      itemBuilder: (menuContext) => [
+        PopupMenuItem<String>(
+          value: contactsAllGroupsValue,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(menuContext.l10n.listFilter_all),
+              IconButton(
+                tooltip: menuContext.l10n.contacts_newGroup,
+                icon: const Icon(Icons.group_add, size: 20),
+                onPressed: canManageGroups
+                    ? () => _closeDropdownAndRun(
+                        menuContext,
+                        () => _showGroupEditor(this.context, contacts),
+                      )
+                    : () => _closeDropdownAndRun(
+                        menuContext,
+                        () => _showGroupsUnavailableMessage(this.context),
+                      ),
+              ),
+            ],
+          ),
+        ),
+        ...sortedGroups.map((group) {
+          return PopupMenuItem<String>(
+            value: group.name,
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Expanded(
+                  child: Text(group.name, overflow: TextOverflow.ellipsis),
+                ),
+                IconButton(
+                  tooltip: menuContext.l10n.contacts_editGroup,
+                  icon: const Icon(Icons.edit, size: 20),
+                  onPressed: canManageGroups
+                      ? () => _closeDropdownAndRun(
+                          menuContext,
+                          () => _showGroupEditor(
+                            this.context,
+                            contacts,
+                            group: group,
+                          ),
+                        )
+                      : () => _closeDropdownAndRun(
+                          menuContext,
+                          () => _showGroupsUnavailableMessage(this.context),
+                        ),
+                ),
+                const SizedBox(width: 8),
+                IconButton(
+                  tooltip: menuContext.l10n.contacts_deleteGroup,
+                  icon: const Icon(Icons.delete, size: 20, color: Colors.red),
+                  onPressed: canManageGroups
+                      ? () => _closeDropdownAndRun(
+                          menuContext,
+                          () => _confirmDeleteGroup(this.context, group),
+                        )
+                      : () => _closeDropdownAndRun(
+                          menuContext,
+                          () => _showGroupsUnavailableMessage(this.context),
+                        ),
+                ),
+              ],
+            ),
+          );
+        }),
+      ],
+      child: SizedBox(
+        height: 48,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+          child: Row(
+            children: [
+              Expanded(
+                child: Text(selectedGroupName, overflow: TextOverflow.ellipsis),
+              ),
+              const SizedBox(width: 8),
+              const Icon(Icons.arrow_drop_down),
+            ],
+          ),
+        ),
+      ),
     );
   }
 
   Widget _buildContactsBody(BuildContext context, MeshCoreConnector connector) {
+    final viewState = context.watch<UiViewStateService>();
     final contacts = connector.contacts;
     final shouldShowStartupSpinner =
         contacts.isEmpty &&
@@ -421,92 +616,171 @@ class _ContactsScreenState extends State<ContactsScreen>
       );
     }
 
-    final filteredAndSorted = _filterAndSortContacts(contacts, connector);
-    final filteredGroups = _showUnreadOnly
-        ? const <ContactGroup>[]
-        : _filterAndSortGroups(_groups, contacts);
+    final filteredAndSorted = _filterAndSortContacts(
+      contacts,
+      connector,
+      viewState,
+    );
 
     String hintText = "";
 
-    switch (_typeFilter) {
+    switch (viewState.contactsTypeFilter) {
       case ContactTypeFilter.all:
         hintText = context.l10n.contacts_searchContacts(
           filteredAndSorted.length,
-          _showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+          viewState.contactsShowUnreadOnly
+              ? " ${context.l10n.contacts_unread}"
+              : "",
         );
         break;
       case ContactTypeFilter.users:
         hintText = context.l10n.contacts_searchUsers(
           filteredAndSorted.length,
-          _showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+          viewState.contactsShowUnreadOnly
+              ? " ${context.l10n.contacts_unread}"
+              : "",
         );
         break;
       case ContactTypeFilter.repeaters:
         hintText = context.l10n.contacts_searchRepeaters(
           filteredAndSorted.length,
-          _showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+          viewState.contactsShowUnreadOnly
+              ? " ${context.l10n.contacts_unread}"
+              : "",
         );
         break;
       case ContactTypeFilter.rooms:
         hintText = context.l10n.contacts_searchRoomServers(
           filteredAndSorted.length,
-          _showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+          viewState.contactsShowUnreadOnly
+              ? " ${context.l10n.contacts_unread}"
+              : "",
         );
         break;
       case ContactTypeFilter.favorites:
         hintText = context.l10n.contacts_searchFavorites(
           filteredAndSorted.length,
-          _showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+          viewState.contactsShowUnreadOnly
+              ? " ${context.l10n.contacts_unread}"
+              : "",
         );
         break;
     }
 
+    final groupsByName = <String, ContactGroup>{};
+    for (final group in _groups) {
+      groupsByName.putIfAbsent(group.name, () => group);
+    }
+    final sortedGroups = groupsByName.values.toList()
+      ..sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
+
+    final screenWidth = MediaQuery.sizeOf(context).width;
+    final searchExpandedWidth = (screenWidth * 0.52).clamp(
+      97.0,
+      double.infinity,
+    ); // allow expansion up to 52% of screen width, but not less than the collapsed width
+    final searchCollapsedWidth = (screenWidth * 0.22).clamp(
+      97.0,
+      120.0,
+    ); //two 48px icon buttons + 1px divider
+
     return Column(
       children: [
         Padding(
           padding: const EdgeInsets.all(8.0),
-          child: TextField(
-            controller: _searchController,
-            decoration: InputDecoration(
-              hintText: hintText,
-              prefixIcon: const Icon(Icons.search),
-              suffixIcon: Row(
-                mainAxisSize: MainAxisSize.min,
+          child: Row(
             children: [
-                  if (_searchQuery.isNotEmpty)
-                    IconButton(
-                      icon: const Icon(Icons.clear),
-                      onPressed: () {
-                        _searchController.clear();
-                        setState(() {
-                          _searchQuery = '';
-                        });
-                      },
+              Expanded(
+                child: _buildGroupButton(
+                  context,
+                  connector,
+                  viewState,
+                  contacts,
+                  sortedGroups,
                 ),
-                  _buildFilterButton(context, connector),
-                ],
               ),
-              border: OutlineInputBorder(
+              const SizedBox(width: 8),
+              AnimatedContainer(
+                duration: const Duration(milliseconds: 220),
+                curve: Curves.easeOutCubic,
+                width: viewState.contactsSearchExpanded
+                    ? searchExpandedWidth
+                    : searchCollapsedWidth,
+                height: 48,
+                child: DecoratedBox(
+                  decoration: BoxDecoration(
+                    border: Border.all(
+                      color: Theme.of(context).colorScheme.outline,
+                    ),
                     borderRadius: BorderRadius.circular(12),
                   ),
+                  child: Row(
+                    children: [
+                      Expanded(
+                        child: viewState.contactsSearchExpanded
+                            ? TextField(
+                                controller: _searchController,
+                                autofocus: true,
+                                decoration: InputDecoration(
+                                  hintText: hintText,
+                                  border: InputBorder.none,
                                   contentPadding: const EdgeInsets.symmetric(
-                horizontal: 16,
-                vertical: 12,
+                                    horizontal: 12,
+                                    vertical: 10,
                                   ),
                                 ),
                                 onChanged: (value) {
                                   _searchDebounce?.cancel();
-              _searchDebounce = Timer(const Duration(milliseconds: 300), () {
+                                  _searchDebounce = Timer(
+                                    const Duration(milliseconds: 300),
+                                    () {
                                       if (!mounted) return;
-                setState(() {
-                  _searchQuery = value.toLowerCase();
-                });
-              });
+                                      context
+                                          .read<UiViewStateService>()
+                                          .setContactsSearchText(value);
                                     },
+                                  );
+                                },
+                              )
+                            : const SizedBox.shrink(),
+                      ),
+                      SizedBox(
+                        width: 48,
+                        height: 48,
+                        child: IconButton(
+                          onPressed: () {
+                            if (viewState.contactsSearchExpanded) {
+                              _collapseContactsSearch(viewState);
+                              return;
+                            }
+                            viewState.setContactsSearchExpanded(true);
+                          },
+                          icon: Icon(
+                            viewState.contactsSearchExpanded
+                                ? Icons.close
+                                : Icons.search,
+                          ),
+                        ),
+                      ),
+                      Container(
+                        width: 1,
+                        height: 24,
+                        color: Theme.of(context).colorScheme.outlineVariant,
+                      ),
+                      SizedBox(
+                        width: 48,
+                        height: 48,
+                        child: _buildFilterButton(context, viewState),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
           ),
         ),
         Expanded(
-          child: filteredAndSorted.isEmpty && filteredGroups.isEmpty
+          child: filteredAndSorted.isEmpty
               ? Center(
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
@@ -514,7 +788,7 @@ class _ContactsScreenState extends State<ContactsScreen>
                       Icon(Icons.search_off, size: 64, color: Colors.grey[400]),
                       const SizedBox(height: 16),
                       Text(
-                        _showUnreadOnly
+                        viewState.contactsShowUnreadOnly
                             ? context.l10n.contacts_noUnreadContacts
                             : context.l10n.contacts_noContactsFound,
                         style: TextStyle(fontSize: 16, color: Colors.grey[600]),
@@ -525,14 +799,9 @@ class _ContactsScreenState extends State<ContactsScreen>
               : RefreshIndicator(
                   onRefresh: () => connector.getContacts(),
                   child: ListView.builder(
-                    itemCount: filteredGroups.length + filteredAndSorted.length,
+                    itemCount: filteredAndSorted.length,
                     itemBuilder: (context, index) {
-                      if (index < filteredGroups.length) {
-                        final group = filteredGroups[index];
-                        return _buildGroupTile(context, group, contacts);
-                      }
-                      final contact =
-                          filteredAndSorted[index - filteredGroups.length];
+                      final contact = filteredAndSorted[index];
                       final unreadCount = connector.getUnreadCountForContact(
                         contact,
                       );
@@ -553,55 +822,26 @@ class _ContactsScreenState extends State<ContactsScreen>
     );
   }
 
-  List<ContactGroup> _filterAndSortGroups(
-    List<ContactGroup> groups,
-    List<Contact> contacts,
-  ) {
-    final query = _searchQuery.trim().toLowerCase();
-    final contactsByKey = <String, Contact>{};
-    for (final contact in contacts) {
-      contactsByKey[contact.publicKeyHex] = contact;
-    }
-
-    final filtered = groups
-        .where((group) {
-          if (query.isEmpty) return true;
-          if (group.name.toLowerCase().contains(query)) return true;
-          for (final key in group.memberKeys) {
-            final contact = contactsByKey[key];
-            if (contact != null && matchesContactQuery(contact, query)) {
-              return true;
-            }
-          }
-          return false;
-        })
-        .where((group) {
-          if (_typeFilter == ContactTypeFilter.all) return true;
-          // Groups don't have a favorite flag, so hide them under favorites filter
-          if (_typeFilter == ContactTypeFilter.favorites) return false;
-          for (final key in group.memberKeys) {
-            final contact = contactsByKey[key];
-            if (contact != null && _matchesTypeFilter(contact)) return true;
-          }
-          return false;
-        })
-        .toList();
-
-    filtered.sort(
-      (a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()),
-    );
-    return filtered;
-  }
-
   List<Contact> _filterAndSortContacts(
     List<Contact> contacts,
     MeshCoreConnector connector,
+    UiViewStateService viewState,
   ) {
     var filtered = contacts.where((contact) {
-      if (_searchQuery.isEmpty) return true;
-      return matchesContactQuery(contact, _searchQuery);
+      if (viewState.contactsSearchText.isEmpty) return true;
+      return matchesContactQuery(contact, viewState.contactsSearchText);
     }).toList();
 
+    final selectedGroup = _selectedGroupForName(
+      viewState.contactsSelectedGroupName,
+    );
+    if (selectedGroup != null) {
+      final memberKeys = selectedGroup.memberKeys.toSet();
+      filtered = filtered
+          .where((contact) => memberKeys.contains(contact.publicKeyHex))
+          .toList();
+    }
+
     // Filter out own node from the list
     if (connector.selfPublicKey != null) {
       final selfPubKeyHex = pubKeyToHex(connector.selfPublicKey!);
@@ -610,17 +850,22 @@ class _ContactsScreenState extends State<ContactsScreen>
       }).toList();
     }
 
-    if (_typeFilter != ContactTypeFilter.all) {
-      filtered = filtered.where(_matchesTypeFilter).toList();
+    if (viewState.contactsTypeFilter != ContactTypeFilter.all) {
+      filtered = filtered
+          .where(
+            (contact) =>
+                _matchesTypeFilter(contact, viewState.contactsTypeFilter),
+          )
+          .toList();
     }
 
-    if (_showUnreadOnly) {
+    if (viewState.contactsShowUnreadOnly) {
       filtered = filtered.where((contact) {
         return connector.getUnreadCountForContact(contact) > 0;
       }).toList();
     }
 
-    switch (_sortOption) {
+    switch (viewState.contactsSortOption) {
       case ContactSortOption.lastSeen:
         filtered.sort(
           (a, b) => _resolveLastSeen(b).compareTo(_resolveLastSeen(a)),
@@ -649,8 +894,8 @@ class _ContactsScreenState extends State<ContactsScreen>
     return filtered;
   }
 
-  bool _matchesTypeFilter(Contact contact) {
-    switch (_typeFilter) {
+  bool _matchesTypeFilter(Contact contact, ContactTypeFilter typeFilter) {
+    switch (typeFilter) {
       case ContactTypeFilter.all:
         return true;
       case ContactTypeFilter.favorites:
@@ -671,57 +916,6 @@ class _ContactsScreenState extends State<ContactsScreen>
         : contact.lastSeen;
   }
 
-  Widget _buildGroupTile(
-    BuildContext context,
-    ContactGroup group,
-    List<Contact> contacts,
-  ) {
-    final memberContacts = _resolveGroupContacts(group, contacts);
-    final subtitle = _formatGroupMembers(context, memberContacts);
-    return ListTile(
-      leading: const CircleAvatar(
-        backgroundColor: Colors.teal,
-        child: Icon(Icons.group, color: Colors.white, size: 20),
-      ),
-      title: Text(group.name),
-      subtitle: Text(subtitle),
-      trailing: Text(
-        memberContacts.length.toString(),
-        style: TextStyle(fontSize: 12, color: Colors.grey[600]),
-      ),
-      onTap: () => _showGroupOptions(context, group, contacts),
-      onLongPress: () => _showGroupOptions(context, group, contacts),
-    );
-  }
-
-  List<Contact> _resolveGroupContacts(
-    ContactGroup group,
-    List<Contact> contacts,
-  ) {
-    final byKey = <String, Contact>{};
-    for (final contact in contacts) {
-      byKey[contact.publicKeyHex] = contact;
-    }
-    final resolved = <Contact>[];
-    for (final key in group.memberKeys) {
-      final contact = byKey[key];
-      if (contact != null) {
-        resolved.add(contact);
-      }
-    }
-    resolved.sort(
-      (a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()),
-    );
-    return resolved;
-  }
-
-  String _formatGroupMembers(BuildContext context, List<Contact> members) {
-    if (members.isEmpty) return context.l10n.contacts_noMembers;
-    final names = members.map((c) => c.name).toList();
-    if (names.length <= 2) return names.join(', ');
-    return '${names.take(2).join(', ')} +${names.length - 2}';
-  }
-
   void _openChat(BuildContext context, Contact contact) {
     // Check if this is a repeater
     if (contact.type == advTypeRepeater) {
@@ -799,58 +993,11 @@ class _ContactsScreenState extends State<ContactsScreen>
     );
   }
 
-  void _showGroupOptions(
-    BuildContext context,
-    ContactGroup group,
-    List<Contact> contacts,
-  ) {
-    final members = _resolveGroupContacts(group, contacts);
-    showModalBottomSheet(
-      context: context,
-      builder: (sheetContext) => SafeArea(
-        child: SingleChildScrollView(
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              ListTile(
-                leading: const Icon(Icons.edit),
-                title: Text(context.l10n.contacts_editGroup),
-                onTap: () {
-                  Navigator.pop(sheetContext);
-                  _showGroupEditor(context, contacts, group: group);
-                },
-              ),
-              ListTile(
-                leading: const Icon(Icons.delete, color: Colors.red),
-                title: Text(
-                  context.l10n.contacts_deleteGroup,
-                  style: const TextStyle(color: Colors.red),
-                ),
-                onTap: () {
-                  Navigator.pop(sheetContext);
-                  _confirmDeleteGroup(context, group);
-                },
-              ),
-              if (members.isNotEmpty) const Divider(),
-              ...members.map((member) {
-                return ListTile(
-                  leading: const Icon(Icons.person),
-                  title: Text(member.name),
-                  subtitle: Text(member.typeLabel),
-                  onTap: () {
-                    Navigator.pop(sheetContext);
-                    _openChat(context, member);
-                  },
-                );
-              }),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
   void _confirmDeleteGroup(BuildContext context, ContactGroup group) {
+    if (!_hasGroupStoreScope(context.read<MeshCoreConnector>())) {
+      _showGroupsUnavailableMessage(context);
+      return;
+    }
     showDialog(
       context: context,
       builder: (dialogContext) => AlertDialog(
@@ -866,6 +1013,7 @@ class _ContactsScreenState extends State<ContactsScreen>
               Navigator.pop(dialogContext);
               setState(() {
                 _groups.removeWhere((g) => g.name == group.name);
+                _ensureValidSelectedGroup();
               });
               await _saveGroups();
             },
@@ -884,6 +1032,10 @@ class _ContactsScreenState extends State<ContactsScreen>
     List<Contact> contacts, {
     ContactGroup? group,
   }) {
+    if (!_hasGroupStoreScope(context.read<MeshCoreConnector>())) {
+      _showGroupsUnavailableMessage(context);
+      return;
+    }
     final isEditing = group != null;
     final nameController = TextEditingController(text: group?.name ?? '');
     final selectedKeys = <String>{...group?.memberKeys ?? []};
@@ -910,6 +1062,10 @@ class _ContactsScreenState extends State<ContactsScreen>
             ),
             content: SizedBox(
               width: double.maxFinite,
+              child: ConstrainedBox(
+                constraints: BoxConstraints(
+                  maxHeight: MediaQuery.of(context).size.height * 0.8,
+                ),
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
@@ -935,8 +1091,7 @@ class _ContactsScreenState extends State<ContactsScreen>
                       },
                     ),
                     const SizedBox(height: 12),
-                  SizedBox(
-                    height: 240,
+                    Expanded(
                       child: filteredContacts.isEmpty
                           ? Center(
                               child: Text(
@@ -959,7 +1114,9 @@ class _ContactsScreenState extends State<ContactsScreen>
                                       if (value == true) {
                                         selectedKeys.add(contact.publicKeyHex);
                                       } else {
-                                      selectedKeys.remove(contact.publicKeyHex);
+                                        selectedKeys.remove(
+                                          contact.publicKeyHex,
+                                        );
                                       }
                                     });
                                   },
@@ -970,6 +1127,7 @@ class _ContactsScreenState extends State<ContactsScreen>
                   ],
                 ),
               ),
+            ),
             actions: [
               TextButton(
                 onPressed: () => Navigator.pop(dialogContext),
@@ -986,6 +1144,15 @@ class _ContactsScreenState extends State<ContactsScreen>
                     );
                     return;
                   }
+                  if (name.toLowerCase() ==
+                      contactsAllGroupsValue.toLowerCase()) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      SnackBar(
+                        content: Text(context.l10n.contacts_groupNameReserved),
+                      ),
+                    );
+                    return;
+                  }
                   final exists = _groups.any((g) {
                     if (isEditing && g.name == group.name) return false;
                     return g.name.toLowerCase() == name.toLowerCase();
@@ -1001,15 +1168,21 @@ class _ContactsScreenState extends State<ContactsScreen>
                     return;
                   }
                   setState(() {
+                    final viewState = context.read<UiViewStateService>();
                     if (isEditing) {
                       final index = _groups.indexWhere(
                         (g) => g.name == group.name,
                       );
                       if (index != -1) {
+                        final wasSelected =
+                            viewState.contactsSelectedGroupName == group.name;
                         _groups[index] = ContactGroup(
                           name: name,
                           memberKeys: selectedKeys.toList(),
                         );
+                        if (wasSelected) {
+                          viewState.setContactsSelectedGroupName(name);
+                        }
                       }
                     } else {
                       _groups.add(
@@ -1018,7 +1191,9 @@ class _ContactsScreenState extends State<ContactsScreen>
                           memberKeys: selectedKeys.toList(),
                         ),
                       );
+                      viewState.setContactsSelectedGroupName(name);
                     }
+                    _ensureValidSelectedGroup();
                   });
                   await _saveGroups();
                   if (dialogContext.mounted) {

lib/screens/discovery_screen.dart

@@ -7,7 +7,7 @@ import 'package:provider/provider.dart';
 import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
 import '../l10n/l10n.dart';
-import '../models/discovery_contact.dart';
+import '../models/contact.dart';
 import '../utils/contact_search.dart';
 import '../widgets/app_bar.dart';
 import '../widgets/list_filter_widget.dart';
@@ -129,7 +129,7 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
   }
 
   Future<void> _showContactContextMenu(
-    DiscoveryContact contact,
+    Contact contact,
     MeshCoreConnector connector,
   ) async {
     final action = await showModalBottomSheet<String>(
@@ -169,7 +169,8 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
         connector.importDiscoveredContact(contact);
         break;
       case 'copy_contact':
-        final hexString = pubKeyToHex(contact.rawPacket);
+        if (contact.rawPacket == null) return;
+        final hexString = pubKeyToHex(contact.rawPacket!);
         Clipboard.setData(ClipboardData(text: "meshcore://$hexString"));
         if (!mounted) return;
         ScaffoldMessenger.of(context).showSnackBar(
@@ -207,7 +208,7 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
   }
 
   Widget _buildFilters(
-    List<DiscoveryContact> filteredAndSorted,
+    List<Contact> filteredAndSorted,
     MeshCoreConnector connector,
   ) {
     String hintText = "";
@@ -309,8 +310,8 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
     );
   }
 
-  List<DiscoveryContact> _filterAndSortContacts(
-    List<DiscoveryContact> contacts,
+  List<Contact> _filterAndSortContacts(
+    List<Contact> contacts,
     MeshCoreConnector connector,
   ) {
     var filtered = contacts.where((contact) {
@@ -350,7 +351,7 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
     return filtered;
   }
 
-  bool _matchesTypeFilter(DiscoveryContact contact) {
+  bool _matchesTypeFilter(Contact contact) {
     switch (typeFilter) {
       case ContactTypeFilter.all:
         return true;

lib/screens/map_screen.dart

@@ -1,6 +1,7 @@
 import 'dart:math';
 import 'dart:typed_data';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
@@ -50,7 +51,8 @@ class MapScreen extends StatefulWidget {
 }
 
 class _MapScreenState extends State<MapScreen> {
-  static const double _labelZoomThreshold = 8.5;
+  // Zoom level at which node labels start to appear
+  static const double _labelZoomThreshold = 12.0;
 
   final MapController _mapController = MapController();
   final MapMarkerService _markerService = MapMarkerService();
@@ -91,6 +93,15 @@ class _MapScreenState extends State<MapScreen> {
     });
   }
 
+  bool _checkLocationPlausibility(double lat, double lon) {
+    const double epsilon = 1e-6;
+    return (lat.abs() > epsilon || lon.abs() > epsilon) &&
+        lat >= -90.0 &&
+        lat <= 90.0 &&
+        lon >= -180.0 &&
+        lon <= 180.0;
+  }
+
   double _standardDeviation(List<double> values) {
     if (values.length <= 1) {
       return 0.0;
@@ -126,7 +137,15 @@ class _MapScreenState extends State<MapScreen> {
       builder: (context, connector, settingsService, pathHistory, child) {
         final tileCache = context.read<MapTileCacheService>();
         final settings = settingsService.settings;
-        final contacts = connector.contacts;
+        final allContacts = <Contact>[
+          ...connector.contacts,
+          ...connector.discoveredContacts.where((c) => !c.isActive),
+        ];
+
+        final contacts = settings.mapShowDiscoveryContacts
+            ? allContacts
+            : allContacts.where((c) => c.isActive).toList();
+
         final highlightPosition = widget.highlightPosition;
         final sharedMarkers = settings.mapShowMarkers
             ? _collectSharedMarkers(connector)
@@ -159,14 +178,21 @@ class _MapScreenState extends State<MapScreen> {
             : filteredByTime;
 
         // Filter by location
-        final contactsWithLocation = filteredByKeyPrefix
-            .where((c) => c.hasLocation)
-            .toList();
+        final contactsWithLocation = filteredByKeyPrefix.where((c) {
+          if (!c.hasLocation) {
+            return false;
+          }
+          return _checkLocationPlausibility(c.latitude!, c.longitude!);
+        }).toList();
 
         // All contacts with a known location — used as anchors regardless of
         // time/key-prefix filters so that repeaters are always available.
-        final allContactsWithLocation = contacts
-            .where((c) => c.hasLocation)
+        final allContactsWithLocation = allContacts
+            .where(
+              (c) =>
+                  c.hasLocation &&
+                  _checkLocationPlausibility(c.latitude!, c.longitude!),
+            )
             .toList();
 
         // Compute guessed locations with caching
@@ -468,7 +494,10 @@ class _MapScreenState extends State<MapScreen> {
                             ),
                           ),
                         if (!_isBuildingPathTrace)
-                          ...guessedLocations.map(_buildGuessedMarker),
+                          ..._buildGuessedMarker(
+                            guessedLocations,
+                            showLabels: _showNodeLabels,
+                          ),
                         ..._buildMarkers(
                           contactsWithLocation,
                           settings,
@@ -630,6 +659,13 @@ class _MapScreenState extends State<MapScreen> {
           anchors[0].latitude + offsetDeg * cos(angle),
           anchors[0].longitude + offsetDeg * sin(angle),
         );
+
+        if (!_checkLocationPlausibility(
+          position.latitude,
+          position.longitude,
+        )) {
+          continue; // discard implausible guesses near (0, 0)
+        }
       } else {
         double lat = 0, lon = 0;
         for (final a in anchors) {
@@ -637,6 +673,12 @@ class _MapScreenState extends State<MapScreen> {
           lon += a.longitude;
         }
         position = LatLng(lat / anchors.length, lon / anchors.length);
+        if (!_checkLocationPlausibility(
+          position.latitude,
+          position.longitude,
+        )) {
+          continue; // discard implausible guesses near (0, 0
+        }
       }
       result.add(
         _GuessedLocation(
@@ -710,9 +752,15 @@ class _MapScreenState extends State<MapScreen> {
         .toList();
   }
 
-  Marker _buildGuessedMarker(_GuessedLocation guess) {
+  List<Marker> _buildGuessedMarker(
+    List<_GuessedLocation> guessed, {
+    required bool showLabels,
+  }) {
+    final markers = <Marker>[];
+
+    for (final guess in guessed) {
       final color = _getNodeColor(guess.contact.type);
-    return Marker(
+      final marker = Marker(
         point: guess.position,
         width: 35,
         height: 35,
@@ -725,7 +773,9 @@ class _MapScreenState extends State<MapScreen> {
           child: Container(
             padding: const EdgeInsets.all(4),
             decoration: BoxDecoration(
-            color: color.withValues(alpha: guess.highConfidence ? 0.55 : 0.30),
+              color: color.withValues(
+                alpha: guess.highConfidence ? 0.55 : 0.30,
+              ),
               shape: BoxShape.circle,
               border: Border.all(color: Colors.white, width: 2),
               boxShadow: [
@@ -744,6 +794,19 @@ class _MapScreenState extends State<MapScreen> {
           ),
         ),
       );
+
+      markers.add(marker);
+
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: guess.position,
+            label: guess.contact.name,
+          ),
+        );
+      }
+    }
+    return markers;
   }
 
   List<Marker> _buildMarkers(
@@ -1203,6 +1266,7 @@ class _MapScreenState extends State<MapScreen> {
     Contact contact, {
     LatLng? guessedPosition,
   }) {
+    final connector = context.read<MeshCoreConnector>();
     showDialog(
       context: context,
       builder: (dialogContext) => AlertDialog(
@@ -1248,6 +1312,9 @@ class _MapScreenState extends State<MapScreen> {
               advTypeChat) // Only show chat button for chat nodes
             TextButton(
               onPressed: () {
+                if (!contact.isActive) {
+                  connector.importDiscoveredContact(contact);
+                }
                 Navigator.pop(dialogContext);
                 Navigator.push(
                   context,
@@ -1261,6 +1328,9 @@ class _MapScreenState extends State<MapScreen> {
           if (contact.type == advTypeRepeater)
             TextButton(
               onPressed: () {
+                if (!contact.isActive) {
+                  connector.importDiscoveredContact(contact);
+                }
                 Navigator.pop(dialogContext);
                 _showRepeaterLogin(context, contact);
               },
@@ -1269,6 +1339,9 @@ class _MapScreenState extends State<MapScreen> {
           if (contact.type == advTypeRoom)
             TextButton(
               onPressed: () {
+                if (!contact.isActive) {
+                  connector.importDiscoveredContact(contact);
+                }
                 Navigator.pop(dialogContext);
                 _showRoomLogin(context, contact);
               },
@@ -1745,6 +1818,14 @@ class _MapScreenState extends State<MapScreen> {
                     },
                     contentPadding: EdgeInsets.zero,
                   ),
+                  CheckboxListTile(
+                    title: Text(context.l10n.map_showDiscoveryContacts),
+                    value: settings.mapShowDiscoveryContacts,
+                    onChanged: (value) {
+                      service.setMapShowDiscoveryContacts(value ?? true);
+                    },
+                    contentPadding: EdgeInsets.zero,
+                  ),
                   const SizedBox(height: 16),
                   Text(
                     context.l10n.map_keyPrefix,

lib/screens/neighbors_screen.dart

@@ -124,12 +124,14 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
 
   void _handleNeighborsResponse(MeshCoreConnector connector, Uint8List frame) {
     final buffer = BufferReader(frame);
+    final contacts = <Contact>[
+      ...connector.contacts,
+      ...connector.discoveredContacts,
+    ];
     try {
       final neighborCount = buffer.readUInt16LE();
       final parsedNeighbors = parseNeighborsData(buffer, buffer.readUInt16LE());
-      connector.contacts.where((c) => c.type == advTypeRepeater).forEach((
-        repeater,
-      ) {
+      contacts.where((c) => c.type == advTypeRepeater).forEach((repeater) {
         for (var neighborData in parsedNeighbors) {
           final publicKey = neighborData['publicKey'];
           if (listEquals(

lib/screens/path_trace_map.dart

@@ -114,8 +114,30 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
     super.dispose();
   }
 
-  Uint8List addReturnPath(Uint8List pathBytes) {
-    Uint8List? traceBytes;
+  Uint8List buildPath(Uint8List pathBytes) {
+    Uint8List traceBytes;
+
+    if (pathBytes.isEmpty) {
+      traceBytes = Uint8List(1);
+      traceBytes[0] = widget.targetContact?.publicKey[0] ?? 0;
+      return traceBytes;
+    }
+
+    if (widget.targetContact?.type == advTypeRepeater ||
+        widget.targetContact?.type == advTypeRoom) {
+      final len = (pathBytes.length + pathBytes.length + 1);
+      traceBytes = Uint8List(len);
+      traceBytes[pathBytes.length] = widget.targetContact?.publicKey[0] ?? 0;
+      for (int i = 0; i < pathBytes.length; i++) {
+        traceBytes[i] = pathBytes[i];
+        if (i < pathBytes.length) {
+          traceBytes[len - 1 - i] = pathBytes[i];
+        }
+      }
+    } else {
+      if (pathBytes.length < 2) {
+        return pathBytes[0] == 0 ? Uint8List(0) : pathBytes;
+      }
       final len = (pathBytes.length + pathBytes.length - 1);
       traceBytes = Uint8List(len);
       for (int i = 0; i < pathBytes.length; i++) {
@@ -124,6 +146,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
           traceBytes[len - 1 - i] = pathBytes[i];
         }
       }
+    }
     return traceBytes;
   }
 
@@ -142,11 +165,16 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
         : widget.path;
 
     if (widget.flipPathRound) {
-      path = addReturnPath(pathTmp);
+      path = buildPath(pathTmp);
     } else {
       path = pathTmp;
     }
 
+    appLogger.info(
+      'Initiating path trace with path: ${_formatPathPrefixes(path)}',
+      tag: 'PathTraceMapScreen',
+    );
+
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
     final frame = buildTraceReq(
       DateTime.now().millisecondsSinceEpoch ~/ 1000,
@@ -235,10 +263,11 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
           .toList();
 
       Map<int, Contact> pathContacts = {};
-
-      connector.contacts.where((c) => c.type != advTypeChat).forEach((
-        repeater,
-      ) {
+      final contacts = <Contact>[
+        ...connector.contacts,
+        ...connector.discoveredContacts,
+      ];
+      contacts.where((c) => c.type != advTypeChat).forEach((repeater) {
         for (var repeaterData in pathData) {
           if (listEquals(
             repeater.publicKey.sublist(0, 1),

lib/screens/scanner_screen.dart

@@ -10,6 +10,7 @@ import '../utils/app_logger.dart';
 import '../widgets/adaptive_app_bar_title.dart';
 import '../widgets/device_tile.dart';
 import 'contacts_screen.dart';
+import 'tcp_screen.dart';
 import 'usb_screen.dart';
 
 /// Screen for scanning and connecting to MeshCore devices
@@ -125,10 +126,14 @@ class _ScannerScreenState extends State<ScannerScreen> {
               connector.state == MeshCoreConnectionState.scanning;
           final isBluetoothOff = _bluetoothState == BluetoothAdapterState.off;
           final usbSupported = PlatformInfo.supportsUsbSerial;
+          final tcpSupported = !PlatformInfo.isWeb;
 
           return SafeArea(
             top: false,
             minimum: const EdgeInsets.fromLTRB(16, 8, 16, 16),
+            child: FittedBox(
+              fit: BoxFit.scaleDown,
+              alignment: Alignment.centerRight,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.end,
                 children: [
@@ -148,6 +153,18 @@ class _ScannerScreenState extends State<ScannerScreen> {
                       label: Text(context.l10n.connectionChoiceUsbLabel),
                     ),
                   if (usbSupported) const SizedBox(width: 12),
+                  if (tcpSupported)
+                    FloatingActionButton.extended(
+                      onPressed: () {
+                        Navigator.of(context).push(
+                          MaterialPageRoute(builder: (_) => const TcpScreen()),
+                        );
+                      },
+                      heroTag: 'scanner_tcp_action',
+                      icon: const Icon(Icons.lan),
+                      label: Text(context.l10n.connectionChoiceTcpLabel),
+                    ),
+                  if (tcpSupported) const SizedBox(width: 12),
                   FloatingActionButton.extended(
                     heroTag: 'scanner_ble_action',
                     onPressed: isBluetoothOff
@@ -181,6 +198,7 @@ class _ScannerScreenState extends State<ScannerScreen> {
                   ),
                 ],
               ),
+            ),
           );
         },
       ),

lib/screens/tcp_screen.dart

@@ -0,0 +1,282 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../connector/meshcore_connector.dart';
+import '../l10n/l10n.dart';
+import '../utils/platform_info.dart';
+import '../widgets/adaptive_app_bar_title.dart';
+import 'contacts_screen.dart';
+import 'usb_screen.dart';
+
+class TcpScreen extends StatefulWidget {
+  const TcpScreen({super.key});
+
+  @override
+  State<TcpScreen> createState() => _TcpScreenState();
+}
+
+class _TcpScreenState extends State<TcpScreen> {
+  late final TextEditingController _hostController;
+  late final TextEditingController _portController;
+  late final MeshCoreConnector _connector;
+  late final VoidCallback _connectionListener;
+  bool _navigatedToContacts = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _hostController = TextEditingController();
+    _portController = TextEditingController(text: '5000');
+    _connector = context.read<MeshCoreConnector>();
+
+    _connectionListener = () {
+      if (!mounted) return;
+      if (_connector.state == MeshCoreConnectionState.disconnected) {
+        _navigatedToContacts = false;
+      }
+      if (_connector.state == MeshCoreConnectionState.connected &&
+          _connector.isTcpTransportConnected &&
+          !_navigatedToContacts) {
+        _navigatedToContacts = true;
+        Navigator.of(context).pushReplacement(
+          MaterialPageRoute(builder: (_) => const ContactsScreen()),
+        );
+      }
+    };
+    _connector.addListener(_connectionListener);
+  }
+
+  @override
+  void dispose() {
+    _hostController.dispose();
+    _portController.dispose();
+    _connector.removeListener(_connectionListener);
+    if (!_navigatedToContacts &&
+        _connector.activeTransport == MeshCoreTransportType.tcp &&
+        _connector.state != MeshCoreConnectionState.disconnected) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        unawaited(_connector.disconnect(manual: true));
+      });
+    }
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () => Navigator.of(context).maybePop(),
+        ),
+        title: AdaptiveAppBarTitle(context.l10n.tcpScreenTitle),
+        centerTitle: true,
+      ),
+      body: SafeArea(
+        top: false,
+        child: Consumer<MeshCoreConnector>(
+          builder: (context, connector, child) {
+            final isConnecting =
+                connector.state == MeshCoreConnectionState.connecting &&
+                connector.activeTransport == MeshCoreTransportType.tcp;
+            final isButtonDisabled =
+                isConnecting ||
+                connector.state == MeshCoreConnectionState.scanning;
+            return Column(
+              children: [
+                _buildStatusBar(context, connector),
+                Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: [
+                      TextField(
+                        controller: _hostController,
+                        decoration: InputDecoration(
+                          labelText: context.l10n.tcpHostLabel,
+                          hintText: context.l10n.tcpHostHint,
+                          border: const OutlineInputBorder(),
+                        ),
+                        enabled: !isConnecting,
+                        keyboardType: TextInputType.url,
+                      ),
+                      const SizedBox(height: 12),
+                      TextField(
+                        controller: _portController,
+                        decoration: InputDecoration(
+                          labelText: context.l10n.tcpPortLabel,
+                          hintText: context.l10n.tcpPortHint,
+                          border: const OutlineInputBorder(),
+                        ),
+                        enabled: !isConnecting,
+                        keyboardType: TextInputType.number,
+                      ),
+                      const SizedBox(height: 16),
+                      FilledButton.icon(
+                        key: const Key('tcp_connect_button'),
+                        onPressed: isButtonDisabled ? null : _connectTcp,
+                        icon: isConnecting
+                            ? const SizedBox(
+                                width: 18,
+                                height: 18,
+                                child: CircularProgressIndicator(
+                                  strokeWidth: 2,
+                                ),
+                              )
+                            : const Icon(Icons.lan),
+                        label: Text(
+                          isConnecting
+                              ? context.l10n.scanner_connecting
+                              : context.l10n.common_connect,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            );
+          },
+        ),
+      ),
+      bottomNavigationBar: SafeArea(
+        top: false,
+        minimum: const EdgeInsets.fromLTRB(16, 8, 16, 16),
+        child: FittedBox(
+          fit: BoxFit.scaleDown,
+          alignment: Alignment.centerRight,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.end,
+            children: [
+              if (PlatformInfo.supportsUsbSerial)
+                FloatingActionButton.extended(
+                  onPressed: () {
+                    Navigator.of(context).pushReplacement(
+                      MaterialPageRoute(builder: (_) => const UsbScreen()),
+                    );
+                  },
+                  heroTag: 'tcp_usb_action',
+                  extendedPadding: const EdgeInsets.symmetric(horizontal: 12),
+                  icon: const Icon(Icons.usb),
+                  label: Text(context.l10n.connectionChoiceUsbLabel),
+                ),
+              if (PlatformInfo.supportsUsbSerial) const SizedBox(width: 12),
+              FloatingActionButton.extended(
+                onPressed: () {
+                  Navigator.of(context).maybePop();
+                },
+                heroTag: 'tcp_ble_action',
+                extendedPadding: const EdgeInsets.symmetric(horizontal: 12),
+                icon: const Icon(Icons.bluetooth),
+                label: Text(context.l10n.connectionChoiceBluetoothLabel),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStatusBar(BuildContext context, MeshCoreConnector connector) {
+    final l10n = context.l10n;
+    String statusText;
+    Color statusColor;
+
+    if (connector.isTcpTransportConnected) {
+      statusText = l10n.scanner_connectedTo(
+        connector.activeTcpEndpoint ?? 'TCP',
+      );
+      statusColor = Colors.green;
+    } else if (connector.state == MeshCoreConnectionState.connecting &&
+        connector.activeTransport == MeshCoreTransportType.tcp) {
+      statusText = l10n.tcpStatus_connectingTo(
+        '${_hostController.text}:${_portController.text}',
+      );
+      statusColor = Colors.orange;
+    } else if (connector.state == MeshCoreConnectionState.disconnecting &&
+        connector.activeTransport == MeshCoreTransportType.tcp) {
+      statusText = l10n.scanner_disconnecting;
+      statusColor = Colors.orange;
+    } else {
+      statusText = l10n.tcpStatus_notConnected;
+      statusColor = Colors.grey;
+    }
+
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+      color: statusColor.withValues(alpha: 0.1),
+      child: Row(
+        children: [
+          Icon(Icons.circle, size: 12, color: statusColor),
+          const SizedBox(width: 8),
+          Expanded(
+            child: FittedBox(
+              fit: BoxFit.scaleDown,
+              alignment: Alignment.centerLeft,
+              child: Text(
+                statusText,
+                style: TextStyle(
+                  color: statusColor,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _connectTcp() async {
+    if (_connector.state == MeshCoreConnectionState.connecting ||
+        _connector.state == MeshCoreConnectionState.connected ||
+        _connector.state == MeshCoreConnectionState.disconnecting) {
+      return;
+    }
+
+    final host = _hostController.text.trim();
+    final parsedPort = int.tryParse(_portController.text.trim());
+    if (host.isEmpty) {
+      _showError(context.l10n.tcpErrorHostRequired);
+      return;
+    }
+    if (parsedPort == null || parsedPort < 1 || parsedPort > 65535) {
+      _showError(context.l10n.tcpErrorPortInvalid);
+      return;
+    }
+
+    try {
+      await _connector.connectTcp(host: host, port: parsedPort);
+    } catch (error) {
+      if (!mounted) return;
+      _showError(_friendlyErrorMessage(error));
+    }
+  }
+
+  void _showError(String message) {
+    if (!mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text(message), backgroundColor: Colors.red),
+    );
+  }
+
+  String _friendlyErrorMessage(Object error) {
+    if (error is UnsupportedError) {
+      return context.l10n.tcpErrorUnsupported;
+    }
+    if (error is TimeoutException) {
+      return context.l10n.tcpErrorTimedOut;
+    }
+    if (error is StateError) {
+      return context.l10n.tcpConnectionFailed(error.message);
+    }
+    if (error is ArgumentError) {
+      return context.l10n.tcpConnectionFailed(
+        error.message?.toString() ?? error.toString(),
+      );
+    }
+    return context.l10n.tcpConnectionFailed(error.toString());
+  }
+}

lib/screens/usb_screen.dart

@@ -12,6 +12,7 @@ import '../utils/usb_port_labels.dart';
 import '../widgets/adaptive_app_bar_title.dart';
 import 'contacts_screen.dart';
 import 'scanner_screen.dart';
+import 'tcp_screen.dart';
 
 class UsbScreen extends StatefulWidget {
   const UsbScreen({super.key});
@@ -107,17 +108,33 @@ class _UsbScreenState extends State<UsbScreen> {
       bottomNavigationBar: Consumer<MeshCoreConnector>(
         builder: (context, connector, child) {
           final isLoading = _isLoadingPorts;
-          final showBle =
-              PlatformInfo.isWeb ||
-              PlatformInfo.isAndroid ||
-              PlatformInfo.isIOS;
+          final showBle = true;
+          final showTcp = !PlatformInfo.isWeb;
 
           return SafeArea(
             top: false,
             minimum: const EdgeInsets.fromLTRB(16, 8, 16, 16),
+            child: FittedBox(
+              fit: BoxFit.scaleDown,
+              alignment: Alignment.centerRight,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.end,
                 children: [
+                  if (showTcp)
+                    FloatingActionButton.extended(
+                      onPressed: () {
+                        Navigator.of(context).pushReplacement(
+                          MaterialPageRoute(builder: (_) => const TcpScreen()),
+                        );
+                      },
+                      heroTag: 'usb_tcp_action',
+                      extendedPadding: const EdgeInsets.symmetric(
+                        horizontal: 12,
+                      ),
+                      icon: const Icon(Icons.lan),
+                      label: Text(context.l10n.connectionChoiceTcpLabel),
+                    ),
+                  if (showTcp && showBle) const SizedBox(width: 12),
                   if (showBle)
                     FloatingActionButton.extended(
                       onPressed: () {
@@ -128,25 +145,33 @@ class _UsbScreenState extends State<UsbScreen> {
                         );
                       },
                       heroTag: 'usb_ble_action',
+                      extendedPadding: const EdgeInsets.symmetric(
+                        horizontal: 12,
+                      ),
                       icon: const Icon(Icons.bluetooth),
                       label: Text(context.l10n.connectionChoiceBluetoothLabel),
                     ),
-                if (showBle) const SizedBox(width: 12),
+                  if ((showTcp || showBle) && !_supportsHotPlug)
+                    const SizedBox(width: 12),
                   if (!_supportsHotPlug)
                     FloatingActionButton.extended(
                       onPressed: isLoading ? null : _loadPorts,
                       heroTag: 'usb_refresh_action',
+                      extendedPadding: const EdgeInsets.symmetric(
+                        horizontal: 12,
+                      ),
                       icon: isLoading
                           ? const SizedBox(
                               width: 20,
                               height: 20,
                               child: CircularProgressIndicator(strokeWidth: 2),
                             )
-                        : const Icon(Icons.refresh),
-                    label: Text(context.l10n.repeater_refresh),
+                          : const Icon(Icons.usb),
+                      label: Text(context.l10n.scanner_scan),
                     ),
                 ],
               ),
+            ),
           );
         },
       ),
@@ -192,9 +217,18 @@ class _UsbScreenState extends State<UsbScreen> {
         children: [
           Icon(Icons.circle, size: 12, color: statusColor),
           const SizedBox(width: 8),
-          Text(
+          Expanded(
+            child: FittedBox(
+              fit: BoxFit.scaleDown,
+              alignment: Alignment.centerLeft,
+              child: Text(
                 statusText,
-            style: TextStyle(color: statusColor, fontWeight: FontWeight.w500),
+                style: TextStyle(
+                  color: statusColor,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
           ),
         ],
       ),

lib/services/app_settings_service.dart

@@ -134,6 +134,10 @@ class AppSettingsService extends ChangeNotifier {
     appLogger.setEnabled(value);
   }
 
+  Future<void> setMapShowDiscoveryContacts(bool value) async {
+    await updateSettings(_settings.copyWith(mapShowDiscoveryContacts: value));
+  }
+
   Future<void> setBatteryChemistryForDevice(
     String deviceId,
     String chemistry,

lib/services/chat_text_scale_service.dart

@@ -65,7 +65,7 @@ class ChatTextScaleService extends ChangeNotifier {
 
   void _commitScale() {
     _saveTimer?.cancel();
-    PrefsManager.instance.setDouble(_prefKey, _scale);
+    unawaited(PrefsManager.instance.setDouble(_prefKey, _scale));
   }
 
   double _clamp(double value) => value.clamp(_minScale, _maxScale).toDouble();

lib/services/tcp_transport_service.dart

@@ -0,0 +1,2 @@
+export 'tcp_transport_service_native.dart'
+    if (dart.library.js_interop) 'tcp_transport_service_web.dart';

lib/services/tcp_transport_service_native.dart

@@ -0,0 +1,210 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'app_debug_log_service.dart';
+import 'usb_serial_frame_codec.dart';
+
+class TcpTransportService {
+  final StreamController<Uint8List> _frameController =
+      StreamController<Uint8List>.broadcast();
+  final UsbSerialFrameDecoder _frameDecoder = UsbSerialFrameDecoder();
+
+  StreamSubscription<Uint8List>? _socketSubscription;
+  Socket? _socket;
+  AppDebugLogService? _debugLogService;
+  TcpTransportStatus _status = TcpTransportStatus.disconnected;
+  String? _activeHost;
+  int? _activePort;
+  Future<void> _pendingWrite = Future<void>.value();
+  int _connectGeneration = 0;
+
+  TcpTransportStatus get status => _status;
+  Stream<Uint8List> get frameStream => _frameController.stream;
+  bool get isConnected => _status == TcpTransportStatus.connected;
+  String? get activeEndpoint => _activeHost == null || _activePort == null
+      ? null
+      : '$_activeHost:$_activePort';
+
+  void setDebugLogService(AppDebugLogService? service) {
+    _debugLogService = service;
+  }
+
+  Future<void> connect({
+    required String host,
+    required int port,
+    Duration timeout = const Duration(seconds: 10),
+  }) async {
+    if (_status == TcpTransportStatus.connected ||
+        _status == TcpTransportStatus.connecting) {
+      throw StateError('TCP transport is already active');
+    }
+    final trimmedHost = host.trim();
+    if (trimmedHost.isEmpty) {
+      throw ArgumentError.value(host, 'host', 'Host cannot be empty');
+    }
+    if (port < 1 || port > 65535) {
+      throw ArgumentError.value(port, 'port', 'Port must be in 1..65535');
+    }
+
+    _status = TcpTransportStatus.connecting;
+    final generation = ++_connectGeneration;
+    _frameDecoder.reset();
+
+    try {
+      final socket = await Socket.connect(trimmedHost, port, timeout: timeout);
+      if (generation != _connectGeneration ||
+          _status != TcpTransportStatus.connecting) {
+        try {
+          await socket.close();
+        } catch (_) {}
+        try {
+          socket.destroy();
+        } catch (_) {}
+        return;
+      }
+      socket.setOption(SocketOption.tcpNoDelay, true);
+      _socket = socket;
+      _activeHost = trimmedHost;
+      _activePort = port;
+      _socketSubscription = socket.listen(
+        _handleSocketData,
+        onError: _handleSocketError,
+        onDone: _handleSocketDone,
+      );
+      _status = TcpTransportStatus.connected;
+      _debugLogService?.info(
+        'TCP transport opened endpoint=$activeEndpoint',
+        tag: 'TCP',
+      );
+    } catch (error) {
+      await _cleanupFailedConnect();
+      _status = TcpTransportStatus.disconnected;
+      rethrow;
+    }
+  }
+
+  Future<void> write(Uint8List data) async {
+    if (!isConnected || _socket == null) {
+      throw StateError('TCP transport is not connected');
+    }
+
+    final packet = wrapUsbSerialTxFrame(data);
+    _logFrameSummary('TCP TX frame', data);
+
+    final writeTask = _pendingWrite.then((_) async {
+      final socket = _socket;
+      if (!isConnected || socket == null) {
+        throw StateError('TCP transport is not connected');
+      }
+      socket.add(packet);
+      await socket.flush();
+    });
+
+    _pendingWrite = writeTask.catchError((_) {});
+    await writeTask;
+  }
+
+  Future<void> disconnect() async {
+    _connectGeneration += 1;
+    if (_status == TcpTransportStatus.disconnected) return;
+
+    final endpoint = activeEndpoint;
+    _status = TcpTransportStatus.disconnecting;
+    _frameDecoder.reset();
+    _activeHost = null;
+    _activePort = null;
+
+    final subscription = _socketSubscription;
+    _socketSubscription = null;
+    await subscription?.cancel();
+
+    final socket = _socket;
+    _socket = null;
+    try {
+      await socket?.close();
+    } catch (_) {}
+    try {
+      socket?.destroy();
+    } catch (_) {}
+
+    _status = TcpTransportStatus.disconnected;
+    _debugLogService?.info(
+      'TCP transport closed endpoint=${endpoint ?? 'unknown'}',
+      tag: 'TCP',
+    );
+  }
+
+  void dispose() {
+    unawaited(disconnect().whenComplete(_closeFrameController));
+  }
+
+  Future<void> _cleanupFailedConnect() async {
+    final subscription = _socketSubscription;
+    _socketSubscription = null;
+    await subscription?.cancel();
+    final socket = _socket;
+    _socket = null;
+    try {
+      await socket?.close();
+    } catch (_) {}
+    try {
+      socket?.destroy();
+    } catch (_) {}
+    _activeHost = null;
+    _activePort = null;
+    _frameDecoder.reset();
+  }
+
+  void _handleSocketData(Uint8List bytes) {
+    for (final packet in _frameDecoder.ingest(bytes)) {
+      if (!packet.isRxFrame) {
+        _debugLogService?.info(
+          'TCP ignored packet start=0x${packet.frameStart.toRadixString(16).padLeft(2, '0')} len=${packet.payload.length}',
+          tag: 'TCP',
+        );
+        continue;
+      }
+      _addFrame(packet.payload);
+    }
+  }
+
+  void _handleSocketError(Object error, [StackTrace? stackTrace]) {
+    _addFrameError(error, stackTrace);
+    unawaited(disconnect());
+  }
+
+  void _handleSocketDone() {
+    if (_status == TcpTransportStatus.disconnecting ||
+        _status == TcpTransportStatus.disconnected) {
+      return;
+    }
+    _addFrameError(StateError('TCP socket closed by remote endpoint'));
+    unawaited(disconnect());
+  }
+
+  void _addFrame(Uint8List payload) {
+    if (_frameController.isClosed) return;
+    _frameController.add(payload);
+  }
+
+  void _addFrameError(Object error, [StackTrace? stackTrace]) {
+    if (_frameController.isClosed) return;
+    _frameController.addError(error, stackTrace);
+  }
+
+  void _logFrameSummary(String prefix, Uint8List payload) {
+    final code = payload.isNotEmpty ? payload.first : -1;
+    _debugLogService?.info(
+      '$prefix code=$code len=${payload.length}',
+      tag: 'TCP',
+    );
+  }
+
+  Future<void> _closeFrameController() async {
+    if (_frameController.isClosed) return;
+    await _frameController.close();
+  }
+}
+
+enum TcpTransportStatus { disconnected, connecting, connected, disconnecting }

lib/services/tcp_transport_service_web.dart

@@ -0,0 +1,35 @@
+import 'dart:typed_data';
+
+import 'app_debug_log_service.dart';
+
+class TcpTransportService {
+  AppDebugLogService? _debugLogService;
+
+  Stream<Uint8List> get frameStream => const Stream<Uint8List>.empty();
+  bool get isConnected => false;
+  String? get activeEndpoint => null;
+
+  void setDebugLogService(AppDebugLogService? service) {
+    _debugLogService = service;
+  }
+
+  Future<void> connect({
+    required String host,
+    required int port,
+    Duration timeout = const Duration(seconds: 10),
+  }) async {
+    _debugLogService?.warn(
+      'TCP transport requested on web for $host:$port',
+      tag: 'TCP',
+    );
+    throw UnsupportedError('TCP transport is not supported on web.');
+  }
+
+  Future<void> write(Uint8List data) async {
+    throw UnsupportedError('TCP transport is not supported on web.');
+  }
+
+  Future<void> disconnect() async {}
+
+  void dispose() {}
+}

lib/services/ui_view_state_service.dart

@@ -0,0 +1,154 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+
+import '../storage/prefs_manager.dart';
+import '../utils/contact_search.dart';
+
+const String contactsAllGroupsValue = '__all__';
+
+enum ChannelSortOption { manual, name, latestMessages, unread }
+
+class UiViewStateService extends ChangeNotifier {
+  static const _keyContactsSelectedGroupName = 'ui_contacts_selected_group';
+  static const _keyContactsSortOption = 'ui_contacts_sort_option';
+  static const _keyContactsShowUnreadOnly = 'ui_contacts_show_unread_only';
+  static const _keyContactsTypeFilter = 'ui_contacts_type_filter';
+  static const _keyChannelsSortOption = 'ui_channels_sort_option';
+  static const _keyChannelsSortIndexLegacy = 'ui_channels_sort_index';
+
+  String _contactsSelectedGroupName = contactsAllGroupsValue;
+  String _contactsSearchText = '';
+  bool _contactsSearchExpanded = false;
+  ContactSortOption _contactsSortOption = ContactSortOption.lastSeen;
+  bool _contactsShowUnreadOnly = false;
+  ContactTypeFilter _contactsTypeFilter = ContactTypeFilter.all;
+
+  String _channelsSearchText = '';
+  ChannelSortOption _channelsSortOption = ChannelSortOption.manual;
+
+  String get contactsSelectedGroupName => _contactsSelectedGroupName;
+  String get contactsSearchText => _contactsSearchText;
+  bool get contactsSearchExpanded => _contactsSearchExpanded;
+  ContactSortOption get contactsSortOption => _contactsSortOption;
+  bool get contactsShowUnreadOnly => _contactsShowUnreadOnly;
+  ContactTypeFilter get contactsTypeFilter => _contactsTypeFilter;
+  String get channelsSearchText => _channelsSearchText;
+  ChannelSortOption get channelsSortOption => _channelsSortOption;
+
+  Future<void> initialize() async {
+    final prefs = PrefsManager.instance;
+
+    final selectedGroupName = prefs.getString(_keyContactsSelectedGroupName);
+    if (selectedGroupName != null && selectedGroupName.isNotEmpty) {
+      _contactsSelectedGroupName = selectedGroupName;
+    }
+
+    final sortStr = prefs.getString(_keyContactsSortOption);
+    if (sortStr != null) {
+      _contactsSortOption = ContactSortOption.values.firstWhere(
+        (e) => e.name == sortStr,
+        orElse: () => ContactSortOption.lastSeen,
+      );
+    }
+
+    _contactsShowUnreadOnly =
+        prefs.getBool(_keyContactsShowUnreadOnly) ?? false;
+
+    final typeStr = prefs.getString(_keyContactsTypeFilter);
+    if (typeStr != null) {
+      _contactsTypeFilter = ContactTypeFilter.values.firstWhere(
+        (e) => e.name == typeStr,
+        orElse: () => ContactTypeFilter.all,
+      );
+    }
+
+    final channelSortStr = prefs.getString(_keyChannelsSortOption);
+    if (channelSortStr != null) {
+      _channelsSortOption = ChannelSortOption.values.firstWhere(
+        (e) => e.name == channelSortStr,
+        orElse: () => ChannelSortOption.manual,
+      );
+      return;
+    }
+
+    // Backward compatibility for old persisted index format.
+    switch (prefs.getInt(_keyChannelsSortIndexLegacy) ?? 0) {
+      case 0:
+        _channelsSortOption = ChannelSortOption.manual;
+        break;
+      case 1:
+        _channelsSortOption = ChannelSortOption.name;
+        break;
+      case 2:
+        _channelsSortOption = ChannelSortOption.latestMessages;
+        break;
+      case 3:
+        _channelsSortOption = ChannelSortOption.unread;
+        break;
+      default:
+        _channelsSortOption = ChannelSortOption.manual;
+    }
+  }
+
+  void setContactsSelectedGroupName(String value) {
+    if (_contactsSelectedGroupName == value) return;
+    _contactsSelectedGroupName = value;
+    notifyListeners();
+    unawaited(
+      PrefsManager.instance.setString(_keyContactsSelectedGroupName, value),
+    );
+  }
+
+  void setContactsSearchText(String value) {
+    if (_contactsSearchText == value) return;
+    _contactsSearchText = value;
+    notifyListeners();
+  }
+
+  void setContactsSearchExpanded(bool value) {
+    if (_contactsSearchExpanded == value) return;
+    _contactsSearchExpanded = value;
+    notifyListeners();
+  }
+
+  void setContactsSortOption(ContactSortOption value) {
+    if (_contactsSortOption == value) return;
+    _contactsSortOption = value;
+    notifyListeners();
+    unawaited(
+      PrefsManager.instance.setString(_keyContactsSortOption, value.name),
+    );
+  }
+
+  void setContactsShowUnreadOnly(bool value) {
+    if (_contactsShowUnreadOnly == value) return;
+    _contactsShowUnreadOnly = value;
+    notifyListeners();
+    unawaited(PrefsManager.instance.setBool(_keyContactsShowUnreadOnly, value));
+  }
+
+  void setContactsTypeFilter(ContactTypeFilter value) {
+    if (_contactsTypeFilter == value) return;
+    _contactsTypeFilter = value;
+    notifyListeners();
+    unawaited(
+      PrefsManager.instance.setString(_keyContactsTypeFilter, value.name),
+    );
+  }
+
+  void setChannelsSearchText(String value) {
+    if (_channelsSearchText == value) return;
+    _channelsSearchText = value;
+    notifyListeners();
+  }
+
+  void setChannelsSortOption(ChannelSortOption value) {
+    if (_channelsSortOption == value) return;
+    _channelsSortOption = value;
+    notifyListeners();
+    unawaited(
+      PrefsManager.instance.setString(_keyChannelsSortOption, value.name),
+    );
+  }
+}

lib/storage/channel_order_store.dart

@@ -42,7 +42,6 @@ class ChannelOrderStore {
     if (jsonString == null || jsonString.isEmpty) {
       return [];
     }
-
     try {
       final decoded = jsonDecode(jsonString);
       if (decoded is List) {

lib/storage/channel_settings_store.dart

@@ -32,7 +32,7 @@ class ChannelSettingsStore {
         await prefs.setBool(key, enabled);
       }
     }
-    return prefs.getBool(key) ?? false;
+    return enabled ?? false;
   }
 
   Future<void> saveSmazEnabled(int channelIndex, bool enabled) async {

lib/storage/channel_store.dart

@@ -33,6 +33,9 @@ class ChannelStore {
       }
     }
 
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
     if (jsonString == null || jsonString.isEmpty) {
       return [];
     }

lib/storage/community_store.dart

@@ -38,7 +38,6 @@ class CommunityStore {
         jsonString = legacyJsonString;
       }
     }
-
     if (jsonString == null || jsonString.isEmpty) {
       jsonString = prefs.getString(keyFor);
     }

lib/storage/contact_discovery_store.dart

@@ -1,13 +1,13 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import '../models/discovery_contact.dart';
+import '../models/contact.dart';
 import 'prefs_manager.dart';
 
 class ContactDiscoveryStore {
   static const String _keyPrefix = 'discovered_contacts';
 
-  Future<List<DiscoveryContact>> loadContacts() async {
+  Future<List<Contact>> loadContacts() async {
     final prefs = PrefsManager.instance;
     final jsonStr = prefs.getString(_keyPrefix);
     if (jsonStr == null) return [];
@@ -22,40 +22,62 @@ class ContactDiscoveryStore {
     }
   }
 
-  Future<void> saveContacts(List<DiscoveryContact> contacts) async {
+  Future<void> saveContacts(List<Contact> contacts) async {
     final prefs = PrefsManager.instance;
     final jsonList = contacts.map(_toJson).toList();
     await prefs.setString(_keyPrefix, jsonEncode(jsonList));
   }
 
-  Map<String, dynamic> _toJson(DiscoveryContact contact) {
+  Map<String, dynamic> _toJson(Contact contact) {
     return {
-      'rawPacket': base64Encode(contact.rawPacket),
       'publicKey': base64Encode(contact.publicKey),
       'name': contact.name,
       'type': contact.type,
+      'flags': contact.flags,
       'pathLength': contact.pathLength,
       'path': base64Encode(contact.path),
+      'pathOverride': contact.pathOverride,
+      'pathOverrideBytes': contact.pathOverrideBytes != null
+          ? base64Encode(contact.pathOverrideBytes!)
+          : null,
       'latitude': contact.latitude,
       'longitude': contact.longitude,
       'lastSeen': contact.lastSeen.millisecondsSinceEpoch,
+      'lastMessageAt': contact.lastMessageAt.millisecondsSinceEpoch,
+      'rawPacket': contact.rawPacket != null
+          ? base64Encode(contact.rawPacket!)
+          : null,
     };
   }
 
-  DiscoveryContact _fromJson(Map<String, dynamic> json) {
+  Contact _fromJson(Map<String, dynamic> json) {
     final lastSeenMs = json['lastSeen'] as int? ?? 0;
-    return DiscoveryContact(
-      rawPacket: Uint8List.fromList(base64Decode(json['rawPacket'] as String)),
+    final lastMessageMs = json['lastMessageAt'] as int?;
+    return Contact(
       publicKey: Uint8List.fromList(base64Decode(json['publicKey'] as String)),
       name: json['name'] as String? ?? 'Unknown',
       type: json['type'] as int? ?? 0,
+      flags: json['flags'] as int? ?? 0,
       pathLength: json['pathLength'] as int? ?? -1,
       path: json['path'] != null
           ? Uint8List.fromList(base64Decode(json['path'] as String))
           : Uint8List(0),
+      pathOverride: json['pathOverride'] as int?,
+      pathOverrideBytes: json['pathOverrideBytes'] != null
+          ? Uint8List.fromList(
+              base64Decode(json['pathOverrideBytes'] as String),
+            )
+          : null,
       latitude: (json['latitude'] as num?)?.toDouble(),
       longitude: (json['longitude'] as num?)?.toDouble(),
       lastSeen: DateTime.fromMillisecondsSinceEpoch(lastSeenMs),
+      lastMessageAt: DateTime.fromMillisecondsSinceEpoch(
+        lastMessageMs ?? lastSeenMs,
+      ),
+      isActive: false,
+      rawPacket: json['rawPacket'] != null
+          ? Uint8List.fromList(base64Decode(json['rawPacket'] as String))
+          : null,
     );
   }
 }

lib/storage/contact_store.dart

@@ -76,6 +76,10 @@ class ContactStore {
       'longitude': contact.longitude,
       'lastSeen': contact.lastSeen.millisecondsSinceEpoch,
       'lastMessageAt': contact.lastMessageAt.millisecondsSinceEpoch,
+      'isActive': contact.isActive,
+      'rawPacket': contact.rawPacket != null
+          ? base64Encode(contact.rawPacket!)
+          : null,
     };
   }
 
@@ -103,6 +107,10 @@ class ContactStore {
       lastMessageAt: DateTime.fromMillisecondsSinceEpoch(
         lastMessageMs ?? lastSeenMs,
       ),
+      isActive: json['isActive'] as bool? ?? true,
+      rawPacket: json['rawPacket'] != null
+          ? Uint8List.fromList(base64Decode(json['rawPacket'] as String))
+          : null,
     );
   }
 }

lib/storage/message_store.dart

@@ -49,7 +49,6 @@ class MessageStore {
         jsonString = legacyJsonString;
       }
     }
-
     if (jsonString == null || jsonString.isEmpty) {
       jsonString = prefs.getString(keyFor);
     }

lib/utils/contact_filter_types.dart

@@ -0,0 +1,3 @@
+enum ContactSortOption { lastSeen, recentMessages, name }
+
+enum ContactTypeFilter { all, favorites, users, repeaters, rooms }

lib/utils/contact_search.dart

@@ -1,7 +1,7 @@
-import 'package:meshcore_open/models/discovery_contact.dart';
-
 import '../models/contact.dart';
 
+export 'contact_filter_types.dart';
+
 bool matchesContactQuery(Contact contact, String query) {
   final normalizedQuery = query.trim().toLowerCase();
   if (normalizedQuery.isEmpty) return true;
@@ -16,7 +16,7 @@ bool matchesContactQuery(Contact contact, String query) {
   return contact.publicKeyHex.toLowerCase().startsWith(hexPrefix);
 }
 
-bool matchesDiscoveryContactQuery(DiscoveryContact contact, String query) {
+bool matchesDiscoveryContactQuery(Contact contact, String query) {
   final normalizedQuery = query.trim().toLowerCase();
   if (normalizedQuery.isEmpty) return true;
 

lib/widgets/list_filter_widget.dart

@@ -1,12 +1,9 @@
 import 'package:flutter/material.dart';
 import '../l10n/l10n.dart';
+import '../utils/contact_search.dart';
 
-enum ContactSortOption { lastSeen, recentMessages, name }
-
-enum ContactTypeFilter { all, favorites, users, repeaters, rooms }
-
-class SortFilterMenuOption {
-  final int value;
+class SortFilterMenuOption<T> {
+  final T value;
   final String label;
   final bool? checked;
 
@@ -17,16 +14,16 @@ class SortFilterMenuOption {
   });
 }
 
-class SortFilterMenuSection {
+class SortFilterMenuSection<T> {
   final String title;
-  final List<SortFilterMenuOption> options;
+  final List<SortFilterMenuOption<T>> options;
 
   const SortFilterMenuSection({required this.title, required this.options});
 }
 
-class SortFilterMenu extends StatelessWidget {
-  final List<SortFilterMenuSection> sections;
-  final ValueChanged<int> onSelected;
+class SortFilterMenu<T> extends StatelessWidget {
+  final List<SortFilterMenuSection<T>> sections;
+  final ValueChanged<T> onSelected;
   final String tooltip;
   final Widget icon;
 
@@ -40,7 +37,7 @@ class SortFilterMenu extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return PopupMenuButton<int>(
+    return PopupMenuButton<T>(
       icon: icon,
       tooltip: tooltip,
       onSelected: onSelected,
@@ -53,11 +50,11 @@ class SortFilterMenu extends StatelessWidget {
         final visibleSections = sections
             .where((section) => section.options.isNotEmpty)
             .toList();
-        final entries = <PopupMenuEntry<int>>[];
+        final entries = <PopupMenuEntry<T>>[];
         for (int i = 0; i < visibleSections.length; i++) {
           final section = visibleSections[i];
           entries.add(
-            PopupMenuItem<int>(
+            PopupMenuItem<T>(
               enabled: false,
               child: Text(section.title, style: labelStyle),
             ),
@@ -65,14 +62,14 @@ class SortFilterMenu extends StatelessWidget {
           for (final option in section.options) {
             if (option.checked == null) {
               entries.add(
-                PopupMenuItem<int>(
+                PopupMenuItem<T>(
                   value: option.value,
                   child: Text(option.label),
                 ),
               );
             } else {
               entries.add(
-                CheckedPopupMenuItem<int>(
+                CheckedPopupMenuItem<T>(
                   value: option.value,
                   checked: option.checked ?? false,
                   child: Text(option.label),
@@ -90,16 +87,23 @@ class SortFilterMenu extends StatelessWidget {
   }
 }
 
-const int _actionSortRecentMessages = 1;
-const int _actionSortName = 2;
-const int _actionSortLastSeen = 3;
-const int _actionFilterAll = 4;
-const int _actionFilterFavorites = 5;
-const int _actionFilterUsers = 6;
-const int _actionFilterRepeaters = 7;
-const int _actionFilterRooms = 8;
-const int _actionToggleUnreadOnly = 9;
-const int _actionNewGroup = 10;
+sealed class _ContactsFilterAction {
+  const _ContactsFilterAction();
+}
+
+class _SortAction extends _ContactsFilterAction {
+  final ContactSortOption option;
+  const _SortAction(this.option);
+}
+
+class _TypeFilterAction extends _ContactsFilterAction {
+  final ContactTypeFilter filter;
+  const _TypeFilterAction(this.filter);
+}
+
+class _ToggleUnreadAction extends _ContactsFilterAction {
+  const _ToggleUnreadAction();
+}
 
 class ContactsFilterMenu extends StatelessWidget {
   final ContactSortOption sortOption;
@@ -108,7 +112,6 @@ class ContactsFilterMenu extends StatelessWidget {
   final ValueChanged<ContactSortOption> onSortChanged;
   final ValueChanged<ContactTypeFilter> onTypeFilterChanged;
   final ValueChanged<bool> onUnreadOnlyChanged;
-  final VoidCallback onNewGroup;
 
   const ContactsFilterMenu({
     super.key,
@@ -118,30 +121,29 @@ class ContactsFilterMenu extends StatelessWidget {
     required this.onSortChanged,
     required this.onTypeFilterChanged,
     required this.onUnreadOnlyChanged,
-    required this.onNewGroup,
   });
 
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
-    return SortFilterMenu(
+    return SortFilterMenu<_ContactsFilterAction>(
       tooltip: l10n.listFilter_tooltip,
       sections: [
         SortFilterMenuSection(
           title: l10n.listFilter_sortBy,
           options: [
             SortFilterMenuOption(
-              value: _actionSortRecentMessages,
+              value: _SortAction(ContactSortOption.recentMessages),
               label: l10n.listFilter_latestMessages,
               checked: sortOption == ContactSortOption.recentMessages,
             ),
             SortFilterMenuOption(
-              value: _actionSortLastSeen,
+              value: _SortAction(ContactSortOption.lastSeen),
               label: l10n.listFilter_heardRecently,
               checked: sortOption == ContactSortOption.lastSeen,
             ),
             SortFilterMenuOption(
-              value: _actionSortName,
+              value: _SortAction(ContactSortOption.name),
               label: l10n.listFilter_az,
               checked: sortOption == ContactSortOption.name,
             ),
@@ -151,80 +153,66 @@ class ContactsFilterMenu extends StatelessWidget {
           title: l10n.listFilter_filters,
           options: [
             SortFilterMenuOption(
-              value: _actionFilterAll,
+              value: _TypeFilterAction(ContactTypeFilter.all),
               label: l10n.listFilter_all,
               checked: typeFilter == ContactTypeFilter.all,
             ),
             SortFilterMenuOption(
-              value: _actionFilterFavorites,
+              value: _TypeFilterAction(ContactTypeFilter.favorites),
               label: l10n.listFilter_favorites,
               checked: typeFilter == ContactTypeFilter.favorites,
             ),
             SortFilterMenuOption(
-              value: _actionFilterUsers,
+              value: _TypeFilterAction(ContactTypeFilter.users),
               label: l10n.listFilter_users,
               checked: typeFilter == ContactTypeFilter.users,
             ),
             SortFilterMenuOption(
-              value: _actionFilterRepeaters,
+              value: _TypeFilterAction(ContactTypeFilter.repeaters),
               label: l10n.listFilter_repeaters,
               checked: typeFilter == ContactTypeFilter.repeaters,
             ),
             SortFilterMenuOption(
-              value: _actionFilterRooms,
+              value: _TypeFilterAction(ContactTypeFilter.rooms),
               label: l10n.listFilter_roomServers,
               checked: typeFilter == ContactTypeFilter.rooms,
             ),
             SortFilterMenuOption(
-              value: _actionToggleUnreadOnly,
+              value: const _ToggleUnreadAction(),
               label: l10n.listFilter_unreadOnly,
               checked: showUnreadOnly,
             ),
-            SortFilterMenuOption(
-              value: _actionNewGroup,
-              label: l10n.listFilter_newGroup,
-            ),
           ],
         ),
       ],
       onSelected: (action) {
         switch (action) {
-          case _actionSortRecentMessages:
-            onSortChanged(ContactSortOption.recentMessages);
-            break;
-          case _actionSortName:
-            onSortChanged(ContactSortOption.name);
-            break;
-          case _actionSortLastSeen:
-            onSortChanged(ContactSortOption.lastSeen);
-            break;
-          case _actionFilterAll:
-            onTypeFilterChanged(ContactTypeFilter.all);
-            break;
-          case _actionFilterUsers:
-            onTypeFilterChanged(ContactTypeFilter.users);
-            break;
-          case _actionFilterFavorites:
-            onTypeFilterChanged(ContactTypeFilter.favorites);
-            break;
-          case _actionFilterRepeaters:
-            onTypeFilterChanged(ContactTypeFilter.repeaters);
-            break;
-          case _actionFilterRooms:
-            onTypeFilterChanged(ContactTypeFilter.rooms);
-            break;
-          case _actionToggleUnreadOnly:
+          case _SortAction(:final option):
+            onSortChanged(option);
+          case _TypeFilterAction(:final filter):
+            onTypeFilterChanged(filter);
+          case _ToggleUnreadAction():
             onUnreadOnlyChanged(!showUnreadOnly);
-            break;
-          case _actionNewGroup:
-            onNewGroup();
-            break;
         }
       },
     );
   }
 }
 
+sealed class _DiscoveryFilterAction {
+  const _DiscoveryFilterAction();
+}
+
+class _DiscoverySortAction extends _DiscoveryFilterAction {
+  final ContactSortOption option;
+  const _DiscoverySortAction(this.option);
+}
+
+class _DiscoveryTypeFilterAction extends _DiscoveryFilterAction {
+  final ContactTypeFilter filter;
+  const _DiscoveryTypeFilterAction(this.filter);
+}
+
 class DiscoveryContactsFilterMenu extends StatelessWidget {
   final ContactSortOption sortOption;
   final ContactTypeFilter typeFilter;
@@ -242,19 +230,19 @@ class DiscoveryContactsFilterMenu extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
-    return SortFilterMenu(
+    return SortFilterMenu<_DiscoveryFilterAction>(
       tooltip: l10n.listFilter_tooltip,
       sections: [
         SortFilterMenuSection(
           title: l10n.listFilter_sortBy,
           options: [
             SortFilterMenuOption(
-              value: _actionSortLastSeen,
+              value: _DiscoverySortAction(ContactSortOption.lastSeen),
               label: l10n.listFilter_heardRecently,
               checked: sortOption == ContactSortOption.lastSeen,
             ),
             SortFilterMenuOption(
-              value: _actionSortName,
+              value: _DiscoverySortAction(ContactSortOption.name),
               label: l10n.listFilter_az,
               checked: sortOption == ContactSortOption.name,
             ),
@@ -264,22 +252,22 @@ class DiscoveryContactsFilterMenu extends StatelessWidget {
           title: l10n.listFilter_filters,
           options: [
             SortFilterMenuOption(
-              value: _actionFilterAll,
+              value: _DiscoveryTypeFilterAction(ContactTypeFilter.all),
               label: l10n.listFilter_all,
               checked: typeFilter == ContactTypeFilter.all,
             ),
             SortFilterMenuOption(
-              value: _actionFilterUsers,
+              value: _DiscoveryTypeFilterAction(ContactTypeFilter.users),
               label: l10n.listFilter_users,
               checked: typeFilter == ContactTypeFilter.users,
             ),
             SortFilterMenuOption(
-              value: _actionFilterRepeaters,
+              value: _DiscoveryTypeFilterAction(ContactTypeFilter.repeaters),
               label: l10n.listFilter_repeaters,
               checked: typeFilter == ContactTypeFilter.repeaters,
             ),
             SortFilterMenuOption(
-              value: _actionFilterRooms,
+              value: _DiscoveryTypeFilterAction(ContactTypeFilter.rooms),
               label: l10n.listFilter_roomServers,
               checked: typeFilter == ContactTypeFilter.rooms,
             ),
@@ -288,27 +276,10 @@ class DiscoveryContactsFilterMenu extends StatelessWidget {
       ],
       onSelected: (action) {
         switch (action) {
-          case _actionSortName:
-            onSortChanged(ContactSortOption.name);
-            break;
-          case _actionSortLastSeen:
-            onSortChanged(ContactSortOption.lastSeen);
-            break;
-          case _actionFilterAll:
-            onTypeFilterChanged(ContactTypeFilter.all);
-            break;
-          case _actionFilterUsers:
-            onTypeFilterChanged(ContactTypeFilter.users);
-            break;
-          case _actionFilterFavorites:
-            onTypeFilterChanged(ContactTypeFilter.favorites);
-            break;
-          case _actionFilterRepeaters:
-            onTypeFilterChanged(ContactTypeFilter.repeaters);
-            break;
-          case _actionFilterRooms:
-            onTypeFilterChanged(ContactTypeFilter.rooms);
-            break;
+          case _DiscoverySortAction(:final option):
+            onSortChanged(option);
+          case _DiscoveryTypeFilterAction(:final filter):
+            onTypeFilterChanged(filter);
         }
       },
     );

lib/widgets/snr_indicator.dart

@@ -157,8 +157,11 @@ class _SNRIndicatorState extends State<SNRIndicator> {
                   repeater.snr,
                   widget.connector.currentSf,
                 );
-
-                final name = widget.connector.contacts
+                final allContacts = [
+                  ...widget.connector.contacts,
+                  ...widget.connector.discoveredContacts,
+                ];
+                final name = allContacts
                     .where((c) => c.publicKey.first == repeater.pubkeyFirstByte)
                     .map((c) => c.name)
                     .firstOrNull;

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -9,6 +9,7 @@ import flutter_blue_plus_darwin
 import flutter_local_notifications
 import mobile_scanner
 import package_info_plus
+import path_provider_foundation
 import share_plus
 import shared_preferences_foundation
 import sqflite_darwin
@@ -20,6 +21,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
+  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))

test/connector/meshcore_connector_tcp_error_filter_test.dart

@@ -0,0 +1,93 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_open/connector/meshcore_connector.dart';
+
+void main() {
+  group('shouldIgnoreLateTcpConnectError', () {
+    test('returns true for manual cancel during disconnecting state', () {
+      final result = MeshCoreConnector.shouldIgnoreLateTcpConnectError(
+        manualDisconnect: true,
+        state: MeshCoreConnectionState.disconnecting,
+        activeTransport: MeshCoreTransportType.bluetooth,
+        tcpManagerConnected: false,
+      );
+
+      expect(result, isTrue);
+    });
+
+    test(
+      'returns true for manual cancel after reaching disconnected state',
+      () {
+        final result = MeshCoreConnector.shouldIgnoreLateTcpConnectError(
+          manualDisconnect: true,
+          state: MeshCoreConnectionState.disconnected,
+          activeTransport: MeshCoreTransportType.bluetooth,
+          tcpManagerConnected: false,
+        );
+
+        expect(result, isTrue);
+      },
+    );
+
+    test('returns false when not a manual disconnect', () {
+      final result = MeshCoreConnector.shouldIgnoreLateTcpConnectError(
+        manualDisconnect: false,
+        state: MeshCoreConnectionState.disconnecting,
+        activeTransport: MeshCoreTransportType.bluetooth,
+        tcpManagerConnected: false,
+      );
+
+      expect(result, isFalse);
+    });
+
+    test('returns false for connected state handshake failures', () {
+      final result = MeshCoreConnector.shouldIgnoreLateTcpConnectError(
+        manualDisconnect: true,
+        state: MeshCoreConnectionState.connected,
+        activeTransport: MeshCoreTransportType.tcp,
+        tcpManagerConnected: true,
+      );
+
+      expect(result, isFalse);
+    });
+
+    test('returns false when TCP is still active while disconnecting', () {
+      final result = MeshCoreConnector.shouldIgnoreLateTcpConnectError(
+        manualDisconnect: true,
+        state: MeshCoreConnectionState.disconnecting,
+        activeTransport: MeshCoreTransportType.tcp,
+        tcpManagerConnected: true,
+      );
+
+      expect(result, isFalse);
+    });
+  });
+
+  group('shouldResetStateAfterTcpConnectAbort', () {
+    test('returns true when TCP connect is still in connecting state', () {
+      final result = MeshCoreConnector.shouldResetStateAfterTcpConnectAbort(
+        state: MeshCoreConnectionState.connecting,
+        activeTransport: MeshCoreTransportType.tcp,
+      );
+
+      expect(result, isTrue);
+    });
+
+    test('returns false when state is already disconnected', () {
+      final result = MeshCoreConnector.shouldResetStateAfterTcpConnectAbort(
+        state: MeshCoreConnectionState.disconnected,
+        activeTransport: MeshCoreTransportType.tcp,
+      );
+
+      expect(result, isFalse);
+    });
+
+    test('returns false when transport switched away from TCP', () {
+      final result = MeshCoreConnector.shouldResetStateAfterTcpConnectAbort(
+        state: MeshCoreConnectionState.connecting,
+        activeTransport: MeshCoreTransportType.bluetooth,
+      );
+
+      expect(result, isFalse);
+    });
+  });
+}

test/screens/tcp_flow_test.dart

@@ -0,0 +1,192 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:provider/provider.dart';
+
+import 'package:meshcore_open/connector/meshcore_connector.dart';
+import 'package:meshcore_open/l10n/app_localizations.dart';
+import 'package:meshcore_open/screens/scanner_screen.dart';
+import 'package:meshcore_open/screens/tcp_screen.dart';
+
+class _FakeMeshCoreConnector extends MeshCoreConnector {
+  _FakeMeshCoreConnector();
+
+  MeshCoreConnectionState initialState = MeshCoreConnectionState.disconnected;
+  MeshCoreTransportType initialTransport = MeshCoreTransportType.bluetooth;
+  String? initialEndpoint;
+  int connectTcpCalls = 0;
+  String? lastHost;
+  int? lastPort;
+
+  @override
+  MeshCoreConnectionState get state => initialState;
+
+  @override
+  MeshCoreTransportType get activeTransport => initialTransport;
+
+  @override
+  bool get isTcpTransportConnected =>
+      initialState == MeshCoreConnectionState.connected &&
+      initialTransport == MeshCoreTransportType.tcp;
+
+  @override
+  String? get activeTcpEndpoint => initialEndpoint;
+
+  @override
+  Future<void> connectTcp({required String host, required int port}) async {
+    connectTcpCalls += 1;
+    lastHost = host;
+    lastPort = port;
+  }
+}
+
+Widget _buildTestApp({
+  required MeshCoreConnector connector,
+  required Widget child,
+  Locale? locale,
+}) {
+  return ChangeNotifierProvider<MeshCoreConnector>.value(
+    value: connector,
+    child: MaterialApp(
+      locale: locale,
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      home: child,
+    ),
+  );
+}
+
+void main() {
+  testWidgets('TcpScreen uses localized TCP copy', (tester) async {
+    final connector = _FakeMeshCoreConnector();
+
+    await tester.pumpWidget(
+      _buildTestApp(
+        connector: connector,
+        child: const TcpScreen(),
+        locale: const Locale('en'),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final context = tester.element(find.byType(TcpScreen));
+    final l10n = AppLocalizations.of(context);
+
+    expect(find.text(l10n.tcpScreenTitle), findsOneWidget);
+    expect(find.text(l10n.tcpHostLabel), findsOneWidget);
+    expect(find.text(l10n.tcpPortLabel), findsOneWidget);
+    expect(find.text(l10n.tcpStatus_notConnected), findsOneWidget);
+  });
+
+  testWidgets('TcpScreen validation errors are localized', (tester) async {
+    final connector = _FakeMeshCoreConnector();
+
+    await tester.pumpWidget(
+      _buildTestApp(
+        connector: connector,
+        child: const TcpScreen(),
+        locale: const Locale('en'),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final context = tester.element(find.byType(TcpScreen));
+    final l10n = AppLocalizations.of(context);
+
+    await tester.enterText(find.byType(TextField).first, '');
+    await tester.tap(find.byKey(const Key('tcp_connect_button')));
+    await tester.pumpAndSettle();
+
+    expect(find.text(l10n.tcpErrorHostRequired), findsOneWidget);
+    expect(connector.connectTcpCalls, 0);
+
+    await tester.enterText(find.byType(TextField).first, '192.168.1.50');
+    await tester.enterText(find.byType(TextField).at(1), '99999');
+    await tester.tap(find.byKey(const Key('tcp_connect_button')));
+    await tester.pumpAndSettle();
+
+    expect(connector.connectTcpCalls, 0);
+  });
+
+  testWidgets('TCP Bluetooth action returns to existing scanner route', (
+    tester,
+  ) async {
+    final connector = _FakeMeshCoreConnector();
+
+    await tester.pumpWidget(
+      _buildTestApp(connector: connector, child: const ScannerScreen()),
+    );
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.widgetWithText(FloatingActionButton, 'TCP'));
+    await tester.pumpAndSettle();
+    expect(find.byType(TcpScreen), findsOneWidget);
+
+    await tester.tap(find.widgetWithText(FloatingActionButton, 'Bluetooth'));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(TcpScreen), findsNothing);
+    expect(find.byType(ScannerScreen), findsOneWidget);
+    final navigatorState = tester.state<NavigatorState>(find.byType(Navigator));
+    expect(navigatorState.canPop(), isFalse);
+
+    // ScannerScreen.dispose() schedules disconnect work that debounces notify.
+    // Drain that debounce timer before test teardown.
+    await tester.pumpWidget(const SizedBox.shrink());
+    await tester.pump(const Duration(milliseconds: 60));
+  });
+
+  testWidgets('TcpScreen disables connect button while connector is scanning', (
+    tester,
+  ) async {
+    final connector = _FakeMeshCoreConnector()
+      ..initialState = MeshCoreConnectionState.scanning;
+
+    await tester.pumpWidget(
+      _buildTestApp(
+        connector: connector,
+        child: const TcpScreen(),
+        locale: const Locale('en'),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final button = tester.widget<ButtonStyleButton>(
+      find.byKey(const Key('tcp_connect_button')),
+    );
+    expect(button.onPressed, isNull);
+    expect(connector.connectTcpCalls, 0);
+  });
+
+  testWidgets('TcpScreen narrow width long status text does not overflow', (
+    tester,
+  ) async {
+    await tester.binding.setSurfaceSize(const Size(320, 700));
+    addTearDown(() => tester.binding.setSurfaceSize(null));
+
+    final connector = _FakeMeshCoreConnector()
+      ..initialState = MeshCoreConnectionState.connected
+      ..initialTransport = MeshCoreTransportType.tcp
+      ..initialEndpoint = 'meshcore-room-server-very-long-hostname.local:5000';
+
+    await tester.pumpWidget(
+      _buildTestApp(
+        connector: connector,
+        child: const TcpScreen(),
+        locale: const Locale('en'),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(tester.takeException(), isNull);
+
+    final context = tester.element(find.byType(TcpScreen));
+    final l10n = AppLocalizations.of(context);
+    expect(
+      find.text(l10n.scanner_connectedTo(connector.initialEndpoint!)),
+      findsOneWidget,
+    );
+
+    await tester.pumpWidget(const SizedBox.shrink());
+    await tester.pump(const Duration(milliseconds: 60));
+  });
+}

test/screens/usb_flow_test.dart

@@ -116,12 +116,7 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      await tester.tap(
-        find.ancestor(
-          of: find.text('Connect'),
-          matching: find.bySubtype<ElevatedButton>(),
-        ),
-      );
+      await tester.tap(find.byType(ListTile).first);
       await tester.pump();
 
       expect(connector.connectUsbCalls, 0);
@@ -145,12 +140,7 @@ void main() {
     );
     await tester.pumpAndSettle();
 
-    await tester.tap(
-      find.ancestor(
-        of: find.text('Connect'),
-        matching: find.bySubtype<ElevatedButton>(),
-      ),
-    );
+    await tester.tap(find.byType(ListTile).first);
     await tester.pump();
 
     expect(connector.connectUsbCalls, 1);
@@ -179,6 +169,68 @@ void main() {
     await tester.pump(const Duration(milliseconds: 60));
   });
 
+  testWidgets('ScannerScreen narrow width keeps actions without overflow', (
+    tester,
+  ) async {
+    await tester.binding.setSurfaceSize(const Size(320, 700));
+    addTearDown(() => tester.binding.setSurfaceSize(null));
+
+    final connector = _FakeMeshCoreConnector();
+
+    await tester.pumpWidget(
+      _buildTestApp(connector: connector, child: const ScannerScreen()),
+    );
+    await tester.pumpAndSettle();
+
+    expect(tester.takeException(), isNull);
+
+    final context = tester.element(find.byType(ScannerScreen));
+    final l10n = AppLocalizations.of(context);
+    expect(find.text(l10n.scanner_scan), findsOneWidget);
+
+    if (PlatformInfo.supportsUsbSerial) {
+      expect(find.text(l10n.connectionChoiceUsbLabel), findsOneWidget);
+    }
+    if (!PlatformInfo.isWeb) {
+      expect(find.text(l10n.connectionChoiceTcpLabel), findsOneWidget);
+    }
+
+    await tester.pumpWidget(const SizedBox.shrink());
+    await tester.pump(const Duration(milliseconds: 60));
+  });
+
+  testWidgets('UsbScreen narrow width long status text does not overflow', (
+    tester,
+  ) async {
+    await tester.binding.setSurfaceSize(const Size(320, 700));
+    addTearDown(() => tester.binding.setSurfaceSize(null));
+
+    final connector =
+        _FakeMeshCoreConnector(initialState: MeshCoreConnectionState.connected)
+          ..fakeUsbTransportConnected = true
+          ..fakeActiveUsbPortDisplayLabel =
+              '/dev/bus/usb/001/002 - KD3CGK mesh-utility.org very long label';
+
+    await tester.pumpWidget(
+      _buildTestApp(connector: connector, child: const UsbScreen()),
+    );
+    await tester.pumpAndSettle();
+
+    expect(tester.takeException(), isNull);
+
+    final context = tester.element(find.byType(UsbScreen));
+    final l10n = AppLocalizations.of(context);
+    expect(
+      find.text(
+        l10n.scanner_connectedTo(connector.fakeActiveUsbPortDisplayLabel!),
+      ),
+      findsOneWidget,
+    );
+
+    await tester.pumpWidget(const SizedBox.shrink());
+    await tester.pump(const Duration(milliseconds: 60));
+  });
+
   group('Error Handling', () {
     testWidgets('shows error SnackBar when listing ports fails', (
       tester,
@@ -212,12 +264,7 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      await tester.tap(
-        find.ancestor(
-          of: find.text('Connect'),
-          matching: find.bySubtype<ElevatedButton>(),
-        ),
-      );
+      await tester.tap(find.byType(ListTile).first);
       await tester.pumpAndSettle();
 
       expect(connectAttempted, isTrue);

test/services/tcp_transport_service_native_test.dart

@@ -0,0 +1,136 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_open/services/tcp_transport_service_native.dart';
+import 'package:meshcore_open/services/usb_serial_frame_codec.dart';
+
+final class _DelayedConnectOverrides extends IOOverrides {
+  _DelayedConnectOverrides(this.delay);
+
+  final Duration delay;
+
+  @override
+  Future<Socket> socketConnect(
+    host,
+    int port, {
+    sourceAddress,
+    int sourcePort = 0,
+    Duration? timeout,
+  }) async {
+    await Future<void>.delayed(delay);
+    return super.socketConnect(
+      host,
+      port,
+      sourceAddress: sourceAddress,
+      sourcePort: sourcePort,
+      timeout: timeout,
+    );
+  }
+}
+
+void main() {
+  test('connect/disconnect updates TCP transport state', () async {
+    final server = await ServerSocket.bind(InternetAddress.loopbackIPv4, 0);
+    final service = TcpTransportService();
+
+    try {
+      await service.connect(
+        host: InternetAddress.loopbackIPv4.address,
+        port: server.port,
+      );
+
+      expect(service.isConnected, isTrue);
+      expect(
+        service.activeEndpoint,
+        '${InternetAddress.loopbackIPv4.address}:${server.port}',
+      );
+
+      await service.disconnect();
+
+      expect(service.isConnected, isFalse);
+      expect(service.activeEndpoint, isNull);
+    } finally {
+      await service.disconnect();
+      await server.close();
+    }
+  });
+
+  test('disconnect is safe when already disconnected', () async {
+    final service = TcpTransportService();
+
+    await service.disconnect();
+    await service.disconnect();
+
+    expect(service.isConnected, isFalse);
+    expect(service.activeEndpoint, isNull);
+  });
+
+  test('emits only RX frames from socket stream', () async {
+    final server = await ServerSocket.bind(InternetAddress.loopbackIPv4, 0);
+    final acceptedSocket = Completer<Socket>();
+    final service = TcpTransportService();
+    final receivedFrames = <Uint8List>[];
+
+    final serverSub = server.listen((socket) {
+      if (!acceptedSocket.isCompleted) {
+        acceptedSocket.complete(socket);
+      } else {
+        socket.destroy();
+      }
+    });
+    final frameSub = service.frameStream.listen(receivedFrames.add);
+
+    try {
+      await service.connect(
+        host: InternetAddress.loopbackIPv4.address,
+        port: server.port,
+      );
+
+      final socket = await acceptedSocket.future.timeout(
+        const Duration(seconds: 2),
+      );
+
+      socket.add(<int>[usbSerialTxFrameStart, 0x01, 0x00, 0x11]);
+      socket.add(<int>[usbSerialRxFrameStart, 0x02, 0x00, 0x33, 0x44]);
+      await socket.flush();
+
+      await Future<void>.delayed(const Duration(milliseconds: 20));
+
+      expect(receivedFrames, hasLength(1));
+      expect(receivedFrames.single, orderedEquals(<int>[0x33, 0x44]));
+    } finally {
+      await service.disconnect();
+      await frameSub.cancel();
+      await serverSub.cancel();
+      await server.close();
+    }
+  });
+
+  test(
+    'disconnect during in-flight connect keeps transport disconnected',
+    () async {
+      final server = await ServerSocket.bind(InternetAddress.loopbackIPv4, 0);
+      final service = TcpTransportService();
+      final host = InternetAddress.loopbackIPv4.address;
+
+      try {
+        await IOOverrides.runWithIOOverrides(() async {
+          final connectFuture = service.connect(host: host, port: server.port);
+
+          await Future<void>.delayed(const Duration(milliseconds: 10));
+          await service.disconnect();
+          await connectFuture;
+
+          expect(service.isConnected, isFalse);
+          expect(service.status, TcpTransportStatus.disconnected);
+          expect(service.activeEndpoint, isNull);
+        }, _DelayedConnectOverrides(const Duration(milliseconds: 120)));
+      } finally {
+        await service.disconnect();
+        await server.close();
+      }
+    },
+  );
+}