From 4f932aaefbe06d2e01f02d03c534161d5b640ceb Mon Sep 17 00:00:00 2001
From: Mahad Kalam <mahadkalam1234@gmail.com>
Date: Tue, 1 Sep 2026 02:40:55 +0000
Subject: [PATCH 1/2] Fix settings form state ownership

Amp-Thread-ID: https://ampcode.com/threads/T-01a05ac8-06f4-747e-9645-75acf8e495d6
Co-authored-by: Amp <amp@ampcode.com>
---
 .../pages/Users/Settings/Editors.svelte       | 16 ++++++++++-----
 .../pages/Users/Settings/Notifications.svelte |  8 +++++++-
 .../pages/Users/Settings/Privacy.svelte       |  7 ++++++-
 .../pages/Users/Settings/SlackGithub.svelte   |  7 ++++++-
 test/system/settings/editors_settings_test.rb | 20 +++++++++++++++++++
 5 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/app/javascript/pages/Users/Settings/Editors.svelte b/app/javascript/pages/Users/Settings/Editors.svelte
index 84a6fe84e..57b694928 100644
--- a/app/javascript/pages/Users/Settings/Editors.svelte
+++ b/app/javascript/pages/Users/Settings/Editors.svelte
@@ -24,9 +24,15 @@
 
   let { user, options }: Props = $props();
 
-  let goalsDisabled = $derived(
-    user.hackatime_extension_text_type !== "simple_text",
-  );
+  let extensionTextType = $state("");
+  let showGoalsInStatusbar = $state(false);
+
+  $effect(() => {
+    extensionTextType = user.hackatime_extension_text_type;
+    showGoalsInStatusbar = user.show_goals_in_statusbar;
+  });
+
+  let goalsDisabled = $derived(extensionTextType !== "simple_text");
 </script>
 
 <svelte:head>
@@ -49,14 +55,14 @@
       <Select
         id="extension_type"
         name="user[hackatime_extension_text_type]"
-        bind:value={user.hackatime_extension_text_type}
+        bind:value={extensionTextType}
         items={options.extension_text_types}
       />
     </FormField>
 
     <CheckboxField
       name="user[show_goals_in_statusbar]"
-      bind:checked={user.show_goals_in_statusbar}
+      bind:checked={showGoalsInStatusbar}
       disabled={goalsDisabled}
       align="start"
       label="Show daily goal in status bar"
diff --git a/app/javascript/pages/Users/Settings/Notifications.svelte b/app/javascript/pages/Users/Settings/Notifications.svelte
index 6af687d04..f0d708109 100644
--- a/app/javascript/pages/Users/Settings/Notifications.svelte
+++ b/app/javascript/pages/Users/Settings/Notifications.svelte
@@ -15,6 +15,12 @@
   };
 
   let { user }: Props = $props();
+
+  let weeklySummaryEmailEnabled = $state(false);
+
+  $effect(() => {
+    weeklySummaryEmailEnabled = user.weekly_summary_email_enabled;
+  });
 </script>
 
 <svelte:head>
@@ -36,7 +42,7 @@
     <div id="user_weekly_summary_email">
       <CheckboxField
         name="user[weekly_summary_email_enabled]"
-        bind:checked={user.weekly_summary_email_enabled}
+        bind:checked={weeklySummaryEmailEnabled}
         label="Weekly coding summary email (sent Sundays at 6:30 PM GMT)"
       />
       <p class="mt-2 text-xs text-muted">
diff --git a/app/javascript/pages/Users/Settings/Privacy.svelte b/app/javascript/pages/Users/Settings/Privacy.svelte
index 276914409..466bd5007 100644
--- a/app/javascript/pages/Users/Settings/Privacy.svelte
+++ b/app/javascript/pages/Users/Settings/Privacy.svelte
@@ -42,6 +42,7 @@
     "Something else",
   ];
 
+  let allowPublicStatsLookup = $state(false);
   let rotatingApiKey = $state(false);
   let apiKeyCopied = $state(false);
   let rotateApiKeyModalOpen = $state(false);
@@ -52,6 +53,10 @@
     deletionReason.length > 0 && deletionReasonDetails.trim().length > 0,
   );
 
+  $effect(() => {
+    allowPublicStatsLookup = user.allow_public_stats_lookup;
+  });
+
   const rotateApiKey = () => {
     if (rotatingApiKey) return;
     rotatingApiKey = true;
@@ -93,7 +98,7 @@
   >
     <CheckboxField
       name="user[allow_public_stats_lookup]"
-      bind:checked={user.allow_public_stats_lookup}
+      bind:checked={allowPublicStatsLookup}
       label="Allow public stats lookup"
     />
   </Form>
diff --git a/app/javascript/pages/Users/Settings/SlackGithub.svelte b/app/javascript/pages/Users/Settings/SlackGithub.svelte
index 04e36394f..4f5c41a00 100644
--- a/app/javascript/pages/Users/Settings/SlackGithub.svelte
+++ b/app/javascript/pages/Users/Settings/SlackGithub.svelte
@@ -31,7 +31,12 @@
 
   let { user, slack, github }: Props = $props();
 
+  let usesSlackStatus = $state(false);
   let unlinkGithubModalOpen = $state(false);
+
+  $effect(() => {
+    usesSlackStatus = user.uses_slack_status;
+  });
 </script>
 
 <svelte:head>
@@ -62,7 +67,7 @@
     >
       <CheckboxField
         name="user[uses_slack_status]"
-        bind:checked={user.uses_slack_status}
+        bind:checked={usesSlackStatus}
         label="Update my Slack status automatically"
       />
     </Form>
diff --git a/test/system/settings/editors_settings_test.rb b/test/system/settings/editors_settings_test.rb
index 96be06680..aebd3fc59 100644
--- a/test/system/settings/editors_settings_test.rb
+++ b/test/system/settings/editors_settings_test.rb
@@ -13,9 +13,29 @@ class EditorsSettingsTest < ApplicationSystemTestCase
     visit my_settings_editors_path
 
     choose_select_option("extension_type", "Clock emoji")
+    assert_selector "[role='checkbox'][disabled]"
     click_on "Save extension settings"
 
     assert_text "Settings updated successfully"
     assert_equal "clock_emoji", @user.reload.hackatime_extension_text_type
   end
+
+  test "editors settings restores server values after a rejected update" do
+    @user.update!(
+      hackatime_extension_text_type: :simple_text,
+      show_goals_in_statusbar: false
+    )
+
+    visit my_settings_editors_path
+    @user.update_column(:country_code, "ZZ")
+
+    find("[role='checkbox']").click
+    choose_select_option("extension_type", "Clock emoji")
+    click_on "Save extension settings"
+
+    assert_text "Country code is not included in the list"
+
+    choose_select_option("extension_type", "Simple text")
+    assert_selector "[role='checkbox'][aria-checked='false']:not([disabled])"
+  end
 end

From 3cb3cf9902598b13a739d73ba2239c3f8a0bf619 Mon Sep 17 00:00:00 2001
From: Mahad Kalam <mahadkalam1234@gmail.com>
Date: Tue, 1 Sep 2026 02:54:54 +0000
Subject: [PATCH 2/2] Preserve settings state during SSR

Amp-Thread-ID: https://ampcode.com/threads/T-01a05ac8-06f4-747e-9645-75acf8e495d6
Co-authored-by: Amp <amp@ampcode.com>
---
 app/javascript/pages/Users/Settings/Editors.svelte       | 4 ++--
 app/javascript/pages/Users/Settings/Notifications.svelte | 2 +-
 app/javascript/pages/Users/Settings/Privacy.svelte       | 2 +-
 app/javascript/pages/Users/Settings/SlackGithub.svelte   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/pages/Users/Settings/Editors.svelte b/app/javascript/pages/Users/Settings/Editors.svelte
index 57b694928..65c755d88 100644
--- a/app/javascript/pages/Users/Settings/Editors.svelte
+++ b/app/javascript/pages/Users/Settings/Editors.svelte
@@ -24,8 +24,8 @@
 
   let { user, options }: Props = $props();
 
-  let extensionTextType = $state("");
-  let showGoalsInStatusbar = $state(false);
+  let extensionTextType = $state(user.hackatime_extension_text_type);
+  let showGoalsInStatusbar = $state(user.show_goals_in_statusbar);
 
   $effect(() => {
     extensionTextType = user.hackatime_extension_text_type;
diff --git a/app/javascript/pages/Users/Settings/Notifications.svelte b/app/javascript/pages/Users/Settings/Notifications.svelte
index f0d708109..301ecb413 100644
--- a/app/javascript/pages/Users/Settings/Notifications.svelte
+++ b/app/javascript/pages/Users/Settings/Notifications.svelte
@@ -16,7 +16,7 @@
 
   let { user }: Props = $props();
 
-  let weeklySummaryEmailEnabled = $state(false);
+  let weeklySummaryEmailEnabled = $state(user.weekly_summary_email_enabled);
 
   $effect(() => {
     weeklySummaryEmailEnabled = user.weekly_summary_email_enabled;
diff --git a/app/javascript/pages/Users/Settings/Privacy.svelte b/app/javascript/pages/Users/Settings/Privacy.svelte
index 466bd5007..2949a49e4 100644
--- a/app/javascript/pages/Users/Settings/Privacy.svelte
+++ b/app/javascript/pages/Users/Settings/Privacy.svelte
@@ -42,7 +42,7 @@
     "Something else",
   ];
 
-  let allowPublicStatsLookup = $state(false);
+  let allowPublicStatsLookup = $state(user.allow_public_stats_lookup);
   let rotatingApiKey = $state(false);
   let apiKeyCopied = $state(false);
   let rotateApiKeyModalOpen = $state(false);
diff --git a/app/javascript/pages/Users/Settings/SlackGithub.svelte b/app/javascript/pages/Users/Settings/SlackGithub.svelte
index 4f5c41a00..ad3e452bc 100644
--- a/app/javascript/pages/Users/Settings/SlackGithub.svelte
+++ b/app/javascript/pages/Users/Settings/SlackGithub.svelte
@@ -31,7 +31,7 @@
 
   let { user, slack, github }: Props = $props();
 
-  let usesSlackStatus = $state(false);
+  let usesSlackStatus = $state(user.uses_slack_status);
   let unlinkGithubModalOpen = $state(false);
 
   $effect(() => {