From 332e2af683ec1560cefd96287b0c498421441b73 Mon Sep 17 00:00:00 2001
From: Dat Dang <tddang@linagora.com>
Date: Mon, 17 Mar 2025 12:02:32 +0700
Subject: [PATCH] TF-3511 Fix Android email view system back action (#3546)

---
 .../widgets/email_view_app_bar_widget.dart            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/features/email/presentation/widgets/email_view_app_bar_widget.dart b/lib/features/email/presentation/widgets/email_view_app_bar_widget.dart
index 7764b611e..bc8579c38 100644
--- a/lib/features/email/presentation/widgets/email_view_app_bar_widget.dart
+++ b/lib/features/email/presentation/widgets/email_view_app_bar_widget.dart
@@ -42,7 +42,7 @@ class EmailViewAppBarWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (context, constraints) {
+    final child = LayoutBuilder(builder: (context, constraints) {
       return Container(
         height: PlatformInfo.isIOS
           ? EmailViewAppBarWidgetStyles.heightIOS(context, _responsiveUtils)
@@ -150,6 +150,15 @@ class EmailViewAppBarWidget extends StatelessWidget {
         ])
       );
     });
+
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (_, __) {
+        onBackAction();
+        return;
+      },
+      child: child,
+    );
   }
 
   bool _supportDisplayMailboxNameTitle(BuildContext context) {