From 688d55e00fea42a9ccfd10e43cc00487f7747e76 Mon Sep 17 00:00:00 2001
From: Richard Shiue <71320345+richardshiue@users.noreply.github.com>
Date: Fri, 10 Mar 2023 17:33:25 +0800
Subject: [PATCH] fix: #1942 utc timestamp being parsed as local time (#1953)

---
 .../calendar/application/calendar_bloc.dart            |  1 +
 .../widgets/row/cells/date_cell/date_cal_bloc.dart     |  5 ++++-
 .../lib/plugins/trash/src/trash_cell.dart              | 10 ++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dart
index 49c0f5e174..bf0e1ab8f6 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dart
@@ -173,6 +173,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
 
       final date = DateTime.fromMillisecondsSinceEpoch(
         eventPB.timestamp.toInt() * 1000,
+        isUtc: true,
       );
       return CalendarEventData(
         title: eventPB.title,
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cal_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cal_bloc.dart
index 30c61c0636..058782ebcb 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cal_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cal_bloc.dart
@@ -264,7 +264,10 @@ Option<DateCellData> calDataFromCellData(DateCellDataPB? cellData) {
   Option<DateCellData> dateData = none();
   if (cellData != null) {
     final timestamp = cellData.timestamp * 1000;
-    final date = DateTime.fromMillisecondsSinceEpoch(timestamp.toInt());
+    final date = DateTime.fromMillisecondsSinceEpoch(
+      timestamp.toInt(),
+      isUtc: true,
+    );
     dateData = Some(DateCellData(
       date: date,
       time: time,
diff --git a/frontend/appflowy_flutter/lib/plugins/trash/src/trash_cell.dart b/frontend/appflowy_flutter/lib/plugins/trash/src/trash_cell.dart
index d492b25481..058f6f842a 100644
--- a/frontend/appflowy_flutter/lib/plugins/trash/src/trash_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/trash/src/trash_cell.dart
@@ -61,10 +61,12 @@ class TrashCell extends StatelessWidget {
   }
 
   String dateFormatter($fixnum.Int64 inputTimestamps) {
-    var outputFormat = DateFormat('MM/dd/yyyy hh:mm a');
-    var date =
-        DateTime.fromMillisecondsSinceEpoch(inputTimestamps.toInt() * 1000);
-    var outputDate = outputFormat.format(date);
+    final outputFormat = DateFormat('MM/dd/yyyy hh:mm a');
+    final date = DateTime.fromMillisecondsSinceEpoch(
+      inputTimestamps.toInt() * 1000,
+      isUtc: true,
+    );
+    final outputDate = outputFormat.format(date);
     return outputDate;
   }
 }