From f4ae9b09a6ac575d78cde24e6e1cc7a9140adfc5 Mon Sep 17 00:00:00 2001
From: InfiniteTF <infinitekittens@protonmail.com>
Date: Mon, 20 Jul 2020 20:04:56 -0700
Subject: [PATCH] Fix FormattedDate timezone bug (#681)

---
 ui/v2.5/src/components/Changelog/Version.tsx                | 2 +-
 ui/v2.5/src/components/Changelog/versions/v030.tsx          | 3 +++
 .../src/components/Scenes/SceneDetails/SceneDetailPanel.tsx | 6 +++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/Changelog/Version.tsx b/ui/v2.5/src/components/Changelog/Version.tsx
index 9f60781e8..b274a7c3d 100644
--- a/ui/v2.5/src/components/Changelog/Version.tsx
+++ b/ui/v2.5/src/components/Changelog/Version.tsx
@@ -36,7 +36,7 @@ const Version: React.FC<IVersionProps> = ({
             <Icon icon={open ? "angle-up" : "angle-down"} className="mr-3" />
             {version} (
             {date ? (
-              <FormattedDate value={new Date(Date.parse(date))} />
+              <FormattedDate value={date} timeZone="utc" />
             ) : (
               <FormattedMessage
                 defaultMessage="Development Version"
diff --git a/ui/v2.5/src/components/Changelog/versions/v030.tsx b/ui/v2.5/src/components/Changelog/versions/v030.tsx
index 75ce788e4..4467634f4 100644
--- a/ui/v2.5/src/components/Changelog/versions/v030.tsx
+++ b/ui/v2.5/src/components/Changelog/versions/v030.tsx
@@ -28,6 +28,9 @@ const markup = `
 *  Show rating as stars in scene page.
 *  Add reload scrapers button.
 
+### 🐛 Bug fixes
+*  Fix formatted dates using incorrect timezone.
+
 `;
 
 export default () => <ReactMarkdown source={markup} />;
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneDetailPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneDetailPanel.tsx
index 73538f357..55863a594 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneDetailPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneDetailPanel.tsx
@@ -70,7 +70,11 @@ export const SceneDetailPanel: React.FC<ISceneDetailProps> = (props) => {
           </div>
           {props.scene.date ? (
             <h5>
-              <FormattedDate value={props.scene.date} format="long" />
+              <FormattedDate
+                value={props.scene.date}
+                format="long"
+                timeZone="utc"
+              />
             </h5>
           ) : undefined}
           {props.scene.rating ? (