Merge branch 'main' into feature/usb

lib/screens/contacts_screen.dart

@@ -26,6 +26,7 @@ import '../widgets/room_login_dialog.dart';
 import '../widgets/unread_badge.dart';
 import 'channels_screen.dart';
 import 'chat_screen.dart';
+import 'discovery_screen.dart';
 import 'map_screen.dart';
 import 'repeater_hub_screen.dart';
 import 'settings_screen.dart';
@@ -218,9 +219,10 @@ class _ContactsScreenState extends State<ContactsScreen>
     }
     final hexString = text.substring('meshcore://'.length);
     try {
-      final importContactFrame = buildImportContactFrame(hexString);
+      final bytes = hex2Uint8List(hexString);
+      final importContactFrame = buildImportContactFrame(bytes);
       _pendingOperations.add(ContactOperationType.import);
-      await connector.sendFrame(importContactFrame, expectsGenericAck: true);
+      connector.importContact(importContactFrame);
     } catch (e) {
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
@@ -318,6 +320,21 @@ class _ContactsScreenState extends State<ContactsScreen>
                   ),
                   onTap: () => _disconnect(context, connector),
                 ),
+                PopupMenuItem(
+                  child: Row(
+                    children: [
+                      const Icon(Icons.person_add_rounded),
+                      const SizedBox(width: 8),
+                      Text("Discovered Contacts"),
+                    ],
+                  ),
+                  onTap: () => Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => const DiscoveryScreen(),
+                    ),
+                  ),
+                ),
                 PopupMenuItem(
                   child: Row(
                     children: [
@@ -1121,6 +1138,7 @@ class _ContactsScreenState extends State<ContactsScreen>
                             contact.name,
                           ),
                           path: contact.traceRouteBytes ?? Uint8List(0),
+                          targetContact: contact,
                         ),
                       ),
                     );