feat: Refactor repeater resolution logic across multiple screens

- Implemented telemetry options for contacts, allowing users to enable or disable telemetry data sharing.
- Introduced a clear chat option in the chat interface for better message management.
- Updated the telemetry screen to handle telemetry data for contacts, including battery level.
- Refactored contact settings to include telemetry options and improved UI for better user experience.

.swift-version

@@ -0,0 +1 @@
+6.2.4

README.md

@@ -51,7 +51,7 @@ MeshCore Open is a cross-platform mobile application for communicating with Mesh
 
 ### Device Management
 
-- **BLE Connection**: Scan and connect to MeshCore devices via Bluetooth
+- **BLE, USB, TCP Connection**: Scan and connect to MeshCore devices via Bluetooth, USB or TCP
 - **Device Settings**: Configure radio parameters, power settings, and network options
 - **Battery Monitoring**: Real-time battery status with chemistry-specific voltage curves
 - **Firmware Updates**: Over-the-air firmware updates via BLE (coming soon)
@@ -75,10 +75,16 @@ MeshCore Open is a cross-platform mobile application for communicating with Mesh
 
 ### Platform Support
 
-- ✅ **Android**: Full support (API 21+)
-- ✅ **iOS**: Full support (iOS 12+)
-- 🚧 **Desktop**: Limited support (macOS/Linux/Windows)
-- 🚧 **Web**: Under construction (Chrome)
+| Feature            | Android (API 21+) | iOS (12+) | Linux | Windows | macOS |                Web                |
+|--------------------|:-----------------:|:---------:|:-----:|:-------:|:-----:|:---------------------------------:|
+| BLE companion      | ✅                | ✅        | ✅   | ✅      | ✅    | ✅                                |
+| USB companion      | ✅                | 🚧        | ✅   | ✅      | ✅    | ✅                                |
+| TCP companion      | ✅                | 🚧        | ✅   | ✅      | ✅    | ❌<br>(requires websocket bridge) |
+| Core Functionality | ✅                | ✅        | ✅   | ✅      | ✅    | ✅                                |
+| Mesh Network       | ✅                | ✅        | ✅   | ✅      | ✅    | ✅                                |
+| Map & Location     | ✅                | ✅        | ✅   | ✅      | ✅    | ✅                                |
+| Device Management  | ✅                | ✅        | ✅   | ✅      | ✅    | ✅                                |
+| Repeater Hub       | ✅                | ✅        | ✅   | ✅      | ✅    | ✅                                |
 
 ### Dependencies
 
@@ -189,6 +195,7 @@ Messages are transmitted as binary frames using a custom protocol optimized for
 ### App Settings
 
 - **Theme**: System default, light, or dark mode
+- **Language**: Use one of 15 languages (English, Chinese, French, Spanish, Portuguese, German, Dutch, Polish, Swedish, Italian, Slovak, Slovene, Bulgarian, Russian, Ukrainian)
 - **Notifications**: Configurable for messages, channels, and node advertisements
 - **Battery Chemistry**: Support for NMC, LiFePO4, and LiPo battery types
 - **Message Retry**: Automatic retry with configurable path clearing

android/app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
     <!-- Camera permission for QR code scanning -->
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.usb.host" android:required="false"/>
 
     <application
         android:label="meshcore_open"

android/app/src/main/kotlin/com/meshcore/meshcore_open/MainActivity.kt

@@ -1,5 +1,18 @@
 package com.meshcore.meshcore_open
 
 import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
 
-class MainActivity : FlutterActivity()
+class MainActivity : FlutterActivity() {
+    private val usbFunctions by lazy { MeshcoreUsbFunctions(this) }
+
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+        usbFunctions.configureFlutterEngine(flutterEngine)
+    }
+
+    override fun onDestroy() {
+        usbFunctions.dispose()
+        super.onDestroy()
+    }
+}

android/app/src/main/kotlin/com/meshcore/meshcore_open/MeshcoreUsbFunctions.kt

@@ -0,0 +1,582 @@
+package com.meshcore.meshcore_open
+
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.hardware.usb.UsbConstants
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbDeviceConnection
+import android.hardware.usb.UsbEndpoint
+import android.hardware.usb.UsbInterface
+import android.hardware.usb.UsbManager
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import java.util.Locale
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+class MeshcoreUsbFunctions(
+    private val activity: FlutterActivity,
+) {
+    private companion object {
+        const val usbRecipientInterface = 0x01
+    }
+
+    private val usbMethodChannelName = "meshcore_open/android_usb_serial"
+    private val usbEventChannelName = "meshcore_open/android_usb_serial_events"
+    private val usbPermissionAction = "com.meshcore.meshcore_open.USB_PERMISSION"
+
+    private val usbManager by lazy {
+        activity.getSystemService(Context.USB_SERVICE) as UsbManager
+    }
+    private val mainHandler = Handler(Looper.getMainLooper())
+    private val usbIoExecutor: ExecutorService = Executors.newSingleThreadExecutor()
+
+    @Volatile private var eventSink: EventChannel.EventSink? = null
+    @Volatile private var usbConnection: UsbDeviceConnection? = null
+    @Volatile private var usbInEndpoint: UsbEndpoint? = null
+    @Volatile private var usbOutEndpoint: UsbEndpoint? = null
+    @Volatile private var controlInterface: UsbInterface? = null
+    @Volatile private var dataInterface: UsbInterface? = null
+    private var readThread: Thread? = null
+    @Volatile private var isReading = false
+    @Volatile private var connectedDeviceName: String? = null
+
+    private var pendingConnectResult: MethodChannel.Result? = null
+    private var pendingConnectPortName: String? = null
+    private var pendingConnectBaudRate: Int = 115200
+
+    private data class PortConfig(
+        val controlInterface: UsbInterface?,
+        val dataInterface: UsbInterface,
+        val inEndpoint: UsbEndpoint,
+        val outEndpoint: UsbEndpoint,
+    )
+
+    private val permissionReceiver =
+        object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                when (intent?.action) {
+                    UsbManager.ACTION_USB_DEVICE_DETACHED -> {
+                        handleUsbDetached(intent)
+                        return
+                    }
+                    usbPermissionAction -> Unit
+                    else -> return
+                }
+
+                val result = pendingConnectResult
+                val portName = pendingConnectPortName
+                pendingConnectResult = null
+                pendingConnectPortName = null
+
+                if (result == null || portName == null) {
+                    return
+                }
+
+                val device = findUsbDevice(portName)
+                if (device == null) {
+                    result.error(
+                        "usb_device_missing",
+                        null,
+                        null,
+                    )
+                    return
+                }
+
+                val granted =
+                    intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
+                if (!granted || !usbManager.hasPermission(device)) {
+                    result.error("usb_permission_denied", null, null)
+                    return
+                }
+
+                openUsbDevice(device, pendingConnectBaudRate, result)
+            }
+        }
+
+    fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        registerUsbPermissionReceiver()
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, usbMethodChannelName)
+            .setMethodCallHandler { call, result ->
+                when (call.method) {
+                    "listPorts" -> result.success(listUsbPorts())
+                    "connect" -> handleUsbConnect(call, result)
+                    "write" -> handleUsbWrite(call, result)
+                    "disconnect" -> {
+                        scheduleCloseUsbConnection {
+                            result.success(null)
+                        }
+                    }
+                    else -> result.notImplemented()
+                }
+            }
+
+        EventChannel(flutterEngine.dartExecutor.binaryMessenger, usbEventChannelName)
+            .setStreamHandler(
+                object : EventChannel.StreamHandler {
+                    override fun onListen(arguments: Any?, events: EventChannel.EventSink) {
+                        eventSink = events
+                    }
+
+                    override fun onCancel(arguments: Any?) {
+                        eventSink = null
+                    }
+                },
+            )
+    }
+
+    fun dispose() {
+        closeUsbConnection()
+        usbIoExecutor.shutdownNow()
+        try {
+            activity.unregisterReceiver(permissionReceiver)
+        } catch (_: IllegalArgumentException) {
+        }
+    }
+
+    private fun registerUsbPermissionReceiver() {
+        val filter =
+            IntentFilter().apply {
+                addAction(usbPermissionAction)
+                addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
+            }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            activity.registerReceiver(permissionReceiver, filter, Context.RECEIVER_NOT_EXPORTED)
+        } else {
+            @Suppress("DEPRECATION")
+            activity.registerReceiver(permissionReceiver, filter)
+        }
+    }
+
+    private fun listUsbPorts(): List<String> {
+        return usbManager.deviceList.values.map { device ->
+            val productName = device.productName ?: "USB Serial Device"
+            val vendorProduct =
+                String.format(
+                    Locale.US,
+                    "VID:%04X PID:%04X",
+                    device.vendorId,
+                    device.productId,
+                )
+            "${device.deviceName} - $productName - $vendorProduct"
+        }
+    }
+
+    private fun handleUsbConnect(call: MethodCall, result: MethodChannel.Result) {
+        val portName = call.argument<String>("portName")
+        val baudRate = call.argument<Int>("baudRate") ?: 115200
+        if (portName.isNullOrBlank()) {
+            result.error("usb_invalid_port", null, null)
+            return
+        }
+
+        val device = findUsbDevice(portName)
+        if (device == null) {
+            result.error("usb_device_missing", null, null)
+            return
+        }
+
+        if (usbManager.hasPermission(device)) {
+            openUsbDevice(device, baudRate, result)
+            return
+        }
+
+        if (pendingConnectResult != null) {
+            result.error("usb_busy", null, null)
+            return
+        }
+
+        pendingConnectResult = result
+        pendingConnectPortName = portName
+        pendingConnectBaudRate = baudRate
+
+        val permissionIntent = PendingIntent.getBroadcast(
+            activity,
+            0,
+            Intent(usbPermissionAction).setPackage(activity.packageName),
+            pendingIntentFlags(),
+        )
+        usbManager.requestPermission(device, permissionIntent)
+    }
+
+    private fun handleUsbWrite(call: MethodCall, result: MethodChannel.Result) {
+        val data = call.argument<ByteArray>("data")
+        val connection = usbConnection
+        val endpoint = usbOutEndpoint
+        if (data == null) {
+            result.error("usb_invalid_data", null, null)
+            return
+        }
+        if (connection == null || endpoint == null) {
+            result.error("usb_not_connected", null, null)
+            return
+        }
+
+        usbIoExecutor.execute {
+            try {
+                writeToDevice(data)
+                mainHandler.post { result.success(null) }
+            } catch (error: Exception) {
+                mainHandler.post {
+                    result.error("usb_write_failed", error.message, null)
+                }
+            }
+        }
+    }
+
+    private fun findUsbDevice(portName: String): UsbDevice? {
+        val devices = usbManager.deviceList.values
+        val exactMatch = devices.firstOrNull { it.deviceName == portName }
+        if (exactMatch != null) {
+            return exactMatch
+        }
+
+        val normalizedName = portName.substringBefore(" - ").trim()
+        return devices.firstOrNull { it.deviceName == normalizedName }
+    }
+
+    private fun openUsbDevice(
+        device: UsbDevice,
+        baudRate: Int,
+        result: MethodChannel.Result,
+    ) {
+        usbIoExecutor.execute {
+            try {
+                closeUsbConnection()
+
+                val config = resolvePortConfig(device)
+                if (config == null) {
+                    mainHandler.post {
+                        result.error(
+                            "usb_driver_missing",
+                            null,
+                            null,
+                        )
+                    }
+                    return@execute
+                }
+
+                val connection = usbManager.openDevice(device)
+                if (connection == null) {
+                    mainHandler.post {
+                        result.error(
+                            "usb_open_failed",
+                            null,
+                            null,
+                        )
+                    }
+                    return@execute
+                }
+
+                if (!connection.claimInterface(config.dataInterface, true)) {
+                    connection.close()
+                    mainHandler.post {
+                        result.error(
+                            "usb_open_failed",
+                            null,
+                            null,
+                        )
+                    }
+                    return@execute
+                }
+
+                if (config.controlInterface != null &&
+                    config.controlInterface.id != config.dataInterface.id &&
+                    !connection.claimInterface(config.controlInterface, true)
+                ) {
+                    connection.releaseInterface(config.dataInterface)
+                    connection.close()
+                    mainHandler.post {
+                        result.error(
+                            "usb_open_failed",
+                            null,
+                            null,
+                        )
+                    }
+                    return@execute
+                }
+
+                usbConnection = connection
+                usbInEndpoint = config.inEndpoint
+                usbOutEndpoint = config.outEndpoint
+                controlInterface = config.controlInterface
+                dataInterface = config.dataInterface
+
+                configureDevice(connection, config, baudRate)
+
+                connectedDeviceName = device.deviceName
+                startReadLoop()
+
+                mainHandler.post {
+                    result.success(null)
+                }
+            } catch (error: Exception) {
+                closeUsbConnection()
+                mainHandler.post {
+                    result.error("usb_connect_failed", error.message, null)
+                }
+            }
+        }
+    }
+
+    private fun resolvePortConfig(device: UsbDevice): PortConfig? {
+        var preferredDataInterface: UsbInterface? = null
+        var preferredInEndpoint: UsbEndpoint? = null
+        var preferredOutEndpoint: UsbEndpoint? = null
+        var fallbackDataInterface: UsbInterface? = null
+        var fallbackInEndpoint: UsbEndpoint? = null
+        var fallbackOutEndpoint: UsbEndpoint? = null
+        var preferredControlInterface: UsbInterface? = null
+
+        for (interfaceIndex in 0 until device.interfaceCount) {
+            val usbInterface = device.getInterface(interfaceIndex)
+            var inEndpoint: UsbEndpoint? = null
+            var outEndpoint: UsbEndpoint? = null
+
+            for (endpointIndex in 0 until usbInterface.endpointCount) {
+                val endpoint = usbInterface.getEndpoint(endpointIndex)
+                if (endpoint.type != UsbConstants.USB_ENDPOINT_XFER_BULK) {
+                    continue
+                }
+                when (endpoint.direction) {
+                    UsbConstants.USB_DIR_IN -> if (inEndpoint == null) inEndpoint = endpoint
+                    UsbConstants.USB_DIR_OUT -> if (outEndpoint == null) outEndpoint = endpoint
+                }
+            }
+
+            val hasDataPair = inEndpoint != null && outEndpoint != null
+            when {
+                usbInterface.interfaceClass == UsbConstants.USB_CLASS_COMM &&
+                    preferredControlInterface == null -> {
+                    preferredControlInterface = usbInterface
+                }
+                hasDataPair &&
+                    usbInterface.interfaceClass == UsbConstants.USB_CLASS_CDC_DATA -> {
+                    preferredDataInterface = usbInterface
+                    preferredInEndpoint = inEndpoint
+                    preferredOutEndpoint = outEndpoint
+                }
+                hasDataPair && fallbackDataInterface == null -> {
+                    fallbackDataInterface = usbInterface
+                    fallbackInEndpoint = inEndpoint
+                    fallbackOutEndpoint = outEndpoint
+                }
+            }
+        }
+
+        val dataInterface = preferredDataInterface ?: fallbackDataInterface ?: return null
+        val inEndpoint = preferredInEndpoint ?: fallbackInEndpoint ?: return null
+        val outEndpoint = preferredOutEndpoint ?: fallbackOutEndpoint ?: return null
+        return PortConfig(preferredControlInterface, dataInterface, inEndpoint, outEndpoint)
+    }
+
+    private fun configureDevice(
+        connection: UsbDeviceConnection,
+        config: PortConfig,
+        baudRate: Int,
+    ) {
+        val control = config.controlInterface ?: return
+        val lineCoding =
+            byteArrayOf(
+                (baudRate and 0xFF).toByte(),
+                ((baudRate shr 8) and 0xFF).toByte(),
+                ((baudRate shr 16) and 0xFF).toByte(),
+                ((baudRate shr 24) and 0xFF).toByte(),
+                0, // stop bits: 1
+                0, // parity: none
+                8, // data bits
+            )
+
+                val lineCodingResult =
+            connection.controlTransfer(
+                UsbConstants.USB_DIR_OUT or
+                    UsbConstants.USB_TYPE_CLASS or
+                    usbRecipientInterface,
+                0x20,
+                0,
+                control.id,
+                lineCoding,
+                lineCoding.size,
+                1000,
+            )
+        if (lineCodingResult < 0) {
+            throw IllegalStateException("Failed to configure USB line coding")
+        }
+
+        val controlLineResult =
+            connection.controlTransfer(
+                UsbConstants.USB_DIR_OUT or
+                    UsbConstants.USB_TYPE_CLASS or
+                    usbRecipientInterface,
+                0x22,
+                0x0001, // DTR on, RTS off
+                control.id,
+                null,
+                0,
+                1000,
+            )
+        if (controlLineResult < 0) {
+            throw IllegalStateException("Failed to configure USB control line state")
+        }
+    }
+
+    private fun startReadLoop() {
+        val connection = usbConnection ?: return
+        val endpoint = usbInEndpoint ?: return
+
+        isReading = true
+        readThread =
+            Thread({
+                val packetSize = endpoint.maxPacketSize.coerceAtLeast(64)
+                val buffer = ByteArray(packetSize * 4)
+                try {
+                    while (isReading) {
+                        val bytesRead = connection.bulkTransfer(endpoint, buffer, buffer.size, 250)
+                        if (!isReading) {
+                            break
+                        }
+                        if (bytesRead <= 0) {
+                            continue
+                        }
+                        val packet = buffer.copyOf(bytesRead)
+                        mainHandler.post {
+                            eventSink?.success(packet)
+                        }
+                    }
+                } catch (error: Exception) {
+                    if (isReading) {
+                        mainHandler.post {
+                            eventSink?.error(
+                                "usb_io_error",
+                                error.message ?: "USB serial I/O error",
+                                null,
+                            )
+                        }
+                        scheduleCloseUsbConnection()
+                    }
+                }
+            }, "MeshCoreUsbRead").also { thread ->
+                thread.isDaemon = true
+                thread.start()
+            }
+    }
+
+    private fun writeToDevice(data: ByteArray) {
+        val connection = usbConnection ?: throw IllegalStateException("USB connection missing")
+        val endpoint = usbOutEndpoint ?: throw IllegalStateException("USB output endpoint missing")
+        var offset = 0
+        val maxPacketSize = endpoint.maxPacketSize.coerceAtLeast(64)
+        while (offset < data.size) {
+            val chunkSize = minOf(maxPacketSize, data.size - offset)
+            val chunk = data.copyOfRange(offset, offset + chunkSize)
+            val bytesWritten = connection.bulkTransfer(endpoint, chunk, chunkSize, 1000)
+            if (bytesWritten != chunkSize) {
+                throw IllegalStateException("Short USB write: wrote $bytesWritten of $chunkSize bytes")
+            }
+            offset += chunkSize
+        }
+    }
+
+    private fun scheduleCloseUsbConnection(onComplete: (() -> Unit)? = null) {
+        usbIoExecutor.execute {
+            closeUsbConnection()
+            if (onComplete != null) {
+                mainHandler.post(onComplete)
+            }
+        }
+    }
+
+    @Synchronized
+    private fun closeUsbConnection() {
+        isReading = false
+        readThread?.interrupt()
+        if (readThread != null && readThread !== Thread.currentThread()) {
+            try {
+                readThread?.join(300)
+            } catch (_: InterruptedException) {
+                Thread.currentThread().interrupt()
+            }
+        }
+        readThread = null
+
+        val connection = usbConnection
+        val claimedControl = controlInterface
+        val claimedData = dataInterface
+
+        usbInEndpoint = null
+        usbOutEndpoint = null
+        controlInterface = null
+        dataInterface = null
+        usbConnection = null
+
+        if (connection != null) {
+            if (claimedControl != null) {
+                try {
+                    connection.releaseInterface(claimedControl)
+                } catch (_: Exception) {
+                }
+            }
+            if (claimedData != null && claimedData.id != claimedControl?.id) {
+                try {
+                    connection.releaseInterface(claimedData)
+                } catch (_: Exception) {
+                }
+            }
+            try {
+                connection.close()
+            } catch (_: Exception) {
+            }
+        }
+        connectedDeviceName = null
+    }
+
+    private fun handleUsbDetached(intent: Intent) {
+        val detachedDevice =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                intent.getParcelableExtra(UsbManager.EXTRA_DEVICE, UsbDevice::class.java)
+            } else {
+                @Suppress("DEPRECATION")
+                intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
+            }
+
+        val detachedName = detachedDevice?.deviceName ?: return
+
+        if (pendingConnectPortName == detachedName) {
+            pendingConnectResult?.error(
+                "usb_device_detached",
+                "USB device was removed before the connection completed",
+                null,
+            )
+            pendingConnectResult = null
+            pendingConnectPortName = null
+        }
+
+        if (connectedDeviceName == detachedName) {
+            scheduleCloseUsbConnection {
+                eventSink?.error(
+                    "usb_device_detached",
+                    "USB device was disconnected",
+                    null,
+                )
+            }
+        }
+    }
+
+    private fun pendingIntentFlags(): Int {
+        var flags = PendingIntent.FLAG_UPDATE_CURRENT
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            flags = flags or PendingIntent.FLAG_MUTABLE
+        }
+        return flags
+    }
+}

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

@@ -0,0 +1,78 @@
+import 'dart:typed_data';
+
+import '../services/app_debug_log_service.dart';
+import '../services/usb_serial_service.dart';
+
+/// Manages USB serial transport for MeshCore devices.
+///
+/// Owns the [UsbSerialService] and USB-specific connection state.
+/// The main [MeshCoreConnector] delegates all USB operations here.
+class MeshCoreUsbManager {
+  MeshCoreUsbManager();
+
+  final UsbSerialService _service = UsbSerialService();
+  AppDebugLogService? _debugLog;
+  String? _activePortKey;
+  String? _activePortLabel;
+
+  // --- Getters ---
+  String? get activePortKey => _activePortKey;
+  String? get activePortDisplayLabel => _activePortLabel ?? _activePortKey;
+  bool get isConnected => _service.isConnected;
+  Stream<Uint8List> get frameStream => _service.frameStream;
+
+  // --- Configuration ---
+  Future<List<String>> listPorts() => _service.listPorts();
+
+  void setRequestPortLabel(String label) => _service.setRequestPortLabel(label);
+
+  void setFallbackDeviceName(String label) =>
+      _service.setFallbackDeviceName(label);
+
+  void setDebugLogService(AppDebugLogService? service) {
+    _debugLog = service;
+    _service.setDebugLogService(service);
+  }
+
+  // --- Connection lifecycle ---
+  Future<void> connect({
+    required String portName,
+    int baudRate = 115200,
+  }) async {
+    _debugLog?.info(
+      'UsbManager.connect: portName=$portName baud=$baudRate',
+      tag: 'USB',
+    );
+    await _service.connect(portName: portName, baudRate: baudRate);
+    _activePortKey = _service.activePortKey ?? portName;
+    _activePortLabel = _service.activePortDisplayLabel ?? portName;
+    _debugLog?.info(
+      'UsbManager.connect: done, key=$_activePortKey label=$_activePortLabel',
+      tag: 'USB',
+    );
+  }
+
+  Future<void> disconnect() async {
+    if (!_service.isConnected && _activePortKey == null) {
+      return;
+    }
+    _debugLog?.info('UsbManager.disconnect', tag: 'USB');
+    await _service.disconnect();
+    _activePortKey = null;
+    _activePortLabel = null;
+  }
+
+  Future<void> write(Uint8List data) => _service.write(data);
+
+  Future<void> writeRaw(Uint8List data) => _service.writeRaw(data);
+
+  // --- Label management ---
+  void updateConnectedLabel(String selfName) {
+    _service.updateConnectedLabel(selfName);
+    _activePortLabel = _service.activePortDisplayLabel ?? _activePortLabel;
+  }
+
+  void dispose() {
+    _service.dispose();
+  }
+}

lib/connector/meshcore_protocol.dart

@@ -4,6 +4,7 @@ import 'dart:typed_data';
 // Buffer Reader - sequential binary data reader with pointer tracking
 class BufferReader {
   int _pointer = 0;
+  int _lastPointer = 0;
   final Uint8List _buffer;
 
   BufferReader(Uint8List data) : _buffer = Uint8List.fromList(data);
@@ -13,6 +14,7 @@ class BufferReader {
   int readByte() => readBytes(1)[0];
 
   Uint8List readBytes(int count) {
+    _lastPointer = _pointer;
     if (_pointer + count > _buffer.length) {
       throw RangeError(
         'Attempted to read $count bytes at offset $_pointer, but only $remaining bytes remaining in buffer of length ${_buffer.length}',
@@ -24,6 +26,7 @@ class BufferReader {
   }
 
   void skipBytes(int count) {
+    _lastPointer = _pointer;
     if (_pointer + count > _buffer.length) {
       throw RangeError(
         'Attempted to skip $count bytes at offset $_pointer, but only $remaining bytes remaining in buffer of length ${_buffer.length}',
@@ -35,6 +38,7 @@ class BufferReader {
   Uint8List readRemainingBytes() => readBytes(remaining);
 
   String readString() {
+    _lastPointer = _pointer;
     final value = readRemainingBytes();
     try {
       return utf8.decode(Uint8List.fromList(value), allowMalformed: true);
@@ -43,7 +47,8 @@ class BufferReader {
     }
   }
 
-  String readCString(int maxLength) {
+  String readCStringGreedy(int maxLength) {
+    _lastPointer = _pointer;
     final value = <int>[];
     final bytes = readBytes(maxLength);
     for (final byte in bytes) {
@@ -57,6 +62,24 @@ class BufferReader {
     }
   }
 
+  String readCString(int maxLength) {
+    final backupPointer = _pointer;
+    final value = <int>[];
+    int counter = 0;
+    while (counter < maxLength) {
+      final byte = readByte();
+      if (byte == 0) break;
+      value.add(byte);
+      counter++;
+    }
+    _lastPointer = backupPointer;
+    try {
+      return utf8.decode(Uint8List.fromList(value), allowMalformed: true);
+    } catch (e) {
+      return String.fromCharCodes(value); // Latin-1 fallback
+    }
+  }
+
   int readUInt8() => readBytes(1).buffer.asByteData().getUint8(0);
   int readInt8() => readBytes(1).buffer.asByteData().getInt8(0);
   int readUInt16LE() =>
@@ -78,6 +101,9 @@ class BufferReader {
     if ((value & 0x800000) != 0) value -= 0x1000000;
     return value;
   }
+
+  void resetPointer() => _pointer = 0;
+  void rewind() => _pointer = _lastPointer;
 }
 
 // Buffer Writer - accumulating binary data builder
@@ -122,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) {
@@ -171,7 +210,7 @@ const int cmdSetChannel = 32;
 const int cmdSendTracePath = 36;
 const int cmdSetOtherParams = 38;
 const int cmdSendAnonReq = 57;
-const int cmdGetTelemetryReq = 39;
+const int cmdSendTelemetryReq = 39;
 const int cmdGetCustomVar = 40;
 const int cmdSetCustomVar = 41;
 const int cmdSendBinaryReq = 50;
@@ -233,6 +272,10 @@ const int advTypeRepeater = 2;
 const int advTypeRoom = 3;
 const int advTypeSensor = 4;
 
+const int teleModeDeny = 0;
+const int teleModeAllowFlags = 1; // use contact.flags
+const int teleModeAllowAll = 2;
+
 // Payload Types
 const int payloadTypeREQ =
     0x00; // request (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
@@ -313,6 +356,9 @@ const int contactPubKeyOffset = 1;
 const int contactTypeOffset = 33;
 const int contactFlagsOffset = 34;
 const int contactFlagFavorite = 0x01;
+const int contactFlagTeleBase = 0x02; // 'base' permission includes battery
+const int contactFlagTeleLoc = 0x04;
+const int contactFlagTeleEnv = 0x08; //access environment sensors
 const int contactPathLenOffset = 35;
 const int contactPathOffset = 36;
 const int contactNameOffset = 100;
@@ -650,14 +696,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);
@@ -666,17 +715,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);
@@ -685,6 +724,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();
 }
 
@@ -884,3 +944,18 @@ Uint8List buildSetAutoAddConfigFrame({
   writer.writeByte(flags);
   return writer.toBytes();
 }
+
+//Build CMD_SEND_TELEMETRY_REQ
+// Format: [cmd][reserved x3][pub_key? x32]
+Uint8List buildSendTelemetryReq(Uint8List? pubKey) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdSendTelemetryReq);
+
+  if (pubKey != null && pubKey.length == pubKeySize) {
+    writer.writeBytes(Uint8List(3)); // reserved bytes
+    writer.writeBytes(pubKey);
+  } else {
+    writer.writeBytes(Uint8List(4)); // reserved bytes
+  }
+  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": {
@@ -1828,5 +1829,96 @@
   "discoveredContacts_deleteContactAllContent": "Сигурни ли сте, че искате да изтриете всички открити контакти?",
   "common_deleteAll": "Изтрий всичко",
   "map_guessedLocation": "Предполагано местоположение",
-  "map_showGuessedLocations": "Покажете местоположенията на предположените възли."
+  "map_showGuessedLocations": "Покажете местоположенията на предположените възли.",
+  "connectionChoiceUsbLabel": "USB",
+  "usbScreenTitle": "Свържете се чрез USB",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "usbScreenSubtitle": "Изберете открития сериен уред и свържете директно към вашия MeshCore възел.",
+  "usbScreenStatus": "Изберете USB устройство",
+  "usbScreenNote": "USB серийната връзка е активна на поддържаните Android устройства и настолни платформи.",
+  "usbScreenEmptyState": "Няма открити USB устройства. Включете едно и опитайте отново.",
+  "usbErrorPermissionDenied": "Не беше разрешено достъпът през USB.",
+  "usbErrorDeviceMissing": "Избраното USB устройство вече не е налично.",
+  "usbErrorInvalidPort": "Изберете валитно USB устройство.",
+  "usbErrorBusy": "Друг мол за свързване през USB вече е в процес на изпълнение.",
+  "usbErrorNotConnected": "Няма свързано USB устройство.",
+  "usbErrorOpenFailed": "Не успях да отворя избраното USB устройство.",
+  "usbErrorConnectFailed": "Не успях да се свържа с избраното USB устройство.",
+  "usbErrorUnsupported": "USB серийната комуникация не се поддържа на тази платформа.",
+  "usbErrorAlreadyActive": "USB връзката вече е активирана.",
+  "usbErrorNoDeviceSelected": "Няма избран USB устройство.",
+  "usbErrorPortClosed": "USB връзката не е активна.",
+  "usbFallbackDeviceName": "Устройство за четене на уеб серийни данни",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_connecting": "Свързване към USB устройство...",
+  "usbConnectionFailed": "Неуспешно свързване през USB: {error}",
+  "usbStatus_notConnected": "Изберете USB устройство",
+  "usbStatus_searching": "Търсене на 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": "Покажи контакти за откриване",
+  "map_setAsMyLocation": "Задайте като моя местоположение",
+  "settings_denyAll": "Откажи всичко",
+  "settings_allowAll": "Позволи всичко",
+  "settings_allowByContact": "Позволи по флагове за контакт",
+  "settings_privacy": "Настройки на поверителността",
+  "settings_privacySettingsDescription": "Изберете каква информация устройството ви споделя с другите.",
+  "settings_privacySubtitle": "Контролирайте каква информация се споделя.",
+  "settings_telemetryBaseMode": "Базов режим на телеметрия",
+  "settings_telemetryLocationMode": "Режим на местоположение на телеметрията",
+  "settings_advertLocation": "Място на обявата",
+  "settings_advertLocationSubtitle": "Включи местоположение в обявата",
+  "contact_info": "Контактна информация",
+  "settings_telemetryEnvironmentMode": "Режим на средата на телеметрията",
+  "contact_telemetry": "Телеметрия",
+  "contact_lastSeen": "Последно видян",
+  "contact_clearChat": "Изчисти чата",
+  "contact_teleBase": "Базата данни за телеметрия",
+  "contact_settings": "Настройки за контакти",
+  "contact_teleBaseSubtitle": "Позволи споделяне на ниво на батерията и основна телеметрия",
+  "contact_teleEnv": "Среда на телеметрия",
+  "contact_teleLocSubtitle": "Позволи споделяне на данни за местоположение",
+  "contact_teleLoc": "Местоположение на телеметрията",
+  "contact_teleEnvSubtitle": "Позволи споделяне на данни от средносферните датчици",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_multiAck": "Мулти-потвърди: {value}",
+  "settings_telemetryModeUpdated": "Режим на телеметрията е обновен"
 }

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": {
@@ -296,8 +297,8 @@
   "contacts_filterContacts": "Filtert Kontakte...",
   "contacts_noContactsMatchFilter": "Keine Kontakte passen zu Ihrem Filter",
   "contacts_noMembers": "Keine Mitglieder",
-  "contacts_lastSeenNow": "gerade gesehen",
-  "contacts_lastSeenMinsAgo": "Letzte Sichtung vor {minutes} Minuten.",
+  "contacts_lastSeenNow": "kürzlich",
+  "contacts_lastSeenMinsAgo": "~ {minutes} Min.",
   "@contacts_lastSeenMinsAgo": {
     "placeholders": {
       "minutes": {
@@ -305,8 +306,8 @@
       }
     }
   },
-  "contacts_lastSeenHourAgo": "Letzte Sichtung vor 1 Stunde.",
-  "contacts_lastSeenHoursAgo": "Letzte Sichtung vor {hours} Stunden.",
+  "contacts_lastSeenHourAgo": "~ 1 Std.",
+  "contacts_lastSeenHoursAgo": "~ {hours} Std.",
   "@contacts_lastSeenHoursAgo": {
     "placeholders": {
       "hours": {
@@ -314,8 +315,8 @@
       }
     }
   },
-  "contacts_lastSeenDayAgo": "Letzte Sichtung vor 1 Tag",
-  "contacts_lastSeenDaysAgo": "Letzte Sichtung {days} Tage zuvor",
+  "contacts_lastSeenDayAgo": "~ 1 Tag",
+  "contacts_lastSeenDaysAgo": "~ {days} Tage",
   "@contacts_lastSeenDaysAgo": {
     "placeholders": {
       "days": {
@@ -1856,5 +1857,96 @@
   "discoveredContacts_deleteContactAllContent": "Sind Sie sicher, dass Sie alle gefundenen Kontakte löschen möchten?",
   "discoveredContacts_deleteContactAll": "Alle entdeckten Kontakte löschen",
   "map_showGuessedLocations": "Zeige die vermuteten Knotenpositionen",
-  "map_guessedLocation": "Geschätzter Ort"
+  "map_guessedLocation": "Geschätzter Ort",
+  "usbScreenSubtitle": "Wählen Sie ein erkannten serielles Gerät aus und verbinden Sie es direkt mit Ihrem MeshCore-Knoten.",
+  "connectionChoiceUsbLabel": "USB",
+  "usbScreenTitle": "Verbinden über USB",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "usbScreenStatus": "Wählen Sie ein USB-Gerät aus",
+  "usbScreenNote": "Die USB-Serielle Schnittstelle ist auf unterstützten Android-Geräten und Desktop-Plattformen aktiv.",
+  "usbScreenEmptyState": "Keine USB-Geräte gefunden. Schließen Sie eines an und aktualisieren Sie.",
+  "usbErrorPermissionDenied": "Die USB-Berechtigung wurde abgelehnt.",
+  "usbErrorDeviceMissing": "Das ausgewählte USB-Gerät ist nicht mehr verfügbar.",
+  "usbErrorInvalidPort": "Wählen Sie ein gültiges USB-Gerät aus.",
+  "usbErrorBusy": "Eine weitere Anfrage für eine USB-Verbindung ist bereits in Bearbeitung.",
+  "usbErrorNotConnected": "Es ist kein USB-Gerät angeschlossen.",
+  "usbErrorOpenFailed": "Fehlgeschlagen beim Öffnen des ausgewählten USB-Geräts.",
+  "usbErrorConnectFailed": "Keine Verbindung zum ausgewählten USB-Gerät hergestellt.",
+  "usbErrorUnsupported": "Die USB-Serielle Schnittstelle wird auf dieser Plattform nicht unterstützt.",
+  "usbErrorAlreadyActive": "Eine USB-Verbindung ist bereits hergestellt.",
+  "usbErrorNoDeviceSelected": "Kein USB-Gerät wurde ausgewählt.",
+  "usbErrorPortClosed": "Die USB-Verbindung ist nicht aktiv.",
+  "usbFallbackDeviceName": "Web-Serielle Geräte",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_searching": "Suche nach USB-Geräten...",
+  "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.",
+  "@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",
+  "map_setAsMyLocation": "Als meine aktuelle Position festlegen",
+  "settings_allowByContact": "Zulassen durch Kontaktflaggen",
+  "settings_privacy": "Datenschutzeinstellungen",
+  "settings_allowAll": "Alles zulassen",
+  "settings_privacySettingsDescription": "Wählen Sie die Informationen, die Ihr Gerät mit anderen teilt.",
+  "settings_denyAll": "Alle ablehnen",
+  "settings_privacySubtitle": "Steuern Sie die Informationen, die freigegeben werden.",
+  "settings_telemetryLocationMode": "Telemetrie-Ortsmodus",
+  "settings_telemetryEnvironmentMode": "Telemetrie-Umgebungsmodus",
+  "settings_advertLocation": "Anzeigenort",
+  "settings_advertLocationSubtitle": "Ort in der Anzeige einbeziehen",
+  "settings_telemetryBaseMode": "Telemetrie-Basismodus",
+  "contact_teleBase": "Telemetriebasis",
+  "contact_teleBaseSubtitle": "Erlauben des Freigebens des Batteriestands und der grundlegenden Telemetrie",
+  "contact_teleLoc": "Telemetrieort",
+  "contact_teleLocSubtitle": "Teilen von Standortdaten zulassen",
+  "contact_info": "Kontaktinformationen",
+  "contact_settings": "Kontakteinstellungen",
+  "contact_telemetry": "Telemetrie",
+  "contact_teleEnv": "Telemetrieumgebung",
+  "contact_lastSeen": "Zuletzt gesehen",
+  "contact_clearChat": "Chat löschen",
+  "contact_teleEnvSubtitle": "Teilen von Umgebungsensordaten zulassen",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_telemetryModeUpdated": "Telemetriemodus aktualisiert",
+  "settings_multiAck": "Mehrfach-Bestätigungen: {value}"
 }

lib/l10n/app_en.arb

@@ -47,6 +47,64 @@
     }
   },
   "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",
+  "usbScreenNote": "USB serial is active on supported Android devices and desktop platforms.",
+  "usbScreenEmptyState": "No USB devices found. Plug one in and refresh.",
+  "usbErrorPermissionDenied": "USB permission was denied.",
+  "usbErrorDeviceMissing": "The selected USB device is no longer available.",
+  "usbErrorInvalidPort": "Select a valid USB device.",
+  "usbErrorBusy": "Another USB connection request is already in progress.",
+  "usbErrorNotConnected": "No USB device is connected.",
+  "usbErrorOpenFailed": "Failed to open the selected USB device.",
+  "usbErrorConnectFailed": "Failed to connect to the selected USB device.",
+  "usbErrorUnsupported": "USB serial is not supported on this platform.",
+  "usbErrorAlreadyActive": "A USB connection is already active.",
+  "usbErrorNoDeviceSelected": "No USB device was selected.",
+  "usbErrorPortClosed": "The USB connection is not open.",
+  "usbErrorConnectTimedOut": "Connection timed out. Make sure the device has USB Companion firmware.",
+  "usbFallbackDeviceName": "Web Serial Device",
+  "usbStatus_notConnected": "Select a USB device",
+  "usbStatus_connecting": "Connecting to USB device...",
+  "usbStatus_searching": "Searching for USB devices...",
+  "usbConnectionFailed": "USB connection failed: {error}",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
   "scanner_scanning": "Scanning for devices...",
   "scanner_connecting": "Connecting...",
   "scanner_disconnecting": "Disconnecting...",
@@ -108,6 +166,26 @@
   "settings_privacyModeToggle": "Toggle privacy mode to hide your name and location in advertisements.",
   "settings_privacyModeEnabled": "Privacy mode enabled",
   "settings_privacyModeDisabled": "Privacy mode disabled",
+  "settings_privacy": "Privacy Settings",
+  "settings_privacySubtitle": "Control what information is shared.",
+  "settings_privacySettingsDescription": "Choose what information your device shares with others.",
+  "settings_denyAll": "Deny all",
+  "settings_allowByContact": "Allow by contact flags",
+  "settings_allowAll": "Allow all",
+  "settings_telemetryBaseMode": "Telemetry Base Mode",
+  "settings_telemetryLocationMode": "Telemetry Location Mode",
+  "settings_telemetryEnvironmentMode": "Telemetry Environment Mode",
+  "settings_advertLocation": "Advert Location",
+  "settings_advertLocationSubtitle": "Include location in advert.",
+  "settings_multiAck": "Multi-ACKs: {value}",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_telemetryModeUpdated": "Telemetry mode updated",
   "settings_actions": "Actions",
   "settings_sendAdvertisement": "Send Advertisement",
   "settings_sendAdvertisementSubtitle": "Broadcast presence now",
@@ -358,6 +436,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": {
@@ -369,8 +448,8 @@
   "contacts_filterContacts": "Filter contacts...",
   "contacts_noContactsMatchFilter": "No contacts match your filter",
   "contacts_noMembers": "No members",
-  "contacts_lastSeenNow": "Last seen now",
-  "contacts_lastSeenMinsAgo": "Last seen {minutes} mins ago",
+  "contacts_lastSeenNow": "recently",
+  "contacts_lastSeenMinsAgo": "~ {minutes} min.",
   "@contacts_lastSeenMinsAgo": {
     "placeholders": {
       "minutes": {
@@ -378,8 +457,8 @@
       }
     }
   },
-  "contacts_lastSeenHourAgo": "Last seen 1 hour ago",
-  "contacts_lastSeenHoursAgo": "Last seen {hours} hours ago",
+  "contacts_lastSeenHourAgo": "~ 1 hour",
+  "contacts_lastSeenHoursAgo": "~ {hours} hours",
   "@contacts_lastSeenHoursAgo": {
     "placeholders": {
       "hours": {
@@ -387,8 +466,8 @@
       }
     }
   },
-  "contacts_lastSeenDayAgo": "Last seen 1 day ago",
-  "contacts_lastSeenDaysAgo": "Last seen {days} days ago",
+  "contacts_lastSeenDayAgo": "~ 1 day",
+  "contacts_lastSeenDaysAgo": "~ {days} days",
   "@contacts_lastSeenDaysAgo": {
     "placeholders": {
       "days": {
@@ -396,6 +475,17 @@
       }
     }
   },
+  "contact_info": "Contact Info",
+  "contact_settings": "Contact Settings",
+  "contact_telemetry": "Telemetry",
+  "contact_lastSeen": "Last seen",
+  "contact_clearChat": "Clear Chat",
+  "contact_teleBase": "Telemetry Base",
+  "contact_teleBaseSubtitle": "Allow sharing battery level and basic telemetry",
+  "contact_teleLoc": "Telemetry Location",
+  "contact_teleLocSubtitle": "Allow sharing location data",
+  "contact_teleEnv": "Telemetry Environment",
+  "contact_teleEnvSubtitle": "Allow sharing environment sensor data",
   "channels_title": "Channels",
   "channels_noChannelsConfigured": "No channels configured",
   "channels_addPublicChannel": "Add Public Channel",
@@ -749,6 +839,7 @@
   "map_source": "Source",
   "map_flags": "Flags",
   "map_shareMarkerHere": "Share marker here",
+  "map_setAsMyLocation": "Set as my location",
   "map_pinLabel": "Pin label",
   "map_label": "Label",
   "map_pointOfInterest": "Point of interest",
@@ -776,6 +867,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": {
@@ -297,7 +298,7 @@
   "contacts_noContactsMatchFilter": "No hay contactos que coincidan con tu filtro",
   "contacts_noMembers": "No miembros",
   "contacts_lastSeenNow": "Última vez que se vio ahora",
-  "contacts_lastSeenMinsAgo": "Última vez visto hace {minutes} minutos.",
+  "contacts_lastSeenMinsAgo": "~ {minutes} min.",
   "@contacts_lastSeenMinsAgo": {
     "placeholders": {
       "minutes": {
@@ -305,8 +306,8 @@
       }
     }
   },
-  "contacts_lastSeenHourAgo": "Última vez que se vio hace 1 hora",
-  "contacts_lastSeenHoursAgo": "Última vez visto hace {hours} horas.",
+  "contacts_lastSeenHourAgo": "~ 1 hora",
+  "contacts_lastSeenHoursAgo": "~ {hours} horas",
   "@contacts_lastSeenHoursAgo": {
     "placeholders": {
       "hours": {
@@ -314,8 +315,8 @@
       }
     }
   },
-  "contacts_lastSeenDayAgo": "Última vez que se vio hace 1 día",
-  "contacts_lastSeenDaysAgo": "Última vez visto hace {days} días.",
+  "contacts_lastSeenDayAgo": "~ 1 día",
+  "contacts_lastSeenDaysAgo": "~ {days} días",
   "@contacts_lastSeenDaysAgo": {
     "placeholders": {
       "days": {
@@ -1856,5 +1857,96 @@
   "discoveredContacts_deleteContactAll": "Eliminar Todos los Contactos Descubiertos",
   "discoveredContacts_deleteContactAllContent": "¿Está seguro de que desea eliminar todos los contactos descubiertos!",
   "map_guessedLocation": "Ubicación estimada",
-  "map_showGuessedLocations": "Mostrar las ubicaciones estimadas de los nodos."
+  "map_showGuessedLocations": "Mostrar las ubicaciones estimadas de los nodos.",
+  "usbScreenTitle": "Conecte mediante USB",
+  "connectionChoiceUsbLabel": "USB",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "usbScreenSubtitle": "Seleccione el dispositivo de serie detectado y conéctelo directamente a su nodo MeshCore.",
+  "usbScreenStatus": "Seleccione un dispositivo USB",
+  "usbScreenNote": "La comunicación serial a través de USB está activa en dispositivos Android compatibles y en plataformas de escritorio.",
+  "usbScreenEmptyState": "No se encontraron dispositivos USB. Conecte uno y vuelva a intentar.",
+  "usbErrorPermissionDenied": "Se denegó el permiso de acceso a través de USB.",
+  "usbErrorDeviceMissing": "El dispositivo USB seleccionado ya no está disponible.",
+  "usbErrorInvalidPort": "Seleccione un dispositivo USB válido.",
+  "usbErrorBusy": "Ya se ha iniciado una solicitud de conexión USB adicional.",
+  "usbErrorNotConnected": "No hay ningún dispositivo USB conectado.",
+  "usbErrorOpenFailed": "No se pudo abrir el dispositivo USB seleccionado.",
+  "usbErrorConnectFailed": "No se pudo conectar con el dispositivo USB seleccionado.",
+  "usbErrorUnsupported": "La comunicación serial a través de USB no está soportada en esta plataforma.",
+  "usbErrorAlreadyActive": "La conexión USB ya está activa.",
+  "usbErrorNoDeviceSelected": "No se ha seleccionado ningún dispositivo USB.",
+  "usbErrorPortClosed": "La conexión USB no está activa.",
+  "usbFallbackDeviceName": "Dispositivo de serie web",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_connecting": "Conectándose al dispositivo USB...",
+  "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.",
+  "@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",
+  "map_setAsMyLocation": "Establecer mi ubicación",
+  "settings_privacySubtitle": "Controlar qué información se comparte.",
+  "settings_allowByContact": "Permitir por banderas de contacto",
+  "settings_denyAll": "Denegar todo",
+  "settings_telemetryBaseMode": "Modo base de telemetría",
+  "settings_telemetryEnvironmentMode": "Modo de entorno de telemetría",
+  "settings_advertLocationSubtitle": "Incluir ubicación en anuncio",
+  "contact_info": "Información de contacto",
+  "settings_privacySettingsDescription": "Elige qué información comparte tu dispositivo con otros.",
+  "settings_allowAll": "Permitir todo",
+  "settings_privacy": "Configuración de privacidad",
+  "contact_settings": "Configuración de contacto",
+  "settings_telemetryLocationMode": "Modo de ubicación de telemetría",
+  "contact_teleBase": "Base de Telemetría",
+  "contact_teleLoc": "Ubicación de telemetría",
+  "settings_advertLocation": "Ubicación de anuncio",
+  "contact_teleLocSubtitle": "Permitir el intercambio de datos de ubicación",
+  "contact_clearChat": "Borrar chat",
+  "contact_telemetry": "Telemetría",
+  "contact_lastSeen": "Visto por última vez",
+  "contact_teleBaseSubtitle": "Permitir el intercambio de nivel de batería y telemetría básica",
+  "contact_teleEnv": "Entorno de Telemetría",
+  "contact_teleEnvSubtitle": "Permitir el intercambio de datos de sensores de entorno",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_telemetryModeUpdated": "Modo de telemetría actualizado",
+  "settings_multiAck": "Multi-ACKs: {value}"
 }

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": {
@@ -297,7 +298,7 @@
   "contacts_noContactsMatchFilter": "Aucun contact ne correspond à votre filtre.",
   "contacts_noMembers": "Aucun membre",
   "contacts_lastSeenNow": "Vu maintenant",
-  "contacts_lastSeenMinsAgo": "Vu il y a {minutes} minutes",
+  "contacts_lastSeenMinsAgo": "~ {minutes} min.",
   "@contacts_lastSeenMinsAgo": {
     "placeholders": {
       "minutes": {
@@ -305,8 +306,8 @@
       }
     }
   },
-  "contacts_lastSeenHourAgo": "Vu il y a 1 heure",
-  "contacts_lastSeenHoursAgo": "Vu il y a {hours} heures",
+  "contacts_lastSeenHourAgo": "~ 1 heure",
+  "contacts_lastSeenHoursAgo": "~ {hours} heures",
   "@contacts_lastSeenHoursAgo": {
     "placeholders": {
       "hours": {
@@ -314,8 +315,8 @@
       }
     }
   },
-  "contacts_lastSeenDayAgo": "Vu il y a 1 jour",
-  "contacts_lastSeenDaysAgo": "Vu il y a {days} jours",
+  "contacts_lastSeenDayAgo": "~ 1 jour",
+  "contacts_lastSeenDaysAgo": "~ {days} jours",
   "@contacts_lastSeenDaysAgo": {
     "placeholders": {
       "days": {
@@ -1828,5 +1829,96 @@
   "discoveredContacts_deleteContactAll": "Supprimer tous les contacts découverts",
   "discoveredContacts_deleteContactAllContent": "Êtes-vous sûr de vouloir supprimer tous les contacts découverts ?",
   "map_showGuessedLocations": "Afficher les emplacements des nœuds estimés",
-  "map_guessedLocation": "Lieu deviné"
+  "map_guessedLocation": "Lieu deviné",
+  "connectionChoiceUsbLabel": "USB",
+  "usbScreenTitle": "Connectez via USB",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "usbScreenSubtitle": "Sélectionnez un périphérique série détecté et connectez-vous directement à votre nœud MeshCore.",
+  "usbScreenStatus": "Sélectionnez un périphérique USB",
+  "usbScreenNote": "La communication série USB est active sur les appareils Android et les plateformes de bureau compatibles.",
+  "usbScreenEmptyState": "Aucun périphérique USB n'a été trouvé. Veuillez en brancher un et rafraîchir la page.",
+  "usbErrorPermissionDenied": "L'accès via USB a été refusé.",
+  "usbErrorDeviceMissing": "Le périphérique USB sélectionné n'est plus disponible.",
+  "usbErrorInvalidPort": "Sélectionnez un périphérique USB valide.",
+  "usbErrorBusy": "Une autre demande de connexion USB est déjà en cours.",
+  "usbErrorNotConnected": "Aucun appareil USB n'est connecté.",
+  "usbErrorOpenFailed": "Impossible d'ouvrir l'appareil USB sélectionné.",
+  "usbErrorConnectFailed": "Impossible de se connecter à l'appareil USB sélectionné.",
+  "usbErrorUnsupported": "La communication série USB n'est pas prise en charge sur cette plateforme.",
+  "usbErrorAlreadyActive": "Une connexion USB est déjà établie.",
+  "usbErrorNoDeviceSelected": "Aucun appareil USB n'a été sélectionné.",
+  "usbErrorPortClosed": "La connexion USB n'est pas établie.",
+  "usbFallbackDeviceName": "Dispositif de communication série sur le Web",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_notConnected": "Sélectionnez un périphérique USB",
+  "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.",
+  "@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",
+  "map_setAsMyLocation": "Définir comme ma localisation",
+  "settings_privacy": "Paramètres de confidentialité",
+  "settings_privacySubtitle": "Contrôlez les informations partagées",
+  "settings_telemetryLocationMode": "Mode d'emplacement de télémétrie",
+  "settings_telemetryEnvironmentMode": "Mode d'environnement de télémétrie",
+  "settings_advertLocation": "Emplacement de l'annonce",
+  "settings_advertLocationSubtitle": "Inclure l'emplacement dans l'annonce",
+  "settings_denyAll": "Refuser tout",
+  "settings_allowByContact": "Autoriser par drapeaux de contact",
+  "settings_privacySettingsDescription": "Choisissez les informations que votre appareil partage avec les autres.",
+  "settings_allowAll": "Autoriser tout",
+  "contact_info": "Informations de contact",
+  "settings_telemetryBaseMode": "Mode de base Télémétrie",
+  "contact_teleBase": "Base de télémétrie",
+  "contact_teleLoc": "Emplacement de télémétrie",
+  "contact_teleLocSubtitle": "Autoriser le partage des données de localisation",
+  "contact_teleEnv": "Environnement Télémétrie",
+  "contact_teleEnvSubtitle": "Autoriser le partage des données des capteurs d'environnement",
+  "contact_telemetry": "Télémétrie",
+  "contact_settings": "Paramètres de contact",
+  "contact_lastSeen": "Dernière fois vu",
+  "contact_clearChat": "Effacer la conversation",
+  "contact_teleBaseSubtitle": "Autoriser le partage du niveau de batterie et de la télémétrie de base",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_multiAck": "Multi-ACKs : {value}",
+  "settings_telemetryModeUpdated": "Le mode télémétrie a été mis à jour"
 }

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": {
@@ -1828,5 +1829,96 @@
   "discoveredContacts_deleteContactAllContent": "Sei sicuro di voler eliminare tutti i contatti scoperti?",
   "discoveredContacts_deleteContactAll": "Eliminare tutti i contatti scoperti",
   "map_guessedLocation": "Località indovinata",
-  "map_showGuessedLocations": "Mostra le posizioni stimate dei nodi"
+  "map_showGuessedLocations": "Mostra le posizioni stimate dei nodi",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "usbScreenSubtitle": "Seleziona il dispositivo seriale rilevato e connettilo direttamente al tuo nodo MeshCore.",
+  "connectionChoiceUsbLabel": "USB",
+  "usbScreenTitle": "Connessione tramite USB",
+  "usbScreenStatus": "Seleziona un dispositivo USB",
+  "usbScreenNote": "La comunicazione seriale USB è attiva sui dispositivi Android supportati e sulle piattaforme desktop.",
+  "usbScreenEmptyState": "Nessun dispositivo USB rilevato. Collegare uno e aggiornare.",
+  "usbErrorPermissionDenied": "È stato negato l'accesso tramite USB.",
+  "usbErrorDeviceMissing": "Il dispositivo USB selezionato non è più disponibile.",
+  "usbErrorInvalidPort": "Seleziona un dispositivo USB valido.",
+  "usbErrorBusy": "Un'altra richiesta di connessione tramite USB è già in corso.",
+  "usbErrorNotConnected": "Non è collegato alcun dispositivo USB.",
+  "usbErrorOpenFailed": "Impossibile aprire il dispositivo USB selezionato.",
+  "usbErrorConnectFailed": "Impossibile connettersi al dispositivo USB selezionato.",
+  "usbErrorUnsupported": "La comunicazione seriale tramite USB non è supportata su questa piattaforma.",
+  "usbErrorAlreadyActive": "La connessione USB è già attiva.",
+  "usbErrorNoDeviceSelected": "Non è stato selezionato alcun dispositivo USB.",
+  "usbErrorPortClosed": "La connessione USB non è attiva.",
+  "usbFallbackDeviceName": "Dispositivo per comunicazione seriale su rete",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_searching": "Ricerca di dispositivi USB...",
+  "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.",
+  "@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",
+  "map_setAsMyLocation": "Imposta come la mia posizione",
+  "settings_privacySettingsDescription": "Scegli le informazioni che il tuo dispositivo condivide con gli altri.",
+  "settings_allowByContact": "Consenti in base ai flag di contatto",
+  "settings_telemetryLocationMode": "Modalità di posizionamento telemetrico",
+  "settings_telemetryEnvironmentMode": "Modalità di ambiente di telemetria",
+  "settings_advertLocation": "Posizione dell'annuncio",
+  "settings_advertLocationSubtitle": "Includi la posizione nell'annuncio",
+  "settings_privacy": "Impostazioni sulla privacy",
+  "settings_denyAll": "Negare tutto",
+  "settings_privacySubtitle": "Controlla le informazioni che vengono condivise.",
+  "settings_allowAll": "Consenti tutto",
+  "contact_info": "Informazioni di Contatto",
+  "settings_telemetryBaseMode": "Modalità di base di telemetria",
+  "contact_teleBase": "Base di telemetria",
+  "contact_teleLoc": "Posizione telemetria",
+  "contact_teleLocSubtitle": "Consenti la condivisione dei dati di posizione",
+  "contact_clearChat": "Cancella chat",
+  "contact_telemetry": "Telemetria",
+  "contact_settings": "Impostazioni di contatto",
+  "contact_lastSeen": "Ultimo accesso",
+  "contact_teleBaseSubtitle": "Consenti la condivisione del livello della batteria e della telemetria di base",
+  "contact_teleEnvSubtitle": "Consenti la condivisione dei dati del sensore ambientale",
+  "contact_teleEnv": "Ambiente di telemetria",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_telemetryModeUpdated": "Modalità telemetria aggiornata",
+  "settings_multiAck": "Multi-ACKs: {value}"
 }

lib/l10n/app_localizations.dart

@@ -322,6 +322,228 @@ abstract class AppLocalizations {
   /// **'MeshCore Open'**
   String get scanner_title;
 
+  /// No description provided for @connectionChoiceUsbLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'USB'**
+  String get connectionChoiceUsbLabel;
+
+  /// No description provided for @connectionChoiceBluetoothLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'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:
+  /// **'Connect over USB'**
+  String get usbScreenTitle;
+
+  /// No description provided for @usbScreenSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose a detected serial device and connect directly to your MeshCore node.'**
+  String get usbScreenSubtitle;
+
+  /// No description provided for @usbScreenStatus.
+  ///
+  /// In en, this message translates to:
+  /// **'Select a USB device'**
+  String get usbScreenStatus;
+
+  /// No description provided for @usbScreenNote.
+  ///
+  /// In en, this message translates to:
+  /// **'USB serial is active on supported Android devices and desktop platforms.'**
+  String get usbScreenNote;
+
+  /// No description provided for @usbScreenEmptyState.
+  ///
+  /// In en, this message translates to:
+  /// **'No USB devices found. Plug one in and refresh.'**
+  String get usbScreenEmptyState;
+
+  /// No description provided for @usbErrorPermissionDenied.
+  ///
+  /// In en, this message translates to:
+  /// **'USB permission was denied.'**
+  String get usbErrorPermissionDenied;
+
+  /// No description provided for @usbErrorDeviceMissing.
+  ///
+  /// In en, this message translates to:
+  /// **'The selected USB device is no longer available.'**
+  String get usbErrorDeviceMissing;
+
+  /// No description provided for @usbErrorInvalidPort.
+  ///
+  /// In en, this message translates to:
+  /// **'Select a valid USB device.'**
+  String get usbErrorInvalidPort;
+
+  /// No description provided for @usbErrorBusy.
+  ///
+  /// In en, this message translates to:
+  /// **'Another USB connection request is already in progress.'**
+  String get usbErrorBusy;
+
+  /// No description provided for @usbErrorNotConnected.
+  ///
+  /// In en, this message translates to:
+  /// **'No USB device is connected.'**
+  String get usbErrorNotConnected;
+
+  /// No description provided for @usbErrorOpenFailed.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to open the selected USB device.'**
+  String get usbErrorOpenFailed;
+
+  /// No description provided for @usbErrorConnectFailed.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to connect to the selected USB device.'**
+  String get usbErrorConnectFailed;
+
+  /// No description provided for @usbErrorUnsupported.
+  ///
+  /// In en, this message translates to:
+  /// **'USB serial is not supported on this platform.'**
+  String get usbErrorUnsupported;
+
+  /// No description provided for @usbErrorAlreadyActive.
+  ///
+  /// In en, this message translates to:
+  /// **'A USB connection is already active.'**
+  String get usbErrorAlreadyActive;
+
+  /// No description provided for @usbErrorNoDeviceSelected.
+  ///
+  /// In en, this message translates to:
+  /// **'No USB device was selected.'**
+  String get usbErrorNoDeviceSelected;
+
+  /// No description provided for @usbErrorPortClosed.
+  ///
+  /// In en, this message translates to:
+  /// **'The USB connection is not open.'**
+  String get usbErrorPortClosed;
+
+  /// No description provided for @usbErrorConnectTimedOut.
+  ///
+  /// In en, this message translates to:
+  /// **'Connection timed out. Make sure the device has USB Companion firmware.'**
+  String get usbErrorConnectTimedOut;
+
+  /// No description provided for @usbFallbackDeviceName.
+  ///
+  /// In en, this message translates to:
+  /// **'Web Serial Device'**
+  String get usbFallbackDeviceName;
+
+  /// No description provided for @usbStatus_notConnected.
+  ///
+  /// In en, this message translates to:
+  /// **'Select a USB device'**
+  String get usbStatus_notConnected;
+
+  /// No description provided for @usbStatus_connecting.
+  ///
+  /// In en, this message translates to:
+  /// **'Connecting to USB device...'**
+  String get usbStatus_connecting;
+
+  /// No description provided for @usbStatus_searching.
+  ///
+  /// In en, this message translates to:
+  /// **'Searching for USB devices...'**
+  String get usbStatus_searching;
+
+  /// No description provided for @usbConnectionFailed.
+  ///
+  /// In en, this message translates to:
+  /// **'USB connection failed: {error}'**
+  String usbConnectionFailed(String error);
+
   /// No description provided for @scanner_scanning.
   ///
   /// In en, this message translates to:
@@ -604,6 +826,84 @@ abstract class AppLocalizations {
   /// **'Privacy mode disabled'**
   String get settings_privacyModeDisabled;
 
+  /// No description provided for @settings_privacy.
+  ///
+  /// In en, this message translates to:
+  /// **'Privacy Settings'**
+  String get settings_privacy;
+
+  /// No description provided for @settings_privacySubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Control what information is shared.'**
+  String get settings_privacySubtitle;
+
+  /// No description provided for @settings_privacySettingsDescription.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose what information your device shares with others.'**
+  String get settings_privacySettingsDescription;
+
+  /// No description provided for @settings_denyAll.
+  ///
+  /// In en, this message translates to:
+  /// **'Deny all'**
+  String get settings_denyAll;
+
+  /// No description provided for @settings_allowByContact.
+  ///
+  /// In en, this message translates to:
+  /// **'Allow by contact flags'**
+  String get settings_allowByContact;
+
+  /// No description provided for @settings_allowAll.
+  ///
+  /// In en, this message translates to:
+  /// **'Allow all'**
+  String get settings_allowAll;
+
+  /// No description provided for @settings_telemetryBaseMode.
+  ///
+  /// In en, this message translates to:
+  /// **'Telemetry Base Mode'**
+  String get settings_telemetryBaseMode;
+
+  /// No description provided for @settings_telemetryLocationMode.
+  ///
+  /// In en, this message translates to:
+  /// **'Telemetry Location Mode'**
+  String get settings_telemetryLocationMode;
+
+  /// No description provided for @settings_telemetryEnvironmentMode.
+  ///
+  /// In en, this message translates to:
+  /// **'Telemetry Environment Mode'**
+  String get settings_telemetryEnvironmentMode;
+
+  /// No description provided for @settings_advertLocation.
+  ///
+  /// In en, this message translates to:
+  /// **'Advert Location'**
+  String get settings_advertLocation;
+
+  /// No description provided for @settings_advertLocationSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Include location in advert.'**
+  String get settings_advertLocationSubtitle;
+
+  /// No description provided for @settings_multiAck.
+  ///
+  /// In en, this message translates to:
+  /// **'Multi-ACKs: {value}'**
+  String settings_multiAck(String value);
+
+  /// No description provided for @settings_telemetryModeUpdated.
+  ///
+  /// In en, this message translates to:
+  /// **'Telemetry mode updated'**
+  String get settings_telemetryModeUpdated;
+
   /// No description provided for @settings_actions.
   ///
   /// In en, this message translates to:
@@ -1492,6 +1792,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:
@@ -1519,39 +1825,105 @@ abstract class AppLocalizations {
   /// No description provided for @contacts_lastSeenNow.
   ///
   /// In en, this message translates to:
-  /// **'Last seen now'**
+  /// **'recently'**
   String get contacts_lastSeenNow;
 
   /// No description provided for @contacts_lastSeenMinsAgo.
   ///
   /// In en, this message translates to:
-  /// **'Last seen {minutes} mins ago'**
+  /// **'~ {minutes} min.'**
   String contacts_lastSeenMinsAgo(int minutes);
 
   /// No description provided for @contacts_lastSeenHourAgo.
   ///
   /// In en, this message translates to:
-  /// **'Last seen 1 hour ago'**
+  /// **'~ 1 hour'**
   String get contacts_lastSeenHourAgo;
 
   /// No description provided for @contacts_lastSeenHoursAgo.
   ///
   /// In en, this message translates to:
-  /// **'Last seen {hours} hours ago'**
+  /// **'~ {hours} hours'**
   String contacts_lastSeenHoursAgo(int hours);
 
   /// No description provided for @contacts_lastSeenDayAgo.
   ///
   /// In en, this message translates to:
-  /// **'Last seen 1 day ago'**
+  /// **'~ 1 day'**
   String get contacts_lastSeenDayAgo;
 
   /// No description provided for @contacts_lastSeenDaysAgo.
   ///
   /// In en, this message translates to:
-  /// **'Last seen {days} days ago'**
+  /// **'~ {days} days'**
   String contacts_lastSeenDaysAgo(int days);
 
+  /// No description provided for @contact_info.
+  ///
+  /// In en, this message translates to:
+  /// **'Contact Info'**
+  String get contact_info;
+
+  /// No description provided for @contact_settings.
+  ///
+  /// In en, this message translates to:
+  /// **'Contact Settings'**
+  String get contact_settings;
+
+  /// No description provided for @contact_telemetry.
+  ///
+  /// In en, this message translates to:
+  /// **'Telemetry'**
+  String get contact_telemetry;
+
+  /// No description provided for @contact_lastSeen.
+  ///
+  /// In en, this message translates to:
+  /// **'Last seen'**
+  String get contact_lastSeen;
+
+  /// No description provided for @contact_clearChat.
+  ///
+  /// In en, this message translates to:
+  /// **'Clear Chat'**
+  String get contact_clearChat;
+
+  /// No description provided for @contact_teleBase.
+  ///
+  /// In en, this message translates to:
+  /// **'Telemetry Base'**
+  String get contact_teleBase;
+
+  /// No description provided for @contact_teleBaseSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Allow sharing battery level and basic telemetry'**
+  String get contact_teleBaseSubtitle;
+
+  /// No description provided for @contact_teleLoc.
+  ///
+  /// In en, this message translates to:
+  /// **'Telemetry Location'**
+  String get contact_teleLoc;
+
+  /// No description provided for @contact_teleLocSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Allow sharing location data'**
+  String get contact_teleLocSubtitle;
+
+  /// No description provided for @contact_teleEnv.
+  ///
+  /// In en, this message translates to:
+  /// **'Telemetry Environment'**
+  String get contact_teleEnv;
+
+  /// No description provided for @contact_teleEnvSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Allow sharing environment sensor data'**
+  String get contact_teleEnvSubtitle;
+
   /// No description provided for @channels_title.
   ///
   /// In en, this message translates to:
@@ -2524,6 +2896,12 @@ abstract class AppLocalizations {
   /// **'Share marker here'**
   String get map_shareMarkerHere;
 
+  /// No description provided for @map_setAsMyLocation.
+  ///
+  /// In en, this message translates to:
+  /// **'Set as my location'**
+  String get map_setAsMyLocation;
+
   /// No description provided for @map_pinLabel.
   ///
   /// In en, this message translates to:
@@ -2644,6 +3022,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

@@ -111,6 +111,134 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Изберете открития сериен уред и свържете директно към вашия MeshCore възел.';
+
+  @override
+  String get usbScreenStatus => 'Изберете USB устройство';
+
+  @override
+  String get usbScreenNote =>
+      'USB серийната връзка е активна на поддържаните Android устройства и настолни платформи.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Няма открити USB устройства. Включете едно и опитайте отново.';
+
+  @override
+  String get usbErrorPermissionDenied => 'Не беше разрешено достъпът през USB.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'Избраното USB устройство вече не е налично.';
+
+  @override
+  String get usbErrorInvalidPort => 'Изберете валитно USB устройство.';
+
+  @override
+  String get usbErrorBusy =>
+      'Друг мол за свързване през USB вече е в процес на изпълнение.';
+
+  @override
+  String get usbErrorNotConnected => 'Няма свързано USB устройство.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'Не успях да отворя избраното USB устройство.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Не успях да се свържа с избраното USB устройство.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'USB серийната комуникация не се поддържа на тази платформа.';
+
+  @override
+  String get usbErrorAlreadyActive => 'USB връзката вече е активирана.';
+
+  @override
+  String get usbErrorNoDeviceSelected => 'Няма избран USB устройство.';
+
+  @override
+  String get usbErrorPortClosed => 'USB връзката не е активна.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'Връзката прекъсна. Уверете се, че устройството има софтуер за USB връзка.';
+
+  @override
+  String get usbFallbackDeviceName =>
+      'Устройство за четене на уеб серийни данни';
+
+  @override
+  String get usbStatus_notConnected => 'Изберете USB устройство';
+
+  @override
+  String get usbStatus_connecting => 'Свързване към USB устройство...';
+
+  @override
+  String get usbStatus_searching => 'Търсене на USB устройства...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Неуспешно свързване през USB: $error';
+  }
+
   @override
   String get scanner_scanning => 'Сканиране за устройства...';
 
@@ -270,6 +398,52 @@ class AppLocalizationsBg extends AppLocalizations {
   String get settings_privacyModeDisabled =>
       'Режим на поверителност е деактивиран';
 
+  @override
+  String get settings_privacy => 'Настройки на поверителността';
+
+  @override
+  String get settings_privacySubtitle =>
+      'Контролирайте каква информация се споделя.';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Изберете каква информация устройството ви споделя с другите.';
+
+  @override
+  String get settings_denyAll => 'Откажи всичко';
+
+  @override
+  String get settings_allowByContact => 'Позволи по флагове за контакт';
+
+  @override
+  String get settings_allowAll => 'Позволи всичко';
+
+  @override
+  String get settings_telemetryBaseMode => 'Базов режим на телеметрия';
+
+  @override
+  String get settings_telemetryLocationMode =>
+      'Режим на местоположение на телеметрията';
+
+  @override
+  String get settings_telemetryEnvironmentMode =>
+      'Режим на средата на телеметрията';
+
+  @override
+  String get settings_advertLocation => 'Място на обявата';
+
+  @override
+  String get settings_advertLocationSubtitle =>
+      'Включи местоположение в обявата';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Мулти-потвърди: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => 'Режим на телеметрията е обновен';
+
   @override
   String get settings_actions => 'Действия';
 
@@ -774,6 +948,9 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Името на групата е задължително.';
 
+  @override
+  String get contacts_groupNameReserved => 'Това име на група е запазено';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Групата \"$name\" вече съществува.';
@@ -813,6 +990,42 @@ class AppLocalizationsBg extends AppLocalizations {
     return 'Последно видян $days дни преди.';
   }
 
+  @override
+  String get contact_info => 'Контактна информация';
+
+  @override
+  String get contact_settings => 'Настройки за контакти';
+
+  @override
+  String get contact_telemetry => 'Телеметрия';
+
+  @override
+  String get contact_lastSeen => 'Последно видян';
+
+  @override
+  String get contact_clearChat => 'Изчисти чата';
+
+  @override
+  String get contact_teleBase => 'Базата данни за телеметрия';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Позволи споделяне на ниво на батерията и основна телеметрия';
+
+  @override
+  String get contact_teleLoc => 'Местоположение на телеметрията';
+
+  @override
+  String get contact_teleLocSubtitle =>
+      'Позволи споделяне на данни за местоположение';
+
+  @override
+  String get contact_teleEnv => 'Среда на телеметрия';
+
+  @override
+  String get contact_teleEnvSubtitle =>
+      'Позволи споделяне на данни от средносферните датчици';
+
   @override
   String get channels_title => 'Канали';
 
@@ -1383,6 +1596,9 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Споделете маркер тук';
 
+  @override
+  String get map_setAsMyLocation => 'Задайте като моя местоположение';
+
   @override
   String get map_pinLabel => 'Етикетиране на пин';
 
@@ -1447,6 +1663,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

@@ -111,6 +111,137 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Wählen Sie ein erkannten serielles Gerät aus und verbinden Sie es direkt mit Ihrem MeshCore-Knoten.';
+
+  @override
+  String get usbScreenStatus => 'Wählen Sie ein USB-Gerät aus';
+
+  @override
+  String get usbScreenNote =>
+      'Die USB-Serielle Schnittstelle ist auf unterstützten Android-Geräten und Desktop-Plattformen aktiv.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Keine USB-Geräte gefunden. Schließen Sie eines an und aktualisieren Sie.';
+
+  @override
+  String get usbErrorPermissionDenied =>
+      'Die USB-Berechtigung wurde abgelehnt.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'Das ausgewählte USB-Gerät ist nicht mehr verfügbar.';
+
+  @override
+  String get usbErrorInvalidPort => 'Wählen Sie ein gültiges USB-Gerät aus.';
+
+  @override
+  String get usbErrorBusy =>
+      'Eine weitere Anfrage für eine USB-Verbindung ist bereits in Bearbeitung.';
+
+  @override
+  String get usbErrorNotConnected => 'Es ist kein USB-Gerät angeschlossen.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'Fehlgeschlagen beim Öffnen des ausgewählten USB-Geräts.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Keine Verbindung zum ausgewählten USB-Gerät hergestellt.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'Die USB-Serielle Schnittstelle wird auf dieser Plattform nicht unterstützt.';
+
+  @override
+  String get usbErrorAlreadyActive =>
+      'Eine USB-Verbindung ist bereits hergestellt.';
+
+  @override
+  String get usbErrorNoDeviceSelected => 'Kein USB-Gerät wurde ausgewählt.';
+
+  @override
+  String get usbErrorPortClosed => 'Die USB-Verbindung ist nicht aktiv.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'Verbindung konnte nicht hergestellt werden. Stellen Sie sicher, dass das Gerät die entsprechende USB-Firmware enthält.';
+
+  @override
+  String get usbFallbackDeviceName => 'Web-Serielle Geräte';
+
+  @override
+  String get usbStatus_notConnected => 'Wählen Sie ein USB-Gerät aus';
+
+  @override
+  String get usbStatus_connecting => 'Verbindung zum USB-Gerät...';
+
+  @override
+  String get usbStatus_searching => 'Suche nach USB-Geräten...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Fehler beim USB-Verbindungsaufbau: $error';
+  }
+
   @override
   String get scanner_scanning => 'Scannen nach Geräten...';
 
@@ -267,6 +398,50 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => 'Datenschutzmodus deaktiviert';
 
+  @override
+  String get settings_privacy => 'Datenschutzeinstellungen';
+
+  @override
+  String get settings_privacySubtitle =>
+      'Steuern Sie die Informationen, die freigegeben werden.';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Wählen Sie die Informationen, die Ihr Gerät mit anderen teilt.';
+
+  @override
+  String get settings_denyAll => 'Alle ablehnen';
+
+  @override
+  String get settings_allowByContact => 'Zulassen durch Kontaktflaggen';
+
+  @override
+  String get settings_allowAll => 'Alles zulassen';
+
+  @override
+  String get settings_telemetryBaseMode => 'Telemetrie-Basismodus';
+
+  @override
+  String get settings_telemetryLocationMode => 'Telemetrie-Ortsmodus';
+
+  @override
+  String get settings_telemetryEnvironmentMode => 'Telemetrie-Umgebungsmodus';
+
+  @override
+  String get settings_advertLocation => 'Anzeigenort';
+
+  @override
+  String get settings_advertLocationSubtitle =>
+      'Ort in der Anzeige einbeziehen';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Mehrfach-Bestätigungen: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => 'Telemetriemodus aktualisiert';
+
   @override
   String get settings_actions => 'Aktionen';
 
@@ -771,6 +946,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.';
@@ -787,29 +965,64 @@ class AppLocalizationsDe extends AppLocalizations {
   String get contacts_noMembers => 'Keine Mitglieder';
 
   @override
-  String get contacts_lastSeenNow => 'gerade gesehen';
+  String get contacts_lastSeenNow => 'kürzlich';
 
   @override
   String contacts_lastSeenMinsAgo(int minutes) {
-    return 'Letzte Sichtung vor $minutes Minuten.';
+    return '~ $minutes Min.';
   }
 
   @override
-  String get contacts_lastSeenHourAgo => 'Letzte Sichtung vor 1 Stunde.';
+  String get contacts_lastSeenHourAgo => '~ 1 Std.';
 
   @override
   String contacts_lastSeenHoursAgo(int hours) {
-    return 'Letzte Sichtung vor $hours Stunden.';
+    return '~ $hours Std.';
   }
 
   @override
-  String get contacts_lastSeenDayAgo => 'Letzte Sichtung vor 1 Tag';
+  String get contacts_lastSeenDayAgo => '~ 1 Tag';
 
   @override
   String contacts_lastSeenDaysAgo(int days) {
-    return 'Letzte Sichtung $days Tage zuvor';
+    return '~ $days Tage';
   }
 
+  @override
+  String get contact_info => 'Kontaktinformationen';
+
+  @override
+  String get contact_settings => 'Kontakteinstellungen';
+
+  @override
+  String get contact_telemetry => 'Telemetrie';
+
+  @override
+  String get contact_lastSeen => 'Zuletzt gesehen';
+
+  @override
+  String get contact_clearChat => 'Chat löschen';
+
+  @override
+  String get contact_teleBase => 'Telemetriebasis';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Erlauben des Freigebens des Batteriestands und der grundlegenden Telemetrie';
+
+  @override
+  String get contact_teleLoc => 'Telemetrieort';
+
+  @override
+  String get contact_teleLocSubtitle => 'Teilen von Standortdaten zulassen';
+
+  @override
+  String get contact_teleEnv => 'Telemetrieumgebung';
+
+  @override
+  String get contact_teleEnvSubtitle =>
+      'Teilen von Umgebungsensordaten zulassen';
+
   @override
   String get channels_title => 'Kanäle';
 
@@ -1382,6 +1595,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Teilen Sie den Marker hier.';
 
+  @override
+  String get map_setAsMyLocation => 'Als meine aktuelle Position festlegen';
+
   @override
   String get map_pinLabel => 'Pin Name';
 
@@ -1446,6 +1662,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

@@ -111,6 +111,132 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Choose a detected serial device and connect directly to your MeshCore node.';
+
+  @override
+  String get usbScreenStatus => 'Select a USB device';
+
+  @override
+  String get usbScreenNote =>
+      'USB serial is active on supported Android devices and desktop platforms.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'No USB devices found. Plug one in and refresh.';
+
+  @override
+  String get usbErrorPermissionDenied => 'USB permission was denied.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'The selected USB device is no longer available.';
+
+  @override
+  String get usbErrorInvalidPort => 'Select a valid USB device.';
+
+  @override
+  String get usbErrorBusy =>
+      'Another USB connection request is already in progress.';
+
+  @override
+  String get usbErrorNotConnected => 'No USB device is connected.';
+
+  @override
+  String get usbErrorOpenFailed => 'Failed to open the selected USB device.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Failed to connect to the selected USB device.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'USB serial is not supported on this platform.';
+
+  @override
+  String get usbErrorAlreadyActive => 'A USB connection is already active.';
+
+  @override
+  String get usbErrorNoDeviceSelected => 'No USB device was selected.';
+
+  @override
+  String get usbErrorPortClosed => 'The USB connection is not open.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'Connection timed out. Make sure the device has USB Companion firmware.';
+
+  @override
+  String get usbFallbackDeviceName => 'Web Serial Device';
+
+  @override
+  String get usbStatus_notConnected => 'Select a USB device';
+
+  @override
+  String get usbStatus_connecting => 'Connecting to USB device...';
+
+  @override
+  String get usbStatus_searching => 'Searching for USB devices...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'USB connection failed: $error';
+  }
+
   @override
   String get scanner_scanning => 'Scanning for devices...';
 
@@ -266,6 +392,48 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => 'Privacy mode disabled';
 
+  @override
+  String get settings_privacy => 'Privacy Settings';
+
+  @override
+  String get settings_privacySubtitle => 'Control what information is shared.';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Choose what information your device shares with others.';
+
+  @override
+  String get settings_denyAll => 'Deny all';
+
+  @override
+  String get settings_allowByContact => 'Allow by contact flags';
+
+  @override
+  String get settings_allowAll => 'Allow all';
+
+  @override
+  String get settings_telemetryBaseMode => 'Telemetry Base Mode';
+
+  @override
+  String get settings_telemetryLocationMode => 'Telemetry Location Mode';
+
+  @override
+  String get settings_telemetryEnvironmentMode => 'Telemetry Environment Mode';
+
+  @override
+  String get settings_advertLocation => 'Advert Location';
+
+  @override
+  String get settings_advertLocationSubtitle => 'Include location in advert.';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Multi-ACKs: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => 'Telemetry mode updated';
+
   @override
   String get settings_actions => 'Actions';
 
@@ -763,6 +931,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';
@@ -778,29 +949,63 @@ class AppLocalizationsEn extends AppLocalizations {
   String get contacts_noMembers => 'No members';
 
   @override
-  String get contacts_lastSeenNow => 'Last seen now';
+  String get contacts_lastSeenNow => 'recently';
 
   @override
   String contacts_lastSeenMinsAgo(int minutes) {
-    return 'Last seen $minutes mins ago';
+    return '~ $minutes min.';
   }
 
   @override
-  String get contacts_lastSeenHourAgo => 'Last seen 1 hour ago';
+  String get contacts_lastSeenHourAgo => '~ 1 hour';
 
   @override
   String contacts_lastSeenHoursAgo(int hours) {
-    return 'Last seen $hours hours ago';
+    return '~ $hours hours';
   }
 
   @override
-  String get contacts_lastSeenDayAgo => 'Last seen 1 day ago';
+  String get contacts_lastSeenDayAgo => '~ 1 day';
 
   @override
   String contacts_lastSeenDaysAgo(int days) {
-    return 'Last seen $days days ago';
+    return '~ $days days';
   }
 
+  @override
+  String get contact_info => 'Contact Info';
+
+  @override
+  String get contact_settings => 'Contact Settings';
+
+  @override
+  String get contact_telemetry => 'Telemetry';
+
+  @override
+  String get contact_lastSeen => 'Last seen';
+
+  @override
+  String get contact_clearChat => 'Clear Chat';
+
+  @override
+  String get contact_teleBase => 'Telemetry Base';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Allow sharing battery level and basic telemetry';
+
+  @override
+  String get contact_teleLoc => 'Telemetry Location';
+
+  @override
+  String get contact_teleLocSubtitle => 'Allow sharing location data';
+
+  @override
+  String get contact_teleEnv => 'Telemetry Environment';
+
+  @override
+  String get contact_teleEnvSubtitle => 'Allow sharing environment sensor data';
+
   @override
   String get channels_title => 'Channels';
 
@@ -1361,6 +1566,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Share marker here';
 
+  @override
+  String get map_setAsMyLocation => 'Set as my location';
+
   @override
   String get map_pinLabel => 'Pin label';
 
@@ -1424,6 +1632,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

@@ -111,6 +111,135 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Seleccione el dispositivo de serie detectado y conéctelo directamente a su nodo MeshCore.';
+
+  @override
+  String get usbScreenStatus => 'Seleccione un dispositivo USB';
+
+  @override
+  String get usbScreenNote =>
+      'La comunicación serial a través de USB está activa en dispositivos Android compatibles y en plataformas de escritorio.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'No se encontraron dispositivos USB. Conecte uno y vuelva a intentar.';
+
+  @override
+  String get usbErrorPermissionDenied =>
+      'Se denegó el permiso de acceso a través de USB.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'El dispositivo USB seleccionado ya no está disponible.';
+
+  @override
+  String get usbErrorInvalidPort => 'Seleccione un dispositivo USB válido.';
+
+  @override
+  String get usbErrorBusy =>
+      'Ya se ha iniciado una solicitud de conexión USB adicional.';
+
+  @override
+  String get usbErrorNotConnected => 'No hay ningún dispositivo USB conectado.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'No se pudo abrir el dispositivo USB seleccionado.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'No se pudo conectar con el dispositivo USB seleccionado.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'La comunicación serial a través de USB no está soportada en esta plataforma.';
+
+  @override
+  String get usbErrorAlreadyActive => 'La conexión USB ya está activa.';
+
+  @override
+  String get usbErrorNoDeviceSelected =>
+      'No se ha seleccionado ningún dispositivo USB.';
+
+  @override
+  String get usbErrorPortClosed => 'La conexión USB no está activa.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'La conexión ha caducado. Asegúrese de que el dispositivo tenga el firmware USB Companion.';
+
+  @override
+  String get usbFallbackDeviceName => 'Dispositivo de serie web';
+
+  @override
+  String get usbStatus_notConnected => 'Seleccione un dispositivo USB';
+
+  @override
+  String get usbStatus_connecting => 'Conectándose al dispositivo USB...';
+
+  @override
+  String get usbStatus_searching => 'Buscando dispositivos USB...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Error al conectar mediante USB: $error';
+  }
+
   @override
   String get scanner_scanning => 'Escaneando dispositivos...';
 
@@ -267,6 +396,51 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => 'Modo de privacidad desactivado';
 
+  @override
+  String get settings_privacy => 'Configuración de privacidad';
+
+  @override
+  String get settings_privacySubtitle =>
+      'Controlar qué información se comparte.';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Elige qué información comparte tu dispositivo con otros.';
+
+  @override
+  String get settings_denyAll => 'Denegar todo';
+
+  @override
+  String get settings_allowByContact => 'Permitir por banderas de contacto';
+
+  @override
+  String get settings_allowAll => 'Permitir todo';
+
+  @override
+  String get settings_telemetryBaseMode => 'Modo base de telemetría';
+
+  @override
+  String get settings_telemetryLocationMode =>
+      'Modo de ubicación de telemetría';
+
+  @override
+  String get settings_telemetryEnvironmentMode =>
+      'Modo de entorno de telemetría';
+
+  @override
+  String get settings_advertLocation => 'Ubicación de anuncio';
+
+  @override
+  String get settings_advertLocationSubtitle => 'Incluir ubicación en anuncio';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Multi-ACKs: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => 'Modo de telemetría actualizado';
+
   @override
   String get settings_actions => 'Acciones';
 
@@ -772,6 +946,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';
@@ -792,25 +970,61 @@ class AppLocalizationsEs extends AppLocalizations {
 
   @override
   String contacts_lastSeenMinsAgo(int minutes) {
-    return 'Última vez visto hace $minutes minutos.';
+    return '~ $minutes min.';
   }
 
   @override
-  String get contacts_lastSeenHourAgo => 'Última vez que se vio hace 1 hora';
+  String get contacts_lastSeenHourAgo => '~ 1 hora';
 
   @override
   String contacts_lastSeenHoursAgo(int hours) {
-    return 'Última vez visto hace $hours horas.';
+    return '~ $hours horas';
   }
 
   @override
-  String get contacts_lastSeenDayAgo => 'Última vez que se vio hace 1 día';
+  String get contacts_lastSeenDayAgo => '~ 1 día';
 
   @override
   String contacts_lastSeenDaysAgo(int days) {
-    return 'Última vez visto hace $days días.';
+    return '~ $days días';
   }
 
+  @override
+  String get contact_info => 'Información de contacto';
+
+  @override
+  String get contact_settings => 'Configuración de contacto';
+
+  @override
+  String get contact_telemetry => 'Telemetría';
+
+  @override
+  String get contact_lastSeen => 'Visto por última vez';
+
+  @override
+  String get contact_clearChat => 'Borrar chat';
+
+  @override
+  String get contact_teleBase => 'Base de Telemetría';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Permitir el intercambio de nivel de batería y telemetría básica';
+
+  @override
+  String get contact_teleLoc => 'Ubicación de telemetría';
+
+  @override
+  String get contact_teleLocSubtitle =>
+      'Permitir el intercambio de datos de ubicación';
+
+  @override
+  String get contact_teleEnv => 'Entorno de Telemetría';
+
+  @override
+  String get contact_teleEnvSubtitle =>
+      'Permitir el intercambio de datos de sensores de entorno';
+
   @override
   String get channels_title => 'Canales';
 
@@ -1380,6 +1594,9 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Compartir marcador aquí';
 
+  @override
+  String get map_setAsMyLocation => 'Establecer mi ubicación';
+
   @override
   String get map_pinLabel => 'Etiqueta de marcador';
 
@@ -1444,6 +1661,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

@@ -111,6 +111,137 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Sélectionnez un périphérique série détecté et connectez-vous directement à votre nœud MeshCore.';
+
+  @override
+  String get usbScreenStatus => 'Sélectionnez un périphérique USB';
+
+  @override
+  String get usbScreenNote =>
+      'La communication série USB est active sur les appareils Android et les plateformes de bureau compatibles.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Aucun périphérique USB n\'a été trouvé. Veuillez en brancher un et rafraîchir la page.';
+
+  @override
+  String get usbErrorPermissionDenied => 'L\'accès via USB a été refusé.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'Le périphérique USB sélectionné n\'est plus disponible.';
+
+  @override
+  String get usbErrorInvalidPort => 'Sélectionnez un périphérique USB valide.';
+
+  @override
+  String get usbErrorBusy =>
+      'Une autre demande de connexion USB est déjà en cours.';
+
+  @override
+  String get usbErrorNotConnected => 'Aucun appareil USB n\'est connecté.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'Impossible d\'ouvrir l\'appareil USB sélectionné.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Impossible de se connecter à l\'appareil USB sélectionné.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'La communication série USB n\'est pas prise en charge sur cette plateforme.';
+
+  @override
+  String get usbErrorAlreadyActive => 'Une connexion USB est déjà établie.';
+
+  @override
+  String get usbErrorNoDeviceSelected =>
+      'Aucun appareil USB n\'a été sélectionné.';
+
+  @override
+  String get usbErrorPortClosed => 'La connexion USB n\'est pas établie.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'La connexion a expiré. Assurez-vous que l\'appareil dispose du firmware USB Companion.';
+
+  @override
+  String get usbFallbackDeviceName =>
+      'Dispositif de communication série sur le Web';
+
+  @override
+  String get usbStatus_notConnected => 'Sélectionnez un périphérique USB';
+
+  @override
+  String get usbStatus_connecting => 'Connexion au périphérique USB...';
+
+  @override
+  String get usbStatus_searching => 'Recherche de périphériques USB...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Échec de la connexion USB : $error';
+  }
+
   @override
   String get scanner_scanning => 'Recherche de périphériques...';
 
@@ -269,6 +400,52 @@ class AppLocalizationsFr extends AppLocalizations {
   String get settings_privacyModeDisabled =>
       'Mode de confidentialité désactivé';
 
+  @override
+  String get settings_privacy => 'Paramètres de confidentialité';
+
+  @override
+  String get settings_privacySubtitle => 'Contrôlez les informations partagées';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Choisissez les informations que votre appareil partage avec les autres.';
+
+  @override
+  String get settings_denyAll => 'Refuser tout';
+
+  @override
+  String get settings_allowByContact => 'Autoriser par drapeaux de contact';
+
+  @override
+  String get settings_allowAll => 'Autoriser tout';
+
+  @override
+  String get settings_telemetryBaseMode => 'Mode de base Télémétrie';
+
+  @override
+  String get settings_telemetryLocationMode =>
+      'Mode d\'emplacement de télémétrie';
+
+  @override
+  String get settings_telemetryEnvironmentMode =>
+      'Mode d\'environnement de télémétrie';
+
+  @override
+  String get settings_advertLocation => 'Emplacement de l\'annonce';
+
+  @override
+  String get settings_advertLocationSubtitle =>
+      'Inclure l\'emplacement dans l\'annonce';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Multi-ACKs : $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated =>
+      'Le mode télémétrie a été mis à jour';
+
   @override
   String get settings_actions => 'Actions';
 
@@ -774,6 +951,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à.';
@@ -794,25 +974,61 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String contacts_lastSeenMinsAgo(int minutes) {
-    return 'Vu il y a $minutes minutes';
+    return '~ $minutes min.';
   }
 
   @override
-  String get contacts_lastSeenHourAgo => 'Vu il y a 1 heure';
+  String get contacts_lastSeenHourAgo => '~ 1 heure';
 
   @override
   String contacts_lastSeenHoursAgo(int hours) {
-    return 'Vu il y a $hours heures';
+    return '~ $hours heures';
   }
 
   @override
-  String get contacts_lastSeenDayAgo => 'Vu il y a 1 jour';
+  String get contacts_lastSeenDayAgo => '~ 1 jour';
 
   @override
   String contacts_lastSeenDaysAgo(int days) {
-    return 'Vu il y a $days jours';
+    return '~ $days jours';
   }
 
+  @override
+  String get contact_info => 'Informations de contact';
+
+  @override
+  String get contact_settings => 'Paramètres de contact';
+
+  @override
+  String get contact_telemetry => 'Télémétrie';
+
+  @override
+  String get contact_lastSeen => 'Dernière fois vu';
+
+  @override
+  String get contact_clearChat => 'Effacer la conversation';
+
+  @override
+  String get contact_teleBase => 'Base de télémétrie';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Autoriser le partage du niveau de batterie et de la télémétrie de base';
+
+  @override
+  String get contact_teleLoc => 'Emplacement de télémétrie';
+
+  @override
+  String get contact_teleLocSubtitle =>
+      'Autoriser le partage des données de localisation';
+
+  @override
+  String get contact_teleEnv => 'Environnement Télémétrie';
+
+  @override
+  String get contact_teleEnvSubtitle =>
+      'Autoriser le partage des données des capteurs d\'environnement';
+
   @override
   String get channels_title => 'Canaux';
 
@@ -1387,6 +1603,9 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Partager le marqueur ici';
 
+  @override
+  String get map_setAsMyLocation => 'Définir comme ma localisation';
+
   @override
   String get map_pinLabel => 'Étiquete de repin';
 
@@ -1451,6 +1670,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

@@ -111,6 +111,137 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Seleziona il dispositivo seriale rilevato e connettilo direttamente al tuo nodo MeshCore.';
+
+  @override
+  String get usbScreenStatus => 'Seleziona un dispositivo USB';
+
+  @override
+  String get usbScreenNote =>
+      'La comunicazione seriale USB è attiva sui dispositivi Android supportati e sulle piattaforme desktop.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Nessun dispositivo USB rilevato. Collegare uno e aggiornare.';
+
+  @override
+  String get usbErrorPermissionDenied =>
+      'È stato negato l\'accesso tramite USB.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'Il dispositivo USB selezionato non è più disponibile.';
+
+  @override
+  String get usbErrorInvalidPort => 'Seleziona un dispositivo USB valido.';
+
+  @override
+  String get usbErrorBusy =>
+      'Un\'altra richiesta di connessione tramite USB è già in corso.';
+
+  @override
+  String get usbErrorNotConnected => 'Non è collegato alcun dispositivo USB.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'Impossibile aprire il dispositivo USB selezionato.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Impossibile connettersi al dispositivo USB selezionato.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'La comunicazione seriale tramite USB non è supportata su questa piattaforma.';
+
+  @override
+  String get usbErrorAlreadyActive => 'La connessione USB è già attiva.';
+
+  @override
+  String get usbErrorNoDeviceSelected =>
+      'Non è stato selezionato alcun dispositivo USB.';
+
+  @override
+  String get usbErrorPortClosed => 'La connessione USB non è attiva.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'La connessione è scaduta. Assicurarsi che il dispositivo abbia il firmware USB Companion.';
+
+  @override
+  String get usbFallbackDeviceName =>
+      'Dispositivo per comunicazione seriale su rete';
+
+  @override
+  String get usbStatus_notConnected => 'Seleziona un dispositivo USB';
+
+  @override
+  String get usbStatus_connecting => 'Connessione al dispositivo USB...';
+
+  @override
+  String get usbStatus_searching => 'Ricerca di dispositivi USB...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Errore nella connessione USB: $error';
+  }
+
   @override
   String get scanner_scanning => 'Scansione in corso per i dispositivi...';
 
@@ -267,6 +398,52 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => 'Modalità privacy disabilitata';
 
+  @override
+  String get settings_privacy => 'Impostazioni sulla privacy';
+
+  @override
+  String get settings_privacySubtitle =>
+      'Controlla le informazioni che vengono condivise.';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Scegli le informazioni che il tuo dispositivo condivide con gli altri.';
+
+  @override
+  String get settings_denyAll => 'Negare tutto';
+
+  @override
+  String get settings_allowByContact => 'Consenti in base ai flag di contatto';
+
+  @override
+  String get settings_allowAll => 'Consenti tutto';
+
+  @override
+  String get settings_telemetryBaseMode => 'Modalità di base di telemetria';
+
+  @override
+  String get settings_telemetryLocationMode =>
+      'Modalità di posizionamento telemetrico';
+
+  @override
+  String get settings_telemetryEnvironmentMode =>
+      'Modalità di ambiente di telemetria';
+
+  @override
+  String get settings_advertLocation => 'Posizione dell\'annuncio';
+
+  @override
+  String get settings_advertLocationSubtitle =>
+      'Includi la posizione nell\'annuncio';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Multi-ACKs: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => 'Modalità telemetria aggiornata';
+
   @override
   String get settings_actions => 'Azioni';
 
@@ -770,6 +947,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à.';
@@ -809,6 +989,42 @@ class AppLocalizationsIt extends AppLocalizations {
     return 'Ultimo visto $days giorni fa';
   }
 
+  @override
+  String get contact_info => 'Informazioni di Contatto';
+
+  @override
+  String get contact_settings => 'Impostazioni di contatto';
+
+  @override
+  String get contact_telemetry => 'Telemetria';
+
+  @override
+  String get contact_lastSeen => 'Ultimo accesso';
+
+  @override
+  String get contact_clearChat => 'Cancella chat';
+
+  @override
+  String get contact_teleBase => 'Base di telemetria';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Consenti la condivisione del livello della batteria e della telemetria di base';
+
+  @override
+  String get contact_teleLoc => 'Posizione telemetria';
+
+  @override
+  String get contact_teleLocSubtitle =>
+      'Consenti la condivisione dei dati di posizione';
+
+  @override
+  String get contact_teleEnv => 'Ambiente di telemetria';
+
+  @override
+  String get contact_teleEnvSubtitle =>
+      'Consenti la condivisione dei dati del sensore ambientale';
+
   @override
   String get channels_title => 'Canali';
 
@@ -1379,6 +1595,9 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Condividi marcatore qui';
 
+  @override
+  String get map_setAsMyLocation => 'Imposta come la mia posizione';
+
   @override
   String get map_pinLabel => 'Etichetta PIN';
 
@@ -1442,6 +1661,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

@@ -111,6 +111,134 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Selecteer een gedetecteerd seriële apparaat en verbind deze direct met uw MeshCore-node.';
+
+  @override
+  String get usbScreenStatus => 'Selecteer een USB-apparaat';
+
+  @override
+  String get usbScreenNote =>
+      'USB-serieel is actief op ondersteunde Android-apparaten en desktop-platforms.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Geen USB-apparaten gevonden. Sluit er een aan en herlaad.';
+
+  @override
+  String get usbErrorPermissionDenied => 'Toegang via USB is geweigerd.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'Het geselecteerde USB-apparaat is niet meer beschikbaar.';
+
+  @override
+  String get usbErrorInvalidPort => 'Selecteer een geldig USB-apparaat.';
+
+  @override
+  String get usbErrorBusy =>
+      'Een andere verzoek om een USB-verbinding is al in behandeling.';
+
+  @override
+  String get usbErrorNotConnected => 'Er is geen USB-apparaat aangesloten.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'Kon het geselecteerde USB-apparaat niet openen.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Kon niet verbinding maken met het geselecteerde USB-apparaat.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'USB-serieel is niet ondersteund op deze platform.';
+
+  @override
+  String get usbErrorAlreadyActive => 'Een USB-verbinding is al actief.';
+
+  @override
+  String get usbErrorNoDeviceSelected => 'Geen USB-apparaat is geselecteerd.';
+
+  @override
+  String get usbErrorPortClosed => 'De USB-verbinding is niet actief.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'Verbinding is verbroken. Zorg ervoor dat het apparaat de juiste USB-firmware heeft.';
+
+  @override
+  String get usbFallbackDeviceName => 'Web-serieapparaat';
+
+  @override
+  String get usbStatus_notConnected => 'Selecteer een USB-apparaat';
+
+  @override
+  String get usbStatus_connecting => 'Verbinding maken met USB-apparaat...';
+
+  @override
+  String get usbStatus_searching => 'Zoeken naar USB-apparaten...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Fout bij de USB-verbinding: $error';
+  }
+
   @override
   String get scanner_scanning => 'Scannen naar apparaten...';
 
@@ -267,6 +395,50 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => 'Privacy modus is uitgeschakeld';
 
+  @override
+  String get settings_privacy => 'Privacyinstellingen';
+
+  @override
+  String get settings_privacySubtitle =>
+      'Beheer welke informatie wordt gedeeld';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Kies welke informatie uw apparaat deelt met anderen';
+
+  @override
+  String get settings_denyAll => 'Weiger alles';
+
+  @override
+  String get settings_allowByContact => 'Toestaan op basis van contactvlaggen';
+
+  @override
+  String get settings_allowAll => 'Alles toestaan';
+
+  @override
+  String get settings_telemetryBaseMode => 'Telemetrie-basismodus';
+
+  @override
+  String get settings_telemetryLocationMode => 'Telemetrie-locatiemodus';
+
+  @override
+  String get settings_telemetryEnvironmentMode => 'Telemetrie-omgevingsmodus';
+
+  @override
+  String get settings_advertLocation => 'Advertentielocatie';
+
+  @override
+  String get settings_advertLocationSubtitle =>
+      'Locatie opnemen in advertentie';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Multi-ACKs: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => 'Telemetrie-modus bijgewerkt';
+
   @override
   String get settings_actions => 'Acties';
 
@@ -767,6 +939,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.';
@@ -806,6 +981,40 @@ class AppLocalizationsNl extends AppLocalizations {
     return 'Laast gezien $days dagen geleden';
   }
 
+  @override
+  String get contact_info => 'Contactinformatie';
+
+  @override
+  String get contact_settings => 'Contactinstellingen';
+
+  @override
+  String get contact_telemetry => 'Telemetrie';
+
+  @override
+  String get contact_lastSeen => 'Laatst gezien';
+
+  @override
+  String get contact_clearChat => 'Chat leegmaken';
+
+  @override
+  String get contact_teleBase => 'Telemetrie_basis';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Sta delen van batterij niveau en basis telemetrie toe';
+
+  @override
+  String get contact_teleLoc => 'Telemetrielocatie';
+
+  @override
+  String get contact_teleLocSubtitle => 'Locatiegegevens delen toestaan';
+
+  @override
+  String get contact_teleEnv => 'Telemetrieomgeving';
+
+  @override
+  String get contact_teleEnvSubtitle => 'Delen van omgevingsensordata toestaan';
+
   @override
   String get channels_title => 'Kanaal';
 
@@ -1374,6 +1583,9 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Deel marker hier';
 
+  @override
+  String get map_setAsMyLocation => 'Stel dit in als mijn locatie';
+
   @override
   String get map_pinLabel => 'Label vastzetten';
 
@@ -1438,6 +1650,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

@@ -111,6 +111,138 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Wybierz wykryty urządzenie szeregowe i podłącz je bezpośrednio do swojego węzła MeshCore.';
+
+  @override
+  String get usbScreenStatus => 'Wybierz urządzenie USB';
+
+  @override
+  String get usbScreenNote =>
+      'Port szeregowy USB jest aktywny na urządzeniach z systemem Android i platformach stacjonarnych, które go obsługują.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Nie znaleziono żadnych urządzeń USB. Podłącz jedno i zaktualizuj.';
+
+  @override
+  String get usbErrorPermissionDenied =>
+      'Zostało odrzucone żądanie dostępu przez USB.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'Wybór urządzenia USB już nie jest dostępny.';
+
+  @override
+  String get usbErrorInvalidPort => 'Wybierz prawidłowe urządzenie USB.';
+
+  @override
+  String get usbErrorBusy =>
+      'Kolejne żądanie połączenia przez USB jest już w trakcie realizacji.';
+
+  @override
+  String get usbErrorNotConnected => 'Brak podłączonego urządzenia USB.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'Nie udało się otworzyć wybranego urządzenia USB.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Nie udało się połączyć z wybranym urządzeniem USB.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'Port szeregowy USB nie jest obsługiwany na tym urządzeniu.';
+
+  @override
+  String get usbErrorAlreadyActive => 'Połączenie USB jest już aktywne.';
+
+  @override
+  String get usbErrorNoDeviceSelected =>
+      'Nie został wybrany żaden urządzenie USB.';
+
+  @override
+  String get usbErrorPortClosed => 'Połączenie USB nie jest aktywne.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'Połączenie nie zostało nawiązane. Upewnij się, że urządzenie posiada oprogramowanie \"USB Companion\".';
+
+  @override
+  String get usbFallbackDeviceName =>
+      'Urządzenie do komunikacji przez sieć (seria)';
+
+  @override
+  String get usbStatus_notConnected => 'Wybierz urządzenie USB';
+
+  @override
+  String get usbStatus_connecting => 'Połączenie z urządzeniem USB...';
+
+  @override
+  String get usbStatus_searching => 'Wyszukiwanie urządzeń USB...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Błąd połączenia USB: $error';
+  }
+
   @override
   String get scanner_scanning => 'Skanowanie urządzeń...';
 
@@ -269,6 +401,52 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => 'Tryb prywatności wyłączony';
 
+  @override
+  String get settings_privacy => 'Ustawienia prywatności';
+
+  @override
+  String get settings_privacySubtitle =>
+      'Kontroluj jakie informacje są udostępniane.';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Wybierz jakie informacje urządzenie udostępni innym.';
+
+  @override
+  String get settings_denyAll => 'Odmów wszystkim';
+
+  @override
+  String get settings_allowByContact => 'Zezwalaj według flag kontaktowych';
+
+  @override
+  String get settings_allowAll => 'Zezwalaj na wszystko';
+
+  @override
+  String get settings_telemetryBaseMode => 'Tryb podstawowy telemetrii';
+
+  @override
+  String get settings_telemetryLocationMode => 'Tryb położenia telemetrycznego';
+
+  @override
+  String get settings_telemetryEnvironmentMode =>
+      'Tryb środowiska telemetrycznego';
+
+  @override
+  String get settings_advertLocation => 'Lokalizacja reklamowa';
+
+  @override
+  String get settings_advertLocationSubtitle =>
+      'Uwzględnij lokalizację w ogłoszeniu';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Wiele potwierdzeń: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated =>
+      'Tryb telemetryczny zaktualizowany';
+
   @override
   String get settings_actions => 'Działania';
 
@@ -772,6 +950,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';
@@ -811,6 +992,42 @@ class AppLocalizationsPl extends AppLocalizations {
     return 'Ostatnie połączenie $days dni temu';
   }
 
+  @override
+  String get contact_info => 'Informacje kontaktowe';
+
+  @override
+  String get contact_settings => 'Ustawienia kontaktowe';
+
+  @override
+  String get contact_telemetry => 'Telemetryka';
+
+  @override
+  String get contact_lastSeen => 'Ostatnio widziany';
+
+  @override
+  String get contact_clearChat => 'Wyczyść czat';
+
+  @override
+  String get contact_teleBase => 'Baza telemetryczna';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Pozwól na udostępnianie poziomu naładowania baterii i podstawowych danych telemetrycznych';
+
+  @override
+  String get contact_teleLoc => 'Lokalizacja telemetryczna';
+
+  @override
+  String get contact_teleLocSubtitle =>
+      'Zezwalaj na udostępnianie danych lokalizacji';
+
+  @override
+  String get contact_teleEnv => 'Środowisko telemetryczne';
+
+  @override
+  String get contact_teleEnvSubtitle =>
+      'Zezwalaj na udostępnianie danych czujników środowiskowych';
+
   @override
   String get channels_title => 'Kanały';
 
@@ -1380,6 +1597,9 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Udostępnij znacznik tutaj';
 
+  @override
+  String get map_setAsMyLocation => 'Ustaw jako moje lokalizację';
+
   @override
   String get map_pinLabel => 'Oznacz etykietę';
 
@@ -1444,6 +1664,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

@@ -111,6 +111,136 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Selecione um dispositivo serial detectado e conecte-o diretamente ao seu nó MeshCore.';
+
+  @override
+  String get usbScreenStatus => 'Selecione um dispositivo USB';
+
+  @override
+  String get usbScreenNote =>
+      'A comunicação serial via USB está ativa em dispositivos Android e plataformas de desktop compatíveis.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Nenhum dispositivo USB encontrado. Conecte um e atualize.';
+
+  @override
+  String get usbErrorPermissionDenied =>
+      'A permissão para acesso via USB foi negada.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'O dispositivo USB selecionado não está mais disponível.';
+
+  @override
+  String get usbErrorInvalidPort => 'Selecione um dispositivo USB válido.';
+
+  @override
+  String get usbErrorBusy =>
+      'Já existe uma solicitação de conexão USB em andamento.';
+
+  @override
+  String get usbErrorNotConnected => 'Não há nenhum dispositivo USB conectado.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'Não foi possível abrir o dispositivo USB selecionado.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Não foi possível conectar ao dispositivo USB selecionado.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'A comunicação serial via USB não é suportada nesta plataforma.';
+
+  @override
+  String get usbErrorAlreadyActive => 'A conexão USB já está ativa.';
+
+  @override
+  String get usbErrorNoDeviceSelected =>
+      'Nenhum dispositivo USB foi selecionado.';
+
+  @override
+  String get usbErrorPortClosed => 'A conexão USB não está ativa.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'A conexão expirou. Verifique se o dispositivo possui o firmware USB Companion.';
+
+  @override
+  String get usbFallbackDeviceName => 'Dispositivo de Serial para a Web';
+
+  @override
+  String get usbStatus_notConnected => 'Selecione um dispositivo USB';
+
+  @override
+  String get usbStatus_connecting => 'Conectando ao dispositivo USB...';
+
+  @override
+  String get usbStatus_searching => 'Procurando por dispositivos USB...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Falha na conexão USB: $error';
+  }
+
   @override
   String get scanner_scanning => 'Procurando por dispositivos...';
 
@@ -268,6 +398,51 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => 'Modo de privacidade desativado';
 
+  @override
+  String get settings_privacy => 'Configurações de Privacidade';
+
+  @override
+  String get settings_privacySubtitle => 'Controle o que é compartilhado.';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Escolha quais informações o seu dispositivo compartilha com os outros.';
+
+  @override
+  String get settings_denyAll => 'Negar todos';
+
+  @override
+  String get settings_allowByContact => 'Permitir por bandeiras de contato';
+
+  @override
+  String get settings_allowAll => 'Permitir todos';
+
+  @override
+  String get settings_telemetryBaseMode => 'Modo Base de Telemetria';
+
+  @override
+  String get settings_telemetryLocationMode =>
+      'Modo de Localização de Telemetria';
+
+  @override
+  String get settings_telemetryEnvironmentMode =>
+      'Modo de Ambiente de Telemetria';
+
+  @override
+  String get settings_advertLocation => 'Localização do Anúncio';
+
+  @override
+  String get settings_advertLocationSubtitle =>
+      'Incluir localização no anúncio';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Multi-ACKs: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => 'Modo de telemetria atualizado';
+
   @override
   String get settings_actions => 'Ações';
 
@@ -773,6 +948,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';
@@ -812,6 +990,42 @@ class AppLocalizationsPt extends AppLocalizations {
     return 'Última vez visto $days dias atrás';
   }
 
+  @override
+  String get contact_info => 'Informações de Contato';
+
+  @override
+  String get contact_settings => 'Configurações de Contato';
+
+  @override
+  String get contact_telemetry => 'Telemetria';
+
+  @override
+  String get contact_lastSeen => 'Visto pela última vez';
+
+  @override
+  String get contact_clearChat => 'Limpar Chat';
+
+  @override
+  String get contact_teleBase => 'Base de Telemetria';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Permitir compartilhamento do nível da bateria e telemetria básica';
+
+  @override
+  String get contact_teleLoc => 'Localização de Telemetria';
+
+  @override
+  String get contact_teleLocSubtitle =>
+      'Permitir compartilhamento de dados de localização';
+
+  @override
+  String get contact_teleEnv => 'Ambiente de Telemetria';
+
+  @override
+  String get contact_teleEnvSubtitle =>
+      'Permitir compartilhamento de dados do sensor de ambiente';
+
   @override
   String get channels_title => 'Canais';
 
@@ -1381,6 +1595,9 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Compartilhar marcador aqui';
 
+  @override
+  String get map_setAsMyLocation => 'Defina minha localização';
+
   @override
   String get map_pinLabel => 'Rótulo de marcador';
 
@@ -1445,6 +1662,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

@@ -111,6 +111,137 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Выберите обнаруженное устройство с последовательным интерфейсом и подключите его напрямую к вашему узлу MeshCore.';
+
+  @override
+  String get usbScreenStatus => 'Выберите USB-устройство';
+
+  @override
+  String get usbScreenNote =>
+      'USB-серийный порт активен на поддерживаемых устройствах Android и на настольных платформах.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Не обнаружено устройств USB. Подключите одно из них и обновите список.';
+
+  @override
+  String get usbErrorPermissionDenied =>
+      'Запрос на доступ через USB был отклонен.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'Выбранное USB-устройство больше недоступно.';
+
+  @override
+  String get usbErrorInvalidPort => 'Выберите действительное USB-устройство.';
+
+  @override
+  String get usbErrorBusy =>
+      'Еще одно запрошенное соединение через USB уже находится в процессе.';
+
+  @override
+  String get usbErrorNotConnected => 'Ни одно USB-устройство не подключено.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'Не удалось открыть выбранное USB-устройство.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Не удалось установить соединение с выбранным USB-устройством.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'Поддержка последовательного USB отсутствует на данной платформе.';
+
+  @override
+  String get usbErrorAlreadyActive => 'USB-соединение уже установлено.';
+
+  @override
+  String get usbErrorNoDeviceSelected =>
+      'Не было выбрано ни одно устройство USB.';
+
+  @override
+  String get usbErrorPortClosed => 'USB-соединение не установлено.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'Соединение не установлено. Убедитесь, что устройство имеет установленное программное обеспечение USB Companion.';
+
+  @override
+  String get usbFallbackDeviceName =>
+      'Устройство для последовательного подключения к сети';
+
+  @override
+  String get usbStatus_notConnected => 'Выберите USB-устройство';
+
+  @override
+  String get usbStatus_connecting => 'Подключение к USB-устройству...';
+
+  @override
+  String get usbStatus_searching => 'Поиск USB-устройств...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Не удалось установить соединение через USB: $error';
+  }
+
   @override
   String get scanner_scanning => 'Поиск устройств...';
 
@@ -267,6 +398,51 @@ class AppLocalizationsRu extends AppLocalizations {
   String get settings_privacyModeDisabled =>
       'Режим конфиденциальности выключен';
 
+  @override
+  String get settings_privacy => 'Настройки конфиденциальности';
+
+  @override
+  String get settings_privacySubtitle =>
+      'Контролируйте, какую информацию делиться.';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Выберите, какую информацию ваше устройство будет делиться с другими.';
+
+  @override
+  String get settings_denyAll => 'Отклонить все';
+
+  @override
+  String get settings_allowByContact => 'Разрешить по флагам контактов';
+
+  @override
+  String get settings_allowAll => 'Разрешить все';
+
+  @override
+  String get settings_telemetryBaseMode => 'Базовый режим телеметрии';
+
+  @override
+  String get settings_telemetryLocationMode =>
+      'Режим местоположения телеметрии';
+
+  @override
+  String get settings_telemetryEnvironmentMode => 'Режим среды телеметрии';
+
+  @override
+  String get settings_advertLocation => 'Местоположение рекламы';
+
+  @override
+  String get settings_advertLocationSubtitle =>
+      'Включить местоположение в объявление';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Мульти-ACK: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => 'Режим телеметрии обновлен';
+
   @override
   String get settings_actions => 'Действия';
 
@@ -771,6 +947,9 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Имя группы обязательно';
 
+  @override
+  String get contacts_groupNameReserved => 'Это имя группы зарезервировано';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Группа \"$name\" уже существует';
@@ -810,6 +989,42 @@ class AppLocalizationsRu extends AppLocalizations {
     return 'Видели $days дн. назад';
   }
 
+  @override
+  String get contact_info => 'Контактная информация';
+
+  @override
+  String get contact_settings => 'Настройки контактов';
+
+  @override
+  String get contact_telemetry => 'Телеметрия';
+
+  @override
+  String get contact_lastSeen => 'Последний раз видели';
+
+  @override
+  String get contact_clearChat => 'Очистить чат';
+
+  @override
+  String get contact_teleBase => 'База телеметрии';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Разрешить обмен уровнем заряда батареи и базовой телеметрией';
+
+  @override
+  String get contact_teleLoc => 'Местоположение телеметрии';
+
+  @override
+  String get contact_teleLocSubtitle =>
+      'Разрешить обмен данными о местоположении';
+
+  @override
+  String get contact_teleEnv => 'Среда телеметрии';
+
+  @override
+  String get contact_teleEnvSubtitle =>
+      'Разрешить обмен данными датчиков окружающей среды';
+
   @override
   String get channels_title => 'Каналы';
 
@@ -1382,6 +1597,9 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Поделиться меткой здесь';
 
+  @override
+  String get map_setAsMyLocation => 'Установить мое местоположение';
+
   @override
   String get map_pinLabel => 'Метка';
 
@@ -1446,6 +1664,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

@@ -111,6 +111,135 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Vyberte detekovaný sériový zariadenie a pripojte ho priamo k vašej MeshCore uzlu.';
+
+  @override
+  String get usbScreenStatus => 'Vyberte USB zariadenie';
+
+  @override
+  String get usbScreenNote =>
+      'USB sériová komunikácia je aktívna na podporovaných zariadeniach s Androidom a na desktopových platformách.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Nenašli sa žiadne USB zariadenia. Pripojte jedno a obnovte.';
+
+  @override
+  String get usbErrorPermissionDenied =>
+      'Žiadosť o prístup cez USB bola zamietnutá.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'Vybrané USB zariadenie už nie je dostupné.';
+
+  @override
+  String get usbErrorInvalidPort => 'Vyberte platné USB zariadenie.';
+
+  @override
+  String get usbErrorBusy =>
+      'Ďalšia požiadavka na pripojenie cez USB je aktuálne v procese.';
+
+  @override
+  String get usbErrorNotConnected => 'Nie je pripojené žiadne USB zariadenie.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'Nepodarilo sa otvoriť vybrané USB zariadenie.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Nepodarilo sa sa sa pripojiť k vybranému USB zariadeniu.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'Podpora USB sériového rozhrania nie je na tejto platforme dostupná.';
+
+  @override
+  String get usbErrorAlreadyActive => 'Pripojenie cez USB je už aktivované.';
+
+  @override
+  String get usbErrorNoDeviceSelected =>
+      'Nebolo vybrané žiadne USB zariadenie.';
+
+  @override
+  String get usbErrorPortClosed => 'Pripojenie cez USB nie je aktivované.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'Pripojenie nebolo úspešné. Uistite sa, že zariadenie má nainštalovaný firmware USB Companion.';
+
+  @override
+  String get usbFallbackDeviceName => 'Webový sériový zariadenie';
+
+  @override
+  String get usbStatus_notConnected => 'Vyberte USB zariadenie';
+
+  @override
+  String get usbStatus_connecting => 'Pripojenie k USB zariadeniu...';
+
+  @override
+  String get usbStatus_searching => 'Hľadanie USB zariadení...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Neúspešné pripojenie cez USB: $error';
+  }
+
   @override
   String get scanner_scanning => 'Skrívania zariadení...';
 
@@ -266,6 +395,49 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => 'Ochranný režim je vypnutý';
 
+  @override
+  String get settings_privacy => 'Nastavenia súkromia';
+
+  @override
+  String get settings_privacySubtitle => 'Ovládni, aké informácie sa zdieľajú.';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Vyberte, ktoré informácie váš zariadenie zdieľa s ostatnými.';
+
+  @override
+  String get settings_denyAll => 'Zamietnuť všetko';
+
+  @override
+  String get settings_allowByContact => 'Povoliť podľa kontaktových vlajok';
+
+  @override
+  String get settings_allowAll => 'Povoliť všetko';
+
+  @override
+  String get settings_telemetryBaseMode => 'Základný režim telemetrie';
+
+  @override
+  String get settings_telemetryLocationMode => 'Režim umiestnenia telemetrie';
+
+  @override
+  String get settings_telemetryEnvironmentMode => 'Režim prostredia telemetrie';
+
+  @override
+  String get settings_advertLocation => 'Umiestnenie inzerátu';
+
+  @override
+  String get settings_advertLocationSubtitle => 'Zahrnúť polohu do inzerátu';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Viaceré ACK: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated =>
+      'Režim telemetrie bol aktualizovaný';
+
   @override
   String get settings_actions => 'Možné akcie';
 
@@ -765,6 +937,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';
@@ -806,6 +981,41 @@ class AppLocalizationsSk extends AppLocalizations {
     return 'Posledné zobrazenie $days dní dozadu';
   }
 
+  @override
+  String get contact_info => 'Kontaktné informácie';
+
+  @override
+  String get contact_settings => 'Nastavenia kontaktov';
+
+  @override
+  String get contact_telemetry => 'Telemetria';
+
+  @override
+  String get contact_lastSeen => 'Naposledy videný';
+
+  @override
+  String get contact_clearChat => 'Vymazať chat';
+
+  @override
+  String get contact_teleBase => 'Báza telemetrie';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Povoliť zdieľanie úrovne batérie a základnej telemetrie';
+
+  @override
+  String get contact_teleLoc => 'Lokácia telemetrie';
+
+  @override
+  String get contact_teleLocSubtitle => 'Povoliť zdieľanie údajov o lokalite';
+
+  @override
+  String get contact_teleEnv => 'Prostredie telemetrie';
+
+  @override
+  String get contact_teleEnvSubtitle =>
+      'Povoliť zdieľanie údajov senzorov prostredia';
+
   @override
   String get channels_title => 'Kanály';
 
@@ -1375,6 +1585,9 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Zdieľte značku tu';
 
+  @override
+  String get map_setAsMyLocation => 'Nastavte ako moju polohu';
+
   @override
   String get map_pinLabel => 'Označka upozornenia';
 
@@ -1439,6 +1652,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

@@ -111,6 +111,133 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Izberite zaznano serijsko napravo in se neposredno povežite z vašo MeshCore napravo.';
+
+  @override
+  String get usbScreenStatus => 'Izberite USB naprave';
+
+  @override
+  String get usbScreenNote =>
+      'USB serijska povezava je aktivna na podprtih napravah Android in na desktop platformah.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Niti en USB naprave niso najdeni. Povežite eno in posodobite.';
+
+  @override
+  String get usbErrorPermissionDenied =>
+      'Dovoljenje za dostop preko USB-ja je bilo zavrnjeno.';
+
+  @override
+  String get usbErrorDeviceMissing => 'Izbrani USB napravej je več ne.';
+
+  @override
+  String get usbErrorInvalidPort => 'Izberite veljavno USB naprave.';
+
+  @override
+  String get usbErrorBusy => 'Že je v teku zahteva za povezavo preko USB.';
+
+  @override
+  String get usbErrorNotConnected => 'Ni priklopljenih USB naprave.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'Uspešno ni bilo mogo, da se odpre izbran naprave USB.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Niso bilo mogoče uskladiti povezave z izbranim USB napom.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'USB serijska komunikacija ni podprta na tej platformi.';
+
+  @override
+  String get usbErrorAlreadyActive => 'USB povezava je že aktivirana.';
+
+  @override
+  String get usbErrorNoDeviceSelected => 'Ni bilo izbranega USB naprave.';
+
+  @override
+  String get usbErrorPortClosed => 'USB povezava ni aktivirana.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'Vzpostavitve ni bilo mogo. Prosimo, da se prepričate, da ima naprave trenutno nameštan firmware USB Companion.';
+
+  @override
+  String get usbFallbackDeviceName =>
+      'Naprave za serijsko komunikacijo preko spleta';
+
+  @override
+  String get usbStatus_notConnected => 'Izberite USB naprave.';
+
+  @override
+  String get usbStatus_connecting => 'Povezava z USB napravo...';
+
+  @override
+  String get usbStatus_searching => 'Iskanje USB naprav...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Napaka pri povezavi preko USB: $error';
+  }
+
   @override
   String get scanner_scanning => 'Skeniram za naprave...';
 
@@ -266,6 +393,50 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => 'Privatni način je onemogočen.';
 
+  @override
+  String get settings_privacy => 'Nastavitve zasebnosti';
+
+  @override
+  String get settings_privacySubtitle =>
+      'Kontrolirajte, katere informacije so deljene.';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Izberite, katere informacije vaš naprava deli z drugimi.';
+
+  @override
+  String get settings_denyAll => 'Zavrniti vse';
+
+  @override
+  String get settings_allowByContact => 'Dovoli po kontaktnih zastavah';
+
+  @override
+  String get settings_allowAll => 'Dovoli vse';
+
+  @override
+  String get settings_telemetryBaseMode => 'Osnovni način telemetrije';
+
+  @override
+  String get settings_telemetryLocationMode => 'Način delovanja telemetrije';
+
+  @override
+  String get settings_telemetryEnvironmentMode =>
+      'Način delovanja okolja telemetrije';
+
+  @override
+  String get settings_advertLocation => 'Lokacija oglasa';
+
+  @override
+  String get settings_advertLocationSubtitle => 'Vključi lokacijo v oglas.';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Večkratni potrditvi: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => 'Način telemetrije posodobljen';
+
   @override
   String get settings_actions => 'Akcije';
 
@@ -765,6 +936,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';
@@ -804,6 +978,41 @@ class AppLocalizationsSl extends AppLocalizations {
     return 'Zadnjič viden pred $days dnem';
   }
 
+  @override
+  String get contact_info => 'Kontaktni podatki';
+
+  @override
+  String get contact_settings => 'Nastavitve stika';
+
+  @override
+  String get contact_telemetry => 'Telemetrija';
+
+  @override
+  String get contact_lastSeen => 'Zadnjič videno';
+
+  @override
+  String get contact_clearChat => 'Počisti klepet';
+
+  @override
+  String get contact_teleBase => 'Baza telemetrije';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Dovoli deljenje stanja baterije in osnovne telemetrije';
+
+  @override
+  String get contact_teleLoc => 'Lokacija telemetrije';
+
+  @override
+  String get contact_teleLocSubtitle => 'Dovoli deljenje podatkov o lokaciji';
+
+  @override
+  String get contact_teleEnv => 'Okolje telemetrije';
+
+  @override
+  String get contact_teleEnvSubtitle =>
+      'Dovoli deljenje podatkov okoljskih senzorjev';
+
   @override
   String get channels_title => 'Kanali';
 
@@ -1371,6 +1580,9 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Delite točke tukaj.';
 
+  @override
+  String get map_setAsMyLocation => 'Nastavite to kot mojo lokacijo';
+
   @override
   String get map_pinLabel => 'Oznaka za pritrditev';
 
@@ -1434,6 +1646,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

@@ -111,6 +111,133 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Välj en detekterad seriell enhet och anslut direkt till din MeshCore-nod.';
+
+  @override
+  String get usbScreenStatus => 'Välj en USB-enhet';
+
+  @override
+  String get usbScreenNote =>
+      'USB-seriell kommunikation är aktiv på stödda Android-enheter och på skrivbordsplattformar.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Inga USB-enheter hittades. Anslut en och uppdatera.';
+
+  @override
+  String get usbErrorPermissionDenied => 'Tillgången via USB nekas.';
+
+  @override
+  String get usbErrorDeviceMissing =>
+      'Den valda USB-enheten är inte längre tillgänglig.';
+
+  @override
+  String get usbErrorInvalidPort => 'Välj en giltig USB-enhet.';
+
+  @override
+  String get usbErrorBusy =>
+      'En annan förfrågan om USB-anslutning är redan pågående.';
+
+  @override
+  String get usbErrorNotConnected => 'Ingen USB-enhet är ansluten.';
+
+  @override
+  String get usbErrorOpenFailed =>
+      'Misslyckades med att öppna det valda USB-enheten.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Kunde inte ansluta till det valda USB-enheten.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'USB-seriell kommunikation stöds inte på denna plattform.';
+
+  @override
+  String get usbErrorAlreadyActive => 'En USB-anslutning är redan aktiv.';
+
+  @override
+  String get usbErrorNoDeviceSelected => 'Ingen USB-enhet valdes.';
+
+  @override
+  String get usbErrorPortClosed => 'USB-anslutningen är inte aktiv.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'Anslutningen har tidsutgått. Se till att enheten har rätt USB-firmware.';
+
+  @override
+  String get usbFallbackDeviceName => 'Web-serieenhet';
+
+  @override
+  String get usbStatus_notConnected => 'Välj en USB-enhet';
+
+  @override
+  String get usbStatus_connecting => 'Anslutning till USB-enhet...';
+
+  @override
+  String get usbStatus_searching => 'Söker efter USB-enheter...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Fel vid USB-anslutning: $error';
+  }
+
   @override
   String get scanner_scanning => 'Söker efter enheter...';
 
@@ -265,6 +392,49 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => 'Privatläge är avstängt';
 
+  @override
+  String get settings_privacy => 'Inställningar för sekretess';
+
+  @override
+  String get settings_privacySubtitle =>
+      'Kontrollera vilken information som delas.';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Välj vilken information din enhet delar med andra.';
+
+  @override
+  String get settings_denyAll => 'Neka alla';
+
+  @override
+  String get settings_allowByContact => 'Tillåt via kontaktflaggor';
+
+  @override
+  String get settings_allowAll => 'Tillåt alla';
+
+  @override
+  String get settings_telemetryBaseMode => 'Telemetribasläge';
+
+  @override
+  String get settings_telemetryLocationMode => 'Telemetritillstånd för plats';
+
+  @override
+  String get settings_telemetryEnvironmentMode => 'Telemetri miljöläge';
+
+  @override
+  String get settings_advertLocation => 'Annonsplacering';
+
+  @override
+  String get settings_advertLocationSubtitle => 'Inkludera plats i annonsen';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Multi-ACKs: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => 'Telemetri-läge uppdaterat';
+
   @override
   String get settings_actions => 'Åtgärder';
 
@@ -761,6 +931,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.';
@@ -800,6 +973,40 @@ class AppLocalizationsSv extends AppLocalizations {
     return 'Senast synlig $days dagar sedan';
   }
 
+  @override
+  String get contact_info => 'Kontaktinformation';
+
+  @override
+  String get contact_settings => 'Kontaktinställningar';
+
+  @override
+  String get contact_telemetry => 'Telemetri';
+
+  @override
+  String get contact_lastSeen => 'Senast sedd';
+
+  @override
+  String get contact_clearChat => 'Rensa Chatt';
+
+  @override
+  String get contact_teleBase => 'Telemetribas';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Tillåt delning av batterinivå och grundläggande telemetri';
+
+  @override
+  String get contact_teleLoc => 'Telemetridata plats';
+
+  @override
+  String get contact_teleLocSubtitle => 'Tillåt delning av platsdata';
+
+  @override
+  String get contact_teleEnv => 'Telemetri Miljö';
+
+  @override
+  String get contact_teleEnvSubtitle => 'Tillåt delning av miljösensordata';
+
   @override
   String get channels_title => 'Kanaler';
 
@@ -1367,6 +1574,9 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Dela markeringen här';
 
+  @override
+  String get map_setAsMyLocation => 'Ange som min plats';
+
   @override
   String get map_pinLabel => 'Fästetikett';
 
@@ -1431,6 +1641,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

@@ -111,6 +111,135 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get scanner_title => 'MeshCore Open';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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';
+
+  @override
+  String get usbScreenSubtitle =>
+      'Виберіть виявлене серійне пристрій і підключіть його безпосередньо до вашого вузла MeshCore.';
+
+  @override
+  String get usbScreenStatus => 'Виберіть пристрій USB';
+
+  @override
+  String get usbScreenNote =>
+      'USB-серіальний інтерфейс активний на підтримуваних пристроях на базі Android та на десктопних платформах.';
+
+  @override
+  String get usbScreenEmptyState =>
+      'Не знайдено жодних пристроїв USB. Підключіть один і перезавантажте.';
+
+  @override
+  String get usbErrorPermissionDenied =>
+      'Було відмовлено у наданні дозволу на використання USB.';
+
+  @override
+  String get usbErrorDeviceMissing => 'Вибране USB-пристрій більше недоступне.';
+
+  @override
+  String get usbErrorInvalidPort => 'Виберіть дійсний USB-пристрій.';
+
+  @override
+  String get usbErrorBusy =>
+      'Ще один запит на підключення через USB вже обробляється.';
+
+  @override
+  String get usbErrorNotConnected => 'Немає підключених пристроїв USB.';
+
+  @override
+  String get usbErrorOpenFailed => 'Не вдалося відкрити вибране USB-пристрій.';
+
+  @override
+  String get usbErrorConnectFailed =>
+      'Не вдалося підключитися до вибраного USB-пристрою.';
+
+  @override
+  String get usbErrorUnsupported =>
+      'Підтримка USB-серіального інтерфейсу не реалізована на цій платформі.';
+
+  @override
+  String get usbErrorAlreadyActive => 'USB-з\'єднання вже встановлено.';
+
+  @override
+  String get usbErrorNoDeviceSelected =>
+      'Не було вибрано жодного пристрою USB.';
+
+  @override
+  String get usbErrorPortClosed => 'З\'єднання USB не встановлено.';
+
+  @override
+  String get usbErrorConnectTimedOut =>
+      'З\'єднання не вдалося встановити. Переконайтеся, що пристрій має встановлене програмне забезпечення USB Companion.';
+
+  @override
+  String get usbFallbackDeviceName =>
+      'Пристрій для передачі даних по веб-серіалах';
+
+  @override
+  String get usbStatus_notConnected => 'Виберіть пристрій USB';
+
+  @override
+  String get usbStatus_connecting => 'Підключення до USB-пристрою...';
+
+  @override
+  String get usbStatus_searching => 'Пошук пристроїв USB...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'Не вдалося встановити з\'єднання через USB: $error';
+  }
+
   @override
   String get scanner_scanning => 'Пошук пристроїв...';
 
@@ -266,6 +395,50 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => 'Режим приватності вимкнено';
 
+  @override
+  String get settings_privacy => 'Налаштування приватності';
+
+  @override
+  String get settings_privacySubtitle =>
+      'Керуйте інформацією, яку буде спільно використовуватися';
+
+  @override
+  String get settings_privacySettingsDescription =>
+      'Виберіть, яку інформацію ваш пристрій буде передавати іншим.';
+
+  @override
+  String get settings_denyAll => 'Відхилити все';
+
+  @override
+  String get settings_allowByContact => 'Дозволити за контактними прапорцями';
+
+  @override
+  String get settings_allowAll => 'Дозволити все';
+
+  @override
+  String get settings_telemetryBaseMode => 'Режим базової телеметрії';
+
+  @override
+  String get settings_telemetryLocationMode => 'Режим місця телеметрії';
+
+  @override
+  String get settings_telemetryEnvironmentMode => 'Режим середовища телеметрії';
+
+  @override
+  String get settings_advertLocation => 'Розміщення реклами';
+
+  @override
+  String get settings_advertLocationSubtitle =>
+      'Включити місце розташування в оголошення';
+
+  @override
+  String settings_multiAck(String value) {
+    return 'Багатократне підтвердження: $value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => 'Режим телеметрії оновлено';
+
   @override
   String get settings_actions => 'Дії';
 
@@ -769,6 +942,9 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Назва групи обов\'язкова.';
 
+  @override
+  String get contacts_groupNameReserved => 'Ця назва групи зарезервована';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Група «$name» вже існує.';
@@ -808,6 +984,42 @@ class AppLocalizationsUk extends AppLocalizations {
     return 'В мережі $days дн. тому';
   }
 
+  @override
+  String get contact_info => 'Контактна інформація';
+
+  @override
+  String get contact_settings => 'Налаштування контактів';
+
+  @override
+  String get contact_telemetry => 'Телеметрія';
+
+  @override
+  String get contact_lastSeen => 'Останній раз бачили';
+
+  @override
+  String get contact_clearChat => 'Очистити чат';
+
+  @override
+  String get contact_teleBase => 'Базовий телебачення';
+
+  @override
+  String get contact_teleBaseSubtitle =>
+      'Дозволити спільний доступ до рівня заряду батареї та базової телеметрії';
+
+  @override
+  String get contact_teleLoc => 'Розташування телеметрії';
+
+  @override
+  String get contact_teleLocSubtitle =>
+      'Дозволити спільне використання даних про місцеположення';
+
+  @override
+  String get contact_teleEnv => 'Середовище телеметрії';
+
+  @override
+  String get contact_teleEnvSubtitle =>
+      'Дозволити спільний доступ до даних датчиків середовища';
+
   @override
   String get channels_title => 'Канали';
 
@@ -1381,6 +1593,9 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Поділитися маркером тут';
 
+  @override
+  String get map_setAsMyLocation => 'Встановити моє місцезнаходження';
+
   @override
   String get map_pinLabel => 'Мітка піна';
 
@@ -1445,6 +1660,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

@@ -111,6 +111,123 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get scanner_title => '连接设备';
 
+  @override
+  String get connectionChoiceUsbLabel => 'USB';
+
+  @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连接';
+
+  @override
+  String get usbScreenSubtitle => '选择已检测到的串行设备，并直接连接到您的 MeshCore 节点。';
+
+  @override
+  String get usbScreenStatus => '选择一个 USB 设备';
+
+  @override
+  String get usbScreenNote => 'USB 串行接口在支持的 Android 设备和桌面平台上处于活动状态。';
+
+  @override
+  String get usbScreenEmptyState => '未找到任何 USB 设备。请插入一个，然后刷新。';
+
+  @override
+  String get usbErrorPermissionDenied => '拒绝了USB权限。';
+
+  @override
+  String get usbErrorDeviceMissing => '所选的USB设备已不再可用。';
+
+  @override
+  String get usbErrorInvalidPort => '选择一个有效的USB设备。';
+
+  @override
+  String get usbErrorBusy => '还有一个 USB 连接请求正在进行中。';
+
+  @override
+  String get usbErrorNotConnected => '没有连接任何USB设备。';
+
+  @override
+  String get usbErrorOpenFailed => '未能打开所选的USB设备。';
+
+  @override
+  String get usbErrorConnectFailed => '未能连接到所选的USB设备。';
+
+  @override
+  String get usbErrorUnsupported => '此平台不支持USB串行通信。';
+
+  @override
+  String get usbErrorAlreadyActive => 'USB 连接已建立。';
+
+  @override
+  String get usbErrorNoDeviceSelected => '未选择任何 USB 设备。';
+
+  @override
+  String get usbErrorPortClosed => 'USB 连接未建立。';
+
+  @override
+  String get usbErrorConnectTimedOut => '连接超时。请确保设备已安装 USB 伴侣固件。';
+
+  @override
+  String get usbFallbackDeviceName => 'Web 串流设备';
+
+  @override
+  String get usbStatus_notConnected => '选择一个 USB 设备';
+
+  @override
+  String get usbStatus_connecting => '连接USB设备...';
+
+  @override
+  String get usbStatus_searching => '正在搜索 USB 设备...';
+
+  @override
+  String usbConnectionFailed(String error) {
+    return 'USB 连接失败：$error';
+  }
+
   @override
   String get scanner_scanning => '正在搜索设备...';
 
@@ -257,6 +374,47 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get settings_privacyModeDisabled => '隐私模式已关闭';
 
+  @override
+  String get settings_privacy => '隐私设置';
+
+  @override
+  String get settings_privacySubtitle => '控制要共享的信息。';
+
+  @override
+  String get settings_privacySettingsDescription => '选择您的设备与他人共享的信息。';
+
+  @override
+  String get settings_denyAll => '拒绝所有';
+
+  @override
+  String get settings_allowByContact => '按联系人标志允许';
+
+  @override
+  String get settings_allowAll => '允许全部';
+
+  @override
+  String get settings_telemetryBaseMode => '遥测基础模式';
+
+  @override
+  String get settings_telemetryLocationMode => '遥测位置模式';
+
+  @override
+  String get settings_telemetryEnvironmentMode => '遥测环境模式';
+
+  @override
+  String get settings_advertLocation => '广告位置';
+
+  @override
+  String get settings_advertLocationSubtitle => '在广告中包含位置';
+
+  @override
+  String settings_multiAck(String value) {
+    return '多重ACK：$value';
+  }
+
+  @override
+  String get settings_telemetryModeUpdated => '遥测模式已更新';
+
   @override
   String get settings_actions => '操作';
 
@@ -728,6 +886,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => '请输入群聊名称';
 
+  @override
+  String get contacts_groupNameReserved => '该群组名称已被保留';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return '名为 \"$name\" 的群聊已存在';
@@ -766,6 +927,39 @@ class AppLocalizationsZh extends AppLocalizations {
     return '最后在线 $days 天前';
   }
 
+  @override
+  String get contact_info => '联系信息';
+
+  @override
+  String get contact_settings => '联系人设置';
+
+  @override
+  String get contact_telemetry => '遥测数据';
+
+  @override
+  String get contact_lastSeen => '最近出现';
+
+  @override
+  String get contact_clearChat => '清除聊天记录';
+
+  @override
+  String get contact_teleBase => '遥测基站';
+
+  @override
+  String get contact_teleBaseSubtitle => '允许共享电池电量和基本遥测数据';
+
+  @override
+  String get contact_teleLoc => '遥测位置';
+
+  @override
+  String get contact_teleLocSubtitle => '允许共享位置数据';
+
+  @override
+  String get contact_teleEnv => '遥测环境';
+
+  @override
+  String get contact_teleEnvSubtitle => '允许共享环境传感器数据';
+
   @override
   String get channels_title => '频道';
 
@@ -1304,6 +1498,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get map_shareMarkerHere => '在此分享标记';
 
+  @override
+  String get map_setAsMyLocation => '设置为我的位置';
+
   @override
   String get map_pinLabel => '标签';
 
@@ -1366,6 +1563,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": {
@@ -1828,5 +1829,96 @@
   "discoveredContacts_deleteContactAll": "Verwijder alle ontdekte contacten",
   "discoveredContacts_deleteContactAllContent": "Weet u zeker dat u alle ontdekte contacten wilt verwijderen?",
   "map_guessedLocation": "Geroerde locatie",
-  "map_showGuessedLocations": "Toon de voorspelde locaties van de knopen"
+  "map_showGuessedLocations": "Toon de voorspelde locaties van de knopen",
+  "connectionChoiceUsbLabel": "USB",
+  "usbScreenSubtitle": "Selecteer een gedetecteerd seriële apparaat en verbind deze direct met uw MeshCore-node.",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "usbScreenTitle": "Verbind via USB",
+  "usbScreenStatus": "Selecteer een USB-apparaat",
+  "usbScreenNote": "USB-serieel is actief op ondersteunde Android-apparaten en desktop-platforms.",
+  "usbScreenEmptyState": "Geen USB-apparaten gevonden. Sluit er een aan en herlaad.",
+  "usbErrorPermissionDenied": "Toegang via USB is geweigerd.",
+  "usbErrorDeviceMissing": "Het geselecteerde USB-apparaat is niet meer beschikbaar.",
+  "usbErrorInvalidPort": "Selecteer een geldig USB-apparaat.",
+  "usbErrorBusy": "Een andere verzoek om een USB-verbinding is al in behandeling.",
+  "usbErrorNotConnected": "Er is geen USB-apparaat aangesloten.",
+  "usbErrorOpenFailed": "Kon het geselecteerde USB-apparaat niet openen.",
+  "usbErrorConnectFailed": "Kon niet verbinding maken met het geselecteerde USB-apparaat.",
+  "usbErrorUnsupported": "USB-serieel is niet ondersteund op deze platform.",
+  "usbErrorAlreadyActive": "Een USB-verbinding is al actief.",
+  "usbErrorNoDeviceSelected": "Geen USB-apparaat is geselecteerd.",
+  "usbErrorPortClosed": "De USB-verbinding is niet actief.",
+  "usbFallbackDeviceName": "Web-serieapparaat",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbConnectionFailed": "Fout bij de USB-verbinding: {error}",
+  "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.",
+  "@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",
+  "map_setAsMyLocation": "Stel dit in als mijn locatie",
+  "settings_privacy": "Privacyinstellingen",
+  "settings_privacySubtitle": "Beheer welke informatie wordt gedeeld",
+  "settings_telemetryLocationMode": "Telemetrie-locatiemodus",
+  "settings_telemetryEnvironmentMode": "Telemetrie-omgevingsmodus",
+  "settings_advertLocation": "Advertentielocatie",
+  "settings_advertLocationSubtitle": "Locatie opnemen in advertentie",
+  "settings_privacySettingsDescription": "Kies welke informatie uw apparaat deelt met anderen",
+  "settings_allowByContact": "Toestaan op basis van contactvlaggen",
+  "settings_allowAll": "Alles toestaan",
+  "settings_denyAll": "Weiger alles",
+  "contact_info": "Contactinformatie",
+  "settings_telemetryBaseMode": "Telemetrie-basismodus",
+  "contact_teleBase": "Telemetrie_basis",
+  "contact_teleLoc": "Telemetrielocatie",
+  "contact_teleLocSubtitle": "Locatiegegevens delen toestaan",
+  "contact_teleEnv": "Telemetrieomgeving",
+  "contact_teleEnvSubtitle": "Delen van omgevingsensordata toestaan",
+  "contact_settings": "Contactinstellingen",
+  "contact_telemetry": "Telemetrie",
+  "contact_lastSeen": "Laatst gezien",
+  "contact_clearChat": "Chat leegmaken",
+  "contact_teleBaseSubtitle": "Sta delen van batterij niveau en basis telemetrie toe",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_telemetryModeUpdated": "Telemetrie-modus bijgewerkt",
+  "settings_multiAck": "Multi-ACKs: {value}"
 }

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": {
@@ -1828,5 +1829,96 @@
   "discoveredContacts_deleteContactAllContent": "Czy na pewno chcesz usunąć wszystkie znalezione kontakty?",
   "discoveredContacts_deleteContactAll": "Usuń wszystkie odkryte kontakty",
   "map_guessedLocation": "Wydana lokalizacja",
-  "map_showGuessedLocations": "Wyświetl lokalizacje zgadanych węzłów"
+  "map_showGuessedLocations": "Wyświetl lokalizacje zgadanych węzłów",
+  "usbScreenSubtitle": "Wybierz wykryty urządzenie szeregowe i podłącz je bezpośrednio do swojego węzła MeshCore.",
+  "usbScreenTitle": "Połącz przez USB",
+  "connectionChoiceUsbLabel": "USB",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "usbScreenStatus": "Wybierz urządzenie USB",
+  "usbScreenNote": "Port szeregowy USB jest aktywny na urządzeniach z systemem Android i platformach stacjonarnych, które go obsługują.",
+  "usbScreenEmptyState": "Nie znaleziono żadnych urządzeń USB. Podłącz jedno i zaktualizuj.",
+  "usbErrorPermissionDenied": "Zostało odrzucone żądanie dostępu przez USB.",
+  "usbErrorDeviceMissing": "Wybór urządzenia USB już nie jest dostępny.",
+  "usbErrorInvalidPort": "Wybierz prawidłowe urządzenie USB.",
+  "usbErrorBusy": "Kolejne żądanie połączenia przez USB jest już w trakcie realizacji.",
+  "usbErrorNotConnected": "Brak podłączonego urządzenia USB.",
+  "usbErrorOpenFailed": "Nie udało się otworzyć wybranego urządzenia USB.",
+  "usbErrorConnectFailed": "Nie udało się połączyć z wybranym urządzeniem USB.",
+  "usbErrorUnsupported": "Port szeregowy USB nie jest obsługiwany na tym urządzeniu.",
+  "usbErrorAlreadyActive": "Połączenie USB jest już aktywne.",
+  "usbErrorNoDeviceSelected": "Nie został wybrany żaden urządzenie USB.",
+  "usbErrorPortClosed": "Połączenie USB nie jest aktywne.",
+  "usbFallbackDeviceName": "Urządzenie do komunikacji przez sieć (seria)",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_searching": "Wyszukiwanie urządzeń USB...",
+  "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\".",
+  "@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",
+  "map_setAsMyLocation": "Ustaw jako moje lokalizację",
+  "settings_allowByContact": "Zezwalaj według flag kontaktowych",
+  "settings_allowAll": "Zezwalaj na wszystko",
+  "settings_telemetryLocationMode": "Tryb położenia telemetrycznego",
+  "settings_telemetryEnvironmentMode": "Tryb środowiska telemetrycznego",
+  "settings_advertLocation": "Lokalizacja reklamowa",
+  "settings_advertLocationSubtitle": "Uwzględnij lokalizację w ogłoszeniu",
+  "settings_denyAll": "Odmów wszystkim",
+  "settings_privacySubtitle": "Kontroluj jakie informacje są udostępniane.",
+  "settings_privacy": "Ustawienia prywatności",
+  "settings_privacySettingsDescription": "Wybierz jakie informacje urządzenie udostępni innym.",
+  "contact_info": "Informacje kontaktowe",
+  "settings_telemetryBaseMode": "Tryb podstawowy telemetrii",
+  "contact_teleBase": "Baza telemetryczna",
+  "contact_teleLoc": "Lokalizacja telemetryczna",
+  "contact_teleLocSubtitle": "Zezwalaj na udostępnianie danych lokalizacji",
+  "contact_teleEnv": "Środowisko telemetryczne",
+  "contact_teleEnvSubtitle": "Zezwalaj na udostępnianie danych czujników środowiskowych",
+  "contact_telemetry": "Telemetryka",
+  "contact_clearChat": "Wyczyść czat",
+  "contact_settings": "Ustawienia kontaktowe",
+  "contact_lastSeen": "Ostatnio widziany",
+  "contact_teleBaseSubtitle": "Pozwól na udostępnianie poziomu naładowania baterii i podstawowych danych telemetrycznych",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_telemetryModeUpdated": "Tryb telemetryczny zaktualizowany",
+  "settings_multiAck": "Wiele potwierdzeń: {value}"
 }

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": {
@@ -1828,5 +1829,96 @@
   "discoveredContacts_deleteContactAll": "Excluir Todos os Contatos Descobertos",
   "discoveredContacts_deleteContactAllContent": "Tem certeza de que deseja excluir todos os contatos descobertos?",
   "map_guessedLocation": "Localização estimada",
-  "map_showGuessedLocations": "Mostrar as localizações dos nós estimados"
+  "map_showGuessedLocations": "Mostrar as localizações dos nós estimados",
+  "connectionChoiceUsbLabel": "USB",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "usbScreenTitle": "Conecte via USB",
+  "usbScreenSubtitle": "Selecione um dispositivo serial detectado e conecte-o diretamente ao seu nó MeshCore.",
+  "usbScreenStatus": "Selecione um dispositivo USB",
+  "usbScreenNote": "A comunicação serial via USB está ativa em dispositivos Android e plataformas de desktop compatíveis.",
+  "usbScreenEmptyState": "Nenhum dispositivo USB encontrado. Conecte um e atualize.",
+  "usbErrorPermissionDenied": "A permissão para acesso via USB foi negada.",
+  "usbErrorDeviceMissing": "O dispositivo USB selecionado não está mais disponível.",
+  "usbErrorInvalidPort": "Selecione um dispositivo USB válido.",
+  "usbErrorBusy": "Já existe uma solicitação de conexão USB em andamento.",
+  "usbErrorNotConnected": "Não há nenhum dispositivo USB conectado.",
+  "usbErrorOpenFailed": "Não foi possível abrir o dispositivo USB selecionado.",
+  "usbErrorConnectFailed": "Não foi possível conectar ao dispositivo USB selecionado.",
+  "usbErrorUnsupported": "A comunicação serial via USB não é suportada nesta plataforma.",
+  "usbErrorAlreadyActive": "A conexão USB já está ativa.",
+  "usbErrorNoDeviceSelected": "Nenhum dispositivo USB foi selecionado.",
+  "usbErrorPortClosed": "A conexão USB não está ativa.",
+  "usbFallbackDeviceName": "Dispositivo de Serial para a Web",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_searching": "Procurando por dispositivos USB...",
+  "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.",
+  "@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",
+  "map_setAsMyLocation": "Defina minha localização",
+  "settings_privacySettingsDescription": "Escolha quais informações o seu dispositivo compartilha com os outros.",
+  "settings_allowByContact": "Permitir por bandeiras de contato",
+  "settings_telemetryLocationMode": "Modo de Localização de Telemetria",
+  "settings_telemetryEnvironmentMode": "Modo de Ambiente de Telemetria",
+  "settings_advertLocation": "Localização do Anúncio",
+  "settings_advertLocationSubtitle": "Incluir localização no anúncio",
+  "settings_privacySubtitle": "Controle o que é compartilhado.",
+  "settings_denyAll": "Negar todos",
+  "settings_allowAll": "Permitir todos",
+  "settings_privacy": "Configurações de Privacidade",
+  "contact_info": "Informações de Contato",
+  "settings_telemetryBaseMode": "Modo Base de Telemetria",
+  "contact_teleBase": "Base de Telemetria",
+  "contact_teleLoc": "Localização de Telemetria",
+  "contact_teleLocSubtitle": "Permitir compartilhamento de dados de localização",
+  "contact_teleEnv": "Ambiente de Telemetria",
+  "contact_teleEnvSubtitle": "Permitir compartilhamento de dados do sensor de ambiente",
+  "contact_lastSeen": "Visto pela última vez",
+  "contact_clearChat": "Limpar Chat",
+  "contact_telemetry": "Telemetria",
+  "contact_settings": "Configurações de Contato",
+  "contact_teleBaseSubtitle": "Permitir compartilhamento do nível da bateria e telemetria básica",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_telemetryModeUpdated": "Modo de telemetria atualizado",
+  "settings_multiAck": "Multi-ACKs: {value}"
 }

lib/l10n/app_ru.arb

@@ -212,6 +212,7 @@
   "contacts_newGroup": "Новая группа",
   "contacts_groupName": "Имя группы",
   "contacts_groupNameRequired": "Имя группы обязательно",
+  "contacts_groupNameReserved": "Это имя группы зарезервировано",
   "contacts_groupAlreadyExists": "Группа \"{name}\" уже существует",
   "contacts_filterContacts": "Фильтр контактов...",
   "contacts_noContactsMatchFilter": "Нет контактов, соответствующих фильтру",
@@ -1068,5 +1069,96 @@
   "discoveredContacts_deleteContactAllContent": "Вы уверены, что хотите удалить все обнаруженные контакты?",
   "discoveredContacts_deleteContactAll": "Удалить Все Обнаруженные Контакты",
   "map_guessedLocation": "Угаданное место",
-  "map_showGuessedLocations": "Отобразить предполагаемые места расположения узлов"
+  "map_showGuessedLocations": "Отобразить предполагаемые места расположения узлов",
+  "connectionChoiceUsbLabel": "USB",
+  "usbScreenSubtitle": "Выберите обнаруженное устройство с последовательным интерфейсом и подключите его напрямую к вашему узлу MeshCore.",
+  "usbScreenTitle": "Подключение через USB",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "usbScreenStatus": "Выберите USB-устройство",
+  "usbScreenNote": "USB-серийный порт активен на поддерживаемых устройствах Android и на настольных платформах.",
+  "usbScreenEmptyState": "Не обнаружено устройств USB. Подключите одно из них и обновите список.",
+  "usbErrorPermissionDenied": "Запрос на доступ через USB был отклонен.",
+  "usbErrorDeviceMissing": "Выбранное USB-устройство больше недоступно.",
+  "usbErrorInvalidPort": "Выберите действительное USB-устройство.",
+  "usbErrorBusy": "Еще одно запрошенное соединение через USB уже находится в процессе.",
+  "usbErrorNotConnected": "Ни одно USB-устройство не подключено.",
+  "usbErrorOpenFailed": "Не удалось открыть выбранное USB-устройство.",
+  "usbErrorConnectFailed": "Не удалось установить соединение с выбранным USB-устройством.",
+  "usbErrorUnsupported": "Поддержка последовательного USB отсутствует на данной платформе.",
+  "usbErrorAlreadyActive": "USB-соединение уже установлено.",
+  "usbErrorNoDeviceSelected": "Не было выбрано ни одно устройство USB.",
+  "usbErrorPortClosed": "USB-соединение не установлено.",
+  "usbFallbackDeviceName": "Устройство для последовательного подключения к сети",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_searching": "Поиск USB-устройств...",
+  "usbStatus_connecting": "Подключение к USB-устройству...",
+  "usbConnectionFailed": "Не удалось установить соединение через USB: {error}",
+  "usbStatus_notConnected": "Выберите USB-устройство",
+  "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",
+  "map_setAsMyLocation": "Установить мое местоположение",
+  "settings_privacy": "Настройки конфиденциальности",
+  "settings_privacySubtitle": "Контролируйте, какую информацию делиться.",
+  "settings_telemetryLocationMode": "Режим местоположения телеметрии",
+  "settings_telemetryEnvironmentMode": "Режим среды телеметрии",
+  "settings_advertLocation": "Местоположение рекламы",
+  "settings_advertLocationSubtitle": "Включить местоположение в объявление",
+  "settings_allowAll": "Разрешить все",
+  "settings_privacySettingsDescription": "Выберите, какую информацию ваше устройство будет делиться с другими.",
+  "settings_denyAll": "Отклонить все",
+  "settings_allowByContact": "Разрешить по флагам контактов",
+  "contact_info": "Контактная информация",
+  "settings_telemetryBaseMode": "Базовый режим телеметрии",
+  "contact_teleBase": "База телеметрии",
+  "contact_teleLoc": "Местоположение телеметрии",
+  "contact_teleLocSubtitle": "Разрешить обмен данными о местоположении",
+  "contact_teleEnv": "Среда телеметрии",
+  "contact_teleEnvSubtitle": "Разрешить обмен данными датчиков окружающей среды",
+  "contact_settings": "Настройки контактов",
+  "contact_telemetry": "Телеметрия",
+  "contact_clearChat": "Очистить чат",
+  "contact_lastSeen": "Последний раз видели",
+  "contact_teleBaseSubtitle": "Разрешить обмен уровнем заряда батареи и базовой телеметрией",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_telemetryModeUpdated": "Режим телеметрии обновлен",
+  "settings_multiAck": "Мульти-ACK: {value}"
 }

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": {
@@ -1828,5 +1829,96 @@
   "common_deleteAll": "Zmazať všetko",
   "discoveredContacts_deleteContactAllContent": "Ste si istí, že chcete zmazať všetky objavené kontakty?",
   "map_showGuessedLocations": "Zobraziť umiestnenia odhadnutých uzlov",
-  "map_guessedLocation": "Odhadnutá lokalita"
+  "map_guessedLocation": "Odhadnutá lokalita",
+  "usbScreenTitle": "Pripojte cez USB",
+  "usbScreenSubtitle": "Vyberte detekovaný sériový zariadenie a pripojte ho priamo k vašej MeshCore uzlu.",
+  "connectionChoiceUsbLabel": "USB",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "usbScreenStatus": "Vyberte USB zariadenie",
+  "usbScreenNote": "USB sériová komunikácia je aktívna na podporovaných zariadeniach s Androidom a na desktopových platformách.",
+  "usbScreenEmptyState": "Nenašli sa žiadne USB zariadenia. Pripojte jedno a obnovte.",
+  "usbErrorPermissionDenied": "Žiadosť o prístup cez USB bola zamietnutá.",
+  "usbErrorDeviceMissing": "Vybrané USB zariadenie už nie je dostupné.",
+  "usbErrorInvalidPort": "Vyberte platné USB zariadenie.",
+  "usbErrorBusy": "Ďalšia požiadavka na pripojenie cez USB je aktuálne v procese.",
+  "usbErrorNotConnected": "Nie je pripojené žiadne USB zariadenie.",
+  "usbErrorOpenFailed": "Nepodarilo sa otvoriť vybrané USB zariadenie.",
+  "usbErrorConnectFailed": "Nepodarilo sa sa sa pripojiť k vybranému USB zariadeniu.",
+  "usbErrorUnsupported": "Podpora USB sériového rozhrania nie je na tejto platforme dostupná.",
+  "usbErrorAlreadyActive": "Pripojenie cez USB je už aktivované.",
+  "usbErrorNoDeviceSelected": "Nebolo vybrané žiadne USB zariadenie.",
+  "usbErrorPortClosed": "Pripojenie cez USB nie je aktivované.",
+  "usbFallbackDeviceName": "Webový sériový zariadenie",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_searching": "Hľadanie USB zariadení...",
+  "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.",
+  "@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",
+  "map_setAsMyLocation": "Nastavte ako moju polohu",
+  "settings_privacy": "Nastavenia súkromia",
+  "settings_privacySubtitle": "Ovládni, aké informácie sa zdieľajú.",
+  "settings_telemetryLocationMode": "Režim umiestnenia telemetrie",
+  "settings_telemetryBaseMode": "Základný režim telemetrie",
+  "settings_advertLocation": "Umiestnenie inzerátu",
+  "settings_telemetryEnvironmentMode": "Režim prostredia telemetrie",
+  "settings_advertLocationSubtitle": "Zahrnúť polohu do inzerátu",
+  "settings_allowAll": "Povoliť všetko",
+  "settings_privacySettingsDescription": "Vyberte, ktoré informácie váš zariadenie zdieľa s ostatnými.",
+  "settings_denyAll": "Zamietnuť všetko",
+  "settings_allowByContact": "Povoliť podľa kontaktových vlajok",
+  "contact_info": "Kontaktné informácie",
+  "contact_settings": "Nastavenia kontaktov",
+  "contact_teleBaseSubtitle": "Povoliť zdieľanie úrovne batérie a základnej telemetrie",
+  "contact_teleLoc": "Lokácia telemetrie",
+  "contact_teleLocSubtitle": "Povoliť zdieľanie údajov o lokalite",
+  "contact_teleEnv": "Prostredie telemetrie",
+  "contact_telemetry": "Telemetria",
+  "contact_clearChat": "Vymazať chat",
+  "contact_lastSeen": "Naposledy videný",
+  "contact_teleBase": "Báza telemetrie",
+  "contact_teleEnvSubtitle": "Povoliť zdieľanie údajov senzorov prostredia",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_telemetryModeUpdated": "Režim telemetrie bol aktualizovaný",
+  "settings_multiAck": "Viaceré ACK: {value}"
 }

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": {
@@ -1828,5 +1829,96 @@
   "discoveredContacts_deleteContactAllContent": "Ste prepričani, da želite izbrisati vse odkrite kontakte?",
   "discoveredContacts_deleteContactAll": "Izbriši vse odkrite kontakte",
   "map_guessedLocation": "Predpostavljena lokacija",
-  "map_showGuessedLocations": "Pokaži lokacije domnevnih not."
+  "map_showGuessedLocations": "Pokaži lokacije domnevnih not.",
+  "usbScreenTitle": "Povežite preko USB",
+  "usbScreenSubtitle": "Izberite zaznano serijsko napravo in se neposredno povežite z vašo MeshCore napravo.",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "connectionChoiceUsbLabel": "USB",
+  "usbScreenStatus": "Izberite USB naprave",
+  "usbScreenNote": "USB serijska povezava je aktivna na podprtih napravah Android in na desktop platformah.",
+  "usbScreenEmptyState": "Niti en USB naprave niso najdeni. Povežite eno in posodobite.",
+  "usbErrorPermissionDenied": "Dovoljenje za dostop preko USB-ja je bilo zavrnjeno.",
+  "usbErrorDeviceMissing": "Izbrani USB napravej je več ne.",
+  "usbErrorInvalidPort": "Izberite veljavno USB naprave.",
+  "usbErrorBusy": "Že je v teku zahteva za povezavo preko USB.",
+  "usbErrorNotConnected": "Ni priklopljenih USB naprave.",
+  "usbErrorOpenFailed": "Uspešno ni bilo mogo, da se odpre izbran naprave USB.",
+  "usbErrorConnectFailed": "Niso bilo mogoče uskladiti povezave z izbranim USB napom.",
+  "usbErrorUnsupported": "USB serijska komunikacija ni podprta na tej platformi.",
+  "usbErrorAlreadyActive": "USB povezava je že aktivirana.",
+  "usbErrorNoDeviceSelected": "Ni bilo izbranega USB naprave.",
+  "usbErrorPortClosed": "USB povezava ni aktivirana.",
+  "usbFallbackDeviceName": "Naprave za serijsko komunikacijo preko spleta",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_notConnected": "Izberite USB naprave.",
+  "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.",
+  "@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",
+  "map_setAsMyLocation": "Nastavite to kot mojo lokacijo",
+  "settings_privacy": "Nastavitve zasebnosti",
+  "settings_privacySettingsDescription": "Izberite, katere informacije vaš naprava deli z drugimi.",
+  "settings_telemetryBaseMode": "Osnovni način telemetrije",
+  "settings_telemetryLocationMode": "Način delovanja telemetrije",
+  "settings_telemetryEnvironmentMode": "Način delovanja okolja telemetrije",
+  "settings_advertLocation": "Lokacija oglasa",
+  "settings_allowByContact": "Dovoli po kontaktnih zastavah",
+  "settings_denyAll": "Zavrniti vse",
+  "settings_allowAll": "Dovoli vse",
+  "settings_privacySubtitle": "Kontrolirajte, katere informacije so deljene.",
+  "contact_info": "Kontaktni podatki",
+  "contact_teleBase": "Baza telemetrije",
+  "contact_teleBaseSubtitle": "Dovoli deljenje stanja baterije in osnovne telemetrije",
+  "contact_teleLoc": "Lokacija telemetrije",
+  "contact_lastSeen": "Zadnjič videno",
+  "contact_settings": "Nastavitve stika",
+  "settings_advertLocationSubtitle": "Vključi lokacijo v oglas.",
+  "contact_telemetry": "Telemetrija",
+  "contact_clearChat": "Počisti klepet",
+  "contact_teleEnv": "Okolje telemetrije",
+  "contact_teleEnvSubtitle": "Dovoli deljenje podatkov okoljskih senzorjev",
+  "contact_teleLocSubtitle": "Dovoli deljenje podatkov o lokaciji",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_multiAck": "Večkratni potrditvi: {value}",
+  "settings_telemetryModeUpdated": "Način telemetrije posodobljen"
 }

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": {
@@ -1828,5 +1829,96 @@
   "discoveredContacts_deleteContactAllContent": "Är du säker på att du vill ta bort alla upptäckta kontakter?",
   "discoveredContacts_deleteContactAll": "Ta bort alla upptäckta kontakter",
   "map_guessedLocation": "Gissad plats",
-  "map_showGuessedLocations": "Visa upp de antagna nodernas placeringar"
+  "map_showGuessedLocations": "Visa upp de antagna nodernas placeringar",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "connectionChoiceUsbLabel": "USB",
+  "usbScreenSubtitle": "Välj en detekterad seriell enhet och anslut direkt till din MeshCore-nod.",
+  "usbScreenTitle": "Anslut via USB",
+  "usbScreenStatus": "Välj en USB-enhet",
+  "usbScreenNote": "USB-seriell kommunikation är aktiv på stödda Android-enheter och på skrivbordsplattformar.",
+  "usbScreenEmptyState": "Inga USB-enheter hittades. Anslut en och uppdatera.",
+  "usbErrorPermissionDenied": "Tillgången via USB nekas.",
+  "usbErrorDeviceMissing": "Den valda USB-enheten är inte längre tillgänglig.",
+  "usbErrorInvalidPort": "Välj en giltig USB-enhet.",
+  "usbErrorBusy": "En annan förfrågan om USB-anslutning är redan pågående.",
+  "usbErrorNotConnected": "Ingen USB-enhet är ansluten.",
+  "usbErrorOpenFailed": "Misslyckades med att öppna det valda USB-enheten.",
+  "usbErrorConnectFailed": "Kunde inte ansluta till det valda USB-enheten.",
+  "usbErrorUnsupported": "USB-seriell kommunikation stöds inte på denna plattform.",
+  "usbErrorAlreadyActive": "En USB-anslutning är redan aktiv.",
+  "usbErrorNoDeviceSelected": "Ingen USB-enhet valdes.",
+  "usbErrorPortClosed": "USB-anslutningen är inte aktiv.",
+  "usbFallbackDeviceName": "Web-serieenhet",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_connecting": "Anslutning till USB-enhet...",
+  "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.",
+  "@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",
+  "map_setAsMyLocation": "Ange som min plats",
+  "settings_privacy": "Inställningar för sekretess",
+  "settings_allowAll": "Tillåt alla",
+  "settings_privacySubtitle": "Kontrollera vilken information som delas.",
+  "settings_telemetryEnvironmentMode": "Telemetri miljöläge",
+  "settings_telemetryBaseMode": "Telemetribasläge",
+  "settings_telemetryLocationMode": "Telemetritillstånd för plats",
+  "settings_advertLocation": "Annonsplacering",
+  "contact_info": "Kontaktinformation",
+  "contact_settings": "Kontaktinställningar",
+  "contact_telemetry": "Telemetri",
+  "settings_denyAll": "Neka alla",
+  "settings_allowByContact": "Tillåt via kontaktflaggor",
+  "settings_privacySettingsDescription": "Välj vilken information din enhet delar med andra.",
+  "contact_lastSeen": "Senast sedd",
+  "contact_clearChat": "Rensa Chatt",
+  "contact_teleEnv": "Telemetri Miljö",
+  "settings_advertLocationSubtitle": "Inkludera plats i annonsen",
+  "contact_teleEnvSubtitle": "Tillåt delning av miljösensordata",
+  "contact_teleBase": "Telemetribas",
+  "contact_teleBaseSubtitle": "Tillåt delning av batterinivå och grundläggande telemetri",
+  "contact_teleLoc": "Telemetridata plats",
+  "contact_teleLocSubtitle": "Tillåt delning av platsdata",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_telemetryModeUpdated": "Telemetri-läge uppdaterat",
+  "settings_multiAck": "Multi-ACKs: {value}"
 }

lib/l10n/app_uk.arb

@@ -286,6 +286,7 @@
   "contacts_newGroup": "Нова група",
   "contacts_groupName": "Назва групи",
   "contacts_groupNameRequired": "Назва групи обов'язкова.",
+  "contacts_groupNameReserved": "Ця назва групи зарезервована",
   "contacts_groupAlreadyExists": "Група «{name}» вже існує.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1828,5 +1829,96 @@
   "discoveredContacts_deleteContactAll": "Видалити всі виявлені контакти",
   "discoveredContacts_deleteContactAllContent": "Ви впевнені, що хочете видалити всі виявлені контакти?",
   "map_showGuessedLocations": "Показати місцезнаходження передбачених вузлів",
-  "map_guessedLocation": "Визначено місцезнаходження"
+  "map_guessedLocation": "Визначено місцезнаходження",
+  "usbScreenSubtitle": "Виберіть виявлене серійне пристрій і підключіть його безпосередньо до вашого вузла MeshCore.",
+  "usbScreenTitle": "Підключити через USB",
+  "connectionChoiceBluetoothLabel": "Bluetooth",
+  "connectionChoiceUsbLabel": "USB",
+  "usbScreenStatus": "Виберіть пристрій USB",
+  "usbScreenNote": "USB-серіальний інтерфейс активний на підтримуваних пристроях на базі Android та на десктопних платформах.",
+  "usbScreenEmptyState": "Не знайдено жодних пристроїв USB. Підключіть один і перезавантажте.",
+  "usbErrorPermissionDenied": "Було відмовлено у наданні дозволу на використання USB.",
+  "usbErrorDeviceMissing": "Вибране USB-пристрій більше недоступне.",
+  "usbErrorInvalidPort": "Виберіть дійсний USB-пристрій.",
+  "usbErrorBusy": "Ще один запит на підключення через USB вже обробляється.",
+  "usbErrorNotConnected": "Немає підключених пристроїв USB.",
+  "usbErrorOpenFailed": "Не вдалося відкрити вибране USB-пристрій.",
+  "usbErrorConnectFailed": "Не вдалося підключитися до вибраного USB-пристрою.",
+  "usbErrorUnsupported": "Підтримка USB-серіального інтерфейсу не реалізована на цій платформі.",
+  "usbErrorAlreadyActive": "USB-з'єднання вже встановлено.",
+  "usbErrorNoDeviceSelected": "Не було вибрано жодного пристрою USB.",
+  "usbErrorPortClosed": "З'єднання USB не встановлено.",
+  "usbFallbackDeviceName": "Пристрій для передачі даних по веб-серіалах",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_searching": "Пошук пристроїв USB...",
+  "usbStatus_notConnected": "Виберіть пристрій USB",
+  "usbConnectionFailed": "Не вдалося встановити з'єднання через USB: {error}",
+  "usbStatus_connecting": "Підключення до USB-пристрою...",
+  "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": "Показати контакти Відкриття",
+  "map_setAsMyLocation": "Встановити моє місцезнаходження",
+  "settings_privacySubtitle": "Керуйте інформацією, яку буде спільно використовуватися",
+  "settings_privacy": "Налаштування приватності",
+  "settings_telemetryBaseMode": "Режим базової телеметрії",
+  "settings_telemetryLocationMode": "Режим місця телеметрії",
+  "settings_advertLocation": "Розміщення реклами",
+  "settings_advertLocationSubtitle": "Включити місце розташування в оголошення",
+  "settings_privacySettingsDescription": "Виберіть, яку інформацію ваш пристрій буде передавати іншим.",
+  "settings_allowAll": "Дозволити все",
+  "settings_denyAll": "Відхилити все",
+  "settings_allowByContact": "Дозволити за контактними прапорцями",
+  "settings_telemetryEnvironmentMode": "Режим середовища телеметрії",
+  "contact_info": "Контактна інформація",
+  "contact_teleBaseSubtitle": "Дозволити спільний доступ до рівня заряду батареї та базової телеметрії",
+  "contact_teleLoc": "Розташування телеметрії",
+  "contact_teleBase": "Базовий телебачення",
+  "contact_teleLocSubtitle": "Дозволити спільне використання даних про місцеположення",
+  "contact_settings": "Налаштування контактів",
+  "contact_telemetry": "Телеметрія",
+  "contact_clearChat": "Очистити чат",
+  "contact_lastSeen": "Останній раз бачили",
+  "contact_teleEnv": "Середовище телеметрії",
+  "contact_teleEnvSubtitle": "Дозволити спільний доступ до даних датчиків середовища",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_telemetryModeUpdated": "Режим телеметрії оновлено",
+  "settings_multiAck": "Багатократне підтвердження: {value}"
 }

lib/l10n/app_zh.arb

@@ -300,6 +300,7 @@
   "contacts_newGroup": "新建群聊",
   "contacts_groupName": "群聊名称",
   "contacts_groupNameRequired": "请输入群聊名称",
+  "contacts_groupNameReserved": "该群组名称已被保留",
   "contacts_groupAlreadyExists": "名为 \"{name}\" 的群聊已存在",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1833,5 +1834,96 @@
   "discoveredContacts_deleteContactAllContent": "您确定要删除所有发现的联系人吗？",
   "discoveredContacts_deleteContactAll": "删除所有发现的联系人",
   "map_showGuessedLocations": "显示猜测的节点位置",
-  "map_guessedLocation": "猜测的位置"
+  "map_guessedLocation": "猜测的位置",
+  "connectionChoiceUsbLabel": "USB",
+  "usbScreenTitle": "通过USB连接",
+  "usbScreenSubtitle": "选择已检测到的串行设备，并直接连接到您的 MeshCore 节点。",
+  "connectionChoiceBluetoothLabel": "蓝牙",
+  "usbScreenStatus": "选择一个 USB 设备",
+  "usbScreenNote": "USB 串行接口在支持的 Android 设备和桌面平台上处于活动状态。",
+  "usbScreenEmptyState": "未找到任何 USB 设备。请插入一个，然后刷新。",
+  "usbErrorPermissionDenied": "拒绝了USB权限。",
+  "usbErrorDeviceMissing": "所选的USB设备已不再可用。",
+  "usbErrorInvalidPort": "选择一个有效的USB设备。",
+  "usbErrorBusy": "还有一个 USB 连接请求正在进行中。",
+  "usbErrorNotConnected": "没有连接任何USB设备。",
+  "usbErrorOpenFailed": "未能打开所选的USB设备。",
+  "usbErrorConnectFailed": "未能连接到所选的USB设备。",
+  "usbErrorUnsupported": "此平台不支持USB串行通信。",
+  "usbErrorAlreadyActive": "USB 连接已建立。",
+  "usbErrorNoDeviceSelected": "未选择任何 USB 设备。",
+  "usbErrorPortClosed": "USB 连接未建立。",
+  "usbFallbackDeviceName": "Web 串流设备",
+  "@usbConnectionFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "usbStatus_searching": "正在搜索 USB 设备...",
+  "usbStatus_connecting": "连接USB设备...",
+  "usbStatus_notConnected": "选择一个 USB 设备",
+  "usbConnectionFailed": "USB 连接失败：{error}",
+  "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": "显示发现联系人",
+  "map_setAsMyLocation": "设置为我的位置",
+  "settings_privacySubtitle": "控制要共享的信息。",
+  "settings_privacySettingsDescription": "选择您的设备与他人共享的信息。",
+  "settings_telemetryBaseMode": "遥测基础模式",
+  "settings_telemetryLocationMode": "遥测位置模式",
+  "settings_advertLocation": "广告位置",
+  "settings_advertLocationSubtitle": "在广告中包含位置",
+  "settings_allowByContact": "按联系人标志允许",
+  "settings_denyAll": "拒绝所有",
+  "settings_privacy": "隐私设置",
+  "settings_allowAll": "允许全部",
+  "contact_info": "联系信息",
+  "contact_teleBase": "遥测基站",
+  "contact_teleBaseSubtitle": "允许共享电池电量和基本遥测数据",
+  "settings_telemetryEnvironmentMode": "遥测环境模式",
+  "contact_teleLoc": "遥测位置",
+  "contact_teleEnv": "遥测环境",
+  "contact_teleEnvSubtitle": "允许共享环境传感器数据",
+  "contact_clearChat": "清除聊天记录",
+  "contact_lastSeen": "最近出现",
+  "contact_settings": "联系人设置",
+  "contact_teleLocSubtitle": "允许共享位置数据",
+  "contact_telemetry": "遥测数据",
+  "@settings_multiAck": {
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "settings_multiAck": "多重ACK：{value}",
+  "settings_telemetryModeUpdated": "遥测模式已更新"
 }

lib/main.dart

@@ -19,6 +19,8 @@ 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 'services/timeout_prediction_service.dart';
 import 'storage/prefs_manager.dart';
 import 'utils/app_logger.dart';
 
@@ -39,6 +41,8 @@ void main() async {
   final backgroundService = BackgroundService();
   final mapTileCacheService = MapTileCacheService();
   final chatTextScaleService = ChatTextScaleService();
+  final uiViewStateService = UiViewStateService();
+  final timeoutPredictionService = TimeoutPredictionService(storage);
 
   // Load settings
   await appSettingsService.loadSettings();
@@ -56,6 +60,8 @@ void main() async {
   _registerThirdPartyLicenses();
 
   await chatTextScaleService.initialize();
+  await uiViewStateService.initialize();
+  await timeoutPredictionService.initialize();
 
   // Wire up connector with services
   connector.initialize(
@@ -65,6 +71,7 @@ void main() async {
     bleDebugLogService: bleDebugLogService,
     appDebugLogService: appDebugLogService,
     backgroundService: backgroundService,
+    timeoutPredictionService: timeoutPredictionService,
   );
 
   await connector.loadContactCache();
@@ -86,6 +93,8 @@ void main() async {
       appDebugLogService: appDebugLogService,
       mapTileCacheService: mapTileCacheService,
       chatTextScaleService: chatTextScaleService,
+      uiViewStateService: uiViewStateService,
+      timeoutPredictionService: timeoutPredictionService,
     ),
   );
 }
@@ -121,6 +130,8 @@ class MeshCoreApp extends StatelessWidget {
   final AppDebugLogService appDebugLogService;
   final MapTileCacheService mapTileCacheService;
   final ChatTextScaleService chatTextScaleService;
+  final UiViewStateService uiViewStateService;
+  final TimeoutPredictionService timeoutPredictionService;
 
   const MeshCoreApp({
     super.key,
@@ -133,6 +144,8 @@ class MeshCoreApp extends StatelessWidget {
     required this.appDebugLogService,
     required this.mapTileCacheService,
     required this.chatTextScaleService,
+    required this.uiViewStateService,
+    required this.timeoutPredictionService,
   });
 
   @override
@@ -146,8 +159,10 @@ 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),
+        ChangeNotifierProvider.value(value: timeoutPredictionService),
       ],
       child: Consumer<AppSettingsService>(
         builder: (context, settingsService, child) {

lib/models/app_settings.dart

@@ -39,6 +39,9 @@ class AppSettings {
   final Map<String, String> batteryChemistryByRepeaterId;
   final UnitSystem unitSystem;
   final Set<String> mutedChannels;
+  final bool mapShowDiscoveryContacts;
+  final String tcpServerAddress;
+  final int tcpServerPort;
 
   AppSettings({
     this.clearPathOnMaxRetry = false,
@@ -66,6 +69,9 @@ class AppSettings {
     Map<String, String>? batteryChemistryByRepeaterId,
     this.unitSystem = UnitSystem.metric,
     Set<String>? mutedChannels,
+    this.mapShowDiscoveryContacts = true,
+    this.tcpServerAddress = '',
+    this.tcpServerPort = 0,
   }) : batteryChemistryByDeviceId = batteryChemistryByDeviceId ?? {},
        batteryChemistryByRepeaterId = batteryChemistryByRepeaterId ?? {},
        mutedChannels = mutedChannels ?? {};
@@ -97,6 +103,9 @@ class AppSettings {
       'battery_chemistry_by_repeater_id': batteryChemistryByRepeaterId,
       'unit_system': unitSystem.value,
       'muted_channels': mutedChannels.toList(),
+      'map_show_discovery_contacts': mapShowDiscoveryContacts,
+      'tcp_server_address': tcpServerAddress,
+      'tcp_server_port': tcpServerPort,
     };
   }
 
@@ -152,6 +161,10 @@ class AppSettings {
               ?.map((e) => e.toString())
               .toSet()) ??
           {},
+      mapShowDiscoveryContacts:
+          json['map_show_discovery_contacts'] as bool? ?? true,
+      tcpServerAddress: json['tcp_server_address'] as String? ?? '',
+      tcpServerPort: json['tcp_server_port'] as int? ?? 0,
     );
   }
 
@@ -181,6 +194,9 @@ class AppSettings {
     Map<String, String>? batteryChemistryByRepeaterId,
     UnitSystem? unitSystem,
     Set<String>? mutedChannels,
+    bool? mapShowDiscoveryContacts,
+    String? tcpServerAddress,
+    int? tcpServerPort,
   }) {
     return AppSettings(
       clearPathOnMaxRetry: clearPathOnMaxRetry ?? this.clearPathOnMaxRetry,
@@ -217,6 +233,10 @@ class AppSettings {
           batteryChemistryByRepeaterId ?? this.batteryChemistryByRepeaterId,
       unitSystem: unitSystem ?? this.unitSystem,
       mutedChannels: mutedChannels ?? this.mutedChannels,
+      mapShowDiscoveryContacts:
+          mapShowDiscoveryContacts ?? this.mapShowDiscoveryContacts,
+      tcpServerAddress: tcpServerAddress ?? this.tcpServerAddress,
+      tcpServerPort: tcpServerPort ?? this.tcpServerPort,
     );
   }
 }

lib/models/contact.dart

@@ -1,4 +1,6 @@
 import 'dart:typed_data';
+import 'package:meshcore_open/utils/app_logger.dart';
+
 import '../connector/meshcore_protocol.dart';
 
 class Contact {
@@ -15,6 +17,8 @@ class Contact {
   final double? longitude;
   final DateTime lastSeen;
   final DateTime lastMessageAt;
+  final bool isActive;
+  final Uint8List? rawPacket;
 
   Contact({
     required this.publicKey,
@@ -29,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);
@@ -59,7 +65,17 @@ class Contact {
     return '$pathLength hops';
   }
 
-  bool get hasLocation => latitude != null && longitude != null;
+  bool get hasLocation {
+    const double epsilon = 1e-6;
+    final lat = latitude ?? 0.0;
+    final lon = longitude ?? 0.0;
+    return (lat.abs() > epsilon || lon.abs() > epsilon) &&
+        lat >= -90.0 &&
+        lat <= 90.0 &&
+        lon >= -180.0 &&
+        lon <= 180.0;
+  }
+
   bool get isFavorite => (flags & contactFlagFavorite) != 0;
 
   Contact copyWith({
@@ -76,6 +92,8 @@ class Contact {
     double? longitude,
     DateTime? lastSeen,
     DateTime? lastMessageAt,
+    bool? isActive,
+    Uint8List? rawPacket,
   }) {
     return Contact(
       publicKey: publicKey ?? this.publicKey,
@@ -94,11 +112,13 @@ class Contact {
       longitude: longitude ?? this.longitude,
       lastSeen: lastSeen ?? this.lastSeen,
       lastMessageAt: lastMessageAt ?? this.lastMessageAt,
+      isActive: isActive ?? this.isActive,
+      rawPacket: rawPacket ?? this.rawPacket,
     );
   }
 
   String get pathIdList {
-    final pathBytes = _pathBytesForDisplay;
+    final pathBytes = pathBytesForDisplay;
     if (pathBytes.isEmpty) return '';
     final parts = <String>[];
     final groupSize = pathHashSize;
@@ -120,43 +140,7 @@ class Contact {
     return "<${publicKeyHex.substring(0, 8)}...${publicKeyHex.substring(publicKeyHex.length - 8)}>";
   }
 
-  Uint8List? get traceRouteBytes {
-    final pathBytes = _pathBytesForDisplay;
-    Uint8List? traceBytes;
-
-    if (pathBytes.isEmpty) {
-      traceBytes = Uint8List(1);
-      traceBytes[0] = publicKey[0];
-      return traceBytes;
-    }
-
-    if (type == advTypeRepeater || type == advTypeRoom) {
-      final len = (pathBytes.length + pathBytes.length + 1);
-      traceBytes = Uint8List(len);
-      traceBytes[pathBytes.length] = publicKey[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 ? null : pathBytes;
-      }
-      final len = (pathBytes.length + pathBytes.length - 1);
-      traceBytes = Uint8List(len);
-      for (int i = 0; i < pathBytes.length; i++) {
-        traceBytes[i] = pathBytes[i];
-        if (i < pathBytes.length - 1) {
-          traceBytes[len - 1 - i] = pathBytes[i];
-        }
-      }
-    }
-    return traceBytes;
-  }
-
-  Uint8List get _pathBytesForDisplay {
+  Uint8List get pathBytesForDisplay {
     if (pathOverride != null) {
       if (pathOverride! < 0) return Uint8List(0);
       return pathOverrideBytes ?? Uint8List(0);
@@ -166,28 +150,28 @@ class Contact {
 
   static Contact? fromFrame(Uint8List data) {
     if (data.isEmpty) return null;
-    if (data[0] != respCodeContact) return null;
+    final reader = BufferReader(data);
     try {
-      final pubKey = Uint8List.fromList(
-        data.sublist(contactPubKeyOffset, contactPubKeyOffset + pubKeySize),
-      );
-      final type = data[contactTypeOffset];
-      final flags = data[contactFlagsOffset];
-      final pathLen = data[contactPathLenOffset].toSigned(8);
+      final respCode = reader.readByte();
+      if (respCode != respCodeContact && respCode != pushCodeNewAdvert) {
+        return null;
+      }
+      final pubKey = reader.readBytes(pubKeySize);
+      final type = reader.readByte();
+      final flags = reader.readByte();
+      final pathLen = reader.readByte();
       final safePathLen = pathLen > 0
           ? (pathLen > maxPathSize ? maxPathSize : pathLen)
           : 0;
-      final pathBytes = safePathLen > 0
-          ? Uint8List.fromList(
-              data.sublist(contactPathOffset, contactPathOffset + safePathLen),
-            )
-          : Uint8List(0);
-      final name = readCString(data, contactNameOffset, maxNameSize);
-      final lastmod = readUint32LE(data, contactLastModOffset);
+      final pathBytes = reader.readBytes(maxPathSize).sublist(0, safePathLen);
+      final name = reader.readCStringGreedy(maxNameSize);
+
+      final lastMod = reader.readUInt32LE();
 
       double? lat, lon;
-      final latRaw = readInt32LE(data, contactLatOffset);
-      final lonRaw = readInt32LE(data, contactLonOffset);
+      final latRaw = reader.readInt32LE();
+      final lonRaw = reader.readInt32LE();
+
       if (latRaw != 0 || lonRaw != 0) {
         lat = latRaw / 1e6;
         lon = lonRaw / 1e6;
@@ -198,14 +182,16 @@ class Contact {
         name: name.isEmpty ? 'Unknown' : name,
         type: type,
         flags: flags,
-        pathLength: pathLen,
+        pathLength: pathLen > 0 ? (pathLen > maxPathSize ? -1 : pathLen) : -1,
         path: pathBytes,
         latitude: lat,
         longitude: lon,
-        lastSeen: DateTime.fromMillisecondsSinceEpoch(lastmod * 1000),
+        lastSeen: DateTime.fromMillisecondsSinceEpoch(lastMod * 1000),
+        isActive: true,
+        rawPacket: null,
       );
     } catch (e) {
-      // If parsing fails, return null
+      appLogger.error('Failed to parse contact frame: $e');
       return null;
     }
   }
@@ -216,4 +202,7 @@ class Contact {
 
   @override
   int get hashCode => publicKeyHex.hashCode;
+  bool get teleBaseEnabled => (flags & contactFlagTeleBase) != 0;
+  bool get teleLocEnabled => (flags & contactFlagTeleLoc) != 0;
+  bool get teleEnvEnabled => (flags & contactFlagTeleEnv) != 0;
 }

lib/models/delivery_observation.dart

@@ -0,0 +1,43 @@
+class DeliveryObservation {
+  final String contactKey;
+  final int pathLength;
+  final int messageBytes;
+  final int secondsSinceLastRx;
+  final bool isFlood;
+  final int deliveryMs;
+  final DateTime timestamp;
+
+  DeliveryObservation({
+    required this.contactKey,
+    required this.pathLength,
+    required this.messageBytes,
+    required this.secondsSinceLastRx,
+    required this.isFlood,
+    required this.deliveryMs,
+    required this.timestamp,
+  });
+
+  Map<String, dynamic> toJson() {
+    return {
+      'contact_key': contactKey,
+      'path_length': pathLength,
+      'message_bytes': messageBytes,
+      'seconds_since_last_rx': secondsSinceLastRx,
+      'is_flood': isFlood,
+      'delivery_ms': deliveryMs,
+      'timestamp': timestamp.toIso8601String(),
+    };
+  }
+
+  factory DeliveryObservation.fromJson(Map<String, dynamic> json) {
+    return DeliveryObservation(
+      contactKey: json['contact_key'] as String,
+      pathLength: json['path_length'] as int,
+      messageBytes: json['message_bytes'] as int,
+      secondsSinceLastRx: json['seconds_since_last_rx'] as int? ?? 0,
+      isFlood: json['is_flood'] as bool,
+      deliveryMs: json['delivery_ms'] as int,
+      timestamp: DateTime.parse(json['timestamp'] as String),
+    );
+  }
+}

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_chat_screen.dart

@@ -166,6 +166,33 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
           ],
         ),
         centerTitle: false,
+        actions: [
+          PopupMenuButton<String>(
+            icon: const Icon(Icons.more_vert),
+            onSelected: (value) {
+              if (value == 'clearChat') {
+                context.read<MeshCoreConnector>().clearMessagesForChannel(
+                  widget.channel.index,
+                );
+              }
+            },
+            itemBuilder: (context) => [
+              PopupMenuItem(
+                value: 'clearChat',
+                child: Row(
+                  children: [
+                    const Icon(Icons.delete, size: 20, color: Colors.red),
+                    const SizedBox(width: 12),
+                    Text(
+                      context.l10n.contact_clearChat,
+                      style: const TextStyle(color: Colors.red),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ],
       ),
       body: SafeArea(
         top: false,

lib/screens/channel_message_path_screen.dart

@@ -40,8 +40,8 @@ class ChannelMessagePathScreen extends StatelessWidget {
         final primaryPath = !channelMessage && !message.isOutgoing
             ? Uint8List.fromList(primaryPathTmp.reversed.toList())
             : primaryPathTmp;
-
-        final hops = _buildPathHops(primaryPath, connector.contacts, l10n);
+        final contacts = connector.allContacts;
+        final hops = _buildPathHops(primaryPath, contacts, l10n);
         final hasHopDetails = primaryPath.isNotEmpty;
         final observedLabel = _formatObservedHops(
           primaryPath.length,
@@ -62,8 +62,9 @@ class ChannelMessagePathScreen extends StatelessWidget {
                     builder: (context) => PathTraceMapScreen(
                       title: context.l10n.contacts_repeaterPathTrace,
                       path: primaryPath,
-                      flipPathRound: true,
-                      reversePathRound: !message.isOutgoing && !channelMessage,
+                      flipPathAround: true,
+                      reversePathAround:
+                          !(!channelMessage && !message.isOutgoing),
                     ),
                   ),
                 ),
@@ -364,11 +365,8 @@ class _ChannelMessagePathMapScreenState
             : selectedPathTmp;
 
         final selectedIndex = _indexForPath(selectedPath, observedPaths);
-        final hops = _buildPathHops(
-          selectedPath,
-          connector.contacts,
-          context.l10n,
-        );
+        final contacts = connector.allContacts;
+        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,17 +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();
+    _searchController.text = context
+        .read<UiViewStateService>()
+        .channelsSearchText;
     WidgetsBinding.instance.addPostFrameCallback((_) {
       context.read<MeshCoreConnector>().getChannels();
       _loadCommunities();
@@ -61,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(() {
@@ -106,7 +110,10 @@ 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;
 
     // Auto-navigate back to scanner if disconnected
     if (!checkConnectionAndNavigate(connector)) {
@@ -199,6 +206,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
             final filteredChannels = _filterAndSortChannels(
               channels,
               connector,
+              viewState,
             );
 
             return Column(
@@ -213,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(
@@ -240,9 +250,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                         const Duration(milliseconds: 300),
                         () {
                           if (!mounted) return;
-                          setState(() {
-                            _searchQuery = value.toLowerCase();
-                          });
+                          context
+                              .read<UiViewStateService>()
+                              .setChannelsSearchText(value);
                         },
                       );
                     },
@@ -277,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,
@@ -578,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);
       },
     );
   }
@@ -638,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) {
@@ -651,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:
@@ -712,6 +707,8 @@ class _ChannelsScreenState extends State<ChannelsScreen>
     bool isRegularHashtag = true;
     Community? selectedCommunity;
 
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
+
     showDialog(
       context: context,
       builder: (dialogContext) => StatefulBuilder(
@@ -763,7 +760,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
             );
           }
 
-          Widget? buildExpandedContent() {
+          Widget? buildExpandedContent(
+            ChannelMessageStore channelMessageStore,
+          ) {
             switch (selectedOption) {
               case 0: // Create Private Channel
                 return Column(
@@ -788,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(
@@ -810,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(
@@ -1329,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,
@@ -1338,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(
@@ -1348,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(
@@ -1358,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,
@@ -1366,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,
@@ -1374,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)!,
                   ],
                 ),
               ),
@@ -1524,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;
 
@@ -1749,6 +1761,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
     }
 
     final channelCount = communityChannels.length;
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
 
     showDialog(
       context: context,

lib/screens/chat_screen.dart

@@ -36,6 +36,7 @@ import '../widgets/gif_picker.dart';
 import '../widgets/path_selection_dialog.dart';
 import '../utils/app_logger.dart';
 import '../l10n/l10n.dart';
+import 'telemetry_screen.dart';
 
 class ChatScreen extends StatefulWidget {
   final Contact contact;
@@ -106,10 +107,9 @@ class _ChatScreenState extends State<ChatScreen> {
             final unreadLabel = context.l10n.chat_unread(unreadCount);
             final pathLabel = _currentPathLabel(contact);
 
-            // Show path details if we have path data (from device or override)
-            final hasPathData =
-                contact.path.isNotEmpty || contact.pathOverrideBytes != null;
+            // Show path details if we have non-empty path data (from device or override)
             final effectivePath = contact.pathOverrideBytes ?? contact.path;
+            final hasPathData = effectivePath.isNotEmpty;
 
             return Column(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -143,12 +143,25 @@ class _ChatScreenState extends State<ChatScreen> {
               final contact = _resolveContact(connector);
               final isFloodMode = contact.pathOverride == -1;
 
+              final isDirectMode = contact.pathOverride == 0;
+              final activeMode = isFloodMode
+                  ? 'flood'
+                  : isDirectMode
+                  ? 'direct'
+                  : 'auto';
+
               return PopupMenuButton<String>(
                 icon: Icon(isFloodMode ? Icons.waves : Icons.route),
                 tooltip: context.l10n.chat_routingMode,
                 onSelected: (mode) async {
                   if (mode == 'flood') {
                     await connector.setPathOverride(contact, pathLen: -1);
+                  } else if (mode == 'direct') {
+                    await connector.setPathOverride(
+                      contact,
+                      pathLen: 0,
+                      pathBytes: Uint8List(0),
+                    );
                   } else {
                     await connector.setPathOverride(contact, pathLen: null);
                   }
@@ -161,7 +174,7 @@ class _ChatScreenState extends State<ChatScreen> {
                         Icon(
                           Icons.auto_mode,
                           size: 20,
-                          color: !isFloodMode
+                          color: activeMode == 'auto'
                               ? Theme.of(context).primaryColor
                               : null,
                         ),
@@ -169,7 +182,30 @@ class _ChatScreenState extends State<ChatScreen> {
                         Text(
                           context.l10n.chat_autoUseSavedPath,
                           style: TextStyle(
-                            fontWeight: !isFloodMode
+                            fontWeight: activeMode == 'auto'
+                                ? FontWeight.bold
+                                : FontWeight.normal,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  PopupMenuItem(
+                    value: 'direct',
+                    child: Row(
+                      children: [
+                        Icon(
+                          Icons.near_me,
+                          size: 20,
+                          color: activeMode == 'direct'
+                              ? Theme.of(context).primaryColor
+                              : null,
+                        ),
+                        const SizedBox(width: 8),
+                        Text(
+                          context.l10n.chat_direct,
+                          style: TextStyle(
+                            fontWeight: activeMode == 'direct'
                                 ? FontWeight.bold
                                 : FontWeight.normal,
                           ),
@@ -184,7 +220,7 @@ class _ChatScreenState extends State<ChatScreen> {
                         Icon(
                           Icons.waves,
                           size: 20,
-                          color: isFloodMode
+                          color: activeMode == 'flood'
                               ? Theme.of(context).primaryColor
                               : null,
                         ),
@@ -192,7 +228,7 @@ class _ChatScreenState extends State<ChatScreen> {
                         Text(
                           context.l10n.chat_forceFloodMode,
                           style: TextStyle(
-                            fontWeight: isFloodMode
+                            fontWeight: activeMode == 'flood'
                                 ? FontWeight.bold
                                 : FontWeight.normal,
                           ),
@@ -209,9 +245,77 @@ class _ChatScreenState extends State<ChatScreen> {
             tooltip: context.l10n.chat_pathManagement,
             onPressed: () => _showPathHistory(context),
           ),
-          IconButton(
-            icon: const Icon(Icons.info_outline),
-            onPressed: () => _showContactInfo(context),
+          Consumer<MeshCoreConnector>(
+            builder: (context, connector, _) {
+              return PopupMenuButton<String>(
+                icon: const Icon(Icons.more_vert),
+                onSelected: (value) {
+                  if (value == 'info') {
+                    _showContactInfo(context);
+                  }
+                  if (value == 'settings') {
+                    _showContactSettings(context);
+                  }
+                  if (value == 'telemetry') {
+                    Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        builder: (context) =>
+                            TelemetryScreen(contact: widget.contact),
+                      ),
+                    );
+                  }
+                  if (value == 'clearChat') {
+                    connector.clearMessagesForContact(widget.contact);
+                  }
+                },
+                itemBuilder: (context) => [
+                  PopupMenuItem(
+                    value: 'info',
+                    child: Row(
+                      children: [
+                        const Icon(Icons.info_outline, size: 20),
+                        const SizedBox(width: 12),
+                        Text(context.l10n.contact_info),
+                      ],
+                    ),
+                  ),
+                  PopupMenuItem(
+                    value: 'telemetry',
+                    child: Row(
+                      children: [
+                        const Icon(Icons.bar_chart, size: 20),
+                        const SizedBox(width: 12),
+                        Text(context.l10n.contact_telemetry),
+                      ],
+                    ),
+                  ),
+                  PopupMenuItem(
+                    value: 'settings',
+                    child: Row(
+                      children: [
+                        const Icon(Icons.settings, size: 20),
+                        const SizedBox(width: 12),
+                        Text(context.l10n.contact_settings),
+                      ],
+                    ),
+                  ),
+                  PopupMenuItem(
+                    value: 'clearChat',
+                    child: Row(
+                      children: [
+                        const Icon(Icons.delete, size: 20, color: Colors.red),
+                        const SizedBox(width: 12),
+                        Text(
+                          context.l10n.contact_clearChat,
+                          style: const TextStyle(color: Colors.red),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              );
+            },
           ),
         ],
       ),
@@ -251,7 +355,9 @@ class _ChatScreenState extends State<ChatScreen> {
           ),
           const SizedBox(height: 8),
           Text(
-            context.l10n.chat_sendMessageTo(widget.contact.name),
+            context.l10n.chat_sendMessageTo(
+              _resolveContact(context.read<MeshCoreConnector>()).name,
+            ),
             style: TextStyle(fontSize: 14, color: Colors.grey[500]),
           ),
         ],
@@ -269,6 +375,7 @@ class _ChatScreenState extends State<ChatScreen> {
 
     // Auto-scroll to bottom if user is already at bottom
     WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
       _scrollController.scrollToBottomIfAtBottom();
     });
 
@@ -293,10 +400,10 @@ class _ChatScreenState extends State<ChatScreen> {
             );
           }
           final messageIndex = index;
-          Contact contact = widget.contact;
+          Contact contact = _resolveContact(connector);
           final message = reversedMessages[messageIndex];
           String fourByteHex = '';
-          if (widget.contact.type == advTypeRoom) {
+          if (contact.type == advTypeRoom) {
             contact = _resolveContactFrom4Bytes(
               connector,
               message.fourByteRoomContactKey.isEmpty
@@ -314,12 +421,13 @@ class _ChatScreenState extends State<ChatScreen> {
               final textScale = context.select<ChatTextScaleService, double>(
                 (service) => service.scale,
               );
+              final resolvedContact = _resolveContact(connector);
               return _MessageBubble(
                 message: message,
-                senderName: widget.contact.type == advTypeRoom
+                senderName: resolvedContact.type == advTypeRoom
                     ? "${contact.name} [$fourByteHex]"
                     : contact.name,
-                isRoomServer: widget.contact.type == advTypeRoom,
+                isRoomServer: resolvedContact.type == advTypeRoom,
                 textScale: textScale,
                 onTap: () => _openMessagePath(message, contact),
                 onLongPress: () => _showMessageActions(message, contact),
@@ -457,7 +565,7 @@ class _ChatScreenState extends State<ChatScreen> {
       return;
     }
 
-    connector.sendMessage(widget.contact, text);
+    connector.sendMessage(_resolveContact(connector), text);
     _textController.clear();
     _textFieldFocusNode.requestFocus();
   }
@@ -654,7 +762,7 @@ class _ChatScreenState extends State<ChatScreen> {
 
                                 // Set the path override to persist user's choice
                                 await connector.setPathOverride(
-                                  widget.contact,
+                                  _resolveContact(connector),
                                   pathLen: pathLength,
                                   pathBytes: pathBytes,
                                 );
@@ -663,7 +771,7 @@ class _ChatScreenState extends State<ChatScreen> {
                                 Navigator.pop(context);
                                 await _notifyPathSet(
                                   connector,
-                                  widget.contact,
+                                  _resolveContact(connector),
                                   pathBytes,
                                   path.hopCount,
                                 );
@@ -722,7 +830,9 @@ class _ChatScreenState extends State<ChatScreen> {
                         style: const TextStyle(fontSize: 11),
                       ),
                       onTap: () async {
-                        await connector.clearContactPath(widget.contact);
+                        await connector.clearContactPath(
+                          _resolveContact(connector),
+                        );
                         if (!context.mounted) return;
                         ScaffoldMessenger.of(context).showSnackBar(
                           SnackBar(
@@ -750,7 +860,7 @@ class _ChatScreenState extends State<ChatScreen> {
                       ),
                       onTap: () async {
                         await connector.setPathOverride(
-                          widget.contact,
+                          _resolveContact(connector),
                           pathLen: -1,
                         );
                         if (!context.mounted) return;
@@ -817,7 +927,7 @@ class _ChatScreenState extends State<ChatScreen> {
                 builder: (context) => PathTraceMapScreen(
                   title: context.l10n.contacts_repeaterPathTrace,
                   path: Uint8List.fromList(pathBytes),
-                  flipPathRound: true,
+                  flipPathAround: true,
                   targetContact: widget.contact,
                 ),
               ),
@@ -833,11 +943,22 @@ class _ChatScreenState extends State<ChatScreen> {
     );
   }
 
+  int _resolveContactIndex = -1;
+
   Contact _resolveContact(MeshCoreConnector connector) {
-    return connector.contacts.firstWhere(
+    if (_resolveContactIndex >= 0 &&
+        _resolveContactIndex < connector.contacts.length &&
+        connector.contacts[_resolveContactIndex].publicKeyHex ==
+            widget.contact.publicKeyHex) {
+      return connector.contacts[_resolveContactIndex];
+    }
+    _resolveContactIndex = connector.contacts.indexWhere(
       (c) => c.publicKeyHex == widget.contact.publicKeyHex,
-      orElse: () => widget.contact,
     );
+    if (_resolveContactIndex == -1) {
+      return widget.contact;
+    }
+    return connector.contacts[_resolveContactIndex];
   }
 
   Contact _resolveContactFrom4Bytes(
@@ -890,59 +1011,127 @@ class _ChatScreenState extends State<ChatScreen> {
 
   void _showContactInfo(BuildContext context) {
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
-    connector.ensureContactSmazSettingLoaded(widget.contact.publicKeyHex);
-
+    final contact = _resolveContact(connector);
     showDialog(
       context: context,
-      builder: (context) => Consumer<MeshCoreConnector>(
-        builder: (context, connector, _) {
-          final contact = _resolveContact(connector);
-          final smazEnabled = connector.isContactSmazEnabled(
-            contact.publicKeyHex,
-          );
-
-          return AlertDialog(
-            title: Text(contact.name),
-            content: SingleChildScrollView(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  _buildInfoRow(context.l10n.chat_type, contact.typeLabel),
-                  _buildInfoRow(context.l10n.chat_path, contact.pathLabel),
-                  if (contact.hasLocation)
-                    _buildInfoRow(
-                      context.l10n.chat_location,
-                      '${contact.latitude?.toStringAsFixed(4)}, ${contact.longitude?.toStringAsFixed(4)}',
-                    ),
-                  _buildInfoRow(
-                    context.l10n.chat_publicKey,
-                    '${contact.publicKeyHex.substring(0, 16)}...',
-                  ),
-                  const Divider(),
-                  SwitchListTile(
-                    contentPadding: EdgeInsets.zero,
-                    title: Text(context.l10n.channels_smazCompression),
-                    subtitle: Text(context.l10n.chat_compressOutgoingMessages),
-                    value: smazEnabled,
-                    onChanged: (value) {
-                      connector.setContactSmazEnabled(
-                        contact.publicKeyHex,
-                        value,
-                      );
-                    },
-                  ),
-                ],
-              ),
-            ),
-            actions: [
-              TextButton(
-                onPressed: () => Navigator.pop(context),
-                child: Text(context.l10n.common_close),
+      builder: (context) => AlertDialog(
+        title: SelectableText(contact.name),
+        content: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              _buildInfoRow(context.l10n.chat_type, contact.typeLabel),
+              _buildInfoRow(context.l10n.chat_path, contact.pathLabel),
+              _buildInfoRow(
+                context.l10n.contact_lastSeen,
+                _formatContactLastMessage(contact.lastMessageAt),
               ),
+              if (contact.hasLocation)
+                _buildInfoRow(
+                  context.l10n.chat_location,
+                  '${contact.latitude?.toStringAsFixed(4)}, ${contact.longitude?.toStringAsFixed(4)}',
+                ),
+              _buildInfoRow(context.l10n.chat_publicKey, contact.publicKeyHex),
             ],
-          );
-        },
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: Text(context.l10n.common_close),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void _showContactSettings(BuildContext context) {
+    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
+    connector.ensureContactSmazSettingLoaded(widget.contact.publicKeyHex);
+    final contact = widget.contact;
+    bool smazEnabled = connector.isContactSmazEnabled(contact.publicKeyHex);
+    bool teleBaseEnabled = contact.teleBaseEnabled;
+    bool teleLocEnabled = contact.teleLocEnabled;
+    bool teleEnvEnabled = contact.teleEnvEnabled;
+    showDialog(
+      context: context,
+      builder: (context) => StatefulBuilder(
+        builder: (context, setDialogState) => AlertDialog(
+          title: Text(context.l10n.contact_settings),
+          content: SingleChildScrollView(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (contact.hasLocation) ...[
+                  _buildInfoRow(
+                    context.l10n.chat_location,
+                    '${contact.latitude?.toStringAsFixed(4)}, ${contact.longitude?.toStringAsFixed(4)}',
+                  ),
+                  const Divider(height: 8),
+                ],
+                SwitchListTile(
+                  contentPadding: EdgeInsets.zero,
+                  title: Text(context.l10n.channels_smazCompression),
+                  subtitle: Text(context.l10n.chat_compressOutgoingMessages),
+                  value: smazEnabled,
+                  onChanged: (value) {
+                    connector.setContactSmazEnabled(
+                      contact.publicKeyHex,
+                      value,
+                    );
+                    setDialogState(() => smazEnabled = value);
+                  },
+                ),
+                const Divider(height: 8),
+                SwitchListTile(
+                  contentPadding: EdgeInsets.zero,
+                  title: Text(context.l10n.contact_teleBase),
+                  subtitle: Text(context.l10n.contact_teleBaseSubtitle),
+                  value: teleBaseEnabled,
+                  onChanged: (value) {
+                    setDialogState(() => teleBaseEnabled = value);
+                  },
+                ),
+                const Divider(height: 8),
+                SwitchListTile(
+                  contentPadding: EdgeInsets.zero,
+                  title: Text(context.l10n.contact_teleLoc),
+                  subtitle: Text(context.l10n.contact_teleLocSubtitle),
+                  value: teleLocEnabled,
+                  onChanged: (value) {
+                    setDialogState(() => teleLocEnabled = value);
+                  },
+                ),
+                const Divider(height: 8),
+                SwitchListTile(
+                  contentPadding: EdgeInsets.zero,
+                  title: Text(context.l10n.contact_teleEnv),
+                  subtitle: Text(context.l10n.contact_teleEnvSubtitle),
+                  value: teleEnvEnabled,
+                  onChanged: (value) {
+                    setDialogState(() => teleEnvEnabled = value);
+                  },
+                ),
+              ],
+            ),
+          ),
+          actions: [
+            TextButton(
+              onPressed: () {
+                connector.setContactFlags(
+                  contact,
+                  teleBase: teleBaseEnabled,
+                  teleLoc: teleLocEnabled,
+                  teleEnv: teleEnvEnabled,
+                );
+                Navigator.pop(context);
+              },
+              child: Text(context.l10n.common_close),
+            ),
+          ],
+        ),
       ),
     );
   }
@@ -957,12 +1146,32 @@ class _ChatScreenState extends State<ChatScreen> {
             width: 80,
             child: Text(label, style: TextStyle(color: Colors.grey[600])),
           ),
-          Expanded(child: Text(value)),
+          Expanded(child: SelectableText(value)),
         ],
       ),
     );
   }
 
+  String _formatContactLastMessage(DateTime timestamp) {
+    final diff = DateTime.now().difference(timestamp);
+    if (diff.isNegative || diff.inMinutes < 5) {
+      return context.l10n.contacts_lastSeenNow;
+    }
+    if (diff.inMinutes < 60) {
+      return context.l10n.contacts_lastSeenMinsAgo(diff.inMinutes);
+    }
+    if (diff.inHours < 24) {
+      final hours = diff.inHours;
+      return hours == 1
+          ? context.l10n.contacts_lastSeenHourAgo
+          : context.l10n.contacts_lastSeenHoursAgo(hours);
+    }
+    final days = diff.inDays;
+    return days == 1
+        ? context.l10n.contacts_lastSeenDayAgo
+        : context.l10n.contacts_lastSeenDaysAgo(days);
+  }
+
   void _openChat(BuildContext context, Contact contact) {
     // Check if this is a repeater
     context.read<MeshCoreConnector>().markContactRead(contact.publicKeyHex);
@@ -986,7 +1195,7 @@ class _ChatScreenState extends State<ChatScreen> {
     final currentPathLabel = _currentPathLabel(currentContact);
 
     // Filter out the current contact from available contacts
-    final availableContacts = connector.contacts
+    final availableContacts = connector.allContacts
         .where((c) => c != widget.contact)
         .toList();
 
@@ -1005,11 +1214,7 @@ class _ChatScreenState extends State<ChatScreen> {
     );
 
     if (result == null) {
-      appLogger.info(
-        'PathSelectionDialog was cancelled or returned null',
-        tag: 'ChatScreen',
-      );
-      return;
+      return; // Cancelled — keep existing path
     }
 
     if (!mounted) {
@@ -1025,14 +1230,19 @@ class _ChatScreenState extends State<ChatScreen> {
       tag: 'ChatScreen',
     );
     await connector.setPathOverride(
-      widget.contact,
+      _resolveContact(connector),
       pathLen: result.length,
       pathBytes: result,
     );
     appLogger.info('setPathOverride completed', tag: 'ChatScreen');
 
     if (!mounted) return;
-    await _notifyPathSet(connector, widget.contact, result, result.length);
+    await _notifyPathSet(
+      connector,
+      _resolveContact(connector),
+      result,
+      result.length,
+    );
   }
 
   void _openMessagePath(Message message, Contact contact) {
@@ -1044,10 +1254,10 @@ class _ChatScreenState extends State<ChatScreen> {
     final String senderName;
     if (message.isOutgoing) {
       senderName = connector.selfName ?? context.l10n.chat_me;
-    } else if (widget.contact.type == advTypeRoom) {
+    } else if (_resolveContact(connector).type == advTypeRoom) {
       senderName = "${contact.name} [$fourByteHex]";
     } else {
-      senderName = widget.contact.name;
+      senderName = _resolveContact(connector).name;
     }
     final pathMessage = ChannelMessage(
       senderKey: null,
@@ -1110,7 +1320,8 @@ class _ChatScreenState extends State<ChatScreen> {
                   _retryMessage(message);
                 },
               ),
-            if (widget.contact.type == advTypeRoom)
+            if (_resolveContact(context.read<MeshCoreConnector>()).type ==
+                advTypeRoom)
               ListTile(
                 leading: const Icon(Icons.chat),
                 title: Text(context.l10n.contacts_openChat),
@@ -1148,7 +1359,7 @@ class _ChatScreenState extends State<ChatScreen> {
   void _retryMessage(Message message) {
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
     // Retry using the contact's current path override setting
-    connector.sendMessage(widget.contact, message.text);
+    connector.sendMessage(_resolveContact(connector), message.text);
     ScaffoldMessenger.of(
       context,
     ).showSnackBar(SnackBar(content: Text(context.l10n.chat_retryingMessage)));
@@ -1174,7 +1385,8 @@ class _ChatScreenState extends State<ChatScreen> {
 
     // For room servers, include sender name (like channels) since multiple users
     // For 1:1 chats, sender is implicit (null)
-    final senderName = widget.contact.type == advTypeRoom
+    final liveContact = _resolveContact(connector);
+    final senderName = liveContact.type == advTypeRoom
         ? senderContact.name
         : null;
     final hash = ReactionHelper.computeReactionHash(
@@ -1183,7 +1395,7 @@ class _ChatScreenState extends State<ChatScreen> {
       message.text,
     );
     final reactionText = 'r:$hash:$emojiIndex';
-    connector.sendMessage(widget.contact, reactionText);
+    connector.sendMessage(_resolveContact(connector), reactionText);
   }
 }
 

lib/screens/community_qr_scanner_screen.dart

@@ -51,6 +51,9 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
       _isProcessing = true;
     });
 
+    final connector = context.read<MeshCoreConnector>();
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
+
     try {
       // Parse the community data
       final community = Community.fromQrData(const Uuid().v4(), data);
@@ -209,6 +212,8 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
     bool addPublicChannel,
   ) async {
     // Save community to local storage
+    final connector = context.read<MeshCoreConnector>();
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
     await _communityStore.addCommunity(community);
 
     // Optionally add the community public channel to the device

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,12 @@ 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 = connector.allContacts;
+
+        final contacts = settings.mapShowDiscoveryContacts
+            ? allContacts
+            : allContacts.where((c) => c.isActive).toList();
+
         final highlightPosition = widget.highlightPosition;
         final sharedMarkers = settings.mapShowMarkers
             ? _collectSharedMarkers(connector)
@@ -159,13 +175,13 @@ class _MapScreenState extends State<MapScreen> {
             : filteredByTime;
 
         // Filter by location
-        final contactsWithLocation = filteredByKeyPrefix
-            .where((c) => c.hasLocation)
-            .toList();
+        final contactsWithLocation = filteredByKeyPrefix.where((c) {
+          return c.hasLocation;
+        }).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
+        final allContactsWithLocation = allContacts
             .where((c) => c.hasLocation)
             .toList();
 
@@ -468,7 +484,10 @@ class _MapScreenState extends State<MapScreen> {
                             ),
                           ),
                         if (!_isBuildingPathTrace)
-                          ...guessedLocations.map(_buildGuessedMarker),
+                          ..._buildGuessedMarker(
+                            guessedLocations,
+                            showLabels: _showNodeLabels,
+                          ),
                         ..._buildMarkers(
                           contactsWithLocation,
                           settings,
@@ -630,6 +649,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 +663,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,40 +742,61 @@ class _MapScreenState extends State<MapScreen> {
         .toList();
   }
 
-  Marker _buildGuessedMarker(_GuessedLocation guess) {
-    final color = _getNodeColor(guess.contact.type);
-    return Marker(
-      point: guess.position,
-      width: 35,
-      height: 35,
-      child: GestureDetector(
-        onTap: () => _showNodeInfo(
-          context,
-          guess.contact,
-          guessedPosition: guess.position,
-        ),
-        child: Container(
-          padding: const EdgeInsets.all(4),
-          decoration: BoxDecoration(
-            color: color.withValues(alpha: guess.highConfidence ? 0.55 : 0.30),
-            shape: BoxShape.circle,
-            border: Border.all(color: Colors.white, width: 2),
-            boxShadow: [
-              BoxShadow(
-                color: Colors.black.withValues(alpha: 0.3),
-                blurRadius: 4,
-                offset: const Offset(0, 2),
+  List<Marker> _buildGuessedMarker(
+    List<_GuessedLocation> guessed, {
+    required bool showLabels,
+  }) {
+    final markers = <Marker>[];
+
+    for (final guess in guessed) {
+      final color = _getNodeColor(guess.contact.type);
+      final marker = Marker(
+        point: guess.position,
+        width: 35,
+        height: 35,
+        child: GestureDetector(
+          onTap: () => _showNodeInfo(
+            context,
+            guess.contact,
+            guessedPosition: guess.position,
+          ),
+          child: Container(
+            padding: const EdgeInsets.all(4),
+            decoration: BoxDecoration(
+              color: color.withValues(
+                alpha: guess.highConfidence ? 0.55 : 0.30,
               ),
-            ],
-          ),
-          child: const Icon(
-            Icons.not_listed_location,
-            color: Colors.white,
-            size: 20,
+              shape: BoxShape.circle,
+              border: Border.all(color: Colors.white, width: 2),
+              boxShadow: [
+                BoxShadow(
+                  color: Colors.black.withValues(alpha: 0.3),
+                  blurRadius: 4,
+                  offset: const Offset(0, 2),
+                ),
+              ],
+            ),
+            child: const Icon(
+              Icons.not_listed_location,
+              color: Colors.white,
+              size: 20,
+            ),
           ),
         ),
-      ),
-    );
+      );
+
+      markers.add(marker);
+
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: guess.position,
+            label: guess.contact.name,
+          ),
+        );
+      }
+    }
+    return markers;
   }
 
   List<Marker> _buildMarkers(
@@ -1203,6 +1256,7 @@ class _MapScreenState extends State<MapScreen> {
     Contact contact, {
     LatLng? guessedPosition,
   }) {
+    final connector = context.read<MeshCoreConnector>();
     showDialog(
       context: context,
       builder: (dialogContext) => AlertDialog(
@@ -1248,6 +1302,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 +1318,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 +1329,9 @@ class _MapScreenState extends State<MapScreen> {
           if (contact.type == advTypeRoom)
             TextButton(
               onPressed: () {
+                if (!contact.isActive) {
+                  connector.importDiscoveredContact(contact);
+                }
                 Navigator.pop(dialogContext);
                 _showRoomLogin(context, contact);
               },
@@ -1436,6 +1499,23 @@ class _MapScreenState extends State<MapScreen> {
                 );
               },
             ),
+            ListTile(
+              leading: const Icon(Icons.my_location),
+              title: Text(context.l10n.map_setAsMyLocation),
+              onTap: () async {
+                final messenger = ScaffoldMessenger.of(context);
+                final successMsg = context.l10n.settings_locationUpdated;
+                Navigator.pop(sheetContext);
+                if (!connector.isConnected) return;
+                await connector.setNodeLocation(
+                  lat: position.latitude,
+                  lon: position.longitude,
+                );
+                await connector.refreshDeviceInfo();
+                if (!mounted) return;
+                messenger.showSnackBar(SnackBar(content: Text(successMsg)));
+              },
+            ),
             ListTile(
               leading: const Icon(Icons.close),
               title: Text(context.l10n.common_cancel),
@@ -1745,6 +1825,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

@@ -44,6 +44,24 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
   PathSelection? _pendingStatusSelection;
   List<Map<String, dynamic>>? _parsedNeighbors;
 
+  int _resolveRepeaterIndex = -1;
+
+  Contact _resolveRepeater(MeshCoreConnector connector) {
+    if (_resolveRepeaterIndex >= 0 &&
+        _resolveRepeaterIndex < connector.contacts.length &&
+        connector.contacts[_resolveRepeaterIndex].publicKeyHex ==
+            widget.repeater.publicKeyHex) {
+      return connector.contacts[_resolveRepeaterIndex];
+    }
+    _resolveRepeaterIndex = connector.contacts.indexWhere(
+      (c) => c.publicKeyHex == widget.repeater.publicKeyHex,
+    );
+    if (_resolveRepeaterIndex == -1) {
+      return widget.repeater;
+    }
+    return connector.contacts[_resolveRepeaterIndex];
+  }
+
   @override
   void initState() {
     super.initState();
@@ -124,12 +142,11 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
 
   void _handleNeighborsResponse(MeshCoreConnector connector, Uint8List frame) {
     final buffer = BufferReader(frame);
+    final contacts = connector.allContacts;
     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(
@@ -164,13 +181,6 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
     }
   }
 
-  Contact _resolveRepeater(MeshCoreConnector connector) {
-    return connector.contacts.firstWhere(
-      (c) => c.publicKeyHex == widget.repeater.publicKeyHex,
-      orElse: () => widget.repeater,
-    );
-  }
-
   Future<void> _loadNeighbors() async {
     if (_commandService == null) return;
 

lib/screens/path_trace_map.dart

@@ -52,8 +52,8 @@ class PathTraceMapScreen extends StatefulWidget {
   final String title;
   final Uint8List path;
   final int? repeaterId;
-  final bool flipPathRound;
-  final bool reversePathRound;
+  final bool flipPathAround;
+  final bool reversePathAround;
   final Contact? targetContact;
 
   const PathTraceMapScreen({
@@ -61,8 +61,8 @@ class PathTraceMapScreen extends StatefulWidget {
     required this.title,
     required this.path,
     this.repeaterId,
-    this.flipPathRound = false,
-    this.reversePathRound = false,
+    this.flipPathAround = false,
+    this.reversePathAround = false,
     this.targetContact,
   });
 
@@ -93,6 +93,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
   ValueKey<String> _mapKey = const ValueKey('initial');
   double _pathDistanceMeters = 0.0;
   bool _showNodeLabels = true;
+  Contact? _targetContact;
 
   String _formatPathPrefixes(Uint8List pathBytes) {
     return pathBytes
@@ -114,14 +115,37 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
     super.dispose();
   }
 
-  Uint8List addReturnPath(Uint8List pathBytes) {
-    Uint8List? traceBytes;
-    final len = (pathBytes.length + pathBytes.length - 1);
-    traceBytes = Uint8List(len);
-    for (int i = 0; i < pathBytes.length; i++) {
-      traceBytes[i] = pathBytes[i];
-      if (i < pathBytes.length - 1) {
-        traceBytes[len - 1 - i] = pathBytes[i];
+  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++) {
+        traceBytes[i] = pathBytes[i];
+        if (i < pathBytes.length - 1) {
+          traceBytes[len - 1 - i] = pathBytes[i];
+        }
       }
     }
     return traceBytes;
@@ -135,17 +159,17 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
       });
     }
 
-    final Uint8List path;
-
-    Uint8List pathTmp = widget.reversePathRound
+    final pathTmp = widget.reversePathAround
         ? Uint8List.fromList(widget.path.reversed.toList())
         : widget.path;
 
-    if (widget.flipPathRound) {
-      path = addReturnPath(pathTmp);
-    } else {
-      path = pathTmp;
-    }
+    final path = widget.flipPathAround ? buildPath(pathTmp) : pathTmp;
+
+    appLogger.info(
+      'Initiating path trace with path: ${_formatPathPrefixes(path)}',
+      tag: 'PathTraceMapScreen',
+      noNotify: !mounted,
+    );
 
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
     final frame = buildTraceReq(
@@ -235,10 +259,8 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
           .toList();
 
       Map<int, Contact> pathContacts = {};
-
-      connector.contacts.where((c) => c.type != advTypeChat).forEach((
-        repeater,
-      ) {
+      final contacts = connector.allContacts;
+      contacts.where((c) => c.type != advTypeChat).forEach((repeater) {
         for (var repeaterData in pathData) {
           if (listEquals(
             repeater.publicKey.sublist(0, 1),
@@ -283,18 +305,21 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
         // Compute endpoint position for the target contact.
         LatLng? targetPos;
         bool targetGuessed = false;
-        final target = widget.targetContact;
-        if (target != null) {
-          if (target.hasLocation) {
-            targetPos = LatLng(target.latitude!, target.longitude!);
-          } else if (pathData.isNotEmpty) {
+        _targetContact = widget.targetContact;
+
+        if (_targetContact != null) {
+          final tc = _targetContact!;
+          if (tc.hasLocation) {
+            targetPos = LatLng(tc.latitude!, tc.longitude!);
+          } else if (widget.path.length > 1) {
             // Infer from the last hop: average GPS contacts sharing that hop.
-            // For a round-trip path (flipPathRound), the target-side hop sits
-            // in the middle of the symmetric sequence; .last is the local side.
-            final lastHop = (widget.flipPathRound && pathData.length > 1)
-                ? pathData[(pathData.length - 1) ~/ 2]
-                : pathData.last;
-            final peers = connector.contacts
+            // For a round-trip path (flipPathAround/reversePathAround), the target-side hop
+            // sits in the middle of the symmetric sequence; .last is the local side.
+            final lastHop = widget.reversePathAround
+                ? widget.path.first
+                : widget.path.last;
+
+            final peers = connector.allContacts
                 .where(
                   (c) =>
                       c.hasLocation &&
@@ -310,12 +335,34 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                   peers.map((c) => c.longitude!).reduce((a, b) => a + b) /
                   peers.length;
               const offsetDeg = 0.003;
-              final angle = (target.publicKey[1] / 255.0) * 2 * pi;
+              final angle = (tc.publicKey[1] / 255.0) * 2 * pi;
               targetPos = LatLng(
                 lat + offsetDeg * cos(angle),
                 lon + offsetDeg * sin(angle),
               );
               targetGuessed = true;
+            } else if (inferredPositions.containsKey(lastHop)) {
+              final lat = inferredPositions[lastHop]!.latitude;
+              final lon = inferredPositions[lastHop]!.longitude;
+              const offsetDeg = 0.003;
+              final angle = (tc.publicKey[1] / 255.0) * 2 * pi;
+              targetPos = LatLng(
+                lat + offsetDeg * cos(angle),
+                lon + offsetDeg * sin(angle),
+              );
+              targetGuessed = true;
+            } else {
+              // As a last resort, just place it at the same position as the last hop.
+              final contact = pathContacts[lastHop];
+              if (contact != null && contact.hasLocation) {
+                const offsetDeg = 0.003;
+                final angle = (tc.publicKey[1] / 255.0) * 2 * pi;
+                targetPos = LatLng(
+                  contact.latitude! + offsetDeg * cos(angle),
+                  contact.longitude! + offsetDeg * sin(angle),
+                );
+                targetGuessed = true;
+              }
             }
           }
         }
@@ -324,7 +371,12 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
 
         _points = <LatLng>[];
         _points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        int hopLast = 0;
+        int hopLastLast = 0;
         for (final hop in _traceData!.pathData) {
+          if (hop == hopLastLast && widget.flipPathAround) {
+            break; //skip duplicate hops in round-trip paths
+          }
           final contact = _traceData!.pathContacts[hop];
           if (contact != null && contact.hasLocation) {
             _points.add(LatLng(contact.latitude!, contact.longitude!));
@@ -332,8 +384,14 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
             final inferred = inferredPositions[hop];
             if (inferred != null) _points.add(inferred);
           }
+          hopLastLast = hopLast;
+          hopLast = hop;
+        }
+        if (targetPos != null) {
+          if (_targetContact != null && _targetContact!.type == advTypeChat) {
+            _points.add(targetPos);
+          }
         }
-        if (targetPos != null) _points.add(targetPos);
         _polylines = _points.length > 1
             ? [
                 Polyline(
@@ -422,7 +480,8 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                       ],
                     ),
                   ),
-                if (_hasData) _buildMapPathTrace(context, tileCache),
+                if (_hasData)
+                  _buildMapPathTrace(context, tileCache, _targetContact),
                 if (_points.isEmpty &&
                     !_hasData &&
                     !_isLoading &&
@@ -451,17 +510,28 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
   List<Marker> _buildHopMarkers(
     List<int> pathData, {
     required bool showLabels,
+    required Contact? target,
   }) {
     final markers = <Marker>[];
+    int hopLast = 0;
+    int hopLastLast = 0;
     for (final hop in pathData) {
       final contact = _traceData!.pathContacts[hop];
       final inferred = _inferredHopPositions[hop];
       final hasGps = contact != null && contact.hasLocation;
-      if (!hasGps && inferred == null) continue;
+      if (hop == hopLastLast && widget.flipPathAround) {
+        continue; //skip duplicate hops in round-trip paths
+      }
+      if (!hasGps && inferred == null) {
+        hopLastLast = hopLast;
+        hopLast = hop;
+        continue; //skip hops with no GPS and no inferred position
+      }
       final point = hasGps
           ? LatLng(contact.latitude!, contact.longitude!)
           : inferred!;
       final label = hop.toRadixString(16).padLeft(2, '0').toUpperCase();
+
       markers.add(
         Marker(
           point: point,
@@ -503,6 +573,8 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
           ),
         );
       }
+      hopLastLast = hopLast;
+      hopLast = hop;
     }
 
     final selfLat = context.read<MeshCoreConnector>().selfLatitude;
@@ -552,9 +624,9 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
 
     // Add target contact endpoint marker.
     final targetPos = _targetContactPosition;
-    if (targetPos != null) {
+    if (targetPos != null && target != null && target.type == advTypeChat) {
       final isGuessed = _targetContactIsGuessed;
-      final targetName = widget.targetContact?.name ?? '?';
+      final targetName = target.name;
       markers.add(
         Marker(
           point: targetPos,
@@ -690,6 +762,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
   Widget _buildMapPathTrace(
     BuildContext context,
     MapTileCacheService tileCache,
+    Contact? target,
   ) {
     return FlutterMap(
       key: _mapKey,
@@ -728,6 +801,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
             markers: _buildHopMarkers(
               _traceData!.pathData,
               showLabels: _showNodeLabels,
+              target: target,
             ),
           ),
       ],

lib/screens/repeater_cli_screen.dart

@@ -77,11 +77,22 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
     });
   }
 
+  int _resolveRepeaterIndex = -1;
+
   Contact _resolveRepeater(MeshCoreConnector connector) {
-    return connector.contacts.firstWhere(
+    if (_resolveRepeaterIndex >= 0 &&
+        _resolveRepeaterIndex < connector.contacts.length &&
+        connector.contacts[_resolveRepeaterIndex].publicKeyHex ==
+            widget.repeater.publicKeyHex) {
+      return connector.contacts[_resolveRepeaterIndex];
+    }
+    _resolveRepeaterIndex = connector.contacts.indexWhere(
       (c) => c.publicKeyHex == widget.repeater.publicKeyHex,
-      orElse: () => widget.repeater,
     );
+    if (_resolveRepeaterIndex == -1) {
+      return widget.repeater;
+    }
+    return connector.contacts[_resolveRepeaterIndex];
   }
 
   void _handleTextMessageResponse(Uint8List frame) {

lib/screens/repeater_hub_screen.dart

@@ -205,8 +205,7 @@ class RepeaterHubScreen extends StatelessWidget {
                 Navigator.push(
                   context,
                   MaterialPageRoute(
-                    builder: (context) =>
-                        TelemetryScreen(repeater: repeater, password: password),
+                    builder: (context) => TelemetryScreen(contact: repeater),
                   ),
                 );
               },

lib/screens/repeater_settings_screen.dart

@@ -129,11 +129,22 @@ class _RepeaterSettingsScreenState extends State<RepeaterSettingsScreen> {
     _commandService?.handleResponse(widget.repeater, parsed.text);
   }
 
+  int _resolveRepeaterIndex = -1;
+
   Contact _resolveRepeater(MeshCoreConnector connector) {
-    return connector.contacts.firstWhere(
+    if (_resolveRepeaterIndex >= 0 &&
+        _resolveRepeaterIndex < connector.contacts.length &&
+        connector.contacts[_resolveRepeaterIndex].publicKeyHex ==
+            widget.repeater.publicKeyHex) {
+      return connector.contacts[_resolveRepeaterIndex];
+    }
+    _resolveRepeaterIndex = connector.contacts.indexWhere(
       (c) => c.publicKeyHex == widget.repeater.publicKeyHex,
-      orElse: () => widget.repeater,
     );
+    if (_resolveRepeaterIndex == -1) {
+      return widget.repeater;
+    }
+    return connector.contacts[_resolveRepeaterIndex];
   }
 
   bool _matchesRepeaterPrefix(Uint8List prefix) {

lib/screens/repeater_status_screen.dart

@@ -91,11 +91,22 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
     });
   }
 
+  int _resolveRepeaterIndex = -1;
+
   Contact _resolveRepeater(MeshCoreConnector connector) {
-    return connector.contacts.firstWhere(
+    if (_resolveRepeaterIndex >= 0 &&
+        _resolveRepeaterIndex < connector.contacts.length &&
+        connector.contacts[_resolveRepeaterIndex].publicKeyHex ==
+            widget.repeater.publicKeyHex) {
+      return connector.contacts[_resolveRepeaterIndex];
+    }
+    _resolveRepeaterIndex = connector.contacts.indexWhere(
       (c) => c.publicKeyHex == widget.repeater.publicKeyHex,
-      orElse: () => widget.repeater,
     );
+    if (_resolveRepeaterIndex == -1) {
+      return widget.repeater;
+    }
+    return connector.contacts[_resolveRepeaterIndex];
   }
 
   void _handleTextMessageResponse(Uint8List frame) {

lib/screens/scanner_screen.dart

@@ -6,9 +6,12 @@ import 'package:provider/provider.dart';
 
 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
+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
 class ScannerScreen extends StatefulWidget {
@@ -20,6 +23,7 @@ class ScannerScreen extends StatefulWidget {
 
 class _ScannerScreenState extends State<ScannerScreen> {
   bool _changedNavigation = false;
+  late final MeshCoreConnector _connector;
   late final VoidCallback _connectionListener;
   BluetoothAdapterState _bluetoothState = BluetoothAdapterState.unknown;
   late StreamSubscription<BluetoothAdapterState> _bluetoothStateSubscription;
@@ -27,12 +31,15 @@ class _ScannerScreenState extends State<ScannerScreen> {
   @override
   void initState() {
     super.initState();
-    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
+    _connector = Provider.of<MeshCoreConnector>(context, listen: false);
 
     _connectionListener = () {
-      if (connector.state == MeshCoreConnectionState.disconnected) {
+      final isCurrentRoute = ModalRoute.of(context)?.isCurrent ?? true;
+      if (_connector.state == MeshCoreConnectionState.disconnected) {
         _changedNavigation = false;
-      } else if (connector.state == MeshCoreConnectionState.connected &&
+      } else if (_connector.state == MeshCoreConnectionState.connected &&
+          _connector.activeTransport == MeshCoreTransportType.bluetooth &&
+          isCurrentRoute &&
           !_changedNavigation) {
         _changedNavigation = true;
         if (mounted) {
@@ -43,7 +50,7 @@ class _ScannerScreenState extends State<ScannerScreen> {
       }
     };
 
-    connector.addListener(_connectionListener);
+    _connector.addListener(_connectionListener);
 
     _bluetoothStateSubscription = FlutterBluePlus.adapterState.listen(
       (state) {
@@ -53,28 +60,42 @@ class _ScannerScreenState extends State<ScannerScreen> {
           });
           // Cancel scan if Bluetooth turns off while scanning
           if (state != BluetoothAdapterState.on) {
-            unawaited(connector.stopScan());
+            unawaited(_connector.stopScan());
           }
         }
       },
       onError: (Object e) {
-        debugPrint("Scanner adapterState stream error: $e");
+        appLogger.warn('Adapter state stream error: $e', tag: 'ScannerScreen');
       },
     );
   }
 
   @override
   void dispose() {
-    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
-    connector.removeListener(_connectionListener);
+    _connector.removeListener(_connectionListener);
     unawaited(_bluetoothStateSubscription.cancel());
+    if (!_changedNavigation) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        unawaited(_connector.disconnect(manual: true));
+      });
+    }
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
+    final canPop = Navigator.of(context).canPop();
     return Scaffold(
       appBar: AppBar(
+        leading: canPop
+            ? IconButton(
+                icon: const Icon(Icons.arrow_back),
+                onPressed: () {
+                  appLogger.info('Back button pressed', tag: 'ScannerScreen');
+                  Navigator.of(context).maybePop();
+                },
+              )
+            : null,
         title: AdaptiveAppBarTitle(context.l10n.scanner_title),
         centerTitle: true,
         automaticallyImplyLeading: false,
@@ -99,40 +120,84 @@ class _ScannerScreenState extends State<ScannerScreen> {
           },
         ),
       ),
-      floatingActionButton: Consumer<MeshCoreConnector>(
+      bottomNavigationBar: Consumer<MeshCoreConnector>(
         builder: (context, connector, child) {
           final isScanning =
               connector.state == MeshCoreConnectionState.scanning;
           final isBluetoothOff = _bluetoothState == BluetoothAdapterState.off;
+          final usbSupported = PlatformInfo.supportsUsbSerial;
+          final tcpSupported = !PlatformInfo.isWeb;
 
-          return FloatingActionButton.extended(
-            onPressed: isBluetoothOff
-                ? null
-                : () {
-                    if (isScanning) {
-                      connector.stopScan();
-                    } else {
-                      unawaited(
-                        connector.startScan().catchError((e) {
-                          debugPrint("Scanner screen startScan error: $e");
-                        }),
-                      );
-                    }
-                  },
-            icon: isScanning
-                ? const SizedBox(
-                    width: 20,
-                    height: 20,
-                    child: CircularProgressIndicator(
-                      strokeWidth: 2,
-                      color: Colors.white,
+          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 (usbSupported)
+                    FloatingActionButton.extended(
+                      onPressed: () {
+                        appLogger.info(
+                          'USB selected, opening UsbScreen',
+                          tag: 'ScannerScreen',
+                        );
+                        Navigator.of(context).push(
+                          MaterialPageRoute(builder: (_) => const UsbScreen()),
+                        );
+                      },
+                      heroTag: 'scanner_usb_action',
+                      icon: const Icon(Icons.usb),
+                      label: Text(context.l10n.connectionChoiceUsbLabel),
                     ),
-                  )
-                : const Icon(Icons.bluetooth_searching),
-            label: Text(
-              isScanning
-                  ? context.l10n.scanner_stop
-                  : context.l10n.scanner_scan,
+                  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
+                        ? null
+                        : () {
+                            if (isScanning) {
+                              connector.stopScan();
+                            } else {
+                              unawaited(
+                                connector.startScan().catchError((e) {
+                                  appLogger.warn(
+                                    'startScan error: $e',
+                                    tag: 'ScannerScreen',
+                                  );
+                                }),
+                              );
+                            }
+                          },
+                    icon: isScanning
+                        ? const SizedBox(
+                            width: 20,
+                            height: 20,
+                            child: CircularProgressIndicator(strokeWidth: 2),
+                          )
+                        : const Icon(Icons.bluetooth_searching),
+                    label: Text(
+                      isScanning
+                          ? context.l10n.scanner_stop
+                          : context.l10n.scanner_scan,
+                    ),
+                  ),
+                ],
+              ),
             ),
           );
         },

lib/screens/settings_screen.dart

@@ -287,10 +287,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
           const Divider(height: 1),
           ListTile(
             leading: const Icon(Icons.visibility_off_outlined),
-            title: Text(l10n.settings_privacyMode),
-            subtitle: Text(l10n.settings_privacyModeSubtitle),
+            title: Text(l10n.settings_privacy),
+            subtitle: Text(l10n.settings_privacySubtitle),
             trailing: const Icon(Icons.chevron_right),
-            onTap: () => _togglePrivacy(context, connector),
+            onTap: () => _privacySettings(context, connector),
           ),
         ],
       ),
@@ -657,47 +657,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  void _togglePrivacy(BuildContext context, MeshCoreConnector connector) {
-    final l10n = context.l10n;
-    showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Text(l10n.settings_privacyMode),
-        content: Text(l10n.settings_privacyModeToggle),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context),
-            child: Text(l10n.common_cancel),
-          ),
-          TextButton(
-            onPressed: () async {
-              Navigator.pop(context);
-              await connector.setPrivacyMode(true);
-              await connector.refreshDeviceInfo();
-              if (!context.mounted) return;
-              ScaffoldMessenger.of(context).showSnackBar(
-                SnackBar(content: Text(l10n.settings_privacyModeEnabled)),
-              );
-            },
-            child: Text(l10n.common_enable),
-          ),
-          TextButton(
-            onPressed: () async {
-              Navigator.pop(context);
-              await connector.setPrivacyMode(false);
-              await connector.refreshDeviceInfo();
-              if (!context.mounted) return;
-              ScaffoldMessenger.of(context).showSnackBar(
-                SnackBar(content: Text(l10n.settings_privacyModeDisabled)),
-              );
-            },
-            child: Text(l10n.common_disable),
-          ),
-        ],
-      ),
-    );
-  }
-
   void _sendAdvert(BuildContext context, MeshCoreConnector connector) {
     final l10n = context.l10n;
     connector.sendSelfAdvert(flood: true);
@@ -977,6 +936,137 @@ class _SettingsScreenState extends State<SettingsScreen> {
   }
 }
 
+void _privacySettings(BuildContext context, MeshCoreConnector connector) {
+  final l10n = context.l10n;
+
+  int telemetryMode = connector.telemetryModeBase;
+  int telemetryLocMode = connector.telemetryModeLoc;
+  int telemetryEnvMode = connector.telemetryModeEnv;
+  bool advertLocPolicy = connector.advertLocationPolicy == 0 ? false : true;
+  int multiAcks = connector.multiAcks;
+
+  final telemModeBase = [
+    DropdownMenuItem(value: teleModeDeny, child: Text(l10n.settings_denyAll)),
+    DropdownMenuItem(
+      value: teleModeAllowFlags,
+      child: Text(l10n.settings_allowByContact),
+    ),
+    DropdownMenuItem(
+      value: teleModeAllowAll,
+      child: Text(l10n.settings_allowAll),
+    ),
+  ];
+
+  showDialog(
+    context: context,
+    builder: (dialogContext) => StatefulBuilder(
+      builder: (context, setDialogState) => AlertDialog(
+        title: Text(l10n.settings_privacy),
+        content: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(l10n.settings_privacySettingsDescription),
+              const SizedBox(height: 16),
+              FeatureToggleRow(
+                title: l10n.settings_advertLocation,
+                subtitle: l10n.settings_advertLocationSubtitle,
+                value: advertLocPolicy,
+                onChanged: (value) {
+                  setDialogState(() => advertLocPolicy = value);
+                  advertLocPolicy = value;
+                },
+              ),
+              const SizedBox(height: 8),
+              DropdownButtonFormField<int>(
+                initialValue: telemetryMode,
+                decoration: InputDecoration(
+                  labelText: l10n.settings_telemetryBaseMode,
+                  border: const OutlineInputBorder(),
+                ),
+                items: telemModeBase,
+                onChanged: (value) {
+                  if (value != null) {
+                    setDialogState(() => telemetryMode = value);
+                  }
+                },
+              ),
+              const SizedBox(height: 16),
+              DropdownButtonFormField<int>(
+                initialValue: telemetryLocMode,
+                decoration: InputDecoration(
+                  labelText: l10n.settings_telemetryLocationMode,
+                  border: const OutlineInputBorder(),
+                ),
+                items: telemModeBase,
+                onChanged: (value) {
+                  if (value != null) {
+                    setDialogState(() => telemetryLocMode = value);
+                  }
+                },
+              ),
+              const SizedBox(height: 16),
+              DropdownButtonFormField<int>(
+                initialValue: telemetryEnvMode,
+                decoration: InputDecoration(
+                  labelText: l10n.settings_telemetryEnvironmentMode,
+                  border: const OutlineInputBorder(),
+                ),
+                items: telemModeBase,
+                onChanged: (value) {
+                  if (value != null) {
+                    setDialogState(() => telemetryEnvMode = value);
+                  }
+                },
+              ),
+              const SizedBox(height: 16),
+              Text(
+                l10n.settings_multiAck(multiAcks.toString()),
+                style: Theme.of(context).textTheme.bodyMedium,
+              ),
+              Slider(
+                value: multiAcks.toDouble(),
+                min: 0,
+                max: 2,
+                divisions: 2,
+                label: multiAcks.toString(),
+                onChanged: (value) {
+                  setDialogState(() => multiAcks = value.round());
+                },
+              ),
+            ],
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: Text(l10n.common_cancel),
+          ),
+          TextButton(
+            onPressed: () async {
+              Navigator.pop(context);
+              await connector.setTelemetryModeBase(
+                telemetryMode,
+                telemetryLocMode,
+                telemetryEnvMode,
+                advertLocPolicy ? 1 : 0,
+                multiAcks,
+              );
+              await connector.refreshDeviceInfo();
+              if (!context.mounted) return;
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(content: Text(l10n.settings_telemetryModeUpdated)),
+              );
+            },
+            child: Text(l10n.common_save),
+          ),
+        ],
+      ),
+    ),
+  );
+}
+
 class _RadioSettingsDialog extends StatefulWidget {
   final MeshCoreConnector connector;
 

lib/screens/tcp_screen.dart

@@ -0,0 +1,295 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../connector/meshcore_connector.dart';
+import '../l10n/l10n.dart';
+import '../services/app_settings_service.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(
+      text: context.read<AppSettingsService>().settings.tcpServerAddress,
+    );
+    _portController = TextEditingController(
+      text: context.read<AppSettingsService>().settings.tcpServerPort > 0
+          ? context.read<AppSettingsService>().settings.tcpServerPort.toString()
+          : '',
+    );
+    _connector = context.read<MeshCoreConnector>();
+
+    _connectionListener = () {
+      if (!mounted) return;
+      if (_connector.state == MeshCoreConnectionState.disconnected) {
+        _navigatedToContacts = false;
+      }
+      if (_connector.state == MeshCoreConnectionState.connected &&
+          _connector.isTcpTransportConnected &&
+          !_navigatedToContacts) {
+        context.read<AppSettingsService>().setTcpServerAddress(
+          _hostController.text,
+        );
+        context.read<AppSettingsService>().setTcpServerPort(
+          int.tryParse(_portController.text) ?? 0,
+        );
+        _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/telemetry_screen.dart

@@ -10,30 +10,22 @@ import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
 import '../services/app_settings_service.dart';
 import '../services/repeater_command_service.dart';
+import '../utils/app_logger.dart';
 import '../widgets/path_management_dialog.dart';
 import '../helpers/cayenne_lpp.dart';
 import '../utils/battery_utils.dart';
 
 class TelemetryScreen extends StatefulWidget {
-  final Contact repeater;
-  final String password;
+  final Contact contact;
 
-  const TelemetryScreen({
-    super.key,
-    required this.repeater,
-    required this.password,
-  });
+  const TelemetryScreen({super.key, required this.contact});
 
   @override
   State<TelemetryScreen> createState() => _TelemetryScreenState();
 }
 
 class _TelemetryScreenState extends State<TelemetryScreen> {
-  static const int _statusPayloadOffset = 8;
-  static const int _statusStatsSize = 52;
-  static const int _statusResponseBytes =
-      _statusPayloadOffset + _statusStatsSize;
-  Uint8List _tagData = Uint8List(4);
+  int _tagData = 0;
 
   bool _isLoading = false;
   bool _isLoaded = false;
@@ -44,6 +36,26 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
   PathSelection? _pendingStatusSelection;
   List<Map<String, dynamic>>? _parsedTelemetry;
 
+  int _tripTime = 0;
+
+  int _resolveContactIndex = -1;
+
+  Contact _resolveContact(MeshCoreConnector connector) {
+    if (_resolveContactIndex >= 0 &&
+        _resolveContactIndex < connector.contacts.length &&
+        connector.contacts[_resolveContactIndex].publicKeyHex ==
+            widget.contact.publicKeyHex) {
+      return connector.contacts[_resolveContactIndex];
+    }
+    _resolveContactIndex = connector.contacts.indexWhere(
+      (c) => c.publicKeyHex == widget.contact.publicKeyHex,
+    );
+    if (_resolveContactIndex == -1) {
+      return widget.contact;
+    }
+    return connector.contacts[_resolveContactIndex];
+  }
+
   @override
   void initState() {
     super.initState();
@@ -60,27 +72,62 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
     // Listen for incoming text messages from the repeater
     _frameSubscription = connector.receivedFrames.listen((frame) {
       if (frame.isEmpty) return;
+      final reader = BufferReader(frame);
+      try {
+        final cmd = reader.readByte();
+        if (cmd == respCodeSent) {
+          reader.skipBytes(1); // Skip the reserved byte
+          _tagData = reader.readUInt32LE();
+          _tripTime = reader.readUInt32LE();
+          _statusTimeout?.cancel();
+          _statusTimeout = Timer(Duration(milliseconds: _tripTime), () {
+            if (!mounted) return;
+            setState(() {
+              _isLoading = false;
+              _isLoaded = false;
+            });
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.telemetry_requestTimeout),
+                backgroundColor: Colors.red,
+              ),
+            );
+            _recordTelemetryResult(false);
+          });
+        }
 
-      if (frame[0] == respCodeSent) {
-        _tagData = frame.sublist(2, 6);
-      }
+        // Check if it's a binary response
+        if (cmd == pushCodeBinaryResponse) {
+          if (!mounted) return;
+          reader.skipBytes(1); // Skip the reserved byte
+          if (reader.readUInt32LE() != _tagData) return;
+          _handleTelemetryResponse(reader.readRemainingBytes());
+        }
 
-      // Check if it's a binary response
-      if (frame[0] == pushCodeBinaryResponse &&
-          listEquals(frame.sublist(2, 6), _tagData)) {
-        if (!mounted) return;
-        _handleStatusResponse(frame.sublist(6));
+        // Check if it's a telemetry response (for chat contacts)
+        if (cmd == pushCodeTelemetryResponse) {
+          reader.skipBytes(1); // Skip the reserved byte
+          final pubkey = reader.readBytes(6);
+          if (!mounted) return;
+          if (!listEquals(widget.contact.publicKey.sublist(0, 6), pubkey)) {
+            return;
+          }
+          _handleTelemetryResponse(reader.readRemainingBytes());
+        }
+      } catch (e) {
+        appLogger.error('Error parsing incoming frame: $e');
+        // If parsing fails, ignore the frame
       }
     });
   }
 
-  void _handleStatusResponse(Uint8List frame) {
+  void _handleTelemetryResponse(Uint8List frame) {
     final parsedTelemetry = CayenneLpp.parseByChannel(frame);
     final batteryMv = _extractTelemetryBatteryMillivolts(parsedTelemetry);
     if (batteryMv != null) {
       final connector = Provider.of<MeshCoreConnector>(context, listen: false);
       connector.updateRepeaterBatterySnapshot(
-        widget.repeater.publicKeyHex,
+        widget.contact.publicKeyHex,
         batteryMv,
         source: 'telemetry',
       );
@@ -105,13 +152,6 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
     });
   }
 
-  Contact _resolveRepeater(MeshCoreConnector connector) {
-    return connector.contacts.firstWhere(
-      (c) => c.publicKeyHex == widget.repeater.publicKeyHex,
-      orElse: () => widget.repeater,
-    );
-  }
-
   Future<void> _loadTelemetry() async {
     if (_commandService == null) return;
 
@@ -121,41 +161,20 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
     });
     try {
       final connector = Provider.of<MeshCoreConnector>(context, listen: false);
-      final repeater = _resolveRepeater(connector);
-      final selection = await connector.preparePathForContactSend(repeater);
+      final selection = await connector.preparePathForContactSend(
+        _resolveContact(connector),
+      );
       _pendingStatusSelection = selection;
-      final frame = buildSendBinaryReq(
-        repeater.publicKey,
-        payload: Uint8List.fromList([reqTypeGetTelemetry]),
-      );
-      await connector.sendFrame(frame);
-
-      final pathLengthValue = selection.useFlood ? -1 : selection.hopCount;
-      var messageBytes = frame.length >= _statusResponseBytes
-          ? frame.length
-          : _statusResponseBytes;
-      if (messageBytes < maxFrameSize) {
-        messageBytes = maxFrameSize;
-      }
-      final timeoutMs = connector.calculateTimeout(
-        pathLength: pathLengthValue,
-        messageBytes: messageBytes,
-      );
-      _statusTimeout?.cancel();
-      _statusTimeout = Timer(Duration(milliseconds: timeoutMs), () {
-        if (!mounted) return;
-        setState(() {
-          _isLoading = false;
-          _isLoaded = false;
-        });
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(context.l10n.telemetry_requestTimeout),
-            backgroundColor: Colors.red,
-          ),
+      Uint8List frame;
+      if (widget.contact.type != advTypeChat) {
+        frame = buildSendBinaryReq(
+          widget.contact.publicKey,
+          payload: Uint8List.fromList([reqTypeGetTelemetry]),
         );
-        _recordStatusResult(false);
-      });
+      } else {
+        frame = buildSendTelemetryReq(widget.contact.publicKey);
+      }
+      await connector.sendFrame(frame);
     } catch (e) {
       if (mounted) {
         setState(() {
@@ -173,12 +192,16 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
     }
   }
 
-  void _recordStatusResult(bool success) {
+  void _recordTelemetryResult(bool success) {
     final selection = _pendingStatusSelection;
     if (selection == null) return;
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
-    final repeater = _resolveRepeater(connector);
-    connector.recordRepeaterPathResult(repeater, selection, success, null);
+    connector.recordRepeaterPathResult(
+      widget.contact,
+      selection,
+      success,
+      null,
+    );
     _pendingStatusSelection = null;
   }
 
@@ -196,8 +219,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
     final connector = context.watch<MeshCoreConnector>();
     final settings = context.watch<AppSettingsService>().settings;
     final isImperialUnits = settings.unitSystem == UnitSystem.imperial;
-    final repeater = _resolveRepeater(connector);
-    final isFloodMode = repeater.pathOverride == -1;
+    final isFloodMode = widget.contact.pathOverride == -1;
 
     return Scaffold(
       appBar: AppBar(
@@ -210,7 +232,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
               style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
             ),
             Text(
-              repeater.name,
+              widget.contact.name,
               style: const TextStyle(
                 fontSize: 14,
                 fontWeight: FontWeight.normal,
@@ -225,9 +247,9 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
             tooltip: l10n.repeater_routingMode,
             onSelected: (mode) async {
               if (mode == 'flood') {
-                await connector.setPathOverride(repeater, pathLen: -1);
+                await connector.setPathOverride(widget.contact, pathLen: -1);
               } else {
-                await connector.setPathOverride(repeater, pathLen: null);
+                await connector.setPathOverride(widget.contact, pathLen: null);
               }
             },
             itemBuilder: (context) => [
@@ -283,7 +305,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
             icon: const Icon(Icons.timeline),
             tooltip: l10n.repeater_pathManagement,
             onPressed: () =>
-                PathManagementDialog.show(context, contact: repeater),
+                PathManagementDialog.show(context, contact: widget.contact),
           ),
           IconButton(
             icon: _isLoading
@@ -437,7 +459,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
     final l10n = context.l10n;
     final connector = context.watch<MeshCoreConnector>();
     final batteryMv =
-        connector.getRepeaterBatteryMillivolts(widget.repeater.publicKeyHex) ??
+        connector.getRepeaterBatteryMillivolts(widget.contact.publicKeyHex) ??
         (telemetryVolts == null ? null : (telemetryVolts * 1000).round());
     if (batteryMv == null) return l10n.common_notAvailable;
     final chemistry = _batteryChemistry();
@@ -449,7 +471,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
   String _batteryChemistry() {
     final settingsService = context.read<AppSettingsService>();
     return settingsService.batteryChemistryForRepeater(
-      widget.repeater.publicKeyHex,
+      widget.contact.publicKeyHex,
     );
   }
 

lib/screens/usb_screen.dart

@@ -0,0 +1,441 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+
+import '../connector/meshcore_connector.dart';
+import '../l10n/l10n.dart';
+import '../utils/app_logger.dart';
+import '../utils/platform_info.dart';
+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});
+
+  @override
+  State<UsbScreen> createState() => _UsbScreenState();
+}
+
+class _UsbScreenState extends State<UsbScreen> {
+  final List<String> _ports = <String>[];
+  bool _isLoadingPorts = true;
+  bool _navigatedToContacts = false;
+  bool _didScheduleInitialLoad = false;
+  Timer? _hotPlugTimer;
+  late final MeshCoreConnector _connector;
+  late final VoidCallback _connectionListener;
+
+  bool get _supportsHotPlug =>
+      PlatformInfo.isWindows || PlatformInfo.isLinux || PlatformInfo.isMacOS;
+
+  @override
+  void initState() {
+    super.initState();
+    _connector = context.read<MeshCoreConnector>();
+    _connectionListener = () {
+      if (!mounted) return;
+      if (_connector.state == MeshCoreConnectionState.disconnected) {
+        _navigatedToContacts = false;
+      }
+      if (_connector.state == MeshCoreConnectionState.connected &&
+          _connector.isUsbTransportConnected &&
+          !_navigatedToContacts) {
+        _navigatedToContacts = true;
+        Navigator.of(context).pushReplacement(
+          MaterialPageRoute(builder: (_) => const ContactsScreen()),
+        );
+      }
+    };
+    _connector.addListener(_connectionListener);
+    _startHotPlugTimer();
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    _connector.setUsbRequestPortLabel(context.l10n.usbScreenStatus);
+    _connector.setUsbFallbackDeviceName(context.l10n.usbFallbackDeviceName);
+    if (!_didScheduleInitialLoad) {
+      _didScheduleInitialLoad = true;
+      unawaited(_loadPorts());
+    }
+  }
+
+  @override
+  void dispose() {
+    _hotPlugTimer?.cancel();
+    _hotPlugTimer = null;
+    _connector.removeListener(_connectionListener);
+    if (!_navigatedToContacts &&
+        _connector.activeTransport == MeshCoreTransportType.usb &&
+        _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.usbScreenTitle),
+        centerTitle: true,
+      ),
+      body: SafeArea(
+        top: false,
+        child: Consumer<MeshCoreConnector>(
+          builder: (context, connector, child) {
+            return Column(
+              children: [
+                _buildStatusBar(context, connector),
+                Expanded(child: _buildPortList(context, connector)),
+              ],
+            );
+          },
+        ),
+      ),
+      bottomNavigationBar: Consumer<MeshCoreConnector>(
+        builder: (context, connector, child) {
+          final isLoading = _isLoadingPorts;
+          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: () {
+                        Navigator.of(context).pushReplacement(
+                          MaterialPageRoute(
+                            builder: (_) => const ScannerScreen(),
+                          ),
+                        );
+                      },
+                      heroTag: 'usb_ble_action',
+                      extendedPadding: const EdgeInsets.symmetric(
+                        horizontal: 12,
+                      ),
+                      icon: const Icon(Icons.bluetooth),
+                      label: Text(context.l10n.connectionChoiceBluetoothLabel),
+                    ),
+                  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.usb),
+                      label: Text(context.l10n.scanner_scan),
+                    ),
+                ],
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildStatusBar(BuildContext context, MeshCoreConnector connector) {
+    final l10n = context.l10n;
+    String statusText;
+    Color statusColor;
+
+    if (_isLoadingPorts) {
+      statusText = l10n.usbStatus_searching;
+      statusColor = Colors.blue;
+    } else if (connector.isUsbTransportConnected) {
+      switch (connector.state) {
+        case MeshCoreConnectionState.connected:
+          statusText = l10n.scanner_connectedTo(
+            connector.activeUsbPortDisplayLabel ?? 'USB',
+          );
+          statusColor = Colors.green;
+        case MeshCoreConnectionState.disconnecting:
+          statusText = l10n.scanner_disconnecting;
+          statusColor = Colors.orange;
+        default:
+          statusText = l10n.usbStatus_notConnected;
+          statusColor = Colors.grey;
+      }
+    } else if (connector.state == MeshCoreConnectionState.connecting &&
+        connector.activeTransport == MeshCoreTransportType.usb) {
+      statusText = l10n.usbStatus_connecting;
+      statusColor = Colors.orange;
+    } else {
+      statusText = l10n.usbStatus_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,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildPortList(BuildContext context, MeshCoreConnector connector) {
+    final l10n = context.l10n;
+
+    if (_isLoadingPorts) {
+      return Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(Icons.usb, size: 64, color: Colors.grey[400]),
+            const SizedBox(height: 16),
+            Text(
+              l10n.usbStatus_searching,
+              style: TextStyle(fontSize: 16, color: Colors.grey[600]),
+            ),
+          ],
+        ),
+      );
+    }
+
+    if (_ports.isEmpty) {
+      return Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(Icons.usb, size: 64, color: Colors.grey[400]),
+            const SizedBox(height: 16),
+            Text(
+              l10n.usbScreenEmptyState,
+              textAlign: TextAlign.center,
+              style: TextStyle(fontSize: 16, color: Colors.grey[600]),
+            ),
+          ],
+        ),
+      );
+    }
+
+    final isConnecting =
+        connector.state == MeshCoreConnectionState.connecting &&
+        connector.activeTransport == MeshCoreTransportType.usb;
+
+    return ListView.separated(
+      padding: const EdgeInsets.all(8),
+      itemCount: _ports.length,
+      separatorBuilder: (context, index) => const Divider(),
+      itemBuilder: (context, index) {
+        final port = _ports[index];
+        final displayName = friendlyUsbPortName(port);
+        final rawName = normalizeUsbPortName(port);
+        final showRawName =
+            rawName != displayName && !rawName.startsWith('web:');
+
+        return ListTile(
+          leading: const Icon(Icons.usb),
+          title: Text(
+            displayName,
+            style: const TextStyle(fontWeight: FontWeight.w500),
+          ),
+          subtitle: showRawName ? Text(rawName) : null,
+          trailing: ElevatedButton(
+            onPressed: isConnecting ? null : () => _connectPort(port),
+            child: Text(l10n.common_connect),
+          ),
+          onTap: isConnecting ? null : () => _connectPort(port),
+        );
+      },
+    );
+  }
+
+  void _startHotPlugTimer() {
+    if (!_supportsHotPlug) return;
+    _hotPlugTimer?.cancel();
+    _hotPlugTimer = Timer.periodic(const Duration(seconds: 2), (_) {
+      _pollHotPlug();
+    });
+  }
+
+  Future<void> _pollHotPlug() async {
+    if (_isLoadingPorts) return;
+    if (!mounted) return;
+    // Don't poll while connecting or connected.
+    if (_connector.state != MeshCoreConnectionState.disconnected) return;
+    try {
+      final ports = await _connector.listUsbPorts();
+      if (!mounted) return;
+      final added = ports.where((p) => !_ports.contains(p)).toList();
+      final removed = _ports.where((p) => !ports.contains(p)).toList();
+      if (added.isEmpty && removed.isEmpty) return;
+      setState(() {
+        _ports
+          ..clear()
+          ..addAll(ports);
+      });
+    } catch (_) {
+      // Silent — hot-plug failures are non-critical.
+    }
+  }
+
+  Future<void> _loadPorts() async {
+    if (!mounted) return;
+    _connector.setUsbRequestPortLabel(context.l10n.usbScreenStatus);
+
+    setState(() {
+      _isLoadingPorts = true;
+    });
+
+    try {
+      final ports = await _connector.listUsbPorts();
+      if (!mounted) return;
+      setState(() {
+        _ports
+          ..clear()
+          ..addAll(ports);
+        _isLoadingPorts = false;
+      });
+    } catch (error) {
+      if (!mounted) return;
+      setState(() {
+        _ports.clear();
+        _isLoadingPorts = false;
+      });
+      _showError(error);
+    }
+  }
+
+  Future<void> _connectPort(String port) async {
+    if (_connector.state != MeshCoreConnectionState.disconnected) return;
+
+    final rawPortName = normalizeUsbPortName(port);
+    appLogger.info(
+      'Connect tapped for $port (raw: $rawPortName)',
+      tag: 'UsbScreen',
+    );
+
+    try {
+      await _connector.connectUsb(portName: rawPortName);
+    } catch (error, stackTrace) {
+      appLogger.error(
+        'Connect failed for $rawPortName: $error\n$stackTrace',
+        tag: 'UsbScreen',
+      );
+      if (!mounted) return;
+      _showError(error);
+      unawaited(_loadPorts());
+    }
+  }
+
+  void _showError(Object error) {
+    if (!mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(_friendlyErrorMessage(error)),
+        backgroundColor: Colors.red,
+      ),
+    );
+  }
+
+  String _friendlyErrorMessage(Object error) {
+    final l10n = context.l10n;
+
+    if (error is PlatformException) {
+      switch (error.code) {
+        case 'usb_permission_denied':
+          return l10n.usbErrorPermissionDenied;
+        case 'usb_device_missing':
+        case 'usb_device_detached':
+          return l10n.usbErrorDeviceMissing;
+        case 'usb_invalid_port':
+          return l10n.usbErrorInvalidPort;
+        case 'usb_busy':
+          return l10n.usbErrorBusy;
+        case 'usb_not_connected':
+          return l10n.usbErrorNotConnected;
+        case 'usb_open_failed':
+        case 'usb_driver_missing':
+          return l10n.usbErrorOpenFailed;
+        case 'usb_connect_failed':
+          return l10n.usbErrorConnectFailed;
+      }
+    }
+
+    if (error is UnsupportedError) {
+      return l10n.usbErrorUnsupported;
+    }
+
+    if (error is StateError) {
+      final msg = error.message;
+      if (msg.contains('already active')) return l10n.usbErrorAlreadyActive;
+      if (msg.contains('No USB serial device selected')) {
+        return l10n.usbErrorNoDeviceSelected;
+      }
+      if (msg.contains('not open') || msg.contains('closed')) {
+        return l10n.usbErrorPortClosed;
+      }
+      if (msg.contains('Timed out')) return l10n.usbErrorConnectTimedOut;
+      if (msg.contains('Failed to open')) return l10n.usbErrorOpenFailed;
+    }
+
+    if (error is TimeoutException) {
+      return l10n.usbErrorConnectTimedOut;
+    }
+
+    return error.toString();
+  }
+}

lib/services/app_debug_log_service.dart

@@ -51,8 +51,14 @@ class AppDebugLogService extends ChangeNotifier {
     String message, {
     String tag = 'App',
     AppDebugLogLevel level = AppDebugLogLevel.info,
+    bool noNotify = false,
   }) {
-    if (!_enabled) return;
+    if (!_enabled && !kDebugMode) return;
+    if (!_enabled) {
+      // In debug mode, still print to console but don't store entries.
+      debugPrint('[$tag] $message');
+      return;
+    }
 
     _entries.add(
       AppDebugLogEntry(
@@ -67,22 +73,24 @@ class AppDebugLogService extends ChangeNotifier {
       _entries.removeRange(0, _entries.length - maxEntries);
     }
 
-    notifyListeners();
+    if (!noNotify) {
+      notifyListeners();
+    }
 
     // Also print to console for development
     debugPrint('[$tag] $message');
   }
 
-  void info(String message, {String tag = 'App'}) {
-    log(message, tag: tag, level: AppDebugLogLevel.info);
+  void info(String message, {String tag = 'App', bool noNotify = false}) {
+    log(message, tag: tag, level: AppDebugLogLevel.info, noNotify: noNotify);
   }
 
-  void warn(String message, {String tag = 'App'}) {
-    log(message, tag: tag, level: AppDebugLogLevel.warning);
+  void warn(String message, {String tag = 'App', bool noNotify = false}) {
+    log(message, tag: tag, level: AppDebugLogLevel.warning, noNotify: noNotify);
   }
 
-  void error(String message, {String tag = 'App'}) {
-    log(message, tag: tag, level: AppDebugLogLevel.error);
+  void error(String message, {String tag = 'App', bool noNotify = false}) {
+    log(message, tag: tag, level: AppDebugLogLevel.error, noNotify: noNotify);
   }
 
   void clear() {

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,
@@ -178,4 +182,12 @@ class AppSettingsService extends ChangeNotifier {
       ..remove(channelName);
     await updateSettings(_settings.copyWith(mutedChannels: updated));
   }
+
+  Future<void> setTcpServerAddress(String value) async {
+    await updateSettings(_settings.copyWith(tcpServerAddress: value));
+  }
+
+  Future<void> setTcpServerPort(int value) async {
+    await updateSettings(_settings.copyWith(tcpServerPort: value));
+  }
 }

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/message_retry_service.dart

@@ -44,6 +44,12 @@ class MessageRetryService extends ChangeNotifier {
       []; // Rolling buffer of recent ACK hashes
   final Map<String, List<String>> _pendingMessageQueuePerContact =
       {}; // contactPubKeyHex → FIFO queue of messageIds (DEPRECATED - will be removed)
+  final Map<String, List<String>> _sendQueue =
+      {}; // contactPubKeyHex → ordered list of messageIds awaiting send
+  final Set<String> _activeMessages =
+      {}; // messageIds currently in-flight (sent/retrying)
+  final Set<String> _resolvedMessages =
+      {}; // messageIds already resolved (prevents double _onMessageResolved)
   final Map<String, String> _expectedHashToMessageId =
       {}; // expectedAckHashHex → messageId (for matching RESP_CODE_SENT by hash)
 
@@ -52,12 +58,13 @@ class MessageRetryService extends ChangeNotifier {
   Function(Message)? _updateMessageCallback;
   Function(Contact)? _clearContactPathCallback;
   Function(Contact, Uint8List, int)? _setContactPathCallback;
-  Function(int, int)? _calculateTimeoutCallback;
+  Function(int, int, {String? contactKey})? _calculateTimeoutCallback;
   Uint8List? Function()? _getSelfPublicKeyCallback;
   String Function(Contact, String)? _prepareContactOutboundTextCallback;
   AppSettingsService? _appSettingsService;
   AppDebugLogService? _debugLogService;
   Function(String, PathSelection, bool, int?)? _recordPathResultCallback;
+  Function(String, int, int, int)? _onDeliveryObservedCallback;
 
   MessageRetryService();
 
@@ -67,12 +74,20 @@ class MessageRetryService extends ChangeNotifier {
     required Function(Message) updateMessageCallback,
     Function(Contact)? clearContactPathCallback,
     Function(Contact, Uint8List, int)? setContactPathCallback,
-    Function(int pathLength, int messageBytes)? calculateTimeoutCallback,
+    Function(int pathLength, int messageBytes, {String? contactKey})?
+    calculateTimeoutCallback,
     Uint8List? Function()? getSelfPublicKeyCallback,
     String Function(Contact, String)? prepareContactOutboundTextCallback,
     AppSettingsService? appSettingsService,
     AppDebugLogService? debugLogService,
     Function(String, PathSelection, bool, int?)? recordPathResultCallback,
+    Function(
+      String contactKey,
+      int pathLength,
+      int messageBytes,
+      int tripTimeMs,
+    )?
+    onDeliveryObservedCallback,
   }) {
     _sendMessageCallback = sendMessageCallback;
     _addMessageCallback = addMessageCallback;
@@ -85,6 +100,7 @@ class MessageRetryService extends ChangeNotifier {
     _appSettingsService = appSettingsService;
     _debugLogService = debugLogService;
     _recordPathResultCallback = recordPathResultCallback;
+    _onDeliveryObservedCallback = onDeliveryObservedCallback;
   }
 
   /// Compute expected ACK hash using same algorithm as firmware:
@@ -156,7 +172,49 @@ class MessageRetryService extends ChangeNotifier {
       _addMessageCallback!(contact.publicKeyHex, message);
     }
 
-    await _attemptSend(messageId);
+    // Queue per contact — only one message in-flight at a time to avoid
+    // overflowing the firmware's 8-entry expected_ack_table.
+    final contactKey = contact.publicKeyHex;
+    _sendQueue[contactKey] ??= [];
+    _sendQueue[contactKey]!.add(messageId);
+
+    if (!_activeMessages.any(
+      (id) => _pendingContacts[id]?.publicKeyHex == contactKey,
+    )) {
+      _sendNextForContact(contactKey);
+    }
+  }
+
+  void _sendNextForContact(String contactKey) {
+    final queue = _sendQueue[contactKey];
+    if (queue == null) return;
+
+    // Drain stale entries iteratively instead of recursing.
+    while (queue.isNotEmpty) {
+      final messageId = queue.removeAt(0);
+      if (_pendingMessages.containsKey(messageId)) {
+        _activeMessages.add(messageId);
+        _attemptSend(messageId).catchError((e) {
+          debugPrint('_attemptSend threw for $messageId: $e');
+          final msg = _pendingMessages[messageId];
+          if (msg != null) {
+            final failed = msg.copyWith(status: MessageStatus.failed);
+            _pendingMessages[messageId] = failed;
+            _updateMessageCallback?.call(failed);
+          }
+          _onMessageResolved(messageId, contactKey);
+        });
+        return;
+      }
+      // Message was cancelled/cleaned up while queued — try next
+    }
+  }
+
+  void _onMessageResolved(String messageId, String contactKey) {
+    if (_resolvedMessages.contains(messageId)) return;
+    _resolvedMessages.add(messageId);
+    _activeMessages.remove(messageId);
+    _sendNextForContact(contactKey);
   }
 
   Future<void> _attemptSend(String messageId) async {
@@ -169,13 +227,11 @@ class MessageRetryService extends ChangeNotifier {
     // Use the path that was captured when the message was first sent
     if (_setContactPathCallback != null && _clearContactPathCallback != null) {
       if (message.pathLength != null && message.pathLength! < 0) {
-        // Flood mode - clear the path
         debugPrint(
           'Setting flood mode for retry attempt ${message.retryCount}',
         );
-        _clearContactPathCallback!(contact);
+        await _clearContactPathCallback!(contact);
       } else if (message.pathLength != null && message.pathLength! >= 0) {
-        // Specific path (including direct neighbor with pathLength=0)
         final pathStr = message.pathBytes.isEmpty
             ? 'direct'
             : message.pathBytes
@@ -192,6 +248,24 @@ class MessageRetryService extends ChangeNotifier {
       }
     }
 
+    // Re-validate after async gap — a timer or ACK could have resolved/retried
+    // this message while we were awaiting the path callback.
+    final currentMessage = _pendingMessages[messageId];
+    if (currentMessage == null || _resolvedMessages.contains(messageId)) {
+      debugPrint(
+        '_attemptSend: message $messageId resolved during path sync, aborting',
+      );
+      return;
+    }
+    // If the message was retried by a timer during our await, the retryCount
+    // will have advanced. Only proceed if it still matches the attempt we started.
+    if (currentMessage.retryCount != message.retryCount) {
+      debugPrint(
+        '_attemptSend: message $messageId retryCount changed during path sync, aborting',
+      );
+      return;
+    }
+
     final attempt = message.retryCount.clamp(0, 3);
     final timestampSeconds = message.timestamp.millisecondsSinceEpoch ~/ 1000;
 
@@ -231,6 +305,15 @@ class MessageRetryService extends ChangeNotifier {
 
     if (_sendMessageCallback != null) {
       _sendMessageCallback!(contact, message.text, attempt, timestampSeconds);
+    } else {
+      // No send callback — message would be stuck forever. Fail it immediately.
+      debugPrint(
+        '_attemptSend: no sendMessageCallback, failing message $messageId',
+      );
+      final failedMessage = message.copyWith(status: MessageStatus.failed);
+      _pendingMessages[messageId] = failedMessage;
+      _updateMessageCallback?.call(failedMessage);
+      _onMessageResolved(messageId, contact.publicKeyHex);
     }
   }
 
@@ -281,6 +364,7 @@ class MessageRetryService extends ChangeNotifier {
     }
 
     // FALLBACK: Old queue-based matching (for messages sent before hash computation was added)
+    // Only match within a single contact's queue to avoid cross-contact mismatches.
     if (messageId == null && allowQueueFallback) {
       _debugLogService?.warn(
         'RESP_CODE_SENT: ACK hash $ackHashHex not found in hash table, falling back to queue',
@@ -290,13 +374,16 @@ class MessageRetryService extends ChangeNotifier {
         'Hash-based match failed for $ackHashHex, falling back to queue-based matching',
       );
 
-      for (var entry in _pendingMessageQueuePerContact.entries) {
+      // Search all contact queues so concurrent chats don't miss matches.
+      final queuesToSearch = _pendingMessageQueuePerContact;
+
+      for (var entry in queuesToSearch.entries) {
         final contactKey = entry.key;
         final queue = entry.value;
 
-        if (queue.isNotEmpty) {
+        // Drain stale entries until we find a valid one or exhaust the queue.
+        while (queue.isNotEmpty) {
           final candidateMessageId = queue.removeAt(0);
-
           if (_pendingMessages.containsKey(candidateMessageId)) {
             messageId = candidateMessageId;
             contact = _pendingContacts[candidateMessageId];
@@ -304,21 +391,10 @@ class MessageRetryService extends ChangeNotifier {
               'Queue-based match (fallback): $ackHashHex → message $messageId for $contactKey',
             );
             break;
-          } else {
-            debugPrint('Dequeued stale message $candidateMessageId - skipping');
-            if (queue.isNotEmpty) {
-              final nextMessageId = queue.removeAt(0);
-              if (_pendingMessages.containsKey(nextMessageId)) {
-                messageId = nextMessageId;
-                contact = _pendingContacts[nextMessageId];
-                debugPrint(
-                  'Queue-based match (fallback): $ackHashHex → message $messageId',
-                );
-                break;
-              }
-            }
           }
+          debugPrint('Dequeued stale message $candidateMessageId - skipping');
         }
+        if (messageId != null) break;
       }
     }
 
@@ -357,25 +433,33 @@ class MessageRetryService extends ChangeNotifier {
       );
     }
 
-    // Use device-provided timeout, or calculate from radio settings if timeout is 0 or invalid
+    // Calculate timeout: prefer ML prediction, then device-provided, then physics fallback
+    int pathLengthValue;
+    if (selection != null) {
+      pathLengthValue = selection.useFlood ? -1 : selection.hopCount;
+      if (pathLengthValue < 0) pathLengthValue = contact.pathLength;
+    } else if (message.pathLength != null) {
+      pathLengthValue = message.pathLength!;
+    } else {
+      pathLengthValue = contact.pathLength;
+    }
+
     int actualTimeout = timeoutMs;
-    if (timeoutMs <= 0 && _calculateTimeoutCallback != null) {
-      int pathLengthValue;
-      if (selection != null) {
-        pathLengthValue = selection.useFlood ? -1 : selection.hopCount;
-        if (pathLengthValue < 0) pathLengthValue = contact.pathLength;
-      } else if (message.pathLength != null) {
-        pathLengthValue = message.pathLength!;
-      } else {
-        pathLengthValue = contact.pathLength;
-      }
-      actualTimeout = _calculateTimeoutCallback!(
+    if (_calculateTimeoutCallback != null) {
+      final calculated = _calculateTimeoutCallback!(
         pathLengthValue,
         message.text.length,
+        contactKey: contact.publicKeyHex,
       );
-      debugPrint(
-        'Using calculated timeout: ${actualTimeout}ms for path length $pathLengthValue',
-      );
+      // calculateTimeout tries ML first, falls back to physics.
+      // Use calculated value if device didn't provide one, or if ML
+      // produced a tighter prediction than the device's estimate.
+      if (timeoutMs <= 0 || calculated < timeoutMs) {
+        actualTimeout = calculated;
+        debugPrint(
+          'Using calculated timeout: ${actualTimeout}ms for path length $pathLengthValue',
+        );
+      }
     }
 
     final updatedMessage = message.copyWith(
@@ -463,22 +547,7 @@ class MessageRetryService extends ChangeNotifier {
     } else {
       // Max retries reached - mark as failed
       final failedMessage = message.copyWith(status: MessageStatus.failed);
-
-      // Move ACK hashes to history before removing
-      _moveAckHashesToHistory(messageId);
-
-      _pendingMessages.remove(messageId);
-      _pendingContacts.remove(messageId);
-      _pendingPathSelections.remove(messageId);
-      _timeoutTimers[messageId]?.cancel();
-      _timeoutTimers.remove(messageId);
-
-      // Clean up the queue entry for this contact
-      _pendingMessageQueuePerContact[contact.publicKeyHex]?.remove(messageId);
-      if (_pendingMessageQueuePerContact[contact.publicKeyHex]?.isEmpty ??
-          false) {
-        _pendingMessageQueuePerContact.remove(contact.publicKeyHex);
-      }
+      _pendingMessages[messageId] = failedMessage;
 
       // Check if we should clear the path on max retry
       if (_appSettingsService?.settings.clearPathOnMaxRetry == true &&
@@ -499,6 +568,30 @@ class MessageRetryService extends ChangeNotifier {
       }
 
       notifyListeners();
+
+      // Message is done retrying — send next queued message for this contact
+      _onMessageResolved(messageId, contact.publicKeyHex);
+
+      // Keep message in pending maps for 30s grace period so late ACKs
+      // can still match and update the message to delivered.
+      _timeoutTimers[messageId] = Timer(const Duration(seconds: 30), () {
+        _moveAckHashesToHistory(messageId);
+        // Clean up ALL hash mappings for this message
+        _ackHashToMessageId.removeWhere(
+          (_, mapping) => mapping.messageId == messageId,
+        );
+        _expectedHashToMessageId.removeWhere((_, msgId) => msgId == messageId);
+        _pendingMessages.remove(messageId);
+        _pendingContacts.remove(messageId);
+        _pendingPathSelections.remove(messageId);
+        _timeoutTimers.remove(messageId);
+        _resolvedMessages.remove(messageId);
+        final contactKey = contact.publicKeyHex;
+        _pendingMessageQueuePerContact[contactKey]?.remove(messageId);
+        if (_pendingMessageQueuePerContact[contactKey]?.isEmpty ?? false) {
+          _pendingMessageQueuePerContact.remove(contactKey);
+        }
+      });
     }
   }
 
@@ -594,7 +687,15 @@ class MessageRetryService extends ChangeNotifier {
     }
 
     if (matchedMessageId != null) {
-      final message = _pendingMessages[matchedMessageId]!;
+      final message = _pendingMessages[matchedMessageId];
+      if (message == null) {
+        // Message was already cleaned up (e.g. grace period expired)
+        _ackHashToMessageId.remove(ackHashHex);
+        debugPrint(
+          'ACK matched $matchedMessageId but message already cleaned up',
+        );
+        return;
+      }
       final contact = _pendingContacts[matchedMessageId];
       final selection = _pendingPathSelections[matchedMessageId];
 
@@ -616,12 +717,21 @@ class MessageRetryService extends ChangeNotifier {
         tripTimeMs: tripTimeMs,
       );
 
+      // Clean up ALL hash mappings for this message (from all retry attempts)
+      _ackHashToMessageId.removeWhere(
+        (_, mapping) => mapping.messageId == matchedMessageId,
+      );
+      _expectedHashToMessageId.removeWhere(
+        (_, msgId) => msgId == matchedMessageId,
+      );
+
       // Move ACK hashes to history before removing
       _moveAckHashesToHistory(matchedMessageId);
 
       _pendingMessages.remove(matchedMessageId);
       _pendingContacts.remove(matchedMessageId);
       _pendingPathSelections.remove(matchedMessageId);
+      _resolvedMessages.remove(matchedMessageId);
 
       // Clean up the queue entry for this contact (remove any remaining references to this message)
       if (contact != null) {
@@ -646,6 +756,17 @@ class MessageRetryService extends ChangeNotifier {
           true,
           tripTimeMs,
         );
+        if (_onDeliveryObservedCallback != null &&
+            tripTimeMs > 0 &&
+            message.pathLength != null) {
+          _onDeliveryObservedCallback!(
+            contact.publicKeyHex,
+            message.pathLength!,
+            message.text.length,
+            tripTimeMs,
+          );
+        }
+        _onMessageResolved(matchedMessageId, contact.publicKeyHex);
       }
 
       notifyListeners();
@@ -783,6 +904,9 @@ class MessageRetryService extends ChangeNotifier {
     _ackHistory.clear();
     _ackHashToMessageId.clear();
     _pendingMessageQueuePerContact.clear();
+    _sendQueue.clear();
+    _activeMessages.clear();
+    _resolvedMessages.clear();
     super.dispose();
   }
 }

lib/services/notification_service.dart

@@ -1,9 +1,11 @@
+import 'dart:io' show Platform, File;
 import 'dart:ui';
 
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:flutter/foundation.dart';
 
 import '../l10n/app_localizations.dart';
+import '../utils/platform_info.dart';
 
 class NotificationService {
   static final NotificationService _instance = NotificationService._internal();
@@ -63,14 +65,27 @@ class NotificationService {
       appUserModelId: 'org.meshcore.open.app',
       guid: 'e7ea8f85-72f5-4f36-91f6-038f740ccf86',
     );
+    const linuxSettings = LinuxInitializationSettings(
+      defaultActionName: 'Open notification',
+    );
 
     const initSettings = InitializationSettings(
       android: androidSettings,
       iOS: iosSettings,
       macOS: macSettings,
       windows: windowsSettings,
+      linux: linuxSettings,
     );
 
+    // On Linux, the notifications plugin opens a D-Bus session bus
+    // connection whose async subscription can throw an unhandled
+    // SocketException when the bus socket is missing (e.g. running as
+    // root or inside a container without a session bus).
+    if (PlatformInfo.isLinux && !_isDbusSessionAvailable()) {
+      debugPrint('Skipping notification init: D-Bus session bus unavailable');
+      return;
+    }
+
     try {
       await _notifications.initialize(
         settings: initSettings,
@@ -82,6 +97,15 @@ class NotificationService {
     }
   }
 
+  static bool _isDbusSessionAvailable() {
+    final addr = Platform.environment['DBUS_SESSION_BUS_ADDRESS'];
+    if (addr != null && addr.isNotEmpty) return true;
+    // Fallback: check the default socket for the current user.
+    final uid = Platform.environment['UID'] ?? Platform.environment['EUID'];
+    final path = '/run/user/${uid ?? '1000'}/bus';
+    return File(path).existsSync();
+  }
+
   Future<bool> _ensureInitialized() async {
     if (!_isInitialized) {
       await initialize();
@@ -208,7 +232,9 @@ class NotificationService {
 
     try {
       await _notifications.show(
-        id: contactId?.hashCode ?? DateTime.now().millisecondsSinceEpoch,
+        id: contactId != null
+            ? 'advert:$contactId'.hashCode
+            : DateTime.now().millisecondsSinceEpoch,
         title: _l10n.notification_newTypeDiscovered(contactType),
         body: contactName,
         notificationDetails: notificationDetails,
@@ -307,6 +333,61 @@ class NotificationService {
     await _notifications.cancel(id: id);
   }
 
+  /// Cancel the notification for a specific contact and update the app badge.
+  Future<void> clearContactNotification(
+    String contactId,
+    int totalUnreadCount,
+  ) async {
+    if (!await _ensureInitialized()) return;
+    await _notifications.cancel(id: contactId.hashCode);
+    await _updateBadge(totalUnreadCount);
+  }
+
+  /// Cancel the notification for a specific channel and update the app badge.
+  Future<void> clearChannelNotification(
+    int channelIndex,
+    int totalUnreadCount,
+  ) async {
+    if (!await _ensureInitialized()) return;
+    await _notifications.cancel(id: channelIndex.hashCode);
+    await _updateBadge(totalUnreadCount);
+  }
+
+  /// Cancel advert notifications for the given contact public key hexes.
+  Future<void> clearAdvertNotifications(List<String> contactIds) async {
+    if (!await _ensureInitialized()) return;
+    for (final id in contactIds) {
+      await _notifications.cancel(id: 'advert:$id'.hashCode);
+    }
+  }
+
+  Future<void> _updateBadge(int count) async {
+    if (PlatformInfo.isIOS || PlatformInfo.isMacOS) {
+      // On Apple platforms, set the badge number directly via a silent update.
+      final darwinDetails = DarwinNotificationDetails(
+        presentAlert: false,
+        presentSound: false,
+        presentBadge: true,
+        badgeNumber: count,
+      );
+      final details = NotificationDetails(
+        iOS: darwinDetails,
+        macOS: darwinDetails,
+      );
+      // Use a fixed ID so each update replaces the previous one.
+      await _notifications.show(
+        id: 'badge_update'.hashCode,
+        title: null,
+        body: null,
+        notificationDetails: details,
+      );
+      // Immediately cancel the silent notification so it doesn't appear in tray.
+      await _notifications.cancel(id: 'badge_update'.hashCode);
+    }
+    // On Android, badge count is derived from active notifications,
+    // so cancelling the specific notification above is sufficient.
+  }
+
   // ─────────────────────────────────────────────────────────────────
   // Public notification methods (rate limiting is enforced automatically)
   // ─────────────────────────────────────────────────────────────────

lib/services/storage_service.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import '../models/delivery_observation.dart';
 import '../models/path_history.dart';
 import '../storage/prefs_manager.dart';
 
@@ -6,6 +7,7 @@ class StorageService {
   static const String _pathHistoryPrefix = 'path_history_';
   static const String _pendingMessagesKey = 'pending_messages';
   static const String _repeaterPasswordsKey = 'repeater_passwords';
+  static const String _deliveryObservationsKey = 'delivery_observations';
 
   Future<void> savePathHistory(
     String contactPubKeyHex,
@@ -122,4 +124,33 @@ class StorageService {
     final prefs = PrefsManager.instance;
     await prefs.remove(_repeaterPasswordsKey);
   }
+
+  Future<void> saveDeliveryObservations(
+    List<DeliveryObservation> observations,
+  ) async {
+    final prefs = PrefsManager.instance;
+    final jsonStr = jsonEncode(observations.map((o) => o.toJson()).toList());
+    await prefs.setString(_deliveryObservationsKey, jsonStr);
+  }
+
+  Future<List<DeliveryObservation>> loadDeliveryObservations() async {
+    final prefs = PrefsManager.instance;
+    final jsonStr = prefs.getString(_deliveryObservationsKey);
+
+    if (jsonStr == null) return [];
+
+    try {
+      final list = jsonDecode(jsonStr) as List;
+      return list
+          .map((e) => DeliveryObservation.fromJson(e as Map<String, dynamic>))
+          .toList();
+    } catch (e) {
+      return [];
+    }
+  }
+
+  Future<void> clearDeliveryObservations() async {
+    final prefs = PrefsManager.instance;
+    await prefs.remove(_deliveryObservationsKey);
+  }
 }

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/timeout_prediction_service.dart

@@ -0,0 +1,229 @@
+import 'dart:async';
+import 'package:flutter/foundation.dart';
+import 'package:ml_algo/ml_algo.dart';
+import 'package:ml_dataframe/ml_dataframe.dart';
+import '../models/delivery_observation.dart';
+import 'storage_service.dart';
+
+class _ContactStats {
+  int count = 0;
+  double _sum = 0;
+
+  void add(double ms) {
+    count++;
+    _sum += ms;
+  }
+
+  double get mean => _sum / count;
+}
+
+class TimeoutPredictionService extends ChangeNotifier {
+  final StorageService? _storage;
+
+  static const int minObservations = 10;
+  static const int maxObservations = 100;
+  static const int _retrainInterval = 5;
+  // 1.5x multiplier on raw prediction to account for variance in delivery
+  // times — tight enough to improve on worst-case physics, loose enough
+  // to avoid premature timeouts from model noise.
+  static const double _safetyMargin = 1.5;
+  static const int _minContactObservations = 10;
+
+  List<DeliveryObservation> _observations = [];
+  LinearRegressor? _model;
+  List<String> _activeFeatures = [];
+  int _observationsSinceLastTrain = 0;
+  final Map<String, _ContactStats> _contactStats = {};
+  Timer? _persistTimer;
+
+  TimeoutPredictionService(StorageService storage) : _storage = storage;
+  TimeoutPredictionService.noStorage() : _storage = null;
+
+  int get observationCount => _observations.length;
+  bool get hasModel => _model != null;
+
+  Future<void> initialize() async {
+    _observations = await _storage?.loadDeliveryObservations() ?? [];
+    _rebuildContactStats();
+
+    if (_observations.length >= minObservations) {
+      _trainModel();
+    }
+
+    debugPrint(
+      'TimeoutPrediction: initialized with ${_observations.length} observations, '
+      'model=${_model != null ? "ready" : "waiting for data"}',
+    );
+  }
+
+  void recordObservation({
+    required String contactKey,
+    required int pathLength,
+    required int messageBytes,
+    required int tripTimeMs,
+    int secondsSinceLastRx = 0,
+  }) {
+    final observation = DeliveryObservation(
+      contactKey: contactKey,
+      pathLength: pathLength,
+      messageBytes: messageBytes,
+      secondsSinceLastRx: secondsSinceLastRx,
+      isFlood: pathLength < 0,
+      deliveryMs: tripTimeMs,
+      timestamp: DateTime.now(),
+    );
+
+    _observations.add(observation);
+    if (_observations.length > maxObservations) {
+      _observations.removeAt(0);
+    }
+
+    _contactStats.putIfAbsent(contactKey, () => _ContactStats());
+    _contactStats[contactKey]!.add(tripTimeMs.toDouble());
+
+    _observationsSinceLastTrain++;
+    if (_observationsSinceLastTrain >= _retrainInterval &&
+        _observations.length >= minObservations) {
+      _trainModel();
+    }
+
+    _persistTimer?.cancel();
+    _persistTimer = Timer(const Duration(seconds: 2), () {
+      _storage?.saveDeliveryObservations(_observations);
+    });
+    debugPrint(
+      'TimeoutPrediction: recorded ${tripTimeMs}ms for $pathLength hops '
+      '(${_observations.length} total)',
+    );
+  }
+
+  int? predictTimeout({
+    String? contactKey,
+    required int pathLength,
+    required int messageBytes,
+    int secondsSinceLastRx = 0,
+  }) {
+    if (_model == null) return null;
+
+    try {
+      if (_activeFeatures.isEmpty) return null;
+
+      final allFeatures = {
+        'pathLength': pathLength.toDouble(),
+        'messageBytes': messageBytes.toDouble(),
+        'secSinceRx': secondsSinceLastRx.toDouble(),
+        'isFlood': pathLength < 0 ? 1.0 : 0.0,
+      };
+      final row = _activeFeatures.map((f) => allFeatures[f]!).toList();
+
+      final features = DataFrame(
+        [row],
+        headerExists: false,
+        header: _activeFeatures,
+      );
+
+      final prediction = _model!.predict(features);
+      final rawValue = prediction.rows.first.first;
+      var predictedMs = (rawValue is double)
+          ? rawValue
+          : (rawValue as num).toDouble();
+
+      debugPrint(
+        'TimeoutPrediction: raw prediction=$predictedMs for '
+        'pathLength=$pathLength, messageBytes=$messageBytes, '
+        'features=$_activeFeatures',
+      );
+
+      // Sanity check: if prediction is negative or zero, fall back
+      if (predictedMs <= 0) return null;
+
+      // Blend with per-contact mean if enough data
+      if (contactKey != null) {
+        final stats = _contactStats[contactKey];
+        if (stats != null && stats.count >= _minContactObservations) {
+          predictedMs = 0.5 * predictedMs + 0.5 * stats.mean;
+        }
+      }
+
+      // Connector clamps this between physics min/max bounds
+      final timeout = (predictedMs * _safetyMargin).ceil();
+      debugPrint(
+        'TimeoutPrediction: ML timeout ${timeout}ms '
+        '(raw: ${predictedMs.round()}ms, contact: $contactKey)',
+      );
+      return timeout;
+    } catch (e) {
+      debugPrint('TimeoutPrediction: prediction failed: $e');
+      return null;
+    }
+  }
+
+  void _trainModel() {
+    try {
+      // Build feature columns, then exclude any with zero variance
+      // (ml_algo's OLS produces all-zero coefficients for singular matrices)
+      final allNames = ['pathLength', 'messageBytes', 'secSinceRx', 'isFlood'];
+      final allExtractors = <double Function(DeliveryObservation)>[
+        (o) => o.pathLength.toDouble(),
+        (o) => o.messageBytes.toDouble(),
+        (o) => o.secondsSinceLastRx.toDouble(),
+        (o) => o.isFlood ? 1.0 : 0.0,
+      ];
+
+      _activeFeatures = [];
+      for (var i = 0; i < allNames.length; i++) {
+        final values = _observations.map(allExtractors[i]).toSet();
+        if (values.length > 1) _activeFeatures.add(allNames[i]);
+      }
+
+      if (_activeFeatures.isEmpty) {
+        debugPrint(
+          'TimeoutPrediction: no features with variance, skipping training',
+        );
+        return;
+      }
+
+      final header = [..._activeFeatures, 'deliveryMs'];
+      final rows = _observations.map((o) {
+        final row = <double>[];
+        for (var i = 0; i < allNames.length; i++) {
+          if (_activeFeatures.contains(allNames[i])) {
+            row.add(allExtractors[i](o));
+          }
+        }
+        row.add(o.deliveryMs.toDouble());
+        return row;
+      });
+
+      final data = DataFrame([header, ...rows], headerExists: true);
+
+      _model = LinearRegressor(data, 'deliveryMs');
+      _observationsSinceLastTrain = 0;
+
+      // Log training summary with sample predictions
+      final avgMs =
+          _observations.map((o) => o.deliveryMs).reduce((a, b) => a + b) /
+          _observations.length;
+      debugPrint(
+        'TimeoutPrediction: trained on ${_observations.length} observations '
+        '(avg: ${avgMs.round()}ms, features: $_activeFeatures)',
+      );
+    } catch (e) {
+      debugPrint('TimeoutPrediction: training failed: $e');
+    }
+  }
+
+  @override
+  void dispose() {
+    _persistTimer?.cancel();
+    super.dispose();
+  }
+
+  void _rebuildContactStats() {
+    _contactStats.clear();
+    for (final obs in _observations) {
+      _contactStats.putIfAbsent(obs.contactKey, () => _ContactStats());
+      _contactStats[obs.contactKey]!.add(obs.deliveryMs.toDouble());
+    }
+  }
+}

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/services/usb_serial_frame_codec.dart

@@ -0,0 +1,111 @@
+import 'dart:typed_data';
+
+const int usbSerialTxFrameStart = 0x3c;
+const int usbSerialRxFrameStart = 0x3e;
+const int usbSerialHeaderLength = 3;
+const int usbSerialMaxPayloadLength = 172;
+
+Uint8List wrapUsbSerialTxFrame(Uint8List payload) {
+  if (payload.length > usbSerialMaxPayloadLength) {
+    throw ArgumentError.value(
+      payload.length,
+      'payload.length',
+      'USB serial payload exceeds $usbSerialMaxPayloadLength bytes',
+    );
+  }
+  final packet = Uint8List(usbSerialHeaderLength + payload.length);
+  packet[0] = usbSerialTxFrameStart;
+  packet[1] = payload.length & 0xff;
+  packet[2] = (payload.length >> 8) & 0xff;
+  packet.setRange(usbSerialHeaderLength, packet.length, payload);
+  return packet;
+}
+
+class UsbSerialDecodedPacket {
+  const UsbSerialDecodedPacket({
+    required this.frameStart,
+    required this.payload,
+  });
+
+  final int frameStart;
+  final Uint8List payload;
+
+  bool get isRxFrame => frameStart == usbSerialRxFrameStart;
+}
+
+class UsbSerialFrameDecoder {
+  final List<int> _rxBuffer = <int>[];
+  int _startIndex = 0;
+
+  void reset() {
+    _rxBuffer.clear();
+    _startIndex = 0;
+  }
+
+  List<UsbSerialDecodedPacket> ingest(Uint8List bytes) {
+    if (bytes.isEmpty) {
+      return const <UsbSerialDecodedPacket>[];
+    }
+
+    _rxBuffer.addAll(bytes);
+    final packets = <UsbSerialDecodedPacket>[];
+
+    while (true) {
+      if (_startIndex >= _rxBuffer.length) {
+        _rxBuffer.clear();
+        _startIndex = 0;
+        return packets;
+      }
+
+      if (_rxBuffer[_startIndex] != usbSerialRxFrameStart &&
+          _rxBuffer[_startIndex] != usbSerialTxFrameStart) {
+        _startIndex++;
+        _compactBufferIfNeeded();
+        continue;
+      }
+
+      final availableLength = _rxBuffer.length - _startIndex;
+      if (availableLength < usbSerialHeaderLength) {
+        _compactBufferIfNeeded(force: true);
+        return packets;
+      }
+
+      final payloadLength =
+          _rxBuffer[_startIndex + 1] | (_rxBuffer[_startIndex + 2] << 8);
+      if (payloadLength > usbSerialMaxPayloadLength) {
+        _startIndex++;
+        _compactBufferIfNeeded();
+        continue;
+      }
+      final packetLength = usbSerialHeaderLength + payloadLength;
+      if (availableLength < packetLength) {
+        _compactBufferIfNeeded(force: true);
+        return packets;
+      }
+
+      final frameStart = _rxBuffer[_startIndex];
+      final payload = Uint8List.fromList(
+        _rxBuffer.sublist(
+          _startIndex + usbSerialHeaderLength,
+          _startIndex + packetLength,
+        ),
+      );
+      _startIndex += packetLength;
+      _compactBufferIfNeeded();
+      packets.add(
+        UsbSerialDecodedPacket(frameStart: frameStart, payload: payload),
+      );
+    }
+  }
+
+  void _compactBufferIfNeeded({bool force = false}) {
+    if (_startIndex == 0) {
+      return;
+    }
+    if (!force && _startIndex < 1024 && _startIndex < (_rxBuffer.length ~/ 2)) {
+      return;
+    }
+    _rxBuffer.removeRange(0, _startIndex);
+    _startIndex = 0;
+  }
+}

lib/services/usb_serial_service.dart

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

lib/services/usb_serial_service_native.dart

@@ -0,0 +1,484 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:flserial/flserial.dart';
+import 'package:flserial/flserial_exception.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+
+import 'app_debug_log_service.dart';
+import '../utils/macos_usb_device_names.dart';
+import '../utils/platform_info.dart';
+import '../utils/usb_port_labels.dart';
+import 'usb_serial_frame_codec.dart';
+
+/// Wraps the native flserial plugin to expose a stream of raw bytes for the
+/// MeshCore connector to consume.
+class UsbSerialService {
+  UsbSerialService();
+
+  static const MethodChannel _androidMethodChannel = MethodChannel(
+    'meshcore_open/android_usb_serial',
+  );
+  static const EventChannel _androidEventChannel = EventChannel(
+    'meshcore_open/android_usb_serial_events',
+  );
+  final StreamController<Uint8List> _frameController =
+      StreamController<Uint8List>.broadcast();
+  final UsbSerialFrameDecoder _frameDecoder = UsbSerialFrameDecoder();
+  StreamSubscription<dynamic>? _androidDataSubscription;
+  StreamSubscription<FlSerialEventArgs>? _dataSubscription;
+  UsbSerialStatus _status = UsbSerialStatus.disconnected;
+  String? _connectedPortKey;
+  String? _connectedPortLabel;
+  FlSerial? _serial;
+  AppDebugLogService? _debugLogService;
+
+  UsbSerialStatus get status => _status;
+  String? get activePortKey => _connectedPortKey;
+  String? get activePortDisplayLabel =>
+      _connectedPortLabel ?? _connectedPortKey;
+  Stream<Uint8List> get frameStream => _frameController.stream;
+  bool get _useAndroidUsbHost =>
+      !kIsWeb && defaultTargetPlatform == TargetPlatform.android;
+  bool get _useDesktopFlSerial =>
+      PlatformInfo.isWindows || PlatformInfo.isLinux || PlatformInfo.isMacOS;
+  bool get _isSupportedPlatform => _useAndroidUsbHost || _useDesktopFlSerial;
+  // Always-fresh: do NOT use ??= here – a cached FlSerial retains stale
+  // native handle state (flh) from a prior failed open, causing subsequent
+  // open attempts to fail with "port not exist" even when the device is present.
+  FlSerial _freshSerial() => FlSerial();
+
+  bool get isConnected {
+    if (!_isSupportedPlatform) {
+      return false;
+    }
+    // Trust _status as the authoritative connection state. Polling
+    // _serial?.isOpen() via the native FL_CTRL_IS_PORT_OPEN query is
+    // unreliable during the brief USB re-enumeration window that many
+    // microcontrollers (e.g. NRF52) trigger in response to DTR assertion.
+    // Actual port drops are handled by the onDone / onError callbacks on the
+    // serial data stream subscription, which update _status correctly.
+    return _status == UsbSerialStatus.connected;
+  }
+
+  Future<List<String>> listPorts() async {
+    if (!_isSupportedPlatform) {
+      return const <String>[];
+    }
+    if (_useAndroidUsbHost) {
+      final ports = await _androidMethodChannel.invokeListMethod<String>(
+        'listPorts',
+      );
+      return ports ?? <String>[];
+    }
+    final rawPorts = FlSerial.listPorts();
+    // On macOS, flserial's native device-name lookup is broken on macOS
+    // 10.15+ because the IOKit class name changed from IOUSBDevice to
+    // IOUSBHostDevice. We resolve names ourselves via ioreg and rewrite any
+    // "port - n/a" entries with the real product name.
+    if (Platform.isMacOS && rawPorts.isNotEmpty) {
+      return _annotateMacOsPorts(rawPorts);
+    }
+    return Future.value(rawPorts);
+  }
+
+  /// Rewrites the flserial port list on macOS by substituting real USB device
+  /// names (obtained via [ioreg]) for the "n/a" placeholders that flserial
+  /// returns when it can't find the deprecated IOUSBDevice parent.
+  Future<List<String>> _annotateMacOsPorts(List<String> rawPorts) async {
+    final deviceNames = await queryMacOsUsbDeviceNames();
+    if (deviceNames.isEmpty) return rawPorts;
+    return rawPorts.map((entry) {
+      // entry format from fl_ports: "port - description - hardware_id"
+      final port = normalizeUsbPortName(entry); // e.g. /dev/cu.usbmodem1101
+      final knownName = deviceNames[port]; // e.g. "Nordic NRF52 DK"
+      if (knownName == null) return entry; // non-USB port, keep as-is
+      // Replace description field only; preserve hardware_id for device
+      // identity (used by normalizeUsbPortName).
+      final segments = entry.split(' - ');
+      final hardwareId = segments.length >= 3 ? segments.last : 'n/a';
+      return '$port - $knownName - $hardwareId';
+    }).toList();
+  }
+
+  void setDebugLogService(AppDebugLogService? service) {
+    _debugLogService = service;
+  }
+
+  Future<void> connect({
+    required String portName,
+    int baudRate = 115200,
+  }) async {
+    if (_status == UsbSerialStatus.connected ||
+        _status == UsbSerialStatus.connecting) {
+      throw StateError('USB serial transport is already active');
+    }
+    if (!_isSupportedPlatform) {
+      throw UnsupportedError('USB serial is not supported on this platform.');
+    }
+
+    _status = UsbSerialStatus.connecting;
+    var normalizedPortName = normalizeUsbPortName(portName);
+    _frameDecoder.reset();
+
+    if (_useAndroidUsbHost) {
+      try {
+        await _androidMethodChannel.invokeMethod<void>('connect', {
+          'portName': normalizedPortName,
+          'baudRate': baudRate,
+        });
+        _debugLogService?.info(
+          'USB serial opened port=$normalizedPortName on Android via USB host bridge',
+          tag: 'USB Serial',
+        );
+      } on PlatformException catch (error) {
+        _status = UsbSerialStatus.disconnected;
+        final msg = error.message ?? error.code;
+        _debugLogService?.error(
+          'Android connect failed: $msg',
+          tag: 'USB Serial',
+        );
+        rethrow;
+      }
+    } else {
+      // ── Hot-restart guard ─────────────────────────────────────────────────
+      // On hot restart Dart tears down the isolate without calling dispose().
+      // The NativeCallable registered by flserial's setCallback() is
+      // isolate-local and gets freed when the isolate dies, but the native
+      // SerialThread is still alive and will call it → crash.
+      //
+      // flserial uses process-global native state. Calling fl_free() kills ALL
+      // SerialThreads for every open port across all Dart isolates (there is
+      // only one in a Flutter app). Then fl_init() re-initialises the slot
+      // table so subsequent fl_open() calls work normally.
+      //
+      // This must happen before we register any new NativeCallable, so it must
+      // be the very first thing we do in the desktop branch.
+      try {
+        bindings.fl_free();
+        bindings.fl_init(16);
+      } catch (_) {}
+
+      // On macOS, flserial lists both cu.* and tty.* device nodes.
+      // When a cu.* open fails with FL_ERROR_PORT_NOT_EXIST, try the tty.*
+      // variant as a fallback (and vice-versa) before giving up.
+      final candidates = _buildPortCandidates(normalizedPortName);
+      FlSerialException? lastError;
+      bool opened = false;
+
+      for (final candidate in candidates) {
+        // Always create a fresh FlSerial instance — a cached instance retains
+        // a stale flh handle from prior failed opens, which causes the native
+        // fl_open() to mis-route the request and report port-not-exist even
+        // when the device node is physically present.
+        final serial = _freshSerial();
+        serial.init();
+        try {
+          final openStatus = serial.openPort(candidate, baudRate);
+          if (openStatus != FlOpenStatus.open) {
+            final msg =
+                'Failed to open USB port $candidate (status: $openStatus)';
+            _debugLogService?.error(msg, tag: 'USB Serial');
+            // Not a FlSerialException — treat as terminal failure
+            _status = UsbSerialStatus.disconnected;
+            throw StateError(msg);
+          }
+          serial.setByteSize8();
+          serial.setBitParityNone();
+          serial.setStopBits1();
+          serial.setFlowControlNone();
+          serial.setRTS(false);
+          // Toggle DTR low→high so the device sees a fresh connection even
+          // if the previous disconnect didn't cleanly signal DTR drop.
+          serial.setDTR(false);
+          await Future<void>.delayed(const Duration(milliseconds: 50));
+          serial.setDTR(true);
+          _serial = serial;
+          // Update the normalized port name to whichever candidate succeeded.
+          normalizedPortName = candidate;
+          _debugLogService?.info(
+            'USB serial opened port=$candidate cts=${serial.getCTS()} dsr=${serial.getDSR()} dtr=true rts=false',
+            tag: 'USB Serial',
+          );
+          opened = true;
+          break;
+        } on FlSerialException catch (error) {
+          // The native fl_open() already called fl_close() on failure
+          // internally, so no extra cleanup is needed here for this candidate.
+          _debugLogService?.warn(
+            'Failed to open $candidate: ${error.msg} (code ${error.error})',
+            tag: 'USB Serial',
+          );
+          lastError = error;
+          // Try next candidate
+        } catch (error, stackTrace) {
+          _status = UsbSerialStatus.disconnected;
+          _debugLogService?.error(
+            'Unexpected error opening $candidate: $error\n$stackTrace',
+            tag: 'USB Serial',
+          );
+          rethrow;
+        }
+      }
+
+      if (!opened) {
+        _status = UsbSerialStatus.disconnected;
+        final primary = candidates.first;
+        final msg = lastError != null
+            ? 'Failed to open USB port $primary: ${lastError.msg} (code ${lastError.error})'
+            : 'Failed to open USB port $primary';
+        _debugLogService?.error(msg, tag: 'USB Serial');
+        throw StateError(msg);
+      }
+    }
+
+    _connectedPortKey = normalizedPortName;
+    _connectedPortLabel = normalizedPortName;
+    if (_useAndroidUsbHost) {
+      _androidDataSubscription = _androidEventChannel
+          .receiveBroadcastStream()
+          .listen(
+            _handleAndroidData,
+            onError: _handleSerialError,
+            onDone: _handleSerialDone,
+          );
+    } else {
+      _dataSubscription = _serial!.onSerialData.stream.listen(
+        _handleSerialData,
+        onError: _handleSerialError,
+        onDone: _handleSerialDone,
+      );
+    }
+    _status = UsbSerialStatus.connected;
+  }
+
+  Future<void> writeRaw(Uint8List data) async {
+    if (!isConnected) {
+      throw StateError('USB serial port is not open');
+    }
+    if (_useAndroidUsbHost) {
+      try {
+        await _androidMethodChannel.invokeMethod<void>('write', {'data': data});
+      } on PlatformException catch (error) {
+        throw StateError(error.message ?? error.code);
+      }
+    } else {
+      _serial!.write(data);
+    }
+  }
+
+  Future<void> write(Uint8List data) async {
+    if (!isConnected) {
+      throw StateError('USB serial port is not open');
+    }
+    final packet = wrapUsbSerialTxFrame(data);
+    _logFrameSummary('USB TX frame', data);
+    if (_useAndroidUsbHost) {
+      try {
+        await _androidMethodChannel.invokeMethod<void>('write', {
+          'data': packet,
+        });
+      } on PlatformException catch (error) {
+        throw StateError(error.message ?? error.code);
+      }
+    } else {
+      _serial!.write(packet);
+    }
+  }
+
+  Future<void> disconnect() async {
+    if (_status == UsbSerialStatus.disconnected) return;
+
+    final portLabel = _connectedPortLabel ?? _connectedPortKey;
+    _debugLogService?.info(
+      'USB disconnect starting port=${portLabel ?? 'unknown'}',
+      tag: 'USB Serial',
+    );
+    _status = UsbSerialStatus.disconnecting;
+    _connectedPortKey = null;
+    _connectedPortLabel = null;
+    _frameDecoder.reset();
+
+    if (_useAndroidUsbHost) {
+      await _androidDataSubscription?.cancel();
+      _androidDataSubscription = null;
+      try {
+        await _androidMethodChannel.invokeMethod<void>('disconnect');
+      } catch (_) {
+        // Ignore errors while closing.
+      }
+    } else {
+      // IMPORTANT: Close and free the native port FIRST, before cancelling the
+      // Dart subscription. The native SerialThread is blocked on a read(); once
+      // closePort() is called it unblocks and the thread exits.  If we cancel
+      // the Dart subscription first (freeing the FFI callback pointer) and the
+      // thread fires one final callback before noticing the port is gone, Dart
+      // crashes with "Callback invoked after it has been deleted".
+      final serial = _serial;
+      _serial = null;
+      try {
+        if (serial?.isOpen() == FlOpenStatus.open) {
+          serial?.setDTR(false);
+          serial?.closePort();
+        }
+      } catch (_) {
+        // Ignore errors while closing.
+      }
+      // Note: we do NOT call free() here; that would globally reset native
+      // state for all ports. The global reset is done in connect() instead,
+      // before the next open, which is the safer place to do it.
+
+      // Now it is safe to cancel the Dart subscription — the native thread has
+      // already seen the port close and will not fire any more callbacks.
+      await _dataSubscription?.cancel();
+      _dataSubscription = null;
+    }
+    _status = UsbSerialStatus.disconnected;
+    _debugLogService?.info(
+      'USB disconnect complete port=${portLabel ?? 'unknown'}',
+      tag: 'USB Serial',
+    );
+  }
+
+  void setRequestPortLabel(String label) {
+    // Native implementations do not use a synthetic chooser row.
+  }
+
+  void setFallbackDeviceName(String label) {
+    // Native implementations use OS-provided device names.
+  }
+
+  void updateConnectedLabel(String label) {
+    final trimmed = label.trim();
+    if (trimmed.isEmpty) {
+      return;
+    }
+    _connectedPortLabel = buildUsbDisplayLabel(
+      basePortLabel: _connectedPortKey ?? trimmed,
+      deviceName: trimmed,
+    );
+  }
+
+  void dispose() {
+    // Synchronously close the native port so the SerialThread exits before
+    // the Dart isolate is torn down (e.g. on hot restart). The async
+    // disconnect() path via unawaited() offers no ordering guarantee — the
+    // isolate may die before the Future resolves, leaving the thread alive
+    // with a dangling NativeCallable pointer.
+    if (_useDesktopFlSerial) {
+      final serial = _serial;
+      try {
+        if (serial?.isOpen() == FlOpenStatus.open) {
+          serial?.setDTR(false);
+          serial?.closePort(); // synchronous C call — kills the SerialThread
+        }
+      } catch (_) {}
+    }
+    // Kick off the full async teardown for anything else (subscription cancel,
+    // stream controller close). These are best-effort at dispose time.
+    unawaited(disconnect().whenComplete(_closeFrameController));
+  }
+
+  void _handleSerialData(FlSerialEventArgs event) {
+    try {
+      final bytes = event.serial.readList();
+      if (bytes.isNotEmpty) {
+        _ingestRawBytes(Uint8List.fromList(bytes));
+      }
+    } catch (error, stack) {
+      _addFrameError(error, stack);
+    }
+  }
+
+  void _handleAndroidData(dynamic data) {
+    if (data is Uint8List) {
+      _ingestRawBytes(data);
+      return;
+    }
+    if (data is ByteData) {
+      _ingestRawBytes(data.buffer.asUint8List());
+      return;
+    }
+    _addFrameError(
+      StateError('Unexpected Android USB event payload: ${data.runtimeType}'),
+    );
+  }
+
+  void _handleSerialError(Object error, [StackTrace? stackTrace]) {
+    _addFrameError(error, stackTrace);
+  }
+
+  void _handleSerialDone() {
+    unawaited(disconnect());
+  }
+
+  void _ingestRawBytes(Uint8List bytes) {
+    for (final packet in _frameDecoder.ingest(bytes)) {
+      if (!packet.isRxFrame) {
+        _debugLogService?.info(
+          'USB ignored packet start=0x${packet.frameStart.toRadixString(16).padLeft(2, '0')} len=${packet.payload.length}',
+          tag: 'USB Serial',
+        );
+        continue;
+      }
+      _addFrame(packet.payload);
+    }
+  }
+
+  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);
+  }
+
+  Future<void> _closeFrameController() async {
+    if (_frameController.isClosed) {
+      return;
+    }
+    await _frameController.close();
+  }
+
+  void _logFrameSummary(String prefix, Uint8List bytes) {
+    if (bytes.isEmpty) {
+      _debugLogService?.info('$prefix len=0', tag: 'USB Serial');
+      return;
+    }
+    _debugLogService?.info(
+      '$prefix code=${bytes[0]} len=${bytes.length}',
+      tag: 'USB Serial',
+    );
+  }
+
+  /// Returns an ordered list of port paths to try for [portName].
+  ///
+  /// On macOS, USB serial devices appear as both `/dev/cu.*` (call-out, the
+  /// correct mode for outgoing serial connections) and `/dev/tty.*` (dial-in).
+  /// `flserial` may list one variant while only the other is actually openable
+  /// at a given moment. We prefer `cu.*` but automatically include the `tty.*`
+  /// sibling as a fallback, and vice-versa.
+  List<String> _buildPortCandidates(String normalizedPort) {
+    if (!Platform.isMacOS) return [normalizedPort];
+    const cuPrefix = '/dev/cu.';
+    const ttyPrefix = '/dev/tty.';
+    if (normalizedPort.startsWith(cuPrefix)) {
+      final suffix = normalizedPort.substring(cuPrefix.length);
+      return [normalizedPort, '$ttyPrefix$suffix'];
+    }
+    if (normalizedPort.startsWith(ttyPrefix)) {
+      final suffix = normalizedPort.substring(ttyPrefix.length);
+      return [normalizedPort, '$cuPrefix$suffix'];
+    }
+    return [normalizedPort];
+  }
+}
+
+enum UsbSerialStatus { disconnected, connecting, connected, disconnecting }

lib/services/usb_serial_service_web.dart

@@ -0,0 +1,591 @@
+import 'dart:async';
+import 'dart:js_interop';
+import 'dart:js_interop_unsafe';
+
+import 'package:flutter/foundation.dart';
+import 'package:web/web.dart' as web;
+
+import 'app_debug_log_service.dart';
+import '../utils/usb_port_labels.dart';
+import 'usb_serial_frame_codec.dart';
+
+class UsbSerialService {
+  UsbSerialService();
+
+  static const Map<String, String> _knownUsbNames = <String, String>{
+    '2886:1667': 'Seeed Wio Tracker L1',
+  };
+  static final Map<String, String> _deviceNamesByPortKey = <String, String>{};
+  static final Map<String, String> _baseLabelsByPortKey = <String, String>{};
+  static final Map<String, JSObject> _authorizedPortsByKey =
+      <String, JSObject>{};
+  static int _nextAuthorizedPortId = 1;
+
+  final StreamController<Uint8List> _frameController =
+      StreamController<Uint8List>.broadcast();
+  final UsbSerialFrameDecoder _frameDecoder = UsbSerialFrameDecoder();
+
+  UsbSerialStatus _status = UsbSerialStatus.disconnected;
+  JSObject? _port;
+  JSObject? _reader;
+  JSObject? _writer;
+  String? _connectedPortName;
+  String? _connectedPortKey;
+  String _requestPortLabel = 'Choose USB Device';
+  String _fallbackDeviceName = 'Web Serial Device';
+  AppDebugLogService? _debugLogService;
+
+  UsbSerialStatus get status => _status;
+  String? get activePortKey => _connectedPortKey;
+  String? get activePortDisplayLabel => _connectedPortName ?? _connectedPortKey;
+  Stream<Uint8List> get frameStream => _frameController.stream;
+  bool get isConnected => _status == UsbSerialStatus.connected;
+
+  JSObject get _navigator => JSObject.fromInteropObject(web.window.navigator);
+  bool get _isSupported => _navigator.has('serial');
+  JSObject? get _serial {
+    if (!_isSupported) {
+      return null;
+    }
+    final serial = _navigator['serial'];
+    return serial == null ? null : serial as JSObject;
+  }
+
+  Future<List<String>> listPorts() async {
+    if (!_isSupported) {
+      return const <String>[];
+    }
+
+    _resetPortCache();
+    final ports = await _getAuthorizedPorts();
+    return <String>[_requestPortListEntry, ...ports.map(_listEntryForPort)];
+  }
+
+  Future<void> connect({
+    required String portName,
+    int baudRate = 115200,
+  }) async {
+    if (_status == UsbSerialStatus.connected ||
+        _status == UsbSerialStatus.connecting) {
+      throw StateError('USB serial transport is already active');
+    }
+    if (!_isSupported) {
+      throw UnsupportedError('Web Serial is not supported by this browser.');
+    }
+
+    _status = UsbSerialStatus.connecting;
+    _frameDecoder.reset();
+
+    try {
+      final requestedPortName = normalizeUsbPortName(portName);
+      _debugLogService?.info(
+        'Web connect: requested=$requestedPortName baud=$baudRate',
+        tag: 'USB Serial',
+      );
+      final selectedPortKey = requestedPortName.startsWith('web:port:')
+          ? requestedPortName
+          : null;
+      _port = _authorizedPortsByKey[requestedPortName];
+      final authorizedPorts = await _getAuthorizedPorts();
+      _debugLogService?.info(
+        'Web connect: ${authorizedPorts.length} authorized port(s), cached=${_port != null}',
+        tag: 'USB Serial',
+      );
+      _port ??= _selectPort(authorizedPorts, requestedPortName);
+
+      _port ??= await _requestPort();
+      if (_port == null) {
+        throw StateError('No USB serial device selected');
+      }
+
+      _debugLogService?.info(
+        'Web connect: opening port at $baudRate baud…',
+        tag: 'USB Serial',
+      );
+      await _openPort(_port!, baudRate);
+      _connectedPortKey = _cachePort(_port!, preferredKey: selectedPortKey);
+      _connectedPortName = _displayLabelForPort(
+        _port!,
+        portKey: _connectedPortKey,
+      );
+      _writer = _getWriter(_port!);
+      _reader = _getReader(_port!);
+      _status = UsbSerialStatus.connected;
+      unawaited(_pumpReads());
+
+      _debugLogService?.info(
+        'USB serial opened port=$_connectedPortName via Web Serial',
+        tag: 'USB Serial',
+      );
+    } catch (error) {
+      _debugLogService?.error('Web connect failed: $error', tag: 'USB Serial');
+      await _cleanupFailedConnect();
+      _status = UsbSerialStatus.disconnected;
+      _connectedPortName = null;
+      _connectedPortKey = null;
+      rethrow;
+    }
+  }
+
+  Future<void> writeRaw(Uint8List data) async {
+    if (!isConnected || _writer == null) {
+      throw StateError('USB serial port is not open');
+    }
+    final promise = _writer!.callMethod<JSPromise<JSAny?>>(
+      'write'.toJS,
+      data.toJS,
+    );
+    await promise.toDart;
+  }
+
+  Future<void> write(Uint8List data) async {
+    if (!isConnected || _writer == null) {
+      throw StateError('USB serial port is not open');
+    }
+
+    final packet = wrapUsbSerialTxFrame(data);
+    _logFrameSummary('USB TX frame', data);
+
+    final promise = _writer!.callMethod<JSPromise<JSAny?>>(
+      'write'.toJS,
+      packet.toJS,
+    );
+    await promise.toDart;
+  }
+
+  Future<void> disconnect() async {
+    if (_status == UsbSerialStatus.disconnected) return;
+
+    final portLabel = _connectedPortName ?? _connectedPortKey;
+    _debugLogService?.info(
+      'USB disconnect starting port=${portLabel ?? 'unknown'}',
+      tag: 'USB Serial',
+    );
+    _status = UsbSerialStatus.disconnecting;
+    final reader = _reader;
+    final writer = _writer;
+    final port = _port;
+
+    _reader = null;
+    _writer = null;
+    _port = null;
+    _connectedPortName = null;
+    _connectedPortKey = null;
+    _frameDecoder.reset();
+
+    if (reader != null) {
+      try {
+        await reader.callMethod<JSPromise<JSAny?>>('cancel'.toJS).toDart;
+      } catch (_) {
+        // Ignore errors while closing.
+      }
+      _releaseLock(reader);
+    }
+
+    if (writer != null) {
+      _releaseLock(writer);
+    }
+
+    if (port != null) {
+      try {
+        await port.callMethod<JSPromise<JSAny?>>('close'.toJS).toDart;
+      } catch (_) {
+        // Ignore errors while closing.
+      }
+    }
+
+    _status = UsbSerialStatus.disconnected;
+    _debugLogService?.info(
+      'USB disconnect complete port=${portLabel ?? 'unknown'}',
+      tag: 'USB Serial',
+    );
+  }
+
+  void updateConnectedLabel(String label) {
+    final trimmed = label.trim();
+    final portKey = _connectedPortKey;
+    if (trimmed.isEmpty || portKey == null) {
+      return;
+    }
+    _deviceNamesByPortKey[portKey] = trimmed;
+    _connectedPortName = _buildDisplayLabel(portKey);
+  }
+
+  void setRequestPortLabel(String label) {
+    final trimmed = label.trim();
+    if (trimmed.isEmpty) {
+      return;
+    }
+    _requestPortLabel = trimmed;
+  }
+
+  void setFallbackDeviceName(String label) {
+    final trimmed = label.trim();
+    if (trimmed.isEmpty) {
+      return;
+    }
+    _fallbackDeviceName = trimmed;
+  }
+
+  void setDebugLogService(AppDebugLogService? service) {
+    _debugLogService = service;
+  }
+
+  void dispose() {
+    unawaited(disconnect().whenComplete(_closeFrameController));
+  }
+
+  Future<List<JSObject>> _getAuthorizedPorts() async {
+    final serial = _serial;
+    if (serial == null) {
+      return const <JSObject>[];
+    }
+    final result = await serial
+        .callMethod<JSPromise<JSAny?>>('getPorts'.toJS)
+        .toDart;
+    return _toObjectList(result);
+  }
+
+  Future<JSObject?> _requestPort() async {
+    final serial = _serial;
+    if (serial == null) {
+      return null;
+    }
+    final result = await serial
+        .callMethod<JSPromise<JSAny?>>('requestPort'.toJS)
+        .toDart;
+    return result == null ? null : result as JSObject;
+  }
+
+  JSObject? _selectPort(List<JSObject> ports, String requestedPortName) {
+    if (ports.isEmpty) {
+      return null;
+    }
+    if (requestedPortName.isEmpty || requestedPortName == _requestPortKey) {
+      return ports.first;
+    }
+    if (requestedPortName.startsWith('web:port:')) {
+      return null;
+    }
+    for (final port in ports) {
+      final description = _describePort(port);
+      if (description == requestedPortName) {
+        return port;
+      }
+    }
+    return null;
+  }
+
+  Future<void> _openPort(JSObject port, int baudRate) async {
+    final options = JSObject()
+      ..['baudRate'] = baudRate.toJS
+      ..['flowControl'] = 'none'.toJS;
+    await port.callMethod<JSPromise<JSAny?>>('open'.toJS, options).toDart;
+
+    // Prevent ESP32 USB-CDC reset: hold DTR=true, RTS=false after open.
+    try {
+      final signals = JSObject()
+        ..['dataTerminalReady'] = true.toJS
+        ..['requestToSend'] = false.toJS;
+      await port
+          .callMethod<JSPromise<JSAny?>>('setSignals'.toJS, signals)
+          .toDart;
+    } catch (_) {
+      // setSignals may not be supported on all browsers/devices.
+    }
+  }
+
+  Future<void> _cleanupFailedConnect() async {
+    final reader = _reader;
+    final writer = _writer;
+    final port = _port;
+
+    _reader = null;
+    _writer = null;
+    _port = null;
+
+    if (reader != null) {
+      try {
+        await reader.callMethod<JSPromise<JSAny?>>('cancel'.toJS).toDart;
+      } catch (_) {
+        // Ignore cleanup errors after a failed connect.
+      }
+      _releaseLock(reader);
+    }
+
+    if (writer != null) {
+      _releaseLock(writer);
+    }
+
+    if (port != null) {
+      try {
+        await port.callMethod<JSPromise<JSAny?>>('close'.toJS).toDart;
+      } catch (_) {
+        // Ignore cleanup errors after a failed connect.
+      }
+    }
+  }
+
+  JSObject? _getReader(JSObject port) {
+    final readable = port.getProperty<JSAny?>('readable'.toJS);
+    if (readable == null) {
+      throw StateError('Web Serial port is not readable');
+    }
+    final readableObject = readable as JSObject;
+    return readableObject.callMethod<JSAny?>('getReader'.toJS) as JSObject;
+  }
+
+  JSObject? _getWriter(JSObject port) {
+    final writable = port.getProperty<JSAny?>('writable'.toJS);
+    if (writable == null) {
+      throw StateError('Web Serial port is not writable');
+    }
+    final writableObject = writable as JSObject;
+    return writableObject.callMethod<JSAny?>('getWriter'.toJS) as JSObject;
+  }
+
+  Future<void> _pumpReads() async {
+    final reader = _reader;
+    if (reader == null) {
+      _debugLogService?.warn('_pumpReads: reader is null', tag: 'USB Serial');
+      return;
+    }
+
+    _debugLogService?.info('_pumpReads: started', tag: 'USB Serial');
+    try {
+      while (_status == UsbSerialStatus.connected &&
+          identical(reader, _reader)) {
+        final result = await reader
+            .callMethod<JSPromise<JSAny?>>('read'.toJS)
+            .toDart;
+        if (result == null) {
+          _debugLogService?.warn('_pumpReads: null result', tag: 'USB Serial');
+          break;
+        }
+        final resultObject = result as JSObject;
+
+        final doneValue = resultObject.getProperty<JSAny?>('done'.toJS);
+        final done = doneValue != null && doneValue.dartify() == true;
+        if (done) {
+          _debugLogService?.info('_pumpReads: done=true', tag: 'USB Serial');
+          break;
+        }
+
+        final value = resultObject.getProperty<JSAny?>('value'.toJS);
+        final bytes = _coerceBytes(value);
+        if (bytes != null && bytes.isNotEmpty) {
+          _debugLogService?.info(
+            'USB RX raw: ${bytes.length} byte(s)',
+            tag: 'USB Serial',
+          );
+          _ingestRawBytes(bytes);
+        }
+      }
+    } catch (error, stackTrace) {
+      _debugLogService?.error('_pumpReads error: $error', tag: 'USB Serial');
+      if (_status == UsbSerialStatus.connected) {
+        _addFrameError(error, stackTrace);
+      }
+    } finally {
+      _debugLogService?.info('_pumpReads: ended', tag: 'USB Serial');
+      _releaseLock(reader);
+      if (_status == UsbSerialStatus.connected && identical(reader, _reader)) {
+        _addFrameError(StateError('USB serial connection closed'));
+      }
+    }
+  }
+
+  Uint8List? _coerceBytes(JSAny? value) {
+    if (value == null) return null;
+    try {
+      return (value as JSUint8Array).toDart;
+    } catch (_) {
+      // Fall back to array-like coercion below.
+    }
+
+    final object = value as JSObject;
+    if (object.has('length')) {
+      final lengthValue = object.getProperty<JSAny?>('length'.toJS)?.dartify();
+      if (lengthValue is num) {
+        final length = lengthValue.toInt();
+        final bytes = Uint8List(length);
+        for (var i = 0; i < length; i++) {
+          final item = object.getProperty<JSAny?>(i.toString().toJS)?.dartify();
+          if (item is num) {
+            bytes[i] = item.toInt();
+          }
+        }
+        return bytes;
+      }
+    }
+
+    return null;
+  }
+
+  List<JSObject> _toObjectList(JSAny? value) {
+    if (value == null) {
+      return const <JSObject>[];
+    }
+    final object = value as JSObject;
+    if (!object.has('length')) {
+      return const <JSObject>[];
+    }
+
+    final lengthValue = object.getProperty<JSAny?>('length'.toJS)?.dartify();
+    if (lengthValue is! num) {
+      return const <JSObject>[];
+    }
+
+    final length = lengthValue.toInt();
+    final items = <JSObject>[];
+    for (var i = 0; i < length; i++) {
+      final item = object.getProperty<JSAny?>(i.toString().toJS);
+      if (item != null) {
+        items.add(item as JSObject);
+      }
+    }
+    return items;
+  }
+
+  String _describePort(JSObject port) {
+    final info = _portInfo(port);
+    if (info == null) {
+      return _requestPortLabel;
+    }
+
+    final vendorId = info.usbVendorId;
+    final productId = info.usbProductId;
+    final hasVendor = vendorId != null;
+    final hasProduct = productId != null;
+
+    return describeWebUsbPort(
+      vendorId: hasVendor ? vendorId : null,
+      productId: hasProduct ? productId : null,
+      requestPortLabel: _requestPortLabel,
+      fallbackDeviceName: _fallbackDeviceName,
+      knownUsbNames: _knownUsbNames,
+    );
+  }
+
+  _WebPortInfo? _portInfo(JSObject port) {
+    try {
+      final info = port.callMethod<JSAny?>('getInfo'.toJS);
+      if (info == null) {
+        return null;
+      }
+      final infoObject = info as JSObject;
+
+      final vendorId = infoObject
+          .getProperty<JSAny?>('usbVendorId'.toJS)
+          ?.dartify();
+      final productId = infoObject
+          .getProperty<JSAny?>('usbProductId'.toJS)
+          ?.dartify();
+      return _WebPortInfo(
+        usbVendorId: vendorId is num ? vendorId.toInt() : null,
+        usbProductId: productId is num ? productId.toInt() : null,
+      );
+    } catch (_) {
+      return null;
+    }
+  }
+
+  String _portKeyFor(JSObject port) {
+    return _cachePort(port);
+  }
+
+  String _cachePort(JSObject port, {String? preferredKey}) {
+    final portKey = preferredKey ?? 'web:port:${_nextAuthorizedPortId++}';
+    _baseLabelsByPortKey[portKey] = _describePort(port);
+    _authorizedPortsByKey[portKey] = port;
+    return portKey;
+  }
+
+  String _displayLabelForPort(JSObject port, {String? portKey}) =>
+      _buildDisplayLabel(portKey ?? _portKeyFor(port));
+
+  String _buildDisplayLabel(String portKey) {
+    return buildUsbDisplayLabel(
+      basePortLabel: _baseLabelsByPortKey[portKey] ?? portKey,
+      deviceName: _deviceNamesByPortKey[portKey],
+    );
+  }
+
+  String _listEntryForPort(JSObject port) {
+    final portKey = _portKeyFor(port);
+    return '$portKey - ${_displayLabelForPort(port, portKey: portKey)}';
+  }
+
+  String get _requestPortKey => 'web:request';
+
+  String get _requestPortListEntry => '$_requestPortKey - $_requestPortLabel';
+
+  void _resetPortCache() {
+    _authorizedPortsByKey.clear();
+    _baseLabelsByPortKey.clear();
+    _deviceNamesByPortKey.clear();
+    _nextAuthorizedPortId = 1;
+  }
+
+  void _releaseLock(JSObject resource) {
+    try {
+      resource.callMethod<JSAny?>('releaseLock'.toJS);
+    } catch (_) {
+      // Ignore lock release failures.
+    }
+  }
+
+  void _ingestRawBytes(Uint8List bytes) {
+    for (final packet in _frameDecoder.ingest(bytes)) {
+      if (!packet.isRxFrame) {
+        _debugLogService?.info(
+          'USB ignored packet start=0x${packet.frameStart.toRadixString(16).padLeft(2, '0')} len=${packet.payload.length}',
+          tag: 'USB Serial',
+        );
+        continue;
+      }
+      _addFrame(packet.payload);
+    }
+  }
+
+  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);
+  }
+
+  Future<void> _closeFrameController() async {
+    if (_frameController.isClosed) {
+      return;
+    }
+    await _frameController.close();
+  }
+
+  void _logFrameSummary(String prefix, Uint8List bytes) {
+    if (bytes.isEmpty) {
+      _debugLogService?.info('$prefix len=0', tag: 'USB Serial');
+      return;
+    }
+    _debugLogService?.info(
+      '$prefix code=${bytes[0]} len=${bytes.length}',
+      tag: 'USB Serial',
+    );
+  }
+}
+
+enum UsbSerialStatus { disconnected, connecting, connected, disconnecting }
+
+final class _WebPortInfo {
+  const _WebPortInfo({required this.usbVendorId, required this.usbProductId});
+
+  final int? usbVendorId;
+  final int? usbProductId;
+}

lib/storage/channel_message_store.dart

@@ -1,5 +1,7 @@
 import 'dart:convert';
 import 'dart:typed_data';
+import 'package:meshcore_open/utils/app_logger.dart';
+
 import '../models/channel_message.dart';
 import '../helpers/smaz.dart';
 import 'prefs_manager.dart';
@@ -7,13 +9,25 @@ import 'prefs_manager.dart';
 class ChannelMessageStore {
   static const String _keyPrefix = 'channel_messages_';
 
+  String publicKeyHex = '';
+  set setPublicKeyHex(String value) =>
+      publicKeyHex = value.length > 10 ? value.substring(0, 10) : '';
+
+  String get keyFor => '$_keyPrefix$publicKeyHex';
+
   /// Save messages for a specific channel
   Future<void> saveChannelMessages(
     int channelIndex,
     List<ChannelMessage> messages,
   ) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn(
+        'Public key hex is not set. Cannot save channel messages.',
+      );
+      return;
+    }
     final prefs = PrefsManager.instance;
-    final key = '$_keyPrefix$channelIndex';
+    final key = '$keyFor$channelIndex';
 
     // Convert messages to JSON
     final jsonList = messages.map((msg) => _messageToJson(msg)).toList();
@@ -24,12 +38,35 @@ class ChannelMessageStore {
 
   /// Load messages for a specific channel
   Future<List<ChannelMessage>> loadChannelMessages(int channelIndex) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn(
+        'Public key hex is not set. Cannot load channel messages.',
+      );
+      return [];
+    }
     final prefs = PrefsManager.instance;
-    final key = '$_keyPrefix$channelIndex';
-
-    final jsonString = prefs.getString(key);
-    if (jsonString == null) return [];
+    final key = '$keyFor$channelIndex';
+    final oldKey = '$_keyPrefix$channelIndex';
 
+    String? jsonString = prefs.getString(key);
+    if (jsonString == null || jsonString.isEmpty) {
+      // Attempt migration from legacy unscoped key on first load
+      final legacyJsonString = prefs.getString(oldKey);
+      prefs.remove(oldKey);
+      if (legacyJsonString != null && legacyJsonString.isNotEmpty) {
+        appLogger.info(
+          'Migrating channel messages from legacy key $oldKey to scoped key $key',
+        );
+        await prefs.setString(key, legacyJsonString);
+        jsonString = legacyJsonString;
+      }
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      return [];
+    }
     try {
       final jsonList = jsonDecode(jsonString) as List<dynamic>;
       return jsonList.map((json) => _messageFromJson(json)).toList();
@@ -42,14 +79,14 @@ class ChannelMessageStore {
   /// Clear messages for a specific channel
   Future<void> clearChannelMessages(int channelIndex) async {
     final prefs = PrefsManager.instance;
-    final key = '$_keyPrefix$channelIndex';
+    final key = '$keyFor$channelIndex';
     await prefs.remove(key);
   }
 
   /// Clear all channel messages
   Future<void> clearAllChannelMessages() async {
     final prefs = PrefsManager.instance;
-    final keys = prefs.getKeys().where((k) => k.startsWith(_keyPrefix));
+    final keys = prefs.getKeys().where((k) => k.startsWith(keyFor));
     for (var key in keys) {
       await prefs.remove(key);
     }

lib/storage/channel_order_store.dart

@@ -1,20 +1,49 @@
 import 'dart:convert';
+import '../utils/app_logger.dart';
 import 'prefs_manager.dart';
 
 class ChannelOrderStore {
-  static const String _key = 'channel_order';
+  static const String _keyPrefix = 'channel_order_';
+
+  String publicKeyHex = '';
+  set setPublicKeyHex(String value) =>
+      publicKeyHex = value.length > 10 ? value.substring(0, 10) : '';
+
+  String get keyFor => '$_keyPrefix$publicKeyHex';
 
   Future<void> saveChannelOrder(List<int> order) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot save channel order.');
+      return;
+    }
     final prefs = PrefsManager.instance;
-    await prefs.setString(_key, jsonEncode(order));
+    await prefs.setString(keyFor, jsonEncode(order));
   }
 
   Future<List<int>> loadChannelOrder() async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot load channel order.');
+      return [];
+    }
     final prefs = PrefsManager.instance;
-    final raw = prefs.getString(_key);
-    if (raw == null || raw.isEmpty) return [];
+    String? jsonString = prefs.getString(keyFor);
+    if (jsonString == null || jsonString.isEmpty) {
+      // Attempt migration from legacy unscoped key on first load
+      final legacyJsonString = prefs.getString(_keyPrefix);
+      prefs.remove(_keyPrefix);
+      if (legacyJsonString != null && legacyJsonString.isNotEmpty) {
+        appLogger.info(
+          'Migrating channel order from legacy key $_keyPrefix to scoped key $keyFor',
+        );
+        await prefs.setString(keyFor, legacyJsonString);
+        jsonString = legacyJsonString;
+      }
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      return [];
+    }
     try {
-      final decoded = jsonDecode(raw);
+      final decoded = jsonDecode(jsonString);
       if (decoded is List) {
         return decoded
             .map((value) => value is int ? value : int.tryParse('$value'))
@@ -24,7 +53,7 @@ class ChannelOrderStore {
     } catch (_) {
       // fall through to legacy parse
     }
-    return raw
+    return jsonString
         .split(',')
         .map((value) => int.tryParse(value))
         .whereType<int>()

lib/storage/channel_settings_store.dart

@@ -1,17 +1,49 @@
+import '../utils/app_logger.dart';
 import 'prefs_manager.dart';
 
 class ChannelSettingsStore {
-  static const String _smazKeyPrefix = 'channel_smaz_';
+  static const String _keyPrefix = 'channel_smaz_';
+
+  String publicKeyHex = '';
+  set setPublicKeyHex(String value) =>
+      publicKeyHex = value.length > 10 ? value.substring(0, 10) : '';
+
+  String get keyFor => '$_keyPrefix$publicKeyHex';
 
   Future<bool> loadSmazEnabled(int channelIndex) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn(
+        'Public key hex is not set. Cannot load channel settings.',
+      );
+      return false;
+    }
     final prefs = PrefsManager.instance;
-    final key = '$_smazKeyPrefix$channelIndex';
-    return prefs.getBool(key) ?? false;
+    final key = '$keyFor$channelIndex';
+    final oldKey = '$_keyPrefix$channelIndex';
+    bool? enabled = prefs.getBool(oldKey);
+    if (enabled == null) {
+      // Attempt migration from legacy unscoped key on first load
+      enabled = prefs.getBool(oldKey);
+      prefs.remove(oldKey);
+      if (enabled != null) {
+        appLogger.info(
+          'Migrating channel settings from legacy key $oldKey to scoped key $key',
+        );
+        await prefs.setBool(key, enabled);
+      }
+    }
+    return enabled ?? false;
   }
 
   Future<void> saveSmazEnabled(int channelIndex, bool enabled) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn(
+        'Public key hex is not set. Cannot save channel settings.',
+      );
+      return;
+    }
     final prefs = PrefsManager.instance;
-    final key = '$_smazKeyPrefix$channelIndex';
+    final key = '$keyFor$channelIndex';
     await prefs.setBool(key, enabled);
   }
 }

lib/storage/channel_store.dart

@@ -2,18 +2,46 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import '../models/channel.dart';
+import '../utils/app_logger.dart';
 import 'prefs_manager.dart';
 
 class ChannelStore {
-  static const String _key = 'channels';
+  static const String _keyPrefix = 'channels';
+  String publicKeyHex = '';
+  set setPublicKeyHex(String value) =>
+      publicKeyHex = value.length >= 10 ? value.substring(0, 10) : '';
+
+  String get keyFor => '$_keyPrefix$publicKeyHex';
 
   Future<List<Channel>> loadChannels() async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot load channels.');
+      return [];
+    }
     final prefs = PrefsManager.instance;
-    final jsonStr = prefs.getString(_key);
-    if (jsonStr == null) return [];
+    String? jsonString = prefs.getString(keyFor);
+    if (jsonString == null || jsonString.isEmpty) {
+      // Attempt migration from legacy unscoped key on first load
+      final legacyJsonString = prefs.getString(_keyPrefix);
+      prefs.remove(_keyPrefix);
+      if (legacyJsonString != null && legacyJsonString.isNotEmpty) {
+        appLogger.info(
+          'Migrating channel messages from legacy key $_keyPrefix to scoped key $keyFor',
+        );
+        await prefs.setString(keyFor, legacyJsonString);
+        jsonString = legacyJsonString;
+      }
+    }
+
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      return [];
+    }
 
     try {
-      final jsonList = jsonDecode(jsonStr) as List<dynamic>;
+      final jsonList = jsonDecode(jsonString) as List<dynamic>;
       return jsonList
           .map((entry) => _fromJson(entry as Map<String, dynamic>))
           .toList();
@@ -23,9 +51,13 @@ class ChannelStore {
   }
 
   Future<void> saveChannels(List<Channel> channels) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot save channels.');
+      return;
+    }
     final prefs = PrefsManager.instance;
     final jsonList = channels.map(_toJson).toList();
-    await prefs.setString(_key, jsonEncode(jsonList));
+    await prefs.setString(keyFor, jsonEncode(jsonList));
   }
 
   Map<String, dynamic> _toJson(Channel channel) {

lib/storage/community_store.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import '../models/community.dart';
+import '../utils/app_logger.dart';
 import 'prefs_manager.dart';
 
 /// Persists communities to local storage using SharedPreferences.
@@ -9,12 +10,37 @@ import 'prefs_manager.dart';
 /// Each community contains its secret K, so this data should
 /// be considered sensitive (though device encryption handles security).
 class CommunityStore {
-  static const String _communitiesKey = 'communities_v1';
+  static const String _keyPrefix = 'communities_v1';
+
+  String publicKeyHex = '';
+  set setPublicKeyHex(String value) =>
+      publicKeyHex = value.length > 10 ? value.substring(0, 10) : '';
+
+  String get keyFor => '$_keyPrefix$publicKeyHex';
 
   /// Load all communities from storage
   Future<List<Community>> loadCommunities() async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot load communities.');
+      return [];
+    }
     final prefs = PrefsManager.instance;
-    final jsonString = prefs.getString(_communitiesKey);
+    String? jsonString = prefs.getString(keyFor);
+    if (jsonString == null || jsonString.isEmpty) {
+      // Attempt migration from legacy unscoped key on first load
+      final legacyJsonString = prefs.getString(_keyPrefix);
+      prefs.remove(_keyPrefix);
+      if (legacyJsonString != null && legacyJsonString.isNotEmpty) {
+        appLogger.info(
+          'Migrating communities from legacy key $_keyPrefix to scoped key $keyFor',
+        );
+        await prefs.setString(keyFor, legacyJsonString);
+        jsonString = legacyJsonString;
+      }
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
     if (jsonString == null || jsonString.isEmpty) {
       return [];
     }
@@ -32,9 +58,13 @@ class CommunityStore {
 
   /// Save all communities to storage
   Future<void> saveCommunities(List<Community> communities) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot save communities.');
+      return;
+    }
     final prefs = PrefsManager.instance;
     final jsonList = communities.map((c) => c.toJson()).toList();
-    await prefs.setString(_communitiesKey, jsonEncode(jsonList));
+    await prefs.setString(keyFor, jsonEncode(jsonList));
   }
 
   /// Add a new community

lib/storage/contact_discovery_store.dart

@@ -1,15 +1,15 @@
 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 _key = 'discovered_contacts';
+  static const String _keyPrefix = 'discovered_contacts';
 
-  Future<List<DiscoveryContact>> loadContacts() async {
+  Future<List<Contact>> loadContacts() async {
     final prefs = PrefsManager.instance;
-    final jsonStr = prefs.getString(_key);
+    final jsonStr = prefs.getString(_keyPrefix);
     if (jsonStr == null) return [];
 
     try {
@@ -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(_key, jsonEncode(jsonList));
+    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_group_store.dart

@@ -1,17 +1,45 @@
 import 'dart:convert';
 import '../models/contact_group.dart';
+import '../utils/app_logger.dart';
 import 'prefs_manager.dart';
 
 class ContactGroupStore {
-  static const String _key = 'contact_groups';
+  static const String _keyPrefix = 'contact_groups';
+
+  String publicKeyHex = '';
+  set setPublicKeyHex(String value) =>
+      publicKeyHex = value.length > 10 ? value.substring(0, 10) : '';
+
+  String get keyFor => '$_keyPrefix$publicKeyHex';
 
   Future<List<ContactGroup>> loadGroups() async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot load contact groups.');
+      return [];
+    }
     final prefs = PrefsManager.instance;
-    final raw = prefs.getString(_key);
-    if (raw == null || raw.isEmpty) return [];
+    String? jsonString = prefs.getString(keyFor);
+    if (jsonString == null || jsonString.isEmpty) {
+      // Attempt migration from legacy unscoped key on first load
+      final legacyJsonString = prefs.getString(_keyPrefix);
+      prefs.remove(_keyPrefix);
+      if (legacyJsonString != null && legacyJsonString.isNotEmpty) {
+        appLogger.info(
+          'Migrating channel messages from legacy key $_keyPrefix to scoped key $keyFor',
+        );
+        await prefs.setString(keyFor, legacyJsonString);
+        jsonString = legacyJsonString;
+      }
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      return [];
+    }
 
     try {
-      final decoded = jsonDecode(raw);
+      final decoded = jsonDecode(jsonString);
       if (decoded is List) {
         return decoded
             .whereType<Map<String, dynamic>>()
@@ -25,8 +53,12 @@ class ContactGroupStore {
   }
 
   Future<void> saveGroups(List<ContactGroup> groups) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot save contact groups.');
+      return;
+    }
     final prefs = PrefsManager.instance;
     final encoded = jsonEncode(groups.map((group) => group.toJson()).toList());
-    await prefs.setString(_key, encoded);
+    await prefs.setString(keyFor, encoded);
   }
 }

lib/storage/contact_settings_store.dart

@@ -1,17 +1,49 @@
+import '../utils/app_logger.dart';
 import 'prefs_manager.dart';
 
 class ContactSettingsStore {
-  static const String _smazKeyPrefix = 'contact_smaz_';
+  static const String _keyPrefix = 'contact_smaz_';
+
+  String publicKeyHex = '';
+  set setPublicKeyHex(String value) =>
+      publicKeyHex = value.length > 10 ? value.substring(0, 10) : '';
+
+  String get keyFor => '$_keyPrefix$publicKeyHex';
 
   Future<bool> loadSmazEnabled(String contactKeyHex) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn(
+        'Public key hex is not set. Cannot load contact settings.',
+      );
+      return false;
+    }
     final prefs = PrefsManager.instance;
-    final key = '$_smazKeyPrefix$contactKeyHex';
+    final key = '$keyFor$contactKeyHex';
+    final oldKey = '$_keyPrefix$contactKeyHex';
+    bool? enabled = prefs.getBool(key);
+    if (enabled == null) {
+      // Attempt migration from legacy unscoped key on first load
+      enabled = prefs.getBool(oldKey);
+      prefs.remove(oldKey);
+      if (enabled != null) {
+        appLogger.info(
+          'Migrating contact settings from legacy key $oldKey to scoped key $key',
+        );
+        await prefs.setBool(key, enabled);
+      }
+    }
     return prefs.getBool(key) ?? false;
   }
 
   Future<void> saveSmazEnabled(String contactKeyHex, bool enabled) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn(
+        'Public key hex is not set. Cannot save contact settings.',
+      );
+      return;
+    }
     final prefs = PrefsManager.instance;
-    final key = '$_smazKeyPrefix$contactKeyHex';
+    final key = '$keyFor$contactKeyHex';
     await prefs.setBool(key, enabled);
   }
 }

lib/storage/contact_store.dart

@@ -2,18 +2,46 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import '../models/contact.dart';
+import '../utils/app_logger.dart';
 import 'prefs_manager.dart';
 
 class ContactStore {
-  static const String _key = 'contacts';
+  static const String _keyPrefix = 'contacts';
+
+  String publicKeyHex = '';
+  set setPublicKeyHex(String value) =>
+      publicKeyHex = value.length > 10 ? value.substring(0, 10) : '';
+
+  String get keyFor => '$_keyPrefix$publicKeyHex';
 
   Future<List<Contact>> loadContacts() async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot load contacts.');
+      return [];
+    }
     final prefs = PrefsManager.instance;
-    final jsonStr = prefs.getString(_key);
-    if (jsonStr == null) return [];
+    String? jsonString = prefs.getString(keyFor);
+    if (jsonString == null || jsonString.isEmpty) {
+      // Attempt migration from legacy unscoped key on first load
+      final legacyJsonString = prefs.getString(_keyPrefix);
+      prefs.remove(_keyPrefix);
+      if (legacyJsonString != null && legacyJsonString.isNotEmpty) {
+        appLogger.info(
+          'Migrating contacts from legacy key $_keyPrefix to scoped key $keyFor',
+        );
+        await prefs.setString(keyFor, legacyJsonString);
+        jsonString = legacyJsonString;
+      }
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      return [];
+    }
 
     try {
-      final jsonList = jsonDecode(jsonStr) as List<dynamic>;
+      final jsonList = jsonDecode(jsonString) as List<dynamic>;
       return jsonList
           .map((entry) => _fromJson(entry as Map<String, dynamic>))
           .toList();
@@ -23,9 +51,13 @@ class ContactStore {
   }
 
   Future<void> saveContacts(List<Contact> contacts) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot save contacts.');
+      return;
+    }
     final prefs = PrefsManager.instance;
     final jsonList = contacts.map(_toJson).toList();
-    await prefs.setString(_key, jsonEncode(jsonList));
+    await prefs.setString(keyFor, jsonEncode(jsonList));
   }
 
   Map<String, dynamic> _toJson(Contact contact) {
@@ -44,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,
     };
   }
 
@@ -71,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

@@ -2,26 +2,59 @@ import 'dart:convert';
 import 'dart:typed_data';
 import '../models/message.dart';
 import '../helpers/smaz.dart';
+import '../utils/app_logger.dart';
 import 'prefs_manager.dart';
 
 class MessageStore {
   static const String _keyPrefix = 'messages_';
 
+  String publicKeyHex = '';
+  set setPublicKeyHex(String value) =>
+      publicKeyHex = value.length > 10 ? value.substring(0, 10) : '';
+
+  String get keyFor => '$_keyPrefix$publicKeyHex';
+
   Future<void> saveMessages(
     String contactKeyHex,
     List<Message> messages,
   ) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot save messages.');
+      return;
+    }
     final prefs = PrefsManager.instance;
-    final key = '$_keyPrefix$contactKeyHex';
+    final key = '$keyFor$contactKeyHex';
     final jsonList = messages.map(_messageToJson).toList();
     await prefs.setString(key, jsonEncode(jsonList));
   }
 
   Future<List<Message>> loadMessages(String contactKeyHex) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot load messages.');
+      return [];
+    }
     final prefs = PrefsManager.instance;
-    final key = '$_keyPrefix$contactKeyHex';
-    final jsonString = prefs.getString(key);
-    if (jsonString == null) return [];
+    final key = '$keyFor$contactKeyHex';
+    final oldKey = '$_keyPrefix$contactKeyHex';
+    String? jsonString = prefs.getString(key);
+    if (jsonString == null || jsonString.isEmpty) {
+      // Attempt migration from legacy unscoped key on first load
+      final legacyJsonString = prefs.getString(oldKey);
+      prefs.remove(oldKey);
+      if (legacyJsonString != null && legacyJsonString.isNotEmpty) {
+        appLogger.info(
+          'Migrating messages from legacy key $oldKey to scoped key $key',
+        );
+        await prefs.setString(key, legacyJsonString);
+        jsonString = legacyJsonString;
+      }
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      return [];
+    }
 
     try {
       final jsonList = jsonDecode(jsonString) as List<dynamic>;
@@ -32,8 +65,12 @@ class MessageStore {
   }
 
   Future<void> clearMessages(String contactKeyHex) async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot clear messages.');
+      return;
+    }
     final prefs = PrefsManager.instance;
-    final key = '$_keyPrefix$contactKeyHex';
+    final key = '$keyFor$contactKeyHex';
     await prefs.remove(key);
   }
 

lib/storage/unread_store.dart

@@ -1,11 +1,18 @@
 import 'dart:async';
 import 'dart:convert';
 
+import '../utils/app_logger.dart';
 import 'prefs_manager.dart';
 
 /// Storage for unread message tracking with debounced writes to reduce I/O.
 class UnreadStore {
-  static const String _contactUnreadCountKey = 'contact_unread_count';
+  static const String _keyPrefix = 'contact_unread_count';
+
+  String publicKeyHex = '';
+  set setPublicKeyHex(String value) =>
+      publicKeyHex = value.length >= 10 ? value.substring(0, 10) : '';
+
+  String get keyFor => '$_keyPrefix$publicKeyHex';
 
   // Debounce timers to batch rapid writes
   Timer? _contactUnreadSaveTimer;
@@ -20,12 +27,33 @@ class UnreadStore {
   }
 
   Future<Map<String, int>> loadContactUnreadCount() async {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot load unread counts.');
+      return {};
+    }
     final prefs = PrefsManager.instance;
-    final jsonStr = prefs.getString(_contactUnreadCountKey);
-    if (jsonStr == null) return {};
+    String? jsonString = prefs.getString(keyFor);
+    if (jsonString == null || jsonString.isEmpty) {
+      // Attempt migration from legacy unscoped key on first load
+      final legacyJsonString = prefs.getString(_keyPrefix);
+      prefs.remove(_keyPrefix);
+      if (legacyJsonString != null && legacyJsonString.isNotEmpty) {
+        appLogger.info(
+          'Migrating channel messages from legacy key $_keyPrefix to scoped key $keyFor',
+        );
+        await prefs.setString(keyFor, legacyJsonString);
+        jsonString = legacyJsonString;
+      }
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      jsonString = prefs.getString(keyFor);
+    }
+    if (jsonString == null || jsonString.isEmpty) {
+      return {};
+    }
 
     try {
-      final json = jsonDecode(jsonStr) as Map<String, dynamic>;
+      final json = jsonDecode(jsonString) as Map<String, dynamic>;
       return json.map((key, value) => MapEntry(key, value as int));
     } catch (_) {
       return {};
@@ -33,6 +61,10 @@ class UnreadStore {
   }
 
   void saveContactUnreadCount(Map<String, int> counts) {
+    if (publicKeyHex.isEmpty) {
+      appLogger.warn('Public key hex is not set. Cannot save unread counts.');
+      return;
+    }
     _pendingContactUnreadCount = counts;
 
     _contactUnreadSaveTimer?.cancel();
@@ -49,7 +81,7 @@ class UnreadStore {
 
     final prefs = PrefsManager.instance;
     final jsonStr = jsonEncode(_pendingContactUnreadCount);
-    await prefs.setString(_contactUnreadCountKey, jsonStr);
+    await prefs.setString(keyFor, jsonStr);
     _pendingContactUnreadCount = null;
   }
 

lib/utils/app_logger.dart

@@ -23,23 +23,23 @@ class AppLogger {
   bool get isEnabled => _enabled;
 
   /// Log an info message
-  void info(String message, {String tag = 'App'}) {
+  void info(String message, {String tag = 'App', bool noNotify = false}) {
     if (_enabled && _service != null) {
-      _service!.info(message, tag: tag);
+      _service!.info(message, tag: tag, noNotify: noNotify);
     }
   }
 
   /// Log a warning message
-  void warn(String message, {String tag = 'App'}) {
+  void warn(String message, {String tag = 'App', bool noNotify = false}) {
     if (_enabled && _service != null) {
-      _service!.warn(message, tag: tag);
+      _service!.warn(message, tag: tag, noNotify: noNotify);
     }
   }
 
   /// Log an error message
-  void error(String message, {String tag = 'App'}) {
+  void error(String message, {String tag = 'App', bool noNotify = false}) {
     if (_enabled && _service != null) {
-      _service!.error(message, tag: tag);
+      _service!.error(message, tag: tag, noNotify: noNotify);
     }
   }
 
@@ -48,9 +48,10 @@ class AppLogger {
     String message, {
     String tag = 'App',
     AppDebugLogLevel level = AppDebugLogLevel.info,
+    bool noNotify = false,
   }) {
     if (_enabled && _service != null) {
-      _service!.log(message, tag: tag, level: level);
+      _service!.log(message, tag: tag, level: level, noNotify: noNotify);
     }
   }
 }

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/utils/dialog_utils.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
+import 'app_logger.dart';
 
 /// Shows a confirmation dialog before disconnecting from the device.
 /// Returns true if user confirmed and disconnect completed, false otherwise.
@@ -28,6 +29,7 @@ Future<bool> showDisconnectDialog(
   );
 
   if (confirmed == true) {
+    appLogger.info('Disconnect confirmed from popup', tag: 'Connection');
     await connector.disconnect();
     return true;
   }

lib/utils/macos_usb_device_names.dart

@@ -0,0 +1,92 @@
+import 'dart:io';
+
+/// Queries the macOS IOKit registry via [ioreg] to build a map of serial port
+/// callout device paths to human-readable USB device names.
+///
+/// The [flserial] native library uses the deprecated [IOUSBDevice] IOKit class
+/// to resolve device names, but macOS 10.15+ renamed it to [IOUSBHostDevice].
+/// As a result flserial always returns "n/a" for USB product/vendor info on
+/// modern macOS. This utility bypasses that limitation by invoking ioreg
+/// directly and parsing its output.
+///
+/// Returns a Map of e.g. `"/dev/cu.usbmodem1101"` → `"Nordic NRF52 DK"`.
+/// Devices without a USB product name are not included in the map.
+Future<Map<String, String>> queryMacOsUsbDeviceNames() async {
+  assert(Platform.isMacOS);
+  try {
+    final result = await Process.run('ioreg', [
+      '-r',
+      '-c',
+      'IOUSBHostDevice',
+      '-l',
+    ], stdoutEncoding: const SystemEncoding());
+    if (result.exitCode != 0) return const <String, String>{};
+    return _parseIoregOutput(result.stdout as String);
+  } catch (_) {
+    return const <String, String>{};
+  }
+}
+
+Map<String, String> _parseIoregOutput(String output) {
+  final lines = output.split('\n');
+  final result = <String, String>{};
+
+  // We accumulate the current device block's properties.
+  // A new block starts at a line beginning with "+-o " which indicates a
+  // top-level IOUSBHostDevice entry in the ioreg tree.
+  String? currentVendor;
+  String? currentProduct;
+  final List<String> currentPorts = <String>[];
+
+  void flushBlock() {
+    if (currentPorts.isNotEmpty &&
+        (currentVendor != null || currentProduct != null)) {
+      final parts = <String>[
+        if (currentVendor != null && currentVendor!.isNotEmpty) currentVendor!,
+        if (currentProduct != null && currentProduct!.isNotEmpty)
+          currentProduct!,
+      ];
+      final name = parts.join(' ');
+      for (final port in currentPorts) {
+        result[port] = name;
+      }
+    }
+    currentVendor = null;
+    currentProduct = null;
+    currentPorts.clear();
+  }
+
+  for (final line in lines) {
+    // A new top-level device block begins here.
+    if (line.startsWith('+-o ')) {
+      flushBlock();
+      continue;
+    }
+    // USB Product Name (appears at multiple depths in the tree, first wins)
+    final productMatch = _kProductName.firstMatch(line);
+    if (productMatch != null && currentProduct == null) {
+      currentProduct = productMatch.group(1)?.trim();
+      continue;
+    }
+    // USB Vendor Name
+    final vendorMatch = _kVendorName.firstMatch(line);
+    if (vendorMatch != null && currentVendor == null) {
+      currentVendor = vendorMatch.group(1)?.trim();
+      continue;
+    }
+    // IOCalloutDevice — the /dev/cu.xxx path our app uses
+    final calloutMatch = _kCalloutDevice.firstMatch(line);
+    if (calloutMatch != null) {
+      final port = calloutMatch.group(1)?.trim();
+      if (port != null && port.isNotEmpty) {
+        currentPorts.add(port);
+      }
+    }
+  }
+  flushBlock();
+  return result;
+}
+
+final RegExp _kProductName = RegExp(r'"USB Product Name" = "([^"]*)"');
+final RegExp _kVendorName = RegExp(r'"USB Vendor Name" = "([^"]*)"');
+final RegExp _kCalloutDevice = RegExp(r'"IOCalloutDevice" = "([^"]*)"');

lib/utils/platform_info.dart

@@ -33,4 +33,15 @@ class PlatformInfo {
 
   /// Whether the app is running on a desktop platform (macOS, Windows, or Linux).
   static bool get isDesktop => isMacOS || isWindows || isLinux;
+
+  /// Whether the current platform supports a native USB serial backend.
+  static bool get supportsNativeUsbSerial =>
+      isAndroid || isWindows || isLinux || isMacOS;
+
+  /// Whether the current browser supports the Web Serial backend.
+  static bool get supportsWebSerial => isWeb && isChrome;
+
+  /// Whether USB serial is expected to be available on the current platform.
+  static bool get supportsUsbSerial =>
+      supportsNativeUsbSerial || supportsWebSerial;
 }

lib/utils/usb_port_labels.dart

@@ -0,0 +1,66 @@
+String normalizeUsbPortName(String portLabel) {
+  final separatorIndex = portLabel.indexOf(' - ');
+  final normalized = separatorIndex >= 0
+      ? portLabel.substring(0, separatorIndex)
+      : portLabel;
+  return normalized.trim();
+}
+
+/// Returns a human-readable name for a serial port label.
+///
+/// The native flserial library encodes port info as a ` - `-separated string:
+///   `"<port> - <description> - <hardware_id>"`
+///
+/// This function extracts the *description* field (index 1) and discards the
+/// raw hardware_id, which is not user-friendly. If the description is missing
+/// or unhelpful (e.g. "n/a"), it falls back to the raw port name.
+String friendlyUsbPortName(String portLabel) {
+  final parts = portLabel.split(' - ');
+  if (parts.length < 2) {
+    return portLabel.trim();
+  }
+  // parts[0] = port name, parts[1] = description, parts[2+] = hardware id
+  final description = parts[1].trim();
+  if (description.isEmpty || description.toLowerCase() == 'n/a') {
+    return parts[0].trim();
+  }
+  return description;
+}
+
+String describeWebUsbPort({
+  required int? vendorId,
+  required int? productId,
+  String requestPortLabel = 'Choose USB Device',
+  String fallbackDeviceName = 'Web Serial Device',
+  Map<String, String> knownUsbNames = const <String, String>{},
+}) {
+  if (vendorId == null && productId == null) {
+    return requestPortLabel;
+  }
+
+  final vendorHex = vendorId?.toRadixString(16).padLeft(4, '0').toUpperCase();
+  final productHex = productId?.toRadixString(16).padLeft(4, '0').toUpperCase();
+  final knownName = (vendorHex != null && productHex != null)
+      ? knownUsbNames['${vendorHex.toLowerCase()}:${productHex.toLowerCase()}']
+      : null;
+
+  final parts = <String>[knownName ?? fallbackDeviceName];
+  if (vendorHex != null) {
+    parts.add('VID:$vendorHex');
+  }
+  if (productHex != null) {
+    parts.add('PID:$productHex');
+  }
+  return '${parts.first} (${parts.skip(1).join(' ')})';
+}
+
+String buildUsbDisplayLabel({
+  required String basePortLabel,
+  String? deviceName,
+}) {
+  final trimmedName = deviceName?.trim() ?? '';
+  if (trimmedName.isEmpty) {
+    return basePortLabel;
+  }
+  return '$basePortLabel - $trimmedName';
+}

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);
         }
       },
     );