diff --git a/lib/screens/map_tab.dart b/lib/screens/map_tab.dart
index 50ddd4a..e15b302 100644
--- a/lib/screens/map_tab.dart
+++ b/lib/screens/map_tab.dart
@@ -506,7 +506,7 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
     );
   }
 
-  void _showDetailedCompass(BuildContext context, List<Contact> contacts) {
+  void _showDetailedCompass(BuildContext context, List<Contact> contacts, List<SarMarker> sarMarkers) {
     showModalBottomSheet(
       context: context,
       isScrollControlled: true,
@@ -521,6 +521,7 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
           initialPosition: _currentPosition,
           initialHeading: _currentHeading,
           contacts: contacts,
+          sarMarkers: sarMarkers,
         ),
       ),
     );
@@ -665,6 +666,7 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
                   onTap: () => _showDetailedCompass(
                     context,
                     contactsProvider.chatContactsWithLocation,
+                    messagesProvider.sarMarkers,
                   ),
                   child: _CompassWidget(
                     heading: _currentHeading ?? 0,
@@ -972,11 +974,13 @@ class _DetailedCompassDialog extends StatefulWidget {
   final Position? initialPosition;
   final double? initialHeading;
   final List<Contact> contacts;
+  final List<SarMarker> sarMarkers;
 
   const _DetailedCompassDialog({
     required this.initialPosition,
     required this.initialHeading,
     required this.contacts,
+    required this.sarMarkers,
   });
 
   @override
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index dc4bffa..cf7240c 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -93,12 +93,20 @@ class _SettingsScreenState extends State<SettingsScreen> {
         stagingCount: 1,
       );
 
+      final channelMessages = SampleDataGenerator.generateChannelMessages(
+        generalChannelMessages: 8,
+        emergencyChannelMessages: 5,
+      );
+
+      // Combine all messages
+      final allMessages = [...sarMessages, ...channelMessages];
+
       // Add to providers
       final contactsProvider = Provider.of<ContactsProvider>(context, listen: false);
       final messagesProvider = Provider.of<MessagesProvider>(context, listen: false);
 
       contactsProvider.addContacts(contacts);
-      messagesProvider.addMessages(sarMessages);
+      messagesProvider.addMessages(allMessages);
 
       if (!mounted) return;
 
@@ -108,7 +116,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
           content: Text(
-            'Loaded $teamCount team members, $channelCount channels, ${sarMessages.length} SAR markers',
+            'Loaded $teamCount team members, $channelCount channels, ${sarMessages.length} SAR markers, ${channelMessages.length} messages',
           ),
           backgroundColor: Colors.green,
         ),
@@ -227,7 +235,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           Padding(
             padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
             child: Text(
-              'Load or clear sample contacts and SAR markers for testing',
+              'Load or clear sample contacts, channel messages, and SAR markers for testing',
               style: Theme.of(context).textTheme.bodySmall?.copyWith(
                     color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
                   ),
diff --git a/lib/utils/sample_data_generator.dart b/lib/utils/sample_data_generator.dart
index 14b3158..eb37e33 100644
--- a/lib/utils/sample_data_generator.dart
+++ b/lib/utils/sample_data_generator.dart
@@ -211,4 +211,107 @@ class SampleDataGenerator {
 
     return messages;
   }
+
+  /// Generate sample channel messages for public channels
+  static List<Message> generateChannelMessages({
+    int generalChannelMessages = 8,
+    int emergencyChannelMessages = 5,
+  }) {
+    final messages = <Message>[];
+    final now = DateTime.now();
+    int messageId = 1000; // Start with high ID to avoid conflicts
+
+    // Sample messages for General channel (index 0)
+    final generalMessages = [
+      'All teams check in',
+      'Weather update: Clear skies, temp 18°C',
+      'Base camp established at staging area',
+      'Team Alpha moving to sector 2',
+      'Radio check - all stations respond',
+      'Water supply available at checkpoint 3',
+      'Team Bravo reporting: sector 1 clear',
+      'ETA to rally point: 15 minutes',
+      'Supply drop confirmed for 14:00',
+      'Drone survey completed - no findings',
+      'Team Charlie requesting backup',
+      'All units: maintain radio discipline',
+    ];
+
+    // Sample messages for Emergency channel (index 1)
+    final emergencyMessages = [
+      'URGENT: Medical assistance needed at sector 4',
+      'Found person - requesting immediate evac',
+      'Fire spotted - coordinates incoming',
+      'Team member injured - sending location',
+      'PRIORITY: Need helicopter support',
+      'Medical team en route to your location',
+      'Evac helicopter ETA 10 minutes',
+      'Emergency resolved - all clear',
+      'Casualties: 1 minor injury, being treated',
+      'Emergency services notified and responding',
+    ];
+
+    final teamNames = [
+      'Alpha Team Lead',
+      'Bravo Scout',
+      'Charlie Medic',
+      'Delta Navigator',
+      'Echo Support',
+      'Base Command',
+      'Field Coordinator',
+      'Medical Team',
+    ];
+
+    // Generate General channel messages
+    for (int i = 0; i < generalChannelMessages && i < generalMessages.length; i++) {
+      final senderKey = Uint8List.fromList(
+        List.generate(32, (_) => _random.nextInt(256)),
+      );
+
+      // Messages spread over the last 2 hours
+      final minutesAgo = 120 - (i * 15) - _random.nextInt(10);
+      final timestamp = now.subtract(Duration(minutes: minutesAgo));
+
+      messages.add(Message(
+        id: 'sample_general_$messageId',
+        messageType: MessageType.channel,
+        channelIdx: 0, // General channel
+        senderPublicKeyPrefix: senderKey.sublist(0, 6),
+        pathLen: 1,
+        textType: MessageTextType.plain,
+        senderTimestamp: timestamp.millisecondsSinceEpoch ~/ 1000,
+        text: generalMessages[i],
+        receivedAt: timestamp,
+        senderName: teamNames[_random.nextInt(teamNames.length)],
+      ));
+      messageId++;
+    }
+
+    // Generate Emergency channel messages
+    for (int i = 0; i < emergencyChannelMessages && i < emergencyMessages.length; i++) {
+      final senderKey = Uint8List.fromList(
+        List.generate(32, (_) => _random.nextInt(256)),
+      );
+
+      // Emergency messages more recent (last hour)
+      final minutesAgo = 60 - (i * 10) - _random.nextInt(5);
+      final timestamp = now.subtract(Duration(minutes: minutesAgo));
+
+      messages.add(Message(
+        id: 'sample_emergency_$messageId',
+        messageType: MessageType.channel,
+        channelIdx: 1, // Emergency channel
+        senderPublicKeyPrefix: senderKey.sublist(0, 6),
+        pathLen: 1,
+        textType: MessageTextType.plain,
+        senderTimestamp: timestamp.millisecondsSinceEpoch ~/ 1000,
+        text: emergencyMessages[i],
+        receivedAt: timestamp,
+        senderName: teamNames[_random.nextInt(teamNames.length)],
+      ));
+      messageId++;
+    }
+
+    return messages;
+  }
 }