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

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

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

.swift-version

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

lib/connector/meshcore_connector.dart

@@ -19,7 +19,6 @@ import '../services/message_retry_service.dart';
 import '../services/path_history_service.dart';
 import '../services/app_settings_service.dart';
 import '../services/background_service.dart';
-import '../services/timeout_prediction_service.dart';
 import '../services/notification_service.dart';
 import 'meshcore_connector_usb.dart';
 import 'meshcore_connector_tcp.dart';
@@ -167,10 +166,6 @@ class MeshCoreConnector extends ChangeNotifier {
   bool _isLoadingContacts = false;
   bool _isLoadingChannels = false;
   bool _hasLoadedChannels = false;
-  TimeoutPredictionService? _timeoutPredictionService;
-  // Intentionally global (not per-contact): tracks overall network activity.
-  // Frequent RX from any source indicates a busy network with more collisions.
-  DateTime _lastRxTime = DateTime.now();
   bool _batteryRequested = false;
   bool _awaitingSelfInfo = false;
   bool _hasReceivedDeviceInfo = false;
@@ -204,9 +199,6 @@ class MeshCoreConnector extends ChangeNotifier {
   int _queueSyncRetries = 0;
   static const int _maxQueueSyncRetries = 3;
   static const int _queueSyncTimeoutMs = 5000; // 5 second timeout
-  // Serializes path operations (setContactPath/clearContactPath) to prevent
-  // interleaved async calls from leaving in-memory state inconsistent with device.
-  Future<void> _pathOpLock = Future.value();
   Map<String, String>? _currentCustomVars;
 
   // Channel syncing state (sequential pattern)
@@ -566,10 +558,6 @@ class MeshCoreConnector extends ChangeNotifier {
       _unreadStore.saveContactUnreadCount(
         Map<String, int>.from(_contactUnreadCount),
       );
-      _notificationService.clearContactNotification(
-        contactKeyHex,
-        getTotalUnreadCount(),
-      );
       notifyListeners();
     }
   }
@@ -588,10 +576,6 @@ class MeshCoreConnector extends ChangeNotifier {
           _channels.isNotEmpty ? _channels : _cachedChannels,
         ),
       );
-      _notificationService.clearChannelNotification(
-        channelIndex,
-        getTotalUnreadCount(),
-      );
       notifyListeners();
     }
   }
@@ -673,7 +657,6 @@ class MeshCoreConnector extends ChangeNotifier {
     BleDebugLogService? bleDebugLogService,
     AppDebugLogService? appDebugLogService,
     BackgroundService? backgroundService,
-    TimeoutPredictionService? timeoutPredictionService,
   }) {
     _retryService = retryService;
     _pathHistoryService = pathHistoryService;
@@ -681,7 +664,6 @@ class MeshCoreConnector extends ChangeNotifier {
     _bleDebugLogService = bleDebugLogService;
     _appDebugLogService = appDebugLogService;
     _backgroundService = backgroundService;
-    _timeoutPredictionService = timeoutPredictionService;
     _usbManager.setDebugLogService(_appDebugLogService);
     _tcpConnector.setDebugLogService(_appDebugLogService);
 
@@ -696,28 +678,13 @@ class MeshCoreConnector extends ChangeNotifier {
       updateMessageCallback: _updateMessage,
       clearContactPathCallback: clearContactPath,
       setContactPathCallback: setContactPath,
-      calculateTimeoutCallback:
-          (pathLength, messageBytes, {String? contactKey}) => calculateTimeout(
-            pathLength: pathLength,
-            messageBytes: messageBytes,
-            contactKey: contactKey,
-          ),
+      calculateTimeoutCallback: (pathLength, messageBytes) =>
+          calculateTimeout(pathLength: pathLength, messageBytes: messageBytes),
       getSelfPublicKeyCallback: () => _selfPublicKey,
       prepareContactOutboundTextCallback: prepareContactOutboundText,
       appSettingsService: appSettingsService,
       debugLogService: _appDebugLogService,
       recordPathResultCallback: _recordPathResult,
-      onDeliveryObservedCallback:
-          (contactKey, pathLength, messageBytes, tripTimeMs) {
-            final secSinceRx = DateTime.now().difference(_lastRxTime).inSeconds;
-            _timeoutPredictionService?.recordObservation(
-              contactKey: contactKey,
-              pathLength: pathLength,
-              messageBytes: messageBytes,
-              tripTimeMs: tripTimeMs,
-              secondsSinceLastRx: secSinceRx,
-            );
-          },
     );
   }
 
@@ -1773,33 +1740,18 @@ class MeshCoreConnector extends ChangeNotifier {
     Uint8List customPath,
     int pathLen,
   ) async {
-    // Serialize path operations to prevent interleaved async calls from
-    // leaving in-memory state inconsistent with the device.
-    final prev = _pathOpLock;
-    final completer = Completer<void>();
-    _pathOpLock = completer.future;
-    await prev;
-    try {
-      if (!isConnected) return;
+    if (!isConnected) return;
 
-      await sendFrame(
-        buildUpdateContactPathFrame(
-          contact.publicKey,
-          customPath,
-          pathLen,
-          type: contact.type,
-          flags: contact.flags,
-          name: contact.name,
-        ),
-      );
-      // USB writes return instantly (no BLE flow control), so give the firmware
-      // time to persist the path change before subsequent commands.
-      if (_activeTransport == MeshCoreTransportType.usb) {
-        await Future<void>.delayed(const Duration(milliseconds: 100));
-      }
-    } finally {
-      completer.complete();
-    }
+    await sendFrame(
+      buildUpdateContactPathFrame(
+        contact.publicKey,
+        customPath,
+        pathLen,
+        type: contact.type,
+        flags: contact.flags,
+        name: contact.name,
+      ),
+    );
   }
 
   Future<void> setContactFavorite(Contact contact, bool isFavorite) async {
@@ -2184,34 +2136,25 @@ class MeshCoreConnector extends ChangeNotifier {
   }
 
   Future<void> clearContactPath(Contact contact) async {
-    // Serialize path operations to prevent interleaved async calls.
-    final prev = _pathOpLock;
-    final completer = Completer<void>();
-    _pathOpLock = completer.future;
-    await prev;
-    try {
-      if (!isConnected) return;
+    if (!isConnected) return;
 
-      await sendFrame(buildResetPathFrame(contact.publicKey));
-      if (_activeTransport == MeshCoreTransportType.usb) {
-        await Future<void>.delayed(const Duration(milliseconds: 100));
-      }
-      final existingIndex = _contacts.indexWhere(
-        (c) => c.publicKeyHex == contact.publicKeyHex,
+    await sendFrame(buildResetPathFrame(contact.publicKey));
+    final existingIndex = _contacts.indexWhere(
+      (c) => c.publicKeyHex == contact.publicKeyHex,
+    );
+    if (existingIndex >= 0) {
+      final existing = _contacts[existingIndex];
+      // Use copyWith to preserve pathOverride and pathOverrideBytes
+      _contacts[existingIndex] = existing.copyWith(
+        pathOverride: null,
+        pathOverrideBytes: null,
+        pathLength: -1,
+        path: Uint8List(0),
       );
-      if (existingIndex >= 0) {
-        final existing = _contacts[existingIndex];
-        // Preserve pathOverride and pathOverrideBytes — only reset device path
-        _contacts[existingIndex] = existing.copyWith(
-          pathLength: -1,
-          path: Uint8List(0),
-        );
-        notifyListeners();
-        unawaited(_persistContacts());
-      }
-    } finally {
-      completer.complete();
+      notifyListeners();
+      unawaited(_persistContacts());
     }
+    // The device will send updated contact info with path_len = -1
   }
 
   void updateContactInMemory(
@@ -2520,7 +2463,6 @@ class MeshCoreConnector extends ChangeNotifier {
 
   void _handleFrame(List<int> data) {
     if (data.isEmpty) return;
-    _lastRxTime = DateTime.now();
 
     final frame = Uint8List.fromList(data);
     _receivedFramesController.add(frame);
@@ -2548,9 +2490,6 @@ class MeshCoreConnector extends ChangeNotifier {
         _isLoadingContacts = true;
         notifyListeners();
         break;
-      case pushCodeAdvert:
-        // Known contact was seen again - just a pub key, no action needed
-        break;
       case pushCodeNewAdvert:
         debugPrint('Got New CONTACT');
         // It's the same format as respCodeContact, so we can reuse the handler
@@ -2897,68 +2836,38 @@ class MeshCoreConnector extends ChangeNotifier {
     }
   }
 
-  /// Estimate single-packet airtime in ms from radio settings, or a fallback.
-  int _estimateAirtimeMs(int messageBytes) {
+  /// Calculate timeout for a message based on radio settings and path length
+  /// Returns timeout in milliseconds, considering number of hops
+  int calculateTimeout({required int pathLength, int messageBytes = 100}) {
+    // If we have radio settings, use them for accurate calculation
     if (_currentFreqHz != null &&
         _currentBwHz != null &&
         _currentSf != null &&
         _currentCr != null) {
       final cr = _currentCr! <= 4 ? _currentCr! : _currentCr! - 4;
-      return calculateLoRaAirtime(
-        payloadBytes: messageBytes,
-        spreadingFactor: _currentSf!,
-        bandwidthHz: _currentBwHz!,
-        codingRate: cr,
-        lowDataRateOptimize: _currentSf! >= 11,
+      return calculateMessageTimeout(
+        freqHz: _currentFreqHz!,
+        bwHz: _currentBwHz!,
+        sf: _currentSf!,
+        cr: cr,
+        pathLength: pathLength,
+        messageBytes: messageBytes,
       );
     }
-    return 50; // fallback: ~SF7/BW125 for 100 bytes
-  }
 
-  /// Physics-based worst-case timeout (ceiling).
-  int _physicsMaxTimeout(int pathLength, int airtime) {
+    // Fallback: Conservative estimates based on typical settings
+    // Assume SF7, BW125, which gives ~50ms airtime for 100 bytes
+    const estimatedAirtime = 50;
+
     if (pathLength < 0) {
-      return 500 + (16 * airtime);
+      // Flood mode: Base delay + 16× airtime
+      return 500 + (16 * estimatedAirtime);
     } else {
-      return 500 + ((airtime * 6 + 250) * (pathLength + 1));
+      // Direct path: Base delay + ((airtime×6 + 250ms)×(hops+1))
+      return 500 + ((estimatedAirtime * 6 + 250) * (pathLength + 1));
     }
   }
 
-  /// Physics-based minimum timeout (floor): raw traversal time.
-  int _physicsMinTimeout(int pathLength, int airtime) {
-    if (pathLength < 0) {
-      return airtime;
-    } else {
-      return airtime * (pathLength + 1);
-    }
-  }
-
-  /// Calculate timeout for a message based on radio settings and path length.
-  /// Returns timeout in milliseconds, considering number of hops.
-  int calculateTimeout({
-    required int pathLength,
-    int messageBytes = 100,
-    String? contactKey,
-  }) {
-    final airtime = _estimateAirtimeMs(messageBytes);
-    final physicsMin = _physicsMinTimeout(pathLength, airtime);
-    final physicsMax = _physicsMaxTimeout(pathLength, airtime);
-
-    // Try ML-based prediction, clamped between physics bounds
-    final secSinceRx = DateTime.now().difference(_lastRxTime).inSeconds;
-    final mlTimeout = _timeoutPredictionService?.predictTimeout(
-      contactKey: contactKey,
-      pathLength: pathLength,
-      messageBytes: messageBytes,
-      secondsSinceLastRx: secSinceRx,
-    );
-    if (mlTimeout != null) {
-      return mlTimeout.clamp(physicsMin, physicsMax);
-    }
-
-    return physicsMax;
-  }
-
   void _handleContact(Uint8List frame, {bool isContact = true}) {
     final contact = Contact.fromFrame(frame);
     if (contact != null) {

lib/l10n/app_bg.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Нова група",
   "contacts_groupName": "Група",
   "contacts_groupNameRequired": "Името на групата е задължително.",
+  "contacts_groupNameReserved": "Това име на група е запазено",
   "contacts_groupAlreadyExists": "Групата \"{name}\" вече съществува.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1887,6 +1888,5 @@
   "tcpErrorUnsupported": "Транспортът чрез TCP не се поддържа на тази платформа.",
   "tcpErrorTimedOut": "Връзката TCP изтекла.",
   "tcpConnectionFailed": "Неуспешно е установено TCP връзката: {error}",
-  "map_showDiscoveryContacts": "Покажи контакти за откриване",
-  "map_setAsMyLocation": "Задайте като моя местоположение"
+  "map_showDiscoveryContacts": "Покажи контакти за откриване"
 }

lib/l10n/app_de.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Neue Gruppe",
   "contacts_groupName": "Gruppenname",
   "contacts_groupNameRequired": "Der Gruppennamen ist erforderlich.",
+  "contacts_groupNameReserved": "Dieser Gruppenname ist reserviert",
   "contacts_groupAlreadyExists": "Die Gruppe \"{name}\" existiert bereits.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1915,6 +1916,5 @@
   "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"
+  "map_showDiscoveryContacts": "Entdeckungs-Kontakte anzeigen"
 }

lib/l10n/app_en.arb

@@ -416,6 +416,7 @@
   "contacts_newGroup": "New Group",
   "contacts_groupName": "Group name",
   "contacts_groupNameRequired": "Group name is required",
+  "contacts_groupNameReserved": "This group name is reserved",
   "contacts_groupAlreadyExists": "Group \"{name}\" already exists",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -807,7 +808,6 @@
   "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",

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": {
@@ -1915,6 +1916,5 @@
   "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"
+  "map_showDiscoveryContacts": "Mostrar Contactos de Descubrimiento"
 }

lib/l10n/app_fr.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nouveau Groupe",
   "contacts_groupName": "Nom du groupe",
   "contacts_groupNameRequired": "Le nom du groupe est obligatoire.",
+  "contacts_groupNameReserved": "Ce nom de groupe est réservé",
   "contacts_groupAlreadyExists": "Le groupe \"{name}\" existe déjà.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1887,6 +1888,5 @@
   "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"
+  "map_showDiscoveryContacts": "Afficher les contacts de découverte"
 }

lib/l10n/app_it.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nuovo Gruppo",
   "contacts_groupName": "Nome gruppo",
   "contacts_groupNameRequired": "Il nome del gruppo è obbligatorio.",
+  "contacts_groupNameReserved": "Questo nome del gruppo è riservato",
   "contacts_groupAlreadyExists": "Il gruppo \"{name}\" esiste già.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1887,6 +1888,5 @@
   "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"
+  "map_showDiscoveryContacts": "Mostra Contatti di Discovery"
 }

lib/l10n/app_localizations.dart

@@ -1714,6 +1714,12 @@ abstract class AppLocalizations {
   /// **'Group name is required'**
   String get contacts_groupNameRequired;
 
+  /// No description provided for @contacts_groupNameReserved.
+  ///
+  /// In en, this message translates to:
+  /// **'This group name is reserved'**
+  String get contacts_groupNameReserved;
+
   /// No description provided for @contacts_groupAlreadyExists.
   ///
   /// In en, this message translates to:
@@ -2746,12 +2752,6 @@ 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:

lib/l10n/app_localizations_bg.dart

@@ -902,6 +902,9 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Името на групата е задължително.';
 
+  @override
+  String get contacts_groupNameReserved => 'Това име на група е запазено';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Групата \"$name\" вече съществува.';
@@ -1511,9 +1514,6 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Споделете маркер тук';
 
-  @override
-  String get map_setAsMyLocation => 'Задайте като моя местоположение';
-
   @override
   String get map_pinLabel => 'Етикетиране на пин';
 

lib/l10n/app_localizations_de.dart

@@ -902,6 +902,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Der Gruppennamen ist erforderlich.';
 
+  @override
+  String get contacts_groupNameReserved => 'Dieser Gruppenname ist reserviert';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Die Gruppe \"$name\" existiert bereits.';
@@ -1513,9 +1516,6 @@ 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';
 

lib/l10n/app_localizations_en.dart

@@ -889,6 +889,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Group name is required';
 
+  @override
+  String get contacts_groupNameReserved => 'This group name is reserved';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Group \"$name\" already exists';
@@ -1487,9 +1490,6 @@ 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';
 

lib/l10n/app_localizations_es.dart

@@ -901,6 +901,10 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'El nombre del grupo es obligatorio';
 
+  @override
+  String get contacts_groupNameReserved =>
+      'Este nombre de grupo está reservado';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'El grupo \"$name\" ya existe';
@@ -1509,9 +1513,6 @@ 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';
 

lib/l10n/app_localizations_fr.dart

@@ -905,6 +905,9 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Le nom du groupe est obligatoire.';
 
+  @override
+  String get contacts_groupNameReserved => 'Ce nom de groupe est réservé';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Le groupe \"$name\" existe déjà.';
@@ -1518,9 +1521,6 @@ 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';
 

lib/l10n/app_localizations_it.dart

@@ -901,6 +901,9 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Il nome del gruppo è obbligatorio.';
 
+  @override
+  String get contacts_groupNameReserved => 'Questo nome del gruppo è riservato';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Il gruppo \"$name\" esiste già.';
@@ -1510,9 +1513,6 @@ 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';
 

lib/l10n/app_localizations_nl.dart

@@ -895,6 +895,9 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'De groepnaam is verplicht.';
 
+  @override
+  String get contacts_groupNameReserved => 'Deze groepsnaam is gereserveerd';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'De groep \"$name\" bestaat al.';
@@ -1502,9 +1505,6 @@ 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';
 

lib/l10n/app_localizations_pl.dart

@@ -904,6 +904,9 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Nazwa grupy jest wymagana';
 
+  @override
+  String get contacts_groupNameReserved => 'Ta nazwa grupy jest zastrzeżona';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Grupa \"$name\" już istnieje';
@@ -1512,9 +1515,6 @@ 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ę';
 

lib/l10n/app_localizations_pt.dart

@@ -903,6 +903,9 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'O nome do grupo é obrigatório.';
 
+  @override
+  String get contacts_groupNameReserved => 'Este nome de grupo está reservado';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'O grupo \"$name\" já existe';
@@ -1511,9 +1514,6 @@ 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';
 

lib/l10n/app_localizations_ru.dart

@@ -902,6 +902,9 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Имя группы обязательно';
 
+  @override
+  String get contacts_groupNameReserved => 'Это имя группы зарезервировано';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Группа \"$name\" уже существует';
@@ -1513,9 +1516,6 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Поделиться меткой здесь';
 
-  @override
-  String get map_setAsMyLocation => 'Установить мое местоположение';
-
   @override
   String get map_pinLabel => 'Метка';
 

lib/l10n/app_localizations_sk.dart

@@ -894,6 +894,9 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Skupina musí mať názov.';
 
+  @override
+  String get contacts_groupNameReserved => 'Tento názov skupiny je rezervovaný';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Skupina \"$name\" už existuje';
@@ -1504,9 +1507,6 @@ 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';
 

lib/l10n/app_localizations_sl.dart

@@ -892,6 +892,9 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Ime skupine je obvezno.';
 
+  @override
+  String get contacts_groupNameReserved => 'To ime skupine je rezervirano';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Skupina \"$name\" že obstaja';
@@ -1498,9 +1501,6 @@ 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';
 

lib/l10n/app_localizations_sv.dart

@@ -888,6 +888,9 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Gruppnamnet är obligatoriskt';
 
+  @override
+  String get contacts_groupNameReserved => 'Detta gruppnamn är reserverat';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Gruppen \"$name\" finns redan.';
@@ -1494,9 +1497,6 @@ 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';
 

lib/l10n/app_localizations_uk.dart

@@ -898,6 +898,9 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => 'Назва групи обов\'язкова.';
 
+  @override
+  String get contacts_groupNameReserved => 'Ця назва групи зарезервована';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return 'Група «$name» вже існує.';
@@ -1510,9 +1513,6 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get map_shareMarkerHere => 'Поділитися маркером тут';
 
-  @override
-  String get map_setAsMyLocation => 'Встановити моє місцезнаходження';
-
   @override
   String get map_pinLabel => 'Мітка піна';
 

lib/l10n/app_localizations_zh.dart

@@ -845,6 +845,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get contacts_groupNameRequired => '请输入群聊名称';
 
+  @override
+  String get contacts_groupNameReserved => '该群组名称已被保留';
+
   @override
   String contacts_groupAlreadyExists(String name) {
     return '名为 \"$name\" 的群聊已存在';
@@ -1421,9 +1424,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get map_shareMarkerHere => '在此分享标记';
 
-  @override
-  String get map_setAsMyLocation => '设置为我的位置';
-
   @override
   String get map_pinLabel => '标签';
 

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": {
@@ -1887,6 +1888,5 @@
   "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"
+  "map_showDiscoveryContacts": "Ontdek contacten weergeven"
 }

lib/l10n/app_pl.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nowa Grupa",
   "contacts_groupName": "Nazwa grupy",
   "contacts_groupNameRequired": "Nazwa grupy jest wymagana",
+  "contacts_groupNameReserved": "Ta nazwa grupy jest zastrzeżona",
   "contacts_groupAlreadyExists": "Grupa \"{name}\" już istnieje",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1887,6 +1888,5 @@
   "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ę"
+  "map_showDiscoveryContacts": "Pokaż kontakty odkrywania"
 }

lib/l10n/app_pt.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Novo Grupo",
   "contacts_groupName": "Nome do grupo",
   "contacts_groupNameRequired": "O nome do grupo é obrigatório.",
+  "contacts_groupNameReserved": "Este nome de grupo está reservado",
   "contacts_groupAlreadyExists": "O grupo \"{name}\" já existe",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1887,6 +1888,5 @@
   "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"
+  "map_showDiscoveryContacts": "Mostrar Contatos de Descoberta"
 }

lib/l10n/app_ru.arb

@@ -212,6 +212,7 @@
   "contacts_newGroup": "Новая группа",
   "contacts_groupName": "Имя группы",
   "contacts_groupNameRequired": "Имя группы обязательно",
+  "contacts_groupNameReserved": "Это имя группы зарезервировано",
   "contacts_groupAlreadyExists": "Группа \"{name}\" уже существует",
   "contacts_filterContacts": "Фильтр контактов...",
   "contacts_noContactsMatchFilter": "Нет контактов, соответствующих фильтру",
@@ -1127,6 +1128,5 @@
   "tcpErrorUnsupported": "Протокол TCP не поддерживается на этой платформе.",
   "tcpErrorTimedOut": "Соединение TCP не удалось установить.",
   "tcpConnectionFailed": "Не удалось установить соединение TCP: {error}",
-  "map_showDiscoveryContacts": "Показать контакты Discovery",
-  "map_setAsMyLocation": "Установить мое местоположение"
+  "map_showDiscoveryContacts": "Показать контакты Discovery"
 }

lib/l10n/app_sk.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nová skupina",
   "contacts_groupName": "Názov skupiny",
   "contacts_groupNameRequired": "Skupina musí mať názov.",
+  "contacts_groupNameReserved": "Tento názov skupiny je rezervovaný",
   "contacts_groupAlreadyExists": "Skupina \"{name}\" už existuje",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1887,6 +1888,5 @@
   "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"
+  "map_showDiscoveryContacts": "Zobraziť kontakty objavov"
 }

lib/l10n/app_sl.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Nova skupina",
   "contacts_groupName": "Ime skupine",
   "contacts_groupNameRequired": "Ime skupine je obvezno.",
+  "contacts_groupNameReserved": "To ime skupine je rezervirano",
   "contacts_groupAlreadyExists": "Skupina \"{name}\" že obstaja",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1887,6 +1888,5 @@
   "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"
+  "map_showDiscoveryContacts": "Prikaži odkritja kontaktov"
 }

lib/l10n/app_sv.arb

@@ -285,6 +285,7 @@
   "contacts_newGroup": "Ny grupp",
   "contacts_groupName": "Gruppnamn",
   "contacts_groupNameRequired": "Gruppnamnet är obligatoriskt",
+  "contacts_groupNameReserved": "Detta gruppnamn är reserverat",
   "contacts_groupAlreadyExists": "Gruppen \"{name}\" finns redan.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1887,6 +1888,5 @@
   "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"
+  "map_showDiscoveryContacts": "Visa Discovery-kontakter"
 }

lib/l10n/app_uk.arb

@@ -286,6 +286,7 @@
   "contacts_newGroup": "Нова група",
   "contacts_groupName": "Назва групи",
   "contacts_groupNameRequired": "Назва групи обов'язкова.",
+  "contacts_groupNameReserved": "Ця назва групи зарезервована",
   "contacts_groupAlreadyExists": "Група «{name}» вже існує.",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1887,6 +1888,5 @@
   "tcpErrorUnsupported": "Транспорт TCP не підтримується на цій платформі.",
   "tcpErrorTimedOut": "З'єднання TCP завершилося через закінчення часу очікування.",
   "tcpConnectionFailed": "Не вдалося встановити з'єднання TCP: {error}",
-  "map_showDiscoveryContacts": "Показати контакти Відкриття",
-  "map_setAsMyLocation": "Встановити моє місцезнаходження"
+  "map_showDiscoveryContacts": "Показати контакти Відкриття"
 }

lib/l10n/app_zh.arb

@@ -300,6 +300,7 @@
   "contacts_newGroup": "新建群聊",
   "contacts_groupName": "群聊名称",
   "contacts_groupNameRequired": "请输入群聊名称",
+  "contacts_groupNameReserved": "该群组名称已被保留",
   "contacts_groupAlreadyExists": "名为 \"{name}\" 的群聊已存在",
   "@contacts_groupAlreadyExists": {
     "placeholders": {
@@ -1892,6 +1893,5 @@
   "tcpErrorUnsupported": "此平台不支持 TCP 传输。",
   "tcpErrorTimedOut": "TCP 连接超时。",
   "tcpConnectionFailed": "TCP 连接失败：{error}",
-  "map_showDiscoveryContacts": "显示发现联系人",
-  "map_setAsMyLocation": "设置为我的位置"
+  "map_showDiscoveryContacts": "显示发现联系人"
 }

lib/main.dart

@@ -19,7 +19,7 @@ import 'services/app_debug_log_service.dart';
 import 'services/background_service.dart';
 import 'services/map_tile_cache_service.dart';
 import 'services/chat_text_scale_service.dart';
-import 'services/timeout_prediction_service.dart';
+import 'services/ui_view_state_service.dart';
 import 'storage/prefs_manager.dart';
 import 'utils/app_logger.dart';
 
@@ -40,7 +40,7 @@ void main() async {
   final backgroundService = BackgroundService();
   final mapTileCacheService = MapTileCacheService();
   final chatTextScaleService = ChatTextScaleService();
-  final timeoutPredictionService = TimeoutPredictionService(storage);
+  final uiViewStateService = UiViewStateService();
 
   // Load settings
   await appSettingsService.loadSettings();
@@ -58,7 +58,7 @@ void main() async {
   _registerThirdPartyLicenses();
 
   await chatTextScaleService.initialize();
-  await timeoutPredictionService.initialize();
+  await uiViewStateService.initialize();
 
   // Wire up connector with services
   connector.initialize(
@@ -68,7 +68,6 @@ void main() async {
     bleDebugLogService: bleDebugLogService,
     appDebugLogService: appDebugLogService,
     backgroundService: backgroundService,
-    timeoutPredictionService: timeoutPredictionService,
   );
 
   await connector.loadContactCache();
@@ -90,7 +89,7 @@ void main() async {
       appDebugLogService: appDebugLogService,
       mapTileCacheService: mapTileCacheService,
       chatTextScaleService: chatTextScaleService,
-      timeoutPredictionService: timeoutPredictionService,
+      uiViewStateService: uiViewStateService,
     ),
   );
 }
@@ -126,7 +125,7 @@ class MeshCoreApp extends StatelessWidget {
   final AppDebugLogService appDebugLogService;
   final MapTileCacheService mapTileCacheService;
   final ChatTextScaleService chatTextScaleService;
-  final TimeoutPredictionService timeoutPredictionService;
+  final UiViewStateService uiViewStateService;
 
   const MeshCoreApp({
     super.key,
@@ -139,7 +138,7 @@ class MeshCoreApp extends StatelessWidget {
     required this.appDebugLogService,
     required this.mapTileCacheService,
     required this.chatTextScaleService,
-    required this.timeoutPredictionService,
+    required this.uiViewStateService,
   });
 
   @override
@@ -153,9 +152,9 @@ 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/delivery_observation.dart

@@ -1,43 +0,0 @@
-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/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,9 +42,7 @@ 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
@@ -56,6 +53,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
   @override
   void initState() {
     super.initState();
+    _searchController.text = context
+        .read<UiViewStateService>()
+        .channelsSearchText;
     WidgetsBinding.instance.addPostFrameCallback((_) {
       context.read<MeshCoreConnector>().getChannels();
       _loadCommunities();
@@ -110,6 +110,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
   @override
   Widget build(BuildContext context) {
     final connector = context.watch<MeshCoreConnector>();
+    final viewState = context.watch<UiViewStateService>();
 
     final channelMessageStore = ChannelMessageStore();
     channelMessageStore.setPublicKeyHex = connector.selfPublicKeyHex;
@@ -205,6 +206,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
             final filteredChannels = _filterAndSortChannels(
               channels,
               connector,
+              viewState,
             );
 
             return Column(
@@ -219,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(
@@ -246,9 +250,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                         const Duration(milliseconds: 300),
                         () {
                           if (!mounted) return;
-                          setState(() {
-                            _searchQuery = value.toLowerCase();
-                          });
+                          context
+                              .read<UiViewStateService>()
+                              .setChannelsSearchText(value);
                         },
                       );
                     },
@@ -283,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,
@@ -584,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);
       },
     );
   }
@@ -644,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) {
@@ -657,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:

lib/screens/chat_screen.dart

@@ -106,9 +106,10 @@ class _ChatScreenState extends State<ChatScreen> {
             final unreadLabel = context.l10n.chat_unread(unreadCount);
             final pathLabel = _currentPathLabel(contact);
 
-            // Show path details if we have non-empty path data (from device or override)
+            // Show path details if we have path data (from device or override)
+            final hasPathData =
+                contact.path.isNotEmpty || contact.pathOverrideBytes != null;
             final effectivePath = contact.pathOverrideBytes ?? contact.path;
-            final hasPathData = effectivePath.isNotEmpty;
 
             return Column(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -142,25 +143,12 @@ 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);
                   }
@@ -173,7 +161,7 @@ class _ChatScreenState extends State<ChatScreen> {
                         Icon(
                           Icons.auto_mode,
                           size: 20,
-                          color: activeMode == 'auto'
+                          color: !isFloodMode
                               ? Theme.of(context).primaryColor
                               : null,
                         ),
@@ -181,30 +169,7 @@ class _ChatScreenState extends State<ChatScreen> {
                         Text(
                           context.l10n.chat_autoUseSavedPath,
                           style: TextStyle(
-                            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: !isFloodMode
                                 ? FontWeight.bold
                                 : FontWeight.normal,
                           ),
@@ -219,7 +184,7 @@ class _ChatScreenState extends State<ChatScreen> {
                         Icon(
                           Icons.waves,
                           size: 20,
-                          color: activeMode == 'flood'
+                          color: isFloodMode
                               ? Theme.of(context).primaryColor
                               : null,
                         ),
@@ -227,7 +192,7 @@ class _ChatScreenState extends State<ChatScreen> {
                         Text(
                           context.l10n.chat_forceFloodMode,
                           style: TextStyle(
-                            fontWeight: activeMode == 'flood'
+                            fontWeight: isFloodMode
                                 ? FontWeight.bold
                                 : FontWeight.normal,
                           ),
@@ -286,9 +251,7 @@ class _ChatScreenState extends State<ChatScreen> {
           ),
           const SizedBox(height: 8),
           Text(
-            context.l10n.chat_sendMessageTo(
-              _resolveContact(context.read<MeshCoreConnector>()).name,
-            ),
+            context.l10n.chat_sendMessageTo(widget.contact.name),
             style: TextStyle(fontSize: 14, color: Colors.grey[500]),
           ),
         ],
@@ -306,7 +269,6 @@ class _ChatScreenState extends State<ChatScreen> {
 
     // Auto-scroll to bottom if user is already at bottom
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!mounted) return;
       _scrollController.scrollToBottomIfAtBottom();
     });
 
@@ -331,10 +293,10 @@ class _ChatScreenState extends State<ChatScreen> {
             );
           }
           final messageIndex = index;
-          Contact contact = _resolveContact(connector);
+          Contact contact = widget.contact;
           final message = reversedMessages[messageIndex];
           String fourByteHex = '';
-          if (contact.type == advTypeRoom) {
+          if (widget.contact.type == advTypeRoom) {
             contact = _resolveContactFrom4Bytes(
               connector,
               message.fourByteRoomContactKey.isEmpty
@@ -352,13 +314,12 @@ class _ChatScreenState extends State<ChatScreen> {
               final textScale = context.select<ChatTextScaleService, double>(
                 (service) => service.scale,
               );
-              final resolvedContact = _resolveContact(connector);
               return _MessageBubble(
                 message: message,
-                senderName: resolvedContact.type == advTypeRoom
+                senderName: widget.contact.type == advTypeRoom
                     ? "${contact.name} [$fourByteHex]"
                     : contact.name,
-                isRoomServer: resolvedContact.type == advTypeRoom,
+                isRoomServer: widget.contact.type == advTypeRoom,
                 textScale: textScale,
                 onTap: () => _openMessagePath(message, contact),
                 onLongPress: () => _showMessageActions(message, contact),
@@ -496,7 +457,7 @@ class _ChatScreenState extends State<ChatScreen> {
       return;
     }
 
-    connector.sendMessage(_resolveContact(connector), text);
+    connector.sendMessage(widget.contact, text);
     _textController.clear();
     _textFieldFocusNode.requestFocus();
   }
@@ -693,7 +654,7 @@ class _ChatScreenState extends State<ChatScreen> {
 
                                 // Set the path override to persist user's choice
                                 await connector.setPathOverride(
-                                  _resolveContact(connector),
+                                  widget.contact,
                                   pathLen: pathLength,
                                   pathBytes: pathBytes,
                                 );
@@ -702,7 +663,7 @@ class _ChatScreenState extends State<ChatScreen> {
                                 Navigator.pop(context);
                                 await _notifyPathSet(
                                   connector,
-                                  _resolveContact(connector),
+                                  widget.contact,
                                   pathBytes,
                                   path.hopCount,
                                 );
@@ -761,9 +722,7 @@ class _ChatScreenState extends State<ChatScreen> {
                         style: const TextStyle(fontSize: 11),
                       ),
                       onTap: () async {
-                        await connector.clearContactPath(
-                          _resolveContact(connector),
-                        );
+                        await connector.clearContactPath(widget.contact);
                         if (!context.mounted) return;
                         ScaffoldMessenger.of(context).showSnackBar(
                           SnackBar(
@@ -791,7 +750,7 @@ class _ChatScreenState extends State<ChatScreen> {
                       ),
                       onTap: () async {
                         await connector.setPathOverride(
-                          _resolveContact(connector),
+                          widget.contact,
                           pathLen: -1,
                         );
                         if (!context.mounted) return;
@@ -1046,7 +1005,11 @@ class _ChatScreenState extends State<ChatScreen> {
     );
 
     if (result == null) {
-      return; // Cancelled — keep existing path
+      appLogger.info(
+        'PathSelectionDialog was cancelled or returned null',
+        tag: 'ChatScreen',
+      );
+      return;
     }
 
     if (!mounted) {
@@ -1062,19 +1025,14 @@ class _ChatScreenState extends State<ChatScreen> {
       tag: 'ChatScreen',
     );
     await connector.setPathOverride(
-      _resolveContact(connector),
+      widget.contact,
       pathLen: result.length,
       pathBytes: result,
     );
     appLogger.info('setPathOverride completed', tag: 'ChatScreen');
 
     if (!mounted) return;
-    await _notifyPathSet(
-      connector,
-      _resolveContact(connector),
-      result,
-      result.length,
-    );
+    await _notifyPathSet(connector, widget.contact, result, result.length);
   }
 
   void _openMessagePath(Message message, Contact contact) {
@@ -1086,10 +1044,10 @@ class _ChatScreenState extends State<ChatScreen> {
     final String senderName;
     if (message.isOutgoing) {
       senderName = connector.selfName ?? context.l10n.chat_me;
-    } else if (_resolveContact(connector).type == advTypeRoom) {
+    } else if (widget.contact.type == advTypeRoom) {
       senderName = "${contact.name} [$fourByteHex]";
     } else {
-      senderName = _resolveContact(connector).name;
+      senderName = widget.contact.name;
     }
     final pathMessage = ChannelMessage(
       senderKey: null,
@@ -1152,8 +1110,7 @@ class _ChatScreenState extends State<ChatScreen> {
                   _retryMessage(message);
                 },
               ),
-            if (_resolveContact(context.read<MeshCoreConnector>()).type ==
-                advTypeRoom)
+            if (widget.contact.type == advTypeRoom)
               ListTile(
                 leading: const Icon(Icons.chat),
                 title: Text(context.l10n.contacts_openChat),
@@ -1191,7 +1148,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(_resolveContact(connector), message.text);
+    connector.sendMessage(widget.contact, message.text);
     ScaffoldMessenger.of(
       context,
     ).showSnackBar(SnackBar(content: Text(context.l10n.chat_retryingMessage)));
@@ -1217,8 +1174,7 @@ 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 liveContact = _resolveContact(connector);
-    final senderName = liveContact.type == advTypeRoom
+    final senderName = widget.contact.type == advTypeRoom
         ? senderContact.name
         : null;
     final hash = ReactionHelper.computeReactionHash(
@@ -1227,7 +1183,7 @@ class _ChatScreenState extends State<ChatScreen> {
       message.text,
     );
     final reactionText = 'r:$hash:$emojiIndex';
-    connector.sendMessage(_resolveContact(connector), reactionText);
+    connector.sendMessage(widget.contact, reactionText);
   }
 }
 

lib/screens/contacts_screen.dart

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

lib/screens/map_screen.dart

@@ -1509,23 +1509,6 @@ 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),

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,12 +44,6 @@ 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)
 
@@ -58,13 +52,12 @@ class MessageRetryService extends ChangeNotifier {
   Function(Message)? _updateMessageCallback;
   Function(Contact)? _clearContactPathCallback;
   Function(Contact, Uint8List, int)? _setContactPathCallback;
-  Function(int, int, {String? contactKey})? _calculateTimeoutCallback;
+  Function(int, int)? _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();
 
@@ -74,20 +67,12 @@ class MessageRetryService extends ChangeNotifier {
     required Function(Message) updateMessageCallback,
     Function(Contact)? clearContactPathCallback,
     Function(Contact, Uint8List, int)? setContactPathCallback,
-    Function(int pathLength, int messageBytes, {String? contactKey})?
-    calculateTimeoutCallback,
+    Function(int pathLength, int messageBytes)? 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;
@@ -100,7 +85,6 @@ class MessageRetryService extends ChangeNotifier {
     _appSettingsService = appSettingsService;
     _debugLogService = debugLogService;
     _recordPathResultCallback = recordPathResultCallback;
-    _onDeliveryObservedCallback = onDeliveryObservedCallback;
   }
 
   /// Compute expected ACK hash using same algorithm as firmware:
@@ -172,49 +156,7 @@ class MessageRetryService extends ChangeNotifier {
       _addMessageCallback!(contact.publicKeyHex, message);
     }
 
-    // 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);
+    await _attemptSend(messageId);
   }
 
   Future<void> _attemptSend(String messageId) async {
@@ -227,11 +169,13 @@ 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}',
         );
-        await _clearContactPathCallback!(contact);
+        _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
@@ -248,24 +192,6 @@ 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;
 
@@ -305,15 +231,6 @@ 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);
     }
   }
 
@@ -364,7 +281,6 @@ 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',
@@ -374,16 +290,13 @@ class MessageRetryService extends ChangeNotifier {
         'Hash-based match failed for $ackHashHex, falling back to queue-based matching',
       );
 
-      // Search all contact queues so concurrent chats don't miss matches.
-      final queuesToSearch = _pendingMessageQueuePerContact;
-
-      for (var entry in queuesToSearch.entries) {
+      for (var entry in _pendingMessageQueuePerContact.entries) {
         final contactKey = entry.key;
         final queue = entry.value;
 
-        // Drain stale entries until we find a valid one or exhaust the queue.
-        while (queue.isNotEmpty) {
+        if (queue.isNotEmpty) {
           final candidateMessageId = queue.removeAt(0);
+
           if (_pendingMessages.containsKey(candidateMessageId)) {
             messageId = candidateMessageId;
             contact = _pendingContacts[candidateMessageId];
@@ -391,10 +304,21 @@ 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;
       }
     }
 
@@ -433,33 +357,25 @@ class MessageRetryService extends ChangeNotifier {
       );
     }
 
-    // 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;
-    }
-
+    // Use device-provided timeout, or calculate from radio settings if timeout is 0 or invalid
     int actualTimeout = timeoutMs;
-    if (_calculateTimeoutCallback != null) {
-      final calculated = _calculateTimeoutCallback!(
+    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!(
         pathLengthValue,
         message.text.length,
-        contactKey: contact.publicKeyHex,
       );
-      // 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',
-        );
-      }
+      debugPrint(
+        'Using calculated timeout: ${actualTimeout}ms for path length $pathLengthValue',
+      );
     }
 
     final updatedMessage = message.copyWith(
@@ -547,7 +463,22 @@ class MessageRetryService extends ChangeNotifier {
     } else {
       // Max retries reached - mark as failed
       final failedMessage = message.copyWith(status: MessageStatus.failed);
-      _pendingMessages[messageId] = failedMessage;
+
+      // 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);
+      }
 
       // Check if we should clear the path on max retry
       if (_appSettingsService?.settings.clearPathOnMaxRetry == true &&
@@ -568,30 +499,6 @@ 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);
-        }
-      });
     }
   }
 
@@ -687,15 +594,7 @@ class MessageRetryService extends ChangeNotifier {
     }
 
     if (matchedMessageId != null) {
-      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 message = _pendingMessages[matchedMessageId]!;
       final contact = _pendingContacts[matchedMessageId];
       final selection = _pendingPathSelections[matchedMessageId];
 
@@ -717,21 +616,12 @@ 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) {
@@ -756,17 +646,6 @@ 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();
@@ -904,9 +783,6 @@ class MessageRetryService extends ChangeNotifier {
     _ackHistory.clear();
     _ackHashToMessageId.clear();
     _pendingMessageQueuePerContact.clear();
-    _sendQueue.clear();
-    _activeMessages.clear();
-    _resolvedMessages.clear();
     super.dispose();
   }
 }

lib/services/notification_service.dart

@@ -232,9 +232,7 @@ class NotificationService {
 
     try {
       await _notifications.show(
-        id: contactId != null
-            ? 'advert:$contactId'.hashCode
-            : DateTime.now().millisecondsSinceEpoch,
+        id: contactId?.hashCode ?? DateTime.now().millisecondsSinceEpoch,
         title: _l10n.notification_newTypeDiscovered(contactType),
         body: contactName,
         notificationDetails: notificationDetails,
@@ -333,61 +331,6 @@ 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,5 +1,4 @@
 import 'dart:convert';
-import '../models/delivery_observation.dart';
 import '../models/path_history.dart';
 import '../storage/prefs_manager.dart';
 
@@ -7,7 +6,6 @@ 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,
@@ -124,33 +122,4 @@ 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/timeout_prediction_service.dart

@@ -1,229 +0,0 @@
-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/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,5 +1,7 @@
 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;

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

macos/Flutter/GeneratedPluginRegistrant.swift

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

pubspec.yaml

@@ -69,8 +69,6 @@ dependencies:
   material_symbols_icons: ^4.2906.0
   web: ^1.1.1
   flutter_svg: ^2.0.10+1
-  ml_algo: ^16.0.0
-  ml_dataframe: ^1.0.0
 
 dev_dependencies:
   flutter_test:

test/services/ml_algo_sanity_test.dart

@@ -1,156 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:ml_algo/ml_algo.dart';
-import 'package:ml_dataframe/ml_dataframe.dart';
-
-void main() {
-  test('LinearRegressor basic sanity check', () {
-    // Simple: y = 2x + 100
-    final data = DataFrame(
-      [
-        [1.0, 102.0],
-        [2.0, 104.0],
-        [3.0, 106.0],
-        [4.0, 108.0],
-        [5.0, 110.0],
-        [10.0, 120.0],
-        [20.0, 140.0],
-        [50.0, 200.0],
-        [0.0, 100.0],
-        [100.0, 300.0],
-      ],
-      headerExists: false,
-      header: ['x', 'y'],
-    );
-
-    debugPrint('Training data columns: ${data.header}');
-    debugPrint('Training data rows: ${data.rows.length}');
-
-    final model = LinearRegressor(data, 'y');
-
-    final testDf = DataFrame(
-      [
-        [25.0],
-      ],
-      headerExists: false,
-      header: ['x'],
-    );
-
-    final prediction = model.predict(testDf);
-    final value = prediction.rows.first.first;
-    debugPrint('Predict x=25 → y=$value (expected ~150)');
-    expect((value as num).toDouble(), closeTo(150, 5));
-  });
-
-  test('LinearRegressor multi-feature with constant column produces zeros', () {
-    // isFlood=0 for all rows → zero-variance column → singular matrix
-    final data = DataFrame(
-      [
-        [0.0, 50.0, 14.0, 0.0, 1900.0],
-        [0.0, 80.0, 14.0, 0.0, 2200.0],
-        [2.0, 50.0, 14.0, 0.0, 5000.0],
-        [4.0, 50.0, 14.0, 0.0, 9500.0],
-      ],
-      headerExists: false,
-      header: [
-        'pathLength',
-        'messageBytes',
-        'hourOfDay',
-        'isFlood',
-        'deliveryMs',
-      ],
-    );
-
-    final model = LinearRegressor(data, 'deliveryMs');
-    final testDf = DataFrame(
-      [
-        [2.0, 50.0, 14.0, 0.0],
-      ],
-      headerExists: false,
-      header: ['pathLength', 'messageBytes', 'hourOfDay', 'isFlood'],
-    );
-    final pred = model.predict(testDf).rows.first.first;
-    debugPrint(
-      'With constant isFlood column: hops=2 → ${(pred as num).round()}ms (likely 0)',
-    );
-  });
-
-  test('LinearRegressor 2-feature works correctly', () {
-    // Just pathLength + messageBytes → deliveryMs
-    final data = DataFrame(
-      [
-        [0.0, 50.0, 1900.0],
-        [0.0, 80.0, 2200.0],
-        [2.0, 50.0, 5000.0],
-        [2.0, 80.0, 5500.0],
-        [4.0, 50.0, 9500.0],
-        [4.0, 80.0, 10000.0],
-        [0.0, 30.0, 1800.0],
-        [2.0, 30.0, 4800.0],
-        [4.0, 30.0, 9000.0],
-        [0.0, 60.0, 2000.0],
-      ],
-      headerExists: false,
-      header: ['pathLength', 'messageBytes', 'deliveryMs'],
-    );
-
-    final model = LinearRegressor(data, 'deliveryMs');
-
-    for (final hops in [0.0, 2.0, 4.0]) {
-      final testDf = DataFrame(
-        [
-          [hops, 50.0],
-        ],
-        headerExists: false,
-        header: ['pathLength', 'messageBytes'],
-      );
-      final pred = model.predict(testDf).rows.first.first;
-      debugPrint('2-feature: hops=$hops → ${(pred as num).round()}ms');
-    }
-  });
-
-  test('LinearRegressor multi-feature with variance in all columns', () {
-    // Mix flood and direct so isFlood has variance
-    final data = DataFrame(
-      [
-        [0.0, 50.0, 14.0, 0.0, 1900.0],
-        [0.0, 80.0, 10.0, 0.0, 2200.0],
-        [2.0, 50.0, 16.0, 0.0, 5000.0],
-        [2.0, 80.0, 20.0, 0.0, 5500.0],
-        [4.0, 50.0, 8.0, 0.0, 9500.0],
-        [4.0, 80.0, 12.0, 0.0, 10000.0],
-        [-1.0, 40.0, 14.0, 1.0, 5000.0],
-        [-1.0, 60.0, 18.0, 1.0, 6500.0],
-        [-1.0, 30.0, 10.0, 1.0, 4000.0],
-        [-1.0, 80.0, 22.0, 1.0, 7000.0],
-      ],
-      headerExists: false,
-      header: [
-        'pathLength',
-        'messageBytes',
-        'hourOfDay',
-        'isFlood',
-        'deliveryMs',
-      ],
-    );
-
-    final model = LinearRegressor(data, 'deliveryMs');
-
-    for (final tc in [
-      [0.0, 50.0, 14.0, 0.0],
-      [2.0, 50.0, 14.0, 0.0],
-      [4.0, 50.0, 14.0, 0.0],
-      [-1.0, 50.0, 14.0, 1.0],
-    ]) {
-      final testDf = DataFrame(
-        [tc],
-        headerExists: false,
-        header: ['pathLength', 'messageBytes', 'hourOfDay', 'isFlood'],
-      );
-      final pred = model.predict(testDf).rows.first.first;
-      debugPrint(
-        '4-feature: hops=${tc[0]} flood=${tc[3]} → ${(pred as num).round()}ms',
-      );
-    }
-  });
-}

test/services/timeout_prediction_service_test.dart

@@ -1,164 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:meshcore_open/models/delivery_observation.dart';
-import 'package:meshcore_open/services/timeout_prediction_service.dart';
-
-void main() {
-  late TimeoutPredictionService service;
-
-  setUp(() {
-    service = TimeoutPredictionService.noStorage();
-  });
-
-  test('trains on sample data and predicts sensible timeouts', () {
-    // Simulate realistic delivery data:
-    // Direct 0-hop messages: ~1500-2500ms
-    // 2-hop messages: ~4000-6000ms
-    // 4-hop messages: ~8000-12000ms
-    // Flood messages: ~3000-8000ms
-    final sampleData = [
-      // 0-hop direct
-      _obs(pathLength: 0, messageBytes: 20, deliveryMs: 1800),
-      _obs(pathLength: 0, messageBytes: 50, deliveryMs: 2100),
-      _obs(pathLength: 0, messageBytes: 80, deliveryMs: 2400),
-      _obs(pathLength: 0, messageBytes: 30, deliveryMs: 1925),
-      // 2-hop direct
-      _obs(pathLength: 2, messageBytes: 40, deliveryMs: 4500),
-      _obs(pathLength: 2, messageBytes: 60, deliveryMs: 5200),
-      _obs(pathLength: 2, messageBytes: 25, deliveryMs: 4100),
-      // 4-hop direct
-      _obs(pathLength: 4, messageBytes: 50, deliveryMs: 9800),
-      _obs(pathLength: 4, messageBytes: 30, deliveryMs: 8500),
-      _obs(pathLength: 4, messageBytes: 70, deliveryMs: 10570),
-      // Flood
-      _obs(pathLength: -1, messageBytes: 40, deliveryMs: 5000),
-      _obs(pathLength: -1, messageBytes: 60, deliveryMs: 6500),
-    ];
-
-    // Feed all observations
-    for (final obs in sampleData) {
-      service.recordObservation(
-        contactKey: obs.contactKey,
-        pathLength: obs.pathLength,
-        messageBytes: obs.messageBytes,
-        tripTimeMs: obs.deliveryMs,
-      );
-    }
-
-    expect(service.hasModel, isTrue);
-    expect(service.observationCount, equals(12));
-
-    // Predict for different scenarios
-    final direct0 = service.predictTimeout(pathLength: 0, messageBytes: 50);
-    final direct2 = service.predictTimeout(pathLength: 2, messageBytes: 50);
-    final direct4 = service.predictTimeout(pathLength: 4, messageBytes: 50);
-    final flood = service.predictTimeout(pathLength: -1, messageBytes: 50);
-
-    // All should return non-null (model is trained)
-    expect(direct0, isNotNull);
-    expect(direct2, isNotNull);
-    expect(direct4, isNotNull);
-    expect(flood, isNotNull);
-
-    // More hops should predict longer timeouts
-    expect(direct4!, greaterThan(direct2!));
-    expect(direct2, greaterThan(direct0!));
-
-    // All should be positive
-    expect(direct0, greaterThan(0));
-    expect(direct4, greaterThan(0));
-
-    // Print predictions for visibility
-    debugPrint('Predictions (with 1.5x safety margin):');
-    debugPrint('  0-hop direct: ${direct0}ms');
-    debugPrint('  2-hop direct: ${direct2}ms');
-    debugPrint('  4-hop direct: ${direct4}ms');
-    debugPrint('  flood:        ${flood}ms');
-  });
-
-  test('returns null before minimum observations', () {
-    for (var i = 0; i < TimeoutPredictionService.minObservations - 1; i++) {
-      service.recordObservation(
-        contactKey: 'abc',
-        pathLength: 0,
-        messageBytes: 50,
-        tripTimeMs: 2000,
-      );
-    }
-
-    expect(service.hasModel, isFalse);
-    expect(service.predictTimeout(pathLength: 0, messageBytes: 50), isNull);
-  });
-
-  test('caps observations at maxObservations', () {
-    for (var i = 0; i < TimeoutPredictionService.maxObservations + 20; i++) {
-      service.recordObservation(
-        contactKey: 'abc',
-        pathLength: 0,
-        messageBytes: 50,
-        tripTimeMs: 2000 + i,
-      );
-    }
-
-    expect(
-      service.observationCount,
-      equals(TimeoutPredictionService.maxObservations),
-    );
-  });
-
-  test('blends per-contact stats after enough observations', () {
-    // Train with mixed contacts and varied features:
-    // contactA is fast (0-hop), contactB is slow (2-hop)
-    for (var i = 0; i < 12; i++) {
-      service.recordObservation(
-        contactKey: 'contactA',
-        pathLength: 0,
-        messageBytes: 30 + i,
-        tripTimeMs: 1500,
-      );
-      service.recordObservation(
-        contactKey: 'contactB',
-        pathLength: 2,
-        messageBytes: 30 + i,
-        tripTimeMs: 8000,
-      );
-    }
-
-    final predA = service.predictTimeout(
-      contactKey: 'contactA',
-      pathLength: 0,
-      messageBytes: 50,
-    );
-    final predB = service.predictTimeout(
-      contactKey: 'contactB',
-      pathLength: 0,
-      messageBytes: 50,
-    );
-
-    expect(predA, isNotNull);
-    expect(predB, isNotNull);
-    // Contact B (slow) should have a higher predicted timeout than A (fast)
-    expect(predB!, greaterThan(predA!));
-
-    debugPrint('Per-contact blending:');
-    debugPrint('  contactA (fast): ${predA}ms');
-    debugPrint('  contactB (slow): ${predB}ms');
-  });
-}
-
-DeliveryObservation _obs({
-  required int pathLength,
-  required int messageBytes,
-  required int deliveryMs,
-  String contactKey = 'test_contact',
-}) {
-  return DeliveryObservation(
-    contactKey: contactKey,
-    pathLength: pathLength,
-    messageBytes: messageBytes,
-    secondsSinceLastRx: 5,
-    isFlood: pathLength < 0,
-    deliveryMs: deliveryMs,
-    timestamp: DateTime.now(),
-  );
-}