From fa89ed3a7cf650afac4e5b84b802ac717cf186b9 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 2 Aug 2024 12:14:11 +0530
Subject: [PATCH] Switch to dayjs for UTC support

---
 web/packages/new/package.json                              | 2 +-
 web/packages/new/photos/components/PhotoDateTimePicker.tsx | 5 +++--
 web/yarn.lock                                              | 7 ++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/web/packages/new/package.json b/web/packages/new/package.json
index 9f082b6ff7..520f121764 100644
--- a/web/packages/new/package.json
+++ b/web/packages/new/package.json
@@ -7,7 +7,7 @@
         "@/utils": "*",
         "@ente/shared": "*",
         "@mui/x-date-pickers": "^5.0.20",
-        "date-fns": "^2",
+        "dayjs": "^1.11.12",
         "formik": "^2.4",
         "idb": "^8",
         "zod": "^3"
diff --git a/web/packages/new/photos/components/PhotoDateTimePicker.tsx b/web/packages/new/photos/components/PhotoDateTimePicker.tsx
index 119e4aab13..d203a3fa85 100644
--- a/web/packages/new/photos/components/PhotoDateTimePicker.tsx
+++ b/web/packages/new/photos/components/PhotoDateTimePicker.tsx
@@ -2,7 +2,7 @@ import {
     LocalizationProvider,
     MobileDateTimePicker,
 } from "@mui/x-date-pickers";
-import { AdapterDateFns } from "@mui/x-date-pickers/AdapterDateFns";
+import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import React, { useState } from "react";
 
 interface PhotoDateTimePickerProps {
@@ -51,7 +51,7 @@ export const PhotoDateTimePicker: React.FC<PhotoDateTimePickerProps> = ({
     };
 
     return (
-        <LocalizationProvider dateAdapter={AdapterDateFns}>
+        <LocalizationProvider dateAdapter={AdapterDayjs}>
             <MobileDateTimePicker
                 value={value}
                 onChange={setValue}
@@ -61,6 +61,7 @@ export const PhotoDateTimePicker: React.FC<PhotoDateTimePickerProps> = ({
                 disabled={disabled}
                 minDateTime={new Date(1800, 0, 1)}
                 disableFuture={true}
+                // timezone={"UTC"}
                 onAccept={handleAccept}
                 DialogProps={{
                     sx: {
diff --git a/web/yarn.lock b/web/yarn.lock
index c0dffdce3b..ce989302d6 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -1841,7 +1841,7 @@ data-view-byte-offset@^1.0.0:
     es-errors "^1.3.0"
     is-data-view "^1.0.1"
 
-date-fns@^2, date-fns@^2.30.0:
+date-fns@^2.30.0:
   version "2.30.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
   integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
@@ -1853,6 +1853,11 @@ dayjs@^1.10.0:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
   integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
 
+dayjs@^1.11.12:
+  version "1.11.12"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.12.tgz#5245226cc7f40a15bf52e0b99fd2a04669ccac1d"
+  integrity sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==
+
 debounce@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"