From 157fbe347aaee11a26ab8e61452c5a949ddab1bc Mon Sep 17 00:00:00 2001 From: dab246 Date: Thu, 3 Aug 2023 12:07:46 +0700 Subject: [PATCH] TF-2068 Display organizer address when organizer name (cherry picked from commit f0e0670b798e3d751ced6ce5040b458b1ad10f04) --- .../extensions/calendar_event_extension.dart | 10 ++++++---- .../calendar_event_information_widget.dart | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/features/email/presentation/extensions/calendar_event_extension.dart b/lib/features/email/presentation/extensions/calendar_event_extension.dart index 3b36f6d06..388143796 100644 --- a/lib/features/email/presentation/extensions/calendar_event_extension.dart +++ b/lib/features/email/presentation/extensions/calendar_event_extension.dart @@ -121,18 +121,20 @@ extension CalendarEventExtension on CalendarEvent { case EventMethod.refresh: case EventMethod.cancel: case EventMethod.declineCounter: - return getOrganizerName(context); + return getOrganizerNameEvent(context); case EventMethod.reply: case EventMethod.counter: - return getAttendeeName(context, listEmailAddressSender); + return getAttendeeNameEvent(context, listEmailAddressSender); default: return ''; } } - String getOrganizerName(BuildContext context) => organizer?.name ?? AppLocalizations.of(context).you; + String getOrganizerNameEvent(BuildContext context) => organizer?.name ?? AppLocalizations.of(context).you; - String getAttendeeName(BuildContext context, List listEmailAddressSender) { + String get organizerName => organizer?.name ?? organizer?.mailto?.value ?? ''; + + String getAttendeeNameEvent(BuildContext context, List listEmailAddressSender) { final matchedAttendee = findAttendeeHasUpdatedStatus(listEmailAddressSender); if (matchedAttendee != null) { return matchedAttendee.name?.name ?? AppLocalizations.of(context).anAttendee; diff --git a/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart b/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart index 62062c410..ed7490a1b 100644 --- a/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart @@ -71,7 +71,7 @@ class CalendarEventInformationWidget extends StatelessWidget { ), children: [ TextSpan( - text: calendarEvent.organizer?.name, + text: calendarEvent.organizerName, style: const TextStyle( color: CalendarEventInformationWidgetStyles.invitationMessageColor, fontSize: CalendarEventInformationWidgetStyles.invitationMessageTextSize, @@ -136,7 +136,7 @@ class CalendarEventInformationWidget extends StatelessWidget { ), children: [ TextSpan( - text: calendarEvent.organizer?.name, + text: calendarEvent.organizerName, style: const TextStyle( color: CalendarEventInformationWidgetStyles.invitationMessageColor, fontSize: CalendarEventInformationWidgetStyles.invitationMessageTextSize,