From 700fa237872abafeb623aa384e65644cfd6b0369 Mon Sep 17 00:00:00 2001
From: Catalin Pit <25515812+catalinpit@users.noreply.github.com>
Date: Tue, 23 Jul 2024 15:15:29 +0300
Subject: [PATCH] fix: document creation timezone

---
 packages/ui/primitives/document-flow/add-settings.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/ui/primitives/document-flow/add-settings.tsx b/packages/ui/primitives/document-flow/add-settings.tsx
index dddba289c..2ab0c0f63 100644
--- a/packages/ui/primitives/document-flow/add-settings.tsx
+++ b/packages/ui/primitives/document-flow/add-settings.tsx
@@ -98,8 +98,12 @@ export const AddSettingsFormPartial = ({
   // We almost always want to set the timezone to the user's local timezone to avoid confusion
   // when the document is signed.
   useEffect(() => {
-    if (!form.formState.touchedFields.meta?.timezone && !documentHasBeenSent) {
-      form.setValue('meta.timezone', Intl.DateTimeFormat().resolvedOptions().timeZone);
+    // Check if the timezone field has not been modified and the document hasn't been sent
+    if (!form.formState.dirtyFields.meta?.timezone && !documentHasBeenSent) {
+      // If the timezone is the default timezone, set it to the user's local timezone automatically
+      if (form.getValues('meta.timezone') === DEFAULT_DOCUMENT_TIME_ZONE) {
+        form.setValue('meta.timezone', Intl.DateTimeFormat().resolvedOptions().timeZone);
+      }
     }
   }, [documentHasBeenSent, form, form.setValue, form.formState.touchedFields.meta?.timezone]);