From 78af37e0f57aadd7b85cbeefe744b272a73c4e73 Mon Sep 17 00:00:00 2001
From: ManhNTX <tmnguyen@linagora.com>
Date: Sat, 29 Oct 2022 20:08:19 +0700
Subject: [PATCH] TF-996: apply correct content email when swipe

---
 .../email/presentation/email_controller.dart     | 16 +++++++++-------
 lib/features/email/presentation/email_view.dart  |  9 ++++++---
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/features/email/presentation/email_controller.dart b/lib/features/email/presentation/email_controller.dart
index 5ba748778..f3d8ca887 100644
--- a/lib/features/email/presentation/email_controller.dart
+++ b/lib/features/email/presentation/email_controller.dart
@@ -344,14 +344,16 @@ class EmailController extends BaseController with AppLoaderMixin {
     );
     presentationEmailsLoaded.removeWhere((e) => e.emailCurrent!.id == emailLoaded.emailCurrent!.id);
     presentationEmailsLoaded.add(emailLoaded);
-    emailContents.value = success.emailContentsDisplayed;
-    initialEmailContents = success.emailContents;
-    attachments.value = success.attachments;
+    if(success.emailCurrent?.id == mailboxDashBoardController.selectedEmail.value?.id) {
+      emailContents.value = success.emailContentsDisplayed;
+      initialEmailContents = success.emailContents;
+      attachments.value = success.attachments;
 
-    final isShowMessageReadReceipt = success.emailCurrent
-        ?.hasReadReceipt(mailboxDashBoardController.mapMailboxById) == true;
-    if (isShowMessageReadReceipt) {
-      _handleReadReceipt();
+      final isShowMessageReadReceipt = success.emailCurrent
+          ?.hasReadReceipt(mailboxDashBoardController.mapMailboxById) == true;
+      if (isShowMessageReadReceipt) {
+        _handleReadReceipt();
+      }
     }
   }
 
diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart
index 70dbdf67f..f18f47475 100644
--- a/lib/features/email/presentation/email_view.dart
+++ b/lib/features/email/presentation/email_view.dart
@@ -242,11 +242,11 @@ class EmailView extends GetWidget<EmailController> {
             if (BuildUtils.isWeb)
               Expanded(child: Padding(
                   padding: const EdgeInsets.only(left: 16, bottom: 16),
-                  child: _buildEmailContent(context, constraints)))
+                  child: _buildEmailContent(context, constraints, email)))
             else
               Padding(
                   padding: const EdgeInsets.all(16),
-                  child: _buildEmailContent(context, constraints))
+                  child: _buildEmailContent(context, constraints, email))
           ],
         );
       });
@@ -715,7 +715,10 @@ class EmailView extends GetWidget<EmailController> {
     });
   }
 
-  Widget _buildEmailContent(BuildContext context, BoxConstraints constraints) {
+  Widget _buildEmailContent(BuildContext context, BoxConstraints constraints, PresentationEmail email) {
+    if(email.id != controller.mailboxDashBoardController.selectedEmail.value?.id) {
+      return const SizedBox.shrink();
+    }
     return Obx(() {
       if (controller.emailContents.isNotEmpty) {
         final allEmailContents = controller.emailContents.asHtmlString;