From b8d65dfdde2e9e8605837a2fc776b39740ab95c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Salazar?=
 <73718835+joshrs23@users.noreply.github.com>
Date: Wed, 28 Jan 2026 19:35:09 -0500
Subject: [PATCH] validation date as utc and converting in orders

---
 .../client_create_order_repository_impl.dart        | 12 +-----------
 .../widgets/shift_order_form_sheet.dart             | 11 +----------
 .../repositories/view_orders_repository_impl.dart   |  2 +-
 .../src/presentation/widgets/view_order_card.dart   | 13 ++-----------
 4 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/apps/mobile/packages/features/client/create_order/lib/src/data/repositories_impl/client_create_order_repository_impl.dart b/apps/mobile/packages/features/client/create_order/lib/src/data/repositories_impl/client_create_order_repository_impl.dart
index 04dd8498..53617f2e 100644
--- a/apps/mobile/packages/features/client/create_order/lib/src/data/repositories_impl/client_create_order_repository_impl.dart
+++ b/apps/mobile/packages/features/client/create_order/lib/src/data/repositories_impl/client_create_order_repository_impl.dart
@@ -191,17 +191,7 @@ class ClientCreateOrderRepositoryImpl
   }
 
   fdc.Timestamp _toTimestamp(DateTime dateTime) {
-    // Keep the selected local time as-is by treating it as UTC.
-    final DateTime utc = DateTime.utc(
-      dateTime.year,
-      dateTime.month,
-      dateTime.day,
-      dateTime.hour,
-      dateTime.minute,
-      dateTime.second,
-      dateTime.millisecond,
-      dateTime.microsecond,
-    );
+    final DateTime utc = dateTime.toUtc();
     final int seconds = utc.millisecondsSinceEpoch ~/ 1000;
     final int nanoseconds = (utc.microsecondsSinceEpoch % 1000000) * 1000;
     return fdc.Timestamp(nanoseconds, seconds);
diff --git a/apps/mobile/packages/features/client/home/lib/src/presentation/widgets/shift_order_form_sheet.dart b/apps/mobile/packages/features/client/home/lib/src/presentation/widgets/shift_order_form_sheet.dart
index c7401c12..4fef193c 100644
--- a/apps/mobile/packages/features/client/home/lib/src/presentation/widgets/shift_order_form_sheet.dart
+++ b/apps/mobile/packages/features/client/home/lib/src/presentation/widgets/shift_order_form_sheet.dart
@@ -481,16 +481,7 @@ class _ShiftOrderFormSheetState extends State<ShiftOrderFormSheet> {
   }
 
   fdc.Timestamp _toTimestamp(DateTime date) {
-    final DateTime utc = DateTime.utc(
-      date.year,
-      date.month,
-      date.day,
-      date.hour,
-      date.minute,
-      date.second,
-      date.millisecond,
-      date.microsecond,
-    );
+    final DateTime utc = date.toUtc();
     final int millis = utc.millisecondsSinceEpoch;
     final int seconds = millis ~/ 1000;
     final int nanos = (millis % 1000) * 1000000;
diff --git a/apps/mobile/packages/features/client/view_orders/lib/src/data/repositories/view_orders_repository_impl.dart b/apps/mobile/packages/features/client/view_orders/lib/src/data/repositories/view_orders_repository_impl.dart
index 3a9e9fe2..e29c3a46 100644
--- a/apps/mobile/packages/features/client/view_orders/lib/src/data/repositories/view_orders_repository_impl.dart
+++ b/apps/mobile/packages/features/client/view_orders/lib/src/data/repositories/view_orders_repository_impl.dart
@@ -145,7 +145,7 @@ class ViewOrdersRepositoryImpl implements IViewOrdersRepository {
     if (timestamp == null) {
       return '';
     }
-    final DateTime dateTime = timestamp.toDateTime();
+    final DateTime dateTime = timestamp.toDateTime().toLocal();
     return DateFormat('HH:mm').format(dateTime);
   }
 
diff --git a/apps/mobile/packages/features/client/view_orders/lib/src/presentation/widgets/view_order_card.dart b/apps/mobile/packages/features/client/view_orders/lib/src/presentation/widgets/view_order_card.dart
index 5d7a87f7..4637a929 100644
--- a/apps/mobile/packages/features/client/view_orders/lib/src/presentation/widgets/view_order_card.dart
+++ b/apps/mobile/packages/features/client/view_orders/lib/src/presentation/widgets/view_order_card.dart
@@ -883,7 +883,7 @@ class _OrderEditSheetState extends State<_OrderEditSheet> {
   String _formatTimeForField(Timestamp? value) {
     if (value == null) return '';
     try {
-      return DateFormat('HH:mm').format(value.toDateTime());
+      return DateFormat('HH:mm').format(value.toDateTime().toLocal());
     } catch (_) {
       return '';
     }
@@ -957,16 +957,7 @@ class _OrderEditSheetState extends State<_OrderEditSheet> {
   }
 
   Timestamp _toTimestamp(DateTime date) {
-    final DateTime utc = DateTime.utc(
-      date.year,
-      date.month,
-      date.day,
-      date.hour,
-      date.minute,
-      date.second,
-      date.millisecond,
-      date.microsecond,
-    );
+    final DateTime utc = date.toUtc();
     final int millis = utc.millisecondsSinceEpoch;
     final int seconds = millis ~/ 1000;
     final int nanos = (millis % 1000) * 1000000;