Merge remote-tracking branch 'origin/main' into ez_group_dropdown3

# Conflicts:
#	lib/main.dart

lib/main.dart

@@ -20,6 +20,7 @@ import 'services/background_service.dart';
 import 'services/map_tile_cache_service.dart';
 import 'services/chat_text_scale_service.dart';
 import 'services/ui_view_state_service.dart';
+import 'services/timeout_prediction_service.dart';
 import 'storage/prefs_manager.dart';
 import 'utils/app_logger.dart';
 
@@ -41,6 +42,7 @@ void main() async {
   final mapTileCacheService = MapTileCacheService();
   final chatTextScaleService = ChatTextScaleService();
   final uiViewStateService = UiViewStateService();
+  final timeoutPredictionService = TimeoutPredictionService(storage);
 
   // Load settings
   await appSettingsService.loadSettings();
@@ -59,6 +61,7 @@ void main() async {
 
   await chatTextScaleService.initialize();
   await uiViewStateService.initialize();
+  await timeoutPredictionService.initialize();
 
   // Wire up connector with services
   connector.initialize(
@@ -68,6 +71,7 @@ void main() async {
     bleDebugLogService: bleDebugLogService,
     appDebugLogService: appDebugLogService,
     backgroundService: backgroundService,
+    timeoutPredictionService: timeoutPredictionService,
   );
 
   await connector.loadContactCache();
@@ -90,6 +94,7 @@ void main() async {
       mapTileCacheService: mapTileCacheService,
       chatTextScaleService: chatTextScaleService,
       uiViewStateService: uiViewStateService,
+      timeoutPredictionService: timeoutPredictionService,
     ),
   );
 }
@@ -126,6 +131,7 @@ class MeshCoreApp extends StatelessWidget {
   final MapTileCacheService mapTileCacheService;
   final ChatTextScaleService chatTextScaleService;
   final UiViewStateService uiViewStateService;
+  final TimeoutPredictionService timeoutPredictionService;
 
   const MeshCoreApp({
     super.key,
@@ -139,6 +145,7 @@ class MeshCoreApp extends StatelessWidget {
     required this.mapTileCacheService,
     required this.chatTextScaleService,
     required this.uiViewStateService,
+    required this.timeoutPredictionService,
   });
 
   @override
@@ -155,6 +162,7 @@ class MeshCoreApp extends StatelessWidget {
         ChangeNotifierProvider.value(value: uiViewStateService),
         Provider.value(value: storage),
         Provider.value(value: mapTileCacheService),
+        ChangeNotifierProvider.value(value: timeoutPredictionService),
       ],
       child: Consumer<AppSettingsService>(
         builder: (context, settingsService, child) {