Merge a741bbe7e3 into 28919bf37c

This reverts commit dc7791c245.

ui/src/components/WebRTCVideo.tsx

@@ -417,7 +417,7 @@ export default function WebRTCVideo({ hasConnectionIssues }: { hasConnectionIssu
       });
 
       if (isRelativeMouseMode) {
-        videoElmRefValue.addEventListener("click",
+        containerRef.current?.addEventListener("click",
           () => {
             if (isPointerLockPossible && !isPointerLockActive && !document.pointerLockElement) {
               requestPointerLock();

ui/src/routes/devices.$id.settings.advanced.tsx

@@ -12,6 +12,7 @@ import { TextAreaWithLabel } from "@components/TextArea";
 import { isOnDevice } from "@/main";
 import notifications from "@/notifications";
 import { m } from "@localizations/messages.js";
+import { sleep } from "@/utils";
 
 export default function SettingsAdvancedRoute() {
   const { send } = useJsonRpc();
@@ -311,7 +312,7 @@ export default function SettingsAdvancedRoute() {
                 size="SM"
                 theme="light"
                 text={m.advanced_reset_config_button()}
-                onClick={() => {
+                onClick={async () => {
                   handleResetConfig();
                   // Add 2s delay between resetting the configuration and calling reload() to prevent reload from interrupting the RPC call to reset things.
                   await sleep(2000);

ui/src/routes/devices.$id.settings.general.reboot.tsx

@@ -4,12 +4,13 @@ import { useNavigate } from "react-router";
 import { useJsonRpc } from "@hooks/useJsonRpc";
 import { Button } from "@components/Button";
 import { m } from "@localizations/messages.js";
+import { sleep } from "@/utils";
 
 export default function SettingsGeneralRebootRoute() {
   const navigate = useNavigate();
   const { send } = useJsonRpc();
   
-  const onClose = useCallback(() => {
+  const onClose = useCallback(async () => {
     navigate(".."); // back to the devices.$id.settings page
     // Add 1s delay between navigation and calling reload() to prevent reload from interrupting the navigation.
     await sleep(1000);

ui/src/routes/devices.$id.settings.general.update.tsx

@@ -21,7 +21,7 @@ export default function SettingsGeneralUpdateRoute() {
   const { setModalView, otaState } = useUpdateStore();
   const { send } = useJsonRpc();
 
-  const onClose = useCallback(() => {
+  const onClose = useCallback(async () => {
     navigate(".."); // back to the devices.$id.settings page
     // Add 1s delay between navigation and calling reload() to prevent reload from interrupting the navigation.
     await sleep(1000);