diff --git a/lib/screens/chat/chat_screen.dart b/lib/screens/chat/chat_screen.dart index 842c75e..f176a0a 100644 --- a/lib/screens/chat/chat_screen.dart +++ b/lib/screens/chat/chat_screen.dart @@ -74,6 +74,7 @@ class _ChatScreenState extends State { AsyncSnapshot?> snapshot) { if (_userInfo != null) { final userInfo = _userInfo![0] as MyUser; + return Container( padding: const EdgeInsets.symmetric(vertical: 8), color: const Color(0xFFD6F4FF), @@ -240,6 +241,7 @@ class _ChatScreenState extends State { if (_userInfo != null) { final userInfo = _userInfo![0] as MyUser; + final myInfo = _userInfo![1] as MyUser; if (userInfo.token == null) return; @@ -250,7 +252,7 @@ class _ChatScreenState extends State { LocalNotifications.sendPushNotification( userInfo.token!, 'Nuevo mensaje', - 'Tienes un nuevo mensaje de ${userInfo.name}', + 'Tienes un nuevo mensaje de ${myInfo.name}', ); _lastNotificationTime = DateTime.now(); @@ -282,6 +284,7 @@ class _ChatScreenState extends State { if (_userInfo != null) { final userInfo = _userInfo![0] as MyUser; + final myInfo = _userInfo![1] as MyUser; if (userInfo.token == null) return; @@ -292,7 +295,7 @@ class _ChatScreenState extends State { LocalNotifications.sendPushNotification( userInfo.token!, 'Nuevo mensaje', - 'Tienes un nuevo mensaje de ${userInfo.name}', + 'Tienes un nuevo mensaje de ${myInfo.name}', ); _lastNotificationTime = DateTime.now(); @@ -414,19 +417,21 @@ class _ChatScreenState extends State { .toList(); } - Future> _getUserAndProfessionalInfo( - ServiceEntity service) async { + Future> _getUserAndProfessionalInfo(ServiceEntity service) async { final userRepo = FirebaseUserRepository(FirebaseAuth.instance); final MyUser? userInfo; + final MyUser? myInfo; if (FirebaseAuth.instance.currentUser!.uid == service.userId) { userInfo = await userRepo.getMyUser(service.professionalId); + myInfo = await userRepo.getMyUser(service.userId); } else { userInfo = await userRepo.getMyUser(service.userId); + myInfo = await userRepo.getMyUser(service.professionalId); } - return [userInfo]; + return [userInfo, myInfo]; } double calculoRating(double average) {