From 5b87045b8afe79778884b0cf5f3fd5e46ef85aca Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Thu, 10 Aug 2023 19:32:56 +0700
Subject: [PATCH] TF-2078 Fix ScrollController is currently attached to more
 than one ScrollPosition

(cherry picked from commit 96521061d8f0d4a6038180070cc9af6edc7dd70a)
---
 .../controller/single_email_controller.dart   |  2 +-
 .../email/presentation/email_view.dart        | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/features/email/presentation/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart
index 68277eb13..9d86b3c1d 100644
--- a/lib/features/email/presentation/controller/single_email_controller.dart
+++ b/lib/features/email/presentation/controller/single_email_controller.dart
@@ -223,6 +223,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
       log('SingleEmailController::_handleOpenEmailDetailedView(): email unselected');
       return;
     }
+    dispatchState(Right<Failure, Success>(GetEmailContentLoading()));
 
     emailSupervisorController.updateNewCurrentListEmail();
     _updateCurrentEmailId(selectedEmail.id);
@@ -364,7 +365,6 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
     final emailLoaded = emailSupervisorController.getEmailInQueueByEmailId(emailId);
 
     if (emailLoaded != null) {
-      dispatchState(Right<Failure, Success>(GetEmailContentLoading()));
       consumeState(Stream.value(Right<Failure, Success>(
         GetEmailContentSuccess(
           emailContent: emailLoaded.emailContent,
diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart
index bc2ec8fc1..f4f465e66 100644
--- a/lib/features/email/presentation/email_view.dart
+++ b/lib/features/email/presentation/email_view.dart
@@ -233,16 +233,15 @@ class EmailView extends GetWidget<SingleEmailController> with AppLoaderMixin {
       return _buildEmailMessage(context, email);
     } else {
       return SingleChildScrollView(
-          primary: true,
-          physics : const ClampingScrollPhysics(),
-          child: Container(
-              margin: EdgeInsets.zero,
-              width: double.infinity,
-              alignment: Alignment.center,
-              padding: EdgeInsets.zero,
-              color: Colors.white,
-              child: _buildEmailMessage(context, email)
-          )
+        physics : const ClampingScrollPhysics(),
+        child: Container(
+          margin: EdgeInsets.zero,
+          width: double.infinity,
+          alignment: Alignment.center,
+          padding: EdgeInsets.zero,
+          color: Colors.white,
+          child: _buildEmailMessage(context, email)
+        )
       );
     }
   }