Fix system app-lock availability handling

Author: Ryanisgood

components/settings/tabs/SettingsSystemTab.test.ts

@@ -77,13 +77,14 @@ test("app lock system unlock enablement does not require current password in set
   assert.doesNotMatch(systemUnlockSection, /settings\.appLock\.currentPassword/);
 });
 
-test("app lock system unlock toggle still allows disabling when system auth is unavailable", () => {
+test("app lock system unlock setting hides when unavailable unless already enabled", () => {
   const source = readFileSync(new URL("./SettingsSystemTab.tsx", import.meta.url), "utf8");
   const appLockSectionStart = source.indexOf('<SectionHeader title={t("settings.appLock.title")} />');
   const nextSectionStart = source.indexOf("<SectionHeader", appLockSectionStart + 1);
   const appLockSection = source.slice(appLockSectionStart, nextSectionStart);
 
-  assert.match(appLockSection, /disabled=\{isSavingAppLockSystemUnlock \|\| \(!appLockSettings\.systemUnlockEnabled && !appLockSystemUnlockStatus\.available\)\}/);
+  assert.match(source, /appLockSystemUnlockStatus\?\.available \|\| appLockSettings\.systemUnlockEnabled/);
+  assert.match(appLockSection, /disabled=\{isSavingAppLockSystemUnlock \|\| !appLockSystemUnlockStatus\.available\}/);
 });
 
 test("app lock system unlock exposes auto prompt as a child option", () => {

components/settings/tabs/SettingsSystemTab.tsx

@@ -178,7 +178,12 @@ const SettingsSystemTab: React.FC<SettingsSystemTabProps> = ({
   const [isSavingAppLock, setIsSavingAppLock] = useState(false);
   const [isSavingAppLockSystemUnlock, setIsSavingAppLockSystemUnlock] = useState(false);
   const hasAppLockPassword = Boolean(appLockSettings.passwordVerifier);
-  const showAppLockSystemUnlock = Boolean(hasAppLockPassword && appLockSystemUnlockStatus?.supported && appLockSystemUnlockStatus.label);
+  const showAppLockSystemUnlock = Boolean(
+    hasAppLockPassword &&
+    appLockSystemUnlockStatus?.supported &&
+    appLockSystemUnlockStatus.label &&
+    (appLockSystemUnlockStatus?.available || appLockSettings.systemUnlockEnabled)
+  );
 
   const [tempDirInfo, setTempDirInfo] = useState<TempDirInfo | null>(null);
   const [isLoading, setIsLoading] = useState(false);
@@ -486,6 +491,7 @@ const SettingsSystemTab: React.FC<SettingsSystemTabProps> = ({
       setIsSavingAppLockSystemUnlock(false);
     }
   }, [
+    appLockSettings.systemUnlockEnabled,
     appLockSettings.systemUnlockAutoPromptEnabled,
     appLockSystemUnlockStatus?.label,
     mapAppLockChangeError,
@@ -769,7 +775,7 @@ const SettingsSystemTab: React.FC<SettingsSystemTabProps> = ({
                         <div className="flex flex-col items-end gap-2">
                           <Toggle
                             checked={appLockSettings.systemUnlockEnabled}
-                            disabled={isSavingAppLockSystemUnlock || (!appLockSettings.systemUnlockEnabled && !appLockSystemUnlockStatus.available)}
+                            disabled={isSavingAppLockSystemUnlock || !appLockSystemUnlockStatus.available}
                             ariaLabel={t("settings.appLock.systemUnlock.label").replace("{label}", appLockSystemUnlockStatus.label)}
                             onChange={(enabled) => void handleAppLockSystemUnlockChange(enabled)}
                           />

electron/bridges/appLockSystemAuthBridge.cjs

@@ -96,7 +96,7 @@ function resolveDefaultHelperPath() {
   if (process.resourcesPath) {
     return path.join(process.resourcesPath, "windowsHello", "NetcattyWindowsHello.exe");
   }
-  return path.join(__dirname, "windowsHelloHelper", "build", "NetcattyWindowsHello.exe");
+  return path.join(__dirname, "windowsHelloHelper", "build", process.arch, "NetcattyWindowsHello.exe");
 }
 
 function createAppLockSystemAuthBridge({

electron/bridges/appLockSystemAuthBridge.test.cjs

@@ -5,6 +5,7 @@ const {
   createAppLockSystemAuthBridge,
   normalizeSystemAuthStatus,
   normalizeSystemAuthUnlockResult,
+  resolveDefaultHelperPath,
 } = require("./appLockSystemAuthBridge.cjs");
 
 test("normalizes unsupported status", () => {
@@ -85,6 +86,21 @@ test("Windows status and unlock call helper with HWND", async () => {
   assert.deepEqual(calls[1].args, ["verify", "--hwnd", "1234605616436508552", "--message", "Unlock Netcatty"]);
 });
 
+test("Windows dev helper path follows the architecture-specific build output", () => {
+  const originalPlatform = Object.getOwnPropertyDescriptor(process, "platform");
+  const originalArch = Object.getOwnPropertyDescriptor(process, "arch");
+  Object.defineProperty(process, "platform", { value: "win32" });
+  Object.defineProperty(process, "arch", { value: "x64" });
+
+  try {
+    const helperPath = resolveDefaultHelperPath();
+    assert.match(helperPath, /windowsHelloHelper[\\/]build[\\/]x64[\\/]NetcattyWindowsHello\.exe$/);
+  } finally {
+    Object.defineProperty(process, "platform", originalPlatform);
+    Object.defineProperty(process, "arch", originalArch);
+  }
+});
+
 test("Windows helper maps unavailable and cancelled states", async () => {
   const bridge = createAppLockSystemAuthBridge({
     platform: "win32",