From e44020f93a261eecbe3fc0139acf5a3a7e5a7df2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 13:02:58 +0530
Subject: [PATCH] Swap

---
 .../photos/src/components/Collections/CollectionShare.tsx | 6 +++---
 web/apps/photos/src/components/ExportFinished.tsx         | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/apps/photos/src/components/Collections/CollectionShare.tsx b/web/apps/photos/src/components/Collections/CollectionShare.tsx
index 583dd8b6da..4ed9f24342 100644
--- a/web/apps/photos/src/components/Collections/CollectionShare.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionShare.tsx
@@ -17,6 +17,7 @@ import { Titlebar } from "@/base/components/Titlebar";
 import { useModalVisibility } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { sharedCryptoWorker } from "@/base/crypto";
+import { formattedDateTime } from "@/base/i18n-date";
 import log from "@/base/log";
 import { appendCollectionKeyToShareURL } from "@/gallery/services/share";
 import type {
@@ -34,7 +35,6 @@ import SingleInputForm, {
     type SingleInputFormProps,
 } from "@ente/shared/components/SingleInputForm";
 import { CustomError, parseSharingErrorCodes } from "@ente/shared/error";
-import { formatDateTime } from "@ente/shared/time/format";
 import AddIcon from "@mui/icons-material/Add";
 import AdminPanelSettingsIcon from "@mui/icons-material/AdminPanelSettings";
 import BlockIcon from "@mui/icons-material/Block";
@@ -1539,8 +1539,8 @@ const ManageLinkExpiry: React.FC<ManageLinkExpiryProps> = ({
                         isLinkExpired(publicShareProp?.validTill)
                             ? t("link_expired")
                             : publicShareProp?.validTill
-                              ? formatDateTime(
-                                    publicShareProp?.validTill / 1000,
+                              ? formattedDateTime(
+                                    publicShareProp.validTill / 1000,
                                 )
                               : t("never")
                     }
diff --git a/web/apps/photos/src/components/ExportFinished.tsx b/web/apps/photos/src/components/ExportFinished.tsx
index 9b1507c6a8..eab2d1b7ac 100644
--- a/web/apps/photos/src/components/ExportFinished.tsx
+++ b/web/apps/photos/src/components/ExportFinished.tsx
@@ -1,9 +1,9 @@
 import { LinkButton } from "@/base/components/LinkButton";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { formattedNumber } from "@/base/i18n";
+import { formattedDateTime } from "@/base/i18n-date";
 import { EnteFile } from "@/media/file";
 import { SpaceBetweenFlex } from "@ente/shared/components/Container";
-import { formatDateTime } from "@ente/shared/time/format";
 import { DialogActions, DialogContent, Stack, Typography } from "@mui/material";
 import { t } from "i18next";
 import { useState } from "react";
@@ -19,6 +19,8 @@ interface Props {
 }
 
 export default function ExportFinished(props: Props) {
+    const { lastExportTime } = props;
+
     const [pendingFileListView, setPendingFileListView] =
         useState<boolean>(false);
 
@@ -52,8 +54,8 @@ export default function ExportFinished(props: Props) {
                             {t("last_export_time")}
                         </Typography>
                         <Typography>
-                            {props.lastExportTime
-                                ? formatDateTime(props.lastExportTime)
+                            {lastExportTime
+                                ? formattedDateTime(new Date(lastExportTime))
                                 : t("never")}
                         </Typography>
                     </SpaceBetweenFlex>