fix(frontend): defer startup modals until onboarding completes

Author: dreamguxiang

frontend/src/App.tsx

@@ -154,6 +154,7 @@ function App() {
   } = useAppModals({
     hasBackend,
     isUpdatingMode,
+    isOnboardingMode,
   });
 
   // Counter/refresh for LauncherPage
@@ -406,19 +407,19 @@ function App() {
                         </div>
 
                         <TermsModal
-                          isOpen={termsOpen}
+                          isOpen={termsOpen && !isOnboardingMode}
                           countdown={termsCountdown}
                           onAccept={acceptTerms}
                         />
 
                         <ClarityConsentModal
-                          isOpen={clarityPromptOpen}
+                          isOpen={clarityPromptOpen && !isOnboardingMode}
                           onEnable={acceptClarity}
                           onKeepDisabled={declineClarity}
                         />
 
                         <UpdateModal
-                          isOpen={updateOpen}
+                          isOpen={updateOpen && !isOnboardingMode}
                           version={updateVersion}
                           body={updateBody}
                           loading={updateLoading}
@@ -446,7 +447,7 @@ function App() {
                         />
 
                         <LipUpdateModal
-                          isOpen={lipUpdateOpen}
+                          isOpen={lipUpdateOpen && !isOnboardingMode}
                           currentVersion={lipCurrentVersion}
                           latestVersion={lipLatestVersion}
                           onDismiss={() => {

frontend/src/assets/locales/en_US.json

@@ -314,15 +314,6 @@
       "body": "You have unsaved changes to the content path. Do you want to save before finishing?",
       "cancel": "Cancel",
       "save": "Save and Finish"
-    },
-    "privacy": {
-      "title": "Privacy & Usage Data",
-      "subtitle": "Choose whether to enable anonymous analytics",
-      "desc": "If enabled, LeviLauncher uses Microsoft Clarity to collect anonymous interaction data (such as clicks and page flow) to improve usability. It does not collect account information, game information, or disk content, and only applies to frontend pages.",
-      "links": {
-        "clarity_terms": "Clarity Terms",
-        "microsoft_privacy": "Microsoft Privacy Statement"
-      }
     }
   },
   "settings": {

frontend/src/assets/locales/ja_JP.json

@@ -1105,15 +1105,6 @@
       "body": "コンテンツパスに未保存の変更があります。保存して終了しますか？",
       "cancel": "キャンセル",
       "save": "保存して完了"
-    },
-    "privacy": {
-      "title": "Privacy & Usage Data",
-      "subtitle": "Choose whether to enable anonymous analytics",
-      "desc": "If enabled, LeviLauncher uses Microsoft Clarity to collect anonymous interaction data (such as clicks and page flow) to improve usability. It does not collect account information, game information, or disk content, and only applies to frontend pages.",
-      "links": {
-        "clarity_terms": "Clarity Terms",
-        "microsoft_privacy": "Microsoft Privacy Statement"
-      }
     }
   },
   "contentdownload": {

frontend/src/assets/locales/ru_RU.json

@@ -1105,15 +1105,6 @@
       "body": "У вас есть несохранённые изменения пути к контенту. Сохранить перед завершением?",
       "cancel": "Отмена",
       "save": "Сохранить и завершить"
-    },
-    "privacy": {
-      "title": "Privacy & Usage Data",
-      "subtitle": "Choose whether to enable anonymous analytics",
-      "desc": "If enabled, LeviLauncher uses Microsoft Clarity to collect anonymous interaction data (such as clicks and page flow) to improve usability. It does not collect account information, game information, or disk content, and only applies to frontend pages.",
-      "links": {
-        "clarity_terms": "Clarity Terms",
-        "microsoft_privacy": "Microsoft Privacy Statement"
-      }
     }
   },
   "contentdownload": {

frontend/src/assets/locales/zh_CN.json

@@ -314,15 +314,6 @@
       "body": "您更改了内容路径但尚未保存。是否保存后完成引导？",
       "cancel": "取消",
       "save": "保存并完成"
-    },
-    "privacy": {
-      "title": "隐私与使用数据",
-      "subtitle": "请选择是否开启匿名分析",
-      "desc": "开启后，LeviLauncher 会通过 Microsoft Clarity 收集匿名操作数据（如点击、页面停留）来改进易用性。不会收集账号信息、游戏信息、磁盘内容，仅应用于前端页面。",
-      "links": {
-        "clarity_terms": "Clarity 条款",
-        "microsoft_privacy": "Microsoft 隐私声明"
-      }
     }
   },
   "settings": {

frontend/src/assets/locales/zh_HK.json

@@ -1105,15 +1105,6 @@
       "body": "您更改了內容路徑但尚未儲存。是否儲存後完成引導？",
       "cancel": "取消",
       "save": "儲存並完成"
-    },
-    "privacy": {
-      "title": "私隱與使用資料",
-      "subtitle": "請選擇是否啟用匿名分析",
-      "desc": "啟用後，LeviLauncher 會透過 Microsoft Clarity 收集匿名操作資料（例如點擊、頁面停留）以改善易用性。不會收集帳號資料、遊戲資訊、磁碟內容，僅適用於前端頁面。",
-      "links": {
-        "clarity_terms": "Clarity 服務條款",
-        "microsoft_privacy": "Microsoft 私隱聲明"
-      }
     }
   },
   "contentdownload": {

frontend/src/hooks/useAppModals.ts

@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from "react";
+import { useState, useEffect, useCallback, useRef } from "react";
 import * as minecraft from "bindings/github.com/liteldev/LeviLauncher/minecraft";
 import { setNavLockReason } from "@/hooks/useAppNavigation";
 import {
@@ -10,6 +10,7 @@ import { useStartupInteractive } from "@/utils/startupState";
 interface UseAppModalsOptions {
   hasBackend: boolean;
   isUpdatingMode: boolean;
+  isOnboardingMode: boolean;
 }
 
 const LIP_IGNORE_VERSION_KEY = "ll.ignoreLipVersion";
@@ -22,8 +23,11 @@ const normalizeVersion = (value: unknown): string =>
 export const useAppModals = ({
   hasBackend,
   isUpdatingMode,
+  isOnboardingMode,
 }: UseAppModalsOptions) => {
   const startupInteractive = useStartupInteractive();
+  const previousOnboardingModeRef = useRef<boolean>(isOnboardingMode);
+  const startupFlowArmedRef = useRef<boolean>(true);
   const [termsOpen, setTermsOpen] = useState<boolean>(false);
   const [termsCountdown, setTermsCountdown] = useState<number>(0);
   const [clarityPromptOpen, setClarityPromptOpen] = useState<boolean>(false);
@@ -131,10 +135,13 @@ export const useAppModals = ({
     applyClarityChoice(false);
   }, [applyClarityChoice]);
 
-  useEffect(() => {
-    if (!hasBackend) return;
-    if (!startupInteractive) return;
-    if (isUpdatingMode) return;
+  const runStartupModalFlow = useCallback(() => {
+    if (!startupFlowArmedRef.current) {
+      return;
+    }
+
+    startupFlowArmedRef.current = false;
+
     try {
       const accepted = localStorage.getItem("ll.termsAccepted");
       if (!accepted) {
@@ -143,11 +150,37 @@ export const useAppModals = ({
       }
       runPostTermsFlow();
     } catch {}
+  }, [runPostTermsFlow]);
+
+  useEffect(() => {
+    if (!hasBackend) return;
+    if (!startupInteractive) return;
+    if (isUpdatingMode) return;
+    if (isOnboardingMode) return;
+    runStartupModalFlow();
   }, [
     hasBackend,
     startupInteractive,
     isUpdatingMode,
-    runPostTermsFlow,
+    isOnboardingMode,
+    runStartupModalFlow,
+  ]);
+
+  useEffect(() => {
+    const wasOnboardingMode = previousOnboardingModeRef.current;
+    previousOnboardingModeRef.current = isOnboardingMode;
+
+    if (!wasOnboardingMode || isOnboardingMode) return;
+    if (!hasBackend) return;
+    if (!startupInteractive) return;
+    if (isUpdatingMode) return;
+    runStartupModalFlow();
+  }, [
+    hasBackend,
+    isOnboardingMode,
+    isUpdatingMode,
+    runStartupModalFlow,
+    startupInteractive,
   ]);
 
   useEffect(() => {

frontend/src/pages/OnboardingPage.tsx

@@ -10,7 +10,6 @@ import {
   DropdownMenu,
   DropdownItem,
   Divider,
-  Switch,
   useDisclosure,
 } from "@heroui/react";
 import { UnifiedModal } from "@/components/UnifiedModal";
@@ -27,15 +26,10 @@ import {
   ResetBaseRoot,
   CanWriteToDir,
 } from "bindings/github.com/liteldev/LeviLauncher/minecraft";
-import {
-  GetInstallerDir,
-  GetVersionsDir,
-} from "bindings/github.com/liteldev/LeviLauncher/versionservice";
 import * as minecraft from "bindings/github.com/liteldev/LeviLauncher/minecraft";
 import { normalizeLanguage } from "@/utils/i18nUtils";
-import { persistClarityChoice } from "@/utils/clarityConsent";
-import { Browser, Dialogs } from "@wailsio/runtime";
-import { LuHardDrive, LuLanguages, LuShield } from "react-icons/lu";
+import { Dialogs } from "@wailsio/runtime";
+import { LuHardDrive, LuLanguages } from "react-icons/lu";
 
 export default function OnboardingPage() {
   const { t, i18n } = useTranslation();
@@ -47,17 +41,8 @@ export default function OnboardingPage() {
   const [selectedLang, setSelectedLang] = React.useState<string>("en_US");
   const [baseRoot, setBaseRoot] = React.useState<string>("");
   const [newBaseRoot, setNewBaseRoot] = React.useState<string>("");
-  const [installerDir, setInstallerDir] = React.useState<string>("");
-  const [versionsDir, setVersionsDir] = React.useState<string>("");
   const [baseRootWritable, setBaseRootWritable] = React.useState<boolean>(true);
   const [savingBaseRoot, setSavingBaseRoot] = React.useState<boolean>(false);
-  const [clarityEnabled, setClarityEnabled] = React.useState<boolean>(() => {
-    try {
-      return localStorage.getItem("ll.clarity.enabled") === "true";
-    } catch {
-      return false;
-    }
-  });
   const {
     isOpen: unsavedOpen,
     onOpen: unsavedOnOpen,
@@ -75,10 +60,6 @@ export default function OnboardingPage() {
           const br = await GetBaseRoot();
           setBaseRoot(String(br || ""));
           setNewBaseRoot(String(br || ""));
-          const id = await GetInstallerDir();
-          setInstallerDir(String(id || ""));
-          const vd = await GetVersionsDir();
-          setVersionsDir(String(vd || ""));
         }
       } catch {}
     })();
@@ -88,13 +69,8 @@ export default function OnboardingPage() {
     setBaseRootWritable(true);
   }, [newBaseRoot]);
 
-  const persistClaritySelection = React.useCallback((enabled: boolean) => {
-    persistClarityChoice(enabled);
-  }, []);
-
   const proceedHome = () => {
     try {
-      persistClaritySelection(clarityEnabled);
       localStorage.setItem("ll.onboarded", "1");
     } catch {}
     navigate(ROUTES.home, { replace: true });
@@ -181,10 +157,6 @@ export default function OnboardingPage() {
                             const br = await GetBaseRoot();
                             setBaseRoot(String(br || ""));
                             setNewBaseRoot(String(br || ""));
-                            const id = await GetInstallerDir();
-                            setInstallerDir(String(id || ""));
-                            const vd = await GetVersionsDir();
-                            setVersionsDir(String(vd || ""));
                             setBaseRootWritable(true);
                           }
                         } catch {}
@@ -214,10 +186,6 @@ export default function OnboardingPage() {
                             if (!err) {
                               const br = await GetBaseRoot();
                               setBaseRoot(String(br || ""));
-                              const id = await GetInstallerDir();
-                              setInstallerDir(String(id || ""));
-                              const vd = await GetVersionsDir();
-                              setVersionsDir(String(vd || ""));
                             }
                           }
                         } catch {}
@@ -342,55 +310,6 @@ export default function OnboardingPage() {
                 }
               />
             </div>
-
-            <Divider className="opacity-50" />
-
-            <div className="space-y-4">
-              <SectionHeader
-                title={t("onboarding.privacy.title")}
-                description={t("onboarding.privacy.subtitle")}
-                icon={<LuShield className="w-5 h-5" />}
-                action={
-                  <Switch
-                    size="sm"
-                    isSelected={clarityEnabled}
-                    onValueChange={setClarityEnabled}
-                    classNames={{
-                      wrapper: "group-data-[selected=true]:bg-primary-500",
-                    }}
-                  />
-                }
-              />
-              <div className="text-sm text-default-600 dark:text-zinc-300 leading-6">
-                {t("onboarding.privacy.desc")}
-              </div>
-              <div className="flex flex-wrap gap-2">
-                <Button
-                  size="sm"
-                  radius="full"
-                  variant="flat"
-                  className="bg-default-200/50 dark:bg-white/10 font-bold"
-                  onPress={() =>
-                    Browser.OpenURL("https://clarity.microsoft.com/terms")
-                  }
-                >
-                  {t("onboarding.privacy.links.clarity_terms")}
-                </Button>
-                <Button
-                  size="sm"
-                  radius="full"
-                  variant="light"
-                  className="font-bold"
-                  onPress={() =>
-                    Browser.OpenURL(
-                      "https://privacy.microsoft.com/privacystatement",
-                    )
-                  }
-                >
-                  {t("onboarding.privacy.links.microsoft_privacy")}
-                </Button>
-              </div>
-            </div>
           </CardBody>
         </Card>
       </div>
@@ -420,10 +339,6 @@ export default function OnboardingPage() {
               if (!err) {
                 const br = await GetBaseRoot();
                 setBaseRoot(String(br || ""));
-                const id = await GetInstallerDir();
-                setInstallerDir(String(id || ""));
-                const vd = await GetVersionsDir();
-                setVersionsDir(String(vd || ""));
                 unsavedOnClose();
                 proceedHome();
               }