From bf3c465b14b28978eac61bba6e22f0633dd809ef Mon Sep 17 00:00:00 2001
From: Dat Vu <tdvu@linagora.com>
Date: Fri, 19 Sep 2025 09:43:46 +0700
Subject: [PATCH] Fix email content is broken when perform previous/next email
 then back to app (#4028)

---
 lib/features/email/presentation/email_view.dart           | 8 ++++++--
 .../extension/get_thread_details_email_views.dart         | 2 --
 .../thread_detail/presentation/thread_detail_view.dart    | 3 ---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart
index 61869756f..763e395d0 100644
--- a/lib/features/email/presentation/email_view.dart
+++ b/lib/features/email/presentation/email_view.dart
@@ -372,7 +372,9 @@ class EmailView extends GetWidget<SingleEmailController> {
                             horizontal: EmailViewStyles.mobileContentHorizontalMargin,
                           ),
                           child: HtmlContentViewer(
-                            key: controller.htmlContentViewKey,
+                            key: PlatformInfo.isIntegrationTesting
+                                ? controller.htmlContentViewKey
+                                : null,
                             contentHtml: allEmailContents,
                             initialWidth: bodyConstraints.maxWidth,
                             direction: AppUtils.getCurrentDirection(context),
@@ -411,7 +413,9 @@ class EmailView extends GetWidget<SingleEmailController> {
                     horizontal: EmailViewStyles.mobileContentHorizontalMargin
                   ),
                   child: HtmlContentViewer(
-                    key: controller.htmlContentViewKey,
+                    key: PlatformInfo.isIntegrationTesting
+                        ? controller.htmlContentViewKey
+                        : null,
                     contentHtml: allEmailContents,
                     initialWidth: bodyConstraints.maxWidth,
                     direction: AppUtils.getCurrentDirection(context),
diff --git a/lib/features/thread_detail/presentation/extension/get_thread_details_email_views.dart b/lib/features/thread_detail/presentation/extension/get_thread_details_email_views.dart
index 2957f7905..69f77bdf4 100644
--- a/lib/features/thread_detail/presentation/extension/get_thread_details_email_views.dart
+++ b/lib/features/thread_detail/presentation/extension/get_thread_details_email_views.dart
@@ -69,7 +69,6 @@ extension GetThreadDetailEmailViews on ThreadDetailController {
         return Padding(
           padding: const EdgeInsetsDirectional.only(bottom: 16),
           child: EmailView(
-            key: GlobalObjectKey('${presentationEmail.id?.id.value ?? ''}firstInThread'),
             isInsideThreadDetailView: true,
             emailId: presentationEmail.id,
             isFirstEmailInThreadDetail: true,
@@ -85,7 +84,6 @@ extension GetThreadDetailEmailViews on ThreadDetailController {
       return Padding(
         padding: const EdgeInsetsDirectional.only(bottom: 16),
         child: EmailView(
-          key: GlobalObjectKey(presentationEmail.id?.id.value ?? ''),
           isInsideThreadDetailView: true,
           emailId: presentationEmail.id,
           onToggleThreadDetailCollapseExpand: () {
diff --git a/lib/features/thread_detail/presentation/thread_detail_view.dart b/lib/features/thread_detail/presentation/thread_detail_view.dart
index 318c95c98..36da9ee83 100644
--- a/lib/features/thread_detail/presentation/thread_detail_view.dart
+++ b/lib/features/thread_detail/presentation/thread_detail_view.dart
@@ -136,9 +136,6 @@ class ThreadDetailView extends GetWidget<ThreadDetailController> {
                         ? manager.availableThreadIds.length
                         : manager.currentDisplayedEmails.length,
                     itemBuilder: (context, index) {
-                      if (index != currentIndex) {
-                        return const SizedBox.shrink();
-                      }
                       return SingleChildScrollView(child: threadBody);
                     },
                     onPageChanged: controller.onThreadPageChanged,