feat: Add location-based DM retries

feat: Add repeater discovery onboarding flow

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 2026-03-15 to 2026-03-22
+
+- Device connectivity and routing: added Android USB serial companion support, serial compass support, GPS module controls, per-contact path size selection, and favourites support via firmware flags.
+- Location and map intelligence: added RSSI-based repeater trilateration and contact location estimates, isolated MET history, matched the official advert import/discovery flow, and refreshed map presentation by removing contact trails.
+- Telemetry and device info: surfaced self telemetry and sensor defaults, opened device info from signal and battery taps, improved signal chip behavior, fixed duplicate telemetry delivery, and restored telemetry refresh behavior.
+- Contacts and messaging: added meshcore:// contact sharing and repeater neighbour views, supported MeshCore message links, fixed DM retry behavior, corrected room poster naming, and compacted the recipient selector.
+- UI polish and platform upkeep: improved device settings layout, tightened sensor and contact presentation, expanded localization coverage, and refreshed platform dependencies and build numbers.
+
+## Key PRs
+
+- [#26](https://github.com/dz0ny/meshcore-sar/pull/26) Merge pull request #26 from `dz0ny/feat/sensor-telemetry-preview`
+
 ## 2026-03-08 to 2026-03-14
 
 - Discovery and contacts: finished the discovery flow, removed artificial UI delays, added profile storage and sync, and allowed contact name overrides.

ios/Runner.xcodeproj/project.pbxproj

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

ios/Runner/Info.plist

@@ -43,7 +43,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>123</string>
+	<string>125</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>ITSAppUsesNonExemptEncryption</key>

ios/fastlane/report.xml

@@ -5,22 +5,22 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000217">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000216">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.503497">
+      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="1.086406">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: build_app" time="103.12875">
+      <testcase classname="fastlane.lanes" name="2: build_app" time="96.919368">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="58490.472877">
+      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="563.579992">
         
       </testcase>
     

lib/l10n/app_en.arb

@@ -2285,7 +2285,7 @@
   "@change": {
     "description": "Generic change action"
   },
-  "wizardOverviewDescription": "This app combines MeshCore messaging, SAR field updates, mapping, and device tools in one place.",
+  "wizardOverviewDescription": "This app combines MeshCore messaging, SAR field updates, discovery, mapping, and device tools in one place.",
   "@wizardOverviewDescription": {
     "description": "Updated onboarding overview description"
   },
@@ -2297,7 +2297,7 @@
   "@wizardOverviewFeature2": {
     "description": "Updated onboarding overview feature 2"
   },
-  "wizardOverviewFeature3": "Connect over BLE or TCP, then manage the companion radio from inside the app.",
+  "wizardOverviewFeature3": "Connect over BLE, WiFi, or Serial, then manage the companion radio from inside the app.",
   "@wizardOverviewFeature3": {
     "description": "Updated onboarding overview feature 3"
   },
@@ -2410,11 +2410,11 @@
   "@wizardNetworkTitle": {
     "description": "Updated onboarding network page title"
   },
-  "wizardNetworkDescription": "The Contacts tab organizes the network you discover and the routes you learn over time.",
+  "wizardNetworkDescription": "The Contacts and Discovery flows help you find nearby nodes, store repeaters, and manage the routes you learn over time.",
   "@wizardNetworkDescription": {
     "description": "Updated onboarding network page description"
   },
-  "wizardNetworkFeature1": "Review team members, repeaters, rooms, channels, and pending adverts in one list.",
+  "wizardNetworkFeature1": "Discover repeaters and sensors, then review team members, rooms, channels, and pending adverts in one list.",
   "@wizardNetworkFeature1": {
     "description": "Updated onboarding network feature 1"
   },
@@ -2422,7 +2422,7 @@
   "@wizardNetworkFeature2": {
     "description": "Updated onboarding network feature 2"
   },
-  "wizardNetworkFeature3": "Create channels and manage network destinations without leaving the app.",
+  "wizardNetworkFeature3": "Add new repeaters right after you connect, then create channels and manage network destinations without leaving the app.",
   "@wizardNetworkFeature3": {
     "description": "Updated onboarding network feature 3"
   },
@@ -2462,10 +2462,18 @@
   "@wizardToolsFeature2": {
     "description": "Updated onboarding tools feature 2"
   },
-  "wizardToolsFeature3": "Use packet logs, spectrum scan, and developer diagnostics when troubleshooting the mesh.",
+  "wizardToolsFeature3": "Use live traffic, packet logs, spectrum scan, and developer diagnostics when troubleshooting the mesh.",
   "@wizardToolsFeature3": {
     "description": "Updated onboarding tools feature 3"
   },
+  "postConnectDiscoveryTitle": "Discover repeaters now?",
+  "@postConnectDiscoveryTitle": {
+    "description": "Title for the prompt shown after a successful device connection"
+  },
+  "postConnectDiscoveryDescription": "Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.",
+  "@postConnectDiscoveryDescription": {
+    "description": "Body text for the prompt shown after a successful device connection"
+  },
   "contactInSensors": "In Sensors",
   "@contactInSensors": {
     "description": "Contact actions label when already in sensors"
@@ -2770,5 +2778,24 @@
   "captured": "Captured",
   "size": "Size",
   "noCustomChannelsToClear": "No custom channels to clear.",
-  "noDeviceContactsToClear": "No device contacts to clear."
+  "noDeviceContactsToClear": "No device contacts to clear.",
+
+  "setRegionScope": "Set region scope",
+  "regionScope": "Region scope",
+  "regionScopeNone": "None (global)",
+  "clearRegionScope": "Clear scope",
+  "regionScopeWarning": "Only repeaters allowing this region will forward.",
+  "discoverRegions": "Discover from repeaters",
+  "discoveringRegions": "Discovering regions...",
+  "enterRegionName": "Region name (e.g. auckland)",
+  "noRegionsFound": "No regions found on this repeater.",
+  "regionScopeSet": "Region scope set to {name}",
+  "@regionScopeSet": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "regionScopeCleared": "Region scope cleared"
 }

lib/l10n/app_localizations.dart

@@ -3219,7 +3219,7 @@ abstract class AppLocalizations {
   /// Updated onboarding overview description
   ///
   /// In en, this message translates to:
-  /// **'This app combines MeshCore messaging, SAR field updates, mapping, and device tools in one place.'**
+  /// **'This app combines MeshCore messaging, SAR field updates, discovery, mapping, and device tools in one place.'**
   String get wizardOverviewDescription;
 
   /// Updated onboarding overview feature 1
@@ -3237,7 +3237,7 @@ abstract class AppLocalizations {
   /// Updated onboarding overview feature 3
   ///
   /// In en, this message translates to:
-  /// **'Connect over BLE or TCP, then manage the companion radio from inside the app.'**
+  /// **'Connect over BLE, WiFi, or Serial, then manage the companion radio from inside the app.'**
   String get wizardOverviewFeature3;
 
   /// Updated onboarding messaging page title
@@ -3387,13 +3387,13 @@ abstract class AppLocalizations {
   /// Updated onboarding network page description
   ///
   /// In en, this message translates to:
-  /// **'The Contacts tab organizes the network you discover and the routes you learn over time.'**
+  /// **'The Contacts and Discovery flows help you find nearby nodes, store repeaters, and manage the routes you learn over time.'**
   String get wizardNetworkDescription;
 
   /// Updated onboarding network feature 1
   ///
   /// In en, this message translates to:
-  /// **'Review team members, repeaters, rooms, channels, and pending adverts in one list.'**
+  /// **'Discover repeaters and sensors, then review team members, rooms, channels, and pending adverts in one list.'**
   String get wizardNetworkFeature1;
 
   /// Updated onboarding network feature 2
@@ -3405,7 +3405,7 @@ abstract class AppLocalizations {
   /// Updated onboarding network feature 3
   ///
   /// In en, this message translates to:
-  /// **'Create channels and manage network destinations without leaving the app.'**
+  /// **'Add new repeaters right after you connect, then create channels and manage network destinations without leaving the app.'**
   String get wizardNetworkFeature3;
 
   /// Updated onboarding map page title
@@ -3465,9 +3465,21 @@ abstract class AppLocalizations {
   /// Updated onboarding tools feature 3
   ///
   /// In en, this message translates to:
-  /// **'Use packet logs, spectrum scan, and developer diagnostics when troubleshooting the mesh.'**
+  /// **'Use live traffic, packet logs, spectrum scan, and developer diagnostics when troubleshooting the mesh.'**
   String get wizardToolsFeature3;
 
+  /// Title for the prompt shown after a successful device connection
+  ///
+  /// In en, this message translates to:
+  /// **'Discover repeaters now?'**
+  String get postConnectDiscoveryTitle;
+
+  /// Body text for the prompt shown after a successful device connection
+  ///
+  /// In en, this message translates to:
+  /// **'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.'**
+  String get postConnectDiscoveryDescription;
+
   /// Contact actions label when already in sensors
   ///
   /// In en, this message translates to:
@@ -4997,6 +5009,72 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'No device contacts to clear.'**
   String get noDeviceContactsToClear;
+
+  /// No description provided for @setRegionScope.
+  ///
+  /// In en, this message translates to:
+  /// **'Set region scope'**
+  String get setRegionScope;
+
+  /// No description provided for @regionScope.
+  ///
+  /// In en, this message translates to:
+  /// **'Region scope'**
+  String get regionScope;
+
+  /// No description provided for @regionScopeNone.
+  ///
+  /// In en, this message translates to:
+  /// **'None (global)'**
+  String get regionScopeNone;
+
+  /// No description provided for @clearRegionScope.
+  ///
+  /// In en, this message translates to:
+  /// **'Clear scope'**
+  String get clearRegionScope;
+
+  /// No description provided for @regionScopeWarning.
+  ///
+  /// In en, this message translates to:
+  /// **'Only repeaters allowing this region will forward.'**
+  String get regionScopeWarning;
+
+  /// No description provided for @discoverRegions.
+  ///
+  /// In en, this message translates to:
+  /// **'Discover from repeaters'**
+  String get discoverRegions;
+
+  /// No description provided for @discoveringRegions.
+  ///
+  /// In en, this message translates to:
+  /// **'Discovering regions...'**
+  String get discoveringRegions;
+
+  /// No description provided for @enterRegionName.
+  ///
+  /// In en, this message translates to:
+  /// **'Region name (e.g. auckland)'**
+  String get enterRegionName;
+
+  /// No description provided for @noRegionsFound.
+  ///
+  /// In en, this message translates to:
+  /// **'No regions found on this repeater.'**
+  String get noRegionsFound;
+
+  /// No description provided for @regionScopeSet.
+  ///
+  /// In en, this message translates to:
+  /// **'Region scope set to {name}'**
+  String regionScopeSet(String name);
+
+  /// No description provided for @regionScopeCleared.
+  ///
+  /// In en, this message translates to:
+  /// **'Region scope cleared'**
+  String get regionScopeCleared;
 }
 
 class _AppLocalizationsDelegate

lib/l10n/app_localizations_de.dart

@@ -1898,6 +1898,13 @@ class AppLocalizationsDe extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Nutze Paketprotokolle, Spektrumsuche und Entwicklerdiagnosen zur Fehlersuche im Mesh.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'In Sensoren';
 
@@ -2698,4 +2705,40 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get noDeviceContactsToClear => 'Keine Gerätekontakte zum Löschen.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_el.dart

@@ -1905,6 +1905,13 @@ class AppLocalizationsEl extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Χρησιμοποιήστε καταγραφές πακέτων, σάρωση φάσματος και διαγνωστικά προγραμματιστή κατά την αντιμετώπιση προβλημάτων του mesh.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'Στους αισθητήρες';
 
@@ -2700,4 +2707,40 @@ class AppLocalizationsEl extends AppLocalizations {
 
   @override
   String get noDeviceContactsToClear => 'Δεν υπάρχουν επαφές συσκευής.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_en.dart

@@ -1717,7 +1717,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get wizardOverviewDescription =>
-      'This app combines MeshCore messaging, SAR field updates, mapping, and device tools in one place.';
+      'This app combines MeshCore messaging, SAR field updates, discovery, mapping, and device tools in one place.';
 
   @override
   String get wizardOverviewFeature1 =>
@@ -1729,7 +1729,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get wizardOverviewFeature3 =>
-      'Connect over BLE or TCP, then manage the companion radio from inside the app.';
+      'Connect over BLE, WiFi, or Serial, then manage the companion radio from inside the app.';
 
   @override
   String get wizardMessagingTitle => 'Messaging and Field Reports';
@@ -1819,11 +1819,11 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get wizardNetworkDescription =>
-      'The Contacts tab organizes the network you discover and the routes you learn over time.';
+      'The Contacts and Discovery flows help you find nearby nodes, store repeaters, and manage the routes you learn over time.';
 
   @override
   String get wizardNetworkFeature1 =>
-      'Review team members, repeaters, rooms, channels, and pending adverts in one list.';
+      'Discover repeaters and sensors, then review team members, rooms, channels, and pending adverts in one list.';
 
   @override
   String get wizardNetworkFeature2 =>
@@ -1831,7 +1831,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get wizardNetworkFeature3 =>
-      'Create channels and manage network destinations without leaving the app.';
+      'Add new repeaters right after you connect, then create channels and manage network destinations without leaving the app.';
 
   @override
   String get wizardMapOpsTitle => 'Map, Trails, and Shared Geometry';
@@ -1869,7 +1869,14 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get wizardToolsFeature3 =>
-      'Use packet logs, spectrum scan, and developer diagnostics when troubleshooting the mesh.';
+      'Use live traffic, packet logs, spectrum scan, and developer diagnostics when troubleshooting the mesh.';
+
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
 
   @override
   String get contactInSensors => 'In Sensors';
@@ -2662,4 +2669,40 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get noDeviceContactsToClear => 'No device contacts to clear.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_es.dart

@@ -1901,6 +1901,13 @@ class AppLocalizationsEs extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Usa registros de paquetes, escaneo de espectro y diagnósticos de desarrollador al solucionar problemas de la malla.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'En Sensores';
 
@@ -2702,4 +2709,40 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get noDeviceContactsToClear =>
       'No hay contactos del dispositivo que borrar.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_fr.dart

@@ -1905,6 +1905,13 @@ class AppLocalizationsFr extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Utilisez les journaux de paquets, le balayage du spectre et les diagnostics développeur pour dépanner le réseau maillé.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'Dans Capteurs';
 
@@ -2706,4 +2713,40 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get noDeviceContactsToClear =>
       'Aucun contact de l\'appareil à effacer.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_hr.dart

@@ -1881,6 +1881,13 @@ class AppLocalizationsHr extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Koristite zapisnike paketa, skeniranje spektra i razvojnu dijagnostiku pri rješavanju problema s mesh mrežom.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'U Senzorima';
 
@@ -2675,4 +2682,40 @@ class AppLocalizationsHr extends AppLocalizations {
 
   @override
   String get noDeviceContactsToClear => 'Nema kontakata uređaja za brisanje.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_it.dart

@@ -1896,6 +1896,13 @@ class AppLocalizationsIt extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Usa log dei pacchetti, scansione dello spettro e diagnostica sviluppatore per risolvere problemi della mesh.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'Nei Sensori';
 
@@ -2692,4 +2699,40 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get noDeviceContactsToClear =>
       'Nessun contatto dispositivo da cancellare.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_pl.dart

@@ -1893,6 +1893,13 @@ class AppLocalizationsPl extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Używaj logów pakietów, skanowania widma i diagnostyki deweloperskiej podczas rozwiązywania problemów z mesh.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'W Czujnikach';
 
@@ -2689,4 +2696,40 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get noDeviceContactsToClear =>
       'Brak kontaktów urządzenia do wyczyszczenia.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_pt.dart

@@ -1900,6 +1900,13 @@ class AppLocalizationsPt extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Use logs de pacotes, varredura de espectro e diagnóstico de desenvolvedor ao solucionar problemas da malha.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'Nos Sensores';
 
@@ -2700,4 +2707,40 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get noDeviceContactsToClear =>
       'Sem contactos do dispositivo para limpar.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_ru.dart

@@ -1890,6 +1890,13 @@ class AppLocalizationsRu extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Используйте журналы пакетов, сканирование спектра и диагностику разработчика для устранения проблем mesh-сети.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'В датчиках';
 
@@ -2685,4 +2692,40 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get noDeviceContactsToClear => 'Нет контактов устройства для очистки.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_sl.dart

@@ -1881,6 +1881,13 @@ class AppLocalizationsSl extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Uporabite dnevnik paketov, pregled spektra in razvojno diagnostiko pri odpravljanju težav v mesh omrežju.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'V senzorjih';
 
@@ -2675,4 +2682,40 @@ class AppLocalizationsSl extends AppLocalizations {
 
   @override
   String get noDeviceContactsToClear => 'Ni stikov naprave za brisanje.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_tr.dart

@@ -1883,6 +1883,13 @@ class AppLocalizationsTr extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Mesh sorunlarını giderirken paket günlükleri, spektrum taraması ve geliştirici tanılamalarını kullanın.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'Sensörlerde';
 
@@ -2673,4 +2680,40 @@ class AppLocalizationsTr extends AppLocalizations {
 
   @override
   String get noDeviceContactsToClear => 'Temizlenecek cihaz kişisi yok.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_uk.dart

@@ -1896,6 +1896,13 @@ class AppLocalizationsUk extends AppLocalizations {
   String get wizardToolsFeature3 =>
       'Використовуйте журнали пакетів, сканування спектра та діагностику розробника для усунення проблем mesh-мережі.';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => 'У датчиках';
 
@@ -2696,4 +2703,40 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get noDeviceContactsToClear =>
       'Немає контактів пристрою для очищення.';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/app_localizations_zh.dart

@@ -1796,6 +1796,13 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get wizardToolsFeature3 => '在排查 mesh 网络问题时使用数据包日志、频谱扫描和开发者诊断。';
 
+  @override
+  String get postConnectDiscoveryTitle => 'Discover repeaters now?';
+
+  @override
+  String get postConnectDiscoveryDescription =>
+      'Run repeater discovery right after connecting so you can see nearby MeshCore nodes and add them to your network faster.';
+
   @override
   String get contactInSensors => '在传感器中';
 
@@ -2568,4 +2575,40 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String get noDeviceContactsToClear => '没有设备联系人可清除。';
+
+  @override
+  String get setRegionScope => 'Set region scope';
+
+  @override
+  String get regionScope => 'Region scope';
+
+  @override
+  String get regionScopeNone => 'None (global)';
+
+  @override
+  String get clearRegionScope => 'Clear scope';
+
+  @override
+  String get regionScopeWarning =>
+      'Only repeaters allowing this region will forward.';
+
+  @override
+  String get discoverRegions => 'Discover from repeaters';
+
+  @override
+  String get discoveringRegions => 'Discovering regions...';
+
+  @override
+  String get enterRegionName => 'Region name (e.g. auckland)';
+
+  @override
+  String get noRegionsFound => 'No regions found on this repeater.';
+
+  @override
+  String regionScopeSet(String name) {
+    return 'Region scope set to $name';
+  }
+
+  @override
+  String get regionScopeCleared => 'Region scope cleared';
 }

lib/l10n/untranslated.json

@@ -1 +1,209 @@
-{}
+{
+  "de": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "el": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "es": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "fr": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "hr": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "it": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "pl": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "pt": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "ru": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "sl": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "tr": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "uk": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "zh": [
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ]
+}

lib/models/config_profile.dart

@@ -263,7 +263,6 @@ class MapWorkspaceProfileSection {
   final bool? showKrasFireZonesOverlay;
   final bool? showPlaceNamesOverlay;
   final bool? showMunicipalityBordersOverlay;
-  final bool? showAllContactTrails;
   final bool? hideRepeatersOnMap;
 
   const MapWorkspaceProfileSection({
@@ -284,7 +283,6 @@ class MapWorkspaceProfileSection {
     this.showKrasFireZonesOverlay,
     this.showPlaceNamesOverlay,
     this.showMunicipalityBordersOverlay,
-    this.showAllContactTrails,
     this.hideRepeatersOnMap,
   });
 
@@ -306,7 +304,6 @@ class MapWorkspaceProfileSection {
       showKrasFireZonesOverlay == null &&
       showPlaceNamesOverlay == null &&
       showMunicipalityBordersOverlay == null &&
-      showAllContactTrails == null &&
       hideRepeatersOnMap == null;
 
   Map<String, dynamic> toJson() => {
@@ -327,7 +324,6 @@ class MapWorkspaceProfileSection {
     'showKrasFireZonesOverlay': showKrasFireZonesOverlay,
     'showPlaceNamesOverlay': showPlaceNamesOverlay,
     'showMunicipalityBordersOverlay': showMunicipalityBordersOverlay,
-    'showAllContactTrails': showAllContactTrails,
     'hideRepeatersOnMap': hideRepeatersOnMap,
   };
 
@@ -356,7 +352,6 @@ class MapWorkspaceProfileSection {
       showPlaceNamesOverlay: json['showPlaceNamesOverlay'] as bool?,
       showMunicipalityBordersOverlay:
           json['showMunicipalityBordersOverlay'] as bool?,
-      showAllContactTrails: json['showAllContactTrails'] as bool?,
       hideRepeatersOnMap: json['hideRepeatersOnMap'] as bool?,
     );
   }

lib/models/path_history.dart

@@ -9,6 +9,11 @@ class PathRecord {
   final int failureCount;
   final int lastRoundTripTimeMs;
   final DateTime lastUsedAt;
+  final DateTime? lastSucceededAt;
+  final double? senderLatitude;
+  final double? senderLongitude;
+  final double? recipientLatitude;
+  final double? recipientLongitude;
 
   const PathRecord({
     required this.pathBytes,
@@ -19,6 +24,11 @@ class PathRecord {
     required this.failureCount,
     required this.lastRoundTripTimeMs,
     required this.lastUsedAt,
+    required this.lastSucceededAt,
+    required this.senderLatitude,
+    required this.senderLongitude,
+    required this.recipientLatitude,
+    required this.recipientLongitude,
   });
 
   String get signature =>
@@ -36,6 +46,11 @@ class PathRecord {
     int? failureCount,
     int? lastRoundTripTimeMs,
     DateTime? lastUsedAt,
+    DateTime? lastSucceededAt,
+    double? senderLatitude,
+    double? senderLongitude,
+    double? recipientLatitude,
+    double? recipientLongitude,
   }) {
     return PathRecord(
       pathBytes: pathBytes ?? this.pathBytes,
@@ -46,6 +61,11 @@ class PathRecord {
       failureCount: failureCount ?? this.failureCount,
       lastRoundTripTimeMs: lastRoundTripTimeMs ?? this.lastRoundTripTimeMs,
       lastUsedAt: lastUsedAt ?? this.lastUsedAt,
+      lastSucceededAt: lastSucceededAt ?? this.lastSucceededAt,
+      senderLatitude: senderLatitude ?? this.senderLatitude,
+      senderLongitude: senderLongitude ?? this.senderLongitude,
+      recipientLatitude: recipientLatitude ?? this.recipientLatitude,
+      recipientLongitude: recipientLongitude ?? this.recipientLongitude,
     );
   }
 
@@ -59,6 +79,11 @@ class PathRecord {
       'failure_count': failureCount,
       'last_round_trip_time_ms': lastRoundTripTimeMs,
       'last_used_at': lastUsedAt.toIso8601String(),
+      'last_succeeded_at': lastSucceededAt?.toIso8601String(),
+      'sender_latitude': senderLatitude,
+      'sender_longitude': senderLongitude,
+      'recipient_latitude': recipientLatitude,
+      'recipient_longitude': recipientLongitude,
     };
   }
 
@@ -79,6 +104,13 @@ class PathRecord {
       lastUsedAt:
           DateTime.tryParse(json['last_used_at'] as String? ?? '') ??
           DateTime.fromMillisecondsSinceEpoch(0),
+      lastSucceededAt: DateTime.tryParse(
+        json['last_succeeded_at'] as String? ?? '',
+      ),
+      senderLatitude: (json['sender_latitude'] as num?)?.toDouble(),
+      senderLongitude: (json['sender_longitude'] as num?)?.toDouble(),
+      recipientLatitude: (json['recipient_latitude'] as num?)?.toDouble(),
+      recipientLongitude: (json['recipient_longitude'] as num?)?.toDouble(),
     );
   }
 }

lib/providers/app_provider.dart

@@ -2,7 +2,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:math' as math;
 import 'package:flutter/foundation.dart';
-import 'package:meshcore_client/meshcore_client.dart' show BufferReader;
+import 'package:meshcore_client/meshcore_client.dart'
+    show BufferReader, MeshCoreConstants;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'connection_provider.dart';
 import 'contacts_provider.dart';
@@ -211,6 +212,8 @@ class AppProvider with ChangeNotifier {
   static const int _maxPacketRetryAttempts = 4;
   final Map<String, String> _voiceSessionSenderKey6 = {};
   final Map<String, String> _imageSessionSenderKey6 = {};
+  final Map<String, Map<int, VoicePacket>> _pendingChannelVoicePackets = {};
+  final Map<String, Map<int, ImagePacket>> _pendingChannelImageFragments = {};
   final Map<String, Timer> _voiceMissingRetryTimers = {};
   final Map<String, int> _voiceMissingRetryAttempts = {};
   final Map<String, Timer> _imageMissingRetryTimers = {};
@@ -1315,6 +1318,7 @@ class AppProvider with ChangeNotifier {
               .toLowerCase();
         }
         voiceProvider.registerEnvelope(voiceEnvelope);
+        _replayPendingChannelVoicePackets(voiceEnvelope.sessionId);
         enrichedMessage = enrichedMessage.copyWith(
           isVoice: true,
           voiceId: voiceEnvelope.sessionId,
@@ -1352,6 +1356,7 @@ class AppProvider with ChangeNotifier {
               .toLowerCase();
         }
         imageProvider.registerEnvelope(imageEnvelope);
+        _replayPendingChannelImageFragments(imageEnvelope.sessionId);
         messagesProvider.addMessage(
           enrichedMessage,
           contactLookup: (name) {
@@ -1469,15 +1474,7 @@ class AppProvider with ChangeNotifier {
         return;
       }
 
-      final fastGpsPacket = FastGpsPacket.tryParseBinary(payload);
+      if (_handleFastGpsPayload(payload)) {
-      if (fastGpsPacket != null) {
-        final sender = _resolveContactByPrefixHex(fastGpsPacket.senderKey6);
-        if (sender != null) {
-          contactsProvider.updateFastGps(
-            sender.publicKey.sublist(0, 6),
-            fastGpsPacket,
-          );
-        }
         return;
       }
 
@@ -1614,66 +1611,44 @@ class AppProvider with ChangeNotifier {
         return;
       }
 
-      if (ImagePacket.isImageBinary(payload)) {
+      if (_handleIncomingImageBinaryPayload(payload)) {
-        final frag = ImagePacket.tryParseBinary(payload);
-        if (frag == null) return;
-        debugPrint('📷 [AppProvider] Binary image fragment received: $frag');
-        final session = imageProvider.session(frag.sessionId);
-        if (session == null && frag.total < 1) {
-          debugPrint(
-            '⚠️ [AppProvider] Dropping compact image fragment without envelope '
-            'for session ${frag.sessionId}',
-          );
-          return;
-        }
-        imageProvider.addFragment(
-          session == null
-              ? frag
-              : ImagePacket(
-                  sessionId: frag.sessionId,
-                  format: session.format,
-                  index: frag.index,
-                  total: session.total,
-                  data: frag.data,
-                ),
-          width: session?.width ?? 0,
-          height: session?.height ?? 0,
-        );
-        _scheduleImageMissingRetry(
-          frag.sessionId,
-          justComplete: imageProvider.isComplete(frag.sessionId),
-        );
         return;
       }
-
+      _handleIncomingVoiceBinaryPayload(payload);
-      if (!VoicePacket.isVoiceBinary(payload)) return;
-      final pkt = VoicePacket.tryParseBinary(payload);
-      if (pkt == null) return;
-      debugPrint('🎙️ [AppProvider] Binary voice packet received: $pkt');
-      final session = voiceProvider.session(pkt.sessionId);
-      if (session == null && pkt.total < 1) {
-        debugPrint(
-          '⚠️ [AppProvider] Dropping compact voice packet without envelope '
-          'for session ${pkt.sessionId}',
-        );
-        return;
-      }
-      final justComplete = voiceProvider.addPacket(
-        session == null
-            ? pkt
-            : VoicePacket(
-                sessionId: pkt.sessionId,
-                mode: session.mode,
-                index: pkt.index,
-                total: session.total,
-                codec2Data: pkt.codec2Data,
-              ),
-      );
-      _scheduleVoiceMissingRetry(pkt.sessionId, justComplete: justComplete);
-      // Insert or update the placeholder message in the chat list
-      _handleIncomingVoicePacket(pkt, justComplete: justComplete);
     };
 
+    connectionProvider.onChannelDataReceived =
+        (channelIdx, pathLen, dataType, payload, snrRaw, rssiDbm) {
+          if (dataType != MeshCoreConstants.dataTypeDev) {
+            debugPrint(
+              '📦 [AppProvider] Ignoring channel datagram type '
+              '0x${dataType.toRadixString(16).padLeft(4, '0')} on channel $channelIdx',
+            );
+            return;
+          }
+
+          if (_handleFastGpsPayload(payload)) {
+            return;
+          }
+          if (_handleIncomingImageBinaryPayload(
+            payload,
+            allowPreEnvelopeBuffer: true,
+          )) {
+            return;
+          }
+          if (_handleIncomingVoiceBinaryPayload(
+            payload,
+            allowPreEnvelopeBuffer: true,
+          )) {
+            return;
+          }
+
+          debugPrint(
+            '📦 [AppProvider] Unknown developer channel payload on channel '
+            '$channelIdx: ${payload.isNotEmpty ? payload.first : -1}',
+          );
+        };
+
     connectionProvider.onControlDataReceived =
         (payload, snrRaw, rssiDbm, pathLen) {
           _handleControlDataDiscovery(
@@ -1786,6 +1761,7 @@ class AppProvider with ChangeNotifier {
           return _prepareDirectMessageSend(
             messageId: messageId,
             contact: contact,
+            retryAttempt: retryAttempt,
           );
         };
 
@@ -1855,23 +1831,47 @@ class AppProvider with ChangeNotifier {
   Future<Contact> _prepareDirectMessageSend({
     required String messageId,
     required Contact contact,
+    required int retryAttempt,
   }) async {
     final latestContact =
         contactsProvider.findContactByKey(contact.publicKey) ?? contact;
     var session = _directMessageRouteSessions[messageId];
     if (session == null) {
-      final selection = await _pathHistoryService.getSelectionForContact(
+      final selection = latestContact.routeHasPath && latestContact.routeHopCount > 0
-        latestContact,
+          ? PathSelection(
-        autoRouteRotationEnabled: _autoRouteRotationEnabled,
+              mode: PathSelectionMode.directCurrent,
-      );
+              pathBytes: Uint8List.fromList(latestContact.routePathBytes),
+              hopCount: latestContact.routeHopCount,
+              hashSize: latestContact.routeHashSize,
+            )
+          : await _pathHistoryService.getSelectionForContact(
+              latestContact,
+              autoRouteRotationEnabled: _autoRouteRotationEnabled,
+            );
       session = _DirectMessageRouteSession(
         currentSelection: selection,
         originalRoute: ContactRouteCodec.fromContact(latestContact),
         routerFallbackAttempted: false,
       );
-      _directMessageRouteSessions[messageId] = session;
     }
 
+    if (!session.routerFallbackAttempted) {
+      final currentSignature =
+          latestContact.routeHasPath && latestContact.routeHopCount > 0
+          ? latestContact.routePathBytes
+                .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+                .join()
+          : null;
+      final selection = await _resolveDirectMessageSelectionForRetry(
+        latestContact,
+        retryAttempt: retryAttempt,
+        currentSignature: currentSignature,
+        fallbackSelection: session.currentSelection,
+      );
+      session = session.copyWith(currentSelection: selection);
+    }
+    _directMessageRouteSessions[messageId] = session;
+
     await _applyPathSelection(
       latestContact,
       session.currentSelection,
@@ -1882,6 +1882,43 @@ class AppProvider with ChangeNotifier {
         latestContact;
   }
 
+  Future<PathSelection> _resolveDirectMessageSelectionForRetry(
+    Contact contact, {
+    required int retryAttempt,
+    required String? currentSignature,
+    required PathSelection fallbackSelection,
+  }) async {
+    if (contact.routeHasPath && contact.routeHopCount > 0 && retryAttempt <= 1) {
+      return PathSelection(
+        mode: PathSelectionMode.directCurrent,
+        pathBytes: Uint8List.fromList(contact.routePathBytes),
+        hopCount: contact.routeHopCount,
+        hashSize: contact.routeHashSize,
+      );
+    }
+
+    if (retryAttempt == 2) {
+      return PathSelection.flood();
+    }
+
+    if (retryAttempt >= 3) {
+      final historicalSelection = await _pathHistoryService
+          .getLastSuccessfulDirectSelection(
+            contact,
+            excludeSignature: currentSignature,
+            senderLatitude: locationTrackingService.currentPosition?.latitude,
+            senderLongitude: locationTrackingService.currentPosition?.longitude,
+            recipientLatitude: contact.displayLocation?.latitude,
+            recipientLongitude: contact.displayLocation?.longitude,
+          );
+      if (historicalSelection != null) {
+        return historicalSelection;
+      }
+    }
+
+    return fallbackSelection;
+  }
+
   Future<void> _applyPathSelection(
     Contact contact,
     PathSelection selection, {
@@ -2056,6 +2093,10 @@ class AppProvider with ChangeNotifier {
         session.currentSelection,
         success: true,
         roundTripTimeMs: roundTripTimeMs,
+        senderLatitude: locationTrackingService.currentPosition?.latitude,
+        senderLongitude: locationTrackingService.currentPosition?.longitude,
+        recipientLatitude: contact.displayLocation?.latitude,
+        recipientLongitude: contact.displayLocation?.longitude,
       ),
     );
   }
@@ -2805,6 +2846,23 @@ class AppProvider with ChangeNotifier {
       return;
     }
 
+    final channelIdx = locationTrackingService.fastLocationChannelIdx;
+    if (channelIdx == null) {
+      return;
+    }
+
+    final hasTargetChannel = contactsProvider.channels.any(
+      (channel) =>
+          (channel.publicKey.length > 1 ? channel.publicKey[1] : 0) ==
+          channelIdx,
+    );
+    if (!hasTargetChannel) {
+      debugPrint(
+        '⚠️ [AppProvider] Fast GPS target channel $channelIdx is unavailable',
+      );
+      return;
+    }
+
     final publicKey = connectionProvider.deviceInfo.publicKey;
     if (publicKey == null || publicKey.length < 6) {
       return;
@@ -2822,10 +2880,14 @@ class AppProvider with ChangeNotifier {
     );
     debugPrint(
       '📍 [AppProvider] Sending fast GPS update ($reason): '
-      '${position.latitude}, ${position.longitude}',
+      '${position.latitude}, ${position.longitude} via channel $channelIdx',
     );
     try {
-      await connectionProvider.sendRawPrivateMulticast(packet.encodeBinary());
+      await connectionProvider.sendChannelData(
+        channelIdx: channelIdx,
+        dataType: MeshCoreConstants.dataTypeDev,
+        payload: packet.encodeBinary(),
+      );
     } catch (e) {
       debugPrint('⚠️ [AppProvider] Fast GPS send failed: $e');
     }
@@ -3363,6 +3425,173 @@ class AppProvider with ChangeNotifier {
     });
   }
 
+  bool _handleFastGpsPayload(Uint8List payload) {
+    final fastGpsPacket = FastGpsPacket.tryParseBinary(payload);
+    if (fastGpsPacket == null) {
+      return false;
+    }
+
+    final sender = _resolveContactByPrefixHex(fastGpsPacket.senderKey6);
+    if (sender != null) {
+      contactsProvider.updateFastGps(
+        sender.publicKey.sublist(0, 6),
+        fastGpsPacket,
+      );
+    }
+    return true;
+  }
+
+  bool _handleIncomingImageBinaryPayload(
+    Uint8List payload, {
+    bool allowPreEnvelopeBuffer = false,
+  }) {
+    if (!ImagePacket.isImageBinary(payload)) {
+      return false;
+    }
+    final frag = ImagePacket.tryParseBinary(payload);
+    if (frag == null) {
+      return true;
+    }
+    debugPrint('📷 [AppProvider] Binary image fragment received: $frag');
+    final session = imageProvider.session(frag.sessionId);
+    if (session == null && frag.total < 1) {
+      if (allowPreEnvelopeBuffer) {
+        _pendingChannelImageFragments.putIfAbsent(
+          frag.sessionId,
+          () => <int, ImagePacket>{},
+        )[frag.index] = frag;
+        debugPrint(
+          '📷 [AppProvider] Buffered compact image fragment before envelope '
+          'for session ${frag.sessionId} index=${frag.index}',
+        );
+      } else {
+        debugPrint(
+          '⚠️ [AppProvider] Dropping compact image fragment without envelope '
+          'for session ${frag.sessionId}',
+        );
+      }
+      return true;
+    }
+
+    imageProvider.addFragment(
+      session == null
+          ? frag
+          : ImagePacket(
+              sessionId: frag.sessionId,
+              format: session.format,
+              index: frag.index,
+              total: session.total,
+              data: frag.data,
+            ),
+      width: session?.width ?? 0,
+      height: session?.height ?? 0,
+    );
+    _scheduleImageMissingRetry(
+      frag.sessionId,
+      justComplete: imageProvider.isComplete(frag.sessionId),
+    );
+    return true;
+  }
+
+  bool _handleIncomingVoiceBinaryPayload(
+    Uint8List payload, {
+    bool allowPreEnvelopeBuffer = false,
+  }) {
+    if (!VoicePacket.isVoiceBinary(payload)) {
+      return false;
+    }
+    final pkt = VoicePacket.tryParseBinary(payload);
+    if (pkt == null) {
+      return true;
+    }
+    debugPrint('🎙️ [AppProvider] Binary voice packet received: $pkt');
+    final session = voiceProvider.session(pkt.sessionId);
+    if (session == null && pkt.total < 1) {
+      if (allowPreEnvelopeBuffer) {
+        _pendingChannelVoicePackets.putIfAbsent(
+          pkt.sessionId,
+          () => <int, VoicePacket>{},
+        )[pkt.index] = pkt;
+        debugPrint(
+          '🎙️ [AppProvider] Buffered compact voice packet before envelope '
+          'for session ${pkt.sessionId} index=${pkt.index}',
+        );
+      } else {
+        debugPrint(
+          '⚠️ [AppProvider] Dropping compact voice packet without envelope '
+          'for session ${pkt.sessionId}',
+        );
+      }
+      return true;
+    }
+
+    final normalizedPacket = session == null
+        ? pkt
+        : VoicePacket(
+            sessionId: pkt.sessionId,
+            mode: session.mode,
+            index: pkt.index,
+            total: session.total,
+            codec2Data: pkt.codec2Data,
+          );
+    final justComplete = voiceProvider.addPacket(normalizedPacket);
+    _scheduleVoiceMissingRetry(pkt.sessionId, justComplete: justComplete);
+    _handleIncomingVoicePacket(normalizedPacket, justComplete: justComplete);
+    return true;
+  }
+
+  void _replayPendingChannelVoicePackets(String sessionId) {
+    final pending = _pendingChannelVoicePackets.remove(sessionId);
+    final session = voiceProvider.session(sessionId);
+    if (pending == null || pending.isEmpty || session == null) {
+      return;
+    }
+
+    final indices = pending.keys.toList()..sort();
+    for (final index in indices) {
+      final packet = pending[index]!;
+      final normalizedPacket = VoicePacket(
+        sessionId: packet.sessionId,
+        mode: session.mode,
+        index: packet.index,
+        total: session.total,
+        codec2Data: packet.codec2Data,
+      );
+      final justComplete = voiceProvider.addPacket(normalizedPacket);
+      _scheduleVoiceMissingRetry(sessionId, justComplete: justComplete);
+      _handleIncomingVoicePacket(normalizedPacket, justComplete: justComplete);
+    }
+  }
+
+  void _replayPendingChannelImageFragments(String sessionId) {
+    final pending = _pendingChannelImageFragments.remove(sessionId);
+    final session = imageProvider.session(sessionId);
+    if (pending == null || pending.isEmpty || session == null) {
+      return;
+    }
+
+    final indices = pending.keys.toList()..sort();
+    for (final index in indices) {
+      final fragment = pending[index]!;
+      final normalizedFragment = ImagePacket(
+        sessionId: fragment.sessionId,
+        format: session.format,
+        index: fragment.index,
+        total: session.total,
+        data: fragment.data,
+      );
+      imageProvider.addFragment(
+        normalizedFragment,
+        width: session.width,
+        height: session.height,
+      );
+      _scheduleImageMissingRetry(
+        sessionId,
+        justComplete: imageProvider.isComplete(sessionId),
+      );
+    }
+  }
+
   /// Insert or update a voice placeholder message for binary raw-data packets.
   ///
   /// Binary voice packets arrive without a chat message, so we synthesise one
@@ -3767,6 +3996,8 @@ class AppProvider with ChangeNotifier {
     _imageMissingRetryAttempts.clear();
     _voiceSessionSenderKey6.clear();
     _imageSessionSenderKey6.clear();
+    _pendingChannelVoicePackets.clear();
+    _pendingChannelImageFragments.clear();
     _lowBatteryNotifiedNodeIds.clear();
     notifyListeners();
   }
@@ -3876,6 +4107,8 @@ class AppProvider with ChangeNotifier {
     for (final timer in _imageMissingRetryTimers.values) {
       timer.cancel();
     }
+    _pendingChannelVoicePackets.clear();
+    _pendingChannelImageFragments.clear();
     super.dispose();
   }
 }

lib/providers/connection_provider.dart

@@ -105,8 +105,6 @@ class ConnectionProvider with ChangeNotifier {
 
   bool _isScanning = false;
   bool get isScanning => _isScanning;
-  bool _isSpectrumScanActive = false;
-  bool get isSpectrumScanActive => _isSpectrumScanActive;
   final Set<int> _pendingDeletedChannelIndices = <int>{};
 
   String? _error;
@@ -212,6 +210,15 @@ class ConnectionProvider with ChangeNotifier {
   onMessageEchoDetected;
   Function(Uint8List publicKeyPrefix, Uint8List statusData)? onStatusResponse;
   Function(Uint8List payload, int snrRaw, int rssiDbm)? onRawDataReceived;
+  Function(
+    int channelIdx,
+    int pathLen,
+    int dataType,
+    Uint8List payload,
+    int snrRaw,
+    int? rssiDbm,
+  )?
+  onChannelDataReceived;
   Function(Uint8List payload, int snrRaw, int rssiDbm, int pathLen)?
   onControlDataReceived;
   Contact? Function(Uint8List contactPublicKey)? resolveContactForDmCallback;
@@ -463,10 +470,6 @@ class ConnectionProvider with ChangeNotifier {
     };
 
     service.onMessageWaiting = () {
-      if (_isSpectrumScanActive) {
-        debugPrint('📥 [Provider] MSG_WAITING ignored during spectrum scan');
-        return;
-      }
       if (!(canStartAutomaticMessageSyncCallback?.call() ?? true)) {
         _pendingAutomaticMessageSync = true;
         debugPrint(
@@ -533,6 +536,16 @@ class ConnectionProvider with ChangeNotifier {
 
     service.onRawDataReceived = (payload, snrRaw, rssiDbm) =>
         onRawDataReceived?.call(payload, snrRaw, rssiDbm);
+    service.onChannelDataReceived =
+        (channelIdx, pathLen, dataType, payload, snrRaw, rssiDbm) =>
+            onChannelDataReceived?.call(
+              channelIdx,
+              pathLen,
+              dataType,
+              payload,
+              snrRaw,
+              rssiDbm,
+            );
     service.onControlDataReceived = (payload, snrRaw, rssiDbm, pathLen) =>
         onControlDataReceived?.call(payload, snrRaw, rssiDbm, pathLen);
 
@@ -548,10 +561,14 @@ class ConnectionProvider with ChangeNotifier {
         semanticVersion: deviceInfo['semanticVersion'] as String?,
         clientRepeat: deviceInfo['clientRepeat'] as bool?,
         pathHashMode: deviceInfo['pathHashMode'] as int?,
-        supportsSpectrumScan: deviceInfo['supportsSpectrumScan'] as bool?,
-        spectrumScanMinKhz: deviceInfo['spectrumScanMinKhz'] as int?,
-        spectrumScanMaxKhz: deviceInfo['spectrumScanMaxKhz'] as int?,
       );
+
+      // Clear any stale flood scope on connect (firmware v8+)
+      final fwVer = deviceInfo['firmwareVersion'] as int?;
+      if (fwVer != null && fwVer >= 8) {
+        clearFloodScope();
+      }
+
       notifyListeners();
     };
 
@@ -1724,6 +1741,7 @@ class ConnectionProvider with ChangeNotifier {
     required int channelIdx,
     required String text,
     String? messageId,
+    Uint8List? floodScopeKey,
   }) async {
     if (!_activeService.isConnected) {
       _error = 'Not connected to device';
@@ -1736,10 +1754,12 @@ class ConnectionProvider with ChangeNotifier {
       debugPrint('  Channel: $channelIdx');
       debugPrint('  Text: $text');
       debugPrint('  MessageID: $messageId');
+      debugPrint('  FloodScope: ${floodScopeKey != null ? "set (${floodScopeKey.length}B)" : "none"}');
 
       await _activeService.sendChannelMessage(
         channelIdx: channelIdx,
         text: text,
+        floodScopeKey: floodScopeKey,
       );
 
       debugPrint('✅ [ConnectionProvider] BLE send completed');
@@ -1804,6 +1824,42 @@ class ConnectionProvider with ChangeNotifier {
     );
   }
 
+  /// Clear the flood scope on the device (firmware v8+).
+  Future<void> clearFloodScope() async {
+    if (!_activeService.isConnected) return;
+    try {
+      await _activeService.clearFloodScope();
+    } catch (e) {
+      debugPrint('⚠️ [ConnectionProvider] Failed to clear flood scope: $e');
+    }
+  }
+
+  Future<void> sendChannelData({
+    required int channelIdx,
+    required int dataType,
+    required Uint8List payload,
+    Uint8List? floodScopeKey,
+  }) async {
+    if (!_activeService.isConnected) {
+      _error = 'Not connected to device';
+      notifyListeners();
+      return;
+    }
+
+    try {
+      await _activeService.sendChannelData(
+        channelIdx: channelIdx,
+        dataType: dataType,
+        payload: payload,
+        floodScopeKey: floodScopeKey,
+      );
+    } catch (e) {
+      _error = 'Failed to send channel data: $e';
+      notifyListeners();
+      rethrow;
+    }
+  }
+
   /// Request telemetry from contact
   ///
   /// COMPATIBILITY NOTE: This method sends CMD_SEND_TELEMETRY_REQ (39).
@@ -2238,43 +2294,6 @@ class ConnectionProvider with ChangeNotifier {
     }
   }
 
-  Future<SpectrumScanResult?> scanSpectrum({
-    required int startFrequencyKhz,
-    required int stopFrequencyKhz,
-    required int bandwidthKhz,
-    required int stepKhz,
-    required int dwellMs,
-    required int thresholdDb,
-  }) async {
-    if (!_activeService.isConnected) {
-      _error = 'Not connected to device';
-      notifyListeners();
-      return null;
-    }
-
-    try {
-      _isSpectrumScanActive = true;
-      _activeService.setSpectrumScanActive(true);
-      notifyListeners();
-      return await _activeService.scanSpectrum(
-        startFrequencyKhz: startFrequencyKhz,
-        stopFrequencyKhz: stopFrequencyKhz,
-        bandwidthKhz: bandwidthKhz,
-        stepKhz: stepKhz,
-        dwellMs: dwellMs,
-        thresholdDb: thresholdDb,
-      );
-    } catch (e) {
-      _error = 'Failed to scan spectrum: $e';
-      notifyListeners();
-      return null;
-    } finally {
-      _isSpectrumScanActive = false;
-      _activeService.setSpectrumScanActive(false);
-      notifyListeners();
-    }
-  }
-
   /// Set transmit power
   Future<void> setTxPower(int powerDbm) async {
     if (!_activeService.isConnected) {
@@ -2464,7 +2483,6 @@ class ConnectionProvider with ChangeNotifier {
   }
 
   Future<void> refreshDeviceInfo() async {
-    if (_isSpectrumScanActive) return;
     if (!_activeService.isConnected) {
       _error = 'Not connected to device';
       notifyListeners();
@@ -2537,7 +2555,6 @@ class ConnectionProvider with ChangeNotifier {
   /// Sync messages from device queue
   /// Call this repeatedly until no more messages are available
   Future<bool> syncNextMessage() async {
-    if (_isSpectrumScanActive) return false;
     // Prevent re-entrancy and too-fast triggers
     if (_isSyncingMessages) {
       // Another sync (single or loop) is in progress
@@ -2576,10 +2593,6 @@ class ConnectionProvider with ChangeNotifier {
 
   /// Sync all waiting messages from device
   Future<int> syncAllMessages({bool force = false}) async {
-    if (_isSpectrumScanActive) {
-      debugPrint('⏸️ [Provider] Message sync skipped during spectrum scan');
-      return 0;
-    }
     if (!force && !(canStartAutomaticMessageSyncCallback?.call() ?? true)) {
       _pendingAutomaticMessageSync = true;
       debugPrint(

lib/providers/contacts_provider.dart

@@ -127,11 +127,13 @@ class _RetainedRoute {
 class ContactsProvider with ChangeNotifier {
   static const double _firstHopFallbackOffsetMeters = 100.0;
   static const String autoGroupIdPrefix = 'auto_group_';
+  static const String _rawTelemetryHexKey = '__raw_lpp_hex';
   final Map<String, Contact> _contacts = {};
   final List<SavedContactGroup> _savedContactGroups = <SavedContactGroup>[];
   final Map<String, PendingAdvert> _pendingAdverts = {};
   final Map<String, LatLng> _estimatedLocations = {};
   final Map<String, List<RssiObservation>> _rssiObservations = {};
+  final Map<String, Contact> _retainedContactsForSync = {};
   final ContactStorageService _storageService = ContactStorageService();
   bool _isInitialized = false;
   bool _isPersisting = false;
@@ -279,7 +281,6 @@ class ContactsProvider with ChangeNotifier {
   /// empty list while sync is in progress.
   Future<void> prepareForDeviceContactSync({Uint8List? devicePublicKey}) async {
     _setSelfDevicePublicKey(devicePublicKey);
-    _selfTelemetry = null;
     if (!_isInitialized) {
       final storedGroups = await _storageService.loadContactGroups(
         namespace: _storageNamespace,
@@ -293,6 +294,13 @@ class ContactsProvider with ChangeNotifier {
     debugPrint(
       '🧹 [ContactsProvider] Clearing runtime contacts before device sync',
     );
+    _retainedContactsForSync
+      ..clear()
+      ..addEntries(
+        _contactsForStorage().map(
+          (contact) => MapEntry(contact.publicKeyHex, contact),
+        ),
+      );
     _contacts.clear();
     _pendingAdverts.clear();
     _estimatedLocations.clear();
@@ -676,7 +684,9 @@ class ContactsProvider with ChangeNotifier {
     }
 
     // Check if this is a new contact
-    final existingContact = _contacts[contact.publicKeyHex];
+    final existingContact =
+        _contacts[contact.publicKeyHex] ??
+        _retainedContactsForSync[contact.publicKeyHex];
     final isNewContact = existingContact == null;
     debugPrint(
       '   isNew: $isNewContact, total contacts before: ${_contacts.length}',
@@ -688,6 +698,7 @@ class ContactsProvider with ChangeNotifier {
     );
 
     _contacts[contact.publicKeyHex] = updatedContact;
+    _retainedContactsForSync.remove(contact.publicKeyHex);
     // Keep repeaters and sensors in pending adverts so they remain visible
     // in the discovery list (with a checkmark). Remove others.
     if (contact.type != ContactType.repeater &&
@@ -717,11 +728,14 @@ class ContactsProvider with ChangeNotifier {
         excluded++;
         continue;
       }
-      final existingContact = _contacts[contact.publicKeyHex];
+      final existingContact =
+          _contacts[contact.publicKeyHex] ??
+          _retainedContactsForSync[contact.publicKeyHex];
       _contacts[contact.publicKeyHex] = _mergeIncomingContact(
         incomingContact: contact,
         existingContact: existingContact,
       );
+      _retainedContactsForSync.remove(contact.publicKeyHex);
       if (contact.type != ContactType.repeater &&
           contact.type != ContactType.sensor) {
         _pendingAdverts.remove(contact.publicKeyHex);
@@ -1012,7 +1026,10 @@ class ContactsProvider with ChangeNotifier {
 
     try {
       // Parse Cayenne LPP data
-      var telemetry = CayenneLppParser.parse(lppData);
+      var telemetry = _withRawTelemetryHex(
+        CayenneLppParser.parse(lppData),
+        lppData,
+      );
       debugPrint('  ✅ Parsed new telemetry');
       debugPrint('  New telemetry timestamp: ${telemetry.timestamp}');
 
@@ -1056,7 +1073,7 @@ class ContactsProvider with ChangeNotifier {
           timestamp: mergedTelemetry.timestamp,
           humidity: mergedTelemetry.humidity,
           pressure: mergedTelemetry.pressure,
-          extraSensorData: telemetry.extraSensorData,
+          extraSensorData: mergedTelemetry.extraSensorData,
         );
       }
 
@@ -1205,6 +1222,28 @@ class ContactsProvider with ChangeNotifier {
     );
   }
 
+  ContactTelemetry _withRawTelemetryHex(
+    ContactTelemetry telemetry,
+    Uint8List lppData,
+  ) {
+    final extraSensorData = <String, dynamic>{...?telemetry.extraSensorData};
+    extraSensorData[_rawTelemetryHexKey] = _bytesToHex(lppData);
+    return ContactTelemetry(
+      gpsLocation: telemetry.gpsLocation,
+      batteryPercentage: telemetry.batteryPercentage,
+      batteryMilliVolts: telemetry.batteryMilliVolts,
+      temperature: telemetry.temperature,
+      timestamp: telemetry.timestamp,
+      humidity: telemetry.humidity,
+      pressure: telemetry.pressure,
+      extraSensorData: extraSensorData,
+    );
+  }
+
+  String _bytesToHex(Uint8List bytes) {
+    return bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join(' ');
+  }
+
   Map<String, dynamic> _mergeExtraSensorData(
     Map<String, dynamic>? existingExtraSensorData,
     Map<String, dynamic>? incomingExtraSensorData,
@@ -1621,6 +1660,7 @@ class ContactsProvider with ChangeNotifier {
   void clearContacts() {
     _contacts.clear();
     _pendingAdverts.clear();
+    _retainedContactsForSync.clear();
     _ensurePublicChannelExists();
     _persistContacts();
     _persistPendingAdverts();
@@ -1645,6 +1685,7 @@ class ContactsProvider with ChangeNotifier {
     // Then remove from local storage
     _contacts.remove(publicKeyHex);
     _pendingAdverts.remove(publicKeyHex);
+    _retainedContactsForSync.remove(publicKeyHex);
     _persistContacts();
     _persistPendingAdverts();
     notifyListeners();
@@ -1729,6 +1770,7 @@ class ContactsProvider with ChangeNotifier {
     _pendingAdverts.clear();
     _estimatedLocations.clear();
     _rssiObservations.clear();
+    _retainedContactsForSync.clear();
     _selfTelemetry = null;
   }
 

lib/providers/helpers/message_retry_manager.dart

@@ -21,8 +21,8 @@ class MessageRetryManager {
   final Map<String, int> _pathFailureStreaks = {};
 
   /// Max retry attempts when the contact has a known path.
-  /// Official MeshCore app uses 5 (with auto-retry) or 3 (without).
+  /// Sequence: 2 direct attempts, flood, then last successful route.
-  static const int maxRetryAttemptsWithPath = 5;
+  static const int maxRetryAttemptsWithPath = 3;
 
   /// No retries for flood-only contacts (no known path).
   /// Value 0 means: don't retry at all, go straight to fallback/fail.

lib/providers/map_provider.dart

@@ -37,8 +37,6 @@ class MapProvider with ChangeNotifier {
   MapCoordinateSpace _targetCoordinateSpace = MapCoordinateSpace.geo;
   String? _targetMapId;
 
-  final Set<String> _visibleContactPaths = {};
-
   LocationTrail? _currentTrail;
   bool _isTrailVisible = true;
   final List<LocationTrail> _trailHistory = [];
@@ -55,7 +53,6 @@ class MapProvider with ChangeNotifier {
   bool _showPlaceNamesOverlay = false;
   bool _showMunicipalityBordersOverlay = false;
 
-  bool _showAllContactTrails = true;
   bool _hideRepeatersOnMap = false;
 
   LocationTrail? _importedTrail;
@@ -72,8 +69,6 @@ class MapProvider with ChangeNotifier {
   bool get shouldAnimate => _shouldAnimate;
   MapCoordinateSpace get targetCoordinateSpace => _targetCoordinateSpace;
   String? get targetMapId => _targetMapId;
-  Set<String> get visibleContactPaths => Set.unmodifiable(_visibleContactPaths);
-
   LocationTrail? get currentTrail => _currentTrail;
   bool get isTrailVisible => _isTrailVisible;
   List<LocationTrail> get trailHistory => List.unmodifiable(_trailHistory);
@@ -91,7 +86,6 @@ class MapProvider with ChangeNotifier {
   bool get showPlaceNamesOverlay => _showPlaceNamesOverlay;
   bool get showMunicipalityBordersOverlay => _showMunicipalityBordersOverlay;
 
-  bool get showAllContactTrails => _showAllContactTrails;
   bool get hideRepeatersOnMap => _hideRepeatersOnMap;
 
   LocationTrail? get importedTrail => _importedTrail;
@@ -365,30 +359,6 @@ class MapProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  void toggleContactPath(String publicKeyHex) {
-    if (_visibleContactPaths.contains(publicKeyHex)) {
-      _visibleContactPaths.remove(publicKeyHex);
-    } else {
-      _visibleContactPaths.add(publicKeyHex);
-    }
-    notifyListeners();
-  }
-
-  bool isContactPathVisible(String publicKeyHex) {
-    return _visibleContactPaths.contains(publicKeyHex);
-  }
-
-  void hideAllPaths() {
-    _visibleContactPaths.clear();
-    notifyListeners();
-  }
-
-  void showOnlyPath(String publicKeyHex) {
-    _visibleContactPaths.clear();
-    _visibleContactPaths.add(publicKeyHex);
-    notifyListeners();
-  }
-
   void startTrail() {
     if (_currentTrail != null && _currentTrail!.isActive) {
       endTrail();
@@ -556,12 +526,17 @@ class MapProvider with ChangeNotifier {
   Future<void> _loadInitialState() async {
     await Future.wait([
       loadOverlayState(),
-      loadTrailSettings(),
       loadRepeaterVisibilitySettings(),
       _loadCustomMapState(),
+      _removeDeprecatedSettings(),
     ]);
   }
 
+  Future<void> _removeDeprecatedSettings() async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.remove(_scopedKey('map_show_all_contact_trails'));
+  }
+
   Future<void> _saveOverlayState() async {
     final prefs = await SharedPreferences.getInstance();
     await prefs.setBool(
@@ -610,27 +585,6 @@ class MapProvider with ChangeNotifier {
     );
   }
 
-  Future<void> toggleAllContactTrails() async {
-    _showAllContactTrails = !_showAllContactTrails;
-    notifyListeners();
-    await _saveTrailSettings();
-  }
-
-  Future<void> loadTrailSettings() async {
-    final prefs = await SharedPreferences.getInstance();
-    _showAllContactTrails =
-        prefs.getBool(_scopedKey('map_show_all_contact_trails')) ?? true;
-    notifyListeners();
-  }
-
-  Future<void> _saveTrailSettings() async {
-    final prefs = await SharedPreferences.getInstance();
-    await prefs.setBool(
-      _scopedKey('map_show_all_contact_trails'),
-      _showAllContactTrails,
-    );
-  }
-
   Future<void> setHideRepeatersOnMap(bool hide) async {
     if (_hideRepeatersOnMap == hide) return;
     _hideRepeatersOnMap = hide;
@@ -755,7 +709,6 @@ class MapProvider with ChangeNotifier {
       'showKrasFireZonesOverlay': _showKrasFireZonesOverlay,
       'showPlaceNamesOverlay': _showPlaceNamesOverlay,
       'showMunicipalityBordersOverlay': _showMunicipalityBordersOverlay,
-      'showAllContactTrails': _showAllContactTrails,
       'hideRepeatersOnMap': _hideRepeatersOnMap,
     };
   }
@@ -792,7 +745,6 @@ class MapProvider with ChangeNotifier {
     _showPlaceNamesOverlay = json['showPlaceNamesOverlay'] as bool? ?? false;
     _showMunicipalityBordersOverlay =
         json['showMunicipalityBordersOverlay'] as bool? ?? false;
-    _showAllContactTrails = json['showAllContactTrails'] as bool? ?? true;
     _hideRepeatersOnMap = json['hideRepeatersOnMap'] as bool? ?? false;
     notifyListeners();
   }

lib/providers/messages_provider.dart

@@ -2354,17 +2354,6 @@ class MessagesProvider with ChangeNotifier {
           return;
         }
 
-        // On the last attempt, reset the path to force flood mode
-        // (matches official MeshCore app behaviour)
-        if (_retryManager.isLastAttempt(currentMessage, contact)) {
-          debugPrint(
-            '🔄 [MessagesProvider] Last attempt — resetting path to flood for $messageId',
-          );
-          if (resetPathBeforeLastRetryCallback != null) {
-            await resetPathBeforeLastRetryCallback!(contact);
-          }
-        }
-
         if (sendMessageCallback != null) {
           final queued = await sendMessageCallback!(
             contactPublicKey: contact.publicKey,

lib/providers/sensors_provider.dart

@@ -14,6 +14,7 @@ enum SensorRefreshState { idle, refreshing, success, timeout, unavailable }
 
 class SensorsProvider with ChangeNotifier {
   static const Duration _successStateRetention = Duration(minutes: 1);
+  static const int selfAutoRefreshMinutes = 1;
   static const String _watchedSensorsKey = 'watched_sensor_keys';
   static const String _visibleSensorMetricsKey = 'visible_sensor_metrics';
   static const String _fieldSpanKey = 'sensor_field_spans';
@@ -373,6 +374,20 @@ class SensorsProvider with ChangeNotifier {
     return List<String>.unmodifiable(dueKeys);
   }
 
+  bool _isRefreshDue(
+    String publicKeyHex, {
+    required int minutes,
+    required DateTime refreshTime,
+  }) {
+    if (minutes <= 0) {
+      return false;
+    }
+
+    final lastRefreshAt = _lastRefreshAttemptAt[publicKeyHex];
+    return lastRefreshAt == null ||
+        refreshTime.difference(lastRefreshAt) >= Duration(minutes: minutes);
+  }
+
   Future<void> toggleMetric(
     String publicKeyHex,
     String fieldKey,
@@ -636,6 +651,17 @@ class SensorsProvider with ChangeNotifier {
     return <String>[self.publicKeyHex];
   }
 
+  String? displaySelfKey({
+    required ContactsProvider contactsProvider,
+    required ConnectionProvider connectionProvider,
+  }) {
+    final self = selfContact(contactsProvider, connectionProvider);
+    if (self == null || _watchedSensorKeys.contains(self.publicKeyHex)) {
+      return null;
+    }
+    return self.publicKeyHex;
+  }
+
   Contact? contactForDisplay(
     String publicKeyHex, {
     required ContactsProvider contactsProvider,
@@ -659,7 +685,18 @@ class SensorsProvider with ChangeNotifier {
     required ContactsProvider contactsProvider,
     required ConnectionProvider connectionProvider,
   }) async {
-    if (_isRefreshingAll || _watchedSensorKeys.isEmpty) {
+    if (_isRefreshingAll) {
+      return;
+    }
+
+    final self = selfContact(contactsProvider, connectionProvider);
+    final keysToRefresh = <String>[
+      if (self != null) self.publicKeyHex,
+      ..._watchedSensorKeys.where(
+        (key) => self == null || key != self.publicKeyHex,
+      ),
+    ];
+    if (keysToRefresh.isEmpty) {
       return;
     }
 
@@ -667,7 +704,7 @@ class SensorsProvider with ChangeNotifier {
     notifyListeners();
 
     try {
-      for (final key in _watchedSensorKeys) {
+      for (final key in keysToRefresh) {
         await refreshSensor(
           publicKeyHex: key,
           contactsProvider: contactsProvider,
@@ -728,7 +765,17 @@ class SensorsProvider with ChangeNotifier {
     }
 
     final refreshTime = now ?? DateTime.now();
-    final dueKeys = dueAutoRefreshSensorKeys(now: refreshTime);
+    final dueKeys = dueAutoRefreshSensorKeys(now: refreshTime).toList();
+    final self = selfContact(contactsProvider, connectionProvider);
+    if (self != null &&
+        !dueKeys.contains(self.publicKeyHex) &&
+        _isRefreshDue(
+          self.publicKeyHex,
+          minutes: selfAutoRefreshMinutes,
+          refreshTime: refreshTime,
+        )) {
+      dueKeys.insert(0, self.publicKeyHex);
+    }
     if (dueKeys.isEmpty) {
       return;
     }

lib/screens/contacts_tab.dart

@@ -19,6 +19,8 @@ import '../utils/avatar_label_helper.dart';
 import '../widgets/common/contact_avatar.dart';
 import '../widgets/contacts/contact_tile.dart';
 import '../widgets/contacts/add_channel_dialog.dart';
+import '../services/region_scope_preferences.dart';
+import '../utils/toast_logger.dart';
 import 'add_contact_screen.dart';
 
 class ContactsTab extends StatefulWidget {
@@ -519,62 +521,100 @@ class _ContactsTabState extends State<ContactsTab> {
     final canExportHashChannelPsk = Channel.isHashChannelName(
       channel.advName.trim(),
     );
+    final actions = <_ChannelSheetAction>[
+      _ChannelSheetAction(
+        icon: Icons.message_outlined,
+        label: l10n.messages,
+        onTap: () async {
+          Navigator.pop(context);
+          await _openMessagesForChannel(context, channel);
+        },
+      ),
+      if (channel.displayLocation != null)
+        _ChannelSheetAction(
+          icon: Icons.map_outlined,
+          label: l10n.viewOnMap,
+          onTap: () async {
+            Navigator.pop(context);
+            _showChannelOnMap(context, channel);
+          },
+        ),
+      if (canExportHashChannelPsk)
+        _ChannelSheetAction(
+          icon: Icons.key_outlined,
+          label: '${l10n.exportToClipboard} psk_base64',
+          onTap: () async {
+            Navigator.pop(context);
+            await _exportHashChannelPskBase64(context, channel);
+          },
+        ),
+      _ChannelSheetAction(
+        icon: Icons.language_rounded,
+        label: l10n.setRegionScope,
+        onTap: () async {
+          Navigator.pop(context);
+          if (!context.mounted) return;
+          _showRegionScopeForChannel(context, channel);
+        },
+      ),
+      if (!channel.isPublicChannel)
+        _ChannelSheetAction(
+          icon: Icons.delete_outline_rounded,
+          label: l10n.deleteChannel,
+          destructive: true,
+          onTap: () async {
+            Navigator.pop(context);
+            await Future<void>.delayed(Duration.zero);
+            if (!context.mounted) return;
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              if (!context.mounted) return;
+              _showDeleteChannelDialog(context, channel);
+            });
+          },
+        ),
+    ];
+
+    showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      backgroundColor: Colors.transparent,
+      builder: (sheetContext) => _ChannelActionSheet(
+        channel: channel,
+        actions: actions,
+        onClose: () => Navigator.pop(sheetContext),
+      ),
+    );
+  }
+
+  void _showRegionScopeForChannel(BuildContext context, Contact channel) async {
+    final channelIdx = channel.publicKey.length > 1 ? channel.publicKey[1] : 0;
+    final l10n = AppLocalizations.of(context)!;
+    final currentScope = await RegionScopePreferences.getScope(channelIdx);
+    if (!context.mounted) return;
 
     showModalBottomSheet(
       context: context,
-      shape: const RoundedRectangleBorder(
+      showDragHandle: true,
-        borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
+      isScrollControlled: true,
-      ),
+      builder: (sheetContext) {
-      builder: (sheetContext) => SafeArea(
+        return _ContactsRegionScopeSheet(
-        child: Column(
+          currentScopeName: currentScope?.name,
-          mainAxisSize: MainAxisSize.min,
+          l10n: l10n,
-          children: [
+          onScopeSelected: (String? name) async {
-            ListTile(
+            Navigator.of(sheetContext).pop();
-              leading: Icon(Icons.message_outlined),
+            if (name == null) {
-              title: Text(l10n.messages),
+              await RegionScopePreferences.clearScope(channelIdx);
-              onTap: () async {
+              if (!context.mounted) return;
-                Navigator.pop(sheetContext);
+              ToastLogger.success(context, l10n.regionScopeCleared);
-                await _openMessagesForChannel(context, channel);
+            } else {
-              },
+              final key = RegionScopePreferences.deriveRegionKey(name);
-            ),
+              await RegionScopePreferences.setScope(channelIdx, name, key);
-            if (channel.displayLocation != null)
+              if (!context.mounted) return;
-              ListTile(
+              ToastLogger.success(context, l10n.regionScopeSet(name));
-                leading: Icon(Icons.map_outlined),
+            }
-                title: Text(l10n.viewOnMap),
+          },
-                onTap: () {
+        );
-                  Navigator.pop(sheetContext);
+      },
-                  _showChannelOnMap(context, channel);
-                },
-              ),
-            if (canExportHashChannelPsk)
-              ListTile(
-                leading: const Icon(Icons.key_outlined),
-                title: Text('${l10n.exportToClipboard} psk_base64'),
-                onTap: () async {
-                  Navigator.pop(sheetContext);
-                  await _exportHashChannelPskBase64(context, channel);
-                },
-              ),
-            if (!channel.isPublicChannel)
-              ListTile(
-                leading: Icon(Icons.delete, color: Colors.red),
-                title: Text(
-                  l10n.deleteChannel,
-                  style: const TextStyle(color: Colors.red),
-                ),
-                onTap: () async {
-                  Navigator.pop(sheetContext);
-                  await Future<void>.delayed(Duration.zero);
-                  if (!context.mounted) return;
-                  WidgetsBinding.instance.addPostFrameCallback((_) {
-                    if (!context.mounted) return;
-                    _showDeleteChannelDialog(context, channel);
-                  });
-                },
-              ),
-          ],
-        ),
-      ),
     );
   }
 
@@ -1980,6 +2020,302 @@ class _ExpandableParticipantStackState
   }
 }
 
+class _ChannelSheetAction {
+  final IconData icon;
+  final String label;
+  final Future<void> Function() onTap;
+  final bool destructive;
+
+  const _ChannelSheetAction({
+    required this.icon,
+    required this.label,
+    required this.onTap,
+    this.destructive = false,
+  });
+}
+
+class _ChannelActionSheet extends StatelessWidget {
+  final Contact channel;
+  final List<_ChannelSheetAction> actions;
+  final VoidCallback onClose;
+
+  const _ChannelActionSheet({
+    required this.channel,
+    required this.actions,
+    required this.onClose,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final l10n = AppLocalizations.of(context)!;
+    final title = channel.getLocalizedDisplayName(context);
+    final subtitle = channel.isPublicChannel
+        ? l10n.broadcastToAllNearby
+        : '${l10n.channel} ${channel.publicKey[1]}';
+    final bottomInset = MediaQuery.of(context).viewPadding.bottom;
+
+    return Container(
+      constraints: BoxConstraints(
+        maxHeight: MediaQuery.of(context).size.height * 0.82,
+      ),
+      clipBehavior: Clip.antiAlias,
+      decoration: BoxDecoration(
+        color: colorScheme.surface,
+        borderRadius: const BorderRadius.vertical(top: Radius.circular(32)),
+        boxShadow: [
+          BoxShadow(
+            color: colorScheme.shadow.withValues(alpha: 0.12),
+            blurRadius: 24,
+            offset: const Offset(0, -4),
+          ),
+        ],
+      ),
+      child: Material(
+        color: colorScheme.surface,
+        child: SingleChildScrollView(
+          padding: EdgeInsets.fromLTRB(16, 12, 16, 16 + bottomInset),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Center(
+                child: Container(
+                  width: 44,
+                  height: 4,
+                  decoration: BoxDecoration(
+                    color: colorScheme.outlineVariant,
+                    borderRadius: BorderRadius.circular(999),
+                  ),
+                ),
+              ),
+              const SizedBox(height: 12),
+              Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  DecoratedBox(
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(24),
+                      boxShadow: [
+                        BoxShadow(
+                          color: colorScheme.shadow.withValues(alpha: 0.08),
+                          blurRadius: 12,
+                          offset: const Offset(0, 4),
+                        ),
+                      ],
+                    ),
+                    child: ContactAvatar(
+                      contact: channel,
+                      radius: 28,
+                      displayName: title,
+                    ),
+                  ),
+                  const SizedBox(width: 14),
+                  Expanded(
+                    child: Padding(
+                      padding: const EdgeInsets.only(top: 2),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            title,
+                            style: theme.textTheme.titleLarge?.copyWith(
+                              fontWeight: FontWeight.w900,
+                              letterSpacing: -0.45,
+                            ),
+                          ),
+                          const SizedBox(height: 4),
+                          Text(
+                            subtitle,
+                            style: theme.textTheme.bodyMedium?.copyWith(
+                              color: colorScheme.onSurfaceVariant,
+                            ),
+                          ),
+                          const SizedBox(height: 10),
+                          _ChannelSheetChip(
+                            icon: channel.isPublicChannel
+                                ? Icons.broadcast_on_personal_rounded
+                                : Icons.tag_rounded,
+                            label: channel.isPublicChannel
+                                ? l10n.broadcastToAllNearby
+                                : channel.publicKeyShort,
+                            monospace: !channel.isPublicChannel,
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                  const SizedBox(width: 8),
+                  IconButton.filledTonal(
+                    onPressed: onClose,
+                    tooltip: l10n.close,
+                    icon: const Icon(Icons.close_rounded),
+                  ),
+                ],
+              ),
+              if (actions.isNotEmpty) ...[
+                const SizedBox(height: 20),
+                LayoutBuilder(
+                  builder: (context, constraints) {
+                    const spacing = 12.0;
+                    const minTileWidth = 132.0;
+                    final actionCount = actions.length;
+                    final maxColumnsByWidth =
+                        ((constraints.maxWidth + spacing) /
+                                (minTileWidth + spacing))
+                            .floor()
+                            .clamp(1, 3);
+                    var columnCount = actionCount.clamp(1, maxColumnsByWidth);
+                    if (actionCount > 3 &&
+                        columnCount > 2 &&
+                        actionCount % columnCount == 1) {
+                      columnCount -= 1;
+                    }
+                    final itemWidth =
+                        (constraints.maxWidth - (spacing * (columnCount - 1))) /
+                        columnCount;
+
+                    return Wrap(
+                      spacing: spacing,
+                      runSpacing: spacing,
+                      children: [
+                        for (final action in actions)
+                          SizedBox(
+                            width: itemWidth,
+                            child: _ChannelPrimaryActionButton(action: action),
+                          ),
+                      ],
+                    );
+                  },
+                ),
+              ],
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _ChannelPrimaryActionButton extends StatelessWidget {
+  final _ChannelSheetAction action;
+
+  const _ChannelPrimaryActionButton({required this.action});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final accent = action.destructive ? colorScheme.error : colorScheme.primary;
+    final backgroundColor = action.destructive
+        ? colorScheme.errorContainer.withValues(alpha: 0.82)
+        : Color.alphaBlend(
+            accent.withValues(alpha: 0.12),
+            colorScheme.surfaceContainerLow,
+          );
+    final foregroundColor = action.destructive
+        ? colorScheme.onErrorContainer
+        : accent;
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        borderRadius: BorderRadius.circular(20),
+        onTap: action.onTap,
+        child: Ink(
+          height: 100,
+          decoration: BoxDecoration(
+            color: backgroundColor,
+            borderRadius: BorderRadius.circular(20),
+            border: Border.all(
+              color: action.destructive
+                  ? colorScheme.error.withValues(alpha: 0.18)
+                  : accent.withValues(alpha: 0.14),
+            ),
+          ),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                Container(
+                  width: 30,
+                  height: 30,
+                  decoration: BoxDecoration(
+                    color: foregroundColor.withValues(alpha: 0.12),
+                    borderRadius: BorderRadius.circular(11),
+                  ),
+                  child: Icon(action.icon, color: foregroundColor, size: 16),
+                ),
+                const SizedBox(height: 6),
+                Text(
+                  action.label,
+                  maxLines: 2,
+                  textAlign: TextAlign.center,
+                  overflow: TextOverflow.ellipsis,
+                  style: theme.textTheme.labelLarge?.copyWith(
+                    color: action.destructive
+                        ? colorScheme.onErrorContainer
+                        : colorScheme.onSurface,
+                    fontWeight: FontWeight.w800,
+                    letterSpacing: -0.2,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _ChannelSheetChip extends StatelessWidget {
+  final IconData icon;
+  final String label;
+  final bool monospace;
+
+  const _ChannelSheetChip({
+    required this.icon,
+    required this.label,
+    this.monospace = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Container(
+      constraints: const BoxConstraints(maxWidth: 260),
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceContainerHigh,
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(icon, size: 14, color: colorScheme.onSurfaceVariant),
+          const SizedBox(width: 6),
+          Flexible(
+            child: Text(
+              label,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: Theme.of(context).textTheme.labelMedium?.copyWith(
+                color: colorScheme.onSurfaceVariant,
+                fontWeight: FontWeight.w700,
+                fontFamily: monospace ? 'monospace' : null,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
 class _OverflowAvatar extends StatelessWidget {
   final int count;
 
@@ -2101,3 +2437,165 @@ class _MetricChip extends StatelessWidget {
     );
   }
 }
+
+class _ContactsRegionScopeSheet extends StatefulWidget {
+  final String? currentScopeName;
+  final AppLocalizations l10n;
+  final ValueChanged<String?> onScopeSelected;
+
+  const _ContactsRegionScopeSheet({
+    required this.currentScopeName,
+    required this.l10n,
+    required this.onScopeSelected,
+  });
+
+  @override
+  State<_ContactsRegionScopeSheet> createState() =>
+      _ContactsRegionScopeSheetState();
+}
+
+class _ContactsRegionScopeSheetState
+    extends State<_ContactsRegionScopeSheet> {
+  final TextEditingController _nameController = TextEditingController();
+
+  @override
+  void dispose() {
+    _nameController.dispose();
+    super.dispose();
+  }
+
+  void _submitManualName() {
+    var name = _nameController.text.trim();
+    if (name.isEmpty) return;
+    if (!name.startsWith('#')) name = '#$name';
+    widget.onScopeSelected(name);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final l10n = widget.l10n;
+
+    return SafeArea(
+      child: ConstrainedBox(
+        constraints: BoxConstraints(
+          maxHeight: MediaQuery.of(context).size.height * 0.72,
+        ),
+        child: SingleChildScrollView(
+          padding: const EdgeInsets.fromLTRB(20, 8, 20, 20),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                l10n.regionScope,
+                style: theme.textTheme.titleLarge?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              const SizedBox(height: 4),
+              Text(
+                l10n.regionScopeWarning,
+                style: theme.textTheme.bodySmall?.copyWith(
+                  color: colorScheme.onSurfaceVariant,
+                ),
+              ),
+              const SizedBox(height: 16),
+
+              _ScopeOption(
+                label: l10n.regionScopeNone,
+                isSelected: widget.currentScopeName == null,
+                onTap: () => widget.onScopeSelected(null),
+              ),
+              const SizedBox(height: 8),
+
+              Row(
+                children: [
+                  Expanded(
+                    child: TextField(
+                      controller: _nameController,
+                      decoration: InputDecoration(
+                        hintText: l10n.enterRegionName,
+                        isDense: true,
+                        prefixText: '#',
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.circular(12),
+                        ),
+                        contentPadding: const EdgeInsets.symmetric(
+                          horizontal: 12,
+                          vertical: 10,
+                        ),
+                      ),
+                      onSubmitted: (_) => _submitManualName(),
+                    ),
+                  ),
+                  const SizedBox(width: 8),
+                  FilledButton.tonal(
+                    onPressed: _submitManualName,
+                    child: const Icon(Icons.check_rounded, size: 20),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _ScopeOption extends StatelessWidget {
+  final String label;
+  final bool isSelected;
+  final VoidCallback onTap;
+
+  const _ScopeOption({
+    required this.label,
+    required this.isSelected,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return Material(
+      color: isSelected
+          ? colorScheme.primaryContainer
+          : colorScheme.surfaceContainerLow,
+      borderRadius: BorderRadius.circular(12),
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(12),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+          child: Row(
+            children: [
+              Icon(
+                isSelected
+                    ? Icons.radio_button_checked_rounded
+                    : Icons.radio_button_off_rounded,
+                size: 20,
+                color: isSelected
+                    ? colorScheme.primary
+                    : colorScheme.onSurfaceVariant,
+              ),
+              const SizedBox(width: 12),
+              Expanded(
+                child: Text(
+                  label,
+                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                    fontWeight: isSelected ? FontWeight.w600 : FontWeight.w400,
+                    color: isSelected
+                        ? colorScheme.onPrimaryContainer
+                        : colorScheme.onSurface,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/screens/discovery_screen.dart

@@ -9,10 +9,12 @@ import '../providers/contacts_provider.dart';
 import '../services/mesh_map_nodes_service.dart';
 import '../widgets/compact_signal_indicator.dart' show SignalMetric;
 
-enum _DiscoveryMenuAction { repeaters, sensors }
+enum _DiscoveryListFilter { all, repeaters, sensors, others }
 
 class DiscoveryScreen extends StatefulWidget {
-  const DiscoveryScreen({super.key});
+  final bool autoDiscoverRepeatersOnOpen;
+
+  const DiscoveryScreen({super.key, this.autoDiscoverRepeatersOnOpen = false});
 
   @override
   State<DiscoveryScreen> createState() => _DiscoveryScreenState();
@@ -23,7 +25,11 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
   static const int _sensorAdvertType = 4;
   final Set<String> _resolvingAdvertKeys = <String>{};
   final Set<int> _runningDiscoveryTypes = <int>{};
+  final TextEditingController _searchController = TextEditingController();
   bool _isResolvingAll = false;
+  bool _hasQueuedAutoRepeaterDiscovery = false;
+  String _searchQuery = '';
+  _DiscoveryListFilter _selectedFilter = _DiscoveryListFilter.all;
   late final Future<List<MeshMapNode>> _cachedNodesFuture;
 
   @override
@@ -32,17 +38,19 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
     _cachedNodesFuture = MeshMapNodesService.loadCachedNodes(
       cacheTtl: MeshMapNodesService.traceCacheTtl,
     );
+
+    if (widget.autoDiscoverRepeatersOnOpen) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (!mounted) return;
+        _autoDiscoverRepeaters();
+      });
+    }
   }
 
-  Future<void> _handleMenuAction(_DiscoveryMenuAction action) async {
+  @override
-    switch (action) {
+  void dispose() {
-      case _DiscoveryMenuAction.repeaters:
+    _searchController.dispose();
-        await _discoverNodeType(_repeaterAdvertType);
+    super.dispose();
-        break;
-      case _DiscoveryMenuAction.sensors:
-        await _discoverNodeType(_sensorAdvertType);
-        break;
-    }
   }
 
   Future<void> _clearAllDiscoveries() async {
@@ -80,7 +88,9 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
       return;
     }
     ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(content: Text(AppLocalizations.of(context)!.clearedPendingDiscoveries)),
+      SnackBar(
+        content: Text(AppLocalizations.of(context)!.clearedPendingDiscoveries),
+      ),
     );
   }
 
@@ -96,9 +106,10 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
         advertType: advertType,
       );
       if (!mounted) return;
+      final l10n = AppLocalizations.of(context)!;
       final label = switch (advertType) {
-        _repeaterAdvertType => 'Repeater discovery sent',
+        _repeaterAdvertType => l10n.repeaterDiscoverySent,
-        _sensorAdvertType => 'Sensor discovery sent',
+        _sensorAdvertType => l10n.sensorDiscoverySent,
         _ => 'Discovery sent',
       };
       ScaffoldMessenger.of(
@@ -113,6 +124,14 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
     }
   }
 
+  Future<void> _autoDiscoverRepeaters() async {
+    if (_hasQueuedAutoRepeaterDiscovery) {
+      return;
+    }
+    _hasQueuedAutoRepeaterDiscovery = true;
+    await _discoverNodeType(_repeaterAdvertType);
+  }
+
   Future<void> _resolveAdvert(PendingAdvert advert) async {
     final keyHex = advert.publicKeyHex;
     if (_resolvingAdvertKeys.contains(keyHex)) return;
@@ -293,8 +312,8 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
     };
   }
 
-  String? _typeLabelForAdvert(PendingAdvert advert) {
+  String? _typeLabelForValue(int? typeValue) {
-    return switch (advert.typeValue) {
+    return switch (typeValue) {
       _repeaterAdvertType => 'Repeater',
       _sensorAdvertType => 'Sensor',
       3 => 'Room',
@@ -303,22 +322,22 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
     };
   }
 
-  String? _resolvedTypeLabelForAdvert(
+  int? _resolvedTypeValueForAdvert(
     PendingAdvert advert,
     List<MeshMapNode> cachedNodes,
   ) {
-    final directType = _typeLabelForAdvert(advert);
+    final directType = advert.typeValue;
-    if (directType != null) {
+    if (directType != null && directType != 0) {
       return directType;
     }
 
     for (final node in cachedNodes) {
       if (node.publicKey == advert.publicKeyHex.toLowerCase()) {
         return switch (node.type) {
-          1 => 'Repeater',
+          1 => _repeaterAdvertType,
-          4 => 'Sensor',
+          4 => _sensorAdvertType,
-          3 => 'Room',
+          3 => 3,
-          2 => 'Chat',
+          2 => 1,
           _ => null,
         };
       }
@@ -327,6 +346,81 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
     return null;
   }
 
+  String? _resolvedTypeLabelForAdvert(
+    PendingAdvert advert,
+    List<MeshMapNode> cachedNodes,
+  ) {
+    return _typeLabelForValue(_resolvedTypeValueForAdvert(advert, cachedNodes));
+  }
+
+  bool get _hasActiveInlineFilter =>
+      _searchQuery.trim().isNotEmpty ||
+      _selectedFilter != _DiscoveryListFilter.all;
+
+  bool _matchesSelectedFilter(
+    PendingAdvert advert,
+    List<MeshMapNode> cachedNodes,
+  ) {
+    if (_selectedFilter == _DiscoveryListFilter.all) {
+      return true;
+    }
+
+    final resolvedType = _resolvedTypeValueForAdvert(advert, cachedNodes);
+    return switch (_selectedFilter) {
+      _DiscoveryListFilter.all => true,
+      _DiscoveryListFilter.repeaters => resolvedType == _repeaterAdvertType,
+      _DiscoveryListFilter.sensors => resolvedType == _sensorAdvertType,
+      _DiscoveryListFilter.others =>
+        resolvedType != _repeaterAdvertType &&
+            resolvedType != _sensorAdvertType,
+    };
+  }
+
+  bool _matchesSearchQuery(
+    PendingAdvert advert,
+    ContactsProvider contactsProvider,
+    List<MeshMapNode> cachedNodes,
+  ) {
+    final query = _searchQuery.trim().toLowerCase();
+    if (query.isEmpty) {
+      return true;
+    }
+
+    final displayName = _displayNameForAdvert(
+      advert,
+      contactsProvider,
+      cachedNodes,
+    ).toLowerCase();
+    final typeLabel = (_resolvedTypeLabelForAdvert(advert, cachedNodes) ?? '')
+        .toLowerCase();
+
+    return displayName.contains(query) ||
+        advert.publicKeyHex.toLowerCase().contains(query) ||
+        advert.shortDisplayKey.toLowerCase().contains(query) ||
+        typeLabel.contains(query);
+  }
+
+  List<PendingAdvert> _filteredPendingAdverts(
+    List<PendingAdvert> adverts,
+    ContactsProvider contactsProvider,
+    List<MeshMapNode> cachedNodes,
+  ) {
+    return adverts
+        .where((advert) => _matchesSelectedFilter(advert, cachedNodes))
+        .where(
+          (advert) =>
+              _matchesSearchQuery(advert, contactsProvider, cachedNodes),
+        )
+        .toList();
+  }
+
+  String _summaryTitle({required int totalCount, required int filteredCount}) {
+    if (filteredCount == totalCount) {
+      return 'Discovered nodes ($totalCount)';
+    }
+    return 'Discovered nodes ($filteredCount/$totalCount)';
+  }
+
   Widget _buildAdvertTitle(
     BuildContext context, {
     required String displayName,
@@ -362,193 +456,236 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
     final l10n = AppLocalizations.of(context)!;
 
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: Text(l10n.discovery)),
-        title: Text(l10n.discovery),
-        actions: [
-          Consumer<ConnectionProvider>(
-            builder: (context, connectionProvider, child) {
-              final isConnected = connectionProvider.deviceInfo.isConnected;
-              final repeatersBusy = _runningDiscoveryTypes.contains(
-                _repeaterAdvertType,
-              );
-              final sensorsBusy = _runningDiscoveryTypes.contains(
-                _sensorAdvertType,
-              );
-
-              return PopupMenuButton<_DiscoveryMenuAction>(
-                tooltip: 'Discovery tools',
-                onSelected: _handleMenuAction,
-                itemBuilder: (context) => [
-                  PopupMenuItem<_DiscoveryMenuAction>(
-                    value: _DiscoveryMenuAction.repeaters,
-                    enabled: isConnected && !repeatersBusy,
-                    child: Row(
-                      children: [
-                        repeatersBusy
-                            ? const SizedBox(
-                                width: 18,
-                                height: 18,
-                                child: CircularProgressIndicator(
-                                  strokeWidth: 2,
-                                ),
-                              )
-                            : const Icon(Icons.router_outlined),
-                        SizedBox(width: 12),
-                        Text(l10n.discoverRepeaters),
-                      ],
-                    ),
-                  ),
-                  PopupMenuItem<_DiscoveryMenuAction>(
-                    value: _DiscoveryMenuAction.sensors,
-                    enabled: isConnected && !sensorsBusy,
-                    child: Row(
-                      children: [
-                        sensorsBusy
-                            ? const SizedBox(
-                                width: 18,
-                                height: 18,
-                                child: CircularProgressIndicator(
-                                  strokeWidth: 2,
-                                ),
-                              )
-                            : const Icon(Icons.sensors_outlined),
-                        SizedBox(width: 12),
-                        Text(l10n.discoverSensors),
-                      ],
-                    ),
-                  ),
-                ],
-              );
-            },
-          ),
-        ],
-      ),
       body: FutureBuilder<List<MeshMapNode>>(
         future: _cachedNodesFuture,
-        builder: (context, nodesSnapshot) => Consumer2<ContactsProvider, ConnectionProvider>(
+        builder: (context, nodesSnapshot) =>
-          builder: (context, contactsProvider, connectionProvider, child) {
+            Consumer2<ContactsProvider, ConnectionProvider>(
-            final pendingAdverts = contactsProvider.pendingAdverts;
+              builder: (context, contactsProvider, connectionProvider, child) {
-            final isConnected = connectionProvider.deviceInfo.isConnected;
+                final pendingAdverts = contactsProvider.pendingAdverts;
-            final cachedNodes = nodesSnapshot.data ?? const <MeshMapNode>[];
+                final isConnected = connectionProvider.deviceInfo.isConnected;
+                final cachedNodes = nodesSnapshot.data ?? const <MeshMapNode>[];
+                final repeatersBusy = _runningDiscoveryTypes.contains(
+                  _repeaterAdvertType,
+                );
+                final sensorsBusy = _runningDiscoveryTypes.contains(
+                  _sensorAdvertType,
+                );
 
-            // Track which pending adverts are already in the contacts list
+                // Track which pending adverts are already in the contacts list
-            final resolvedKeySet = <String>{};
+                final resolvedKeySet = <String>{};
-            for (final advert in pendingAdverts) {
+                for (final advert in pendingAdverts) {
-              if (contactsProvider.findContactByKey(advert.publicKey) != null) {
+                  if (contactsProvider.findContactByKey(advert.publicKey) !=
-                resolvedKeySet.add(advert.publicKeyHex);
+                      null) {
-              }
+                    resolvedKeySet.add(advert.publicKeyHex);
-            }
+                  }
+                }
 
-            final totalCount = pendingAdverts.length;
+                final totalCount = pendingAdverts.length;
+                final filteredAdverts = _filteredPendingAdverts(
+                  pendingAdverts,
+                  contactsProvider,
+                  cachedNodes,
+                );
+                final filteredCount = filteredAdverts.length;
 
-            return ListView(
+                return ListView(
-              padding: const EdgeInsets.all(16),
+                  padding: const EdgeInsets.all(16),
-              children: [
+                  children: [
-                Card(
+                    Card(
-                  child: Padding(
+                      child: Padding(
-                    padding: const EdgeInsets.all(16),
+                        padding: const EdgeInsets.all(16),
-                    child: Column(
+                        child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                          crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Row(
-                          crossAxisAlignment: CrossAxisAlignment.center,
                           children: [
-                            const Icon(Icons.person_search),
+                            Row(
-                            const SizedBox(width: 12),
+                              crossAxisAlignment: CrossAxisAlignment.center,
-                            Expanded(
+                              children: [
-                              child: Text(
+                                const Icon(Icons.person_search),
-                                'Discovered nodes ($totalCount)',
+                                const SizedBox(width: 12),
-                                style: Theme.of(context).textTheme.titleMedium,
+                                Expanded(
+                                  child: Text(
+                                    _summaryTitle(
+                                      totalCount: totalCount,
+                                      filteredCount: filteredCount,
+                                    ),
+                                    style: Theme.of(
+                                      context,
+                                    ).textTheme.titleMedium,
+                                  ),
+                                ),
+                              ],
+                            ),
+                            const SizedBox(height: 12),
+                            Text(
+                              'Resolve entries manually so they do not auto-populate contacts.',
+                              style: Theme.of(context).textTheme.bodyMedium,
+                            ),
+                            if (totalCount > 0) ...[
+                              const SizedBox(height: 12),
+                              _buildInlineSearchField(context),
+                              const SizedBox(height: 10),
+                              Wrap(
+                                spacing: 8,
+                                runSpacing: 8,
+                                children: [
+                                  _buildTypeFilterChip(
+                                    context,
+                                    label: l10n.all,
+                                    filter: _DiscoveryListFilter.all,
+                                  ),
+                                  _buildTypeFilterChip(
+                                    context,
+                                    label: l10n.repeatersFilter,
+                                    filter: _DiscoveryListFilter.repeaters,
+                                  ),
+                                  _buildTypeFilterChip(
+                                    context,
+                                    label: l10n.sensors,
+                                    filter: _DiscoveryListFilter.sensors,
+                                  ),
+                                  _buildTypeFilterChip(
+                                    context,
+                                    label: l10n.others,
+                                    filter: _DiscoveryListFilter.others,
+                                  ),
+                                ],
                               ),
+                            ],
+                            const SizedBox(height: 14),
+                            LayoutBuilder(
+                              builder: (context, constraints) {
+                                const spacing = 10.0;
+                                final useTwoColumns =
+                                    constraints.maxWidth >= 360;
+                                final buttonWidth = useTwoColumns
+                                    ? (constraints.maxWidth - spacing) / 2
+                                    : constraints.maxWidth;
+
+                                return Wrap(
+                                  spacing: spacing,
+                                  runSpacing: spacing,
+                                  children: [
+                                    _buildHeaderActionButton(
+                                      width: buttonWidth,
+                                      onPressed: isConnected && !repeatersBusy
+                                          ? () => _discoverNodeType(
+                                              _repeaterAdvertType,
+                                            )
+                                          : null,
+                                      icon: repeatersBusy
+                                          ? const SizedBox(
+                                              width: 16,
+                                              height: 16,
+                                              child: CircularProgressIndicator(
+                                                strokeWidth: 2,
+                                              ),
+                                            )
+                                          : const Icon(Icons.router_outlined),
+                                      label: Text(l10n.discoverRepeaters),
+                                    ),
+                                    _buildHeaderActionButton(
+                                      width: buttonWidth,
+                                      onPressed: isConnected && !sensorsBusy
+                                          ? () => _discoverNodeType(
+                                              _sensorAdvertType,
+                                            )
+                                          : null,
+                                      icon: sensorsBusy
+                                          ? const SizedBox(
+                                              width: 16,
+                                              height: 16,
+                                              child: CircularProgressIndicator(
+                                                strokeWidth: 2,
+                                              ),
+                                            )
+                                          : const Icon(Icons.sensors_outlined),
+                                      label: Text(l10n.discoverSensors),
+                                    ),
+                                    _buildHeaderActionButton(
+                                      width: buttonWidth,
+                                      onPressed:
+                                          isConnected &&
+                                              pendingAdverts.isNotEmpty &&
+                                              !_isResolvingAll
+                                          ? () => _resolveAll(pendingAdverts)
+                                          : null,
+                                      icon: _isResolvingAll
+                                          ? const SizedBox(
+                                              width: 16,
+                                              height: 16,
+                                              child: CircularProgressIndicator(
+                                                strokeWidth: 2,
+                                              ),
+                                            )
+                                          : const Icon(
+                                              Icons
+                                                  .download_for_offline_outlined,
+                                            ),
+                                      label: Text(l10n.resolveAll),
+                                    ),
+                                    _buildHeaderActionButton(
+                                      width: buttonWidth,
+                                      onPressed: pendingAdverts.isNotEmpty
+                                          ? _clearAllDiscoveries
+                                          : null,
+                                      icon: const Icon(Icons.clear_all_rounded),
+                                      label: Text(l10n.clearAllLabel),
+                                    ),
+                                  ],
+                                );
+                              },
                             ),
                           ],
                         ),
-                        const SizedBox(height: 12),
+                      ),
-                        Text(
+                    ),
-                          'Resolve entries manually so they do not auto-populate contacts.',
+                    const SizedBox(height: 16),
-                          style: Theme.of(context).textTheme.bodyMedium,
+                    if (totalCount == 0)
-                        ),
+                      Padding(
-                        const SizedBox(height: 14),
+                        padding: const EdgeInsets.symmetric(vertical: 48),
-                        Row(
+                        child: Column(
                           children: [
-                            Expanded(
+                            Icon(
-                              child: OutlinedButton.icon(
+                              Icons.person_search_outlined,
-                                onPressed:
+                              size: 64,
-                                    isConnected &&
+                              color: Theme.of(context).disabledColor,
-                                        pendingAdverts.isNotEmpty &&
-                                        !_isResolvingAll
-                                    ? () => _resolveAll(pendingAdverts)
-                                    : null,
-                                icon: _isResolvingAll
-                                    ? const SizedBox(
-                                        width: 16,
-                                        height: 16,
-                                        child: CircularProgressIndicator(
-                                          strokeWidth: 2,
-                                        ),
-                                      )
-                                    : const Icon(
-                                        Icons.download_for_offline_outlined,
-                                      ),
-                                label: Text(l10n.resolveAll),
-                              ),
                             ),
-                            const SizedBox(width: 10),
+                            const SizedBox(height: 16),
-                            Expanded(
+                            Text(
-                              child: OutlinedButton.icon(
+                              'No discovered nodes',
-                                onPressed: pendingAdverts.isNotEmpty
+                              style: Theme.of(context).textTheme.titleLarge,
-                                    ? _clearAllDiscoveries
+                            ),
-                                    : null,
+                            const SizedBox(height: 8),
-                                icon: Icon(Icons.clear_all_rounded),
+                            Text(
-                                label: Text(l10n.clearAllLabel),
+                              'Use the discovery actions above to find repeaters and sensors on the mesh.',
-                              ),
+                              textAlign: TextAlign.center,
+                              style: Theme.of(context).textTheme.bodyMedium,
                             ),
                           ],
                         ),
-                      ],
+                      ),
+                    if (_hasActiveInlineFilter &&
+                        totalCount > 0 &&
+                        filteredCount == 0)
+                      _buildNoFilterResults(context),
+                    ...filteredAdverts.map(
+                      (advert) => _buildPendingAdvertCard(
+                        context,
+                        advert: advert,
+                        contactsProvider: contactsProvider,
+                        isConnected: isConnected,
+                        isResolved: resolvedKeySet.contains(
+                          advert.publicKeyHex,
+                        ),
+                        cachedNodes: cachedNodes,
+                        l10n: l10n,
+                      ),
                     ),
-                  ),
+                  ],
-                ),
+                );
-                const SizedBox(height: 16),
+              },
-                if (totalCount == 0)
+            ),
-                  Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 48),
-                    child: Column(
-                      children: [
-                        Icon(
-                          Icons.person_search_outlined,
-                          size: 64,
-                          color: Theme.of(context).disabledColor,
-                        ),
-                        const SizedBox(height: 16),
-                        Text(
-                          'No discovered nodes',
-                          style: Theme.of(context).textTheme.titleLarge,
-                        ),
-                        const SizedBox(height: 8),
-                        Text(
-                          'Use the menu to discover repeaters and sensors on the mesh.',
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyMedium,
-                        ),
-                      ],
-                    ),
-                  ),
-                ...pendingAdverts.map((advert) =>
-                  _buildPendingAdvertCard(
-                    context,
-                    advert: advert,
-                    contactsProvider: contactsProvider,
-                    isConnected: isConnected,
-                    isResolved: resolvedKeySet.contains(advert.publicKeyHex),
-                    cachedNodes: cachedNodes,
-                    l10n: l10n,
-                  ),
-                ),
-              ],
-            );
-          },
-        ),
       ),
     );
   }
@@ -563,7 +700,11 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
     required AppLocalizations l10n,
   }) {
     final isResolving = _resolvingAdvertKeys.contains(advert.publicKeyHex);
-    final displayName = _displayNameForAdvert(advert, contactsProvider, cachedNodes);
+    final displayName = _displayNameForAdvert(
+      advert,
+      contactsProvider,
+      cachedNodes,
+    );
     final typeLabel = _resolvedTypeLabelForAdvert(advert, cachedNodes);
     final downMetric = SignalMetric.fromValues(
       rssiDbm: advert.rxRssiDbm,
@@ -652,6 +793,180 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
     );
   }
 
+  Widget _buildInlineSearchField(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final hasFilter = _searchQuery.trim().isNotEmpty;
+
+    return Material(
+      color: Colors.transparent,
+      child: Ink(
+        decoration: BoxDecoration(
+          color: colorScheme.surface,
+          borderRadius: BorderRadius.circular(16),
+          border: Border.all(
+            color: hasFilter
+                ? colorScheme.primary.withValues(alpha: 0.38)
+                : colorScheme.outline.withValues(alpha: 0.32),
+            width: 1.2,
+          ),
+          boxShadow: [
+            BoxShadow(
+              color: colorScheme.shadow.withValues(alpha: 0.025),
+              blurRadius: 8,
+              offset: const Offset(0, 2),
+            ),
+          ],
+        ),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(16),
+          child: SizedBox(
+            height: 42,
+            child: Row(
+              children: [
+                Padding(
+                  padding: const EdgeInsets.only(left: 12, right: 8),
+                  child: Icon(
+                    Icons.search_rounded,
+                    size: 17,
+                    color: hasFilter
+                        ? colorScheme.primary
+                        : colorScheme.onSurfaceVariant,
+                  ),
+                ),
+                Expanded(
+                  child: TextField(
+                    controller: _searchController,
+                    onChanged: (value) {
+                      setState(() {
+                        _searchQuery = value;
+                      });
+                    },
+                    cursorColor: colorScheme.primary,
+                    style: theme.textTheme.bodyMedium?.copyWith(
+                      fontWeight: FontWeight.w600,
+                      height: 1.1,
+                    ),
+                    decoration: InputDecoration(
+                      hintText: 'Search discovered nodes',
+                      hintStyle: theme.textTheme.bodyMedium?.copyWith(
+                        color: colorScheme.onSurfaceVariant.withValues(
+                          alpha: 0.85,
+                        ),
+                      ),
+                      filled: true,
+                      fillColor: Colors.transparent,
+                      border: InputBorder.none,
+                      enabledBorder: InputBorder.none,
+                      focusedBorder: InputBorder.none,
+                      disabledBorder: InputBorder.none,
+                      isDense: true,
+                      contentPadding: const EdgeInsets.symmetric(vertical: 10),
+                    ),
+                  ),
+                ),
+                if (hasFilter)
+                  Padding(
+                    padding: const EdgeInsets.only(right: 6),
+                    child: Material(
+                      color: colorScheme.primary.withValues(alpha: 0.10),
+                      shape: const CircleBorder(),
+                      child: InkWell(
+                        customBorder: const CircleBorder(),
+                        onTap: () {
+                          _searchController.clear();
+                          setState(() {
+                            _searchQuery = '';
+                          });
+                        },
+                        child: Padding(
+                          padding: const EdgeInsets.all(6),
+                          child: Icon(
+                            Icons.close_rounded,
+                            size: 14,
+                            color: colorScheme.primary,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTypeFilterChip(
+    BuildContext context, {
+    required String label,
+    required _DiscoveryListFilter filter,
+  }) {
+    final scheme = Theme.of(context).colorScheme;
+    final selected = _selectedFilter == filter;
+    final color = selected ? scheme.primary : scheme.outline;
+
+    return InkWell(
+      onTap: () {
+        if (_selectedFilter == filter) {
+          return;
+        }
+        setState(() {
+          _selectedFilter = filter;
+        });
+      },
+      borderRadius: BorderRadius.circular(999),
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+        decoration: BoxDecoration(
+          color: color.withValues(alpha: selected ? 0.14 : 0.08),
+          borderRadius: BorderRadius.circular(999),
+          border: Border.all(
+            color: color.withValues(alpha: selected ? 0.45 : 0.22),
+          ),
+        ),
+        child: Text(
+          label,
+          style: TextStyle(
+            fontSize: 12,
+            fontWeight: FontWeight.w700,
+            color: color,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildNoFilterResults(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 24),
+      child: Text(
+        'No matches',
+        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+          color: Theme.of(context).colorScheme.onSurfaceVariant,
+        ),
+        textAlign: TextAlign.center,
+      ),
+    );
+  }
+
+  Widget _buildHeaderActionButton({
+    required double width,
+    required VoidCallback? onPressed,
+    required Widget icon,
+    required Widget label,
+  }) {
+    return SizedBox(
+      width: width,
+      child: OutlinedButton.icon(
+        onPressed: onPressed,
+        icon: icon,
+        label: label,
+      ),
+    );
+  }
+
   Widget _buildSignalSummary(
     BuildContext context, {
     SignalMetric? downMetric,

lib/screens/home_screen.dart

@@ -23,13 +23,11 @@ import 'device_config_screen.dart';
 import 'packet_log_screen.dart';
 import 'live_traffic_screen.dart';
 import 'profiles_screen.dart';
-import 'spectrum_scan_screen.dart';
 import '../utils/toast_logger.dart';
 import '../l10n/app_localizations.dart';
 import '../widgets/permission_request_dialog.dart';
 import '../widgets/connection_dialog.dart';
 import '../utils/battery_display_helper.dart';
-import '../services/developer_mode_service.dart';
 import '../services/mesh_map_nodes_service.dart';
 import '../services/profile_device_key_resolver.dart';
 import '../services/profile_manager.dart';
@@ -68,7 +66,6 @@ class _HomeScreenState extends State<HomeScreen>
   int _currentIndex = 0;
   bool _isMapFullscreen = false;
   bool _showRxTxIndicators = true;
-  bool _isDeveloperModeEnabled = false;
   bool _isMapEnabled = true;
   bool _isContactsEnabled = true;
   bool _isSensorsEnabled = false;
@@ -107,7 +104,6 @@ class _HomeScreenState extends State<HomeScreen>
     // Initialize synchronously so first build always has a valid controller.
     _initTabController();
     _loadRxTxPreference();
-    _loadDeveloperModePreference();
     MeshMapNodesService.syncInBackgroundIfStale();
 
     // Show permission dialog after the first frame if needed
@@ -291,14 +287,6 @@ class _HomeScreenState extends State<HomeScreen>
     }
   }
 
-  Future<void> _loadDeveloperModePreference() async {
-    final isEnabled = await DeveloperModeService.isEnabled();
-    if (!mounted) return;
-    setState(() {
-      _isDeveloperModeEnabled = isEnabled;
-    });
-  }
-
   void _showPermissionDialog() {
     if (!mounted) return;
 
@@ -749,12 +737,10 @@ class _HomeScreenState extends State<HomeScreen>
     }
   }
 
-  void _showConnectionDialog(BuildContext context) {
+  Future<void> _showConnectionDialog(BuildContext context) async {
-    showModalBottomSheet(
+    await showConnectionDialogFlow(
-      context: context,
+      context,
-      isScrollControlled: true,
       backgroundColor: Colors.transparent,
-      builder: (context) => const ConnectionDialog(),
     );
   }
 
@@ -811,32 +797,6 @@ class _HomeScreenState extends State<HomeScreen>
                         .read<ProfileManager>()
                         .profilesEnabled;
 
-                    if (_isDeveloperModeEnabled) {
-                      items.add(
-                        PopupMenuItem(
-                          child: Row(
-                            children: [
-                              const Icon(Icons.radar),
-                              SizedBox(width: 8),
-                              Text(AppLocalizations.of(context)!.spectrumScan),
-                            ],
-                          ),
-                          onTap: () {
-                            final navigator = Navigator.of(context);
-                            Future.delayed(Duration.zero, () {
-                              if (!mounted) return;
-                              navigator.push(
-                                MaterialPageRoute(
-                                  builder: (context) =>
-                                      const SpectrumScanScreen(),
-                                ),
-                              );
-                            });
-                          },
-                        ),
-                      );
-                    }
-
                     items.add(
                       PopupMenuItem(
                         child: Row(
@@ -954,7 +914,6 @@ class _HomeScreenState extends State<HomeScreen>
                               ),
                             );
                             _loadRxTxPreference();
-                            _loadDeveloperModePreference();
                           });
                         },
                       ),

lib/screens/map_tab.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'dart:math' as math;
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart' show MissingPluginException;
 import 'package:flutter_map/flutter_map.dart' as flutter_map;
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
@@ -10,6 +11,7 @@ import 'package:provider/provider.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:flutter_compass/flutter_compass.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import '../services/compass_support.dart';
 import '../utils/slovenian_crs.dart';
 import '../providers/contacts_provider.dart';
 import '../providers/messages_provider.dart';
@@ -27,7 +29,6 @@ import '../services/background_location_service.dart';
 import '../services/location_tracking_service.dart';
 import '../services/map_marker_service.dart';
 import '../services/message_destination_preferences.dart';
-import '../services/trail_color_service.dart';
 import '../services/profiles_feature_service.dart';
 import '../widgets/map_debug_info.dart';
 import '../widgets/map/compass_widget.dart';
@@ -201,46 +202,64 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
   }
 
   void _startCompassTracking() {
+    if (!CompassSupport.isAvailable) {
+      return;
+    }
+
     final compassStream = FlutterCompass.events;
     if (compassStream == null) {
       return;
     }
 
     // Start listening to compass events
-    _compassStreamSubscription = compassStream.listen((CompassEvent event) {
+    _compassStreamSubscription = compassStream.listen(
-      // Check if widget is disposing, mounted, and event has valid heading
+      (CompassEvent event) {
-      if (_isDisposing || !mounted || event.heading == null) return;
+        // Check if widget is disposing, mounted, and event has valid heading
+        if (_isDisposing || !mounted || event.heading == null) return;
 
-      try {
+        try {
-        setState(() {
+          setState(() {
-          _compassHeading = event.heading;
+            _compassHeading = event.heading;
-        });
+          });
 
-        // Rotate map if rotation mode is enabled and we have compass heading
+          // Rotate map if rotation mode is enabled and we have compass heading
-        // Only rotate if map is ready
+          // Only rotate if map is ready
-        if (_rotateMarkerWithHeading &&
+          if (_rotateMarkerWithHeading &&
-            event.heading != null &&
+              event.heading != null &&
-            _isMapReady &&
+              _isMapReady &&
-            !_isDisposing) {
+              !_isDisposing) {
-          try {
+            try {
-            // Use moveAndRotate to set absolute rotation
+              // Use moveAndRotate to set absolute rotation
-            final camera = _mapController.camera;
+              final camera = _mapController.camera;
-            _mapController.moveAndRotate(
+              _mapController.moveAndRotate(
-              camera.center,
+                camera.center,
-              camera.zoom,
+                camera.zoom,
-              -event.heading!,
+                -event.heading!,
-            );
+              );
-          } catch (e) {
+            } catch (e) {
-            // Map not ready yet, ignore
+              // Map not ready yet, ignore
+            }
+          }
+        } catch (e) {
+          // Widget disposed during setState, ignore
+          if (!_isDisposing) {
+            debugPrint('Compass tracking error: $e');
           }
         }
-      } catch (e) {
+      },
-        // Widget disposed during setState, ignore
+      onError: (Object error, StackTrace stackTrace) {
-        if (!_isDisposing) {
+        if (_isDisposing) {
-          debugPrint('Compass tracking error: $e');
+          return;
         }
-      }
+
-    });
+        if (error is MissingPluginException) {
+          debugPrint('Compass plugin is unavailable on this platform');
+          return;
+        }
+
+        debugPrint('Compass tracking stream error: $error');
+      },
+    );
   }
 
   Future<void> _loadSettings() async {
@@ -873,7 +892,9 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
                           if (!hasCustomMap)
                             ListTile(
                               leading: Icon(Icons.add_photo_alternate),
-                              title: Text(AppLocalizations.of(context)!.loadFromGallery),
+                              title: Text(
+                                AppLocalizations.of(context)!.loadFromGallery,
+                              ),
                               subtitle: const Text(
                                 'Use a cave map image instead of GPS tiles',
                               ),
@@ -905,7 +926,9 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
                             ),
                             ListTile(
                               leading: Icon(Icons.swap_horizontal_circle),
-                              title: Text(AppLocalizations.of(context)!.replaceImage),
+                              title: Text(
+                                AppLocalizations.of(context)!.replaceImage,
+                              ),
                               subtitle: const Text(
                                 'Pick a different map from the gallery',
                               ),
@@ -941,7 +964,9 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
                             if (customMapConfig.isCalibrated)
                               ListTile(
                                 leading: Icon(Icons.clear),
-                                title: Text(AppLocalizations.of(context)!.clearScale),
+                                title: Text(
+                                  AppLocalizations.of(context)!.clearScale,
+                                ),
                                 onTap: () async {
                                   await mapProvider.clearCustomMapCalibration();
                                   if (!context.mounted) return;
@@ -999,7 +1024,7 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
         ),
         child: DetailedCompassDialog(
           initialPosition: _locationService.currentPosition,
-          initialHeading: _currentHeading,
+          initialHeading: _compassHeading,
           contacts: contacts,
           sarMarkers: sarMarkers,
         ),
@@ -1025,7 +1050,7 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
         ),
         child: DetailedCompassDialog(
           initialPosition: _locationService.currentPosition,
-          initialHeading: _currentHeading,
+          initialHeading: _compassHeading,
           contacts: contacts,
           sarMarkers: sarMarkers,
           preSelectedContact: selectedContact,
@@ -1277,9 +1302,11 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
       _stopCustomMapCalibration();
 
       if (!mounted) return;
-      ScaffoldMessenger.of(
+      ScaffoldMessenger.of(context).showSnackBar(
-        context,
+        SnackBar(
-      ).showSnackBar(SnackBar(content: Text(AppLocalizations.of(context)!.customMapScaleSaved)));
+          content: Text(AppLocalizations.of(context)!.customMapScaleSaved),
+        ),
+      );
     }
   }
 
@@ -1419,7 +1446,9 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
                     contentPadding: EdgeInsets.zero,
                     leading: Icon(Icons.chat_bubble_outline),
                     title: Text(AppLocalizations.of(context)!.openMessage),
-                    subtitle: Text(AppLocalizations.of(context)!.jumpToTheRelatedSarMessage),
+                    subtitle: Text(
+                      AppLocalizations.of(context)!.jumpToTheRelatedSarMessage,
+                    ),
                     onTap: () async {
                       Navigator.pop(sheetContext);
                       await _openSarMarkerMessage(
@@ -1655,7 +1684,11 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
       if (!mounted) return;
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-          content: Text(AppLocalizations.of(context)!.pleaseSelectADestinationToSendSarMarker),
+          content: Text(
+            AppLocalizations.of(
+              context,
+            )!.pleaseSelectADestinationToSendSarMarker,
+          ),
           backgroundColor: Colors.red,
         ),
       );
@@ -1785,7 +1818,9 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
         if (!mounted) return;
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text(AppLocalizations.of(context)!.sarMarkerBroadcastToPublicChannel),
+            content: Text(
+              AppLocalizations.of(context)!.sarMarkerBroadcastToPublicChannel,
+            ),
             backgroundColor: Colors.orange,
             duration: Duration(seconds: 2),
           ),
@@ -2514,52 +2549,6 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
                         );
                       },
                     ),
-                    // Contact trail polylines (rendered before user trail and markers)
-                    Consumer<MapProvider>(
-                      builder: (context, mapProvider, _) {
-                        // Determine which contacts to show trails for
-                        final contactsToShow = mapProvider.showAllContactTrails
-                            ? contactsWithLocation // Show all when master toggle is ON
-                            : contactsWithLocation.where(
-                                (contact) => mapProvider.isContactPathVisible(
-                                  contact.publicKeyHex,
-                                ),
-                              ); // Individual toggles
-
-                        return PolylineLayer(
-                          polylines: contactsToShow
-                              .where(
-                                (contact) => contact.advertHistory.length >= 2,
-                              )
-                              .map((contact) {
-                                // Use TrailColorService for consistent, emoji-based colors
-                                final color = TrailColorService.getTrailColor(
-                                  contact,
-                                );
-
-                                return Polyline(
-                                  points: contact.advertHistory
-                                      .map((advert) => advert.location)
-                                      .toList(),
-                                  color: color.withValues(
-                                    alpha: 0.95,
-                                  ), // More opaque for better visibility
-                                  strokeWidth:
-                                      4.5, // Thicker for better visibility on all map backgrounds
-                                  borderColor: Colors.white.withValues(
-                                    alpha: 0.6,
-                                  ), // Stronger border contrast
-                                  borderStrokeWidth: 2.0, // Wider border
-                                  // DASHED pattern to distinguish from solid user trail
-                                  pattern: StrokePattern.dashed(
-                                    segments: [8, 4],
-                                  ),
-                                );
-                              })
-                              .toList(),
-                        );
-                      },
-                    ),
                     // Location trail layer (rendered after paths, before drawings)
                     const LocationTrailLayer(),
                   ],
@@ -2604,7 +2593,8 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
                           context: context,
                           mapRotation: _getMapRotation(),
                           userPosition: _locationService.currentPosition,
-                          estimatedLocations: contactsProvider.estimatedLocations,
+                          estimatedLocations:
+                              contactsProvider.estimatedLocations,
                           onTap: (contact) {
                             _showDetailedCompassWithContact(
                               context,

lib/screens/messages_tab.dart

@@ -6,6 +6,7 @@ import 'dart:math' as math;
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:meshcore_client/meshcore_client.dart' show MeshCoreConstants;
 import 'package:provider/provider.dart';
 import 'package:geolocator/geolocator.dart';
 import '../providers/messages_provider.dart';
@@ -35,6 +36,7 @@ import '../utils/tictactoe_message_parser.dart';
 import '../providers/image_provider.dart' as ip;
 import '../services/image_codec_service.dart';
 import '../services/image_preferences.dart';
+import '../services/region_scope_preferences.dart';
 import 'package:image_picker/image_picker.dart';
 import '../l10n/app_localizations.dart';
 
@@ -48,6 +50,86 @@ class MessagesTab extends StatefulWidget {
   State<MessagesTab> createState() => _MessagesTabState();
 }
 
+class _ComposerActionTile extends StatelessWidget {
+  final IconData icon;
+  final String title;
+  final Color color;
+  final bool enabled;
+  final bool busy;
+  final VoidCallback? onTap;
+
+  const _ComposerActionTile({
+    required this.icon,
+    required this.title,
+    required this.color,
+    this.enabled = true,
+    this.busy = false,
+    this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final effectiveColor = enabled
+        ? color
+        : colorScheme.onSurfaceVariant.withValues(alpha: 0.45);
+
+    return Material(
+      color: enabled
+          ? colorScheme.surfaceContainerLow
+          : colorScheme.surfaceContainerLowest,
+      borderRadius: BorderRadius.circular(20),
+      child: ListTile(
+        contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
+        enabled: enabled,
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+        onTap: enabled ? onTap : null,
+        leading: Container(
+          width: 42,
+          height: 42,
+          decoration: BoxDecoration(
+            color: effectiveColor.withValues(alpha: enabled ? 0.14 : 0.10),
+            borderRadius: BorderRadius.circular(14),
+            border: Border.all(
+              color: enabled
+                  ? effectiveColor.withValues(alpha: 0.16)
+                  : colorScheme.outlineVariant.withValues(alpha: 0.16),
+            ),
+          ),
+          alignment: Alignment.center,
+          child: Icon(icon, color: effectiveColor, size: 20),
+        ),
+        title: Text(
+          title,
+          maxLines: 2,
+          overflow: TextOverflow.ellipsis,
+          style: theme.textTheme.titleSmall?.copyWith(
+            fontWeight: FontWeight.w700,
+            letterSpacing: -0.2,
+            color: enabled
+                ? colorScheme.onSurface
+                : colorScheme.onSurfaceVariant,
+          ),
+        ),
+        trailing: busy
+            ? SizedBox(
+                width: 20,
+                height: 20,
+                child: CircularProgressIndicator(
+                  strokeWidth: 2.2,
+                  color: effectiveColor,
+                ),
+              )
+            : Icon(
+                Icons.chevron_right_rounded,
+                color: colorScheme.onSurfaceVariant,
+              ),
+      ),
+    );
+  }
+}
+
 class _MessagesTabState extends State<MessagesTab> {
   static const int _maxContactMessageBytes = 156;
   static const int _maxChannelMessageBytes = 127;
@@ -72,6 +154,11 @@ class _MessagesTabState extends State<MessagesTab> {
       MessageDestinationPreferences.destinationTypeChannel;
   Contact? _selectedRecipient;
 
+  // Region scope state
+  String? _channelRegionScopeName;
+  Uint8List? _channelRegionScopeKey;
+  Map<int, String> _channelRegionScopes = {};
+
   // Image sending state
   bool _isSendingImage = false;
   final ImagePicker _imagePicker = ImagePicker();
@@ -99,6 +186,7 @@ class _MessagesTabState extends State<MessagesTab> {
     // Load saved message destination
     _loadSavedDestination();
     _loadVoiceSettings();
+    _loadAllChannelRegionScopes();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _checkForNavigationRequest();
     });
@@ -402,6 +490,9 @@ class _MessagesTabState extends State<MessagesTab> {
     }
 
     _enforceMessageByteLimit();
+
+    // Load region scope for channel destinations
+    await _loadRegionScope();
   }
 
   /// Show recipient selector bottom sheet
@@ -455,6 +546,7 @@ class _MessagesTabState extends State<MessagesTab> {
         currentDestinationType: _destinationType,
         currentRecipientPublicKey: _selectedRecipient?.publicKeyHex,
         onSelect: _onRecipientSelected,
+        channelRegionScopes: _channelRegionScopes,
       ),
     );
   }
@@ -470,6 +562,9 @@ class _MessagesTabState extends State<MessagesTab> {
 
     _enforceMessageByteLimit();
 
+    // Load region scope for channel destinations
+    await _loadRegionScope();
+
     // Save to preferences
     await MessageDestinationPreferences.setDestination(
       type,
@@ -480,6 +575,51 @@ class _MessagesTabState extends State<MessagesTab> {
     if (!mounted) return;
   }
 
+  Future<void> _loadRegionScope() async {
+    if (_destinationType !=
+        MessageDestinationPreferences.destinationTypeChannel) {
+      if (_channelRegionScopeName != null) {
+        setState(() {
+          _channelRegionScopeName = null;
+          _channelRegionScopeKey = null;
+        });
+      }
+      return;
+    }
+    final channelIdx = _selectedRecipient?.publicKey[1] ?? 0;
+    final scope = await RegionScopePreferences.getScope(channelIdx);
+    if (!mounted) return;
+    setState(() {
+      _channelRegionScopeName = scope?.name;
+      _channelRegionScopeKey = scope?.key;
+      if (scope != null) {
+        _channelRegionScopes[channelIdx] = scope.name;
+      } else {
+        _channelRegionScopes.remove(channelIdx);
+      }
+    });
+  }
+
+  Future<void> _loadAllChannelRegionScopes() async {
+    final contactsProvider = context.read<ContactsProvider>();
+    final channels = contactsProvider.chatContacts
+        .where((c) => c.publicKey.length > 1 && c.publicKey[0] == 0)
+        .toList();
+    final scopes = <int, String>{};
+    // Always check channel 0 (public)
+    final scope0 = await RegionScopePreferences.getScope(0);
+    if (scope0 != null) scopes[0] = scope0.name;
+    for (final ch in channels) {
+      final idx = ch.publicKey[1];
+      final scope = await RegionScopePreferences.getScope(idx);
+      if (scope != null) scopes[idx] = scope.name;
+    }
+    if (!mounted) return;
+    setState(() {
+      _channelRegionScopes = scopes;
+    });
+  }
+
   Future<void> _applyPendingDestination({
     required String type,
     String? recipientPublicKeyHex,
@@ -746,11 +886,12 @@ class _MessagesTabState extends State<MessagesTab> {
     // Add to messages list with "sending" status
     messagesProvider.addSentMessage(sentMessage, contact: _selectedRecipient);
 
-    // Send to selected channel
+    // Send to selected channel (with region scope if set)
     await connectionProvider.sendChannelMessage(
       channelIdx: channelIdx,
       text: text,
       messageId: messageId,
+      floodScopeKey: _channelRegionScopeKey,
     );
   }
 
@@ -860,6 +1001,7 @@ class _MessagesTabState extends State<MessagesTab> {
     if (!shouldContinue) return;
     if (!mounted) return;
     final connectionProvider = context.read<ConnectionProvider>();
+    final messagesProvider = context.read<MessagesProvider>();
     if (!connectionProvider.deviceInfo.isConnected) {
       ToastLogger.error(context, 'Not connected to device');
       return;
@@ -871,6 +1013,7 @@ class _MessagesTabState extends State<MessagesTab> {
     final rawBytes = await picked.readAsBytes();
 
     setState(() => _isSendingImage = true);
+    String? failedMessageId;
     try {
       // Compress AVIF using user-selected size, compression and color mode.
       final maxSize = await ImagePreferences.getMaxSize();
@@ -948,8 +1091,8 @@ class _MessagesTabState extends State<MessagesTab> {
       imageProvider.cacheOutgoingSession(sessionId, fragments, envelope);
 
       // Add local placeholder message.
-      final messagesProvider = context.read<MessagesProvider>();
       final msgId = 'img_${sessionId}_sent';
+      failedMessageId = msgId;
       final isChannel =
           _destinationType ==
           MessageDestinationPreferences.destinationTypeChannel;
@@ -980,6 +1123,7 @@ class _MessagesTabState extends State<MessagesTab> {
           channelIdx: channelIdx ?? 0,
           text: envelopeText,
           messageId: msgId,
+          floodScopeKey: _channelRegionScopeKey,
         );
       } else if (recipient != null) {
         final sent = await connectionProvider.sendTextMessage(
@@ -1007,10 +1151,24 @@ class _MessagesTabState extends State<MessagesTab> {
         'chunk=${imageDataBytesPerFragment}B',
       );
 
+      if (isChannel) {
+        for (final fragment in fragments) {
+          await connectionProvider.sendChannelData(
+            channelIdx: channelIdx ?? 0,
+            dataType: MeshCoreConstants.dataTypeDev,
+            payload: fragment.encodeBinary(),
+            floodScopeKey: _channelRegionScopeKey,
+          );
+        }
+      }
+
       // Image fragments are always served on demand after an explicit IR2
       // fetch request, including direct contacts.
     } catch (e, st) {
       debugPrint('❌ [Image] _pickAndSendImage: $e\n$st');
+      if (failedMessageId != null) {
+        messagesProvider.markMessageFailed(failedMessageId);
+      }
       if (!mounted) return;
       ToastLogger.error(context, 'Image send failed');
     } finally {
@@ -1294,6 +1452,7 @@ class _MessagesTabState extends State<MessagesTab> {
           channelIdx: channelIdx ?? 0,
           text: envelopeText,
           messageId: msgId,
+          floodScopeKey: _channelRegionScopeKey,
         );
       } else if (recipient != null) {
         final sentSuccessfully = await connectionProvider.sendTextMessage(
@@ -1319,6 +1478,16 @@ class _MessagesTabState extends State<MessagesTab> {
     }
 
     debugPrint('🎙️ [Voice] envelope sent for session $sessionId');
+    if (isChannel) {
+      for (final packet in encodedPackets) {
+        await connectionProvider.sendChannelData(
+          channelIdx: channelIdx ?? 0,
+          dataType: MeshCoreConstants.dataTypeDev,
+          payload: packet.encodeBinary(),
+          floodScopeKey: _channelRegionScopeKey,
+        );
+      }
+    }
     // Mark the placeholder message as "sent" (ackTag=0, timeout=0 = no ACK tracking).
     // addSentMessage() forces deliveryStatus.sending; we upgrade it here so the
     // bubble shows "Sent" instead of "Sending" once all packets are on the wire.
@@ -1468,82 +1637,166 @@ class _MessagesTabState extends State<MessagesTab> {
   void _showComposerActions() {
     showModalBottomSheet(
       context: context,
+      showDragHandle: true,
+      isScrollControlled: true,
       builder: (sheetContext) {
-        return SafeArea(
+        final theme = Theme.of(sheetContext);
-          child: Column(
+        final l10n = AppLocalizations.of(context)!;
-            mainAxisSize: MainAxisSize.min,
+
-            children: [
+        Future<void> runAction(Future<void> Function() action) async {
-              ListTile(
+          await _runAfterSheetDismissal(sheetContext, action);
-                leading: Icon(Icons.search),
+        }
-                title: Text(AppLocalizations.of(context)!.searchMessages),
+
-                onTap: () async {
+        final actions = <Widget>[
-                  await _runAfterSheetDismissal(sheetContext, () async {
+          _ComposerActionTile(
-                    _showFilteredMessageSearch();
+            icon: Icons.search_rounded,
-                  });
+            title: l10n.searchMessages,
-                },
+            color: const Color(0xFF2B6CB0),
-              ),
+            onTap: () => runAction(() async {
-              ListTile(
+              _showFilteredMessageSearch();
-                leading: Icon(Icons.add_location_alt),
+            }),
-                title: Text(AppLocalizations.of(context)!.sendSarMarker),
-                onTap: () async {
-                  await _runAfterSheetDismissal(sheetContext, () async {
-                    _showSarDialog();
-                  });
-                },
-              ),
-              if (_voiceSupported)
-                ListTile(
-                  enabled: !_isSendingVoice,
-                  leading: Icon(_isRecording ? Icons.stop : Icons.mic),
-                  title: Text(_isRecording ? 'Stop recording' : 'Record voice'),
-                  onTap: _isSendingVoice
-                      ? null
-                      : () async {
-                          await _runAfterSheetDismissal(sheetContext, () async {
-                            if (_isRecording) {
-                              await _stopAndSendVoice();
-                            } else {
-                              await _startVoiceRecording();
-                            }
-                          });
-                        },
-                ),
-              ListTile(
-                enabled: !_isSendingImage,
-                leading: Icon(Icons.photo_library),
-                title: Text(AppLocalizations.of(context)!.sendImageFromGallery),
-                onTap: _isSendingImage
-                    ? null
-                    : () async {
-                        await _runAfterSheetDismissal(sheetContext, () async {
-                          await _pickAndSendImage(source: ImageSource.gallery);
-                        });
-                      },
-              ),
-              ListTile(
-                enabled: !_isSendingImage,
-                leading: Icon(Icons.camera_alt),
-                title: Text(AppLocalizations.of(context)!.takePhoto),
-                onTap: _isSendingImage
-                    ? null
-                    : () async {
-                        await _runAfterSheetDismissal(sheetContext, () async {
-                          await _pickAndSendImage(source: ImageSource.camera);
-                        });
-                      },
-              ),
-              ListTile(
-                leading: Icon(Icons.grid_3x3),
-                title: Text(AppLocalizations.of(context)!.startTictactoe),
-                subtitle: Text(AppLocalizations.of(context)!.dmOnly),
-                onTap: () async {
-                  await _runAfterSheetDismissal(sheetContext, () async {
-                    await _startTicTacToeGame();
-                  });
-                },
-              ),
-            ],
           ),
+          _ComposerActionTile(
+            icon: Icons.add_location_alt_rounded,
+            title: l10n.sendSarMarker,
+            color: const Color(0xFFB45309),
+            onTap: () => runAction(() async {
+              _showSarDialog();
+            }),
+          ),
+          if (_voiceSupported)
+            _ComposerActionTile(
+              icon: _isRecording ? Icons.stop_rounded : Icons.mic_rounded,
+              title: _isRecording ? 'Stop recording' : 'Record voice',
+              color: const Color(0xFF7C3AED),
+              enabled: !_isSendingVoice,
+              busy: _isSendingVoice,
+              onTap: !_isSendingVoice
+                  ? () => runAction(() async {
+                      if (_isRecording) {
+                        await _stopAndSendVoice();
+                      } else {
+                        await _startVoiceRecording();
+                      }
+                    })
+                  : null,
+            ),
+          _ComposerActionTile(
+            icon: Icons.photo_library_rounded,
+            title: l10n.sendImageFromGallery,
+            color: const Color(0xFF0F766E),
+            enabled: !_isSendingImage,
+            busy: _isSendingImage,
+            onTap: !_isSendingImage
+                ? () => runAction(() async {
+                    await _pickAndSendImage(source: ImageSource.gallery);
+                  })
+                : null,
+          ),
+          _ComposerActionTile(
+            icon: Icons.camera_alt_rounded,
+            title: l10n.takePhoto,
+            color: const Color(0xFF2563EB),
+            enabled: !_isSendingImage,
+            busy: _isSendingImage,
+            onTap: !_isSendingImage
+                ? () => runAction(() async {
+                    await _pickAndSendImage(source: ImageSource.camera);
+                  })
+                : null,
+          ),
+          _ComposerActionTile(
+            icon: Icons.grid_3x3_rounded,
+            title: l10n.startTictactoe,
+            color: const Color(0xFFBE185D),
+            onTap: () => runAction(() async {
+              await _startTicTacToeGame();
+            }),
+          ),
+          if (_destinationType ==
+              MessageDestinationPreferences.destinationTypeChannel)
+            _ComposerActionTile(
+              icon: _channelRegionScopeName != null
+                  ? Icons.language_rounded
+                  : Icons.public_rounded,
+              title: _channelRegionScopeName != null
+                  ? '${l10n.regionScope}: $_channelRegionScopeName'
+                  : l10n.setRegionScope,
+              color: const Color(0xFF7C3AED),
+              onTap: () => runAction(() async {
+                _showRegionScopeSheet();
+              }),
+            ),
+        ];
+
+        return SafeArea(
+          child: ConstrainedBox(
+            constraints: BoxConstraints(
+              maxHeight: MediaQuery.of(sheetContext).size.height * 0.72,
+            ),
+            child: SingleChildScrollView(
+              padding: const EdgeInsets.fromLTRB(20, 8, 20, 20),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    'More actions',
+                    style: theme.textTheme.titleLarge?.copyWith(
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                  const SizedBox(height: 16),
+                  for (var index = 0; index < actions.length; index++) ...[
+                    actions[index],
+                    if (index != actions.length - 1) const SizedBox(height: 8),
+                  ],
+                ],
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  void _showRegionScopeSheet() {
+    final channelIdx = _selectedRecipient?.publicKey[1] ?? 0;
+    final l10n = AppLocalizations.of(context)!;
+
+    showModalBottomSheet(
+      context: context,
+      showDragHandle: true,
+      isScrollControlled: true,
+      builder: (sheetContext) {
+        return _RegionScopeSheet(
+          currentScopeName: _channelRegionScopeName,
+          l10n: l10n,
+          onScopeSelected: (String? name) async {
+            Navigator.of(sheetContext).pop();
+            if (name == null) {
+              // Clear scope
+              await RegionScopePreferences.clearScope(channelIdx);
+              if (!mounted) return;
+              setState(() {
+                _channelRegionScopeName = null;
+                _channelRegionScopeKey = null;
+                _channelRegionScopes.remove(channelIdx);
+              });
+              ToastLogger.success(context, l10n.regionScopeCleared);
+            } else {
+              // Set scope
+              final key = RegionScopePreferences.deriveRegionKey(name);
+              await RegionScopePreferences.setScope(channelIdx, name, key);
+              if (!mounted) return;
+              setState(() {
+                _channelRegionScopeName = name;
+                _channelRegionScopeKey = key;
+                _channelRegionScopes[channelIdx] = name;
+              });
+              ToastLogger.success(context, l10n.regionScopeSet(name));
+            }
+          },
         );
       },
     );
@@ -1835,6 +2088,7 @@ class _MessagesTabState extends State<MessagesTab> {
           channelIdx: 0,
           text: sarMessage,
           messageId: messageId,
+          floodScopeKey: _channelRegionScopeKey,
         );
 
         if (!mounted) return;
@@ -2133,6 +2387,10 @@ class _MessagesTabState extends State<MessagesTab> {
                   onStartVoiceRecording: _startVoiceRecording,
                   onStopAndSendVoice: _stopAndSendVoice,
                   onSendMessage: _sendMessage,
+                  regionScopeName: _channelRegionScopeName,
+                  onRegionScopeTap: _channelRegionScopeName != null
+                      ? _showRegionScopeSheet
+                      : null,
                 ),
               ),
             ],
@@ -2142,3 +2400,165 @@ class _MessagesTabState extends State<MessagesTab> {
     );
   }
 }
+
+/// Bottom sheet for selecting a region scope for the current channel.
+class _RegionScopeSheet extends StatefulWidget {
+  final String? currentScopeName;
+  final AppLocalizations l10n;
+  final ValueChanged<String?> onScopeSelected;
+
+  const _RegionScopeSheet({
+    required this.currentScopeName,
+    required this.l10n,
+    required this.onScopeSelected,
+  });
+
+  @override
+  State<_RegionScopeSheet> createState() => _RegionScopeSheetState();
+}
+
+class _RegionScopeSheetState extends State<_RegionScopeSheet> {
+  final TextEditingController _nameController = TextEditingController();
+
+  @override
+  void dispose() {
+    _nameController.dispose();
+    super.dispose();
+  }
+
+  void _submitManualName() {
+    var name = _nameController.text.trim();
+    if (name.isEmpty) return;
+    if (!name.startsWith('#')) name = '#$name';
+    if (utf8.encode(name).length > 30) return;
+    widget.onScopeSelected(name);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final l10n = widget.l10n;
+
+    return SafeArea(
+      child: ConstrainedBox(
+        constraints: BoxConstraints(
+          maxHeight: MediaQuery.of(context).size.height * 0.72,
+        ),
+        child: SingleChildScrollView(
+          padding: const EdgeInsets.fromLTRB(20, 8, 20, 20),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                l10n.regionScope,
+                style: theme.textTheme.titleLarge?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              const SizedBox(height: 4),
+              Text(
+                l10n.regionScopeWarning,
+                style: theme.textTheme.bodySmall?.copyWith(
+                  color: colorScheme.onSurfaceVariant,
+                ),
+              ),
+              const SizedBox(height: 16),
+
+              _RegionOptionTile(
+                label: l10n.regionScopeNone,
+                isSelected: widget.currentScopeName == null,
+                onTap: () => widget.onScopeSelected(null),
+              ),
+              const SizedBox(height: 8),
+
+              Row(
+                children: [
+                  Expanded(
+                    child: TextField(
+                      controller: _nameController,
+                      decoration: InputDecoration(
+                        hintText: l10n.enterRegionName,
+                        isDense: true,
+                        prefixText: '#',
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.circular(12),
+                        ),
+                        contentPadding: const EdgeInsets.symmetric(
+                          horizontal: 12,
+                          vertical: 10,
+                        ),
+                      ),
+                      onSubmitted: (_) => _submitManualName(),
+                    ),
+                  ),
+                  const SizedBox(width: 8),
+                  FilledButton.tonal(
+                    onPressed: _submitManualName,
+                    child: const Icon(Icons.check_rounded, size: 20),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _RegionOptionTile extends StatelessWidget {
+  final String label;
+  final bool isSelected;
+  final VoidCallback onTap;
+
+  const _RegionOptionTile({
+    required this.label,
+    required this.isSelected,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return Material(
+      color: isSelected
+          ? colorScheme.primaryContainer
+          : colorScheme.surfaceContainerLow,
+      borderRadius: BorderRadius.circular(12),
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(12),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+          child: Row(
+            children: [
+              Icon(
+                isSelected
+                    ? Icons.radio_button_checked_rounded
+                    : Icons.radio_button_off_rounded,
+                size: 20,
+                color: isSelected
+                    ? colorScheme.primary
+                    : colorScheme.onSurfaceVariant,
+              ),
+              const SizedBox(width: 12),
+              Expanded(
+                child: Text(
+                  label,
+                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                    fontWeight: isSelected ? FontWeight.w600 : FontWeight.w400,
+                    color: isSelected
+                        ? colorScheme.onPrimaryContainer
+                        : colorScheme.onSurface,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/screens/sensors_tab.dart

@@ -105,73 +105,22 @@ class _SensorsTabState extends State<SensorsTab> {
       contactsProvider,
       connectionProvider: context.read<ConnectionProvider>(),
     );
-
     await showModalBottomSheet<void>(
       context: context,
       showDragHandle: true,
-      builder: (sheetContext) {
+      isScrollControlled: true,
-        if (candidates.isEmpty) {
+      builder: (sheetContext) => AddSensorSheet(
-          return const SafeArea(
+        candidates: candidates,
-            child: Padding(
+        onClose: () => Navigator.of(sheetContext).pop(),
-              padding: EdgeInsets.all(24),
+        onSelect: (contact) async {
-              child: Text(
+          await sensorsProvider.addSensor(contact);
-                'No eligible nodes available. Discover a relay or node first.',
+          if (!sheetContext.mounted) return;
-              ),
+          Navigator.of(sheetContext).pop();
-            ),
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text('${contact.displayName} added to Sensors')),
           );
-        }
+        },
-
+      ),
-        return SafeArea(
-          child: ListView(
-            shrinkWrap: true,
-            padding: const EdgeInsets.only(bottom: 20),
-            children: [
-              ListTile(
-                title: const Text(
-                  'Add sensor node',
-                  style: TextStyle(fontWeight: FontWeight.bold),
-                ),
-                subtitle: Text(
-                  AppLocalizations.of(
-                    context,
-                  )!.pickARelayOrNodeToWatchInSensors,
-                ),
-              ),
-              ...candidates.map(
-                (contact) => ListTile(
-                  contentPadding: const EdgeInsets.symmetric(
-                    horizontal: 20,
-                    vertical: 4,
-                  ),
-                  leading: CircleAvatar(
-                    radius: 24,
-                    backgroundColor: const Color(0xFFDDEAF8),
-                    child: Icon(
-                      _typeIcon(contact),
-                      color: const Color(0xFF1E4F7A),
-                    ),
-                  ),
-                  title: Text(contact.displayName),
-                  subtitle: _SensorCandidatePreview(contact: contact),
-                  isThreeLine: true,
-                  onTap: () async {
-                    await sensorsProvider.addSensor(contact);
-                    if (!sheetContext.mounted) return;
-                    Navigator.of(sheetContext).pop();
-                    ScaffoldMessenger.of(context).showSnackBar(
-                      SnackBar(
-                        content: Text(
-                          '${contact.displayName} added to Sensors',
-                        ),
-                      ),
-                    );
-                  },
-                ),
-              ),
-            ],
-          ),
-        );
-      },
     );
   }
 
@@ -182,7 +131,7 @@ class _SensorsTabState extends State<SensorsTab> {
   ) async {
     await Navigator.of(context).push(
       MaterialPageRoute<void>(
-        builder: (pageContext) => _SensorCustomizeView(
+        builder: (pageContext) => SensorCustomizeView(
           publicKeyHex: publicKeyHex,
           initialContact: contact,
           onRenameMetric:
@@ -292,14 +241,21 @@ class _SensorsTabState extends State<SensorsTab> {
               connectionProvider,
               child,
             ) {
-              final displayKeys = sensorsProvider.displaySensorKeys(
+              final watchedKeys = sensorsProvider.watchedSensorKeys;
+              final hasPersistedSensors = watchedKeys.isNotEmpty;
+              final selfDisplayKey = sensorsProvider.displaySelfKey(
                 contactsProvider: contactsProvider,
                 connectionProvider: connectionProvider,
               );
-              final hasPersistedSensors =
+              final hasAnyCards =
-                  sensorsProvider.watchedSensorKeys.isNotEmpty;
+                  selfDisplayKey != null || watchedKeys.isNotEmpty;
 
-              Widget buildSensorCard(String key, int index) {
+              Widget buildSensorCard(
+                String key, {
+                required int index,
+                required int totalCount,
+                required bool isWatchedCard,
+              }) {
                 final contact = sensorsProvider.contactForDisplay(
                   key,
                   contactsProvider: contactsProvider,
@@ -314,106 +270,104 @@ class _SensorsTabState extends State<SensorsTab> {
                 return Padding(
                   key: ValueKey<String>('sensor_card_$key'),
                   padding: EdgeInsets.only(
-                    bottom: index == displayKeys.length - 1 ? 0 : 12,
+                    bottom: index == totalCount - 1 ? 0 : 12,
                   ),
-                  child: Row(
+                  child: ReorderableDelayedDragStartListener(
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                    enabled: isWatchedCard,
-                    children: [
+                    index: index,
-                      Expanded(
+                    child: SensorTelemetryCard(
-                        child: SensorTelemetryCard(
+                      contact: contact,
-                          contact: contact,
+                      state: sensorsProvider.stateFor(key),
-                          state: sensorsProvider.stateFor(key),
+                      visibleFields: visibleFields,
-                          visibleFields: visibleFields,
+                      fieldOrder: sensorsProvider.metricOrderFor(
-                          fieldOrder: sensorsProvider.metricOrderFor(
+                        key,
-                            key,
+                        availableFieldKeys,
-                            availableFieldKeys,
-                          ),
-                          labelOverrides: sensorsProvider.labelOverridesFor(
-                            key,
-                          ),
-                          fieldSpans: {
-                            for (final field in visibleFields)
-                              field: sensorsProvider.fieldSpanFor(key, field),
-                          },
-                          onRemove: hasPersistedSensors
-                              ? () async {
-                                  await sensorsProvider.removeSensor(key);
-                                }
-                              : null,
-                          onCustomize: () =>
-                              _showMetricSelector(context, key, contact),
-                          onShowMetHistory: (contact) =>
-                              showBTHomeMetHistorySheet(
-                                context,
-                                contact: contact,
-                              ),
-                          onRefresh: () => sensorsProvider.refreshSensor(
-                            publicKeyHex: key,
-                            contactsProvider: contactsProvider,
-                            connectionProvider: connectionProvider,
-                          ),
-                        ),
                       ),
-                      if (hasPersistedSensors) ...[
+                      labelOverrides: sensorsProvider.labelOverridesFor(key),
-                        const SizedBox(width: 8),
+                      fieldSpans: {
-                        Padding(
+                        for (final field in visibleFields)
-                          padding: const EdgeInsets.only(top: 20),
+                          field: sensorsProvider.fieldSpanFor(key, field),
-                          child: ReorderableDragStartListener(
+                      },
-                            index: index,
+                      onRemove: isWatchedCard
-                            child: Tooltip(
+                          ? () async {
-                              message: 'Move card',
+                              await sensorsProvider.removeSensor(key);
-                              child: Container(
+                            }
-                                decoration: BoxDecoration(
+                          : null,
-                                  color: Theme.of(
+                      onCustomize: () =>
-                                    context,
+                          _showMetricSelector(context, key, contact),
-                                  ).colorScheme.surfaceContainerHighest,
+                      onShowMetHistory: (contact) =>
-                                  borderRadius: BorderRadius.circular(12),
+                          showBTHomeMetHistorySheet(context, contact: contact),
-                                ),
+                      onMoveUp: isWatchedCard && index > 0
-                                padding: const EdgeInsets.symmetric(
+                          ? () =>
-                                  horizontal: 8,
+                                sensorsProvider.reorderSensors(index, index - 1)
-                                  vertical: 12,
+                          : null,
-                                ),
+                      onMoveDown: isWatchedCard && index < totalCount - 1
-                                child: Icon(
+                          ? () =>
-                                  Icons.drag_indicator,
+                                sensorsProvider.reorderSensors(index, index + 2)
-                                  color: Theme.of(
+                          : null,
-                                    context,
+                      onRefresh: () => sensorsProvider.refreshSensor(
-                                  ).colorScheme.onSurfaceVariant,
+                        publicKeyHex: key,
-                                ),
+                        contactsProvider: contactsProvider,
-                              ),
+                        connectionProvider: connectionProvider,
-                            ),
+                      ),
-                          ),
+                    ),
-                        ),
-                      ],
-                    ],
                   ),
                 );
               }
 
               return RefreshIndicator(
                 onRefresh: () => _refreshAll(context),
-                child: displayKeys.isEmpty
+                child: !hasAnyCards
                     ? ListView(
                         physics: const AlwaysScrollableScrollPhysics(),
                         padding: const EdgeInsets.fromLTRB(16, 16, 16, 96),
                         children: const [_EmptySensorsState()],
                       )
-                    : hasPersistedSensors
+                    : hasPersistedSensors && selfDisplayKey == null
                     ? ReorderableListView.builder(
                         buildDefaultDragHandles: false,
                         physics: const AlwaysScrollableScrollPhysics(),
                         padding: const EdgeInsets.fromLTRB(16, 16, 16, 96),
-                        itemCount: displayKeys.length,
+                        itemCount: watchedKeys.length,
                         onReorder: (oldIndex, newIndex) =>
                             sensorsProvider.reorderSensors(oldIndex, newIndex),
-                        itemBuilder: (context, index) =>
+                        itemBuilder: (context, index) => buildSensorCard(
-                            buildSensorCard(displayKeys[index], index),
+                          watchedKeys[index],
+                          index: index,
+                          totalCount: watchedKeys.length,
+                          isWatchedCard: true,
+                        ),
                       )
                     : ListView(
                         physics: const AlwaysScrollableScrollPhysics(),
                         padding: const EdgeInsets.fromLTRB(16, 16, 16, 96),
                         children: [
-                          for (var i = 0; i < displayKeys.length; i++)
+                          if (selfDisplayKey != null)
-                            buildSensorCard(displayKeys[i], i),
+                            buildSensorCard(
+                              selfDisplayKey,
+                              index: 0,
+                              totalCount: watchedKeys.isEmpty ? 1 : 2,
+                              isWatchedCard: false,
+                            ),
+                          if (selfDisplayKey != null && watchedKeys.isEmpty)
+                            _SelfOnlySensorsCta(
+                              onAddSensor: () => _showAddSensorSheet(context),
+                            ),
+                          if (watchedKeys.isNotEmpty)
+                            ReorderableListView.builder(
+                              shrinkWrap: true,
+                              buildDefaultDragHandles: false,
+                              physics: const NeverScrollableScrollPhysics(),
+                              itemCount: watchedKeys.length,
+                              onReorder: (oldIndex, newIndex) => sensorsProvider
+                                  .reorderSensors(oldIndex, newIndex),
+                              itemBuilder: (context, index) => buildSensorCard(
+                                watchedKeys[index],
+                                index: index,
+                                totalCount: watchedKeys.length,
+                                isWatchedCard: true,
+                              ),
+                            ),
                         ],
                       ),
               );
@@ -423,9 +377,153 @@ class _SensorsTabState extends State<SensorsTab> {
   }
 }
 
-class _SensorCustomizeView extends StatelessWidget {
+class AddSensorSheet extends StatefulWidget {
+  final List<Contact> candidates;
+  final Future<void> Function(Contact contact) onSelect;
+  final VoidCallback onClose;
+
+  const AddSensorSheet({
+    super.key,
+    required this.candidates,
+    required this.onSelect,
+    required this.onClose,
+  });
+
+  @override
+  State<AddSensorSheet> createState() => _AddSensorSheetState();
+}
+
+class _AddSensorSheetState extends State<AddSensorSheet> {
+  final TextEditingController _searchController = TextEditingController();
+
+  @override
+  void dispose() {
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.candidates.isEmpty) {
+      return const SafeArea(
+        child: Padding(
+          padding: EdgeInsets.all(24),
+          child: Text(
+            'No eligible nodes available. Discover a relay or node first.',
+          ),
+        ),
+      );
+    }
+
+    final l10n = AppLocalizations.of(context)!;
+    final query = _searchController.text.trim().toLowerCase();
+    final filteredCandidates = widget.candidates.where((contact) {
+      if (query.isEmpty) {
+        return true;
+      }
+      return contact.displayName.toLowerCase().contains(query) ||
+          contact.publicKeyHex.toLowerCase().contains(query);
+    }).toList();
+
+    return SafeArea(
+      child: Padding(
+        padding: EdgeInsets.only(
+          bottom: MediaQuery.of(context).viewInsets.bottom,
+        ),
+        child: SizedBox(
+          height: MediaQuery.of(context).size.height * 0.8,
+          child: Column(
+            children: [
+              Padding(
+                padding: const EdgeInsets.fromLTRB(20, 8, 12, 8),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          const Text(
+                            'Add sensor node',
+                            style: TextStyle(fontWeight: FontWeight.bold),
+                          ),
+                          const SizedBox(height: 4),
+                          Text(l10n.pickARelayOrNodeToWatchInSensors),
+                        ],
+                      ),
+                    ),
+                    IconButton(
+                      onPressed: widget.onClose,
+                      tooltip: l10n.close,
+                      icon: const Icon(Icons.close),
+                    ),
+                  ],
+                ),
+              ),
+              Padding(
+                padding: const EdgeInsets.fromLTRB(20, 0, 20, 12),
+                child: TextField(
+                  controller: _searchController,
+                  onChanged: (_) => setState(() {}),
+                  decoration: const InputDecoration(
+                    prefixIcon: Icon(Icons.search),
+                    hintText: 'Search sensors',
+                    border: OutlineInputBorder(),
+                  ),
+                ),
+              ),
+              Expanded(
+                child: filteredCandidates.isEmpty
+                    ? const Padding(
+                        padding: EdgeInsets.symmetric(
+                          horizontal: 20,
+                          vertical: 16,
+                        ),
+                        child: Align(
+                          alignment: Alignment.topLeft,
+                          child: Text(
+                            'No sensor candidates match your search.',
+                          ),
+                        ),
+                      )
+                    : ListView.builder(
+                        padding: const EdgeInsets.only(bottom: 20),
+                        itemCount: filteredCandidates.length,
+                        itemBuilder: (context, index) {
+                          final contact = filteredCandidates[index];
+                          return ListTile(
+                            contentPadding: const EdgeInsets.symmetric(
+                              horizontal: 20,
+                              vertical: 4,
+                            ),
+                            leading: CircleAvatar(
+                              radius: 24,
+                              backgroundColor: const Color(0xFFDDEAF8),
+                              child: Icon(
+                                _typeIcon(contact),
+                                color: const Color(0xFF1E4F7A),
+                              ),
+                            ),
+                            title: Text(contact.displayName),
+                            subtitle: _SensorCandidatePreview(contact: contact),
+                            isThreeLine: true,
+                            onTap: () => widget.onSelect(contact),
+                          );
+                        },
+                      ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class SensorCustomizeView extends StatelessWidget {
   final String publicKeyHex;
   final Contact? initialContact;
+  final bool showLivePreview;
   final Future<void> Function({
     required BuildContext context,
     required String publicKeyHex,
@@ -434,10 +532,12 @@ class _SensorCustomizeView extends StatelessWidget {
   })
   onRenameMetric;
 
-  const _SensorCustomizeView({
+  const SensorCustomizeView({
+    super.key,
     required this.publicKeyHex,
     required this.initialContact,
     required this.onRenameMetric,
+    this.showLivePreview = true,
   });
 
   @override
@@ -482,35 +582,39 @@ class _SensorCustomizeView extends StatelessWidget {
           body: ListView(
             padding: EdgeInsets.fromLTRB(16, 16, 16, 24),
             children: [
-              _SensorCustomizeSectionCard(
+              if (showLivePreview)
-                title: AppLocalizations.of(context)!.livePreview,
+                _SensorCustomizeSectionCard(
-                subtitle:
+                  title: AppLocalizations.of(context)!.livePreview,
-                    'Changes apply immediately. This card matches the current dashboard layout for this sensor.',
+                  subtitle:
-                child: SensorTelemetryCard(
+                      'Changes apply immediately. This card matches the current dashboard layout for this sensor.',
-                  contact: contact,
+                  child: SensorTelemetryCard(
-                  state: sensorsProvider.stateFor(publicKeyHex),
+                    contact: contact,
-                  visibleFields: visibleFields,
+                    state: sensorsProvider.stateFor(publicKeyHex),
-                  fieldOrder: sensorsProvider.metricOrderFor(
+                    visibleFields: visibleFields,
-                    publicKeyHex,
+                    fieldOrder: sensorsProvider.metricOrderFor(
-                    visibleFields,
+                      publicKeyHex,
-                  ),
+                      visibleFields,
-                  labelOverrides: sensorsProvider.labelOverridesFor(
+                    ),
-                    publicKeyHex,
+                    labelOverrides: sensorsProvider.labelOverridesFor(
-                  ),
+                      publicKeyHex,
-                  onShowMetHistory: contact == null
+                    ),
-                      ? null
+                    onShowMetHistory: contact == null
-                      : (contact) => showBTHomeMetHistorySheet(
+                        ? null
-                          context,
+                        : (contact) => showBTHomeMetHistorySheet(
-                          contact: contact,
+                            context,
+                            contact: contact,
+                          ),
+                    fieldSpans: {
+                      for (final field in visibleFields)
+                        field: sensorsProvider.fieldSpanFor(
+                          publicKeyHex,
+                          field,
                         ),
-                  fieldSpans: {
+                    },
-                    for (final field in visibleFields)
+                    margin: EdgeInsets.zero,
-                      field: sensorsProvider.fieldSpanFor(publicKeyHex, field),
+                    emptyMetricsMessage: 'No telemetry fields available yet.',
-                  },
+                  ),
-                  margin: EdgeInsets.zero,
-                  emptyMetricsMessage: 'No telemetry fields available yet.',
                 ),
-              ),
               _SensorCustomizeSectionCard(
                 title: AppLocalizations.of(context)!.refreshSchedule,
                 subtitle:
@@ -1011,6 +1115,81 @@ class _EmptySensorsStateState extends State<_EmptySensorsState> {
   }
 }
 
+class _SelfOnlySensorsCta extends StatelessWidget {
+  final VoidCallback onAddSensor;
+
+  const _SelfOnlySensorsCta({required this.onAddSensor});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    return Container(
+      margin: const EdgeInsets.only(top: 8),
+      padding: const EdgeInsets.fromLTRB(18, 18, 18, 20),
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surfaceContainerLow,
+        borderRadius: BorderRadius.circular(24),
+        border: Border.all(
+          color: theme.colorScheme.outlineVariant.withValues(alpha: 0.35),
+        ),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Container(
+                width: 44,
+                height: 44,
+                decoration: BoxDecoration(
+                  color: theme.colorScheme.primaryContainer,
+                  borderRadius: BorderRadius.circular(16),
+                ),
+                child: Icon(
+                  Icons.add_chart_rounded,
+                  color: theme.colorScheme.onPrimaryContainer,
+                ),
+              ),
+              const SizedBox(width: 14),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      'Add another device',
+                      style: theme.textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      'Bring in weather stations, repeaters, or other devices to watch them here.',
+                      style: theme.textTheme.bodyMedium?.copyWith(
+                        color: theme.colorScheme.onSurfaceVariant,
+                        height: 1.35,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 16),
+          Align(
+            alignment: Alignment.centerLeft,
+            child: FilledButton.icon(
+              onPressed: onAddSensor,
+              icon: const Icon(Icons.add, size: 18),
+              label: const Text('Choose'),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
 IconData _typeIcon(Contact contact) {
   if (contact.isSensor) {
     return Icons.sensors;

lib/screens/settings_screen.dart

@@ -16,6 +16,7 @@ import '../providers/app_provider.dart';
 import '../providers/connection_provider.dart';
 import '../providers/drawing_provider.dart';
 import '../providers/map_provider.dart';
+import '../models/contact.dart';
 import '../models/config_profile.dart';
 import '../services/location_tracking_service.dart';
 import '../services/locale_preferences.dart';
@@ -79,6 +80,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
   bool _fastLocationUpdatesEnabled = false;
   double _fastLocationMovementThresholdMeters = 10.0;
   int _fastLocationActiveCadenceSeconds = 10;
+  int? _fastLocationChannelIdx;
   bool _rotateMapWithHeading = false;
   bool _showMapDebugInfo = false;
   bool _openMapInFullscreen = false;
@@ -314,6 +316,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           _locationService.fastLocationMovementThresholdMeters;
       _fastLocationActiveCadenceSeconds =
           _locationService.fastLocationActiveCadenceSeconds;
+      _fastLocationChannelIdx = _locationService.fastLocationChannelIdx;
     });
   }
 
@@ -407,6 +410,80 @@ class _SettingsScreenState extends State<SettingsScreen> {
     });
   }
 
+  String _describeFastLocationChannel(List<Contact> channels) {
+    final channelIdx = _fastLocationChannelIdx;
+    if (channelIdx == null) {
+      return 'Not set';
+    }
+
+    for (final channel in channels) {
+      final idx = channel.publicKey.length > 1 ? channel.publicKey[1] : 0;
+      if (idx == channelIdx) {
+        return '${channel.getLocalizedDisplayName(context)} (slot $channelIdx)';
+      }
+    }
+
+    return 'Channel $channelIdx unavailable';
+  }
+
+  Future<void> _editFastLocationChannel() async {
+    final channels =
+        List<Contact>.from(context.read<ContactsProvider>().channels)
+          ..removeWhere((c) => c.isPublicChannel)
+          ..sort((a, b) {
+            final aIdx = a.publicKey.length > 1 ? a.publicKey[1] : 0;
+            final bIdx = b.publicKey.length > 1 ? b.publicKey[1] : 0;
+            return aIdx.compareTo(bIdx);
+          });
+
+    final selected = await showModalBottomSheet<int?>(
+      context: context,
+      builder: (sheetContext) => SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            ListTile(
+              leading: const Icon(Icons.block),
+              title: const Text('Disable fast GPS publishing'),
+              trailing: _fastLocationChannelIdx == null
+                  ? const Icon(Icons.check)
+                  : null,
+              onTap: () => Navigator.pop(sheetContext, -1),
+            ),
+            for (final channel in channels)
+              ListTile(
+                leading: const Icon(Icons.tag),
+                title: Text(channel.getLocalizedDisplayName(sheetContext)),
+                subtitle: Text(
+                  'Channel ${channel.publicKey.length > 1 ? channel.publicKey[1] : 0}',
+                ),
+                trailing:
+                    _fastLocationChannelIdx ==
+                        (channel.publicKey.length > 1
+                            ? channel.publicKey[1]
+                            : 0)
+                    ? const Icon(Icons.check)
+                    : null,
+                onTap: () => Navigator.pop(
+                  sheetContext,
+                  channel.publicKey.length > 1 ? channel.publicKey[1] : 0,
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+
+    if (selected == null) return;
+    await _locationService.updateFastLocationChannelIdx(
+      selected < 0 ? null : selected,
+    );
+    if (!mounted) return;
+    setState(() {
+      _fastLocationChannelIdx = _locationService.fastLocationChannelIdx;
+    });
+  }
+
   Future<void> _saveImageMaxSize(int size) async {
     await ImagePreferences.setMaxSize(size);
     if (!mounted) return;
@@ -1463,21 +1540,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 },
               ),
             ),
-            Consumer<MapProvider>(
-              builder: (context, mapProvider, child) => SwitchListTile(
-                secondary: Icon(Icons.timeline),
-                title: Text(
-                  AppLocalizations.of(context)!.showAllContactTrailsLabel,
-                ),
-                subtitle: const Text(
-                  'Display location trails for all contacts that have history',
-                ),
-                value: mapProvider.showAllContactTrails,
-                onChanged: (value) async {
-                  await mapProvider.toggleAllContactTrails();
-                },
-              ),
-            ),
             Consumer<MapProvider>(
               builder: (context, mapProvider, child) => SwitchListTile(
                 secondary: Icon(Icons.router_outlined),
@@ -1781,6 +1843,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
               trailing: const Icon(Icons.chevron_right),
               onTap: _editFastLocationActiveCadence,
             ),
+            ListTile(
+              leading: const Icon(Icons.forum),
+              title: const Text('Fast GPS target channel'),
+              subtitle: Text(
+                _describeFastLocationChannel(
+                  context.watch<ContactsProvider>().channels,
+                ),
+              ),
+              trailing: const Icon(Icons.chevron_right),
+              onTap: _editFastLocationChannel,
+            ),
             ListTile(
               leading: Icon(Icons.location_on),
               title: Text(AppLocalizations.of(context)!.locationPermission),

lib/screens/spectrum_scan_screen.dart

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

lib/screens/welcome_wizard_screen.dart

@@ -221,14 +221,13 @@ class _WelcomeWizardScreenState extends State<WelcomeWizardScreen> {
   }
 
   Future<void> _openConnectionDialog() async {
-    await showModalBottomSheet(
+    final connected = await showConnectionDialogFlow(
-      context: context,
+      context,
-      isScrollControlled: true,
+      offerPostConnectRepeaterDiscovery: true,
-      builder: (context) => const ConnectionDialog(),
     );
     if (!mounted) return;
     final connectionProvider = context.read<ConnectionProvider>();
-    if (connectionProvider.deviceInfo.isConnected) {
+    if (connected) {
       await connectionProvider.refreshDeviceInfo();
     }
     if (!mounted) return;

lib/services/bthome_met_history.dart

@@ -110,9 +110,44 @@ class BTHomeMetHistoryParser {
   }
 }
 
+bool _isTruthyCapabilityValue(Object? value) {
+  if (value is num) {
+    return value > 0;
+  }
+  if (value is bool) {
+    return value;
+  }
+  return false;
+}
+
+bool _hasBTHomeMetCapability(Contact? contact) {
+  final extraSensorData = contact?.telemetry?.extraSensorData;
+  if (extraSensorData == null) {
+    return false;
+  }
+
+  // MET history is only enabled when the node advertises an explicit
+  // capability marker on channel 1. Accept a small set of channel-1 marker
+  // keys so the app remains tolerant while firmware-side encoding settles.
+  const capabilityKeys = <String>[
+    'met_capability',
+    'met_capability_1',
+    'generic_sensor_1',
+    'light_level_1',
+  ];
+
+  for (final key in capabilityKeys) {
+    if (_isTruthyCapabilityValue(extraSensorData[key])) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 List<BTHomeMetMeasurement> bTHomeMetMeasurementsForContact(Contact? contact) {
   final telemetry = contact?.telemetry;
-  if (telemetry == null) {
+  if (telemetry == null || !_hasBTHomeMetCapability(contact)) {
     return const <BTHomeMetMeasurement>[];
   }
 

lib/services/cayenne_lpp_parser.dart

@@ -88,10 +88,13 @@ class CayenneLppParser {
     LatLng? gpsLocation;
     double? batteryPercentage;
     double? batteryMilliVolts;
+    double? deferredBatteryMilliVolts;
+    double? deferredBatteryPercentage;
     double? temperature;
     double? humidity;
     double? pressure;
     final extraSensorData = <String, dynamic>{};
+    bool sawNonSelfChannel = false;
 
     int fieldCount = 0;
     while (reader.hasRemaining) {
@@ -112,6 +115,9 @@ class CayenneLppParser {
 
         final channel = reader.readByte();
         debugPrint('      Channel: $channel');
+        if (channel != _selfTelemetryChannel) {
+          sawNonSelfChannel = true;
+        }
 
         final type = reader.readByte();
         debugPrint(
@@ -136,7 +142,7 @@ class CayenneLppParser {
             final value = rawValue / 100.0;
             debugPrint('      Analog Input (raw): $rawValue');
             debugPrint('      Analog Input (volts): ${value}V');
-            if (_isBatteryChannel(channel)) {
+            if (_isDedicatedBatteryChannel(channel)) {
               batteryMilliVolts = value * 1000;
               batteryPercentage = _calculateBatteryPercentage(value);
               extraSensorData[_sourceChannelKey('battery')] = channel;
@@ -144,6 +150,10 @@ class CayenneLppParser {
               debugPrint(
                 '      → Battery: ${batteryPercentage.toStringAsFixed(1)}% (${batteryMilliVolts.toStringAsFixed(0)}mV)',
               );
+            } else if (_isDeferredBatteryChannel(channel)) {
+              deferredBatteryMilliVolts = value * 1000;
+              deferredBatteryPercentage = _calculateBatteryPercentage(value);
+              extraSensorData['analog_input_$channel'] = value;
             } else {
               extraSensorData['analog_input_$channel'] = value;
             }
@@ -237,7 +247,7 @@ class CayenneLppParser {
             final value = rawValue / 100.0;
             debugPrint('      Voltage (raw): $rawValue');
             debugPrint('      Voltage: ${value}V');
-            if (_isBatteryChannel(channel)) {
+            if (_isDedicatedBatteryChannel(channel)) {
               batteryMilliVolts = value * 1000;
               batteryPercentage = _calculateBatteryPercentage(value);
               extraSensorData[_sourceChannelKey('battery')] = channel;
@@ -245,6 +255,10 @@ class CayenneLppParser {
               debugPrint(
                 '      → Battery: ${batteryPercentage.toStringAsFixed(1)}% (${batteryMilliVolts.toStringAsFixed(0)}mV)',
               );
+            } else if (_isDeferredBatteryChannel(channel)) {
+              deferredBatteryMilliVolts = value * 1000;
+              deferredBatteryPercentage = _calculateBatteryPercentage(value);
+              extraSensorData['voltage_$channel'] = value;
             } else {
               extraSensorData['voltage_$channel'] = value;
             }
@@ -327,7 +341,7 @@ class CayenneLppParser {
           case _lppPercentage:
             final value = reader.readByte().toDouble();
             debugPrint('      Percentage: $value%');
-            if (_isBatteryChannel(channel)) {
+            if (_isDedicatedBatteryChannel(channel) || _isDeferredBatteryChannel(channel)) {
               batteryPercentage = value;
               extraSensorData[_sourceChannelKey('battery')] = channel;
             } else {
@@ -631,6 +645,21 @@ class CayenneLppParser {
       }
     }
 
+    if (batteryMilliVolts == null &&
+        batteryPercentage == null &&
+        deferredBatteryMilliVolts != null &&
+        deferredBatteryPercentage != null &&
+        !sawNonSelfChannel) {
+      batteryMilliVolts = deferredBatteryMilliVolts;
+      batteryPercentage = deferredBatteryPercentage;
+      extraSensorData[_sourceChannelKey('battery')] = _selfTelemetryChannel;
+      extraSensorData[_sourceChannelKey('voltage')] = _selfTelemetryChannel;
+      debugPrint(
+        '    Promoted self-channel voltage to battery: '
+        '${batteryPercentage.toStringAsFixed(1)}% (${batteryMilliVolts.toStringAsFixed(0)}mV)',
+      );
+    }
+
     debugPrint('    Parsed $fieldCount fields');
     debugPrint('  ✅ [CayenneLPP] Parsing complete');
     debugPrint(
@@ -677,8 +706,10 @@ class CayenneLppParser {
     return ((voltage - 3.0) / 1.2) * 100.0;
   }
 
-  static bool _isBatteryChannel(int channel) =>
+  static bool _isDedicatedBatteryChannel(int channel) => channel == 0;
-      channel == 0 || channel == _selfTelemetryChannel;
+
+  static bool _isDeferredBatteryChannel(int channel) =>
+      channel == _selfTelemetryChannel;
 
   static int _readUInt32BE(BufferReader reader) {
     final bytes = reader.readBytes(4);

lib/services/compass_support.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/foundation.dart'
+    show TargetPlatform, defaultTargetPlatform, kIsWeb;
+
+class CompassSupport {
+  const CompassSupport._();
+
+  static bool get isAvailable =>
+      !kIsWeb &&
+      (defaultTargetPlatform == TargetPlatform.android ||
+          defaultTargetPlatform == TargetPlatform.iOS);
+}

lib/services/location_tracking_service.dart

@@ -49,6 +49,7 @@ class LocationTrackingService {
       'fast_location_movement_threshold_meters';
   static const String _prefKeyFastActiveCadence =
       'fast_location_active_cadence_seconds';
+  static const String _prefKeyFastChannelIdx = 'fast_location_channel_idx';
 
   String _scopedKey(String baseKey) {
     return ProfileStorageScope.scopedKey(baseKey);
@@ -79,6 +80,9 @@ class LocationTrackingService {
   /// Cadence for active-use fast GPS updates
   int fastLocationActiveCadenceSeconds = 10;
 
+  /// Target channel index for fast GPS updates; null means disabled/unset.
+  int? fastLocationChannelIdx;
+
   // ============================================================================
   // State Properties
   // ============================================================================
@@ -528,8 +532,14 @@ class LocationTrackingService {
     _refreshFastLocationTimer();
   }
 
+  Future<void> updateFastLocationChannelIdx(int? channelIdx) async {
+    fastLocationChannelIdx = channelIdx;
+    await saveSettings();
+    _refreshFastLocationTimer();
+  }
+
   void _evaluateFastLocationMovement(Position position) {
-    if (!fastLocationUpdatesEnabled) return;
+    if (!fastLocationUpdatesEnabled || fastLocationChannelIdx == null) return;
     final previous = _lastFastLocationSentPosition;
     if (previous == null) {
       _emitFastLocationUpdate(position, reason: 'initial');
@@ -552,6 +562,7 @@ class LocationTrackingService {
     _fastLocationTimer = null;
     if (!isTracking ||
         !fastLocationUpdatesEnabled ||
+        fastLocationChannelIdx == null ||
         !_isFastLocationActiveUse) {
       return;
     }
@@ -567,7 +578,7 @@ class LocationTrackingService {
   }
 
   void _emitFastLocationUpdate(Position position, {required String reason}) {
-    if (!fastLocationUpdatesEnabled) return;
+    if (!fastLocationUpdatesEnabled || fastLocationChannelIdx == null) return;
 
     final now = DateTime.now();
     final previous = _lastFastLocationSentPosition;
@@ -669,6 +680,7 @@ class LocationTrackingService {
           5,
           60,
         );
+    fastLocationChannelIdx = prefs.getInt(_scopedKey(_prefKeyFastChannelIdx));
 
     debugPrint('✅ [LocationTracking] Settings loaded');
     debugPrint('    Min distance: ${minDistanceMeters}m');
@@ -680,6 +692,7 @@ class LocationTrackingService {
       '    Fast movement threshold: ${fastLocationMovementThresholdMeters}m',
     );
     debugPrint('    Fast active cadence: ${fastLocationActiveCadenceSeconds}s');
+    debugPrint('    Fast channel idx: ${fastLocationChannelIdx ?? "unset"}');
   }
 
   /// Save settings to SharedPreferences
@@ -709,6 +722,12 @@ class LocationTrackingService {
       _scopedKey(_prefKeyFastActiveCadence),
       fastLocationActiveCadenceSeconds,
     );
+    final channelKey = _scopedKey(_prefKeyFastChannelIdx);
+    if (fastLocationChannelIdx == null) {
+      await prefs.remove(channelKey);
+    } else {
+      await prefs.setInt(channelKey, fastLocationChannelIdx!);
+    }
 
     debugPrint('✅ [LocationTracking] Settings saved');
   }

lib/services/map_workspace_snapshot_service.dart

@@ -64,7 +64,6 @@ class MapWorkspaceSnapshotService {
       showPlaceNamesOverlay: mapProvider.showPlaceNamesOverlay,
       showMunicipalityBordersOverlay:
           mapProvider.showMunicipalityBordersOverlay,
-      showAllContactTrails: mapProvider.showAllContactTrails,
       hideRepeatersOnMap: mapProvider.hideRepeatersOnMap,
     );
   }

lib/services/path_history_service.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
+import 'package:geolocator/geolocator.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../models/contact.dart';
@@ -9,7 +10,7 @@ import '../models/path_selection.dart';
 import '../utils/log_rx_route_decoder.dart';
 
 class PathHistoryService {
-  static const String _storageKey = 'contact_path_history_v1';
+  static const String _storageKey = 'contact_path_history_v2';
   static const int _maxDirectPaths = 20;
   static const int _topRotationCount = 3;
 
@@ -59,6 +60,11 @@ class PathHistoryService {
       failureCount: existing?.failureCount ?? 0,
       lastRoundTripTimeMs: existing?.lastRoundTripTimeMs ?? 0,
       lastUsedAt: DateTime.now(),
+      lastSucceededAt: existing?.lastSucceededAt,
+      senderLatitude: existing?.senderLatitude,
+      senderLongitude: existing?.senderLongitude,
+      recipientLatitude: existing?.recipientLatitude,
+      recipientLongitude: existing?.recipientLongitude,
     );
 
     await _saveHistory(
@@ -104,6 +110,11 @@ class PathHistoryService {
       failureCount: existing?.failureCount ?? 0,
       lastRoundTripTimeMs: existing?.lastRoundTripTimeMs ?? 0,
       lastUsedAt: DateTime.now(),
+      lastSucceededAt: existing?.lastSucceededAt,
+      senderLatitude: existing?.senderLatitude,
+      senderLongitude: existing?.senderLongitude,
+      recipientLatitude: existing?.recipientLatitude,
+      recipientLongitude: existing?.recipientLongitude,
     );
 
     await _saveHistory(
@@ -172,6 +183,10 @@ class PathHistoryService {
     PathSelection selection, {
     required bool success,
     int? roundTripTimeMs,
+    double? senderLatitude,
+    double? senderLongitude,
+    double? recipientLatitude,
+    double? recipientLongitude,
   }) async {
     await initialize();
     final history = _historyFor(contactPublicKeyHex);
@@ -206,6 +221,13 @@ class PathHistoryService {
           ? (roundTripTimeMs ?? existing?.lastRoundTripTimeMs ?? 0)
           : (existing?.lastRoundTripTimeMs ?? 0),
       lastUsedAt: DateTime.now(),
+      lastSucceededAt: success ? DateTime.now() : existing?.lastSucceededAt,
+      senderLatitude: success ? senderLatitude : existing?.senderLatitude,
+      senderLongitude: success ? senderLongitude : existing?.senderLongitude,
+      recipientLatitude:
+          success ? recipientLatitude : existing?.recipientLatitude,
+      recipientLongitude:
+          success ? recipientLongitude : existing?.recipientLongitude,
     );
     await _saveHistory(
       contactPublicKeyHex,
@@ -215,6 +237,54 @@ class PathHistoryService {
     );
   }
 
+  Future<PathSelection?> getLastSuccessfulDirectSelection(
+    Contact contact, {
+    String? excludeSignature,
+    double? senderLatitude,
+    double? senderLongitude,
+    double? recipientLatitude,
+    double? recipientLongitude,
+  }) async {
+    await initialize();
+    final history = _historyFor(contact.publicKeyHex);
+    final ranked = history.directPaths
+        .where(
+          (record) =>
+              record.successCount > 0 &&
+              record.lastSucceededAt != null &&
+              record.signature != excludeSignature,
+        )
+        .toList()
+      ..sort((a, b) {
+        final locationCompare = _compareLocationFit(
+          a,
+          b,
+          senderLatitude: senderLatitude,
+          senderLongitude: senderLongitude,
+          recipientLatitude: recipientLatitude,
+          recipientLongitude: recipientLongitude,
+        );
+        if (locationCompare != 0) return locationCompare;
+        final succeededCompare = b.lastSucceededAt!.compareTo(
+          a.lastSucceededAt!,
+        );
+        if (succeededCompare != 0) return succeededCompare;
+        return _comparePathRecords(a, b);
+      });
+
+    if (ranked.isEmpty) {
+      return null;
+    }
+
+    final record = ranked.first;
+    return PathSelection(
+      mode: PathSelectionMode.directHistorical,
+      pathBytes: Uint8List.fromList(record.pathBytes),
+      hopCount: record.hopCount,
+      hashSize: record.hashSize,
+    );
+  }
+
   ContactPathHistory historyFor(String contactPublicKeyHex) {
     return _cache[contactPublicKeyHex] ??
         ContactPathHistory.empty(contactPublicKeyHex);
@@ -279,4 +349,68 @@ class PathHistoryService {
 
   String _signature(Uint8List bytes) =>
       bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
+
+  int _compareLocationFit(
+    PathRecord a,
+    PathRecord b, {
+    required double? senderLatitude,
+    required double? senderLongitude,
+    required double? recipientLatitude,
+    required double? recipientLongitude,
+  }) {
+    final aDistance = _locationDistanceScore(
+      a,
+      senderLatitude: senderLatitude,
+      senderLongitude: senderLongitude,
+      recipientLatitude: recipientLatitude,
+      recipientLongitude: recipientLongitude,
+    );
+    final bDistance = _locationDistanceScore(
+      b,
+      senderLatitude: senderLatitude,
+      senderLongitude: senderLongitude,
+      recipientLatitude: recipientLatitude,
+      recipientLongitude: recipientLongitude,
+    );
+    return aDistance.compareTo(bDistance);
+  }
+
+  double _locationDistanceScore(
+    PathRecord record, {
+    required double? senderLatitude,
+    required double? senderLongitude,
+    required double? recipientLatitude,
+    required double? recipientLongitude,
+  }) {
+    var total = 0.0;
+    var matched = false;
+
+    if (senderLatitude != null &&
+        senderLongitude != null &&
+        record.senderLatitude != null &&
+        record.senderLongitude != null) {
+      matched = true;
+      total += Geolocator.distanceBetween(
+        senderLatitude,
+        senderLongitude,
+        record.senderLatitude!,
+        record.senderLongitude!,
+      );
+    }
+
+    if (recipientLatitude != null &&
+        recipientLongitude != null &&
+        record.recipientLatitude != null &&
+        record.recipientLongitude != null) {
+      matched = true;
+      total += Geolocator.distanceBetween(
+        recipientLatitude,
+        recipientLongitude,
+        record.recipientLatitude!,
+        record.recipientLongitude!,
+      );
+    }
+
+    return matched ? total : double.infinity;
+  }
 }

lib/services/region_scope_preferences.dart

@@ -0,0 +1,86 @@
+import 'dart:convert';
+import 'dart:typed_data';
+import 'package:crypto/crypto.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'profiles_feature_service.dart';
+
+/// Stores per-channel region scope settings.
+///
+/// Each channel can optionally have a region scope assigned. When set, the app
+/// will set the flood scope on the device before sending channel messages so
+/// that repeaters outside the region won't forward them.
+class RegionScopePreferences {
+  static const String _namePrefix = 'region_scope_name_';
+  static const String _keyPrefix = 'region_scope_key_';
+
+  /// Get the saved scope for a channel.
+  /// Returns null if no scope is set.
+  static Future<({String name, Uint8List key})?> getScope(
+    int channelIdx,
+  ) async {
+    final prefs = await SharedPreferences.getInstance();
+    final name = prefs.getString(
+      ProfileStorageScope.scopedKey('$_namePrefix$channelIdx'),
+    );
+    final keyBase64 = prefs.getString(
+      ProfileStorageScope.scopedKey('$_keyPrefix$channelIdx'),
+    );
+    if (name == null || keyBase64 == null) return null;
+    try {
+      return (name: name, key: Uint8List.fromList(base64.decode(keyBase64)));
+    } catch (_) {
+      return null;
+    }
+  }
+
+  /// Save a region scope for a channel.
+  static Future<void> setScope(
+    int channelIdx,
+    String name,
+    Uint8List key,
+  ) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setString(
+      ProfileStorageScope.scopedKey('$_namePrefix$channelIdx'),
+      name,
+    );
+    await prefs.setString(
+      ProfileStorageScope.scopedKey('$_keyPrefix$channelIdx'),
+      base64.encode(key),
+    );
+  }
+
+  /// Clear the region scope for a channel.
+  static Future<void> clearScope(int channelIdx) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.remove(
+      ProfileStorageScope.scopedKey('$_namePrefix$channelIdx'),
+    );
+    await prefs.remove(
+      ProfileStorageScope.scopedKey('$_keyPrefix$channelIdx'),
+    );
+  }
+
+  /// Clear all region scopes (all channels).
+  static Future<void> clearAllScopes() async {
+    final prefs = await SharedPreferences.getInstance();
+    final keys = prefs.getKeys();
+    for (final key in keys) {
+      if (key.contains(_namePrefix) || key.contains(_keyPrefix)) {
+        await prefs.remove(key);
+      }
+    }
+  }
+
+  /// Derive the 16-byte transport key for a region name.
+  ///
+  /// Matches firmware `TransportKeyStore::getAutoKeyFor`:
+  /// `SHA256("#regionname")` → first 16 bytes.
+  /// The name must include the leading `#` (auto-prepended if missing).
+  static Uint8List deriveRegionKey(String regionName) {
+    final normalized =
+        regionName.startsWith('#') ? regionName : '#$regionName';
+    final digest = sha256.convert(utf8.encode(normalized));
+    return Uint8List.fromList(digest.bytes.sublist(0, 16));
+  }
+}

lib/widgets/connection_dialog.dart

@@ -4,10 +4,14 @@ import 'package:provider/provider.dart';
 import '../l10n/app_localizations.dart';
 import '../providers/app_provider.dart';
 import '../providers/connection_provider.dart';
+import '../providers/contacts_provider.dart';
+import '../screens/discovery_screen.dart';
 import '../services/network_scanner_service.dart';
 import '../services/profile_workspace_coordinator.dart';
 import '../services/serial/serial_transport.dart';
 
+enum _ConnectionDialogResult { connected }
+
 Future<void> _initializeConnectedWorkspace({
   required ProfileWorkspaceCoordinator profileWorkspaceCoordinator,
   required AppProvider appProvider,
@@ -16,6 +20,103 @@ Future<void> _initializeConnectedWorkspace({
   await appProvider.initialize();
 }
 
+String _normalizeConnectionError(Object error) {
+  var message = error.toString();
+  if (message.startsWith('Exception: ')) {
+    message = message.substring('Exception: '.length);
+  }
+  if (message.startsWith('Connection failed: Exception: ')) {
+    return message.substring('Connection failed: Exception: '.length);
+  }
+  if (message.startsWith('Connection failed: ')) {
+    return message.substring('Connection failed: '.length);
+  }
+  return message;
+}
+
+void _showConnectionErrorSnackBar(BuildContext context, Object error) {
+  ScaffoldMessenger.of(context).showSnackBar(
+    SnackBar(
+      content: Text(_normalizeConnectionError(error)),
+      backgroundColor: Colors.red,
+      duration: const Duration(seconds: 5),
+    ),
+  );
+}
+
+Future<bool> showConnectionDialogFlow(
+  BuildContext context, {
+  Color? backgroundColor,
+  bool offerPostConnectRepeaterDiscovery = false,
+}) async {
+  final result = await showModalBottomSheet<_ConnectionDialogResult>(
+    context: context,
+    isScrollControlled: true,
+    backgroundColor: backgroundColor,
+    builder: (context) => const ConnectionDialog(),
+  );
+
+  if (result != _ConnectionDialogResult.connected || !context.mounted) {
+    return result == _ConnectionDialogResult.connected;
+  }
+
+  try {
+    await _initializeConnectedWorkspace(
+      profileWorkspaceCoordinator: context.read<ProfileWorkspaceCoordinator>(),
+      appProvider: context.read<AppProvider>(),
+    );
+  } catch (error) {
+    if (context.mounted) {
+      _showConnectionErrorSnackBar(context, error);
+    }
+  }
+
+  if (!context.mounted) {
+    return true;
+  }
+
+  if (!offerPostConnectRepeaterDiscovery) {
+    return true;
+  }
+
+  final contactsProvider = context.read<ContactsProvider>();
+  if (contactsProvider.repeaters.isNotEmpty) {
+    return true;
+  }
+
+  final l10n = AppLocalizations.of(context)!;
+  final openDiscovery = await showDialog<bool>(
+    context: context,
+    builder: (dialogContext) => AlertDialog(
+      title: Text(l10n.postConnectDiscoveryTitle),
+      content: Text(l10n.postConnectDiscoveryDescription),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(dialogContext).pop(false),
+          child: Text(l10n.continue_),
+        ),
+        FilledButton.icon(
+          onPressed: () => Navigator.of(dialogContext).pop(true),
+          icon: const Icon(Icons.router_outlined),
+          label: Text(l10n.discoverRepeaters),
+        ),
+      ],
+    ),
+  );
+
+  if (openDiscovery != true || !context.mounted) {
+    return true;
+  }
+
+  await Navigator.of(context).push(
+    MaterialPageRoute(
+      builder: (context) =>
+          const DiscoveryScreen(autoDiscoverRepeatersOnOpen: true),
+    ),
+  );
+  return true;
+}
+
 /// Connection Dialog with tabs for BLE devices and Network servers
 class ConnectionDialog extends StatefulWidget {
   const ConnectionDialog({super.key});
@@ -33,6 +134,7 @@ class _ConnectionDialogState extends State<ConnectionDialog>
   int _scannedCount = 0;
   int _totalToScan = 0;
   int _lastTabIndex = 0;
+  bool _hasRequestedBleScan = false;
   String? _connectingToServerKey;
   String? _connectingBleDeviceId;
 
@@ -40,10 +142,6 @@ class _ConnectionDialogState extends State<ConnectionDialog>
     if (_tabController.index == _lastTabIndex) return;
     _lastTabIndex = _tabController.index;
 
-    if (_tabController.index == 0) {
-      _refreshBleDevices();
-    }
-
     if (_tabController.index == 1) {
       if (_networkScanner.hasCachedResults && _discoveredServers.isEmpty) {
         setState(() {
@@ -65,11 +163,6 @@ class _ConnectionDialogState extends State<ConnectionDialog>
       listen: false,
     );
 
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!mounted) return;
-      _refreshBleDevices();
-    });
-
     _networkScanner.onServerDiscovered = (server) {
       if (!mounted) return;
       setState(() {
@@ -110,6 +203,13 @@ class _ConnectionDialogState extends State<ConnectionDialog>
   }
 
   Future<void> _refreshBleDevices() async {
+    if (!_hasRequestedBleScan && mounted) {
+      setState(() {
+        _hasRequestedBleScan = true;
+      });
+    } else {
+      _hasRequestedBleScan = true;
+    }
     await _connectionProvider.stopScan();
     if (!mounted) return;
     await _connectionProvider.startScan();
@@ -121,6 +221,16 @@ class _ConnectionDialogState extends State<ConnectionDialog>
     return Colors.red;
   }
 
+  void _closeOnSuccessfulConnection() {
+    if (!mounted) return;
+    Navigator.of(context).pop(_ConnectionDialogResult.connected);
+  }
+
+  void _showConnectionError(Object error) {
+    if (!mounted) return;
+    _showConnectionErrorSnackBar(context, error);
+  }
+
   @override
   Widget build(BuildContext context) {
     final connectionProvider = context.watch<ConnectionProvider>();
@@ -401,11 +511,13 @@ class _ConnectionDialogState extends State<ConnectionDialog>
   }
 
   Widget _buildBleDevicesTab(ConnectionProvider connectionProvider) {
+    final l10n = AppLocalizations.of(context)!;
+
     return Column(
       children: [
         _buildSectionBanner(
           icon: Icons.bluetooth_searching_rounded,
-          message: AppLocalizations.of(context)!.defaultPinInfo,
+          message: l10n.defaultPinInfo,
           onRefresh: _refreshBleDevices,
         ),
         if (connectionProvider.error != null)
@@ -418,8 +530,10 @@ class _ConnectionDialogState extends State<ConnectionDialog>
               : connectionProvider.scannedDevices.isEmpty
               ? _buildEmptyState(
                   icon: Icons.bluetooth_searching_rounded,
-                  title: AppLocalizations.of(context)!.noDevicesFound,
+                  title: _hasRequestedBleScan
-                  actionLabel: AppLocalizations.of(context)!.scanAgain,
+                      ? l10n.noDevicesFound
+                      : 'Press scan to search for nearby devices',
+                  actionLabel: _hasRequestedBleScan ? l10n.scanAgain : 'Scan',
                   onAction: _refreshBleDevices,
                 )
               : ListView.builder(
@@ -434,25 +548,25 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                     final isConnecting = _connectingBleDeviceId == deviceId;
 
                     Future<void> connectBle() async {
-                      final appProvider = context.read<AppProvider>();
-                      final profileWorkspaceCoordinator = context
-                          .read<ProfileWorkspaceCoordinator>();
                       setState(() {
                         _connectingBleDeviceId = deviceId;
                       });
                       try {
-                        Navigator.pop(context);
                         final success = await connectionProvider.connect(
                           device,
                         );
-                        if (success &&
+                        if (!success) {
-                            connectionProvider.deviceInfo.isConnected) {
+                          final name = device.platformName.isNotEmpty
-                          await _initializeConnectedWorkspace(
+                              ? device.platformName
-                            profileWorkspaceCoordinator:
+                              : 'device';
-                                profileWorkspaceCoordinator,
+                          throw Exception(
-                            appProvider: appProvider,
+                            connectionProvider.error ??
+                                'Failed to connect to $name',
                           );
                         }
+                        _closeOnSuccessfulConnection();
+                      } catch (error) {
+                        _showConnectionError(error);
                       } finally {
                         if (mounted) {
                           setState(() {
@@ -547,11 +661,6 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                     Future<void> connectServer() async {
                       final connectionProvider = context
                           .read<ConnectionProvider>();
-                      final appProvider = context.read<AppProvider>();
-                      final profileWorkspaceCoordinator = context
-                          .read<ProfileWorkspaceCoordinator>();
-                      final navigator = Navigator.of(context);
-                      final messenger = ScaffoldMessenger.of(context);
 
                       setState(() {
                         _connectingToServerKey = serverKey;
@@ -567,52 +676,23 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                           );
                         }
 
-                        await connectionProvider.connectTcp(
+                        final success = await connectionProvider.connectTcp(
                           server.ipAddress,
                           server.port,
                         );
-                        await _initializeConnectedWorkspace(
+                        if (!success) {
-                          profileWorkspaceCoordinator:
+                          throw Exception(
-                              profileWorkspaceCoordinator,
+                            connectionProvider.error ??
-                          appProvider: appProvider,
+                                'Failed to connect to ${server.ipAddress}:${server.port}',
-                        );
+                          );
-
-                        if (mounted) {
-                          navigator.pop();
                         }
+                        _closeOnSuccessfulConnection();
                       } catch (e) {
                         if (!mounted) return;
                         setState(() {
                           _connectingToServerKey = null;
                         });
-
+                        _showConnectionError(e);
-                        var errorMessage = e.toString();
-                        if (errorMessage.startsWith('Exception: ')) {
-                          errorMessage = errorMessage.substring(
-                            'Exception: '.length,
-                          );
-                        }
-                        if (errorMessage.startsWith(
-                          'Connection failed: Exception: ',
-                        )) {
-                          errorMessage = errorMessage.substring(
-                            'Connection failed: Exception: '.length,
-                          );
-                        } else if (errorMessage.startsWith(
-                          'Connection failed: ',
-                        )) {
-                          errorMessage = errorMessage.substring(
-                            'Connection failed: '.length,
-                          );
-                        }
-
-                        messenger.showSnackBar(
-                          SnackBar(
-                            content: Text(errorMessage),
-                            backgroundColor: Colors.red,
-                            duration: const Duration(seconds: 5),
-                          ),
-                        );
                       }
                     }
 
@@ -679,8 +759,10 @@ class _ConnectionDialogState extends State<ConnectionDialog>
             actionLabel: actionLabel,
             onAction: onAction,
           ),
-      onConnected: () {
+      onConnected: (result) {
-        if (mounted) Navigator.of(context).pop();
+        if (mounted) {
+          Navigator.of(context).pop(result);
+        }
       },
     );
   }
@@ -706,7 +788,7 @@ typedef _EmptyStateBuilder =
     });
 
 class _SerialDeviceList extends StatefulWidget {
-  final VoidCallback onConnected;
+  final ValueChanged<_ConnectionDialogResult> onConnected;
   final _TransportCardBuilder buildTransportCard;
   final _EmptyStateBuilder buildEmptyState;
 
@@ -801,9 +883,6 @@ class _SerialDeviceListState extends State<_SerialDeviceList> {
     setState(() => _isConnecting = true);
     try {
       final connectionProvider = context.read<ConnectionProvider>();
-      final appProvider = context.read<AppProvider>();
-      final profileWorkspaceCoordinator = context
-          .read<ProfileWorkspaceCoordinator>();
       final connection = await _transport.connect(device);
       final success = await connectionProvider.connectSerial(
         service: connection.service,
@@ -814,11 +893,7 @@ class _SerialDeviceListState extends State<_SerialDeviceList> {
       if (!mounted) return;
 
       if (success) {
-        await _initializeConnectedWorkspace(
+        widget.onConnected(_ConnectionDialogResult.connected);
-          profileWorkspaceCoordinator: profileWorkspaceCoordinator,
-          appProvider: appProvider,
-        );
-        widget.onConnected();
       } else {
         await connection.disconnect();
         connection.service.dispose();

lib/widgets/contacts/contact_tile.dart

@@ -157,6 +157,7 @@ class ContactTile extends StatelessWidget {
                       icon: Icons.folder_copy_outlined,
                       label: label,
                     ),
+                  ..._buildSignalPills(context),
                 ],
               ),
               if (location != null) ...[
@@ -324,6 +325,34 @@ class ContactTile extends StatelessWidget {
     );
   }
 
+  List<Widget> _buildSignalPills(BuildContext context) {
+    if (!contact.isRepeater && !contact.isSensor) return [];
+    final contactsProvider = context.read<ContactsProvider>();
+    final advert = contactsProvider.pendingAdvertByKey(contact.publicKey);
+    if (advert == null) return [];
+
+    final pills = <Widget>[];
+    if (advert.rxRssiDbm != null) {
+      pills.add(
+        _buildMetaPill(
+          context,
+          icon: Icons.arrow_downward_rounded,
+          label: '${advert.rxRssiDbm} dBm',
+        ),
+      );
+    }
+    if (advert.repeaterLastRssi != null) {
+      pills.add(
+        _buildMetaPill(
+          context,
+          icon: Icons.arrow_upward_rounded,
+          label: '${advert.repeaterLastRssi} dBm',
+        ),
+      );
+    }
+    return pills;
+  }
+
   Widget _buildCompactSubtitle(BuildContext context, String? distanceText) {
     final location = contact.displayLocation;
     final compactPills = <Widget>[
@@ -338,6 +367,7 @@ class ContactTile extends StatelessWidget {
           icon: Icons.location_disabled_outlined,
           label: AppLocalizations.of(context)!.noGpsData,
         ),
+      ..._buildSignalPills(context),
     ];
 
     return Padding(
@@ -513,7 +543,6 @@ class ContactTile extends StatelessWidget {
     showModalBottomSheet<void>(
       context: context,
       isScrollControlled: true,
-      showDragHandle: true,
       backgroundColor: Colors.transparent,
       builder: (sheetContext) => _ContactActionSheet(
         contact: contact,
@@ -1252,10 +1281,21 @@ class _ContactActionSheetState extends State<_ContactActionSheet> {
       child: Material(
         color: colorScheme.surface,
         child: SingleChildScrollView(
-          padding: EdgeInsets.fromLTRB(16, 8, 16, 16 + bottomInset),
+          padding: EdgeInsets.fromLTRB(16, 12, 16, 16 + bottomInset),
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: [
+              Center(
+                child: Container(
+                  width: 44,
+                  height: 4,
+                  decoration: BoxDecoration(
+                    color: colorScheme.outlineVariant,
+                    borderRadius: BorderRadius.circular(999),
+                  ),
+                ),
+              ),
+              const SizedBox(height: 12),
               Row(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
@@ -1363,17 +1403,26 @@ class _ContactActionSheetState extends State<_ContactActionSheet> {
                 const SizedBox(height: 20),
                 LayoutBuilder(
                   builder: (context, constraints) {
-                    final columnCount = widget.primaryActions.length <= 1
+                    const spacing = 12.0;
-                        ? 1
+                    const minTileWidth = 104.0;
-                        : widget.primaryActions.length == 2
+                    final actionCount = widget.primaryActions.length;
-                        ? 2
+                    final maxColumnsByWidth =
-                        : 3;
+                        ((constraints.maxWidth + spacing) /
+                                (minTileWidth + spacing))
+                            .floor()
+                            .clamp(1, 4);
+                    var columnCount = actionCount.clamp(1, maxColumnsByWidth);
+                    if (actionCount > 3 &&
+                        columnCount > 2 &&
+                        actionCount % columnCount == 1) {
+                      columnCount -= 1;
+                    }
                     final itemWidth =
-                        (constraints.maxWidth - (12 * (columnCount - 1))) /
+                        (constraints.maxWidth - (spacing * (columnCount - 1))) /
                         columnCount;
                     return Wrap(
-                      spacing: 12,
+                      spacing: spacing,
-                      runSpacing: 12,
+                      runSpacing: spacing,
                       children: [
                         for (final action in widget.primaryActions)
                           SizedBox(

lib/widgets/device/spectrum_scan_panel.dart

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

lib/widgets/map/detailed_compass_dialog.dart

@@ -1,9 +1,11 @@
 import 'dart:async';
 import 'dart:math';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart' show MissingPluginException;
 import 'package:geolocator/geolocator.dart';
 import 'package:flutter_compass/flutter_compass.dart';
 import 'package:latlong2/latlong.dart';
+import '../../services/compass_support.dart';
 import '../../models/contact.dart';
 import '../../models/sar_marker.dart';
 import '../common/location_display.dart';
@@ -90,17 +92,33 @@ class _DetailedCompassDialogState extends State<DetailedCompassDialog> {
       });
     }
 
-    // Subscribe to compass updates
+    // Subscribe to compass updates on supported targets only.
-    final compassStream = FlutterCompass.events;
+    final compassStream = CompassSupport.isAvailable
+        ? FlutterCompass.events
+        : null;
     if (compassStream != null) {
-      _compassSubscription = compassStream.listen((event) {
+      _compassSubscription = compassStream.listen(
-        if (mounted && event.heading != null) {
+        (event) {
-          setState(() {
+          if (mounted && event.heading != null) {
-            _currentHeading = event.heading;
+            setState(() {
-            _compassAccuracy = event.accuracy;
+              _currentHeading = event.heading;
-          });
+              _compassAccuracy = event.accuracy;
-        }
+            });
-      });
+          }
+        },
+        onError: (Object error, StackTrace stackTrace) {
+          if (!mounted) {
+            return;
+          }
+
+          if (error is MissingPluginException) {
+            debugPrint('Compass plugin is unavailable on this platform');
+            return;
+          }
+
+          debugPrint('Compass dialog stream error: $error');
+        },
+      );
     }
 
     // Subscribe to position updates

lib/widgets/map/trail_controls.dart

@@ -1,11 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../../models/contact.dart';
 import '../../models/location_trail.dart';
 import '../../providers/map_provider.dart';
-import '../../providers/contacts_provider.dart';
 import '../../services/gpx_service.dart';
-import '../../services/trail_color_service.dart';
 import '../../l10n/app_localizations.dart';
 
 /// Trail management controls widget
@@ -14,17 +11,8 @@ class TrailControls extends StatelessWidget {
 
   void _showTrailMenu(BuildContext context) {
     final mapProvider = Provider.of<MapProvider>(context, listen: false);
-    final contactsProvider = Provider.of<ContactsProvider>(
-      context,
-      listen: false,
-    );
     final l10n = AppLocalizations.of(context)!;
 
-    // Get contacts with trails (advertHistory >= 2 points)
-    final contactsWithTrails = contactsProvider.contactsWithLocation
-        .where((c) => c.advertHistory.length >= 2)
-        .toList();
-
     showModalBottomSheet(
       context: context,
       isScrollControlled: true,
@@ -183,110 +171,6 @@ class TrailControls extends StatelessWidget {
                     ),
                   ),
 
-                const SizedBox(height: 8),
-                const Divider(),
-                const SizedBox(height: 8),
-
-                // Contact Trails Section
-                Row(
-                  children: [
-                    const Icon(Icons.people, size: 20),
-                    SizedBox(width: 8),
-                    Text(
-                      l10n.contactTrails,
-                      style: const TextStyle(
-                        fontSize: 18,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ],
-                ),
-                const SizedBox(height: 12),
-
-                // Show All Contact Trails toggle
-                SwitchListTile(
-                  secondary: Icon(Icons.route),
-                  title: Text(l10n.showAllContactTrails),
-                  subtitle: Text(
-                    contactsWithTrails.isEmpty
-                        ? l10n.noContactsWithLocationHistory
-                        : mapProvider.showAllContactTrails
-                        ? l10n.showingTrailsForContacts(
-                            contactsWithTrails.length,
-                          )
-                        : l10n.individualContactTrails,
-                  ),
-                  value: mapProvider.showAllContactTrails,
-                  onChanged: contactsWithTrails.isNotEmpty
-                      ? (value) {
-                          mapProvider.toggleAllContactTrails();
-                          setModalState(() {}); // Update modal UI
-                        }
-                      : null, // Disable if no contacts with trails
-                ),
-
-                // Individual contact trails (when "show all" is OFF)
-                if (!mapProvider.showAllContactTrails &&
-                    contactsWithTrails.isNotEmpty)
-                  ExpansionTile(
-                    title: Text(l10n.individualContactTrails),
-                    initiallyExpanded: false,
-                    children: contactsWithTrails.map((contact) {
-                      final trailColor = TrailColorService.getTrailColor(
-                        contact,
-                      );
-                      final isVisible = mapProvider.isContactPathVisible(
-                        contact.publicKeyHex,
-                      );
-
-                      return SwitchListTile(
-                        // Color indicator with emoji
-                        secondary: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            if (contact.roleEmoji != null)
-                              Text(
-                                contact.roleEmoji!,
-                                style: const TextStyle(fontSize: 18),
-                              ),
-                            const SizedBox(width: 4),
-                            Container(
-                              width: 16,
-                              height: 16,
-                              decoration: BoxDecoration(
-                                color: trailColor,
-                                border: Border.all(
-                                  color: Colors.white,
-                                  width: 2,
-                                ),
-                                borderRadius: BorderRadius.circular(3),
-                              ),
-                            ),
-                          ],
-                        ),
-                        title: Row(
-                          children: [
-                            Expanded(child: Text(contact.displayName)),
-                            IconButton(
-                              tooltip: l10n.exportToClipboard,
-                              icon: const Icon(Icons.file_download_outlined),
-                              onPressed: () =>
-                                  _exportContactTrail(context, contact),
-                            ),
-                          ],
-                        ),
-                        subtitle: Text(
-                          '${contact.advertHistory.length} points',
-                        ),
-                        value: isVisible,
-                        onChanged: (value) {
-                          mapProvider.toggleContactPath(contact.publicKeyHex);
-                          setModalState(() {}); // Update modal UI
-                        },
-                      );
-                    }).toList(),
-                  ),
-
                 const SizedBox(height: 8),
 
                 // Close button
@@ -360,34 +244,6 @@ class TrailControls extends StatelessWidget {
     }
   }
 
-  Future<void> _exportContactTrail(BuildContext context, Contact contact) async {
-    await _exportTrail(
-      context,
-      _buildContactTrail(contact),
-      customName: '${contact.displayName} Trail',
-    );
-  }
-
-  LocationTrail _buildContactTrail(Contact contact) {
-    final sortedHistory = [...contact.advertHistory]
-      ..sort((a, b) => a.timestamp.compareTo(b.timestamp));
-
-    return LocationTrail(
-      id: 'contact_${contact.publicKeyHex}',
-      isActive: false,
-      startTime: sortedHistory.first.timestamp,
-      endTime: sortedHistory.last.timestamp,
-      points: sortedHistory
-          .map(
-            (advert) => TrailPoint(
-              position: advert.location,
-              timestamp: advert.timestamp,
-            ),
-          )
-          .toList(),
-    );
-  }
-
   void _showClearConfirmation(
     BuildContext context,
     MapProvider mapProvider,

lib/widgets/messages/message_bubble.dart

@@ -12,6 +12,7 @@ import '../../models/sar_template.dart';
 import '../../models/map_drawing.dart';
 import '../../models/map_coordinate_space.dart';
 import '../../providers/messages_provider.dart';
+import '../../providers/channels_provider.dart';
 import '../../providers/contacts_provider.dart';
 import '../../providers/connection_provider.dart';
 import '../../providers/drawing_provider.dart';
@@ -1955,10 +1956,12 @@ class _MessageBubbleState extends State<MessageBubble> {
     final isSarMarker = message.isSarMarker;
     final isDarkMode = Theme.of(context).brightness == Brightness.dark;
     final messageFontScale = context.watch<AppProvider>().messageFontScale;
+    final l10n = AppLocalizations.of(context)!;
 
     // Determine if this is own message
     final connectionProvider = context.read<ConnectionProvider>();
     final messagesProvider = context.read<MessagesProvider>();
+    final channelsProvider = context.watch<ChannelsProvider>();
     final selfPublicKey = connectionProvider.deviceInfo.publicKey;
     final isOwnMessage =
         message.isSentMessage || message.isFromSelf(selfPublicKey);
@@ -2004,7 +2007,7 @@ class _MessageBubbleState extends State<MessageBubble> {
 
     // Get rich display name (with emoji if available)
     final displayName = isOwnMessage
-        ? AppLocalizations.of(context)!.you
+        ? l10n.you
         : message.getRichDisplayName(senderContact);
 
     // Look up destination/source display labels for direct/channel messages
@@ -2039,15 +2042,30 @@ class _MessageBubbleState extends State<MessageBubble> {
         }
       }
     } else if (message.isChannelMessage) {
-      if (message.channelIdx == 0) {
+      final channelIdx = message.channelIdx ?? 0;
-        channelDisplayName = AppLocalizations.of(context)!.publicChannel;
+      if (channelIdx == 0) {
+        channelDisplayName = l10n.publicChannel;
       } else {
         final channelContact = contactsProvider.channels.where((c) {
-          return c.publicKey.length > 1 && c.publicKey[1] == message.channelIdx;
+          return c.publicKey.length > 1 && c.publicKey[1] == channelIdx;
         }).firstOrNull;
+        final syncedChannel = channelsProvider.getChannel(channelIdx);
+        final syncedChannelDisplayName =
+            syncedChannel != null && syncedChannel.hasCustomName
+            ? syncedChannel.displayName
+            : null;
+        final contactChannelDisplayName = channelContact
+            ?.getLocalizedDisplayName(context)
+            .trim();
+
         channelDisplayName =
-            channelContact?.getLocalizedDisplayName(context) ??
+            syncedChannelDisplayName ??
-            '${AppLocalizations.of(context)!.channel} ${message.channelIdx}';
+            (contactChannelDisplayName != null &&
+                    contactChannelDisplayName.isNotEmpty
+                ? contactChannelDisplayName
+                : null) ??
+            syncedChannel?.displayName ??
+            '${l10n.channel} $channelIdx';
       }
 
       if (isOwnMessage) {
@@ -2057,14 +2075,14 @@ class _MessageBubbleState extends State<MessageBubble> {
 
     final recipientSubtitle =
         isOwnMessage && message.isChannelMessage && recipientDisplayName != null
-        ? '${AppLocalizations.of(context)!.channel}: $recipientDisplayName'
+        ? '${l10n.channel}: $recipientDisplayName'
         : recipientDisplayName;
     final directCounterpartLabel = !message.isChannelMessage
-        ? (isOwnMessage ? recipientSubtitle : AppLocalizations.of(context)!.you)
+        ? (isOwnMessage ? recipientSubtitle : l10n.you)
         : null;
     final receivedChannelSubtitle =
         !isOwnMessage && message.isChannelMessage && channelDisplayName != null
-        ? '${AppLocalizations.of(context)!.channel}: $channelDisplayName'
+        ? '${l10n.channel}: $channelDisplayName'
         : null;
 
     final shouldFloatBubble = widget.isCompact;

lib/widgets/messages/messages_composer.dart

@@ -27,6 +27,8 @@ class MessagesComposer extends StatelessWidget {
   final Future<void> Function() onStartVoiceRecording;
   final Future<void> Function() onStopAndSendVoice;
   final Future<void> Function() onSendMessage;
+  final String? regionScopeName;
+  final VoidCallback? onRegionScopeTap;
 
   const MessagesComposer({
     super.key,
@@ -49,6 +51,8 @@ class MessagesComposer extends StatelessWidget {
     required this.onStartVoiceRecording,
     required this.onStopAndSendVoice,
     required this.onSendMessage,
+    this.regionScopeName,
+    this.onRegionScopeTap,
   });
 
   @override
@@ -102,6 +106,14 @@ class MessagesComposer extends StatelessWidget {
                                 ? onStopAndSendVoice
                                 : onShowComposerActions,
                           ),
+                          if (regionScopeName != null &&
+                              onRegionScopeTap != null) ...[
+                            const SizedBox(width: 6),
+                            _RegionScopeChip(
+                              name: regionScopeName!,
+                              onTap: onRegionScopeTap!,
+                            ),
+                          ],
                           const SizedBox(width: 8),
                           Expanded(
                             child: _DestinationSelector(
@@ -534,3 +546,52 @@ class _SendButton extends StatelessWidget {
     );
   }
 }
+
+class _RegionScopeChip extends StatelessWidget {
+  final String name;
+  final VoidCallback onTap;
+
+  const _RegionScopeChip({required this.name, required this.onTap});
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return GestureDetector(
+      onTap: onTap,
+      child: Container(
+        height: 40,
+        padding: const EdgeInsets.symmetric(horizontal: 10),
+        decoration: BoxDecoration(
+          color: colorScheme.tertiaryContainer,
+          borderRadius: BorderRadius.circular(20),
+          border: Border.all(
+            color: colorScheme.tertiary.withValues(alpha: 0.3),
+          ),
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(
+              Icons.language_rounded,
+              size: 16,
+              color: colorScheme.onTertiaryContainer,
+            ),
+            const SizedBox(width: 4),
+            ConstrainedBox(
+              constraints: const BoxConstraints(maxWidth: 80),
+              child: Text(
+                name,
+                style: TextStyle(
+                  fontSize: 12,
+                  fontWeight: FontWeight.w600,
+                  color: colorScheme.onTertiaryContainer,
+                ),
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/widgets/messages/recipient_selector_sheet.dart

@@ -1,7 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 import '../../l10n/app_localizations.dart';
 import '../../models/contact.dart';
+import '../../providers/messages_provider.dart';
+import '../../utils/avatar_label_helper.dart';
 import '../common/contact_avatar.dart';
 
 enum _RecipientSortMode { activity, favorites, alphabetical }
@@ -17,6 +20,10 @@ class RecipientSelectorSheet extends StatefulWidget {
   final String? currentRecipientPublicKey;
   final bool showAllOption;
   final Function(String type, Contact? recipient) onSelect;
+  final MessagesProvider? messagesProvider;
+
+  /// Region scope names per channel index (e.g. {0: "#auckland"}).
+  final Map<int, String> channelRegionScopes;
 
   const RecipientSelectorSheet({
     super.key,
@@ -29,6 +36,8 @@ class RecipientSelectorSheet extends StatefulWidget {
     this.currentRecipientPublicKey,
     this.showAllOption = true,
     required this.onSelect,
+    this.messagesProvider,
+    this.channelRegionScopes = const {},
   });
 
   @override
@@ -87,6 +96,9 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
           return lastSeenCompare;
         }
       } else if (_sortMode == _RecipientSortMode.activity) {
+        if (a.isFavourite != b.isFavourite) {
+          return a.isFavourite ? -1 : 1;
+        }
         final unreadCompare = _unreadFor(b).compareTo(_unreadFor(a));
         if (unreadCompare != 0) {
           return unreadCompare;
@@ -147,10 +159,184 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
     }
   }
 
+  String _sectionDescription(AppLocalizations l10n, String type) {
+    switch (type) {
+      case 'channel':
+        return 'Broadcast lanes for nearby mesh traffic';
+      case 'room':
+        return 'Shared spaces for ongoing team coordination';
+      case 'contact':
+        return 'Direct people and devices you can reach';
+      default:
+        return '';
+    }
+  }
+
+  MessagesProvider? _resolveMessagesProvider(BuildContext context) {
+    if (widget.messagesProvider != null) {
+      return widget.messagesProvider;
+    }
+
+    try {
+      return Provider.of<MessagesProvider>(context);
+    } on ProviderNotFoundException {
+      return null;
+    }
+  }
+
+  String _formatRelativeTime(BuildContext context, DateTime when) {
+    final l10n = AppLocalizations.of(context)!;
+    final diff = DateTime.now().difference(when);
+
+    if (diff.inMinutes < 1) return l10n.justNow;
+    if (diff.inMinutes < 60) return l10n.minutesAgo(diff.inMinutes);
+    if (diff.inHours < 24) return l10n.hoursAgo(diff.inHours);
+    return l10n.daysAgo(diff.inDays);
+  }
+
+  _ChannelPreviewData _channelPreviewData(
+    BuildContext context,
+    Contact channel,
+    MessagesProvider? messagesProvider,
+  ) {
+    if (messagesProvider == null) {
+      return const _ChannelPreviewData();
+    }
+
+    final lastActivityAt = messagesProvider.getLastActivityForDestination(
+      channel,
+    );
+    final channelIdx = channel.publicKey.length > 1 ? channel.publicKey[1] : 0;
+    final channelMessages = messagesProvider.getMessagesForChannel(channelIdx)
+      ..sort((a, b) => b.sentAt.compareTo(a.sentAt));
+    final participantNames = <String>[];
+
+    for (final message in channelMessages) {
+      final senderName = message.senderName?.trim();
+      if (senderName == null || senderName.isEmpty) {
+        continue;
+      }
+      if (!participantNames.contains(senderName)) {
+        participantNames.add(senderName);
+      }
+    }
+
+    return _ChannelPreviewData(
+      activityLabel: lastActivityAt == null
+          ? null
+          : _formatRelativeTime(context, lastActivityAt),
+      participantNames: participantNames,
+    );
+  }
+
+  Contact? _findParticipantContact(String name) {
+    final normalizedName = name.trim();
+
+    for (final contact in widget.contacts) {
+      if (!contact.isChannel && contact.advName.trim() == normalizedName) {
+        return contact;
+      }
+    }
+
+    for (final contact in widget.contacts) {
+      if (!contact.isChannel && contact.displayName.trim() == normalizedName) {
+        return contact;
+      }
+    }
+
+    return null;
+  }
+
+  String _contactActivityLabel(
+    BuildContext context,
+    Contact contact,
+    MessagesProvider? messagesProvider,
+  ) {
+    final lastActivityAt =
+        messagesProvider?.getLastActivityForDestination(contact) ??
+        contact.lastSeenTime;
+
+    return _formatRelativeTime(context, lastActivityAt);
+  }
+
+  Widget _buildTextSubtitle(
+    BuildContext context,
+    Contact contact,
+    String subtitle,
+  ) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Text(
+      subtitle,
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+      style: Theme.of(context).textTheme.bodySmall?.copyWith(
+        color: colorScheme.onSurfaceVariant,
+        fontFamily: contact.isChannel ? null : 'monospace',
+      ),
+    );
+  }
+
+  Widget _buildChannelSubtitle(
+    BuildContext context,
+    Contact channel,
+    _ChannelPreviewData previewData,
+  ) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    if (previewData.participantNames.isEmpty) {
+      return Text(
+        'No recent chatters',
+        maxLines: 1,
+        overflow: TextOverflow.ellipsis,
+        style: Theme.of(
+          context,
+        ).textTheme.bodySmall?.copyWith(color: colorScheme.onSurfaceVariant),
+      );
+    }
+
+    return Row(
+      children: [
+        _ParticipantAvatarStack(
+          key: Key('channel-participants-${channel.publicKeyHex}'),
+          names: previewData.participantNames,
+          contactForName: _findParticipantContact,
+        ),
+      ],
+    );
+  }
+
+  Widget _buildChannelRecipientCard(
+    BuildContext context,
+    Contact channel,
+    MessagesProvider? messagesProvider,
+  ) {
+    final previewData = _channelPreviewData(context, channel, messagesProvider);
+
+    return _buildRecipientCard(
+      context: context,
+      type: 'channel',
+      contact: channel,
+      title: channel.getLocalizedDisplayName(context),
+      subtitle: _buildChannelSubtitle(context, channel, previewData),
+      unreadCount: _unreadFor(channel),
+      isSelected: _isSelected('channel', channel),
+      compact: true,
+      activityLabel: previewData.activityLabel,
+      onTap: () {
+        widget.onSelect('channel', channel);
+        Navigator.pop(context);
+      },
+    );
+  }
+
+  bool _isDenseSection(String type) => type == 'channel' || type == 'contact';
+
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     final colorScheme = Theme.of(context).colorScheme;
+    final messagesProvider = _resolveMessagesProvider(context);
     final filteredContacts = _filterAndSortContacts(widget.contacts);
     final filteredRooms = _filterAndSortContacts(widget.rooms);
     final filteredChannels = _filterAndSortContacts(
@@ -194,21 +380,45 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
                 ),
                 const SizedBox(height: 12),
                 Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Expanded(
-                      child: Text(
+                      child: Column(
-                        l10n.selectRecipient,
+                        crossAxisAlignment: CrossAxisAlignment.start,
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                        children: [
-                          fontWeight: FontWeight.w900,
+                          Text(
-                          letterSpacing: -0.5,
+                            l10n.selectRecipient,
-                        ),
+                            style: Theme.of(context).textTheme.titleLarge
+                                ?.copyWith(
+                                  fontWeight: FontWeight.w900,
+                                  letterSpacing: -0.5,
+                                ),
+                          ),
+                          const SizedBox(height: 4),
+                          Text(
+                            'Pick a channel, room, or direct contact.',
+                            style: Theme.of(context).textTheme.bodyMedium
+                                ?.copyWith(color: colorScheme.onSurfaceVariant),
+                          ),
+                        ],
                       ),
                     ),
                     const SizedBox(width: 12),
-                    IconButton.filledTonal(
+                    Container(
-                      onPressed: () => Navigator.pop(context),
+                      decoration: BoxDecoration(
-                      tooltip: l10n.close,
+                        color: colorScheme.surfaceContainerHigh,
-                      icon: const Icon(Icons.close_rounded),
+                        borderRadius: BorderRadius.circular(18),
+                        border: Border.all(
+                          color: colorScheme.outlineVariant.withValues(
+                            alpha: 0.18,
+                          ),
+                        ),
+                      ),
+                      child: IconButton(
+                        onPressed: () => Navigator.pop(context),
+                        tooltip: l10n.close,
+                        icon: const Icon(Icons.close_rounded),
+                      ),
                     ),
                   ],
                 ),
@@ -273,20 +483,10 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
                     emptyLabel: l10n.noChannelsFound,
                     children: [
                       for (final channel in filteredChannels)
-                        _buildRecipientCard(
+                        _buildChannelRecipientCard(
-                          context: context,
+                          context,
-                          type: 'channel',
+                          channel,
-                          contact: channel,
+                          messagesProvider,
-                          title: channel.getLocalizedDisplayName(context),
-                          subtitle: channel.isPublicChannel
-                              ? l10n.broadcastToAllNearby
-                              : '${l10n.channel} ${channel.publicKey[1]}',
-                          unreadCount: _unreadFor(channel),
-                          isSelected: _isSelected('channel', channel),
-                          onTap: () {
-                            widget.onSelect('channel', channel);
-                            Navigator.pop(context);
-                          },
                         ),
                     ],
                   ),
@@ -305,9 +505,14 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
                           type: 'contact',
                           contact: contact,
                           title: contact.displayName,
-                          subtitle: contact.publicKeyShort,
+                          activityLabel: _contactActivityLabel(
+                            context,
+                            contact,
+                            messagesProvider,
+                          ),
                           unreadCount: _unreadFor(contact),
                           isSelected: _isSelected('contact', contact),
+                          compact: true,
                           onTap: () {
                             widget.onSelect('contact', contact);
                             Navigator.pop(context);
@@ -330,7 +535,11 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
                           type: 'room',
                           contact: room,
                           title: room.displayName,
-                          subtitle: room.publicKeyShort,
+                          subtitle: _buildTextSubtitle(
+                            context,
+                            room,
+                            room.publicKeyShort,
+                          ),
                           unreadCount: _unreadFor(room),
                           isSelected: _isSelected('room', room),
                           onTap: () {
@@ -455,10 +664,11 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
   }) {
     final colorScheme = Theme.of(context).colorScheme;
     final accentColor = _sectionColor(context, type);
+    final compact = _isDenseSection(type);
 
     return Container(
       margin: const EdgeInsets.only(bottom: 12),
-      padding: const EdgeInsets.all(14),
+      padding: EdgeInsets.all(compact ? 12 : 14),
       decoration: BoxDecoration(
         color: colorScheme.surfaceContainerLow,
         borderRadius: BorderRadius.circular(24),
@@ -470,16 +680,16 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
           Row(
             children: [
               Container(
-                width: 38,
+                width: compact ? 34 : 38,
-                height: 38,
+                height: compact ? 34 : 38,
                 decoration: BoxDecoration(
                   color: accentColor.withValues(alpha: 0.12),
                   borderRadius: BorderRadius.circular(12),
                 ),
                 alignment: Alignment.center,
-                child: Icon(icon, size: 18, color: accentColor),
+                child: Icon(icon, size: compact ? 16 : 18, color: accentColor),
               ),
-              const SizedBox(width: 10),
+              SizedBox(width: compact ? 8 : 10),
               Expanded(
                 child: Text(
                   title,
@@ -490,9 +700,9 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
                 ),
               ),
               Container(
-                padding: const EdgeInsets.symmetric(
+                padding: EdgeInsets.symmetric(
-                  horizontal: 10,
+                  horizontal: compact ? 9 : 10,
-                  vertical: 5,
+                  vertical: compact ? 4 : 5,
                 ),
                 decoration: BoxDecoration(
                   color: colorScheme.surface,
@@ -511,7 +721,14 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
               ),
             ],
           ),
-          const SizedBox(height: 12),
+          const SizedBox(height: 8),
+          Text(
+            _sectionDescription(AppLocalizations.of(context)!, type),
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+              color: colorScheme.onSurfaceVariant,
+            ),
+          ),
+          SizedBox(height: compact ? 10 : 12),
           if (children.isEmpty)
             Padding(
               padding: const EdgeInsets.symmetric(vertical: 8),
@@ -526,7 +743,7 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
           else ...[
             for (var i = 0; i < children.length; i++) ...[
               children[i],
-              if (i != children.length - 1) const SizedBox(height: 8),
+              if (i != children.length - 1) SizedBox(height: compact ? 6 : 8),
             ],
           ],
         ],
@@ -620,9 +837,11 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
     required String type,
     required Contact contact,
     required String title,
-    required String subtitle,
+    Widget? subtitle,
     required int unreadCount,
     required bool isSelected,
+    bool compact = false,
+    String? activityLabel,
     required VoidCallback onTap,
   }) {
     final colorScheme = Theme.of(context).colorScheme;
@@ -631,14 +850,14 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
     return Material(
       color: Colors.transparent,
       child: InkWell(
-        borderRadius: BorderRadius.circular(20),
+        borderRadius: BorderRadius.circular(compact ? 18 : 20),
         onTap: onTap,
         child: Ink(
           decoration: BoxDecoration(
             color: isSelected
                 ? accentColor.withValues(alpha: 0.12)
                 : colorScheme.surface.withValues(alpha: 0.82),
-            borderRadius: BorderRadius.circular(20),
+            borderRadius: BorderRadius.circular(compact ? 18 : 20),
             border: Border.all(
               color: isSelected
                   ? accentColor.withValues(alpha: 0.24)
@@ -646,7 +865,7 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
             ),
           ),
           child: Padding(
-            padding: const EdgeInsets.all(12),
+            padding: EdgeInsets.all(compact ? 10 : 12),
             child: Row(
               children: [
                 Stack(
@@ -654,15 +873,15 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
                   children: [
                     ContactAvatar(
                       contact: contact,
-                      radius: 22,
+                      radius: compact ? 20 : 22,
                       displayName: title,
                     ),
                     Positioned(
                       right: -3,
                       bottom: -3,
                       child: Container(
-                        width: 18,
+                        width: compact ? 16 : 18,
-                        height: 18,
+                        height: compact ? 16 : 18,
                         decoration: BoxDecoration(
                           color: colorScheme.surface,
                           shape: BoxShape.circle,
@@ -673,41 +892,87 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
                         alignment: Alignment.center,
                         child: Icon(
                           _typeIcon(contact),
-                          size: 10,
+                          size: compact ? 9 : 10,
                           color: accentColor,
                         ),
                       ),
                     ),
                   ],
                 ),
-                const SizedBox(width: 12),
+                SizedBox(width: compact ? 10 : 12),
                 Expanded(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      Text(
+                      Row(
-                        title,
+                        crossAxisAlignment: CrossAxisAlignment.start,
-                        maxLines: 1,
+                        children: [
-                        overflow: TextOverflow.ellipsis,
+                          Expanded(
-                        style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                            child: Row(
-                          fontWeight: FontWeight.w800,
+                              children: [
-                          letterSpacing: -0.2,
+                                Flexible(
-                        ),
+                                  child: Text(
+                                    title,
+                                    maxLines: 1,
+                                    overflow: TextOverflow.ellipsis,
+                                    style: Theme.of(context)
+                                        .textTheme
+                                        .titleSmall
+                                        ?.copyWith(
+                                          fontWeight: FontWeight.w800,
+                                          letterSpacing: -0.2,
+                                        ),
+                                  ),
+                                ),
+                                if (contact.isPublicChannel) ...[
+                                  SizedBox(width: compact ? 6 : 8),
+                                  Container(
+                                    padding: EdgeInsets.symmetric(
+                                      horizontal: compact ? 7 : 8,
+                                      vertical: compact ? 2 : 3,
+                                    ),
+                                    decoration: BoxDecoration(
+                                      color: accentColor.withValues(
+                                        alpha: 0.10,
+                                      ),
+                                      borderRadius: BorderRadius.circular(999),
+                                    ),
+                                    child: Text(
+                                      'Public',
+                                      style: Theme.of(context)
+                                          .textTheme
+                                          .labelSmall
+                                          ?.copyWith(
+                                            color: accentColor,
+                                            fontWeight: FontWeight.w800,
+                                          ),
+                                    ),
+                                  ),
+                                ],
+                              ],
+                            ),
+                          ),
+                          if (activityLabel != null) ...[
+                            SizedBox(width: compact ? 8 : 10),
+                            Text(
+                              activityLabel,
+                              style: Theme.of(context).textTheme.labelSmall
+                                  ?.copyWith(
+                                    color: colorScheme.onSurfaceVariant,
+                                    fontWeight: FontWeight.w700,
+                                  ),
+                            ),
+                          ],
+                        ],
                       ),
-                      const SizedBox(height: 4),
+                      if (subtitle != null) ...[
-                      Text(
+                        SizedBox(height: compact ? 2 : 4),
                         subtitle,
-                        maxLines: 1,
+                      ],
-                        overflow: TextOverflow.ellipsis,
-                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                          color: colorScheme.onSurfaceVariant,
-                          fontFamily: contact.isChannel ? null : 'monospace',
-                        ),
-                      ),
                     ],
                   ),
                 ),
-                const SizedBox(width: 10),
+                SizedBox(width: compact ? 8 : 10),
                 _buildTrailing(
                   context,
                   unreadCount: unreadCount,
@@ -759,3 +1024,140 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
     );
   }
 }
+
+class _ChannelPreviewData {
+  final String? activityLabel;
+  final List<String> participantNames;
+
+  const _ChannelPreviewData({
+    this.activityLabel,
+    this.participantNames = const <String>[],
+  });
+}
+
+class _ParticipantAvatarStack extends StatelessWidget {
+  final List<String> names;
+  final Contact? Function(String name) contactForName;
+  static const int _visibleCount = 4;
+
+  const _ParticipantAvatarStack({
+    super.key,
+    required this.names,
+    required this.contactForName,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final visibleNames = names.take(_visibleCount).toList();
+    final overflowCount = names.length - visibleNames.length;
+    const avatarSize = 20.0;
+    const spacing = 14.0;
+    final itemCount = visibleNames.length + (overflowCount > 0 ? 1 : 0);
+    final width = itemCount == 0 ? 0.0 : avatarSize + (itemCount - 1) * spacing;
+
+    return SizedBox(
+      width: width,
+      height: avatarSize,
+      child: Stack(
+        clipBehavior: Clip.none,
+        children: [
+          for (var i = 0; i < visibleNames.length; i++)
+            Positioned(
+              left: i * spacing,
+              top: 0,
+              child: _ParticipantAvatar(
+                name: visibleNames[i],
+                contact: contactForName(visibleNames[i]),
+              ),
+            ),
+          if (overflowCount > 0)
+            Positioned(
+              left: visibleNames.length * spacing,
+              top: 0,
+              child: _ParticipantOverflowAvatar(count: overflowCount),
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+class _ParticipantOverflowAvatar extends StatelessWidget {
+  final int count;
+
+  const _ParticipantOverflowAvatar({required this.count});
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Container(
+      width: 20,
+      height: 20,
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceContainerHighest,
+        shape: BoxShape.circle,
+        border: Border.all(color: colorScheme.surface, width: 2),
+      ),
+      alignment: Alignment.center,
+      child: Text(
+        '+$count',
+        style: Theme.of(context).textTheme.labelSmall?.copyWith(
+          fontWeight: FontWeight.w700,
+          color: colorScheme.onSurface,
+          fontSize: 8,
+        ),
+      ),
+    );
+  }
+}
+
+class _ParticipantAvatar extends StatelessWidget {
+  final String name;
+  final Contact? contact;
+
+  const _ParticipantAvatar({required this.name, required this.contact});
+
+  @override
+  Widget build(BuildContext context) {
+    if (contact != null) {
+      final surfaceColor = Theme.of(context).colorScheme.surface;
+
+      return SizedBox(
+        width: 20,
+        height: 20,
+        child: DecoratedBox(
+          decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            border: Border.all(color: surfaceColor, width: 2),
+          ),
+          child: Padding(
+            padding: const EdgeInsets.all(2),
+            child: ClipOval(child: ContactAvatar(contact: contact!, radius: 6)),
+          ),
+        ),
+      );
+    }
+
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Container(
+      width: 20,
+      height: 20,
+      decoration: BoxDecoration(
+        color: colorScheme.tertiaryContainer,
+        shape: BoxShape.circle,
+        border: Border.all(color: colorScheme.surface, width: 2),
+      ),
+      alignment: Alignment.center,
+      child: Text(
+        AvatarLabelHelper.buildLabel(name),
+        style: Theme.of(context).textTheme.labelSmall?.copyWith(
+          fontWeight: FontWeight.w700,
+          color: colorScheme.onTertiaryContainer,
+          fontSize: 8,
+        ),
+      ),
+    );
+  }
+}

lib/widgets/sensors/sensor_telemetry_card.dart

@@ -1,6 +1,7 @@
 import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_map/flutter_map.dart' as flutter_map;
 import 'package:latlong2/latlong.dart';
 
@@ -547,12 +548,15 @@ SensorMetricCardData? _buildOptionPreviewCardData(
         fieldKey: fieldKey,
         icon: Icons.explore_outlined,
         label: label,
-        value: previewValue,
+        value: degrees == null
+            ? previewValue
+            : '${_formatPreviewNumber(degrees, maxFractionDigits: 0)}°',
         secondaryValue: degrees == null
             ? null
             : _previewFormatCardinalDirection(degrees),
         accent: const Color(0xFF8A5A44),
         channel: metricKey.channel,
+        directionDegrees: degrees,
       );
     case 'unixtime':
       return SensorMetricCardData(
@@ -1007,6 +1011,13 @@ String _formatPreviewNumber(num value, {int maxFractionDigits = 2}) {
       ? math.min(maxFractionDigits, 1)
       : maxFractionDigits;
   final text = value.toStringAsFixed(digits);
+  return _trimFractionZeros(text);
+}
+
+String _trimFractionZeros(String text) {
+  if (!text.contains('.')) {
+    return text;
+  }
   return text.replaceFirst(RegExp(r'\.?0+$'), '');
 }
 
@@ -1030,6 +1041,8 @@ class SensorTelemetryCard extends StatelessWidget {
   final Future<void> Function()? onRefresh;
   final VoidCallback? onCustomize;
   final Future<void> Function(Contact contact)? onShowMetHistory;
+  final Future<void> Function()? onMoveUp;
+  final Future<void> Function()? onMoveDown;
   final EdgeInsetsGeometry margin;
   final String emptyMetricsMessage;
   final Map<String, String> labelOverrides;
@@ -1045,6 +1058,8 @@ class SensorTelemetryCard extends StatelessWidget {
     this.onRefresh,
     this.onCustomize,
     this.onShowMetHistory,
+    this.onMoveUp,
+    this.onMoveDown,
     this.margin = const EdgeInsets.only(bottom: 16),
     this.emptyMetricsMessage =
         'All fields are hidden. Use Visible fields to choose what to show.',
@@ -1055,6 +1070,9 @@ class SensorTelemetryCard extends StatelessWidget {
       onRefresh != null ||
       onCustomize != null ||
       onRemove != null ||
+      onMoveUp != null ||
+      onMoveDown != null ||
+      _rawTelemetryHex(contact?.telemetry) != null ||
       (contact != null &&
           onShowMetHistory != null &&
           supportsBTHomeMetHistory(contact));
@@ -1136,21 +1154,21 @@ class SensorTelemetryCard extends StatelessWidget {
                             ),
                             if (state == SensorRefreshState.refreshing)
                               _InlineStateMeta(
-                                label: l10n.refreshing,
                                 color: Color(0xFF266AC2),
                                 spinning: true,
+                                tooltip: l10n.refreshing,
                               ),
                             if (state == SensorRefreshState.success)
                               const _InlineStateMeta(
-                                label: 'Updated',
                                 color: Color(0xFF218B63),
                                 icon: Icons.check_circle,
+                                tooltip: 'Updated',
                               ),
                             if (state == SensorRefreshState.unavailable)
                               _InlineStateMeta(
-                                label: l10n.unavailable,
                                 color: Color(0xFFB13B55),
                                 icon: Icons.error_outline,
+                                tooltip: l10n.unavailable,
                               ),
                           ],
                         ),
@@ -1163,6 +1181,26 @@ class SensorTelemetryCard extends StatelessWidget {
                     onSelected: (value) async {
                       if (value == 'refresh' && onRefresh != null) {
                         await onRefresh!();
+                      } else if (value == 'move_up' && onMoveUp != null) {
+                        await onMoveUp!();
+                      } else if (value == 'move_down' && onMoveDown != null) {
+                        await onMoveDown!();
+                      } else if (value == 'copy_raw') {
+                        final rawTelemetry = _rawTelemetryHex(
+                          contact?.telemetry,
+                        );
+                        if (rawTelemetry != null && context.mounted) {
+                          await Clipboard.setData(
+                            ClipboardData(text: rawTelemetry),
+                          );
+                          if (context.mounted) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              const SnackBar(
+                                content: Text('Raw response copied'),
+                              ),
+                            );
+                          }
+                        }
                       } else if (value == 'remove' && onRemove != null) {
                         await onRemove!();
                       } else if (value == 'customize' && onCustomize != null) {
@@ -1183,6 +1221,30 @@ class SensorTelemetryCard extends StatelessWidget {
                           ),
                         );
                       }
+                      if (onMoveUp != null) {
+                        items.add(
+                          const PopupMenuItem<String>(
+                            value: 'move_up',
+                            child: Text('Move up'),
+                          ),
+                        );
+                      }
+                      if (onMoveDown != null) {
+                        items.add(
+                          const PopupMenuItem<String>(
+                            value: 'move_down',
+                            child: Text('Move down'),
+                          ),
+                        );
+                      }
+                      if (_rawTelemetryHex(contact?.telemetry) != null) {
+                        items.add(
+                          const PopupMenuItem<String>(
+                            value: 'copy_raw',
+                            child: Text('Copy raw response'),
+                          ),
+                        );
+                      }
                       if (onCustomize != null) {
                         items.add(
                           PopupMenuItem<String>(
@@ -1811,10 +1873,11 @@ class SensorTelemetryCard extends StatelessWidget {
           fieldKey: _extraFieldKey(rawKey),
           icon: Icons.explore_outlined,
           label: label,
-          value: '${_formatNumber(degrees, maxFractionDigits: 0)} deg',
+          value: '${_formatNumber(degrees, maxFractionDigits: 0)}°',
           secondaryValue: _formatCardinalDirection(degrees),
           accent: const Color(0xFF8A5A44),
           channel: metricKey.channel,
+          directionDegrees: degrees,
         );
 
       case 'rotation':
@@ -2054,7 +2117,7 @@ class SensorTelemetryCard extends StatelessWidget {
         ? math.min(maxFractionDigits, 1)
         : maxFractionDigits;
     final text = value.toStringAsFixed(digits);
-    return text.replaceFirst(RegExp(r'\.?0+$'), '');
+    return _trimFractionZeros(text);
   }
 
   _Vector3? _asVector3(dynamic value) {
@@ -2118,31 +2181,28 @@ class SensorTelemetryCard extends StatelessWidget {
 }
 
 class _InlineStateMeta extends StatelessWidget {
-  final String label;
   final Color color;
   final IconData? icon;
   final bool spinning;
+  final String? tooltip;
 
   const _InlineStateMeta({
-    required this.label,
     required this.color,
     this.icon,
     this.spinning = false,
+    this.tooltip,
   });
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    final badge = Container(
       padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
       decoration: BoxDecoration(
         color: color.withValues(alpha: 0.10),
         borderRadius: BorderRadius.circular(999),
       ),
-      child: Row(
+      child: spinning
-        mainAxisSize: MainAxisSize.min,
+          ? SizedBox(
-        children: [
-          if (spinning)
-            SizedBox(
               width: 11,
               height: 11,
               child: CircularProgressIndicator(
@@ -2150,18 +2210,20 @@ class _InlineStateMeta extends StatelessWidget {
                 valueColor: AlwaysStoppedAnimation<Color>(color),
               ),
             )
-          else if (icon != null)
+          : Icon(
-            Icon(icon, size: 11, color: color),
+              icon ?? Icons.info_outline,
-          const SizedBox(width: 4),
+              size: 11,
-          Text(
-            label,
-            style: Theme.of(context).textTheme.labelSmall?.copyWith(
               color: color,
-              fontWeight: FontWeight.w700,
             ),
-          ),
+    );
-        ],
+
-      ),
+    if (tooltip == null || tooltip!.isEmpty) {
+      return badge;
+    }
+
+    return Tooltip(
+      message: tooltip!,
+      child: badge,
     );
   }
 }
@@ -2292,7 +2354,40 @@ class SensorMetricTile extends StatelessWidget {
             borderRadius: BorderRadius.circular(22),
             border: Border.all(color: data.accent.withValues(alpha: 0.14)),
           ),
-          child: data.mapLocation == null || !allowMapPreview
+          child: data.directionDegrees != null
+              ? Stack(
+                  children: [
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        _DirectionDial(
+                          accent: data.accent,
+                          degrees: data.directionDegrees!,
+                          cardinal: data.secondaryValue ?? '',
+                          compact: true,
+                        ),
+                        const SizedBox(width: 10),
+                        Expanded(
+                          child: _MetricText(data: data, keyPrefix: keyPrefix),
+                        ),
+                      ],
+                    ),
+                    if (data.channel != null)
+                      Positioned(
+                        right: 0,
+                        bottom: 0,
+                        child: Text(
+                          'ch${data.channel}',
+                          style: TextStyle(
+                            fontSize: 9,
+                            fontWeight: FontWeight.w700,
+                            color: data.accent.withValues(alpha: 0.5),
+                          ),
+                        ),
+                      ),
+                  ],
+                )
+              : data.mapLocation == null || !allowMapPreview
               ? Stack(
                   children: [
                     Row(
@@ -2456,6 +2551,10 @@ class _MetricText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    if (data.directionDegrees != null) {
+      return _DirectionMetricText(data: data);
+    }
+
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -2495,12 +2594,138 @@ class _MetricText extends StatelessWidget {
   }
 }
 
+class _DirectionMetricText extends StatelessWidget {
+  final SensorMetricCardData data;
+
+  const _DirectionMetricText({required this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final directionLabel = data.secondaryValue ?? '';
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        Text(
+          data.label,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: theme.textTheme.labelMedium?.copyWith(
+            color: data.accent,
+            fontWeight: FontWeight.w700,
+          ),
+        ),
+        const SizedBox(height: 4),
+        Wrap(
+          spacing: 8,
+          runSpacing: 4,
+          crossAxisAlignment: WrapCrossAlignment.center,
+          children: [
+            Text(
+              data.value,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: theme.textTheme.titleSmall?.copyWith(
+                fontWeight: FontWeight.w800,
+                height: 1.1,
+              ),
+            ),
+            if (directionLabel.isNotEmpty)
+              Text(
+                directionLabel,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: theme.textTheme.titleSmall?.copyWith(
+                  color: data.accent.withValues(alpha: 0.9),
+                  fontWeight: FontWeight.w800,
+                  height: 1.1,
+                ),
+              ),
+          ],
+        ),
+      ],
+    );
+  }
+}
+
+class _DirectionDial extends StatelessWidget {
+  final Color accent;
+  final double degrees;
+  final String cardinal;
+  final bool compact;
+
+  const _DirectionDial({
+    required this.accent,
+    required this.degrees,
+    required this.cardinal,
+    this.compact = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final normalized = ((degrees % 360) + 360) % 360;
+    final size = compact ? 34.0 : 44.0;
+    final innerSize = compact ? 24.0 : 30.0;
+    final arrowSize = compact ? 14.0 : 16.0;
+    final northTop = compact ? 1.0 : 3.0;
+
+    return SizedBox(
+      width: size,
+      height: size,
+      child: Stack(
+        alignment: Alignment.center,
+        children: [
+          Container(
+            width: size,
+            height: size,
+            decoration: BoxDecoration(
+              color: accent.withValues(alpha: 0.08),
+              shape: BoxShape.circle,
+              border: Border.all(color: accent.withValues(alpha: 0.2)),
+            ),
+          ),
+          Container(
+            width: innerSize,
+            height: innerSize,
+            decoration: BoxDecoration(
+              shape: BoxShape.circle,
+              border: Border.all(color: accent.withValues(alpha: 0.2)),
+            ),
+          ),
+          Transform.rotate(
+            angle: normalized * math.pi / 180,
+            child: Icon(
+              Icons.navigation_rounded,
+              size: arrowSize,
+              color: accent,
+            ),
+          ),
+          Positioned(
+            top: northTop,
+            child: Text(
+              'N',
+              style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                color: accent.withValues(alpha: 0.65),
+                fontWeight: FontWeight.w800,
+                fontSize: compact ? 7.5 : 9,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
 class SensorMetricCardData {
   final String fieldKey;
   final IconData icon;
   final String label;
   final String value;
   final String? secondaryValue;
+  final double? directionDegrees;
   final Color accent;
   final bool wide;
   final LatLng? mapLocation;
@@ -2512,6 +2737,7 @@ class SensorMetricCardData {
     required this.label,
     required this.value,
     this.secondaryValue,
+    this.directionDegrees,
     required this.accent,
     this.wide = false,
     this.mapLocation,
@@ -2543,13 +2769,20 @@ class _RgbColor {
 }
 
 const String _telemetrySourceChannelPrefix = '__source_channel:';
+const String _rawTelemetryHexKey = '__raw_lpp_hex';
 
 String _extraFieldKey(String label) {
   return 'extra:$label';
 }
 
 bool _isTelemetryMetadataKey(String key) {
-  return key.startsWith(_telemetrySourceChannelPrefix);
+  return key.startsWith(_telemetrySourceChannelPrefix) ||
+      key == _rawTelemetryHexKey;
+}
+
+String? _rawTelemetryHex(ContactTelemetry? telemetry) {
+  final value = telemetry?.extraSensorData?[_rawTelemetryHexKey];
+  return value is String && value.trim().isNotEmpty ? value : null;
 }
 
 String _telemetrySourceChannelKey(String fieldKey) {

pubspec.lock

@@ -827,8 +827,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: main
+      ref: a0deff8
-      resolved-ref: "3dbc82170583f616b590e5204a307a02f2b8833d"
+      resolved-ref: a0deff80fcbca974f0e18fe47971b76bec583109
       url: "https://github.com/dz0ny/meshcore_client.git"
     source: git
     version: "0.1.0"

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2026.0321.1+37
+version: 2026.0322.2+39
 
 environment:
   sdk: ^3.9.2
@@ -44,7 +44,7 @@ dependencies:
   meshcore_client:
     git:
       url: https://github.com/dz0ny/meshcore_client.git
-      ref: main
+      ref: a0deff8
 
   # Codec2 ultra-low-bitrate speech codec (FFI plugin)
   codec2_flutter:

test/providers/contacts_provider_test.dart

@@ -907,6 +907,56 @@ void main() {
         expect(restored.savedGroupsForSection('teamMembers'), hasLength(1));
       },
     );
+
+    test(
+      'retains cached telemetry when sync re-adds a contact without telemetry',
+      () async {
+        final key = createPublicKey(141);
+        final contact = createContact(
+          key: key,
+          type: ContactType.sensor,
+          name: 'Sparse Sync Sensor',
+        ).copyWith(
+          telemetry: ContactTelemetry(
+            temperature: 18.5,
+            humidity: 64.0,
+            timestamp: DateTime(2026, 3, 22, 8, 30),
+          ),
+        );
+
+        provider.addOrUpdateContact(contact);
+        await provider.prepareForDeviceContactSync();
+
+        provider.addOrUpdateContact(
+          createContact(
+            key: key,
+            type: ContactType.sensor,
+            name: 'Sparse Sync Sensor',
+          ),
+        );
+
+        final restored = provider.findContactByKey(key);
+        expect(restored, isNotNull);
+        expect(restored!.telemetry, isNotNull);
+        expect(restored.telemetry!.temperature, closeTo(18.5, 0.01));
+        expect(restored.telemetry!.humidity, closeTo(64.0, 0.01));
+      },
+    );
+
+    test('keeps self telemetry cached across reconnect for the same device', () async {
+      final selfKey = createPublicKey(200);
+
+      await provider.initialize(devicePublicKey: selfKey);
+      provider.updateTelemetry(
+        selfKey.sublist(0, 6),
+        CayenneLppParser.createTemperatureData(23.5, channel: 1),
+      );
+
+      await provider.prepareForDeviceContactSync(devicePublicKey: selfKey);
+
+      expect(provider.selfTelemetry, isNotNull);
+      expect(provider.selfTelemetry!.temperature, closeTo(23.5, 0.1));
+    });
   });
 
   group('ContactsProvider self telemetry', () {
@@ -935,6 +985,24 @@ void main() {
       },
     );
   });
+
+  test('stores raw telemetry hex in metadata for verification', () async {
+    SharedPreferences.setMockInitialValues({});
+    final provider = ContactsProvider();
+    final telemetryKey = createPublicKey(150);
+    final contact = createContact(
+      key: telemetryKey,
+      type: ContactType.chat,
+      name: 'Telemetry Node',
+    );
+    provider.addOrUpdateContact(contact);
+
+    final payload = Uint8List.fromList(<int>[0x01, 0x67, 0x00, 0xEB]);
+    provider.updateTelemetry(telemetryKey.sublist(0, 6), payload);
+
+    final updated = provider.findContactByKey(telemetryKey)!;
+    expect(updated.telemetry?.extraSensorData?['__raw_lpp_hex'], '01 67 00 eb');
+  });
 }
 
 String publicKeyHex(Uint8List publicKey) {

test/providers/sensors_provider_test.dart

@@ -356,6 +356,43 @@ void main() {
     expect(connectionProvider.pingCalls, 2);
   });
 
+  test('refreshDueSensors refreshes self every minute', () async {
+    SharedPreferences.setMockInitialValues({});
+    final selfKey = Uint8List(32)..[0] = 0x66;
+    final contactsProvider = ContactsProvider();
+    await contactsProvider.initialize(devicePublicKey: selfKey);
+    final connectionProvider = _FakeConnectionProvider(
+      isConnected: true,
+      publicKey: selfKey,
+      selfName: 'My Device',
+    );
+    final start = DateTime(2026, 3, 22, 9, 0);
+
+    final provider = SensorsProvider();
+    await waitUntilLoaded(provider);
+
+    await provider.refreshDueSensors(
+      now: start,
+      contactsProvider: contactsProvider,
+      connectionProvider: connectionProvider,
+    );
+    expect(connectionProvider.pingCalls, 1);
+
+    await provider.refreshDueSensors(
+      now: start.add(const Duration(seconds: 30)),
+      contactsProvider: contactsProvider,
+      connectionProvider: connectionProvider,
+    );
+    expect(connectionProvider.pingCalls, 1);
+
+    await provider.refreshDueSensors(
+      now: start.add(const Duration(minutes: 1)),
+      contactsProvider: contactsProvider,
+      connectionProvider: connectionProvider,
+    );
+    expect(connectionProvider.pingCalls, 2);
+  });
+
   test(
     'addSensor includes available extra telemetry fields by default',
     () async {
@@ -411,4 +448,32 @@ void main() {
     expect(selfContact!.telemetry, isNotNull);
     expect(selfContact.telemetry!.temperature, closeTo(19.5, 0.1));
   });
+
+  test(
+    'displaySelfKey still returns self when watched sensors exist',
+    () async {
+      SharedPreferences.setMockInitialValues({});
+      final selfKey = Uint8List(32)..[0] = 0x66;
+      final sensor = buildSensorContact(firstByte: 0x44, name: 'Weather');
+      final contactsProvider = ContactsProvider();
+      await contactsProvider.initialize(devicePublicKey: selfKey);
+
+      final connectionProvider = _FakeConnectionProvider(
+        isConnected: true,
+        publicKey: selfKey,
+        selfName: 'My Device',
+      );
+      final provider = SensorsProvider();
+      await waitUntilLoaded(provider);
+      await provider.addSensor(sensor);
+
+      expect(
+        provider.displaySelfKey(
+          contactsProvider: contactsProvider,
+          connectionProvider: connectionProvider,
+        ),
+        selfKey.map((b) => b.toRadixString(16).padLeft(2, '0')).join(),
+      );
+    },
+  );
 }

test/screens/discovery_screen_test.dart

@@ -0,0 +1,206 @@
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/l10n/app_localizations.dart';
+import 'package:meshcore_sar_app/models/device_info.dart' as device_info;
+import 'package:meshcore_sar_app/providers/connection_provider.dart';
+import 'package:meshcore_sar_app/providers/contacts_provider.dart';
+import 'package:meshcore_sar_app/screens/discovery_screen.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class _FakeConnectionProvider extends ConnectionProvider {
+  _FakeConnectionProvider({required bool isConnected})
+    : _isConnected = isConnected;
+
+  final bool _isConnected;
+  final List<int> discoveredAdvertTypes = <int>[];
+
+  @override
+  device_info.DeviceInfo get deviceInfo => device_info.DeviceInfo(
+    connectionState: _isConnected
+        ? device_info.ConnectionState.connected
+        : device_info.ConnectionState.disconnected,
+  );
+
+  @override
+  Future<void> discoverNodeType({
+    required int advertType,
+    bool prefixOnly = false,
+    int since = 0,
+  }) async {
+    discoveredAdvertTypes.add(advertType);
+  }
+}
+
+Future<void> _pumpDiscoveryScreen(
+  WidgetTester tester, {
+  ContactsProvider? contactsProvider,
+  ConnectionProvider? connectionProvider,
+  DiscoveryScreen screen = const DiscoveryScreen(),
+}) async {
+  final resolvedContactsProvider = contactsProvider ?? ContactsProvider();
+  final resolvedConnectionProvider =
+      connectionProvider ?? _FakeConnectionProvider(isConnected: true);
+
+  await tester.pumpWidget(
+    MultiProvider(
+      providers: [
+        ChangeNotifierProvider<ContactsProvider>.value(
+          value: resolvedContactsProvider,
+        ),
+        ChangeNotifierProvider<ConnectionProvider>.value(
+          value: resolvedConnectionProvider,
+        ),
+      ],
+      child: MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: screen,
+      ),
+    ),
+  );
+
+  await tester.pumpAndSettle();
+}
+
+Uint8List _publicKey(int seed) {
+  final bytes = Uint8List(32);
+  bytes[0] = seed;
+  bytes[1] = seed + 1;
+  bytes[2] = seed + 2;
+  return bytes;
+}
+
+void main() {
+  setUp(() {
+    SharedPreferences.setMockInitialValues({});
+  });
+
+  testWidgets(
+    'discovery actions are shown in the summary card instead of overflow menu',
+    (tester) async {
+      tester.view.physicalSize = const Size(375, 812);
+      tester.view.devicePixelRatio = 1;
+      addTearDown(tester.view.reset);
+
+      final connectionProvider = _FakeConnectionProvider(isConnected: true);
+
+      await _pumpDiscoveryScreen(
+        tester,
+        connectionProvider: connectionProvider,
+      );
+
+      expect(tester.takeException(), isNull);
+      expect(find.text('Discover repeaters'), findsOneWidget);
+      expect(find.text('Discover sensors'), findsOneWidget);
+      expect(find.text('Resolve all'), findsOneWidget);
+      expect(find.text('Clear all'), findsOneWidget);
+      expect(find.text('Search discovered nodes'), findsNothing);
+      expect(find.byIcon(Icons.more_vert), findsNothing);
+      expect(
+        find.text(
+          'Use the discovery actions above to find repeaters and sensors on the mesh.',
+        ),
+        findsOneWidget,
+      );
+
+      await tester.tap(find.text('Discover repeaters'));
+      await tester.pump();
+
+      expect(connectionProvider.discoveredAdvertTypes, [2]);
+      expect(find.text('Repeater discovery sent'), findsOneWidget);
+    },
+  );
+
+  testWidgets('auto discovery can trigger repeater discovery on open', (
+    tester,
+  ) async {
+    final connectionProvider = _FakeConnectionProvider(isConnected: true);
+
+    await _pumpDiscoveryScreen(
+      tester,
+      connectionProvider: connectionProvider,
+      screen: const DiscoveryScreen(autoDiscoverRepeatersOnOpen: true),
+    );
+
+    expect(connectionProvider.discoveredAdvertTypes, [2]);
+    expect(find.text('Repeater discovery sent'), findsOneWidget);
+  });
+
+  testWidgets('search and inline type filters narrow discovered nodes', (
+    tester,
+  ) async {
+    tester.view.physicalSize = const Size(390, 1400);
+    tester.view.devicePixelRatio = 1;
+    addTearDown(tester.view.reset);
+
+    final contactsProvider = ContactsProvider()
+      ..addOrUpdatePendingAdvertMetadata(
+        publicKey: _publicKey(0x10),
+        typeValue: 2,
+        advName: 'Relay Alpha',
+      )
+      ..addOrUpdatePendingAdvertMetadata(
+        publicKey: _publicKey(0x20),
+        typeValue: 4,
+        advName: 'WX Station',
+      )
+      ..addOrUpdatePendingAdvertMetadata(
+        publicKey: _publicKey(0x30),
+        typeValue: 3,
+        advName: 'Ops Room',
+      );
+
+    await _pumpDiscoveryScreen(
+      tester,
+      contactsProvider: contactsProvider,
+      connectionProvider: _FakeConnectionProvider(isConnected: true),
+    );
+
+    expect(find.text('Search discovered nodes'), findsOneWidget);
+    expect(find.text('All'), findsOneWidget);
+    expect(find.text('Repeaters'), findsOneWidget);
+    expect(find.text('Sensors'), findsOneWidget);
+    expect(find.text('Others'), findsOneWidget);
+
+    expect(find.text('Relay Alpha'), findsOneWidget);
+    expect(find.text('WX Station'), findsOneWidget);
+    expect(find.text('Ops Room'), findsOneWidget);
+
+    await tester.tap(find.text('Sensors'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Relay Alpha'), findsNothing);
+    expect(find.text('WX Station'), findsOneWidget);
+    expect(find.text('Ops Room'), findsNothing);
+    expect(find.text('Discovered nodes (1/3)'), findsOneWidget);
+
+    await tester.tap(find.text('Others'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Relay Alpha'), findsNothing);
+    expect(find.text('WX Station'), findsNothing);
+    expect(find.text('Ops Room'), findsOneWidget);
+
+    await tester.enterText(find.byType(TextField), 'relay');
+    await tester.pumpAndSettle();
+
+    expect(find.text('No matches'), findsOneWidget);
+
+    await tester.tap(find.text('All'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Relay Alpha'), findsOneWidget);
+    expect(find.text('Ops Room'), findsNothing);
+
+    await tester.enterText(find.byType(TextField), 'ops');
+    await tester.pumpAndSettle();
+
+    expect(find.text('Relay Alpha'), findsNothing);
+    expect(find.text('WX Station'), findsNothing);
+    expect(find.text('Ops Room'), findsOneWidget);
+    expect(find.text('Discovered nodes (1/3)'), findsOneWidget);
+  });
+}

test/screens/sensors_tab_test.dart

@@ -4,27 +4,16 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:meshcore_sar_app/l10n/app_localizations.dart';
 import 'package:meshcore_sar_app/models/contact.dart';
-import 'package:meshcore_sar_app/providers/contacts_provider.dart';
-import 'package:meshcore_sar_app/providers/sensors_provider.dart';
 import 'package:meshcore_sar_app/screens/sensors_tab.dart';
-import 'package:provider/provider.dart';
+import 'package:meshcore_sar_app/widgets/sensors/sensor_telemetry_card.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 void main() {
-  setUp(() {
+  Contact buildSensorContact({
-    SharedPreferences.setMockInitialValues({});
+    int firstByte = 0x44,
-  });
+    String name = 'WX Station',
-
+  }) {
-  Future<void> waitUntilLoaded(SensorsProvider provider) async {
-    for (var i = 0; i < 20 && !provider.isLoaded; i++) {
-      await Future<void>.delayed(Duration.zero);
-    }
-    expect(provider.isLoaded, isTrue);
-  }
-
-  Contact buildSensorContact() {
     final publicKey = Uint8List(32);
-    publicKey[0] = 0x44;
+    publicKey[0] = firstByte;
 
     return Contact(
       publicKey: publicKey,
@@ -32,7 +21,7 @@ void main() {
       flags: 0,
       outPathLen: 0,
       outPath: Uint8List(64),
-      advName: 'WX Station',
+      advName: name,
       lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
       advLat: 0,
       advLon: 0,
@@ -50,48 +39,84 @@ void main() {
     );
   }
 
-  testWidgets('customize action opens full customization view', (tester) async {
+  testWidgets('metric selector item shows channel-specific preview', (
+    tester,
+  ) async {
     final contact = buildSensorContact();
-    final sensorsProvider = SensorsProvider();
+    final option = sensorMetricOptionsFor(contact, labelOverrides: const {})
-    final contactsProvider = ContactsProvider();
+        .firstWhere(
-
+          (entry) => entry.key.contains('illuminance') && entry.channel == 2,
-    await waitUntilLoaded(sensorsProvider);
+        );
-    contactsProvider.addOrUpdateContact(contact);
-    await sensorsProvider.addSensor(contact);
 
     await tester.pumpWidget(
-      MultiProvider(
+      MaterialApp(
-        providers: [
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
-          ChangeNotifierProvider<ContactsProvider>.value(
+        supportedLocales: AppLocalizations.supportedLocales,
-            value: contactsProvider,
+        home: Scaffold(
+          body: SensorMetricSelectorItem(
+            option: option,
+            visible: true,
+            span: 1,
+            canMoveUp: false,
+            canMoveDown: false,
+            onToggle: (_) {},
+            onRename: () {},
+            onSpanChanged: (_) {},
           ),
-          ChangeNotifierProvider<SensorsProvider>.value(value: sensorsProvider),
-        ],
-        child: MaterialApp(
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
-          supportedLocales: AppLocalizations.supportedLocales,
-          home: const SensorsTab(),
         ),
       ),
     );
     await tester.pump();
 
-    await tester.tap(find.byIcon(Icons.more_vert));
-    await tester.pump();
-    await tester.pump(const Duration(milliseconds: 300));
-    await tester.tap(find.text('Customize fields'));
-    await tester.pump();
-    await tester.pump(const Duration(milliseconds: 300));
-
-    expect(find.text('Customize WX Station'), findsOneWidget);
-    expect(find.text('Live preview'), findsOneWidget);
-    expect(find.text('Refresh schedule'), findsOneWidget);
     expect(
-      find.byKey(
+      find.byKey(ValueKey('sensor_selector_metric_${option.key}')),
-        const ValueKey('sensor_selector_metric_channel_extra:illuminance_2'),
-      ),
       findsOneWidget,
     );
     expect(find.text('Channel 2'), findsOneWidget);
   });
+
+  testWidgets('add sensor sheet keeps close action available when scrolled', (
+    tester,
+  ) async {
+    tester.view.physicalSize = const Size(320, 480);
+    tester.view.devicePixelRatio = 1;
+    addTearDown(tester.view.reset);
+
+    var didClose = false;
+    final candidates = List<Contact>.generate(
+      20,
+      (index) =>
+          buildSensorContact(firstByte: index + 1, name: 'Sensor ${index + 1}'),
+    );
+
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: AddSensorSheet(
+            candidates: candidates,
+            onSelect: (_) async {},
+            onClose: () {
+              didClose = true;
+            },
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+
+    final closeButton = find.byTooltip('Close');
+    expect(closeButton, findsOneWidget);
+
+    await tester.drag(find.byType(ListView).last, const Offset(0, -600));
+    await tester.pump();
+
+    expect(closeButton, findsOneWidget);
+
+    await tester.tap(closeButton);
+    await tester.pump();
+
+    expect(didClose, isTrue);
+  });
 }

test/services/bthome_met_history_test.dart

@@ -38,7 +38,12 @@ void main() {
       telemetry: ContactTelemetry(
         temperature: 20.1,
         humidity: 52,
-        extraSensorData: const {'speed_2': 3.1, 'gust_2': 4.8, 'rain_2': 12.3},
+        extraSensorData: const {
+          'generic_sensor_1': 1,
+          'speed_2': 3.1,
+          'gust_2': 4.8,
+          'rain_2': 12.3,
+        },
         timestamp: DateTime(2026, 3, 21, 12),
       ),
     );
@@ -52,4 +57,28 @@ void main() {
     ]);
     expect(supportsBTHomeMetHistory(contact), isTrue);
   });
+
+  test('does not enable BTHome MET history without channel 1 capability', () {
+    final contact = Contact(
+      publicKey: Uint8List(32),
+      type: ContactType.sensor,
+      flags: 0,
+      outPathLen: 0,
+      outPath: Uint8List(64),
+      advName: 'WX',
+      lastAdvert: 0,
+      advLat: 0,
+      advLon: 0,
+      lastMod: 0,
+      telemetry: ContactTelemetry(
+        temperature: 20.1,
+        humidity: 52,
+        extraSensorData: const {'speed_2': 3.1, 'gust_2': 4.8, 'rain_2': 12.3},
+        timestamp: DateTime(2026, 3, 21, 12),
+      ),
+    );
+
+    expect(bTHomeMetMeasurementsForContact(contact), isEmpty);
+    expect(supportsBTHomeMetHistory(contact), isFalse);
+  });
 }

test/services/cayenne_lpp_parser_test.dart

@@ -488,6 +488,39 @@ void main() {
       },
     );
 
+    test('weather station payload keeps generic percentage and does not invent battery from ch1 voltage', () {
+      final payload = Uint8List.fromList([
+        0x01, 0x74, 0x00, 0x00,
+        0x02, 0x78, 0x64,
+        0x02, 0x73, 0x24, 0x32,
+        0x02, 0x65, 0x5A, 0x50,
+        0x02, 0x8A, 0xFF, 0xE4,
+        0x02, 0x74, 0x01, 0xE0,
+        0x02, 0x9D, 0x00,
+        0x02, 0x68, 0x76,
+        0x02, 0x81, 0x01, 0x4A,
+        0x02, 0x89, 0x01, 0xB8,
+        0x02, 0x67, 0x00, 0x2D,
+        0x02, 0xAD, 0x0A,
+        0x02, 0x84, 0x00, 0x56,
+        0x02, 0x8B, 0x00, 0xB3,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+      ]);
+
+      final decoded = CayenneLppParser.parse(payload);
+
+      expect(decoded.batteryPercentage, isNull);
+      expect(decoded.batteryMilliVolts, isNull);
+      expect(decoded.temperature, closeTo(4.5, 0.1));
+      expect(decoded.humidity, closeTo(59.0, 0.1));
+      expect(decoded.pressure, closeTo(926.6, 0.1));
+      expect(decoded.extraSensorData!['voltage_1'], closeTo(0.0, 0.001));
+      expect(decoded.extraSensorData!['percentage_2'], equals(100.0));
+      expect(decoded.extraSensorData!['uv_2'], equals(1.0));
+      expect(decoded.extraSensorData!['rain_2'], closeTo(17.9, 0.1));
+      expect(decoded.extraSensorData!.containsKey('__source_channel:battery'), isFalse);
+    });
+
     test('unknown sensor type is skipped gracefully', () {
       final buffer = ByteData(5);
       buffer.setUint8(0, 0);

test/services/compass_support_test.dart

@@ -0,0 +1,23 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/services/compass_support.dart';
+
+void main() {
+  tearDown(() {
+    debugDefaultTargetPlatformOverride = null;
+  });
+
+  test('reports compass support only on mobile targets', () {
+    debugDefaultTargetPlatformOverride = TargetPlatform.android;
+    expect(CompassSupport.isAvailable, isTrue);
+
+    debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+    expect(CompassSupport.isAvailable, isTrue);
+
+    debugDefaultTargetPlatformOverride = TargetPlatform.macOS;
+    expect(CompassSupport.isAvailable, isFalse);
+
+    debugDefaultTargetPlatformOverride = TargetPlatform.windows;
+    expect(CompassSupport.isAvailable, isFalse);
+  });
+}

test/services/location_tracking_service_test.dart

@@ -0,0 +1,40 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'package:meshcore_sar_app/services/location_tracking_service.dart';
+import 'package:meshcore_sar_app/services/profiles_feature_service.dart';
+
+void main() {
+  final service = LocationTrackingService();
+
+  setUp(() {
+    SharedPreferences.setMockInitialValues({});
+    ProfileStorageScope.setScope(
+      profilesEnabled: false,
+      activeProfileId: 'default',
+    );
+    service.fastLocationUpdatesEnabled = false;
+    service.fastLocationMovementThresholdMeters = 10.0;
+    service.fastLocationActiveCadenceSeconds = 10;
+    service.fastLocationChannelIdx = null;
+  });
+
+  test('persists and restores fast location channel idx', () async {
+    await service.updateFastLocationChannelIdx(3);
+
+    service.fastLocationChannelIdx = null;
+    await service.loadSettings();
+
+    expect(service.fastLocationChannelIdx, 3);
+  });
+
+  test('clears persisted fast location channel idx when unset', () async {
+    await service.updateFastLocationChannelIdx(7);
+    await service.updateFastLocationChannelIdx(null);
+
+    service.fastLocationChannelIdx = 99;
+    await service.loadSettings();
+
+    expect(service.fastLocationChannelIdx, isNull);
+  });
+}

test/services/path_history_service_test.dart

@@ -206,4 +206,59 @@ void main() {
       expect(history.directPaths.single.source, PathRecordSource.observed);
     },
   );
+
+  test('last successful direct path is chosen by location fit', () async {
+    final service = PathHistoryService();
+    final contact = _buildContact(
+      seed: 7,
+      pathBytes: [0xAA],
+      hopCount: 1,
+      hashSize: 1,
+    );
+
+    await service.initialize();
+    await service.recordPathResult(
+      contact.publicKeyHex,
+      PathSelection(
+        mode: PathSelectionMode.directHistorical,
+        pathBytes: Uint8List.fromList([0x11]),
+        hopCount: 1,
+        hashSize: 1,
+      ),
+      success: true,
+      roundTripTimeMs: 120,
+      senderLatitude: 46.0,
+      senderLongitude: 14.0,
+      recipientLatitude: 46.1,
+      recipientLongitude: 14.1,
+    );
+    await service.recordPathResult(
+      contact.publicKeyHex,
+      PathSelection(
+        mode: PathSelectionMode.directHistorical,
+        pathBytes: Uint8List.fromList([0x22]),
+        hopCount: 1,
+        hashSize: 1,
+      ),
+      success: true,
+      roundTripTimeMs: 90,
+      senderLatitude: 46.0001,
+      senderLongitude: 14.0001,
+      recipientLatitude: 46.1001,
+      recipientLongitude: 14.1001,
+    );
+
+    final selection = await service.getLastSuccessfulDirectSelection(
+      contact,
+      excludeSignature: 'aa',
+      senderLatitude: 46.0002,
+      senderLongitude: 14.0002,
+      recipientLatitude: 46.1002,
+      recipientLongitude: 14.1002,
+    );
+
+    expect(selection, isNotNull);
+    expect(selection!.mode, PathSelectionMode.directHistorical);
+    expect(selection.canonicalPath, '22');
+  });
 }

test/widgets/connection_dialog_test.dart

@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_blue_plus/flutter_blue_plus.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/l10n/app_localizations.dart';
+import 'package:meshcore_sar_app/providers/connection_provider.dart';
+import 'package:meshcore_sar_app/widgets/connection_dialog.dart';
+import 'package:provider/provider.dart';
+
+class _FakeConnectionProvider extends ConnectionProvider {
+  int startScanCalls = 0;
+  int stopScanCalls = 0;
+  bool _isScanning = false;
+
+  @override
+  bool get isScanning => _isScanning;
+
+  @override
+  List<ScannedDevice> get scannedDevices => const [];
+
+  @override
+  String? get error => null;
+
+  @override
+  Future<void> startScan() async {
+    startScanCalls += 1;
+    _isScanning = true;
+    notifyListeners();
+  }
+
+  @override
+  Future<void> stopScan() async {
+    stopScanCalls += 1;
+    _isScanning = false;
+    notifyListeners();
+  }
+}
+
+class _ConnectableFakeConnectionProvider extends ConnectionProvider {
+  int connectCalls = 0;
+
+  @override
+  List<ScannedDevice> get scannedDevices => [
+    ScannedDevice(device: BluetoothDevice.fromId('test-device'), rssi: -55),
+  ];
+
+  @override
+  String? get error => null;
+
+  @override
+  Future<bool> connect(BluetoothDevice device) async {
+    connectCalls += 1;
+    return true;
+  }
+}
+
+void main() {
+  testWidgets('BLE scan waits for explicit user action', (tester) async {
+    final connectionProvider = _FakeConnectionProvider();
+
+    await tester.pumpWidget(
+      ChangeNotifierProvider<ConnectionProvider>.value(
+        value: connectionProvider,
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: const Scaffold(body: ConnectionDialog()),
+        ),
+      ),
+    );
+
+    await tester.pump();
+
+    expect(connectionProvider.startScanCalls, 0);
+    expect(
+      find.text('Press scan to search for nearby devices'),
+      findsOneWidget,
+    );
+    expect(find.text('Scan'), findsOneWidget);
+
+    await tester.tap(find.widgetWithText(FilledButton, 'Scan'));
+    await tester.pump();
+
+    expect(connectionProvider.stopScanCalls, 1);
+    expect(connectionProvider.startScanCalls, 1);
+  });
+
+  testWidgets('successful BLE connect closes the dialog immediately', (
+    tester,
+  ) async {
+    final connectionProvider = _ConnectableFakeConnectionProvider();
+
+    await tester.pumpWidget(
+      ChangeNotifierProvider<ConnectionProvider>.value(
+        value: connectionProvider,
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Builder(
+            builder: (context) => Scaffold(
+              body: Center(
+                child: FilledButton(
+                  onPressed: () {
+                    showModalBottomSheet<Object?>(
+                      context: context,
+                      isScrollControlled: true,
+                      builder: (_) => const ConnectionDialog(),
+                    );
+                  },
+                  child: const Text('Open'),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.text('Open'));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(ConnectionDialog), findsOneWidget);
+
+    await tester.tap(find.widgetWithText(FilledButton, 'Connect'));
+    await tester.pumpAndSettle();
+
+    expect(connectionProvider.connectCalls, 1);
+    expect(find.byType(ConnectionDialog), findsNothing);
+  });
+}

test/widgets/message_bubble_test.dart

@@ -1,5 +1,3 @@
-import 'dart:typed_data';
-
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -183,6 +181,44 @@ void main() {
     }
   });
 
+  testWidgets('channel bubbles refresh to synced channel names', (
+    tester,
+  ) async {
+    final harness = await _TestHarness.create();
+    try {
+      final message = Message(
+        id: 'channel-name-refresh',
+        messageType: MessageType.channel,
+        senderPublicKeyPrefix: _prefix(61),
+        channelIdx: 3,
+        pathLen: 0,
+        textType: MessageTextType.plain,
+        senderTimestamp: 1700000000,
+        text: 'Team update',
+        receivedAt: DateTime.fromMillisecondsSinceEpoch(1700000000500),
+        deliveryStatus: MessageDeliveryStatus.sent,
+      );
+
+      await tester.pumpWidget(_buildApp(harness, message));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Channel 3'), findsOneWidget);
+      expect(find.text('#slovenija'), findsNothing);
+
+      harness.channelsProvider.addOrUpdateChannel(
+        index: 3,
+        name: '#slovenija',
+        secret: Uint8List(16),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.text('#slovenija'), findsOneWidget);
+      expect(find.text('Channel 3'), findsNothing);
+    } finally {
+      await _disposeHarness(tester, harness);
+    }
+  });
+
   testWidgets('message bubble detects and opens links', (tester) async {
     final harness = await _TestHarness.create();
     try {

test/widgets/recipient_selector_sheet_test.dart

@@ -4,6 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:meshcore_sar_app/l10n/app_localizations.dart';
 import 'package:meshcore_sar_app/models/contact.dart';
+import 'package:meshcore_sar_app/models/message.dart';
+import 'package:meshcore_sar_app/providers/messages_provider.dart';
 import 'package:meshcore_sar_app/widgets/messages/recipient_selector_sheet.dart';
 
 void main() {
@@ -31,13 +33,18 @@ void main() {
     );
   }
 
-  Future<void> pumpSheet(WidgetTester tester) async {
+  Future<void> pumpSheet(
-    final channel = buildContact(
+    WidgetTester tester, {
-      name: 'Ops',
+    List<Contact>? contacts,
-      type: ContactType.channel,
+    List<Contact>? channels,
-      secondByte: 3,
+    MessagesProvider? messagesProvider,
-    );
+    bool showAllOption = true,
-    final contact = buildContact(name: 'John Smith', type: ContactType.chat);
+  }) async {
+    final resolvedChannels =
+        channels ??
+        [buildContact(name: 'Ops', type: ContactType.channel, secondByte: 3)];
+    final resolvedContacts =
+        contacts ?? [buildContact(name: 'John Smith', type: ContactType.chat)];
 
     await tester.pumpWidget(
       MaterialApp(
@@ -45,15 +52,17 @@ void main() {
         supportedLocales: AppLocalizations.supportedLocales,
         home: Scaffold(
           body: RecipientSelectorSheet(
-            contacts: [contact],
+            contacts: resolvedContacts,
             rooms: const [],
-            channels: [channel],
+            channels: resolvedChannels,
             unreadCount: 11,
             unreadCountsByPublicKey: {
-              channel.publicKeyHex: 7,
+              for (final channel in resolvedChannels) channel.publicKeyHex: 7,
-              contact.publicKeyHex: 3,
+              for (final contact in resolvedContacts) contact.publicKeyHex: 3,
             },
             currentDestinationType: 'all',
+            showAllOption: showAllOption,
+            messagesProvider: messagesProvider,
             onSelect: (selectedContact, destinationType) {},
           ),
         ),
@@ -150,4 +159,88 @@ void main() {
     expect(charlieY, lessThan(bravoY));
     expect(bravoY, lessThan(alphaY));
   });
+
+  testWidgets('shows channel activity and participants instead of raw ids', (
+    tester,
+  ) async {
+    final channel = buildContact(
+      name: 'Ops',
+      type: ContactType.channel,
+      secondByte: 3,
+    );
+    final messagesProvider = MessagesProvider()
+      ..addMessage(
+        Message(
+          id: 'channel-activity',
+          messageType: MessageType.channel,
+          senderName: 'Radio Alpha',
+          channelIdx: 3,
+          pathLen: 1,
+          textType: MessageTextType.plain,
+          senderTimestamp:
+              DateTime.now()
+                  .subtract(const Duration(minutes: 5))
+                  .millisecondsSinceEpoch ~/
+              1000,
+          text: 'status update',
+          receivedAt: DateTime.now().subtract(const Duration(minutes: 5)),
+        ),
+      );
+
+    await pumpSheet(
+      tester,
+      contacts: const [],
+      channels: [channel],
+      messagesProvider: messagesProvider,
+      showAllOption: false,
+    );
+
+    expect(
+      find.byKey(Key('channel-participants-${channel.publicKeyHex}')),
+      findsOneWidget,
+    );
+    expect(find.text('Radio Alpha'), findsNothing);
+    expect(find.text('5m ago'), findsOneWidget);
+    expect(find.textContaining('Channel 3'), findsNothing);
+    expect(find.text(channel.publicKeyShort.toUpperCase()), findsNothing);
+  });
+
+  testWidgets('shows contact activity instead of the public key', (
+    tester,
+  ) async {
+    final contact = buildContact(
+      name: 'John Smith',
+      type: ContactType.chat,
+      secondByte: 4,
+    );
+    final messagesProvider = MessagesProvider()
+      ..addMessage(
+        Message(
+          id: 'contact-activity',
+          messageType: MessageType.contact,
+          recipientPublicKey: contact.publicKey,
+          pathLen: 1,
+          textType: MessageTextType.plain,
+          senderTimestamp:
+              DateTime.now()
+                  .subtract(const Duration(hours: 2))
+                  .millisecondsSinceEpoch ~/
+              1000,
+          text: 'check-in',
+          receivedAt: DateTime.now().subtract(const Duration(hours: 2)),
+        ),
+      );
+
+    await pumpSheet(
+      tester,
+      contacts: [contact],
+      channels: const [],
+      messagesProvider: messagesProvider,
+      showAllOption: false,
+    );
+
+    expect(find.text('John Smith'), findsOneWidget);
+    expect(find.text('2h ago'), findsOneWidget);
+    expect(find.text(contact.publicKeyShort), findsNothing);
+  });
 }

test/widgets/sensor_telemetry_card_test.dart

@@ -1,10 +1,10 @@
-import 'dart:typed_data';
-
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:meshcore_sar_app/l10n/app_localizations.dart';
 import 'package:meshcore_sar_app/models/contact.dart';
 import 'package:meshcore_sar_app/providers/sensors_provider.dart';
+import 'package:meshcore_sar_app/services/cayenne_lpp_parser.dart';
 import 'package:meshcore_sar_app/widgets/sensors/sensor_telemetry_card.dart';
 
 void main() {
@@ -190,6 +190,139 @@ void main() {
     expect(find.text('12.3 mm'), findsOneWidget);
   });
 
+  testWidgets('renders generic percentage separately from UV for weather payload', (tester) async {
+    tester.view.physicalSize = const Size(1600, 2600);
+    tester.view.devicePixelRatio = 1.0;
+    addTearDown(() {
+      tester.view.resetPhysicalSize();
+      tester.view.resetDevicePixelRatio();
+    });
+
+    final publicKey = Uint8List(32);
+    publicKey[0] = 0x49;
+    final payload = Uint8List.fromList([
+      0x01, 0x74, 0x00, 0x00,
+      0x02, 0x78, 0x64,
+      0x02, 0x73, 0x24, 0x31,
+      0x02, 0x65, 0x67, 0xDE,
+      0x02, 0x8A, 0xFF, 0xE6,
+      0x02, 0x74, 0x01, 0xE0,
+      0x02, 0x9D, 0x00,
+      0x02, 0x68, 0x76,
+      0x02, 0x81, 0x00, 0xDC,
+      0x02, 0x89, 0x01, 0x36,
+      0x02, 0x67, 0x00, 0x2F,
+      0x02, 0xAD, 0x0A,
+      0x02, 0x84, 0x00, 0x50,
+      0x02, 0x8B, 0x00, 0xB3,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    ]);
+
+    final contact = Contact(
+      publicKey: publicKey,
+      type: ContactType.sensor,
+      flags: 0,
+      outPathLen: 0,
+      outPath: Uint8List(64),
+      advName: 'WX Station',
+      lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      advLat: 0,
+      advLon: 0,
+      lastMod: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      telemetry: CayenneLppParser.parse(payload),
+    );
+
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SingleChildScrollView(
+            child: SensorTelemetryCard(
+              contact: contact,
+              state: SensorRefreshState.idle,
+              visibleFields: const {
+                'temperature',
+                'humidity',
+                'pressure',
+                'extra:percentage_2',
+                'extra:dew_2',
+                'extra:speed_2',
+                'extra:gust_2',
+                'extra:uv_2',
+                'extra:direction_2',
+                'extra:rain_2',
+              },
+              fieldSpans: sensorFullWidthFieldSpans(const {
+                'temperature',
+                'humidity',
+                'pressure',
+                'extra:percentage_2',
+                'extra:dew_2',
+                'extra:speed_2',
+                'extra:gust_2',
+                'extra:uv_2',
+                'extra:direction_2',
+                'extra:rain_2',
+              }),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(find.byKey(const ValueKey('sensor_metric_extra:percentage_2')), findsOneWidget);
+    expect(find.byKey(const ValueKey('sensor_metric_extra:uv_2')), findsOneWidget);
+    expect(find.text('100%'), findsOneWidget);
+    expect(find.text('1%'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+    expect(find.text('80°'), findsOneWidget);
+    expect(find.text('8°'), findsNothing);
+  });
+
+  testWidgets('renders direction metric with compact compass layout', (
+    tester,
+  ) async {
+    final publicKey = Uint8List(32);
+    publicKey[0] = 0x47;
+    final contact = Contact(
+      publicKey: publicKey,
+      type: ContactType.sensor,
+      flags: 0,
+      outPathLen: 0,
+      outPath: Uint8List(64),
+      advName: 'WX Station',
+      lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      advLat: 0,
+      advLon: 0,
+      lastMod: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      telemetry: ContactTelemetry(
+        timestamp: DateTime.now().subtract(const Duration(minutes: 1)),
+        extraSensorData: const {'direction_2': 111.0},
+      ),
+    );
+
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SensorTelemetryCard(
+            contact: contact,
+            state: SensorRefreshState.idle,
+            visibleFields: const {'extra:direction_2'},
+            fieldSpans: sensorFullWidthFieldSpans(const {'extra:direction_2'}),
+          ),
+        ),
+      ),
+    );
+
+    expect(find.text('Direction'), findsOneWidget);
+    expect(find.text('111°'), findsOneWidget);
+    expect(find.text('E'), findsOneWidget);
+    expect(find.byIcon(Icons.navigation_rounded), findsOneWidget);
+  });
+
   testWidgets('long pressing a telemetry bubble triggers refresh', (
     tester,
   ) async {
@@ -221,4 +354,92 @@ void main() {
 
     expect(refreshCount, 1);
   });
+
+  testWidgets('overflow menu exposes move actions', (tester) async {
+    final contact = buildContact();
+    var moveUpCount = 0;
+    var moveDownCount = 0;
+
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SensorTelemetryCard(
+            contact: contact,
+            state: SensorRefreshState.idle,
+            visibleFields: const {'temperature'},
+            fieldSpans: sensorFullWidthFieldSpans(const {'temperature'}),
+            onMoveUp: () async {
+              moveUpCount += 1;
+            },
+            onMoveDown: () async {
+              moveDownCount += 1;
+            },
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.byIcon(Icons.more_vert));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Move up'), findsOneWidget);
+    expect(find.text('Move down'), findsOneWidget);
+
+    await tester.tap(find.text('Move down'));
+    await tester.pumpAndSettle();
+
+    expect(moveUpCount, 0);
+    expect(moveDownCount, 1);
+  });
+
+  testWidgets('overflow menu copies raw response', (tester) async {
+    final publicKey = Uint8List(32);
+    publicKey[0] = 0x48;
+    final contact = Contact(
+      publicKey: publicKey,
+      type: ContactType.sensor,
+      flags: 0,
+      outPathLen: 0,
+      outPath: Uint8List(64),
+      advName: 'WX Station',
+      lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      advLat: 0,
+      advLon: 0,
+      lastMod: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      telemetry: ContactTelemetry(
+        temperature: 21.5,
+        timestamp: DateTime.now().subtract(const Duration(minutes: 1)),
+        extraSensorData: const {'__raw_lpp_hex': '01 67 00 d7'},
+      ),
+    );
+
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SensorTelemetryCard(
+            contact: contact,
+            state: SensorRefreshState.idle,
+            visibleFields: const {'temperature'},
+            fieldSpans: sensorFullWidthFieldSpans(const {'temperature'}),
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.byIcon(Icons.more_vert));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Copy raw response'), findsOneWidget);
+
+    await tester.tap(find.text('Copy raw response'));
+    await tester.pump();
+
+    final clipboardData = await Clipboard.getData(Clipboard.kTextPlain);
+    expect(clipboardData?.text, '01 67 00 d7');
+    expect(find.text('Raw response copied'), findsOneWidget);
+  });
 }