Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/src/components/FailSafeModeOverlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ Please attach the recovery logs file that was downloaded to your computer:
};

const handleDowngrade = () => {
navigateTo(`/settings/general/update?app=${DOWNGRADE_VERSION}`);
navigateTo(`/settings/general/update?custom_app_version=${DOWNGRADE_VERSION}`);
};

return (
Expand Down
12 changes: 7 additions & 5 deletions ui/src/routes/devices.$id.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ export default function KvmIdRoute() {
});
}, 10000);

const { setNetworkState } = useNetworkStateStore();
const { setNetworkState } = useNetworkStateStore();
const { setHdmiState } = useVideoStore();
const {
keyboardLedState, setKeyboardLedState,
Expand Down Expand Up @@ -815,6 +815,10 @@ export default function KvmIdRoute() {
return <RebootingOverlay show={true} postRebootAction={rebootState.postRebootAction} />;
}

if (isFailsafeMode && failsafeReason) {
return <FailSafeModeOverlay reason={failsafeReason} />;
}

const hasConnectionFailed =
connectionFailed || ["failed", "closed"].includes(peerConnectionState ?? "");

Expand All @@ -839,7 +843,7 @@ export default function KvmIdRoute() {
}

return null;
}, [location.pathname, rebootState?.isRebooting, rebootState?.postRebootAction, connectionFailed, peerConnectionState, peerConnection, setupPeerConnection, loadingMessage]);
}, [location.pathname, rebootState?.isRebooting, rebootState?.postRebootAction, isFailsafeMode, failsafeReason, connectionFailed, peerConnectionState, peerConnection, setupPeerConnection, loadingMessage]);

return (
<FeatureFlagProvider appVersion={appVersion}>
Expand Down Expand Up @@ -887,9 +891,7 @@ export default function KvmIdRoute() {
className="animate-slideUpFade pointer-events-none absolute inset-0 flex items-center justify-center p-4"
>
<div className="relative h-full max-h-[720px] w-full max-w-[1280px] rounded-md">
{isFailsafeMode && failsafeReason ? (
<FailSafeModeOverlay reason={failsafeReason} />
) : !!ConnectionStatusElement && ConnectionStatusElement}
{!!ConnectionStatusElement && ConnectionStatusElement}
</div>
</div>
<SidebarContainer sidebarView={sidebarView} />
Expand Down