From b8ac5fd04aaa744b74e8410ac2937ac28683622c Mon Sep 17 00:00:00 2001
From: haorwen <haorwen@qq.com>
Date: Sun, 21 Jun 2026 18:03:34 +0800
Subject: [PATCH] fix: fetch server version in onboarding to unblock wizard
 mount

---
 package.json                    | 2 +-
 src/routes/onboarding/index.tsx | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 15266a93..76eb397a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vocechat-web",
-  "version": "0.9.85",
+  "version": "0.9.86",
   "homepage": "https://voce.chat",
   "dependencies": {
     "@metamask/onboarding": "^1.0.1",
diff --git a/src/routes/onboarding/index.tsx b/src/routes/onboarding/index.tsx
index 5400daa3..4601b306 100644
--- a/src/routes/onboarding/index.tsx
+++ b/src/routes/onboarding/index.tsx
@@ -12,7 +12,7 @@ import ServerName from "./steps/server-name";
 import WelcomePage from "./steps/welcome-page";
 import WhoCanSignUp from "./steps/who-can-sign-up";
 import SelectLanguage from "../../components/Language";
-import { useGetAutoTunnelInfoQuery } from "@/app/services/server";
+import { useGetAutoTunnelInfoQuery, useGetServerVersionQuery } from "@/app/services/server";
 import { useAppSelector } from "@/app/store";
 import { compareVersion } from "@/utils";
 import { shallowEqual } from "react-redux";
@@ -59,14 +59,15 @@ const Navigator = ({ showTunnelStep }: { showTunnelStep: boolean }) => {
 export default function OnboardingPage() {
   const { t } = useTranslation("welcome");
   const [serverName, setServerName] = useState("");
+  const { isLoading: versionLoading } = useGetServerVersionQuery();
   const currentVersion = useAppSelector((store) => store.server.version, shallowEqual);
   const versionOk = !!currentVersion && compareVersion(currentVersion, TUNNEL_MIN_VERSION) >= 0;
-  const { data: autoInfo, isLoading: autoInfoLoading } = useGetAutoTunnelInfoQuery(undefined, { skip: !versionOk });
+  const { data: autoInfo } = useGetAutoTunnelInfoQuery(undefined, { skip: !versionOk });
   const showTunnelStep = versionOk && !!autoInfo && !autoInfo.auto_cftunnel;
 
   // Wait until we know whether to show the tunnel step before mounting Wizard
   // so step count is stable from mount
-  const ready = currentVersion && (!versionOk || autoInfo !== undefined);
+  const ready = !versionLoading && (!versionOk || autoInfo !== undefined);
   if (!ready) return null;
 
   return (