From c475820353afeb792dbd60d4929be202e14d6f3d Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Mon, 4 Oct 2021 11:44:04 +0700
Subject: [PATCH] TF-113 [BUG] Date should be display in the local time zone

---
 model/lib/extensions/presentation_email_extension.dart | 4 +++-
 model/lib/extensions/utc_date_extension.dart           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/model/lib/extensions/presentation_email_extension.dart b/model/lib/extensions/presentation_email_extension.dart
index 6ee376e54..942ca123c 100644
--- a/model/lib/extensions/presentation_email_extension.dart
+++ b/model/lib/extensions/presentation_email_extension.dart
@@ -9,7 +9,9 @@ extension PresentationEmailExtension on PresentationEmail {
   String getEmailDateTime(String newLocale, {String? pattern}) {
     final emailTime = sentAt ?? receivedAt;
     if (emailTime != null) {
-      return emailTime.formatDate(pattern: pattern ?? emailTime.value.toPattern(), locale: newLocale);
+      return emailTime.formatDate(
+        pattern: pattern ?? emailTime.value.toLocal().toPattern(),
+        locale: newLocale);
     }
     return '';
   }
diff --git a/model/lib/extensions/utc_date_extension.dart b/model/lib/extensions/utc_date_extension.dart
index 95b9a4d56..3174de5f1 100644
--- a/model/lib/extensions/utc_date_extension.dart
+++ b/model/lib/extensions/utc_date_extension.dart
@@ -5,7 +5,7 @@ extension UTCDateExtension on UTCDate? {
 
   String formatDate({String pattern = 'yMMMd', String locale = 'en_US'}) {
     if (this != null) {
-      return DateFormat(pattern, locale).format(this!.value);
+      return DateFormat(pattern, locale).format(this!.value.toLocal());
     } else {
       return '';
     }