From 638949c289538538da1a1e3e1ee6af7956a409c5 Mon Sep 17 00:00:00 2001
From: Adam Shiervani <adam.shiervani@gmail.com>
Date: Wed, 8 Oct 2025 12:42:44 +0200
Subject: [PATCH] refactor: simplify and fix button rendering logic in network
 settings

---
 .../routes/devices.$id.settings.network.tsx   | 50 ++++++++-----------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/ui/src/routes/devices.$id.settings.network.tsx b/ui/src/routes/devices.$id.settings.network.tsx
index 4ea4b8eb..073234f4 100644
--- a/ui/src/routes/devices.$id.settings.network.tsx
+++ b/ui/src/routes/devices.$id.settings.network.tsx
@@ -222,19 +222,16 @@ export default function SettingsNetworkRoute() {
             description="Configure the network settings for the device"
             action={
               <>
-
-                {(formState.isDirty || formState.isSubmitting) && (
-                  <div>
-                    <Button
-                      size="SM"
-                      theme="primary"
-                      disabled={formState.isSubmitting}
-                      loading={formState.isSubmitting}
-                      type="submit"
-                      text={formState.isSubmitting ? "Saving..." : "Save Settings"}
-                    />
-                  </div>
-                )}
+                <div>
+                  <Button
+                    size="SM"
+                    theme="primary"
+                    disabled={!(formState.isDirty || formState.isSubmitting)}
+                    loading={formState.isSubmitting}
+                    type="submit"
+                    text={formState.isSubmitting ? "Saving..." : "Save Settings"}
+                  />
+                </div>
               </>
             }
           />
@@ -420,21 +417,18 @@ export default function SettingsNetworkRoute() {
                 )}
               </AutoHeight>
             </div>
-            {(formState.isDirty || formState.isSubmitting) && (
-              <>
-                <div className="h-px w-full bg-slate-800/10 dark:bg-slate-300/20" />
-                <div className="animate-fadeInStill opacity-0 animation-duration-300">
-                  <Button
-                    size="SM"
-                    theme="primary"
-                    disabled={formState.isSubmitting}
-                    loading={formState.isSubmitting}
-                    type="submit"
-                    text={formState.isSubmitting ? "Saving..." : "Save Settings"}
-                  />
-                </div>
-              </>
-            )}
+            <>
+              <div className="animate-fadeInStill animation-duration-300">
+                <Button
+                  size="SM"
+                  theme="primary"
+                  disabled={!(formState.isDirty || formState.isSubmitting)}
+                  loading={formState.isSubmitting}
+                  type="submit"
+                  text={formState.isSubmitting ? "Saving..." : "Save Settings"}
+                />
+              </div>
+            </>
           </div>
         </form>
       </FormProvider>