From 0388e4eef78188a7138d0fca4ea676d53ef79708 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Thu, 3 Aug 2023 10:56:33 +0700
Subject: [PATCH] TF-2068 Remove the comma of the last attendee in
 EventAttendeeDetailWidget

(cherry picked from commit 48906b1ac2d0e1ef978e410b0ba2719769c7fa19)
---
 .../widgets/calendar_event/attendee_widget.dart            | 7 +++++--
 .../calendar_event/event_attendee_detail_widget.dart       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/features/email/presentation/widgets/calendar_event/attendee_widget.dart b/lib/features/email/presentation/widgets/calendar_event/attendee_widget.dart
index 03ebcf3d3..607e2a135 100644
--- a/lib/features/email/presentation/widgets/calendar_event/attendee_widget.dart
+++ b/lib/features/email/presentation/widgets/calendar_event/attendee_widget.dart
@@ -6,10 +6,12 @@ import 'package:tmail_ui_user/features/email/presentation/styles/attendee_widget
 class AttendeeWidget extends StatelessWidget {
 
   final CalendarAttendee attendee;
+  final List<CalendarAttendee> listAttendees;
 
   const AttendeeWidget({
     super.key,
-    required this.attendee
+    required this.attendee,
+    required this.listAttendees,
   });
 
   @override
@@ -33,7 +35,8 @@ class AttendeeWidget extends StatelessWidget {
                 fontWeight: FontWeight.w500
               ),
             ),
-          const TextSpan(text: ', '),
+          if (listAttendees.last != attendee)
+            const TextSpan(text: ', '),
         ]
       )
     );
diff --git a/lib/features/email/presentation/widgets/calendar_event/event_attendee_detail_widget.dart b/lib/features/email/presentation/widgets/calendar_event/event_attendee_detail_widget.dart
index 13f3026e6..8a83c240f 100644
--- a/lib/features/email/presentation/widgets/calendar_event/event_attendee_detail_widget.dart
+++ b/lib/features/email/presentation/widgets/calendar_event/event_attendee_detail_widget.dart
@@ -61,7 +61,7 @@ class _EventAttendeeDetailWidgetState extends State<EventAttendeeDetailWidget> {
           children: [
             OrganizerWidget(organizer: widget.organizer),
             ..._attendeesDisplayed
-                .map((attendee) => AttendeeWidget(attendee: attendee))
+                .map((attendee) => AttendeeWidget(attendee: attendee, listAttendees: _attendeesDisplayed))
                 .toList(),
             if (!_isShowAllAttendee)
               Padding(