diff --git a/lib/features/agents/presentation/screens/agent_network_screen.dart b/lib/features/agents/presentation/screens/agent_network_screen.dart index cf7cd82..4d346c5 100644 --- a/lib/features/agents/presentation/screens/agent_network_screen.dart +++ b/lib/features/agents/presentation/screens/agent_network_screen.dart @@ -252,9 +252,15 @@ class _RequestCard extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final user = data['user'] as Map? ?? {}; - final userName = - user['email'] as String? ?? user['name'] as String? ?? 'User'; - final avatar = user['avatar'] as String?; + final userProfile = user['userProfile'] as Map? ?? {}; + final profileFirstName = userProfile['firstName'] as String? ?? ''; + final profileLastName = userProfile['lastName'] as String? ?? ''; + final profileName = '$profileFirstName $profileLastName'.trim(); + final userName = profileName.isNotEmpty + ? profileName + : (user['email'] as String? ?? 'User'); + final avatar = (userProfile['avatar'] as String?) ?? + (user['avatar'] as String?); final message = data['message'] as String?; final requestId = data['id'] as String; final createdAt = data['createdAt'] as String?; @@ -449,10 +455,16 @@ class _ConnectionCardState extends ConsumerState<_ConnectionCard> { @override Widget build(BuildContext context) { final user = widget.data['user'] as Map? ?? {}; - final userName = - user['email'] as String? ?? user['name'] as String? ?? 'User'; + final userProfile = user['userProfile'] as Map? ?? {}; + final profileFirstName = userProfile['firstName'] as String? ?? ''; + final profileLastName = userProfile['lastName'] as String? ?? ''; + final profileName = '$profileFirstName $profileLastName'.trim(); + final userName = profileName.isNotEmpty + ? profileName + : (user['email'] as String? ?? 'User'); final userEmail = user['email'] as String? ?? ''; - final avatar = user['avatar'] as String?; + final avatar = (userProfile['avatar'] as String?) ?? + (user['avatar'] as String?); final respondedAt = widget.data['respondedAt'] as String?; final connectedDate = _formatConnectedDate(respondedAt); diff --git a/lib/features/home/presentation/widgets/hero_section.dart b/lib/features/home/presentation/widgets/hero_section.dart index e9ca9b0..86bf562 100644 --- a/lib/features/home/presentation/widgets/hero_section.dart +++ b/lib/features/home/presentation/widgets/hero_section.dart @@ -51,12 +51,8 @@ class _HeroSectionState extends ConsumerState { if (_selectedCategory != null) params['category'] = Uri.encodeComponent(_selectedCategory!); if (params.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Please select at least one filter to search'), - backgroundColor: AppColors.accentOrange, - ), - ); + // "All Types" with no other filters — navigate to show all agents + context.push('/agents/search'); return; }