From 7d768584d0a0e2538062ad455ac8f66035d5e111 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Mon, 26 Jan 2026 14:43:54 +0700
Subject: [PATCH] TF-4272 Fix events always display email body

---
 .../calendar_event_detail_widget.dart         | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/features/email/presentation/widgets/calendar_event/calendar_event_detail_widget.dart b/lib/features/email/presentation/widgets/calendar_event/calendar_event_detail_widget.dart
index 9e0887cb7..bb7fe9ee8 100644
--- a/lib/features/email/presentation/widgets/calendar_event/calendar_event_detail_widget.dart
+++ b/lib/features/email/presentation/widgets/calendar_event/calendar_event_detail_widget.dart
@@ -1,3 +1,4 @@
+import 'package:core/presentation/extensions/string_extension.dart';
 import 'package:core/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart';
 import 'package:core/presentation/views/html_viewer/html_content_viewer_widget.dart';
 import 'package:flutter/material.dart';
@@ -34,9 +35,7 @@ class CalendarEventDetailWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final eventDesc = calendarEvent.description?.isNotEmpty == true
-      ? calendarEvent.description!
-      : emailContent;
+    final eventDesc = _generateEventDescriptionAsHtml();
 
     return Container(
       clipBehavior: Clip.antiAlias,
@@ -75,4 +74,19 @@ class CalendarEventDetailWidget extends StatelessWidget {
       ),
     );
   }
+
+  String _generateEventDescriptionAsHtml() {
+    final descriptions = calendarEvent.description?.trimmed ?? '';
+    final emailContentTrimmed = emailContent.trimmed;
+
+    if (descriptions.isEmpty || emailContentTrimmed.isEmpty) {
+      return '';
+    }
+
+    return '''
+      $descriptions
+      <br>
+      $emailContentTrimmed
+    ''';
+  }
 }