From ad768f155202d87ea716a931245a5c896050d763 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Fri, 9 Jan 2026 20:23:28 +0700
Subject: [PATCH] TF-4223 Fix welcome email is not well displayed

---
 contact/pubspec.lock                          |  4 +--
 core/pubspec.lock                             |  4 +--
 ...ize_html_sanitizing_transformers_test.dart | 28 +++++++++++++++----
 model/lib/email/email_content.dart            |  3 +-
 model/pubspec.lock                            |  4 +--
 pubspec.lock                                  |  4 +--
 scribe/pubspec.lock                           |  4 +--
 7 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/contact/pubspec.lock b/contact/pubspec.lock
index 6c20ded71..52faef956 100644
--- a/contact/pubspec.lock
+++ b/contact/pubspec.lock
@@ -1020,10 +1020,10 @@ packages:
     description:
       path: sanitize_html
       ref: support_mail
-      resolved-ref: "6627e13f2236bdea5d25f648e6d55b214a4569df"
+      resolved-ref: "21f9da9bc177f5f29bc871d70f0b5f5fa2085d89"
       url: "https://github.com/linagora/dart-neats.git"
     source: git
-    version: "3.0.0"
+    version: "3.0.1"
   shelf:
     dependency: transitive
     description:
diff --git a/core/pubspec.lock b/core/pubspec.lock
index 78bd1ab5d..ed0f00234 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -973,10 +973,10 @@ packages:
     description:
       path: sanitize_html
       ref: support_mail
-      resolved-ref: "6627e13f2236bdea5d25f648e6d55b214a4569df"
+      resolved-ref: "21f9da9bc177f5f29bc871d70f0b5f5fa2085d89"
       url: "https://github.com/linagora/dart-neats.git"
     source: git
-    version: "3.0.0"
+    version: "3.0.1"
   shelf:
     dependency: transitive
     description:
diff --git a/core/test/utils/standardize_html_sanitizing_transformers_test.dart b/core/test/utils/standardize_html_sanitizing_transformers_test.dart
index df325e3d3..eb15ac91e 100644
--- a/core/test/utils/standardize_html_sanitizing_transformers_test.dart
+++ b/core/test/utils/standardize_html_sanitizing_transformers_test.dart
@@ -77,6 +77,22 @@ void main() {
       'touchmove',
       'touchend',
       'touchcancel',
+      'wheel',
+      'animationstart',
+      'animationend',
+      'animationiteration',
+      'transitionstart',
+      'transitionend',
+      'transitionrun',
+      'transitioncancel',
+      'pointerdown',
+      'pointerup',
+      'pointermove',
+      'pointerenter',
+      'pointerleave',
+      'pointerover',
+      'pointerout',
+      'pointercancel',
     ];
 
     String sanitize(String input) =>
@@ -161,9 +177,9 @@ void main() {
         expect(sanitize('<footer href="javascript:1"></footer>'), equals('<footer></footer>'));
       });
 
-      test('SHOULD unwrap <supress_time_adjustment> AND keep children', () {
+      test('SHOULD unwrap <suppress_time_adjustment> AND keep children', () {
         const html =
-            '<supress_time_adjustment href="javascript:1"><div><p>Hello</p></div></supress_time_adjustment>';
+            '<suppress_time_adjustment href="javascript:1"><div><p>Hello</p></div></suppress_time_adjustment>';
         expect(sanitize(html), equals('<div><p>Hello</p></div>'));
       });
 
@@ -334,19 +350,19 @@ void main() {
 
     group('FORM safe attributes – safely unwrapped', () {
       test('SHOULD unwrap FORM with safe style', () {
-        expect(sanitize('<form style="color: red;"></form>'), contains(''));
+        expect(sanitize('<form style="color: red;"></form>'), equals(''));
       });
 
       test('SHOULD unwrap FORM with safe class', () {
-        expect(sanitize('<form class="email-form"></form>'), contains(''));
+        expect(sanitize('<form class="email-form"></form>'), equals(''));
       });
 
       test('SHOULD unwrap FORM with safe id', () {
-        expect(sanitize('<form id="my-form"></form>'), contains(''));
+        expect(sanitize('<form id="my-form"></form>'), equals(''));
       });
 
       test('SHOULD unwrap FORM with safe bgcolor', () {
-        expect(sanitize('<form bgcolor="#fff"></form>'), contains(''));
+        expect(sanitize('<form bgcolor="#fff"></form>'), equals(''));
       });
 
       test('SHOULD remove dangerous attributes even when safe attributes exist', () {
diff --git a/model/lib/email/email_content.dart b/model/lib/email/email_content.dart
index 78ad7a250..86da9486d 100644
--- a/model/lib/email/email_content.dart
+++ b/model/lib/email/email_content.dart
@@ -1,4 +1,3 @@
-import 'package:core/utils/string_convert.dart';
 import 'package:equatable/equatable.dart';
 import 'package:model/email/email_content_type.dart';
 
@@ -21,6 +20,6 @@ extension EmailContentExtension on EmailContent {
           .replaceAll('\n', '<br/>')
           .replaceAll('\n\n', '<br/>');
     }
-    return StringConvert.getContentOriginal(content);
+    return content;
   }
 }
\ No newline at end of file
diff --git a/model/pubspec.lock b/model/pubspec.lock
index 285ba585b..76f564fe3 100644
--- a/model/pubspec.lock
+++ b/model/pubspec.lock
@@ -997,10 +997,10 @@ packages:
     description:
       path: sanitize_html
       ref: support_mail
-      resolved-ref: "6627e13f2236bdea5d25f648e6d55b214a4569df"
+      resolved-ref: "21f9da9bc177f5f29bc871d70f0b5f5fa2085d89"
       url: "https://github.com/linagora/dart-neats.git"
     source: git
-    version: "3.0.0"
+    version: "3.0.1"
   shelf:
     dependency: transitive
     description:
diff --git a/pubspec.lock b/pubspec.lock
index 9c9ccfe60..638c4881c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1997,10 +1997,10 @@ packages:
     description:
       path: sanitize_html
       ref: support_mail
-      resolved-ref: "6627e13f2236bdea5d25f648e6d55b214a4569df"
+      resolved-ref: "21f9da9bc177f5f29bc871d70f0b5f5fa2085d89"
       url: "https://github.com/linagora/dart-neats.git"
     source: git
-    version: "3.0.0"
+    version: "3.0.1"
   scribe:
     dependency: "direct main"
     description:
diff --git a/scribe/pubspec.lock b/scribe/pubspec.lock
index 76cf7a1e8..b7640a88d 100644
--- a/scribe/pubspec.lock
+++ b/scribe/pubspec.lock
@@ -1003,10 +1003,10 @@ packages:
     description:
       path: sanitize_html
       ref: support_mail
-      resolved-ref: fda32cde4d4baadaa988477f498ab6622ee79987
+      resolved-ref: "21f9da9bc177f5f29bc871d70f0b5f5fa2085d89"
       url: "https://github.com/linagora/dart-neats.git"
     source: git
-    version: "2.1.0"
+    version: "3.0.1"
   shelf:
     dependency: transitive
     description: