From 0eff994878d8634ce8ecd6d143f58f7d692ea76d Mon Sep 17 00:00:00 2001
From: Siyuan <siyuan@buildjet.com>
Date: Fri, 14 Nov 2025 12:07:01 +0000
Subject: [PATCH] fix: update custom version update logic

---
 internal/ota/ota.go                           |  6 ++++--
 .../routes/devices.$id.settings.advanced.tsx  | 20 +++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/internal/ota/ota.go b/internal/ota/ota.go
index 095fec40..5617a39b 100644
--- a/internal/ota/ota.go
+++ b/internal/ota/ota.go
@@ -37,9 +37,11 @@ func (s *State) getUpdateURL(params UpdateParams) (string, error, bool) {
 
 	// set the custom versions if they are specified
 	for component, constraint := range params.Components {
-		if constraint != "" {
-			query.Set(component+"Version", constraint)
+		if constraint == "" {
+			continue
 		}
+
+		query.Set(component+"Version", constraint)
 		isCustomVersion = true
 	}
 
diff --git a/ui/src/routes/devices.$id.settings.advanced.tsx b/ui/src/routes/devices.$id.settings.advanced.tsx
index 84f61a9d..3f366ee7 100644
--- a/ui/src/routes/devices.$id.settings.advanced.tsx
+++ b/ui/src/routes/devices.$id.settings.advanced.tsx
@@ -35,7 +35,7 @@ export default function SettingsAdvancedRoute() {
   const [systemVersion, setSystemVersion] = useState<string>("");
   const [resetConfig, setResetConfig] = useState(false);
   const [versionChangeAcknowledged, setVersionChangeAcknowledged] = useState(false);
-  const [versionUpdateLoading, setVersionUpdateLoading] = useState(false);
+  const [customVersionUpdateLoading, setCustomVersionUpdateLoading] = useState(false);
   const settings = useSettingsStore();
 
   useEffect(() => {
@@ -192,19 +192,19 @@ export default function SettingsAdvancedRoute() {
       }),
       { duration: 1000 * 15 } // 15 seconds
     );
-    setVersionUpdateLoading(false);
+    setCustomVersionUpdateLoading(false);
   }, []);
 
-  const handleVersionUpdate = useCallback(async () => {
+  const handleCustomVersionUpdate = useCallback(async () => {
     const components: UpdateComponents = {};
-    if (["app", "both"].includes(updateTarget)) components.app = appVersion;
-    if (["system", "both"].includes(updateTarget)) components.system = systemVersion;
+    if (["app", "both"].includes(updateTarget) && appVersion) components.app = appVersion;
+    if (["system", "both"].includes(updateTarget) && systemVersion) components.system = systemVersion;
     let versionInfo: SystemVersionInfo | undefined;
 
     try {
       // we do not need to set it to false if check succeeds,
       // because it will be redirected to the update page later
-      setVersionUpdateLoading(true);
+      setCustomVersionUpdateLoading(true);
       versionInfo = await checkUpdateComponents({
         components,
       }, devChannel);
@@ -238,7 +238,7 @@ export default function SettingsAdvancedRoute() {
   }, [
     updateTarget, appVersion, systemVersion, devChannel,
     navigateTo, resetConfig, handleVersionUpdateError,
-    setVersionUpdateLoading
+    setCustomVersionUpdateLoading
   ]);
 
   return (
@@ -404,10 +404,10 @@ export default function SettingsAdvancedRoute() {
                   (updateTarget === "system" && !systemVersion) ||
                   (updateTarget === "both" && (!appVersion || !systemVersion)) ||
                   !versionChangeAcknowledged ||
-                  versionUpdateLoading
+                  customVersionUpdateLoading
                 }
-                loading={versionUpdateLoading}
-                onClick={handleVersionUpdate}
+                loading={customVersionUpdateLoading}
+                onClick={handleCustomVersionUpdate}
               />
             </div>
           </NestedSettingsGroup>