Compare commits

..

No commits in common. "8c88f72ba41f364874934ed506868440ecb13713" and "bce968000c0b74015c56ec162d712e22e27dcb39" have entirely different histories.

3 changed files with 6 additions and 15 deletions

View File

@ -10,5 +10,5 @@
] ]
}, },
"git.ignoreLimitWarning": true, "git.ignoreLimitWarning": true,
"cmake.sourceDirectory": "internal/native/cgo" "cmake.sourceDirectory": "/workspaces/kvm-sleep-mode/internal/native/cgo"
} }

View File

@ -31,7 +31,6 @@ export default function SettingsAdvancedRoute() {
const [appVersion, setAppVersion] = useState<string>(""); const [appVersion, setAppVersion] = useState<string>("");
const [systemVersion, setSystemVersion] = useState<string>(""); const [systemVersion, setSystemVersion] = useState<string>("");
const [resetConfig, setResetConfig] = useState(false); const [resetConfig, setResetConfig] = useState(false);
const [versionChangeAcknowledged, setVersionChangeAcknowledged] = useState(false);
const settings = useSettingsStore(); const settings = useSettingsStore();
@ -204,7 +203,7 @@ export default function SettingsAdvancedRoute() {
const pageParams = new URLSearchParams(); const pageParams = new URLSearchParams();
pageParams.set("downgrade", "true"); pageParams.set("downgrade", "true");
pageParams.set("resetConfig", resetConfig.toString()); pageParams.set("resetConfig", resetConfig.toString());
pageParams.set("components", updateTarget === "both" ? "app,system" : updateTarget); pageParams.set("components", updateTarget == "both" ? "app,system" : updateTarget);
// Navigate to update page // Navigate to update page
navigateTo(`/settings/general/update?${pageParams.toString()}`); navigateTo(`/settings/general/update?${pageParams.toString()}`);
@ -355,15 +354,7 @@ export default function SettingsAdvancedRoute() {
checked={resetConfig} checked={resetConfig}
onChange={e => setResetConfig(e.target.checked)} onChange={e => setResetConfig(e.target.checked)}
/> />
</div> </div>
<div>
<CheckboxWithLabel
label="I understand version changes may break my device and require factory reset"
checked={versionChangeAcknowledged}
onChange={e => setVersionChangeAcknowledged(e.target.checked)}
/>
</div>
<Button <Button
size="SM" size="SM"
@ -372,8 +363,7 @@ export default function SettingsAdvancedRoute() {
disabled={ disabled={
(updateTarget === "app" && !appVersion) || (updateTarget === "app" && !appVersion) ||
(updateTarget === "system" && !systemVersion) || (updateTarget === "system" && !systemVersion) ||
(updateTarget === "both" && (!appVersion || !systemVersion)) || (updateTarget === "both" && (!appVersion || !systemVersion))
!versionChangeAcknowledged
} }
onClick={handleVersionUpdate} onClick={handleVersionUpdate}
/> />

View File

@ -14,7 +14,8 @@ import { m } from "@localizations/messages.js";
export default function SettingsGeneralUpdateRoute() { export default function SettingsGeneralUpdateRoute() {
const navigate = useNavigate(); const navigate = useNavigate();
const location = useLocation(); const location = useLocation();
const [searchParams] = useSearchParams(); //@ts-ignore
const [searchParams, setSearchParams] = useSearchParams();
const { updateSuccess } = location.state || {}; const { updateSuccess } = location.state || {};
const { setModalView, otaState } = useUpdateStore(); const { setModalView, otaState } = useUpdateStore();