From 7b9ae36af06627b19b4da4b6f8e1aa46a91f4595 Mon Sep 17 00:00:00 2001
From: Adam Shiervani <adam.shiervani@gmail.com>
Date: Thu, 27 Feb 2025 17:23:57 +0100
Subject: [PATCH] fix(ui): Navigate to root on cloud device access settings
 disconnection

---
 ui/src/routes/devices.$id.settings.access._index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/src/routes/devices.$id.settings.access._index.tsx b/ui/src/routes/devices.$id.settings.access._index.tsx
index e9ab053..4beae1c 100644
--- a/ui/src/routes/devices.$id.settings.access._index.tsx
+++ b/ui/src/routes/devices.$id.settings.access._index.tsx
@@ -1,6 +1,6 @@
 import { SettingsPageHeader } from "@components/SettingsPageheader";
 import { SettingsItem } from "./devices.$id.settings";
-import { useLoaderData } from "react-router-dom";
+import { useLoaderData, useNavigate } from "react-router-dom";
 import { Button, LinkButton } from "../components/Button";
 import { CLOUD_APP, DEVICE_API } from "../ui.config";
 import api from "../api";
@@ -30,6 +30,7 @@ export default function SettingsAccessIndexRoute() {
   const loaderData = useLoaderData() as LocalDevice | null;
 
   const { navigateTo } = useDeviceUiNavigation();
+  const navigate = useNavigate();
 
   const [send] = useJsonRpc();
 
@@ -78,7 +79,10 @@ export default function SettingsAccessIndexRoute() {
         );
         return;
       }
+
       getCloudState();
+      // In cloud mode, we need to navigate to the device overview page, as we don't a connection anymore
+      if (!isOnDevice) navigate("/");
       return;
     });
   };