From 6f40afa6f29d1af19c6176ec19523d3829c57f5d Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Thu, 14 Oct 2021 00:00:39 +0700
Subject: [PATCH] TF-164 [BUG] Fix Draft, Outbox header should change to
 recipient

---
 .../thread/presentation/widgets/email_tile_builder.dart       | 4 +++-
 model/lib/extensions/list_email_address_extension.dart        | 4 ++--
 model/lib/extensions/presentation_email_extension.dart        | 3 ++-
 model/lib/mailbox/presentation_mailbox.dart                   | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/features/thread/presentation/widgets/email_tile_builder.dart b/lib/features/thread/presentation/widgets/email_tile_builder.dart
index c8ffe63d6..2159c46da 100644
--- a/lib/features/thread/presentation/widgets/email_tile_builder.dart
+++ b/lib/features/thread/presentation/widgets/email_tile_builder.dart
@@ -85,7 +85,9 @@ class EmailTileBuilder {
                 children: [
                   Expanded(
                     child: Text(
-                      _mailboxRole == PresentationMailbox.roleSent
+                      (_mailboxRole == PresentationMailbox.roleSent
+                        || _mailboxRole == PresentationMailbox.roleDrafts
+                        || _mailboxRole == PresentationMailbox.roleOutbox)
                           ? '${_presentationEmail.recipientsName()}'
                           : '${_presentationEmail.getSenderName()}',
                       maxLines: 1,
diff --git a/model/lib/extensions/list_email_address_extension.dart b/model/lib/extensions/list_email_address_extension.dart
index 21864a9df..22e1a2828 100644
--- a/model/lib/extensions/list_email_address_extension.dart
+++ b/model/lib/extensions/list_email_address_extension.dart
@@ -8,7 +8,7 @@ extension ListEmailAddressExtension on Set<EmailAddress>? {
 
   List<EmailAddress> asList() => this != null ? this!.toList() : List.empty();
 
-  List<String> getListEmailAddress({ExpandMode expandMode = ExpandMode.EXPAND, int limitAddress = 1, bool isFullEmailAddress = false}) {
+  List<String> emailAddressToListString({ExpandMode expandMode = ExpandMode.EXPAND, int limitAddress = 1, bool isFullEmailAddress = false}) {
     if (this != null) {
       if (expandMode == ExpandMode.EXPAND) {
         return this!.map((emailAddress) => isFullEmailAddress ? emailAddress.asFullString() : emailAddress.asString()).toList();
@@ -21,7 +21,7 @@ extension ListEmailAddressExtension on Set<EmailAddress>? {
   }
 
   String listEmailAddressToString({ExpandMode expandMode = ExpandMode.EXPAND, int limitAddress = 1, bool isFullEmailAddress = false}) {
-    final listEmail = getListEmailAddress(expandMode: expandMode, limitAddress: limitAddress, isFullEmailAddress: isFullEmailAddress);
+    final listEmail = emailAddressToListString(expandMode: expandMode, limitAddress: limitAddress, isFullEmailAddress: isFullEmailAddress);
     return listEmail.isNotEmpty ? listEmail.join(', ') : '';
   }
 
diff --git a/model/lib/extensions/presentation_email_extension.dart b/model/lib/extensions/presentation_email_extension.dart
index 6cb64be1c..e59db896c 100644
--- a/model/lib/extensions/presentation_email_extension.dart
+++ b/model/lib/extensions/presentation_email_extension.dart
@@ -76,7 +76,8 @@ extension PresentationEmailExtension on PresentationEmail {
   }
 
   String recipientsName() {
-    return to.listEmailAddressToString() + cc.listEmailAddressToString() + bcc.listEmailAddressToString();
+    final allEmailAddress = to.emailAddressToListString() + cc.emailAddressToListString() + bcc.emailAddressToListString();
+    return allEmailAddress.isNotEmpty ? allEmailAddress.join(', ') : '';
   }
 
   Tuple3<List<EmailAddress>, List<EmailAddress>, List<EmailAddress>> generateRecipientsEmailAddressForComposer(
diff --git a/model/lib/mailbox/presentation_mailbox.dart b/model/lib/mailbox/presentation_mailbox.dart
index 80f279151..93770a59a 100644
--- a/model/lib/mailbox/presentation_mailbox.dart
+++ b/model/lib/mailbox/presentation_mailbox.dart
@@ -10,6 +10,7 @@ class PresentationMailbox with EquatableMixin {
   static final roleSent = Role('sent');
   static final roleTemplates = Role('templates');
   static final roleOutbox = Role('outbox');
+  static final roleDrafts = Role('drafts');
 
   final MailboxId id;
   final MailboxName? name;