fix: Widen worker stats graph

ref:

.github/workflows/build-artifacts.yml

@@ -193,6 +193,9 @@ jobs:
       - name: Install dependencies
         run: flutter pub get
 
+      - name: Install macOS native build tools
+        run: brew install automake libtool
+
       - name: Build macOS release
         run: flutter build macos --release
 
@@ -298,7 +301,7 @@ jobs:
         run: flutter pub get
 
       - name: Build web release
-        run: flutter build web --release --base-href /meshcore-sar/
+        run: flutter build web --wasm --release --base-href /meshcore-sar/
 
       - name: Upload pages artifact
         uses: actions/upload-pages-artifact@v3

.gitignore

@@ -79,9 +79,15 @@ play-store/
 create_feature_graphic.py
 
 # Tool caches and local state
+.devenv/
 .cachebro/
 .osgrep/
 third_party/lpcnet_flutter/
+worker/node_modules/
+worker/.wrangler/
+worker/.bun/
+worker/.astro/
+worker/dist/
 
 # Claude Code local settings (permissions, personal config)
 .claude/settings.local.json

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.

Makefile

@@ -135,6 +135,9 @@ clean: ## Clean build artifacts
 	flutter clean
 	rm -rf $(BUILD_DIR)
 
+build-web: ## Build web with WebAssembly
+	flutter build web --wasm --release
+
 # Build for all platforms
 build-all: bump ## Build for Android and iOS
 	flutter build apk --release

ios/Runner.xcodeproj/project.pbxproj

@@ -489,7 +489,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 122;
+				CURRENT_PROJECT_VERSION = 131;
 				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 = 122;
+				CURRENT_PROJECT_VERSION = 131;
 				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 = 122;
+				CURRENT_PROJECT_VERSION = 131;
 				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 = 122;
+				CURRENT_PROJECT_VERSION = 131;
 				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 = 122;
+				CURRENT_PROJECT_VERSION = 131;
 				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 = 122;
+				CURRENT_PROJECT_VERSION = 131;
 				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>122</string>
+	<string>131</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.000814">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000669">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.353323">
+      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.917785">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: build_app" time="115.148883">
+      <testcase classname="fastlane.lanes" name="2: build_app" time="130.084682">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="204.902574">
+      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="203.665249">
         
       </testcase>
     

lib/l10n/app_en.arb

@@ -660,6 +660,30 @@
   "@flood": {
     "description": "Flood routing indicator"
   },
+  "autoSend": "Auto Send",
+  "@autoSend": {
+    "description": "Auto send mode - uses current path"
+  },
+  "autoSendDescription": "Send via current path.",
+  "@autoSendDescription": {
+    "description": "Description for auto send mode"
+  },
+  "sendDirect": "Send Direct",
+  "@sendDirect": {
+    "description": "Send direct mode - zero-hop to contact"
+  },
+  "sendDirectDescription": "Send directly to this contact.",
+  "@sendDirectDescription": {
+    "description": "Description for send direct mode"
+  },
+  "sendFlood": "Send Flood",
+  "@sendFlood": {
+    "description": "Send flood mode - via all repeaters"
+  },
+  "sendFloodDescription": "Send via all repeaters.",
+  "@sendFloodDescription": {
+    "description": "Description for send flood mode"
+  },
   "loggedIn": "Logged In",
   "@loggedIn": {
     "description": "Logged in status badge"
@@ -2285,7 +2309,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 +2321,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 +2434,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 +2446,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 +2486,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 +2802,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

@@ -961,6 +961,42 @@ abstract class AppLocalizations {
   /// **'Flood'**
   String get flood;
 
+  /// Auto send mode - uses current path
+  ///
+  /// In en, this message translates to:
+  /// **'Auto Send'**
+  String get autoSend;
+
+  /// Description for auto send mode
+  ///
+  /// In en, this message translates to:
+  /// **'Send via current path.'**
+  String get autoSendDescription;
+
+  /// Send direct mode - zero-hop to contact
+  ///
+  /// In en, this message translates to:
+  /// **'Send Direct'**
+  String get sendDirect;
+
+  /// Description for send direct mode
+  ///
+  /// In en, this message translates to:
+  /// **'Send directly to this contact.'**
+  String get sendDirectDescription;
+
+  /// Send flood mode - via all repeaters
+  ///
+  /// In en, this message translates to:
+  /// **'Send Flood'**
+  String get sendFlood;
+
+  /// Description for send flood mode
+  ///
+  /// In en, this message translates to:
+  /// **'Send via all repeaters.'**
+  String get sendFloodDescription;
+
   /// Logged in status badge
   ///
   /// In en, this message translates to:
@@ -3219,7 +3255,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 +3273,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 +3423,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 +3441,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 +3501,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 +5045,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

@@ -481,6 +481,24 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get flood => 'Flut';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Angemeldet';
 
@@ -1898,6 +1916,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 +2723,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

@@ -483,6 +483,24 @@ class AppLocalizationsEl extends AppLocalizations {
   @override
   String get flood => 'Πλημμυρικό';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Συνδεδεμένος';
 
@@ -1905,6 +1923,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 +2725,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

@@ -478,6 +478,24 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get flood => 'Flood';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Logged In';
 
@@ -1717,7 +1735,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 +1747,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 +1837,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 +1849,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 +1887,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 +2687,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

@@ -481,6 +481,24 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get flood => 'Inundación';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Sesión iniciada';
 
@@ -1901,6 +1919,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 +2727,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

@@ -483,6 +483,24 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get flood => 'Inondation';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Connecté';
 
@@ -1905,6 +1923,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 +2731,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

@@ -476,6 +476,24 @@ class AppLocalizationsHr extends AppLocalizations {
   @override
   String get flood => 'Preplavljanje';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Prijavljen';
 
@@ -1881,6 +1899,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 +2700,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

@@ -480,6 +480,24 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get flood => 'Flood';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Connesso';
 
@@ -1896,6 +1914,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 +2717,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

@@ -481,6 +481,24 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get flood => 'Rozgłoszeniowo';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Zalogowano';
 
@@ -1893,6 +1911,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 +2714,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

@@ -482,6 +482,24 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get flood => 'Inundação';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Conectado';
 
@@ -1900,6 +1918,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 +2725,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

@@ -480,6 +480,24 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get flood => 'Широковещательно';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Вход выполнен';
 
@@ -1890,6 +1908,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 +2710,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

@@ -477,6 +477,24 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get flood => 'Razpršitev';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Prijavljen';
 
@@ -1881,6 +1899,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 +2700,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

@@ -480,6 +480,24 @@ class AppLocalizationsTr extends AppLocalizations {
   @override
   String get flood => 'Yayılım';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Giriş yapıldı';
 
@@ -1883,6 +1901,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 +2698,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

@@ -480,6 +480,24 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get flood => 'Широкомовно';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => 'Увійшли';
 
@@ -1896,6 +1914,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 +2721,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

@@ -464,6 +464,24 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get flood => '泛洪';
 
+  @override
+  String get autoSend => 'Auto Send';
+
+  @override
+  String get autoSendDescription => 'Send via current path.';
+
+  @override
+  String get sendDirect => 'Send Direct';
+
+  @override
+  String get sendDirectDescription => 'Send directly to this contact.';
+
+  @override
+  String get sendFlood => 'Send Flood';
+
+  @override
+  String get sendFloodDescription => 'Send via all repeaters.';
+
   @override
   String get loggedIn => '已登录';
 
@@ -1796,6 +1814,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 +2593,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,287 @@
-{}
+{
+  "de": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "el": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "es": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "fr": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "hr": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "it": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "pl": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "pt": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "ru": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "sl": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "tr": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "uk": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ],
+
+  "zh": [
+    "autoSend",
+    "autoSendDescription",
+    "sendDirect",
+    "sendDirectDescription",
+    "sendFlood",
+    "sendFloodDescription",
+    "postConnectDiscoveryTitle",
+    "postConnectDiscoveryDescription",
+    "setRegionScope",
+    "regionScope",
+    "regionScopeNone",
+    "clearRegionScope",
+    "regionScopeWarning",
+    "discoverRegions",
+    "discoveringRegions",
+    "enterRegionName",
+    "noRegionsFound",
+    "regionScopeSet",
+    "regionScopeCleared"
+  ]
+}

lib/main.dart

@@ -18,6 +18,7 @@ import 'providers/channels_provider.dart';
 import 'providers/voice_provider.dart';
 import 'providers/image_provider.dart' as ip;
 import 'providers/app_provider.dart';
+import 'providers/offline_tiles_provider.dart';
 import 'providers/sensors_provider.dart';
 import 'services/voice_codec_service.dart';
 import 'services/voice_player_service.dart';
@@ -285,6 +286,7 @@ class _MeshCoreSarAppState extends State<MeshCoreSarApp> {
         ),
         ChangeNotifierProvider(create: (_) => ChannelsProvider()),
         ChangeNotifierProvider(create: (_) => SensorsProvider()),
+        ChangeNotifierProvider(create: (_) => OfflineTilesProvider()),
         ChangeNotifierProvider(
           create: (_) {
             final manager = ProfileManager();
@@ -372,6 +374,8 @@ class _MeshCoreSarAppState extends State<MeshCoreSarApp> {
                 mapProvider: mapProvider,
                 drawingProvider: context.read<DrawingProvider>(),
                 channelsProvider: context.read<ChannelsProvider>(),
+                voiceProvider: context.read<VoiceProvider>(),
+                imageProvider: context.read<ip.ImageProvider>(),
                 appProvider: appProvider,
               ),
         ),

lib/models/channel.dart

@@ -122,6 +122,15 @@ class Channel {
   /// Base64-encoded PSK for sharing with firmware CLI and related tooling.
   String get pskBase64 => base64.encode(secret);
 
+  /// MeshCore group packets carry the first byte of SHA256(channel secret).
+  int get hashByte {
+    final digest = sha256.convert(secret);
+    return digest.bytes.first;
+  }
+
+  String get hashHex =>
+      hashByte.toRadixString(16).padLeft(2, '0').toUpperCase();
+
   /// Display name for the channel
   /// Returns "Public" for channel 0, otherwise returns the custom name or "Channel N"
   String get displayName {

lib/models/config_profile.dart

@@ -116,7 +116,6 @@ class AppSettingsProfileSection {
   final bool? voiceEchoCancellationEnabled;
   final bool? voiceNoiseSuppressionEnabled;
   final double? messageFontScale;
-  final bool? autoRouteRotationEnabled;
   final bool? clearPathOnMaxRetry;
   final bool? nearestRelayFallbackEnabled;
   final int? voiceBitrate;
@@ -142,7 +141,6 @@ class AppSettingsProfileSection {
     this.voiceEchoCancellationEnabled,
     this.voiceNoiseSuppressionEnabled,
     this.messageFontScale,
-    this.autoRouteRotationEnabled,
     this.clearPathOnMaxRetry,
     this.nearestRelayFallbackEnabled,
     this.voiceBitrate,
@@ -169,7 +167,6 @@ class AppSettingsProfileSection {
       voiceEchoCancellationEnabled == null &&
       voiceNoiseSuppressionEnabled == null &&
       messageFontScale == null &&
-      autoRouteRotationEnabled == null &&
       clearPathOnMaxRetry == null &&
       nearestRelayFallbackEnabled == null &&
       voiceBitrate == null &&
@@ -195,7 +192,6 @@ class AppSettingsProfileSection {
     'voiceEchoCancellationEnabled': voiceEchoCancellationEnabled,
     'voiceNoiseSuppressionEnabled': voiceNoiseSuppressionEnabled,
     'messageFontScale': messageFontScale,
-    'autoRouteRotationEnabled': autoRouteRotationEnabled,
     'clearPathOnMaxRetry': clearPathOnMaxRetry,
     'nearestRelayFallbackEnabled': nearestRelayFallbackEnabled,
     'voiceBitrate': voiceBitrate,
@@ -225,7 +221,6 @@ class AppSettingsProfileSection {
       voiceNoiseSuppressionEnabled:
           json['voiceNoiseSuppressionEnabled'] as bool?,
       messageFontScale: (json['messageFontScale'] as num?)?.toDouble(),
-      autoRouteRotationEnabled: json['autoRouteRotationEnabled'] as bool?,
       clearPathOnMaxRetry: json['clearPathOnMaxRetry'] as bool?,
       nearestRelayFallbackEnabled: json['nearestRelayFallbackEnabled'] as bool?,
       voiceBitrate: json['voiceBitrate'] as int?,
@@ -263,7 +258,6 @@ class MapWorkspaceProfileSection {
   final bool? showKrasFireZonesOverlay;
   final bool? showPlaceNamesOverlay;
   final bool? showMunicipalityBordersOverlay;
-  final bool? showAllContactTrails;
   final bool? hideRepeatersOnMap;
 
   const MapWorkspaceProfileSection({
@@ -284,7 +278,6 @@ class MapWorkspaceProfileSection {
     this.showKrasFireZonesOverlay,
     this.showPlaceNamesOverlay,
     this.showMunicipalityBordersOverlay,
-    this.showAllContactTrails,
     this.hideRepeatersOnMap,
   });
 
@@ -306,7 +299,6 @@ class MapWorkspaceProfileSection {
       showKrasFireZonesOverlay == null &&
       showPlaceNamesOverlay == null &&
       showMunicipalityBordersOverlay == null &&
-      showAllContactTrails == null &&
       hideRepeatersOnMap == null;
 
   Map<String, dynamic> toJson() => {
@@ -327,7 +319,6 @@ class MapWorkspaceProfileSection {
     'showKrasFireZonesOverlay': showKrasFireZonesOverlay,
     'showPlaceNamesOverlay': showPlaceNamesOverlay,
     'showMunicipalityBordersOverlay': showMunicipalityBordersOverlay,
-    'showAllContactTrails': showAllContactTrails,
     'hideRepeatersOnMap': hideRepeatersOnMap,
   };
 
@@ -356,7 +347,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/device_info.dart

@@ -71,6 +71,7 @@ class DeviceInfo {
   final bool? autoAddRoomServers;
   final bool? autoAddSensors;
   final bool? autoAddOverwriteOldest;
+  final int? autoAddMaxHops;
   final int? radioFreq;
   final int? radioBw;
   final int? radioSf;
@@ -95,6 +96,7 @@ class DeviceInfo {
 
   // Repeat mode (firmware v9+)
   final bool? clientRepeat;
+  final int? pathHashMode;
   final bool? supportsSpectrumScan;
   final int? spectrumScanMinKhz;
   final int? spectrumScanMaxKhz;
@@ -123,6 +125,7 @@ class DeviceInfo {
     this.autoAddRoomServers,
     this.autoAddSensors,
     this.autoAddOverwriteOldest,
+    this.autoAddMaxHops,
     this.radioFreq,
     this.radioBw,
     this.radioSf,
@@ -139,6 +142,7 @@ class DeviceInfo {
     this.manufacturerModel,
     this.semanticVersion,
     this.clientRepeat,
+    this.pathHashMode,
     this.supportsSpectrumScan,
     this.spectrumScanMinKhz,
     this.spectrumScanMaxKhz,
@@ -254,6 +258,7 @@ class DeviceInfo {
     bool? autoAddRoomServers,
     bool? autoAddSensors,
     bool? autoAddOverwriteOldest,
+    int? autoAddMaxHops,
     int? radioFreq,
     int? radioBw,
     int? radioSf,
@@ -270,6 +275,7 @@ class DeviceInfo {
     String? manufacturerModel,
     String? semanticVersion,
     bool? clientRepeat,
+    int? pathHashMode,
     bool? supportsSpectrumScan,
     int? spectrumScanMinKhz,
     int? spectrumScanMaxKhz,
@@ -299,6 +305,7 @@ class DeviceInfo {
       autoAddSensors: autoAddSensors ?? this.autoAddSensors,
       autoAddOverwriteOldest:
           autoAddOverwriteOldest ?? this.autoAddOverwriteOldest,
+      autoAddMaxHops: autoAddMaxHops ?? this.autoAddMaxHops,
       radioFreq: radioFreq ?? this.radioFreq,
       radioBw: radioBw ?? this.radioBw,
       radioSf: radioSf ?? this.radioSf,
@@ -315,6 +322,7 @@ class DeviceInfo {
       manufacturerModel: manufacturerModel ?? this.manufacturerModel,
       semanticVersion: semanticVersion ?? this.semanticVersion,
       clientRepeat: clientRepeat ?? this.clientRepeat,
+      pathHashMode: pathHashMode ?? this.pathHashMode,
       supportsSpectrumScan: supportsSpectrumScan ?? this.supportsSpectrumScan,
       spectrumScanMinKhz: spectrumScanMinKhz ?? this.spectrumScanMinKhz,
       spectrumScanMaxKhz: spectrumScanMaxKhz ?? this.spectrumScanMaxKhz,

lib/models/path_history.dart

@@ -1,197 +0,0 @@
-enum PathRecordSource { learned, observed }
-
-class PathRecord {
-  final List<int> pathBytes;
-  final int hopCount;
-  final int hashSize;
-  final PathRecordSource source;
-  final int successCount;
-  final int failureCount;
-  final int lastRoundTripTimeMs;
-  final DateTime lastUsedAt;
-
-  const PathRecord({
-    required this.pathBytes,
-    required this.hopCount,
-    required this.hashSize,
-    required this.source,
-    required this.successCount,
-    required this.failureCount,
-    required this.lastRoundTripTimeMs,
-    required this.lastUsedAt,
-  });
-
-  String get signature =>
-      pathBytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
-
-  double get successRate =>
-      (successCount + 1) / (successCount + failureCount + 2);
-
-  PathRecord copyWith({
-    List<int>? pathBytes,
-    int? hopCount,
-    int? hashSize,
-    PathRecordSource? source,
-    int? successCount,
-    int? failureCount,
-    int? lastRoundTripTimeMs,
-    DateTime? lastUsedAt,
-  }) {
-    return PathRecord(
-      pathBytes: pathBytes ?? this.pathBytes,
-      hopCount: hopCount ?? this.hopCount,
-      hashSize: hashSize ?? this.hashSize,
-      source: source ?? this.source,
-      successCount: successCount ?? this.successCount,
-      failureCount: failureCount ?? this.failureCount,
-      lastRoundTripTimeMs: lastRoundTripTimeMs ?? this.lastRoundTripTimeMs,
-      lastUsedAt: lastUsedAt ?? this.lastUsedAt,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'path_bytes': pathBytes,
-      'hop_count': hopCount,
-      'hash_size': hashSize,
-      'source': source.name,
-      'success_count': successCount,
-      'failure_count': failureCount,
-      'last_round_trip_time_ms': lastRoundTripTimeMs,
-      'last_used_at': lastUsedAt.toIso8601String(),
-    };
-  }
-
-  factory PathRecord.fromJson(Map<String, dynamic> json) {
-    return PathRecord(
-      pathBytes: (json['path_bytes'] as List<dynamic>? ?? const <dynamic>[])
-          .map((value) => value as int)
-          .toList(),
-      hopCount: json['hop_count'] as int? ?? 0,
-      hashSize: json['hash_size'] as int? ?? 1,
-      source: PathRecordSource.values.firstWhere(
-        (value) => value.name == (json['source'] as String? ?? 'learned'),
-        orElse: () => PathRecordSource.learned,
-      ),
-      successCount: json['success_count'] as int? ?? 0,
-      failureCount: json['failure_count'] as int? ?? 0,
-      lastRoundTripTimeMs: json['last_round_trip_time_ms'] as int? ?? 0,
-      lastUsedAt:
-          DateTime.tryParse(json['last_used_at'] as String? ?? '') ??
-          DateTime.fromMillisecondsSinceEpoch(0),
-    );
-  }
-}
-
-class FloodPathStats {
-  final int successCount;
-  final int failureCount;
-  final int lastRoundTripTimeMs;
-  final DateTime? lastUsedAt;
-
-  const FloodPathStats({
-    required this.successCount,
-    required this.failureCount,
-    required this.lastRoundTripTimeMs,
-    required this.lastUsedAt,
-  });
-
-  const FloodPathStats.empty()
-    : successCount = 0,
-      failureCount = 0,
-      lastRoundTripTimeMs = 0,
-      lastUsedAt = null;
-
-  FloodPathStats copyWith({
-    int? successCount,
-    int? failureCount,
-    int? lastRoundTripTimeMs,
-    DateTime? lastUsedAt,
-  }) {
-    return FloodPathStats(
-      successCount: successCount ?? this.successCount,
-      failureCount: failureCount ?? this.failureCount,
-      lastRoundTripTimeMs: lastRoundTripTimeMs ?? this.lastRoundTripTimeMs,
-      lastUsedAt: lastUsedAt ?? this.lastUsedAt,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'success_count': successCount,
-      'failure_count': failureCount,
-      'last_round_trip_time_ms': lastRoundTripTimeMs,
-      'last_used_at': lastUsedAt?.toIso8601String(),
-    };
-  }
-
-  factory FloodPathStats.fromJson(Map<String, dynamic> json) {
-    return FloodPathStats(
-      successCount: json['success_count'] as int? ?? 0,
-      failureCount: json['failure_count'] as int? ?? 0,
-      lastRoundTripTimeMs: json['last_round_trip_time_ms'] as int? ?? 0,
-      lastUsedAt: DateTime.tryParse(json['last_used_at'] as String? ?? ''),
-    );
-  }
-}
-
-class ContactPathHistory {
-  final String contactPublicKeyHex;
-  final List<PathRecord> directPaths;
-  final FloodPathStats floodStats;
-  final int rotationIndex;
-
-  const ContactPathHistory({
-    required this.contactPublicKeyHex,
-    required this.directPaths,
-    required this.floodStats,
-    required this.rotationIndex,
-  });
-
-  const ContactPathHistory.empty(this.contactPublicKeyHex)
-    : directPaths = const <PathRecord>[],
-      floodStats = const FloodPathStats.empty(),
-      rotationIndex = 0;
-
-  ContactPathHistory copyWith({
-    List<PathRecord>? directPaths,
-    FloodPathStats? floodStats,
-    int? rotationIndex,
-  }) {
-    return ContactPathHistory(
-      contactPublicKeyHex: contactPublicKeyHex,
-      directPaths: directPaths ?? this.directPaths,
-      floodStats: floodStats ?? this.floodStats,
-      rotationIndex: rotationIndex ?? this.rotationIndex,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'direct_paths': directPaths.map((record) => record.toJson()).toList(),
-      'flood_stats': floodStats.toJson(),
-      'rotation_index': rotationIndex,
-    };
-  }
-
-  List<PathRecord> get observedPaths => directPaths
-      .where((record) => record.source == PathRecordSource.observed)
-      .toList();
-
-  factory ContactPathHistory.fromJson(
-    String contactPublicKeyHex,
-    Map<String, dynamic> json,
-  ) {
-    return ContactPathHistory(
-      contactPublicKeyHex: contactPublicKeyHex,
-      directPaths: (json['direct_paths'] as List<dynamic>? ?? const <dynamic>[])
-          .whereType<Map<String, dynamic>>()
-          .map(PathRecord.fromJson)
-          .toList(),
-      floodStats: json['flood_stats'] is Map<String, dynamic>
-          ? FloodPathStats.fromJson(json['flood_stats'] as Map<String, dynamic>)
-          : const FloodPathStats.empty(),
-      rotationIndex: json['rotation_index'] as int? ?? 0,
-    );
-  }
-}

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';
@@ -18,6 +19,7 @@ import '../services/messaging_route_preferences.dart';
 import '../services/nearest_router_selector.dart';
 import '../services/packet_capture_storage_service.dart';
 import '../services/path_history_service.dart';
+import '../services/traffic_stats_reporting_service.dart';
 import '../utils/rssi_location_estimator.dart';
 import '../services/profiles_feature_service.dart';
 import '../services/route_hash_preferences.dart';
@@ -158,6 +160,8 @@ class AppProvider with ChangeNotifier {
       LocationTrackingService();
   final PacketCaptureStorageService packetCaptureStorageService =
       PacketCaptureStorageService();
+  final TrafficStatsReportingService trafficStatsReportingService =
+      TrafficStatsReportingService();
   final NotificationService _notificationService = NotificationService();
 
   bool _isInitialized = false;
@@ -191,9 +195,6 @@ class AppProvider with ChangeNotifier {
   bool get isVoiceNoiseSuppressionEnabled => _isVoiceNoiseSuppressionEnabled;
   double _messageFontScale = 1.0;
   double get messageFontScale => _messageFontScale;
-  bool _autoRouteRotationEnabled =
-      MessagingRoutePreferences.defaultAutoRouteRotationEnabled;
-  bool get autoRouteRotationEnabled => _autoRouteRotationEnabled;
   bool _clearPathOnMaxRetry =
       MessagingRoutePreferences.defaultClearPathOnMaxRetry;
   bool get clearPathOnMaxRetry => _clearPathOnMaxRetry;
@@ -205,12 +206,15 @@ class AppProvider with ChangeNotifier {
       const NearestRouterSelector();
   final Map<String, _DirectMessageRouteSession> _directMessageRouteSessions =
       {};
+  final Set<String> _pendingDeliveredRouteRefreshContacts = <String>{};
 
   static const Duration _packetRetryDelay = Duration(milliseconds: 1200);
   static const Duration _mediaSwarmResponseWindow = Duration(seconds: 10);
   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 = {};
@@ -261,6 +265,11 @@ class AppProvider with ChangeNotifier {
     _loadVoiceNoiseSuppressionEnabled();
     _loadMessageFontScale();
     _loadMessagingRouteSettings();
+    unawaited(
+      trafficStatsReportingService.initialize(
+        deviceKey6Provider: _deviceKey6Hex,
+      ),
+    );
     unawaited(_pathHistoryService.initialize());
     _startPacketCapturePersistence();
     _startLowBatteryWatcher();
@@ -394,6 +403,7 @@ class AppProvider with ChangeNotifier {
 
       if (toPersist.isNotEmpty) {
         await packetCaptureStorageService.appendLogs(toPersist);
+        await trafficStatsReportingService.processLogs(toPersist);
       }
       _lastPersistedPacketSignature = _packetLogSignature(logs.last);
     } catch (e) {
@@ -857,8 +867,7 @@ class AppProvider with ChangeNotifier {
 
   Future<void> _loadMessagingRouteSettings() async {
     try {
-      _autoRouteRotationEnabled =
-          await MessagingRoutePreferences.getAutoRouteRotationEnabled();
+      await MessagingRoutePreferences.cleanupLegacySettings();
       _clearPathOnMaxRetry =
           await MessagingRoutePreferences.getClearPathOnMaxRetry();
       _nearestRelayFallbackEnabled =
@@ -869,16 +878,6 @@ class AppProvider with ChangeNotifier {
     }
   }
 
-  Future<void> toggleAutoRouteRotationEnabled(bool enabled) async {
-    try {
-      _autoRouteRotationEnabled = enabled;
-      await MessagingRoutePreferences.setAutoRouteRotationEnabled(enabled);
-      notifyListeners();
-    } catch (e) {
-      debugPrint('Error saving auto route rotation setting: $e');
-    }
-  }
-
   Future<void> toggleClearPathOnMaxRetry(bool enabled) async {
     try {
       _clearPathOnMaxRetry = enabled;
@@ -1032,7 +1031,14 @@ class AppProvider with ChangeNotifier {
         contact,
         devicePublicKey: devicePublicKey,
       );
-      unawaited(_pathHistoryService.recordLearnedPath(contact));
+
+      final updatedContact =
+          contactsProvider.findContactByKey(contact.publicKey) ?? contact;
+      if (_pendingDeliveredRouteRefreshContacts.remove(
+        updatedContact.publicKeyHex,
+      )) {
+        messagesProvider.applyDeliveredMessageRouteFromContact(updatedContact);
+      }
     };
 
     // When all contacts are received
@@ -1042,9 +1048,6 @@ class AppProvider with ChangeNotifier {
         contacts,
         devicePublicKey: connectionProvider.deviceInfo.publicKey,
       );
-      for (final contact in contacts) {
-        unawaited(_pathHistoryService.recordLearnedPath(contact));
-      }
       debugPrint('Received ${contacts.length} contacts');
     };
 
@@ -1242,18 +1245,6 @@ class AppProvider with ChangeNotifier {
         enrichedMessage,
       );
       final receivedPathBytes = receptionDetailsSnapshot?.pathBytes;
-      if (senderContact != null &&
-          enrichedMessage.isChannelMessage &&
-          receivedPathBytes != null &&
-          receivedPathBytes.isNotEmpty) {
-        unawaited(
-          _learnPathFromPublicMessage(
-            contact: senderContact,
-            pathBytes: receivedPathBytes,
-          ),
-        );
-      }
-
       // Estimate location for contacts without GPS using received path
       if (senderContact != null &&
           senderContact.displayLocation == null &&
@@ -1315,6 +1306,7 @@ class AppProvider with ChangeNotifier {
               .toLowerCase();
         }
         voiceProvider.registerEnvelope(voiceEnvelope);
+        _replayPendingChannelVoicePackets(voiceEnvelope.sessionId);
         enrichedMessage = enrichedMessage.copyWith(
           isVoice: true,
           voiceId: voiceEnvelope.sessionId,
@@ -1352,6 +1344,7 @@ class AppProvider with ChangeNotifier {
               .toLowerCase();
         }
         imageProvider.registerEnvelope(imageEnvelope);
+        _replayPendingChannelImageFragments(imageEnvelope.sessionId);
         messagesProvider.addMessage(
           enrichedMessage,
           contactLookup: (name) {
@@ -1469,15 +1462,7 @@ class AppProvider with ChangeNotifier {
         return;
       }
 
-      final fastGpsPacket = FastGpsPacket.tryParseBinary(payload);
-      if (fastGpsPacket != null) {
-        final sender = _resolveContactByPrefixHex(fastGpsPacket.senderKey6);
-        if (sender != null) {
-          contactsProvider.updateFastGps(
-            sender.publicKey.sublist(0, 6),
-            fastGpsPacket,
-          );
-        }
+      if (_handleFastGpsPayload(payload)) {
         return;
       }
 
@@ -1614,66 +1599,44 @@ class AppProvider with ChangeNotifier {
         return;
       }
 
-      if (ImagePacket.isImageBinary(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),
-        );
+      if (_handleIncomingImageBinaryPayload(payload)) {
         return;
       }
-
-      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);
+      _handleIncomingVoiceBinaryPayload(payload);
     };
 
+    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(
@@ -1701,6 +1664,7 @@ class AppProvider with ChangeNotifier {
 
     // When a contact's routing path is updated in the mesh network
     connectionProvider.onPathUpdated = (publicKey) {
+      _pendingDeliveredRouteRefreshContacts.add(_publicKeyHex(publicKey));
       debugPrint(
         '🔄 [AppProvider] Path updated for contact: ${publicKey.sublist(0, 6).map((b) => b.toRadixString(16).padLeft(2, '0')).join(':')}...',
       );
@@ -1786,6 +1750,7 @@ class AppProvider with ChangeNotifier {
           return _prepareDirectMessageSend(
             messageId: messageId,
             contact: contact,
+            retryAttempt: retryAttempt,
           );
         };
 
@@ -1855,23 +1820,34 @@ 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(
-        latestContact,
-        autoRouteRotationEnabled: _autoRouteRotationEnabled,
-      );
+      final manualSelection = await _pathHistoryService
+          .getManualSelectionForContact(latestContact);
+      final selection =
+          manualSelection ??
+          await _pathHistoryService.getSelectionForContact(latestContact);
       session = _DirectMessageRouteSession(
         currentSelection: selection,
         originalRoute: ContactRouteCodec.fromContact(latestContact),
         routerFallbackAttempted: false,
       );
-      _directMessageRouteSessions[messageId] = session;
     }
 
+    if (!session.routerFallbackAttempted) {
+      final selection = await _resolveDirectMessageSelectionForRetry(
+        latestContact,
+        retryAttempt: retryAttempt,
+        fallbackSelection: session.currentSelection,
+      );
+      session = session.copyWith(currentSelection: selection);
+    }
+    _directMessageRouteSessions[messageId] = session;
+
     await _applyPathSelection(
       latestContact,
       session.currentSelection,
@@ -1882,6 +1858,25 @@ class AppProvider with ChangeNotifier {
         latestContact;
   }
 
+  Future<PathSelection> _resolveDirectMessageSelectionForRetry(
+    Contact contact, {
+    required int retryAttempt,
+    required PathSelection fallbackSelection,
+  }) async {
+    if (retryAttempt == 2) {
+      return PathSelection.flood();
+    }
+
+    if (retryAttempt < 2 &&
+        !fallbackSelection.hasDirectPath &&
+        contact.routeHasPath &&
+        contact.routeHopCount > 0) {
+      return _pathHistoryService.getSelectionForContact(contact);
+    }
+
+    return fallbackSelection;
+  }
+
   Future<void> _applyPathSelection(
     Contact contact,
     PathSelection selection, {
@@ -1986,27 +1981,19 @@ class AppProvider with ChangeNotifier {
 
     final latestContact =
         contactsProvider.findContactByKey(contact.publicKey) ?? contact;
+    final manualSelection = await _pathHistoryService.getManualSelectionForContact(
+      latestContact,
+    );
     final session =
         _directMessageRouteSessions[messageId] ??
         _DirectMessageRouteSession(
-          currentSelection: latestContact.routeHasPath
-              ? PathSelection(
-                  mode: PathSelectionMode.directCurrent,
-                  pathBytes: Uint8List.fromList(latestContact.routePathBytes),
-                  hopCount: latestContact.routeHopCount,
-                  hashSize: latestContact.routeHashSize,
-                )
-              : PathSelection.flood(),
+          currentSelection:
+              manualSelection ??
+              await _pathHistoryService.getSelectionForContact(latestContact),
           originalRoute: ContactRouteCodec.fromContact(latestContact),
           routerFallbackAttempted: false,
         );
 
-    await _pathHistoryService.recordPathResult(
-      latestContact.publicKeyHex,
-      session.currentSelection,
-      success: false,
-    );
-
     final repeater = _nearestRouterSelector.select(
       senderPosition: locationTrackingService.currentPosition,
       repeaters: contactsProvider.repeaters,
@@ -2050,14 +2037,10 @@ class AppProvider with ChangeNotifier {
       return;
     }
 
-    unawaited(
-      _pathHistoryService.recordPathResult(
-        contact.publicKeyHex,
-        session.currentSelection,
-        success: true,
-        roundTripTimeMs: roundTripTimeMs,
-      ),
-    );
+    if (session.currentSelection.usesFlood ||
+        session.currentSelection.mode == PathSelectionMode.nearestRouter) {
+      messagesProvider.queueDeliveredMessageRouteRefresh(messageId, contact);
+    }
   }
 
   Future<void> _handleDirectMessageFinalFailure({
@@ -2068,11 +2051,6 @@ class AppProvider with ChangeNotifier {
         contactsProvider.findContactByKey(contact.publicKey) ?? contact;
     final session = _directMessageRouteSessions.remove(messageId);
     if (session != null) {
-      await _pathHistoryService.recordPathResult(
-        latestContact.publicKeyHex,
-        session.currentSelection,
-        success: false,
-      );
       if (session.routerFallbackAttempted) {
         await _restoreRouteOnDevice(latestContact, session.originalRoute);
       }
@@ -2094,6 +2072,12 @@ class AppProvider with ChangeNotifier {
     return bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
   }
 
+  String _publicKeyHex(Uint8List publicKey) {
+    return publicKey
+        .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+        .join();
+  }
+
   /// Estimate contact location from the received message path.
   ///
   /// When we receive a message, the path bytes describe how it traveled:
@@ -2144,22 +2128,6 @@ class AppProvider with ChangeNotifier {
     );
   }
 
-  Future<void> _learnPathFromPublicMessage({
-    required Contact contact,
-    required List<int> pathBytes,
-  }) async {
-    final preferred = await RouteHashPreferences.getHashSize();
-    final inferredHashSize = _inferReceivedPathHashSize(
-      pathBytes,
-      preferredHashSize: preferred,
-    );
-    await _pathHistoryService.recordReceivedBytePath(
-      contact.publicKeyHex,
-      pathBytes,
-      inferredHashSize,
-    );
-  }
-
   Future<void> _retainAdvertRxPath(Uint8List publicKey) async {
     final decoded = _findBestMatchingAdvertRxRoute(publicKey);
     if (decoded == null || decoded.pathBytes.isEmpty) {
@@ -2185,11 +2153,6 @@ class AppProvider with ChangeNotifier {
       paddedPathBytes: parsedRoute.paddedPathBytes,
       devicePublicKey: connectionProvider.deviceInfo.publicKey,
     );
-    await _pathHistoryService.recordReceivedBytePath(
-      publicKey.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join(),
-      decoded.pathBytes,
-      decoded.hashSize,
-    );
   }
 
   /// Handle pushAdvert (0x80) — matches the official MeshCore app flow:
@@ -2530,22 +2493,6 @@ class AppProvider with ChangeNotifier {
     }
   }
 
-  int _inferReceivedPathHashSize(
-    List<int> pathBytes, {
-    required int preferredHashSize,
-  }) {
-    final preferred = preferredHashSize;
-    final candidates = {preferred, 3, 2, 1}.toList();
-    for (final candidate in candidates) {
-      if (candidate >= 1 &&
-          candidate <= 3 &&
-          pathBytes.length % candidate == 0) {
-        return candidate;
-      }
-    }
-    return 1;
-  }
-
   /// Initialize the app (load contacts, sync time, etc.)
   Future<void> initialize() async {
     if (!connectionProvider.deviceInfo.isConnected) return;
@@ -2553,12 +2500,10 @@ class AppProvider with ChangeNotifier {
     try {
       _isReconnectSyncInProgress = true;
       _hasCompletedConnectionBootstrap = false;
-      // Initialize contacts provider with device public key to exclude self
-      // If already initialized (from early load), this will just filter out self-contact
-      // This must happen before getContacts to ensure proper filtering
-      await contactsProvider.initialize(
+      await contactsProvider.prepareForDeviceContactSync(
         devicePublicKey: connectionProvider.deviceInfo.publicKey,
       );
+      channelsProvider.prepareForDeviceSync();
 
       // Note: Device clock is automatically synced during connection in MeshCoreBleService
       // No need to sync it again here
@@ -2634,10 +2579,14 @@ class AppProvider with ChangeNotifier {
         '🔄 [AppProvider] Device reconnected - syncing contacts and missed messages',
       );
 
-      await contactsProvider.initialize(
+      await contactsProvider.prepareForDeviceContactSync(
         devicePublicKey: connectionProvider.deviceInfo.publicKey,
       );
+      channelsProvider.prepareForDeviceSync();
       await connectionProvider.getContacts();
+      await connectionProvider.syncChannels(
+        maxChannels: connectionProvider.deviceInfo.maxChannels,
+      );
 
       final messageCount = await connectionProvider.syncAllMessages(
         force: true,
@@ -2803,6 +2752,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;
@@ -2819,16 +2785,46 @@ class AppProvider with ChangeNotifier {
       timestampSeconds: DateTime.now().millisecondsSinceEpoch ~/ 1000,
     );
     debugPrint(
-      '📍 [AppProvider] Sending fast GPS update ($reason): '
-      '${position.latitude}, ${position.longitude}',
+      '📤 [AppProvider] Fast GPS send '
+      'reason=$reason '
+      'sender=$senderKey6 '
+      'channel=$channelIdx '
+      'lat=${position.latitude} '
+      'lon=${position.longitude} '
+      'ts=${packet.timestampSeconds}',
     );
     try {
-      await connectionProvider.sendRawPrivateMulticast(packet.encodeBinary());
+      await connectionProvider.sendChannelData(
+        channelIdx: channelIdx,
+        dataType: MeshCoreConstants.dataTypeDev,
+        payload: packet.encodeBinary(),
+      );
+      debugPrint(
+        '✅ [AppProvider] Fast GPS sent '
+        'sender=$senderKey6 channel=$channelIdx ts=${packet.timestampSeconds}',
+      );
     } catch (e) {
       debugPrint('⚠️ [AppProvider] Fast GPS send failed: $e');
     }
   }
 
+  Future<bool> sendTestFastLocationUpdate() async {
+    if (!connectionProvider.deviceInfo.isConnected) {
+      return false;
+    }
+
+    final position = await locationTrackingService.getCurrentPosition(
+      timeLimit: const Duration(seconds: 10),
+      retryCount: 1,
+    );
+    if (position == null) {
+      return false;
+    }
+
+    await _sendFastLocationUpdate(position, reason: 'test');
+    return true;
+  }
+
   Contact? _resolveVoiceFetchRequester(VoiceFetchRequest request) {
     final liveContact = _resolveContactByPrefixHex(request.requesterKey6);
     if (liveContact != null) {
@@ -3361,6 +3357,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
@@ -3642,6 +3805,7 @@ class AppProvider with ChangeNotifier {
       await connectionProvider.getContacts();
 
       // Sync all channels so refresh reflects the full device state.
+      channelsProvider.prepareForDeviceSync();
       await connectionProvider.syncChannels(
         maxChannels: connectionProvider.deviceInfo.maxChannels,
       );
@@ -3764,6 +3928,8 @@ class AppProvider with ChangeNotifier {
     _imageMissingRetryAttempts.clear();
     _voiceSessionSenderKey6.clear();
     _imageSessionSenderKey6.clear();
+    _pendingChannelVoicePackets.clear();
+    _pendingChannelImageFragments.clear();
     _lowBatteryNotifiedNodeIds.clear();
     notifyListeners();
   }
@@ -3873,6 +4039,9 @@ class AppProvider with ChangeNotifier {
     for (final timer in _imageMissingRetryTimers.values) {
       timer.cancel();
     }
+    _pendingChannelVoicePackets.clear();
+    _pendingChannelImageFragments.clear();
+    trafficStatsReportingService.dispose();
     super.dispose();
   }
 }

lib/providers/channels_provider.dart

@@ -7,7 +7,8 @@ class ChannelsProvider with ChangeNotifier {
   int _selectedChannelIndex = 0; // Default to public channel
 
   /// Get all channels
-  List<Channel> get channels => _channels.values.toList()..sort((a, b) => a.index.compareTo(b.index));
+  List<Channel> get channels =>
+      _channels.values.toList()..sort((a, b) => a.index.compareTo(b.index));
 
   /// Get a specific channel by index
   Channel? getChannel(int index) => _channels[index];
@@ -28,6 +29,16 @@ class ChannelsProvider with ChangeNotifier {
     return index == 0 ? 'Public' : 'Channel $index';
   }
 
+  List<Channel> getChannelsByHashByte(int hashByte) {
+    return _channels.values.where((channel) => channel.hashByte == hashByte).toList()
+      ..sort((a, b) => a.index.compareTo(b.index));
+  }
+
+  String? getUniqueChannelDisplayNameByHashByte(int hashByte) {
+    final matches = getChannelsByHashByte(hashByte);
+    return matches.length == 1 ? matches.single.displayName : null;
+  }
+
   /// Add or update a channel
   void addOrUpdateChannel({
     required int index,
@@ -54,12 +65,12 @@ class ChannelsProvider with ChangeNotifier {
   void removeChannel(int index) {
     if (_channels.containsKey(index)) {
       _channels.remove(index);
-      
+
       // If the deleted channel was selected, switch to public channel
       if (_selectedChannelIndex == index) {
         _selectedChannelIndex = 0;
       }
-      
+
       notifyListeners();
     }
   }
@@ -96,6 +107,13 @@ class ChannelsProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  /// Clear runtime channel state before a live device sync begins.
+  void prepareForDeviceSync() {
+    _channels.clear();
+    _selectedChannelIndex = 0;
+    notifyListeners();
+  }
+
   /// Check if channels have been loaded
   bool get hasChannels => _channels.isNotEmpty;
 

lib/providers/connection_provider.dart

@@ -47,6 +47,23 @@ class PingResult {
   });
 }
 
+/// Result of a relay ping (trace path) operation
+class RelayPingResult {
+  final bool success;
+  final int durationMs;
+  final double snrThere;
+  final double snrBack;
+  final int hopCount;
+
+  const RelayPingResult({
+    required this.success,
+    required this.durationMs,
+    required this.snrThere,
+    required this.snrBack,
+    required this.hopCount,
+  });
+}
+
 /// Scanned device with RSSI information
 class ScannedDevice {
   final BluetoothDevice device;
@@ -105,8 +122,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;
@@ -174,6 +189,8 @@ class ConnectionProvider with ChangeNotifier {
       MessageDeliveryTracker();
   final PingTracker _pingTracker = PingTracker();
   final Map<String, Future<PingResult>> _pendingSmartPings = {};
+  final Map<int, Completer<RelayPingResult>> _pendingRelayPings = {};
+  final Map<int, int> _relayPingStartTimes = {};
 
   // Expose room login states
   Map<String, RoomLoginState> get roomLoginStates =>
@@ -212,6 +229,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 +489,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 +555,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);
 
@@ -547,10 +579,15 @@ class ConnectionProvider with ChangeNotifier {
         manufacturerModel: deviceInfo['manufacturerModel'] as String?,
         semanticVersion: deviceInfo['semanticVersion'] as String?,
         clientRepeat: deviceInfo['clientRepeat'] as bool?,
-        supportsSpectrumScan: deviceInfo['supportsSpectrumScan'] as bool?,
-        spectrumScanMinKhz: deviceInfo['spectrumScanMinKhz'] as int?,
-        spectrumScanMaxKhz: deviceInfo['spectrumScanMaxKhz'] as int?,
+        pathHashMode: deviceInfo['pathHashMode'] as int?,
       );
+
+      // Clear any stale flood scope on connect (firmware v8+)
+      final fwVer = deviceInfo['firmwareVersion'] as int?;
+      if (fwVer != null && fwVer >= 8) {
+        clearFloodScope();
+      }
+
       notifyListeners();
     };
 
@@ -563,6 +600,9 @@ class ConnectionProvider with ChangeNotifier {
         publicKey: selfInfo['publicKey'] as Uint8List?,
         advLat: selfInfo['advLat'] as int?,
         advLon: selfInfo['advLon'] as int?,
+        multiAcks: selfInfo['multiAcks'] as int?,
+        advertLocPolicy: selfInfo['advertLocPolicy'] as int?,
+        telemetryModes: selfInfo['telemetryModes'] as int?,
         manualAddContacts: selfInfo['manualAddContacts'] as bool?,
         radioFreq: selfInfo['radioFreq'] as int?,
         radioBw: selfInfo['radioBw'] as int?,
@@ -605,10 +645,15 @@ class ConnectionProvider with ChangeNotifier {
         autoAddRoomServers: config['autoAddRoomServers'] as bool?,
         autoAddSensors: config['autoAddSensors'] as bool?,
         autoAddOverwriteOldest: config['autoAddOverwriteOldest'] as bool?,
+        autoAddMaxHops: config['autoAddMaxHops'] as int?,
       );
       notifyListeners();
     };
 
+    service.onTraceDataReceived = (nonce, hopCount, snrThere, snrBack) {
+      _handleTraceDataReceived(nonce, hopCount, snrThere, snrBack);
+    };
+
     service.onTxActivity = () {
       _txActivity = true;
       notifyListeners();
@@ -1719,6 +1764,7 @@ class ConnectionProvider with ChangeNotifier {
     required int channelIdx,
     required String text,
     String? messageId,
+    Uint8List? floodScopeKey,
   }) async {
     if (!_activeService.isConnected) {
       _error = 'Not connected to device';
@@ -1731,10 +1777,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');
@@ -1799,6 +1847,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).
@@ -1853,11 +1937,13 @@ class ConnectionProvider with ChangeNotifier {
       return pendingPing;
     }
 
-    final future = _runSmartPing(
-      contactPublicKey: contactPublicKey,
-      hasPath: hasPath,
-      onRetryWithFlooding: onRetryWithFlooding,
-    );
+    final future = _isSelfPublicKey(contactPublicKey)
+        ? _runSelfTelemetryPing(contactPublicKey)
+        : _runSmartPing(
+            contactPublicKey: contactPublicKey,
+            hasPath: hasPath,
+            onRetryWithFlooding: onRetryWithFlooding,
+          );
     _pendingSmartPings[pingKey] = future;
     notifyListeners();
 
@@ -1944,10 +2030,117 @@ class ConnectionProvider with ChangeNotifier {
     }
   }
 
+  Future<PingResult> _runSelfTelemetryPing(Uint8List devicePublicKey) async {
+    if (!_activeService.isConnected) {
+      _error = 'Not connected to device';
+      notifyListeners();
+      return PingResult(success: false, usedFlooding: false, timedOut: true);
+    }
+
+    try {
+      final pingFuture = _pingTracker.trackPing(
+        publicKey: devicePublicKey,
+        wasDirectAttempt: true,
+      );
+
+      // Firmware treats a 4-byte telemetry request as "self telemetry".
+      await _activeService.requestTelemetry(Uint8List(0), zeroHop: true);
+
+      final gotResponse = await pingFuture;
+      return PingResult(
+        success: gotResponse,
+        usedFlooding: false,
+        timedOut: !gotResponse,
+      );
+    } catch (e) {
+      _error = 'Failed to request self telemetry: $e';
+      notifyListeners();
+      return PingResult(success: false, usedFlooding: false, timedOut: true);
+    }
+  }
+
+  /// Ping a relay/repeater using trace path (command 36).
+  /// Returns RTT, SNR there/back, and hop count.
+  Future<RelayPingResult> pingRelay(Contact contact) async {
+    if (!_activeService.isConnected) {
+      return const RelayPingResult(
+        success: false, durationMs: 0, snrThere: 0, snrBack: 0, hopCount: 0,
+      );
+    }
+
+    final nonce = Random().nextInt(0xFFFFFFFF);
+    final completer = Completer<RelayPingResult>();
+    _pendingRelayPings[nonce] = completer;
+    _relayPingStartTimes[nonce] = DateTime.now().millisecondsSinceEpoch;
+
+    // Timeout after 10 seconds
+    final timer = Timer(const Duration(seconds: 10), () {
+      _pendingRelayPings.remove(nonce);
+      _relayPingStartTimes.remove(nonce);
+      if (!completer.isCompleted) {
+        completer.complete(const RelayPingResult(
+          success: false, durationMs: 0, snrThere: 0, snrBack: 0, hopCount: 0,
+        ));
+      }
+    });
+
+    try {
+      // Zero-hop ping: prefixSize=1 sends 1 byte of public key, hopType=0
+      await _activeService.sendTracePath(
+        nonce: nonce,
+        prefixSize: 1,
+        contactPublicKey: contact.publicKey,
+      );
+      final result = await completer.future;
+      timer.cancel();
+      return result;
+    } catch (e) {
+      timer.cancel();
+      _pendingRelayPings.remove(nonce);
+      _relayPingStartTimes.remove(nonce);
+      return const RelayPingResult(
+        success: false, durationMs: 0, snrThere: 0, snrBack: 0, hopCount: 0,
+      );
+    }
+  }
+
+  void _handleTraceDataReceived(
+    int nonce, int hopCount, double snrThere, double snrBack,
+  ) {
+    final completer = _pendingRelayPings.remove(nonce);
+    final startTime = _relayPingStartTimes.remove(nonce);
+    if (completer != null && !completer.isCompleted) {
+      final durationMs = startTime != null
+          ? DateTime.now().millisecondsSinceEpoch - startTime
+          : 0;
+      completer.complete(RelayPingResult(
+        success: true,
+        durationMs: durationMs,
+        snrThere: snrThere,
+        snrBack: snrBack,
+        hopCount: hopCount,
+      ));
+    }
+  }
+
   String _publicKeyToHex(Uint8List publicKey) {
     return publicKey.map((b) => b.toRadixString(16).padLeft(2, '0')).join('');
   }
 
+  bool _isSelfPublicKey(Uint8List publicKey) {
+    final selfKey = _deviceInfo.publicKey;
+    if (selfKey == null || selfKey.length != publicKey.length) {
+      return false;
+    }
+
+    for (var i = 0; i < publicKey.length; i++) {
+      if (selfKey[i] != publicKey[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   /// Send binary request to contact (modern replacement for requestTelemetry)
   ///
   /// Supports multiple request types:
@@ -2188,43 +2381,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) {
@@ -2292,6 +2448,7 @@ class ConnectionProvider with ChangeNotifier {
         autoAddRoomServers: config['autoAddRoomServers'] as bool?,
         autoAddSensors: config['autoAddSensors'] as bool?,
         autoAddOverwriteOldest: config['autoAddOverwriteOldest'] as bool?,
+        autoAddMaxHops: config['autoAddMaxHops'] as int?,
       );
       notifyListeners();
     } catch (e) {
@@ -2303,6 +2460,7 @@ class ConnectionProvider with ChangeNotifier {
           autoAddRoomServers: null,
           autoAddSensors: null,
           autoAddOverwriteOldest: null,
+          autoAddMaxHops: null,
         );
         notifyListeners();
         return;
@@ -2322,6 +2480,7 @@ class ConnectionProvider with ChangeNotifier {
     required bool autoAddRoomServers,
     required bool autoAddSensors,
     required bool overwriteOldest,
+    int maxHops = 0,
   }) async {
     if (!_activeService.isConnected) {
       _error = 'Not connected to device';
@@ -2336,6 +2495,7 @@ class ConnectionProvider with ChangeNotifier {
         autoAddRoomServers: autoAddRoomServers,
         autoAddSensors: autoAddSensors,
         overwriteOldest: overwriteOldest,
+        maxHops: maxHops,
       );
       _deviceInfo = _deviceInfo.copyWith(
         autoAddUsers: autoAddUsers,
@@ -2343,6 +2503,7 @@ class ConnectionProvider with ChangeNotifier {
         autoAddRoomServers: autoAddRoomServers,
         autoAddSensors: autoAddSensors,
         autoAddOverwriteOldest: overwriteOldest,
+        autoAddMaxHops: maxHops,
       );
       notifyListeners();
     } catch (e) {
@@ -2351,6 +2512,23 @@ class ConnectionProvider with ChangeNotifier {
     }
   }
 
+  Future<void> setPathHashMode(int mode) async {
+    if (!_activeService.isConnected) {
+      _error = 'Not connected to device';
+      notifyListeners();
+      return;
+    }
+
+    try {
+      await _activeService.setPathHashMode(mode);
+      _deviceInfo = _deviceInfo.copyWith(pathHashMode: mode);
+      notifyListeners();
+    } catch (e) {
+      _error = 'Failed to set path hash mode: $e';
+      notifyListeners();
+    }
+  }
+
   /// Export a contact as a meshcore:// share URL.
   /// Pass null to export self.
   Future<String?> exportContactUrl(Uint8List? publicKey) async {
@@ -2392,7 +2570,6 @@ class ConnectionProvider with ChangeNotifier {
   }
 
   Future<void> refreshDeviceInfo() async {
-    if (_isSpectrumScanActive) return;
     if (!_activeService.isConnected) {
       _error = 'Not connected to device';
       notifyListeners();
@@ -2440,14 +2617,8 @@ class ConnectionProvider with ChangeNotifier {
   Future<void> requestSelfTelemetry() async {
     if (!_activeService.isConnected) return;
     try {
-      // Request own telemetry by sending telemetry req with zero-length key
-      final deviceKey = _deviceInfo.publicKey;
-      if (deviceKey != null) {
-        await _activeService.requestTelemetry(
-          Uint8List.fromList(deviceKey),
-          zeroHop: true,
-        );
-      }
+      // Firmware expects a 4-byte CMD_SEND_TELEMETRY_REQ frame for "self".
+      await _activeService.requestTelemetry(Uint8List(0), zeroHop: true);
     } catch (e) {
       debugPrint('⚠️ [Provider] requestSelfTelemetry failed: $e');
     }
@@ -2471,7 +2642,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
@@ -2510,10 +2680,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(
@@ -2801,6 +2967,32 @@ class ConnectionProvider with ChangeNotifier {
     }
   }
 
+  /// Set a contact to zero-hop direct mode (no mesh forwarding).
+  ///
+  /// This forces the firmware to send directly to this contact without
+  /// using any repeaters, matching the "Send Direct" option in the
+  /// official MeshCore client.
+  Future<void> setContactDirect(Contact contact) async {
+    if (!_activeService.isConnected) {
+      _error = 'Not connected to device';
+      notifyListeners();
+      return;
+    }
+
+    try {
+      _error = null;
+      final updatedContact = contact.copyWith(
+        outPathLen: 0, // descriptor: hashSize=1, hopCount=0 → zero-hop direct
+        outPath: Uint8List(64),
+      );
+      await _activeService.addOrUpdateContact(updatedContact);
+    } catch (e) {
+      _error = 'Failed to set direct path: $e';
+      notifyListeners();
+      rethrow;
+    }
+  }
+
   /// Remove a contact from the companion radio
   ///
   /// Deletes the contact from the device's internal contact table.

lib/providers/contacts_provider.dart

@@ -7,6 +7,7 @@ import '../models/contact_group.dart';
 import '../models/message_contact_location.dart';
 import '../services/cayenne_lpp_parser.dart';
 import '../services/contact_storage_service.dart';
+import '../services/profiles_feature_service.dart';
 import '../utils/fast_gps_packet.dart';
 import '../utils/rssi_location_estimator.dart';
 import '../utils/key_comparison.dart';
@@ -126,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;
@@ -138,9 +141,12 @@ class ContactsProvider with ChangeNotifier {
   bool _isPersistingPendingAdverts = false;
   bool _persistPendingAdvertsRequested = false;
   String? _storageNamespace;
+  String? _selfPublicKeyHex;
+  ContactTelemetry? _selfTelemetry;
 
   // Add default public channel on initialization
-  ContactsProvider() {
+  ContactsProvider()
+    : _storageNamespace = ProfileStorageScope.effectiveNamespace {
     _ensurePublicChannelExists();
   }
 
@@ -160,6 +166,7 @@ class ContactsProvider with ChangeNotifier {
     Uint8List? devicePublicKey,
   }) async {
     _storageNamespace = namespace;
+    _setSelfDevicePublicKey(devicePublicKey);
     await _loadFromStorage(force: true, devicePublicKey: devicePublicKey);
   }
 
@@ -251,6 +258,7 @@ class ContactsProvider with ChangeNotifier {
   /// Initialize and load persisted contacts
   /// [devicePublicKey] - device's own public key to exclude from loaded contacts
   Future<void> initialize({Uint8List? devicePublicKey}) async {
+    _setSelfDevicePublicKey(devicePublicKey);
     if (_isInitialized) {
       // If already initialized (from early load), just filter out self-contact
       if (devicePublicKey != null) {
@@ -265,6 +273,36 @@ class ContactsProvider with ChangeNotifier {
     }
   }
 
+  /// Clear runtime contact state before a live device contact sync begins.
+  ///
+  /// This intentionally does not touch persisted storage. It snapshots the
+  /// current in-memory contacts so sync updates can still merge against the
+  /// latest local state, but keeps the visible list intact so reconnects do
+  /// not blank the UI while the device is resyncing.
+  Future<void> prepareForDeviceContactSync({Uint8List? devicePublicKey}) async {
+    _setSelfDevicePublicKey(devicePublicKey);
+    if (!_isInitialized) {
+      final storedGroups = await _storageService.loadContactGroups(
+        namespace: _storageNamespace,
+      );
+      _savedContactGroups
+        ..clear()
+        ..addAll(storedGroups);
+      _isInitialized = true;
+    }
+
+    debugPrint(
+      '🧹 [ContactsProvider] Preparing retained contact state for device sync',
+    );
+    _retainedContactsForSync
+      ..clear()
+      ..addEntries(
+        _contactsForStorage().map(
+          (contact) => MapEntry(contact.publicKeyHex, contact),
+        ),
+      );
+  }
+
   /// Remove self-contact from loaded contacts (called after BLE connection established)
   void _removeSelfContact(Uint8List devicePublicKey) {
     final selfKeyHex = devicePublicKey
@@ -345,6 +383,7 @@ class ContactsProvider with ChangeNotifier {
   }
 
   List<Contact> get contacts => _contacts.values.toList();
+  ContactTelemetry? get selfTelemetry => _selfTelemetry;
   List<Contact> get favouriteContacts =>
       _contacts.values.where((c) => c.isFavourite).toList();
   List<SavedContactGroup> get savedContactGroups =>
@@ -535,9 +574,11 @@ class ContactsProvider with ChangeNotifier {
     // Replace existing observation from the same repeater, or add new
     final repeaterKey =
         '${observation.repeaterLocation.latitude},${observation.repeaterLocation.longitude}';
-    observations.removeWhere((o) =>
-        '${o.repeaterLocation.latitude},${o.repeaterLocation.longitude}' ==
-        repeaterKey);
+    observations.removeWhere(
+      (o) =>
+          '${o.repeaterLocation.latitude},${o.repeaterLocation.longitude}' ==
+          repeaterKey,
+    );
     observations.add(observation);
 
     // Keep at most 8 observations (most recent per repeater)
@@ -637,7 +678,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}',
@@ -649,6 +692,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 &&
@@ -678,11 +722,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);
@@ -954,17 +1001,29 @@ class ContactsProvider with ChangeNotifier {
 
     // Find contact by public key prefix
     final contact = _findContactByPrefix(publicKeyPrefix);
-    if (contact == null) {
+    final isSelfTelemetry =
+        contact == null && _matchesSelfPrefix(publicKeyPrefix);
+    if (contact == null && !isSelfTelemetry) {
       debugPrint('  ❌ Contact not found for this prefix');
       return;
     }
 
-    debugPrint('  ✅ Found contact: ${contact.advName}');
-    debugPrint('  Old telemetry timestamp: ${contact.telemetry?.timestamp}');
+    if (isSelfTelemetry) {
+      debugPrint('  ✅ Matched self telemetry response');
+      debugPrint(
+        '  Old self telemetry timestamp: ${_selfTelemetry?.timestamp}',
+      );
+    } else {
+      debugPrint('  ✅ Found contact: ${contact!.advName}');
+      debugPrint('  Old telemetry timestamp: ${contact.telemetry?.timestamp}');
+    }
 
     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}');
 
@@ -983,7 +1042,9 @@ class ContactsProvider with ChangeNotifier {
         );
       }
 
-      final previousTelemetry = contact.telemetry;
+      final previousTelemetry = isSelfTelemetry
+          ? _selfTelemetry
+          : contact!.telemetry;
 
       final mergedTelemetry = _mergeTelemetryForContact(
         existingTelemetry: previousTelemetry,
@@ -1006,29 +1067,38 @@ class ContactsProvider with ChangeNotifier {
           timestamp: mergedTelemetry.timestamp,
           humidity: mergedTelemetry.humidity,
           pressure: mergedTelemetry.pressure,
-          extraSensorData: telemetry.extraSensorData,
+          extraSensorData: mergedTelemetry.extraSensorData,
         );
       }
 
+      if (isSelfTelemetry) {
+        _selfTelemetry = telemetry;
+        notifyListeners();
+        debugPrint('  ✅ Updated self telemetry');
+        return;
+      }
+
+      final resolvedContact = contact!;
+
       // Update contact with new telemetry AND last seen time
       // lastAdvert is Unix timestamp in seconds
       final currentTimestamp = (DateTime.now().millisecondsSinceEpoch / 1000)
           .round();
-      debugPrint('  Old lastAdvert: ${contact.lastAdvert}');
+      debugPrint('  Old lastAdvert: ${resolvedContact.lastAdvert}');
       debugPrint('  New lastAdvert: $currentTimestamp');
 
       final persistedGps = _getValidGpsOrNull(telemetry.gpsLocation);
-      final updatedContact = contact.copyWith(
+      final updatedContact = resolvedContact.copyWith(
         telemetry: telemetry,
         lastAdvert: currentTimestamp, // Update last seen time
         advLat: persistedGps != null
             ? _coordinateToAdvertMicrodegrees(persistedGps.latitude)
-            : contact.advLat,
+            : resolvedContact.advLat,
         advLon: persistedGps != null
             ? _coordinateToAdvertMicrodegrees(persistedGps.longitude)
-            : contact.advLon,
+            : resolvedContact.advLon,
       );
-      _contacts[contact.publicKeyHex] = updatedContact;
+      _contacts[resolvedContact.publicKeyHex] = updatedContact;
       debugPrint('  ✅ Updated contact in map (with new lastAdvert)');
 
       _persistContacts();
@@ -1067,13 +1137,34 @@ class ContactsProvider with ChangeNotifier {
       ),
     );
 
+    debugPrint(
+      '📥 [ContactsProvider] Fast GPS received '
+      'sender=${packet.senderKey6} '
+      'contact=${contact.displayName} '
+      'contactKey=${contact.publicKeyHex} '
+      'lat=${packet.latitude} '
+      'lon=${packet.longitude} '
+      'ts=${packet.timestampSeconds}',
+    );
+
     final updatedContact = contact.copyWith(
       telemetry: updatedTelemetry,
       lastAdvert: packet.timestampSeconds,
+      lastMod: packet.timestampSeconds,
       advLat: _coordinateToAdvertMicrodegrees(packet.latitude),
       advLon: _coordinateToAdvertMicrodegrees(packet.longitude),
     );
     _contacts[contact.publicKeyHex] = updatedContact;
+    _estimatedLocations[contact.publicKeyHex] = LatLng(
+      packet.latitude,
+      packet.longitude,
+    );
+    debugPrint(
+      '✅ [ContactsProvider] Fast GPS applied '
+      'contact=${updatedContact.displayName} '
+      'contactKey=${updatedContact.publicKeyHex} '
+      'lastAdvert=${updatedContact.lastAdvert}',
+    );
     _persistContacts();
     notifyListeners();
   }
@@ -1146,6 +1237,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,
@@ -1235,6 +1348,36 @@ class ContactsProvider with ChangeNotifier {
     return _contacts[keyHex];
   }
 
+  void _setSelfDevicePublicKey(Uint8List? devicePublicKey) {
+    final nextKeyHex = _publicKeyHexOrNull(devicePublicKey);
+    if (_selfPublicKeyHex != nextKeyHex) {
+      _selfTelemetry = null;
+    }
+    _selfPublicKeyHex = nextKeyHex;
+  }
+
+  String? _publicKeyHexOrNull(Uint8List? publicKey) {
+    if (publicKey == null || publicKey.isEmpty) {
+      return null;
+    }
+
+    return publicKey.map((b) => b.toRadixString(16).padLeft(2, '0')).join('');
+  }
+
+  bool _matchesSelfPrefix(Uint8List prefix) {
+    final selfKeyHex = _selfPublicKeyHex;
+    if (selfKeyHex == null || prefix.isEmpty) {
+      return false;
+    }
+
+    final takeLen = prefix.length < 6 ? prefix.length : 6;
+    final prefixHex = prefix
+        .sublist(0, takeLen)
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join('');
+    return selfKeyHex.startsWith(prefixHex);
+  }
+
   /// Clear a contact's learned path locally so the UI and next send both
   /// prefer flood routing until the radio reports a fresh route.
   void markPathUnhealthy(Uint8List publicKey) {
@@ -1532,6 +1675,7 @@ class ContactsProvider with ChangeNotifier {
   void clearContacts() {
     _contacts.clear();
     _pendingAdverts.clear();
+    _retainedContactsForSync.clear();
     _ensurePublicChannelExists();
     _persistContacts();
     _persistPendingAdverts();
@@ -1556,6 +1700,7 @@ class ContactsProvider with ChangeNotifier {
     // Then remove from local storage
     _contacts.remove(publicKeyHex);
     _pendingAdverts.remove(publicKeyHex);
+    _retainedContactsForSync.remove(publicKeyHex);
     _persistContacts();
     _persistPendingAdverts();
     notifyListeners();
@@ -1638,6 +1783,10 @@ class ContactsProvider with ChangeNotifier {
     _contacts.clear();
     _savedContactGroups.clear();
     _pendingAdverts.clear();
+    _estimatedLocations.clear();
+    _rssiObservations.clear();
+    _retainedContactsForSync.clear();
+    _selfTelemetry = null;
   }
 
   Map<String, dynamic> _pendingAdvertToJson(PendingAdvert advert) {

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).
-  static const int maxRetryAttemptsWithPath = 5;
+  /// Sequence: 2 direct attempts, flood, then last successful route.
+  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/image_provider.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../models/contact.dart';
+import '../services/profiles_feature_service.dart';
 import 'helpers/raw_session_retransmit.dart';
 import '../utils/image_message_parser.dart';
 
@@ -75,6 +76,8 @@ class ImageProvider with ChangeNotifier {
     _restore();
   }
 
+  String _scopedStorageKey() => ProfileStorageScope.scopedKey(_storageKey);
+
   // ── Accessors ────────────────────────────────────────────────────────────
 
   ImageSession? session(String sessionId) => _sessions[sessionId];
@@ -292,18 +295,22 @@ class ImageProvider with ChangeNotifier {
   // ── Persistence ──────────────────────────────────────────────────────────
 
   Future<void> clearAll() async {
-    _sessions.clear();
-    _outgoing.clear();
-    _ignoredIncomingSessions.clear();
+    _resetInMemoryState();
     notifyListeners();
     try {
       final prefs = await SharedPreferences.getInstance();
-      await prefs.remove(_storageKey);
+      await prefs.remove(_scopedStorageKey());
     } catch (e) {
       debugPrint('❌ [ImageProvider] Failed to clear storage: $e');
     }
   }
 
+  Future<void> reloadProfileScopedState() async {
+    _resetInMemoryState();
+    await _restore();
+    notifyListeners();
+  }
+
   void _evictExpiredOutgoing() {
     final now = DateTime.now();
     _outgoing.removeWhere((_, s) => now.difference(s.cachedAt) > _outgoingTtl);
@@ -343,7 +350,7 @@ class ImageProvider with ChangeNotifier {
             )
             .toList(),
       };
-      await prefs.setString(_storageKey, jsonEncode(payload));
+      await prefs.setString(_scopedStorageKey(), jsonEncode(payload));
     } catch (e) {
       debugPrint('❌ [ImageProvider] Failed to persist: $e');
     }
@@ -352,7 +359,7 @@ class ImageProvider with ChangeNotifier {
   Future<void> _restore() async {
     try {
       final prefs = await SharedPreferences.getInstance();
-      final raw = prefs.getString(_storageKey);
+      final raw = prefs.getString(_scopedStorageKey());
       if (raw == null || raw.isEmpty) return;
 
       final parsed = jsonDecode(raw) as Map<String, dynamic>;
@@ -428,6 +435,12 @@ class ImageProvider with ChangeNotifier {
       debugPrint('❌ [ImageProvider] Failed to restore: $e');
     }
   }
+
+  void _resetInMemoryState() {
+    _sessions.clear();
+    _outgoing.clear();
+    _ignoredIncomingSessions.clear();
+  }
 }
 
 class _OutgoingSession {

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

@@ -23,6 +23,8 @@ typedef DisplayMessageEntry = ({Message message, int occurrenceCount});
 /// Messages Provider - manages message history and SAR markers
 class MessagesProvider with ChangeNotifier {
   static const Duration _channelEchoWarningDelay = Duration(seconds: 12);
+  static const Duration _receivedDuplicateWindow = Duration(seconds: 5);
+  static const Duration _deliveredRouteRefreshWindow = Duration(seconds: 30);
 
   final List<Message> _messages = [];
   final Map<String, SarMarker> _sarMarkers = {};
@@ -37,6 +39,9 @@ class MessagesProvider with ChangeNotifier {
   final Map<String, MessageReceptionDetails> _messageReceptionDetails = {};
   final Map<String, MessageTransferDetails> _messageTransferDetails = {};
   final Map<String, MessageRouteMetadata> _messageRouteMetadata = {};
+  final Map<String, List<_PendingDeliveredRouteRefresh>>
+  _pendingDeliveredRouteRefreshByContact =
+      <String, List<_PendingDeliveredRouteRefresh>>{};
   String? _storageNamespace;
 
   // Track pending sent messages by expected ACK/TAG
@@ -198,6 +203,83 @@ class MessagesProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  void queueDeliveredMessageRouteRefresh(String messageId, Contact contact) {
+    if (messageId.isEmpty || contact.publicKeyHex.isEmpty) {
+      return;
+    }
+
+    _prunePendingDeliveredRouteRefresh();
+    final queue = _pendingDeliveredRouteRefreshByContact.putIfAbsent(
+      contact.publicKeyHex,
+      () => <_PendingDeliveredRouteRefresh>[],
+    );
+    queue.removeWhere((entry) => entry.messageId == messageId);
+    queue.add(
+      _PendingDeliveredRouteRefresh(
+        messageId: messageId,
+        queuedAt: DateTime.now(),
+      ),
+    );
+  }
+
+  bool applyDeliveredMessageRouteFromContact(Contact contact) {
+    if (!contact.routeHasPath ||
+        contact.routeHopCount <= 0 ||
+        contact.publicKeyHex.isEmpty) {
+      return false;
+    }
+
+    _prunePendingDeliveredRouteRefresh();
+    final queue = _pendingDeliveredRouteRefreshByContact[contact.publicKeyHex];
+    if (queue == null || queue.isEmpty) {
+      return false;
+    }
+
+    while (queue.isNotEmpty) {
+      final pending = queue.removeAt(0);
+      final index = _messages.indexWhere(
+        (message) => message.id == pending.messageId,
+      );
+      if (index == -1) {
+        continue;
+      }
+
+      final message = _messages[index];
+      if (!message.isContactMessage ||
+          message.deliveryStatus != MessageDeliveryStatus.delivered) {
+        continue;
+      }
+
+      final existingMetadata = _messageRouteMetadata[pending.messageId];
+      _messageRouteMetadata[pending.messageId] = MessageRouteMetadata(
+        mode: PathSelectionMode.directCurrent,
+        routerFallbackAttempted:
+            existingMetadata?.routerFallbackAttempted ?? false,
+        canonicalPath: contact.routeCanonicalText.isEmpty
+            ? null
+            : contact.routeCanonicalText,
+        hopCount: contact.routeHopCount,
+      );
+      _messages[index] = message.copyWith(
+        pathLen: contact.routeHopCount,
+        usedFloodFallback: false,
+      );
+
+      if (queue.isEmpty) {
+        _pendingDeliveredRouteRefreshByContact.remove(contact.publicKeyHex);
+      }
+
+      _persistMessages();
+      notifyListeners();
+      return true;
+    }
+
+    if (queue.isEmpty) {
+      _pendingDeliveredRouteRefreshByContact.remove(contact.publicKeyHex);
+    }
+    return false;
+  }
+
   /// Set localizations for notifications
   void setLocalizations(AppLocalizations localizations) {
     _localizations = localizations;
@@ -664,6 +746,27 @@ class MessagesProvider with ChangeNotifier {
       return; // Skip duplicate
     }
 
+    final matchingSentReplayIndex = _findMatchingSentReplayIndex(finalMessage);
+    if (matchingSentReplayIndex != -1) {
+      final existingId = _messages[matchingSentReplayIndex].id;
+      _clearChannelSendWarning(existingId);
+      if (contactLocationSnapshot != null) {
+        _messageContactLocations[existingId] = contactLocationSnapshot;
+      }
+      _messageReceptionDetails[existingId] =
+          MessageReceptionDetails.mergeDuplicate(
+            existing: _messageReceptionDetails[existingId],
+            incoming: receptionDetailsSnapshot,
+          );
+      final existingMessage = _messages[matchingSentReplayIndex];
+      _messages[matchingSentReplayIndex] = existingMessage.copyWith(
+        pathLen: finalMessage.pathLen > 0 ? finalMessage.pathLen : existingMessage.pathLen,
+        pathBytes: finalMessage.pathBytes ?? existingMessage.pathBytes,
+      );
+      _persistMessages();
+      return;
+    }
+
     _messages.add(finalMessage);
     if (contactLocationSnapshot != null) {
       _messageContactLocations[finalMessage.id] = contactLocationSnapshot;
@@ -710,9 +813,25 @@ class MessagesProvider with ChangeNotifier {
       return -1;
     }
 
+    final exactDuplicateIndex = _findExactDuplicateMessageIndex(message);
+    if (exactDuplicateIndex != -1) {
+      return exactDuplicateIndex;
+    }
+
+    final lastConversationDuplicateIndex =
+        _findLastConversationDuplicateMessageIndex(message);
+    if (lastConversationDuplicateIndex != -1) {
+      return lastConversationDuplicateIndex;
+    }
+
+    return -1;
+  }
+
+  int _findExactDuplicateMessageIndex(Message message) {
     for (int index = 0; index < _messages.length; index++) {
       final existing = _messages[index];
-      if (!_matchesDuplicateScope(existing, message) ||
+      if (existing.isSentMessage ||
+          !_matchesExactDuplicateScope(existing, message) ||
           existing.text != message.text) {
         continue;
       }
@@ -729,16 +848,38 @@ class MessagesProvider with ChangeNotifier {
     return -1;
   }
 
-  bool _matchesDuplicateScope(Message existing, Message message) {
+  int _findLastConversationDuplicateMessageIndex(Message message) {
+    for (int index = _messages.length - 1; index >= 0; index--) {
+      final existing = _messages[index];
+      if (!_isSameConversation(existing, message)) {
+        continue;
+      }
+      if (existing.isSentMessage ||
+          existing.isSystemMessage ||
+          existing.text != message.text) {
+        return -1;
+      }
+      final receivedDelta = existing.receivedAt.difference(message.receivedAt).abs();
+      if (receivedDelta > _receivedDuplicateWindow) {
+        return -1;
+      }
+      return _matchesDuplicateSenderIdentity(existing, message) ? index : -1;
+    }
+
+    return -1;
+  }
+
+  bool _matchesExactDuplicateScope(Message existing, Message message) {
     if (existing.messageType != message.messageType) {
       return false;
     }
 
     if (message.isContactMessage) {
-      // Match by sender key + sender timestamp (matches official app's DB
-      // uniqueness: contactPublicKey + senderTimestamp + text + txtType).
-      return existing.senderKeyShort == message.senderKeyShort &&
-          existing.senderTimestamp == message.senderTimestamp;
+      if (!_isSameConversation(existing, message)) {
+        return false;
+      }
+      return existing.senderTimestamp == message.senderTimestamp &&
+          _matchesDuplicateSenderIdentity(existing, message);
     }
 
     if (message.isChannelMessage) {
@@ -746,36 +887,9 @@ class MessagesProvider with ChangeNotifier {
         return false;
       }
 
-      // Primary dedup: same senderTimestamp = same message from mesh repeats.
-      // Matches official app's DB uniqueness: (channelSecret, senderTimestamp, text).
       if (existing.senderTimestamp == message.senderTimestamp) {
         return true;
       }
-
-      // Secondary: catch near-duplicate repeats within a 30s window
-      // (clock drift between nodes).
-      final withinChannelRepeatWindow =
-          (existing.senderTimestamp - message.senderTimestamp).abs() <= 30;
-      if (!withinChannelRepeatWindow) {
-        return false;
-      }
-
-      final existingSenderKey = existing.senderKeyShort;
-      final incomingSenderKey = message.senderKeyShort;
-      if (existingSenderKey != null &&
-          incomingSenderKey != null &&
-          existingSenderKey == incomingSenderKey) {
-        return true;
-      }
-
-      final existingSenderName = _normalizedResolvedSenderName(existing);
-      final incomingSenderName = _normalizedResolvedSenderName(message);
-      if (existingSenderName != null &&
-          incomingSenderName != null &&
-          existingSenderName == incomingSenderName) {
-        return true;
-      }
-
       return false;
     }
 
@@ -783,6 +897,85 @@ class MessagesProvider with ChangeNotifier {
     return false;
   }
 
+  bool _isSameConversation(Message existing, Message message) {
+    if (existing.messageType != message.messageType) {
+      return false;
+    }
+
+    if (message.isChannelMessage) {
+      return existing.channelIdx == message.channelIdx;
+    }
+
+    if (!message.isContactMessage) {
+      return false;
+    }
+
+    if (existing.recipientPublicKey != null && message.recipientPublicKey != null) {
+      return _listEquals(existing.recipientPublicKey!, message.recipientPublicKey!);
+    }
+
+    if (existing.recipientPublicKey == null && message.recipientPublicKey == null) {
+      return true;
+    }
+
+    return false;
+  }
+
+  bool _matchesDuplicateSenderIdentity(Message existing, Message message) {
+    final existingSenderKey = existing.senderKeyShort;
+    final incomingSenderKey = message.senderKeyShort;
+    if (existingSenderKey != null &&
+        incomingSenderKey != null &&
+        existingSenderKey == incomingSenderKey) {
+      return true;
+    }
+
+    final existingSenderName = _normalizedResolvedSenderName(existing);
+    final incomingSenderName = _normalizedResolvedSenderName(message);
+    return existingSenderName != null &&
+        incomingSenderName != null &&
+        existingSenderName == incomingSenderName;
+  }
+
+  int _findMatchingSentReplayIndex(Message message) {
+    if (!message.isChannelMessage || message.isSentMessage) {
+      return -1;
+    }
+
+    for (int index = 0; index < _messages.length; index++) {
+      final existing = _messages[index];
+      if (!existing.isSentMessage ||
+          !existing.isChannelMessage ||
+          existing.text != message.text) {
+        continue;
+      }
+
+      if (_matchesSentReplayScope(existing, message)) {
+        return index;
+      }
+    }
+
+    return -1;
+  }
+
+  bool _matchesSentReplayScope(Message existing, Message message) {
+    if (!_isSameConversation(existing, message)) {
+      return false;
+    }
+
+    if (existing.senderTimestamp == message.senderTimestamp) {
+      return true;
+    }
+
+    final withinChannelRepeatWindow =
+        (existing.senderTimestamp - message.senderTimestamp).abs() <= 30;
+    if (!withinChannelRepeatWindow) {
+      return false;
+    }
+
+    return _matchesDuplicateSenderIdentity(existing, message);
+  }
+
   /// Add multiple messages
   void addMessages(List<Message> messages) {
     int addedCount = 0;
@@ -1180,9 +1373,7 @@ class MessagesProvider with ChangeNotifier {
     for (final message in messages) {
       final occurrenceCount = _messageOccurrenceCount(message);
       final existingIndex = entries.indexWhere(
-        (entry) =>
-            entry.message.text == message.text &&
-            _matchesDuplicateScope(entry.message, message),
+        (entry) => _shouldCollapseDisplayMessage(entry.message, message),
       );
 
       if (existingIndex == -1) {
@@ -1200,6 +1391,17 @@ class MessagesProvider with ChangeNotifier {
     return entries;
   }
 
+  bool _shouldCollapseDisplayMessage(Message existing, Message message) {
+    if (existing.isSentMessage || message.isSentMessage) {
+      return false;
+    }
+
+    return existing.text == message.text &&
+        (_matchesExactDuplicateScope(existing, message) ||
+            (_isSameConversation(existing, message) &&
+                _matchesDuplicateSenderIdentity(existing, message)));
+  }
+
   int _messageOccurrenceCount(Message message) =>
       _messageReceptionDetails[message.id]?.receivedCopies ?? 1;
 
@@ -2347,17 +2549,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,
@@ -2445,6 +2636,7 @@ class MessagesProvider with ChangeNotifier {
         _pendingSentMessages.remove(message.expectedAckTag);
       }
       _clearAckHistoryForMessage(messageId);
+      _removePendingDeliveredRouteRefresh(messageId);
 
       // Clear retry tracking
       _retryManager.clearRetry(messageId);
@@ -2485,6 +2677,7 @@ class MessagesProvider with ChangeNotifier {
       _pendingSentMessages.remove(message.expectedAckTag);
     }
     _clearAckHistoryForMessage(messageId);
+    _removePendingDeliveredRouteRefresh(messageId);
     _retryManager.clearRetry(messageId);
     _messageRouteMetadata.remove(messageId);
     onManualRetryPreparedCallback?.call(messageId);
@@ -2657,4 +2850,51 @@ class MessagesProvider with ChangeNotifier {
       }
     }
   }
+
+  void _prunePendingDeliveredRouteRefresh() {
+    if (_pendingDeliveredRouteRefreshByContact.isEmpty) {
+      return;
+    }
+
+    final cutoff = DateTime.now().subtract(_deliveredRouteRefreshWindow);
+    final emptyKeys = <String>[];
+    for (final entry in _pendingDeliveredRouteRefreshByContact.entries) {
+      entry.value.removeWhere(
+        (pending) => pending.queuedAt.isBefore(cutoff),
+      );
+      if (entry.value.isEmpty) {
+        emptyKeys.add(entry.key);
+      }
+    }
+    for (final key in emptyKeys) {
+      _pendingDeliveredRouteRefreshByContact.remove(key);
+    }
+  }
+
+  void _removePendingDeliveredRouteRefresh(String messageId) {
+    if (_pendingDeliveredRouteRefreshByContact.isEmpty) {
+      return;
+    }
+
+    final emptyKeys = <String>[];
+    for (final entry in _pendingDeliveredRouteRefreshByContact.entries) {
+      entry.value.removeWhere((pending) => pending.messageId == messageId);
+      if (entry.value.isEmpty) {
+        emptyKeys.add(entry.key);
+      }
+    }
+    for (final key in emptyKeys) {
+      _pendingDeliveredRouteRefreshByContact.remove(key);
+    }
+  }
+}
+
+class _PendingDeliveredRouteRefresh {
+  final String messageId;
+  final DateTime queuedAt;
+
+  const _PendingDeliveredRouteRefresh({
+    required this.messageId,
+    required this.queuedAt,
+  });
 }

lib/providers/offline_tiles_provider.dart

@@ -0,0 +1,541 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:latlong2/latlong.dart';
+
+import '../models/map_layer.dart';
+import '../services/offline_tile_cache_service.dart';
+import '../services/tile_download_service.dart';
+import '../services/tile_math_service.dart';
+import '../services/tile_sharing_service.dart';
+
+export '../services/tile_sharing_service.dart' show TilePeer, PeerCatalog;
+export '../services/offline_tile_cache_service.dart'
+    show StyleInfo, DownloadRegion;
+
+/// Download progress state.
+class DownloadProgress {
+  final int downloaded;
+  final int skipped;
+  final int failed;
+  final int total;
+
+  const DownloadProgress({
+    this.downloaded = 0,
+    this.skipped = 0,
+    this.failed = 0,
+    this.total = 0,
+  });
+
+  int get processed => downloaded + skipped + failed;
+  double get percent => total == 0 ? 0 : processed / total;
+  bool get isComplete => total > 0 && processed >= total;
+}
+
+/// A downloaded/skipped tile rectangle for map overlay.
+class TileOverlay {
+  final double north, south, east, west;
+  final bool isSkipped;
+
+  const TileOverlay({
+    required this.north,
+    required this.south,
+    required this.east,
+    required this.west,
+    this.isSkipped = false,
+  });
+}
+
+/// Drawing mode for polygon selection.
+enum DrawingMode { none, polygon, rectangle }
+
+/// State management for offline tile downloading.
+class OfflineTilesProvider extends ChangeNotifier {
+  final OfflineTileCacheService _cache = OfflineTileCacheService.instance;
+  final TileSharingService _sharing = TileSharingService.instance;
+  TileDownloadService? _downloadService;
+  StreamSubscription<TileDownloadEvent>? _downloadSubscription;
+  StreamSubscription<Set<TilePeer>>? _peersSubscription;
+
+  // Drawing state
+  DrawingMode _drawingMode = DrawingMode.none;
+  final List<List<LatLng>> _polygons = [];
+  List<LatLng> _currentVertices = [];
+  LatLng? _rectangleFirstCorner;
+
+  // Download settings
+  int _minZoom = 8;
+  int _maxZoom = 14;
+  MapLayer _selectedLayer = MapLayer.openStreetMap;
+
+  // Download progress
+  bool _isDownloading = false;
+  DownloadProgress _progress = const DownloadProgress();
+  final List<TileOverlay> _tileOverlays = [];
+
+  // Cache info
+  int _cacheSizeBytes = 0;
+
+  // Sharing state
+  bool _isServerRunning = false;
+  Set<TilePeer> _discoveredPeers = {};
+  List<PeerCatalog> _peerCatalogs = [];
+  bool _isFetchingCatalogs = false;
+  bool _isSyncing = false;
+  String _syncStatus = '';
+  double _syncProgress = 0;
+
+  // Local style info
+  List<StyleInfo> _localStyles = [];
+
+  // Coverage overlay — which cached style's tiles to show on the map
+  StyleInfo? _coverageStyle;
+  List<TileOverlay> _coverageOverlays = [];
+
+  // Getters
+  DrawingMode get drawingMode => _drawingMode;
+  List<List<LatLng>> get polygons => List.unmodifiable(_polygons);
+  List<LatLng> get currentVertices => List.unmodifiable(_currentVertices);
+  LatLng? get rectangleFirstCorner => _rectangleFirstCorner;
+  int get minZoom => _minZoom;
+  int get maxZoom => _maxZoom;
+  MapLayer get selectedLayer => _selectedLayer;
+  bool get isDownloading => _isDownloading;
+  DownloadProgress get progress => _progress;
+  List<TileOverlay> get tileOverlays => _tileOverlays;
+  int get cacheSizeBytes => _cacheSizeBytes;
+  bool get hasPolygons => _polygons.isNotEmpty;
+  bool get isServerRunning => _isServerRunning;
+  Set<TilePeer> get discoveredPeers => _discoveredPeers;
+  List<PeerCatalog> get peerCatalogs => _peerCatalogs;
+  bool get isFetchingCatalogs => _isFetchingCatalogs;
+  bool get isSyncing => _isSyncing;
+  String get syncStatus => _syncStatus;
+  double get syncProgress => _syncProgress;
+  List<StyleInfo> get localStyles => _localStyles;
+  StyleInfo? get coverageStyle => _coverageStyle;
+  List<TileOverlay> get coverageOverlays => _coverageOverlays;
+
+  /// Estimated tile count for the current selection.
+  int get estimatedTileCount {
+    if (_polygons.isEmpty) return 0;
+    return TileMathService.estimateTileCount(_polygons, _minZoom, _maxZoom);
+  }
+
+  // Drawing methods
+
+  void setDrawingMode(DrawingMode mode) {
+    _drawingMode = mode;
+    _currentVertices = [];
+    _rectangleFirstCorner = null;
+    notifyListeners();
+  }
+
+  void addVertex(LatLng point) {
+    if (_drawingMode == DrawingMode.polygon) {
+      _currentVertices = [..._currentVertices, point];
+      notifyListeners();
+    } else if (_drawingMode == DrawingMode.rectangle) {
+      if (_rectangleFirstCorner == null) {
+        _rectangleFirstCorner = point;
+        notifyListeners();
+      } else {
+        // Complete rectangle
+        final corner1 = _rectangleFirstCorner!;
+        final corner2 = point;
+        final rect = [
+          LatLng(corner1.latitude, corner1.longitude),
+          LatLng(corner1.latitude, corner2.longitude),
+          LatLng(corner2.latitude, corner2.longitude),
+          LatLng(corner2.latitude, corner1.longitude),
+        ];
+        _polygons.add(rect);
+        _rectangleFirstCorner = null;
+        _drawingMode = DrawingMode.none;
+        notifyListeners();
+      }
+    }
+  }
+
+  void finishPolygon() {
+    if (_drawingMode == DrawingMode.polygon && _currentVertices.length >= 3) {
+      _polygons.add(List.from(_currentVertices));
+      _currentVertices = [];
+      _drawingMode = DrawingMode.none;
+      notifyListeners();
+    }
+  }
+
+  void removePolygon(int index) {
+    if (index >= 0 && index < _polygons.length) {
+      _polygons.removeAt(index);
+      notifyListeners();
+    }
+  }
+
+  void clearPolygons() {
+    _polygons.clear();
+    _currentVertices = [];
+    _rectangleFirstCorner = null;
+    _drawingMode = DrawingMode.none;
+    notifyListeners();
+  }
+
+  void undoLastVertex() {
+    if (_currentVertices.isNotEmpty) {
+      _currentVertices = _currentVertices.sublist(0, _currentVertices.length - 1);
+      notifyListeners();
+    }
+  }
+
+  // Download settings
+
+  void setMinZoom(int zoom) {
+    _minZoom = zoom.clamp(0, 19);
+    if (_maxZoom < _minZoom) _maxZoom = _minZoom;
+    notifyListeners();
+  }
+
+  void setMaxZoom(int zoom) {
+    _maxZoom = zoom.clamp(0, 19);
+    if (_minZoom > _maxZoom) _minZoom = _maxZoom;
+    notifyListeners();
+  }
+
+  void setSelectedLayer(MapLayer layer) {
+    _selectedLayer = layer;
+    notifyListeners();
+  }
+
+  // Download control
+
+  Future<void> startDownload() async {
+    if (_isDownloading || _polygons.isEmpty) return;
+
+    _isDownloading = true;
+    _progress = const DownloadProgress();
+    _tileOverlays.clear();
+    notifyListeners();
+
+    _downloadService = TileDownloadService();
+    final stream = _downloadService!.downloadTiles(
+      polygons: _polygons,
+      minZoom: _minZoom,
+      maxZoom: _maxZoom,
+      urlTemplate: _selectedLayer.urlTemplate,
+      displayName: _selectedLayer.name,
+    );
+
+    await for (final event in stream) {
+      switch (event) {
+        case TileDownloadStarted(:final totalTiles):
+          _progress = DownloadProgress(total: totalTiles);
+          notifyListeners();
+
+        case TileDownloaded(:final north, :final south, :final east, :final west):
+          _progress = DownloadProgress(
+            downloaded: _progress.downloaded + 1,
+            skipped: _progress.skipped,
+            failed: _progress.failed,
+            total: _progress.total,
+          );
+          _addOverlay(TileOverlay(
+            north: north, south: south, east: east, west: west,
+          ));
+          notifyListeners();
+
+        case TileSkipped():
+          _progress = DownloadProgress(
+            downloaded: _progress.downloaded,
+            skipped: _progress.skipped + 1,
+            failed: _progress.failed,
+            total: _progress.total,
+          );
+          notifyListeners();
+
+        case TileBatchSkipped(:final count):
+          _progress = DownloadProgress(
+            downloaded: _progress.downloaded,
+            skipped: _progress.skipped + count,
+            failed: _progress.failed,
+            total: _progress.total,
+          );
+          notifyListeners();
+
+        case TileFailed():
+          _progress = DownloadProgress(
+            downloaded: _progress.downloaded,
+            skipped: _progress.skipped,
+            failed: _progress.failed + 1,
+            total: _progress.total,
+          );
+          notifyListeners();
+
+        case TileDownloadComplete():
+          _isDownloading = false;
+          notifyListeners();
+
+        case TileDownloadCancelled():
+          _isDownloading = false;
+          notifyListeners();
+      }
+    }
+
+    _isDownloading = false;
+    _downloadService?.dispose();
+    _downloadService = null;
+    notifyListeners();
+  }
+
+  void cancelDownload() {
+    _downloadService?.cancel();
+  }
+
+  void clearOverlays() {
+    _tileOverlays.clear();
+    notifyListeners();
+  }
+
+  void _addOverlay(TileOverlay overlay) {
+    _tileOverlays.add(overlay);
+    // Limit overlays to prevent OOM
+    if (_tileOverlays.length > 500) {
+      _tileOverlays.removeRange(0, _tileOverlays.length - 500);
+    }
+  }
+
+  // Cache management
+
+  Future<void> refreshCacheSize() async {
+    _cacheSizeBytes = await _cache.getCacheSize();
+    notifyListeners();
+  }
+
+  Future<void> deleteStyle(StyleInfo style) async {
+    if (_coverageStyle?.hash == style.hash) hideCoverage();
+    await _cache.deleteStyle(style.hash);
+    await refreshCacheSize();
+    await refreshLocalStyles();
+  }
+
+  Future<void> clearCache() async {
+    hideCoverage();
+    await _cache.clearCache();
+    _cacheSizeBytes = 0;
+    _localStyles = [];
+    notifyListeners();
+  }
+
+  // Coverage overlay — show cached tile bounds on the map
+
+  /// Show the coverage of a cached style on the map.
+  /// Loads tile coordinates from the manifest and converts to bounds.
+  Future<void> showCoverage(StyleInfo style) async {
+    if (_coverageStyle?.hash == style.hash) {
+      // Toggle off if same style tapped again
+      hideCoverage();
+      return;
+    }
+
+    _coverageStyle = style;
+    _coverageOverlays = [];
+    notifyListeners();
+
+    final manifest = await _cache.loadManifest(style.hash);
+
+    // Convert manifest keys to tile bound overlays
+    final overlays = <TileOverlay>[];
+    for (final key in manifest) {
+      final parts = key.split('/');
+      if (parts.length != 3) continue;
+      final z = int.tryParse(parts[0]);
+      final x = int.tryParse(parts[1]);
+      final y = int.tryParse(parts[2]);
+      if (z == null || x == null || y == null) continue;
+
+      final bounds = TileMathService.tileBounds(x, y, z);
+      overlays.add(TileOverlay(
+        north: bounds.north,
+        south: bounds.south,
+        east: bounds.east,
+        west: bounds.west,
+        isSkipped: true, // green color
+      ));
+    }
+
+    _coverageOverlays = overlays;
+    notifyListeners();
+  }
+
+  void hideCoverage() {
+    _coverageStyle = null;
+    _coverageOverlays = [];
+    notifyListeners();
+  }
+
+  // Sharing controls
+
+  Future<void> toggleServer() async {
+    if (_isServerRunning) {
+      await _sharing.stopServer();
+      _isServerRunning = false;
+    } else {
+      await _sharing.startServer();
+      _isServerRunning = _sharing.isRunning;
+    }
+    notifyListeners();
+  }
+
+  Future<void> startPeerDiscovery() async {
+    _peersSubscription?.cancel();
+    _peersSubscription = _sharing.peersStream.listen((peers) {
+      _discoveredPeers = peers;
+      notifyListeners();
+    });
+    await _sharing.startDiscovery();
+  }
+
+  Future<void> stopPeerDiscovery() async {
+    _peersSubscription?.cancel();
+    _peersSubscription = null;
+    await _sharing.stopPeerDiscovery();
+    _discoveredPeers = {};
+    notifyListeners();
+  }
+
+  void addManualPeer(String ipAddress) {
+    _sharing.addManualPeer(ipAddress);
+    _discoveredPeers = _sharing.discoveredPeers;
+    notifyListeners();
+  }
+
+  void removePeer(TilePeer peer) {
+    _sharing.removePeer(peer);
+    _discoveredPeers = _sharing.discoveredPeers;
+    notifyListeners();
+  }
+
+  // Peer catalog & P2P sync
+
+  /// Refresh local style info.
+  Future<void> refreshLocalStyles() async {
+    _localStyles = await _cache.listStylesDetailed();
+    notifyListeners();
+  }
+
+  /// Fetch catalogs from all discovered peers to see what they have.
+  Future<void> refreshPeerCatalogs() async {
+    _isFetchingCatalogs = true;
+    notifyListeners();
+
+    _peerCatalogs = await _sharing.fetchAllPeerCatalogs();
+    _isFetchingCatalogs = false;
+    notifyListeners();
+  }
+
+  /// Sync a style from one or more peers that have it.
+  /// Finds all peers offering [styleHash] and pulls missing tiles.
+  Future<void> syncStyleFromPeers(StyleInfo style) async {
+    if (_isSyncing) return;
+
+    // Find all peers that have this style
+    final peersWithStyle = <TilePeer>[];
+    for (final catalog in _peerCatalogs) {
+      if (catalog.styles.any((s) => s.hash == style.hash)) {
+        peersWithStyle.add(catalog.peer);
+      }
+    }
+    if (peersWithStyle.isEmpty) return;
+
+    _isSyncing = true;
+    _syncStatus = 'Starting sync of ${style.displayName}...';
+    _syncProgress = 0;
+    notifyListeners();
+
+    final stream = _sharing.syncStyleFromPeers(
+      peers: peersWithStyle,
+      styleHash: style.hash,
+      styleMeta: style,
+    );
+
+    await for (final event in stream) {
+      switch (event) {
+        case PeerSyncStarted(:final totalTiles):
+          _syncStatus = 'Syncing ${style.displayName}: 0/$totalTiles tiles';
+          _syncProgress = 0;
+          notifyListeners();
+
+        case PeerSyncTileDownloaded(:final downloaded, :final total):
+          _syncStatus =
+              'Syncing ${style.displayName}: $downloaded/$total tiles';
+          _syncProgress = total > 0 ? downloaded / total : 0;
+          notifyListeners();
+
+        case PeerSyncTileSkipped(:final skipped, :final total):
+          _syncProgress = total > 0 ? skipped / total : 0;
+          notifyListeners();
+
+        case PeerSyncComplete(:final downloaded, :final skipped, :final failed):
+          _syncStatus =
+              'Done! $downloaded new, $skipped cached, $failed failed';
+          _isSyncing = false;
+          notifyListeners();
+          await refreshCacheSize();
+          await refreshLocalStyles();
+
+        case PeerSyncCancelled():
+          _syncStatus = 'Sync cancelled';
+          _isSyncing = false;
+          notifyListeners();
+      }
+    }
+  }
+
+  void cancelSync() {
+    _sharing.cancelSync();
+  }
+
+  // Presets — load a previously downloaded region for quick re-download
+
+  /// Load a saved download region as the current selection.
+  /// Restores polygons, zoom range, and map layer.
+  void loadPreset(StyleInfo style) {
+    if (style.region == null) return;
+
+    final region = style.region!;
+
+    // Restore polygons
+    _polygons.clear();
+    for (final polyData in region.polygons) {
+      final poly = polyData.map((v) => LatLng(v[0], v[1])).toList();
+      if (poly.length >= 3) _polygons.add(poly);
+    }
+
+    // Restore zoom range
+    _minZoom = region.minZoom;
+    _maxZoom = region.maxZoom;
+
+    // Try to find the matching map layer
+    if (style.urlTemplate.isNotEmpty) {
+      final matchingLayer = MapLayer.allLayers.where(
+        (l) => l.urlTemplate == style.urlTemplate,
+      );
+      if (matchingLayer.isNotEmpty) {
+        _selectedLayer = matchingLayer.first;
+      }
+    }
+
+    _currentVertices = [];
+    _rectangleFirstCorner = null;
+    _drawingMode = DrawingMode.none;
+    notifyListeners();
+  }
+
+  @override
+  void dispose() {
+    _downloadSubscription?.cancel();
+    _downloadService?.dispose();
+    _peersSubscription?.cancel();
+    super.dispose();
+  }
+}

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 Duration selfAutoRefreshInterval = Duration(seconds: 30);
   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 _isRefreshDueForInterval(
+    String publicKeyHex, {
+    required Duration interval,
+    required DateTime refreshTime,
+  }) {
+    if (interval <= Duration.zero) {
+      return false;
+    }
+
+    final lastRefreshAt = _lastRefreshAttemptAt[publicKeyHex];
+    return lastRefreshAt == null ||
+        refreshTime.difference(lastRefreshAt) >= interval;
+  }
+
   Future<void> toggleMetric(
     String publicKeyHex,
     String fieldKey,
@@ -474,6 +489,28 @@ class SensorsProvider with ChangeNotifier {
   bool isWatched(String publicKeyHex) =>
       _watchedSensorKeys.contains(publicKeyHex);
 
+  Contact? selfContact(
+    ContactsProvider contactsProvider,
+    ConnectionProvider connectionProvider,
+  ) {
+    final selfKey = connectionProvider.deviceInfo.publicKey;
+    if (selfKey == null || selfKey.isEmpty) {
+      return null;
+    }
+
+    final existing = contactsProvider.findContactByKey(
+      Uint8List.fromList(selfKey),
+    );
+    final selfTelemetry = contactsProvider.selfTelemetry;
+    if (existing != null) {
+      return selfTelemetry == null
+          ? existing
+          : existing.copyWith(telemetry: selfTelemetry);
+    }
+
+    return _buildSelfCandidate(connectionProvider, telemetry: selfTelemetry);
+  }
+
   Future<void> addSensor(Contact contact) async {
     if (!contact.isChat && !contact.isRepeater && !contact.isSensor) {
       return;
@@ -549,22 +586,117 @@ class SensorsProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  List<Contact> availableCandidates(ContactsProvider contactsProvider) {
+  Future<void> reorderSensors(int oldIndex, int newIndex) async {
+    if (_watchedSensorKeys.length < 2) {
+      return;
+    }
+    if (oldIndex < 0 ||
+        oldIndex >= _watchedSensorKeys.length ||
+        newIndex < 0 ||
+        newIndex > _watchedSensorKeys.length) {
+      return;
+    }
+
+    var targetIndex = newIndex;
+    if (oldIndex < targetIndex) {
+      targetIndex -= 1;
+    }
+    if (oldIndex == targetIndex) {
+      return;
+    }
+
+    final movedKey = _watchedSensorKeys.removeAt(oldIndex);
+    _watchedSensorKeys.insert(targetIndex, movedKey);
+    await _persistWatchedSensors();
+    notifyListeners();
+  }
+
+  List<Contact> availableCandidates(
+    ContactsProvider contactsProvider, {
+    ConnectionProvider? connectionProvider,
+  }) {
     final candidates = <Contact>[
       ...contactsProvider.chatContacts,
       ...contactsProvider.repeaters,
       ...contactsProvider.sensorContacts,
     ];
+
+    // Add "myself" (own device) as a candidate if it has a public key
+    if (connectionProvider != null) {
+      final self = selfContact(contactsProvider, connectionProvider);
+      if (self != null &&
+          !candidates.any((c) => c.publicKeyHex == self.publicKeyHex)) {
+        candidates.insert(0, self);
+      }
+    }
+
     candidates.removeWhere((contact) => isWatched(contact.publicKeyHex));
     candidates.sort((a, b) => b.lastSeenTime.compareTo(a.lastSeenTime));
     return candidates;
   }
 
+  List<String> displaySensorKeys({
+    required ContactsProvider contactsProvider,
+    required ConnectionProvider connectionProvider,
+  }) {
+    if (_watchedSensorKeys.isNotEmpty) {
+      return List<String>.unmodifiable(_watchedSensorKeys);
+    }
+
+    final self = selfContact(contactsProvider, connectionProvider);
+    if (self == null) {
+      return const <String>[];
+    }
+
+    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,
+    required ConnectionProvider connectionProvider,
+  }) {
+    for (final entry in contactsProvider.contacts) {
+      if (entry.publicKeyHex == publicKeyHex) {
+        return entry;
+      }
+    }
+
+    final self = selfContact(contactsProvider, connectionProvider);
+    if (self?.publicKeyHex == publicKeyHex) {
+      return self;
+    }
+
+    return null;
+  }
+
   Future<void> refreshAll({
     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;
     }
 
@@ -572,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,
@@ -597,13 +729,11 @@ class SensorsProvider with ChangeNotifier {
 
     _lastRefreshAttemptAt[publicKeyHex] = requestedAt ?? DateTime.now();
 
-    Contact? contact;
-    for (final entry in contactsProvider.contacts) {
-      if (entry.publicKeyHex == publicKeyHex) {
-        contact = entry;
-        break;
-      }
-    }
+    final contact = contactForDisplay(
+      publicKeyHex,
+      contactsProvider: contactsProvider,
+      connectionProvider: connectionProvider,
+    );
 
     if (contact == null) {
       _setRefreshState(publicKeyHex, SensorRefreshState.unavailable);
@@ -635,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) &&
+        _isRefreshDueForInterval(
+          self.publicKeyHex,
+          interval: selfAutoRefreshInterval,
+          refreshTime: refreshTime,
+        )) {
+      dueKeys.insert(0, self.publicKeyHex);
+    }
     if (dueKeys.isEmpty) {
       return;
     }
@@ -686,4 +826,29 @@ class SensorsProvider with ChangeNotifier {
     _refreshStateUpdatedAt[publicKeyHex] = DateTime.now();
     notifyListeners();
   }
+
+  Contact? _buildSelfCandidate(
+    ConnectionProvider connectionProvider, {
+    ContactTelemetry? telemetry,
+  }) {
+    final deviceInfo = connectionProvider.deviceInfo;
+    final selfKey = deviceInfo.publicKey;
+    if (selfKey == null || selfKey.isEmpty) {
+      return null;
+    }
+
+    return Contact(
+      publicKey: Uint8List.fromList(selfKey),
+      type: ContactType.chat,
+      flags: 0,
+      outPathLen: 0,
+      outPath: Uint8List(64),
+      advName: deviceInfo.selfName ?? 'My Device',
+      lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      advLat: deviceInfo.advLat ?? 0,
+      advLon: deviceInfo.advLon ?? 0,
+      lastMod: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      telemetry: telemetry,
+    );
+  }
 }

lib/providers/voice_provider.dart

@@ -4,6 +4,7 @@ import 'dart:typed_data';
 import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../models/contact.dart';
+import '../services/profiles_feature_service.dart';
 import 'helpers/raw_session_retransmit.dart';
 import '../utils/voice_message_parser.dart';
 import '../services/voice_codec_service.dart';
@@ -92,6 +93,9 @@ class VoiceProvider with ChangeNotifier {
     _restorePersistedVoiceData();
   }
 
+  String _storageKey() =>
+      ProfileStorageScope.scopedKey(_voiceSessionsStorageKey);
+
   // ── Session accessors ────────────────────────────────────────────────────
 
   VoiceSession? session(String sessionId) => _sessions[sessionId];
@@ -329,19 +333,22 @@ class VoiceProvider with ChangeNotifier {
   }
 
   Future<void> clearStoredVoiceData() async {
-    _sessions.clear();
-    _outgoingSessions.clear();
-    _ignoredIncomingSessions.clear();
-    _playingSessionId = null;
+    await _resetInMemoryState();
     notifyListeners();
     try {
       final prefs = await SharedPreferences.getInstance();
-      await prefs.remove(_voiceSessionsStorageKey);
+      await prefs.remove(_storageKey());
     } catch (e) {
       debugPrint('❌ [VoiceProvider] Failed to clear stored voice data: $e');
     }
   }
 
+  Future<void> reloadProfileScopedState() async {
+    await _resetInMemoryState();
+    await _restorePersistedVoiceData();
+    notifyListeners();
+  }
+
   Future<void> _persistVoiceData() async {
     try {
       final prefs = await SharedPreferences.getInstance();
@@ -365,7 +372,7 @@ class VoiceProvider with ChangeNotifier {
             )
             .toList(),
       };
-      await prefs.setString(_voiceSessionsStorageKey, jsonEncode(payload));
+      await prefs.setString(_storageKey(), jsonEncode(payload));
     } catch (e) {
       debugPrint('❌ [VoiceProvider] Failed to persist voice data: $e');
     }
@@ -374,7 +381,7 @@ class VoiceProvider with ChangeNotifier {
   Future<void> _restorePersistedVoiceData() async {
     try {
       final prefs = await SharedPreferences.getInstance();
-      final raw = prefs.getString(_voiceSessionsStorageKey);
+      final raw = prefs.getString(_storageKey());
       if (raw == null || raw.isEmpty) return;
 
       final parsed = jsonDecode(raw) as Map<String, dynamic>;
@@ -437,6 +444,16 @@ class VoiceProvider with ChangeNotifier {
     }
   }
 
+  Future<void> _resetInMemoryState() async {
+    if (_playingSessionId != null || _player.isPlaying) {
+      await _player.stop();
+    }
+    _sessions.clear();
+    _outgoingSessions.clear();
+    _ignoredIncomingSessions.clear();
+    _playingSessionId = null;
+  }
+
   @override
   void dispose() {
     _playerEventsSub.cancel();

lib/screens/add_contact_screen.dart

@@ -6,7 +6,9 @@ import '../providers/connection_provider.dart';
 import '../l10n/app_localizations.dart';
 
 class AddContactScreen extends StatefulWidget {
-  const AddContactScreen({super.key});
+  final String? initialAdvert;
+
+  const AddContactScreen({super.key, this.initialAdvert});
 
   @override
   State<AddContactScreen> createState() => _AddContactScreenState();
@@ -21,7 +23,12 @@ class _AddContactScreenState extends State<AddContactScreen> {
   @override
   void initState() {
     super.initState();
-    _loadClipboardIfPresent();
+    if (widget.initialAdvert != null &&
+        widget.initialAdvert!.trim().isNotEmpty) {
+      _advertController.text = widget.initialAdvert!.trim();
+    } else {
+      _loadClipboardIfPresent();
+    }
   }
 
   @override
@@ -79,9 +86,9 @@ class _AddContactScreenState extends State<AddContactScreen> {
     final text = clipboardData?.text;
     if (text == null || text.trim().isEmpty) {
       if (!mounted) return;
-      ScaffoldMessenger.of(
-        context,
-      ).showSnackBar(SnackBar(content: Text(AppLocalizations.of(context)!.clipboardIsEmpty)));
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(AppLocalizations.of(context)!.clipboardIsEmpty)),
+      );
       return;
     }
 
@@ -140,9 +147,9 @@ class _AddContactScreenState extends State<AddContactScreen> {
       return;
     }
 
-    ScaffoldMessenger.of(
-      context,
-    ).showSnackBar(SnackBar(content: Text(AppLocalizations.of(context)!.contactImported)));
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text(AppLocalizations.of(context)!.contactImported)),
+    );
     setState(() {
       _importSucceeded = true;
     });

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(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
-      ),
-      builder: (sheetContext) => SafeArea(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            ListTile(
-              leading: Icon(Icons.message_outlined),
-              title: Text(l10n.messages),
-              onTap: () async {
-                Navigator.pop(sheetContext);
-                await _openMessagesForChannel(context, channel);
-              },
-            ),
-            if (channel.displayLocation != null)
-              ListTile(
-                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);
-                  });
-                },
-              ),
-          ],
-        ),
-      ),
+      showDragHandle: true,
+      isScrollControlled: true,
+      builder: (sheetContext) {
+        return _ContactsRegionScopeSheet(
+          currentScopeName: currentScope?.name,
+          l10n: l10n,
+          onScopeSelected: (String? name) async {
+            Navigator.of(sheetContext).pop();
+            if (name == null) {
+              await RegionScopePreferences.clearScope(channelIdx);
+              if (!context.mounted) return;
+              ToastLogger.success(context, l10n.regionScopeCleared);
+            } else {
+              final key = RegionScopePreferences.deriveRegionKey(name);
+              await RegionScopePreferences.setScope(channelIdx, name, key);
+              if (!context.mounted) return;
+              ToastLogger.success(context, l10n.regionScopeSet(name));
+            }
+          },
+        );
+      },
     );
   }
 
@@ -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/device_config_screen.dart

@@ -178,12 +178,20 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
   late TextEditingController _lonController;
   late TextEditingController _freqController;
   late TextEditingController _txPowerController;
+  late TextEditingController _gpsIntervalController;
+  late TextEditingController _autoAddMaxHopsController;
   late final ConnectionProvider _connectionProvider;
 
-  bool _telemetryEnabled = false;
+  int _baseTelemetryMode = 0;
+  int _locationTelemetryMode = 0;
+  int _environmentTelemetryMode = 0;
+  int _advertLocationPolicy = 0;
+  bool _multiAcksEnabled = false;
   bool _repeatEnabled = false;
   bool? _gpsEnabled; // null = not supported by hardware
   bool _gpsLoading = false;
+  bool _isSyncingDeviceTime = false;
+  int? _selectedPathHashMode;
   bool _autoAddDiscoveredContactsEnabled = true;
   bool _autoAddUsersEnabled = true;
   bool _autoAddRepeatersEnabled = true;
@@ -250,6 +258,10 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
     _txPowerController = TextEditingController(
       text: deviceInfo.txPower?.toString() ?? '20',
     );
+    _gpsIntervalController = TextEditingController();
+    _autoAddMaxHopsController = TextEditingController(
+      text: (deviceInfo.autoAddMaxHops ?? 0).toString(),
+    );
 
     if (deviceInfo.radioBw != null &&
         deviceInfo.radioBw! >= 0 &&
@@ -275,10 +287,17 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
     );
     _showCustomRadioSettings = _selectedRadioPreset == null;
 
-    // Check if telemetry is enabled (check if lat/lon are set and not zero)
-    _telemetryEnabled =
-        (deviceInfo.advLat != null && deviceInfo.advLat! != 0) ||
-        (deviceInfo.advLon != null && deviceInfo.advLon! != 0);
+    final telemetryModes = deviceInfo.telemetryModes;
+    _baseTelemetryMode = telemetryModes != null ? telemetryModes & 0x03 : 0;
+    _locationTelemetryMode = telemetryModes != null
+        ? (telemetryModes >> 2) & 0x03
+        : 0;
+    _environmentTelemetryMode = telemetryModes != null
+        ? (telemetryModes >> 4) & 0x03
+        : 0;
+    _advertLocationPolicy = deviceInfo.advertLocPolicy ?? 0;
+    _multiAcksEnabled = (deviceInfo.multiAcks ?? 0) != 0;
+    _selectedPathHashMode = deviceInfo.pathHashMode;
 
     // Initialize repeat mode from device info (firmware v9+)
     _repeatEnabled = deviceInfo.clientRepeat ?? false;
@@ -308,6 +327,8 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
     _lonController.dispose();
     _freqController.dispose();
     _txPowerController.dispose();
+    _gpsIntervalController.dispose();
+    _autoAddMaxHopsController.dispose();
     super.dispose();
   }
 
@@ -428,6 +449,7 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
       deviceInfo.autoAddRoomServers,
       deviceInfo.autoAddSensors,
       deviceInfo.autoAddOverwriteOldest,
+      deviceInfo.autoAddMaxHops,
     ].join('|');
   }
 
@@ -467,22 +489,22 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
     _autoAddRoomServersEnabled = deviceInfo.autoAddRoomServers ?? true;
     _autoAddSensorsEnabled = deviceInfo.autoAddSensors ?? true;
     _overwriteOldestAutoAddEnabled = deviceInfo.autoAddOverwriteOldest ?? false;
+    _autoAddMaxHopsController.text = (deviceInfo.autoAddMaxHops ?? 0)
+        .toString();
   }
 
-  int _telemetryModesForSave(ConnectionProvider connectionProvider) {
-    final deviceInfo = connectionProvider.deviceInfo;
-    final telemetryEnabled =
-        (deviceInfo.advLat != null && deviceInfo.advLat != 0) ||
-        (deviceInfo.advLon != null && deviceInfo.advLon != 0);
-    return deviceInfo.telemetryModes ?? (telemetryEnabled ? 0x0A : 0x00);
+  int _telemetryModesForSave() {
+    return (_environmentTelemetryMode << 4) |
+        (_locationTelemetryMode << 2) |
+        _baseTelemetryMode;
   }
 
-  int _advertLocationPolicyForSave(ConnectionProvider connectionProvider) {
-    final deviceInfo = connectionProvider.deviceInfo;
-    final telemetryEnabled =
-        (deviceInfo.advLat != null && deviceInfo.advLat != 0) ||
-        (deviceInfo.advLon != null && deviceInfo.advLon != 0);
-    return deviceInfo.advertLocPolicy ?? (telemetryEnabled ? 1 : 0);
+  int _advertLocationPolicyForSave() {
+    return _advertLocationPolicy;
+  }
+
+  int _multiAcksForSave() {
+    return _multiAcksEnabled ? 1 : 0;
   }
 
   Future<void> _savePublicInfo() async {
@@ -501,8 +523,24 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
         await connectionProvider.setAdvertName(_nameController.text);
       }
 
-      // Save position and telemetry settings
-      if (_telemetryEnabled) {
+      final gpsIntervalText = _gpsIntervalController.text.trim();
+      if (gpsIntervalText.isNotEmpty) {
+        final gpsInterval = int.tryParse(gpsIntervalText);
+        if (gpsInterval == null || gpsInterval < 0 || gpsInterval > 86400) {
+          if (mounted) {
+            setState(() {
+              _publicInfoError =
+                  'GPS interval must be a whole number between 0 and 86400 seconds.';
+              _isSavingPublicInfo = false;
+            });
+          }
+          return;
+        }
+        await connectionProvider.setCustomVar('gps_interval', gpsIntervalText);
+      }
+
+      // Save stored coordinates only when the firmware advert policy uses prefs.
+      if (_advertLocationPolicy == 2) {
         // Parse and validate coordinates
         final latResult = validator.parseLatitude(_latController.text);
         if (!latResult.isSuccess) {
@@ -530,27 +568,15 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
           latitude: latResult.value!,
           longitude: lonResult.value!,
         );
-
-        // Set telemetry modes to "Allow All" (mode 2 for both base and location)
-        final telemetryModes = 0x0A; // binary: 00001010 (base=2, location=2)
-        await connectionProvider.setOtherParams(
-          manualAddContacts: _autoAddFilterModeFlag,
-          telemetryModes: telemetryModes,
-          advertLocationPolicy: 1,
-        );
-      } else {
-        // Clear position
-        await connectionProvider.setAdvertLatLon(latitude: 0.0, longitude: 0.0);
-
-        // Set telemetry modes to "Deny" (mode 0)
-        final telemetryModes = 0x00;
-        await connectionProvider.setOtherParams(
-          manualAddContacts: _autoAddFilterModeFlag,
-          telemetryModes: telemetryModes,
-          advertLocationPolicy: 0,
-        );
       }
 
+      await connectionProvider.setOtherParams(
+        manualAddContacts: _autoAddFilterModeFlag,
+        telemetryModes: _telemetryModesForSave(),
+        advertLocationPolicy: _advertLocationPolicyForSave(),
+        multiAcks: _multiAcksForSave(),
+      );
+
       // Refetch device info to update UI with new settings
       await connectionProvider.refreshDeviceInfo();
 
@@ -625,6 +651,10 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
       // Save TX power
       await connectionProvider.setTxPower(txPowerResult.value!);
 
+      if (_selectedPathHashMode != null) {
+        await connectionProvider.setPathHashMode(_selectedPathHashMode!);
+      }
+
       // Refetch device info to update UI with new settings
       await connectionProvider.refreshDeviceInfo();
 
@@ -658,6 +688,8 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
         _autoAddDiscoveredContactsEnabled && _autoAddSensorsEnabled;
     final overwriteOldest =
         _autoAddDiscoveredContactsEnabled && _overwriteOldestAutoAddEnabled;
+    final maxHopsText = _autoAddMaxHopsController.text.trim();
+    final maxHops = int.tryParse(maxHopsText);
 
     setState(() {
       _isSavingAutoDiscoverySettings = true;
@@ -666,18 +698,22 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
     });
 
     try {
+      if (maxHops == null || maxHops < 0 || maxHops > 64) {
+        throw Exception('Auto-add max hops must be between 0 and 64.');
+      }
       await connectionProvider.setAutoaddConfig(
         autoAddUsers: autoAddUsers,
         autoAddRepeaters: autoAddRepeaters,
         autoAddRoomServers: autoAddRoomServers,
         autoAddSensors: autoAddSensors,
         overwriteOldest: overwriteOldest,
+        maxHops: maxHops,
       );
       await connectionProvider.setOtherParams(
         manualAddContacts: _autoAddFilterModeFlag,
-        telemetryModes: _telemetryModesForSave(connectionProvider),
-        advertLocationPolicy: _advertLocationPolicyForSave(connectionProvider),
-        multiAcks: connectionProvider.deviceInfo.multiAcks ?? 0,
+        telemetryModes: _telemetryModesForSave(),
+        advertLocationPolicy: _advertLocationPolicyForSave(),
+        multiAcks: _multiAcksForSave(),
       );
       await connectionProvider.getAutoaddConfig();
 
@@ -709,8 +745,12 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
       final vars = await _connectionProvider.getCustomVars();
       if (!mounted) return;
       final gpsValue = vars['gps'];
+      final gpsIntervalValue = vars['gps_interval'];
       setState(() {
         _gpsEnabled = gpsValue != null ? gpsValue == '1' : null;
+        if (gpsIntervalValue != null) {
+          _gpsIntervalController.text = gpsIntervalValue;
+        }
       });
     } catch (_) {
       // Device may not support custom vars (old firmware / no GPS hardware)
@@ -794,7 +834,10 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
       setState(() {
         _latController.text = position.latitude.toStringAsFixed(6);
         _lonController.text = position.longitude.toStringAsFixed(6);
-        _telemetryEnabled = true;
+        _advertLocationPolicy = 2;
+        if (_locationTelemetryMode == 0) {
+          _locationTelemetryMode = 2;
+        }
       });
 
       if (mounted) {
@@ -823,6 +866,37 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
     }
   }
 
+  Future<void> _syncDeviceTime() async {
+    setState(() => _isSyncingDeviceTime = true);
+    try {
+      _connectionProvider.clearError();
+      await _connectionProvider.syncDeviceTime();
+      final syncError = _connectionProvider.error;
+      if (syncError != null) {
+        throw Exception(syncError);
+      }
+      if (!mounted) return;
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Device time synced to this phone.'),
+          backgroundColor: Colors.green,
+        ),
+      );
+    } catch (e) {
+      if (!mounted) return;
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text('Failed to sync device time: $e'),
+          backgroundColor: Theme.of(context).colorScheme.error,
+        ),
+      );
+    } finally {
+      if (mounted) {
+        setState(() => _isSyncingDeviceTime = false);
+      }
+    }
+  }
+
   Future<void> _confirmFactoryReset() async {
     final confirmed = await showDialog<bool>(
       context: context,
@@ -1093,9 +1167,7 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
     final deviceInfo = context.watch<ConnectionProvider>().deviceInfo;
     final theme = Theme.of(context);
     final colorScheme = theme.colorScheme;
-    final locationSet =
-        (deviceInfo.advLat != null && deviceInfo.advLat != 0) ||
-        (deviceInfo.advLon != null && deviceInfo.advLon != 0);
+    final locationSet = _advertLocationPolicy != 0;
 
     return Scaffold(
       appBar: AppBar(title: Text(AppLocalizations.of(context)!.settings)),
@@ -1173,6 +1245,130 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                 ),
               ),
               SizedBox(height: 20),
+              _ConfigSectionCard(
+                title: 'Device info',
+                subtitle:
+                    'Capabilities reported by the connected radio and maintenance tools.',
+                icon: Icons.info_outline_rounded,
+                child: LayoutBuilder(
+                  builder: (context, constraints) {
+                    final cardWidth = constraints.maxWidth > 420
+                        ? (constraints.maxWidth - 24) / 3
+                        : (constraints.maxWidth - 12) / 2;
+
+                    return Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Wrap(
+                          spacing: 12,
+                          runSpacing: 12,
+                          children: [
+                            SizedBox(
+                              width: cardWidth,
+                              child: _StorageStat(
+                                label: 'BLE PIN',
+                                value: _formatBlePin(deviceInfo.blePin),
+                                compact: true,
+                              ),
+                            ),
+                            SizedBox(
+                              width: cardWidth,
+                              child: _StorageStat(
+                                label: AppLocalizations.of(
+                                  context,
+                                )!.maxContacts,
+                                value:
+                                    deviceInfo.maxContacts?.toString() ??
+                                    AppLocalizations.of(context)!.unknown,
+                                compact: true,
+                              ),
+                            ),
+                            SizedBox(
+                              width: cardWidth,
+                              child: _StorageStat(
+                                label: AppLocalizations.of(
+                                  context,
+                                )!.maxChannels,
+                                value:
+                                    deviceInfo.maxChannels?.toString() ??
+                                    AppLocalizations.of(context)!.unknown,
+                                compact: true,
+                              ),
+                            ),
+                            if (deviceInfo.pathHashMode != null)
+                              SizedBox(
+                                width: cardWidth,
+                                child: _StorageStat(
+                                  label: 'Path hash',
+                                  value: _pathHashModeLabel(
+                                    deviceInfo.pathHashMode!,
+                                  ),
+                                  compact: true,
+                                ),
+                              ),
+                          ],
+                        ),
+                        const SizedBox(height: 16),
+                        Container(
+                          padding: const EdgeInsets.all(14),
+                          decoration: BoxDecoration(
+                            color: colorScheme.surfaceContainerLowest,
+                            borderRadius: BorderRadius.circular(20),
+                            border: Border.all(
+                              color: colorScheme.outlineVariant,
+                            ),
+                          ),
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                'Clock maintenance',
+                                style: theme.textTheme.titleSmall?.copyWith(
+                                  fontWeight: FontWeight.w800,
+                                ),
+                              ),
+                              const SizedBox(height: 4),
+                              Text(
+                                'Refresh the radio clock if room logins or message timestamps look off.',
+                                style: theme.textTheme.bodySmall?.copyWith(
+                                  color: colorScheme.onSurfaceVariant,
+                                ),
+                              ),
+                              const SizedBox(height: 12),
+                              SizedBox(
+                                width: double.infinity,
+                                child: OutlinedButton.icon(
+                                  onPressed: _isSyncingDeviceTime
+                                      ? null
+                                      : _syncDeviceTime,
+                                  icon: _isSyncingDeviceTime
+                                      ? const SizedBox(
+                                          width: 18,
+                                          height: 18,
+                                          child: CircularProgressIndicator(
+                                            strokeWidth: 2,
+                                          ),
+                                        )
+                                      : const Icon(Icons.schedule_rounded),
+                                  label: Text(
+                                    _isSyncingDeviceTime
+                                        ? 'Syncing time...'
+                                        : 'Sync device time',
+                                  ),
+                                  style: OutlinedButton.styleFrom(
+                                    minimumSize: const Size.fromHeight(46),
+                                  ),
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ],
+                    );
+                  },
+                ),
+              ),
+              SizedBox(height: 20),
               _ConfigSectionCard(
                 title: AppLocalizations.of(context)!.autoDiscovery,
                 subtitle:
@@ -1310,6 +1506,22 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                             : null,
                       ),
                     ),
+                    const SizedBox(height: 16),
+                    TextField(
+                      controller: _autoAddMaxHopsController,
+                      onChanged: (_) => _markAutoDiscoverySettingsDirty(),
+                      decoration: InputDecoration(
+                        labelText: 'Auto-add max hops',
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.circular(20),
+                        ),
+                        filled: true,
+                        fillColor: colorScheme.surfaceContainerLowest,
+                        helperText:
+                            '0 means no limit. 1 keeps auto-add to direct neighbors only.',
+                      ),
+                      keyboardType: TextInputType.number,
+                    ),
                     const SizedBox(height: 18),
                     if (_autoDiscoverySettingsError != null) ...[
                       Text(
@@ -1346,27 +1558,87 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    _SettingHighlightCard(
-                      icon: _telemetryEnabled
-                          ? Icons.travel_explore
-                          : Icons.location_disabled,
-                      title: AppLocalizations.of(
-                        context,
-                      )!.telemetryAndLocationSharing,
-                      description: 'Share your location with nearby devices.',
-                      accentColor: _telemetryEnabled
-                          ? colorScheme.primary
-                          : colorScheme.onSurfaceVariant,
-                      trailing: Switch(
-                        value: _telemetryEnabled,
-                        onChanged: (value) {
-                          setState(() {
-                            _telemetryEnabled = value;
-                            _publicInfoSaved = false;
-                            _publicInfoError = null;
-                          });
-                        },
-                      ),
+                    _ConfigDropdownField(
+                      label: 'Base telemetry',
+                      value: _baseTelemetryMode,
+                      items: const [
+                        DropdownMenuItem(value: 0, child: Text('Deny')),
+                        DropdownMenuItem(
+                          value: 1,
+                          child: Text('Use contact flags'),
+                        ),
+                        DropdownMenuItem(value: 2, child: Text('Allow all')),
+                      ],
+                      onChanged: (value) {
+                        if (value == null) return;
+                        setState(() {
+                          _baseTelemetryMode = value;
+                          _markPublicInfoDirty();
+                        });
+                      },
+                    ),
+                    const SizedBox(height: 16),
+                    _ConfigDropdownField(
+                      label: 'Location telemetry',
+                      value: _locationTelemetryMode,
+                      items: const [
+                        DropdownMenuItem(value: 0, child: Text('Deny')),
+                        DropdownMenuItem(
+                          value: 1,
+                          child: Text('Use contact flags'),
+                        ),
+                        DropdownMenuItem(value: 2, child: Text('Allow all')),
+                      ],
+                      onChanged: (value) {
+                        if (value == null) return;
+                        setState(() {
+                          _locationTelemetryMode = value;
+                          _markPublicInfoDirty();
+                        });
+                      },
+                    ),
+                    const SizedBox(height: 16),
+                    _ConfigDropdownField(
+                      label: 'Environmental telemetry',
+                      value: _environmentTelemetryMode,
+                      items: const [
+                        DropdownMenuItem(value: 0, child: Text('Deny')),
+                        DropdownMenuItem(
+                          value: 1,
+                          child: Text('Use contact flags'),
+                        ),
+                        DropdownMenuItem(value: 2, child: Text('Allow all')),
+                      ],
+                      onChanged: (value) {
+                        if (value == null) return;
+                        setState(() {
+                          _environmentTelemetryMode = value;
+                          _markPublicInfoDirty();
+                        });
+                      },
+                    ),
+                    const SizedBox(height: 16),
+                    _ConfigDropdownField(
+                      label: 'GPS advert policy',
+                      value: _advertLocationPolicy,
+                      items: const [
+                        DropdownMenuItem(value: 0, child: Text('Hidden')),
+                        DropdownMenuItem(
+                          value: 1,
+                          child: Text('Share live GPS'),
+                        ),
+                        DropdownMenuItem(
+                          value: 2,
+                          child: Text('Use saved coordinates'),
+                        ),
+                      ],
+                      onChanged: (value) {
+                        if (value == null) return;
+                        setState(() {
+                          _advertLocationPolicy = value;
+                          _markPublicInfoDirty();
+                        });
+                      },
                     ),
                     if (_gpsEnabled != null) ...[
                       const SizedBox(height: 12),
@@ -1392,6 +1664,43 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                               ),
                       ),
                     ],
+                    const SizedBox(height: 16),
+                    TextField(
+                      controller: _gpsIntervalController,
+                      onChanged: (_) => _markPublicInfoDirty(),
+                      decoration: InputDecoration(
+                        labelText: 'GPS interval (seconds)',
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.circular(20),
+                        ),
+                        filled: true,
+                        fillColor: colorScheme.surfaceContainerLowest,
+                        helperText:
+                            'Firmware supports 0-86400 seconds. Older builds may not report the current value back.',
+                      ),
+                      keyboardType: TextInputType.number,
+                    ),
+                    const SizedBox(height: 12),
+                    _SettingHighlightCard(
+                      icon: _multiAcksEnabled
+                          ? Icons.mark_email_read_outlined
+                          : Icons.mark_email_unread_outlined,
+                      title: 'Multi-ACK mode',
+                      description:
+                          'Ask the radio to request extra acknowledgements when the firmware supports it.',
+                      accentColor: _multiAcksEnabled
+                          ? colorScheme.primary
+                          : colorScheme.onSurfaceVariant,
+                      trailing: Switch(
+                        value: _multiAcksEnabled,
+                        onChanged: (value) {
+                          setState(() {
+                            _multiAcksEnabled = value;
+                            _markPublicInfoDirty();
+                          });
+                        },
+                      ),
+                    ),
                     const SizedBox(height: 18),
                     TextField(
                       controller: _nameController,
@@ -1407,7 +1716,7 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                             'This is the name other devices will see on the mesh.',
                       ),
                     ),
-                    if (_telemetryEnabled) ...[
+                    if (_advertLocationPolicy == 2) ...[
                       const SizedBox(height: 16),
                       Container(
                         padding: const EdgeInsets.all(14),
@@ -1420,14 +1729,14 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
                             Text(
-                              'Shared location',
+                              'Saved coordinates',
                               style: theme.textTheme.titleSmall?.copyWith(
                                 fontWeight: FontWeight.w800,
                               ),
                             ),
                             const SizedBox(height: 4),
                             Text(
-                              'Set coordinates manually or use your current location.',
+                              'These coordinates are used when advert policy is set to saved coordinates.',
                               style: theme.textTheme.bodySmall?.copyWith(
                                 color: colorScheme.onSurfaceVariant,
                               ),
@@ -1463,6 +1772,22 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                           ],
                         ),
                       ),
+                    ] else if (_advertLocationPolicy == 1) ...[
+                      const SizedBox(height: 16),
+                      Container(
+                        padding: const EdgeInsets.all(14),
+                        decoration: BoxDecoration(
+                          color: colorScheme.surfaceContainerLow,
+                          borderRadius: BorderRadius.circular(22),
+                          border: Border.all(color: colorScheme.outlineVariant),
+                        ),
+                        child: Text(
+                          'The firmware will advertise the live GPS fix from the onboard sensor manager when available.',
+                          style: theme.textTheme.bodySmall?.copyWith(
+                            color: colorScheme.onSurfaceVariant,
+                          ),
+                        ),
+                      ),
                     ],
                     const SizedBox(height: 18),
                     if (_publicInfoError != null) ...[
@@ -1708,6 +2033,45 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                             ),
                             keyboardType: TextInputType.number,
                           ),
+                          if (_selectedPathHashMode != null) ...[
+                            const SizedBox(height: 16),
+                            DropdownButtonFormField<int>(
+                              key: ValueKey('path-hash-$_selectedPathHashMode'),
+                              initialValue: _selectedPathHashMode,
+                              decoration: InputDecoration(
+                                labelText: 'Advert path hash size',
+                                border: OutlineInputBorder(
+                                  borderRadius: BorderRadius.circular(20),
+                                ),
+                                filled: true,
+                                fillColor: colorScheme.surfaceContainerLowest,
+                                helperText:
+                                    'Controls the low-level hash size used in adverts and flood paths.',
+                              ),
+                              items: const [
+                                DropdownMenuItem(
+                                  value: 0,
+                                  child: Text('1 byte (mode 0)'),
+                                ),
+                                DropdownMenuItem(
+                                  value: 1,
+                                  child: Text('2 bytes (mode 1)'),
+                                ),
+                                DropdownMenuItem(
+                                  value: 2,
+                                  child: Text('3 bytes (mode 2)'),
+                                ),
+                              ],
+                              onChanged: (int? newValue) {
+                                if (newValue != null) {
+                                  setState(() {
+                                    _selectedPathHashMode = newValue;
+                                  });
+                                  _markRadioSettingsDirty();
+                                }
+                              },
+                            ),
+                          ],
                         ],
                       ),
                     ),
@@ -1914,6 +2278,26 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
     }
     return '$storageKb KB';
   }
+
+  String _formatBlePin(int? blePin) {
+    if (blePin == null) {
+      return AppLocalizations.of(context)!.unknown;
+    }
+    return blePin.toString().padLeft(6, '0');
+  }
+
+  String _pathHashModeLabel(int mode) {
+    switch (mode) {
+      case 0:
+        return '1 byte';
+      case 1:
+        return '2 bytes';
+      case 2:
+        return '3 bytes';
+      default:
+        return 'Mode $mode';
+    }
+  }
 }
 
 class _ConfigHeroCard extends StatelessWidget {
@@ -2153,17 +2537,52 @@ class _ConfigSectionCard extends StatelessWidget {
   }
 }
 
+class _ConfigDropdownField<T> extends StatelessWidget {
+  final String label;
+  final T value;
+  final List<DropdownMenuItem<T>> items;
+  final ValueChanged<T?> onChanged;
+
+  const _ConfigDropdownField({
+    required this.label,
+    required this.value,
+    required this.items,
+    required this.onChanged,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return DropdownButtonFormField<T>(
+      initialValue: value,
+      decoration: InputDecoration(
+        labelText: label,
+        border: OutlineInputBorder(borderRadius: BorderRadius.circular(20)),
+        filled: true,
+        fillColor: colorScheme.surfaceContainerLowest,
+      ),
+      items: items,
+      onChanged: onChanged,
+    );
+  }
+}
+
 class _StorageStat extends StatelessWidget {
   final String label;
   final String value;
+  final bool compact;
 
-  const _StorageStat({required this.label, required this.value});
+  const _StorageStat({
+    required this.label,
+    required this.value,
+    this.compact = false,
+  });
 
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
     return Container(
-      padding: const EdgeInsets.all(14),
+      padding: EdgeInsets.all(compact ? 12 : 14),
       decoration: BoxDecoration(
         color: colorScheme.surfaceContainerLowest,
         borderRadius: BorderRadius.circular(20),
@@ -2177,14 +2596,16 @@ class _StorageStat extends StatelessWidget {
             style: TextStyle(
               fontWeight: FontWeight.w600,
               color: colorScheme.onSurfaceVariant,
+              fontSize: compact ? 13 : null,
             ),
           ),
-          const SizedBox(height: 6),
+          SizedBox(height: compact ? 4 : 6),
           Text(
             value,
             style: TextStyle(
               fontWeight: FontWeight.w800,
               color: colorScheme.onSurface,
+              fontSize: compact ? 17 : null,
             ),
           ),
         ],

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 {
-    switch (action) {
-      case _DiscoveryMenuAction.repeaters:
-        await _discoverNodeType(_repeaterAdvertType);
-        break;
-      case _DiscoveryMenuAction.sensors:
-        await _discoverNodeType(_sensorAdvertType);
-        break;
-    }
+  @override
+  void dispose() {
+    _searchController.dispose();
+    super.dispose();
   }
 
   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',
-        _sensorAdvertType => 'Sensor discovery sent',
+        _repeaterAdvertType => l10n.repeaterDiscoverySent,
+        _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) {
-    return switch (advert.typeValue) {
+  String? _typeLabelForValue(int? 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);
-    if (directType != null) {
+    final directType = advert.typeValue;
+    if (directType != null && directType != 0) {
       return directType;
     }
 
     for (final node in cachedNodes) {
       if (node.publicKey == advert.publicKeyHex.toLowerCase()) {
         return switch (node.type) {
-          1 => 'Repeater',
-          4 => 'Sensor',
-          3 => 'Room',
-          2 => 'Chat',
+          1 => _repeaterAdvertType,
+          4 => _sensorAdvertType,
+          3 => 3,
+          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(
-        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),
-                      ],
-                    ),
-                  ),
-                ],
-              );
-            },
-          ),
-        ],
-      ),
+      appBar: AppBar(title: Text(l10n.discovery)),
       body: FutureBuilder<List<MeshMapNode>>(
         future: _cachedNodesFuture,
-        builder: (context, nodesSnapshot) => Consumer2<ContactsProvider, ConnectionProvider>(
-          builder: (context, contactsProvider, connectionProvider, child) {
-            final pendingAdverts = contactsProvider.pendingAdverts;
-            final isConnected = connectionProvider.deviceInfo.isConnected;
-            final cachedNodes = nodesSnapshot.data ?? const <MeshMapNode>[];
+        builder: (context, nodesSnapshot) =>
+            Consumer2<ContactsProvider, ConnectionProvider>(
+              builder: (context, contactsProvider, connectionProvider, child) {
+                final pendingAdverts = contactsProvider.pendingAdverts;
+                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
-            final resolvedKeySet = <String>{};
-            for (final advert in pendingAdverts) {
-              if (contactsProvider.findContactByKey(advert.publicKey) != null) {
-                resolvedKeySet.add(advert.publicKeyHex);
-              }
-            }
+                // Track which pending adverts are already in the contacts list
+                final resolvedKeySet = <String>{};
+                for (final advert in pendingAdverts) {
+                  if (contactsProvider.findContactByKey(advert.publicKey) !=
+                      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(
-              padding: const EdgeInsets.all(16),
-              children: [
-                Card(
-                  child: Padding(
-                    padding: const EdgeInsets.all(16),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Row(
-                          crossAxisAlignment: CrossAxisAlignment.center,
+                return ListView(
+                  padding: const EdgeInsets.all(16),
+                  children: [
+                    Card(
+                      child: Padding(
+                        padding: const EdgeInsets.all(16),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                            const Icon(Icons.person_search),
-                            const SizedBox(width: 12),
-                            Expanded(
-                              child: Text(
-                                'Discovered nodes ($totalCount)',
-                                style: Theme.of(context).textTheme.titleMedium,
+                            Row(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                const Icon(Icons.person_search),
+                                const SizedBox(width: 12),
+                                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.',
-                          style: Theme.of(context).textTheme.bodyMedium,
-                        ),
-                        const SizedBox(height: 14),
-                        Row(
+                      ),
+                    ),
+                    const SizedBox(height: 16),
+                    if (totalCount == 0)
+                      Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 48),
+                        child: Column(
                           children: [
-                            Expanded(
-                              child: OutlinedButton.icon(
-                                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),
-                              ),
+                            Icon(
+                              Icons.person_search_outlined,
+                              size: 64,
+                              color: Theme.of(context).disabledColor,
                             ),
-                            const SizedBox(width: 10),
-                            Expanded(
-                              child: OutlinedButton.icon(
-                                onPressed: pendingAdverts.isNotEmpty
-                                    ? _clearAllDiscoveries
-                                    : null,
-                                icon: Icon(Icons.clear_all_rounded),
-                                label: Text(l10n.clearAllLabel),
-                              ),
+                            const SizedBox(height: 16),
+                            Text(
+                              'No discovered nodes',
+                              style: Theme.of(context).textTheme.titleLarge,
+                            ),
+                            const SizedBox(height: 8),
+                            Text(
+                              '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

@@ -8,7 +8,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:vibration/vibration.dart';
 import '../providers/connection_provider.dart';
 import '../providers/app_provider.dart';
-import '../models/contact.dart';
 import '../models/device_info.dart' show ConnectionMode, DeviceInfo;
 import '../providers/messages_provider.dart';
 import '../providers/contacts_provider.dart';
@@ -24,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';
@@ -69,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;
@@ -108,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
@@ -292,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;
 
@@ -439,133 +426,129 @@ class _HomeScreenState extends State<HomeScreen>
     // Request self telemetry so it's fresh
     context.read<ConnectionProvider>().requestSelfTelemetry();
 
-    // Find the device's own contact to show self telemetry
-    final selfKey = deviceInfo.publicKey;
-    Contact? selfContact;
-    if (selfKey != null) {
-      selfContact = context.read<ContactsProvider>().findContactByKey(
-        Uint8List.fromList(selfKey),
-      );
-    }
-    final telemetry = selfContact?.telemetry;
-
     showModalBottomSheet(
       context: context,
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
       ),
-      builder: (context) => SafeArea(
-        child: Padding(
-          padding: const EdgeInsets.all(20),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Container(
-                width: 40,
-                height: 4,
-                decoration: BoxDecoration(
-                  color: Theme.of(context).dividerColor,
-                  borderRadius: BorderRadius.circular(2),
-                ),
+      builder: (context) => Consumer<ContactsProvider>(
+        builder: (context, contactsProvider, child) {
+          final telemetry = contactsProvider.selfTelemetry;
+
+          return SafeArea(
+            child: Padding(
+              padding: const EdgeInsets.all(20),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Container(
+                    width: 40,
+                    height: 4,
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).dividerColor,
+                      borderRadius: BorderRadius.circular(2),
+                    ),
+                  ),
+                  const SizedBox(height: 16),
+                  Text(
+                    deviceInfo.selfName ?? deviceInfo.deviceName ?? 'Device',
+                    style: Theme.of(context).textTheme.titleMedium,
+                  ),
+                  const SizedBox(height: 16),
+                  _deviceInfoRow(
+                    context,
+                    Icons.bluetooth,
+                    'BLE Signal',
+                    deviceInfo.signalRssi != null
+                        ? '${deviceInfo.signalRssi} dBm'
+                        : 'N/A',
+                  ),
+                  if (deviceInfo.batteryPercent != null)
+                    _deviceInfoRow(
+                      context,
+                      BatteryDisplayHelper.getBatteryIcon(
+                        deviceInfo.batteryPercent!,
+                      ),
+                      'Battery',
+                      '${deviceInfo.batteryPercent!.round()}%',
+                    ),
+                  if (deviceInfo.batteryMilliVolts != null)
+                    _deviceInfoRow(
+                      context,
+                      Icons.bolt,
+                      'Voltage',
+                      '${(deviceInfo.batteryMilliVolts! / 1000).toStringAsFixed(2)}V',
+                    ),
+                  if (deviceInfo.storageUsedKb != null &&
+                      deviceInfo.storageTotalKb != null)
+                    _deviceInfoRow(
+                      context,
+                      Icons.storage,
+                      'Storage',
+                      '${deviceInfo.storageUsedKb} / ${deviceInfo.storageTotalKb} KB',
+                    ),
+                  if (deviceInfo.firmwareVersion != null)
+                    _deviceInfoRow(
+                      context,
+                      Icons.system_update,
+                      'Firmware',
+                      'v${deviceInfo.firmwareVersion}',
+                    ),
+                  if (deviceInfo.radioFreq != null)
+                    _deviceInfoRow(
+                      context,
+                      Icons.radio,
+                      'Frequency',
+                      '${(deviceInfo.radioFreq! / 1000).toStringAsFixed(3)} MHz',
+                    ),
+                  if (deviceInfo.txPower != null)
+                    _deviceInfoRow(
+                      context,
+                      Icons.power,
+                      'TX Power',
+                      '${deviceInfo.txPower} dBm',
+                    ),
+                  if (telemetry != null) ...[
+                    const Divider(height: 24),
+                    Text(
+                      'Self Telemetry',
+                      style: Theme.of(context).textTheme.titleSmall,
+                    ),
+                    const SizedBox(height: 8),
+                    if (telemetry.temperature != null)
+                      _deviceInfoRow(
+                        context,
+                        Icons.thermostat,
+                        'Temperature',
+                        '${telemetry.temperature!.toStringAsFixed(1)}°C',
+                      ),
+                    if (telemetry.humidity != null)
+                      _deviceInfoRow(
+                        context,
+                        Icons.water_drop,
+                        'Humidity',
+                        '${telemetry.humidity!.toStringAsFixed(1)}%',
+                      ),
+                    if (telemetry.pressure != null)
+                      _deviceInfoRow(
+                        context,
+                        Icons.compress,
+                        'Pressure',
+                        '${telemetry.pressure!.toStringAsFixed(1)} hPa',
+                      ),
+                    if (telemetry.gpsLocation != null)
+                      _deviceInfoRow(
+                        context,
+                        Icons.gps_fixed,
+                        'GPS',
+                        '${telemetry.gpsLocation!.latitude.toStringAsFixed(5)}, ${telemetry.gpsLocation!.longitude.toStringAsFixed(5)}',
+                      ),
+                  ],
+                ],
               ),
-              const SizedBox(height: 16),
-              Text(
-                deviceInfo.selfName ?? deviceInfo.deviceName ?? 'Device',
-                style: Theme.of(context).textTheme.titleMedium,
-              ),
-              const SizedBox(height: 16),
-              _deviceInfoRow(
-                context,
-                Icons.bluetooth,
-                'BLE Signal',
-                deviceInfo.signalRssi != null
-                    ? '${deviceInfo.signalRssi} dBm'
-                    : 'N/A',
-              ),
-              if (deviceInfo.batteryPercent != null)
-                _deviceInfoRow(
-                  context,
-                  BatteryDisplayHelper.getBatteryIcon(
-                    deviceInfo.batteryPercent!,
-                  ),
-                  'Battery',
-                  '${deviceInfo.batteryPercent!.round()}%',
-                ),
-              if (deviceInfo.batteryMilliVolts != null)
-                _deviceInfoRow(
-                  context,
-                  Icons.bolt,
-                  'Voltage',
-                  '${(deviceInfo.batteryMilliVolts! / 1000).toStringAsFixed(2)}V',
-                ),
-              if (deviceInfo.storageUsedKb != null &&
-                  deviceInfo.storageTotalKb != null)
-                _deviceInfoRow(
-                  context,
-                  Icons.storage,
-                  'Storage',
-                  '${deviceInfo.storageUsedKb} / ${deviceInfo.storageTotalKb} KB',
-                ),
-              if (deviceInfo.firmwareVersion != null)
-                _deviceInfoRow(
-                  context,
-                  Icons.system_update,
-                  'Firmware',
-                  'v${deviceInfo.firmwareVersion}',
-                ),
-              if (deviceInfo.radioFreq != null)
-                _deviceInfoRow(
-                  context,
-                  Icons.radio,
-                  'Frequency',
-                  '${(deviceInfo.radioFreq! / 1000).toStringAsFixed(3)} MHz',
-                ),
-              if (deviceInfo.txPower != null)
-                _deviceInfoRow(
-                  context,
-                  Icons.power,
-                  'TX Power',
-                  '${deviceInfo.txPower} dBm',
-                ),
-              if (telemetry != null) ...[
-                const Divider(height: 24),
-                Text(
-                  'Self Telemetry',
-                  style: Theme.of(context).textTheme.titleSmall,
-                ),
-                const SizedBox(height: 8),
-                if (telemetry.temperature != null)
-                  _deviceInfoRow(
-                    context,
-                    Icons.thermostat,
-                    'Temperature',
-                    '${telemetry.temperature!.toStringAsFixed(1)}°C',
-                  ),
-                if (telemetry.humidity != null)
-                  _deviceInfoRow(
-                    context,
-                    Icons.water_drop,
-                    'Humidity',
-                    '${telemetry.humidity!.toStringAsFixed(1)}%',
-                  ),
-                if (telemetry.pressure != null)
-                  _deviceInfoRow(
-                    context,
-                    Icons.compress,
-                    'Pressure',
-                    '${telemetry.pressure!.toStringAsFixed(1)} hPa',
-                  ),
-                if (telemetry.gpsLocation != null)
-                  _deviceInfoRow(
-                    context,
-                    Icons.gps_fixed,
-                    'GPS',
-                    '${telemetry.gpsLocation!.latitude.toStringAsFixed(5)}, ${telemetry.gpsLocation!.longitude.toStringAsFixed(5)}',
-                  ),
-              ],
-            ],
-          ),
-        ),
+            ),
+          );
+        },
       ),
     );
   }
@@ -587,9 +570,9 @@ class _HomeScreenState extends State<HomeScreen>
           ),
           Text(
             value,
-            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-              fontWeight: FontWeight.w600,
-            ),
+            style: Theme.of(
+              context,
+            ).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600),
           ),
         ],
       ),
@@ -754,12 +737,10 @@ class _HomeScreenState extends State<HomeScreen>
     }
   }
 
-  void _showConnectionDialog(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      isScrollControlled: true,
+  Future<void> _showConnectionDialog(BuildContext context) async {
+    await showConnectionDialogFlow(
+      context,
       backgroundColor: Colors.transparent,
-      builder: (context) => const ConnectionDialog(),
     );
   }
 
@@ -816,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(
@@ -959,7 +914,6 @@ class _HomeScreenState extends State<HomeScreen>
                               ),
                             );
                             _loadRxTxPreference();
-                            _loadDeveloperModePreference();
                           });
                         },
                       ),
@@ -1224,58 +1178,56 @@ class _HomeScreenState extends State<HomeScreen>
                               ),
                               const SizedBox(height: 2),
                               GestureDetector(
-                                onTap: () => _showDeviceInfoSheet(
-                                  context,
-                                  deviceInfo,
-                                ),
+                                onTap: () =>
+                                    _showDeviceInfoSheet(context, deviceInfo),
                                 child: Row(
-                                mainAxisSize: MainAxisSize.min,
-                                children: [
-                                  Icon(
-                                    isTcpConnected
-                                        ? Icons.wifi_rounded
-                                        : Icons.bluetooth_connected_rounded,
-                                    size: 13,
-                                    color: signalColor,
-                                  ),
-                                  if (!isTcpConnected &&
-                                      deviceInfo.signalRssi != null) ...[
-                                    const SizedBox(width: 4),
-                                    _buildMiniSignalBars(
-                                      activeBars:
-                                          BatteryDisplayHelper.getSignalBars(
-                                            deviceInfo.signalRssi!,
-                                          ),
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    Icon(
+                                      isTcpConnected
+                                          ? Icons.wifi_rounded
+                                          : Icons.bluetooth_connected_rounded,
+                                      size: 13,
                                       color: signalColor,
                                     ),
-                                  ],
-                                  if (deviceInfo.batteryPercent != null) ...[
-                                    const SizedBox(width: 8),
-                                    Icon(
-                                      BatteryDisplayHelper.getBatteryIcon(
-                                        deviceInfo.batteryPercent!,
+                                    if (!isTcpConnected &&
+                                        deviceInfo.signalRssi != null) ...[
+                                      const SizedBox(width: 4),
+                                      _buildMiniSignalBars(
+                                        activeBars:
+                                            BatteryDisplayHelper.getSignalBars(
+                                              deviceInfo.signalRssi!,
+                                            ),
+                                        color: signalColor,
                                       ),
-                                      size: 13,
-                                      color:
-                                          BatteryDisplayHelper.getBatteryColor(
-                                            deviceInfo.batteryPercent!,
-                                          ),
-                                    ),
-                                    const SizedBox(width: 2),
-                                    Text(
-                                      '${deviceInfo.batteryPercent!.round()}%',
-                                      style: TextStyle(
-                                        fontSize: 10,
-                                        fontWeight: FontWeight.w600,
+                                    ],
+                                    if (deviceInfo.batteryPercent != null) ...[
+                                      const SizedBox(width: 8),
+                                      Icon(
+                                        BatteryDisplayHelper.getBatteryIcon(
+                                          deviceInfo.batteryPercent!,
+                                        ),
+                                        size: 13,
                                         color:
                                             BatteryDisplayHelper.getBatteryColor(
                                               deviceInfo.batteryPercent!,
                                             ),
                                       ),
-                                    ),
+                                      const SizedBox(width: 2),
+                                      Text(
+                                        '${deviceInfo.batteryPercent!.round()}%',
+                                        style: TextStyle(
+                                          fontSize: 10,
+                                          fontWeight: FontWeight.w600,
+                                          color:
+                                              BatteryDisplayHelper.getBatteryColor(
+                                                deviceInfo.batteryPercent!,
+                                              ),
+                                        ),
+                                      ),
+                                    ],
                                   ],
-                                ],
-                              ),
+                                ),
                               ),
                             ],
                           ),

lib/screens/live_traffic_screen.dart

@@ -3,14 +3,17 @@ import 'package:crypto/crypto.dart';
 import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import '../models/ble_packet_log.dart';
 import '../models/contact.dart';
+import '../providers/channels_provider.dart';
 import '../providers/contacts_provider.dart';
 import '../providers/connection_provider.dart';
 import '../services/live_traffic_summary.dart';
 import '../services/location_tracking_service.dart';
 import '../services/route_hash_preferences.dart';
+import '../services/traffic_stats_reporting_service.dart';
 import '../utils/log_rx_route_decoder.dart';
 import '../widgets/compact_signal_indicator.dart';
 import '../widgets/messages/message_trace_sheet.dart';
@@ -155,6 +158,16 @@ class _LiveTrafficScreenState extends State<LiveTrafficScreen> {
               tooltip: 'Open packet logs',
               icon: const Icon(Icons.list_alt_rounded),
             ),
+          IconButton(
+            onPressed: _openStatsDashboard,
+            tooltip: 'View public stats',
+            icon: const Icon(Icons.open_in_new),
+          ),
+          IconButton(
+            onPressed: () => _showPacketTypeHelpSheet(context),
+            tooltip: 'Packet type help',
+            icon: const Icon(Icons.help_outline),
+          ),
           IconButton(
             onPressed: () {
               setState(() {
@@ -250,6 +263,13 @@ class _LiveTrafficScreenState extends State<LiveTrafficScreen> {
     );
   }
 
+  Future<void> _openStatsDashboard() async {
+    final url = TrafficStatsReportingService.dashboardUri;
+    if (await canLaunchUrl(url)) {
+      await launchUrl(url, mode: LaunchMode.externalApplication);
+    }
+  }
+
   Future<void> _showWindowPicker(BuildContext context) async {
     final selected = await showModalBottomSheet<Duration>(
       context: context,
@@ -278,6 +298,68 @@ class _LiveTrafficScreenState extends State<LiveTrafficScreen> {
       _selectedWindow = selected;
     });
   }
+
+  Future<void> _showPacketTypeHelpSheet(BuildContext context) {
+    final packetTypes = LiveTrafficEntry.knownPayloadTypes;
+    return showModalBottomSheet<void>(
+      context: context,
+      showDragHandle: true,
+      isScrollControlled: true,
+      builder: (context) {
+        final scheme = Theme.of(context).colorScheme;
+        return SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+            child: ListView(
+              shrinkWrap: true,
+              children: [
+                Text(
+                  'Packet Types',
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
+                const SizedBox(height: 6),
+                Text(
+                  'Descriptions below follow the current MeshCore payload definitions.',
+                  style: TextStyle(color: scheme.onSurfaceVariant),
+                ),
+                const SizedBox(height: 16),
+                for (final packetType in packetTypes) ...[
+                  Container(
+                    padding: const EdgeInsets.all(12),
+                    decoration: BoxDecoration(
+                      color: scheme.surfaceContainerHigh,
+                      borderRadius: BorderRadius.circular(14),
+                    ),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          packetType.title,
+                          style: const TextStyle(
+                            fontSize: 14,
+                            fontWeight: FontWeight.w800,
+                          ),
+                        ),
+                        const SizedBox(height: 4),
+                        Text(
+                          packetType.description,
+                          style: TextStyle(
+                            fontSize: 13,
+                            color: scheme.onSurfaceVariant,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(height: 10),
+                ],
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
 }
 
 class _SummaryPanel extends StatelessWidget {
@@ -676,7 +758,11 @@ class _LiveTrafficCard extends StatelessWidget {
     final accent = isRx ? Colors.green : Colors.blue;
     final rxInfo = log.logRxDataInfo;
     final originDistance = _originDistanceLabel(context, entry);
-    final packetDetails = _LiveTrafficPacketDetails.fromEntry(entry);
+    final channelsProvider = _maybeProvider<ChannelsProvider>(context);
+    final packetDetails = _LiveTrafficPacketDetails.fromEntry(
+      entry,
+      channelsProvider: channelsProvider,
+    );
     final signalMetric = SignalMetric.fromRxInfo(rxInfo);
 
     return Material(
@@ -730,7 +816,7 @@ class _LiveTrafficCard extends StatelessWidget {
                         if (entry.payloadMeaning != null)
                           Text(
                             entry.payloadMeaning!,
-                            maxLines: 1,
+                            maxLines: 2,
                             overflow: TextOverflow.ellipsis,
                             style: TextStyle(
                               fontSize: 11,
@@ -989,27 +1075,22 @@ class _LiveTrafficPacketDetails {
     required this.endpointLine,
   });
 
-  factory _LiveTrafficPacketDetails.fromEntry(LiveTrafficEntry entry) {
+  factory _LiveTrafficPacketDetails.fromEntry(
+    LiveTrafficEntry entry, {
+    ChannelsProvider? channelsProvider,
+  }) {
     final route = entry.route;
     final payloadType = route?.payloadType;
     final parsedPayload = _ParsedTrafficPayload.tryParse(
       entry.log.rawData,
       route,
+      channelsProvider: channelsProvider,
     );
     final title = switch (payloadType) {
-      0x00 => 'FLOOD REQUEST',
-      0x01 => 'FLOOD RESPONSE',
-      0x02 => 'FLOOD TEXT',
-      0x03 => 'FLOOD ACK',
-      0x04 => 'FLOOD ADVERTISEMENT',
-      0x05 => 'FLOOD GROUP_TEXT',
-      0x06 => 'FLOOD GROUP_DATA',
-      0x07 => 'FLOOD ANON_REQUEST',
-      0x08 => 'FLOOD RETURNED_PATH',
-      0x09 => 'FLOOD TRACE_PATH',
-      0x0A => 'FLOOD MULTIPART',
-      0x0B => 'FLOOD CONTROL',
-      _ => entry.payloadLabel.toUpperCase(),
+      0x05 => parsedPayload?.channelDisplayName ?? LiveTrafficEntry.payloadTypeTitle(0x05),
+      0x06 => parsedPayload?.channelDisplayName ?? LiveTrafficEntry.payloadTypeTitle(0x06),
+      null => entry.payloadLabel.toUpperCase(),
+      _ => LiveTrafficEntry.payloadTypeTitle(payloadType),
     };
 
     final hopHashes = route?.hopHashes ?? const <String>[];
@@ -1041,13 +1122,15 @@ class _LiveTrafficPacketDetails {
 
 class _ParsedTrafficPayload {
   final String? endpointLine;
+  final String? channelDisplayName;
 
-  const _ParsedTrafficPayload({this.endpointLine});
+  const _ParsedTrafficPayload({this.endpointLine, this.channelDisplayName});
 
   static _ParsedTrafficPayload? tryParse(
     List<int> rawData,
-    DecodedLogRxRoute? route,
-  ) {
+    DecodedLogRxRoute? route, {
+    ChannelsProvider? channelsProvider,
+  }) {
     if (rawData.length < 5 ||
         rawData.first != LiveTrafficSummary.logRxDataResponseCode) {
       return null;
@@ -1084,9 +1167,18 @@ class _ParsedTrafficPayload {
       case 0x05:
       case 0x06:
         if (payload.isEmpty) return const _ParsedTrafficPayload();
+        final channelHash = payload.first;
+        final channelHashHex = channelHash
+            .toRadixString(16)
+            .padLeft(2, '0')
+            .toUpperCase();
+        final channelDisplayName = channelsProvider
+            ?.getUniqueChannelDisplayNameByHashByte(channelHash);
         return _ParsedTrafficPayload(
-          endpointLine:
-              'Channel Hash: ${payload.first.toRadixString(16).padLeft(2, '0').toUpperCase()}',
+          channelDisplayName: channelDisplayName,
+          endpointLine: channelDisplayName == null
+              ? 'Channel Hash: $channelHashHex'
+              : 'Channel: $channelDisplayName ($channelHashHex)',
         );
       case 0x00:
       case 0x01:

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';
@@ -42,6 +43,8 @@ import '../widgets/messages/sar_update_sheet.dart';
 import '../utils/key_comparison.dart';
 import '../utils/sar_message_parser.dart';
 import '../l10n/app_localizations.dart';
+import '../services/offline_map_caching_provider.dart';
+import 'offline_map_screen.dart';
 
 class MapTab extends StatefulWidget {
   final Function(bool)? onFullscreenChanged;
@@ -60,9 +63,11 @@ class MapTab extends StatefulWidget {
 class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
   final MapController _mapController = MapController();
   static final TileProvider _tileProvider = NetworkTileProvider(
-    cachingProvider: BuiltInMapCachingProvider.getOrCreateInstance(
-      maxCacheSize: 10_000_000_000,
-      overrideFreshAge: const Duration(days: 365),
+    cachingProvider: OfflineMapCachingProvider(
+      BuiltInMapCachingProvider.getOrCreateInstance(
+        maxCacheSize: 10_000_000_000,
+        overrideFreshAge: const Duration(days: 365),
+      ),
     ),
   );
   // DO NOT create a new LocationTrackingService instance here
@@ -201,46 +206,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) {
-      // Check if widget is disposing, mounted, and event has valid heading
-      if (_isDisposing || !mounted || event.heading == null) return;
+    _compassStreamSubscription = compassStream.listen(
+      (CompassEvent event) {
+        // Check if widget is disposing, mounted, and event has valid heading
+        if (_isDisposing || !mounted || event.heading == null) return;
 
-      try {
-        setState(() {
-          _compassHeading = event.heading;
-        });
+        try {
+          setState(() {
+            _compassHeading = event.heading;
+          });
 
-        // Rotate map if rotation mode is enabled and we have compass heading
-        // Only rotate if map is ready
-        if (_rotateMarkerWithHeading &&
-            event.heading != null &&
-            _isMapReady &&
-            !_isDisposing) {
-          try {
-            // Use moveAndRotate to set absolute rotation
-            final camera = _mapController.camera;
-            _mapController.moveAndRotate(
-              camera.center,
-              camera.zoom,
-              -event.heading!,
-            );
-          } catch (e) {
-            // Map not ready yet, ignore
+          // Rotate map if rotation mode is enabled and we have compass heading
+          // Only rotate if map is ready
+          if (_rotateMarkerWithHeading &&
+              event.heading != null &&
+              _isMapReady &&
+              !_isDisposing) {
+            try {
+              // Use moveAndRotate to set absolute rotation
+              final camera = _mapController.camera;
+              _mapController.moveAndRotate(
+                camera.center,
+                camera.zoom,
+                -event.heading!,
+              );
+            } catch (e) {
+              // 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
-        if (!_isDisposing) {
-          debugPrint('Compass tracking error: $e');
+      },
+      onError: (Object error, StackTrace stackTrace) {
+        if (_isDisposing) {
+          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 +896,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 +930,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 +968,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 +1028,7 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
         ),
         child: DetailedCompassDialog(
           initialPosition: _locationService.currentPosition,
-          initialHeading: _currentHeading,
+          initialHeading: _compassHeading,
           contacts: contacts,
           sarMarkers: sarMarkers,
         ),
@@ -1025,7 +1054,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 +1306,11 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
       _stopCustomMapCalibration();
 
       if (!mounted) return;
-      ScaffoldMessenger.of(
-        context,
-      ).showSnackBar(SnackBar(content: Text(AppLocalizations.of(context)!.customMapScaleSaved)));
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(AppLocalizations.of(context)!.customMapScaleSaved),
+        ),
+      );
     }
   }
 
@@ -1419,7 +1450,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 +1688,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 +1822,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 +2553,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 +2597,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,
@@ -3239,6 +3233,17 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
                         child: const Icon(Icons.layers),
                       ),
                       const SizedBox(height: 8),
+                      FloatingActionButton.small(
+                        heroTag: 'offline_maps',
+                        onPressed: () => Navigator.push(
+                          context,
+                          MaterialPageRoute(
+                            builder: (_) => const OfflineMapScreen(),
+                          ),
+                        ),
+                        child: const Icon(Icons.download_for_offline),
+                      ),
+                      const SizedBox(height: 8),
                       FloatingActionButton.small(
                         heroTag: 'fullscreen_toggle',
                         onPressed: () {

lib/screens/offline_map_screen.dart

@@ -0,0 +1,842 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:provider/provider.dart';
+
+import '../models/map_layer.dart';
+import '../providers/offline_tiles_provider.dart';
+import '../widgets/map/polygon_draw_handler.dart';
+
+/// Screen for downloading offline map tiles.
+///
+/// Allows drawing polygons/rectangles to select areas, choosing zoom levels,
+/// and downloading tiles with real-time progress visualization.
+class OfflineMapScreen extends StatefulWidget {
+  const OfflineMapScreen({super.key});
+
+  @override
+  State<OfflineMapScreen> createState() => _OfflineMapScreenState();
+}
+
+class _OfflineMapScreenState extends State<OfflineMapScreen> {
+  final MapController _mapController = MapController();
+  late OfflineTilesProvider _provider;
+  double _currentZoom = 8;
+
+  @override
+  void initState() {
+    super.initState();
+    _provider = context.read<OfflineTilesProvider>();
+    _provider.refreshCacheSize();
+    _provider.refreshLocalStyles();
+    _provider.startPeerDiscovery();
+  }
+
+  @override
+  void dispose() {
+    _provider.stopPeerDiscovery();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Offline Maps'),
+        actions: [
+          Consumer<OfflineTilesProvider>(
+            builder: (context, provider, _) {
+              return IconButton(
+                icon: Badge(
+                  isLabelVisible: provider.discoveredPeers.isNotEmpty,
+                  label: Text('${provider.discoveredPeers.length}'),
+                  child: Icon(
+                    provider.isServerRunning
+                        ? Icons.wifi_tethering
+                        : Icons.wifi_tethering_off,
+                  ),
+                ),
+                tooltip: provider.isServerRunning
+                    ? 'Sharing tiles'
+                    : 'Tile sharing off',
+                onPressed: () => _showSharingSheet(context, provider),
+              );
+            },
+          ),
+          Consumer<OfflineTilesProvider>(
+            builder: (context, provider, _) {
+              return PopupMenuButton<MapLayer>(
+                icon: const Icon(Icons.layers),
+                tooltip: 'Map Style',
+                onSelected: (layer) => provider.setSelectedLayer(layer),
+                itemBuilder: (_) => [
+                  for (final layer in MapLayer.allLayers)
+                    PopupMenuItem(
+                      value: layer,
+                      child: Row(
+                        children: [
+                          if (layer.type == provider.selectedLayer.type)
+                            const Icon(Icons.check, size: 18)
+                          else
+                            const SizedBox(width: 18),
+                          const SizedBox(width: 8),
+                          Text(layer.name),
+                        ],
+                      ),
+                    ),
+                ],
+              );
+            },
+          ),
+        ],
+      ),
+      body: Stack(
+        children: [
+          Consumer<OfflineTilesProvider>(
+            builder: (context, provider, _) {
+              return FlutterMap(
+                mapController: _mapController,
+                options: MapOptions(
+                  initialCenter: const LatLng(46.05, 14.5), // Slovenia
+                  initialZoom: 8,
+                  onPositionChanged: (camera, hasGesture) {
+                    if (camera.zoom != _currentZoom) {
+                      setState(() => _currentZoom = camera.zoom);
+                    }
+                  },
+                  onTap: (tapPosition, point) {
+                    if (provider.drawingMode != DrawingMode.none) {
+                      provider.addVertex(point);
+                    }
+                  },
+                ),
+                children: [
+                  TileLayer(
+                    urlTemplate: provider.selectedLayer.urlTemplate,
+                    userAgentPackageName: 'com.meshcore.sar',
+                    maxZoom: provider.selectedLayer.maxZoom,
+                  ),
+                  CoverageLayer(currentZoom: _currentZoom),
+                  const PolygonDrawLayer(),
+                  const DownloadProgressLayer(),
+                ],
+              );
+            },
+          ),
+          const DrawingToolbar(),
+          Positioned(
+            left: 16,
+            top: 16,
+            child: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surface.withValues(alpha: 0.85),
+                borderRadius: BorderRadius.circular(8),
+                boxShadow: [
+                  BoxShadow(
+                    color: Colors.black.withValues(alpha: 0.15),
+                    blurRadius: 4,
+                  ),
+                ],
+              ),
+              child: Text(
+                'Z ${_currentZoom.toStringAsFixed(1)}',
+                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                      fontWeight: FontWeight.bold,
+                    ),
+              ),
+            ),
+          ),
+          _buildBottomPanel(),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildBottomPanel() {
+    return Positioned(
+      left: 0,
+      right: 0,
+      bottom: 0,
+      child: Consumer<OfflineTilesProvider>(
+        builder: (context, provider, _) {
+          return Container(
+            decoration: BoxDecoration(
+              color: Theme.of(context).colorScheme.surface,
+              borderRadius:
+                  const BorderRadius.vertical(top: Radius.circular(16)),
+              boxShadow: [
+                BoxShadow(
+                  color: Colors.black.withValues(alpha: 0.15),
+                  blurRadius: 10,
+                  offset: const Offset(0, -2),
+                ),
+              ],
+            ),
+            child: SafeArea(
+              top: false,
+              child: Padding(
+                padding: const EdgeInsets.all(16),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    // Saved region presets dropdown
+                    if (!provider.isDownloading &&
+                        provider.localStyles
+                            .any((s) => s.region != null)) ...[
+                      DropdownButtonFormField<StyleInfo>(
+                        decoration: const InputDecoration(
+                          prefixIcon: Icon(Icons.bookmark, size: 20),
+                          labelText: 'Saved regions',
+                          isDense: true,
+                          contentPadding: EdgeInsets.symmetric(
+                              horizontal: 12, vertical: 8),
+                          border: OutlineInputBorder(),
+                        ),
+                        isExpanded: true,
+                        hint: const Text('Load a saved region'),
+                        items: provider.localStyles
+                            .where((s) => s.region != null)
+                            .map((style) => DropdownMenuItem(
+                                  value: style,
+                                  child: Text(
+                                    '${style.displayName} '
+                                    '(z${style.region!.minZoom}-${style.region!.maxZoom}, '
+                                    '${_formatNumber(style.tileCount)} tiles)',
+                                    overflow: TextOverflow.ellipsis,
+                                  ),
+                                ))
+                            .toList(),
+                        onChanged: (style) {
+                          if (style != null) {
+                            provider.loadPreset(style);
+                            _fitMapToPolygons(provider);
+                          }
+                        },
+                      ),
+                      const SizedBox(height: 8),
+                    ],
+
+                    // Zoom range
+                    if (!provider.isDownloading) ...[
+                      Row(
+                        children: [
+                          Expanded(
+                            child: _ZoomSelector(
+                              label: 'Min Zoom',
+                              value: provider.minZoom,
+                              onChanged: provider.setMinZoom,
+                            ),
+                          ),
+                          const SizedBox(width: 16),
+                          Expanded(
+                            child: _ZoomSelector(
+                              label: 'Max Zoom',
+                              value: provider.maxZoom,
+                              onChanged: provider.setMaxZoom,
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 8),
+                      // Tile estimate
+                      Text(
+                        provider.hasPolygons
+                            ? '~${_formatNumber(provider.estimatedTileCount)} tiles'
+                            : 'Draw an area to download',
+                        style: Theme.of(context).textTheme.bodySmall,
+                        textAlign: TextAlign.center,
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        'Cache: ${_formatBytes(provider.cacheSizeBytes)}',
+                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                              color: Theme.of(context)
+                                  .colorScheme
+                                  .onSurface
+                                  .withValues(alpha: 0.6),
+                            ),
+                        textAlign: TextAlign.center,
+                      ),
+                    ],
+
+                    // Progress
+                    if (provider.isDownloading) ...[
+                      LinearProgressIndicator(
+                        value: provider.progress.percent,
+                      ),
+                      const SizedBox(height: 8),
+                      Text(
+                        '${(provider.progress.percent * 100).toStringAsFixed(1)}% — '
+                        'Downloaded: ${provider.progress.downloaded}, '
+                        'Cached: ${provider.progress.skipped}, '
+                        'Failed: ${provider.progress.failed} / '
+                        '${provider.progress.total}',
+                        style: Theme.of(context).textTheme.bodySmall,
+                        textAlign: TextAlign.center,
+                      ),
+                    ],
+
+                    // Download complete summary
+                    if (!provider.isDownloading &&
+                        provider.progress.isComplete) ...[
+                      const SizedBox(height: 4),
+                      Text(
+                        'Done! ${provider.progress.downloaded} downloaded, '
+                        '${provider.progress.skipped} cached, '
+                        '${provider.progress.failed} failed',
+                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                              color: Colors.green,
+                            ),
+                        textAlign: TextAlign.center,
+                      ),
+                    ],
+
+                    const SizedBox(height: 12),
+
+                    // Action buttons
+                    Row(
+                      children: [
+                        if (!provider.isDownloading) ...[
+                          Expanded(
+                            child: FilledButton.icon(
+                              onPressed: provider.hasPolygons
+                                  ? () => provider.startDownload()
+                                  : null,
+                              icon: const Icon(Icons.download),
+                              label: const Text('Download'),
+                            ),
+                          ),
+                          if (provider.tileOverlays.isNotEmpty) ...[
+                            const SizedBox(width: 8),
+                            IconButton(
+                              onPressed: provider.clearOverlays,
+                              icon: const Icon(Icons.layers_clear),
+                              tooltip: 'Clear overlay',
+                            ),
+                          ],
+                          if (provider.cacheSizeBytes > 0) ...[
+                            const SizedBox(width: 8),
+                            IconButton(
+                              onPressed: () => _confirmClearCache(provider),
+                              icon: const Icon(Icons.delete_forever),
+                              tooltip: 'Clear cache',
+                            ),
+                          ],
+                        ],
+                        if (provider.isDownloading) ...[
+                          Expanded(
+                            child: OutlinedButton.icon(
+                              onPressed: () => provider.cancelDownload(),
+                              icon: const Icon(Icons.cancel),
+                              label: const Text('Cancel'),
+                              style: OutlinedButton.styleFrom(
+                                foregroundColor: Colors.red,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  void _showSharingSheet(BuildContext context, OfflineTilesProvider provider) {
+    // Refresh catalogs and local styles when opening
+    provider.refreshPeerCatalogs();
+    provider.refreshLocalStyles();
+
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder: (sheetContext) {
+        return DraggableScrollableSheet(
+          initialChildSize: 0.65,
+          minChildSize: 0.3,
+          maxChildSize: 0.9,
+          expand: false,
+          builder: (context, scrollController) {
+            return Consumer<OfflineTilesProvider>(
+              builder: (context, provider, _) {
+                return ListView(
+                  controller: scrollController,
+                  padding: const EdgeInsets.all(16),
+                  children: [
+                    // Header
+                    Center(
+                      child: Container(
+                        width: 32,
+                        height: 4,
+                        margin: const EdgeInsets.only(bottom: 16),
+                        decoration: BoxDecoration(
+                          color: Colors.grey[400],
+                          borderRadius: BorderRadius.circular(2),
+                        ),
+                      ),
+                    ),
+                    Text(
+                      'Tile Sharing',
+                      style: Theme.of(context).textTheme.titleMedium,
+                    ),
+                    const SizedBox(height: 12),
+
+                    // Server toggle
+                    SwitchListTile(
+                      title: const Text('Share my tiles'),
+                      subtitle: Text(
+                        provider.isServerRunning
+                            ? 'Other devices can fetch tiles from this device'
+                            : 'Start serving cached tiles to nearby devices',
+                      ),
+                      secondary: Icon(
+                        provider.isServerRunning
+                            ? Icons.wifi_tethering
+                            : Icons.wifi_tethering_off,
+                      ),
+                      value: provider.isServerRunning,
+                      onChanged: (_) => provider.toggleServer(),
+                    ),
+
+                    // My cached maps
+                    if (provider.localStyles.isNotEmpty) ...[
+                      const Divider(),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 8),
+                        child: Text(
+                          'My Cached Maps',
+                          style: Theme.of(context).textTheme.titleSmall,
+                        ),
+                      ),
+                      ...provider.localStyles.map((style) {
+                        final isShowing =
+                            provider.coverageStyle?.hash == style.hash;
+                        return ListTile(
+                          dense: true,
+                          leading: const Icon(Icons.map, size: 20),
+                          title: Text(style.displayName),
+                          subtitle: Text(
+                            '${_formatNumber(style.tileCount)} tiles, '
+                            '${_formatBytes(style.sizeBytes)}',
+                          ),
+                          trailing: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              IconButton(
+                                icon: Icon(
+                                  isShowing
+                                      ? Icons.visibility
+                                      : Icons.visibility_off,
+                                  size: 20,
+                                  color: isShowing
+                                      ? Colors.blue
+                                      : null,
+                                ),
+                                tooltip: isShowing
+                                    ? 'Hide on map'
+                                    : 'Show on map',
+                                onPressed: () {
+                                  provider.showCoverage(style);
+                                },
+                              ),
+                              IconButton(
+                                icon: const Icon(Icons.delete_outline,
+                                    size: 20),
+                                tooltip: 'Delete',
+                                onPressed: () => _confirmDeleteStyle(
+                                    context, provider, style),
+                              ),
+                            ],
+                          ),
+                        );
+                      }),
+                    ],
+
+                    // Peers section
+                    const Divider(),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(vertical: 8),
+                      child: Row(
+                        children: [
+                          Expanded(
+                            child: Text(
+                              'Nearby Devices',
+                              style: Theme.of(context).textTheme.titleSmall,
+                            ),
+                          ),
+                          if (provider.isFetchingCatalogs)
+                            const SizedBox(
+                              width: 16,
+                              height: 16,
+                              child:
+                                  CircularProgressIndicator(strokeWidth: 2),
+                            )
+                          else
+                            IconButton(
+                              icon: const Icon(Icons.refresh, size: 20),
+                              tooltip: 'Refresh',
+                              onPressed: () =>
+                                  provider.refreshPeerCatalogs(),
+                            ),
+                          IconButton(
+                            icon: const Icon(Icons.add, size: 20),
+                            tooltip: 'Add peer manually',
+                            onPressed: () =>
+                                _showAddPeerDialog(context, provider),
+                          ),
+                        ],
+                      ),
+                    ),
+
+                    if (provider.discoveredPeers.isEmpty)
+                      Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 8),
+                        child: Text(
+                          'No peers found on the local network.\n'
+                          'Make sure other devices have tile sharing enabled.',
+                          style: Theme.of(context)
+                              .textTheme
+                              .bodySmall
+                              ?.copyWith(
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .onSurface
+                                    .withValues(alpha: 0.6),
+                              ),
+                        ),
+                      ),
+
+                    // Peer catalogs — show each peer and their available styles
+                    ...provider.peerCatalogs.map((catalog) => _buildPeerCard(
+                          context, provider, catalog)),
+
+                    // Peers without catalogs yet (just discovered, not queried)
+                    ...provider.discoveredPeers
+                        .where((peer) => !provider.peerCatalogs
+                            .any((c) => c.peer == peer))
+                        .map((peer) => ListTile(
+                              leading: const Icon(Icons.devices),
+                              title: Text(peer.ipAddress),
+                              subtitle: const Text('Fetching catalog...'),
+                              trailing: IconButton(
+                                icon: const Icon(
+                                    Icons.remove_circle_outline,
+                                    size: 20),
+                                onPressed: () =>
+                                    provider.removePeer(peer),
+                              ),
+                            )),
+
+                    // Sync progress
+                    if (provider.isSyncing || provider.syncStatus.isNotEmpty) ...[
+                      const Divider(),
+                      if (provider.isSyncing)
+                        LinearProgressIndicator(
+                          value: provider.syncProgress > 0
+                              ? provider.syncProgress
+                              : null,
+                        ),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 8),
+                        child: Row(
+                          children: [
+                            Expanded(
+                              child: Text(
+                                provider.syncStatus,
+                                style: Theme.of(context).textTheme.bodySmall,
+                              ),
+                            ),
+                            if (provider.isSyncing)
+                              TextButton(
+                                onPressed: () => provider.cancelSync(),
+                                child: const Text('Cancel'),
+                              ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ],
+                );
+              },
+            );
+          },
+        );
+      },
+    );
+  }
+
+  Widget _buildPeerCard(
+    BuildContext context,
+    OfflineTilesProvider provider,
+    PeerCatalog catalog,
+  ) {
+    return Card(
+      margin: const EdgeInsets.symmetric(vertical: 4),
+      child: Padding(
+        padding: const EdgeInsets.all(12),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                const Icon(Icons.devices, size: 18),
+                const SizedBox(width: 8),
+                Expanded(
+                  child: Text(
+                    catalog.peer.ipAddress,
+                    style: Theme.of(context).textTheme.titleSmall,
+                  ),
+                ),
+                IconButton(
+                  icon: const Icon(Icons.remove_circle_outline, size: 18),
+                  onPressed: () => provider.removePeer(catalog.peer),
+                  visualDensity: VisualDensity.compact,
+                ),
+              ],
+            ),
+            if (catalog.styles.isEmpty)
+              Padding(
+                padding: const EdgeInsets.only(top: 4),
+                child: Text(
+                  'No cached tiles on this device',
+                  style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                        color: Theme.of(context)
+                            .colorScheme
+                            .onSurface
+                            .withValues(alpha: 0.6),
+                      ),
+                ),
+              ),
+            ...catalog.styles.map((style) {
+              // Check if we already have this style locally
+              final localMatch = provider.localStyles
+                  .where((s) => s.hash == style.hash);
+              final localCount =
+                  localMatch.isNotEmpty ? localMatch.first.tileCount : 0;
+              final missingTiles = style.tileCount - localCount;
+
+              return ListTile(
+                dense: true,
+                contentPadding: EdgeInsets.zero,
+                leading: const Icon(Icons.map_outlined, size: 20),
+                title: Text(style.displayName),
+                subtitle: Text(
+                  '${_formatNumber(style.tileCount)} tiles, '
+                  '${_formatBytes(style.sizeBytes)}'
+                  '${localCount > 0 ? ' (you have ${_formatNumberInline(localCount)})' : ''}',
+                ),
+                trailing: missingTiles > 0
+                    ? TextButton.icon(
+                        onPressed: provider.isSyncing
+                            ? null
+                            : () => provider.syncStyleFromPeers(style),
+                        icon: const Icon(Icons.download, size: 16),
+                        label: Text(
+                          missingTiles == style.tileCount
+                              ? 'Get all'
+                              : '+${_formatNumber(missingTiles)}',
+                        ),
+                      )
+                    : const Icon(Icons.check_circle,
+                        color: Colors.green, size: 20),
+              );
+            }),
+          ],
+        ),
+      ),
+    );
+  }
+
+  String _formatNumberInline(int n) {
+    if (n < 1000) return '$n';
+    if (n < 1000000) return '${(n / 1000).toStringAsFixed(1)}K';
+    return '${(n / 1000000).toStringAsFixed(1)}M';
+  }
+
+  void _fitMapToPolygons(OfflineTilesProvider provider) {
+    if (provider.polygons.isEmpty) return;
+
+    var minLat = 90.0, maxLat = -90.0;
+    var minLng = 180.0, maxLng = -180.0;
+    for (final poly in provider.polygons) {
+      for (final p in poly) {
+        if (p.latitude < minLat) minLat = p.latitude;
+        if (p.latitude > maxLat) maxLat = p.latitude;
+        if (p.longitude < minLng) minLng = p.longitude;
+        if (p.longitude > maxLng) maxLng = p.longitude;
+      }
+    }
+
+    _mapController.fitCamera(
+      CameraFit.bounds(
+        bounds: LatLngBounds(
+          LatLng(minLat, minLng),
+          LatLng(maxLat, maxLng),
+        ),
+        padding: const EdgeInsets.all(50),
+      ),
+    );
+  }
+
+  void _showAddPeerDialog(
+      BuildContext context, OfflineTilesProvider provider) {
+    final controller = TextEditingController();
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Add Peer'),
+        content: TextField(
+          controller: controller,
+          decoration: const InputDecoration(
+            labelText: 'IP Address',
+            hintText: '192.168.1.100',
+          ),
+          keyboardType: TextInputType.number,
+          autofocus: true,
+          onSubmitted: (value) {
+            if (value.trim().isNotEmpty) {
+              provider.addManualPeer(value.trim());
+              Navigator.pop(context);
+            }
+          },
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: const Text('Cancel'),
+          ),
+          TextButton(
+            onPressed: () {
+              final ip = controller.text.trim();
+              if (ip.isNotEmpty) {
+                provider.addManualPeer(ip);
+                Navigator.pop(context);
+              }
+            },
+            child: const Text('Add'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void _confirmDeleteStyle(
+    BuildContext context,
+    OfflineTilesProvider provider,
+    StyleInfo style,
+  ) {
+    showDialog(
+      context: context,
+      builder: (dialogContext) => AlertDialog(
+        title: Text('Delete ${style.displayName}?'),
+        content: Text(
+          '${_formatNumber(style.tileCount)} tiles, '
+          '${_formatBytes(style.sizeBytes)} will be deleted.',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(dialogContext),
+            child: const Text('Cancel'),
+          ),
+          TextButton(
+            onPressed: () {
+              provider.deleteStyle(style);
+              Navigator.pop(dialogContext);
+            },
+            child:
+                const Text('Delete', style: TextStyle(color: Colors.red)),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void _confirmClearCache(OfflineTilesProvider provider) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Clear offline cache?'),
+        content: Text(
+            'This will delete ${_formatBytes(provider.cacheSizeBytes)} of cached tiles.'),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: const Text('Cancel'),
+          ),
+          TextButton(
+            onPressed: () {
+              provider.clearCache();
+              Navigator.pop(context);
+            },
+            child:
+                const Text('Delete', style: TextStyle(color: Colors.red)),
+          ),
+        ],
+      ),
+    );
+  }
+
+  String _formatBytes(int bytes) {
+    if (bytes < 1024) return '$bytes B';
+    if (bytes < 1024 * 1024) return '${(bytes / 1024).toStringAsFixed(1)} KB';
+    if (bytes < 1024 * 1024 * 1024) {
+      return '${(bytes / (1024 * 1024)).toStringAsFixed(1)} MB';
+    }
+    return '${(bytes / (1024 * 1024 * 1024)).toStringAsFixed(1)} GB';
+  }
+
+  String _formatNumber(int n) {
+    if (n < 1000) return '$n';
+    if (n < 1000000) return '${(n / 1000).toStringAsFixed(1)}K';
+    return '${(n / 1000000).toStringAsFixed(1)}M';
+  }
+}
+
+class _ZoomSelector extends StatelessWidget {
+  final String label;
+  final int value;
+  final ValueChanged<int> onChanged;
+
+  const _ZoomSelector({
+    required this.label,
+    required this.value,
+    required this.onChanged,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Text(label, style: Theme.of(context).textTheme.bodySmall),
+        const SizedBox(width: 8),
+        Expanded(
+          child: Slider(
+            value: value.toDouble(),
+            min: 0,
+            max: 19,
+            divisions: 19,
+            label: '$value',
+            onChanged: (v) => onChanged(v.round()),
+          ),
+        ),
+        SizedBox(
+          width: 24,
+          child: Text(
+            '$value',
+            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                  fontWeight: FontWeight.bold,
+                ),
+            textAlign: TextAlign.center,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/screens/sensors_tab.dart

@@ -6,7 +6,10 @@ import 'package:provider/provider.dart';
 import '../models/contact.dart';
 import '../providers/connection_provider.dart';
 import '../providers/contacts_provider.dart';
+import '../providers/map_provider.dart';
 import '../providers/sensors_provider.dart';
+import '../widgets/contacts/ping_contact_sheet.dart';
+import '../widgets/sensors/bthome_met_history_sheet.dart';
 import '../widgets/sensors/sensor_telemetry_card.dart';
 import '../l10n/app_localizations.dart';
 
@@ -20,7 +23,10 @@ class SensorsTab extends StatefulWidget {
 }
 
 class _SensorsTabState extends State<SensorsTab> {
+  static const Duration _autoRefreshTickInterval = Duration(seconds: 30);
   Timer? _minuteTicker;
+  final Map<String, DateTime> _lastCenteredTelemetryAtBySensor =
+      <String, DateTime>{};
 
   @override
   void initState() {
@@ -60,22 +66,8 @@ class _SensorsTabState extends State<SensorsTab> {
       return;
     }
 
-    final now = DateTime.now();
-    final nextMinute = DateTime(
-      now.year,
-      now.month,
-      now.day,
-      now.hour,
-      now.minute + 1,
-    );
-    final delay = nextMinute.difference(now);
-
-    _minuteTicker = Timer(delay, () {
-      if (!mounted) return;
+    _minuteTicker = Timer.periodic(_autoRefreshTickInterval, (_) {
       unawaited(_handleMinuteTick());
-      _minuteTicker = Timer.periodic(const Duration(minutes: 1), (_) {
-        unawaited(_handleMinuteTick());
-      });
     });
   }
 
@@ -100,70 +92,26 @@ class _SensorsTabState extends State<SensorsTab> {
   Future<void> _showAddSensorSheet(BuildContext context) async {
     final sensorsProvider = context.read<SensorsProvider>();
     final contactsProvider = context.read<ContactsProvider>();
-    final candidates = sensorsProvider.availableCandidates(contactsProvider);
-
+    final candidates = sensorsProvider.availableCandidates(
+      contactsProvider,
+      connectionProvider: context.read<ConnectionProvider>(),
+    );
     await showModalBottomSheet<void>(
       context: context,
       showDragHandle: true,
-      builder: (sheetContext) {
-        if (candidates.isEmpty) {
-          return const SafeArea(
-            child: Padding(
-              padding: EdgeInsets.all(24),
-              child: Text(
-                'No eligible nodes available. Discover a relay or node first.',
-              ),
-            ),
+      isScrollControlled: true,
+      builder: (sheetContext) => AddSensorSheet(
+        candidates: candidates,
+        onClose: () => Navigator.of(sheetContext).pop(),
+        onSelect: (contact) 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')),
           );
-        }
-
-        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',
-                        ),
-                      ),
-                    );
-                  },
-                ),
-              ),
-            ],
-          ),
-        );
-      },
+        },
+      ),
     );
   }
 
@@ -174,7 +122,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:
@@ -268,6 +216,65 @@ class _SensorsTabState extends State<SensorsTab> {
     );
   }
 
+  void _maybeCenterMapOnTelemetryUpdate(
+    Iterable<String> sensorKeys, {
+    required SensorsProvider sensorsProvider,
+    required ContactsProvider contactsProvider,
+    required ConnectionProvider connectionProvider,
+  }) {
+    if (!widget.isActive) {
+      return;
+    }
+
+    Contact? latestContact;
+    DateTime? latestTimestamp;
+
+    for (final key in sensorKeys) {
+      final contact = sensorsProvider.contactForDisplay(
+        key,
+        contactsProvider: contactsProvider,
+        connectionProvider: connectionProvider,
+      );
+      final timestamp = contact?.telemetry?.timestamp;
+      final location = contact?.displayLocation;
+      if (contact == null || timestamp == null || location == null) {
+        continue;
+      }
+
+      final previousTimestamp = _lastCenteredTelemetryAtBySensor[key];
+      if (previousTimestamp != null && !timestamp.isAfter(previousTimestamp)) {
+        continue;
+      }
+
+      if (latestTimestamp == null || timestamp.isAfter(latestTimestamp)) {
+        latestContact = contact;
+        latestTimestamp = timestamp;
+      }
+    }
+
+    if (latestContact == null || latestTimestamp == null) {
+      return;
+    }
+
+    _lastCenteredTelemetryAtBySensor[latestContact.publicKeyHex] =
+        latestTimestamp;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted || !widget.isActive) {
+        return;
+      }
+
+      final location = latestContact!.displayLocation;
+      if (location == null) {
+        return;
+      }
+
+      context.read<MapProvider>().navigateToLocation(
+        location: location,
+        zoom: 15.0,
+      );
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -275,32 +282,63 @@ class _SensorsTabState extends State<SensorsTab> {
         onPressed: () => _showAddSensorSheet(context),
         child: const Icon(Icons.add),
       ),
-      body: Consumer2<SensorsProvider, ContactsProvider>(
-        builder: (context, sensorsProvider, contactsProvider, child) {
-          final watchedKeys = sensorsProvider.watchedSensorKeys;
+      body: Consumer3<SensorsProvider, ContactsProvider, ConnectionProvider>(
+        builder:
+            (
+              context,
+              sensorsProvider,
+              contactsProvider,
+              connectionProvider,
+              child,
+            ) {
+              final watchedKeys = sensorsProvider.watchedSensorKeys;
+              final hasPersistedSensors = watchedKeys.isNotEmpty;
+              final selfDisplayKey = sensorsProvider.displaySelfKey(
+                contactsProvider: contactsProvider,
+                connectionProvider: connectionProvider,
+              );
+              final displayKeys = <String>[
+                ...?selfDisplayKey == null ? null : <String>[selfDisplayKey],
+                ...watchedKeys,
+              ];
+              _maybeCenterMapOnTelemetryUpdate(
+                displayKeys,
+                sensorsProvider: sensorsProvider,
+                contactsProvider: contactsProvider,
+                connectionProvider: connectionProvider,
+              );
+              final hasAnyCards =
+                  selfDisplayKey != null || watchedKeys.isNotEmpty;
 
-          return RefreshIndicator(
-            onRefresh: () => _refreshAll(context),
-            child: ListView(
-              padding: const EdgeInsets.fromLTRB(16, 16, 16, 96),
-              children: [
-                if (watchedKeys.isEmpty)
-                  const _EmptySensorsState()
-                else
-                  ...watchedKeys.map((key) {
-                    Contact? contact;
-                    for (final entry in contactsProvider.contacts) {
-                      if (entry.publicKeyHex == key) {
-                        contact = entry;
-                        break;
-                      }
-                    }
-                    final availableFieldKeys = sensorMetricKeysFor(contact);
-                    final visibleFields = sensorsProvider
-                        .effectiveVisibleFieldsFor(key, availableFieldKeys);
-                    return SensorTelemetryCard(
+              Widget buildSensorCard(
+                String key, {
+                required int index,
+                required int totalCount,
+                required bool isWatchedCard,
+              }) {
+                final contact = sensorsProvider.contactForDisplay(
+                  key,
+                  contactsProvider: contactsProvider,
+                  connectionProvider: connectionProvider,
+                );
+                final availableFieldKeys = sensorMetricKeysFor(contact);
+                final visibleFields = sensorsProvider.effectiveVisibleFieldsFor(
+                  key,
+                  availableFieldKeys,
+                );
+
+                return Padding(
+                  key: ValueKey<String>('sensor_card_$key'),
+                  padding: EdgeInsets.only(
+                    bottom: index == totalCount - 1 ? 0 : 12,
+                  ),
+                  child: ReorderableDelayedDragStartListener(
+                    enabled: isWatchedCard,
+                    index: index,
+                    child: SensorTelemetryCard(
                       contact: contact,
                       state: sensorsProvider.stateFor(key),
+                      showActionSheetOnTap: true,
                       visibleFields: visibleFields,
                       fieldOrder: sensorsProvider.metricOrderFor(
                         key,
@@ -311,30 +349,259 @@ class _SensorsTabState extends State<SensorsTab> {
                         for (final field in visibleFields)
                           field: sensorsProvider.fieldSpanFor(key, field),
                       },
-                      onRemove: () async {
-                        await sensorsProvider.removeSensor(key);
-                      },
+                      onRemove: isWatchedCard
+                          ? () async {
+                              await sensorsProvider.removeSensor(key);
+                            }
+                          : null,
                       onCustomize: () =>
                           _showMetricSelector(context, key, contact),
+                      onShowMetHistory: (contact) =>
+                          showBTHomeMetHistorySheet(context, contact: contact),
+                      onMoveUp: isWatchedCard && index > 0
+                          ? () =>
+                                sensorsProvider.reorderSensors(index, index - 1)
+                          : null,
+                      onMoveDown: isWatchedCard && index < totalCount - 1
+                          ? () =>
+                                sensorsProvider.reorderSensors(index, index + 2)
+                          : null,
                       onRefresh: () => sensorsProvider.refreshSensor(
                         publicKeyHex: key,
                         contactsProvider: contactsProvider,
-                        connectionProvider: context.read<ConnectionProvider>(),
+                        connectionProvider: connectionProvider,
                       ),
-                    );
-                  }),
-              ],
-            ),
-          );
-        },
+                      onPing: contact == null
+                          ? null
+                          : () async {
+                              await showModalBottomSheet<void>(
+                                context: context,
+                                isScrollControlled: true,
+                                backgroundColor:
+                                    Theme.of(context).colorScheme.surface,
+                                shape: const RoundedRectangleBorder(
+                                  borderRadius: BorderRadius.vertical(
+                                    top: Radius.circular(16),
+                                  ),
+                                ),
+                                builder: (context) =>
+                                    PingContactSheet(contact: contact),
+                              );
+                            },
+                    ),
+                  ),
+                );
+              }
+
+              return RefreshIndicator(
+                onRefresh: () => _refreshAll(context),
+                child: !hasAnyCards
+                    ? ListView(
+                        physics: const AlwaysScrollableScrollPhysics(),
+                        padding: const EdgeInsets.fromLTRB(16, 16, 16, 96),
+                        children: const [_EmptySensorsState()],
+                      )
+                    : hasPersistedSensors && selfDisplayKey == null
+                    ? ReorderableListView.builder(
+                        buildDefaultDragHandles: false,
+                        physics: const AlwaysScrollableScrollPhysics(),
+                        padding: const EdgeInsets.fromLTRB(16, 16, 16, 96),
+                        itemCount: watchedKeys.length,
+                        onReorder: (oldIndex, newIndex) =>
+                            sensorsProvider.reorderSensors(oldIndex, newIndex),
+                        itemBuilder: (context, index) => buildSensorCard(
+                          watchedKeys[index],
+                          index: index,
+                          totalCount: watchedKeys.length,
+                          isWatchedCard: true,
+                        ),
+                      )
+                    : ListView(
+                        physics: const AlwaysScrollableScrollPhysics(),
+                        padding: const EdgeInsets.fromLTRB(16, 16, 16, 96),
+                        children: [
+                          if (selfDisplayKey != null)
+                            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,
+                              ),
+                            ),
+                        ],
+                      ),
+              );
+            },
       ),
     );
   }
 }
 
-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,
@@ -343,10 +610,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
@@ -391,29 +660,39 @@ class _SensorCustomizeView extends StatelessWidget {
           body: ListView(
             padding: EdgeInsets.fromLTRB(16, 16, 16, 24),
             children: [
-              _SensorCustomizeSectionCard(
-                title: AppLocalizations.of(context)!.livePreview,
-                subtitle:
-                    'Changes apply immediately. This card matches the current dashboard layout for this sensor.',
-                child: SensorTelemetryCard(
-                  contact: contact,
-                  state: sensorsProvider.stateFor(publicKeyHex),
-                  visibleFields: visibleFields,
-                  fieldOrder: sensorsProvider.metricOrderFor(
-                    publicKeyHex,
-                    visibleFields,
+              if (showLivePreview)
+                _SensorCustomizeSectionCard(
+                  title: AppLocalizations.of(context)!.livePreview,
+                  subtitle:
+                      'Changes apply immediately. This card matches the current dashboard layout for this sensor.',
+                  child: SensorTelemetryCard(
+                    contact: contact,
+                    state: sensorsProvider.stateFor(publicKeyHex),
+                    visibleFields: visibleFields,
+                    fieldOrder: sensorsProvider.metricOrderFor(
+                      publicKeyHex,
+                      visibleFields,
+                    ),
+                    labelOverrides: sensorsProvider.labelOverridesFor(
+                      publicKeyHex,
+                    ),
+                    onShowMetHistory: contact == null
+                        ? null
+                        : (contact) => showBTHomeMetHistorySheet(
+                            context,
+                            contact: contact,
+                          ),
+                    fieldSpans: {
+                      for (final field in visibleFields)
+                        field: sensorsProvider.fieldSpanFor(
+                          publicKeyHex,
+                          field,
+                        ),
+                    },
+                    margin: EdgeInsets.zero,
+                    emptyMetricsMessage: 'No telemetry fields available yet.',
                   ),
-                  labelOverrides: sensorsProvider.labelOverridesFor(
-                    publicKeyHex,
-                  ),
-                  fieldSpans: {
-                    for (final field in visibleFields)
-                      field: sensorsProvider.fieldSpanFor(publicKeyHex, field),
-                  },
-                  margin: EdgeInsets.zero,
-                  emptyMetricsMessage: 'No telemetry fields available yet.',
                 ),
-              ),
               _SensorCustomizeSectionCard(
                 title: AppLocalizations.of(context)!.refreshSchedule,
                 subtitle:
@@ -876,55 +1155,8 @@ class _EmptySensorsState extends StatefulWidget {
 }
 
 class _EmptySensorsStateState extends State<_EmptySensorsState> {
-  bool _discoveryTriggered = false;
-  bool _discoveryInProgress = false;
-
-  @override
-  void initState() {
-    super.initState();
-    // Auto-trigger sensor discovery when the empty state is shown
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      _autoDiscover();
-    });
-  }
-
-  Future<void> _autoDiscover() async {
-    if (_discoveryTriggered || !mounted) return;
-    final connectionProvider = context.read<ConnectionProvider>();
-    if (!connectionProvider.deviceInfo.isConnected) return;
-
-    _discoveryTriggered = true;
-    setState(() => _discoveryInProgress = true);
-    try {
-      await connectionProvider.discoverNodeType(advertType: 4);
-    } finally {
-      if (mounted) setState(() => _discoveryInProgress = false);
-    }
-  }
-
-  Future<void> _discoverSensors() async {
-    if (_discoveryInProgress || !mounted) return;
-    final connectionProvider = context.read<ConnectionProvider>();
-    if (!connectionProvider.deviceInfo.isConnected) return;
-
-    setState(() => _discoveryInProgress = true);
-    try {
-      await connectionProvider.discoverNodeType(advertType: 4);
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(AppLocalizations.of(context)!.sensorDiscoverySent)),
-        );
-      }
-    } finally {
-      if (mounted) setState(() => _discoveryInProgress = false);
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
-    final isConnected =
-        context.watch<ConnectionProvider>().deviceInfo.isConnected;
-
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 64),
       child: Column(
@@ -951,28 +1183,84 @@ class _EmptySensorsStateState extends State<_EmptySensorsState> {
           const Padding(
             padding: EdgeInsets.symmetric(horizontal: 24),
             child: Text(
-              'Use + to add discovered relays or nodes. Pull down to refresh telemetry after adding them.',
+              'Use + to add discovered relays or nodes. Your device will appear here automatically when available.',
               textAlign: TextAlign.center,
             ),
           ),
-          const SizedBox(height: 20),
-          FilledButton.icon(
-            onPressed: isConnected && !_discoveryInProgress
-                ? _discoverSensors
-                : null,
-            icon: _discoveryInProgress
-                ? const SizedBox(
-                    width: 16,
-                    height: 16,
-                    child: CircularProgressIndicator(
-                      strokeWidth: 2,
-                      color: Colors.white,
+        ],
+      ),
+    );
+  }
+}
+
+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 Icon(Icons.sensors_outlined),
-            label: Text(_discoveryInProgress
-                ? 'Discovering...'
-                : 'Discover Sensors'),
+                    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'),
+            ),
           ),
         ],
       ),

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';
@@ -24,6 +25,7 @@ import '../services/update_checker_service.dart';
 import '../services/voice_bitrate_preferences.dart';
 import '../services/image_preferences.dart';
 import '../services/route_hash_preferences.dart';
+import '../services/message_destination_preferences.dart';
 import '../services/image_codec_service.dart';
 import '../services/developer_mode_service.dart';
 import '../services/notification_service.dart';
@@ -36,6 +38,7 @@ import '../utils/voice_message_parser.dart';
 import '../theme/app_theme.dart';
 import '../l10n/app_localizations.dart';
 import '../widgets/update_dialog.dart';
+import '../widgets/settings/traffic_stats_reporting_section.dart';
 import 'sar_template_management_screen.dart';
 import 'profiles_screen.dart';
 import 'welcome_wizard_screen.dart';
@@ -59,6 +62,8 @@ class SettingsScreen extends StatefulWidget {
 }
 
 class _SettingsScreenState extends State<SettingsScreen> {
+  static const String _publicChannelPublicKeyHex =
+      '0000000000000000000000000000000000000000000000000000000000000000';
   late AppThemeMode _selectedTheme;
   late Locale? _selectedLocale;
   PackageInfo? _packageInfo;
@@ -79,6 +84,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;
@@ -89,6 +95,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
   bool _muteForegroundNotifications = true;
   bool _isDeveloperModeEnabled = false;
   bool _profilesEnabled = false;
+  bool _messageDestinationLockEnabled = false;
+  String _messageDestinationLockType =
+      MessageDestinationPreferences.destinationTypeChannel;
+  String? _messageDestinationLockPublicKey = _publicChannelPublicKeyHex;
   DateTime? _onlineTraceCacheUpdatedAt;
   bool _isClearingOnlineTraceCache = false;
   int _versionTapCount = 0;
@@ -112,6 +122,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     _loadOnlineTraceCacheStatus();
     _loadMapPreferences();
     _loadNotificationPreferences();
+    _loadMessageDestinationLock();
   }
 
   @override
@@ -182,6 +193,94 @@ class _SettingsScreenState extends State<SettingsScreen> {
     });
   }
 
+  Future<void> _loadMessageDestinationLock() async {
+    final lockedDestination =
+        await MessageDestinationPreferences.getLockedDestination();
+    if (!mounted) return;
+
+    setState(() {
+      _messageDestinationLockEnabled = lockedDestination != null;
+      _messageDestinationLockType =
+          lockedDestination?['publicKey'] == null
+          ? MessageDestinationPreferences.destinationTypeChannel
+          : lockedDestination?['type'] ??
+                MessageDestinationPreferences.destinationTypeChannel;
+      _messageDestinationLockPublicKey =
+          lockedDestination?['publicKey'] ?? _publicChannelPublicKeyHex;
+    });
+  }
+
+  List<Contact> _messageDestinationLockOptions(
+    ContactsProvider contactsProvider,
+  ) {
+    final channels = List<Contact>.from(contactsProvider.channels)
+      ..sort((a, b) {
+        if (a.isPublicChannel != b.isPublicChannel) {
+          return a.isPublicChannel ? -1 : 1;
+        }
+        return a.displayName.toLowerCase().compareTo(
+          b.displayName.toLowerCase(),
+        );
+      });
+    final rooms = List<Contact>.from(contactsProvider.rooms)
+      ..sort(
+        (a, b) => a.displayName.toLowerCase().compareTo(
+          b.displayName.toLowerCase(),
+        ),
+      );
+
+    return [...channels, ...rooms];
+  }
+
+  String _messageDestinationLockLabel(BuildContext context, Contact contact) {
+    final name = contact.isChannel
+        ? contact.getLocalizedDisplayName(context)
+        : contact.displayName;
+    return contact.isRoom ? 'Room: $name' : 'Channel: $name';
+  }
+
+  String _messageDestinationLockTypeForContact(Contact contact) {
+    return contact.isRoom
+        ? MessageDestinationPreferences.destinationTypeRoom
+        : MessageDestinationPreferences.destinationTypeChannel;
+  }
+
+  String? _selectedMessageDestinationLockValue(List<Contact> destinations) {
+    final currentValue = _messageDestinationLockPublicKey;
+    if (currentValue != null &&
+        destinations.any((contact) => contact.publicKeyHex == currentValue)) {
+      return currentValue;
+    }
+
+    return destinations.isEmpty ? null : destinations.first.publicKeyHex;
+  }
+
+  Future<void> _setMessageDestinationLock({
+    required bool enabled,
+    String? type,
+    String? recipientPublicKey,
+  }) async {
+    final nextType = type ?? _messageDestinationLockType;
+    final nextRecipientPublicKey =
+        recipientPublicKey ??
+        _messageDestinationLockPublicKey ??
+        _publicChannelPublicKeyHex;
+
+    await MessageDestinationPreferences.setLockedDestination(
+      enabled: enabled,
+      type: nextType,
+      recipientPublicKey: enabled ? nextRecipientPublicKey : null,
+    );
+
+    if (!mounted) return;
+
+    setState(() {
+      _messageDestinationLockEnabled = enabled;
+      _messageDestinationLockType = nextType;
+      _messageDestinationLockPublicKey = nextRecipientPublicKey;
+    });
+  }
+
   Future<void> _handleVersionTap() async {
     if (_isDeveloperModeEnabled) {
       await DeveloperModeService.setEnabled(false);
@@ -314,6 +413,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           _locationService.fastLocationMovementThresholdMeters;
       _fastLocationActiveCadenceSeconds =
           _locationService.fastLocationActiveCadenceSeconds;
+      _fastLocationChannelIdx = _locationService.fastLocationChannelIdx;
     });
   }
 
@@ -338,7 +438,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           keyboardType: const TextInputType.numberWithOptions(decimal: true),
           decoration: const InputDecoration(
             labelText: 'Meters',
-            helperText: 'Valid range: 1 to 1000 meters',
+            helperText: 'Valid range: 10 to 1000 meters',
           ),
         ),
         actions: [
@@ -350,7 +450,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
             onPressed: () {
               final parsed = double.tryParse(controller.text.trim());
               if (parsed == null) return;
-              Navigator.pop(context, parsed.clamp(1.0, 1000.0));
+              Navigator.pop(context, parsed.clamp(10.0, 1000.0));
             },
             child: const Text('Save'),
           ),
@@ -379,7 +479,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           keyboardType: TextInputType.number,
           decoration: const InputDecoration(
             labelText: 'Seconds',
-            helperText: 'Valid range: 5 to 60 seconds',
+            helperText: 'Valid range: 10 to 31 seconds',
           ),
         ),
         actions: [
@@ -391,7 +491,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
             onPressed: () {
               final parsed = int.tryParse(controller.text.trim());
               if (parsed == null) return;
-              Navigator.pop(context, parsed.clamp(5, 60));
+              Navigator.pop(context, parsed.clamp(10, 31));
             },
             child: const Text('Save'),
           ),
@@ -407,6 +507,97 @@ 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> _sendTestFastLocationUpdate() async {
+    final appProvider = context.read<AppProvider>();
+    final sent = await appProvider.sendTestFastLocationUpdate();
+    if (!mounted) return;
+
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(
+          sent
+              ? 'Test fast GPS update sent.'
+              : 'Unable to send test fast GPS update.',
+        ),
+        backgroundColor: sent ? Colors.green : Colors.orange,
+      ),
+    );
+  }
+
+  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;
@@ -1295,19 +1486,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
               trailing: const Icon(Icons.chevron_right),
               onTap: _showRouteHashSizeDialog,
             ),
-            Consumer<AppProvider>(
-              builder: (context, appProvider, child) => SwitchListTile(
-                secondary: Icon(Icons.swap_horiz),
-                title: Text(AppLocalizations.of(context)!.autoRouteRotation),
-                subtitle: const Text(
-                  'Rotate between best known direct paths and flood mode for room/contact sends',
-                ),
-                value: appProvider.autoRouteRotationEnabled,
-                onChanged: (value) async {
-                  await appProvider.toggleAutoRouteRotationEnabled(value);
-                },
-              ),
-            ),
             Consumer<AppProvider>(
               builder: (context, appProvider, child) => SwitchListTile(
                 secondary: Icon(Icons.route),
@@ -1336,6 +1514,90 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 },
               ),
             ),
+            SwitchListTile(
+              secondary: const Icon(Icons.lock_outline),
+              title: const Text('Lock messages to one channel or room'),
+              subtitle: const Text(
+                'Keep the Messages tab and composer fixed on one destination. Direct messages from Contacts still open as usual.',
+              ),
+              value: _messageDestinationLockEnabled,
+              onChanged: (value) async {
+                final contactsProvider = context.read<ContactsProvider>();
+                final options = _messageDestinationLockOptions(
+                  contactsProvider,
+                );
+                final selectedPublicKey =
+                    _selectedMessageDestinationLockValue(options) ??
+                    _publicChannelPublicKeyHex;
+                final selectedContact = options.where((contact) {
+                  return contact.publicKeyHex == selectedPublicKey;
+                }).firstOrNull;
+
+                await _setMessageDestinationLock(
+                  enabled: value,
+                  type: selectedContact == null
+                      ? MessageDestinationPreferences.destinationTypeChannel
+                      : _messageDestinationLockTypeForContact(selectedContact),
+                  recipientPublicKey: selectedPublicKey,
+                );
+              },
+            ),
+            Consumer<ContactsProvider>(
+              builder: (context, contactsProvider, child) {
+                final options = _messageDestinationLockOptions(
+                  contactsProvider,
+                );
+                final selectedValue =
+                    _selectedMessageDestinationLockValue(options);
+
+                return Padding(
+                  padding: const EdgeInsets.fromLTRB(16, 12, 16, 16),
+                  child: DropdownButtonFormField<String>(
+                    key: ValueKey(selectedValue),
+                    initialValue: selectedValue,
+                    isExpanded: true,
+                    decoration: const InputDecoration(
+                      labelText: 'Locked channel or room',
+                      prefixIcon: Icon(Icons.forum_outlined),
+                      border: OutlineInputBorder(),
+                    ),
+                    items: [
+                      for (final contact in options)
+                        DropdownMenuItem<String>(
+                          value: contact.publicKeyHex,
+                          child: Text(
+                            _messageDestinationLockLabel(context, contact),
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                        ),
+                    ],
+                    onChanged:
+                        _messageDestinationLockEnabled && options.isNotEmpty
+                        ? (value) async {
+                            if (value == null) {
+                              return;
+                            }
+
+                            final selectedContact = options.where((contact) {
+                              return contact.publicKeyHex == value;
+                            }).firstOrNull;
+                            if (selectedContact == null) {
+                              return;
+                            }
+
+                            await _setMessageDestinationLock(
+                              enabled: true,
+                              type: _messageDestinationLockTypeForContact(
+                                selectedContact,
+                              ),
+                              recipientPublicKey: value,
+                            );
+                          }
+                        : null,
+                  ),
+                );
+              },
+            ),
             ListTile(
               leading: const Icon(Icons.delete_sweep, color: Colors.red),
               title: const Text(
@@ -1463,21 +1725,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 +2028,26 @@ 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: const Icon(Icons.send),
+              title: const Text('Test send update'),
+              subtitle: const Text(
+                'Send one fast GPS update immediately to the configured channel.',
+              ),
+              trailing: const Icon(Icons.chevron_right),
+              onTap: _sendTestFastLocationUpdate,
+            ),
             ListTile(
               leading: Icon(Icons.location_on),
               title: Text(AppLocalizations.of(context)!.locationPermission),
@@ -1883,6 +2150,14 @@ class _SettingsScreenState extends State<SettingsScreen> {
             ),
           _buildSectionHeader('Developer & Data'),
           _buildSettingsCard([
+            Consumer<AppProvider>(
+              builder: (context, appProvider, child) => ListenableBuilder(
+                listenable: appProvider.trafficStatsReportingService,
+                builder: (context, child) => TrafficStatsReportingSection(
+                  service: appProvider.trafficStatsReportingService,
+                ),
+              ),
+            ),
             ListTile(
               leading: Icon(Icons.bug_report),
               title: Text(AppLocalizations.of(context)!.packageName),

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(
-      context: context,
-      isScrollControlled: true,
-      builder: (context) => const ConnectionDialog(),
+    final connected = await showConnectionDialogFlow(
+      context,
+      offerPostConnectRepeaterDiscovery: true,
     );
     if (!mounted) return;
     final connectionProvider = context.read<ConnectionProvider>();
-    if (connectionProvider.deviceInfo.isConnected) {
+    if (connected) {
       await connectionProvider.refreshDeviceInfo();
     }
     if (!mounted) return;

lib/services/app_config_snapshot_service.dart

@@ -23,7 +23,6 @@ class AppConfigSnapshotService {
       voiceEchoCancellationEnabled: appProvider.isVoiceEchoCancellationEnabled,
       voiceNoiseSuppressionEnabled: appProvider.isVoiceNoiseSuppressionEnabled,
       messageFontScale: appProvider.messageFontScale,
-      autoRouteRotationEnabled: appProvider.autoRouteRotationEnabled,
       clearPathOnMaxRetry: appProvider.clearPathOnMaxRetry,
       nearestRelayFallbackEnabled: appProvider.nearestRelayFallbackEnabled,
       voiceBitrate: await VoiceBitratePreferences.getBitrate(),
@@ -98,11 +97,6 @@ class AppConfigSnapshotService {
     if (section.messageFontScale != null) {
       await appProvider.setMessageFontScale(section.messageFontScale!);
     }
-    if (section.autoRouteRotationEnabled != null) {
-      await appProvider.toggleAutoRouteRotationEnabled(
-        section.autoRouteRotationEnabled!,
-      );
-    }
     if (section.clearPathOnMaxRetry != null) {
       await appProvider.toggleClearPathOnMaxRetry(section.clearPathOnMaxRetry!);
     }
@@ -144,11 +138,11 @@ class AppConfigSnapshotService {
     }
     if (section.fastLocationMovementThresholdMeters != null) {
       locationTracking.fastLocationMovementThresholdMeters =
-          section.fastLocationMovementThresholdMeters!;
+          section.fastLocationMovementThresholdMeters!.clamp(10.0, 1000.0);
     }
     if (section.fastLocationActiveCadenceSeconds != null) {
       locationTracking.fastLocationActiveCadenceSeconds =
-          section.fastLocationActiveCadenceSeconds!;
+          section.fastLocationActiveCadenceSeconds!.clamp(10, 31);
     }
     await locationTracking.saveSettings();
     await appProvider.reloadProfileScopedSettings();

lib/services/bthome_met_history.dart

@@ -0,0 +1,178 @@
+import '../models/contact.dart';
+
+enum BTHomeMetMeasurement {
+  temperature(1, 'Temperature', '°C'),
+  humidity(2, 'Humidity', '%'),
+  windSpeed(3, 'Wind speed', 'm/s'),
+  gust(4, 'Wind gust', 'm/s'),
+  rain(5, 'Rain', 'mm');
+
+  const BTHomeMetMeasurement(this.id, this.label, this.unit);
+
+  final int id;
+  final String label;
+  final String unit;
+
+  static BTHomeMetMeasurement? fromId(int id) {
+    for (final value in BTHomeMetMeasurement.values) {
+      if (value.id == id) {
+        return value;
+      }
+    }
+    return null;
+  }
+}
+
+class BTHomeMetHistoryPage {
+  const BTHomeMetHistoryPage({
+    required this.measurement,
+    required this.page,
+    required this.values,
+  });
+
+  final BTHomeMetMeasurement measurement;
+  final int page;
+  final List<double> values;
+
+  double? get latest => values.isEmpty ? null : values.last;
+  double? get minimum => values.isEmpty
+      ? null
+      : values.reduce((left, right) => left < right ? left : right);
+  double? get maximum => values.isEmpty
+      ? null
+      : values.reduce((left, right) => left > right ? left : right);
+}
+
+class BTHomeMetHistoryFormatException implements Exception {
+  const BTHomeMetHistoryFormatException(this.message);
+
+  final String message;
+
+  @override
+  String toString() => message;
+}
+
+class BTHomeMetHistoryParser {
+  static BTHomeMetHistoryPage parse(String text) {
+    final parts = text
+        .trim()
+        .split(',')
+        .map((part) => part.trim())
+        .toList(growable: false);
+    if (parts.length < 3) {
+      throw const BTHomeMetHistoryFormatException(
+        'MET history response is too short.',
+      );
+    }
+
+    final measurementId = int.tryParse(parts[0]);
+    final page = int.tryParse(parts[1]);
+    final count = int.tryParse(parts[2]);
+    if (measurementId == null || page == null || count == null) {
+      throw const BTHomeMetHistoryFormatException(
+        'MET history header is invalid.',
+      );
+    }
+
+    final measurement = BTHomeMetMeasurement.fromId(measurementId);
+    if (measurement == null) {
+      throw BTHomeMetHistoryFormatException(
+        'Unsupported MET history measurement id: $measurementId',
+      );
+    }
+    if (count < 0) {
+      throw const BTHomeMetHistoryFormatException(
+        'MET history sample count is invalid.',
+      );
+    }
+    if (parts.length != count + 3) {
+      throw BTHomeMetHistoryFormatException(
+        'MET history sample count mismatch: expected $count values, got ${parts.length - 3}.',
+      );
+    }
+
+    final values = <double>[];
+    for (final part in parts.skip(3)) {
+      final value = double.tryParse(part);
+      if (value == null) {
+        throw BTHomeMetHistoryFormatException(
+          'Invalid MET history sample value: $part',
+        );
+      }
+      values.add(value);
+    }
+
+    return BTHomeMetHistoryPage(
+      measurement: measurement,
+      page: page,
+      values: List<double>.unmodifiable(values),
+    );
+  }
+}
+
+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 || !_hasBTHomeMetCapability(contact)) {
+    return const <BTHomeMetMeasurement>[];
+  }
+
+  final measurements = <BTHomeMetMeasurement>[
+    if (telemetry.temperature != null) BTHomeMetMeasurement.temperature,
+    if (telemetry.humidity != null) BTHomeMetMeasurement.humidity,
+  ];
+
+  final extraSensorData = telemetry.extraSensorData;
+  if (extraSensorData != null) {
+    if (extraSensorData.keys.any(
+      (key) => key.startsWith('speed_') || key.startsWith('signed_speed_'),
+    )) {
+      measurements.add(BTHomeMetMeasurement.windSpeed);
+    }
+    if (extraSensorData.keys.any((key) => key.startsWith('gust_'))) {
+      measurements.add(BTHomeMetMeasurement.gust);
+    }
+    if (extraSensorData.keys.any((key) => key.startsWith('rain_'))) {
+      measurements.add(BTHomeMetMeasurement.rain);
+    }
+  }
+
+  return List<BTHomeMetMeasurement>.unmodifiable(measurements);
+}
+
+bool supportsBTHomeMetHistory(Contact? contact) =>
+    bTHomeMetMeasurementsForContact(contact).isNotEmpty;

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) =>
-      channel == 0 || channel == _selfTelemetryChannel;
+  static bool _isDedicatedBatteryChannel(int channel) => channel == 0;
+
+  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/live_traffic_summary.dart

@@ -3,12 +3,136 @@ import '../utils/log_rx_route_decoder.dart';
 
 enum LiveTrafficBusyness { quiet, active, busy }
 
+class LiveTrafficPacketTypeDetails {
+  final int payloadType;
+  final String title;
+  final String label;
+  final String summary;
+  final String description;
+
+  const LiveTrafficPacketTypeDetails({
+    required this.payloadType,
+    required this.title,
+    required this.label,
+    required this.summary,
+    required this.description,
+  });
+}
+
 class LiveTrafficEntry {
   final BlePacketLog log;
   final DecodedLogRxRoute? route;
 
   const LiveTrafficEntry({required this.log, required this.route});
 
+  static const List<LiveTrafficPacketTypeDetails> _knownPayloadTypes = [
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x00,
+      title: 'FLOOD REQUEST',
+      label: 'Request',
+      summary: 'Encrypted request to a known peer',
+      description:
+          'Encrypted request to a known peer. The wire payload carries destination and source hashes plus a MAC, and the decrypted body starts with a timestamp followed by application-defined request data such as stats or keepalive requests.',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x01,
+      title: 'FLOOD RESPONSE',
+      label: 'Response',
+      summary: 'Encrypted reply to a request',
+      description:
+          'Encrypted reply to a Request or Anonymous request. After decryption, the body is application-defined response data with no single generic response envelope.',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x02,
+      title: 'FLOOD TEXT',
+      label: 'Text message',
+      summary: 'Encrypted direct text with timestamp and retry flags',
+      description:
+          'Encrypted direct text message to a known peer. The decrypted body contains a timestamp, a flags and attempt byte, and the message text.',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x03,
+      title: 'FLOOD ACK',
+      label: 'Ack',
+      summary: '4-byte acknowledgement for an earlier message',
+      description:
+          'Short acknowledgement proving that a prior message was received. It carries a 4-byte checksum derived from the original message data.',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x04,
+      title: 'FLOOD ADVERTISEMENT',
+      label: 'Advertisement',
+      summary: 'Signed node identity broadcast',
+      description:
+          'Signed node advertisement announcing a device identity plus app data such as a name or location. Receivers verify the signature before accepting it.',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x05,
+      title: 'FLOOD GROUP_TEXT',
+      label: 'Group text',
+      summary: 'Encrypted channel text matched by channel hash',
+      description:
+          'Encrypted channel text message. It is matched by the first byte of SHA256(channel secret), then decrypted with the channel key. The plaintext is usually in the form "<sender name>: <message body>".',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x06,
+      title: 'FLOOD GROUP_DATA',
+      label: 'Group datagram',
+      summary: 'Encrypted channel data with type and length',
+      description:
+          'Encrypted channel datagram. After channel-hash matching and decryption, the body starts with a 16-bit data type and a 1-byte data length before the application payload.',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x07,
+      title: 'FLOOD ANON_REQUEST',
+      label: 'Anonymous request',
+      summary: 'Request using an ephemeral sender key',
+      description:
+          'Encrypted request to a destination hash without using a stored sender identity. The packet includes the sender\'s ephemeral public key so the receiver can derive the shared secret.',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x08,
+      title: 'FLOOD RETURNED_PATH',
+      label: 'Returned path',
+      summary:
+          'Return route back to the sender, with optional bundled ACK or response',
+      description:
+          'Path reply sent back to the original author to describe the route a received packet took. MeshCore stores that returned path as the peer\'s direct out-path and can bundle an ACK or response in the same payload.',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x09,
+      title: 'FLOOD TRACE_PATH',
+      label: 'Trace path',
+      summary: 'Direct trace that records SNR at each hop',
+      description:
+          'Direct diagnostic packet that walks a supplied path and appends one SNR sample per hop. When it reaches the end of the path, the initiator can inspect hop-by-hop link quality.',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x0A,
+      title: 'FLOOD MULTIPART',
+      label: 'Multipart packet',
+      summary: 'Wrapper for one packet in a multipart sequence',
+      description:
+          'Packet wrapper used when a logical message is split into a sequence. Current MeshCore code uses it for multipart ACKs, where the first nibble says how many parts remain.',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x0B,
+      title: 'FLOOD CONTROL',
+      label: 'Control packet',
+      summary: 'Discovery or other control data',
+      description:
+          'Control or discovery payload, typically unencrypted. Current documented subtypes are discovery request and response packets used to find nearby nodes and report SNR.',
+    ),
+    LiveTrafficPacketTypeDetails(
+      payloadType: 0x0F,
+      title: 'RAW CUSTOM',
+      label: 'Custom packet',
+      summary: 'Application-defined custom packet',
+      description:
+          'Application-defined raw packet bytes for custom encryption or custom payload formats. MeshCore leaves the inner format up to the higher-level application.',
+    ),
+  ];
+
   bool get isMultiHop => (route?.hopCount ?? 0) > 1;
 
   int? get hopCount => route?.hopCount;
@@ -37,66 +161,39 @@ class LiveTrafficEntry {
         .join(' -> ');
   }
 
-  static String payloadTypeLabel(int payloadType) {
-    switch (payloadType) {
-      case 0x00:
-        return 'Request';
-      case 0x01:
-        return 'Response';
-      case 0x02:
-        return 'Text message';
-      case 0x03:
-        return 'Ack';
-      case 0x04:
-        return 'Advertisement';
-      case 0x05:
-        return 'Group text';
-      case 0x06:
-        return 'Group datagram';
-      case 0x07:
-        return 'Anonymous request';
-      case 0x08:
-        return 'Returned path';
-      case 0x09:
-        return 'Trace path';
-      case 0x0A:
-        return 'Multipart packet';
-      case 0x0B:
-        return 'Control packet';
-      default:
-        return '0x${payloadType.toRadixString(16).padLeft(2, '0')}';
+  static List<LiveTrafficPacketTypeDetails> get knownPayloadTypes =>
+      _knownPayloadTypes;
+
+  static LiveTrafficPacketTypeDetails payloadTypeDetails(int payloadType) {
+    for (final details in _knownPayloadTypes) {
+      if (details.payloadType == payloadType) {
+        return details;
+      }
     }
+    return LiveTrafficPacketTypeDetails(
+      payloadType: payloadType,
+      title: '0x${payloadType.toRadixString(16).padLeft(2, '0').toUpperCase()}',
+      label: '0x${payloadType.toRadixString(16).padLeft(2, '0')}',
+      summary: 'Unknown or application-specific protocol payload',
+      description:
+          'Unknown or application-specific packet type. Check the current MeshCore firmware or app-specific protocol docs for the exact payload format.',
+    );
+  }
+
+  static String payloadTypeLabel(int payloadType) {
+    return payloadTypeDetails(payloadType).label;
+  }
+
+  static String payloadTypeTitle(int payloadType) {
+    return payloadTypeDetails(payloadType).title;
   }
 
   static String payloadTypeMeaning(int payloadType) {
-    switch (payloadType) {
-      case 0x00:
-        return 'Request (destination/source hashes + MAC)';
-      case 0x01:
-        return 'Response to Request or Anonymous request';
-      case 0x02:
-        return 'Plain text message';
-      case 0x03:
-        return 'Simple acknowledgement';
-      case 0x04:
-        return 'Node advertisement';
-      case 0x05:
-        return 'Unverified group text message';
-      case 0x06:
-        return 'Unverified group datagram';
-      case 0x07:
-        return 'Generic anonymous request';
-      case 0x08:
-        return 'Returned path payload';
-      case 0x09:
-        return 'Trace path collecting hop SNR';
-      case 0x0A:
-        return 'One packet from a multipart set';
-      case 0x0B:
-        return 'Control or discovery packet';
-      default:
-        return 'protocol payload';
-    }
+    return payloadTypeDetails(payloadType).summary;
+  }
+
+  static String payloadTypeDescription(int payloadType) {
+    return payloadTypeDetails(payloadType).description;
   }
 }
 

lib/services/location_tracking_service.dart

@@ -20,6 +20,14 @@ import 'profiles_feature_service.dart';
 /// - MeshCore mesh network integration
 /// - Real-time position updates via callbacks
 class LocationTrackingService {
+  static const double _defaultFastLocationMovementThresholdMeters = 10.0;
+  static const double _minFastLocationMovementThresholdMeters = 10.0;
+  static const int _defaultFastLocationActiveCadenceSeconds = 10;
+  static const int _minFastLocationActiveCadenceSeconds = 10;
+  static const int _maxFastLocationActiveCadenceSeconds = 31;
+  static const Duration _fastLocationMinimumUpdateInterval = Duration(
+    seconds: 31,
+  );
   // ============================================================================
   // Singleton Pattern
   // ============================================================================
@@ -49,6 +57,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);
@@ -74,10 +83,15 @@ class LocationTrackingService {
   bool fastLocationUpdatesEnabled = false;
 
   /// Distance threshold for fast GPS updates
-  double fastLocationMovementThresholdMeters = 10.0;
+  double fastLocationMovementThresholdMeters =
+      _defaultFastLocationMovementThresholdMeters;
 
   /// Cadence for active-use fast GPS updates
-  int fastLocationActiveCadenceSeconds = 10;
+  int fastLocationActiveCadenceSeconds =
+      _defaultFastLocationActiveCadenceSeconds;
+
+  /// Target channel index for fast GPS updates; null means disabled/unset.
+  int? fastLocationChannelIdx;
 
   // ============================================================================
   // State Properties
@@ -518,18 +532,30 @@ class LocationTrackingService {
   }
 
   Future<void> updateFastLocationMovementThreshold(double meters) async {
-    fastLocationMovementThresholdMeters = meters.clamp(1.0, 1000.0);
+    fastLocationMovementThresholdMeters = meters.clamp(
+      _minFastLocationMovementThresholdMeters,
+      1000.0,
+    );
     await saveSettings();
   }
 
   Future<void> updateFastLocationActiveCadenceSeconds(int seconds) async {
-    fastLocationActiveCadenceSeconds = seconds.clamp(5, 60);
+    fastLocationActiveCadenceSeconds = seconds.clamp(
+      _minFastLocationActiveCadenceSeconds,
+      _maxFastLocationActiveCadenceSeconds,
+    );
+    await saveSettings();
+    _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 +578,7 @@ class LocationTrackingService {
     _fastLocationTimer = null;
     if (!isTracking ||
         !fastLocationUpdatesEnabled ||
+        fastLocationChannelIdx == null ||
         !_isFastLocationActiveUse) {
       return;
     }
@@ -567,11 +594,16 @@ class LocationTrackingService {
   }
 
   void _emitFastLocationUpdate(Position position, {required String reason}) {
-    if (!fastLocationUpdatesEnabled) return;
+    if (!fastLocationUpdatesEnabled || fastLocationChannelIdx == null) return;
 
     final now = DateTime.now();
     final previous = _lastFastLocationSentPosition;
     final previousTime = _lastFastLocationSentAt;
+    if (previousTime != null &&
+        now.difference(previousTime) < _fastLocationMinimumUpdateInterval) {
+      return;
+    }
+
     if (previous != null && previousTime != null) {
       final distance = Geolocator.distanceBetween(
         previous.latitude,
@@ -662,13 +694,16 @@ class LocationTrackingService {
         prefs.getBool(_scopedKey(_prefKeyFastLocationEnabled)) ?? false;
     fastLocationMovementThresholdMeters =
         (prefs.getDouble(_scopedKey(_prefKeyFastMovementThreshold)) ??
-                gpsUpdateDistance)
-            .clamp(1.0, 1000.0);
+                _defaultFastLocationMovementThresholdMeters)
+            .clamp(_minFastLocationMovementThresholdMeters, 1000.0);
     fastLocationActiveCadenceSeconds =
-        (prefs.getInt(_scopedKey(_prefKeyFastActiveCadence)) ?? 10).clamp(
-          5,
-          60,
+        (prefs.getInt(_scopedKey(_prefKeyFastActiveCadence)) ??
+                _defaultFastLocationActiveCadenceSeconds)
+            .clamp(
+          _minFastLocationActiveCadenceSeconds,
+          _maxFastLocationActiveCadenceSeconds,
         );
+    fastLocationChannelIdx = prefs.getInt(_scopedKey(_prefKeyFastChannelIdx));
 
     debugPrint('✅ [LocationTracking] Settings loaded');
     debugPrint('    Min distance: ${minDistanceMeters}m');
@@ -680,6 +715,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 +745,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/message_destination_preferences.dart

@@ -5,6 +5,12 @@ import 'package:shared_preferences/shared_preferences.dart';
 class MessageDestinationPreferences {
   static const String _destinationTypeKey = 'message_destination_type';
   static const String _recipientPublicKeyKey = 'message_recipient_public_key';
+  static const String _lockedDestinationEnabledKey =
+      'message_locked_destination_enabled';
+  static const String _lockedDestinationTypeKey =
+      'message_locked_destination_type';
+  static const String _lockedRecipientPublicKeyKey =
+      'message_locked_recipient_public_key';
 
   /// Destination types
   static const String destinationTypeAll = 'all';
@@ -12,6 +18,10 @@ class MessageDestinationPreferences {
   static const String destinationTypeContact = 'contact';
   static const String destinationTypeRoom = 'room';
 
+  static bool isLockableDestinationType(String type) {
+    return type == destinationTypeChannel || type == destinationTypeRoom;
+  }
+
   /// Get the saved destination configuration
   /// Returns a map with 'type' and optional 'publicKey'
   /// Returns null if no preference is saved (defaults to public channel)
@@ -53,6 +63,53 @@ class MessageDestinationPreferences {
     await prefs.remove(_recipientPublicKeyKey);
   }
 
+  /// Get the saved locked destination configuration.
+  /// Returns null when the lock is disabled.
+  static Future<Map<String, String>?> getLockedDestination() async {
+    final prefs = await SharedPreferences.getInstance();
+    final isEnabled = prefs.getBool(_lockedDestinationEnabledKey) ?? false;
+
+    if (!isEnabled) {
+      return null;
+    }
+
+    final savedType =
+        prefs.getString(_lockedDestinationTypeKey) ?? destinationTypeChannel;
+    final type = isLockableDestinationType(savedType)
+        ? savedType
+        : destinationTypeChannel;
+    final publicKey = prefs.getString(_lockedRecipientPublicKeyKey);
+
+    return {'type': type, 'publicKey': ?publicKey};
+  }
+
+  static Future<void> setLockedDestination({
+    required bool enabled,
+    String type = destinationTypeChannel,
+    String? recipientPublicKey,
+  }) async {
+    final prefs = await SharedPreferences.getInstance();
+
+    await prefs.setBool(_lockedDestinationEnabledKey, enabled);
+
+    if (!enabled) {
+      await prefs.remove(_lockedDestinationTypeKey);
+      await prefs.remove(_lockedRecipientPublicKeyKey);
+      return;
+    }
+
+    final sanitizedType = isLockableDestinationType(type)
+        ? type
+        : destinationTypeChannel;
+    await prefs.setString(_lockedDestinationTypeKey, sanitizedType);
+
+    if (recipientPublicKey != null) {
+      await prefs.setString(_lockedRecipientPublicKeyKey, recipientPublicKey);
+    } else {
+      await prefs.remove(_lockedRecipientPublicKeyKey);
+    }
+  }
+
   /// Get display name for destination type
   static String getDestinationTypeName(String type) {
     switch (type) {

lib/services/message_storage_service.dart

@@ -58,10 +58,7 @@ class MessageStorageService {
           : jsonList;
 
       final jsonString = jsonEncode(limitedList);
-      await prefs.setString(
-        _key(_messagesKey, namespace: namespace),
-        jsonString,
-      );
+      final messagesKey = _key(_messagesKey, namespace: namespace);
       final retainedMessageIds = limitedList
           .map((entry) => entry['id'] as String)
           .toSet();
@@ -89,22 +86,41 @@ class MessageStorageService {
           routeMetadataJson[entry.key] = entry.value.toJson();
         }
       }
-      await prefs.setString(
-        _key(_messageContactLocationsKey, namespace: namespace),
-        jsonEncode(locationJson),
+      final contactLocationsKey = _key(
+        _messageContactLocationsKey,
+        namespace: namespace,
       );
-      await prefs.setString(
-        _key(_messageReceptionDetailsKey, namespace: namespace),
-        jsonEncode(receptionJson),
+      final receptionDetailsKey = _key(
+        _messageReceptionDetailsKey,
+        namespace: namespace,
       );
-      await prefs.setString(
-        _key(_messageTransferDetailsKey, namespace: namespace),
-        jsonEncode(transferJson),
+      final transferDetailsKey = _key(
+        _messageTransferDetailsKey,
+        namespace: namespace,
       );
-      await prefs.setString(
-        _key(_messageRouteMetadataKey, namespace: namespace),
-        jsonEncode(routeMetadataJson),
+      final routeMetadataKey = _key(
+        _messageRouteMetadataKey,
+        namespace: namespace,
       );
+      final locationJsonString = jsonEncode(locationJson);
+      final receptionJsonString = jsonEncode(receptionJson);
+      final transferJsonString = jsonEncode(transferJson);
+      final routeMetadataJsonString = jsonEncode(routeMetadataJson);
+      final hasChanges =
+          prefs.getString(messagesKey) != jsonString ||
+          prefs.getString(contactLocationsKey) != locationJsonString ||
+          prefs.getString(receptionDetailsKey) != receptionJsonString ||
+          prefs.getString(transferDetailsKey) != transferJsonString ||
+          prefs.getString(routeMetadataKey) != routeMetadataJsonString;
+      if (!hasChanges) {
+        return;
+      }
+
+      await prefs.setString(messagesKey, jsonString);
+      await prefs.setString(contactLocationsKey, locationJsonString);
+      await prefs.setString(receptionDetailsKey, receptionJsonString);
+      await prefs.setString(transferDetailsKey, transferJsonString);
+      await prefs.setString(routeMetadataKey, routeMetadataJsonString);
 
       debugPrint(
         '✅ [MessageStorage] Saved ${limitedList.length} messages to storage',

lib/services/messaging_route_preferences.dart

@@ -2,30 +2,20 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'profiles_feature_service.dart';
 
 class MessagingRoutePreferences {
-  static const bool defaultAutoRouteRotationEnabled = false;
   static const bool defaultClearPathOnMaxRetry = false;
   static const bool defaultNearestRelayFallbackEnabled = true;
 
-  static const String _autoRouteRotationKey =
+  static const String _legacyAutoRouteRotationKey =
       'messaging_auto_route_rotation_enabled';
   static const String _clearPathOnMaxRetryKey =
       'messaging_clear_path_on_max_retry';
   static const String _nearestRelayFallbackKey =
       'messaging_nearest_relay_fallback_enabled';
 
-  static Future<bool> getAutoRouteRotationEnabled() async {
+  static Future<void> cleanupLegacySettings() async {
     final prefs = await SharedPreferences.getInstance();
-    return prefs.getBool(
-          ProfileStorageScope.scopedKey(_autoRouteRotationKey),
-        ) ??
-        defaultAutoRouteRotationEnabled;
-  }
-
-  static Future<void> setAutoRouteRotationEnabled(bool enabled) async {
-    final prefs = await SharedPreferences.getInstance();
-    await prefs.setBool(
-      ProfileStorageScope.scopedKey(_autoRouteRotationKey),
-      enabled,
+    await prefs.remove(
+      ProfileStorageScope.scopedKey(_legacyAutoRouteRotationKey),
     );
   }
 

lib/services/offline_map_caching_provider.dart

@@ -0,0 +1,115 @@
+import 'dart:typed_data';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter_map/flutter_map.dart';
+
+import 'offline_tile_cache_service.dart';
+import 'tile_sharing_service.dart';
+
+/// A [MapCachingProvider] that checks the offline AVIF tile cache (and
+/// optionally peers) before falling through to the built-in cache.
+///
+/// This allows preloaded tiles to be served during normal map browsing.
+class OfflineMapCachingProvider implements MapCachingProvider {
+  final MapCachingProvider _delegate;
+  final OfflineTileCacheService _cache = OfflineTileCacheService.instance;
+  final TileSharingService _sharing = TileSharingService.instance;
+
+  OfflineMapCachingProvider(this._delegate);
+
+  @override
+  bool get isSupported => true;
+
+  @override
+  Future<CachedMapTile?> getTile(String url) async {
+    // Extract tile coordinates from URL to check our AVIF cache
+    final coords = _parseTileUrl(url);
+    if (coords != null) {
+      final styleHash = _cache.styleHashFromUrl(_extractUrlTemplate(url));
+
+      // Check local AVIF cache first
+      final pngBytes = await _cache.getTileAsPng(
+          styleHash, coords.z, coords.x, coords.y);
+      if (pngBytes != null) {
+        return (
+          bytes: pngBytes,
+          metadata: CachedMapTileMetadata(
+            staleAt: DateTime.now().add(const Duration(days: 365)),
+            lastModified: null,
+            etag: null,
+          ),
+        );
+      }
+
+      // Try peers
+      if (_sharing.discoveredPeers.isNotEmpty) {
+        final avifBytes = await _sharing.fetchFromAnyPeer(
+            styleHash, coords.z, coords.x, coords.y);
+        if (avifBytes != null) {
+          // Cache locally for next time
+          await _cache.putRawTile(
+              styleHash, coords.z, coords.x, coords.y, avifBytes);
+          final decoded = await OfflineTileCacheService.getTileAsPngStatic(avifBytes);
+          if (decoded != null) {
+            return (
+              bytes: decoded,
+              metadata: CachedMapTileMetadata(
+                staleAt: DateTime.now().add(const Duration(days: 365)),
+                lastModified: null,
+                etag: null,
+              ),
+            );
+          }
+        }
+      }
+    }
+
+    // Fall through to delegate (built-in cache)
+    return _delegate.getTile(url);
+  }
+
+  @override
+  Future<void> putTile({
+    required String url,
+    required CachedMapTileMetadata metadata,
+    Uint8List? bytes,
+  }) {
+    // Only delegate to built-in cache for normal browsing tiles
+    return _delegate.putTile(url: url, metadata: metadata, bytes: bytes);
+  }
+
+  /// Parse z/x/y from a tile URL.
+  static _TileCoords? _parseTileUrl(String url) {
+    // Match common patterns: /{z}/{x}/{y}.png, /tile/{z}/{y}/{x}, etc.
+    final patterns = [
+      RegExp(r'/(\d+)/(\d+)/(\d+)\.(?:png|jpg|jpeg|webp)'),
+      RegExp(r'/(\d+)/(\d+)/(\d+)$'),
+    ];
+
+    for (final pattern in patterns) {
+      final match = pattern.firstMatch(url);
+      if (match != null) {
+        return _TileCoords(
+          z: int.parse(match.group(1)!),
+          x: int.parse(match.group(2)!),
+          y: int.parse(match.group(3)!),
+        );
+      }
+    }
+    return null;
+  }
+
+  /// Extract a URL template from a concrete URL by replacing coordinates.
+  static String _extractUrlTemplate(String url) {
+    // Replace the last three numeric path segments with placeholders
+    return url.replaceAllMapped(
+      RegExp(r'/(\d+)/(\d+)/(\d+)(\.(?:png|jpg|jpeg|webp))?$'),
+      (m) => '/{z}/{x}/{y}${m.group(4) ?? ''}',
+    );
+  }
+}
+
+class _TileCoords {
+  final int z, x, y;
+  const _TileCoords({required this.z, required this.x, required this.y});
+}

lib/services/offline_tile_cache_service.dart

@@ -0,0 +1,481 @@
+import 'dart:convert';
+import 'dart:io';
+import 'dart:ui' as ui;
+
+import 'package:crypto/crypto.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_avif/flutter_avif.dart';
+import 'package:path_provider/path_provider.dart';
+
+/// A saved download region (polygons + zoom range) for quick re-download.
+class DownloadRegion {
+  final List<List<List<double>>> polygons; // [polygon][vertex][lat, lng]
+  final int minZoom;
+  final int maxZoom;
+
+  const DownloadRegion({
+    required this.polygons,
+    required this.minZoom,
+    required this.maxZoom,
+  });
+
+  Map<String, dynamic> toJson() => {
+        'polygons': polygons,
+        'minZoom': minZoom,
+        'maxZoom': maxZoom,
+      };
+
+  factory DownloadRegion.fromJson(Map<String, dynamic> json) {
+    final rawPolygons = json['polygons'] as List<dynamic>? ?? [];
+    final polygons = rawPolygons.map<List<List<double>>>((poly) {
+      return (poly as List<dynamic>).map<List<double>>((vertex) {
+        final v = vertex as List<dynamic>;
+        return [
+          (v[0] as num).toDouble(),
+          (v[1] as num).toDouble(),
+        ];
+      }).toList();
+    }).toList();
+    return DownloadRegion(
+      polygons: polygons,
+      minZoom: json['minZoom'] as int? ?? 8,
+      maxZoom: json['maxZoom'] as int? ?? 14,
+    );
+  }
+}
+
+/// Metadata about a cached map style.
+class StyleInfo {
+  final String hash;
+  final String displayName;
+  final String urlTemplate;
+  final int tileCount;
+  final int sizeBytes;
+  final DownloadRegion? region;
+
+  const StyleInfo({
+    required this.hash,
+    required this.displayName,
+    required this.urlTemplate,
+    this.tileCount = 0,
+    this.sizeBytes = 0,
+    this.region,
+  });
+
+  Map<String, dynamic> toJson() => {
+        'hash': hash,
+        'displayName': displayName,
+        'urlTemplate': urlTemplate,
+        'tileCount': tileCount,
+        'sizeBytes': sizeBytes,
+        if (region != null) 'region': region!.toJson(),
+      };
+
+  factory StyleInfo.fromJson(Map<String, dynamic> json) => StyleInfo(
+        hash: json['hash'] as String,
+        displayName: json['displayName'] as String? ?? json['hash'] as String,
+        urlTemplate: json['urlTemplate'] as String? ?? '',
+        tileCount: json['tileCount'] as int? ?? 0,
+        sizeBytes: json['sizeBytes'] as int? ?? 0,
+        region: json['region'] != null
+            ? DownloadRegion.fromJson(json['region'] as Map<String, dynamic>)
+            : null,
+      );
+}
+
+/// A tile coordinate in the cache (z/x/y).
+class CachedTileCoord {
+  final int z, x, y;
+  const CachedTileCoord(this.z, this.x, this.y);
+
+  Map<String, int> toJson() => {'z': z, 'x': x, 'y': y};
+
+  factory CachedTileCoord.fromJson(Map<String, dynamic> json) =>
+      CachedTileCoord(
+        json['z'] as int,
+        json['x'] as int,
+        json['y'] as int,
+      );
+}
+
+/// Manages the offline AVIF tile cache on disk.
+///
+/// Tiles are stored as `{baseDir}/offline_tiles/{styleHash}/{z}/{x}/{y}.avif`.
+/// Style metadata is stored as `{baseDir}/offline_tiles/{styleHash}/meta.json`.
+/// This cache is separate from flutter_map's built-in cache and is used for
+/// proactively downloaded tiles and WiFi sharing.
+class OfflineTileCacheService {
+  OfflineTileCacheService._();
+  static final instance = OfflineTileCacheService._();
+
+  String? _baseDir;
+
+  Future<String> get baseDir async {
+    if (_baseDir != null) return _baseDir!;
+    final docs = await getApplicationDocumentsDirectory();
+    _baseDir = '${docs.path}/offline_tiles';
+    return _baseDir!;
+  }
+
+  /// Derive a short deterministic hash from a URL template.
+  String styleHashFromUrl(String urlTemplate) {
+    final bytes = sha256.convert(urlTemplate.codeUnits).bytes;
+    return bytes
+        .take(6)
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join();
+  }
+
+  String _tilePath(String base, String styleHash, int z, int x, int y) {
+    return '$base/$styleHash/$z/$x/$y.avif';
+  }
+
+  String _tileDir(String base, String styleHash, int z, int x) {
+    return '$base/$styleHash/$z/$x';
+  }
+
+  // In-memory manifest cache: styleHash → set of "z/x/y" keys.
+  // Loaded lazily, kept in sync with writes.
+  final Map<String, Set<String>> _manifests = {};
+
+  static String _tileKey(int z, int x, int y) => '$z/$x/$y';
+
+  String _manifestPath(String base, String styleHash) =>
+      '$base/$styleHash/manifest.txt';
+
+  /// Load the manifest for a style into memory (if not already loaded).
+  Future<Set<String>> loadManifest(String styleHash) async {
+    if (_manifests.containsKey(styleHash)) return _manifests[styleHash]!;
+
+    final base = await baseDir;
+    final file = File(_manifestPath(base, styleHash));
+    final Set<String> manifest;
+    if (await file.exists()) {
+      final lines = await file.readAsLines();
+      manifest = lines.where((l) => l.isNotEmpty).toSet();
+    } else {
+      // First time — scan the filesystem and build the manifest
+      manifest = {};
+      final styleDir = Directory('$base/$styleHash');
+      if (await styleDir.exists()) {
+        final avifPattern = RegExp(r'/(\d+)/(\d+)/(\d+)\.avif$');
+        await for (final entity in styleDir.list(recursive: true)) {
+          if (entity is! File) continue;
+          final match = avifPattern.firstMatch(entity.path);
+          if (match != null) {
+            manifest.add('${match.group(1)}/${match.group(2)}/${match.group(3)}');
+          }
+        }
+        // Persist the scanned manifest
+        await _writeManifest(base, styleHash, manifest);
+      }
+    }
+    _manifests[styleHash] = manifest;
+    return manifest;
+  }
+
+  Future<void> _writeManifest(
+      String base, String styleHash, Set<String> manifest) async {
+    final dir = Directory('$base/$styleHash');
+    if (!await dir.exists()) await dir.create(recursive: true);
+    await File(_manifestPath(base, styleHash))
+        .writeAsString(manifest.join('\n'), flush: true);
+  }
+
+  /// Append a tile key to the manifest (both in-memory and on disk).
+  Future<void> _addToManifest(
+      String base, String styleHash, String key) async {
+    _manifests[styleHash] ??= {};
+    if (_manifests[styleHash]!.add(key)) {
+      final file = File(_manifestPath(base, styleHash));
+      await file.writeAsString('$key\n',
+          mode: FileMode.append, flush: true);
+    }
+  }
+
+  /// Check if a tile exists in the cache (uses in-memory manifest).
+  Future<bool> hasTile(String styleHash, int z, int x, int y) async {
+    final manifest = await loadManifest(styleHash);
+    return manifest.contains(_tileKey(z, x, y));
+  }
+
+  /// Read a cached tile's raw AVIF bytes (for serving to peers).
+  Future<Uint8List?> getRawTile(String styleHash, int z, int x, int y) async {
+    final base = await baseDir;
+    final file = File(_tilePath(base, styleHash, z, x, y));
+    if (!await file.exists()) return null;
+    return file.readAsBytes();
+  }
+
+  /// Read a cached tile and decode AVIF → PNG bytes for flutter_map display.
+  Future<Uint8List?> getTileAsPng(
+      String styleHash, int z, int x, int y) async {
+    final avifBytes = await getRawTile(styleHash, z, x, y);
+    if (avifBytes == null) return null;
+    return _avifToPng(avifBytes);
+  }
+
+  /// Store a tile: encode PNG bytes → AVIF, write to disk, update manifest.
+  Future<void> putTile(
+    String styleHash,
+    int z,
+    int x,
+    int y,
+    Uint8List pngBytes,
+  ) async {
+    final base = await baseDir;
+    final dir = Directory(_tileDir(base, styleHash, z, x));
+    if (!await dir.exists()) {
+      await dir.create(recursive: true);
+    }
+
+    final avifBytes = await _pngToAvif(pngBytes);
+    if (avifBytes == null) {
+      await File(_tilePath(base, styleHash, z, x, y))
+          .writeAsBytes(pngBytes, flush: true);
+    } else {
+      await File(_tilePath(base, styleHash, z, x, y))
+          .writeAsBytes(avifBytes, flush: true);
+    }
+
+    await _addToManifest(base, styleHash, _tileKey(z, x, y));
+  }
+
+  /// Store raw AVIF bytes directly (from a peer), update manifest.
+  Future<void> putRawTile(
+    String styleHash,
+    int z,
+    int x,
+    int y,
+    Uint8List avifBytes,
+  ) async {
+    final base = await baseDir;
+    final dir = Directory(_tileDir(base, styleHash, z, x));
+    if (!await dir.exists()) {
+      await dir.create(recursive: true);
+    }
+    await File(_tilePath(base, styleHash, z, x, y))
+        .writeAsBytes(avifBytes, flush: true);
+    await _addToManifest(base, styleHash, _tileKey(z, x, y));
+  }
+
+  /// Get total cache size in bytes.
+  Future<int> getCacheSize() async {
+    final base = await baseDir;
+    final dir = Directory(base);
+    if (!await dir.exists()) return 0;
+
+    var totalSize = 0;
+    await for (final entity in dir.list(recursive: true)) {
+      if (entity is File) {
+        totalSize += await entity.length();
+      }
+    }
+    return totalSize;
+  }
+
+  /// List all style hashes that have cached tiles.
+  Future<List<String>> listStyles() async {
+    final base = await baseDir;
+    final dir = Directory(base);
+    if (!await dir.exists()) return [];
+
+    final styles = <String>[];
+    await for (final entity in dir.list()) {
+      if (entity is Directory) {
+        styles.add(entity.path.split('/').last);
+      }
+    }
+    return styles;
+  }
+
+  /// Save metadata for a style (name, URL template, download region).
+  Future<void> saveStyleMeta(
+    String styleHash, {
+    required String displayName,
+    required String urlTemplate,
+    DownloadRegion? region,
+  }) async {
+    final base = await baseDir;
+    final dir = Directory('$base/$styleHash');
+    if (!await dir.exists()) {
+      await dir.create(recursive: true);
+    }
+
+    // Merge with existing meta to preserve region if not provided
+    final metaFile = File('$base/$styleHash/meta.json');
+    Map<String, dynamic> meta = {
+      'displayName': displayName,
+      'urlTemplate': urlTemplate,
+    };
+    if (region != null) {
+      meta['region'] = region.toJson();
+    } else if (await metaFile.exists()) {
+      try {
+        final existing = jsonDecode(await metaFile.readAsString());
+        if (existing['region'] != null) {
+          meta['region'] = existing['region'];
+        }
+      } catch (_) {}
+    }
+
+    await metaFile.writeAsString(jsonEncode(meta), flush: true);
+  }
+
+  /// Read metadata for a style.
+  Future<StyleInfo?> getStyleMeta(String styleHash) async {
+    final base = await baseDir;
+    final metaFile = File('$base/$styleHash/meta.json');
+    if (!await metaFile.exists()) return null;
+    try {
+      final json = jsonDecode(await metaFile.readAsString());
+      return StyleInfo(
+        hash: styleHash,
+        displayName: json['displayName'] as String? ?? styleHash,
+        urlTemplate: json['urlTemplate'] as String? ?? '',
+        region: json['region'] != null
+            ? DownloadRegion.fromJson(json['region'] as Map<String, dynamic>)
+            : null,
+      );
+    } catch (_) {
+      return null;
+    }
+  }
+
+  /// List all styles with metadata, tile counts, and sizes.
+  Future<List<StyleInfo>> listStylesDetailed() async {
+    final base = await baseDir;
+    final dir = Directory(base);
+    if (!await dir.exists()) return [];
+
+    final results = <StyleInfo>[];
+    await for (final entity in dir.list()) {
+      if (entity is! Directory) continue;
+      final hash = entity.path.split('/').last;
+
+      // Read meta
+      String displayName = hash;
+      String urlTemplate = '';
+      DownloadRegion? region;
+      final metaFile = File('${entity.path}/meta.json');
+      if (await metaFile.exists()) {
+        try {
+          final json = jsonDecode(await metaFile.readAsString());
+          displayName = json['displayName'] as String? ?? hash;
+          urlTemplate = json['urlTemplate'] as String? ?? '';
+          if (json['region'] != null) {
+            region = DownloadRegion.fromJson(
+                json['region'] as Map<String, dynamic>);
+          }
+        } catch (_) {}
+      }
+
+      // Count tiles and size
+      var tileCount = 0;
+      var sizeBytes = 0;
+      await for (final file in entity.list(recursive: true)) {
+        if (file is File && file.path.endsWith('.avif')) {
+          tileCount++;
+          sizeBytes += await file.length();
+        }
+      }
+
+      results.add(StyleInfo(
+        hash: hash,
+        displayName: displayName,
+        urlTemplate: urlTemplate,
+        tileCount: tileCount,
+        sizeBytes: sizeBytes,
+        region: region,
+      ));
+    }
+    return results;
+  }
+
+  /// List all tile coordinates cached for a given style.
+  Future<List<CachedTileCoord>> listTilesForStyle(String styleHash) async {
+    final base = await baseDir;
+    final styleDir = Directory('$base/$styleHash');
+    if (!await styleDir.exists()) return [];
+
+    final tiles = <CachedTileCoord>[];
+    final avifPattern = RegExp(r'/(\d+)/(\d+)/(\d+)\.avif$');
+
+    await for (final entity in styleDir.list(recursive: true)) {
+      if (entity is! File) continue;
+      final match = avifPattern.firstMatch(entity.path);
+      if (match != null) {
+        tiles.add(CachedTileCoord(
+          int.parse(match.group(1)!),
+          int.parse(match.group(2)!),
+          int.parse(match.group(3)!),
+        ));
+      }
+    }
+    return tiles;
+  }
+
+  /// Delete a single style's tiles, manifest, and metadata.
+  Future<void> deleteStyle(String styleHash) async {
+    _manifests.remove(styleHash);
+    final base = await baseDir;
+    final dir = Directory('$base/$styleHash');
+    if (await dir.exists()) {
+      await dir.delete(recursive: true);
+    }
+  }
+
+  /// Delete all cached tiles, manifests, and metadata.
+  Future<void> clearCache() async {
+    _manifests.clear();
+    final base = await baseDir;
+    final dir = Directory(base);
+    if (await dir.exists()) {
+      await dir.delete(recursive: true);
+    }
+  }
+
+  /// Decode AVIF bytes to PNG (static helper for use by caching provider).
+  static Future<Uint8List?> getTileAsPngStatic(Uint8List avifBytes) {
+    return _avifToPng(avifBytes);
+  }
+
+  /// Encode PNG → AVIF for tile storage.
+  /// Uses moderate quality for good compression with acceptable quality.
+  static Future<Uint8List?> _pngToAvif(Uint8List pngBytes) async {
+    try {
+      final avif = await encodeAvif(
+        pngBytes,
+        maxThreads: 2,
+        maxQuantizer: 40, // Good quality (0=lossless, 63=worst)
+        minQuantizer: 25,
+        maxQuantizerAlpha: 63,
+        minQuantizerAlpha: 63,
+        speed: 6,
+        keepExif: false,
+      );
+      if (avif.isEmpty) return null;
+      return avif;
+    } catch (e) {
+      debugPrint('[OfflineTileCache] AVIF encode error: $e');
+      return null;
+    }
+  }
+
+  /// Decode AVIF → PNG bytes for display.
+  static Future<Uint8List?> _avifToPng(Uint8List avifBytes) async {
+    try {
+      // Use Flutter's image codec which can handle AVIF via flutter_avif
+      final codec = await ui.instantiateImageCodec(avifBytes);
+      final frame = await codec.getNextFrame();
+      final image = frame.image;
+      final byteData =
+          await image.toByteData(format: ui.ImageByteFormat.png);
+      image.dispose();
+      return byteData?.buffer.asUint8List();
+    } catch (e) {
+      debugPrint('[OfflineTileCache] AVIF decode error: $e');
+      return null;
+    }
+  }
+}

lib/services/path_history_service.dart

@@ -4,279 +4,145 @@ import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../models/contact.dart';
-import '../models/path_history.dart';
 import '../models/path_selection.dart';
-import '../utils/log_rx_route_decoder.dart';
+
+class _ManualPathSelectionRecord {
+  final List<int> pathBytes;
+  final int hopCount;
+  final int hashSize;
+
+  const _ManualPathSelectionRecord({
+    required this.pathBytes,
+    required this.hopCount,
+    required this.hashSize,
+  });
+
+  factory _ManualPathSelectionRecord.fromJson(Map<String, dynamic> json) {
+    final pathBytes = (json['pathBytes'] as List<dynamic>? ?? const <dynamic>[])
+        .whereType<int>()
+        .toList();
+    return _ManualPathSelectionRecord(
+      pathBytes: pathBytes,
+      hopCount: json['hopCount'] as int? ?? 0,
+      hashSize: json['hashSize'] as int? ?? 1,
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    'pathBytes': pathBytes,
+    'hopCount': hopCount,
+    'hashSize': hashSize,
+  };
+
+  PathSelection toSelection() => PathSelection(
+    mode: PathSelectionMode.directCurrent,
+    pathBytes: Uint8List.fromList(pathBytes),
+    hopCount: hopCount,
+    hashSize: hashSize,
+  );
+}
 
 class PathHistoryService {
-  static const String _storageKey = 'contact_path_history_v1';
-  static const int _maxDirectPaths = 20;
-  static const int _topRotationCount = 3;
+  static const String _legacyStorageKey = 'contact_path_history_v2';
+  static const String _manualRouteStorageKey =
+      'contact_manual_path_overrides_v1';
 
-  final Map<String, ContactPathHistory> _cache = {};
+  final Map<String, _ManualPathSelectionRecord> _manualSelections = {};
   bool _isLoaded = false;
 
   Future<void> initialize() async {
     if (_isLoaded) return;
     final prefs = await SharedPreferences.getInstance();
-    final raw = prefs.getString(_storageKey);
-    if (raw == null || raw.isEmpty) {
-      _isLoaded = true;
-      return;
-    }
+    await prefs.remove(_legacyStorageKey);
 
+    final manualRaw = prefs.getString(_manualRouteStorageKey);
     try {
-      final decoded = jsonDecode(raw);
-      if (decoded is Map<String, dynamic>) {
-        for (final entry in decoded.entries) {
-          final value = entry.value;
-          if (value is Map<String, dynamic>) {
-            _cache[entry.key] = ContactPathHistory.fromJson(entry.key, value);
+      if (manualRaw != null && manualRaw.isNotEmpty) {
+        final decoded = jsonDecode(manualRaw);
+        if (decoded is Map<String, dynamic>) {
+          for (final entry in decoded.entries) {
+            final value = entry.value;
+            if (value is Map<String, dynamic>) {
+              _manualSelections[entry.key] =
+                  _ManualPathSelectionRecord.fromJson(value);
+            }
           }
         }
       }
     } catch (error) {
-      debugPrint('⚠️ [PathHistoryService] Failed to load history: $error');
+      debugPrint(
+        '⚠️ [PathHistoryService] Failed to load manual routes: $error',
+      );
     }
+
     _isLoaded = true;
   }
 
-  Future<void> recordLearnedPath(Contact contact) async {
+  Future<PathSelection> getSelectionForContact(Contact contact) async {
     await initialize();
-    if (!contact.routeHasPath || contact.routeHopCount <= 0) {
-      return;
+    final manualSelection = _manualSelections[contact.publicKeyHex];
+    if (manualSelection != null) {
+      return manualSelection.toSelection();
     }
 
-    final history = _historyFor(contact.publicKeyHex);
-    final signature = _signature(contact.routePathBytes);
-    final existing = _findDirectPath(history.directPaths, signature);
-    final updated = PathRecord(
-      pathBytes: contact.routePathBytes.toList(),
-      hopCount: contact.routeHopCount,
-      hashSize: contact.routeHashSize,
-      source: existing?.source ?? PathRecordSource.learned,
-      successCount: existing?.successCount ?? 0,
-      failureCount: existing?.failureCount ?? 0,
-      lastRoundTripTimeMs: existing?.lastRoundTripTimeMs ?? 0,
-      lastUsedAt: DateTime.now(),
-    );
+    final route = ContactRouteCodec.fromContact(contact);
+    if (route == null) {
+      return PathSelection.flood();
+    }
 
-    await _saveHistory(
+    return PathSelection(
+      mode: PathSelectionMode.directCurrent,
+      pathBytes: Uint8List.fromList(route.pathBytes),
+      hopCount: route.hopCount,
+      hashSize: route.hashSize,
+    );
+  }
+
+  Future<void> setManualRouteForContact(
+    Contact contact,
+    ParsedContactRoute route,
+  ) async {
+    await setManualSelectionFor(
       contact.publicKeyHex,
-      history.copyWith(
-        directPaths: _upsertDirectPath(history.directPaths, updated),
+      PathSelection(
+        mode: PathSelectionMode.directCurrent,
+        pathBytes: Uint8List.fromList(route.pathBytes),
+        hopCount: route.hopCount,
+        hashSize: route.hashSize,
       ),
     );
   }
 
-  Future<void> recordReceivedBytePath(
+  Future<void> setManualSelectionFor(
     String contactPublicKeyHex,
-    List<int> pathBytes,
-    int hashSize,
+    PathSelection selection,
   ) async {
     await initialize();
-    if (pathBytes.isEmpty) {
-      return;
-    }
-    if (hashSize < 1 || hashSize > 3) {
-      return;
-    }
-    if (pathBytes.length % hashSize != 0) {
-      return;
-    }
-
-    final normalizedPathBytes = LogRxRouteDecoder.reverseHopBytes(
-      pathBytes,
-      hashSize: hashSize,
-    );
-
-    final history = _historyFor(contactPublicKeyHex);
-    final signature = normalizedPathBytes
-        .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
-        .join();
-    final existing = _findDirectPath(history.directPaths, signature);
-    final updated = PathRecord(
-      pathBytes: normalizedPathBytes,
-      hopCount: normalizedPathBytes.length ~/ hashSize,
-      hashSize: hashSize,
-      source: PathRecordSource.observed,
-      successCount: existing?.successCount ?? 0,
-      failureCount: existing?.failureCount ?? 0,
-      lastRoundTripTimeMs: existing?.lastRoundTripTimeMs ?? 0,
-      lastUsedAt: DateTime.now(),
-    );
-
-    await _saveHistory(
-      contactPublicKeyHex,
-      history.copyWith(
-        directPaths: _upsertDirectPath(history.directPaths, updated),
-      ),
-    );
-  }
-
-  Future<PathSelection> getSelectionForContact(
-    Contact contact, {
-    required bool autoRouteRotationEnabled,
-  }) async {
-    await initialize();
-    await recordLearnedPath(contact);
-
-    if (contact.routeHasPath && contact.routeHopCount > 0) {
-      return PathSelection(
-        mode: PathSelectionMode.directCurrent,
-        pathBytes: Uint8List.fromList(contact.routePathBytes),
-        hopCount: contact.routeHopCount,
-        hashSize: contact.routeHashSize,
-      );
-    }
-
-    if (!autoRouteRotationEnabled) {
-      return PathSelection.flood();
-    }
-
-    final history = _historyFor(contact.publicKeyHex);
-    final ranked = List<PathRecord>.from(history.directPaths)
-      ..sort(_comparePathRecords);
-    final topPaths = ranked.take(_topRotationCount).toList();
-    if (topPaths.isEmpty) {
-      final nextFloodHistory = history.copyWith(
-        rotationIndex: history.rotationIndex + 1,
-      );
-      await _saveHistory(contact.publicKeyHex, nextFloodHistory);
-      return PathSelection.flood();
-    }
-
-    final selections =
-        topPaths
-            .map(
-              (record) => PathSelection(
-                mode: PathSelectionMode.directHistorical,
-                pathBytes: Uint8List.fromList(record.pathBytes),
-                hopCount: record.hopCount,
-                hashSize: record.hashSize,
-              ),
-            )
-            .toList()
-          ..add(PathSelection.flood());
-
-    final index = history.rotationIndex % selections.length;
-    final updatedHistory = history.copyWith(
-      rotationIndex: history.rotationIndex + 1,
-    );
-    await _saveHistory(contact.publicKeyHex, updatedHistory);
-    return selections[index];
-  }
-
-  Future<void> recordPathResult(
-    String contactPublicKeyHex,
-    PathSelection selection, {
-    required bool success,
-    int? roundTripTimeMs,
-  }) async {
-    await initialize();
-    final history = _historyFor(contactPublicKeyHex);
-    if (selection.usesFlood) {
-      final current = history.floodStats;
-      await _saveHistory(
-        contactPublicKeyHex,
-        history.copyWith(
-          floodStats: current.copyWith(
-            successCount: current.successCount + (success ? 1 : 0),
-            failureCount: current.failureCount + (success ? 0 : 1),
-            lastRoundTripTimeMs: success
-                ? (roundTripTimeMs ?? current.lastRoundTripTimeMs)
-                : current.lastRoundTripTimeMs,
-            lastUsedAt: DateTime.now(),
-          ),
-        ),
-      );
-      return;
-    }
-
-    final signature = _signature(selection.pathBytes);
-    final existing = _findDirectPath(history.directPaths, signature);
-    final updated = PathRecord(
+    _manualSelections[contactPublicKeyHex] = _ManualPathSelectionRecord(
       pathBytes: selection.pathBytes.toList(),
       hopCount: selection.hopCount,
       hashSize: selection.hashSize,
-      source: existing?.source ?? PathRecordSource.learned,
-      successCount: (existing?.successCount ?? 0) + (success ? 1 : 0),
-      failureCount: (existing?.failureCount ?? 0) + (success ? 0 : 1),
-      lastRoundTripTimeMs: success
-          ? (roundTripTimeMs ?? existing?.lastRoundTripTimeMs ?? 0)
-          : (existing?.lastRoundTripTimeMs ?? 0),
-      lastUsedAt: DateTime.now(),
-    );
-    await _saveHistory(
-      contactPublicKeyHex,
-      history.copyWith(
-        directPaths: _upsertDirectPath(history.directPaths, updated),
-      ),
     );
+    await _persistManualSelections();
   }
 
-  ContactPathHistory historyFor(String contactPublicKeyHex) {
-    return _cache[contactPublicKeyHex] ??
-        ContactPathHistory.empty(contactPublicKeyHex);
+  Future<PathSelection?> getManualSelectionForContact(Contact contact) async {
+    await initialize();
+    return _manualSelections[contact.publicKeyHex]?.toSelection();
   }
 
-  ContactPathHistory _historyFor(String contactPublicKeyHex) {
-    return _cache.putIfAbsent(
-      contactPublicKeyHex,
-      () => ContactPathHistory.empty(contactPublicKeyHex),
-    );
+  Future<void> clearManualRouteFor(String contactPublicKeyHex) async {
+    await initialize();
+    _manualSelections.remove(contactPublicKeyHex);
+    await _persistManualSelections();
   }
 
-  Future<void> _saveHistory(
-    String contactPublicKeyHex,
-    ContactPathHistory history,
-  ) async {
-    _cache[contactPublicKeyHex] = history;
+  Future<void> _persistManualSelections() async {
     final prefs = await SharedPreferences.getInstance();
-    final payload = <String, dynamic>{};
-    for (final entry in _cache.entries) {
-      payload[entry.key] = entry.value.toJson();
+    final manualPayload = <String, dynamic>{};
+    for (final entry in _manualSelections.entries) {
+      manualPayload[entry.key] = entry.value.toJson();
     }
-    await prefs.setString(_storageKey, jsonEncode(payload));
+    await prefs.setString(_manualRouteStorageKey, jsonEncode(manualPayload));
   }
-
-  List<PathRecord> _upsertDirectPath(
-    List<PathRecord> existing,
-    PathRecord updatedRecord,
-  ) {
-    final updated = List<PathRecord>.from(existing)
-      ..removeWhere((record) => record.signature == updatedRecord.signature)
-      ..insert(0, updatedRecord);
-    if (updated.length > _maxDirectPaths) {
-      return updated.take(_maxDirectPaths).toList();
-    }
-    return updated;
-  }
-
-  int _comparePathRecords(PathRecord a, PathRecord b) {
-    final successRateCompare = b.successRate.compareTo(a.successRate);
-    if (successRateCompare != 0) return successRateCompare;
-
-    final successCountCompare = b.successCount.compareTo(a.successCount);
-    if (successCountCompare != 0) return successCountCompare;
-
-    final aRtt = a.lastRoundTripTimeMs == 0 ? 1 << 30 : a.lastRoundTripTimeMs;
-    final bRtt = b.lastRoundTripTimeMs == 0 ? 1 << 30 : b.lastRoundTripTimeMs;
-    final rttCompare = aRtt.compareTo(bRtt);
-    if (rttCompare != 0) return rttCompare;
-
-    return b.lastUsedAt.compareTo(a.lastUsedAt);
-  }
-
-  PathRecord? _findDirectPath(List<PathRecord> records, String signature) {
-    for (final record in records) {
-      if (record.signature == signature) {
-        return record;
-      }
-    }
-    return null;
-  }
-
-  String _signature(Uint8List bytes) =>
-      bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
 }

lib/services/profile_workspace_coordinator.dart

@@ -14,6 +14,8 @@ import '../providers/drawing_provider.dart';
 import '../providers/map_provider.dart';
 import '../providers/messages_provider.dart';
 import '../providers/sensors_provider.dart';
+import '../providers/voice_provider.dart';
+import '../providers/image_provider.dart' as ip;
 import 'app_config_snapshot_service.dart';
 import 'contact_storage_service.dart';
 import 'device_config_applicator.dart';
@@ -33,6 +35,8 @@ class ProfileWorkspaceCoordinator {
     required this.mapProvider,
     required this.drawingProvider,
     required this.channelsProvider,
+    required this.voiceProvider,
+    required this.imageProvider,
     required this.appProvider,
     AppConfigSnapshotService? appConfigSnapshotService,
     MapWorkspaceSnapshotService? mapWorkspaceSnapshotService,
@@ -58,13 +62,15 @@ class ProfileWorkspaceCoordinator {
   final MapProvider mapProvider;
   final DrawingProvider drawingProvider;
   final ChannelsProvider channelsProvider;
+  final VoiceProvider voiceProvider;
+  final ip.ImageProvider imageProvider;
   final AppProvider appProvider;
   final AppConfigSnapshotService _appConfigSnapshotService;
   final MapWorkspaceSnapshotService _mapWorkspaceSnapshotService;
   final DeviceConfigApplicator _deviceConfigApplicator;
   final MessageStorageService _messageStorageService;
   final ContactStorageService _contactStorageService;
-  bool _isSyncingDeviceProfile = false;
+  Future<void>? _deviceProfileSyncFuture;
 
   Future<void> setProfilesEnabled(bool enabled) async {
     final wasEnabled = profileManager.profilesEnabled;
@@ -279,41 +285,54 @@ class ProfileWorkspaceCoordinator {
   }
 
   Future<void> syncActiveProfileForCurrentDevice() async {
-    if (!profileManager.profilesEnabled || _isSyncingDeviceProfile) {
+    if (!profileManager.profilesEnabled) {
       return;
     }
+    final inFlightSync = _deviceProfileSyncFuture;
+    if (inFlightSync != null) {
+      await inFlightSync;
+      return;
+    }
+
+    final syncFuture = _syncActiveProfileForCurrentDeviceInternal();
+    _deviceProfileSyncFuture = syncFuture;
+    try {
+      await syncFuture;
+    } finally {
+      if (identical(_deviceProfileSyncFuture, syncFuture)) {
+        _deviceProfileSyncFuture = null;
+      }
+    }
+  }
+
+  Future<void> _syncActiveProfileForCurrentDeviceInternal() async {
     final deviceKey = _currentDeviceProfileKey;
     if (deviceKey == null) {
       return;
     }
 
-    _isSyncingDeviceProfile = true;
-    try {
-      final profile = await _ensureProfileForCurrentDevice();
-      final targetProfileId = profile.id;
-      if (targetProfileId == profileManager.activeProfileId) {
-        return;
-      }
-
-      await _persistCurrentState();
-      await profileManager.setActiveProfileIdForDevice(
-        targetProfileId,
-        deviceKey: deviceKey,
-      );
-      await _switchRuntimeScope(targetProfileId);
-
-      await _appConfigSnapshotService.apply(
-        profile.sections.appSettings,
-        appProvider,
-      );
-      await _mapWorkspaceSnapshotService.apply(
-        profile.sections.mapWorkspace,
-        mapProvider: mapProvider,
-        drawingProvider: drawingProvider,
-      );
-    } finally {
-      _isSyncingDeviceProfile = false;
+    final profile = await _ensureProfileForCurrentDevice();
+    final targetProfileId = profile.id;
+    if (targetProfileId == profileManager.activeProfileId) {
+      return;
     }
+
+    await _persistCurrentState();
+    await profileManager.setActiveProfileIdForDevice(
+      targetProfileId,
+      deviceKey: deviceKey,
+    );
+    await _switchRuntimeScope(targetProfileId);
+
+    await _appConfigSnapshotService.apply(
+      profile.sections.appSettings,
+      appProvider,
+    );
+    await _mapWorkspaceSnapshotService.apply(
+      profile.sections.mapWorkspace,
+      mapProvider: mapProvider,
+      drawingProvider: drawingProvider,
+    );
   }
 
   Future<ConfigProfile> _ensureProfileForCurrentDevice() async {
@@ -387,6 +406,8 @@ class ProfileWorkspaceCoordinator {
     await sensorsProvider.reloadProfileScopedState();
     await drawingProvider.reloadProfileScopedState();
     await mapProvider.reloadProfileScopedState();
+    await voiceProvider.reloadProfileScopedState();
+    await imageProvider.reloadProfileScopedState();
     await appProvider.reloadProfileScopedSettings();
   }
 

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

@@ -0,0 +1,332 @@
+import 'dart:async';
+
+import 'package:http/http.dart' as http;
+import 'package:latlong2/latlong.dart';
+
+import 'offline_tile_cache_service.dart';
+import 'tile_math_service.dart';
+
+/// Events emitted during tile download.
+sealed class TileDownloadEvent {}
+
+class TileDownloadStarted extends TileDownloadEvent {
+  final int totalTiles;
+  TileDownloadStarted(this.totalTiles);
+}
+
+class TileDownloaded extends TileDownloadEvent {
+  final double north, south, east, west;
+  TileDownloaded({
+    required this.north,
+    required this.south,
+    required this.east,
+    required this.west,
+  });
+}
+
+class TileSkipped extends TileDownloadEvent {
+  final double north, south, east, west;
+  TileSkipped({
+    required this.north,
+    required this.south,
+    required this.east,
+    required this.west,
+  });
+}
+
+class TileFailed extends TileDownloadEvent {
+  final TileCoord coord;
+  final String error;
+  TileFailed(this.coord, this.error);
+}
+
+class TileDownloadComplete extends TileDownloadEvent {
+  final int downloaded;
+  final int skipped;
+  final int failed;
+  final int total;
+  TileDownloadComplete({
+    required this.downloaded,
+    required this.skipped,
+    required this.failed,
+    required this.total,
+  });
+}
+
+class TileBatchSkipped extends TileDownloadEvent {
+  final int count;
+  final int total;
+  TileBatchSkipped({required this.count, required this.total});
+}
+
+class TileDownloadCancelled extends TileDownloadEvent {}
+
+/// Downloads map tiles for given polygons and zoom levels.
+class TileDownloadService {
+  final OfflineTileCacheService _cache = OfflineTileCacheService.instance;
+  final http.Client _httpClient = http.Client();
+
+  bool _cancelled = false;
+
+  /// Cancel an ongoing download.
+  void cancel() {
+    _cancelled = true;
+  }
+
+  /// Download tiles for the given polygons and zoom range.
+  ///
+  /// Returns a stream of [TileDownloadEvent]s.
+  /// [urlTemplate] should contain `{z}`, `{x}`, `{y}` placeholders,
+  /// and optionally `{s}` for subdomains.
+  Stream<TileDownloadEvent> downloadTiles({
+    required List<List<LatLng>> polygons,
+    required int minZoom,
+    required int maxZoom,
+    required String urlTemplate,
+    String? displayName,
+    int maxConcurrency = 6,
+    int rateLimit = 30,
+  }) {
+    final controller = StreamController<TileDownloadEvent>();
+
+    _runDownload(
+      controller: controller,
+      polygons: polygons,
+      minZoom: minZoom,
+      maxZoom: maxZoom,
+      urlTemplate: urlTemplate,
+      displayName: displayName,
+      maxConcurrency: maxConcurrency,
+      rateLimit: rateLimit,
+    );
+
+    return controller.stream;
+  }
+
+  Future<void> _runDownload({
+    required StreamController<TileDownloadEvent> controller,
+    required List<List<LatLng>> polygons,
+    required int minZoom,
+    required int maxZoom,
+    required String urlTemplate,
+    String? displayName,
+    required int maxConcurrency,
+    required int rateLimit,
+  }) async {
+    _cancelled = false;
+
+    final styleHash = _cache.styleHashFromUrl(urlTemplate);
+
+    // Save style metadata with download region so it can be reused
+    final region = DownloadRegion(
+      polygons: polygons
+          .map((poly) =>
+              poly.map((p) => [p.latitude, p.longitude]).toList())
+          .toList(),
+      minZoom: minZoom,
+      maxZoom: maxZoom,
+    );
+    await _cache.saveStyleMeta(
+      styleHash,
+      displayName: displayName ?? urlTemplate,
+      urlTemplate: urlTemplate,
+      region: region,
+    );
+
+    final allTiles =
+        TileMathService.getTilesForPolygons(polygons, minZoom, maxZoom);
+
+    // Load manifest once and partition tiles into needed vs already cached
+    final manifest = await _cache.loadManifest(styleHash);
+    final tilesToDownload = <TileCoord>[];
+    var skipped = 0;
+
+    for (final tile in allTiles) {
+      final key = '${tile.z}/${tile.x}/${tile.y}';
+      if (manifest.contains(key)) {
+        skipped++;
+      } else {
+        tilesToDownload.add(tile);
+      }
+    }
+
+    final total = allTiles.length;
+    controller.add(TileDownloadStarted(total));
+
+    // Report all skipped tiles immediately (no per-tile filesystem check)
+    if (skipped > 0) {
+      controller.add(TileBatchSkipped(count: skipped, total: total));
+    }
+
+    if (tilesToDownload.isEmpty) {
+      controller.add(TileDownloadComplete(
+          downloaded: 0, skipped: skipped, failed: 0, total: total));
+      await controller.close();
+      return;
+    }
+
+    var downloaded = 0;
+    var failed = 0;
+
+    final semaphore = _Semaphore(maxConcurrency);
+    final rateLimiter = _RateLimiter(rateLimit);
+    final futures = <Future<void>>[];
+
+    for (final tile in tilesToDownload) {
+      if (_cancelled) break;
+
+      await rateLimiter.wait();
+      if (_cancelled) break;
+
+      await semaphore.acquire();
+      if (_cancelled) {
+        semaphore.release();
+        break;
+      }
+
+      final future = _downloadSingleTile(tile, urlTemplate, styleHash)
+          .then((event) {
+        if (!controller.isClosed) {
+          controller.add(event);
+          if (event is TileDownloaded) {
+            downloaded++;
+          } else if (event is TileFailed) {
+            failed++;
+          }
+        }
+        semaphore.release();
+      });
+      futures.add(future);
+    }
+
+    // Wait for all in-flight downloads to finish
+    await Future.wait(futures);
+
+    if (_cancelled) {
+      controller.add(TileDownloadCancelled());
+    } else {
+      controller.add(TileDownloadComplete(
+        downloaded: downloaded,
+        skipped: skipped,
+        failed: failed,
+        total: total,
+      ));
+    }
+
+    await controller.close();
+  }
+
+  Future<TileDownloadEvent> _downloadSingleTile(
+    TileCoord tile,
+    String urlTemplate,
+    String styleHash,
+  ) async {
+    final bounds = TileMathService.tileBounds(tile.x, tile.y, tile.z);
+
+    // Build URL
+    final subdomains = ['a', 'b', 'c'];
+    var url = urlTemplate
+        .replaceAll('{s}', subdomains[tile.x % 3])
+        .replaceAll('{z}', '${tile.z}')
+        .replaceAll('{x}', '${tile.x}')
+        .replaceAll('{y}', '${tile.y}');
+
+    // Download with retries
+    const maxRetries = 3;
+    for (var attempt = 0; attempt < maxRetries; attempt++) {
+      if (_cancelled) {
+        return TileFailed(tile, 'Cancelled');
+      }
+
+      try {
+        final response = await _httpClient.get(
+          Uri.parse(url),
+          headers: {'User-Agent': 'MeshCoreSAR/1.0'},
+        );
+
+        if (response.statusCode != 200) {
+          if (attempt < maxRetries - 1) {
+            await Future.delayed(Duration(seconds: 1 << attempt));
+            continue;
+          }
+          return TileFailed(tile, 'HTTP ${response.statusCode}');
+        }
+
+        // Store tile (PNG → AVIF conversion happens inside cache service)
+        await _cache.putTile(
+            styleHash, tile.z, tile.x, tile.y, response.bodyBytes);
+
+        return TileDownloaded(
+          north: bounds.north,
+          south: bounds.south,
+          east: bounds.east,
+          west: bounds.west,
+        );
+      } catch (e) {
+        if (attempt < maxRetries - 1) {
+          await Future.delayed(Duration(seconds: 1 << attempt));
+          continue;
+        }
+        return TileFailed(tile, e.toString());
+      }
+    }
+
+    return TileFailed(tile, 'Max retries exceeded');
+  }
+
+  void dispose() {
+    _cancelled = true;
+    _httpClient.close();
+  }
+}
+
+/// Simple counting semaphore for concurrency limiting.
+class _Semaphore {
+  final int maxCount;
+  int _currentCount = 0;
+  final _waitQueue = <Completer<void>>[];
+
+  _Semaphore(this.maxCount);
+
+  Future<void> acquire() async {
+    if (_currentCount < maxCount) {
+      _currentCount++;
+      return;
+    }
+    final completer = Completer<void>();
+    _waitQueue.add(completer);
+    await completer.future;
+  }
+
+  void release() {
+    if (_waitQueue.isNotEmpty) {
+      _waitQueue.removeAt(0).complete();
+    } else {
+      _currentCount--;
+    }
+  }
+}
+
+/// Rate limiter that ensures no more than [maxPerSecond] operations per second.
+class _RateLimiter {
+  final int maxPerSecond;
+  final _timestamps = <DateTime>[];
+
+  _RateLimiter(this.maxPerSecond);
+
+  Future<void> wait() async {
+    final now = DateTime.now();
+    _timestamps
+        .removeWhere((t) => now.difference(t) > const Duration(seconds: 1));
+
+    if (_timestamps.length >= maxPerSecond) {
+      final oldest = _timestamps.first;
+      final waitTime = const Duration(seconds: 1) - now.difference(oldest);
+      if (waitTime > Duration.zero) {
+        await Future.delayed(waitTime);
+      }
+      _timestamps.removeAt(0);
+    }
+    _timestamps.add(DateTime.now());
+  }
+}

lib/services/tile_math_service.dart

@@ -0,0 +1,268 @@
+import 'dart:math';
+
+import 'package:latlong2/latlong.dart';
+
+/// A tile coordinate with x, y, and zoom level.
+class TileCoord {
+  final int x;
+  final int y;
+  final int z;
+
+  const TileCoord(this.x, this.y, this.z);
+
+  @override
+  bool operator ==(Object other) =>
+      other is TileCoord && other.x == x && other.y == y && other.z == z;
+
+  @override
+  int get hashCode => Object.hash(x, y, z);
+
+  @override
+  String toString() => 'TileCoord($z/$x/$y)';
+}
+
+/// A geographical bounding box.
+class TileBounds {
+  final double north;
+  final double south;
+  final double east;
+  final double west;
+
+  const TileBounds({
+    required this.north,
+    required this.south,
+    required this.east,
+    required this.west,
+  });
+}
+
+/// Pure math utilities for slippy map tile calculations.
+///
+/// Ported from the Go offline-map-tile-downloader.
+class TileMathService {
+  const TileMathService._();
+
+  /// Convert latitude/longitude to tile coordinates at the given zoom level.
+  static (int x, int y) latLonToTile(double lat, double lon, int zoom) {
+    final latRad = lat * pi / 180;
+    final n = pow(2, zoom).toDouble();
+    final x = (n * ((lon + 180) / 360)).floor();
+    final y =
+        (n * (1 - (log(tan(latRad) + 1 / cos(latRad)) / pi)) / 2).floor();
+    return (x, y);
+  }
+
+  /// Calculate the geographical bounding box of a tile.
+  static TileBounds tileBounds(int x, int y, int z) {
+    final n = pow(2.0, z).toDouble();
+    final lonDeg = x / n * 360.0 - 180.0;
+    final latRad = atan(sinh(pi * (1 - 2 * y / n)));
+    final latDeg = latRad * 180.0 / pi;
+
+    final lon2Deg = (x + 1) / n * 360.0 - 180.0;
+    final lat2Rad = atan(sinh(pi * (1 - 2 * (y + 1) / n)));
+    final lat2Deg = lat2Rad * 180.0 / pi;
+
+    return TileBounds(
+      north: latDeg,
+      south: lat2Deg,
+      east: lon2Deg,
+      west: lonDeg,
+    );
+  }
+
+  /// Hyperbolic sine.
+  static double sinh(double x) => (exp(x) - exp(-x)) / 2;
+
+  /// Check if a point is inside a polygon using the ray casting algorithm.
+  static bool polygonContains(List<LatLng> poly, LatLng point) {
+    var inside = false;
+    for (int i = 0, j = poly.length - 1; i < poly.length; j = i++) {
+      if ((poly[i].latitude > point.latitude) !=
+              (poly[j].latitude > point.latitude) &&
+          (point.longitude <
+              (poly[j].longitude - poly[i].longitude) *
+                      (point.latitude - poly[i].latitude) /
+                      (poly[j].latitude - poly[i].latitude) +
+                  poly[i].longitude)) {
+        inside = !inside;
+      }
+    }
+    return inside;
+  }
+
+  /// Check if a bounding box contains a point.
+  static bool boundsContains(TileBounds bounds, LatLng point) {
+    return point.latitude <= bounds.north &&
+        point.latitude >= bounds.south &&
+        point.longitude >= bounds.west &&
+        point.longitude <= bounds.east;
+  }
+
+  /// Check if a polygon intersects with a tile bounding box.
+  static bool polygonIntersects(List<LatLng> poly, TileBounds bounds) {
+    // Check if any polygon vertex is inside the tile
+    for (final p in poly) {
+      if (boundsContains(bounds, p)) return true;
+    }
+
+    // Check if any tile corner is inside the polygon
+    final corners = [
+      LatLng(bounds.north, bounds.west),
+      LatLng(bounds.north, bounds.east),
+      LatLng(bounds.south, bounds.west),
+      LatLng(bounds.south, bounds.east),
+    ];
+    for (final corner in corners) {
+      if (polygonContains(poly, corner)) return true;
+    }
+
+    // Check if any polygon edge intersects any tile edge
+    final tileEdges = [
+      (corners[0], corners[1]),
+      (corners[1], corners[3]),
+      (corners[3], corners[2]),
+      (corners[2], corners[0]),
+    ];
+    for (int i = 0; i < poly.length; i++) {
+      final p1 = poly[i];
+      final p2 = poly[(i + 1) % poly.length];
+      for (final edge in tileEdges) {
+        if (_lineIntersects(p1, p2, edge.$1, edge.$2)) return true;
+      }
+    }
+
+    return false;
+  }
+
+  /// Check if two line segments intersect.
+  static bool _lineIntersects(LatLng p1, LatLng q1, LatLng p2, LatLng q2) {
+    final o1 = _orientation(p1, q1, p2);
+    final o2 = _orientation(p1, q1, q2);
+    final o3 = _orientation(p2, q2, p1);
+    final o4 = _orientation(p2, q2, q1);
+
+    if (o1 != o2 && o3 != o4) return true;
+
+    if (o1 == 0 && _onSegment(p1, p2, q1)) return true;
+    if (o2 == 0 && _onSegment(p1, q2, q1)) return true;
+    if (o3 == 0 && _onSegment(p2, p1, q2)) return true;
+    if (o4 == 0 && _onSegment(p2, q1, q2)) return true;
+
+    return false;
+  }
+
+  /// Find orientation of ordered triplet (p, q, r).
+  /// Returns 0 for collinear, 1 for clockwise, 2 for counterclockwise.
+  static int _orientation(LatLng p, LatLng q, LatLng r) {
+    final val = (q.longitude - p.longitude) * (r.latitude - q.latitude) -
+        (q.latitude - p.latitude) * (r.longitude - q.longitude);
+    if (val == 0) return 0;
+    return val > 0 ? 1 : 2;
+  }
+
+  /// Check if point q lies on segment pr.
+  static bool _onSegment(LatLng p, LatLng q, LatLng r) {
+    return q.latitude <= max(p.latitude, r.latitude) &&
+        q.latitude >= min(p.latitude, r.latitude) &&
+        q.longitude <= max(p.longitude, r.longitude) &&
+        q.longitude >= min(p.longitude, r.longitude);
+  }
+
+  /// Get all tiles that overlap with the given polygons across zoom levels.
+  static List<TileCoord> getTilesForPolygons(
+    List<List<LatLng>> polygons,
+    int minZoom,
+    int maxZoom,
+  ) {
+    final tileSet = <TileCoord>{};
+
+    for (final poly in polygons) {
+      if (poly.length < 3) continue;
+
+      // Find bounding box of polygon
+      var minLat = 90.0, minLon = 180.0;
+      var maxLat = -90.0, maxLon = -180.0;
+      for (final p in poly) {
+        if (p.latitude < minLat) minLat = p.latitude;
+        if (p.latitude > maxLat) maxLat = p.latitude;
+        if (p.longitude < minLon) minLon = p.longitude;
+        if (p.longitude > maxLon) maxLon = p.longitude;
+      }
+
+      for (int z = minZoom; z <= maxZoom; z++) {
+        final (tlx, tly) = latLonToTile(maxLat, minLon, z);
+        final (brx, bry) = latLonToTile(minLat, maxLon, z);
+
+        for (int x = tlx; x <= brx; x++) {
+          for (int y = tly; y <= bry; y++) {
+            final tile = TileCoord(x, y, z);
+            if (tileSet.contains(tile)) continue;
+
+            final bounds = tileBounds(x, y, z);
+
+            // Check if all tile corners are inside the polygon
+            final allCornersInside = polygonContains(
+                    poly, LatLng(bounds.north, bounds.west)) &&
+                polygonContains(poly, LatLng(bounds.north, bounds.east)) &&
+                polygonContains(poly, LatLng(bounds.south, bounds.west)) &&
+                polygonContains(poly, LatLng(bounds.south, bounds.east));
+            if (allCornersInside) {
+              tileSet.add(tile);
+              continue;
+            }
+
+            // Check if all polygon vertices are inside the tile
+            var polyInTile = true;
+            for (final p in poly) {
+              if (!boundsContains(bounds, p)) {
+                polyInTile = false;
+                break;
+              }
+            }
+            if (polyInTile) {
+              tileSet.add(tile);
+              continue;
+            }
+
+            // Check for intersection
+            if (polygonIntersects(poly, bounds)) {
+              tileSet.add(tile);
+            }
+          }
+        }
+      }
+    }
+
+    return tileSet.toList();
+  }
+
+  /// Estimate the number of tiles for given polygons and zoom range.
+  /// Faster than getTilesForPolygons — uses bounding box approximation.
+  static int estimateTileCount(
+    List<List<LatLng>> polygons,
+    int minZoom,
+    int maxZoom,
+  ) {
+    var count = 0;
+    for (final poly in polygons) {
+      if (poly.length < 3) continue;
+
+      var minLat = 90.0, minLon = 180.0;
+      var maxLat = -90.0, maxLon = -180.0;
+      for (final p in poly) {
+        if (p.latitude < minLat) minLat = p.latitude;
+        if (p.latitude > maxLat) maxLat = p.latitude;
+        if (p.longitude < minLon) minLon = p.longitude;
+        if (p.longitude > maxLon) maxLon = p.longitude;
+      }
+
+      for (int z = minZoom; z <= maxZoom; z++) {
+        final (tlx, tly) = latLonToTile(maxLat, minLon, z);
+        final (brx, bry) = latLonToTile(minLat, maxLon, z);
+        count += (brx - tlx + 1) * (bry - tly + 1);
+      }
+    }
+    return count;
+  }
+}

lib/services/tile_sharing_service.dart

@@ -0,0 +1,518 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+import 'package:http/http.dart' as http;
+import 'package:nsd/nsd.dart' as nsd;
+
+import 'offline_tile_cache_service.dart';
+
+/// A discovered tile-serving peer on the local network.
+class TilePeer {
+  final String ipAddress;
+  final int port;
+
+  const TilePeer({required this.ipAddress, required this.port});
+
+  String get baseUrl => 'http://$ipAddress:$port';
+
+  @override
+  bool operator ==(Object other) =>
+      other is TilePeer && other.ipAddress == ipAddress && other.port == port;
+
+  @override
+  int get hashCode => Object.hash(ipAddress, port);
+
+  @override
+  String toString() => 'TilePeer($ipAddress:$port)';
+}
+
+/// What a remote peer has available.
+class PeerCatalog {
+  final TilePeer peer;
+  final List<StyleInfo> styles;
+
+  const PeerCatalog({required this.peer, required this.styles});
+}
+
+/// Progress events during a P2P sync.
+sealed class PeerSyncEvent {}
+
+class PeerSyncStarted extends PeerSyncEvent {
+  final int totalTiles;
+  PeerSyncStarted(this.totalTiles);
+}
+
+class PeerSyncTileDownloaded extends PeerSyncEvent {
+  final int downloaded;
+  final int total;
+  PeerSyncTileDownloaded({required this.downloaded, required this.total});
+}
+
+class PeerSyncTileSkipped extends PeerSyncEvent {
+  final int skipped;
+  final int total;
+  PeerSyncTileSkipped({required this.skipped, required this.total});
+}
+
+class PeerSyncComplete extends PeerSyncEvent {
+  final int downloaded;
+  final int skipped;
+  final int failed;
+  PeerSyncComplete({
+    required this.downloaded,
+    required this.skipped,
+    required this.failed,
+  });
+}
+
+class PeerSyncCancelled extends PeerSyncEvent {}
+
+/// HTTP server that serves cached AVIF tiles to other devices on the
+/// local network, with mDNS advertisement, peer discovery, and P2P sync.
+///
+/// Protocol:
+///   GET /styles               → JSON array of StyleInfo
+///   GET /tiles/{hash}/list    → JSON array of {z, x, y}
+///   GET /tiles/{hash}/{z}/{x}/{y}.avif → AVIF bytes | 404
+class TileSharingService {
+  TileSharingService._();
+  static final instance = TileSharingService._();
+
+  static const int defaultPort = 8347;
+  static const String serviceType = '_sartiles._tcp';
+
+  final OfflineTileCacheService _cache = OfflineTileCacheService.instance;
+  final http.Client _httpClient = http.Client();
+
+  HttpServer? _server;
+  nsd.Discovery? _activeDiscovery;
+  nsd.Registration? _activeRegistration;
+
+  final _peersController = StreamController<Set<TilePeer>>.broadcast();
+  final Set<TilePeer> _discoveredPeers = {};
+
+  bool _syncCancelled = false;
+
+  bool get isRunning => _server != null;
+  Stream<Set<TilePeer>> get peersStream => _peersController.stream;
+  Set<TilePeer> get discoveredPeers => Set.unmodifiable(_discoveredPeers);
+
+  // ── Server ──────────────────────────────────────────────────────────────
+
+  Future<void> startServer() async {
+    if (_server != null) return;
+
+    try {
+      _server = await HttpServer.bind(InternetAddress.anyIPv4, defaultPort);
+      debugPrint('[TileSharing] Server started on port $defaultPort');
+
+      _server!.listen(_handleRequest, onError: (error) {
+        debugPrint('[TileSharing] Server error: $error');
+      });
+
+      await _advertise();
+    } catch (e) {
+      debugPrint('[TileSharing] Failed to start server: $e');
+      _server = null;
+    }
+  }
+
+  Future<void> stopServer() async {
+    await _stopAdvertising();
+    await _server?.close();
+    _server = null;
+    debugPrint('[TileSharing] Server stopped');
+  }
+
+  // ── Discovery ───────────────────────────────────────────────────────────
+
+  Future<void> startDiscovery() async {
+    if (_activeDiscovery != null) return;
+
+    try {
+      _activeDiscovery = await nsd.startDiscovery(serviceType);
+      _activeDiscovery!.addServiceListener((service, status) {
+        if (service.host == null || service.port == null) return;
+
+        final peer = TilePeer(
+          ipAddress: service.host!,
+          port: service.port!,
+        );
+
+        if (status == nsd.ServiceStatus.found) {
+          _discoveredPeers.add(peer);
+        } else {
+          _discoveredPeers.remove(peer);
+        }
+        _peersController.add(Set.unmodifiable(_discoveredPeers));
+      });
+    } catch (e) {
+      debugPrint('[TileSharing] Discovery error: $e');
+    }
+  }
+
+  Future<void> stopPeerDiscovery() async {
+    if (_activeDiscovery != null) {
+      await nsd.stopDiscovery(_activeDiscovery!);
+      _activeDiscovery = null;
+    }
+    _discoveredPeers.clear();
+    _peersController.add(const {});
+  }
+
+  void addManualPeer(String ipAddress, {int port = defaultPort}) {
+    _discoveredPeers.add(TilePeer(ipAddress: ipAddress, port: port));
+    _peersController.add(Set.unmodifiable(_discoveredPeers));
+  }
+
+  void removePeer(TilePeer peer) {
+    _discoveredPeers.remove(peer);
+    _peersController.add(Set.unmodifiable(_discoveredPeers));
+  }
+
+  // ── Peer queries ────────────────────────────────────────────────────────
+
+  /// Fetch the catalog (available styles + tile counts) from a peer.
+  Future<PeerCatalog?> fetchPeerCatalog(TilePeer peer) async {
+    try {
+      final uri = Uri.parse('${peer.baseUrl}/styles');
+      final response =
+          await _httpClient.get(uri).timeout(const Duration(seconds: 5));
+      if (response.statusCode != 200) return null;
+
+      final List<dynamic> data = jsonDecode(response.body);
+      final styles = data
+          .map((e) => StyleInfo.fromJson(e as Map<String, dynamic>))
+          .toList();
+      return PeerCatalog(peer: peer, styles: styles);
+    } catch (e) {
+      debugPrint('[TileSharing] fetchPeerCatalog(${peer.ipAddress}): $e');
+      return null;
+    }
+  }
+
+  /// Fetch catalogs from all discovered peers.
+  Future<List<PeerCatalog>> fetchAllPeerCatalogs() async {
+    final futures =
+        _discoveredPeers.map((peer) => fetchPeerCatalog(peer)).toList();
+    final results = await Future.wait(futures);
+    return results.whereType<PeerCatalog>().toList();
+  }
+
+  /// Fetch the tile list for a style from a peer.
+  Future<List<CachedTileCoord>?> fetchPeerTileList(
+    TilePeer peer,
+    String styleHash,
+  ) async {
+    try {
+      final uri = Uri.parse('${peer.baseUrl}/tiles/$styleHash/list');
+      final response =
+          await _httpClient.get(uri).timeout(const Duration(seconds: 10));
+      if (response.statusCode != 200) return null;
+
+      final List<dynamic> data = jsonDecode(response.body);
+      return data
+          .map((e) => CachedTileCoord.fromJson(e as Map<String, dynamic>))
+          .toList();
+    } catch (e) {
+      debugPrint('[TileSharing] fetchPeerTileList(${peer.ipAddress}): $e');
+      return null;
+    }
+  }
+
+  /// Fetch a single tile from a peer. Returns raw AVIF bytes or null.
+  Future<Uint8List?> fetchTileFromPeer(
+    TilePeer peer,
+    String styleHash,
+    int z,
+    int x,
+    int y,
+  ) async {
+    try {
+      final uri =
+          Uri.parse('${peer.baseUrl}/tiles/$styleHash/$z/$x/$y.avif');
+      final response =
+          await _httpClient.get(uri).timeout(const Duration(seconds: 5));
+      if (response.statusCode == 200) return response.bodyBytes;
+    } catch (e) {
+      // Silently fail — caller will try next peer
+    }
+    return null;
+  }
+
+  /// Try fetching a tile from any available peer (for the caching provider).
+  Future<Uint8List?> fetchFromAnyPeer(
+    String styleHash,
+    int z,
+    int x,
+    int y,
+  ) async {
+    for (final peer in _discoveredPeers) {
+      final bytes = await fetchTileFromPeer(peer, styleHash, z, x, y);
+      if (bytes != null) return bytes;
+    }
+    return null;
+  }
+
+  // ── P2P Sync ────────────────────────────────────────────────────────────
+
+  void cancelSync() {
+    _syncCancelled = true;
+  }
+
+  /// Sync a style from peers: fetch their tile list, download tiles we
+  /// don't have, trying multiple peers in round-robin for speed.
+  ///
+  /// [peers] — which peers to pull from (all that have this style).
+  /// [styleHash] — which style to sync.
+  /// [styleMeta] — metadata to save locally (name, URL template).
+  Stream<PeerSyncEvent> syncStyleFromPeers({
+    required List<TilePeer> peers,
+    required String styleHash,
+    required StyleInfo styleMeta,
+    int maxConcurrency = 8,
+  }) {
+    final controller = StreamController<PeerSyncEvent>();
+    _runSync(
+      controller: controller,
+      peers: peers,
+      styleHash: styleHash,
+      styleMeta: styleMeta,
+      maxConcurrency: maxConcurrency,
+    );
+    return controller.stream;
+  }
+
+  Future<void> _runSync({
+    required StreamController<PeerSyncEvent> controller,
+    required List<TilePeer> peers,
+    required String styleHash,
+    required StyleInfo styleMeta,
+    required int maxConcurrency,
+  }) async {
+    _syncCancelled = false;
+
+    // Save style metadata locally
+    await _cache.saveStyleMeta(
+      styleHash,
+      displayName: styleMeta.displayName,
+      urlTemplate: styleMeta.urlTemplate,
+    );
+
+    // Collect tile lists from all peers and merge (union)
+    final allTiles = <String, CachedTileCoord>{};
+    for (final peer in peers) {
+      if (_syncCancelled) break;
+      final tiles = await fetchPeerTileList(peer, styleHash);
+      if (tiles != null) {
+        for (final t in tiles) {
+          allTiles['${t.z}/${t.x}/${t.y}'] = t;
+        }
+      }
+    }
+
+    final tilesToSync = allTiles.values.toList();
+    controller.add(PeerSyncStarted(tilesToSync.length));
+
+    if (tilesToSync.isEmpty || _syncCancelled) {
+      controller
+          .add(PeerSyncComplete(downloaded: 0, skipped: 0, failed: 0));
+      await controller.close();
+      return;
+    }
+
+    var downloaded = 0;
+    var skipped = 0;
+    var failed = 0;
+    final total = tilesToSync.length;
+
+    final semaphore = _Semaphore(maxConcurrency);
+    final futures = <Future<void>>[];
+    var peerIndex = 0;
+
+    for (final tile in tilesToSync) {
+      if (_syncCancelled) break;
+
+      await semaphore.acquire();
+      if (_syncCancelled) {
+        semaphore.release();
+        break;
+      }
+
+      // Round-robin across peers for parallel throughput
+      final peer = peers[peerIndex % peers.length];
+      peerIndex++;
+
+      final future = () async {
+        try {
+          // Skip if we already have it
+          if (await _cache.hasTile(styleHash, tile.z, tile.x, tile.y)) {
+            skipped++;
+            controller.add(
+                PeerSyncTileSkipped(skipped: skipped, total: total));
+            return;
+          }
+
+          // Try this peer, then fallback to others
+          Uint8List? bytes =
+              await fetchTileFromPeer(peer, styleHash, tile.z, tile.x, tile.y);
+          if (bytes == null) {
+            for (final fallback in peers) {
+              if (fallback == peer) continue;
+              bytes = await fetchTileFromPeer(
+                  fallback, styleHash, tile.z, tile.x, tile.y);
+              if (bytes != null) break;
+            }
+          }
+
+          if (bytes != null) {
+            await _cache.putRawTile(
+                styleHash, tile.z, tile.x, tile.y, bytes);
+            downloaded++;
+            controller.add(PeerSyncTileDownloaded(
+                downloaded: downloaded, total: total));
+          } else {
+            failed++;
+          }
+        } catch (_) {
+          failed++;
+        } finally {
+          semaphore.release();
+        }
+      }();
+      futures.add(future);
+    }
+
+    await Future.wait(futures);
+
+    if (_syncCancelled) {
+      controller.add(PeerSyncCancelled());
+    } else {
+      controller.add(PeerSyncComplete(
+        downloaded: downloaded,
+        skipped: skipped,
+        failed: failed,
+      ));
+    }
+    await controller.close();
+  }
+
+  // ── mDNS ────────────────────────────────────────────────────────────────
+
+  Future<void> _advertise() async {
+    try {
+      final styles = await _cache.listStyles();
+      _activeRegistration = await nsd.register(nsd.Service(
+        name: 'MeshCore SAR Tiles',
+        type: serviceType,
+        port: defaultPort,
+        txt: {
+          'styles':
+              Uint8List.fromList(utf8.encode(styles.join(','))),
+        },
+      ));
+    } catch (e) {
+      debugPrint('[TileSharing] mDNS registration error: $e');
+    }
+  }
+
+  Future<void> _stopAdvertising() async {
+    if (_activeRegistration != null) {
+      await nsd.unregister(_activeRegistration!);
+      _activeRegistration = null;
+    }
+  }
+
+  // ── HTTP Server ─────────────────────────────────────────────────────────
+
+  void _handleRequest(HttpRequest request) async {
+    request.response.headers.add('Access-Control-Allow-Origin', '*');
+
+    final path = request.uri.path;
+
+    // GET /styles → detailed style list
+    if (path == '/styles') {
+      final styles = await _cache.listStylesDetailed();
+      request.response
+        ..statusCode = HttpStatus.ok
+        ..headers.contentType = ContentType.json
+        ..write(jsonEncode(styles.map((s) => s.toJson()).toList()));
+      await request.response.close();
+      return;
+    }
+
+    // GET /tiles/{hash}/list → tile coordinate inventory
+    final listPattern = RegExp(r'^/tiles/([a-f0-9]+)/list$');
+    final listMatch = listPattern.firstMatch(path);
+    if (listMatch != null) {
+      final styleHash = listMatch.group(1)!;
+      final tiles = await _cache.listTilesForStyle(styleHash);
+      request.response
+        ..statusCode = HttpStatus.ok
+        ..headers.contentType = ContentType.json
+        ..write(jsonEncode(tiles.map((t) => t.toJson()).toList()));
+      await request.response.close();
+      return;
+    }
+
+    // GET /tiles/{hash}/{z}/{x}/{y}.avif → tile bytes
+    final tilePattern =
+        RegExp(r'^/tiles/([a-f0-9]+)/(\d+)/(\d+)/(\d+)\.avif$');
+    final tileMatch = tilePattern.firstMatch(path);
+    if (tileMatch != null) {
+      final styleHash = tileMatch.group(1)!;
+      final z = int.parse(tileMatch.group(2)!);
+      final x = int.parse(tileMatch.group(3)!);
+      final y = int.parse(tileMatch.group(4)!);
+
+      final bytes = await _cache.getRawTile(styleHash, z, x, y);
+      if (bytes != null) {
+        request.response
+          ..statusCode = HttpStatus.ok
+          ..headers.contentType = ContentType('image', 'avif')
+          ..add(bytes);
+        await request.response.close();
+        return;
+      }
+    }
+
+    request.response.statusCode = HttpStatus.notFound;
+    await request.response.close();
+  }
+
+  void dispose() {
+    stopServer();
+    stopPeerDiscovery();
+    _httpClient.close();
+    _peersController.close();
+  }
+}
+
+/// Simple counting semaphore for concurrency limiting.
+class _Semaphore {
+  final int maxCount;
+  int _currentCount = 0;
+  final _waitQueue = <Completer<void>>[];
+
+  _Semaphore(this.maxCount);
+
+  Future<void> acquire() async {
+    if (_currentCount < maxCount) {
+      _currentCount++;
+      return;
+    }
+    final completer = Completer<void>();
+    _waitQueue.add(completer);
+    await completer.future;
+  }
+
+  void release() {
+    if (_waitQueue.isNotEmpty) {
+      _waitQueue.removeAt(0).complete();
+    } else {
+      _currentCount--;
+    }
+  }
+}

lib/services/traffic_stats_reporting_service.dart

@@ -0,0 +1,508 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:flutter/foundation.dart';
+import 'package:http/http.dart' as http;
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../models/ble_packet_log.dart';
+import '../utils/log_rx_route_decoder.dart';
+import 'live_traffic_summary.dart';
+
+class TrafficStatsCounts {
+  static const List<String> packetTypeKeys = <String>[
+    'pt_00',
+    'pt_01',
+    'pt_02',
+    'pt_03',
+    'pt_04',
+    'pt_05',
+    'pt_06',
+    'pt_07',
+    'pt_08',
+    'pt_09',
+    'pt_0a',
+    'pt_0b',
+    'pt_0c',
+    'pt_0d',
+    'pt_0e',
+    'pt_0f',
+  ];
+  static const List<String> pathModeKeys = <String>[
+    'path_mode_1b',
+    'path_mode_2b',
+    'path_mode_3b',
+    'path_mode_none',
+    'path_mode_unknown',
+  ];
+  static const String decodeFailKey = 'decode_fail';
+  static const List<String> allKeys = <String>[
+    ...packetTypeKeys,
+    decodeFailKey,
+    ...pathModeKeys,
+  ];
+
+  final Map<String, int> _values;
+
+  TrafficStatsCounts._(this._values);
+
+  factory TrafficStatsCounts.empty() {
+    return TrafficStatsCounts._(
+      <String, int>{for (final key in allKeys) key: 0},
+    );
+  }
+
+  factory TrafficStatsCounts.fromJson(Map<String, dynamic>? json) {
+    final counts = TrafficStatsCounts.empty();
+    if (json == null) {
+      return counts;
+    }
+    for (final key in allKeys) {
+      counts._values[key] = (json[key] as num?)?.toInt() ?? 0;
+    }
+    return counts;
+  }
+
+  int operator [](String key) => _values[key] ?? 0;
+
+  bool get isEmpty => _values.values.every((value) => value == 0);
+
+  Map<String, int> toJson() {
+    return <String, int>{
+      for (final key in allKeys) key: _values[key] ?? 0,
+    };
+  }
+
+  void increment(String key, [int amount = 1]) {
+    _values[key] = (_values[key] ?? 0) + amount;
+  }
+
+  void incrementPacketType(int payloadType) {
+    if (payloadType < 0 || payloadType > 0x0F) {
+      increment(decodeFailKey);
+      return;
+    }
+    increment('pt_${payloadType.toRadixString(16).padLeft(2, '0')}');
+  }
+
+  void mergeFrom(TrafficStatsCounts other) {
+    for (final key in allKeys) {
+      increment(key, other[key]);
+    }
+  }
+}
+
+class TrafficStatsQueuedReport {
+  final String reportId;
+  final String deviceKey6;
+  final DateTime windowStart;
+  final DateTime windowEnd;
+  final String appVersion;
+  final TrafficStatsCounts counts;
+
+  const TrafficStatsQueuedReport({
+    required this.reportId,
+    required this.deviceKey6,
+    required this.windowStart,
+    required this.windowEnd,
+    required this.appVersion,
+    required this.counts,
+  });
+
+  factory TrafficStatsQueuedReport.fromJson(Map<String, dynamic> json) {
+    return TrafficStatsQueuedReport(
+      reportId: (json['reportId'] as String?) ?? '',
+      deviceKey6: (json['deviceKey6'] as String?) ?? '',
+      windowStart: DateTime.parse(json['windowStart'] as String).toUtc(),
+      windowEnd: DateTime.parse(json['windowEnd'] as String).toUtc(),
+      appVersion: (json['appVersion'] as String?) ?? 'unknown',
+      counts: TrafficStatsCounts.fromJson(
+        json['counts'] as Map<String, dynamic>?,
+      ),
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return <String, dynamic>{
+      'reportId': reportId,
+      'deviceKey6': deviceKey6,
+      'windowStart': windowStart.toIso8601String(),
+      'windowEnd': windowEnd.toIso8601String(),
+      'appVersion': appVersion,
+      'counts': counts.toJson(),
+    };
+  }
+}
+
+class TrafficStatsReportingService extends ChangeNotifier {
+  static const String workerBaseUrl = 'https://mcstats.dz0ny.dev';
+  static final Uri dashboardUri = Uri.parse(workerBaseUrl);
+  static final Uri ingestUri = Uri.parse('$workerBaseUrl/api/ingest');
+
+  static const bool defaultEnabled = true;
+  static const int defaultIntervalMinutes = 5;
+  static const String _enabledKey = 'traffic_stats_reporting_enabled';
+  static const String _legacyIntervalKey =
+      'traffic_stats_reporting_interval_minutes';
+  static const String _queueKey = 'traffic_stats_reporting_queue';
+  static const String _lastSuccessAtKey =
+      'traffic_stats_reporting_last_success_at';
+  static const String _lastErrorKey = 'traffic_stats_reporting_last_error';
+  static const Duration _retryInterval = Duration(seconds: 30);
+
+  final http.Client _client;
+  final bool _ownsClient;
+  final DateTime Function() _now;
+  final Future<SharedPreferences> Function() _prefsProvider;
+  final Future<String> Function() _appVersionProvider;
+  final Map<int, TrafficStatsCounts> _openWindows =
+      <int, TrafficStatsCounts>{};
+  final List<TrafficStatsQueuedReport> _queue = <TrafficStatsQueuedReport>[];
+
+  String? Function()? _deviceKey6Provider;
+  Timer? _retryTimer;
+  String? _appVersion;
+  bool _enabled = defaultEnabled;
+  DateTime? _lastSuccessAt;
+  String? _lastError;
+  bool _isInitialized = false;
+  bool _isFlushingQueue = false;
+
+  TrafficStatsReportingService({
+    http.Client? client,
+    DateTime Function()? now,
+    Future<SharedPreferences> Function()? prefsProvider,
+    Future<String> Function()? appVersionProvider,
+  }) : _client = client ?? http.Client(),
+       _ownsClient = client == null,
+       _now = now ?? DateTime.now,
+       _prefsProvider = prefsProvider ?? SharedPreferences.getInstance,
+       _appVersionProvider = appVersionProvider ?? _defaultAppVersionProvider;
+
+  bool get isEnabled => _enabled;
+  int get intervalMinutes => defaultIntervalMinutes;
+  DateTime? get lastSuccessAt => _lastSuccessAt;
+  String? get lastError => _lastError;
+  bool get isInitialized => _isInitialized;
+  bool get isFlushingQueue => _isFlushingQueue;
+  int get pendingUploadCount => _queue.length;
+
+  Future<void> initialize({
+    required String? Function() deviceKey6Provider,
+  }) async {
+    _deviceKey6Provider = deviceKey6Provider;
+    final prefs = await _prefsProvider();
+    _enabled = prefs.getBool(_enabledKey) ?? defaultEnabled;
+    if (prefs.containsKey(_legacyIntervalKey)) {
+      await prefs.remove(_legacyIntervalKey);
+    }
+    final queueJson = prefs.getString(_queueKey);
+    if (queueJson != null && queueJson.isNotEmpty) {
+      final decoded = jsonDecode(queueJson);
+      if (decoded is List) {
+        _queue
+          ..clear()
+          ..addAll(
+            decoded.whereType<Map<String, dynamic>>().map(
+              TrafficStatsQueuedReport.fromJson,
+            ),
+          );
+      }
+    }
+    final lastSuccessAt = prefs.getString(_lastSuccessAtKey);
+    if (lastSuccessAt != null && lastSuccessAt.isNotEmpty) {
+      _lastSuccessAt = DateTime.tryParse(lastSuccessAt)?.toUtc();
+    }
+    final lastError = prefs.getString(_lastErrorKey);
+    if (lastError != null && lastError.isNotEmpty) {
+      _lastError = lastError;
+    }
+    try {
+      _appVersion = await _appVersionProvider();
+    } catch (_) {
+      _appVersion = 'unknown';
+    }
+    _retryTimer?.cancel();
+    _retryTimer = Timer.periodic(_retryInterval, (_) {
+      unawaited(flushPendingUploads());
+    });
+    _isInitialized = true;
+    notifyListeners();
+    await flushPendingUploads();
+  }
+
+  Future<void> setEnabled(bool enabled) async {
+    if (_enabled == enabled) {
+      return;
+    }
+    _enabled = enabled;
+    _lastError = null;
+    if (!enabled) {
+      _openWindows.clear();
+    }
+    await _saveState();
+    notifyListeners();
+    if (enabled) {
+      unawaited(flushPendingUploads());
+    }
+  }
+
+  Future<void> processLogs(List<BlePacketLog> logs) async {
+    if (!_enabled || logs.isEmpty) {
+      if (_enabled) {
+        await flushPendingUploads();
+      }
+      return;
+    }
+
+    var changed = false;
+    for (final log in logs) {
+      if (!LiveTrafficSummary.isRxDataLog(log)) {
+        continue;
+      }
+      final counts = _openWindows.putIfAbsent(
+        _windowStartFor(log.timestamp).millisecondsSinceEpoch,
+        TrafficStatsCounts.empty,
+      );
+      final route = LogRxRouteDecoder.decode(log.rawData);
+      if (route == null) {
+        counts.increment(TrafficStatsCounts.decodeFailKey);
+      } else {
+        counts.incrementPacketType(route.payloadType);
+      }
+      counts.increment(_pathModeKeyFor(log.rawData, route));
+      changed = true;
+    }
+
+    if (!changed) {
+      await flushPendingUploads();
+      return;
+    }
+
+    final queuedReports = _queueClosedWindows();
+    if (queuedReports > 0) {
+      await _saveState();
+    }
+    notifyListeners();
+    await flushPendingUploads();
+  }
+
+  Future<void> flushPendingUploads() async {
+    if (!_enabled || _queue.isEmpty || _isFlushingQueue) {
+      return;
+    }
+    final deviceKey6 = _deviceKey6Provider?.call();
+    if (deviceKey6 == null || deviceKey6.isEmpty) {
+      return;
+    }
+
+    _isFlushingQueue = true;
+    notifyListeners();
+    try {
+      while (_queue.isNotEmpty && _enabled) {
+        final report = _queue.first;
+        final response = await _client.post(
+          ingestUri,
+          headers: const <String, String>{
+            'content-type': 'application/json',
+          },
+          body: jsonEncode(report.toJson()),
+        );
+
+        if (response.statusCode < 200 || response.statusCode >= 300) {
+          _lastError = 'Upload failed (${response.statusCode})';
+          await _saveState();
+          notifyListeners();
+          return;
+        }
+
+        _queue.removeAt(0);
+        _lastError = null;
+        _lastSuccessAt = _now().toUtc();
+        await _saveState();
+        notifyListeners();
+      }
+    } catch (error) {
+      _lastError = 'Upload failed: $error';
+      await _saveState();
+      notifyListeners();
+    } finally {
+      _isFlushingQueue = false;
+      notifyListeners();
+    }
+  }
+
+  int _queueClosedWindows() {
+    final deviceKey6 = _deviceKey6Provider?.call();
+    if (deviceKey6 == null || deviceKey6.isEmpty) {
+      return 0;
+    }
+
+    final now = _now().toUtc();
+    final closable = _openWindows.keys
+        .where((windowStartMs) {
+          final windowStart = DateTime.fromMillisecondsSinceEpoch(
+            windowStartMs,
+            isUtc: true,
+          );
+          final windowEnd = windowStart.add(
+            Duration(minutes: defaultIntervalMinutes),
+          );
+          return !windowEnd.isAfter(now);
+        })
+        .toList()
+      ..sort();
+
+    for (final windowStartMs in closable) {
+      final windowStart = DateTime.fromMillisecondsSinceEpoch(
+        windowStartMs,
+        isUtc: true,
+      );
+      final counts = _openWindows.remove(windowStartMs);
+      if (counts == null || counts.isEmpty) {
+        continue;
+      }
+      final reportId = '$deviceKey6:${windowStart.toIso8601String()}';
+      final existingIndex = _queue.indexWhere(
+        (report) => report.reportId == reportId,
+      );
+      if (existingIndex != -1) {
+        _queue[existingIndex].counts.mergeFrom(counts);
+        continue;
+      }
+      _queue.add(
+        TrafficStatsQueuedReport(
+          reportId: reportId,
+          deviceKey6: deviceKey6,
+          windowStart: windowStart,
+          windowEnd: windowStart.add(
+            Duration(minutes: defaultIntervalMinutes),
+          ),
+          appVersion: _appVersion ?? 'unknown',
+          counts: counts,
+        ),
+      );
+    }
+    return closable.length;
+  }
+
+  DateTime _windowStartFor(DateTime timestamp) {
+    final utc = timestamp.toUtc();
+    final alignedMinute =
+        utc.minute - (utc.minute % defaultIntervalMinutes);
+    return DateTime.utc(
+      utc.year,
+      utc.month,
+      utc.day,
+      utc.hour,
+      alignedMinute,
+    );
+  }
+
+  String _pathModeKeyFor(Uint8List rawData, DecodedLogRxRoute? route) {
+    if (route != null) {
+      if (route.pathBytes.isEmpty) {
+        return 'path_mode_none';
+      }
+      switch (route.hashSize) {
+        case 1:
+          return 'path_mode_1b';
+        case 2:
+          return 'path_mode_2b';
+        case 3:
+          return 'path_mode_3b';
+      }
+      return 'path_mode_unknown';
+    }
+    return _pathModeKeyFromRawData(rawData);
+  }
+
+  String _pathModeKeyFromRawData(Uint8List rawData) {
+    if (rawData.length < 5 ||
+        rawData.first != LiveTrafficSummary.logRxDataResponseCode) {
+      return 'path_mode_unknown';
+    }
+
+    final rawPacketData = rawData.sublist(3);
+    if (rawPacketData.length < 2) {
+      return 'path_mode_unknown';
+    }
+
+    final header = rawPacketData[0];
+    final routeType = header & 0x03;
+    var index = 1;
+    if (routeType == 0x00 || routeType == 0x03) {
+      if (rawPacketData.length < index + 5) {
+        return 'path_mode_unknown';
+      }
+      index += 4;
+    }
+
+    if (rawPacketData.length <= index) {
+      return 'path_mode_unknown';
+    }
+
+    final pathDescriptor = rawPacketData[index];
+    final pathByteLen = LogRxRouteDecoder.descriptorByteLength(pathDescriptor);
+    if (pathByteLen == null) {
+      return 'path_mode_unknown';
+    }
+    if (rawPacketData.length < index + 1 + pathByteLen) {
+      return 'path_mode_unknown';
+    }
+    if (pathByteLen == 0) {
+      return 'path_mode_none';
+    }
+
+    final hashSize = LogRxRouteDecoder.descriptorHashSize(pathDescriptor);
+    switch (hashSize) {
+      case 1:
+        return 'path_mode_1b';
+      case 2:
+        return 'path_mode_2b';
+      case 3:
+        return 'path_mode_3b';
+    }
+    return 'path_mode_unknown';
+  }
+
+  Future<void> _saveState() async {
+    final prefs = await _prefsProvider();
+    await prefs.setBool(_enabledKey, _enabled);
+    await prefs.remove(_legacyIntervalKey);
+    await prefs.setString(
+      _queueKey,
+      jsonEncode(_queue.map((report) => report.toJson()).toList()),
+    );
+    if (_lastSuccessAt == null) {
+      await prefs.remove(_lastSuccessAtKey);
+    } else {
+      await prefs.setString(
+        _lastSuccessAtKey,
+        _lastSuccessAt!.toIso8601String(),
+      );
+    }
+    if (_lastError == null || _lastError!.isEmpty) {
+      await prefs.remove(_lastErrorKey);
+    } else {
+      await prefs.setString(_lastErrorKey, _lastError!);
+    }
+  }
+
+  static Future<String> _defaultAppVersionProvider() async {
+    final info = await PackageInfo.fromPlatform();
+    if (info.buildNumber.isEmpty || info.buildNumber == '0') {
+      return info.version;
+    }
+    return '${info.version}+${info.buildNumber}';
+  }
+
+  @override
+  void dispose() {
+    _retryTimer?.cancel();
+    if (_ownsClient) {
+      _client.close();
+    }
+    super.dispose();
+  }
+}

lib/widgets/connection_dialog.dart

@@ -4,9 +4,119 @@ 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,
+}) async {
+  await profileWorkspaceCoordinator.syncActiveProfileForCurrentDevice();
+  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});
@@ -24,6 +134,7 @@ class _ConnectionDialogState extends State<ConnectionDialog>
   int _scannedCount = 0;
   int _totalToScan = 0;
   int _lastTabIndex = 0;
+  bool _hasRequestedBleScan = false;
   String? _connectingToServerKey;
   String? _connectingBleDeviceId;
 
@@ -31,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(() {
@@ -56,11 +163,6 @@ class _ConnectionDialogState extends State<ConnectionDialog>
       listen: false,
     );
 
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!mounted) return;
-      _refreshBleDevices();
-    });
-
     _networkScanner.onServerDiscovered = (server) {
       if (!mounted) return;
       setState(() {
@@ -101,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();
@@ -112,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>();
@@ -392,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)
@@ -409,8 +530,10 @@ class _ConnectionDialogState extends State<ConnectionDialog>
               : connectionProvider.scannedDevices.isEmpty
               ? _buildEmptyState(
                   icon: Icons.bluetooth_searching_rounded,
-                  title: AppLocalizations.of(context)!.noDevicesFound,
-                  actionLabel: AppLocalizations.of(context)!.scanAgain,
+                  title: _hasRequestedBleScan
+                      ? l10n.noDevicesFound
+                      : 'Press scan to search for nearby devices',
+                  actionLabel: _hasRequestedBleScan ? l10n.scanAgain : 'Scan',
                   onAction: _refreshBleDevices,
                 )
               : ListView.builder(
@@ -425,19 +548,25 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                     final isConnecting = _connectingBleDeviceId == deviceId;
 
                     Future<void> connectBle() async {
-                      final appProvider = context.read<AppProvider>();
                       setState(() {
                         _connectingBleDeviceId = deviceId;
                       });
                       try {
-                        Navigator.pop(context);
                         final success = await connectionProvider.connect(
                           device,
                         );
-                        if (success &&
-                            connectionProvider.deviceInfo.isConnected) {
-                          await appProvider.initialize();
+                        if (!success) {
+                          final name = device.platformName.isNotEmpty
+                              ? device.platformName
+                              : 'device';
+                          throw Exception(
+                            connectionProvider.error ??
+                                'Failed to connect to $name',
+                          );
                         }
+                        _closeOnSuccessfulConnection();
+                      } catch (error) {
+                        _showConnectionError(error);
                       } finally {
                         if (mounted) {
                           setState(() {
@@ -532,9 +661,6 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                     Future<void> connectServer() async {
                       final connectionProvider = context
                           .read<ConnectionProvider>();
-                      final appProvider = context.read<AppProvider>();
-                      final navigator = Navigator.of(context);
-                      final messenger = ScaffoldMessenger.of(context);
 
                       setState(() {
                         _connectingToServerKey = serverKey;
@@ -550,48 +676,23 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                           );
                         }
 
-                        await connectionProvider.connectTcp(
+                        final success = await connectionProvider.connectTcp(
                           server.ipAddress,
                           server.port,
                         );
-                        await appProvider.initialize();
-
-                        if (mounted) {
-                          navigator.pop();
+                        if (!success) {
+                          throw Exception(
+                            connectionProvider.error ??
+                                'Failed to connect to ${server.ipAddress}:${server.port}',
+                          );
                         }
+                        _closeOnSuccessfulConnection();
                       } catch (e) {
                         if (!mounted) return;
                         setState(() {
                           _connectingToServerKey = null;
                         });
-
-                        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),
-                          ),
-                        );
+                        _showConnectionError(e);
                       }
                     }
 
@@ -658,8 +759,10 @@ class _ConnectionDialogState extends State<ConnectionDialog>
             actionLabel: actionLabel,
             onAction: onAction,
           ),
-      onConnected: () {
-        if (mounted) Navigator.of(context).pop();
+      onConnected: (result) {
+        if (mounted) {
+          Navigator.of(context).pop(result);
+        }
       },
     );
   }
@@ -685,7 +788,7 @@ typedef _EmptyStateBuilder =
     });
 
 class _SerialDeviceList extends StatefulWidget {
-  final VoidCallback onConnected;
+  final ValueChanged<_ConnectionDialogResult> onConnected;
   final _TransportCardBuilder buildTransportCard;
   final _EmptyStateBuilder buildEmptyState;
 
@@ -780,7 +883,6 @@ class _SerialDeviceListState extends State<_SerialDeviceList> {
     setState(() => _isConnecting = true);
     try {
       final connectionProvider = context.read<ConnectionProvider>();
-      final appProvider = context.read<AppProvider>();
       final connection = await _transport.connect(device);
       final success = await connectionProvider.connectSerial(
         service: connection.service,
@@ -791,8 +893,7 @@ class _SerialDeviceListState extends State<_SerialDeviceList> {
       if (!mounted) return;
 
       if (success) {
-        await appProvider.initialize();
-        widget.onConnected();
+        widget.onConnected(_ConnectionDialogResult.connected);
       } else {
         await connection.disconnect();
         connection.service.dispose();

lib/widgets/contacts/contact_route_dialog.dart

@@ -6,12 +6,9 @@ import 'package:latlong2/latlong.dart';
 import 'package:provider/provider.dart';
 
 import '../../models/contact.dart';
-import '../../models/path_history.dart';
 import '../../l10n/app_localizations.dart';
 import '../../providers/app_provider.dart';
 import '../../providers/connection_provider.dart';
-import '../../services/contact_route_resolver.dart';
-import '../../services/path_history_service.dart';
 import '../../services/relay_candidate_sorter.dart';
 import '../../services/route_hash_preferences.dart';
 
@@ -73,16 +70,13 @@ class ContactRouteDialog extends StatefulWidget {
 class _ContactRouteDialogState extends State<ContactRouteDialog> {
   late final TextEditingController _controller;
   late final TextEditingController _relaySearchController;
-  final PathHistoryService _pathHistoryService = PathHistoryService();
   final RelayCandidateSorter _relayCandidateSorter =
       const RelayCandidateSorter();
   int _selectedHashSize = RouteHashPreferences.defaultHashSize;
   ParsedContactRoute? _parsedRoute;
   String? _errorText;
   bool _showRoutingInfo = false;
-  bool _showManualEditor = false;
   List<Contact> _selectedMapHops = const [];
-  ContactPathHistory? _pathHistory;
 
   @override
   void initState() {
@@ -92,9 +86,7 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
     );
     _relaySearchController = TextEditingController();
     _controller.addListener(_reparse);
-    _showManualEditor = widget.contact.routeCanonicalText.isNotEmpty;
     _loadHashSizePreference();
-    _loadPathHistory();
     _reparse();
   }
 
@@ -185,16 +177,6 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
     _reparse();
   }
 
-  Future<void> _loadPathHistory() async {
-    await _pathHistoryService.initialize();
-    if (!mounted) return;
-    setState(() {
-      _pathHistory = _pathHistoryService.historyFor(
-        widget.contact.publicKeyHex,
-      );
-    });
-  }
-
   String _tokenFor(Contact contact, int hashSize) {
     final hex = contact.publicKeyHex.toUpperCase();
     final length = hashSize * 2;
@@ -240,35 +222,6 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
     });
   }
 
-  void _applyResolvedPlan(ResolvedContactRoutePlan plan) {
-    setState(() {
-      _selectedMapHops = plan.selectedContacts;
-      _controller.text = plan.canonicalText;
-      _controller.selection = TextSelection.fromPosition(
-        TextPosition(offset: _controller.text.length),
-      );
-      _errorText = null;
-      _showManualEditor = false;
-    });
-    _reparse();
-  }
-
-  void _applyHistoryRecord(PathRecord record) {
-    final canonicalText = _canonicalRouteFromBytes(
-      record.pathBytes,
-      hashSize: record.hashSize,
-    );
-    setState(() {
-      _controller.text = canonicalText;
-      _controller.selection = TextSelection.fromPosition(
-        TextPosition(offset: _controller.text.length),
-      );
-      _errorText = null;
-      _showManualEditor = true;
-    });
-    _reparse();
-  }
-
   LatLng? _resolveLastHopLocation() {
     if (_selectedMapHops.isNotEmpty) {
       return _selectedMapHops.last.displayLocation == null
@@ -319,147 +272,34 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
     );
   }
 
-  void _resolvePathAutomatically() {
-    final connectionProvider = context.read<ConnectionProvider>();
-    final advLat = connectionProvider.deviceInfo.advLat;
-    final advLon = connectionProvider.deviceInfo.advLon;
-    final recipientLocation = widget.contact.displayLocation;
-    if (advLat == null ||
-        advLon == null ||
-        (advLat == 0 && advLon == 0) ||
-        recipientLocation == null) {
-      setState(() {
-        _errorText =
-            'Automatic resolve needs both your advertised location and the contact location.';
-      });
-      return;
-    }
-
-    final plan = ContactRouteResolver.resolveAutomaticRoute(
-      senderLocation: LatLng(advLat / 1e6, advLon / 1e6),
-      recipient: widget.contact,
-      availableContacts: widget.availableContacts,
-      hashSize: _selectedHashSize,
-    );
-    if (plan == null) {
-      setState(() {
-        _errorText =
-            'Could not resolve a route from available repeater locations.';
-      });
-      return;
-    }
-
-    _applyResolvedPlan(plan);
-  }
-
-  String _canonicalRouteFromBytes(
-    List<int> pathBytes, {
-    required int hashSize,
-  }) {
-    final hops = <String>[];
-    for (var i = 0; i < pathBytes.length; i += hashSize) {
-      final hop = pathBytes.sublist(i, i + hashSize);
-      hops.add(
-        hop
-            .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
-            .join()
-            .toUpperCase(),
-      );
-    }
-    return hops.join(',');
-  }
-
-  String _historySubtitle(PathRecord record) {
-    final attempts = record.successCount + record.failureCount;
-    final lastSeen = MaterialLocalizations.of(
-      context,
-    ).formatShortDate(record.lastUsedAt);
-    final sourceLabel = switch (record.source) {
-      PathRecordSource.observed => 'Observed on mesh',
-      PathRecordSource.learned => 'Learned route',
-    };
-    final successRate = attempts == 0
-        ? 'No send stats yet'
-        : '${(record.successRate * 100).round()}% success over $attempts send${attempts == 1 ? '' : 's'}';
-    final latency = record.lastRoundTripTimeMs > 0
-        ? ' • ${record.lastRoundTripTimeMs} ms'
-        : '';
-    return '$sourceLabel • $successRate • Last used $lastSeen$latency';
-  }
-
-  Widget _buildHistoryRecordTile(PathRecord record, {String? title}) {
-    final canonicalText = _canonicalRouteFromBytes(
-      record.pathBytes,
-      hashSize: record.hashSize,
-    );
-    return Card(
-      margin: EdgeInsets.zero,
-      child: ListTile(
-        contentPadding: const EdgeInsets.symmetric(
-          horizontal: 16,
-          vertical: 10,
-        ),
-        leading: title == null ? null : const Icon(Icons.alt_route),
-        title: title == null
-            ? Text(
-                canonicalText,
-                style: Theme.of(
-                  context,
-                ).textTheme.bodyMedium?.copyWith(fontFamily: 'monospace'),
-              )
-            : Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(title, style: Theme.of(context).textTheme.titleSmall),
-                  const SizedBox(height: 6),
-                  Text(
-                    canonicalText,
-                    style: Theme.of(
-                      context,
-                    ).textTheme.bodyMedium?.copyWith(fontFamily: 'monospace'),
-                  ),
-                ],
-              ),
-        subtitle: Padding(
-          padding: const EdgeInsets.only(top: 6),
-          child: Text(_historySubtitle(record)),
-        ),
-        trailing: FilledButton.tonal(
-          onPressed: () => _applyHistoryRecord(record),
-          child: Text(AppLocalizations.of(context)!.use),
-        ),
-      ),
-    );
-  }
-
   Widget _buildPreviewSection() {
     final previewRoute = _effectiveRoute;
+    if (previewRoute == null) {
+      return const SizedBox.shrink();
+    }
     final colorScheme = Theme.of(context).colorScheme;
     return Container(
       width: double.infinity,
-      padding: const EdgeInsets.all(14),
+      padding: const EdgeInsets.all(12),
       decoration: BoxDecoration(
         color: colorScheme.surfaceContainerHighest.withValues(alpha: 0.5),
-        borderRadius: BorderRadius.circular(16),
+        borderRadius: BorderRadius.circular(12),
         border: Border.all(color: colorScheme.outlineVariant),
       ),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Text(
-            previewRoute == null ? 'Route preview' : previewRoute.summary,
+            previewRoute.summary,
             style: Theme.of(context).textTheme.titleSmall,
           ),
-          const SizedBox(height: 4),
+          const SizedBox(height: 2),
           Text(
-            previewRoute == null
-                ? 'Pick relays from the list below or open manual edit if you need exact hop tokens.'
-                : '${previewRoute.byteLength} bytes • descriptor 0x${previewRoute.encodedPathLen.toRadixString(16).padLeft(2, '0').toUpperCase()}',
+            '${previewRoute.byteLength}B • 0x${previewRoute.encodedPathLen.toRadixString(16).padLeft(2, '0').toUpperCase()}',
             style: Theme.of(context).textTheme.bodySmall,
           ),
-          if (previewRoute != null &&
-              previewRoute.canonicalText.isNotEmpty) ...[
-            const SizedBox(height: 10),
+          if (previewRoute.canonicalText.isNotEmpty) ...[
+            const SizedBox(height: 8),
             SelectableText(
               previewRoute.canonicalText,
               style: Theme.of(
@@ -474,18 +314,7 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
 
   Widget _buildSelectedHopSection() {
     if (_selectedMapHops.isEmpty) {
-      return Container(
-        width: double.infinity,
-        padding: const EdgeInsets.all(14),
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(16),
-          border: Border.all(color: Theme.of(context).dividerColor),
-        ),
-        child: Text(
-          'No relays selected. Save now to use a direct path, or add repeaters below.',
-          style: Theme.of(context).textTheme.bodyMedium,
-        ),
-      );
+      return const SizedBox.shrink();
     }
 
     return Column(
@@ -493,28 +322,21 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
       children: [
         Text('Selected relays', style: Theme.of(context).textTheme.titleSmall),
         const SizedBox(height: 8),
-        ..._selectedMapHops.asMap().entries.map((entry) {
-          final index = entry.key;
-          final contact = entry.value;
-          return Card(
-            margin: const EdgeInsets.only(bottom: 8),
-            child: ListTile(
-              leading: CircleAvatar(child: Text('${index + 1}')),
-              title: Text(contact.displayName),
-              subtitle: Text(
-                _tokenFor(contact, _selectedHashSize),
-                style: Theme.of(
-                  context,
-                ).textTheme.bodySmall?.copyWith(fontFamily: 'monospace'),
-              ),
-              trailing: IconButton(
-                tooltip: 'Remove relay',
-                onPressed: () => _toggleHop(contact),
-                icon: const Icon(Icons.close),
-              ),
-            ),
-          );
-        }),
+        Wrap(
+          spacing: 8,
+          runSpacing: 8,
+          children: _selectedMapHops.asMap().entries.map((entry) {
+            final index = entry.key;
+            final contact = entry.value;
+            return InputChip(
+              label: Text('${index + 1}. ${contact.displayName}'),
+              deleteIcon: const Icon(Icons.close),
+              onDeleted: () => _toggleHop(contact),
+              materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+              visualDensity: VisualDensity.compact,
+            );
+          }).toList(),
+        ),
       ],
     );
   }
@@ -563,6 +385,12 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
             return Card(
               margin: const EdgeInsets.only(bottom: 8),
               child: ListTile(
+                dense: true,
+                visualDensity: VisualDensity.compact,
+                contentPadding: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 4,
+                ),
                 leading: Icon(
                   isSelected
                       ? Icons.check_circle
@@ -593,41 +421,6 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
     );
   }
 
-  Widget _buildManualEditor() {
-    return ExpansionTile(
-      tilePadding: EdgeInsets.zero,
-      childrenPadding: EdgeInsets.zero,
-      initiallyExpanded: _showManualEditor,
-      onExpansionChanged: (expanded) {
-        setState(() {
-          _showManualEditor = expanded;
-        });
-      },
-      title: Text(AppLocalizations.of(context)!.manualRouteEdit),
-      subtitle: const Text(
-        'Use this when you need to paste or tweak hop tokens directly.',
-      ),
-      children: [
-        TextField(
-          controller: _controller,
-          textCapitalization: TextCapitalization.characters,
-          decoration: InputDecoration(
-            labelText: 'Route',
-            hintText: _selectedHashSize == 1
-                ? 'AA,BB,CC'
-                : _selectedHashSize == 2
-                ? 'AABB,CCDD'
-                : 'AABBCC,DDEEFF',
-            helperText:
-                'Comma-separated hops using the selected path size. Colon form like AA:BB is also accepted.',
-            errorText: _errorText,
-            border: const OutlineInputBorder(),
-          ),
-        ),
-      ],
-    );
-  }
-
   Widget _buildMapPreview({
     required List<Contact> routeCandidates,
     required List<LatLng> mapPoints,
@@ -709,15 +502,14 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
 
   Widget _buildBuilderTab({
     required List<Contact> routeCandidates,
-    required List<LatLng> mapPoints,
-    required List<LatLng> routePoints,
   }) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            Text('Path Size', style: Theme.of(context).textTheme.labelLarge),
+            Text('Path size', style: Theme.of(context).textTheme.labelLarge),
             const Spacer(),
             SegmentedButton<int>(
               segments: [
@@ -734,36 +526,32 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
             ),
           ],
         ),
+        if (_errorText != null) ...[
+          const SizedBox(height: 12),
+          Text(
+            _errorText!,
+            style: TextStyle(color: Theme.of(context).colorScheme.error),
+          ),
+        ],
+        if (_selectedMapHops.isNotEmpty) ...[
+          const SizedBox(height: 12),
+          _buildSelectedHopSection(),
+        ],
         const SizedBox(height: 12),
-        Wrap(
-          spacing: 8,
-          runSpacing: 8,
-          children: [
-            FilledButton.tonalIcon(
-              onPressed: _resolvePathAutomatically,
-              icon: Icon(Icons.auto_fix_high),
-              label: Text(AppLocalizations.of(context)!.autoResolve),
-            ),
-            OutlinedButton.icon(
-              onPressed: _selectedMapHops.isEmpty
-                  ? null
-                  : () {
-                      setState(() {
-                        _selectedMapHops = const [];
-                        _syncControllerFromSelectedHops();
-                      });
-                    },
-              icon: Icon(Icons.clear_all),
-              label: Text(AppLocalizations.of(context)!.clearRelays),
-            ),
-          ],
-        ),
-        const SizedBox(height: 16),
-        _buildPreviewSection(),
-        const SizedBox(height: 16),
-        _buildSelectedHopSection(),
-        const SizedBox(height: 16),
         _buildRelayPicker(routeCandidates),
+      ],
+    );
+  }
+
+  Widget _buildInfoTab({
+    required AppProvider appProvider,
+    required List<Contact> routeCandidates,
+    required List<LatLng> mapPoints,
+    required List<LatLng> routePoints,
+  }) {
+    return ListView(
+      children: [
+        _buildPreviewSection(),
         const SizedBox(height: 16),
         _buildMapPreview(
           routeCandidates: routeCandidates,
@@ -771,64 +559,17 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
           routePoints: routePoints,
         ),
         const SizedBox(height: 16),
-        _buildManualEditor(),
-      ],
-    );
-  }
-
-  Widget _buildHistoryTab() {
-    final records = List<PathRecord>.from(_pathHistory?.directPaths ?? const [])
-      ..sort((a, b) => b.lastUsedAt.compareTo(a.lastUsedAt));
-    if (records.isEmpty) {
-      return Center(
-        child: Padding(
-          padding: const EdgeInsets.all(24),
-          child: Text(
-            'No historical paths for this contact yet.',
-            style: Theme.of(context).textTheme.bodyMedium,
-            textAlign: TextAlign.center,
-          ),
+        _AutomationRoutingInfo(
+          isExpanded: _showRoutingInfo,
+          onToggle: () {
+            setState(() {
+              _showRoutingInfo = !_showRoutingInfo;
+            });
+          },
+          nearestRelayFallbackEnabled: appProvider.nearestRelayFallbackEnabled,
+          clearPathOnMaxRetry: appProvider.clearPathOnMaxRetry,
         ),
-      );
-    }
-
-    PathRecord? observedRecord;
-    for (final record in records) {
-      if (record.source == PathRecordSource.observed) {
-        observedRecord = record;
-        break;
-      }
-    }
-    final remainingRecords = observedRecord == null
-        ? records
-        : records
-              .where((record) => !identical(record, observedRecord))
-              .toList();
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        if (observedRecord != null) ...[
-          _buildHistoryRecordTile(observedRecord, title: AppLocalizations.of(context)!.observedMeshRoute),
-          const SizedBox(height: 16),
-        ],
-        if (remainingRecords.isEmpty)
-          Text(
-            observedRecord == null
-                ? 'No additional route history yet.'
-                : 'Observed routes you start using will continue to build history here.',
-            style: Theme.of(context).textTheme.bodyMedium,
-          )
-        else
-          ListView.separated(
-            itemCount: remainingRecords.length,
-            shrinkWrap: true,
-            physics: const NeverScrollableScrollPhysics(),
-            separatorBuilder: (_, _) => const SizedBox(height: 8),
-            itemBuilder: (context, index) {
-              return _buildHistoryRecordTile(remainingRecords[index]);
-            },
-          ),
+        const SizedBox(height: 24),
       ],
     );
   }
@@ -884,57 +625,28 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
           bottom: const TabBar(
             tabs: [
               Tab(text: 'Build'),
-              Tab(text: 'History'),
+              Tab(text: 'Info'),
             ],
           ),
         ),
         body: SafeArea(
           child: Padding(
             padding: const EdgeInsets.fromLTRB(16, 16, 16, 0),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
+            child: TabBarView(
               children: [
-                Text(
-                  'Plan the route on its own screen, then save it once the preview looks right.',
-                  style: Theme.of(context).textTheme.bodyMedium,
+                ListView(
+                  children: [
+                    _buildBuilderTab(
+                      routeCandidates: routeCandidates,
+                    ),
+                    const SizedBox(height: 24),
+                  ],
                 ),
-                const SizedBox(height: 16),
-                Expanded(
-                  child: TabBarView(
-                    children: [
-                      ListView(
-                        children: [
-                          _buildBuilderTab(
-                            routeCandidates: routeCandidates,
-                            mapPoints: mapPoints,
-                            routePoints: routePoints,
-                          ),
-                          const SizedBox(height: 16),
-                          _AutomationRoutingInfo(
-                            isExpanded: _showRoutingInfo,
-                            onToggle: () {
-                              setState(() {
-                                _showRoutingInfo = !_showRoutingInfo;
-                              });
-                            },
-                            autoRouteRotationEnabled:
-                                appProvider.autoRouteRotationEnabled,
-                            nearestRelayFallbackEnabled:
-                                appProvider.nearestRelayFallbackEnabled,
-                            clearPathOnMaxRetry:
-                                appProvider.clearPathOnMaxRetry,
-                          ),
-                          const SizedBox(height: 24),
-                        ],
-                      ),
-                      ListView(
-                        children: [
-                          _buildHistoryTab(),
-                          const SizedBox(height: 24),
-                        ],
-                      ),
-                    ],
-                  ),
+                _buildInfoTab(
+                  appProvider: appProvider,
+                  routeCandidates: routeCandidates,
+                  mapPoints: mapPoints,
+                  routePoints: routePoints,
                 ),
               ],
             ),
@@ -1009,14 +721,12 @@ class _RouteMarkerDot extends StatelessWidget {
 class _AutomationRoutingInfo extends StatelessWidget {
   final bool isExpanded;
   final VoidCallback onToggle;
-  final bool autoRouteRotationEnabled;
   final bool nearestRelayFallbackEnabled;
   final bool clearPathOnMaxRetry;
 
   const _AutomationRoutingInfo({
     required this.isExpanded,
     required this.onToggle,
-    required this.autoRouteRotationEnabled,
     required this.nearestRelayFallbackEnabled,
     required this.clearPathOnMaxRetry,
   });
@@ -1065,7 +775,7 @@ class _AutomationRoutingInfo extends StatelessWidget {
           if (isExpanded) ...[
             const SizedBox(height: 8),
             Text(
-              'Room/contact sends keep one selected path for the whole send chain, retry up to 5 total attempts with 1s, 2s, 4s, and 8s backoff, then try one final nearest repeater if everything else fails.',
+              'Room/contact sends use the current direct path when one is known, switch to flood on the last normal retry, then try one final nearest repeater if everything else fails.',
               style: Theme.of(context).textTheme.bodySmall,
             ),
             const SizedBox(height: 8),
@@ -1078,12 +788,6 @@ class _AutomationRoutingInfo extends StatelessWidget {
               spacing: 8,
               runSpacing: 8,
               children: [
-                _InfoChip(
-                  label: autoRouteRotationEnabled
-                      ? 'Auto route rotation on'
-                      : 'Auto route rotation off',
-                  icon: Icons.swap_horiz,
-                ),
                 _InfoChip(
                   label: nearestRelayFallbackEnabled
                       ? 'Nearest repeater fallback on'
@@ -1101,7 +805,7 @@ class _AutomationRoutingInfo extends StatelessWidget {
           ] else ...[
             const SizedBox(height: 6),
             Text(
-              'Shows retry, rotation, and final repeater fallback behavior.',
+              'Shows retry and final repeater fallback behavior.',
               style: Theme.of(context).textTheme.bodySmall,
             ),
           ],

lib/widgets/contacts/ping_contact_sheet.dart

@@ -0,0 +1,638 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:math' as math;
+import 'dart:typed_data';
+
+import 'package:audioplayers/audioplayers.dart';
+import 'package:flutter/material.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:provider/provider.dart';
+
+import '../../models/contact.dart';
+import '../../providers/connection_provider.dart';
+import '../../services/location_tracking_service.dart';
+import '../../utils/link_quality.dart';
+import '../../utils/time_ago_extensions.dart';
+
+class PingContactSheet extends StatefulWidget {
+  final Contact contact;
+
+  const PingContactSheet({super.key, required this.contact});
+
+  @override
+  State<PingContactSheet> createState() => _PingContactSheetState();
+}
+
+class _PingEntry {
+  final RelayPingResult result;
+  final DateTime timestamp;
+  final String? distance;
+
+  const _PingEntry({
+    required this.result,
+    required this.timestamp,
+    this.distance,
+  });
+}
+
+class _PingContactSheetState extends State<PingContactSheet> {
+  static const Duration _autoPingInterval = Duration(seconds: 2);
+  static const Duration _maxAutoPingDelay = Duration(seconds: 5);
+  static const int _maxHistoryEntries = 24;
+  static const double _maxHistoryHeight = 320;
+  static const Duration _timeoutPenalty = Duration(seconds: 10);
+
+  bool _pinging = false;
+  bool _autoPingEnabled = false;
+  final List<_PingEntry> _history = [];
+  final _PingCuePlayer _cuePlayer = _PingCuePlayer();
+  Timer? _autoPingTimer;
+
+  @override
+  void initState() {
+    super.initState();
+    _doPing();
+  }
+
+  @override
+  void dispose() {
+    _autoPingTimer?.cancel();
+    _cuePlayer.dispose();
+    super.dispose();
+  }
+
+  Future<void> _doPing() async {
+    if (_pinging) {
+      return;
+    }
+    setState(() => _pinging = true);
+    final connectionProvider = context.read<ConnectionProvider>();
+    final distance = _distanceText();
+    final result = await connectionProvider.pingRelay(widget.contact);
+    if (!mounted) return;
+    setState(() {
+      _pinging = false;
+      _history.insert(
+        0,
+        _PingEntry(
+          result: result,
+          timestamp: DateTime.now(),
+          distance: distance,
+        ),
+      );
+      if (_history.length > _maxHistoryEntries) {
+        _history.removeRange(_maxHistoryEntries, _history.length);
+      }
+    });
+    await _maybePlayCue(result);
+    _scheduleNextAutoPing(result);
+  }
+
+  Future<void> _maybePlayCue(RelayPingResult result) async {
+    if (!_autoPingEnabled) {
+      return;
+    }
+
+    final previous = _history.length >= 2 ? _history[1].result : null;
+    await _cuePlayer.playCue(result, previous: previous);
+  }
+
+  void _setAutoPingEnabled(bool enabled) {
+    setState(() {
+      _autoPingEnabled = enabled;
+    });
+    _autoPingTimer?.cancel();
+    if (!enabled) {
+      return;
+    }
+    _scheduleNextAutoPing();
+  }
+
+  void _scheduleNextAutoPing([RelayPingResult? result]) {
+    _autoPingTimer?.cancel();
+    if (!_autoPingEnabled || !mounted) {
+      return;
+    }
+    final responseDelay = result == null
+        ? Duration.zero
+        : result.success
+        ? Duration(milliseconds: result.durationMs)
+        : _timeoutPenalty;
+    final nextDelay = _autoPingInterval + responseDelay;
+    final clampedDelay = nextDelay > _maxAutoPingDelay
+        ? _maxAutoPingDelay
+        : nextDelay;
+    _autoPingTimer = Timer(clampedDelay, () {
+      unawaited(_doPing());
+    });
+  }
+
+  String? _distanceText() {
+    final location = widget.contact.displayLocation;
+    if (location == null) return null;
+    final currentPosition = LocationTrackingService().currentPosition;
+    if (currentPosition == null) return null;
+    final meters = Geolocator.distanceBetween(
+      currentPosition.latitude,
+      currentPosition.longitude,
+      location.latitude,
+      location.longitude,
+    );
+    if (meters < 1000) return '${meters.round()} m';
+    if (meters < 10000) return '${(meters / 1000).toStringAsFixed(2)} km';
+    return '${(meters / 1000).toStringAsFixed(1)} km';
+  }
+
+  Widget _buildPill(
+    BuildContext context, {
+    required IconData icon,
+    required String label,
+    Color? iconColor,
+  }) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceContainerHighest.withValues(alpha: 0.75),
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(icon, size: 12, color: iconColor ?? colorScheme.onSurfaceVariant),
+          const SizedBox(width: 4),
+          Text(
+            label,
+            style: Theme.of(context).textTheme.labelSmall?.copyWith(
+              color: colorScheme.onSurfaceVariant,
+              fontWeight: FontWeight.w700,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSnrPill(BuildContext context, String direction, double snrDb) {
+    final quality = linkQualityLabel(null, snrDb);
+    final color = linkQualityColor(quality);
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      decoration: BoxDecoration(
+        color: color.withValues(alpha: 0.15),
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(
+            direction == 'there'
+                ? Icons.arrow_upward_rounded
+                : Icons.arrow_downward_rounded,
+            size: 12,
+            color: color,
+          ),
+          const SizedBox(width: 4),
+          Text(
+            '${snrDb.toStringAsFixed(1)} dB',
+            style: Theme.of(context).textTheme.labelSmall?.copyWith(
+              color: color,
+              fontWeight: FontWeight.w700,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildResultRow(BuildContext context, _PingEntry entry, int seq) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final r = entry.result;
+    final age = DateTime.now().difference(entry.timestamp);
+    final timeAgo = age.toLocalizedTimeAgoWithSeconds(context);
+
+    if (!r.success) {
+      return Padding(
+        padding: const EdgeInsets.symmetric(vertical: 8),
+        child: Row(
+          children: [
+            CircleAvatar(
+              radius: 12,
+              backgroundColor: colorScheme.error.withValues(alpha: 0.15),
+              child: Text(
+                '$seq',
+                style: TextStyle(
+                  color: colorScheme.error,
+                  fontSize: 10,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ),
+            const SizedBox(width: 10),
+            Text(
+              'Timeout',
+              style: theme.textTheme.bodySmall?.copyWith(
+                color: colorScheme.error,
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+            const Spacer(),
+            Text(
+              timeAgo,
+              style: theme.textTheme.labelSmall?.copyWith(
+                color: colorScheme.onSurfaceVariant.withValues(alpha: 0.6),
+              ),
+            ),
+          ],
+        ),
+      );
+    }
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 6),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              CircleAvatar(
+                radius: 12,
+                backgroundColor: colorScheme.surfaceContainerHighest,
+                child: Text(
+                  '$seq',
+                  style: TextStyle(
+                    color: colorScheme.onSurfaceVariant,
+                    fontSize: 10,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              ),
+              const SizedBox(width: 10),
+              _buildPill(
+                context,
+                icon: Icons.timer_outlined,
+                label: '${r.durationMs} ms',
+              ),
+              const SizedBox(width: 6),
+              _buildSnrPill(context, 'there', r.snrThere),
+              const SizedBox(width: 6),
+              _buildSnrPill(context, 'back', r.snrBack),
+              const Spacer(),
+              Text(
+                timeAgo,
+                style: theme.textTheme.labelSmall?.copyWith(
+                  color: colorScheme.onSurfaceVariant.withValues(alpha: 0.6),
+                  fontSize: 10,
+                ),
+              ),
+            ],
+          ),
+          Padding(
+            padding: const EdgeInsets.only(left: 34, top: 4),
+            child: Row(
+              children: [
+                if (entry.distance != null) ...[
+                  Icon(
+                    Icons.straighten,
+                    size: 10,
+                    color: colorScheme.onSurfaceVariant.withValues(alpha: 0.5),
+                  ),
+                  const SizedBox(width: 3),
+                  Text(
+                    entry.distance!,
+                    style: theme.textTheme.labelSmall?.copyWith(
+                      color: colorScheme.onSurfaceVariant.withValues(alpha: 0.6),
+                      fontSize: 10,
+                    ),
+                  ),
+                  const SizedBox(width: 8),
+                ],
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+
+    return SafeArea(
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(16, 12, 16, 24),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    'Ping ${widget.contact.displayName}',
+                    style: theme.textTheme.titleLarge?.copyWith(
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ),
+                FilledButton.icon(
+                  onPressed: _pinging ? null : _doPing,
+                  icon: _pinging
+                      ? SizedBox(
+                          width: 16,
+                          height: 16,
+                          child: CircularProgressIndicator(
+                            strokeWidth: 2,
+                            color: colorScheme.onPrimary,
+                          ),
+                        )
+                      : const Icon(Icons.network_ping, size: 18),
+                  label: Text(_pinging ? 'Pinging...' : 'Ping again'),
+                ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            Text(
+              widget.contact.publicKeyShort,
+              style: theme.textTheme.bodySmall?.copyWith(
+                color: colorScheme.onSurfaceVariant,
+                fontFamily: 'monospace',
+              ),
+            ),
+            const SizedBox(height: 12),
+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+              decoration: BoxDecoration(
+                color: colorScheme.surfaceContainerLow,
+                borderRadius: BorderRadius.circular(16),
+                border: Border.all(
+                  color: colorScheme.outlineVariant.withValues(alpha: 0.4),
+                ),
+              ),
+              child: Row(
+                children: [
+                  Icon(
+                    _autoPingEnabled
+                        ? Icons.radar_rounded
+                        : Icons.radar_outlined,
+                    color: _autoPingEnabled
+                        ? colorScheme.primary
+                        : colorScheme.onSurfaceVariant,
+                  ),
+                  const SizedBox(width: 10),
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          'Auto ping',
+                          style: theme.textTheme.titleSmall?.copyWith(
+                            fontWeight: FontWeight.w700,
+                          ),
+                        ),
+                        Text(
+                          '2s sonar cues for there/back SNR',
+                          style: theme.textTheme.bodySmall?.copyWith(
+                            color: colorScheme.onSurfaceVariant,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  Switch.adaptive(
+                    value: _autoPingEnabled,
+                    onChanged: _setAutoPingEnabled,
+                  ),
+                ],
+              ),
+            ),
+            const SizedBox(height: 16),
+            if (_history.isEmpty && !_pinging)
+              Text(
+                'No ping results yet.',
+                style: theme.textTheme.bodyMedium?.copyWith(
+                  color: colorScheme.onSurfaceVariant,
+                ),
+              )
+            else
+              ConstrainedBox(
+                constraints: const BoxConstraints(
+                  maxHeight: _maxHistoryHeight,
+                ),
+                child: ListView.separated(
+                  shrinkWrap: true,
+                  itemCount: _history.length,
+                  separatorBuilder: (_, _) => Divider(
+                    height: 1,
+                    color: colorScheme.outlineVariant.withValues(alpha: 0.4),
+                  ),
+                  itemBuilder: (context, index) =>
+                      _buildResultRow(context, _history[index], index + 1),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _PingCuePlayer {
+  static const double _fairSnrThresholdDb = 0;
+
+  AudioPlayer? _player;
+
+  Future<void> playCue(
+    RelayPingResult result, {
+    RelayPingResult? previous,
+  }) async {
+    _player ??= AudioPlayer();
+    final player = _player!;
+    final filePath = await _writeCueFile(
+      result,
+      previous: previous,
+    );
+    await player.stop();
+    await player.setVolume(1.0);
+    await player.play(DeviceFileSource(filePath));
+  }
+
+  Future<String> _writeCueFile(
+    RelayPingResult result, {
+    RelayPingResult? previous,
+  }) async {
+    final tempDir = await getTemporaryDirectory();
+    final file = File('${tempDir.path}/ping_sonar_alert.wav');
+    final samples = _buildCueSamples(result, previous: previous);
+    final wavBytes = _buildWav(samples, sampleRate: 16000);
+    await file.writeAsBytes(wavBytes, flush: true);
+    return file.path;
+  }
+
+  Int16List _buildCueSamples(
+    RelayPingResult result, {
+    RelayPingResult? previous,
+  }) {
+    const sampleRate = 16000;
+    final segments = <double>[];
+    if (!result.success) {
+      segments.addAll(
+        _timeoutAlert(sampleRate),
+      );
+    } else {
+      segments.addAll(
+        _tone(
+          sampleRate,
+          frequencyHz: _frequencyForSnr(result.snrThere),
+          durationMs: 90,
+          amplitude: 0.42,
+        ),
+      );
+      segments.addAll(_silence(sampleRate, durationMs: 35));
+      segments.addAll(
+        _tone(
+          sampleRate,
+          frequencyHz: _frequencyForSnr(result.snrBack),
+          durationMs: 90,
+          amplitude: 0.42,
+        ),
+      );
+      final belowFair =
+          result.snrThere < _fairSnrThresholdDb &&
+          result.snrBack < _fairSnrThresholdDb;
+      final worsening =
+          previous != null &&
+          result.snrThere < previous.snrThere &&
+          result.snrBack < previous.snrBack;
+      if (belowFair && worsening) {
+        segments.addAll(_silence(sampleRate, durationMs: 40));
+        segments.addAll(
+          _descendingAlert(sampleRate, baseFrequencyHz: 520),
+        );
+      }
+    }
+    final pcm = Int16List(segments.length);
+    for (var i = 0; i < segments.length; i++) {
+      pcm[i] = (segments[i] * 32767).round().clamp(-32768, 32767);
+    }
+    return pcm;
+  }
+
+  double _frequencyForSnr(double snrDb) {
+    final clamped = snrDb.clamp(-12.0, 12.0);
+    final normalized = (clamped + 12.0) / 24.0;
+    return 320 + (normalized * 900);
+  }
+
+  List<double> _descendingAlert(int sampleRate, {required double baseFrequencyHz}) {
+    return <double>[
+      ..._tone(
+        sampleRate,
+        frequencyHz: baseFrequencyHz,
+        durationMs: 80,
+        amplitude: 0.44,
+      ),
+      ..._silence(sampleRate, durationMs: 30),
+      ..._tone(
+        sampleRate,
+        frequencyHz: baseFrequencyHz * 0.82,
+        durationMs: 110,
+        amplitude: 0.40,
+      ),
+    ];
+  }
+
+  List<double> _timeoutAlert(int sampleRate) {
+    return <double>[
+      ..._tone(
+        sampleRate,
+        frequencyHz: 240,
+        durationMs: 180,
+        amplitude: 0.46,
+      ),
+      ..._silence(sampleRate, durationMs: 60),
+      ..._tone(
+        sampleRate,
+        frequencyHz: 180,
+        durationMs: 220,
+        amplitude: 0.52,
+      ),
+    ];
+  }
+
+  List<double> _tone(
+    int sampleRate, {
+    required double frequencyHz,
+    required int durationMs,
+    required double amplitude,
+  }) {
+    final sampleCount = (sampleRate * durationMs / 1000).round();
+    return List<double>.generate(sampleCount, (index) {
+      final t = index / sampleRate;
+      final envelope = math.sin(math.pi * index / sampleCount);
+      return math.sin(2 * math.pi * frequencyHz * t) * amplitude * envelope;
+    });
+  }
+
+  List<double> _silence(int sampleRate, {required int durationMs}) {
+    final sampleCount = (sampleRate * durationMs / 1000).round();
+    return List<double>.filled(sampleCount, 0);
+  }
+
+  Uint8List _buildWav(Int16List samples, {required int sampleRate}) {
+    const numChannels = 1;
+    const bitsPerSample = 16;
+    const audioFormat = 1;
+    final dataSize = samples.length * 2;
+    final byteRate = sampleRate * numChannels * bitsPerSample ~/ 8;
+    final blockAlign = numChannels * bitsPerSample ~/ 8;
+    final totalSize = 36 + dataSize;
+    final buffer = ByteData(44 + dataSize);
+    var offset = 0;
+
+    void writeString(String value) {
+      for (final codeUnit in value.codeUnits) {
+        buffer.setUint8(offset++, codeUnit);
+      }
+    }
+
+    void writeUint32(int value) {
+      buffer.setUint32(offset, value, Endian.little);
+      offset += 4;
+    }
+
+    void writeUint16(int value) {
+      buffer.setUint16(offset, value, Endian.little);
+      offset += 2;
+    }
+
+    writeString('RIFF');
+    writeUint32(totalSize);
+    writeString('WAVE');
+    writeString('fmt ');
+    writeUint32(16);
+    writeUint16(audioFormat);
+    writeUint16(numChannels);
+    writeUint32(sampleRate);
+    writeUint32(byteRate);
+    writeUint16(blockAlign);
+    writeUint16(bitsPerSample);
+    writeString('data');
+    writeUint32(dataSize);
+
+    for (final sample in samples) {
+      buffer.setInt16(offset, sample, Endian.little);
+      offset += 2;
+    }
+
+    return buffer.buffer.asUint8List();
+  }
+
+  void dispose() {
+    _player?.dispose();
+  }
+}

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
-    final compassStream = FlutterCompass.events;
+    // Subscribe to compass updates on supported targets only.
+    final compassStream = CompassSupport.isAvailable
+        ? FlutterCompass.events
+        : null;
     if (compassStream != null) {
-      _compassSubscription = compassStream.listen((event) {
-        if (mounted && event.heading != null) {
-          setState(() {
-            _currentHeading = event.heading;
-            _compassAccuracy = event.accuracy;
-          });
-        }
-      });
+      _compassSubscription = compassStream.listen(
+        (event) {
+          if (mounted && event.heading != null) {
+            setState(() {
+              _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/polygon_draw_handler.dart

@@ -0,0 +1,303 @@
+import 'dart:math' show log, ln2;
+
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:provider/provider.dart';
+
+import '../../providers/offline_tiles_provider.dart';
+
+/// Renders polygon/rectangle drawing interaction on the map.
+///
+/// Shows completed polygons, in-progress vertices, and handles tap events.
+class PolygonDrawLayer extends StatelessWidget {
+  const PolygonDrawLayer({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<OfflineTilesProvider>(
+      builder: (context, provider, _) {
+        final polygons = <Polygon>[];
+        final markers = <Marker>[];
+
+        // Completed polygons
+        for (int i = 0; i < provider.polygons.length; i++) {
+          final poly = provider.polygons[i];
+          polygons.add(Polygon(
+            points: poly,
+            color: Colors.blue.withValues(alpha: 0.2),
+            borderColor: Colors.blue,
+            borderStrokeWidth: 2,
+          ));
+        }
+
+        // In-progress polygon vertices
+        if (provider.drawingMode == DrawingMode.polygon &&
+            provider.currentVertices.isNotEmpty) {
+          final verts = provider.currentVertices;
+
+          // Draw lines between vertices
+          if (verts.length >= 2) {
+            polygons.add(Polygon(
+              points: verts,
+              color: Colors.orange.withValues(alpha: 0.1),
+              borderColor: Colors.orange,
+              borderStrokeWidth: 2,
+            ));
+          }
+
+          // Draw vertex markers
+          for (final v in verts) {
+            markers.add(Marker(
+              point: v,
+              width: 12,
+              height: 12,
+              child: Container(
+                decoration: BoxDecoration(
+                  color: Colors.orange,
+                  shape: BoxShape.circle,
+                  border: Border.all(color: Colors.white, width: 2),
+                ),
+              ),
+            ));
+          }
+        }
+
+        // Rectangle first corner marker
+        if (provider.drawingMode == DrawingMode.rectangle &&
+            provider.rectangleFirstCorner != null) {
+          markers.add(Marker(
+            point: provider.rectangleFirstCorner!,
+            width: 14,
+            height: 14,
+            child: Container(
+              decoration: BoxDecoration(
+                color: Colors.orange,
+                shape: BoxShape.rectangle,
+                border: Border.all(color: Colors.white, width: 2),
+              ),
+            ),
+          ));
+        }
+
+        return Stack(
+          children: [
+            if (polygons.isNotEmpty) PolygonLayer(polygons: polygons),
+            if (markers.isNotEmpty) MarkerLayer(markers: markers),
+          ],
+        );
+      },
+    );
+  }
+}
+
+/// Renders the download progress overlay tiles.
+class DownloadProgressLayer extends StatelessWidget {
+  const DownloadProgressLayer({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<OfflineTilesProvider>(
+      builder: (context, provider, _) {
+        if (provider.tileOverlays.isEmpty) return const SizedBox.shrink();
+
+        final polygons = provider.tileOverlays.map((overlay) {
+          return Polygon(
+            points: [
+              LatLng(overlay.north, overlay.west),
+              LatLng(overlay.north, overlay.east),
+              LatLng(overlay.south, overlay.east),
+              LatLng(overlay.south, overlay.west),
+            ],
+            color: overlay.isSkipped
+                ? Colors.green.withValues(alpha: 0.15)
+                : Colors.orange.withValues(alpha: 0.15),
+            borderColor:
+                overlay.isSkipped ? Colors.green : Colors.orange,
+            borderStrokeWidth: 1,
+          );
+        }).toList();
+
+        return PolygonLayer(polygons: polygons);
+      },
+    );
+  }
+}
+
+/// Renders the coverage overlay for a cached style.
+///
+/// Only renders tiles at the zoom level closest to the current map zoom
+/// to avoid drawing thousands of rectangles at once.
+class CoverageLayer extends StatelessWidget {
+  final double currentZoom;
+
+  const CoverageLayer({super.key, required this.currentZoom});
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<OfflineTilesProvider>(
+      builder: (context, provider, _) {
+        if (provider.coverageOverlays.isEmpty) {
+          return const SizedBox.shrink();
+        }
+
+        // Filter to tiles near the current zoom level to keep rendering fast.
+        // Show the zoom level that's <= current map zoom (best visual match).
+        final targetZoom = currentZoom.floor();
+
+        // Group overlays by approximate zoom level based on tile size.
+        // A tile at zoom z covers roughly (360/2^z) degrees of longitude.
+        // We filter by checking if the tile width matches the target zoom.
+        final filtered = <Polygon>[];
+        for (final overlay in provider.coverageOverlays) {
+          // Estimate the zoom level from the tile's longitude span
+          final lonSpan = (overlay.east - overlay.west).abs();
+          if (lonSpan <= 0) continue;
+          final estimatedZoom = (log(360.0 / lonSpan) / ln2).round();
+
+          if (estimatedZoom == targetZoom ||
+              estimatedZoom == targetZoom - 1 ||
+              estimatedZoom == targetZoom + 1) {
+            filtered.add(Polygon(
+              points: [
+                LatLng(overlay.north, overlay.west),
+                LatLng(overlay.north, overlay.east),
+                LatLng(overlay.south, overlay.east),
+                LatLng(overlay.south, overlay.west),
+              ],
+              color: Colors.blue.withValues(alpha: 0.1),
+              borderColor: Colors.blue.withValues(alpha: 0.4),
+              borderStrokeWidth: 1,
+            ));
+          }
+
+          // Cap at 1000 visible tiles to avoid jank
+          if (filtered.length >= 1000) break;
+        }
+
+        if (filtered.isEmpty) return const SizedBox.shrink();
+        return PolygonLayer(polygons: filtered);
+      },
+    );
+  }
+}
+
+/// Toolbar for drawing controls.
+class DrawingToolbar extends StatelessWidget {
+  const DrawingToolbar({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<OfflineTilesProvider>(
+      builder: (context, provider, _) {
+        if (provider.isDownloading) return const SizedBox.shrink();
+
+        return Positioned(
+          right: 16,
+          top: 100,
+          child: Column(
+            children: [
+              _ToolButton(
+                icon: Icons.crop_square,
+                label: 'Rectangle',
+                isActive: provider.drawingMode == DrawingMode.rectangle,
+                onTap: () => provider.setDrawingMode(
+                  provider.drawingMode == DrawingMode.rectangle
+                      ? DrawingMode.none
+                      : DrawingMode.rectangle,
+                ),
+              ),
+              const SizedBox(height: 8),
+              _ToolButton(
+                icon: Icons.pentagon_outlined,
+                label: 'Polygon',
+                isActive: provider.drawingMode == DrawingMode.polygon,
+                onTap: () => provider.setDrawingMode(
+                  provider.drawingMode == DrawingMode.polygon
+                      ? DrawingMode.none
+                      : DrawingMode.polygon,
+                ),
+              ),
+              if (provider.drawingMode == DrawingMode.polygon &&
+                  provider.currentVertices.length >= 3) ...[
+                const SizedBox(height: 8),
+                _ToolButton(
+                  icon: Icons.check,
+                  label: 'Finish',
+                  isActive: false,
+                  color: Colors.green,
+                  onTap: () => provider.finishPolygon(),
+                ),
+              ],
+              if (provider.drawingMode == DrawingMode.polygon &&
+                  provider.currentVertices.isNotEmpty) ...[
+                const SizedBox(height: 8),
+                _ToolButton(
+                  icon: Icons.undo,
+                  label: 'Undo',
+                  isActive: false,
+                  onTap: () => provider.undoLastVertex(),
+                ),
+              ],
+              if (provider.hasPolygons) ...[
+                const SizedBox(height: 8),
+                _ToolButton(
+                  icon: Icons.delete_outline,
+                  label: 'Clear',
+                  isActive: false,
+                  color: Colors.red,
+                  onTap: () => provider.clearPolygons(),
+                ),
+              ],
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _ToolButton extends StatelessWidget {
+  final IconData icon;
+  final String label;
+  final bool isActive;
+  final Color? color;
+  final VoidCallback onTap;
+
+  const _ToolButton({
+    required this.icon,
+    required this.label,
+    required this.isActive,
+    this.color,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final activeColor = color ?? theme.colorScheme.primary;
+
+    return Tooltip(
+      message: label,
+      child: Material(
+        elevation: 2,
+        shape: const CircleBorder(),
+        color: isActive ? activeColor : theme.colorScheme.surface,
+        child: InkWell(
+          customBorder: const CircleBorder(),
+          onTap: onTap,
+          child: SizedBox(
+            width: 48,
+            height: 48,
+            child: Icon(
+              icon,
+              color: isActive
+                  ? theme.colorScheme.onPrimary
+                  : (color ?? theme.colorScheme.onSurface),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

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

@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter/gestures.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
 import '../../models/contact.dart';
 import '../../models/message.dart';
 import '../../models/sar_marker.dart';
@@ -10,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';
@@ -31,6 +34,7 @@ import '../../l10n/app_localizations.dart';
 import '../../utils/message_extensions.dart';
 import '../../utils/log_rx_route_decoder.dart';
 import '../../models/message_transfer_details.dart';
+import '../../screens/add_contact_screen.dart';
 import 'voice_message_bubble.dart';
 import 'image_message_bubble.dart';
 import 'tictactoe_message_bubble.dart';
@@ -72,9 +76,28 @@ class MessageBubble extends StatefulWidget {
 }
 
 class _MessageBubbleState extends State<MessageBubble> {
+  static const int _meshcoreAdvertMinBytes = 98;
   static final RegExp _mentionPattern = RegExp(r'@\[(.+?)\]');
+  static final RegExp _linkPattern = RegExp(
+    r'(?:(?:https?:\/\/)|(?:www\.)|(?:meshcore:\/\/))[^\s<]+',
+    caseSensitive: false,
+  );
+  static final RegExp _rawMeshcoreAdvertPattern = RegExp(
+    r'(?<![0-9a-fA-F])[0-9a-fA-F]{196,}(?![0-9a-fA-F])',
+  );
+  static final RegExp _messageTokenPattern = RegExp(
+    r'@\[(.+?)\]|(?:(?:https?:\/\/)|(?:www\.)|(?:meshcore:\/\/))[^\s<]+|(?<![0-9a-fA-F])[0-9a-fA-F]{196,}(?![0-9a-fA-F])',
+    caseSensitive: false,
+  );
   bool _isExpanded = false;
   bool _showReceivedStats = false;
+  final List<TapGestureRecognizer> _linkRecognizers = [];
+
+  @override
+  void dispose() {
+    _disposeLinkRecognizers();
+    super.dispose();
+  }
 
   @override
   void didUpdateWidget(MessageBubble oldWidget) {
@@ -100,14 +123,108 @@ class _MessageBubbleState extends State<MessageBubble> {
     });
   }
 
+  void _disposeLinkRecognizers() {
+    for (final recognizer in _linkRecognizers) {
+      recognizer.dispose();
+    }
+    _linkRecognizers.clear();
+  }
+
+  String _trimTrailingUrlPunctuation(String value) {
+    var trimmed = value;
+    while (trimmed.isNotEmpty) {
+      final lastChar = trimmed[trimmed.length - 1];
+      final shouldTrim = switch (lastChar) {
+        '.' || ',' || '!' || '?' || ':' || ';' => true,
+        ')' => '('.allMatches(trimmed).length < ')'.allMatches(trimmed).length,
+        ']' => '['.allMatches(trimmed).length < ']'.allMatches(trimmed).length,
+        '}' => '{'.allMatches(trimmed).length < '}'.allMatches(trimmed).length,
+        _ => false,
+      };
+      if (!shouldTrim) {
+        break;
+      }
+      trimmed = trimmed.substring(0, trimmed.length - 1);
+    }
+    return trimmed;
+  }
+
+  Uri? _parseMessageLink(String value) {
+    final trimmed = _trimTrailingUrlPunctuation(value);
+    if (trimmed.isEmpty) {
+      return null;
+    }
+
+    if (_isRawMeshcoreAdvert(trimmed)) {
+      return Uri.parse('meshcore://$trimmed');
+    }
+
+    final normalized = trimmed.startsWith('www.')
+        ? 'https://$trimmed'
+        : trimmed;
+    final uri = Uri.tryParse(normalized);
+    if (uri == null || !uri.hasScheme || uri.host.isEmpty) {
+      return null;
+    }
+
+    return uri;
+  }
+
+  bool _isRawMeshcoreAdvert(String value) {
+    if (!_rawMeshcoreAdvertPattern.hasMatch(value)) {
+      return false;
+    }
+    return value.length.isEven && value.length >= _meshcoreAdvertMinBytes * 2;
+  }
+
+  Future<void> _openMessageLink(String rawUrl) async {
+    final uri = _parseMessageLink(rawUrl);
+    if (uri == null) {
+      ToastLogger.error(context, 'Invalid link');
+      return;
+    }
+
+    if (uri.scheme.toLowerCase() == 'meshcore') {
+      if (!mounted) {
+        return;
+      }
+      await Navigator.of(context).push(
+        MaterialPageRoute(
+          builder: (context) => AddContactScreen(initialAdvert: rawUrl),
+        ),
+      );
+      return;
+    }
+
+    try {
+      if (!await canLaunchUrl(uri)) {
+        if (!mounted) {
+          return;
+        }
+        ToastLogger.error(context, 'Cannot open link');
+        return;
+      }
+
+      await launchUrl(uri, mode: LaunchMode.externalApplication);
+    } catch (error) {
+      if (!mounted) {
+        return;
+      }
+      ToastLogger.error(context, 'Failed to open link');
+    }
+  }
+
   Widget _buildMessageTextContent(String text, TextStyle? baseBodyStyle) {
-    final matches = _mentionPattern.allMatches(text).toList();
+    _disposeLinkRecognizers();
+
+    final matches = _messageTokenPattern.allMatches(text).toList();
     if (matches.isEmpty) {
       return Text(text, style: baseBodyStyle);
     }
 
     final textColor =
         baseBodyStyle?.color ?? Theme.of(context).colorScheme.onSurface;
+    final linkColor = Theme.of(context).colorScheme.primary;
     final mentionFontSize = (baseBodyStyle?.fontSize ?? 14) - 1;
     final backgroundColor = Theme.of(
       context,
@@ -129,8 +246,9 @@ class _MessageBubbleState extends State<MessageBubble> {
         );
       }
 
+      final rawMatch = match.group(0) ?? '';
       final mentionName = match.group(1)?.trim() ?? '';
-      if (mentionName.isNotEmpty) {
+      if (_mentionPattern.hasMatch(rawMatch) && mentionName.isNotEmpty) {
         spans.add(
           WidgetSpan(
             alignment: PlaceholderAlignment.middle,
@@ -154,8 +272,34 @@ class _MessageBubbleState extends State<MessageBubble> {
             ),
           ),
         );
+      } else if (_linkPattern.hasMatch(rawMatch) ||
+          _isRawMeshcoreAdvert(rawMatch)) {
+        final trimmedUrl = _trimTrailingUrlPunctuation(rawMatch);
+        final trailingText = rawMatch.substring(trimmedUrl.length);
+        final uri = _parseMessageLink(rawMatch);
+        if (uri != null) {
+          final recognizer = TapGestureRecognizer()
+            ..onTap = () => _openMessageLink(rawMatch);
+          _linkRecognizers.add(recognizer);
+          spans.add(
+            TextSpan(
+              text: trimmedUrl,
+              style: baseBodyStyle?.copyWith(
+                color: linkColor,
+                decoration: TextDecoration.underline,
+                decorationColor: linkColor,
+              ),
+              recognizer: recognizer,
+            ),
+          );
+          if (trailingText.isNotEmpty) {
+            spans.add(TextSpan(text: trailingText, style: baseBodyStyle));
+          }
+        } else {
+          spans.add(TextSpan(text: rawMatch, style: baseBodyStyle));
+        }
       } else {
-        spans.add(TextSpan(text: match.group(0), style: baseBodyStyle));
+        spans.add(TextSpan(text: rawMatch, style: baseBodyStyle));
       }
 
       cursor = match.end;
@@ -1812,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);
@@ -1861,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
@@ -1896,15 +2042,30 @@ class _MessageBubbleState extends State<MessageBubble> {
         }
       }
     } else if (message.isChannelMessage) {
-      if (message.channelIdx == 0) {
-        channelDisplayName = AppLocalizations.of(context)!.publicChannel;
+      final channelIdx = message.channelIdx ?? 0;
+      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) ??
-            '${AppLocalizations.of(context)!.channel} ${message.channelIdx}';
+            syncedChannelDisplayName ??
+            (contactChannelDisplayName != null &&
+                    contactChannelDisplayName.isNotEmpty
+                ? contactChannelDisplayName
+                : null) ??
+            syncedChannel?.displayName ??
+            '${l10n.channel} $channelIdx';
       }
 
       if (isOwnMessage) {
@@ -1914,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/message_bubble_header.dart

@@ -88,24 +88,26 @@ Widget buildBubbleMetaFooter(
         ).textTheme.labelSmall?.copyWith(color: metaColor),
       ),
     ]);
-  } else if (!isSarMarker && _effectivePathLen(message, routeMetadata) < 255) {
-    final effectivePathLen = _effectivePathLen(message, routeMetadata);
-    items.addAll([
-      Icon(Icons.alt_route, size: 11, color: metaColor),
-      const SizedBox(width: 3),
-      Text(
-        effectivePathLen == 0 ? 'direct' : '${effectivePathLen}hop',
-        style: Theme.of(
-          context,
-        ).textTheme.labelSmall?.copyWith(color: metaColor),
-      ),
-      Text(
-        ' • ',
-        style: Theme.of(
-          context,
-        ).textTheme.labelSmall?.copyWith(color: metaColor),
-      ),
-    ]);
+  } else if (!isSarMarker) {
+    final routeLabel = _effectiveRouteFooterLabel(message, routeMetadata);
+    if (routeLabel != null) {
+      items.addAll([
+        Icon(Icons.alt_route, size: 11, color: metaColor),
+        const SizedBox(width: 3),
+        Text(
+          routeLabel,
+          style: Theme.of(
+            context,
+          ).textTheme.labelSmall?.copyWith(color: metaColor),
+        ),
+        Text(
+          ' • ',
+          style: Theme.of(
+            context,
+          ).textTheme.labelSmall?.copyWith(color: metaColor),
+        ),
+      ]);
+    }
   }
 
   items.add(
@@ -127,8 +129,31 @@ Widget buildBubbleMetaFooter(
   );
 }
 
-int _effectivePathLen(Message message, MessageRouteMetadata? routeMetadata) =>
-    routeMetadata?.hopCount ?? message.pathLen;
+String? _effectiveRouteFooterLabel(
+  Message message,
+  MessageRouteMetadata? routeMetadata,
+) {
+  if (routeMetadata?.mode.name == 'flood') {
+    return 'flood';
+  }
+
+  final effectivePathLen = _effectivePathLen(message, routeMetadata);
+  if (effectivePathLen >= 255) {
+    return null;
+  }
+
+  return effectivePathLen == 0 ? 'direct' : '${effectivePathLen}hop';
+}
+
+int _effectivePathLen(Message message, MessageRouteMetadata? routeMetadata) {
+  if (routeMetadata?.hopCount != null) {
+    return routeMetadata!.hopCount!;
+  }
+  if (routeMetadata?.mode.name == 'flood') {
+    return 255;
+  }
+  return message.pathLen;
+}
 
 Widget buildChannelHeaderPill(
   BuildContext context, {

lib/widgets/messages/messages_composer.dart

@@ -19,6 +19,7 @@ class MessagesComposer extends StatelessWidget {
   final double bottomPadding;
   final String destinationLabel;
   final Widget destinationAvatar;
+  final bool destinationLocked;
   final List<Contact> mentionSuggestions;
   final String mentionQuery;
   final ValueChanged<Contact> onMentionSelected;
@@ -27,6 +28,9 @@ class MessagesComposer extends StatelessWidget {
   final Future<void> Function() onStartVoiceRecording;
   final Future<void> Function() onStopAndSendVoice;
   final Future<void> Function() onSendMessage;
+  final VoidCallback? onLongPressSend;
+  final String? regionScopeName;
+  final VoidCallback? onRegionScopeTap;
 
   const MessagesComposer({
     super.key,
@@ -41,6 +45,7 @@ class MessagesComposer extends StatelessWidget {
     required this.bottomPadding,
     required this.destinationLabel,
     required this.destinationAvatar,
+    required this.destinationLocked,
     required this.mentionSuggestions,
     required this.mentionQuery,
     required this.onMentionSelected,
@@ -49,6 +54,9 @@ class MessagesComposer extends StatelessWidget {
     required this.onStartVoiceRecording,
     required this.onStopAndSendVoice,
     required this.onSendMessage,
+    this.onLongPressSend,
+    this.regionScopeName,
+    this.onRegionScopeTap,
   });
 
   @override
@@ -102,12 +110,23 @@ 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(
+                            child: _DestinationPill(
                               destinationLabel: destinationLabel,
                               destinationAvatar: destinationAvatar,
-                              onTap: onShowRecipientSelector,
+                              isLocked: destinationLocked,
+                              onTap: destinationLocked
+                                  ? null
+                                  : onShowRecipientSelector,
                             ),
                           ),
                         ],
@@ -151,6 +170,7 @@ class MessagesComposer extends StatelessWidget {
                                 messageByteCount: messageByteCount,
                                 maxMessageBytes: maxMessageBytes,
                                 onSendMessage: onSendMessage,
+                                onLongPressSend: onLongPressSend,
                                 onStartVoiceRecording: onStartVoiceRecording,
                                 onStopAndSendVoice: onStopAndSendVoice,
                               ),
@@ -282,59 +302,73 @@ class _ComposerActionButton extends StatelessWidget {
   }
 }
 
-class _DestinationSelector extends StatelessWidget {
+class _DestinationPill extends StatelessWidget {
   final String destinationLabel;
   final Widget destinationAvatar;
-  final VoidCallback onTap;
+  final bool isLocked;
+  final VoidCallback? onTap;
 
-  const _DestinationSelector({
+  const _DestinationPill({
     required this.destinationLabel,
     required this.destinationAvatar,
-    required this.onTap,
+    required this.isLocked,
+    this.onTap,
   });
 
   @override
   Widget build(BuildContext context) {
+    final content = Ink(
+      key: ValueKey(
+        isLocked
+            ? 'messages_composer_destination_locked'
+            : 'messages_composer_destination_selector',
+      ),
+      height: 40,
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surface,
+        borderRadius: BorderRadius.circular(20),
+        border: Border.all(
+          color: Theme.of(context).dividerColor.withValues(alpha: 0.35),
+        ),
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 12),
+        child: Row(
+          children: [
+            destinationAvatar,
+            const SizedBox(width: 8),
+            Expanded(
+              child: Text(
+                destinationLabel,
+                overflow: TextOverflow.ellipsis,
+                style: TextStyle(
+                  fontSize: 14,
+                  fontWeight: FontWeight.w600,
+                  color: Theme.of(context).colorScheme.onSurface,
+                ),
+              ),
+            ),
+            if (!isLocked)
+              Icon(
+                Icons.expand_more_rounded,
+                size: 18,
+                color: Theme.of(context).colorScheme.onSurfaceVariant,
+              ),
+          ],
+        ),
+      ),
+    );
+
+    if (onTap == null) {
+      return Material(color: Colors.transparent, child: content);
+    }
+
     return Material(
       color: Colors.transparent,
       child: InkWell(
         borderRadius: BorderRadius.circular(20),
         onTap: onTap,
-        child: Ink(
-          height: 40,
-          decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.surface,
-            borderRadius: BorderRadius.circular(20),
-            border: Border.all(
-              color: Theme.of(context).dividerColor.withValues(alpha: 0.35),
-            ),
-          ),
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 12),
-            child: Row(
-              children: [
-                destinationAvatar,
-                const SizedBox(width: 8),
-                Expanded(
-                  child: Text(
-                    destinationLabel,
-                    overflow: TextOverflow.ellipsis,
-                    style: TextStyle(
-                      fontSize: 14,
-                      fontWeight: FontWeight.w600,
-                      color: Theme.of(context).colorScheme.onSurface,
-                    ),
-                  ),
-                ),
-                Icon(
-                  Icons.expand_more_rounded,
-                  size: 18,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
-              ],
-            ),
-          ),
-        ),
+        child: content,
       ),
     );
   }
@@ -421,6 +455,7 @@ class _SendButton extends StatelessWidget {
   final int messageByteCount;
   final int maxMessageBytes;
   final Future<void> Function() onSendMessage;
+  final VoidCallback? onLongPressSend;
   final Future<void> Function() onStartVoiceRecording;
   final Future<void> Function() onStopAndSendVoice;
 
@@ -433,6 +468,7 @@ class _SendButton extends StatelessWidget {
     required this.messageByteCount,
     required this.maxMessageBytes,
     required this.onSendMessage,
+    this.onLongPressSend,
     required this.onStartVoiceRecording,
     required this.onStopAndSendVoice,
   });
@@ -444,28 +480,32 @@ class _SendButton extends StatelessWidget {
       enabled: canSendText || (voiceSupported && !isSendingVoice),
       label: semanticsLabel,
       onTap: canSendText ? onSendMessage : null,
-      onLongPress: (voiceSupported && !isSendingVoice)
-          ? () {
-              if (isRecording) {
-                onStopAndSendVoice();
-                return;
-              }
-              onStartVoiceRecording();
-            }
-          : null,
+      onLongPress: canSendText && onLongPressSend != null
+          ? onLongPressSend
+          : (voiceSupported && !isSendingVoice)
+              ? () {
+                  if (isRecording) {
+                    onStopAndSendVoice();
+                    return;
+                  }
+                  onStartVoiceRecording();
+                }
+              : null,
       child: Tooltip(
         message: semanticsLabel,
         excludeFromSemantics: true,
         child: GestureDetector(
           excludeFromSemantics: true,
           onTap: canSendText ? onSendMessage : null,
-          onLongPressStart: (voiceSupported && !isSendingVoice)
-              ? (_) => onStartVoiceRecording()
-              : null,
-          onLongPressEnd: (voiceSupported && isRecording)
+          onLongPressStart: canSendText && onLongPressSend != null
+              ? (_) => onLongPressSend!()
+              : (voiceSupported && !isSendingVoice)
+                  ? (_) => onStartVoiceRecording()
+                  : null,
+          onLongPressEnd: (!canSendText && voiceSupported && isRecording)
               ? (_) => onStopAndSendVoice()
               : null,
-          onLongPressCancel: (voiceSupported && isRecording)
+          onLongPressCancel: (!canSendText && voiceSupported && isRecording)
               ? onStopAndSendVoice
               : null,
           child: Column(
@@ -534,3 +574,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(
-                        l10n.selectRecipient,
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                          fontWeight: FontWeight.w900,
-                          letterSpacing: -0.5,
-                        ),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            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(
-                      onPressed: () => Navigator.pop(context),
-                      tooltip: l10n.close,
-                      icon: const Icon(Icons.close_rounded),
+                    Container(
+                      decoration: BoxDecoration(
+                        color: colorScheme.surfaceContainerHigh,
+                        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(
-                          context: context,
-                          type: 'channel',
-                          contact: channel,
-                          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);
-                          },
+                        _buildChannelRecipientCard(
+                          context,
+                          channel,
+                          messagesProvider,
                         ),
                     ],
                   ),
@@ -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,
-                height: 38,
+                width: compact ? 34 : 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(
-                  horizontal: 10,
-                  vertical: 5,
+                padding: EdgeInsets.symmetric(
+                  horizontal: compact ? 9 : 10,
+                  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,
-                        height: 18,
+                        width: compact ? 16 : 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(
-                        title,
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                        style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                          fontWeight: FontWeight.w800,
-                          letterSpacing: -0.2,
-                        ),
+                      Row(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Expanded(
+                            child: Row(
+                              children: [
+                                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),
-                      Text(
+                      if (subtitle != null) ...[
+                        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/bthome_met_history_sheet.dart

@@ -0,0 +1,819 @@
+import 'dart:async';
+import 'dart:math' as math;
+
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:meshcore_client/meshcore_client.dart' show Message;
+import 'package:provider/provider.dart';
+
+import '../../models/contact.dart';
+import '../../providers/connection_provider.dart';
+import '../../services/bthome_met_history.dart';
+
+Future<void> showBTHomeMetHistorySheet(
+  BuildContext context, {
+  required Contact contact,
+}) {
+  return showModalBottomSheet<void>(
+    context: context,
+    isScrollControlled: true,
+    showDragHandle: true,
+    builder: (sheetContext) => _BTHomeMetHistorySheet(contact: contact),
+  );
+}
+
+class _BTHomeMetHistorySheet extends StatefulWidget {
+  const _BTHomeMetHistorySheet({required this.contact});
+
+  final Contact contact;
+
+  @override
+  State<_BTHomeMetHistorySheet> createState() => _BTHomeMetHistorySheetState();
+}
+
+class _BTHomeMetHistorySheetState extends State<_BTHomeMetHistorySheet> {
+  late final List<BTHomeMetMeasurement> _availableMeasurements;
+  late BTHomeMetMeasurement _selectedMeasurement;
+  BTHomeMetHistoryPage? _history;
+  bool _loading = true;
+  String? _error;
+
+  @override
+  void initState() {
+    super.initState();
+    _availableMeasurements = bTHomeMetMeasurementsForContact(widget.contact);
+    _selectedMeasurement = _availableMeasurements.isEmpty
+        ? BTHomeMetMeasurement.temperature
+        : _availableMeasurements.first;
+    if (_availableMeasurements.isEmpty) {
+      _loading = false;
+      _error = 'No BTHome MET-compatible telemetry is available for this node.';
+      return;
+    }
+    unawaited(_loadHistory(measurement: _selectedMeasurement, page: 0));
+  }
+
+  Future<void> _loadHistory({
+    required BTHomeMetMeasurement measurement,
+    required int page,
+  }) async {
+    final connectionProvider = context.read<ConnectionProvider>();
+    final previousOnMessageReceived = connectionProvider.onMessageReceived;
+    String? responseText;
+
+    void onMessage(Message message) {
+      previousOnMessageReceived?.call(message);
+      if (_matchesContact(message)) {
+        responseText = message.text;
+      }
+    }
+
+    connectionProvider.onMessageReceived = onMessage;
+
+    if (mounted) {
+      setState(() {
+        _loading = true;
+        _error = null;
+      });
+    }
+
+    try {
+      final sent = await connectionProvider.sendTextMessage(
+        contactPublicKey: widget.contact.publicKey,
+        text: 'bthome met history ${measurement.id} $page',
+      );
+      if (!sent) {
+        throw Exception('Failed to send MET history request.');
+      }
+
+      for (var i = 0; i < 30; i++) {
+        await Future.delayed(const Duration(milliseconds: 500));
+        if (responseText != null) {
+          break;
+        }
+      }
+
+      final text = responseText?.trim();
+      if (text == null || text.isEmpty) {
+        throw TimeoutException('No response from sensor.');
+      }
+      if (_looksLikeError(text)) {
+        throw Exception(text);
+      }
+
+      final history = BTHomeMetHistoryParser.parse(text);
+      if (!mounted) {
+        return;
+      }
+
+      setState(() {
+        _selectedMeasurement = measurement;
+        _history = history;
+        _loading = false;
+        _error = null;
+      });
+    } catch (error) {
+      if (!mounted) {
+        return;
+      }
+      setState(() {
+        _selectedMeasurement = measurement;
+        _history = null;
+        _loading = false;
+        _error = _formatError(error);
+      });
+    } finally {
+      if (identical(connectionProvider.onMessageReceived, onMessage)) {
+        connectionProvider.onMessageReceived = previousOnMessageReceived;
+      }
+    }
+  }
+
+  bool _matchesContact(Message message) {
+    final prefix = message.senderPublicKeyPrefix;
+    if (prefix == null ||
+        prefix.length < 6 ||
+        widget.contact.publicKey.length < 6) {
+      return false;
+    }
+    for (var i = 0; i < 6; i++) {
+      if (prefix[i] != widget.contact.publicKey[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  bool _looksLikeError(String text) {
+    final lower = text.toLowerCase();
+    return lower.startsWith('err') ||
+        lower.contains('unknown') ||
+        lower.contains('unsupported');
+  }
+
+  String _formatError(Object error) {
+    if (error is TimeoutException) {
+      return error.message ?? 'Timed out waiting for MET history.';
+    }
+    return error.toString().replaceFirst('Exception: ', '');
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final height = MediaQuery.of(context).size.height * 0.8;
+    final history = _history;
+
+    return SafeArea(
+      child: SizedBox(
+        height: height,
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          'MET history',
+                          style: theme.textTheme.titleLarge?.copyWith(
+                            fontWeight: FontWeight.w700,
+                          ),
+                        ),
+                        Text(
+                          widget.contact.displayName,
+                          style: theme.textTheme.bodyMedium?.copyWith(
+                            color: theme.colorScheme.onSurfaceVariant,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  IconButton(
+                    onPressed: () => Navigator.of(context).pop(),
+                    icon: const Icon(Icons.close),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 12),
+              Wrap(
+                spacing: 8,
+                runSpacing: 8,
+                children: _availableMeasurements
+                    .map(
+                      (measurement) => ChoiceChip(
+                        label: Text(measurement.label),
+                        selected: measurement == _selectedMeasurement,
+                        onSelected: (selected) {
+                          if (!selected || _loading) {
+                            return;
+                          }
+                          unawaited(
+                            _loadHistory(measurement: measurement, page: 0),
+                          );
+                        },
+                      ),
+                    )
+                    .toList(growable: false),
+              ),
+              const SizedBox(height: 16),
+              Row(
+                children: [
+                  OutlinedButton.icon(
+                    onPressed: _loading || (history?.page ?? 0) == 0
+                        ? null
+                        : () => unawaited(
+                            _loadHistory(
+                              measurement: _selectedMeasurement,
+                              page: history!.page - 1,
+                            ),
+                          ),
+                    icon: const Icon(Icons.chevron_left),
+                    label: const Text('Newer'),
+                  ),
+                  const SizedBox(width: 8),
+                  OutlinedButton.icon(
+                    onPressed:
+                        _loading ||
+                            history == null ||
+                            history.values.length < 12
+                        ? null
+                        : () => unawaited(
+                            _loadHistory(
+                              measurement: _selectedMeasurement,
+                              page: history.page + 1,
+                            ),
+                          ),
+                    icon: const Icon(Icons.chevron_right),
+                    label: const Text('Older'),
+                  ),
+                  const Spacer(),
+                  if (_loading)
+                    const SizedBox(
+                      width: 18,
+                      height: 18,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    )
+                  else
+                    Text(
+                      'Page ${history?.page ?? 0}',
+                      style: theme.textTheme.bodySmall?.copyWith(
+                        color: theme.colorScheme.onSurfaceVariant,
+                      ),
+                    ),
+                ],
+              ),
+              const SizedBox(height: 12),
+              Expanded(
+                child: SingleChildScrollView(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      if (_error != null)
+                        _HistoryMessageCard(
+                          icon: Icons.error_outline,
+                          title: 'Could not load MET history',
+                          body: _error!,
+                        )
+                      else if (_loading && history == null)
+                        const _HistoryMessageCard(
+                          icon: Icons.hourglass_top,
+                          title: 'Loading',
+                          body: 'Waiting for the sensor to reply.',
+                        )
+                      else if (history != null) ...[
+                        _HistoryChartCard(history: history),
+                        const SizedBox(height: 12),
+                        _HistoryStatsGrid(history: history),
+                        const SizedBox(height: 12),
+                        _HistorySamplesCard(history: history),
+                      ],
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _HistoryChartCard extends StatelessWidget {
+  const _HistoryChartCard({required this.history});
+
+  final BTHomeMetHistoryPage history;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surfaceContainerLow,
+        borderRadius: BorderRadius.circular(24),
+        border: Border.all(
+          color: theme.colorScheme.outlineVariant.withValues(alpha: 0.4),
+        ),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            history.measurement.label,
+            style: theme.textTheme.titleMedium?.copyWith(
+              fontWeight: FontWeight.w700,
+            ),
+          ),
+          const SizedBox(height: 4),
+          Text(
+            'Samples are shown oldest to newest. Firmware replies do not include timestamps.',
+            style: theme.textTheme.bodySmall?.copyWith(
+              color: theme.colorScheme.onSurfaceVariant,
+            ),
+          ),
+          const SizedBox(height: 16),
+          SizedBox(
+            height: 180,
+            child: LineChart(_historyLineChartData(context, history: history)),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _HistoryStatsGrid extends StatelessWidget {
+  const _HistoryStatsGrid({required this.history});
+
+  final BTHomeMetHistoryPage history;
+
+  @override
+  Widget build(BuildContext context) {
+    final measurement = history.measurement;
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final compact = constraints.maxWidth < 520;
+        final tiles = <Widget>[
+          _HistoryStatTile(
+            label: 'Latest',
+            value: _formatMeasurementValue(measurement, history.latest),
+          ),
+          _HistoryStatTile(
+            label: 'Min',
+            value: _formatMeasurementValue(measurement, history.minimum),
+          ),
+          _HistoryStatTile(
+            label: 'Max',
+            value: _formatMeasurementValue(measurement, history.maximum),
+          ),
+          _HistoryStatTile(
+            label: 'Samples',
+            value: history.values.length.toString(),
+          ),
+        ];
+
+        if (compact) {
+          return Column(
+            children: [
+              Row(
+                children: [
+                  Expanded(child: tiles[0]),
+                  const SizedBox(width: 8),
+                  Expanded(child: tiles[1]),
+                ],
+              ),
+              const SizedBox(height: 8),
+              Row(
+                children: [
+                  Expanded(child: tiles[2]),
+                  const SizedBox(width: 8),
+                  Expanded(child: tiles[3]),
+                ],
+              ),
+            ],
+          );
+        }
+
+        return Row(
+          children: [
+            Expanded(child: tiles[0]),
+            const SizedBox(width: 8),
+            Expanded(child: tiles[1]),
+            const SizedBox(width: 8),
+            Expanded(child: tiles[2]),
+            const SizedBox(width: 8),
+            Expanded(child: tiles[3]),
+          ],
+        );
+      },
+    );
+  }
+}
+
+class _HistoryStatTile extends StatelessWidget {
+  const _HistoryStatTile({required this.label, required this.value});
+
+  final String label;
+  final String value;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surfaceContainerHighest.withValues(alpha: 0.5),
+        borderRadius: BorderRadius.circular(18),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            label,
+            style: theme.textTheme.labelMedium?.copyWith(
+              color: theme.colorScheme.onSurfaceVariant,
+            ),
+          ),
+          const SizedBox(height: 4),
+          Text(
+            value,
+            style: theme.textTheme.titleMedium?.copyWith(
+              fontWeight: FontWeight.w700,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _HistorySamplesCard extends StatelessWidget {
+  const _HistorySamplesCard({required this.history});
+
+  final BTHomeMetHistoryPage history;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surfaceContainerLow,
+        borderRadius: BorderRadius.circular(24),
+        border: Border.all(
+          color: theme.colorScheme.outlineVariant.withValues(alpha: 0.4),
+        ),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            'Samples',
+            style: theme.textTheme.titleMedium?.copyWith(
+              fontWeight: FontWeight.w700,
+            ),
+          ),
+          const SizedBox(height: 10),
+          Wrap(
+            spacing: 8,
+            runSpacing: 8,
+            children: history.values
+                .asMap()
+                .entries
+                .map((entry) {
+                  final sampleIndex = entry.key + 1;
+                  final isLatest = entry.key == history.values.length - 1;
+                  return Container(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 10,
+                      vertical: 8,
+                    ),
+                    decoration: BoxDecoration(
+                      color: isLatest
+                          ? _historyColor(
+                              history.measurement,
+                            ).withValues(alpha: 0.12)
+                          : theme.colorScheme.surfaceContainerHighest
+                                .withValues(alpha: 0.45),
+                      borderRadius: BorderRadius.circular(14),
+                    ),
+                    child: Text(
+                      '$sampleIndex. ${_formatMeasurementValue(history.measurement, entry.value)}${isLatest ? ' latest' : ''}',
+                      style: theme.textTheme.bodyMedium?.copyWith(
+                        fontWeight: isLatest
+                            ? FontWeight.w700
+                            : FontWeight.w500,
+                      ),
+                    ),
+                  );
+                })
+                .toList(growable: false),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _HistoryMessageCard extends StatelessWidget {
+  const _HistoryMessageCard({
+    required this.icon,
+    required this.title,
+    required this.body,
+  });
+
+  final IconData icon;
+  final String title;
+  final String body;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surfaceContainerLow,
+        borderRadius: BorderRadius.circular(24),
+      ),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Icon(icon, color: theme.colorScheme.primary),
+          const SizedBox(width: 12),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  title,
+                  style: theme.textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+                ),
+                const SizedBox(height: 4),
+                Text(body),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+Color _historyColor(BTHomeMetMeasurement measurement) {
+  switch (measurement) {
+    case BTHomeMetMeasurement.temperature:
+      return const Color(0xFFC76821);
+    case BTHomeMetMeasurement.humidity:
+      return const Color(0xFF246BB2);
+    case BTHomeMetMeasurement.windSpeed:
+      return const Color(0xFF2B78A0);
+    case BTHomeMetMeasurement.gust:
+      return const Color(0xFF1E88A8);
+    case BTHomeMetMeasurement.rain:
+      return const Color(0xFF2C6BA0);
+  }
+}
+
+String _formatMeasurementValue(BTHomeMetMeasurement measurement, num? value) {
+  if (value == null) {
+    return '--';
+  }
+
+  final digits = switch (measurement) {
+    BTHomeMetMeasurement.humidity => 0,
+    BTHomeMetMeasurement.temperature => 1,
+    BTHomeMetMeasurement.windSpeed => 1,
+    BTHomeMetMeasurement.gust => 1,
+    BTHomeMetMeasurement.rain => 1,
+  };
+
+  final text = value
+      .toStringAsFixed(digits)
+      .replaceFirst(RegExp(r'\.?0+$'), '');
+  return '$text${measurement.unit}';
+}
+
+LineChartData _historyLineChartData(
+  BuildContext context, {
+  required BTHomeMetHistoryPage history,
+}) {
+  final theme = Theme.of(context);
+  final color = _historyColor(history.measurement);
+  final values = history.values;
+  final spots = values
+      .asMap()
+      .entries
+      .map((entry) => FlSpot(entry.key.toDouble(), entry.value))
+      .toList(growable: false);
+  final chartMinY = _historyChartMinY(history);
+  final chartMaxY = _historyChartMaxY(history);
+  final yInterval = _historyYAxisInterval(
+    measurement: history.measurement,
+    minY: chartMinY,
+    maxY: chartMaxY,
+  );
+
+  return LineChartData(
+    minX: 0,
+    maxX: values.length <= 1 ? 1.0 : (values.length - 1).toDouble(),
+    minY: chartMinY,
+    maxY: chartMaxY,
+    clipData: const FlClipData.all(),
+    lineTouchData: const LineTouchData(enabled: false),
+    gridData: FlGridData(
+      show: true,
+      drawVerticalLine: false,
+      horizontalInterval: yInterval,
+      getDrawingHorizontalLine: (value) => FlLine(
+        color: theme.colorScheme.outlineVariant.withValues(alpha: 0.28),
+        strokeWidth: 1,
+      ),
+    ),
+    borderData: FlBorderData(show: false),
+    titlesData: FlTitlesData(
+      topTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)),
+      rightTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)),
+      leftTitles: AxisTitles(
+        sideTitles: SideTitles(
+          showTitles: true,
+          reservedSize: 42,
+          interval: yInterval,
+          getTitlesWidget: (value, meta) => SideTitleWidget(
+            meta: meta,
+            space: 8,
+            child: Text(
+              _formatHistoryAxisValue(history.measurement, value),
+              style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                color: theme.colorScheme.onSurfaceVariant,
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+          ),
+        ),
+      ),
+      bottomTitles: AxisTitles(
+        sideTitles: SideTitles(
+          showTitles: true,
+          reservedSize: 24,
+          interval: 1,
+          getTitlesWidget: (value, meta) {
+            final index = value.round();
+            if (value != index.toDouble() ||
+                !_shouldShowBottomSampleLabel(index, values.length)) {
+              return const SizedBox.shrink();
+            }
+
+            return SideTitleWidget(
+              meta: meta,
+              space: 6,
+              child: Text(
+                '${index + 1}',
+                style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                  color: theme.colorScheme.onSurfaceVariant,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+            );
+          },
+        ),
+      ),
+    ),
+    lineBarsData: [
+      LineChartBarData(
+        spots: spots,
+        color: color,
+        barWidth: 2.8,
+        isCurved: false,
+        isStrokeCapRound: true,
+        dotData: FlDotData(
+          show: true,
+          checkToShowDot: (spot, barData) =>
+              barData.spots.length <= 10 || spot == barData.spots.last,
+          getDotPainter: (spot, percent, barData, index) => FlDotCirclePainter(
+            radius: spot == barData.spots.last ? 4 : 2.5,
+            color: color,
+            strokeColor: theme.colorScheme.surface,
+            strokeWidth: 1.6,
+          ),
+        ),
+        belowBarData: BarAreaData(
+          show: true,
+          gradient: LinearGradient(
+            begin: Alignment.topCenter,
+            end: Alignment.bottomCenter,
+            colors: [
+              color.withValues(alpha: 0.24),
+              color.withValues(alpha: 0.03),
+            ],
+          ),
+        ),
+      ),
+    ],
+  );
+}
+
+double _historyChartMinY(BTHomeMetHistoryPage history) {
+  final minValue = history.minimum ?? 0;
+  final maxValue = history.maximum ?? 0;
+  final spread = maxValue - minValue;
+  final padding = spread == 0
+      ? _historyMinimumPadding(history.measurement, minValue)
+      : math.max(
+          spread * 0.18,
+          _historyMinimumPadding(history.measurement, minValue),
+        );
+  return minValue - padding;
+}
+
+double _historyChartMaxY(BTHomeMetHistoryPage history) {
+  final minValue = history.minimum ?? 0;
+  final maxValue = history.maximum ?? 0;
+  final spread = maxValue - minValue;
+  final padding = spread == 0
+      ? _historyMinimumPadding(history.measurement, maxValue)
+      : math.max(
+          spread * 0.18,
+          _historyMinimumPadding(history.measurement, maxValue),
+        );
+  return maxValue + padding;
+}
+
+double _historyMinimumPadding(
+  BTHomeMetMeasurement measurement,
+  double reference,
+) {
+  final scaled = math.max(reference.abs() * 0.05, 0.1);
+  return switch (measurement) {
+    BTHomeMetMeasurement.temperature => math.max(0.4, scaled),
+    BTHomeMetMeasurement.humidity => math.max(2.0, scaled),
+    BTHomeMetMeasurement.windSpeed => math.max(0.4, scaled),
+    BTHomeMetMeasurement.gust => math.max(0.4, scaled),
+    BTHomeMetMeasurement.rain => math.max(0.4, scaled),
+  };
+}
+
+double _historyYAxisInterval({
+  required BTHomeMetMeasurement measurement,
+  required double minY,
+  required double maxY,
+}) {
+  final span = maxY - minY;
+  if (span <= 0) {
+    return 1;
+  }
+
+  final rough = span / 3;
+  return switch (measurement) {
+    BTHomeMetMeasurement.humidity => math.max(1, rough.round()).toDouble(),
+    BTHomeMetMeasurement.temperature => _niceStep(rough, minStep: 0.5),
+    BTHomeMetMeasurement.windSpeed => _niceStep(rough, minStep: 0.5),
+    BTHomeMetMeasurement.gust => _niceStep(rough, minStep: 0.5),
+    BTHomeMetMeasurement.rain => _niceStep(rough, minStep: 0.5),
+  };
+}
+
+double _niceStep(double value, {required double minStep}) {
+  if (value <= minStep) {
+    return minStep;
+  }
+
+  final exponent = math
+      .pow(10.0, (math.log(value) / math.ln10).floor())
+      .toDouble();
+  final normalized = value / exponent;
+  final stepped = switch (normalized) {
+    < 1.5 => 1.0,
+    < 3.0 => 2.0,
+    < 7.0 => 5.0,
+    _ => 10.0,
+  };
+  return math.max(minStep, stepped * exponent);
+}
+
+String _formatHistoryAxisValue(BTHomeMetMeasurement measurement, double value) {
+  final digits = measurement == BTHomeMetMeasurement.humidity ? 0 : 1;
+  return value.toStringAsFixed(digits).replaceFirst(RegExp(r'\.?0+$'), '');
+}
+
+bool _shouldShowBottomSampleLabel(int index, int sampleCount) {
+  if (index < 0 || index >= sampleCount) {
+    return false;
+  }
+  if (sampleCount <= 3) {
+    return true;
+  }
+
+  final middle = (sampleCount - 1) ~/ 2;
+  return index == 0 || index == middle || index == sampleCount - 1;
+}

lib/widgets/settings/traffic_stats_reporting_section.dart

@@ -0,0 +1,107 @@
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+import '../../services/traffic_stats_reporting_service.dart';
+
+class TrafficStatsReportingSection extends StatelessWidget {
+  final TrafficStatsReportingService service;
+
+  const TrafficStatsReportingSection({super.key, required this.service});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SwitchListTile(
+          secondary: const Icon(Icons.cloud_upload_outlined),
+          title: const Text('Anonymous RX stats reporting'),
+          subtitle: const Text(
+            'Upload RX live-traffic packet type and path mode totals to the fixed Cloudflare worker every 5 minutes.',
+          ),
+          value: service.isEnabled,
+          onChanged: (value) async {
+            await service.setEnabled(value);
+          },
+        ),
+        Padding(
+          padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+          child: DecoratedBox(
+            decoration: BoxDecoration(
+              color: theme.colorScheme.surfaceContainerLow,
+              borderRadius: BorderRadius.circular(12),
+              border: Border.all(
+                color: theme.colorScheme.outlineVariant.withValues(alpha: 0.5),
+              ),
+            ),
+            child: Padding(
+              padding: const EdgeInsets.all(12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    'Upload status',
+                    style: theme.textTheme.titleSmall,
+                  ),
+                  const SizedBox(height: 8),
+                  Text(
+                    _statusText(service),
+                    style: theme.textTheme.bodyMedium,
+                  ),
+                  const SizedBox(height: 6),
+                  Text(
+                    'Ingest URL: ${TrafficStatsReportingService.ingestUri}',
+                    style: theme.textTheme.bodySmall?.copyWith(
+                      color: theme.colorScheme.onSurfaceVariant,
+                    ),
+                  ),
+                  const SizedBox(height: 8),
+                  TextButton.icon(
+                    onPressed: _openStatsDashboard,
+                    icon: const Icon(Icons.open_in_new),
+                    label: const Text('View public stats'),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  static Future<void> _openStatsDashboard() async {
+    final url = TrafficStatsReportingService.dashboardUri;
+    if (await canLaunchUrl(url)) {
+      await launchUrl(url, mode: LaunchMode.externalApplication);
+    }
+  }
+
+  static String _statusText(TrafficStatsReportingService service) {
+    final buffer = StringBuffer();
+    buffer.write('Pending uploads: ${service.pendingUploadCount}');
+    if (service.lastSuccessAt != null) {
+      buffer.write(
+        '\nLast sent: ${_formatDateTime(service.lastSuccessAt!.toLocal())}',
+      );
+    } else {
+      buffer.write('\nLast sent: Never');
+    }
+    if (service.lastError != null && service.lastError!.isNotEmpty) {
+      buffer.write('\nLast error: ${service.lastError}');
+    } else {
+      buffer.write('\nLast error: None');
+    }
+    return buffer.toString();
+  }
+
+  static String _formatDateTime(DateTime value) {
+    final month = value.month.toString().padLeft(2, '0');
+    final day = value.day.toString().padLeft(2, '0');
+    final hour = value.hour.toString().padLeft(2, '0');
+    final minute = value.minute.toString().padLeft(2, '0');
+    final second = value.second.toString().padLeft(2, '0');
+    return '${value.year}-$month-$day $hour:$minute:$second';
+  }
+}

pubspec.lock

@@ -226,6 +226,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.3"
+  equatable:
+    dependency: transitive
+    description:
+      name: equatable
+      sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.8"
   exif:
     dependency: transitive
     description:
@@ -306,6 +314,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
+  fl_chart:
+    dependency: "direct main"
+    description:
+      name: fl_chart
+      sha256: b938f77d042cbcd822936a7a359a7235bad8bd72070de1f827efc2cc297ac888
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -811,8 +827,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: main
-      resolved-ref: "3dbc82170583f616b590e5204a307a02f2b8833d"
+      ref: "0bb339f684f709cf5b9d40c07827cc62beb18a4d"
+      resolved-ref: "0bb339f684f709cf5b9d40c07827cc62beb18a4d"
       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.0319.1+35
+version: 2026.0403.1+45
 
 environment:
   sdk: ^3.9.2
@@ -44,7 +44,7 @@ dependencies:
   meshcore_client:
     git:
       url: https://github.com/dz0ny/meshcore_client.git
-      ref: main
+      ref: 0bb339f684f709cf5b9d40c07827cc62beb18a4d
 
   # Codec2 ultra-low-bitrate speech codec (FFI plugin)
   codec2_flutter:
@@ -71,6 +71,7 @@ dependencies:
       url: https://github.com/fleaflet/flutter_map.git
       ref: master
   latlong2: ^0.9.0
+  fl_chart: ^1.2.0
 
   http: ^1.2.0
 

test/providers/channels_provider_test.dart

@@ -0,0 +1,60 @@
+import 'dart:typed_data';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/models/channel.dart';
+import 'package:meshcore_sar_app/providers/channels_provider.dart';
+
+void main() {
+  group('ChannelsProvider device sync preparation', () {
+    test('clears runtime channel state before sync', () {
+      final provider = ChannelsProvider();
+
+      provider.addOrUpdateChannel(
+        index: 2,
+        name: 'Ops',
+        secret: Uint8List.fromList(List<int>.filled(16, 7)),
+      );
+      provider.selectChannel(2);
+
+      provider.prepareForDeviceSync();
+
+      expect(provider.channels, isEmpty);
+      expect(provider.selectedChannelIndex, 0);
+      expect(provider.selectedChannel, isNull);
+    });
+  });
+
+  group('ChannelsProvider mesh hash lookup', () {
+    test('resolves a unique channel display name by hash byte', () {
+      final provider = ChannelsProvider();
+      final channel = Channel.create(index: 3, name: '#ops');
+
+      provider.addOrUpdateChannelObject(channel);
+
+      expect(
+        provider.getUniqueChannelDisplayNameByHashByte(channel.hashByte),
+        '#ops',
+      );
+    });
+
+    test('does not resolve ambiguous hash matches', () {
+      final provider = ChannelsProvider();
+      final secret = Uint8List.fromList(List<int>.filled(16, 7));
+      final firstChannel = Channel.create(
+        index: 1,
+        name: 'Ops 1',
+        explicitSecret: secret,
+      );
+
+      provider.addOrUpdateChannelObject(firstChannel);
+      provider.addOrUpdateChannelObject(
+        Channel.create(index: 2, name: 'Ops 2', explicitSecret: secret),
+      );
+
+      expect(
+        provider.getUniqueChannelDisplayNameByHashByte(firstChannel.hashByte),
+        isNull,
+      );
+    });
+  });
+}

test/providers/contacts_provider_profile_scope_test.dart

@@ -0,0 +1,69 @@
+import 'dart:typed_data';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/models/contact.dart';
+import 'package:meshcore_sar_app/providers/contacts_provider.dart';
+import 'package:meshcore_sar_app/services/contact_storage_service.dart';
+import 'package:meshcore_sar_app/services/profiles_feature_service.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  Contact createContact({required Uint8List key, required String name}) {
+    return Contact(
+      publicKey: key,
+      type: ContactType.chat,
+      flags: 0,
+      outPathLen: 0,
+      outPath: Uint8List(64),
+      advName: name,
+      lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      advLat: (46.0569 * 1e6).round(),
+      advLon: (14.5058 * 1e6).round(),
+      lastMod: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+    );
+  }
+
+  setUp(() {
+    SharedPreferences.setMockInitialValues({});
+    ProfileStorageScope.setScope(
+      profilesEnabled: true,
+      activeProfileId: 'default',
+    );
+  });
+
+  test(
+    'initializeEarly respects the active profile storage namespace',
+    () async {
+      final storage = ContactStorageService();
+      final defaultContact = createContact(
+        key: Uint8List.fromList(List<int>.filled(32, 1)),
+        name: 'Default Contact',
+      );
+      final alphaContact = createContact(
+        key: Uint8List.fromList(List<int>.filled(32, 2)),
+        name: 'Alpha Contact',
+      );
+
+      await storage.saveContacts([defaultContact]);
+      await storage.saveContacts([alphaContact], namespace: 'alpha');
+
+      ProfileStorageScope.setScope(
+        profilesEnabled: true,
+        activeProfileId: 'alpha',
+      );
+
+      final provider = ContactsProvider();
+      await provider.initializeEarly();
+
+      final names = provider.contacts
+          .where((contact) => !contact.isChannel)
+          .map((contact) => contact.advName)
+          .toList();
+
+      expect(names, <String>['Alpha Contact']);
+      expect(provider.storageNamespace, 'alpha');
+    },
+  );
+}

test/providers/contacts_provider_test.dart

@@ -173,14 +173,8 @@ void main() {
           var updated = scopedProvider.findContactByKey(scopedKey)!;
           expect(updated.telemetry, isNotNull);
           expect(updated.telemetry!.gpsLocation, isNull);
-          expect(
-            updated.displayLocation!.latitude,
-            closeTo(45.1234, 0.0001),
-          );
-          expect(
-            updated.displayLocation!.longitude,
-            closeTo(13.8765, 0.0001),
-          );
+          expect(updated.displayLocation!.latitude, closeTo(45.1234, 0.0001));
+          expect(updated.displayLocation!.longitude, closeTo(13.8765, 0.0001));
 
           // Invalid 0,0 GPS frame should behave the same way.
           final invalidGps = CayenneLppParser.createGpsData(
@@ -192,14 +186,8 @@ void main() {
           updated = scopedProvider.findContactByKey(scopedKey)!;
           expect(updated.telemetry, isNotNull);
           expect(updated.telemetry!.gpsLocation, isNull);
-          expect(
-            updated.displayLocation!.latitude,
-            closeTo(45.1234, 0.0001),
-          );
-          expect(
-            updated.displayLocation!.longitude,
-            closeTo(13.8765, 0.0001),
-          );
+          expect(updated.displayLocation!.latitude, closeTo(45.1234, 0.0001));
+          expect(updated.displayLocation!.longitude, closeTo(13.8765, 0.0001));
         }
       },
     );
@@ -337,95 +325,107 @@ void main() {
       expect(updated.telemetry!.extraSensorData, containsPair('co2', 415.0));
     });
 
-    test('retains scalar telemetry but wipes stale extra sensor fields on refresh', () {
-      final fullTelemetry = ContactTelemetry(
-        gpsLocation: const LatLng(46.0569, 14.5058),
-        batteryPercentage: 54.0,
-        batteryMilliVolts: 3780,
-        temperature: 19.5,
-        timestamp: DateTime.now().subtract(const Duration(minutes: 2)),
-        humidity: 58.0,
-        pressure: 1011.2,
-        extraSensorData: const {'pm25': 8.0},
-      );
+    test(
+      'retains scalar telemetry but wipes stale extra sensor fields on refresh',
+      () {
+        final fullTelemetry = ContactTelemetry(
+          gpsLocation: const LatLng(46.0569, 14.5058),
+          batteryPercentage: 54.0,
+          batteryMilliVolts: 3780,
+          temperature: 19.5,
+          timestamp: DateTime.now().subtract(const Duration(minutes: 2)),
+          humidity: 58.0,
+          pressure: 1011.2,
+          extraSensorData: const {'pm25': 8.0},
+        );
 
-      provider.addOrUpdateContact(
-        createContact(
-          key: publicKey,
-          type: ContactType.chat,
-        ).copyWith(telemetry: fullTelemetry),
-      );
+        provider.addOrUpdateContact(
+          createContact(
+            key: publicKey,
+            type: ContactType.chat,
+          ).copyWith(telemetry: fullTelemetry),
+        );
 
-      final batteryOnly = CayenneLppParser.createBatteryData(3.95);
-      provider.updateTelemetry(publicKey.sublist(0, 6), batteryOnly);
+        final batteryOnly = CayenneLppParser.createBatteryData(3.95);
+        provider.updateTelemetry(publicKey.sublist(0, 6), batteryOnly);
 
-      final updated = provider.findContactByKey(publicKey)!;
-      expect(updated.telemetry, isNotNull);
-      expect(updated.telemetry!.gpsLocation, isNull);
-      expect(updated.displayLocation, const LatLng(46.0569, 14.5058));
-      expect(updated.telemetry!.batteryMilliVolts, isNotNull);
-      expect(updated.telemetry!.batteryPercentage, isNotNull);
-      expect(updated.telemetry!.temperature, equals(19.5));
-      expect(updated.telemetry!.humidity, equals(58.0));
-      expect(updated.telemetry!.pressure, equals(1011.2));
-      expect(
-        updated.telemetry!.extraSensorData,
-        containsPair('__source_channel:battery', 0),
-      );
-      expect(
-        updated.telemetry!.extraSensorData,
-        containsPair('__source_channel:voltage', 0),
-      );
-      expect(updated.telemetry!.extraSensorData, isNot(contains('pm25')));
-    });
+        final updated = provider.findContactByKey(publicKey)!;
+        expect(updated.telemetry, isNotNull);
+        expect(updated.telemetry!.gpsLocation, isNull);
+        expect(updated.displayLocation, const LatLng(46.0569, 14.5058));
+        expect(updated.telemetry!.batteryMilliVolts, isNotNull);
+        expect(updated.telemetry!.batteryPercentage, isNotNull);
+        expect(updated.telemetry!.temperature, equals(19.5));
+        expect(updated.telemetry!.humidity, equals(58.0));
+        expect(updated.telemetry!.pressure, equals(1011.2));
+        expect(
+          updated.telemetry!.extraSensorData,
+          containsPair('__source_channel:battery', 0),
+        );
+        expect(
+          updated.telemetry!.extraSensorData,
+          containsPair('__source_channel:voltage', 0),
+        );
+        expect(updated.telemetry!.extraSensorData, isNot(contains('pm25')));
+      },
+    );
 
-    test('replaces old source-channel mappings when a metric moves channels', () {
-      final initialTelemetry = ContactTelemetry(
-        gpsLocation: null,
-        batteryPercentage: null,
-        batteryMilliVolts: null,
-        temperature: 21.5,
-        timestamp: DateTime.now().subtract(const Duration(minutes: 2)),
-        humidity: null,
-        pressure: null,
-        extraSensorData: const {
-          '__source_channel:temperature': 2,
-          'temperature_2': 21.5,
-          'humidity_4': 66.0,
-        },
-      );
+    test(
+      'replaces old source-channel mappings when a metric moves channels',
+      () {
+        final initialTelemetry = ContactTelemetry(
+          gpsLocation: null,
+          batteryPercentage: null,
+          batteryMilliVolts: null,
+          temperature: 21.5,
+          timestamp: DateTime.now().subtract(const Duration(minutes: 2)),
+          humidity: null,
+          pressure: null,
+          extraSensorData: const {
+            '__source_channel:temperature': 2,
+            'temperature_2': 21.5,
+            'humidity_4': 66.0,
+          },
+        );
 
-      provider.addOrUpdateContact(
-        createContact(
-          key: publicKey,
-          type: ContactType.chat,
-        ).copyWith(telemetry: initialTelemetry),
-      );
+        provider.addOrUpdateContact(
+          createContact(
+            key: publicKey,
+            type: ContactType.chat,
+          ).copyWith(telemetry: initialTelemetry),
+        );
 
-      final movedChannelTelemetry = CayenneLppParser.createTemperatureData(
-        23.5,
-        channel: 3,
-      );
+        final movedChannelTelemetry = CayenneLppParser.createTemperatureData(
+          23.5,
+          channel: 3,
+        );
 
-      provider.updateTelemetry(publicKey.sublist(0, 6), movedChannelTelemetry);
+        provider.updateTelemetry(
+          publicKey.sublist(0, 6),
+          movedChannelTelemetry,
+        );
 
-      final updated = provider.findContactByKey(publicKey)!;
-      expect(updated.telemetry, isNotNull);
-      expect(updated.telemetry!.temperature, closeTo(23.5, 0.1));
-      expect(
-        updated.telemetry!.extraSensorData,
-        containsPair('__source_channel:temperature', 3),
-      );
-      expect(
-        updated.telemetry!.extraSensorData,
-        containsPair('temperature_3', closeTo(23.5, 0.1)),
-      );
-      expect(
-        updated.telemetry!.extraSensorData,
-        isNot(contains('temperature_2')),
-      );
-      expect(updated.telemetry!.extraSensorData, isNot(contains('humidity_4')));
-    });
+        final updated = provider.findContactByKey(publicKey)!;
+        expect(updated.telemetry, isNotNull);
+        expect(updated.telemetry!.temperature, closeTo(23.5, 0.1));
+        expect(
+          updated.telemetry!.extraSensorData,
+          containsPair('__source_channel:temperature', 3),
+        );
+        expect(
+          updated.telemetry!.extraSensorData,
+          containsPair('temperature_3', closeTo(23.5, 0.1)),
+        );
+        expect(
+          updated.telemetry!.extraSensorData,
+          isNot(contains('temperature_2')),
+        );
+        expect(
+          updated.telemetry!.extraSensorData,
+          isNot(contains('humidity_4')),
+        );
+      },
+    );
 
     test('builds message snapshot from latest valid telemetry', () {
       final telemetryData = CayenneLppParser.createGpsData(
@@ -781,6 +781,19 @@ void main() {
       expect(updated.advLat, equals((44.123456 * 1e6).round()));
       expect(updated.advLon, equals((13.654321 * 1e6).round()));
       expect(updated.lastAdvert, equals(1700001234));
+      expect(updated.lastMod, equals(1700001234));
+      expect(
+        provider.estimatedLocationFor(updated.publicKeyHex),
+        isNotNull,
+      );
+      expect(
+        provider.estimatedLocationFor(updated.publicKeyHex)!.latitude,
+        closeTo(44.123456, 0.000001),
+      );
+      expect(
+        provider.estimatedLocationFor(updated.publicKeyHex)!.longitude,
+        closeTo(13.654321, 0.000001),
+      );
     });
 
     test('ignores unknown sender prefix safely', () {
@@ -870,6 +883,142 @@ void main() {
       );
     });
   });
+
+  group('ContactsProvider device sync preparation', () {
+    late ContactsProvider provider;
+
+    setUp(() {
+      SharedPreferences.setMockInitialValues({});
+      provider = ContactsProvider();
+    });
+
+    test(
+      'keeps runtime contacts visible during sync without erasing persisted contacts or saved groups',
+      () async {
+        final key = createPublicKey(140);
+        final pendingKey = createPublicKey(180);
+
+        provider.addOrUpdateContact(
+          createContact(key: key, type: ContactType.chat, name: 'Synced Later'),
+        );
+        provider.addPendingAdvert(pendingKey);
+        await provider.addSavedGroupForFilter('teamMembers', 'alpha');
+
+        await provider.prepareForDeviceContactSync();
+
+        expect(
+          provider.chatContacts.map((contact) => contact.advName),
+          contains('Synced Later'),
+        );
+        expect(provider.pendingAdverts, hasLength(1));
+        expect(provider.savedGroupsForSection('teamMembers'), hasLength(1));
+
+        final restored = ContactsProvider();
+        await restored.initializeEarly();
+
+        expect(
+          restored.chatContacts.map((contact) => contact.advName),
+          contains('Synced Later'),
+        );
+        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', () {
+    test(
+      'stores self telemetry without re-adding the device as a contact',
+      () async {
+        SharedPreferences.setMockInitialValues({});
+        final provider = ContactsProvider();
+        final selfKey = createPublicKey(200);
+
+        await provider.initialize(devicePublicKey: selfKey);
+        provider.updateTelemetry(
+          selfKey.sublist(0, 6),
+          CayenneLppParser.createTemperatureData(23.5, channel: 1),
+        );
+
+        expect(provider.selfTelemetry, isNotNull);
+        expect(provider.selfTelemetry!.temperature, closeTo(23.5, 0.1));
+        expect(provider.findContactByKey(selfKey), isNull);
+        expect(
+          provider.contacts.any(
+            (contact) => contact.publicKeyHex == publicKeyHex(selfKey),
+          ),
+          isFalse,
+        );
+      },
+    );
+  });
+
+  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/media_provider_profile_scope_test.dart

@@ -0,0 +1,134 @@
+import 'dart:async';
+import 'dart:typed_data';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/providers/image_provider.dart';
+import 'package:meshcore_sar_app/providers/voice_provider.dart';
+import 'package:meshcore_sar_app/services/profiles_feature_service.dart';
+import 'package:meshcore_sar_app/services/voice_codec_service.dart';
+import 'package:meshcore_sar_app/services/voice_player_service.dart';
+import 'package:meshcore_sar_app/utils/image_message_parser.dart';
+import 'package:meshcore_sar_app/utils/voice_message_parser.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  setUp(() {
+    SharedPreferences.setMockInitialValues({});
+    ProfileStorageScope.setScope(
+      profilesEnabled: true,
+      activeProfileId: 'alpha',
+    );
+  });
+
+  test('VoiceProvider reloads profile-scoped sessions', () async {
+    final player = _FakeVoicePlayerService();
+    final provider = VoiceProvider(codec: VoiceCodecService(), player: player);
+    addTearDown(provider.dispose);
+
+    await provider.reloadProfileScopedState();
+    provider.registerEnvelope(
+      const VoiceEnvelope(
+        sessionId: 'a1b2c3d4',
+        mode: VoicePacketMode.mode1200,
+        total: 2,
+        durationMs: 1600,
+      ),
+    );
+    await Future<void>.delayed(const Duration(milliseconds: 50));
+
+    ProfileStorageScope.setScope(
+      profilesEnabled: true,
+      activeProfileId: 'beta',
+    );
+    await provider.reloadProfileScopedState();
+    expect(provider.session('a1b2c3d4'), isNull);
+
+    ProfileStorageScope.setScope(
+      profilesEnabled: true,
+      activeProfileId: 'alpha',
+    );
+    await provider.reloadProfileScopedState();
+    expect(provider.session('a1b2c3d4'), isNotNull);
+  });
+
+  test('ImageProvider reloads profile-scoped sessions', () async {
+    final provider = ImageProvider();
+
+    await provider.reloadProfileScopedState();
+    provider.registerEnvelope(
+      const ImageEnvelope(
+        sessionId: 'a1b2c3d4',
+        format: ImageFormat.avif,
+        total: 2,
+        width: 32,
+        height: 32,
+        sizeBytes: 8,
+      ),
+    );
+    provider.addFragment(
+      ImagePacket(
+        sessionId: 'a1b2c3d4',
+        format: ImageFormat.avif,
+        index: 0,
+        total: 2,
+        data: Uint8List.fromList([1, 2, 3, 4]),
+      ),
+      width: 32,
+      height: 32,
+    );
+    await Future<void>.delayed(const Duration(milliseconds: 50));
+
+    ProfileStorageScope.setScope(
+      profilesEnabled: true,
+      activeProfileId: 'beta',
+    );
+    await provider.reloadProfileScopedState();
+    expect(provider.session('a1b2c3d4'), isNull);
+
+    ProfileStorageScope.setScope(
+      profilesEnabled: true,
+      activeProfileId: 'alpha',
+    );
+    await provider.reloadProfileScopedState();
+    expect(provider.session('a1b2c3d4'), isNotNull);
+  });
+}
+
+class _FakeVoicePlayerService implements VoicePlayerService {
+  final StreamController<void> _events = StreamController<void>.broadcast();
+  bool _isPlaying = false;
+
+  @override
+  bool get isPlaying => _isPlaying;
+
+  @override
+  Duration get position => Duration.zero;
+
+  @override
+  Duration get duration => Duration.zero;
+
+  @override
+  Stream<void> get events => _events.stream;
+
+  @override
+  Future<void> play(Int16List pcmSamples, {required int sampleRateHz}) async {
+    _isPlaying = true;
+    _events.add(null);
+  }
+
+  @override
+  Future<void> stop() async {
+    _isPlaying = false;
+    _events.add(null);
+  }
+
+  @override
+  void dispose() {
+    _events.close();
+  }
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}

test/providers/messages_provider_retransmission_test.dart

@@ -10,13 +10,16 @@ import 'package:meshcore_sar_app/providers/helpers/message_retry_manager.dart';
 import 'package:meshcore_sar_app/providers/messages_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-Contact _buildContact() {
+Contact _buildContact({
+  int outPathLen = 1,
+  List<int> outPath = const [1, 2, 3, 4],
+}) {
   return Contact(
     publicKey: Uint8List.fromList(List<int>.generate(32, (i) => i)),
     type: ContactType.chat,
     flags: 0,
-    outPathLen: 1,
-    outPath: Uint8List.fromList([1, 2, 3, 4]),
+    outPathLen: outPathLen,
+    outPath: Uint8List.fromList(outPath),
     advName: 'Teammate',
     lastAdvert: 1700000000,
     advLat: 0,
@@ -162,6 +165,42 @@ void main() {
       expect(provider.messages.single.roundTripTimeMs, 190);
     });
 
+    test('delivered flood message upgrades to learned direct route from ACK path', () {
+      final provider = MessagesProvider();
+      final contactWithoutRoute = _buildContact(outPathLen: -1, outPath: []);
+      provider.addSentMessage(
+        _buildDirectMessage('m1d'),
+        contact: contactWithoutRoute,
+      );
+      provider.updateMessageRouteSelection(
+        'm1d',
+        PathSelection.flood(),
+        routerFallbackAttempted: false,
+      );
+
+      provider.markMessageSent('m1d', 80, 250);
+      provider.markMessageDelivered(80, 200);
+      provider.queueDeliveredMessageRouteRefresh('m1d', contactWithoutRoute);
+
+      final applied = provider.applyDeliveredMessageRouteFromContact(
+        _buildContact(outPathLen: 2, outPath: const [0xAA, 0xBB]),
+      );
+
+      expect(applied, isTrue);
+      expect(provider.messages.single.deliveryStatus, MessageDeliveryStatus.delivered);
+      expect(provider.messages.single.usedFloodFallback, isFalse);
+      expect(provider.messages.single.pathLen, 2);
+      expect(
+        provider.getMessageRouteMetadata('m1d')?.mode,
+        PathSelectionMode.directCurrent,
+      );
+      expect(
+        provider.getMessageRouteMetadata('m1d')?.canonicalPath,
+        'AA,BB',
+      );
+      expect(provider.getMessageRouteMetadata('m1d')?.hopCount, 2);
+    });
+
     test('channel messages are marked sent immediately', () {
       final provider = MessagesProvider();
       provider.resolveContactNameCallback = (_) => 'dz0ny (SI)';
@@ -214,7 +253,7 @@ void main() {
       });
     });
 
-    test('channel warning clears when replay is deduped into sent bubble', () {
+    test('channel warning clears when replay arrives after send', () {
       fakeAsync((async) {
         final provider = MessagesProvider();
         provider.resolveContactNameCallback = (_) => 'dz0ny (SI)';
@@ -240,10 +279,11 @@ void main() {
 
         expect(provider.hasChannelSendWarning('c-warn-replay'), isFalse);
         expect(provider.messages, hasLength(1));
+        expect(provider.messages.single.id, equals('c-warn-replay'));
       });
     });
 
-    test('channel replay is deduped for self sender within repeat window', () {
+    test('channel replay merges into sent message for self sender within repeat window', () {
       final provider = MessagesProvider();
       provider.resolveContactNameCallback = (_) => 'dz0ny (SI)';
       provider.addSentMessage(
@@ -261,7 +301,7 @@ void main() {
 
       expect(provider.messages, hasLength(1));
       expect(provider.messages.single.id, equals('c-echo'));
-      expect(provider.messages.single.senderName, equals('dz0ny (SI)'));
+      expect(provider.messages.single.pathLen, equals(1));
     });
 
     test(
@@ -308,7 +348,7 @@ void main() {
       expect(provider.messages, hasLength(2));
     });
 
-    test('channel replay can dedupe using lazily resolved self name', () {
+    test('channel replay merges using lazily resolved self name', () {
       final provider = MessagesProvider();
       provider.addSentMessage(
         _buildSentChannelMessage(id: 'c-lazy', senderTimestamp: 1700000400),
@@ -328,7 +368,7 @@ void main() {
       expect(provider.messages.single.id, equals('c-lazy'));
     });
 
-    test('channel replay dedupes meshcore-prefixed self sender name', () {
+    test('channel replay merges for meshcore-prefixed self sender name', () {
       final provider = MessagesProvider();
       provider.resolveContactNameCallback = (_) => 'MeshCore-dz0ny (SI)';
       provider.addSentMessage(
@@ -390,6 +430,165 @@ void main() {
       );
     });
 
+    test('incoming contact messages dedupe by sender handle and text', () {
+      final provider = MessagesProvider();
+
+      provider.addMessage(
+        Message(
+          id: 'handle-1',
+          messageType: MessageType.contact,
+          pathLen: 1,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000800,
+          text: 'same payload',
+          senderName: 'Radio Alpha',
+          receivedAt: DateTime.now(),
+        ),
+      );
+      provider.addMessage(
+        Message(
+          id: 'handle-2',
+          messageType: MessageType.contact,
+          pathLen: 2,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000810,
+          text: 'same payload',
+          senderName: 'Radio Alpha',
+          receivedAt: DateTime.now(),
+        ),
+      );
+
+      expect(provider.messages, hasLength(1));
+      expect(provider.messages.single.id, equals('handle-1'));
+    });
+
+    test('channel duplicates only dedupe against the latest channel message', () {
+      final provider = MessagesProvider();
+      final sender = Uint8List.fromList([9, 8, 7, 6, 5, 4]);
+
+      provider.addMessage(
+        Message(
+          id: 'channel-first',
+          messageType: MessageType.channel,
+          channelIdx: 2,
+          pathLen: 1,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000820,
+          text: 'same payload',
+          senderName: 'Radio Alpha',
+          receivedAt: DateTime.now(),
+          senderPublicKeyPrefix: sender,
+        ),
+      );
+      provider.addMessage(
+        Message(
+          id: 'channel-middle',
+          messageType: MessageType.channel,
+          channelIdx: 2,
+          pathLen: 1,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000825,
+          text: 'different payload',
+          senderName: 'Radio Bravo',
+          receivedAt: DateTime.now(),
+          senderPublicKeyPrefix: Uint8List.fromList([1, 2, 3, 4, 5, 6]),
+        ),
+      );
+      provider.addMessage(
+        Message(
+          id: 'channel-repeat',
+          messageType: MessageType.channel,
+          channelIdx: 2,
+          pathLen: 2,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000830,
+          text: 'same payload',
+          senderName: 'Radio Alpha',
+          receivedAt: DateTime.now(),
+          senderPublicKeyPrefix: sender,
+        ),
+      );
+
+      expect(provider.messages, hasLength(3));
+      expect(provider.messages.last.id, equals('channel-repeat'));
+    });
+
+    test('adjacent channel duplicates still dedupe within 5 seconds', () {
+      final provider = MessagesProvider();
+      final sender = Uint8List.fromList([4, 5, 6, 7, 8, 9]);
+      final baseTime = DateTime.fromMillisecondsSinceEpoch(1700000840000);
+
+      provider.addMessage(
+        Message(
+          id: 'adjacent-1',
+          messageType: MessageType.channel,
+          channelIdx: 3,
+          pathLen: 1,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000840,
+          text: 'same payload',
+          senderName: 'Radio Charlie',
+          receivedAt: baseTime,
+          senderPublicKeyPrefix: sender,
+        ),
+      );
+      provider.addMessage(
+        Message(
+          id: 'adjacent-2',
+          messageType: MessageType.channel,
+          channelIdx: 3,
+          pathLen: 2,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000845,
+          text: 'same payload',
+          senderName: 'Radio Charlie',
+          receivedAt: baseTime.add(const Duration(seconds: 4)),
+          senderPublicKeyPrefix: sender,
+        ),
+      );
+
+      expect(provider.messages, hasLength(1));
+      expect(provider.messages.single.id, equals('adjacent-1'));
+    });
+
+    test('channel duplicates outside 5 second window are kept', () {
+      final provider = MessagesProvider();
+      final sender = Uint8List.fromList([6, 7, 8, 9, 0, 1]);
+      final baseTime = DateTime.fromMillisecondsSinceEpoch(1700000850000);
+
+      provider.addMessage(
+        Message(
+          id: 'window-1',
+          messageType: MessageType.channel,
+          channelIdx: 4,
+          pathLen: 1,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000850,
+          text: 'same payload',
+          senderName: 'Radio Delta',
+          receivedAt: baseTime,
+          senderPublicKeyPrefix: sender,
+        ),
+      );
+      provider.addMessage(
+        Message(
+          id: 'window-2',
+          messageType: MessageType.channel,
+          channelIdx: 4,
+          pathLen: 2,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000855,
+          text: 'same payload',
+          senderName: 'Radio Delta',
+          receivedAt: baseTime.add(const Duration(seconds: 6)),
+          senderPublicKeyPrefix: sender,
+        ),
+      );
+
+      expect(provider.messages, hasLength(2));
+      expect(provider.messages.last.id, equals('window-2'));
+    });
+
     test('display list collapses stored duplicates and sums copy counts', () {
       final provider = MessagesProvider();
       final sender = Uint8List.fromList([5, 4, 3, 2, 1, 0]);
@@ -430,6 +629,30 @@ void main() {
       expect(display.single.occurrenceCount, equals(2));
     });
 
+    test('display list keeps a single sent message for self replay', () {
+      final provider = MessagesProvider();
+      provider.resolveContactNameCallback = (_) => 'dz0ny (SI)';
+      provider.addSentMessage(
+        _buildSentChannelMessage(id: 'display-sent', senderTimestamp: 1700000900),
+      );
+      provider.markMessageSent('display-sent', 0, 0);
+
+      provider.addMessage(
+        _buildReceivedChannelReplay(
+          id: 'display-received',
+          senderTimestamp: 1700000901,
+          senderName: 'dz0ny (SI)',
+        ),
+      );
+
+      final display = provider.buildDisplayMessages(
+        provider.getRecentMessages(),
+      );
+
+      expect(display, hasLength(1));
+      expect(display.single.message.id, equals('display-sent'));
+    });
+
     test('missing ACK schedules a delayed retransmission', () {
       fakeAsync((async) {
         final provider = MessagesProvider();

test/providers/sensors_provider_test.dart

@@ -6,6 +6,7 @@ import 'package:meshcore_sar_app/models/device_info.dart';
 import 'package:meshcore_sar_app/providers/connection_provider.dart';
 import 'package:meshcore_sar_app/providers/contacts_provider.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/services/profiles_feature_service.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -19,10 +20,17 @@ class _FakeContactsProvider extends ContactsProvider {
 }
 
 class _FakeConnectionProvider extends ConnectionProvider {
-  _FakeConnectionProvider({required bool isConnected})
-    : _isConnected = isConnected;
+  _FakeConnectionProvider({
+    required bool isConnected,
+    Uint8List? publicKey,
+    String? selfName,
+  }) : _isConnected = isConnected,
+       _publicKey = publicKey,
+       _selfName = selfName;
 
   final bool _isConnected;
+  final Uint8List? _publicKey;
+  final String? _selfName;
 
   int pingCalls = 0;
 
@@ -31,6 +39,8 @@ class _FakeConnectionProvider extends ConnectionProvider {
     connectionState: _isConnected
         ? ConnectionState.connected
         : ConnectionState.disconnected,
+    publicKey: _publicKey,
+    selfName: _selfName,
   );
 
   @override
@@ -65,9 +75,12 @@ void main() {
     expect(provider.isLoaded, isTrue);
   }
 
-  Contact buildSensorContact() {
+  Contact buildSensorContact({
+    int firstByte = 0x44,
+    String name = 'WX Station',
+  }) {
     final publicKey = Uint8List(32);
-    publicKey[0] = 0x44;
+    publicKey[0] = firstByte;
 
     return Contact(
       publicKey: publicKey,
@@ -75,7 +88,7 @@ void main() {
       flags: 0,
       outPathLen: 0,
       outPath: Uint8List(64),
-      advName: 'WX Station',
+      advName: name,
       lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
       advLat: 0,
       advLon: 0,
@@ -264,6 +277,36 @@ void main() {
     );
   });
 
+  test('watched sensor order persists across reloads', () async {
+    SharedPreferences.setMockInitialValues({});
+    final first = buildSensorContact(firstByte: 0x44, name: 'First');
+    final second = buildSensorContact(firstByte: 0x45, name: 'Second');
+    final third = buildSensorContact(firstByte: 0x46, name: 'Third');
+
+    final provider = SensorsProvider();
+    await waitUntilLoaded(provider);
+    await provider.addSensor(first);
+    await provider.addSensor(second);
+    await provider.addSensor(third);
+
+    await provider.reorderSensors(2, 0);
+
+    expect(provider.watchedSensorKeys, <String>[
+      third.publicKeyHex,
+      first.publicKeyHex,
+      second.publicKeyHex,
+    ]);
+
+    final reloadedProvider = SensorsProvider();
+    await waitUntilLoaded(reloadedProvider);
+
+    expect(reloadedProvider.watchedSensorKeys, <String>[
+      third.publicKeyHex,
+      first.publicKeyHex,
+      second.publicKeyHex,
+    ]);
+  });
+
   test(
     'unsupported auto refresh minutes normalize to nearest option',
     () async {
@@ -313,6 +356,50 @@ void main() {
     expect(connectionProvider.pingCalls, 2);
   });
 
+  test('refreshDueSensors refreshes self every 30 seconds', () 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, 2);
+
+    await provider.refreshDueSensors(
+      now: start.add(const Duration(seconds: 59)),
+      contactsProvider: contactsProvider,
+      connectionProvider: connectionProvider,
+    );
+    expect(connectionProvider.pingCalls, 2);
+
+    await provider.refreshDueSensors(
+      now: start.add(const Duration(minutes: 1)),
+      contactsProvider: contactsProvider,
+      connectionProvider: connectionProvider,
+    );
+    expect(connectionProvider.pingCalls, 3);
+  });
+
   test(
     'addSensor includes available extra telemetry fields by default',
     () async {
@@ -340,4 +427,60 @@ void main() {
       );
     },
   );
+
+  test('selfContact includes stored self telemetry', () async {
+    SharedPreferences.setMockInitialValues({});
+    final selfKey = Uint8List(32)..[0] = 0x66;
+    final contactsProvider = ContactsProvider();
+    await contactsProvider.initialize(devicePublicKey: selfKey);
+    contactsProvider.updateTelemetry(
+      selfKey.sublist(0, 6),
+      CayenneLppParser.createTemperatureData(19.5, channel: 1),
+    );
+
+    final connectionProvider = _FakeConnectionProvider(
+      isConnected: true,
+      publicKey: selfKey,
+      selfName: 'My Device',
+    );
+    final provider = SensorsProvider();
+    await waitUntilLoaded(provider);
+
+    final selfContact = provider.selfContact(
+      contactsProvider,
+      connectionProvider,
+    );
+
+    expect(selfContact, isNotNull);
+    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/live_traffic_screen_test.dart

@@ -1,10 +1,12 @@
-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/models/channel.dart';
 import 'package:meshcore_sar_app/models/ble_packet_log.dart';
 import 'package:meshcore_sar_app/l10n/app_localizations.dart';
+import 'package:meshcore_sar_app/providers/channels_provider.dart';
 import 'package:meshcore_sar_app/screens/live_traffic_screen.dart';
+import 'package:provider/provider.dart';
 
 BlePacketLog _log({
   required DateTime timestamp,
@@ -51,15 +53,52 @@ List<int> _multiHopRaw({
   ];
 }
 
-Widget _testApp(Widget child) {
-  return MaterialApp(
+Widget _testApp(Widget child, {ChannelsProvider? channelsProvider}) {
+  final app = MaterialApp(
     localizationsDelegates: AppLocalizations.localizationsDelegates,
     supportedLocales: AppLocalizations.supportedLocales,
     home: child,
   );
+  if (channelsProvider == null) {
+    return app;
+  }
+  return ChangeNotifierProvider.value(value: channelsProvider, child: app);
 }
 
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  final launchedUrls = <String>[];
+
+  setUp(() {
+    launchedUrls.clear();
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(
+          const MethodChannel('plugins.flutter.io/url_launcher'),
+          (call) async {
+            switch (call.method) {
+              case 'canLaunch':
+                return true;
+              case 'launch':
+                final arguments = Map<dynamic, dynamic>.from(
+                  call.arguments as Map<dynamic, dynamic>,
+                );
+                launchedUrls.add(arguments['url'] as String);
+                return true;
+            }
+            return null;
+          },
+        );
+  });
+
+  tearDown(() {
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(
+          const MethodChannel('plugins.flutter.io/url_launcher'),
+          null,
+        );
+  });
+
   testWidgets('shows empty state before traffic arrives', (tester) async {
     final logs = <BlePacketLog>[];
     final refresh = ValueNotifier<int>(0);
@@ -190,6 +229,103 @@ void main() {
     expect(find.textContaining('Size: 3 bytes'), findsOneWidget);
   });
 
+  testWidgets('shows known channel name for group traffic', (tester) async {
+    final logs = <BlePacketLog>[];
+    final refresh = ValueNotifier<int>(0);
+    final channel = Channel.create(index: 3, name: '#ops');
+    final channelsProvider = ChannelsProvider()
+      ..initializePublicChannel()
+      ..addOrUpdateChannelObject(channel);
+    final now = DateTime(2026, 3, 12, 12, 0, 0);
+
+    logs.add(
+      _log(
+        timestamp: now.subtract(const Duration(seconds: 4)),
+        direction: PacketDirection.rx,
+        rawData: [
+          ..._multiHopRaw(hops: [0xC0, 0x10], payloadType: 0x05),
+          channel.hashByte,
+        ],
+        responseCode: 0x88,
+      ),
+    );
+
+    await tester.pumpWidget(
+      _testApp(
+        LiveTrafficScreen(
+          logReader: () => logs,
+          refreshListenable: refresh,
+          now: () => now,
+        ),
+        channelsProvider: channelsProvider,
+      ),
+    );
+
+    expect(find.text('#ops'), findsOneWidget);
+    expect(find.text('Channel: #ops (${channel.hashHex})'), findsOneWidget);
+    expect(find.text('FLOOD GROUP_TEXT'), findsNothing);
+  });
+
+  testWidgets('shows packet type help sheet from the app bar', (tester) async {
+    final logs = <BlePacketLog>[];
+    final refresh = ValueNotifier<int>(0);
+    final now = DateTime(2026, 3, 12, 12, 0, 0);
+
+    await tester.pumpWidget(
+      _testApp(
+        LiveTrafficScreen(
+          logReader: () => logs,
+          refreshListenable: refresh,
+          now: () => now,
+        ),
+      ),
+    );
+
+    await tester.tap(find.byTooltip('Packet type help'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Packet Types'), findsOneWidget);
+    await tester.scrollUntilVisible(
+      find.text('FLOOD RETURNED_PATH'),
+      300,
+      scrollable: find.byType(Scrollable).last,
+    );
+    await tester.pumpAndSettle();
+    expect(find.text('FLOOD RETURNED_PATH'), findsOneWidget);
+    expect(
+      find.textContaining('stores that returned path as the peer\'s direct out-path'),
+      findsOneWidget,
+    );
+    await tester.scrollUntilVisible(
+      find.text('FLOOD CONTROL'),
+      300,
+      scrollable: find.byType(Scrollable).last,
+    );
+    await tester.pumpAndSettle();
+    expect(find.text('FLOOD CONTROL'), findsOneWidget);
+  });
+
+  testWidgets('opens public stats from the app bar', (tester) async {
+    final logs = <BlePacketLog>[];
+    final refresh = ValueNotifier<int>(0);
+    final now = DateTime(2026, 3, 12, 12, 0, 0);
+
+    await tester.pumpWidget(
+      _testApp(
+        LiveTrafficScreen(
+          logReader: () => logs,
+          refreshListenable: refresh,
+          now: () => now,
+        ),
+      ),
+    );
+
+    await tester.tap(find.byTooltip('View public stats'));
+    await tester.pump();
+
+    expect(launchedUrls, ['https://mcstats.dz0ny.dev']);
+  });
+
   testWidgets('summary metrics expand across wide layouts', (tester) async {
     tester.view.physicalSize = const Size(1200, 900);
     tester.view.devicePixelRatio = 1;

test/screens/messages_tab_test.dart

@@ -13,6 +13,7 @@ import 'package:meshcore_sar_app/providers/map_provider.dart';
 import 'package:meshcore_sar_app/providers/messages_provider.dart';
 import 'package:meshcore_sar_app/providers/voice_provider.dart';
 import 'package:meshcore_sar_app/screens/messages_tab.dart';
+import 'package:meshcore_sar_app/services/message_destination_preferences.dart';
 import 'package:meshcore_sar_app/services/voice_codec_service.dart';
 import 'package:meshcore_sar_app/services/voice_player_service.dart';
 import 'package:provider/provider.dart';
@@ -208,4 +209,227 @@ void main() {
     connectionProvider.dispose();
     channelsProvider.dispose();
   });
+
+  testWidgets(
+    'locks messages tab to the configured channel and removes the selector affordance',
+    (tester) async {
+      final lockedChannel = buildContact(
+        name: '#ops',
+        type: ContactType.channel,
+        secondByte: 2,
+      );
+      SharedPreferences.setMockInitialValues({
+        'message_locked_destination_enabled': true,
+        'message_locked_destination_type':
+            MessageDestinationPreferences.destinationTypeChannel,
+        'message_locked_recipient_public_key': lockedChannel.publicKeyHex,
+      });
+
+      final connectionProvider = ConnectionProvider();
+      final contactsProvider = ContactsProvider();
+      final messagesProvider = MessagesProvider();
+      final mapProvider = MapProvider();
+      final drawingProvider = DrawingProvider();
+      await messagesProvider.initialize();
+      await drawingProvider.initialize();
+      final channelsProvider = ChannelsProvider()..initializePublicChannel();
+      final voiceProvider = VoiceProvider(
+        codec: VoiceCodecService(),
+        player: VoicePlayerService(),
+      );
+      final imageProvider = ip.ImageProvider();
+      final appProvider = AppProvider(
+        connectionProvider: connectionProvider,
+        contactsProvider: contactsProvider,
+        messagesProvider: messagesProvider,
+        drawingProvider: drawingProvider,
+        channelsProvider: channelsProvider,
+        voiceProvider: voiceProvider,
+        imageProvider: imageProvider,
+      );
+
+      contactsProvider.addContacts([lockedChannel]);
+      messagesProvider.addMessage(
+        Message(
+          id: 'public-message',
+          messageType: MessageType.channel,
+          pathLen: 1,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000200,
+          text: 'Public chatter',
+          receivedAt: DateTime.now(),
+          channelIdx: 0,
+        ),
+      );
+      messagesProvider.addMessage(
+        Message(
+          id: 'locked-message',
+          messageType: MessageType.channel,
+          pathLen: 1,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000201,
+          text: 'Ops chatter',
+          receivedAt: DateTime.now(),
+          channelIdx: 2,
+        ),
+      );
+
+      await tester.pumpWidget(
+        MultiProvider(
+          providers: [
+            ChangeNotifierProvider.value(value: connectionProvider),
+            ChangeNotifierProvider.value(value: contactsProvider),
+            ChangeNotifierProvider.value(value: messagesProvider),
+            ChangeNotifierProvider.value(value: mapProvider),
+            ChangeNotifierProvider.value(value: drawingProvider),
+            ChangeNotifierProvider.value(value: channelsProvider),
+            ChangeNotifierProvider.value(value: voiceProvider),
+            ChangeNotifierProvider.value(value: imageProvider),
+            ChangeNotifierProvider.value(value: appProvider),
+          ],
+          child: MaterialApp(
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            home: const Scaffold(body: MessagesTab(isActive: true)),
+          ),
+        ),
+      );
+
+      await tester.pumpAndSettle();
+
+      expect(find.text('Ops chatter'), findsOneWidget);
+      expect(find.text('Public chatter'), findsNothing);
+      expect(
+        find.byKey(const ValueKey('messages_composer_destination_locked')),
+        findsOneWidget,
+      );
+      expect(
+        find.byKey(const ValueKey('messages_composer_destination_selector')),
+        findsNothing,
+      );
+
+      appProvider.dispose();
+      voiceProvider.dispose();
+      imageProvider.dispose();
+      drawingProvider.dispose();
+      mapProvider.dispose();
+      messagesProvider.dispose();
+      contactsProvider.dispose();
+      connectionProvider.dispose();
+      channelsProvider.dispose();
+    },
+  );
+
+  testWidgets(
+    'contact navigation temporarily overrides the lock while keeping the selector hidden',
+    (tester) async {
+      final directContact = buildContact(
+        name: 'Tim',
+        type: ContactType.chat,
+        secondByte: 9,
+      );
+      SharedPreferences.setMockInitialValues({
+        'message_locked_destination_enabled': true,
+        'message_locked_destination_type':
+            MessageDestinationPreferences.destinationTypeChannel,
+      });
+
+      final connectionProvider = ConnectionProvider();
+      final contactsProvider = ContactsProvider();
+      final messagesProvider = MessagesProvider();
+      final mapProvider = MapProvider();
+      final drawingProvider = DrawingProvider();
+      await messagesProvider.initialize();
+      await drawingProvider.initialize();
+      final channelsProvider = ChannelsProvider()..initializePublicChannel();
+      final voiceProvider = VoiceProvider(
+        codec: VoiceCodecService(),
+        player: VoicePlayerService(),
+      );
+      final imageProvider = ip.ImageProvider();
+      final appProvider = AppProvider(
+        connectionProvider: connectionProvider,
+        contactsProvider: contactsProvider,
+        messagesProvider: messagesProvider,
+        drawingProvider: drawingProvider,
+        channelsProvider: channelsProvider,
+        voiceProvider: voiceProvider,
+        imageProvider: imageProvider,
+      );
+
+      contactsProvider.addContacts([directContact]);
+      messagesProvider.addMessage(
+        Message(
+          id: 'public-message',
+          messageType: MessageType.channel,
+          pathLen: 1,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000300,
+          text: 'Public chatter',
+          receivedAt: DateTime.now(),
+          channelIdx: 0,
+        ),
+      );
+      messagesProvider.addMessage(
+        Message(
+          id: 'direct-message',
+          messageType: MessageType.contact,
+          senderPublicKeyPrefix: directContact.publicKey.sublist(0, 6),
+          pathLen: 1,
+          textType: MessageTextType.plain,
+          senderTimestamp: 1700000301,
+          text: 'Direct chatter',
+          receivedAt: DateTime.now(),
+        ),
+      );
+      messagesProvider.navigateToDestination(
+        MessageDestinationPreferences.destinationTypeContact,
+        recipientPublicKeyHex: directContact.publicKeyHex,
+      );
+
+      await tester.pumpWidget(
+        MultiProvider(
+          providers: [
+            ChangeNotifierProvider.value(value: connectionProvider),
+            ChangeNotifierProvider.value(value: contactsProvider),
+            ChangeNotifierProvider.value(value: messagesProvider),
+            ChangeNotifierProvider.value(value: mapProvider),
+            ChangeNotifierProvider.value(value: drawingProvider),
+            ChangeNotifierProvider.value(value: channelsProvider),
+            ChangeNotifierProvider.value(value: voiceProvider),
+            ChangeNotifierProvider.value(value: imageProvider),
+            ChangeNotifierProvider.value(value: appProvider),
+          ],
+          child: MaterialApp(
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            home: const Scaffold(body: MessagesTab(isActive: true)),
+          ),
+        ),
+      );
+
+      await tester.pumpAndSettle();
+
+      expect(find.text('Direct chatter'), findsOneWidget);
+      expect(find.text('Public chatter'), findsNothing);
+      expect(
+        find.byKey(const ValueKey('messages_composer_destination_locked')),
+        findsOneWidget,
+      );
+      expect(
+        find.byKey(const ValueKey('messages_composer_destination_selector')),
+        findsNothing,
+      );
+
+      appProvider.dispose();
+      voiceProvider.dispose();
+      imageProvider.dispose();
+      drawingProvider.dispose();
+      mapProvider.dispose();
+      messagesProvider.dispose();
+      contactsProvider.dispose();
+      connectionProvider.dispose();
+      channelsProvider.dispose();
+    },
+  );
 }

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:shared_preferences/shared_preferences.dart';
+import 'package:meshcore_sar_app/widgets/sensors/sensor_telemetry_card.dart';
 
 void main() {
-  setUp(() {
-    SharedPreferences.setMockInitialValues({});
-  });
-
-  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() {
+  Contact buildSensorContact({
+    int firstByte = 0x44,
+    String name = 'WX Station',
+  }) {
     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 contactsProvider = ContactsProvider();
-
-    await waitUntilLoaded(sensorsProvider);
-    contactsProvider.addOrUpdateContact(contact);
-    await sensorsProvider.addSensor(contact);
+    final option = sensorMetricOptionsFor(contact, labelOverrides: const {})
+        .firstWhere(
+          (entry) => entry.key.contains('illuminance') && entry.channel == 2,
+        );
 
     await tester.pumpWidget(
-      MultiProvider(
-        providers: [
-          ChangeNotifierProvider<ContactsProvider>.value(
-            value: contactsProvider,
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        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(
-        const ValueKey('sensor_selector_metric_channel_extra:illuminance_2'),
-      ),
+      find.byKey(ValueKey('sensor_selector_metric_${option.key}')),
       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

@@ -0,0 +1,84 @@
+import 'dart:typed_data';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/models/contact.dart';
+import 'package:meshcore_sar_app/services/bthome_met_history.dart';
+
+void main() {
+  test('parses a valid BTHome MET history response', () {
+    final parsed = BTHomeMetHistoryParser.parse('1,0,4,11.2,11.8,12.1,12.3');
+
+    expect(parsed.measurement, BTHomeMetMeasurement.temperature);
+    expect(parsed.page, 0);
+    expect(parsed.values, <double>[11.2, 11.8, 12.1, 12.3]);
+    expect(parsed.latest, 12.3);
+    expect(parsed.minimum, 11.2);
+    expect(parsed.maximum, 12.3);
+  });
+
+  test('rejects malformed BTHome MET history counts', () {
+    expect(
+      () => BTHomeMetHistoryParser.parse('2,0,3,41,42'),
+      throwsA(isA<BTHomeMetHistoryFormatException>()),
+    );
+  });
+
+  test('detects available BTHome MET measurements from telemetry', () {
+    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 {
+          'generic_sensor_1': 1,
+          'speed_2': 3.1,
+          'gust_2': 4.8,
+          'rain_2': 12.3,
+        },
+        timestamp: DateTime(2026, 3, 21, 12),
+      ),
+    );
+
+    expect(bTHomeMetMeasurementsForContact(contact), <BTHomeMetMeasurement>[
+      BTHomeMetMeasurement.temperature,
+      BTHomeMetMeasurement.humidity,
+      BTHomeMetMeasurement.windSpeed,
+      BTHomeMetMeasurement.gust,
+      BTHomeMetMeasurement.rain,
+    ]);
+    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);
+  });
+}