From 6c2df1a474dbd0ec80ea9a6b8bd1ece792c3f4d1 Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Mon, 20 Feb 2023 15:52:31 +0100 Subject: [PATCH] :bug: (typebot) Attempt to fix updatedAt comparison with different timezones Closes #327 --- .../editor/providers/TypebotProvider/TypebotProvider.tsx | 4 ++-- apps/builder/src/pages/api/typebots/[typebotId].ts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/builder/src/features/editor/providers/TypebotProvider/TypebotProvider.tsx b/apps/builder/src/features/editor/providers/TypebotProvider/TypebotProvider.tsx index 34d8d9a17..15518df36 100644 --- a/apps/builder/src/features/editor/providers/TypebotProvider/TypebotProvider.tsx +++ b/apps/builder/src/features/editor/providers/TypebotProvider/TypebotProvider.tsx @@ -156,8 +156,8 @@ export const TypebotProvider = ({ setLocalTypebot({ ...typebot }, { updateDate: false }) flush() } else if ( - new Date(typebot.updatedAt) > - new Date(currentTypebotRef.current.updatedAt) + new Date(typebot.updatedAt).getTime() > + new Date(currentTypebotRef.current.updatedAt).getTime() ) { setLocalTypebot({ ...typebot }) } diff --git a/apps/builder/src/pages/api/typebots/[typebotId].ts b/apps/builder/src/pages/api/typebots/[typebotId].ts index 1f1ac6044..e8a011ecf 100644 --- a/apps/builder/src/pages/api/typebots/[typebotId].ts +++ b/apps/builder/src/pages/api/typebots/[typebotId].ts @@ -83,7 +83,9 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => { }) if (!typebot) return res.status(404).send({ message: 'Typebot not found' }) - if ((typebot.updatedAt as Date) > new Date(data.updatedAt)) + if ( + (typebot.updatedAt as Date).getTime() > new Date(data.updatedAt).getTime() + ) return res.send({ message: 'Found newer version of the typebot in database', })